[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 14/51] i386/xen: add pc_machine_kvm_type to initialize XEN_EMU
From: |
David Woodhouse |
Subject: |
[PATCH v7 14/51] i386/xen: add pc_machine_kvm_type to initialize XEN_EMULATE mode |
Date: |
Mon, 16 Jan 2023 21:57:28 +0000 |
From: David Woodhouse <dwmw@amazon.co.uk>
The xen_overlay device (and later similar devices for event channels and
grant tables) need to be instantiated. Do this from a kvm_type method on
the PC machine derivatives, since KVM is only way to support Xen emulation
for now.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
---
hw/i386/pc.c | 11 +++++++++++
include/hw/i386/pc.h | 3 +++
2 files changed, 14 insertions(+)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index d489ecc0d1..0ddae2f6ad 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -89,6 +89,7 @@
#include "hw/virtio/virtio-iommu.h"
#include "hw/virtio/virtio-pmem-pci.h"
#include "hw/virtio/virtio-mem-pci.h"
+#include "hw/i386/kvm/xen_overlay.h"
#include "hw/mem/memory-device.h"
#include "sysemu/replay.h"
#include "target/i386/cpu.h"
@@ -1844,6 +1845,16 @@ static void pc_machine_initfn(Object *obj)
cxl_machine_init(obj, &pcms->cxl_devices_state);
}
+int pc_machine_kvm_type(MachineState *machine, const char *kvm_type)
+{
+#ifdef CONFIG_XEN_EMU
+ if (xen_mode == XEN_EMULATE) {
+ xen_overlay_create();
+ }
+#endif
+ return 0;
+}
+
static void pc_machine_reset(MachineState *machine, ShutdownCause reason)
{
CPUState *cs;
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 991f905f5d..b866567b7b 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -293,12 +293,15 @@ extern const size_t pc_compat_1_5_len;
extern GlobalProperty pc_compat_1_4[];
extern const size_t pc_compat_1_4_len;
+extern int pc_machine_kvm_type(MachineState *machine, const char *vm_type);
+
#define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \
static void pc_machine_##suffix##_class_init(ObjectClass *oc, void *data) \
{ \
MachineClass *mc = MACHINE_CLASS(oc); \
optsfn(mc); \
mc->init = initfn; \
+ mc->kvm_type = pc_machine_kvm_type; \
} \
static const TypeInfo pc_machine_type_##suffix = { \
.name = namestr TYPE_MACHINE_SUFFIX, \
--
2.39.0
- [PATCH v7 13/51] hw/xen: Add xen_overlay device for emulating shared xenheap pages, (continued)
- [PATCH v7 13/51] hw/xen: Add xen_overlay device for emulating shared xenheap pages, David Woodhouse, 2023/01/16
- [PATCH v7 44/51] i386/xen: Implement HYPERVISOR_grant_table_op and GNTTABOP_[gs]et_verson, David Woodhouse, 2023/01/16
- [PATCH v7 48/51] i386/xen: handle HVMOP_get_param, David Woodhouse, 2023/01/16
- [PATCH v7 34/51] hw/xen: Implement EVTCHNOP_alloc_unbound, David Woodhouse, 2023/01/16
- [PATCH v7 10/51] i386/xen: implement HYPERVISOR_xen_version, David Woodhouse, 2023/01/16
- [PATCH v7 46/51] i386/xen: handle PV timer hypercalls, David Woodhouse, 2023/01/16
- [PATCH v7 27/51] i386/xen: Add support for Xen event channel delivery to vCPU, David Woodhouse, 2023/01/16
- [PATCH v7 03/51] xen: Add XEN_DISABLED mode and make it default, David Woodhouse, 2023/01/16
- [PATCH v7 14/51] i386/xen: add pc_machine_kvm_type to initialize XEN_EMULATE mode,
David Woodhouse <=
- [PATCH v7 32/51] hw/xen: Implement EVTCHNOP_bind_ipi, David Woodhouse, 2023/01/16
- [PATCH v7 26/51] hw/xen: Add xen_evtchn device for event channel emulation, David Woodhouse, 2023/01/16
- Re: [PATCH v7 26/51] hw/xen: Add xen_evtchn device for event channel emulation, Paul Durrant, 2023/01/17
- Re: [PATCH v7 26/51] hw/xen: Add xen_evtchn device for event channel emulation, David Woodhouse, 2023/01/17
- Re: [PATCH v7 26/51] hw/xen: Add xen_evtchn device for event channel emulation, Paul Durrant, 2023/01/17
- Re: [PATCH v7 26/51] hw/xen: Add xen_evtchn device for event channel emulation, David Woodhouse, 2023/01/17
- Re: [PATCH v7 26/51] hw/xen: Add xen_evtchn device for event channel emulation, Paul Durrant, 2023/01/17
- Re: [PATCH v7 26/51] hw/xen: Add xen_evtchn device for event channel emulation, David Woodhouse, 2023/01/17
- Re: [PATCH v7 26/51] hw/xen: Add xen_evtchn device for event channel emulation, Paul Durrant, 2023/01/17