From: David Woodhouse <dwmw2@infradead.org>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>, Paul Durrant <paul@xen.org>,
Joao Martins <joao.m.martins@oracle.com>,
Ankur Arora <ankur.a.arora@oracle.com>
Subject: [RFC PATCH 05/21] hw/xen_backend: refactor xen_be_init()
Date: Mon, 5 Dec 2022 17:31:21 +0000 [thread overview]
Message-ID: <20221205173137.607044-6-dwmw2@infradead.org> (raw)
In-Reply-To: <20221205173137.607044-1-dwmw2@infradead.org>
From: Joao Martins <joao.m.martins@oracle.com>
Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
---
hw/xen/xen-legacy-backend.c | 40 +++++++++++++++++++++--------
include/hw/xen/xen-legacy-backend.h | 3 +++
2 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c
index 085fd31ef7..694e7bbc54 100644
--- a/hw/xen/xen-legacy-backend.c
+++ b/hw/xen/xen-legacy-backend.c
@@ -676,17 +676,40 @@ void xenstore_update_fe(char *watch, struct XenLegacyDevice *xendev)
}
/* -------------------------------------------------------------------- */
-int xen_be_init(void)
+int xen_be_xenstore_open(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);
+ return 0;
+}
+
+void xen_be_xenstore_close(void)
+{
+ qemu_set_fd_handler(xs_fileno(xenstore), NULL, NULL, NULL);
+ xs_daemon_close(xenstore);
+ xenstore = NULL;
+}
+
+void xen_be_sysdev_init(void)
+{
+ xen_sysdev = qdev_new(TYPE_XENSYSDEV);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(xen_sysdev), &error_fatal);
+ xen_sysbus = qbus_new(TYPE_XENSYSBUS, xen_sysdev, "xen-sysbus");
+ qbus_set_bus_hotplug_handler(xen_sysbus);
+}
+
+int xen_be_init(void)
+{
+ xengnttab_handle *gnttabdev;
+
+ if (xen_be_xenstore_open()) {
+ xen_pv_printf(NULL, 0, "can't connect to xenstored\n");
+ return -1;
+ }
if (xen_xc == NULL || xen_fmem == NULL) {
/* Check if xen_init() have been called */
@@ -701,17 +724,12 @@ int xen_be_init(void)
xengnttab_close(gnttabdev);
}
- xen_sysdev = qdev_new(TYPE_XENSYSDEV);
- sysbus_realize_and_unref(SYS_BUS_DEVICE(xen_sysdev), &error_fatal);
- xen_sysbus = qbus_new(TYPE_XENSYSBUS, xen_sysdev, "xen-sysbus");
- qbus_set_bus_hotplug_handler(xen_sysbus);
+ xen_be_sysdev_init();
return 0;
err:
- qemu_set_fd_handler(xs_fileno(xenstore), NULL, NULL, NULL);
- xs_daemon_close(xenstore);
- xenstore = NULL;
+ xen_be_xenstore_close();
return -1;
}
diff --git a/include/hw/xen/xen-legacy-backend.h b/include/hw/xen/xen-legacy-backend.h
index be281e1f38..0aa171f6c2 100644
--- a/include/hw/xen/xen-legacy-backend.h
+++ b/include/hw/xen/xen-legacy-backend.h
@@ -42,6 +42,9 @@ int xenstore_read_fe_uint64(struct XenLegacyDevice *xendev, const char *node,
void xen_be_check_state(struct XenLegacyDevice *xendev);
/* xen backend driver bits */
+int xen_be_xenstore_open(void);
+void xen_be_xenstore_close(void);
+void xen_be_sysdev_init(void);
int xen_be_init(void);
void xen_be_register_common(void);
int xen_be_register(const char *type, struct XenDevOps *ops);
--
2.35.3
next prev parent reply other threads:[~2022-12-05 17:34 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-05 17:31 [RFC PATCH 00/21] Xen HVM support under KVM David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 01/21] include: import xen public headers David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 02/21] i386/xen: Add xen-version machine property and init KVM Xen support David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 03/21] i386/kvm: handle Xen HVM cpuid leaves David Woodhouse
2022-12-05 21:58 ` Philippe Mathieu-Daudé
2022-12-06 0:18 ` David Woodhouse
2022-12-06 7:58 ` Philippe Mathieu-Daudé
2022-12-06 8:05 ` David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 04/21] xen-platform-pci: allow its creation with XEN_EMULATE mode David Woodhouse
2022-12-05 17:31 ` David Woodhouse [this message]
2022-12-05 17:31 ` [RFC PATCH 06/21] pc_piix: handle XEN_EMULATE backend init David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 07/21] xen-platform-pci: register xen-mmio as RAM for XEN_EMULATE David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 08/21] xen_platform: exclude vfio-pci from the PCI platform unplug David Woodhouse
2022-12-05 22:03 ` Philippe Mathieu-Daudé
2022-12-05 17:31 ` [RFC PATCH 09/21] pc_piix: allow xenfv machine with XEN_EMULATE David Woodhouse
2022-12-05 22:06 ` Philippe Mathieu-Daudé
2022-12-06 0:59 ` David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 10/21] i386/xen: handle guest hypercalls David Woodhouse
2022-12-05 22:11 ` Philippe Mathieu-Daudé
2022-12-06 1:10 ` David Woodhouse
2022-12-06 8:16 ` Philippe Mathieu-Daudé
2022-12-06 9:40 ` David Woodhouse
2022-12-06 11:07 ` Philippe Mathieu-Daudé
2022-12-06 11:30 ` David Woodhouse
2022-12-06 10:41 ` Alex Bennée
2022-12-05 17:31 ` [RFC PATCH 11/21] i386/xen: implement HYPERCALL_xen_version David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 12/21] i386/xen: set shared_info page David Woodhouse
2022-12-05 22:17 ` Philippe Mathieu-Daudé
2022-12-06 2:20 ` David Woodhouse
2022-12-06 8:26 ` Philippe Mathieu-Daudé
2022-12-06 10:00 ` Dr. David Alan Gilbert
2022-12-07 11:15 ` David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 13/21] i386/xen: implement HYPERVISOR_hvm_op David Woodhouse
2022-12-05 22:13 ` Philippe Mathieu-Daudé
2022-12-06 1:18 ` David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 14/21] i386/xen: implement HYPERVISOR_vcpu_op David Woodhouse
2022-12-05 22:18 ` Philippe Mathieu-Daudé
2022-12-05 17:31 ` [RFC PATCH 15/21] i386/xen: handle register_vcpu_info David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 16/21] i386/xen: handle register_vcpu_time_memory_area David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 17/21] i386/xen: handle register_runstate_memory_area David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 18/21] kvm/ioapic: mark gsi-2 used in ioapic routing init David Woodhouse
2022-12-05 22:25 ` Philippe Mathieu-Daudé
2022-12-06 1:21 ` David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 19/21] i386/xen: handle event channel upcall related hypercalls David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 20/21] i386/xen: implement HYPERVISOR_event_channel_op David Woodhouse
2022-12-05 17:31 ` [RFC PATCH 21/21] i386/xen: implement HYPERVISOR_sched_op David Woodhouse
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221205173137.607044-6-dwmw2@infradead.org \
--to=dwmw2@infradead.org \
--cc=ankur.a.arora@oracle.com \
--cc=joao.m.martins@oracle.com \
--cc=paul@xen.org \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).