[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v5 06/11] hw/xen/xen-hvm-common: skip ioreq creation on ioreq regi
From: |
Stefano Stabellini |
Subject: |
[PULL v5 06/11] hw/xen/xen-hvm-common: skip ioreq creation on ioreq registration failure |
Date: |
Thu, 15 Jun 2023 16:52:49 -0700 |
From: Stefano Stabellini <stefano.stabellini@amd.com>
On ARM it is possible to have a functioning xenpv machine with only the
PV backends and no IOREQ server. If the IOREQ server creation fails continue
to the PV backends initialization.
Also, moved the IOREQ registration and mapping subroutine to new function
xen_do_ioreq_register().
Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com>
Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Reviewed-by: Paul Durrant <paul@xen.org>
---
hw/xen/xen-hvm-common.c | 57 +++++++++++++++++++++++++++--------------
1 file changed, 38 insertions(+), 19 deletions(-)
diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c
index a31b067404..cb82f4b83d 100644
--- a/hw/xen/xen-hvm-common.c
+++ b/hw/xen/xen-hvm-common.c
@@ -764,27 +764,12 @@ void xen_shutdown_fatal_error(const char *fmt, ...)
qemu_system_shutdown_request(SHUTDOWN_CAUSE_HOST_ERROR);
}
-void xen_register_ioreq(XenIOState *state, unsigned int max_cpus,
- MemoryListener xen_memory_listener)
+static void xen_do_ioreq_register(XenIOState *state,
+ unsigned int max_cpus,
+ MemoryListener xen_memory_listener)
{
int i, rc;
- setup_xen_backend_ops();
-
- state->xce_handle = qemu_xen_evtchn_open();
- if (state->xce_handle == NULL) {
- perror("xen: event channel open");
- goto err;
- }
-
- state->xenstore = xs_daemon_open();
- if (state->xenstore == NULL) {
- perror("xen: xenstore open");
- goto err;
- }
-
- xen_create_ioreq_server(xen_domid, &state->ioservid);
-
state->exit.notify = xen_exit_notifier;
qemu_add_exit_notifier(&state->exit);
@@ -849,12 +834,46 @@ void xen_register_ioreq(XenIOState *state, unsigned int
max_cpus,
QLIST_INIT(&state->dev_list);
device_listener_register(&state->device_listener);
+ return;
+
+err:
+ error_report("xen hardware virtual machine initialisation failed");
+ exit(1);
+}
+
+void xen_register_ioreq(XenIOState *state, unsigned int max_cpus,
+ MemoryListener xen_memory_listener)
+{
+ int rc;
+
+ setup_xen_backend_ops();
+
+ state->xce_handle = qemu_xen_evtchn_open();
+ if (state->xce_handle == NULL) {
+ perror("xen: event channel open");
+ goto err;
+ }
+
+ state->xenstore = xs_daemon_open();
+ if (state->xenstore == NULL) {
+ perror("xen: xenstore open");
+ goto err;
+ }
+
+ rc = xen_create_ioreq_server(xen_domid, &state->ioservid);
+ if (!rc) {
+ xen_do_ioreq_register(state, max_cpus, xen_memory_listener);
+ } else {
+ warn_report("xen: failed to create ioreq server");
+ }
+
xen_bus_init();
xen_be_init();
return;
+
err:
- error_report("xen hardware virtual machine initialisation failed");
+ error_report("xen hardware virtual machine backend registration failed");
exit(1);
}
--
2.25.1
- [PULL v5 00/11] xenpvh5-tag, Stefano Stabellini, 2023/06/15
- [PULL v5 01/11] hw/i386/xen/: move xen-mapcache.c to hw/xen/, Stefano Stabellini, 2023/06/15
- [PULL v5 02/11] hw/i386/xen: rearrange xen_hvm_init_pc, Stefano Stabellini, 2023/06/15
- [PULL v5 03/11] hw/i386/xen/xen-hvm: move x86-specific fields out of XenIOState, Stefano Stabellini, 2023/06/15
- [PULL v5 05/11] include/hw/xen/xen_common: return error from xen_create_ioreq_server, Stefano Stabellini, 2023/06/15
- [PULL v5 07/11] hw/xen/xen-hvm-common: Use g_new and error_report, Stefano Stabellini, 2023/06/15
- [PULL v5 08/11] meson.build: do not set have_xen_pci_passthrough for aarch64 targets, Stefano Stabellini, 2023/06/15
- [PULL v5 06/11] hw/xen/xen-hvm-common: skip ioreq creation on ioreq registration failure,
Stefano Stabellini <=
- [PULL v5 11/11] test/qtest: add xepvh to skip list for qtest, Stefano Stabellini, 2023/06/15
- [PULL v5 10/11] meson.build: enable xenpv machine build for ARM, Stefano Stabellini, 2023/06/15
- [PULL v5 04/11] xen-hvm: reorganize xen-hvm and move common function to xen-hvm-common, Stefano Stabellini, 2023/06/15
- [PULL v5 09/11] hw/arm: introduce xenpvh machine, Stefano Stabellini, 2023/06/15
- Re: [PULL v5 00/11] xenpvh5-tag, Richard Henderson, 2023/06/17