From nobody Mon Feb 9 03:48:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1633623851; cv=none; d=zohomail.com; s=zohoarc; b=gEaGaL8fGmHQW7wa3G/VTqdgO21xCpS4qxQqZjGXqjOMBqT44u9nGogVIcMqLUiEPOmepixtEIf1ASONdtP7ueImi0CTOOij+f2kbYcpcLoXTOCRYXoa71plBzTgj87WNdDAT+NXVAu51ANmakNTYWnGHEQWn0WTh10RGtTyQgE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1633623851; 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=tyrrw3folQZabp4Q7cjWQY8OkkeO9/g9GAo5KbpE86E=; b=Wsh5I0WrZ+2H7ZX1+PxAtTHpguNO3bUPOSQlKyO/9ivNfcCbPzqRXq1e7IQAdChdluNXOvEZegf6BYVL65xPGDjnGh6foplZw85T/TNjavMhiBK8N9wBm7bL6Wah6GOjufsZZm82NcGSBuBWVltG4/B56e8qBsnXxH29S5dEKpY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1633623851905106.60132708114304; Thu, 7 Oct 2021 09:24:11 -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-481-MqX_EP81OoOZLO_iHQp49Q-1; Thu, 07 Oct 2021 12:24:07 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4CB5F115BDA7; Thu, 7 Oct 2021 15:55:04 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1F9FA272C8; Thu, 7 Oct 2021 15:55:04 +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 D07A44EA2A; Thu, 7 Oct 2021 15:55:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 197FKtvY024331 for ; Thu, 7 Oct 2021 11:20:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id 454F85D6D5; Thu, 7 Oct 2021 15:20:55 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA5015D6BA for ; Thu, 7 Oct 2021 15:20:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633623850; 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=tyrrw3folQZabp4Q7cjWQY8OkkeO9/g9GAo5KbpE86E=; b=AGL1p3fPKOledK68IrxyE8f4s6xu2roUfF3Wx0Wf43kiVVtiPjrd7wQyrIgjD9/pGI1AAq f8wLUsvIdpE423tzPGI8v2TRpZf6tloI2ft0zXZ6StAWMbnV0xmOxZTzzXLQb9bSL6H3y6 sdhp7a9pGiI7wNumTJZwIUCt2XRUxx4= X-MC-Unique: MqX_EP81OoOZLO_iHQp49Q-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 074/103] qemuBuildSCSIHostdevDevProps: Reorder 'drive', 'id' and 'bootindex' after address Date: Thu, 7 Oct 2021 17:18:02 +0200 Message-Id: <4c9274d3bb27c44139b20080d02419a6b6e44155.1633619630.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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.23 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: 1633623853478100001 Content-Type: text/plain; charset="utf-8" Simplify the generator by shuffling around few fields. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 10 +++------- .../hostdev-scsi-lsi.x86_64-4.1.0.args | 12 ++++++------ .../hostdev-scsi-lsi.x86_64-latest.args | 12 ++++++------ .../hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 14 +++++++------- .../hostdev-scsi-virtio-scsi.x86_64-latest.args | 14 +++++++------- tests/qemuxml2argvdata/name-escape.args | 2 +- 6 files changed, 30 insertions(+), 34 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 5bea3991a9..008700cc5f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5077,19 +5077,15 @@ qemuBuildSCSIHostdevDevProps(const virDomainDef *de= f, if (virJSONValueObjectCreate(&props, "s:driver", "scsi-generic", + "s:drive", backendAlias, + "s:id", dev->info->alias, + "p:bootindex", dev->info->bootIndex, NULL) < 0) return NULL; if (qemuBuildDeviceAddressProps(props, def, dev->info) < 0) return NULL; - if (virJSONValueObjectAdd(props, - "s:drive", backendAlias, - "s:id", dev->info->alias, - "p:bootindex", dev->info->bootIndex, - NULL) < 0) - return NULL; - return g_steal_pointer(&props); } diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args b/te= sts/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args index f4745a5f4f..66ebe317ec 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args @@ -30,19 +30,19 @@ QEMU_AUDIO_DRV=3Dnone \ -drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev0 \ --device scsi-generic,bus=3Dscsi0.0,scsi-id=3D7,drive=3Ddrive-hostdev0,id= =3Dhostdev0 \ +-device scsi-generic,drive=3Ddrive-hostdev0,id=3Dhostdev0,bus=3Dscsi0.0,sc= si-id=3D7 \ -drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev1,readonly= =3Don \ --device scsi-generic,bus=3Dscsi0.0,scsi-id=3D6,drive=3Ddrive-hostdev1,id= =3Dhostdev1 \ +-device scsi-generic,drive=3Ddrive-hostdev1,id=3Dhostdev1,bus=3Dscsi0.0,sc= si-id=3D6 \ -drive file.driver=3Discsi,file.portal=3Dexample.org:3260,file.target=3Diq= n.1992-01.com.example,file.lun=3D0,file.transport=3Dtcp,if=3Dnone,format=3D= raw,id=3Ddrive-hostdev2 \ --device scsi-generic,bus=3Dscsi0.0,scsi-id=3D4,drive=3Ddrive-hostdev2,id= =3Dhostdev2 \ +-device scsi-generic,drive=3Ddrive-hostdev2,id=3Dhostdev2,bus=3Dscsi0.0,sc= si-id=3D4 \ -drive file.driver=3Discsi,file.portal=3Dexample.org:3260,file.target=3Diq= n.1992-01.com.example,file.lun=3D1,file.transport=3Dtcp,if=3Dnone,format=3D= raw,id=3Ddrive-hostdev3 \ --device scsi-generic,bus=3Dscsi0.0,scsi-id=3D5,drive=3Ddrive-hostdev3,id= =3Dhostdev3 \ +-device scsi-generic,drive=3Ddrive-hostdev3,id=3Dhostdev3,bus=3Dscsi0.0,sc= si-id=3D5 \ -object secret,id=3Dhostdev4-secret0,data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6= MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoL= DA0ODw=3D=3D,format=3Dbase64 \ -drive file.driver=3Discsi,file.portal=3Dexample.org:3260,file.target=3Diq= n.1992-01.com.example:storage,file.lun=3D1,file.transport=3Dtcp,file.user= =3Dmyname,file.password-secret=3Dhostdev4-secret0,if=3Dnone,format=3Draw,id= =3Ddrive-hostdev4 \ --device scsi-generic,bus=3Dscsi0.0,scsi-id=3D3,drive=3Ddrive-hostdev4,id= =3Dhostdev4 \ +-device scsi-generic,drive=3Ddrive-hostdev4,id=3Dhostdev4,bus=3Dscsi0.0,sc= si-id=3D3 \ -object secret,id=3Dhostdev5-secret0,data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6= MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoL= DA0ODw=3D=3D,format=3Dbase64 \ -drive file.driver=3Discsi,file.portal=3Dexample.org:3260,file.target=3Diq= n.1992-01.com.example:storage,file.lun=3D2,file.transport=3Dtcp,file.user= =3Dmyname,file.password-secret=3Dhostdev5-secret0,if=3Dnone,format=3Draw,id= =3Ddrive-hostdev5 \ --device scsi-generic,bus=3Dscsi0.0,scsi-id=3D2,drive=3Ddrive-hostdev5,id= =3Dhostdev5 \ +-device scsi-generic,drive=3Ddrive-hostdev5,id=3Dhostdev5,bus=3Dscsi0.0,sc= si-id=3D2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args b/t= ests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args index edfcca6ded..eeec33fe98 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args @@ -33,19 +33,19 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config= \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev id=3Daudio1,driver=3Dnone \ -blockdev '{"driver":"host_device","filename":"/dev/sg0","node-name":"libv= irt-2-backend","read-only":false}' \ --device scsi-generic,bus=3Dscsi0.0,scsi-id=3D7,drive=3Dlibvirt-2-backend,i= d=3Dhostdev0 \ +-device scsi-generic,drive=3Dlibvirt-2-backend,id=3Dhostdev0,bus=3Dscsi0.0= ,scsi-id=3D7 \ -blockdev '{"driver":"host_device","filename":"/dev/sg0","node-name":"libv= irt-3-backend","read-only":true}' \ --device scsi-generic,bus=3Dscsi0.0,scsi-id=3D6,drive=3Dlibvirt-3-backend,i= d=3Dhostdev1 \ +-device scsi-generic,drive=3Dlibvirt-3-backend,id=3Dhostdev1,bus=3Dscsi0.0= ,scsi-id=3D6 \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example","lun":0,"transport":"tcp","node-name":"libvirt-4-backend"= ,"read-only":false}' \ --device scsi-generic,bus=3Dscsi0.0,scsi-id=3D4,drive=3Dlibvirt-4-backend,i= d=3Dhostdev2 \ +-device scsi-generic,drive=3Dlibvirt-4-backend,id=3Dhostdev2,bus=3Dscsi0.0= ,scsi-id=3D4 \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example","lun":1,"transport":"tcp","node-name":"libvirt-5-backend"= ,"read-only":false}' \ --device scsi-generic,bus=3Dscsi0.0,scsi-id=3D5,drive=3Dlibvirt-5-backend,i= d=3Dhostdev3 \ +-device scsi-generic,drive=3Dlibvirt-5-backend,id=3Dhostdev3,bus=3Dscsi0.0= ,scsi-id=3D5 \ -object '{"qom-type":"secret","id":"libvirt-6-backend-secret0","data":"9ea= o5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"mas= terKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example:storage","lun":1,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-6-backend-secret0","node-name":"libvirt-6-backend","rea= d-only":false}' \ --device scsi-generic,bus=3Dscsi0.0,scsi-id=3D3,drive=3Dlibvirt-6-backend,i= d=3Dhostdev4 \ +-device scsi-generic,drive=3Dlibvirt-6-backend,id=3Dhostdev4,bus=3Dscsi0.0= ,scsi-id=3D3 \ -object '{"qom-type":"secret","id":"libvirt-7-backend-secret0","data":"9ea= o5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"mas= terKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example:storage","lun":2,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-7-backend-secret0","node-name":"libvirt-7-backend","rea= d-only":false}' \ --device scsi-generic,bus=3Dscsi0.0,scsi-id=3D2,drive=3Dlibvirt-7-backend,i= d=3Dhostdev5 \ +-device scsi-generic,drive=3Dlibvirt-7-backend,id=3Dhostdev5,bus=3Dscsi0.0= ,scsi-id=3D2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.a= rgs b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args index 91deda1cd8..3ce8f3fea1 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args @@ -30,21 +30,21 @@ QEMU_AUDIO_DRV=3Dnone \ -drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ -drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev0 \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D8,drive= =3Ddrive-hostdev0,id=3Dhostdev0 \ +-device scsi-generic,drive=3Ddrive-hostdev0,id=3Dhostdev0,bus=3Dscsi0.0,ch= annel=3D0,scsi-id=3D4,lun=3D8 \ -drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-hostdev1,readonly= =3Don \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D7,drive= =3Ddrive-hostdev1,id=3Dhostdev1 \ +-device scsi-generic,drive=3Ddrive-hostdev1,id=3Dhostdev1,bus=3Dscsi0.0,ch= annel=3D0,scsi-id=3D4,lun=3D7 \ -drive file=3D/dev/sg0,if=3Dnone,format=3Draw,id=3Ddrive-ua-7996c8dc-a4fa-= 4012-b76f-043d20144263 \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D6,drive= =3Ddrive-ua-7996c8dc-a4fa-4012-b76f-043d20144263,id=3Dua-7996c8dc-a4fa-4012= -b76f-043d20144263 \ +-device scsi-generic,drive=3Ddrive-ua-7996c8dc-a4fa-4012-b76f-043d20144263= ,id=3Dua-7996c8dc-a4fa-4012-b76f-043d20144263,bus=3Dscsi0.0,channel=3D0,scs= i-id=3D4,lun=3D6 \ -drive file.driver=3Discsi,file.portal=3Dexample.org:3260,file.target=3Diq= n.1992-01.com.example,file.lun=3D0,file.transport=3Dtcp,if=3Dnone,format=3D= raw,id=3Ddrive-hostdev2 \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D4,drive= =3Ddrive-hostdev2,id=3Dhostdev2 \ +-device scsi-generic,drive=3Ddrive-hostdev2,id=3Dhostdev2,bus=3Dscsi0.0,ch= annel=3D0,scsi-id=3D2,lun=3D4 \ -drive file.driver=3Discsi,file.portal=3Dexample.org:3260,file.target=3Diq= n.1992-01.com.example,file.lun=3D1,file.transport=3Dtcp,if=3Dnone,format=3D= raw,id=3Ddrive-hostdev3,readonly=3Don \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D5,drive= =3Ddrive-hostdev3,id=3Dhostdev3 \ +-device scsi-generic,drive=3Ddrive-hostdev3,id=3Dhostdev3,bus=3Dscsi0.0,ch= annel=3D0,scsi-id=3D2,lun=3D5 \ -object secret,id=3Dhostdev4-secret0,data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6= MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoL= DA0ODw=3D=3D,format=3Dbase64 \ -drive file.driver=3Discsi,file.portal=3Dexample.org:3260,file.target=3Diq= n.1992-01.com.example:storage,file.lun=3D1,file.transport=3Dtcp,file.user= =3Dmyname,file.password-secret=3Dhostdev4-secret0,if=3Dnone,format=3Draw,id= =3Ddrive-hostdev4 \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D3,lun=3D4,drive= =3Ddrive-hostdev4,id=3Dhostdev4 \ +-device scsi-generic,drive=3Ddrive-hostdev4,id=3Dhostdev4,bus=3Dscsi0.0,ch= annel=3D0,scsi-id=3D3,lun=3D4 \ -object secret,id=3Dhostdev5-secret0,data=3D9eao5F8qtkGt+seB1HYivWIxbtwUu6= MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=3DmasterKey0,iv=3DAAECAwQFBgcICQoL= DA0ODw=3D=3D,format=3Dbase64 \ -drive file.driver=3Discsi,file.portal=3Dexample.org:3260,file.target=3Diq= n.1992-01.com.example:storage,file.lun=3D2,file.transport=3Dtcp,file.user= =3Dmyname,file.password-secret=3Dhostdev5-secret0,file.initiator-name=3Diqn= .2020-07.com.example:test,if=3Dnone,format=3Draw,id=3Ddrive-hostdev5 \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D3,lun=3D5,drive= =3Ddrive-hostdev5,id=3Dhostdev5 \ +-device scsi-generic,drive=3Ddrive-hostdev5,id=3Dhostdev5,bus=3Dscsi0.0,ch= annel=3D0,scsi-id=3D3,lun=3D5 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.= args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args index a2985ddad5..ad2cde5171 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args @@ -33,21 +33,21 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config= \ -device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev id=3Daudio1,driver=3Dnone \ -blockdev '{"driver":"host_device","filename":"/dev/sg0","node-name":"libv= irt-2-backend","read-only":false}' \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D8,drive= =3Dlibvirt-2-backend,id=3Dhostdev0 \ +-device scsi-generic,drive=3Dlibvirt-2-backend,id=3Dhostdev0,bus=3Dscsi0.0= ,channel=3D0,scsi-id=3D4,lun=3D8 \ -blockdev '{"driver":"host_device","filename":"/dev/sg0","node-name":"libv= irt-3-backend","read-only":true}' \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D7,drive= =3Dlibvirt-3-backend,id=3Dhostdev1 \ +-device scsi-generic,drive=3Dlibvirt-3-backend,id=3Dhostdev1,bus=3Dscsi0.0= ,channel=3D0,scsi-id=3D4,lun=3D7 \ -blockdev '{"driver":"host_device","filename":"/dev/sg0","node-name":"libv= irt-4-backend","read-only":false}' \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D6,drive= =3Dlibvirt-4-backend,id=3Dua-7996c8dc-a4fa-4012-b76f-043d20144263 \ +-device scsi-generic,drive=3Dlibvirt-4-backend,id=3Dua-7996c8dc-a4fa-4012-= b76f-043d20144263,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D6 \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example","lun":0,"transport":"tcp","node-name":"libvirt-5-backend"= ,"read-only":false}' \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D4,drive= =3Dlibvirt-5-backend,id=3Dhostdev2 \ +-device scsi-generic,drive=3Dlibvirt-5-backend,id=3Dhostdev2,bus=3Dscsi0.0= ,channel=3D0,scsi-id=3D2,lun=3D4 \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example","lun":1,"transport":"tcp","node-name":"libvirt-6-backend"= ,"read-only":true}' \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D2,lun=3D5,drive= =3Dlibvirt-6-backend,id=3Dhostdev3 \ +-device scsi-generic,drive=3Dlibvirt-6-backend,id=3Dhostdev3,bus=3Dscsi0.0= ,channel=3D0,scsi-id=3D2,lun=3D5 \ -object '{"qom-type":"secret","id":"libvirt-7-backend-secret0","data":"9ea= o5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"mas= terKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example:storage","lun":1,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-7-backend-secret0","node-name":"libvirt-7-backend","rea= d-only":false}' \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D3,lun=3D4,drive= =3Dlibvirt-7-backend,id=3Dhostdev4 \ +-device scsi-generic,drive=3Dlibvirt-7-backend,id=3Dhostdev4,bus=3Dscsi0.0= ,channel=3D0,scsi-id=3D3,lun=3D4 \ -object '{"qom-type":"secret","id":"libvirt-8-backend-secret0","data":"9ea= o5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"mas= terKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example:storage","lun":2,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-8-backend-secret0","initiator-name":"iqn.2020-07.com.ex= ample:test","node-name":"libvirt-8-backend","read-only":false}' \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D3,lun=3D5,drive= =3Dlibvirt-8-backend,id=3Dhostdev5 \ +-device scsi-generic,drive=3Dlibvirt-8-backend,id=3Dhostdev5,bus=3Dscsi0.0= ,channel=3D0,scsi-id=3D3,lun=3D5 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/name-escape.args b/tests/qemuxml2argvda= ta/name-escape.args index eaef25b3f1..eb8d9ac10a 100644 --- a/tests/qemuxml2argvdata/name-escape.args +++ b/tests/qemuxml2argvdata/name-escape.args @@ -40,6 +40,6 @@ QEMU_AUDIO_DRV=3Dspice \ -spice unix,addr=3D/tmp/lib/domain--1-foo=3D1,,bar=3D2/spice.sock,gl=3Don,= rendernode=3D/dev/dri/foo,,bar,seamless-migration=3Don \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -drive file.driver=3Discsi,file.portal=3Dexample.foo.org:3260,file.target= =3Diqn.1992-01.com.example:my,,storage,file.lun=3D1,file.transport=3Dtcp,if= =3Dnone,format=3Draw,id=3Ddrive-hostdev0 \ --device scsi-generic,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D4,drive= =3Ddrive-hostdev0,id=3Dhostdev0 \ +-device scsi-generic,drive=3Ddrive-hostdev0,id=3Dhostdev0,bus=3Dscsi0.0,ch= annel=3D0,scsi-id=3D0,lun=3D4 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -msg timestamp=3Don --=20 2.31.1