xen: Add XEN_DISABLED mode and make it default

Also check for XEN_ATTACH mode in xen_init()

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>

diff --git a/accel/xen/xen-all.c b/accel/xen/xen-all.c
index 69aa7d018b28bab1cda4dfa5607c61e1b3eb8a63..109d2e84bcd9e7cb6fd5d98955241f3ddee38f7e 100644 (file)
--- a/accel/xen/xen-all.c
+++ b/accel/xen/xen-all.c
@@ -158,6 +158,10 @@ static int xen_init(MachineState *ms)
 {
     MachineClass *mc = MACHINE_GET_CLASS(ms);
 
+    if (xen_mode != XEN_ATTACH) {
+        xen_pv_printf(NULL, 0, "xen requires --xen-attach mode\n");
+        return -1;
+    }
     xen_xc = xc_interface_open(0, 0, 0);
     if (xen_xc == NULL) {
         xen_pv_printf(NULL, 0, "can't open xen interface\n");

diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h
index afdf9c436afc8593b26cae4ab9687fa6ad7d72d0..82347e76a4751abeee677f5d13a7ae785a4947d8 100644 (file)
--- a/include/hw/xen/xen.h
+++ b/include/hw/xen/xen.h
@@ -12,8 +12,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,
 };
 
 extern uint32_t xen_domid;