summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Mozes <hydrapolic@gmail.com>2019-05-15 20:05:15 +0000
committerYixun Lan <dlan@gentoo.org>2019-05-17 16:48:39 +0800
commit670b6ca726c1175478eb9c40160eac1e65096316 (patch)
treefacad23d323d26030d8cd03a4bc062774557fcba /app-emulation/xen/files
parentnet-print/cups-filters: Removed old. (diff)
downloadgentoo-670b6ca726c1175478eb9c40160eac1e65096316.tar.gz
gentoo-670b6ca726c1175478eb9c40160eac1e65096316.tar.bz2
gentoo-670b6ca726c1175478eb9c40160eac1e65096316.zip
app-emulation/xen: add upstream patches
Bug: https://bugs.gentoo.org/683694 Signed-off-by: Tomáš Mózes <hydrapolic@gmail.com> Signed-off-by: Yixun Lan <dlan@gentoo.org>
Diffstat (limited to 'app-emulation/xen/files')
-rw-r--r--app-emulation/xen/files/xen.gcc9.fixes.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/app-emulation/xen/files/xen.gcc9.fixes.patch b/app-emulation/xen/files/xen.gcc9.fixes.patch
new file mode 100644
index 000000000000..111b063f9c1d
--- /dev/null
+++ b/app-emulation/xen/files/xen.gcc9.fixes.patch
@@ -0,0 +1,34 @@
+--- xen-4.11.1/xen/drivers/passthrough/vtd/vtd.h.orig 2018-11-29 14:04:11.000000000 +0000
++++ xen-4.11.1/xen/drivers/passthrough/vtd/vtd.h 2019-02-05 21:32:50.056774501 +0000
+@@ -28,7 +28,7 @@
+ /* Allow for both IOAPIC and IOSAPIC. */
+ #define IO_xAPIC_route_entry IO_APIC_route_entry
+
+-struct IO_APIC_route_remap_entry {
++struct __packed IO_APIC_route_remap_entry {
+ union {
+ u64 val;
+ struct {
+--- xen-4.11.1/xen/common/trace.c.orig 2018-11-29 14:04:11.000000000 +0000
++++ xen-4.11.1/xen/common/trace.c 2019-02-06 20:31:27.370256971 +0000
+@@ -819,7 +819,7 @@
+ void __trace_hypercall(uint32_t event, unsigned long op,
+ const xen_ulong_t *args)
+ {
+- struct __packed {
++ struct {
+ uint32_t op;
+ uint32_t args[6];
+ } d;
+--- xen-4.11.1/xen/arch/x86/cpu/mtrr/generic.c.orig 2018-11-29 14:04:11.000000000 +0000
++++ xen-4.11.1/xen/arch/x86/cpu/mtrr/generic.c 2019-02-10 19:24:09.378805103 +0000
+@@ -171,6 +171,9 @@
+ printk("%sMTRR variable ranges %sabled:\n", level,
+ mtrr_state.enabled ? "en" : "dis");
+ width = (paddr_bits - PAGE_SHIFT + 3) / 4;
++ if ( width > 64 ) {
++ width=64;
++ }
+
+ for (i = 0; i < num_var_ranges; ++i) {
+ if (mtrr_state.var_ranges[i].mask & MTRR_PHYSMASK_VALID)