07d2889ef8
Update to v2.6.1 stable release. OBS-URL: https://build.opensuse.org/request/show/419833 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=311
96 lines
3.3 KiB
Diff
96 lines
3.3 KiB
Diff
From fceaaa771845a1fa7379539e77390b833dc9de3b Mon Sep 17 00:00:00 2001
|
|
From: Juergen Gross <jgross@suse.com>
|
|
Date: Tue, 2 Aug 2016 08:32:32 +0200
|
|
Subject: [PATCH] xen: use a common function for pv and hvm guest backend
|
|
register calls
|
|
|
|
Instead of calling xen_be_register() for each supported backend type
|
|
for hvm and pv guests in their machine init functions use a common
|
|
function in order not to have to add new backends twice.
|
|
|
|
This at once fixes the error that hvm domains couldn't use the qusb
|
|
backend.
|
|
|
|
Signed-off-by: Juergen Gross <jgross@suse.com>
|
|
Acked-by: Anthony PERARD <anthony.perard@citrix.com>
|
|
Message-id: 1470119552-16170-1-git-send-email-jgross@suse.com
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
(cherry picked from commit 0e39bb022b5fa8c11964968885f3263c02ce42b0)
|
|
[BR: BSC#991785]
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
hw/xen/xen_backend.c | 10 ++++++++++
|
|
hw/xenpv/xen_machine_pv.c | 7 +------
|
|
include/hw/xen/xen_backend.h | 1 +
|
|
xen-hvm.c | 4 +---
|
|
4 files changed, 13 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/hw/xen/xen_backend.c b/hw/xen/xen_backend.c
|
|
index 8f347da..f4d302d 100644
|
|
--- a/hw/xen/xen_backend.c
|
|
+++ b/hw/xen/xen_backend.c
|
|
@@ -781,6 +781,16 @@ int xen_be_register(const char *type, struct XenDevOps *ops)
|
|
return xenstore_scan(type, xen_domid, ops);
|
|
}
|
|
|
|
+void xen_be_register_common(void)
|
|
+{
|
|
+ xen_be_register("console", &xen_console_ops);
|
|
+ xen_be_register("vkbd", &xen_kbdmouse_ops);
|
|
+ xen_be_register("qdisk", &xen_blkdev_ops);
|
|
+#ifdef CONFIG_USB_LIBUSB
|
|
+ xen_be_register("qusb", &xen_usb_ops);
|
|
+#endif
|
|
+}
|
|
+
|
|
int xen_be_bind_evtchn(struct XenDevice *xendev)
|
|
{
|
|
if (xendev->local_port != -1) {
|
|
diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c
|
|
index 48f725c..79aef4e 100644
|
|
--- a/hw/xenpv/xen_machine_pv.c
|
|
+++ b/hw/xenpv/xen_machine_pv.c
|
|
@@ -67,14 +67,9 @@ static void xen_init_pv(MachineState *machine)
|
|
break;
|
|
}
|
|
|
|
- xen_be_register("console", &xen_console_ops);
|
|
- xen_be_register("vkbd", &xen_kbdmouse_ops);
|
|
+ xen_be_register_common();
|
|
xen_be_register("vfb", &xen_framebuffer_ops);
|
|
- xen_be_register("qdisk", &xen_blkdev_ops);
|
|
xen_be_register("qnic", &xen_netdev_ops);
|
|
-#ifdef CONFIG_USB_LIBUSB
|
|
- xen_be_register("qusb", &xen_usb_ops);
|
|
-#endif
|
|
|
|
/* configure framebuffer */
|
|
if (xenfb_enabled) {
|
|
diff --git a/include/hw/xen/xen_backend.h b/include/hw/xen/xen_backend.h
|
|
index 6e18a46..0e9af28 100644
|
|
--- a/include/hw/xen/xen_backend.h
|
|
+++ b/include/hw/xen/xen_backend.h
|
|
@@ -87,6 +87,7 @@ void xen_be_check_state(struct XenDevice *xendev);
|
|
|
|
/* xen backend driver bits */
|
|
int xen_be_init(void);
|
|
+void xen_be_register_common(void);
|
|
int xen_be_register(const char *type, struct XenDevOps *ops);
|
|
int xen_be_set_state(struct XenDevice *xendev, enum xenbus_state state);
|
|
int xen_be_bind_evtchn(struct XenDevice *xendev);
|
|
diff --git a/xen-hvm.c b/xen-hvm.c
|
|
index 039680a..93c958a 100644
|
|
--- a/xen-hvm.c
|
|
+++ b/xen-hvm.c
|
|
@@ -1305,9 +1305,7 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory)
|
|
error_report("xen backend core setup failed");
|
|
goto err;
|
|
}
|
|
- xen_be_register("console", &xen_console_ops);
|
|
- xen_be_register("vkbd", &xen_kbdmouse_ops);
|
|
- xen_be_register("qdisk", &xen_blkdev_ops);
|
|
+ xen_be_register_common();
|
|
xen_read_physmap(state);
|
|
return;
|
|
|