From nobody Mon Feb 9 08:30:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1634037213; cv=none; d=zohomail.com; s=zohoarc; b=gxFWyXO1uZ2rEdlqNkVTOgSYa4p8eqgC1i3jZ/jmdBtDQuQHysXDSu09YOF65P6ueaWW7y8GIfzJvyS/40rWxAUUHMEsieMrobgbraPZ+r6lIENZRU1RlB6najOHpHDVRoIlmrK4CjbiVeOGfERtSMfdCPBTMa8PksfG2qOFO+U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634037213; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VMyK1Gp6KETwif/tlegLaR2mV7AAoO08eVwBRMMs/+A=; b=eu4oCFEGptiOIF31vdkUZ3Htu4Moq0J1X7ilmoeXD9pU4Lf1wg/2b/KNfJboFMsicteEoJfQbSaE5ds1e/9jU4ragyx0hirXUHsBgt4fTQfIVRt+HJ7fNmTm3NeuC+KoTRvduLSAh8NvPfsdFt/UA5FUd+Ke6NAePSEqXjP2eN4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1634037213821658.9092060592421; Tue, 12 Oct 2021 04:13:33 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-476-zm1P16-eOkmP0NykLgfOOg-1; Tue, 12 Oct 2021 07:13:31 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5A8A310B3941; Tue, 12 Oct 2021 11:13:26 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3DBE410016F4; Tue, 12 Oct 2021 11:13:26 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0F7361806D03; Tue, 12 Oct 2021 11:13:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19CBDOqm008662 for ; Tue, 12 Oct 2021 07:13:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 99413ADCA; Tue, 12 Oct 2021 11:13:24 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 02D47ADD1 for ; Tue, 12 Oct 2021 11:13:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634037212; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=VMyK1Gp6KETwif/tlegLaR2mV7AAoO08eVwBRMMs/+A=; b=fpFKFcFWP6B1e4LaL6EwZf60E03WRN6a3NKGyq5HtZCJzcLhO79OWD+5zIo6lE+Ra6V5Hz FmoF4nF3a66cVimxc6dw14XG1r0OjrOmI7iDtnIxFwcGEipgjGAtDFTktytaaYk+03vWPi IM91/i43MEpgeC+IuIcQENiyG4JkYto= X-MC-Unique: zm1P16-eOkmP0NykLgfOOg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 10/14] qemuBuildVMCoreInfoCommandLine: Generate via JSON Date: Tue, 12 Oct 2021 13:12:16 +0200 Message-Id: <8f947da95784a753e7f542c493dcf532c2fd687b.1634037045.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1634037214575100001 Content-Type: text/plain; charset="utf-8" While this device doesn't have any properties it must be converted to use qemuBuildDeviceCommandlineFromJSON so that we can validate it in the future. Signed-off-by: Peter Krempa --- src/qemu/qemu_command.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 86affcdf6f..56bf17b6b4 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10097,14 +10097,22 @@ qemuBuildSecCommandLine(virDomainObj *vm, virComm= and *cmd, static int qemuBuildVMCoreInfoCommandLine(virCommand *cmd, - const virDomainDef *def) + const virDomainDef *def, + virQEMUCaps *qemuCaps) { - virTristateSwitch vmci =3D def->features[VIR_DOMAIN_FEATURE_VMCOREINFO= ]; + g_autoptr(virJSONValue) props =3D NULL; - if (vmci !=3D VIR_TRISTATE_SWITCH_ON) + if (def->features[VIR_DOMAIN_FEATURE_VMCOREINFO] !=3D VIR_TRISTATE_SWI= TCH_ON) return 0; - virCommandAddArgList(cmd, "-device", "vmcoreinfo", NULL); + if (virJSONValueObjectCreate(&props, + "s:driver", "vmcoreinfo", + NULL) < 0) + return -1; + + if (qemuBuildDeviceCommandlineFromJSON(cmd, props, qemuCaps) < 0) + return -1; + return 0; } @@ -10785,7 +10793,7 @@ qemuBuildCommandLine(virQEMUDriver *driver, if (qemuBuildNVRAMCommandLine(cmd, def) < 0) return NULL; - if (qemuBuildVMCoreInfoCommandLine(cmd, def) < 0) + if (qemuBuildVMCoreInfoCommandLine(cmd, def, qemuCaps) < 0) return NULL; if (qemuBuildSecCommandLine(vm, cmd, def->sec) < 0) --=20 2.31.1