From c6a92859258ebe2015de6554fd85e4aa698c71ea Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Fri, 24 Sep 2021 18:43:35 +0200 Subject: [PATCH] qemuBuildObjectCommandlineFromJSON: Remove checks for 'type' and 'alias' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We validate the generated props against the QMP schema which makes sure that the objects are generated properly. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/qemu/qemu_command.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) 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);