[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/62] i386/xen: add pc_machine_kvm_type to initialize XEN_EMULATE
From: |
Paolo Bonzini |
Subject: |
[PULL 15/62] i386/xen: add pc_machine_kvm_type to initialize XEN_EMULATE mode |
Date: |
Thu, 2 Mar 2023 13:29:42 +0100 |
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 992951c107bd..a316a01b1594 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -90,6 +90,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"
@@ -1846,6 +1847,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 66e3d059ef5a..467311007e06 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -291,12 +291,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;
+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.1
- [PULL 04/62] i386/kvm: Add xen-version KVM accelerator property and init KVM Xen support, (continued)
- [PULL 04/62] i386/kvm: Add xen-version KVM accelerator property and init KVM Xen support, Paolo Bonzini, 2023/03/02
- [PULL 01/62] include: import Xen public headers to hw/xen/interface, Paolo Bonzini, 2023/03/02
- [PULL 06/62] i386/kvm: Set Xen vCPU ID in KVM, Paolo Bonzini, 2023/03/02
- [PULL 07/62] xen-platform: exclude vfio-pci from the PCI platform unplug, Paolo Bonzini, 2023/03/02
- [PULL 08/62] xen-platform: allow its creation with XEN_EMULATE mode, Paolo Bonzini, 2023/03/02
- [PULL 09/62] i386/xen: handle guest hypercalls, Paolo Bonzini, 2023/03/02
- [PULL 10/62] i386/xen: implement HYPERVISOR_xen_version, Paolo Bonzini, 2023/03/02
- [PULL 11/62] i386/xen: implement HYPERVISOR_sched_op, SCHEDOP_shutdown, Paolo Bonzini, 2023/03/02
- [PULL 12/62] i386/xen: Implement SCHEDOP_poll and SCHEDOP_yield, Paolo Bonzini, 2023/03/02
- [PULL 13/62] hw/xen: Add xen_overlay device for emulating shared xenheap pages, Paolo Bonzini, 2023/03/02
- [PULL 15/62] i386/xen: add pc_machine_kvm_type to initialize XEN_EMULATE mode,
Paolo Bonzini <=
- [PULL 14/62] xen: Permit --xen-domid argument when accel is KVM, Paolo Bonzini, 2023/03/02
- [PULL 16/62] i386/xen: manage and save/restore Xen guest long_mode setting, Paolo Bonzini, 2023/03/02
- [PULL 19/62] i386/xen: implement HYPERVISOR_hvm_op, Paolo Bonzini, 2023/03/02
- [PULL 21/62] i386/xen: handle VCPUOP_register_vcpu_info, Paolo Bonzini, 2023/03/02
- [PULL 25/62] i386/xen: implement HVMOP_set_evtchn_upcall_vector, Paolo Bonzini, 2023/03/02
- [PULL 26/62] i386/xen: implement HVMOP_set_param, Paolo Bonzini, 2023/03/02
- [PULL 18/62] i386/xen: implement XENMEM_add_to_physmap_batch, Paolo Bonzini, 2023/03/02
- [PULL 20/62] i386/xen: implement HYPERVISOR_vcpu_op, Paolo Bonzini, 2023/03/02
- [PULL 17/62] i386/xen: implement HYPERVISOR_memory_op, Paolo Bonzini, 2023/03/02
- [PULL 36/62] hw/xen: Implement EVTCHNOP_bind_interdomain, Paolo Bonzini, 2023/03/02