[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v10 15/59] i386/xen: add pc_machine_kvm_type to initialize XEN_EM
From: |
David Woodhouse |
Subject: |
[PATCH v10 15/59] i386/xen: add pc_machine_kvm_type to initialize XEN_EMULATE mode |
Date: |
Wed, 1 Feb 2023 14:31:04 +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>
Reviewed-by: Paul Durrant <paul@xen.org>
---
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 6e592bd969..9169305f4f 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 88a120bc23..00c15e78bc 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
- Re: [PATCH v10 45/59] i386/xen: Implement HYPERVISOR_grant_table_op and GNTTABOP_[gs]et_verson, (continued)
- [PATCH v10 48/59] i386/xen: Reserve Xen special pages for console, xenstore rings, David Woodhouse, 2023/02/01
- [PATCH v10 32/59] hw/xen: Implement EVTCHNOP_bind_virq, David Woodhouse, 2023/02/01
- [PATCH v10 06/59] i386/hvm: Set Xen vCPU ID in KVM, David Woodhouse, 2023/02/01
- [PATCH v10 25/59] i386/xen: implement HVMOP_set_evtchn_upcall_vector, David Woodhouse, 2023/02/01
- [PATCH v10 24/59] i386/xen: implement HYPERVISOR_event_channel_op, David Woodhouse, 2023/02/01
- [PATCH v10 15/59] i386/xen: add pc_machine_kvm_type to initialize XEN_EMULATE mode,
David Woodhouse <=
- [PATCH v10 31/59] hw/xen: Implement EVTCHNOP_unmask, David Woodhouse, 2023/02/01
- [PATCH v10 34/59] hw/xen: Implement EVTCHNOP_send, David Woodhouse, 2023/02/01
- [PATCH v10 17/59] i386/xen: implement HYPERVISOR_memory_op, David Woodhouse, 2023/02/01
- [PATCH v10 04/59] i386/kvm: Add xen-version KVM accelerator property and init KVM Xen support, David Woodhouse, 2023/02/01
- [PATCH v10 22/59] i386/xen: handle VCPUOP_register_vcpu_time_info, David Woodhouse, 2023/02/01
- [PATCH v10 37/59] hw/xen: Implement EVTCHNOP_bind_vcpu, David Woodhouse, 2023/02/01
- [PATCH v10 23/59] i386/xen: handle VCPUOP_register_runstate_memory_area, David Woodhouse, 2023/02/01