From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 7110E1FF183 for ; Wed, 27 Aug 2025 09:35:18 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 97B621208D; Wed, 27 Aug 2025 09:35:15 +0200 (CEST) To: pve-devel@lists.proxmox.com Date: Fri, 22 Aug 2025 16:18:01 +0200 In-Reply-To: <20250822141803.1658181-1-alexandre.derumier@groupe-cyllene.com> References: <20250822141803.1658181-1-alexandre.derumier@groupe-cyllene.com> X-Mailman-Approved-At: Wed, 27 Aug 2025 09:35:14 +0200 MIME-Version: 1.0 Message-ID: List-Id: Proxmox VE development discussion List-Post: From: Alexandre Derumier via pve-devel Precedence: list Cc: Alexandre Derumier X-Mailman-Version: 2.1.29 X-BeenThere: pve-devel@lists.proxmox.com List-Subscribe: , List-Unsubscribe: , List-Archive: Reply-To: Proxmox VE development discussion List-Help: Subject: [pve-devel] [PATCH v3 qemu-server 09/10] tests: cfg2cmd: convert drive devices to json format Content-Type: multipart/mixed; boundary="===============5813986889805064471==" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" --===============5813986889805064471== Content-Type: message/rfc822 Content-Disposition: inline Return-Path: X-Original-To: pve-devel@lists.proxmox.com Delivered-To: pve-devel@lists.proxmox.com Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id E3BB5D46A6 for ; Fri, 22 Aug 2025 16:18:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1B01711ED1 for ; Fri, 22 Aug 2025 16:18:18 +0200 (CEST) Received: from bastiontest.odiso.net (unknown [IPv6:2a0a:1580:2000:6700::14]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 22 Aug 2025 16:18:13 +0200 (CEST) Received: from formationkvm1.odiso.net (unknown [10.11.201.57]) by bastiontest.odiso.net (Postfix) with ESMTP id 3CF06862E52; Fri, 22 Aug 2025 16:18:04 +0200 (CEST) Received: by formationkvm1.odiso.net (Postfix, from userid 0) id 39D26110A343; Fri, 22 Aug 2025 16:18:04 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Subject: [PATCH v3 qemu-server 09/10] tests: cfg2cmd: convert drive devices to json format Date: Fri, 22 Aug 2025 16:18:01 +0200 Message-ID: <20250822141803.1658181-10-alexandre.derumier@groupe-cyllene.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250822141803.1658181-1-alexandre.derumier@groupe-cyllene.com> References: <20250822141803.1658181-1-alexandre.derumier@groupe-cyllene.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL -0.006 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_NONE 0.1 DMARC none policy HEADER_FROM_DIFFERENT_DOMAINS 0.058 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_NONE 0.25 DKIM has Failed or SPF has failed on the message and the domain has no DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods KAM_LOTSOFHASH 0.25 Emails with lots of hash-like gibberish RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record X-Mailman-Approved-At: Wed, 27 Aug 2025 09:35:14 +0200 Signed-off-by: Alexandre Derumier --- src/PVE/QemuServer/DriveDevice.pm | 33 +++++++++++++------ src/test/cfg2cmd/aio.conf.cmd | 32 +++++++++--------- src/test/cfg2cmd/bootorder-empty.conf.cmd | 14 ++++---- src/test/cfg2cmd/bootorder-legacy.conf.cmd | 14 ++++---- src/test/cfg2cmd/bootorder.conf.cmd | 14 ++++---- ...putype-icelake-client-deprecation.conf.cmd | 6 ++-- src/test/cfg2cmd/ide.conf.cmd | 12 +++---- .../cfg2cmd/pinned-version-pxe-pve.conf.cmd | 6 ++-- src/test/cfg2cmd/pinned-version-pxe.conf.cmd | 6 ++-- src/test/cfg2cmd/pinned-version.conf.cmd | 6 ++-- src/test/cfg2cmd/q35-ide.conf.cmd | 12 +++---- .../q35-linux-hostpci-template.conf.cmd | 4 +-- src/test/cfg2cmd/seabios_serial.conf.cmd | 6 ++-- src/test/cfg2cmd/simple-backingchain.conf.cmd | 6 ++-- ...imple-balloon-free-page-reporting.conf.cmd | 6 ++-- src/test/cfg2cmd/simple-btrfs.conf.cmd | 12 +++---- src/test/cfg2cmd/simple-cifs.conf.cmd | 12 +++---- .../cfg2cmd/simple-disk-passthrough.conf.cmd | 8 ++--- src/test/cfg2cmd/simple-lvm.conf.cmd | 10 +++--- src/test/cfg2cmd/simple-lvmthin.conf.cmd | 10 +++--- src/test/cfg2cmd/simple-rbd.conf.cmd | 20 +++++------ src/test/cfg2cmd/simple-virtio-blk.conf.cmd | 6 ++-- .../cfg2cmd/simple-zfs-over-iscsi.conf.cmd | 12 +++---- src/test/cfg2cmd/simple1-template.conf.cmd | 10 +++--- src/test/cfg2cmd/simple1.conf.cmd | 6 ++-- 25 files changed, 148 insertions(+), 135 deletions(-) diff --git a/src/PVE/QemuServer/DriveDevice.pm b/src/PVE/QemuServer/DriveDe= vice.pm index 77e3cb61..7db5395b 100644 --- a/src/PVE/QemuServer/DriveDevice.pm +++ b/src/PVE/QemuServer/DriveDevice.pm @@ -14,7 +14,7 @@ use base qw(Exporter); =20 our @EXPORT_OK =3D qw( get_drivedevice - print_drivedevice_controller + get_drivedevice_controller get_drivedevice_iothread scsihw_infos ); @@ -192,7 +192,7 @@ sub get_drivedevice { return $device; } =20 -sub print_drivedevice_controller { +sub get_drivedevice_controller { my ($conf, $drive, $scsihw, $arch, $bridges, $used_controller) =3D @_; =20 if ($drive->{interface} eq 'scsi') { @@ -200,16 +200,23 @@ sub print_drivedevice_controller { my ($maxdev, $controller, $controller_prefix) =3D scsihw_infos($co= nf, $drive); return if $used_controller->{scsi}->{$controller}; =20 - my $pciaddr =3D print_pci_addr("$controller_prefix$controller", $b= ridges, $arch); + my $controllerid =3D "$controller_prefix$controller"; + my $pciaddr =3D get_pci_addr($controllerid, $bridges, $arch); my $scsihw_type =3D $scsihw =3D~ m/^virtio-scsi-single/ ? "virtio-= scsi-pci" : $scsihw; =20 - my $iothread =3D ''; + my $device =3D { + id =3D> $controllerid, + driver =3D> $scsihw_type, + addr =3D> $pciaddr->{addr}, + bus =3D> $pciaddr->{bus}, + }; + if ( $conf->{scsihw} && $conf->{scsihw} eq "virtio-scsi-single" && $drive->{iothread} ) { - $iothread .=3D ",iothread=3Diothread-$controller_prefix$contro= ller"; + $device->{iothread} =3D "iothread-$controllerid"; } =20 my $queues =3D ''; @@ -218,22 +225,28 @@ sub print_drivedevice_controller { && $conf->{scsihw} eq "virtio-scsi-single" && $drive->{queues} ) { - $queues =3D ",num_queues=3D$drive->{queues}"; + $device->{'num_queues'} =3D int($drive->{queues}); } =20 $used_controller->{scsi}->{$controller} =3D 1; - return "$scsihw_type,id=3D$controller_prefix$controller$pciaddr$io= thread$queues"; + return $device; } =20 if ($drive->{interface} eq 'sata') { my $controller =3D int($drive->{index} / $PVE::QemuServer::Drive::= MAX_SATA_DISKS); return if $used_controller->{ahci}->{$controller}; =20 - my $pciaddr =3D print_pci_addr("ahci$controller", $bridges, $arch); + my $controllerid =3D "ahci$controller"; + my $pciaddr =3D get_pci_addr($controllerid, $bridges, $arch); =20 $used_controller->{ahci}->{$controller} =3D 1; - return "ahci,id=3Dahci$controller,multifunction=3Don$pciaddr"; - + return { + driver =3D> 'ahci', + id =3D> $controllerid, + multifunction =3D> 'on', + addr =3D> $pciaddr->{addr}, + bus =3D> $pciaddr->{bus}, + }; } } =20 diff --git a/src/test/cfg2cmd/aio.conf.cmd b/src/test/cfg2cmd/aio.conf.cmd index fbeccc9f..f834e75f 100644 --- a/src/test/cfg2cmd/aio.conf.cmd +++ b/src/test/cfg2cmd/aio.conf.cmd @@ -37,34 +37,34 @@ -device 'VGA,id=3Dvga,bus=3Dpci.0,addr=3D0x2' \ -device 'virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3,free-pa= ge-reporting=3Don' \ -iscsi 'initiator-name=3Diqn.1993-08.org.debian:01:aabbccddeeff' \ - -device 'lsi,id=3Dscsihw0,bus=3Dpci.0,addr=3D0x5' \ + -device '{"addr":"0x5","bus":"pci.0","driver":"lsi","id":"scsihw0"}' -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"raw","file":{"aio":"threads","cache":{"direct":= true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"= file","filename":"/var/lib/vz/images/8006/vm-8006-disk-0.raw","node-name":"= e3b2553803d55d43b9986a0aac3e9a7","read-only":false},"node-name":"f3b2553803= d55d43b9986a0aac3e9a7","read-only":false},"node-name":"drive-scsi0","read-o= nly":false,"throttle-group":"throttle-drive-scsi0"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,scsi-id=3D0,drive=3Ddrive-scsi0,id=3Dsc= si0,device_id=3Ddrive-scsi0,write-cache=3Don' \ + -device '{"bus":"scsihw0.0","device_id":"drive-scsi0","drive":"drive-scs= i0","driver":"scsi-hd","id":"scsi0","scsi-id":0,"write-cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"raw","file":{"aio":"native","cache":{"direct":t= rue,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"f= ile","filename":"/var/lib/vz/images/8006/vm-8006-disk-1.raw","node-name":"e= 08707d013893852b3d4d42301a4298","read-only":false},"node-name":"f08707d0138= 93852b3d4d42301a4298","read-only":false},"node-name":"drive-scsi1","read-on= ly":false,"throttle-group":"throttle-drive-scsi1"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,scsi-id=3D1,drive=3Ddrive-scsi1,id=3Dsc= si1,device_id=3Ddrive-scsi1,write-cache=3Don' \ + -device '{"bus":"scsihw0.0","device_id":"drive-scsi1","drive":"drive-scs= i1","driver":"scsi-hd","id":"scsi1","scsi-id":1,"write-cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct"= :true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":= "file","filename":"/var/lib/vz/images/8006/vm-8006-disk-2.raw","node-name":= "edb0854bba55e8b2544ad937c9f5afc","read-only":false},"node-name":"fdb0854bb= a55e8b2544ad937c9f5afc","read-only":false},"node-name":"drive-scsi2","read-= only":false,"throttle-group":"throttle-drive-scsi2"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,scsi-id=3D2,drive=3Ddrive-scsi2,id=3Dsc= si2,device_id=3Ddrive-scsi2,write-cache=3Don' \ + -device '{"bus":"scsihw0.0","device_id":"drive-scsi2","drive":"drive-scs= i2","driver":"scsi-hd","id":"scsi2","scsi-id":2,"write-cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct"= :true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":= "file","filename":"/var/lib/vz/images/8006/vm-8006-disk-3.raw","node-name":= "e9c170cb9491763cad3f31718205efc","read-only":false},"node-name":"f9c170cb9= 491763cad3f31718205efc","read-only":false},"node-name":"drive-scsi3","read-= only":false,"throttle-group":"throttle-drive-scsi3"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,scsi-id=3D3,drive=3Ddrive-scsi3,id=3Dsc= si3,device_id=3Ddrive-scsi3,write-cache=3Don' \ + -device '{"bus":"scsihw0.0","device_id":"drive-scsi3","drive":"drive-scs= i3","driver":"scsi-hd","id":"scsi3","scsi-id":3,"write-cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"raw","file":{"aio":"native","cache":{"direct":t= rue,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"f= ile","filename":"/mnt/pve/cifs-store/images/8006/vm-8006-disk-4.raw","node-= name":"ea34ecc24c40da0d53420ef344ced37","read-only":false},"node-name":"fa3= 4ecc24c40da0d53420ef344ced37","read-only":false},"node-name":"drive-scsi4",= "read-only":false,"throttle-group":"throttle-drive-scsi4"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,scsi-id=3D4,drive=3Ddrive-scsi4,id=3Dsc= si4,device_id=3Ddrive-scsi4,write-cache=3Don' \ + -device '{"bus":"scsihw0.0","device_id":"drive-scsi4","drive":"drive-scs= i4","driver":"scsi-hd","id":"scsi4","scsi-id":4,"write-cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct"= :true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":= "file","filename":"/mnt/pve/cifs-store/images/8006/vm-8006-disk-5.raw","nod= e-name":"e39cacf47a4f4877072601505d90949","read-only":false},"node-name":"f= 39cacf47a4f4877072601505d90949","read-only":false},"node-name":"drive-scsi5= ","read-only":false,"throttle-group":"throttle-drive-scsi5"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,scsi-id=3D5,drive=3Ddrive-scsi5,id=3Dsc= si5,device_id=3Ddrive-scsi5,write-cache=3Don' \ + -device '{"bus":"scsihw0.0","device_id":"drive-scsi5","drive":"drive-scs= i5","driver":"scsi-hd","id":"scsi5","scsi-id":5,"write-cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct"= :true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":= "host_device","filename":"/dev/rbd-pve/fc4181a6-56eb-4f68-b452-8ba1f381ca2a= /cpool/vm-8006-disk-6","node-name":"e7db1ee70981087e4a2861bc7da417b","read-= only":false},"node-name":"f7db1ee70981087e4a2861bc7da417b","read-only":fals= e},"node-name":"drive-scsi6","read-only":false,"throttle-group":"throttle-d= rive-scsi6"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,scsi-id=3D6,drive=3Ddrive-scsi6,id=3Dsc= si6,device_id=3Ddrive-scsi6,write-cache=3Don' \ - -device 'lsi,id=3Dscsihw1,bus=3Dpci.0,addr=3D0x6' \ + -device '{"bus":"scsihw0.0","device_id":"drive-scsi6","drive":"drive-scs= i6","driver":"scsi-hd","id":"scsi6","scsi-id":6,"write-cache":"on"}' \ + -device '{"addr":"0x6","bus":"pci.0","driver":"lsi","id":"scsihw1"}' -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct"= :true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":= "host_device","filename":"/dev/rbd-pve/fc4181a6-56eb-4f68-b452-8ba1f381ca2a= /cpool/vm-8006-disk-7","node-name":"e2d2deac808301140a96c862fe3ea85","read-= only":false},"node-name":"f2d2deac808301140a96c862fe3ea85","read-only":fals= e},"node-name":"drive-scsi7","read-only":false,"throttle-group":"throttle-d= rive-scsi7"}' \ - -device 'scsi-hd,bus=3Dscsihw1.0,scsi-id=3D0,drive=3Ddrive-scsi7,id=3Dsc= si7,device_id=3Ddrive-scsi7,write-cache=3Don' \ + -device '{"bus":"scsihw1.0","device_id":"drive-scsi7","drive":"drive-scs= i7","driver":"scsi-hd","id":"scsi7","scsi-id":0,"write-cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap"= ,"discard":"unmap","driver":"raw","file":{"aio":"threads","cache":{"direct"= :false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver"= :"host_device","filename":"/dev/rbd-pve/fc4181a6-56eb-4f68-b452-8ba1f381ca2= a/cpool/vm-8006-disk-8","node-name":"e9796b73db57b8943746ede7d0d3060","read= -only":false},"node-name":"f9796b73db57b8943746ede7d0d3060","read-only":fal= se},"node-name":"drive-scsi8","read-only":false,"throttle-group":"throttle-= drive-scsi8"}' \ - -device 'scsi-hd,bus=3Dscsihw1.0,scsi-id=3D1,drive=3Ddrive-scsi8,id=3Dsc= si8,device_id=3Ddrive-scsi8,write-cache=3Don' \ + -device '{"bus":"scsihw1.0","device_id":"drive-scsi8","drive":"drive-scs= i8","driver":"scsi-hd","id":"scsi8","scsi-id":1,"write-cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap"= ,"discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct= ":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver= ":"host_device","filename":"/dev/rbd-pve/fc4181a6-56eb-4f68-b452-8ba1f381ca= 2a/cpool/vm-8006-disk-9","node-name":"efa538892acc012edbdc5810035bf7d","rea= d-only":false},"node-name":"ffa538892acc012edbdc5810035bf7d","read-only":fa= lse},"node-name":"drive-scsi9","read-only":false,"throttle-group":"throttle= -drive-scsi9"}' \ - -device 'scsi-hd,bus=3Dscsihw1.0,scsi-id=3D2,drive=3Ddrive-scsi9,id=3Dsc= si9,device_id=3Ddrive-scsi9,write-cache=3Don' \ + -device '{"bus":"scsihw1.0","device_id":"drive-scsi9","drive":"drive-scs= i9","driver":"scsi-hd","id":"scsi9","scsi-id":2,"write-cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"raw","file":{"auth-client-required":["none"],"c= ache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"u= nmap","driver":"rbd","image":"vm-8006-disk-8","node-name":"e6f4cbffa741d16b= ba69304eb2800ef","pool":"cpool","read-only":false,"server":[{"host":"127.0.= 0.42","port":"3300"},{"host":"127.0.0.21","port":"3300"},{"host":"::1","por= t":"3300"}]},"node-name":"f6f4cbffa741d16bba69304eb2800ef","read-only":fals= e},"node-name":"drive-scsi10","read-only":false,"throttle-group":"throttle-= drive-scsi10"}' \ - -device 'scsi-hd,bus=3Dscsihw1.0,scsi-id=3D3,drive=3Ddrive-scsi10,id=3Ds= csi10,device_id=3Ddrive-scsi10,write-cache=3Don' \ + -device '{"bus":"scsihw1.0","device_id":"drive-scsi10","drive":"drive-sc= si10","driver":"scsi-hd","id":"scsi10","scsi-id":3,"write-cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"raw","file":{"auth-client-required":["none"],"c= ache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"u= nmap","driver":"rbd","image":"vm-8006-disk-8","node-name":"e42375c54de70f5f= 4be966d98c90255","pool":"cpool","read-only":false,"server":[{"host":"127.0.= 0.42","port":"3300"},{"host":"127.0.0.21","port":"3300"},{"host":"::1","por= t":"3300"}]},"node-name":"f42375c54de70f5f4be966d98c90255","read-only":fals= e},"node-name":"drive-scsi11","read-only":false,"throttle-group":"throttle-= drive-scsi11"}' \ - -device 'scsi-hd,bus=3Dscsihw1.0,scsi-id=3D4,drive=3Ddrive-scsi11,id=3Ds= csi11,device_id=3Ddrive-scsi11,write-cache=3Don' \ + -device '{"bus":"scsihw1.0","device_id":"drive-scsi11","drive":"drive-sc= si11","driver":"scsi-hd","id":"scsi11","scsi-id":4,"write-cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"raw","file":{"aio":"native","cache":{"direct":t= rue,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"h= ost_device","filename":"/dev/veegee/vm-8006-disk-9","node-name":"ed7b2c9e01= 33619fcf6cb8ce5903502","read-only":false},"node-name":"fd7b2c9e0133619fcf6c= b8ce5903502","read-only":false},"node-name":"drive-scsi12","read-only":fals= e,"throttle-group":"throttle-drive-scsi12"}' \ - -device 'scsi-hd,bus=3Dscsihw1.0,scsi-id=3D5,drive=3Ddrive-scsi12,id=3Ds= csi12,device_id=3Ddrive-scsi12,write-cache=3Don' \ + -device '{"bus":"scsihw1.0","device_id":"drive-scsi12","drive":"drive-sc= si12","driver":"scsi-hd","id":"scsi12","scsi-id":5,"write-cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct"= :true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":= "host_device","filename":"/dev/veegee/vm-8006-disk-9","node-name":"ed85420a= 880203ca1401d00a8edf132","read-only":false},"node-name":"fd85420a880203ca14= 01d00a8edf132","read-only":false},"node-name":"drive-scsi13","read-only":fa= lse,"throttle-group":"throttle-drive-scsi13"}' \ - -device 'scsi-hd,bus=3Dscsihw1.0,scsi-id=3D6,drive=3Ddrive-scsi13,id=3Ds= csi13,device_id=3Ddrive-scsi13,write-cache=3Don' \ + -device '{"bus":"scsihw1.0","device_id":"drive-scsi13","drive":"drive-sc= si13","driver":"scsi-hd","id":"scsi13","scsi-id":6,"write-cache":"on"}' \ -machine 'type=3Dpc+pve0' diff --git a/src/test/cfg2cmd/bootorder-empty.conf.cmd b/src/test/cfg2cmd/b= ootorder-empty.conf.cmd index 3516b344..39548726 100644 --- a/src/test/cfg2cmd/bootorder-empty.conf.cmd +++ b/src/test/cfg2cmd/bootorder-empty.conf.cmd @@ -16,9 +16,9 @@ -cpu kvm64,enforce,+kvm_pv_eoi,+kvm_pv_unhalt,+lahf_lm,+sep \ -m 768 \ -object '{"id":"throttle-drive-scsi4","limits":{},"qom-type":"throttle-g= roup"}' \ - -object 'iothread,id=3Diothread-virtio0' \ + -object '{"id":"iothread-virtio0","qom-type":"iothread"}' \ -object '{"id":"throttle-drive-virtio0","limits":{},"qom-type":"throttle= -group"}' \ - -object 'iothread,id=3Diothread-virtio1' \ + -object '{"id":"iothread-virtio1","qom-type":"iothread"}' \ -object '{"id":"throttle-drive-virtio1","limits":{},"qom-type":"throttle= -group"}' \ -global 'PIIX4_PM.disable_s3=3D1' \ -global 'PIIX4_PM.disable_s4=3D1' \ @@ -30,14 +30,14 @@ -device 'VGA,id=3Dvga,bus=3Dpci.0,addr=3D0x2' \ -device 'virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3,free-pa= ge-reporting=3Don' \ -iscsi 'initiator-name=3Diqn.1993-08.org.debian:01:aabbccddeeff' \ - -device 'ide-cd,bus=3Dide.1,unit=3D0,id=3Dide2' \ - -device 'lsi,id=3Dscsihw0,bus=3Dpci.0,addr=3D0x5' \ + -device '{"bus":"ide.1","driver":"ide-cd","id":"ide2","unit":0}' \ + -device '{"addr":"0x5","bus":"pci.0","driver":"lsi","id":"scsihw0"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direc= t":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver= ":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-0.qcow2","node-na= me":"e6bf62e20f6c14a2c19bd6f1f5ac36c","read-only":false},"node-name":"f6bf6= 2e20f6c14a2c19bd6f1f5ac36c","read-only":false},"node-name":"drive-scsi4","r= ead-only":false,"throttle-group":"throttle-drive-scsi4"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,scsi-id=3D4,drive=3Ddrive-scsi4,id=3Dsc= si4,device_id=3Ddrive-scsi4,write-cache=3Don' \ + -device '{"bus":"scsihw0.0","device_id":"drive-scsi4","drive":"drive-scs= i4","driver":"scsi-hd","id":"scsi4","scsi-id":4,"write-cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direc= t":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver= ":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-0.qcow2","node-na= me":"edd19f6c1b3a6d5a6248c3376a91a16","read-only":false},"node-name":"fdd19= f6c1b3a6d5a6248c3376a91a16","read-only":false},"node-name":"drive-virtio0",= "read-only":false,"throttle-group":"throttle-drive-virtio0"}' \ - -device 'virtio-blk-pci,drive=3Ddrive-virtio0,id=3Dvirtio0,bus=3Dpci.0,a= ddr=3D0xa,iothread=3Diothread-virtio0,write-cache=3Don' \ + -device '{"addr":"0xa","bus":"pci.0","drive":"drive-virtio0","driver":"v= irtio-blk-pci","id":"virtio0","iothread":"iothread-virtio0","write-cache":"= on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direc= t":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver= ":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-0.qcow2","node-na= me":"eeb683fb9c516c1a8707c917f0d7a38","read-only":false},"node-name":"feb68= 3fb9c516c1a8707c917f0d7a38","read-only":false},"node-name":"drive-virtio1",= "read-only":false,"throttle-group":"throttle-drive-virtio1"}' \ - -device 'virtio-blk-pci,drive=3Ddrive-virtio1,id=3Dvirtio1,bus=3Dpci.0,a= ddr=3D0xb,iothread=3Diothread-virtio1,write-cache=3Don' \ + -device '{"addr":"0xb","bus":"pci.0","drive":"drive-virtio1","driver":"v= irtio-blk-pci","id":"virtio1","iothread":"iothread-virtio1","write-cache":"= on"}' \ -netdev 'type=3Dtap,id=3Dnet0,ifname=3Dtap8006i0,script=3D/usr/libexec/q= emu-server/pve-bridge,downscript=3D/usr/libexec/qemu-server/pve-bridgedown,= vhost=3Don' \ -device 'virtio-net-pci,mac=3DA2:C0:43:77:08:A0,netdev=3Dnet0,bus=3Dpci.= 0,addr=3D0x12,id=3Dnet0,rx_queue_size=3D1024,tx_queue_size=3D256' \ -machine 'type=3Dpc+pve0' diff --git a/src/test/cfg2cmd/bootorder-legacy.conf.cmd b/src/test/cfg2cmd/= bootorder-legacy.conf.cmd index c86ab6f9..7e4a5422 100644 --- a/src/test/cfg2cmd/bootorder-legacy.conf.cmd +++ b/src/test/cfg2cmd/bootorder-legacy.conf.cmd @@ -16,9 +16,9 @@ -cpu kvm64,enforce,+kvm_pv_eoi,+kvm_pv_unhalt,+lahf_lm,+sep \ -m 768 \ -object '{"id":"throttle-drive-scsi4","limits":{},"qom-type":"throttle-g= roup"}' \ - -object 'iothread,id=3Diothread-virtio0' \ + -object '{"id":"iothread-virtio0","qom-type":"iothread"}' \ -object '{"id":"throttle-drive-virtio0","limits":{},"qom-type":"throttle= -group"}' \ - -object 'iothread,id=3Diothread-virtio1' \ + -object '{"id":"iothread-virtio1","qom-type":"iothread"}' \ -object '{"id":"throttle-drive-virtio1","limits":{},"qom-type":"throttle= -group"}' \ -global 'PIIX4_PM.disable_s3=3D1' \ -global 'PIIX4_PM.disable_s4=3D1' \ @@ -30,14 +30,14 @@ -device 'VGA,id=3Dvga,bus=3Dpci.0,addr=3D0x2' \ -device 'virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3,free-pa= ge-reporting=3Don' \ -iscsi 'initiator-name=3Diqn.1993-08.org.debian:01:aabbccddeeff' \ - -device 'ide-cd,bus=3Dide.1,unit=3D0,id=3Dide2,bootindex=3D200' \ - -device 'lsi,id=3Dscsihw0,bus=3Dpci.0,addr=3D0x5' \ + -device '{"bootindex":200,"bus":"ide.1","driver":"ide-cd","id":"ide2","u= nit":0}' \ + -device '{"addr":"0x5","bus":"pci.0","driver":"lsi","id":"scsihw0"}' -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direc= t":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver= ":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-0.qcow2","node-na= me":"e6bf62e20f6c14a2c19bd6f1f5ac36c","read-only":false},"node-name":"f6bf6= 2e20f6c14a2c19bd6f1f5ac36c","read-only":false},"node-name":"drive-scsi4","r= ead-only":false,"throttle-group":"throttle-drive-scsi4"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,scsi-id=3D4,drive=3Ddrive-scsi4,id=3Dsc= si4,device_id=3Ddrive-scsi4,write-cache=3Don' \ + -device '{"bus":"scsihw0.0","device_id":"drive-scsi4","drive":"drive-scs= i4","driver":"scsi-hd","id":"scsi4","scsi-id":4,"write-cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direc= t":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver= ":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-0.qcow2","node-na= me":"edd19f6c1b3a6d5a6248c3376a91a16","read-only":false},"node-name":"fdd19= f6c1b3a6d5a6248c3376a91a16","read-only":false},"node-name":"drive-virtio0",= "read-only":false,"throttle-group":"throttle-drive-virtio0"}' \ - -device 'virtio-blk-pci,drive=3Ddrive-virtio0,id=3Dvirtio0,bus=3Dpci.0,a= ddr=3D0xa,iothread=3Diothread-virtio0,write-cache=3Don' \ + -device '{"addr":"0xa","bus":"pci.0","drive":"drive-virtio0","driver":"v= irtio-blk-pci","id":"virtio0","iothread":"iothread-virtio0","write-cache":"= on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direc= t":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver= ":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-0.qcow2","node-na= me":"eeb683fb9c516c1a8707c917f0d7a38","read-only":false},"node-name":"feb68= 3fb9c516c1a8707c917f0d7a38","read-only":false},"node-name":"drive-virtio1",= "read-only":false,"throttle-group":"throttle-drive-virtio1"}' \ - -device 'virtio-blk-pci,drive=3Ddrive-virtio1,id=3Dvirtio1,bus=3Dpci.0,a= ddr=3D0xb,iothread=3Diothread-virtio1,bootindex=3D302,write-cache=3Don' \ + -device '{"addr":"0xb","bootindex":302,"bus":"pci.0","drive":"drive-virt= io1","driver":"virtio-blk-pci","id":"virtio1","iothread":"iothread-virtio1"= ,"write-cache":"on"}' \ -netdev 'type=3Dtap,id=3Dnet0,ifname=3Dtap8006i0,script=3D/usr/libexec/q= emu-server/pve-bridge,downscript=3D/usr/libexec/qemu-server/pve-bridgedown,= vhost=3Don' \ -device 'virtio-net-pci,mac=3DA2:C0:43:77:08:A0,netdev=3Dnet0,bus=3Dpci.= 0,addr=3D0x12,id=3Dnet0,rx_queue_size=3D1024,tx_queue_size=3D256,bootindex= =3D100' \ -machine 'type=3Dpc+pve0' diff --git a/src/test/cfg2cmd/bootorder.conf.cmd b/src/test/cfg2cmd/bootord= er.conf.cmd index 48f9da8b..20b46f6c 100644 --- a/src/test/cfg2cmd/bootorder.conf.cmd +++ b/src/test/cfg2cmd/bootorder.conf.cmd @@ -16,9 +16,9 @@ -cpu kvm64,enforce,+kvm_pv_eoi,+kvm_pv_unhalt,+lahf_lm,+sep \ -m 768 \ -object '{"id":"throttle-drive-scsi4","limits":{},"qom-type":"throttle-g= roup"}' \ - -object 'iothread,id=3Diothread-virtio0' \ + -object '{"id":"iothread-virtio0","qom-type":"iothread"}' \ -object '{"id":"throttle-drive-virtio0","limits":{},"qom-type":"throttle= -group"}' \ - -object 'iothread,id=3Diothread-virtio1' \ + -object '{"id":"iothread-virtio1","qom-type":"iothread"}' \ -object '{"id":"throttle-drive-virtio1","limits":{},"qom-type":"throttle= -group"}' \ -global 'PIIX4_PM.disable_s3=3D1' \ -global 'PIIX4_PM.disable_s4=3D1' \ @@ -30,14 +30,14 @@ -device 'VGA,id=3Dvga,bus=3Dpci.0,addr=3D0x2' \ -device 'virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3,free-pa= ge-reporting=3Don' \ -iscsi 'initiator-name=3Diqn.1993-08.org.debian:01:aabbccddeeff' \ - -device 'ide-cd,bus=3Dide.1,unit=3D0,id=3Dide2,bootindex=3D103' \ - -device 'lsi,id=3Dscsihw0,bus=3Dpci.0,addr=3D0x5' \ + -device '{"bootindex":103,"bus":"ide.1","driver":"ide-cd","id":"ide2","u= nit":0}' \ + -device '{"addr":"0x5","bus":"pci.0","driver":"lsi","id":"scsihw0"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direc= t":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver= ":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-0.qcow2","node-na= me":"e6bf62e20f6c14a2c19bd6f1f5ac36c","read-only":false},"node-name":"f6bf6= 2e20f6c14a2c19bd6f1f5ac36c","read-only":false},"node-name":"drive-scsi4","r= ead-only":false,"throttle-group":"throttle-drive-scsi4"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,scsi-id=3D4,drive=3Ddrive-scsi4,id=3Dsc= si4,device_id=3Ddrive-scsi4,bootindex=3D102,write-cache=3Don' \ + -device '{"bootindex":102,"bus":"scsihw0.0","device_id":"drive-scsi4","d= rive":"drive-scsi4","driver":"scsi-hd","id":"scsi4","scsi-id":4,"write-cach= e":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direc= t":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver= ":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-0.qcow2","node-na= me":"edd19f6c1b3a6d5a6248c3376a91a16","read-only":false},"node-name":"fdd19= f6c1b3a6d5a6248c3376a91a16","read-only":false},"node-name":"drive-virtio0",= "read-only":false,"throttle-group":"throttle-drive-virtio0"}' \ - -device 'virtio-blk-pci,drive=3Ddrive-virtio0,id=3Dvirtio0,bus=3Dpci.0,a= ddr=3D0xa,iothread=3Diothread-virtio0,write-cache=3Don' \ + -device '{"addr":"0xa","bus":"pci.0","drive":"drive-virtio0","driver":"v= irtio-blk-pci","id":"virtio0","iothread":"iothread-virtio0","write-cache":"= on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direc= t":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver= ":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-0.qcow2","node-na= me":"eeb683fb9c516c1a8707c917f0d7a38","read-only":false},"node-name":"feb68= 3fb9c516c1a8707c917f0d7a38","read-only":false},"node-name":"drive-virtio1",= "read-only":false,"throttle-group":"throttle-drive-virtio1"}' \ - -device 'virtio-blk-pci,drive=3Ddrive-virtio1,id=3Dvirtio1,bus=3Dpci.0,a= ddr=3D0xb,iothread=3Diothread-virtio1,bootindex=3D100,write-cache=3Don' \ + -device '{"addr":"0xb","bootindex":100,"bus":"pci.0","drive":"drive-virt= io1","driver":"virtio-blk-pci","id":"virtio1","iothread":"iothread-virtio1"= ,"write-cache":"on"}' \ -netdev 'type=3Dtap,id=3Dnet0,ifname=3Dtap8006i0,script=3D/usr/libexec/q= emu-server/pve-bridge,downscript=3D/usr/libexec/qemu-server/pve-bridgedown,= vhost=3Don' \ -device 'virtio-net-pci,mac=3DA2:C0:43:77:08:A0,netdev=3Dnet0,bus=3Dpci.= 0,addr=3D0x12,id=3Dnet0,rx_queue_size=3D1024,tx_queue_size=3D256,bootindex= =3D101' \ -machine 'type=3Dpc+pve0' diff --git a/src/test/cfg2cmd/cputype-icelake-client-deprecation.conf.cmd b= /src/test/cfg2cmd/cputype-icelake-client-deprecation.conf.cmd index e6429c9f..587012aa 100644 --- a/src/test/cfg2cmd/cputype-icelake-client-deprecation.conf.cmd +++ b/src/test/cfg2cmd/cputype-icelake-client-deprecation.conf.cmd @@ -26,8 +26,8 @@ -device 'VGA,id=3Dvga,bus=3Dpci.0,addr=3D0x2' \ -device 'virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3,free-pa= ge-reporting=3Don' \ -iscsi 'initiator-name=3Diqn.1993-08.org.debian:01:aabbccddeeff' \ - -device 'ide-cd,bus=3Dide.1,unit=3D0,id=3Dide2,bootindex=3D200' \ - -device 'virtio-scsi-pci,id=3Dscsihw0,bus=3Dpci.0,addr=3D0x5' \ + -device '{"bootindex":200,"bus":"ide.1","driver":"ide-cd","id":"ide2","u= nit":0}' \ + -device '{"addr":"0x5","bus":"pci.0","driver":"virtio-scsi-pci","id":"sc= sihw0"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direc= t":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver= ":"file","filename":"/var/lib/vz/images/8006/base-8006-disk-0.qcow2","node-= name":"e417d5947e69c5890b1e3ddf8a68167","read-only":false},"node-name":"f41= 7d5947e69c5890b1e3ddf8a68167","read-only":false},"node-name":"drive-scsi0",= "read-only":false,"throttle-group":"throttle-drive-scsi0"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive= =3Ddrive-scsi0,id=3Dscsi0,device_id=3Ddrive-scsi0,bootindex=3D100,write-cac= he=3Don' \ + -device '{"bootindex":100,"bus":"scsihw0.0","channel":0,"device_id":"dri= ve-scsi0","drive":"drive-scsi0","driver":"scsi-hd","id":"scsi0","lun":0,"sc= si-id":0,"write-cache":"on"}' \ -machine 'type=3Dpc+pve0' diff --git a/src/test/cfg2cmd/ide.conf.cmd b/src/test/cfg2cmd/ide.conf.cmd index 6b5a52a9..643b7dcc 100644 --- a/src/test/cfg2cmd/ide.conf.cmd +++ b/src/test/cfg2cmd/ide.conf.cmd @@ -31,16 +31,16 @@ -device 'virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3,free-pa= ge-reporting=3Don' \ -iscsi 'initiator-name=3Diqn.1993-08.org.debian:01:aabbccddeeff' \ -blockdev '{"driver":"throttle","file":{"cache":{"direct":false,"no-flus= h":false},"driver":"raw","file":{"aio":"io_uring","cache":{"direct":false,"= no-flush":false},"driver":"file","filename":"/var/lib/vz/template/iso/zero.= iso","node-name":"e19e15bf93b8cf09e2a5d1669648165","read-only":true},"node-= name":"f19e15bf93b8cf09e2a5d1669648165","read-only":true},"node-name":"driv= e-ide0","read-only":true,"throttle-group":"throttle-drive-ide0"}' \ - -device 'ide-cd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0,id=3Dide0,bootin= dex=3D200' \ + -device '{"bootindex":200,"bus":"ide.0","drive":"drive-ide0","driver":"i= de-cd","id":"ide0","unit":0}' \ -blockdev '{"driver":"throttle","file":{"cache":{"direct":false,"no-flus= h":false},"driver":"raw","file":{"aio":"threads","cache":{"direct":false,"n= o-flush":false},"driver":"file","filename":"/mnt/pve/cifs-store/template/is= o/one.iso","node-name":"e247a6535f864815c8e9dbb5a118336","read-only":true},= "node-name":"f247a6535f864815c8e9dbb5a118336","read-only":true},"node-name"= :"drive-ide1","read-only":true,"throttle-group":"throttle-drive-ide1"}' \ - -device 'ide-cd,bus=3Dide.0,unit=3D1,drive=3Ddrive-ide1,id=3Dide1,bootin= dex=3D201' \ + -device '{"bootindex":201,"bus":"ide.0","drive":"drive-ide1","driver":"i= de-cd","id":"ide1","unit":1}' \ -blockdev '{"driver":"throttle","file":{"cache":{"direct":false,"no-flus= h":false},"driver":"raw","file":{"aio":"threads","cache":{"direct":false,"n= o-flush":false},"driver":"file","filename":"/mnt/pve/cifs-store/template/is= o/two.iso","node-name":"ec78a64f692c2fa9f873a111580aebd","read-only":true},= "node-name":"fc78a64f692c2fa9f873a111580aebd","read-only":true},"node-name"= :"drive-ide2","read-only":true,"throttle-group":"throttle-drive-ide2"}' \ - -device 'ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide2,id=3Dide2,bootin= dex=3D202' \ + -device '{"bootindex":202,"bus":"ide.1","drive":"drive-ide2","driver":"i= de-cd","id":"ide2","unit":0}' \ -blockdev '{"driver":"throttle","file":{"cache":{"direct":false,"no-flus= h":false},"driver":"raw","file":{"aio":"threads","cache":{"direct":false,"n= o-flush":false},"driver":"file","filename":"/mnt/pve/cifs-store/template/is= o/three.iso","node-name":"e35557bae4bcbf9edc9f7ff7f132f30","read-only":true= },"node-name":"f35557bae4bcbf9edc9f7ff7f132f30","read-only":true},"node-nam= e":"drive-ide3","read-only":true,"throttle-group":"throttle-drive-ide3"}' \ - -device 'ide-cd,bus=3Dide.1,unit=3D1,drive=3Ddrive-ide3,id=3Dide3,bootin= dex=3D203' \ - -device 'virtio-scsi-pci,id=3Dscsihw0,bus=3Dpci.0,addr=3D0x5' \ + -device '{"bootindex":203,"bus":"ide.1","drive":"drive-ide3","driver":"i= de-cd","id":"ide3","unit":1}' \ + -device '{"addr":"0x5","bus":"pci.0","driver":"virtio-scsi-pci","id":"sc= sihw0"}' \ -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle",= "file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","disc= ard":"ignore","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":t= rue,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"fil= e","filename":"/var/lib/vz/images/100/vm-100-disk-2.qcow2","node-name":"ec1= 1e0572184321efc5835152b95d5d","read-only":false},"node-name":"fc11e05721843= 21efc5835152b95d5d","read-only":false},"node-name":"drive-scsi0","read-only= ":false,"throttle-group":"throttle-drive-scsi0"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive= =3Ddrive-scsi0,id=3Dscsi0,device_id=3Ddrive-scsi0,bootindex=3D100,write-cac= he=3Don' \ + -device '{"bootindex":100,"bus":"scsihw0.0","channel":0,"device_id":"dri= ve-scsi0","drive":"drive-scsi0","driver":"scsi-hd","id":"scsi0","lun":0,"sc= si-id":0,"write-cache":"on"}' \ -netdev 'type=3Dtap,id=3Dnet0,ifname=3Dtap8006i0,script=3D/usr/libexec/q= emu-server/pve-bridge,downscript=3D/usr/libexec/qemu-server/pve-bridgedown,= vhost=3Don' \ -device 'virtio-net-pci,mac=3D2E:01:68:F9:9C:87,netdev=3Dnet0,bus=3Dpci.= 0,addr=3D0x12,id=3Dnet0,rx_queue_size=3D1024,tx_queue_size=3D256,bootindex= =3D300' \ -machine 'type=3Dpc+pve0' diff --git a/src/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd b/src/test/cf= g2cmd/pinned-version-pxe-pve.conf.cmd index 7301e3fa..25faa8e8 100644 --- a/src/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd +++ b/src/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd @@ -24,10 +24,10 @@ -device 'virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3' \ -iscsi 'initiator-name=3Diqn.1993-08.org.debian:01:aabbccddeeff' \ -drive 'if=3Dnone,id=3Ddrive-ide2,media=3Dcdrom,aio=3Dio_uring' \ - -device 'ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide2,id=3Dide2,bootin= dex=3D200' \ - -device 'virtio-scsi-pci,id=3Dscsihw0,bus=3Dpci.0,addr=3D0x5' \ + -device '{"bootindex":200,"bus":"ide.1","drive":"drive-ide2","driver":"i= de-cd","id":"ide2","unit":0}' \ + -device '{"addr":"0x5","bus":"pci.0","driver":"virtio-scsi-pci","id":"sc= sihw0"}' \ -drive 'file=3D/var/lib/vz/images/8006/vm-8006-disk-0.raw,if=3Dnone,id= =3Ddrive-scsi0,discard=3Don,format=3Draw,cache=3Dnone,aio=3Dio_uring,detect= -zeroes=3Dunmap' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive= =3Ddrive-scsi0,id=3Dscsi0,bootindex=3D100' \ + -device '{"bootindex":100,"bus":"scsihw0.0","channel":0,"drive":"drive-s= csi0","driver":"scsi-hd","id":"scsi0","lun":0,"scsi-id":0}' \ -netdev 'type=3Dtap,id=3Dnet0,ifname=3Dtap8006i0,script=3D/usr/libexec/q= emu-server/pve-bridge,downscript=3D/usr/libexec/qemu-server/pve-bridgedown,= vhost=3Don' \ -device 'virtio-net-pci,mac=3DA2:C0:43:77:08:A1,netdev=3Dnet0,bus=3Dpci.= 0,addr=3D0x12,id=3Dnet0,bootindex=3D300,romfile=3Dpxe-virtio.rom' \ -machine 'type=3Dpc-q35-4.1+pve2' diff --git a/src/test/cfg2cmd/pinned-version-pxe.conf.cmd b/src/test/cfg2cm= d/pinned-version-pxe.conf.cmd index 89be8c69..ee954f9d 100644 --- a/src/test/cfg2cmd/pinned-version-pxe.conf.cmd +++ b/src/test/cfg2cmd/pinned-version-pxe.conf.cmd @@ -22,10 +22,10 @@ -device 'virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3' \ -iscsi 'initiator-name=3Diqn.1993-08.org.debian:01:aabbccddeeff' \ -drive 'if=3Dnone,id=3Ddrive-ide2,media=3Dcdrom,aio=3Dio_uring' \ - -device 'ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide2,id=3Dide2,bootin= dex=3D200' \ - -device 'virtio-scsi-pci,id=3Dscsihw0,bus=3Dpci.0,addr=3D0x5' \ + -device '{"bootindex":200,"bus":"ide.1","drive":"drive-ide2","driver":"i= de-cd","id":"ide2","unit":0}' \ + -device '{"addr":"0x5","bus":"pci.0","driver":"virtio-scsi-pci","id":"sc= sihw0"}' \ -drive 'file=3D/var/lib/vz/images/8006/vm-8006-disk-0.raw,if=3Dnone,id= =3Ddrive-scsi0,discard=3Don,format=3Draw,cache=3Dnone,aio=3Dio_uring,detect= -zeroes=3Dunmap' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive= =3Ddrive-scsi0,id=3Dscsi0,bootindex=3D100' \ + -device '{"bootindex":100,"bus":"scsihw0.0","channel":0,"drive":"drive-s= csi0","driver":"scsi-hd","id":"scsi0","lun":0,"scsi-id":0}' \ -netdev 'type=3Dtap,id=3Dnet0,ifname=3Dtap8006i0,script=3D/usr/libexec/q= emu-server/pve-bridge,downscript=3D/usr/libexec/qemu-server/pve-bridgedown,= vhost=3Don' \ -device 'virtio-net-pci,mac=3DA2:C0:43:77:08:A1,netdev=3Dnet0,bus=3Dpci.= 0,addr=3D0x12,id=3Dnet0,bootindex=3D300,romfile=3Dpxe-virtio.rom' \ -machine 'type=3Dpc-q35-5.1+pve0' diff --git a/src/test/cfg2cmd/pinned-version.conf.cmd b/src/test/cfg2cmd/pi= nned-version.conf.cmd index da161ad9..daa04fc2 100644 --- a/src/test/cfg2cmd/pinned-version.conf.cmd +++ b/src/test/cfg2cmd/pinned-version.conf.cmd @@ -22,10 +22,10 @@ -device 'virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3' \ -iscsi 'initiator-name=3Diqn.1993-08.org.debian:01:aabbccddeeff' \ -drive 'if=3Dnone,id=3Ddrive-ide2,media=3Dcdrom,aio=3Dio_uring' \ - -device 'ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide2,id=3Dide2,bootin= dex=3D200' \ - -device 'virtio-scsi-pci,id=3Dscsihw0,bus=3Dpci.0,addr=3D0x5' \ + -device '{"bootindex":200,"bus":"ide.1","drive":"drive-ide2","driver":"i= de-cd","id":"ide2","unit":0}' \ + -device '{"addr":"0x5","bus":"pci.0","driver":"virtio-scsi-pci","id":"sc= sihw0"}' \ -drive 'file=3D/var/lib/vz/images/8006/vm-8006-disk-0.raw,if=3Dnone,id= =3Ddrive-scsi0,discard=3Don,format=3Draw,cache=3Dnone,aio=3Dio_uring,detect= -zeroes=3Dunmap' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive= =3Ddrive-scsi0,id=3Dscsi0,bootindex=3D100' \ + -device '{"bootindex":100,"bus":"scsihw0.0","channel":0,"drive":"drive-s= csi0","driver":"scsi-hd","id":"scsi0","lun":0,"scsi-id":0}' \ -netdev 'type=3Dtap,id=3Dnet0,ifname=3Dtap8006i0,script=3D/usr/libexec/q= emu-server/pve-bridge,downscript=3D/usr/libexec/qemu-server/pve-bridgedown,= vhost=3Don' \ -device 'virtio-net-pci,mac=3DA2:C0:43:77:08:A1,netdev=3Dnet0,bus=3Dpci.= 0,addr=3D0x12,id=3Dnet0,bootindex=3D300' \ -machine 'type=3Dpc-q35-3.1+pve0' diff --git a/src/test/cfg2cmd/q35-ide.conf.cmd b/src/test/cfg2cmd/q35-ide.c= onf.cmd index 475e58d9..1eebf070 100644 --- a/src/test/cfg2cmd/q35-ide.conf.cmd +++ b/src/test/cfg2cmd/q35-ide.conf.cmd @@ -30,16 +30,16 @@ -device 'virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3,free-pa= ge-reporting=3Don' \ -iscsi 'initiator-name=3Diqn.1993-08.org.debian:01:aabbccddeeff' \ -blockdev '{"driver":"throttle","file":{"cache":{"direct":false,"no-flus= h":false},"driver":"raw","file":{"aio":"threads","cache":{"direct":false,"n= o-flush":false},"driver":"file","filename":"/mnt/pve/cifs-store/template/is= o/zero.iso","node-name":"e1677eafc00b7016099210662868e38","read-only":true}= ,"node-name":"f1677eafc00b7016099210662868e38","read-only":true},"node-name= ":"drive-ide0","read-only":true,"throttle-group":"throttle-drive-ide0"}' \ - -device 'ide-cd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0,id=3Dide0,bootin= dex=3D200' \ + -device '{"bootindex":200,"bus":"ide.0","drive":"drive-ide0","driver":"i= de-cd","id":"ide0","unit":0}' \ -blockdev '{"driver":"throttle","file":{"cache":{"direct":false,"no-flus= h":false},"driver":"raw","file":{"aio":"threads","cache":{"direct":false,"n= o-flush":false},"driver":"file","filename":"/mnt/pve/cifs-store/template/is= o/one.iso","node-name":"e247a6535f864815c8e9dbb5a118336","read-only":true},= "node-name":"f247a6535f864815c8e9dbb5a118336","read-only":true},"node-name"= :"drive-ide1","read-only":true,"throttle-group":"throttle-drive-ide1"}' \ - -device 'ide-cd,bus=3Dide.2,unit=3D0,drive=3Ddrive-ide1,id=3Dide1,bootin= dex=3D201' \ + -device '{"bootindex":201,"bus":"ide.2","drive":"drive-ide1","driver":"i= de-cd","id":"ide1","unit":0}' \ -blockdev '{"driver":"throttle","file":{"cache":{"direct":false,"no-flus= h":false},"driver":"raw","file":{"aio":"threads","cache":{"direct":false,"n= o-flush":false},"driver":"file","filename":"/mnt/pve/cifs-store/template/is= o/two.iso","node-name":"ec78a64f692c2fa9f873a111580aebd","read-only":true},= "node-name":"fc78a64f692c2fa9f873a111580aebd","read-only":true},"node-name"= :"drive-ide2","read-only":true,"throttle-group":"throttle-drive-ide2"}' \ - -device 'ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide2,id=3Dide2,bootin= dex=3D202' \ + -device '{"bootindex":202,"bus":"ide.1","drive":"drive-ide2","driver":"i= de-cd","id":"ide2","unit":0}' \ -blockdev '{"driver":"throttle","file":{"cache":{"direct":false,"no-flus= h":false},"driver":"raw","file":{"aio":"threads","cache":{"direct":false,"n= o-flush":false},"driver":"file","filename":"/mnt/pve/cifs-store/template/is= o/three.iso","node-name":"e35557bae4bcbf9edc9f7ff7f132f30","read-only":true= },"node-name":"f35557bae4bcbf9edc9f7ff7f132f30","read-only":true},"node-nam= e":"drive-ide3","read-only":true,"throttle-group":"throttle-drive-ide3"}' \ - -device 'ide-cd,bus=3Dide.3,unit=3D0,drive=3Ddrive-ide3,id=3Dide3,bootin= dex=3D203' \ - -device 'virtio-scsi-pci,id=3Dscsihw0,bus=3Dpci.0,addr=3D0x5' \ + -device '{"bootindex":203,"bus":"ide.3","drive":"drive-ide3","driver":"i= de-cd","id":"ide3","unit":0}' \ + -device '{"addr":"0x5","bus":"pci.0","driver":"virtio-scsi-pci","id":"sc= sihw0"}' \ -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle",= "file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","disc= ard":"ignore","driver":"qcow2","file":{"aio":"io_uring","cache":{"direct":t= rue,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"fil= e","filename":"/var/lib/vz/images/100/vm-100-disk-2.qcow2","node-name":"ec1= 1e0572184321efc5835152b95d5d","read-only":false},"node-name":"fc11e05721843= 21efc5835152b95d5d","read-only":false},"node-name":"drive-scsi0","read-only= ":false,"throttle-group":"throttle-drive-scsi0"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive= =3Ddrive-scsi0,id=3Dscsi0,device_id=3Ddrive-scsi0,bootindex=3D100,write-cac= he=3Don' \ + -device '{"bootindex":100,"bus":"scsihw0.0","channel":0,"device_id":"dri= ve-scsi0","drive":"drive-scsi0","driver":"scsi-hd","id":"scsi0","lun":0,"sc= si-id":0,"write-cache":"on"}' \ -netdev 'type=3Dtap,id=3Dnet0,ifname=3Dtap8006i0,script=3D/usr/libexec/q= emu-server/pve-bridge,downscript=3D/usr/libexec/qemu-server/pve-bridgedown,= vhost=3Don' \ -device 'virtio-net-pci,mac=3D2E:01:68:F9:9C:87,netdev=3Dnet0,bus=3Dpci.= 0,addr=3D0x12,id=3Dnet0,rx_queue_size=3D1024,tx_queue_size=3D256,bootindex= =3D300' \ -machine 'type=3Dq35+pve0' diff --git a/src/test/cfg2cmd/q35-linux-hostpci-template.conf.cmd b/src/tes= t/cfg2cmd/q35-linux-hostpci-template.conf.cmd index 20e3c81d..b42955ae 100644 --- a/src/test/cfg2cmd/q35-linux-hostpci-template.conf.cmd +++ b/src/test/cfg2cmd/q35-linux-hostpci-template.conf.cmd @@ -27,8 +27,8 @@ -device 'usb-tablet,id=3Dtablet,bus=3Duhci.0,port=3D1' \ -device 'virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3,free-pa= ge-reporting=3Don' \ -iscsi 'initiator-name=3Diqn.1993-08.org.debian:01:aabbccddeeff' \ - -device 'virtio-scsi-pci,id=3Dscsihw0,bus=3Dpci.0,addr=3D0x5' \ + -device '{"addr":"0x5","bus":"pci.0","driver":"virtio-scsi-pci","id":"sc= sihw0"}' \ -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle",= "file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","disc= ard":"ignore","driver":"raw","file":{"aio":"io_uring","cache":{"direct":tru= e,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file"= ,"filename":"/var/lib/vz/images/100/base-100-disk-2.raw","node-name":"e24df= e239201bb9924fc4cfb899ca70","read-only":true},"node-name":"f24dfe239201bb99= 24fc4cfb899ca70","read-only":true},"node-name":"drive-scsi0","read-only":tr= ue,"throttle-group":"throttle-drive-scsi0"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive= =3Ddrive-scsi0,id=3Dscsi0,device_id=3Ddrive-scsi0,write-cache=3Don' \ + -device '{"bus":"scsihw0.0","channel":0,"device_id":"drive-scsi0","drive= ":"drive-scsi0","driver":"scsi-hd","id":"scsi0","lun":0,"scsi-id":0,"write-= cache":"on"}' \ -machine 'pflash0=3Dpflash0,pflash1=3Ddrive-efidisk0,accel=3Dtcg,type=3D= pc+pve0' \ -snapshot diff --git a/src/test/cfg2cmd/seabios_serial.conf.cmd b/src/test/cfg2cmd/se= abios_serial.conf.cmd index 8fc0509b..c0e17c7a 100644 --- a/src/test/cfg2cmd/seabios_serial.conf.cmd +++ b/src/test/cfg2cmd/seabios_serial.conf.cmd @@ -26,10 +26,10 @@ -device 'isa-serial,chardev=3Dserial0' \ -device 'virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3,free-pa= ge-reporting=3Don' \ -iscsi 'initiator-name=3Diqn.1993-08.org.debian:01:aabbccddeeff' \ - -device 'ide-cd,bus=3Dide.1,unit=3D0,id=3Dide2,bootindex=3D200' \ - -device 'virtio-scsi-pci,id=3Dscsihw0,bus=3Dpci.0,addr=3D0x5' \ + -device '{"bootindex":200,"bus":"ide.1","driver":"ide-cd","id":"ide2","u= nit":0}' \ + -device '{"addr":"0x5","bus":"pci.0","driver":"virtio-scsi-pci","id":"sc= sihw0"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direc= t":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver= ":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-0.qcow2","node-na= me":"ecd04be4259153b8293415fefa2a84c","read-only":false},"node-name":"fcd04= be4259153b8293415fefa2a84c","read-only":false},"node-name":"drive-scsi0","r= ead-only":false,"throttle-group":"throttle-drive-scsi0"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive= =3Ddrive-scsi0,id=3Dscsi0,device_id=3Ddrive-scsi0,bootindex=3D100,write-cac= he=3Don' \ + -device '{"bootindex":100,"bus":"scsihw0.0","channel":0,"device_id":"dri= ve-scsi0","drive":"drive-scsi0","driver":"scsi-hd","id":"scsi0","lun":0,"sc= si-id":0,"write-cache":"on"}' \ -netdev 'type=3Dtap,id=3Dnet0,ifname=3Dtap8006i0,script=3D/usr/libexec/q= emu-server/pve-bridge,downscript=3D/usr/libexec/qemu-server/pve-bridgedown,= vhost=3Don' \ -device 'virtio-net-pci,mac=3DA2:C0:43:77:08:A0,netdev=3Dnet0,bus=3Dpci.= 0,addr=3D0x12,id=3Dnet0,rx_queue_size=3D1024,tx_queue_size=3D256,bootindex= =3D300' \ -machine 'smm=3Doff,type=3Dpc+pve0' diff --git a/src/test/cfg2cmd/simple-backingchain.conf.cmd b/src/test/cfg2c= md/simple-backingchain.conf.cmd index 4ac24b93..55c0c451 100644 --- a/src/test/cfg2cmd/simple-backingchain.conf.cmd +++ b/src/test/cfg2cmd/simple-backingchain.conf.cmd @@ -25,9 +25,9 @@ -device 'VGA,id=3Dvga,bus=3Dpci.0,addr=3D0x2' \ -device 'virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3,free-pa= ge-reporting=3Don' \ -iscsi 'initiator-name=3Diqn.1993-08.org.debian:01:aabbccddeeff' \ - -device 'lsi,id=3Dscsihw0,bus=3Dpci.0,addr=3D0x5' \ + -device '{"addr":"0x5","bus":"pci.0","driver":"lsi","id":"scsihw0"}' \ -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle",= "file":{"backing":{"backing":{"cache":{"direct":true,"no-flush":false},"det= ect-zeroes":"on","discard":"ignore","discard-no-unref":true,"driver":"qcow2= ","file":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect= -zeroes":"on","discard":"ignore","driver":"file","filename":"/var/lib/vzsna= pext/images/8006/snap1-vm-8006-disk-0.qcow2","node-name":"ea91a385a49a008a4= 735c0aec5c6749","read-only":false},"node-name":"fa91a385a49a008a4735c0aec5c= 6749","read-only":false},"cache":{"direct":true,"no-flush":false},"detect-z= eroes":"on","discard":"ignore","discard-no-unref":true,"driver":"qcow2","fi= le":{"aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zero= es":"on","discard":"ignore","driver":"file","filename":"/var/lib/vzsnapext/= images/8006/snap2-vm-8006-disk-0.qcow2","node-name":"ec0289317073959d450248= d8cd7a480","read-only":false},"node-name":"fc0289317073959d450248d8cd7a480"= ,"read-only":false},"cache":{"direct":true,"no-flush":false},"detect-zeroes= ":"on","discard":"ignore","discard-no-unref":true,"driver":"qcow2","file":{= "aio":"io_uring","cache":{"direct":true,"no-flush":false},"detect-zeroes":"= on","discard":"ignore","driver":"file","filename":"/var/lib/vzsnapext/image= s/8006/vm-8006-disk-0.qcow2","node-name":"e74f4959037afb46eddc7313c43dfdd",= "read-only":false},"node-name":"f74f4959037afb46eddc7313c43dfdd","read-only= ":false},"node-name":"drive-scsi0","read-only":false,"throttle-group":"thro= ttle-drive-scsi0"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,scsi-id=3D0,drive=3Ddrive-scsi0,id=3Dsc= si0,device_id=3Ddrive-scsi0,write-cache=3Don' \ + -device '{"bus":"scsihw0.0","device_id":"drive-scsi0","drive":"drive-scs= i0","driver":"scsi-hd","id":"scsi0","scsi-id":0,"write-cache":"on"}' \ -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle",= "file":{"backing":{"backing":{"cache":{"direct":true,"no-flush":false},"det= ect-zeroes":"on","discard":"ignore","driver":"qcow2","file":{"aio":"native"= ,"cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","discard":"i= gnore","driver":"host_device","filename":"/dev/veegee/snap1-vm-8006-disk-0.= qcow2","node-name":"e25f58d3e6e11f2065ad41253988915","read-only":false},"no= de-name":"f25f58d3e6e11f2065ad41253988915","read-only":false},"cache":{"dir= ect":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver= ":"qcow2","file":{"aio":"native","cache":{"direct":true,"no-flush":false},"= detect-zeroes":"on","discard":"ignore","driver":"host_device","filename":"/= dev/veegee/snap2-vm-8006-disk-0.qcow2","node-name":"e9415bb5e484c1e25d25063= b01686fe","read-only":false},"node-name":"f9415bb5e484c1e25d25063b01686fe",= "read-only":false},"cache":{"direct":true,"no-flush":false},"detect-zeroes"= :"on","discard":"ignore","driver":"qcow2","file":{"aio":"native","cache":{"= direct":true,"no-flush":false},"detect-zeroes":"on","discard":"ignore","dri= ver":"host_device","filename":"/dev/veegee/vm-8006-disk-0.qcow2","node-name= ":"e87358a470ca311f94d5cc61d1eb428","read-only":false},"node-name":"f87358a= 470ca311f94d5cc61d1eb428","read-only":false},"node-name":"drive-scsi1","rea= d-only":false,"throttle-group":"throttle-drive-scsi1"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,scsi-id=3D1,drive=3Ddrive-scsi1,id=3Dsc= si1,device_id=3Ddrive-scsi1,write-cache=3Don' \ + -device '{"bus":"scsihw0.0","device_id":"drive-scsi1","drive":"drive-scs= i1","driver":"scsi-hd","id":"scsi1","scsi-id":1,"write-cache":"on"}' \ -machine 'type=3Dpc+pve0' diff --git a/src/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd b= /src/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd index 0c61d334..a9364443 100644 --- a/src/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd +++ b/src/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd @@ -24,10 +24,10 @@ -device 'virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3,free-pa= ge-reporting=3Don' \ -iscsi 'initiator-name=3Diqn.1993-08.org.debian:01:aabbccddeeff' \ -drive 'if=3Dnone,id=3Ddrive-ide2,media=3Dcdrom,aio=3Dio_uring' \ - -device 'ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide2,id=3Dide2,bootin= dex=3D200' \ - -device 'virtio-scsi-pci,id=3Dscsihw0,bus=3Dpci.0,addr=3D0x5' \ + -device '{"bootindex":200,"bus":"ide.1","drive":"drive-ide2","driver":"i= de-cd","id":"ide2","unit":0}' \ + -device '{"addr":"0x5","bus":"pci.0","driver":"virtio-scsi-pci","id":"sc= sihw0"}' \ -drive 'file=3D/var/lib/vz/images/8006/vm-8006-disk-0.qcow2,if=3Dnone,id= =3Ddrive-scsi0,discard=3Don,format=3Dqcow2,cache=3Dnone,aio=3Dio_uring,dete= ct-zeroes=3Dunmap' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive= =3Ddrive-scsi0,id=3Dscsi0,bootindex=3D100' \ + -device '{"bootindex":100,"bus":"scsihw0.0","channel":0,"drive":"drive-s= csi0","driver":"scsi-hd","id":"scsi0","lun":0,"scsi-id":0}' \ -netdev 'type=3Dtap,id=3Dnet0,ifname=3Dtap8006i0,script=3D/usr/libexec/q= emu-server/pve-bridge,downscript=3D/usr/libexec/qemu-server/pve-bridgedown,= vhost=3Don' \ -device 'virtio-net-pci,mac=3DA2:C0:43:77:08:A0,netdev=3Dnet0,bus=3Dpci.= 0,addr=3D0x12,id=3Dnet0,bootindex=3D300' \ -machine 'type=3Dpc-i440fx-6.2+pve0' diff --git a/src/test/cfg2cmd/simple-btrfs.conf.cmd b/src/test/cfg2cmd/simp= le-btrfs.conf.cmd index f80421ad..84e744b5 100644 --- a/src/test/cfg2cmd/simple-btrfs.conf.cmd +++ b/src/test/cfg2cmd/simple-btrfs.conf.cmd @@ -29,16 +29,16 @@ -device 'VGA,id=3Dvga,bus=3Dpci.0,addr=3D0x2' \ -device 'virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3,free-pa= ge-reporting=3Don' \ -iscsi 'initiator-name=3Diqn.1993-08.org.debian:01:aabbccddeeff' \ - -device 'ide-cd,bus=3Dide.1,unit=3D0,id=3Dide2,bootindex=3D200' \ - -device 'virtio-scsi-pci,id=3Dscsihw0,bus=3Dpci.0,addr=3D0x5' \ + -device '{"bootindex":200,"bus":"ide.1","driver":"ide-cd","id":"ide2","u= nit":0}' \ + -device '{"addr":"0x5","bus":"pci.0","driver":"virtio-scsi-pci","id":"sc= sihw0"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap"= ,"discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct= ":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver= ":"file","filename":"/butter/bread/images/8006/vm-8006-disk-0/disk.raw","no= de-name":"e99aff0ff797aa030a22e9f580076dd","read-only":false},"node-name":"= f99aff0ff797aa030a22e9f580076dd","read-only":false},"node-name":"drive-scsi= 0","read-only":false,"throttle-group":"throttle-drive-scsi0"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive= =3Ddrive-scsi0,id=3Dscsi0,device_id=3Ddrive-scsi0,bootindex=3D100,write-cac= he=3Don' \ + -device '{"bootindex":100,"bus":"scsihw0.0","channel":0,"device_id":"dri= ve-scsi0","drive":"drive-scsi0","driver":"scsi-hd","id":"scsi0","lun":0,"sc= si-id":0,"write-cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap"= ,"discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct= ":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver= ":"file","filename":"/butter/bread/images/8006/vm-8006-disk-0/disk.raw","no= de-name":"e7b2fd2a8c5dbfc550d9781e5df8841","read-only":false},"node-name":"= f7b2fd2a8c5dbfc550d9781e5df8841","read-only":false},"node-name":"drive-scsi= 1","read-only":false,"throttle-group":"throttle-drive-scsi1"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D1,drive= =3Ddrive-scsi1,id=3Dscsi1,device_id=3Ddrive-scsi1,write-cache=3Don' \ + -device '{"bus":"scsihw0.0","channel":0,"device_id":"drive-scsi1","drive= ":"drive-scsi1","driver":"scsi-hd","id":"scsi1","lun":1,"scsi-id":0,"write-= cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap"= ,"discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct= ":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver= ":"file","filename":"/butter/bread/images/8006/vm-8006-disk-0/disk.raw","no= de-name":"ed78b07bb04c2cbd8aedc648e885569","read-only":false},"node-name":"= fd78b07bb04c2cbd8aedc648e885569","read-only":false},"node-name":"drive-scsi= 2","read-only":false,"throttle-group":"throttle-drive-scsi2"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D2,drive= =3Ddrive-scsi2,id=3Dscsi2,device_id=3Ddrive-scsi2,write-cache=3Doff' \ + -device '{"bus":"scsihw0.0","channel":0,"device_id":"drive-scsi2","drive= ":"drive-scsi2","driver":"scsi-hd","id":"scsi2","lun":2,"scsi-id":0,"write-= cache":"off"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct"= :true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":= "file","filename":"/butter/bread/images/8006/vm-8006-disk-0/disk.raw","node= -name":"e7487c01d831e2b51a5446980170ec9","read-only":false},"node-name":"f7= 487c01d831e2b51a5446980170ec9","read-only":false},"node-name":"drive-scsi3"= ,"read-only":false,"throttle-group":"throttle-drive-scsi3"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D3,drive= =3Ddrive-scsi3,id=3Dscsi3,device_id=3Ddrive-scsi3,write-cache=3Doff' \ + -device '{"bus":"scsihw0.0","channel":0,"device_id":"drive-scsi3","drive= ":"drive-scsi3","driver":"scsi-hd","id":"scsi3","lun":3,"scsi-id":0,"write-= cache":"off"}' \ -netdev 'type=3Dtap,id=3Dnet0,ifname=3Dtap8006i0,script=3D/usr/libexec/q= emu-server/pve-bridge,downscript=3D/usr/libexec/qemu-server/pve-bridgedown,= vhost=3Don' \ -device 'virtio-net-pci,mac=3DA2:C0:43:77:08:A0,netdev=3Dnet0,bus=3Dpci.= 0,addr=3D0x12,id=3Dnet0,rx_queue_size=3D1024,tx_queue_size=3D256,bootindex= =3D300' \ -machine 'type=3Dpc+pve0' diff --git a/src/test/cfg2cmd/simple-cifs.conf.cmd b/src/test/cfg2cmd/simpl= e-cifs.conf.cmd index 4174d061..3520a1b8 100644 --- a/src/test/cfg2cmd/simple-cifs.conf.cmd +++ b/src/test/cfg2cmd/simple-cifs.conf.cmd @@ -27,14 +27,14 @@ -device 'VGA,id=3Dvga,bus=3Dpci.0,addr=3D0x2' \ -device 'virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3,free-pa= ge-reporting=3Don' \ -iscsi 'initiator-name=3Diqn.1993-08.org.debian:01:aabbccddeeff' \ - -device 'ide-cd,bus=3Dide.1,unit=3D0,id=3Dide2,bootindex=3D200' \ - -device 'virtio-scsi-pci,id=3Dscsihw0,bus=3Dpci.0,addr=3D0x5' \ + -device '{"bootindex":200,"bus":"ide.1","driver":"ide-cd","id":"ide2","u= nit":0}' \ + -device '{"addr":"0x5","bus":"pci.0","driver":"virtio-scsi-pci","id":"sc= sihw0"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"raw","file":{"aio":"native","cache":{"direct":t= rue,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"f= ile","filename":"/mnt/pve/cifs-store/images/8006/vm-8006-disk-0.raw","node-= name":"e2b3b8f2d6a23adc1aa3ecd195dbaf5","read-only":false},"node-name":"f2b= 3b8f2d6a23adc1aa3ecd195dbaf5","read-only":false},"node-name":"drive-scsi0",= "read-only":false,"throttle-group":"throttle-drive-scsi0"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive= =3Ddrive-scsi0,id=3Dscsi0,device_id=3Ddrive-scsi0,write-cache=3Don' \ + -device '{"bus":"scsihw0.0","channel":0,"device_id":"drive-scsi0","drive= ":"drive-scsi0","driver":"scsi-hd","id":"scsi0","lun":0,"scsi-id":0,"write-= cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap"= ,"discard":"unmap","driver":"raw","file":{"aio":"threads","cache":{"direct"= :false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver"= :"file","filename":"/mnt/pve/cifs-store/images/8006/vm-8006-disk-0.raw","no= de-name":"ee4d9a961200a669c1a8182632aba3e","read-only":false},"node-name":"= fe4d9a961200a669c1a8182632aba3e","read-only":false},"node-name":"drive-scsi= 1","read-only":false,"throttle-group":"throttle-drive-scsi1"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D1,drive= =3Ddrive-scsi1,id=3Dscsi1,device_id=3Ddrive-scsi1,write-cache=3Don' \ + -device '{"bus":"scsihw0.0","channel":0,"device_id":"drive-scsi1","drive= ":"drive-scsi1","driver":"scsi-hd","id":"scsi1","lun":1,"scsi-id":0,"write-= cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap"= ,"discard":"unmap","driver":"raw","file":{"aio":"threads","cache":{"direct"= :false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver"= :"file","filename":"/mnt/pve/cifs-store/images/8006/vm-8006-disk-0.raw","no= de-name":"e6a3bf7eee1e2636cbe31f62b537b6c","read-only":false},"node-name":"= f6a3bf7eee1e2636cbe31f62b537b6c","read-only":false},"node-name":"drive-scsi= 2","read-only":false,"throttle-group":"throttle-drive-scsi2"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D2,drive= =3Ddrive-scsi2,id=3Dscsi2,device_id=3Ddrive-scsi2,write-cache=3Doff' \ + -device '{"bus":"scsihw0.0","channel":0,"device_id":"drive-scsi2","drive= ":"drive-scsi2","driver":"scsi-hd","id":"scsi2","lun":2,"scsi-id":0,"write-= cache":"off"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"raw","file":{"aio":"native","cache":{"direct":t= rue,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"f= ile","filename":"/mnt/pve/cifs-store/images/8006/vm-8006-disk-0.raw","node-= name":"e7042ee58e764b1296ad54014cb9a03","read-only":false},"node-name":"f70= 42ee58e764b1296ad54014cb9a03","read-only":false},"node-name":"drive-scsi3",= "read-only":false,"throttle-group":"throttle-drive-scsi3"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D3,drive= =3Ddrive-scsi3,id=3Dscsi3,device_id=3Ddrive-scsi3,write-cache=3Doff' \ + -device '{"bus":"scsihw0.0","channel":0,"device_id":"drive-scsi3","drive= ":"drive-scsi3","driver":"scsi-hd","id":"scsi3","lun":3,"scsi-id":0,"write-= cache":"off"}' \ -machine 'type=3Dpc+pve0' diff --git a/src/test/cfg2cmd/simple-disk-passthrough.conf.cmd b/src/test/c= fg2cmd/simple-disk-passthrough.conf.cmd index 987a6c82..d8d9d50f 100644 --- a/src/test/cfg2cmd/simple-disk-passthrough.conf.cmd +++ b/src/test/cfg2cmd/simple-disk-passthrough.conf.cmd @@ -29,12 +29,12 @@ -device 'virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3,free-pa= ge-reporting=3Don' \ -iscsi 'initiator-name=3Diqn.1993-08.org.debian:01:aabbccddeeff' \ -blockdev '{"driver":"throttle","file":{"cache":{"direct":false,"no-flus= h":false},"driver":"raw","file":{"aio":"io_uring","cache":{"direct":false,"= no-flush":false},"driver":"host_cdrom","filename":"/dev/cdrom","node-name":= "ee50e59431a6228dc388fc821b35696","read-only":true},"node-name":"fe50e59431= a6228dc388fc821b35696","read-only":true},"node-name":"drive-ide2","read-onl= y":true,"throttle-group":"throttle-drive-ide2"}' \ - -device 'ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide2,id=3Dide2,bootin= dex=3D200' \ - -device 'virtio-scsi-pci,id=3Dscsihw0,bus=3Dpci.0,addr=3D0x5' \ + -device '{"bootindex":200,"bus":"ide.1","drive":"drive-ide2","driver":"i= de-cd","id":"ide2","unit":0}' \ + -device '{"addr":"0x5","bus":"pci.0","driver":"virtio-scsi-pci","id":"sc= sihw0"}' \ -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle",= "file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","disc= ard":"ignore","driver":"raw","file":{"aio":"io_uring","cache":{"direct":tru= e,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"host_= device","filename":"/dev/sda","node-name":"eec235c1b362ebd19d5e98959b4c171"= ,"read-only":false},"node-name":"fec235c1b362ebd19d5e98959b4c171","read-onl= y":false},"node-name":"drive-scsi0","read-only":false,"throttle-group":"thr= ottle-drive-scsi0"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive= =3Ddrive-scsi0,id=3Dscsi0,device_id=3Ddrive-scsi0,bootindex=3D100,write-cac= he=3Don' \ + -device '{"bootindex":100,"bus":"scsihw0.0","channel":0,"device_id":"dri= ve-scsi0","drive":"drive-scsi0","driver":"scsi-hd","id":"scsi0","lun":0,"sc= si-id":0,"write-cache":"on"}' \ -blockdev '{"detect-zeroes":"on","discard":"ignore","driver":"throttle",= "file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"on","disc= ard":"ignore","driver":"raw","file":{"aio":"io_uring","cache":{"direct":tru= e,"no-flush":false},"detect-zeroes":"on","discard":"ignore","driver":"file"= ,"filename":"/mnt/file.raw","node-name":"e234a4e3b89ac3adac9bdbf0c3dd6b4","= read-only":false},"node-name":"f234a4e3b89ac3adac9bdbf0c3dd6b4","read-only"= :false},"node-name":"drive-scsi1","read-only":false,"throttle-group":"throt= tle-drive-scsi1"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D1,drive= =3Ddrive-scsi1,id=3Dscsi1,device_id=3Ddrive-scsi1,write-cache=3Don' \ + -device '{"bus":"scsihw0.0","channel":0,"device_id":"drive-scsi1","drive= ":"drive-scsi1","driver":"scsi-hd","id":"scsi1","lun":1,"scsi-id":0,"write-= cache":"on"}' \ -netdev 'type=3Dtap,id=3Dnet0,ifname=3Dtap8006i0,script=3D/usr/libexec/q= emu-server/pve-bridge,downscript=3D/usr/libexec/qemu-server/pve-bridgedown,= vhost=3Don' \ -device 'virtio-net-pci,mac=3DA2:C0:43:77:08:A0,netdev=3Dnet0,bus=3Dpci.= 0,addr=3D0x12,id=3Dnet0,rx_queue_size=3D1024,tx_queue_size=3D256,bootindex= =3D300' \ -machine 'type=3Dpc+pve0' diff --git a/src/test/cfg2cmd/simple-lvm.conf.cmd b/src/test/cfg2cmd/simple= -lvm.conf.cmd index 96248c0d..f9dbbcb9 100644 --- a/src/test/cfg2cmd/simple-lvm.conf.cmd +++ b/src/test/cfg2cmd/simple-lvm.conf.cmd @@ -27,13 +27,13 @@ -device 'VGA,id=3Dvga,bus=3Dpci.0,addr=3D0x2' \ -device 'virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3,free-pa= ge-reporting=3Don' \ -iscsi 'initiator-name=3Diqn.1993-08.org.debian:01:aabbccddeeff' \ - -device 'virtio-scsi-pci,id=3Dscsihw0,bus=3Dpci.0,addr=3D0x5' \ + -device '{"addr":"0x5","bus":"pci.0","driver":"virtio-scsi-pci","id":"sc= sihw0"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"raw","file":{"aio":"native","cache":{"direct":t= rue,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"h= ost_device","filename":"/dev/veegee/vm-8006-disk-0","node-name":"e0378a375d= 635b0f473569544c7c207","read-only":false},"node-name":"f0378a375d635b0f4735= 69544c7c207","read-only":false},"node-name":"drive-scsi0","read-only":false= ,"throttle-group":"throttle-drive-scsi0"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive= =3Ddrive-scsi0,id=3Dscsi0,device_id=3Ddrive-scsi0,bootindex=3D100,write-cac= he=3Don' \ + -device '{"bootindex":100,"bus":"scsihw0.0","channel":0,"device_id":"dri= ve-scsi0","drive":"drive-scsi0","driver":"scsi-hd","id":"scsi0","lun":0,"sc= si-id":0,"write-cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap"= ,"discard":"unmap","driver":"raw","file":{"aio":"threads","cache":{"direct"= :false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver"= :"host_device","filename":"/dev/veegee/vm-8006-disk-0","node-name":"e2fbae0= 24c8a771f708f4a5391211b0","read-only":false},"node-name":"f2fbae024c8a771f7= 08f4a5391211b0","read-only":false},"node-name":"drive-scsi1","read-only":fa= lse,"throttle-group":"throttle-drive-scsi1"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D1,drive= =3Ddrive-scsi1,id=3Dscsi1,device_id=3Ddrive-scsi1,write-cache=3Don' \ + -device '{"bus":"scsihw0.0","channel":0,"device_id":"drive-scsi1","drive= ":"drive-scsi1","driver":"scsi-hd","id":"scsi1","lun":1,"scsi-id":0,"write-= cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap"= ,"discard":"unmap","driver":"raw","file":{"aio":"threads","cache":{"direct"= :false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver"= :"host_device","filename":"/dev/veegee/vm-8006-disk-0","node-name":"e4328c2= 6b141e3efe1564cb60bf1155","read-only":false},"node-name":"f4328c26b141e3efe= 1564cb60bf1155","read-only":false},"node-name":"drive-scsi2","read-only":fa= lse,"throttle-group":"throttle-drive-scsi2"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D2,drive= =3Ddrive-scsi2,id=3Dscsi2,device_id=3Ddrive-scsi2,write-cache=3Doff' \ + -device '{"bus":"scsihw0.0","channel":0,"device_id":"drive-scsi2","drive= ":"drive-scsi2","driver":"scsi-hd","id":"scsi2","lun":2,"scsi-id":0,"write-= cache":"off"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"raw","file":{"aio":"native","cache":{"direct":t= rue,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":"h= ost_device","filename":"/dev/veegee/vm-8006-disk-0","node-name":"e68e10f812= 8f05fe5f7e85cc1f9922b","read-only":false},"node-name":"f68e10f8128f05fe5f7e= 85cc1f9922b","read-only":false},"node-name":"drive-scsi3","read-only":false= ,"throttle-group":"throttle-drive-scsi3"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D3,drive= =3Ddrive-scsi3,id=3Dscsi3,device_id=3Ddrive-scsi3,write-cache=3Doff' \ + -device '{"bus":"scsihw0.0","channel":0,"device_id":"drive-scsi3","drive= ":"drive-scsi3","driver":"scsi-hd","id":"scsi3","lun":3,"scsi-id":0,"write-= cache":"off"}' \ -machine 'type=3Dpc+pve0' diff --git a/src/test/cfg2cmd/simple-lvmthin.conf.cmd b/src/test/cfg2cmd/si= mple-lvmthin.conf.cmd index 9c98fffc..5e52389e 100644 --- a/src/test/cfg2cmd/simple-lvmthin.conf.cmd +++ b/src/test/cfg2cmd/simple-lvmthin.conf.cmd @@ -27,13 +27,13 @@ -device 'VGA,id=3Dvga,bus=3Dpci.0,addr=3D0x2' \ -device 'virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3,free-pa= ge-reporting=3Don' \ -iscsi 'initiator-name=3Diqn.1993-08.org.debian:01:aabbccddeeff' \ - -device 'virtio-scsi-pci,id=3Dscsihw0,bus=3Dpci.0,addr=3D0x5' \ + -device '{"addr":"0x5","bus":"pci.0","driver":"virtio-scsi-pci","id":"sc= sihw0"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct"= :true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":= "host_device","filename":"/dev/pve/vm-8006-disk-0","node-name":"e6d87b01b7b= b888b8426534a542ff1c","read-only":false},"node-name":"f6d87b01b7bb888b84265= 34a542ff1c","read-only":false},"node-name":"drive-scsi0","read-only":false,= "throttle-group":"throttle-drive-scsi0"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive= =3Ddrive-scsi0,id=3Dscsi0,device_id=3Ddrive-scsi0,bootindex=3D100,write-cac= he=3Don' \ + -device '{"bootindex":100,"bus":"scsihw0.0","channel":0,"device_id":"dri= ve-scsi0","drive":"drive-scsi0","driver":"scsi-hd","id":"scsi0","lun":0,"sc= si-id":0,"write-cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap"= ,"discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct= ":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver= ":"host_device","filename":"/dev/pve/vm-8006-disk-0","node-name":"e96d9ece8= 1aa4271aa2d8485184f66b","read-only":false},"node-name":"f96d9ece81aa4271aa2= d8485184f66b","read-only":false},"node-name":"drive-scsi1","read-only":fals= e,"throttle-group":"throttle-drive-scsi1"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D1,drive= =3Ddrive-scsi1,id=3Dscsi1,device_id=3Ddrive-scsi1,write-cache=3Don' \ + -device '{"bus":"scsihw0.0","channel":0,"device_id":"drive-scsi1","drive= ":"drive-scsi1","driver":"scsi-hd","id":"scsi1","lun":1,"scsi-id":0,"write-= cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap"= ,"discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct= ":false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver= ":"host_device","filename":"/dev/pve/vm-8006-disk-0","node-name":"e0b89788e= f97beda10a850ab45897d9","read-only":false},"node-name":"f0b89788ef97beda10a= 850ab45897d9","read-only":false},"node-name":"drive-scsi2","read-only":fals= e,"throttle-group":"throttle-drive-scsi2"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D2,drive= =3Ddrive-scsi2,id=3Dscsi2,device_id=3Ddrive-scsi2,write-cache=3Doff' \ + -device '{"bus":"scsihw0.0","channel":0,"device_id":"drive-scsi2","drive= ":"drive-scsi2","driver":"scsi-hd","id":"scsi2","lun":2,"scsi-id":0,"write-= cache":"off"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct"= :true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":= "host_device","filename":"/dev/pve/vm-8006-disk-0","node-name":"ea7b6871af6= 6ca3e13e95bd74570aa2","read-only":false},"node-name":"fa7b6871af66ca3e13e95= bd74570aa2","read-only":false},"node-name":"drive-scsi3","read-only":false,= "throttle-group":"throttle-drive-scsi3"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D3,drive= =3Ddrive-scsi3,id=3Dscsi3,device_id=3Ddrive-scsi3,write-cache=3Doff' \ + -device '{"bus":"scsihw0.0","channel":0,"device_id":"drive-scsi3","drive= ":"drive-scsi3","driver":"scsi-hd","id":"scsi3","lun":3,"scsi-id":0,"write-= cache":"off"}' \ -machine 'type=3Dpc+pve0' diff --git a/src/test/cfg2cmd/simple-rbd.conf.cmd b/src/test/cfg2cmd/simple= -rbd.conf.cmd index b848672c..22f050c8 100644 --- a/src/test/cfg2cmd/simple-rbd.conf.cmd +++ b/src/test/cfg2cmd/simple-rbd.conf.cmd @@ -33,24 +33,24 @@ -device 'VGA,id=3Dvga,bus=3Dpci.0,addr=3D0x2' \ -device 'virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3,free-pa= ge-reporting=3Don' \ -iscsi 'initiator-name=3Diqn.1993-08.org.debian:01:aabbccddeeff' \ - -device 'ide-cd,bus=3Dide.1,unit=3D0,id=3Dide2,bootindex=3D200' \ - -device 'virtio-scsi-pci,id=3Dscsihw0,bus=3Dpci.0,addr=3D0x5' \ + -device '{"bootindex":200,"bus":"ide.1","driver":"ide-cd","id":"ide2","u= nit":0}' \ + -device '{"addr":"0x5","bus":"pci.0","driver":"virtio-scsi-pci","id":"sc= sihw0"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"raw","file":{"auth-client-required":["none"],"c= ache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"u= nmap","driver":"rbd","image":"vm-8006-disk-0","node-name":"e8e1af6f55c6a246= 6f178045aa79710","pool":"cpool","read-only":false,"server":[{"host":"127.0.= 0.42","port":"3300"},{"host":"127.0.0.21","port":"3300"},{"host":"::1","por= t":"3300"}]},"node-name":"f8e1af6f55c6a2466f178045aa79710","read-only":fals= e},"node-name":"drive-scsi0","read-only":false,"throttle-group":"throttle-d= rive-scsi0"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive= =3Ddrive-scsi0,id=3Dscsi0,device_id=3Ddrive-scsi0,bootindex=3D100,write-cac= he=3Don' \ + -device '{"bootindex":100,"bus":"scsihw0.0","channel":0,"device_id":"dri= ve-scsi0","drive":"drive-scsi0","driver":"scsi-hd","id":"scsi0","lun":0,"sc= si-id":0,"write-cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap"= ,"discard":"unmap","driver":"raw","file":{"auth-client-required":["none"],"= cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":= "unmap","driver":"rbd","image":"vm-8006-disk-0","node-name":"e3990bba2ed1f4= 8c5bb23e9f37b4cec","pool":"cpool","read-only":false,"server":[{"host":"127.= 0.0.42","port":"3300"},{"host":"127.0.0.21","port":"3300"},{"host":"::1","p= ort":"3300"}]},"node-name":"f3990bba2ed1f48c5bb23e9f37b4cec","read-only":fa= lse},"node-name":"drive-scsi1","read-only":false,"throttle-group":"throttle= -drive-scsi1"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D1,drive= =3Ddrive-scsi1,id=3Dscsi1,device_id=3Ddrive-scsi1,write-cache=3Don' \ + -device '{"bus":"scsihw0.0","channel":0,"device_id":"drive-scsi1","drive= ":"drive-scsi1","driver":"scsi-hd","id":"scsi1","lun":1,"scsi-id":0,"write-= cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap"= ,"discard":"unmap","driver":"raw","file":{"auth-client-required":["none"],"= cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap","discard":= "unmap","driver":"rbd","image":"vm-8006-disk-0","node-name":"e3beccc2a8f2ea= cb8b5df8055a7d093","pool":"cpool","read-only":false,"server":[{"host":"127.= 0.0.42","port":"3300"},{"host":"127.0.0.21","port":"3300"},{"host":"::1","p= ort":"3300"}]},"node-name":"f3beccc2a8f2eacb8b5df8055a7d093","read-only":fa= lse},"node-name":"drive-scsi2","read-only":false,"throttle-group":"throttle= -drive-scsi2"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D2,drive= =3Ddrive-scsi2,id=3Dscsi2,device_id=3Ddrive-scsi2,write-cache=3Doff' \ + -device '{"bus":"scsihw0.0","channel":0,"device_id":"drive-scsi2","drive= ":"drive-scsi2","driver":"scsi-hd","id":"scsi2","lun":2,"scsi-id":0,"write-= cache":"off"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"raw","file":{"auth-client-required":["none"],"c= ache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap","discard":"u= nmap","driver":"rbd","image":"vm-8006-disk-0","node-name":"eef923d5dfcee93f= bc712b03f9f21af","pool":"cpool","read-only":false,"server":[{"host":"127.0.= 0.42","port":"3300"},{"host":"127.0.0.21","port":"3300"},{"host":"::1","por= t":"3300"}]},"node-name":"fef923d5dfcee93fbc712b03f9f21af","read-only":fals= e},"node-name":"drive-scsi3","read-only":false,"throttle-group":"throttle-d= rive-scsi3"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D3,drive= =3Ddrive-scsi3,id=3Dscsi3,device_id=3Ddrive-scsi3,write-cache=3Doff' \ + -device '{"bus":"scsihw0.0","channel":0,"device_id":"drive-scsi3","drive= ":"drive-scsi3","driver":"scsi-hd","id":"scsi3","lun":3,"scsi-id":0,"write-= cache":"off"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct"= :true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":= "host_device","filename":"/dev/rbd-pve/fc4181a6-56eb-4f68-b452-8ba1f381ca2a= /cpool/vm-8006-disk-0","node-name":"eb2c7a292f03b9f6d015cf83ae79730","read-= only":false},"node-name":"fb2c7a292f03b9f6d015cf83ae79730","read-only":fals= e},"node-name":"drive-scsi4","read-only":false,"throttle-group":"throttle-d= rive-scsi4"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D4,drive= =3Ddrive-scsi4,id=3Dscsi4,device_id=3Ddrive-scsi4,write-cache=3Don' \ + -device '{"bus":"scsihw0.0","channel":0,"device_id":"drive-scsi4","drive= ":"drive-scsi4","driver":"scsi-hd","id":"scsi4","lun":4,"scsi-id":0,"write-= cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap"= ,"discard":"unmap","driver":"raw","file":{"aio":"threads","cache":{"direct"= :false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver"= :"host_device","filename":"/dev/rbd-pve/fc4181a6-56eb-4f68-b452-8ba1f381ca2= a/cpool/vm-8006-disk-0","node-name":"e5258ec75558b1f102af1e20e677fd0","read= -only":false},"node-name":"f5258ec75558b1f102af1e20e677fd0","read-only":fal= se},"node-name":"drive-scsi5","read-only":false,"throttle-group":"throttle-= drive-scsi5"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D5,drive= =3Ddrive-scsi5,id=3Dscsi5,device_id=3Ddrive-scsi5,write-cache=3Don' \ + -device '{"bus":"scsihw0.0","channel":0,"device_id":"drive-scsi5","drive= ":"drive-scsi5","driver":"scsi-hd","id":"scsi5","lun":5,"scsi-id":0,"write-= cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap"= ,"discard":"unmap","driver":"raw","file":{"aio":"threads","cache":{"direct"= :false,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver"= :"host_device","filename":"/dev/rbd-pve/fc4181a6-56eb-4f68-b452-8ba1f381ca2= a/cpool/vm-8006-disk-0","node-name":"edb33cdcea8ec3e2225509c4945227e","read= -only":false},"node-name":"fdb33cdcea8ec3e2225509c4945227e","read-only":fal= se},"node-name":"drive-scsi6","read-only":false,"throttle-group":"throttle-= drive-scsi6"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D6,drive= =3Ddrive-scsi6,id=3Dscsi6,device_id=3Ddrive-scsi6,write-cache=3Doff' \ + -device '{"bus":"scsihw0.0","channel":0,"device_id":"drive-scsi6","drive= ":"drive-scsi6","driver":"scsi-hd","id":"scsi6","lun":6,"scsi-id":0,"write-= cache":"off"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"raw","file":{"aio":"io_uring","cache":{"direct"= :true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver":= "host_device","filename":"/dev/rbd-pve/fc4181a6-56eb-4f68-b452-8ba1f381ca2a= /cpool/vm-8006-disk-0","node-name":"eb0b017124a47505c97a5da052e0141","read-= only":false},"node-name":"fb0b017124a47505c97a5da052e0141","read-only":fals= e},"node-name":"drive-scsi7","read-only":false,"throttle-group":"throttle-d= rive-scsi7"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D7,drive= =3Ddrive-scsi7,id=3Dscsi7,device_id=3Ddrive-scsi7,write-cache=3Doff' \ + -device '{"bus":"scsihw0.0","channel":0,"device_id":"drive-scsi7","drive= ":"drive-scsi7","driver":"scsi-hd","id":"scsi7","lun":7,"scsi-id":0,"write-= cache":"off"}' \ -netdev 'type=3Dtap,id=3Dnet0,ifname=3Dtap8006i0,script=3D/usr/libexec/q= emu-server/pve-bridge,downscript=3D/usr/libexec/qemu-server/pve-bridgedown,= vhost=3Don' \ -device 'virtio-net-pci,mac=3DA2:C0:43:77:08:A0,netdev=3Dnet0,bus=3Dpci.= 0,addr=3D0x12,id=3Dnet0,rx_queue_size=3D1024,tx_queue_size=3D256,bootindex= =3D300' \ -machine 'type=3Dpc+pve0' diff --git a/src/test/cfg2cmd/simple-virtio-blk.conf.cmd b/src/test/cfg2cmd= /simple-virtio-blk.conf.cmd index a9acb0cf..aa3c6132 100644 --- a/src/test/cfg2cmd/simple-virtio-blk.conf.cmd +++ b/src/test/cfg2cmd/simple-virtio-blk.conf.cmd @@ -15,7 +15,7 @@ -vnc 'unix:/var/run/qemu-server/8006.vnc,password=3Don' \ -cpu kvm64,enforce,+kvm_pv_eoi,+kvm_pv_unhalt,+lahf_lm,+sep \ -m 768 \ - -object 'iothread,id=3Diothread-virtio0' \ + -object '{"id":"iothread-virtio0","qom-type":"iothread"}' \ -object '{"id":"throttle-drive-virtio0","limits":{},"qom-type":"throttle= -group"}' \ -global 'PIIX4_PM.disable_s3=3D1' \ -global 'PIIX4_PM.disable_s4=3D1' \ @@ -27,9 +27,9 @@ -device 'VGA,id=3Dvga,bus=3Dpci.0,addr=3D0x2' \ -device 'virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3,free-pa= ge-reporting=3Don' \ -iscsi 'initiator-name=3Diqn.1993-08.org.debian:01:aabbccddeeff' \ - -device 'ide-cd,bus=3Dide.1,unit=3D0,id=3Dide2,bootindex=3D200' \ + -device '{"bootindex":200,"bus":"ide.1","driver":"ide-cd","id":"ide2","u= nit":0}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direc= t":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver= ":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-0.qcow2","node-na= me":"edd19f6c1b3a6d5a6248c3376a91a16","read-only":false},"node-name":"fdd19= f6c1b3a6d5a6248c3376a91a16","read-only":false},"node-name":"drive-virtio0",= "read-only":false,"throttle-group":"throttle-drive-virtio0"}' \ - -device 'virtio-blk-pci,drive=3Ddrive-virtio0,id=3Dvirtio0,bus=3Dpci.0,a= ddr=3D0xa,iothread=3Diothread-virtio0,bootindex=3D100,write-cache=3Don' \ + -device '{"addr":"0xa","bootindex":100,"bus":"pci.0","drive":"drive-virt= io0","driver":"virtio-blk-pci","id":"virtio0","iothread":"iothread-virtio0"= ,"write-cache":"on"}' \ -netdev 'type=3Dtap,id=3Dnet0,ifname=3Dtap8006i0,script=3D/usr/libexec/q= emu-server/pve-bridge,downscript=3D/usr/libexec/qemu-server/pve-bridgedown,= vhost=3Don' \ -device 'virtio-net-pci,mac=3DA2:C0:43:77:08:A0,netdev=3Dnet0,bus=3Dpci.= 0,addr=3D0x12,id=3Dnet0,rx_queue_size=3D1024,tx_queue_size=3D256,bootindex= =3D300' \ -machine 'type=3Dpc+pve0' diff --git a/src/test/cfg2cmd/simple-zfs-over-iscsi.conf.cmd b/src/test/cfg= 2cmd/simple-zfs-over-iscsi.conf.cmd index 4fa6a5a9..7bed359b 100644 --- a/src/test/cfg2cmd/simple-zfs-over-iscsi.conf.cmd +++ b/src/test/cfg2cmd/simple-zfs-over-iscsi.conf.cmd @@ -29,16 +29,16 @@ -device 'VGA,id=3Dvga,bus=3Dpci.0,addr=3D0x2' \ -device 'virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3,free-pa= ge-reporting=3Don' \ -iscsi 'initiator-name=3Diqn.1993-08.org.debian:01:aabbccddeeff' \ - -device 'ide-cd,bus=3Dide.1,unit=3D0,id=3Dide2,bootindex=3D200' \ - -device 'virtio-scsi-pci,id=3Dscsihw0,bus=3Dpci.0,addr=3D0x5' \ + -device '{"bootindex":200,"bus":"ide.1","driver":"ide-cd","id":"ide2","u= nit":0}' \ + -device '{"addr":"0x5","bus":"pci.0","driver":"virtio-scsi-pci","id":"sc= sihw0"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"raw","file":{"cache":{"direct":true,"no-flush":= false},"detect-zeroes":"unmap","discard":"unmap","driver":"iscsi","lun":0,"= node-name":"e7106ac43d4f125a1911487dd9e3e42","portal":"127.0.0.1","read-onl= y":false,"target":"iqn.2019-10.org.test:foobar","transport":"tcp"},"node-na= me":"f7106ac43d4f125a1911487dd9e3e42","read-only":false},"node-name":"drive= -scsi0","read-only":false,"throttle-group":"throttle-drive-scsi0"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive= =3Ddrive-scsi0,id=3Dscsi0,device_id=3Ddrive-scsi0,bootindex=3D100,write-cac= he=3Don' \ + -device '{"bootindex":100,"bus":"scsihw0.0","channel":0,"device_id":"dri= ve-scsi0","drive":"drive-scsi0","driver":"scsi-hd","id":"scsi0","lun":0,"sc= si-id":0,"write-cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap"= ,"discard":"unmap","driver":"raw","file":{"cache":{"direct":false,"no-flush= ":false},"detect-zeroes":"unmap","discard":"unmap","driver":"iscsi","lun":0= ,"node-name":"efdb73e0d0acc5a60e3ff438cb20113","portal":"127.0.0.1","read-o= nly":false,"target":"iqn.2019-10.org.test:foobar","transport":"tcp"},"node-= name":"ffdb73e0d0acc5a60e3ff438cb20113","read-only":false},"node-name":"dri= ve-scsi1","read-only":false,"throttle-group":"throttle-drive-scsi1"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D1,drive= =3Ddrive-scsi1,id=3Dscsi1,device_id=3Ddrive-scsi1,write-cache=3Don' \ + -device '{"bus":"scsihw0.0","channel":0,"device_id":"drive-scsi1","drive= ":"drive-scsi1","driver":"scsi-hd","id":"scsi1","lun":1,"scsi-id":0,"write-= cache":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":false,"no-flush":false},"detect-zeroes":"unmap"= ,"discard":"unmap","driver":"raw","file":{"cache":{"direct":false,"no-flush= ":false},"detect-zeroes":"unmap","discard":"unmap","driver":"iscsi","lun":0= ,"node-name":"eab527a81b458aa9603dca5e2505f6e","portal":"127.0.0.1","read-o= nly":false,"target":"iqn.2019-10.org.test:foobar","transport":"tcp"},"node-= name":"fab527a81b458aa9603dca5e2505f6e","read-only":false},"node-name":"dri= ve-scsi2","read-only":false,"throttle-group":"throttle-drive-scsi2"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D2,drive= =3Ddrive-scsi2,id=3Dscsi2,device_id=3Ddrive-scsi2,write-cache=3Doff' \ + -device '{"bus":"scsihw0.0","channel":0,"device_id":"drive-scsi2","drive= ":"drive-scsi2","driver":"scsi-hd","id":"scsi2","lun":2,"scsi-id":0,"write-= cache":"off"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"raw","file":{"cache":{"direct":true,"no-flush":= false},"detect-zeroes":"unmap","discard":"unmap","driver":"iscsi","lun":0,"= node-name":"e915a332310039f7a3feed6901eb5da","portal":"127.0.0.1","read-onl= y":false,"target":"iqn.2019-10.org.test:foobar","transport":"tcp"},"node-na= me":"f915a332310039f7a3feed6901eb5da","read-only":false},"node-name":"drive= -scsi3","read-only":false,"throttle-group":"throttle-drive-scsi3"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D3,drive= =3Ddrive-scsi3,id=3Dscsi3,device_id=3Ddrive-scsi3,write-cache=3Doff' \ + -device '{"bus":"scsihw0.0","channel":0,"device_id":"drive-scsi3","drive= ":"drive-scsi3","driver":"scsi-hd","id":"scsi3","lun":3,"scsi-id":0,"write-= cache":"off"}' \ -netdev 'type=3Dtap,id=3Dnet0,ifname=3Dtap8006i0,script=3D/usr/libexec/q= emu-server/pve-bridge,downscript=3D/usr/libexec/qemu-server/pve-bridgedown,= vhost=3Don' \ -device 'virtio-net-pci,mac=3DA2:C0:43:77:08:A0,netdev=3Dnet0,bus=3Dpci.= 0,addr=3D0x12,id=3Dnet0,rx_queue_size=3D1024,tx_queue_size=3D256,bootindex= =3D300' \ -machine 'type=3Dpc+pve0' diff --git a/src/test/cfg2cmd/simple1-template.conf.cmd b/src/test/cfg2cmd/= simple1-template.conf.cmd index 369b4de9..7613c231 100644 --- a/src/test/cfg2cmd/simple1-template.conf.cmd +++ b/src/test/cfg2cmd/simple1-template.conf.cmd @@ -25,12 +25,12 @@ -device 'usb-tablet,id=3Dtablet,bus=3Duhci.0,port=3D1' \ -device 'virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3,free-pa= ge-reporting=3Don' \ -iscsi 'initiator-name=3Diqn.1993-08.org.debian:01:aabbccddeeff' \ - -device 'ide-cd,bus=3Dide.1,unit=3D0,id=3Dide2,bootindex=3D200' \ - -device 'virtio-scsi-pci,id=3Dscsihw0,bus=3Dpci.0,addr=3D0x5' \ + -device '{"bootindex":200,"bus":"ide.1","driver":"ide-cd","id":"ide2","u= nit":0}' \ + -device '{"addr":"0x5","bus":"pci.0","driver":"virtio-scsi-pci","id":"sc= sihw0"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direc= t":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver= ":"file","filename":"/var/lib/vz/images/8006/base-8006-disk-1.qcow2","node-= name":"e1085774206ae4a6b6bf8426ff08f16","read-only":true},"node-name":"f108= 5774206ae4a6b6bf8426ff08f16","read-only":true},"node-name":"drive-scsi0","r= ead-only":true,"throttle-group":"throttle-drive-scsi0"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive= =3Ddrive-scsi0,id=3Dscsi0,device_id=3Ddrive-scsi0,write-cache=3Don' \ - -device 'ahci,id=3Dahci0,multifunction=3Don,bus=3Dpci.0,addr=3D0x7' \ + -device '{"bus":"scsihw0.0","channel":0,"device_id":"drive-scsi0","drive= ":"drive-scsi0","driver":"scsi-hd","id":"scsi0","lun":0,"scsi-id":0,"write-= cache":"on"}' \ + -device '{"addr":"0x7","bus":"pci.0","driver":"ahci","id":"ahci0","multi= function":"on"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direc= t":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver= ":"file","filename":"/var/lib/vz/images/8006/base-8006-disk-0.qcow2","node-= name":"eab334c2e07734480f33dd80d89871b","read-only":true},"node-name":"fab3= 34c2e07734480f33dd80d89871b","read-only":true},"node-name":"drive-sata0","r= ead-only":true,"throttle-group":"throttle-drive-sata0"}' \ - -device 'ide-cd,bus=3Dahci0.0,drive=3Ddrive-sata0,id=3Dsata0,write-cache= =3Don' \ + -device '{"bus":"ahci0.0","drive":"drive-sata0","driver":"ide-cd","id":"= sata0","write-cache":"on"}' \ -machine 'accel=3Dtcg,smm=3Doff,type=3Dpc+pve0' \ -snapshot diff --git a/src/test/cfg2cmd/simple1.conf.cmd b/src/test/cfg2cmd/simple1.c= onf.cmd index 49b848f2..4e7ec219 100644 --- a/src/test/cfg2cmd/simple1.conf.cmd +++ b/src/test/cfg2cmd/simple1.conf.cmd @@ -26,10 +26,10 @@ -device 'VGA,id=3Dvga,bus=3Dpci.0,addr=3D0x2' \ -device 'virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3,free-pa= ge-reporting=3Don' \ -iscsi 'initiator-name=3Diqn.1993-08.org.debian:01:aabbccddeeff' \ - -device 'ide-cd,bus=3Dide.1,unit=3D0,id=3Dide2,bootindex=3D200' \ - -device 'virtio-scsi-pci,id=3Dscsihw0,bus=3Dpci.0,addr=3D0x5' \ + -device '{"bootindex":200,"bus":"ide.1","driver":"ide-cd","id":"ide2","u= nit":0}' \ + -device '{"addr":"0x5","bus":"pci.0","driver":"virtio-scsi-pci","id":"sc= sihw0"}' \ -blockdev '{"detect-zeroes":"unmap","discard":"unmap","driver":"throttle= ","file":{"cache":{"direct":true,"no-flush":false},"detect-zeroes":"unmap",= "discard":"unmap","driver":"qcow2","file":{"aio":"io_uring","cache":{"direc= t":true,"no-flush":false},"detect-zeroes":"unmap","discard":"unmap","driver= ":"file","filename":"/var/lib/vz/images/8006/vm-8006-disk-0.qcow2","node-na= me":"ecd04be4259153b8293415fefa2a84c","read-only":false},"node-name":"fcd04= be4259153b8293415fefa2a84c","read-only":false},"node-name":"drive-scsi0","r= ead-only":false,"throttle-group":"throttle-drive-scsi0"}' \ - -device 'scsi-hd,bus=3Dscsihw0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive= =3Ddrive-scsi0,id=3Dscsi0,device_id=3Ddrive-scsi0,bootindex=3D100,write-cac= he=3Don' \ + -device '{"bootindex":100,"bus":"scsihw0.0","channel":0,"device_id":"dri= ve-scsi0","drive":"drive-scsi0","driver":"scsi-hd","id":"scsi0","lun":0,"sc= si-id":0,"write-cache":"on"}' \ -netdev 'type=3Dtap,id=3Dnet0,ifname=3Dtap8006i0,script=3D/usr/libexec/q= emu-server/pve-bridge,downscript=3D/usr/libexec/qemu-server/pve-bridgedown,= vhost=3Don' \ -device 'virtio-net-pci,mac=3DA2:C0:43:77:08:A0,netdev=3Dnet0,bus=3Dpci.= 0,addr=3D0x12,id=3Dnet0,rx_queue_size=3D1024,tx_queue_size=3D256,bootindex= =3D300' \ -machine 'type=3Dpc+pve0' --=20 2.47.2 --===============5813986889805064471== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel --===============5813986889805064471==--