[libvirt PATCH 4/9] qemu: Avoid probing unsupported migratable CPU expansion

Jiri Denemark jdenemar at redhat.com
Fri Jun 5 18:31:26 UTC 2020


Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
---
 src/qemu/qemu_capabilities.c                  |  1 +
 .../caps_2.10.0.s390x.replies                 | 22 ---------
 .../caps_2.11.0.s390x.replies                 | 22 ---------
 .../caps_2.12.0.s390x.replies                 | 22 ---------
 .../caps_2.8.0.s390x.replies                  | 22 ---------
 .../caps_2.9.0.s390x.replies                  | 22 ---------
 .../caps_3.0.0.s390x.replies                  | 22 ---------
 .../caps_4.0.0.s390x.replies                  | 48 +------------------
 .../caps_4.2.0.aarch64.replies                | 48 +------------------
 .../caps_4.2.0.s390x.replies                  | 48 +------------------
 .../caps_5.0.0.aarch64.replies                | 48 +------------------
 11 files changed, 9 insertions(+), 316 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index dab3665f07..7a976b6bbc 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3061,6 +3061,7 @@ virQEMUCapsProbeQMPHostCPU(virQEMUCapsPtr qemuCaps,
 
     /* Try to check migratability of each feature. */
     if (modelInfo &&
+        virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE) &&
         qemuMonitorGetCPUModelExpansion(mon, type, cpu, false, fail_no_props,
                                         &nonMigratable) < 0)
         goto cleanup;
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
index 9cae647bdf..4f7d17b4fe 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
@@ -14969,28 +14969,6 @@
   "id": "libvirt-35"
 }
 
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "static",
-    "model": {
-      "name": "host",
-      "props": {
-        "migratable": false
-      }
-    }
-  },
-  "id": "libvirt-36"
-}
-
-{
-  "id": "libvirt-36",
-  "error": {
-    "class": "GenericError",
-    "desc": "Property '.migratable' not found"
-  }
-}
-
 {
   "execute": "qmp_capabilities",
   "id": "libvirt-1"
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
index 6b06303f7b..3096559c13 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
@@ -15270,28 +15270,6 @@
   "id": "libvirt-36"
 }
 
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "static",
-    "model": {
-      "name": "host",
-      "props": {
-        "migratable": false
-      }
-    }
-  },
-  "id": "libvirt-37"
-}
-
-{
-  "id": "libvirt-37",
-  "error": {
-    "class": "GenericError",
-    "desc": "Property '.migratable' not found"
-  }
-}
-
 {
   "execute": "qmp_capabilities",
   "id": "libvirt-1"
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
index 93ad14a6b8..66543f62ee 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
@@ -16990,28 +16990,6 @@
   "id": "libvirt-38"
 }
 
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "static",
-    "model": {
-      "name": "host",
-      "props": {
-        "migratable": false
-      }
-    }
-  },
-  "id": "libvirt-39"
-}
-
-{
-  "id": "libvirt-39",
-  "error": {
-    "class": "GenericError",
-    "desc": "Property '.migratable' not found"
-  }
-}
-
 {
   "execute": "qmp_capabilities",
   "id": "libvirt-1"
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
index 5db900ce80..da9ef050b6 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
@@ -13046,28 +13046,6 @@
   "id": "libvirt-35"
 }
 
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "static",
-    "model": {
-      "name": "host",
-      "props": {
-        "migratable": false
-      }
-    }
-  },
-  "id": "libvirt-36"
-}
-
-{
-  "id": "libvirt-36",
-  "error": {
-    "class": "GenericError",
-    "desc": "Property '.migratable' not found"
-  }
-}
-
 {
   "execute": "qmp_capabilities",
   "id": "libvirt-1"
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
index 503f896892..3aca949683 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
@@ -14031,28 +14031,6 @@
   "id": "libvirt-35"
 }
 
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "static",
-    "model": {
-      "name": "host",
-      "props": {
-        "migratable": false
-      }
-    }
-  },
-  "id": "libvirt-36"
-}
-
-{
-  "id": "libvirt-36",
-  "error": {
-    "class": "GenericError",
-    "desc": "Property '.migratable' not found"
-  }
-}
-
 {
   "execute": "qmp_capabilities",
   "id": "libvirt-1"
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies
index 0b35f7e99b..48b5a0ee01 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies
@@ -17519,28 +17519,6 @@
   "id": "libvirt-39"
 }
 
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "static",
-    "model": {
-      "name": "host",
-      "props": {
-        "migratable": false
-      }
-    }
-  },
-  "id": "libvirt-40"
-}
-
-{
-  "id": "libvirt-40",
-  "error": {
-    "class": "GenericError",
-    "desc": "Property '.migratable' not found"
-  }
-}
-
 {
   "execute": "qmp_capabilities",
   "id": "libvirt-1"
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
index 70fb54b0e7..d81d5c8003 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
@@ -18338,28 +18338,6 @@
   "id": "libvirt-39"
 }
 
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "static",
-    "model": {
-      "name": "host",
-      "props": {
-        "migratable": false
-      }
-    }
-  },
-  "id": "libvirt-40"
-}
-
-{
-  "id": "libvirt-40",
-  "error": {
-    "class": "GenericError",
-    "desc": "Property '.migratable' not found"
-  }
-}
-
 {
   "execute": "qmp_capabilities",
   "id": "libvirt-1"
@@ -21475,31 +21453,9 @@
   "id": "libvirt-3"
 }
 
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "static",
-    "model": {
-      "name": "max",
-      "props": {
-        "migratable": false
-      }
-    }
-  },
-  "id": "libvirt-4"
-}
-
-{
-  "id": "libvirt-4",
-  "error": {
-    "class": "GenericError",
-    "desc": "Property '.migratable' not found"
-  }
-}
-
 {
   "execute": "query-machines",
-  "id": "libvirt-5"
+  "id": "libvirt-4"
 }
 
 {
@@ -21572,5 +21528,5 @@
       "cpu-max": 248
     }
   ],
-  "id": "libvirt-5"
+  "id": "libvirt-4"
 }
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
index 4d28047ebe..a16ba89aeb 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
@@ -21376,28 +21376,6 @@
   "id": "libvirt-43"
 }
 
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "full",
-    "model": {
-      "name": "host",
-      "props": {
-        "migratable": false
-      }
-    }
-  },
-  "id": "libvirt-44"
-}
-
-{
-  "id": "libvirt-44",
-  "error": {
-    "class": "GenericError",
-    "desc": "Parameter 'migratable' is unexpected"
-  }
-}
-
 {
   "execute": "qmp_capabilities",
   "id": "libvirt-1"
@@ -21646,31 +21624,9 @@
   "id": "libvirt-3"
 }
 
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "full",
-    "model": {
-      "name": "max",
-      "props": {
-        "migratable": false
-      }
-    }
-  },
-  "id": "libvirt-4"
-}
-
-{
-  "id": "libvirt-4",
-  "error": {
-    "class": "GenericError",
-    "desc": "Parameter 'migratable' is unexpected"
-  }
-}
-
 {
   "execute": "query-machines",
-  "id": "libvirt-5"
+  "id": "libvirt-4"
 }
 
 {
@@ -22221,5 +22177,5 @@
       "deprecated": false
     }
   ],
-  "id": "libvirt-5"
+  "id": "libvirt-4"
 }
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
index 82b60bf069..9250132d45 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
@@ -19157,28 +19157,6 @@
   "id": "libvirt-39"
 }
 
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "static",
-    "model": {
-      "name": "host",
-      "props": {
-        "migratable": false
-      }
-    }
-  },
-  "id": "libvirt-40"
-}
-
-{
-  "id": "libvirt-40",
-  "error": {
-    "class": "GenericError",
-    "desc": "Property '.migratable' not found"
-  }
-}
-
 {
   "execute": "qmp_capabilities",
   "id": "libvirt-1"
@@ -22639,31 +22617,9 @@
   "id": "libvirt-3"
 }
 
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "static",
-    "model": {
-      "name": "max",
-      "props": {
-        "migratable": false
-      }
-    }
-  },
-  "id": "libvirt-4"
-}
-
-{
-  "id": "libvirt-4",
-  "error": {
-    "class": "GenericError",
-    "desc": "Property '.migratable' not found"
-  }
-}
-
 {
   "execute": "query-machines",
-  "id": "libvirt-5"
+  "id": "libvirt-4"
 }
 
 {
@@ -22790,5 +22746,5 @@
       "deprecated": false
     }
   ],
-  "id": "libvirt-5"
+  "id": "libvirt-4"
 }
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
index 44f1bc6fb7..9e683ef979 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
@@ -22725,28 +22725,6 @@
   "id": "libvirt-43"
 }
 
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "full",
-    "model": {
-      "name": "host",
-      "props": {
-        "migratable": false
-      }
-    }
-  },
-  "id": "libvirt-44"
-}
-
-{
-  "id": "libvirt-44",
-  "error": {
-    "class": "GenericError",
-    "desc": "Parameter 'migratable' is unexpected"
-  }
-}
-
 {
   "execute": "qmp_capabilities",
   "id": "libvirt-1"
@@ -23000,31 +22978,9 @@
   "id": "libvirt-3"
 }
 
-{
-  "execute": "query-cpu-model-expansion",
-  "arguments": {
-    "type": "full",
-    "model": {
-      "name": "max",
-      "props": {
-        "migratable": false
-      }
-    }
-  },
-  "id": "libvirt-4"
-}
-
-{
-  "id": "libvirt-4",
-  "error": {
-    "class": "GenericError",
-    "desc": "Parameter 'migratable' is unexpected"
-  }
-}
-
 {
   "execute": "query-machines",
-  "id": "libvirt-5"
+  "id": "libvirt-4"
 }
 
 {
@@ -23612,5 +23568,5 @@
       "deprecated": false
     }
   ],
-  "id": "libvirt-5"
+  "id": "libvirt-4"
 }
-- 
2.27.0




More information about the libvir-list mailing list