31905d81fa
xen-4.6.1-testing-src.tar.bz2 - Dropped patches now contained in tarball or unnecessary xen-4.6.0-testing-src.tar.bz2 5604f239-x86-PV-properly-populate-descriptor-tables.patch 561bbc8b-VT-d-don-t-suppress-invalidation-address-write-when-it-is-zero.patch 561d2046-VT-d-use-proper-error-codes-in-iommu_enable_x2apic_IR.patch 561d20a0-x86-hide-MWAITX-from-PV-domains.patch 561e3283-x86-NUMA-fix-SRAT-table-processor-entry-parsing-and-consumption.patch 5632118e-arm-Support-hypercall_create_continuation-for-multicall.patch 56321222-arm-rate-limit-logging-from-unimplemented-PHYSDEVOP-and-HVMOP.patch 56321249-arm-handle-races-between-relinquish_memory-and-free_domheap_pages.patch 5632127b-x86-guard-against-undue-super-page-PTE-creation.patch 5632129c-free-domain-s-vcpu-array.patch 563212c9-x86-PoD-Eager-sweep-for-zeroed-pages.patch 563212e4-xenoprof-free-domain-s-vcpu-array.patch 563212ff-x86-rate-limit-logging-in-do_xen-oprof-pmu-_op.patch 56323737-libxl-adjust-PoD-target-by-memory-fudge-too.patch 56377442-x86-PoD-Make-p2m_pod_empty_cache-restartable.patch 5641ceec-x86-HVM-always-intercept-AC-and-DB.patch 56549f24-x86-vPMU-document-as-unsupported.patch 5677f350-x86-make-debug-output-consistent-in-hvm_set_callback_via.patch xen-4.6.0-testing-src.tar.bz2 xsa155-qemut-qdisk-double-access.patch xsa155-qemut-xenfb.patch xsa155-qemuu-qdisk-double-access.patch xsa155-qemuu-xenfb.patch xsa159.patch xsa160.patch xsa162-qemut.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=399
77 lines
2.7 KiB
Diff
77 lines
2.7 KiB
Diff
Index: xen-4.6.1-testing/tools/qemu-xen-traditional-dir-remote/qemu-xen.h
|
|
===================================================================
|
|
--- xen-4.6.1-testing.orig/tools/qemu-xen-traditional-dir-remote/qemu-xen.h
|
|
+++ xen-4.6.1-testing/tools/qemu-xen-traditional-dir-remote/qemu-xen.h
|
|
@@ -1,6 +1,8 @@
|
|
#ifndef QEMU_XEN_H
|
|
#define QEMU_XEN_H
|
|
|
|
+#include "hw/boards.h"
|
|
+
|
|
/* vl.c */
|
|
extern int restore;
|
|
extern int vga_ram_size;
|
|
@@ -65,7 +67,7 @@ void handle_buffered_pio(void);
|
|
/* xenstore.c */
|
|
void xenstore_init(void);
|
|
uint32_t xenstore_read_target(void);
|
|
-void xenstore_parse_domain_config(int domid);
|
|
+void xenstore_parse_domain_config(int domid, QEMUMachine *machine);
|
|
int xenstore_parse_disable_pf_config(void);
|
|
int xenstore_fd(void);
|
|
void xenstore_process_event(void *opaque);
|
|
Index: xen-4.6.1-testing/tools/qemu-xen-traditional-dir-remote/vl.c
|
|
===================================================================
|
|
--- xen-4.6.1-testing.orig/tools/qemu-xen-traditional-dir-remote/vl.c
|
|
+++ xen-4.6.1-testing/tools/qemu-xen-traditional-dir-remote/vl.c
|
|
@@ -5861,9 +5861,9 @@ int main(int argc, char **argv, char **e
|
|
if ((msg = xenbus_read(XBT_NIL, "domid", &domid_s)))
|
|
fprintf(stderr,"Can not read our own domid: %s\n", msg);
|
|
else
|
|
- xenstore_parse_domain_config(atoi(domid_s));
|
|
+ xenstore_parse_domain_config(atoi(domid_s), machine);
|
|
#else
|
|
- xenstore_parse_domain_config(domid);
|
|
+ xenstore_parse_domain_config(domid, machine);
|
|
#endif /* CONFIG_STUBDOM */
|
|
}
|
|
|
|
Index: xen-4.6.1-testing/tools/qemu-xen-traditional-dir-remote/xenstore.c
|
|
===================================================================
|
|
--- xen-4.6.1-testing.orig/tools/qemu-xen-traditional-dir-remote/xenstore.c
|
|
+++ xen-4.6.1-testing/tools/qemu-xen-traditional-dir-remote/xenstore.c
|
|
@@ -445,7 +445,7 @@ void xenstore_init(void)
|
|
}
|
|
}
|
|
|
|
-void xenstore_parse_domain_config(int hvm_domid)
|
|
+void xenstore_parse_domain_config(int hvm_domid, QEMUMachine *machine)
|
|
{
|
|
char **e_danger = NULL;
|
|
char *buf = NULL;
|
|
@@ -739,11 +739,19 @@ void xenstore_parse_domain_config(int hv
|
|
|
|
#endif
|
|
|
|
- drives_table[nb_drives].bdrv = bs;
|
|
- drives_table[nb_drives].used = 1;
|
|
- media_filename[nb_drives] = strdup(bs->filename);
|
|
- nb_drives++;
|
|
-
|
|
+ if (machine == &xenfv_machine) {
|
|
+ drives_table[nb_drives].bdrv = bs;
|
|
+ drives_table[nb_drives].used = 1;
|
|
+#ifdef CONFIG_STUBDOM
|
|
+ media_filename[nb_drives] = strdup(danger_buf);
|
|
+#else
|
|
+ media_filename[nb_drives] = strdup(bs->filename);
|
|
+#endif
|
|
+ nb_drives++;
|
|
+ } else {
|
|
+ qemu_aio_flush();
|
|
+ bdrv_close(bs);
|
|
+ }
|
|
}
|
|
|
|
#ifdef CONFIG_STUBDOM
|