[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v14 03/60] xen: Add XEN_DISABLED mode and make it default
From: |
David Woodhouse |
Subject: |
[PATCH v14 03/60] xen: Add XEN_DISABLED mode and make it default |
Date: |
Mon, 27 Feb 2023 14:28:11 +0000 |
From: David Woodhouse <dwmw@amazon.co.uk>
Also set XEN_ATTACH mode in xen_init() to reflect the truth; not that
anyone ever cared before. It was *only* ever checked in xen_init_pv()
before.
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Paul Durrant <paul@xen.org>
---
accel/xen/xen-all.c | 2 ++
include/hw/xen/xen.h | 5 +++--
softmmu/globals.c | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/accel/xen/xen-all.c b/accel/xen/xen-all.c
index 69aa7d018b..2329556595 100644
--- a/accel/xen/xen-all.c
+++ b/accel/xen/xen-all.c
@@ -181,6 +181,8 @@ static int xen_init(MachineState *ms)
* opt out of system RAM being allocated by generic code
*/
mc->default_ram_id = NULL;
+
+ xen_mode = XEN_ATTACH;
return 0;
}
diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h
index 4d412fd4b2..03983939f9 100644
--- a/include/hw/xen/xen.h
+++ b/include/hw/xen/xen.h
@@ -22,8 +22,9 @@
/* xen-machine.c */
enum xen_mode {
- XEN_EMULATE = 0, // xen emulation, using xenner (default)
- XEN_ATTACH // attach to xen domain created by libxl
+ XEN_DISABLED = 0, /* xen support disabled (default) */
+ XEN_ATTACH, /* attach to xen domain created by libxl */
+ XEN_EMULATE, /* emulate Xen within QEMU */
};
extern uint32_t xen_domid;
diff --git a/softmmu/globals.c b/softmmu/globals.c
index 527edbefdd..0a4405614e 100644
--- a/softmmu/globals.c
+++ b/softmmu/globals.c
@@ -63,5 +63,5 @@ QemuUUID qemu_uuid;
bool qemu_uuid_set;
uint32_t xen_domid;
-enum xen_mode xen_mode = XEN_EMULATE;
+enum xen_mode xen_mode = XEN_DISABLED;
bool xen_domid_restrict;
--
2.39.0
- [PATCH v14 20/60] i386/xen: implement HYPERVISOR_vcpu_op, (continued)
- [PATCH v14 20/60] i386/xen: implement HYPERVISOR_vcpu_op, David Woodhouse, 2023/02/27
- [PATCH v14 04/60] i386/kvm: Add xen-version KVM accelerator property and init KVM Xen support, David Woodhouse, 2023/02/27
- [PATCH v14 54/60] i386/xen: Implement HYPERVISOR_physdev_op, David Woodhouse, 2023/02/27
- [PATCH v14 60/60] hw/xen: Subsume xen_be_register_common() into xen_be_init(), David Woodhouse, 2023/02/27
- [PATCH v14 16/60] i386/xen: manage and save/restore Xen guest long_mode setting, David Woodhouse, 2023/02/27
- [PATCH v14 23/60] i386/xen: handle VCPUOP_register_runstate_memory_area, David Woodhouse, 2023/02/27
- [PATCH v14 40/60] hw/xen: Support HVM_PARAM_CALLBACK_TYPE_GSI callback, David Woodhouse, 2023/02/27
- [PATCH v14 51/60] hw/xen: Add xen_xenstore device for xenstore emulation, David Woodhouse, 2023/02/27
- [PATCH v14 33/60] hw/xen: Implement EVTCHNOP_bind_ipi, David Woodhouse, 2023/02/27
- [PATCH v14 56/60] hw/xen: Support GSI mapping to PIRQ, David Woodhouse, 2023/02/27
- [PATCH v14 03/60] xen: Add XEN_DISABLED mode and make it default,
David Woodhouse <=
- [PATCH v14 14/60] xen: Permit --xen-domid argument when accel is KVM, David Woodhouse, 2023/02/27
- [PATCH v14 02/60] xen: add CONFIG_XEN_BUS and CONFIG_XEN_EMU options for Xen emulation, David Woodhouse, 2023/02/27
- [PATCH v14 24/60] i386/xen: implement HYPERVISOR_event_channel_op, David Woodhouse, 2023/02/27
- [PATCH v14 53/60] hw/xen: Automatically add xen-platform PCI device for emulated Xen guests, David Woodhouse, 2023/02/27
- [PATCH v14 07/60] xen-platform: exclude vfio-pci from the PCI platform unplug, David Woodhouse, 2023/02/27
- [PATCH v14 11/60] i386/xen: implement HYPERVISOR_sched_op, SCHEDOP_shutdown, David Woodhouse, 2023/02/27
- [PATCH v14 42/60] kvm/i386: Add xen-gnttab-max-frames property, David Woodhouse, 2023/02/27
- [PATCH v14 08/60] xen-platform: allow its creation with XEN_EMULATE mode, David Woodhouse, 2023/02/27
- [PATCH v14 46/60] hw/xen: Implement GNTTABOP_query_size, David Woodhouse, 2023/02/27
- [PATCH v14 06/60] i386/kvm: Set Xen vCPU ID in KVM, David Woodhouse, 2023/02/27