[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH v4 15/47] i386/xen: add pc_machine_kvm_type to initialize XEN
From: |
David Woodhouse |
Subject: |
[RFC PATCH v4 15/47] i386/xen: add pc_machine_kvm_type to initialize XEN_EMULATE mode |
Date: |
Wed, 21 Dec 2022 01:05:51 +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 546b703cb4..d8c5b1814e 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"
@@ -1842,6 +1843,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 c95333514e..e82224857e 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -290,12 +290,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.35.3
- [RFC PATCH v4 01/47] Xen HVM support under KVM, David Woodhouse, 2022/12/20
- [RFC PATCH v4 15/47] i386/xen: add pc_machine_kvm_type to initialize XEN_EMULATE mode,
David Woodhouse <=
- [RFC PATCH v4 19/47] i386/xen: implement HYPERVISOR_hvm_op, David Woodhouse, 2022/12/20
- [RFC PATCH v4 11/47] i386/xen: implement HYPERVISOR_xen_version, David Woodhouse, 2022/12/20
- [RFC PATCH v4 44/47] hw/xen: Support mapping grant frames, David Woodhouse, 2022/12/20
- [RFC PATCH v4 24/47] i386/xen: implement HYPERVISOR_event_channel_op, David Woodhouse, 2022/12/20
- [RFC PATCH v4 14/47] hw/xen: Add xen_overlay device for emulating shared xenheap pages, David Woodhouse, 2022/12/20
- [RFC PATCH v4 41/47] hw/xen: Support HVM_PARAM_CALLBACK_TYPE_PCI_INTX callback, David Woodhouse, 2022/12/20
- [RFC PATCH v4 01/47] include: import Xen public headers to include/standard-headers/, David Woodhouse, 2022/12/20
- [RFC PATCH v4 05/47] i386/kvm: handle Xen HVM cpuid leaves, David Woodhouse, 2022/12/20
- [RFC PATCH v4 21/47] i386/xen: handle VCPUOP_register_vcpu_info, David Woodhouse, 2022/12/20