Revert "libxl: fix migration of PV and PVH domUs with and without qemu"

This reverts commit 899433f149d0cc48a5254c797d9e5a8c9dc3b0fb.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>

diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h
index bab5be4bf8ff35ba928bacc43020196288c0bf80..9bacfb97f02b234a2f33dd5fef8f6fa12de874ae 100644 (file)
--- a/tools/libxl/libxl.h
+++ b/tools/libxl/libxl.h
@@ -1191,13 +1191,6 @@ void libxl_mac_copy(libxl_ctx *ctx, libxl_mac *dst, const libxl_mac *src);
  */
 #define LIBXL_HAVE_PVCALLS 1
 
-/*
- * LIBXL_HAVE_DEVICE_MODEL_VERSION_NONE
- *
- * If this is defined, libxl will only run a device-model if required.
- */
-#define LIBXL_HAVE_DEVICE_MODEL_VERSION_NONE 1
-
 typedef char **libxl_string_list;
 void libxl_string_list_dispose(libxl_string_list *sl);
 int libxl_string_list_length(const libxl_string_list *sl);

diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index 89f99f7f4412cf0d231721247e1fefe6ca14c469..42a218cf3aad58dacace0e30dc6ac0c6098ba407 100644 (file)
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -47,20 +47,9 @@ int libxl__domain_set_device_model(libxl__gc *gc, libxl_domain_config *d_config)
         }
         break;
     default:
-        ret = libxl__need_xenpv_qemu(gc, d_config);
-        switch (ret) {
-        case 1:
-            d_config->b_info.device_model_version =
-                LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN;
-            break;
-        case 0:
-            d_config->b_info.device_model_version =
-                LIBXL_DEVICE_MODEL_VERSION_NONE;
-            break;
-        default:
-            LOGE(ERROR, "Unable to determine QEMU requisite");
-            return ret;
-        }
+        b_info->device_model_version =
+            LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL;
+        break;
     }
 
     if (b_info->device_model_version == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) {

diff --git a/tools/libxl/libxl_dom_suspend.c b/tools/libxl/libxl_dom_suspend.c
index c492fe5dd107914714e74f0683aaa270710c2015..d1af3a65730387ee32be4dcaa70fb096cae9bacb 100644 (file)
--- a/tools/libxl/libxl_dom_suspend.c
+++ b/tools/libxl/libxl_dom_suspend.c
@@ -379,9 +379,7 @@ static void domain_suspend_common_guest_suspended(libxl__egc *egc,
     libxl__ev_xswatch_deregister(gc, &dsps->guest_watch);
     libxl__ev_time_deregister(gc, &dsps->guest_timeout);
 
-    if (dsps->type == LIBXL_DOMAIN_TYPE_HVM ||
-        libxl__device_model_version_running(gc, dsps->domid) ==
-        LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) {
+    if (dsps->type == LIBXL_DOMAIN_TYPE_HVM) {
         dsps->callback_device_model_done = domain_suspend_common_done;
         libxl__domain_suspend_device_model(egc, dsps); /* must be last */
         return;
@@ -461,9 +459,7 @@ int libxl__domain_resume(libxl__gc *gc, uint32_t domid, int suspend_cancel)
         goto out;
     }
 
-    if (type == LIBXL_DOMAIN_TYPE_HVM ||
-        libxl__device_model_version_running(gc, domid) ==
-        LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) {
+    if (type == LIBXL_DOMAIN_TYPE_HVM) {
         rc = libxl__domain_resume_device_model(gc, domid);
         if (rc) {
             LOGD(ERROR, domid, "failed to resume device model:%d", rc);

diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl
index 06b8f49aba07b4194faec0146b807094d68b8faf..b61399ce36457b4ea4adf0926714ff3ee73dbf30 100644 (file)
--- a/tools/libxl/libxl_types.idl
+++ b/tools/libxl/libxl_types.idl
@@ -106,7 +106,6 @@ libxl_device_model_version = Enumeration("device_model_version", [
     (0, "UNKNOWN"),
     (1, "QEMU_XEN_TRADITIONAL"), # Historical qemu-xen device model (qemu-dm)
     (2, "QEMU_XEN"),             # Upstream based qemu-xen device model
-    (3, "NONE"),
     ])
 
 libxl_console_type = Enumeration("console_type", [