[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/62] xen: Add XEN_DISABLED mode and make it default
From: |
Paolo Bonzini |
Subject: |
[PULL 03/62] xen: Add XEN_DISABLED mode and make it default |
Date: |
Thu, 2 Mar 2023 13:29:30 +0100 |
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 c1b697a8bda1..e85e4aeba51f 100644
--- a/accel/xen/xen-all.c
+++ b/accel/xen/xen-all.c
@@ -171,6 +171,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 4d412fd4b266..03983939f92a 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 527edbefdd07..0a4405614e7f 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.1
- [PULL 00/62] i386, misc changes for QEMU 8.0 soft freeze, Paolo Bonzini, 2023/03/02
- [PULL 02/62] xen: add CONFIG_XEN_BUS and CONFIG_XEN_EMU options for Xen emulation, Paolo Bonzini, 2023/03/02
- [PULL 03/62] xen: Add XEN_DISABLED mode and make it default,
Paolo Bonzini <=
- [PULL 05/62] i386/kvm: handle Xen HVM cpuid leaves, Paolo Bonzini, 2023/03/02
- [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