From nobody Mon Feb 9 07:53:02 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1741797257095211.10356974194622; Wed, 12 Mar 2025 09:34:17 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 10DC11E80; Wed, 12 Mar 2025 12:34:16 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 5F9A81D0C; Wed, 12 Mar 2025 12:31:48 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 087A41D4A; Wed, 12 Mar 2025 12:31:44 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id EC6FC1C2A for ; Wed, 12 Mar 2025 12:31:36 -0400 (EDT) Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-168-9zEukheXOCW3JME-50TuJg-1; Wed, 12 Mar 2025 12:31:35 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A3ED519560BD for ; Wed, 12 Mar 2025 16:31:34 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.6]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CA5E11955BCB for ; Wed, 12 Mar 2025 16:31:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741797096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4ERcqkiUH0hTmSRdGag0EsGCOb2wkHev+SPQ941Hkqk=; b=FAZnXHITdnIlwNQVkdq4jjRSWCZ/2W082bA6FZzeBZ/u42naByrWeQ4uBQGcHSSZ1fZgcj axficKXDNSY5T+xzyuBbJBJbRYIDFYJ9wwnN7HpI5mSFdj0LO8ccqU17WSDPtTuVbYmJ+/ D9y4xK0IEfpoiyyrsTlkdZf8Fru/mpE= X-MC-Unique: 9zEukheXOCW3JME-50TuJg-1 X-Mimecast-MFC-AGG-ID: 9zEukheXOCW3JME-50TuJg_1741797094 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 03/17] qemuBuildObjectCommandlineFromJSON: Assume all qemus support QEMU_CAPS_OBJECT_JSON Date: Wed, 12 Mar 2025 17:31:13 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: A9PgU1C_MNEle6GVgD7KbJprc7azcuBBJ6O1ICYR1f4_1741797094 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: TZHIHREXSO4QZWJJSDDWPKLDUIBYVQU2 X-Message-ID-Hash: TZHIHREXSO4QZWJJSDDWPKLDUIBYVQU2 X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1741797259846019100 Content-Type: text/plain; charset="utf-8" '-object' was qapified (meaning it supports JSON props) in qemu-6.0, thus now that we require qemu-6.2 we can drop the compatibility code. Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2b0e3dd53a..51e428e017 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -185,25 +185,12 @@ qemuOnOffAuto(virTristateSwitch s) static int qemuBuildObjectCommandlineFromJSON(virCommand *cmd, virJSONValue *props, - virQEMUCaps *qemuCaps) + virQEMUCaps *qemuCaps G_GNUC_UNUSED) { g_autofree char *arg =3D NULL; - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_JSON)) { - if (!(arg =3D virJSONValueToString(props, false))) - return -1; - } else { - const char *type =3D virJSONValueObjectGetString(props, "qom-type"= ); - g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; - - virBufferAsprintf(&buf, "%s,", type); - - if (virQEMUBuildCommandLineJSON(props, &buf, "qom-type", - virQEMUBuildCommandLineJSONArrayBi= tmap) < 0) - return -1; - - arg =3D virBufferContentAndReset(&buf); - } + if (!(arg =3D virJSONValueToString(props, false))) + return -1; virCommandAddArgList(cmd, "-object", arg, NULL); return 0; --=20 2.48.1