qemu: Avoid probing unsupported migratable CPU expansion

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index dab3665f073c5749d9678626b29cd297e1221e03..7a976b6bbcc1cf8ba39b9ecaabf659bea6d783b3 100644 (file)
--- 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 9cae647bdff5c631b76349ef44a612ae959527ec..4f7d17b4fec379e7eccf49d65faade6c6eb03d73 100644 (file)
--- 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 6b06303f7b2b65bc90732c5499d4f0e4653d2ffc..3096559c1308d99032381e7df4f66905675b39c7 100644 (file)
--- 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 93ad14a6b896c81640cd0e137f8f10c900dc999a..66543f62ee5510d7ecdfa58487889e819a79abe6 100644 (file)
--- 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 5db900ce8036ca8b38cf2962919c83dd1ee87d16..da9ef050b64595a3589acc48dd53bf220f11e08f 100644 (file)
--- 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 503f896892e70637c2f60d2a8f3cbeba14b86af4..3aca94968373502cb6e9d65c7befaf4ef1326483 100644 (file)
--- 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 0b35f7e99b72a92fdb432f12dcc9dc3ee9c58dcc..48b5a0ee01cec1bfb38e7166f38428f4fd9bfe1d 100644 (file)
--- 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 70fb54b0e70f034217187343067819b313fecb22..d81d5c80030e7d35bd83943c87d1215365d8d27c 100644 (file)
--- 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 4d28047ebe515e5d0569fcfce672867a87d64bd7..a16ba89aeb2f24d809649db40f02644adf20e20d 100644 (file)
--- 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 82b60bf069ffd6486e467bb55bd0e749fb6536f0..9250132d453b33ac2c94c92786b36b3672e220e6 100644 (file)
--- 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 44f1bc6fb7b1ac0e1bb631a54a234553f1722e5b..9e683ef97954013bd26c78399ac31ff4190a161f 100644 (file)
--- 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"
 }