[PATCH 0/4] OvmfPkg: replace MIT license blocks with SPDX IDs

[PATCH 0/4] OvmfPkg: replace MIT license blocks with SPDX IDs

[Laszlo Ersek]

Repo:   https://github.com/lersek/edk2.git
Branch: ovmf_spdx_mit

For <https://bugzilla.tianocore.org/show_bug.cgi?id=1373>, we replaced
open-coded license text blocks with "SPDX-License-Identifier"s, almost
all over the edk2 tree.

That change however was tied to a license update / CLA update too
(please see details in TianoCore#1373, referenced above), and therefore
the MIT-covered files under OvmfPkg were out of scope. We filed a
reminder at <https://bugzilla.tianocore.org/show_bug.cgi?id=1654>, and
this series intends to address that -- i.e., to replace the MIT license
blocks with the corresponding SPDX License IDs.

Cc: Anthony Perard <anthony.perard@citrix.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Julien Grall <julien.grall@arm.com>
Cc: Lars Kurth <lars.kurth@citrix.com>
Cc: xen-devel@lists.xenproject.org

Thanks,
Laszlo

Laszlo Ersek (4):
  OvmfPkg/License.txt: remove XenPvBlkDxe from the MIT licensed dir list
  OvmfPkg/License.txt: refresh the MIT license text and include the SPDX
    ID
  OvmfPkg/IndustryStandard/Xen: replace MIT license text with SPDX ID
  OvmfPkg/XenBusDxe: replace MIT license text with SPDX ID

 OvmfPkg/Include/IndustryStandard/Xen/arch-arm/xen.h        | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_32.h | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_64.h | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen.h        | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/event_channel.h       | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/grant_table.h         | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/hvm/hvm_op.h          | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/hvm/params.h          | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/io/blkif.h            | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/io/console.h          | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/io/protocols.h        | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/io/ring.h             | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/io/xenbus.h           | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/io/xs_wire.h          | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/memory.h              | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/xen-compat.h          | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/xen.h                 | 18 +-----------------
 OvmfPkg/License.txt                                        |  8 +++++---
 OvmfPkg/XenBusDxe/XenBus.c                                 | 18 +-----------------
 OvmfPkg/XenBusDxe/XenStore.c                               | 18 +-----------------
 OvmfPkg/XenBusDxe/XenStore.h                               | 18 +-----------------
 21 files changed, 25 insertions(+), 343 deletions(-)

-- 
2.19.1.3.g30247aa5d201

[PATCH 1/4] OvmfPkg/License.txt: remove XenPvBlkDxe from the MIT licensed dir list

[Laszlo Ersek]

All files under "OvmfPkg/XenPvBlkDxe" carry

  SPDX-License-Identifier: BSD-2-Clause-Patent

None of them are MIT-licensed.

Update "OvmfPkg/License.txt" accordingly.

Cc: Anthony Perard <anthony.perard@citrix.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Julien Grall <julien.grall@arm.com>
Cc: Lars Kurth <lars.kurth@citrix.com>
Cc: xen-devel@lists.xenproject.org
Bugzilla: https://bugzilla.tianocore.org/show_bug.cgi?id=1654
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 OvmfPkg/License.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/OvmfPkg/License.txt b/OvmfPkg/License.txt
index 0666e1bac65e..a2e02a1796aa 100644
--- a/OvmfPkg/License.txt
+++ b/OvmfPkg/License.txt
@@ -54,11 +54,10 @@ POSSIBILITY OF SUCH DAMAGE.
 
 Some files are subject to the following license, the MIT license. Those files
 are located in:
 - OvmfPkg/Include/IndustryStandard/Xen/
 - OvmfPkg/XenBusDxe/
-- OvmfPkg/XenPvBlkDxe/
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-- 
2.19.1.3.g30247aa5d201

[PATCH 2/4] OvmfPkg/License.txt: refresh the MIT license text and include the SPDX ID

[Laszlo Ersek]

Refresh the MIT license text from <https://spdx.org/licenses/MIT.html>,
and add "SPDX-License-Identifier: MIT" for easier parsing by machines.

This follows the tree-wide adoption of "SPDX-License-Identifier"s, made
for <https://bugzilla.tianocore.org/show_bug.cgi?id=1373>; in particular:

- commit 304bff7223a8 ("edk2: Change License.txt from 2-Clause BSD to
  BSD+Patent", 2019-04-09),

- commit 75fae505b735 ("OvmfPkg: Change License.txt from 2-Clause BSD to
  BSD+Patent", 2019-04-09).

Cc: Anthony Perard <anthony.perard@citrix.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Julien Grall <julien.grall@arm.com>
Cc: Lars Kurth <lars.kurth@citrix.com>
Cc: xen-devel@lists.xenproject.org
Bugzilla: https://bugzilla.tianocore.org/show_bug.cgi?id=1654
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 OvmfPkg/License.txt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/OvmfPkg/License.txt b/OvmfPkg/License.txt
index a2e02a1796aa..6ec950cd9e13 100644
--- a/OvmfPkg/License.txt
+++ b/OvmfPkg/License.txt
@@ -55,19 +55,22 @@ POSSIBILITY OF SUCH DAMAGE.
 Some files are subject to the following license, the MIT license. Those files
 are located in:
 - OvmfPkg/Include/IndustryStandard/Xen/
 - OvmfPkg/XenBusDxe/
 
+SPDX-License-Identifier: MIT
+
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice (including the next
+paragraph) shall be included in all copies or substantial portions of the
+Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-- 
2.19.1.3.g30247aa5d201

[PATCH 3/4] OvmfPkg/IndustryStandard/Xen: replace MIT license text with SPDX ID

[Laszlo Ersek]

The header files under "OvmfPkg/Include/IndustryStandard/Xen" include the
MIT License text. Replace those license blocks with
"SPDX-License-Identifier: MIT" (which refers to
<https://spdx.org/licenses/MIT.html>) for easier parsing by machines (and
humans).

This follows the tree-wide adoption of "SPDX-License-Identifier"s, made
for <https://bugzilla.tianocore.org/show_bug.cgi?id=1373>.

Cc: Anthony Perard <anthony.perard@citrix.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Julien Grall <julien.grall@arm.com>
Cc: Lars Kurth <lars.kurth@citrix.com>
Cc: xen-devel@lists.xenproject.org
Bugzilla: https://bugzilla.tianocore.org/show_bug.cgi?id=1654
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 OvmfPkg/Include/IndustryStandard/Xen/arch-arm/xen.h        | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_32.h | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_64.h | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen.h        | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/event_channel.h       | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/grant_table.h         | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/hvm/hvm_op.h          | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/hvm/params.h          | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/io/blkif.h            | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/io/console.h          | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/io/protocols.h        | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/io/ring.h             | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/io/xenbus.h           | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/io/xs_wire.h          | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/memory.h              | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/xen-compat.h          | 18 +-----------------
 OvmfPkg/Include/IndustryStandard/Xen/xen.h                 | 18 +-----------------
 17 files changed, 17 insertions(+), 289 deletions(-)

diff --git a/OvmfPkg/Include/IndustryStandard/Xen/arch-arm/xen.h b/OvmfPkg/Include/IndustryStandard/Xen/arch-arm/xen.h
index 625a0fc99416..a394f8d85a5d 100644
--- a/OvmfPkg/Include/IndustryStandard/Xen/arch-arm/xen.h
+++ b/OvmfPkg/Include/IndustryStandard/Xen/arch-arm/xen.h
@@ -1,27 +1,11 @@
 /******************************************************************************
  * arch-arm.h
  *
  * Guest OS interface to ARM Xen.
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
+ * SPDX-License-Identifier: MIT
  *
  * Copyright 2011 (C) Citrix Systems
  */
 
 #ifndef __XEN_PUBLIC_ARCH_ARM_H__
diff --git a/OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_32.h b/OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_32.h
index 82f9e49f3341..86378fba9b34 100644
--- a/OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_32.h
+++ b/OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_32.h
@@ -1,27 +1,11 @@
 /******************************************************************************
  * xen-x86_32.h
  * 
  * Guest OS interface to x86 32-bit Xen.
  * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
+ * SPDX-License-Identifier: MIT
  *
  * Copyright (c) 2004-2007, K A Fraser
  */
 
 #ifndef __XEN_PUBLIC_ARCH_X86_XEN_X86_32_H__
diff --git a/OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_64.h b/OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_64.h
index ad2b6b0a4c62..9dc92d02ce6c 100644
--- a/OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_64.h
+++ b/OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_64.h
@@ -1,27 +1,11 @@
 /******************************************************************************
  * xen-x86_64.h
  * 
  * Guest OS interface to x86 64-bit Xen.
  * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
+ * SPDX-License-Identifier: MIT
  *
  * Copyright (c) 2004-2006, K A Fraser
  */
 
 #ifndef __XEN_PUBLIC_ARCH_X86_XEN_X86_64_H__
diff --git a/OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen.h b/OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen.h
index 684ca688c09a..ed69f9241485 100644
--- a/OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen.h
+++ b/OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen.h
@@ -1,27 +1,11 @@
 /******************************************************************************
  * arch-x86/xen.h
  * 
  * Guest OS interface to x86 Xen.
  * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
+ * SPDX-License-Identifier: MIT
  *
  * Copyright (c) 2004-2006, K A Fraser
  */
 
 #include "../xen.h"
diff --git a/OvmfPkg/Include/IndustryStandard/Xen/event_channel.h b/OvmfPkg/Include/IndustryStandard/Xen/event_channel.h
index 6377ce7b1afb..4fff5654af66 100644
--- a/OvmfPkg/Include/IndustryStandard/Xen/event_channel.h
+++ b/OvmfPkg/Include/IndustryStandard/Xen/event_channel.h
@@ -1,27 +1,11 @@
 /******************************************************************************
  * event_channel.h
  *
  * Event channels between domains.
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
+ * SPDX-License-Identifier: MIT
  *
  * Copyright (c) 2003-2004, K A Fraser.
  */
 
 #ifndef __XEN_PUBLIC_EVENT_CHANNEL_H__
diff --git a/OvmfPkg/Include/IndustryStandard/Xen/grant_table.h b/OvmfPkg/Include/IndustryStandard/Xen/grant_table.h
index 029d049382e1..da8d6c2705f0 100644
--- a/OvmfPkg/Include/IndustryStandard/Xen/grant_table.h
+++ b/OvmfPkg/Include/IndustryStandard/Xen/grant_table.h
@@ -2,27 +2,11 @@
  * grant_table.h
  *
  * Interface for granting foreign access to page frames, and receiving
  * page-ownership transfers.
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
+ * SPDX-License-Identifier: MIT
  *
  * Copyright (c) 2004, K A Fraser
  */
 
 #ifndef __XEN_PUBLIC_GRANT_TABLE_H__
diff --git a/OvmfPkg/Include/IndustryStandard/Xen/hvm/hvm_op.h b/OvmfPkg/Include/IndustryStandard/Xen/hvm/hvm_op.h
index bd8d445c081d..5eca23c2055a 100644
--- a/OvmfPkg/Include/IndustryStandard/Xen/hvm/hvm_op.h
+++ b/OvmfPkg/Include/IndustryStandard/Xen/hvm/hvm_op.h
@@ -1,23 +1,7 @@
 /*
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef __XEN_PUBLIC_HVM_HVM_OP_H__
 #define __XEN_PUBLIC_HVM_HVM_OP_H__
 
diff --git a/OvmfPkg/Include/IndustryStandard/Xen/hvm/params.h b/OvmfPkg/Include/IndustryStandard/Xen/hvm/params.h
index cac33359ceb0..3b94435c9f8d 100644
--- a/OvmfPkg/Include/IndustryStandard/Xen/hvm/params.h
+++ b/OvmfPkg/Include/IndustryStandard/Xen/hvm/params.h
@@ -1,23 +1,7 @@
 /*
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef __XEN_PUBLIC_HVM_PARAMS_H__
 #define __XEN_PUBLIC_HVM_PARAMS_H__
 
diff --git a/OvmfPkg/Include/IndustryStandard/Xen/io/blkif.h b/OvmfPkg/Include/IndustryStandard/Xen/io/blkif.h
index 27774d6285ef..ff8e77589f92 100644
--- a/OvmfPkg/Include/IndustryStandard/Xen/io/blkif.h
+++ b/OvmfPkg/Include/IndustryStandard/Xen/io/blkif.h
@@ -1,27 +1,11 @@
 /******************************************************************************
  * blkif.h
  *
  * Unified block-device I/O interface for Xen guest OSes.
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
+ * SPDX-License-Identifier: MIT
  *
  * Copyright (c) 2003-2004, Keir Fraser
  * Copyright (c) 2012, Spectra Logic Corporation
  */
 
diff --git a/OvmfPkg/Include/IndustryStandard/Xen/io/console.h b/OvmfPkg/Include/IndustryStandard/Xen/io/console.h
index f1caa9765bcf..c38d88b07aa3 100644
--- a/OvmfPkg/Include/IndustryStandard/Xen/io/console.h
+++ b/OvmfPkg/Include/IndustryStandard/Xen/io/console.h
@@ -1,27 +1,11 @@
 /******************************************************************************
  * console.h
  *
  * Console I/O interface for Xen guest OSes.
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
+ * SPDX-License-Identifier: MIT
  *
  * Copyright (c) 2005, Keir Fraser
  */
 
 #ifndef __XEN_PUBLIC_IO_CONSOLE_H__
diff --git a/OvmfPkg/Include/IndustryStandard/Xen/io/protocols.h b/OvmfPkg/Include/IndustryStandard/Xen/io/protocols.h
index e2cbd871aa7c..0c48e7693787 100644
--- a/OvmfPkg/Include/IndustryStandard/Xen/io/protocols.h
+++ b/OvmfPkg/Include/IndustryStandard/Xen/io/protocols.h
@@ -1,25 +1,9 @@
 /******************************************************************************
  * protocols.h
  * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
+ * SPDX-License-Identifier: MIT
  */
 
 #ifndef __XEN_PROTOCOLS_H__
 #define __XEN_PROTOCOLS_H__
 
diff --git a/OvmfPkg/Include/IndustryStandard/Xen/io/ring.h b/OvmfPkg/Include/IndustryStandard/Xen/io/ring.h
index 16313773cb9e..c770ade40785 100644
--- a/OvmfPkg/Include/IndustryStandard/Xen/io/ring.h
+++ b/OvmfPkg/Include/IndustryStandard/Xen/io/ring.h
@@ -1,27 +1,11 @@
 /******************************************************************************
  * ring.h
  * 
  * Shared producer-consumer ring macros.
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
+ * SPDX-License-Identifier: MIT
  *
  * Tim Deegan and Andrew Warfield November 2004.
  */
 
 #ifndef __XEN_PUBLIC_IO_RING_H__
diff --git a/OvmfPkg/Include/IndustryStandard/Xen/io/xenbus.h b/OvmfPkg/Include/IndustryStandard/Xen/io/xenbus.h
index 4c76b5ba0f68..80db1909e9a4 100644
--- a/OvmfPkg/Include/IndustryStandard/Xen/io/xenbus.h
+++ b/OvmfPkg/Include/IndustryStandard/Xen/io/xenbus.h
@@ -1,27 +1,11 @@
 /*****************************************************************************
  * xenbus.h
  *
  * Xenbus protocol details.
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
+ * SPDX-License-Identifier: MIT
  *
  * Copyright (C) 2005 XenSource Ltd.
  */
 
 #ifndef _XEN_PUBLIC_IO_XENBUS_H
diff --git a/OvmfPkg/Include/IndustryStandard/Xen/io/xs_wire.h b/OvmfPkg/Include/IndustryStandard/Xen/io/xs_wire.h
index 6f302d1447fa..fb4e48d59182 100644
--- a/OvmfPkg/Include/IndustryStandard/Xen/io/xs_wire.h
+++ b/OvmfPkg/Include/IndustryStandard/Xen/io/xs_wire.h
@@ -1,26 +1,10 @@
 /*
  * Details of the "wire" protocol between Xen Store Daemon and client
  * library or guest kernel.
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
+ * SPDX-License-Identifier: MIT
  *
  * Copyright (C) 2005 Rusty Russell IBM Corporation
  */
 
 #ifndef _XS_WIRE_H
diff --git a/OvmfPkg/Include/IndustryStandard/Xen/memory.h b/OvmfPkg/Include/IndustryStandard/Xen/memory.h
index 020155962c3b..81e981331a80 100644
--- a/OvmfPkg/Include/IndustryStandard/Xen/memory.h
+++ b/OvmfPkg/Include/IndustryStandard/Xen/memory.h
@@ -1,27 +1,11 @@
 /******************************************************************************
  * memory.h
  * 
  * Memory reservation and information.
  * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
+ * SPDX-License-Identifier: MIT
  *
  * Copyright (c) 2005, Keir Fraser <keir@xensource.com>
  */
 
 #ifndef __XEN_PUBLIC_MEMORY_H__
diff --git a/OvmfPkg/Include/IndustryStandard/Xen/xen-compat.h b/OvmfPkg/Include/IndustryStandard/Xen/xen-compat.h
index 53b7a3c7f6f2..99d5a5dc0419 100644
--- a/OvmfPkg/Include/IndustryStandard/Xen/xen-compat.h
+++ b/OvmfPkg/Include/IndustryStandard/Xen/xen-compat.h
@@ -1,27 +1,11 @@
 /******************************************************************************
  * xen-compat.h
  * 
  * Guest OS interface to Xen.  Compatibility layer.
  * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
+ * SPDX-License-Identifier: MIT
  *
  * Copyright (c) 2006, Christian Limpach
  */
 
 #ifndef __XEN_PUBLIC_XEN_COMPAT_H__
diff --git a/OvmfPkg/Include/IndustryStandard/Xen/xen.h b/OvmfPkg/Include/IndustryStandard/Xen/xen.h
index 8596ca1bd26f..eccc1ad6251a 100644
--- a/OvmfPkg/Include/IndustryStandard/Xen/xen.h
+++ b/OvmfPkg/Include/IndustryStandard/Xen/xen.h
@@ -1,27 +1,11 @@
 /******************************************************************************
  * xen.h
  * 
  * Guest OS interface to Xen.
  * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
+ * SPDX-License-Identifier: MIT
  *
  * Copyright (c) 2004, K A Fraser
  */
 
 #ifndef __XEN_PUBLIC_XEN_H__
-- 
2.19.1.3.g30247aa5d201

[PATCH 4/4] OvmfPkg/XenBusDxe: replace MIT license text with SPDX ID

[Laszlo Ersek]

The "XenBus.c", "XenStore.c", "XenStore.h" files under "OvmfPkg/XenBusDxe"
include the MIT License text. Replace those license blocks with
"SPDX-License-Identifier: MIT" (which refers to
<https://spdx.org/licenses/MIT.html>) for easier parsing by machines (and
humans).

This follows the tree-wide adoption of "SPDX-License-Identifier"s, made
for <https://bugzilla.tianocore.org/show_bug.cgi?id=1373>.

Cc: Anthony Perard <anthony.perard@citrix.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Julien Grall <julien.grall@arm.com>
Cc: Lars Kurth <lars.kurth@citrix.com>
Cc: xen-devel@lists.xenproject.org
Bugzilla: https://bugzilla.tianocore.org/show_bug.cgi?id=1654
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 OvmfPkg/XenBusDxe/XenStore.h | 18 +-----------------
 OvmfPkg/XenBusDxe/XenBus.c   | 18 +-----------------
 OvmfPkg/XenBusDxe/XenStore.c | 18 +-----------------
 3 files changed, 3 insertions(+), 51 deletions(-)

diff --git a/OvmfPkg/XenBusDxe/XenStore.h b/OvmfPkg/XenBusDxe/XenStore.h
index 33bb647f6694..effaad73367d 100644
--- a/OvmfPkg/XenBusDxe/XenStore.h
+++ b/OvmfPkg/XenBusDxe/XenStore.h
@@ -7,27 +7,11 @@
   Copyright (C) 2014, Citrix Ltd.
 
   This file may be distributed separately from the Linux kernel, or
   incorporated into other software packages, subject to the following license:
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this source file (the "Software"), to deal in the Software without
-  restriction, including without limitation the rights to use, copy, modify,
-  merge, publish, distribute, sublicense, and/or sell copies of the Software,
-  and to permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-  IN THE SOFTWARE.
+  SPDX-License-Identifier: MIT
 **/
 
 #ifndef _XEN_XENSTORE_XENSTOREVAR_H
 #define _XEN_XENSTORE_XENSTOREVAR_H
 
diff --git a/OvmfPkg/XenBusDxe/XenBus.c b/OvmfPkg/XenBusDxe/XenBus.c
index ee9526c33252..bb8ddbc4d44d 100644
--- a/OvmfPkg/XenBusDxe/XenBus.c
+++ b/OvmfPkg/XenBusDxe/XenBus.c
@@ -12,27 +12,11 @@
   Copyright (C) 2014, Citrix Ltd.
 
   This file may be distributed separately from the Linux kernel, or
   incorporated into other software packages, subject to the following license:
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this source file (the "Software"), to deal in the Software without
-  restriction, including without limitation the rights to use, copy, modify,
-  merge, publish, distribute, sublicense, and/or sell copies of the Software,
-  and to permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-  IN THE SOFTWARE.
+  SPDX-License-Identifier: MIT
 **/
 
 #include <Library/PrintLib.h>
 
 #include "XenBus.h"
diff --git a/OvmfPkg/XenBusDxe/XenStore.c b/OvmfPkg/XenBusDxe/XenStore.c
index 6812e1078cd8..34890ae40bb2 100644
--- a/OvmfPkg/XenBusDxe/XenStore.c
+++ b/OvmfPkg/XenBusDxe/XenStore.c
@@ -33,27 +33,11 @@
   Copyright (C) 2014, Citrix Ltd.
 
   This file may be distributed separately from the Linux kernel, or
   incorporated into other software packages, subject to the following license:
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this source file (the "Software"), to deal in the Software without
-  restriction, including without limitation the rights to use, copy, modify,
-  merge, publish, distribute, sublicense, and/or sell copies of the Software,
-  and to permit persons to whom the Software is furnished to do so, subject to
-  the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-  IN THE SOFTWARE.
+  SPDX-License-Identifier: MIT
 **/
 
 #include "XenStore.h"
 
 #include <Library/PrintLib.h>
-- 
2.19.1.3.g30247aa5d201

Re: [PATCH 0/4] OvmfPkg: replace MIT license blocks with SPDX IDs

[Ard Biesheuvel]

On Wed, 10 Apr 2019 at 05:58, Laszlo Ersek <lersek@redhat.com> wrote:
>
> Repo:   https://github.com/lersek/edk2.git
> Branch: ovmf_spdx_mit
>
> For <https://bugzilla.tianocore.org/show_bug.cgi?id=1373>, we replaced
> open-coded license text blocks with "SPDX-License-Identifier"s, almost
> all over the edk2 tree.
>
> That change however was tied to a license update / CLA update too
> (please see details in TianoCore#1373, referenced above), and therefore
> the MIT-covered files under OvmfPkg were out of scope. We filed a
> reminder at <https://bugzilla.tianocore.org/show_bug.cgi?id=1654>, and
> this series intends to address that -- i.e., to replace the MIT license
> blocks with the corresponding SPDX License IDs.
>
> Cc: Anthony Perard <anthony.perard@citrix.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Julien Grall <julien.grall@arm.com>
> Cc: Lars Kurth <lars.kurth@citrix.com>
> Cc: xen-devel@lists.xenproject.org
>
> Thanks,
> Laszlo
>
> Laszlo Ersek (4):
>   OvmfPkg/License.txt: remove XenPvBlkDxe from the MIT licensed dir list
>   OvmfPkg/License.txt: refresh the MIT license text and include the SPDX
>     ID
>   OvmfPkg/IndustryStandard/Xen: replace MIT license text with SPDX ID
>   OvmfPkg/XenBusDxe: replace MIT license text with SPDX ID
>

For the series

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

>  OvmfPkg/Include/IndustryStandard/Xen/arch-arm/xen.h        | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_32.h | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_64.h | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen.h        | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/event_channel.h       | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/grant_table.h         | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/hvm/hvm_op.h          | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/hvm/params.h          | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/io/blkif.h            | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/io/console.h          | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/io/protocols.h        | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/io/ring.h             | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/io/xenbus.h           | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/io/xs_wire.h          | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/memory.h              | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/xen-compat.h          | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/xen.h                 | 18 +-----------------
>  OvmfPkg/License.txt                                        |  8 +++++---
>  OvmfPkg/XenBusDxe/XenBus.c                                 | 18 +-----------------
>  OvmfPkg/XenBusDxe/XenStore.c                               | 18 +-----------------
>  OvmfPkg/XenBusDxe/XenStore.h                               | 18 +-----------------
>  21 files changed, 25 insertions(+), 343 deletions(-)
>
> --
> 2.19.1.3.g30247aa5d201
>

Re: [PATCH 0/4] OvmfPkg: replace MIT license blocks with SPDX IDs

[Anthony PERARD]

On Wed, Apr 10, 2019 at 02:58:05PM +0200, Laszlo Ersek wrote:
> Repo:   https://github.com/lersek/edk2.git
> Branch: ovmf_spdx_mit
> 
> For <https://bugzilla.tianocore.org/show_bug.cgi?id=1373>, we replaced
> open-coded license text blocks with "SPDX-License-Identifier"s, almost
> all over the edk2 tree.
> 
> That change however was tied to a license update / CLA update too
> (please see details in TianoCore#1373, referenced above), and therefore
> the MIT-covered files under OvmfPkg were out of scope. We filed a
> reminder at <https://bugzilla.tianocore.org/show_bug.cgi?id=1654>, and
> this series intends to address that -- i.e., to replace the MIT license
> blocks with the corresponding SPDX License IDs.
> 
> Cc: Anthony Perard <anthony.perard@citrix.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Julien Grall <julien.grall@arm.com>
> Cc: Lars Kurth <lars.kurth@citrix.com>
> Cc: xen-devel@lists.xenproject.org
> 
> Thanks,
> Laszlo
> 
> Laszlo Ersek (4):
>   OvmfPkg/License.txt: remove XenPvBlkDxe from the MIT licensed dir list
>   OvmfPkg/License.txt: refresh the MIT license text and include the SPDX
>     ID
>   OvmfPkg/IndustryStandard/Xen: replace MIT license text with SPDX ID
>   OvmfPkg/XenBusDxe: replace MIT license text with SPDX ID

For the series:
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>

-- 
Anthony PERARD

Re: [edk2-devel] [PATCH 2/4] OvmfPkg/License.txt: refresh the MIT license text and include the SPDX ID

[Philippe Mathieu-Daudé]

On 4/10/19 2:58 PM, Laszlo Ersek wrote:
> Refresh the MIT license text from <https://spdx.org/licenses/MIT.html>,
> and add "SPDX-License-Identifier: MIT" for easier parsing by machines.
> 
> This follows the tree-wide adoption of "SPDX-License-Identifier"s, made
> for <https://bugzilla.tianocore.org/show_bug.cgi?id=1373>; in particular:
> 
> - commit 304bff7223a8 ("edk2: Change License.txt from 2-Clause BSD to
>   BSD+Patent", 2019-04-09),
> 
> - commit 75fae505b735 ("OvmfPkg: Change License.txt from 2-Clause BSD to
>   BSD+Patent", 2019-04-09).
> 
> Cc: Anthony Perard <anthony.perard@citrix.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Julien Grall <julien.grall@arm.com>
> Cc: Lars Kurth <lars.kurth@citrix.com>
> Cc: xen-devel@lists.xenproject.org
> Bugzilla: https://bugzilla.tianocore.org/show_bug.cgi?id=1654
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  OvmfPkg/License.txt | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/OvmfPkg/License.txt b/OvmfPkg/License.txt
> index a2e02a1796aa..6ec950cd9e13 100644
> --- a/OvmfPkg/License.txt
> +++ b/OvmfPkg/License.txt
> @@ -55,19 +55,22 @@ POSSIBILITY OF SUCH DAMAGE.
>  Some files are subject to the following license, the MIT license. Those files
>  are located in:
>  - OvmfPkg/Include/IndustryStandard/Xen/
>  - OvmfPkg/XenBusDxe/
>  
> +SPDX-License-Identifier: MIT
> +
>  Permission is hereby granted, free of charge, to any person obtaining a copy
>  of this software and associated documentation files (the "Software"), to deal
>  in the Software without restriction, including without limitation the rights
>  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
>  copies of the Software, and to permit persons to whom the Software is
>  furnished to do so, subject to the following conditions:
>  
> -The above copyright notice and this permission notice shall be included in
> -all copies or substantial portions of the Software.
> +The above copyright notice and this permission notice (including the next
> +paragraph) shall be included in all copies or substantial portions of the
> +Software.
>  
>  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
>  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> 

Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>

Re: [edk2-devel] [PATCH 0/4] OvmfPkg: replace MIT license blocks with SPDX IDs

[Laszlo Ersek]

On 04/10/19 14:58, Laszlo Ersek wrote:
> Repo:   https://github.com/lersek/edk2.git
> Branch: ovmf_spdx_mit
> 
> For <https://bugzilla.tianocore.org/show_bug.cgi?id=1373>, we replaced
> open-coded license text blocks with "SPDX-License-Identifier"s, almost
> all over the edk2 tree.
> 
> That change however was tied to a license update / CLA update too
> (please see details in TianoCore#1373, referenced above), and therefore
> the MIT-covered files under OvmfPkg were out of scope. We filed a
> reminder at <https://bugzilla.tianocore.org/show_bug.cgi?id=1654>, and
> this series intends to address that -- i.e., to replace the MIT license
> blocks with the corresponding SPDX License IDs.
> 
> Cc: Anthony Perard <anthony.perard@citrix.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Jordan Justen <jordan.l.justen@intel.com>
> Cc: Julien Grall <julien.grall@arm.com>
> Cc: Lars Kurth <lars.kurth@citrix.com>
> Cc: xen-devel@lists.xenproject.org
> 
> Thanks,
> Laszlo
> 
> Laszlo Ersek (4):
>   OvmfPkg/License.txt: remove XenPvBlkDxe from the MIT licensed dir list
>   OvmfPkg/License.txt: refresh the MIT license text and include the SPDX
>     ID
>   OvmfPkg/IndustryStandard/Xen: replace MIT license text with SPDX ID
>   OvmfPkg/XenBusDxe: replace MIT license text with SPDX ID
> 
>  OvmfPkg/Include/IndustryStandard/Xen/arch-arm/xen.h        | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_32.h | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen-x86_64.h | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/arch-x86/xen.h        | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/event_channel.h       | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/grant_table.h         | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/hvm/hvm_op.h          | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/hvm/params.h          | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/io/blkif.h            | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/io/console.h          | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/io/protocols.h        | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/io/ring.h             | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/io/xenbus.h           | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/io/xs_wire.h          | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/memory.h              | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/xen-compat.h          | 18 +-----------------
>  OvmfPkg/Include/IndustryStandard/Xen/xen.h                 | 18 +-----------------
>  OvmfPkg/License.txt                                        |  8 +++++---
>  OvmfPkg/XenBusDxe/XenBus.c                                 | 18 +-----------------
>  OvmfPkg/XenBusDxe/XenStore.c                               | 18 +-----------------
>  OvmfPkg/XenBusDxe/XenStore.h                               | 18 +-----------------
>  21 files changed, 25 insertions(+), 343 deletions(-)
> 


Thanks everyone for the reviews; I pushed the series as commit range
e0fd9ece26c9..34131e1b5c09.

Cheers
Laszlo