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 06/21] pc_piix: handle XEN_EMULATE backend init
Date: Mon, 5 Dec 2022 17:31:22 +0000 [thread overview]
Message-ID: <20221205173137.607044-7-dwmw2@infradead.org> (raw)
In-Reply-To: <20221205173137.607044-1-dwmw2@infradead.org>
From: Joao Martins <joao.m.martins@oracle.com>
And use newly added xen_emulated_machine_init() to iniitalize
the xenstore and the sysdev bus for future emulated devices.
Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
[dwmw2: Move it to xen-legacy-backend.c]
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
---
hw/i386/pc_piix.c | 5 +++++
hw/xen/xen-legacy-backend.c | 22 ++++++++++++++++------
include/hw/xen/xen-legacy-backend.h | 2 ++
3 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 13286d0739..3dcac2f4b6 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -47,6 +47,7 @@
#include "hw/sysbus.h"
#include "hw/i2c/smbus_eeprom.h"
#include "hw/xen/xen-x86.h"
+#include "hw/xen/xen-legacy-backend.h"
#include "exec/memory.h"
#include "hw/acpi/acpi.h"
#include "hw/acpi/piix4.h"
@@ -155,6 +156,10 @@ static void pc_init1(MachineState *machine,
x86ms->above_4g_mem_size = 0;
x86ms->below_4g_mem_size = machine->ram_size;
}
+
+ if (pcms->xen_version && !xen_be_xenstore_open()) {
+ xen_emulated_machine_init();
+ }
}
pc_machine_init_sgx_epc(pcms);
diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c
index 694e7bbc54..60a7bc7ab6 100644
--- a/hw/xen/xen-legacy-backend.c
+++ b/hw/xen/xen-legacy-backend.c
@@ -31,6 +31,7 @@
#include "qapi/error.h"
#include "hw/xen/xen-legacy-backend.h"
#include "hw/xen/xen_pvdev.h"
+#include "hw/xen/xen-bus.h"
#include "monitor/qdev.h"
DeviceState *xen_sysdev;
@@ -294,13 +295,15 @@ static struct XenLegacyDevice *xen_be_get_xendev(const char *type, int dom,
xendev->debug = debug;
xendev->local_port = -1;
- xendev->evtchndev = xenevtchn_open(NULL, 0);
- if (xendev->evtchndev == NULL) {
- xen_pv_printf(NULL, 0, "can't open evtchn device\n");
- qdev_unplug(DEVICE(xendev), NULL);
- return NULL;
+ if (xen_mode != XEN_EMULATE) {
+ xendev->evtchndev = xenevtchn_open(NULL, 0);
+ if (xendev->evtchndev == NULL) {
+ xen_pv_printf(NULL, 0, "can't open evtchn device\n");
+ qdev_unplug(DEVICE(xendev), NULL);
+ return NULL;
+ }
+ qemu_set_cloexec(xenevtchn_fd(xendev->evtchndev));
}
- qemu_set_cloexec(xenevtchn_fd(xendev->evtchndev));
xen_pv_insert_xendev(xendev);
@@ -859,3 +862,10 @@ static void xenbe_register_types(void)
}
type_init(xenbe_register_types)
+
+void xen_emulated_machine_init(void)
+{
+ xen_bus_init();
+ xen_be_sysdev_init();
+ xen_be_register_common();
+}
diff --git a/include/hw/xen/xen-legacy-backend.h b/include/hw/xen/xen-legacy-backend.h
index 0aa171f6c2..aa09015662 100644
--- a/include/hw/xen/xen-legacy-backend.h
+++ b/include/hw/xen/xen-legacy-backend.h
@@ -105,4 +105,6 @@ int xen_config_dev_vfb(int vdev, const char *type);
int xen_config_dev_vkbd(int vdev);
int xen_config_dev_console(int vdev);
+void xen_emulated_machine_init(void);
+
#endif /* HW_XEN_LEGACY_BACKEND_H */
--
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 ` [RFC PATCH 05/21] hw/xen_backend: refactor xen_be_init() David Woodhouse
2022-12-05 17:31 ` David Woodhouse [this message]
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-7-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).