qemu: Use query-accelerators to query accelerators

Use the `query-accelerators` command to generically query the enabled
acclerator. Below is an example invocation in Qemu:

  { "execute": "query-accelerators"}
  "return": {"enabled": "kvm", "present": ["kvm", "mshv", "qtest", "tcg", "xen"]}}

"enabled" here indicates "kvm" is the enabled accelertor.

If query-accelerators command is not available, fallback to existing
mechnisms for querying kvm and hvf capabilities.

Signed-off-by: Praveen K Paladugu <prapal@linux.microsoft.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index b0d4e765726b0fe6d6cfbe5563624a3ef52d1fa5..205bf3d0b89d0d18fd8c3a4ceaecd6666437933a 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3466,6 +3466,27 @@ virQEMUCapsProbeQMPKVMState(virQEMUCaps *qemuCaps,
     return 0;
 }
 
+
+static int
+virQEMUCapsProbeAccels(virQEMUCaps *qemuCaps,
+                       qemuMonitor *mon)
+{
+    g_autofree char *enabled = NULL;
+
+    if (qemuMonitorGetAccelerators(mon, &enabled) < 0)
+        return -1;
+
+    if (STREQ(enabled, "tcg"))
+        virQEMUCapsSet(qemuCaps, QEMU_CAPS_TCG);
+    else if (STREQ(enabled, "hvf"))
+        virQEMUCapsSet(qemuCaps, QEMU_CAPS_HVF);
+    else if (STREQ(enabled, "kvm"))
+        virQEMUCapsSet(qemuCaps, QEMU_CAPS_KVM);
+
+    return 0;
+}
+
+
 #ifdef __APPLE__
 bool
 virQEMUCapsProbeHVF(virQEMUCaps *qemuCaps)
@@ -5781,12 +5802,17 @@ virQEMUCapsInitQMPMonitor(virQEMUCaps *qemuCaps,
     if (virQEMUCapsProbeQMPSchemaCapabilities(qemuCaps, mon) < 0)
         return -1;
 
-    /* Some capabilities may differ depending on KVM state */
-    if (virQEMUCapsProbeQMPKVMState(qemuCaps, mon) < 0)
-        return -1;
+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_ACCELERATORS)) {
+        if (virQEMUCapsProbeAccels(qemuCaps, mon) < 0)
+            return -1;
+    } else {
+        /* Some capabilities may differ depending on KVM state */
+        if (virQEMUCapsProbeQMPKVMState(qemuCaps, mon) < 0)
+            return -1;
 
-    if (virQEMUCapsProbeHVF(qemuCaps))
-        virQEMUCapsSet(qemuCaps, QEMU_CAPS_HVF);
+        if (virQEMUCapsProbeHVF(qemuCaps))
+            virQEMUCapsSet(qemuCaps, QEMU_CAPS_HVF);
+    }
 
     type = virQEMUCapsGetVirtType(qemuCaps);
     accel = virQEMUCapsGetAccel(qemuCaps, type);

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index f61da140ea5fb7f0e4b5c36211e4cf97b89e0dd8..0f1a9d13f561c24feaa1221b5ab6334d9b967827 100644 (file)
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -3447,6 +3447,16 @@ qemuMonitorGetKVMState(qemuMonitor *mon,
 }
 
 
+int
+qemuMonitorGetAccelerators(qemuMonitor *mon,
+                           char **enabled)
+{
+    QEMU_CHECK_MONITOR(mon);
+
+    return qemuMonitorJSONGetAccelerators(mon, enabled);
+}
+
+
 int
 qemuMonitorGetObjectTypes(qemuMonitor *mon,
                           char ***types)

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 83d702a96c9fd7cf4b6cad2e1f6ec648cfcf9198..dd038f2775e8bcf0f898aff2dac47259d9eb98ad 100644 (file)
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1477,6 +1477,10 @@ qemuMonitorGetKVMState(qemuMonitor *mon,
                        bool *enabled,
                        bool *present);
 
+int
+qemuMonitorGetAccelerators(qemuMonitor *mon,
+                           char **enabled);
+
 int
 qemuMonitorGetObjectTypes(qemuMonitor *mon,
                           char ***types);

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index c7d291a201a32a9f9a195ba488157415dbcbca37..a4cbc222a835d5611ccc0ed0d6df5c98caf273a2 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -5676,6 +5676,35 @@ qemuMonitorJSONGetKVMState(qemuMonitor *mon,
 }
 
 
+int
+qemuMonitorJSONGetAccelerators(qemuMonitor *mon, char **enabled)
+{
+    g_autoptr(virJSONValue) cmd = NULL;
+    g_autoptr(virJSONValue) reply = NULL;
+    virJSONValue *data;
+    const char *str;
+
+    if (!(cmd = qemuMonitorJSONMakeCommand("query-accelerators", NULL)))
+        return -1;
+
+    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
+        return -1;
+
+    if (!(data = qemuMonitorJSONGetReply(cmd, reply, VIR_JSON_TYPE_OBJECT)))
+        return -1;
+
+    if (!(str = virJSONValueObjectGetString(data, "enabled"))) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("query-accelerators was missing 'enabled'"));
+        return -1;
+    }
+
+    *enabled = g_strdup(str);
+
+    return 0;
+}
+
+
 int
 qemuMonitorJSONGetObjectTypes(qemuMonitor *mon,
                               char ***types)

diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index f20830532d2fbfeb1be4d164a05d1008cc91b4c3..db9160eb68ac3b7835ac02b0762e5c8db2e52634 100644 (file)
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -451,6 +451,11 @@ qemuMonitorJSONGetKVMState(qemuMonitor *mon,
                            bool *present)
     ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
 
+int
+qemuMonitorJSONGetAccelerators(qemuMonitor *mon,
+                               char **enabled)
+     ATTRIBUTE_NONNULL(2);
+
 int
 qemuMonitorJSONGetObjectTypes(qemuMonitor *mon,
                               char ***types)

diff --git a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.replies b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.replies
index 6c14a0f9f60b0ff124051b2fe28c53362de63a26..3b6d4e0575e4a9d598c1db7b0a90d6ff1dddf935 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.replies
@@ -24947,14 +24947,19 @@
 }
 
 {
-  "execute": "query-kvm",
+  "execute": "query-accelerators",
   "id": "libvirt-5"
 }
 
 {
   "return": {
-    "enabled": true,
-    "present": true
+    "enabled": "kvm",
+    "present": [
+      "kvm",
+      "mshv",
+      "qtest",
+      "tcg"
+    ]
   },
   "id": "libvirt-5"
 }