aboutsummaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorRoger Pau Monné <royger@FreeBSD.org>2021-06-21 08:43:36 +0000
committerRoger Pau Monné <royger@FreeBSD.org>2021-06-22 14:47:15 +0000
commitd0e59dedfb1bc2fbda2002ab8de556d29973858b (patch)
tree0eac51d8644c480c993a0a7b018adf91bb73f68d /emulators
parent05155b4f4e1ccc0b682e4f823f54a360caf19220 (diff)
downloadports-d0e59dedfb1bc2fbda2002ab8de556d29973858b.tar.gz
ports-d0e59dedfb1bc2fbda2002ab8de556d29973858b.zip
emulators/xen-kernel: remove stale patch files
Those patches are already part of Xen 4.15 and not used by the build. Approved by: bapt (implicit)
Diffstat (limited to 'emulators')
-rw-r--r--emulators/xen-kernel/files/0001-x86-efi-enable-MS-ABI-attribute-on-clang.patch38
-rw-r--r--emulators/xen-kernel/files/0001-x86-pvh-pass-module-command-line-to-dom0.patch54
2 files changed, 0 insertions, 92 deletions
diff --git a/emulators/xen-kernel/files/0001-x86-efi-enable-MS-ABI-attribute-on-clang.patch b/emulators/xen-kernel/files/0001-x86-efi-enable-MS-ABI-attribute-on-clang.patch
deleted file mode 100644
index 81838d32e374..000000000000
--- a/emulators/xen-kernel/files/0001-x86-efi-enable-MS-ABI-attribute-on-clang.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 92f5ffa58d188c9f9a9f1bcdccb6d6348d9df612 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= <roger.pau@citrix.com>
-Date: Thu, 4 Feb 2021 14:02:32 +0100
-Subject: [PATCH] x86/efi: enable MS ABI attribute on clang
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Or else the EFI service calls will use the wrong calling convention.
-
-The __ms_abi__ attribute is available on all supported versions of
-clang. Add a specific Clang check because the GCC version reported by
-Clang is below the required 4.4 to use the __ms_abi__ attribute.
-
-Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
-Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
-Reviewed-by: Ian Jackson <iwj@xenproject.org>
-Release-Acked-by: Ian Jackson <iwj@xenproject.org>
----
- xen/include/asm-x86/x86_64/efibind.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xen/include/asm-x86/x86_64/efibind.h b/xen/include/asm-x86/x86_64/efibind.h
-index b013db175d..ddcfae07ec 100644
---- a/xen/include/asm-x86/x86_64/efibind.h
-+++ b/xen/include/asm-x86/x86_64/efibind.h
-@@ -172,7 +172,7 @@ typedef uint64_t UINTN;
- #ifndef EFIAPI // Forces EFI calling conventions reguardless of compiler options
- #ifdef _MSC_EXTENSIONS
- #define EFIAPI __cdecl // Force C calling convention for Microsoft C compiler
-- #elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
-+ #elif __clang__ || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
- #define EFIAPI __attribute__((__ms_abi__)) // Force Microsoft ABI
- #else
- #define EFIAPI // Substitute expresion to force C calling convention
---
-2.30.1
-
diff --git a/emulators/xen-kernel/files/0001-x86-pvh-pass-module-command-line-to-dom0.patch b/emulators/xen-kernel/files/0001-x86-pvh-pass-module-command-line-to-dom0.patch
deleted file mode 100644
index 2bb2993bb096..000000000000
--- a/emulators/xen-kernel/files/0001-x86-pvh-pass-module-command-line-to-dom0.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From ddc03f91858b21a1641909d1a1f55604be627d82 Mon Sep 17 00:00:00 2001
-From: Roger Pau Monne <roger.pau@citrix.com>
-Date: Fri, 29 Jan 2021 09:59:03 +0100
-Subject: [PATCH] x86/pvh: pass module command line to dom0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Both the multiboot and the HVM start info structures allow passing a
-string together with a module. Implement the missing support in
-pvh_load_kernel so that module strings found in the multiboot
-structure are forwarded to dom0.
-
-Fixes: 62ba982424 ('x86: parse Dom0 kernel for PVHv2')
-Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
----
-NB: str cannot be made const because __hvm_copy buf parameter (that
-maps to str in the added code) is bi-directional depending on the
-flags passed to the function.
----
- xen/arch/x86/hvm/dom0_build.c | 17 ++++++++++++++++-
- 1 file changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c
-index 12a82c9d7c..28c29d2669 100644
---- a/xen/arch/x86/hvm/dom0_build.c
-+++ b/xen/arch/x86/hvm/dom0_build.c
-@@ -617,7 +617,22 @@ static int __init pvh_load_kernel(struct domain *d, const module_t *image,
-
- mod.paddr = last_addr;
- mod.size = initrd->mod_end;
-- last_addr += ROUNDUP(initrd->mod_end, PAGE_SIZE);
-+ last_addr += ROUNDUP(initrd->mod_end, elf_64bit(&elf) ? 8 : 4);
-+ if ( initrd->string )
-+ {
-+ char *str = __va(initrd->string);
-+ unsigned int len = strlen(str) + 1;
-+
-+ rc = hvm_copy_to_guest_phys(last_addr, str, len, v);
-+ if ( rc )
-+ {
-+ printk("Unable to copy module command line\n");
-+ return rc;
-+ }
-+ mod.cmdline_paddr = last_addr;
-+ last_addr += len;
-+ }
-+ last_addr = ROUNDUP(last_addr, PAGE_SIZE);
- }
-
- /* Free temporary buffers. */
---
-2.29.2
-