[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/6] xen: Move xenstore initialization to common loc
From: |
Jason Andryuk |
Subject: |
[Qemu-devel] [PATCH 2/6] xen: Move xenstore initialization to common location |
Date: |
Mon, 11 Mar 2019 14:02:12 -0400 |
For the xen stubdom case, we'll want xenstore initialized, but we'll
want to skip the rest of xen_be_init. Move the initialization to
xen_hvm_init so we can conditionalize calling xen_be_init.
xs_domain_open() is deprecated for xs_open(0), so make the replacement
as well.
Signed-off-by: Jason Andryuk <address@hidden>
---
hw/i386/xen/xen-hvm.c | 8 ++++++++
hw/xen/xen-legacy-backend.c | 8 --------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
index 2939122e7c..c20c4b27f6 100644
--- a/hw/i386/xen/xen-hvm.c
+++ b/hw/i386/xen/xen-hvm.c
@@ -1487,6 +1487,14 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion
**ram_memory)
xen_bus_init();
+ xenstore = xs_open(0);
+ if (!xenstore) {
+ error_report("Can't connect to xenstored");
+ goto err;
+ }
+
+ qemu_set_fd_handler(xs_fileno(xenstore), xenstore_update, NULL, NULL);
+
/* Initialize backend core & drivers */
if (xen_be_init() != 0) {
error_report("xen backend core setup failed");
diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c
index 36fd1e9b09..bdf2fa917f 100644
--- a/hw/xen/xen-legacy-backend.c
+++ b/hw/xen/xen-legacy-backend.c
@@ -683,14 +683,6 @@ int xen_be_init(void)
{
xengnttab_handle *gnttabdev;
- xenstore = xs_daemon_open();
- if (!xenstore) {
- xen_pv_printf(NULL, 0, "can't connect to xenstored\n");
- return -1;
- }
-
- qemu_set_fd_handler(xs_fileno(xenstore), xenstore_update, NULL, NULL);
-
if (xen_xc == NULL || xen_fmem == NULL) {
/* Check if xen_init() have been called */
goto err;
--
2.20.1
- Re: [Qemu-devel] [PATCH 3/6] xen: Skip backend initialization for stubdom, (continued)
- [Qemu-devel] [PATCH 5/6] xen-pt: Hide MSI-X from xen stubdoms, Jason Andryuk, 2019/03/11
- Re: [Qemu-devel] [Xen-devel] [PATCH 5/6] xen-pt: Hide MSI-X from xen stubdoms, Roger Pau Monné, 2019/03/12
- Re: [Qemu-devel] [Xen-devel] [PATCH 5/6] xen-pt: Hide MSI-X from xen stubdoms, Marek Marczykowski-Górecki, 2019/03/12
- Re: [Qemu-devel] [Xen-devel] [PATCH 5/6] xen-pt: Hide MSI-X from xen stubdoms, Jason Andryuk, 2019/03/12
- Re: [Qemu-devel] [Xen-devel] [PATCH 5/6] xen-pt: Hide MSI-X from xen stubdoms, Roger Pau Monné, 2019/03/12
- Re: [Qemu-devel] [Xen-devel] [PATCH 5/6] xen-pt: Hide MSI-X from xen stubdoms, Jason Andryuk, 2019/03/12
- Re: [Qemu-devel] [Xen-devel] [PATCH 5/6] xen-pt: Hide MSI-X from xen stubdoms, Jason Andryuk, 2019/03/12
- Re: [Qemu-devel] [Xen-devel] [PATCH 5/6] xen-pt: Hide MSI-X from xen stubdoms, Marek Marczykowski-Górecki, 2019/03/12
[Qemu-devel] [PATCH 4/6] xen: Set HVM_PARAM_DM_DOMAIN for stubdom on older Xen, Jason Andryuk, 2019/03/11
[Qemu-devel] [PATCH 2/6] xen: Move xenstore initialization to common location,
Jason Andryuk <=
[Qemu-devel] [PATCH 6/6] xen-pt: Round pci regions sizes to XEN_PAGE_SIZE, Jason Andryuk, 2019/03/11
Re: [Qemu-devel] [PATCH 6/6] xen-pt: Round pci regions sizes to XEN_PAGE_SIZE, Simon Gaiser, 2019/03/14