From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 24 Sep 2021 16:43:35 +0000 (+0200)
Subject: qemuBuildObjectCommandlineFromJSON: Remove checks for 'type' and 'alias'
X-Git-Tag: v7.9.0-rc1~224
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6a92859258ebe2015de6554fd85e4aa698c71ea;p=thirdparty%2Flibvirt.git

qemuBuildObjectCommandlineFromJSON: Remove checks for 'type' and 'alias'

We validate the generated props against the QMP schema which makes sure
that the objects are generated properly.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 7fe2cb73bf..91ec991517 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -161,20 +161,12 @@ qemuBuildObjectCommandlineFromJSON(virCommand *cmd,
                                    virQEMUCaps *qemuCaps)
 {
     g_autofree char *arg = NULL;
-    const char *type = virJSONValueObjectGetString(props, "qom-type");
-    const char *alias = virJSONValueObjectGetString(props, "id");
-
-    if (!type || !alias) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("missing 'type'(%s) or 'alias'(%s) field of QOM 'object'"),
-                       NULLSTR(type), NULLSTR(alias));
-        return -1;
-    }
 
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_JSON)) {
         if (!(arg = virJSONValueToString(props, false)))
             return -1;
     } else {
+        const char *type = virJSONValueObjectGetString(props, "qom-type");
         g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
 
         virBufferAsprintf(&buf, "%s,", type);