From nobody Mon Dec 15 23:01:47 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658846345; cv=none; d=zohomail.com; s=zohoarc; b=SWn3kz54Wlytb3py140cSALZJ88t77A2zpX+aPZMrDjyFvIEx/+PS5OOwR45oKnKdl6JZ25ZTwfUCG3iYuFSx4Q2KOfx2h4H7SSXG5+QPVWEYscr9WF/YXJYKXOW/4rIjQ23amujZBUrr8Q44YTVevB8FRj2Qq3lfIF0+m0SJfM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658846345; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=U0FYY+QaDySllLDVYJcNWMOvXRND9SDtBT0SeYDh+Zo=; b=YlIjniZRvGwOs6H8ObxaSyiQTCQ8PRY64ZpmXiFdSYT7SblNoJwhX8PvaEVr4Pd3JQpaPirBKOSGUF4K8Xkbxj46Qj0UPA4+5FnXMt/jxcHI8PmFPQWk+K/zHk6oObsa8DuH+57eZANczEsRGp+lrrA4jsgzUVZL3BEXGyfnP/8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1658846345617501.2374318230778; Tue, 26 Jul 2022 07:39:05 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-632-qlQG4hmJNhONTYQ8p-fTmA-1; Tue, 26 Jul 2022 10:38:24 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4D94A811E87; Tue, 26 Jul 2022 14:38:19 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 17540C27D95; Tue, 26 Jul 2022 14:38:19 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D6FE41945DA0; Tue, 26 Jul 2022 14:38:18 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id CD6831945DA5 for ; Tue, 26 Jul 2022 14:38:17 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id A36B7404C324; Tue, 26 Jul 2022 14:38:17 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A7BB400EA8E for ; Tue, 26 Jul 2022 14:38:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658846343; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=U0FYY+QaDySllLDVYJcNWMOvXRND9SDtBT0SeYDh+Zo=; b=XIe1DJ5AS2s3AdfcBkqc2qcw+89Y4agJ1kcfG5I95ex008U6VLWAB/Ih+6mLRAbTlc3WM4 Vf4khzm85zJPUjPLeRnA+fBQcHVQKI5KlWafk2kXy0bci0YZVQS8QeyN05nQuXEaiqd1Rm TXSXIngxkIJUfcNgZn0t5J2Fa/HFPv8= X-MC-Unique: qlQG4hmJNhONTYQ8p-fTmA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 14/80] tests: Force QEMU_CAPS_BLOCKDEV(_HOSTDEV_SCSI) in fake caps tests Date: Tue, 26 Jul 2022 16:36:52 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658846346493100001 Content-Type: text/plain; charset="utf-8" Until we finish removing the capabilities we need to force them in the tests so that it's obvious that the code changes have no impact. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- .../aarch64-aavmf-virtio-mmio.args | 5 +- .../aarch64-cpu-passthrough.args | 5 +- .../aarch64-kvm-32-on-64.args | 5 +- .../aarch64-virt-2.6-virtio-pci-default.args | 5 +- .../qemuxml2argvdata/aarch64-virt-virtio.args | 5 +- .../aarch64-virtio-pci-default.args | 5 +- .../aarch64-virtio-pci-manual-addresses.args | 5 +- .../arm-vexpressa9-virtio.args | 5 +- tests/qemuxml2argvdata/arm-virt-virtio.args | 5 +- tests/qemuxml2argvdata/audio-default-sdl.args | 5 +- .../qemuxml2argvdata/audio-default-spice.args | 5 +- tests/qemuxml2argvdata/audio-default-vnc.args | 5 +- tests/qemuxml2argvdata/autoindex.args | 5 +- .../qemuxml2argvdata/balloon-device-auto.args | 5 +- .../balloon-device-deflate-off.args | 5 +- .../balloon-device-deflate.args | 5 +- .../balloon-device-period.args | 5 +- tests/qemuxml2argvdata/balloon-device.args | 5 +- tests/qemuxml2argvdata/blkiotune-device.args | 5 +- tests/qemuxml2argvdata/blkiotune.args | 5 +- tests/qemuxml2argvdata/boot-cdrom.args | 5 +- tests/qemuxml2argvdata/boot-complex.args | 35 +- tests/qemuxml2argvdata/boot-floppy-q35.args | 6 +- tests/qemuxml2argvdata/boot-floppy.args | 10 +- .../boot-menu-disable-drive.args | 5 +- tests/qemuxml2argvdata/boot-menu-disable.args | 5 +- .../boot-menu-enable-with-timeout.args | 5 +- tests/qemuxml2argvdata/boot-menu-enable.args | 5 +- tests/qemuxml2argvdata/boot-multi.args | 5 +- tests/qemuxml2argvdata/boot-network.args | 5 +- tests/qemuxml2argvdata/boot-order.args | 20 +- tests/qemuxml2argvdata/channel-guestfwd.args | 5 +- tests/qemuxml2argvdata/channel-spicevmc.args | 5 +- .../qemuxml2argvdata/channel-virtio-auto.args | 5 +- .../channel-virtio-autoadd.args | 5 +- .../channel-virtio-autoassign.args | 5 +- .../channel-virtio-default.args | 5 +- .../channel-virtio-state.args | 5 +- .../qemuxml2argvdata/channel-virtio-unix.args | 5 +- tests/qemuxml2argvdata/channel-virtio.args | 5 +- tests/qemuxml2argvdata/clock-catchup.args | 5 +- tests/qemuxml2argvdata/clock-france.args | 5 +- tests/qemuxml2argvdata/clock-hpet-off.args | 5 +- .../clock-localtime-basis-localtime.args | 5 +- tests/qemuxml2argvdata/clock-localtime.args | 5 +- tests/qemuxml2argvdata/clock-realtime.args | 5 +- tests/qemuxml2argvdata/clock-utc.args | 5 +- tests/qemuxml2argvdata/clock-variable.args | 5 +- .../qemuxml2argvdata/console-compat-auto.args | 5 +- .../console-compat-chardev.args | 5 +- tests/qemuxml2argvdata/console-compat.args | 5 +- .../qemuxml2argvdata/console-virtio-ccw.args | 5 +- .../qemuxml2argvdata/console-virtio-many.args | 5 +- tests/qemuxml2argvdata/console-virtio.args | 5 +- tests/qemuxml2argvdata/controller-order.args | 10 +- .../cpu-host-passthrough-features.args | 5 +- .../qemuxml2argvdata/cputune-zero-shares.args | 5 +- tests/qemuxml2argvdata/cputune.args | 5 +- .../firmware-manual-efi-acpi-aarch64.args | 8 +- .../firmware-manual-efi-acpi-q35.args | 8 +- .../firmware-manual-efi-noacpi-aarch64.args | 8 +- .../firmware-manual-efi-secure.args | 8 +- .../qemuxml2argvdata/firmware-manual-efi.args | 8 +- .../qemuxml2argvdata/graphics-dbus-audio.args | 5 +- .../graphics-egl-headless.args | 5 +- .../graphics-sdl-fullscreen.args | 5 +- tests/qemuxml2argvdata/graphics-sdl.args | 5 +- .../hostdev-scsi-vhost-scsi-ccw.args | 5 +- .../hostdev-scsi-vhost-scsi-pci.args | 5 +- .../hostdev-vfio-multidomain.args | 5 +- tests/qemuxml2argvdata/hostdev-vfio.args | 5 +- .../qemuxml2argvdata/hugepages-memaccess.args | 5 +- .../hugepages-memaccess2.args | 5 +- tests/qemuxml2argvdata/hugepages-shared.args | 5 +- .../hvf-aarch64-virt-headless.args | 13 +- .../hvf-x86_64-q35-headless.args | 5 +- .../qemuxml2argvdata/input-usbmouse-addr.args | 5 +- tests/qemuxml2argvdata/input-usbmouse.args | 5 +- tests/qemuxml2argvdata/input-usbtablet.args | 5 +- tests/qemuxml2argvdata/input-virtio-ccw.args | 5 +- .../iothreads-disk-virtio-ccw.args | 10 +- tests/qemuxml2argvdata/iothreads-disk.args | 15 +- .../iothreads-ids-partial.args | 5 +- tests/qemuxml2argvdata/iothreads-ids.args | 5 +- tests/qemuxml2argvdata/iothreads.args | 5 +- tests/qemuxml2argvdata/kvm-pit-delay.args | 5 +- tests/qemuxml2argvdata/kvm-pit-discard.args | 5 +- .../machine-aeskeywrap-off-cap.args | 5 +- .../machine-aeskeywrap-off-caps.args | 5 +- .../machine-aeskeywrap-on-cap.args | 5 +- .../machine-aeskeywrap-on-caps.args | 5 +- tests/qemuxml2argvdata/machine-aliases1.args | 5 +- tests/qemuxml2argvdata/machine-aliases2.args | 5 +- tests/qemuxml2argvdata/machine-core-off.args | 5 +- tests/qemuxml2argvdata/machine-core-on.args | 5 +- .../machine-deakeywrap-off-cap.args | 5 +- .../machine-deakeywrap-off-caps.args | 5 +- .../machine-deakeywrap-on-cap.args | 5 +- .../machine-deakeywrap-on-caps.args | 5 +- .../machine-keywrap-none-caps.args | 5 +- .../machine-keywrap-none.args | 5 +- ...ine-loadparm-multiple-disks-nets-s390.args | 10 +- .../machine-loadparm-s390.args | 5 +- .../qemuxml2argvdata/machine-vmport-opt.args | 5 +- tests/qemuxml2argvdata/master-key.args | 5 +- .../memory-hotplug-dimm-addr.args | 5 +- .../qemuxml2argvdata/memory-hotplug-dimm.args | 5 +- tests/qemuxml2argvdata/memory-hotplug.args | 5 +- tests/qemuxml2argvdata/memtune-unlimited.args | 5 +- tests/qemuxml2argvdata/memtune.args | 5 +- tests/qemuxml2argvdata/migrate.args | 5 +- tests/qemuxml2argvdata/minimal.args | 5 +- tests/qemuxml2argvdata/misc-acpi.args | 5 +- tests/qemuxml2argvdata/misc-disable-s3.args | 5 +- .../misc-disable-suspends.args | 5 +- tests/qemuxml2argvdata/misc-enable-s4.args | 5 +- tests/qemuxml2argvdata/misc-uuid.args | 5 +- tests/qemuxml2argvdata/monitor-json.args | 5 +- .../multifunction-pci-device.args | 5 +- tests/qemuxml2argvdata/net-client.args | 5 +- tests/qemuxml2argvdata/net-eth-hostip.args | 5 +- tests/qemuxml2argvdata/net-eth-ifname.args | 5 +- tests/qemuxml2argvdata/net-eth-names.args | 5 +- .../net-eth-unmanaged-tap.args | 5 +- tests/qemuxml2argvdata/net-eth.args | 5 +- .../net-hostdev-bootorder.args | 5 +- .../net-hostdev-multidomain.args | 5 +- .../net-hostdev-vfio-multidomain.args | 5 +- tests/qemuxml2argvdata/net-hostdev-vfio.args | 5 +- tests/qemuxml2argvdata/net-hostdev.args | 5 +- tests/qemuxml2argvdata/net-mcast.args | 5 +- tests/qemuxml2argvdata/net-server.args | 5 +- tests/qemuxml2argvdata/net-udp.args | 5 +- tests/qemuxml2argvdata/net-user-addr.args | 5 +- tests/qemuxml2argvdata/net-user.args | 5 +- .../net-vhostuser-multiq.args | 5 +- tests/qemuxml2argvdata/net-virtio-device.args | 5 +- .../net-virtio-disable-offloads.args | 5 +- tests/qemuxml2argvdata/net-virtio-netdev.args | 5 +- .../net-virtio-rxtxqueuesize.args | 5 +- .../net-virtio-teaming-hostdev.args | 5 +- .../qemuxml2argvdata/net-virtio-teaming.args | 5 +- tests/qemuxml2argvdata/net-virtio.args | 5 +- tests/qemuxml2argvdata/nosharepages.args | 5 +- .../numad-auto-memory-vcpu-cpuset.args | 5 +- ...o-memory-vcpu-no-cpuset-and-placement.args | 5 +- .../numad-auto-vcpu-static-numatune.args | 5 +- .../numad-static-memory-auto-vcpu.args | 5 +- tests/qemuxml2argvdata/numad.args | 5 +- .../numatune-auto-nodeset-invalid.args | 5 +- tests/qemuxml2argvdata/numatune-memory.args | 5 +- .../parallel-parport-chardev.args | 5 +- .../parallel-tcp-chardev.args | 5 +- tests/qemuxml2argvdata/pci-autoadd-addr.args | 5 +- tests/qemuxml2argvdata/pci-autoadd-idx.args | 5 +- tests/qemuxml2argvdata/pci-autofill-addr.args | 5 +- .../pci-bridge-many-disks.args | 525 +++++++++++------- tests/qemuxml2argvdata/pci-bridge.args | 5 +- tests/qemuxml2argvdata/pci-many.args | 145 +++-- tests/qemuxml2argvdata/pci-rom.args | 5 +- .../pci-serial-dev-chardev.args | 5 +- tests/qemuxml2argvdata/pcie-expander-bus.args | 5 +- tests/qemuxml2argvdata/pcie-root-port.args | 5 +- .../pcie-switch-downstream-port.args | 5 +- .../pcie-switch-upstream-port.args | 5 +- tests/qemuxml2argvdata/pcihole64-q35.args | 5 +- .../pseries-vio-user-assigned.args | 5 +- tests/qemuxml2argvdata/pseries-vio.args | 5 +- tests/qemuxml2argvdata/q35-pcie-autoadd.args | 5 +- tests/qemuxml2argvdata/q35-pcie.args | 5 +- tests/qemuxml2argvdata/q35-usb2-multi.args | 5 +- tests/qemuxml2argvdata/q35-usb2-reorder.args | 5 +- tests/qemuxml2argvdata/q35-usb2.args | 5 +- .../q35-virt-manager-basic.args | 5 +- tests/qemuxml2argvdata/q35-virtio-pci.args | 5 +- tests/qemuxml2argvdata/q35.args | 5 +- tests/qemuxml2argvdata/qemu-ns-alt.args | 5 +- .../qemu-ns-commandline-ns0.args | 5 +- .../qemu-ns-commandline-ns1.args | 5 +- .../qemuxml2argvdata/qemu-ns-commandline.args | 5 +- .../qemu-ns-domain-commandline-ns0.args | 5 +- .../qemu-ns-domain-commandline.args | 5 +- .../qemuxml2argvdata/qemu-ns-domain-ns0.args | 5 +- tests/qemuxml2argvdata/qemu-ns-no-env.args | 5 +- tests/qemuxml2argvdata/restore-v2-fd.args | 5 +- tests/qemuxml2argvdata/restore-v2.args | 5 +- tests/qemuxml2argvdata/riscv64-virt-pci.args | 5 +- tests/qemuxml2argvdata/riscv64-virt.args | 5 +- tests/qemuxml2argvdata/seclabel-dac-none.args | 5 +- .../seclabel-dynamic-baselabel.args | 5 +- .../seclabel-dynamic-labelskip.args | 5 +- .../seclabel-dynamic-override.args | 10 +- .../seclabel-dynamic-relabel.args | 5 +- tests/qemuxml2argvdata/seclabel-dynamic.args | 5 +- tests/qemuxml2argvdata/seclabel-none.args | 5 +- .../seclabel-static-labelskip.args | 5 +- .../seclabel-static-relabel.args | 5 +- tests/qemuxml2argvdata/seclabel-static.args | 5 +- .../serial-dev-chardev-iobase.args | 5 +- .../qemuxml2argvdata/serial-dev-chardev.args | 5 +- .../qemuxml2argvdata/serial-file-chardev.args | 5 +- tests/qemuxml2argvdata/serial-file-log.args | 5 +- .../qemuxml2argvdata/serial-many-chardev.args | 5 +- .../qemuxml2argvdata/serial-pty-chardev.args | 5 +- tests/qemuxml2argvdata/serial-spiceport.args | 5 +- .../qemuxml2argvdata/serial-tcp-chardev.args | 5 +- .../serial-tcp-telnet-chardev.args | 5 +- .../serial-tcp-tlsx509-chardev-notls.args | 5 +- .../serial-tcp-tlsx509-chardev-verify.args | 5 +- .../serial-tcp-tlsx509-chardev.args | 5 +- .../serial-tcp-tlsx509-secret-chardev.args | 5 +- .../qemuxml2argvdata/serial-udp-chardev.args | 5 +- tests/qemuxml2argvdata/serial-vc-chardev.args | 5 +- tests/qemuxml2argvdata/smbios-type-fwcfg.args | 5 +- tests/qemuxml2argvdata/smbios.args | 5 +- tests/qemuxml2argvdata/smp-dies.args | 5 +- tests/qemuxml2argvdata/smp.args | 5 +- tests/qemuxml2argvdata/sound-device.args | 5 +- tests/qemuxml2argvdata/sound.args | 5 +- tests/qemuxml2argvdata/sparc-minimal.args | 10 +- .../video-device-pciaddr-default.args | 5 +- tests/qemuxml2argvdata/video-none-device.args | 5 +- .../video-qxl-device-vgamem.args | 5 +- tests/qemuxml2argvdata/video-qxl-device.args | 5 +- tests/qemuxml2argvdata/video-qxl-heads.args | 5 +- tests/qemuxml2argvdata/video-qxl-noheads.args | 5 +- .../video-qxl-resolution.args | 5 +- .../video-qxl-sec-device-vgamem.args | 5 +- .../video-qxl-sec-device.args | 5 +- .../video-vga-device-vgamem.args | 5 +- tests/qemuxml2argvdata/video-vga-device.args | 5 +- .../qemuxml2argvdata/video-vga-qxl-heads.args | 5 +- .../video-virtio-gpu-ccw.args | 5 +- .../video-virtio-gpu-device.args | 5 +- .../video-virtio-gpu-sdl-gl.args | 5 +- .../video-virtio-gpu-spice-gl.args | 5 +- .../video-virtio-gpu-virgl.args | 5 +- tests/qemuxml2argvdata/video-virtio-vga.args | 5 +- tests/qemuxml2argvdata/virtio-rng-ccw.args | 5 +- tests/qemuxml2argvdata/vmcoreinfo.args | 5 +- tests/testutilsqemu.c | 4 + 241 files changed, 1187 insertions(+), 786 deletions(-) diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args b/tests/= qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args index 23edbd4edb..9955ca3dbc 100644 --- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args +++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args @@ -31,8 +31,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-aarch64test/.config \ -append 'earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda rootwai= t' \ -dtb /aarch64.dtb \ -device virtio-serial-device,id=3Dvirtio-serial0 \ --drive file=3D/aarch64.raw,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk0 \ --device virtio-blk-device,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,boo= tindex=3D1 \ +-blockdev '{"driver":"file","filename":"/aarch64.raw","node-name":"libvirt= -1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-device,drive=3Dlibvirt-1-format,id=3Dvirtio-disk0,booti= ndex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-device,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4= :37 \ -chardev pty,id=3Dcharconsole0 \ diff --git a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args b/tests/qe= muxml2argvdata/aarch64-cpu-passthrough.args index 6a9898193f..447fcedf84 100644 --- a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args +++ b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args @@ -26,7 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-aarch64test/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --drive file=3D/aarch64.raw,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk0 \ --device virtio-blk-device,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,boo= tindex=3D1 \ +-blockdev '{"driver":"file","filename":"/aarch64.raw","node-name":"libvirt= -1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-device,drive=3Dlibvirt-1-format,id=3Dvirtio-disk0,booti= ndex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args b/tests/qemux= ml2argvdata/aarch64-kvm-32-on-64.args index 6ac50d6f17..0b22efecd2 100644 --- a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args +++ b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args @@ -28,8 +28,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-armtest/.config \ -kernel /arm.kernel \ -initrd /arm.initrd \ -append 'console=3DttyAMA0,115200n8 rw root=3D/dev/vda rootwait physmap.en= abled=3D0' \ --drive file=3D/arm.raw,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk0 \ --device virtio-blk-device,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,boo= tindex=3D1 \ +-blockdev '{"driver":"file","filename":"/arm.raw","node-name":"libvirt-1-s= torage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-device,drive=3Dlibvirt-1-format,id=3Dvirtio-disk0,booti= ndex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-device,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4= :37 \ -chardev pty,id=3Dcharserial0 \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.arg= s b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args index 7f8bd9d402..15f8f16975 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args +++ b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args @@ -34,8 +34,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-aarch64test/.config \ -device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ -device ioh3420,port=3D16,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x2 \ -device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.2,addr=3D0x2 \ --drive file=3D/aarch64.raw,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk0 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x3,drive=3Ddrive-virtio-disk0,i= d=3Dvirtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/aarch64.raw","node-name":"libvirt= -1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x3,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.2,addr=3D0x1 \ -chardev pty,id=3Dcharserial0 \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio.args b/tests/qemuxm= l2argvdata/aarch64-virt-virtio.args index 4a78ab1038..575727a694 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-virtio.args +++ b/tests/qemuxml2argvdata/aarch64-virt-virtio.args @@ -31,8 +31,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-aarch64test/.config \ -append 'earlyprintk console=3DttyAMA0,115200n8 rw root=3D/dev/vda rootwai= t' \ -dtb /aarch64.dtb \ -device virtio-serial-device,id=3Dvirtio-serial0 \ --drive file=3D/aarch64.raw,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk0 \ --device virtio-blk-device,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,boo= tindex=3D1 \ +-blockdev '{"driver":"file","filename":"/aarch64.raw","node-name":"libvirt= -1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-device,drive=3Dlibvirt-1-format,id=3Dvirtio-disk0,booti= ndex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-device,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4= :37 \ -chardev pty,id=3Dcharserial0 \ diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args b/tests= /qemuxml2argvdata/aarch64-virtio-pci-default.args index 2e2b523b07..aa7c04e9c6 100644 --- a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args +++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args @@ -37,8 +37,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-aarch64test/.config \ -device ioh3420,port=3D12,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr=3D0x1.0= x4 \ -device ioh3420,port=3D13,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr=3D0x1.0= x5 \ -device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.2,addr=3D0x0 \ --drive file=3D/aarch64.raw,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk0 \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0x0,drive=3Ddrive-virtio-disk0,i= d=3Dvirtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/aarch64.raw","node-name":"libvirt= -1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.3,addr=3D0x0,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.1,addr=3D0x0 \ -chardev pty,id=3Dcharserial0 \ diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.arg= s b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args index 671854a250..3000fea1a6 100644 --- a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args +++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args @@ -34,8 +34,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-aarch64test/.config \ -device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ -device pci-bridge,chassis_nr=3D3,id=3Dpci.3,bus=3Dpci.1,addr=3D0x1 \ -device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.3,addr=3D0x1 \ --drive file=3D/aarch64.raw,format=3Draw,if=3Dnone,id=3Ddrive-scsi0-0-0-0 \ --device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive=3Ddriv= e-scsi0-0-0-0,id=3Dscsi0-0-0-0,bootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/aarch64.raw","node-name":"libvirt= -1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive=3Dlibv= irt-1-format,id=3Dscsi0-0-0-0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.3,addr=3D0x2 \ -netdev user,id=3Dhostnet1 \ diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args b/tests/qemu= xml2argvdata/arm-vexpressa9-virtio.args index c8fd7ec981..bb2097bd48 100644 --- a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args +++ b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args @@ -30,8 +30,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-armtest/.config \ -dtb /arm.dtb \ -device virtio-serial-device,id=3Dvirtio-serial0 \ -usb \ --drive file=3D/arm.raw,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk0 \ --device virtio-blk-device,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,boo= tindex=3D1 \ +-blockdev '{"driver":"file","filename":"/arm.raw","node-name":"libvirt-1-s= torage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-device,drive=3Dlibvirt-1-format,id=3Dvirtio-disk0,booti= ndex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-device,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4= :37 \ -chardev pty,id=3Dcharserial0 \ diff --git a/tests/qemuxml2argvdata/arm-virt-virtio.args b/tests/qemuxml2ar= gvdata/arm-virt-virtio.args index fb0bf0e374..be24dc0e71 100644 --- a/tests/qemuxml2argvdata/arm-virt-virtio.args +++ b/tests/qemuxml2argvdata/arm-virt-virtio.args @@ -29,8 +29,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-armtest/.config \ -append 'console=3DttyAMA0,115200n8 rw root=3D/dev/vda rootwait physmap.en= abled=3D0' \ -dtb /arm.dtb \ -device virtio-serial-device,id=3Dvirtio-serial0 \ --drive file=3D/arm.raw,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk0 \ --device virtio-blk-device,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,boo= tindex=3D1 \ +-blockdev '{"driver":"file","filename":"/arm.raw","node-name":"libvirt-1-s= torage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-device,drive=3Dlibvirt-1-format,id=3Dvirtio-disk0,booti= ndex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-device,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4= :37 \ -chardev pty,id=3Dcharserial0 \ diff --git a/tests/qemuxml2argvdata/audio-default-sdl.args b/tests/qemuxml2= argvdata/audio-default-sdl.args index f64c20ce3c..522a0cedb3 100644 --- a/tests/qemuxml2argvdata/audio-default-sdl.args +++ b/tests/qemuxml2argvdata/audio-default-sdl.args @@ -26,8 +26,9 @@ SDL_AUDIODRIVER=3Desd \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/cdrom,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,readon= ly=3Don \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"sdl"}' \ -display sdl \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ diff --git a/tests/qemuxml2argvdata/audio-default-spice.args b/tests/qemuxm= l2argvdata/audio-default-spice.args index 2b6946e99a..fd9a7850e0 100644 --- a/tests/qemuxml2argvdata/audio-default-spice.args +++ b/tests/qemuxml2argvdata/audio-default-spice.args @@ -25,8 +25,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/cdrom,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,readon= ly=3Don \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D0,seamless-migration=3Don \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ diff --git a/tests/qemuxml2argvdata/audio-default-vnc.args b/tests/qemuxml2= argvdata/audio-default-vnc.args index 862bde252f..19b80f8d0f 100644 --- a/tests/qemuxml2argvdata/audio-default-vnc.args +++ b/tests/qemuxml2argvdata/audio-default-vnc.args @@ -25,8 +25,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/cdrom,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,readon= ly=3Don \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"alsa"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ diff --git a/tests/qemuxml2argvdata/autoindex.args b/tests/qemuxml2argvdata= /autoindex.args index 08a496c9b7..a80f49c461 100644 --- a/tests/qemuxml2argvdata/autoindex.args +++ b/tests/qemuxml2argvdata/autoindex.args @@ -54,7 +54,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -device ich9-usb-uhci2,masterbus=3Dusb4.0,firstport=3D2,bus=3Dpci.2,addr= =3D0x2.0x1 \ -device ich9-usb-uhci3,masterbus=3Dusb4.0,firstport=3D4,bus=3Dpci.2,addr= =3D0x2.0x2 \ -device ich9-usb-ehci1,id=3Dusb4,bus=3Dpci.2,addr=3D0x2.0x7 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ --device ide-hd,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0,bootinde= x=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind= ex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args b/tests/qemuxm= l2argvdata/balloon-device-auto.args index dbcb959334..24193d008b 100644 --- a/tests/qemuxml2argvdata/balloon-device-auto.args +++ b/tests/qemuxml2argvdata/balloon-device-auto.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args b/tests= /qemuxml2argvdata/balloon-device-deflate-off.args index de5a740a5c..08122249a1 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate-off.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,deflate-on-oom=3Doff,bus=3Dpci.0,= addr=3D0x12 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args b/tests/qem= uxml2argvdata/balloon-device-deflate.args index 060e1fc617..bac27e20a9 100644 --- a/tests/qemuxml2argvdata/balloon-device-deflate.args +++ b/tests/qemuxml2argvdata/balloon-device-deflate.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,deflate-on-oom=3Don,bus=3Dpci.0,a= ddr=3D0x12 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/balloon-device-period.args b/tests/qemu= xml2argvdata/balloon-device-period.args index 7ca265fd15..925f534ae2 100644 --- a/tests/qemuxml2argvdata/balloon-device-period.args +++ b/tests/qemuxml2argvdata/balloon-device-period.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x12 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/balloon-device.args b/tests/qemuxml2arg= vdata/balloon-device.args index 7ca265fd15..925f534ae2 100644 --- a/tests/qemuxml2argvdata/balloon-device.args +++ b/tests/qemuxml2argvdata/balloon-device.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x12 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/blkiotune-device.args b/tests/qemuxml2a= rgvdata/blkiotune-device.args index dbcb959334..24193d008b 100644 --- a/tests/qemuxml2argvdata/blkiotune-device.args +++ b/tests/qemuxml2argvdata/blkiotune-device.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/blkiotune.args b/tests/qemuxml2argvdata= /blkiotune.args index dbcb959334..24193d008b 100644 --- a/tests/qemuxml2argvdata/blkiotune.args +++ b/tests/qemuxml2argvdata/blkiotune.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/boot-cdrom.args b/tests/qemuxml2argvdat= a/boot-cdrom.args index 59095372f5..cba00fa112 100644 --- a/tests/qemuxml2argvdata/boot-cdrom.args +++ b/tests/qemuxml2argvdata/boot-cdrom.args @@ -26,7 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/cdrom,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,readon= ly=3Don \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/boot-complex.args b/tests/qemuxml2argvd= ata/boot-complex.args index bf97a62e1b..5eb78e291b 100644 --- a/tests/qemuxml2argvdata/boot-complex.args +++ b/tests/qemuxml2argvdata/boot-complex.args @@ -26,21 +26,28 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/tmp/vda.img,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk0 \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-vir= tio-disk0,id=3Dvirtio-disk0,bootindex=3D3 \ --drive file=3D/tmp/vdb.img,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk1 \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x5,drive=3Ddrive-vir= tio-disk1,id=3Dvirtio-disk1 \ --drive file=3D/dev/HostVG/hda,format=3Draw,if=3Dnone,id=3Ddrive-ide0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0 \ --drive file=3D/dev/HostVG/hdb,format=3Draw,if=3Dnone,id=3Ddrive-ide0-0-1 \ --device ide-hd,bus=3Dide.0,unit=3D1,drive=3Ddrive-ide0-0-1,id=3Dide0-0-1 \ --drive file=3D/dev/HostVG/hdc,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,r= eadonly=3Don \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ --drive file=3D/dev/fd0,format=3Draw,if=3Dnone,id=3Ddrive-fdc0-0-0 \ --drive file=3D/dev/fd1,format=3Draw,if=3Dnone,id=3Ddrive-fdc0-0-1 \ --global isa-fdc.driveA=3Ddrive-fdc0-0-0 \ -global isa-fdc.bootindexA=3D4 \ --global isa-fdc.driveB=3Ddrive-fdc0-0-1 \ +-blockdev '{"driver":"file","filename":"/tmp/vda.img","node-name":"libvirt= -7-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-7-format","read-only":false,"driver":"raw= ","file":"libvirt-7-storage"}' \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-7= -format,id=3Dvirtio-disk0,bootindex=3D3 \ +-blockdev '{"driver":"file","filename":"/tmp/vdb.img","node-name":"libvirt= -6-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw= ","file":"libvirt-6-storage"}' \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-6= -format,id=3Dvirtio-disk1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/hda","node-name= ":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw= ","file":"libvirt-5-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-5-format,id=3Dide0-0-0= \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/hdb","node-name= ":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-4-format,id=3Dide0-0-1= \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/hdc","node-name= ":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw"= ,"file":"libvirt-3-storage"}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/fd0","node-name":"libv= irt-2-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ +-device floppy,unit=3D0,drive=3Dlibvirt-2-format,id=3Dfdc0-0-0 \ +-blockdev '{"driver":"host_device","filename":"/dev/fd1","node-name":"libv= irt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device floppy,unit=3D1,drive=3Dlibvirt-1-format,id=3Dfdc0-0-1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:11= ,bootindex=3D2,bus=3Dpci.0,addr=3D0x2 \ -netdev user,id=3Dhostnet1 \ diff --git a/tests/qemuxml2argvdata/boot-floppy-q35.args b/tests/qemuxml2ar= gvdata/boot-floppy-q35.args index 632664c46b..7a4737f925 100644 --- a/tests/qemuxml2argvdata/boot-floppy-q35.args +++ b/tests/qemuxml2argvdata/boot-floppy-q35.args @@ -25,7 +25,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --drive file=3D/tmp/firmware.img,format=3Draw,if=3Dnone,id=3Ddrive-fdc0-0-0= \ --device isa-fdc,driveA=3Ddrive-fdc0-0-0,bootindexA=3D1 \ +-device isa-fdc,bootindexA=3D1 \ +-blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"li= bvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device floppy,unit=3D0,drive=3Dlibvirt-1-format,id=3Dfdc0-0-0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/boot-floppy.args b/tests/qemuxml2argvda= ta/boot-floppy.args index b449214b7f..467ca1342b 100644 --- a/tests/qemuxml2argvdata/boot-floppy.args +++ b/tests/qemuxml2argvdata/boot-floppy.args @@ -26,10 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0 \ --drive file=3D/tmp/firmware.img,format=3Draw,if=3Dnone,id=3Ddrive-fdc0-0-0= \ --global isa-fdc.driveA=3Ddrive-fdc0-0-0 \ -global isa-fdc.bootindexA=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-0-0= \ +-blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"li= bvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device floppy,unit=3D0,drive=3Dlibvirt-1-format,id=3Dfdc0-0-0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.args b/tests/qe= muxml2argvdata/boot-menu-disable-drive.args index 3538921f0e..e307121a6e 100644 --- a/tests/qemuxml2argvdata/boot-menu-disable-drive.args +++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot menu=3Doff,strict=3Don \ -usb \ --drive file=3D/dev/cdrom,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,readon= ly=3Don \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/boot-menu-disable.args b/tests/qemuxml2= argvdata/boot-menu-disable.args index 3538921f0e..e307121a6e 100644 --- a/tests/qemuxml2argvdata/boot-menu-disable.args +++ b/tests/qemuxml2argvdata/boot-menu-disable.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot menu=3Doff,strict=3Don \ -usb \ --drive file=3D/dev/cdrom,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,readon= ly=3Don \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args b/te= sts/qemuxml2argvdata/boot-menu-enable-with-timeout.args index 4a799dfe10..d77a63ae5e 100644 --- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args +++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot menu=3Don,splash-time=3D3000,strict=3Don \ -usb \ --drive file=3D/dev/cdrom,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,readon= ly=3Don \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/boot-menu-enable.args b/tests/qemuxml2a= rgvdata/boot-menu-enable.args index 5b5cf2c559..777918fa80 100644 --- a/tests/qemuxml2argvdata/boot-menu-enable.args +++ b/tests/qemuxml2argvdata/boot-menu-enable.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot menu=3Don,strict=3Don \ -usb \ --drive file=3D/dev/cdrom,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,readon= ly=3Don \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/boot-multi.args b/tests/qemuxml2argvdat= a/boot-multi.args index 5b5cf2c559..777918fa80 100644 --- a/tests/qemuxml2argvdata/boot-multi.args +++ b/tests/qemuxml2argvdata/boot-multi.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot menu=3Don,strict=3Don \ -usb \ --drive file=3D/dev/cdrom,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,readon= ly=3Don \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/boot-network.args b/tests/qemuxml2argvd= ata/boot-network.args index 30369ad55e..451e5ef66a 100644 --- a/tests/qemuxml2argvdata/boot-network.args +++ b/tests/qemuxml2argvdata/boot-network.args @@ -26,7 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/boot-order.args b/tests/qemuxml2argvdat= a/boot-order.args index 241639546f..6d465ff2a8 100644 --- a/tests/qemuxml2argvdata/boot-order.args +++ b/tests/qemuxml2argvdata/boot-order.args @@ -26,15 +26,19 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0 \ --drive file=3D/root/boot.iso,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1-0,re= adonly=3Don \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0,b= ootindex=3D1 \ --drive file=3Dsheepdog:example.org:6000:image,format=3Draw,if=3Dnone,id=3D= drive-virtio-disk0 \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-vir= tio-disk0,id=3Dvirtio-disk0,bootindex=3D3 \ --drive file=3D/dev/null,format=3Draw,if=3Dnone,id=3Ddrive-fdc0-0-1 \ --global isa-fdc.driveB=3Ddrive-fdc0-0-1 \ -global isa-fdc.bootindexB=3D4 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-4-format,id=3Dide0-0-0= \ +-blockdev '{"driver":"file","filename":"/root/boot.iso","node-name":"libvi= rt-3-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw"= ,"file":"libvirt-3-storage"}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-1-0= ,bootindex=3D1 \ +-blockdev '{"driver":"sheepdog","server":{"type":"inet","host":"example.or= g","port":"6000"},"vdi":"image","node-name":"libvirt-2-storage","auto-read-= only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-2= -format,id=3Dvirtio-disk0,bootindex=3D3 \ +-blockdev '{"driver":"file","filename":"/dev/null","node-name":"libvirt-1-= storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device floppy,unit=3D1,drive=3Dlibvirt-1-format,id=3Dfdc0-0-1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55= ,bootindex=3D2,bus=3Dpci.0,addr=3D0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args b/tests/qemuxml2a= rgvdata/channel-guestfwd.args index 52411f9289..78fe3d37c2 100644 --- a/tests/qemuxml2argvdata/channel-guestfwd.args +++ b/tests/qemuxml2argvdata/channel-guestfwd.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev pipe,id=3Dcharchannel0,path=3D/tmp/guestfwd \ -netdev user,guestfwd=3Dtcp:10.0.2.1:4600-chardev:charchannel0,id=3Dchanne= l0 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args b/tests/qemuxml2a= rgvdata/channel-spicevmc.args index 0671ae2660..c9a266b9ea 100644 --- a/tests/qemuxml2argvdata/channel-spicevmc.args +++ b/tests/qemuxml2argvdata/channel-spicevmc.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -boot strict=3Don \ -device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0xa \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev spicevmc,id=3Dcharchannel0,name=3Dvdagent \ -device virtserialport,bus=3Dvirtio-serial1.0,nr=3D3,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dcom.redhat.spice.0 \ -audiodev '{"id":"audio1","driver":"spice"}' \ diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args b/tests/qemuxm= l2argvdata/channel-virtio-auto.args index 311860cc67..5b5072d56e 100644 --- a/tests/qemuxml2argvdata/channel-virtio-auto.args +++ b/tests/qemuxml2argvdata/channel-virtio-auto.args @@ -29,8 +29,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0xa \ -device virtio-serial-pci,id=3Dvirtio-serial2,bus=3Dpci.0,addr=3D0x3 \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev pty,id=3Dcharchannel0 \ -device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.linux-kvm.port.0 \ -chardev pty,id=3Dcharchannel1 \ diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args b/tests/qem= uxml2argvdata/channel-virtio-autoadd.args index e78c7a758b..7cca11ac76 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args @@ -28,8 +28,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device virtio-serial-pci,id=3Dvirtio-serial0,max_ports=3D4,vectors=3D4,bu= s=3Dpci.0,addr=3D0x2 \ -device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0x3 \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev pty,id=3Dcharchannel0 \ -device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.linux-kvm.port.0 \ -chardev pty,id=3Dcharchannel1 \ diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args b/tests/= qemuxml2argvdata/channel-virtio-autoassign.args index 5974937da3..330d843faa 100644 --- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args +++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args @@ -28,8 +28,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device virtio-serial-pci,id=3Dvirtio-serial0,max_ports=3D4,vectors=3D4,bu= s=3Dpci.0,addr=3D0x2 \ -device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0xa \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev pty,id=3Dcharchannel0 \ -device virtserialport,bus=3Dvirtio-serial0.0,nr=3D2,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.linux-kvm.port.0 \ -chardev pty,id=3Dcharchannel1 \ diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args b/tests/qem= uxml2argvdata/channel-virtio-default.args index 278ce4b731..73de60f518 100644 --- a/tests/qemuxml2argvdata/channel-virtio-default.args +++ b/tests/qemuxml2argvdata/channel-virtio-default.args @@ -27,8 +27,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0xa \ -device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x3 \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev pty,id=3Dcharchannel0 \ -device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0 \ -chardev spicevmc,id=3Dcharchannel1,name=3Dvdagent \ diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args b/tests/qemux= ml2argvdata/channel-virtio-state.args index ea49528e02..7f3754fc2a 100644 --- a/tests/qemuxml2argvdata/channel-virtio-state.args +++ b/tests/qemuxml2argvdata/channel-virtio-state.args @@ -27,8 +27,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -boot strict=3Don \ -device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0xa \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev pty,id=3Dcharchannel0 \ -device virtserialport,bus=3Dvirtio-serial1.0,nr=3D3,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.linux-kvm.port.foo \ -chardev pty,id=3Dcharchannel1 \ diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args b/tests/qemuxm= l2argvdata/channel-virtio-unix.args index 45a102bbac..baea530a4d 100644 --- a/tests/qemuxml2argvdata/channel-virtio-unix.args +++ b/tests/qemuxml2argvdata/channel-virtio-unix.args @@ -28,8 +28,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0xa \ -device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x2 \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ -device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ -chardev socket,id=3Dcharchannel1,fd=3D1729,server=3Don,wait=3Doff \ diff --git a/tests/qemuxml2argvdata/channel-virtio.args b/tests/qemuxml2arg= vdata/channel-virtio.args index c96c019b6c..ea2b97654b 100644 --- a/tests/qemuxml2argvdata/channel-virtio.args +++ b/tests/qemuxml2argvdata/channel-virtio.args @@ -27,8 +27,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -boot strict=3Don \ -device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0xa \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev pty,id=3Dcharchannel0 \ -device virtserialport,bus=3Dvirtio-serial1.0,nr=3D3,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.linux-kvm.port.foo \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/clock-catchup.args b/tests/qemuxml2argv= data/clock-catchup.args index 0ec9e70f22..c51a40d645 100644 --- a/tests/qemuxml2argvdata/clock-catchup.args +++ b/tests/qemuxml2argvdata/clock-catchup.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-france.args b/tests/qemuxml2argvd= ata/clock-france.args index a5a8f3a088..3d0a24caa6 100644 --- a/tests/qemuxml2argvdata/clock-france.args +++ b/tests/qemuxml2argvdata/clock-france.args @@ -27,8 +27,9 @@ TZ=3DEurope/Paris \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args b/tests/qemuxml2arg= vdata/clock-hpet-off.args index 1979882c36..2ecd29ca29 100644 --- a/tests/qemuxml2argvdata/clock-hpet-off.args +++ b/tests/qemuxml2argvdata/clock-hpet-off.args @@ -27,8 +27,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args b/= tests/qemuxml2argvdata/clock-localtime-basis-localtime.args index 3a03f782c0..c6d55dbacf 100644 --- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args +++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-localtime.args b/tests/qemuxml2ar= gvdata/clock-localtime.args index 7cd450c9be..177e5738f3 100644 --- a/tests/qemuxml2argvdata/clock-localtime.args +++ b/tests/qemuxml2argvdata/clock-localtime.args @@ -26,7 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-realtime.args b/tests/qemuxml2arg= vdata/clock-realtime.args index 4b9321552f..2ab04bc929 100644 --- a/tests/qemuxml2argvdata/clock-realtime.args +++ b/tests/qemuxml2argvdata/clock-realtime.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-utc.args b/tests/qemuxml2argvdata= /clock-utc.args index 39bc2c0a6e..4029e9e1e6 100644 --- a/tests/qemuxml2argvdata/clock-utc.args +++ b/tests/qemuxml2argvdata/clock-utc.args @@ -26,7 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/clock-variable.args b/tests/qemuxml2arg= vdata/clock-variable.args index 9d03ac30ff..bb176dd511 100644 --- a/tests/qemuxml2argvdata/clock-variable.args +++ b/tests/qemuxml2argvdata/clock-variable.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/console-compat-auto.args b/tests/qemuxm= l2argvdata/console-compat-auto.args index cf08357b27..a495cc9c92 100644 --- a/tests/qemuxml2argvdata/console-compat-auto.args +++ b/tests/qemuxml2argvdata/console-compat-auto.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ -device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/console-compat-chardev.args b/tests/qem= uxml2argvdata/console-compat-chardev.args index cf08357b27..a495cc9c92 100644 --- a/tests/qemuxml2argvdata/console-compat-chardev.args +++ b/tests/qemuxml2argvdata/console-compat-chardev.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ -device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/console-compat.args b/tests/qemuxml2arg= vdata/console-compat.args index 7013b6b570..f6c7ca9361 100644 --- a/tests/qemuxml2argvdata/console-compat.args +++ b/tests/qemuxml2argvdata/console-compat.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ -device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/console-virtio-ccw.args b/tests/qemuxml= 2argvdata/console-virtio-ccw.args index a663029542..f8e012f4b7 100644 --- a/tests/qemuxml2argvdata/console-virtio-ccw.args +++ b/tests/qemuxml2argvdata/console-virtio-ccw.args @@ -25,8 +25,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -boot strict=3Don \ -device virtio-serial-ccw,id=3Dvirtio-serial0,devno=3Dfe.0.0001 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,id=3Dv= irtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -chardev pty,id=3Dcharconsole0 \ -device virtconsole,chardev=3Dcharconsole0,id=3Dconsole0 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/console-virtio-many.args b/tests/qemuxm= l2argvdata/console-virtio-many.args index 534d75fbee..33892634d5 100644 --- a/tests/qemuxml2argvdata/console-virtio-many.args +++ b/tests/qemuxml2argvdata/console-virtio-many.args @@ -27,8 +27,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -boot strict=3Don \ -device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x2 \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ -device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -chardev pty,id=3Dcharconsole1 \ diff --git a/tests/qemuxml2argvdata/console-virtio.args b/tests/qemuxml2arg= vdata/console-virtio.args index c11c01ed2f..5e3788fcc1 100644 --- a/tests/qemuxml2argvdata/console-virtio.args +++ b/tests/qemuxml2argvdata/console-virtio.args @@ -27,8 +27,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -boot strict=3Don \ -device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x2 \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev pty,id=3Dcharconsole0 \ -device virtconsole,chardev=3Dcharconsole0,id=3Dconsole0 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/controller-order.args b/tests/qemuxml2a= rgvdata/controller-order.args index 9fcc9560f6..fd9eba459a 100644 --- a/tests/qemuxml2argvdata/controller-order.args +++ b/tests/qemuxml2argvdata/controller-order.args @@ -27,10 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fdr/.config \ -device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x7 \ -device usb-hub,id=3Dhub0,bus=3Dusb.0,port=3D1 \ -device usb-ccid,id=3Dccid0,bus=3Dusb.0,port=3D1.1 \ --drive file=3D/tmp/fdr.img,format=3Draw,if=3Dnone,id=3Ddrive-virtio-disk0,= cache=3Dnone,aio=3Dnative \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Ddrive-virtio-disk0,i= d=3Dvirtio-disk0,bootindex=3D1 \ --drive file=3D/tmp/Fedora-17-x86_64-Live-Desktop.iso,format=3Draw,if=3Dnon= e,id=3Ddrive-ide0-1-0,readonly=3Don \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0 \ +-blockdev '{"driver":"file","filename":"/tmp/fdr.img","aio":"native","node= -name":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},"auto-r= ead-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"raw","file":"libvirt-2-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/tmp/Fedora-17-x86_64-Live-Desktop= .iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unma= p"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:4d:4b:19= ,bootindex=3D2,bus=3Dpci.0,addr=3D0x3 \ -chardev spicevmc,id=3Dcharsmartcard0,name=3Dsmartcard \ diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args b/te= sts/qemuxml2argvdata/cpu-host-passthrough-features.args index 56597bafdf..4c87e1b5ad 100644 --- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args +++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args @@ -27,8 +27,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cputune-zero-shares.args b/tests/qemuxm= l2argvdata/cputune-zero-shares.args index 2a5455dfaf..f30ed2fed6 100644 --- a/tests/qemuxml2argvdata/cputune-zero-shares.args +++ b/tests/qemuxml2argvdata/cputune-zero-shares.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cputune.args b/tests/qemuxml2argvdata/c= putune.args index 2a5455dfaf..f30ed2fed6 100644 --- a/tests/qemuxml2argvdata/cputune.args +++ b/tests/qemuxml2argvdata/cputune.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args b= /tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args index 3ff17a498e..8e89eb8e54 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args @@ -10,10 +10,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gues= t/master-key.aes \ --machine virt,usb=3Doff,dump-guest-core=3Doff,gic-version=3D2 \ +-blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","n= ode-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"= }' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ +-blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.f= d","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"u= nmap"}' \ +-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ +-machine virt,usb=3Doff,dump-guest-core=3Doff,gic-version=3D2,pflash0=3Dli= bvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format \ -accel tcg \ --drive file=3D/usr/share/AAVMF/AAVMF_CODE.fd,if=3Dpflash,format=3Draw,unit= =3D0,readonly=3Don \ --drive file=3D/some/user/nvram/path/guest_VARS.fd,if=3Dpflash,format=3Draw= ,unit=3D1 \ -m 1024 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args b/tes= ts/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args index 776f9fb467..08280c18ea 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args @@ -10,10 +10,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gues= t/master-key.aes \ --machine q35,usb=3Doff,dump-guest-core=3Doff \ +-blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","nod= e-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'= \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ +-blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.f= d","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"u= nmap"}' \ +-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ +-machine q35,usb=3Doff,dump-guest-core=3Doff,pflash0=3Dlibvirt-pflash0-for= mat,pflash1=3Dlibvirt-pflash1-format \ -accel tcg \ --drive file=3D/usr/share/OVMF/OVMF_CODE.fd,if=3Dpflash,format=3Draw,unit= =3D0,readonly=3Don \ --drive file=3D/some/user/nvram/path/guest_VARS.fd,if=3Dpflash,format=3Draw= ,unit=3D1 \ -m 1024 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args= b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args index a0dcc22db2..b135a30201 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args @@ -10,10 +10,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -name guest=3Dguest,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-gues= t/master-key.aes \ --machine virt,usb=3Doff,dump-guest-core=3Doff,gic-version=3D2 \ +-blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","n= ode-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"= }' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ +-blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.f= d","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"u= nmap"}' \ +-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ +-machine virt,usb=3Doff,dump-guest-core=3Doff,gic-version=3D2,pflash0=3Dli= bvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format \ -accel tcg \ --drive file=3D/usr/share/AAVMF/AAVMF_CODE.fd,if=3Dpflash,format=3Draw,unit= =3D0,readonly=3Don \ --drive file=3D/some/user/nvram/path/guest_VARS.fd,if=3Dpflash,format=3Draw= ,unit=3D1 \ -m 1024 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-secure.args b/tests= /qemuxml2argvdata/firmware-manual-efi-secure.args index 94ee0e48c0..996acbb244 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi-secure.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi-secure.args @@ -10,11 +10,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ -name guest=3Dtest-bios,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-test= -bios/master-key.aes \ --machine q35,usb=3Doff,smm=3Don,dump-guest-core=3Doff \ +-blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.= fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"= unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ +-blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.f= d","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"u= nmap"}' \ +-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ +-machine q35,usb=3Doff,smm=3Don,dump-guest-core=3Doff,pflash0=3Dlibvirt-pf= lash0-format,pflash1=3Dlibvirt-pflash1-format \ -accel tcg \ -global driver=3Dcfi.pflash01,property=3Dsecure,value=3Don \ --drive file=3D/usr/share/OVMF/OVMF_CODE.secboot.fd,if=3Dpflash,format=3Dra= w,unit=3D0,readonly=3Don \ --drive file=3D/some/user/nvram/path/guest_VARS.fd,if=3Dpflash,format=3Draw= ,unit=3D1 \ -m 1024 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/firmware-manual-efi.args b/tests/qemuxm= l2argvdata/firmware-manual-efi.args index 8fb23cc1e6..1ee322bf08 100644 --- a/tests/qemuxml2argvdata/firmware-manual-efi.args +++ b/tests/qemuxml2argvdata/firmware-manual-efi.args @@ -10,10 +10,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \ -name guest=3Dtest-bios,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-test= -bios/master-key.aes \ --machine pc,usb=3Doff,dump-guest-core=3Doff \ +-blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","nod= e-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}'= \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ +-blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.f= d","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"u= nmap"}' \ +-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ +-machine pc,usb=3Doff,dump-guest-core=3Doff,pflash0=3Dlibvirt-pflash0-form= at,pflash1=3Dlibvirt-pflash1-format \ -accel tcg \ --drive file=3D/usr/share/OVMF/OVMF_CODE.fd,if=3Dpflash,format=3Draw,unit= =3D0,readonly=3Don \ --drive file=3D/some/user/nvram/path/guest_VARS.fd,if=3Dpflash,format=3Draw= ,unit=3D1 \ -m 1024 \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ diff --git a/tests/qemuxml2argvdata/graphics-dbus-audio.args b/tests/qemuxm= l2argvdata/graphics-dbus-audio.args index 968dddfd89..a222d5d88a 100644 --- a/tests/qemuxml2argvdata/graphics-dbus-audio.args +++ b/tests/qemuxml2argvdata/graphics-dbus-audio.args @@ -25,8 +25,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"dbus","in":{"mixing-engine":false},"ou= t":{"mixing-engine":false}}' \ -display dbus,p2p=3Don,audiodev=3Daudio1 \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.args b/tests/qemu= xml2argvdata/graphics-egl-headless.args index 9b667f573c..ec3ffc1cad 100644 --- a/tests/qemuxml2argvdata/graphics-egl-headless.args +++ b/tests/qemuxml2argvdata/graphics-egl-headless.args @@ -25,8 +25,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -display egl-headless \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args b/tests/qe= muxml2argvdata/graphics-sdl-fullscreen.args index f1592fc5b7..11750f7473 100644 --- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args +++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args @@ -27,8 +27,9 @@ DISPLAY=3D:0.1 \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -full-screen \ -display sdl \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ diff --git a/tests/qemuxml2argvdata/graphics-sdl.args b/tests/qemuxml2argvd= ata/graphics-sdl.args index ffa1114f0a..5c5d373a7c 100644 --- a/tests/qemuxml2argvdata/graphics-sdl.args +++ b/tests/qemuxml2argvdata/graphics-sdl.args @@ -27,8 +27,9 @@ DISPLAY=3D:0.1 \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -display sdl \ -device VGA,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args b/test= s/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args index fa3ef73d7b..2a901ef650 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args @@ -25,8 +25,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ -no-shutdown \ -boot strict=3Don \ -device virtio-scsi-ccw,id=3Dscsi0,devno=3Dfe.0.0001 \ --drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,id=3Dv= irtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device vhost-scsi-ccw,wwpn=3Dnaa.5123456789abcde0,vhostfd=3D3,id=3Dhostde= v0,devno=3Dfe.0.0002 \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0003 \ diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args b/test= s/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args index d322962660..88c62b1c4f 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args @@ -27,8 +27,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ -boot strict=3Don \ -device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x3 \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device vhost-scsi-pci,wwpn=3Dnaa.5123456789abcde0,vhostfd=3D3,id=3Dhostde= v0,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args b/tests/q= emuxml2argvdata/hostdev-vfio-multidomain.args index eb113edeeb..8b2002a986 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args +++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device vfio-pci,host=3D0021:de:1f.1,id=3Dhostdev0,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args b/tests/qemuxml2argvd= ata/hostdev-vfio.args index fcdf5f8aeb..a05305439e 100644 --- a/tests/qemuxml2argvdata/hostdev-vfio.args +++ b/tests/qemuxml2argvdata/hostdev-vfio.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device vfio-pci,host=3D0000:06:12.1,id=3Dhostdev0,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.args b/tests/qemuxm= l2argvdata/hugepages-memaccess.args index 03f6c3fc4f..2d9431dab1 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess.args @@ -36,8 +36,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -usb \ -object memory-backend-file,id=3Dmemdimm0,mem-path=3D/dev/hugepages2M/libv= irt/qemu/-1-QEMUGuest1,share=3Don,prealloc=3Don,size=3D536870912,host-nodes= =3D0-3,policy=3Dbind \ -device pc-dimm,node=3D1,memdev=3Dmemdimm0,id=3Ddimm0,slot=3D0,addr=3D4294= 967296 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.args b/tests/qemux= ml2argvdata/hugepages-memaccess2.args index f35001d39f..0264fc7da9 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess2.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess2.args @@ -36,8 +36,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -usb \ -object memory-backend-file,id=3Dmemdimm0,mem-path=3D/dev/hugepages2M/libv= irt/qemu/-1-QEMUGuest1,share=3Don,prealloc=3Don,size=3D536870912,host-nodes= =3D0-3,policy=3Dbind \ -device pc-dimm,node=3D1,memdev=3Dmemdimm0,id=3Ddimm0,slot=3D0,addr=3D4294= 967296 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hugepages-shared.args b/tests/qemuxml2a= rgvdata/hugepages-shared.args index 37f9ae9efa..08ce2f49cd 100644 --- a/tests/qemuxml2argvdata/hugepages-shared.args +++ b/tests/qemuxml2argvdata/hugepages-shared.args @@ -34,8 +34,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args b/tests/= qemuxml2argvdata/hvf-aarch64-virt-headless.args index 5de677d678..320e5f90ff 100644 --- a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args +++ b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args @@ -10,10 +10,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -name guest=3Dtest,debug-threads=3Don \ -S \ -object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-test= /master-key.aes \ --machine virt,usb=3Doff,dump-guest-core=3Doff,gic-version=3D2 \ +-blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-s= ilent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":tr= ue,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver"= :"raw","file":"libvirt-pflash0-storage"}' \ +-blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.f= d","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"u= nmap"}' \ +-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver= ":"raw","file":"libvirt-pflash1-storage"}' \ +-machine virt,usb=3Doff,dump-guest-core=3Doff,gic-version=3D2,pflash0=3Dli= bvirt-pflash0-format,pflash1=3Dlibvirt-pflash1-format \ -accel hvf \ --drive file=3D/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw,if=3Dpfla= sh,format=3Draw,unit=3D0,readonly=3Don \ --drive file=3D/some/user/nvram/path/guest_VARS.fd,if=3Dpflash,format=3Draw= ,unit=3D1 \ -m 4096 \ -overcommit mem-lock=3Doff \ -smp 2,sockets=3D2,cores=3D1,threads=3D1 \ @@ -33,8 +35,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -device pcie-root-port,port=3D12,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr= =3D0x1.0x4 \ -device pcie-root-port,port=3D13,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr= =3D0x1.0x5 \ -device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.2,addr=3D0x0 \ --drive file=3D/var/lib/libvirt/images/test.qcow2,format=3Dqcow2,if=3Dnone,= id=3Ddrive-virtio-disk0 \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0x0,drive=3Ddrive-virtio-disk0,i= d=3Dvirtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test.qcow2= ","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'= \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.3,addr=3D0x0,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:9a:e6:c6= ,bus=3Dpci.1,addr=3D0x0 \ -chardev pty,id=3Dcharserial0 \ diff --git a/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args b/tests/qe= muxml2argvdata/hvf-x86_64-q35-headless.args index a9b30271d4..8272c0792b 100644 --- a/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args +++ b/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args @@ -32,8 +32,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -device pcie-root-port,port=3D12,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr= =3D0x1.0x4 \ -device pcie-root-port,port=3D13,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr= =3D0x1.0x5 \ -device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.2,addr=3D0x0 \ --drive file=3D/var/lib/libvirt/images/test.qcow2,format=3Dqcow2,if=3Dnone,= id=3Ddrive-virtio-disk0 \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0x0,drive=3Ddrive-virtio-disk0,i= d=3Dvirtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test.qcow2= ","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}'= \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.3,addr=3D0x0,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:9a:e6:c6= ,bus=3Dpci.1,addr=3D0x0 \ -chardev pty,id=3Dcharserial0 \ diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args b/tests/qemuxm= l2argvdata/input-usbmouse-addr.args index 286582b06d..f70425ca30 100644 --- a/tests/qemuxml2argvdata/input-usbmouse-addr.args +++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -device usb-mouse,id=3Dinput0,bus=3Dusb.0,port=3D2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ diff --git a/tests/qemuxml2argvdata/input-usbmouse.args b/tests/qemuxml2arg= vdata/input-usbmouse.args index f13ac6625a..f507078fcb 100644 --- a/tests/qemuxml2argvdata/input-usbmouse.args +++ b/tests/qemuxml2argvdata/input-usbmouse.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -device usb-mouse,id=3Dinput0,bus=3Dusb.0,port=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/input-usbtablet.args b/tests/qemuxml2ar= gvdata/input-usbtablet.args index 53df43196d..7345200ba3 100644 --- a/tests/qemuxml2argvdata/input-usbtablet.args +++ b/tests/qemuxml2argvdata/input-usbtablet.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/input-virtio-ccw.args b/tests/qemuxml2a= rgvdata/input-virtio-ccw.args index a99eca6353..2f3edb5723 100644 --- a/tests/qemuxml2argvdata/input-virtio-ccw.args +++ b/tests/qemuxml2argvdata/input-virtio-ccw.args @@ -24,8 +24,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,id=3Dv= irtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -device virtio-keyboard-ccw,id=3Dinput0,devno=3Dfe.0.0002 \ -device virtio-mouse-ccw,id=3Dinput1,devno=3Dfe.0.0003 \ -device virtio-tablet-ccw,id=3Dinput2,devno=3Dfe.0.0004 \ diff --git a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args b/tests/= qemuxml2argvdata/iothreads-disk-virtio-ccw.args index 4a487475d6..4bd4749d2b 100644 --- a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args +++ b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args @@ -26,10 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-ccw,iothread=3Diothread1,devno=3Dfe.0.0000,drive=3Ddriv= e-virtio-disk0,id=3Dvirtio-disk0,bootindex=3D1 \ --drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk1 \ --device virtio-blk-ccw,iothread=3Diothread2,devno=3D0.0.0007,drive=3Ddrive= -virtio-disk1,id=3Dvirtio-disk1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ +-device virtio-blk-ccw,iothread=3Diothread1,devno=3Dfe.0.0000,drive=3Dlibv= irt-2-format,id=3Dvirtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,iothread=3Diothread2,devno=3D0.0.0007,drive=3Dlibvi= rt-1-format,id=3Dvirtio-disk1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.000a \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/iothreads-disk.args b/tests/qemuxml2arg= vdata/iothreads-disk.args index 8a4109872e..ef80cf4008 100644 --- a/tests/qemuxml2argvdata/iothreads-disk.args +++ b/tests/qemuxml2argvdata/iothreads-disk.args @@ -28,11 +28,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ --drive file=3D/var/lib/libvirt/images/iothrtest1.img,format=3Draw,if=3Dnon= e,id=3Ddrive-virtio-disk1 \ --device virtio-blk-pci,iothread=3Diothread1,bus=3Dpci.0,addr=3D0x4,drive= =3Ddrive-virtio-disk1,id=3Dvirtio-disk1 \ --drive file=3D/var/lib/libvirt/images/iothrtest2.img,format=3Draw,if=3Dnon= e,id=3Ddrive-virtio-disk2 \ --device virtio-blk-pci,iothread=3Diothread2,bus=3Dpci.0,addr=3D0x2,drive= =3Ddrive-virtio-disk2,id=3Dvirtio-disk2 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/iothrtest1= .img","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unma= p"}' \ +-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ +-device virtio-blk-pci,iothread=3Diothread1,bus=3Dpci.0,addr=3D0x4,drive= =3Dlibvirt-2-format,id=3Dvirtio-disk1 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/iothrtest2= .img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unma= p"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-pci,iothread=3Diothread2,bus=3Dpci.0,addr=3D0x2,drive= =3Dlibvirt-1-format,id=3Dvirtio-disk2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/iothreads-ids-partial.args b/tests/qemu= xml2argvdata/iothreads-ids-partial.args index 5eadf315db..a20f6e68bf 100644 --- a/tests/qemuxml2argvdata/iothreads-ids-partial.args +++ b/tests/qemuxml2argvdata/iothreads-ids-partial.args @@ -30,7 +30,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/iothreads-ids.args b/tests/qemuxml2argv= data/iothreads-ids.args index f591475f10..ddb79f9bef 100644 --- a/tests/qemuxml2argvdata/iothreads-ids.args +++ b/tests/qemuxml2argvdata/iothreads-ids.args @@ -28,7 +28,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/iothreads.args b/tests/qemuxml2argvdata= /iothreads.args index e6e6e2b99b..88e6fa4906 100644 --- a/tests/qemuxml2argvdata/iothreads.args +++ b/tests/qemuxml2argvdata/iothreads.args @@ -28,7 +28,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args b/tests/qemuxml2argv= data/kvm-pit-delay.args index f8cc371367..6775184baa 100644 --- a/tests/qemuxml2argvdata/kvm-pit-delay.args +++ b/tests/qemuxml2argvdata/kvm-pit-delay.args @@ -27,8 +27,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args b/tests/qemuxml2ar= gvdata/kvm-pit-discard.args index e9cc6a7576..dddcdf719d 100644 --- a/tests/qemuxml2argvdata/kvm-pit-discard.args +++ b/tests/qemuxml2argvdata/kvm-pit-discard.args @@ -27,8 +27,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args b/tests= /qemuxml2argvdata/machine-aeskeywrap-off-cap.args index cdaa726832..aea6c825c2 100644 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args +++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args @@ -24,7 +24,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,id=3Dv= irtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args b/test= s/qemuxml2argvdata/machine-aeskeywrap-off-caps.args index cdaa726832..aea6c825c2 100644 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args +++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args @@ -24,7 +24,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,id=3Dv= irtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args b/tests/= qemuxml2argvdata/machine-aeskeywrap-on-cap.args index 7987b3ed22..5fbd621003 100644 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args +++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args @@ -24,7 +24,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,id=3Dv= irtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args b/tests= /qemuxml2argvdata/machine-aeskeywrap-on-caps.args index 7987b3ed22..5fbd621003 100644 --- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args +++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args @@ -24,7 +24,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,id=3Dv= irtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-aliases1.args b/tests/qemuxml2a= rgvdata/machine-aliases1.args index c9f0f917a7..5e0b8b3165 100644 --- a/tests/qemuxml2argvdata/machine-aliases1.args +++ b/tests/qemuxml2argvdata/machine-aliases1.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-aliases2.args b/tests/qemuxml2a= rgvdata/machine-aliases2.args index 670a622d1c..78edd86425 100644 --- a/tests/qemuxml2argvdata/machine-aliases2.args +++ b/tests/qemuxml2argvdata/machine-aliases2.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-core-off.args b/tests/qemuxml2a= rgvdata/machine-core-off.args index 39bc2c0a6e..4029e9e1e6 100644 --- a/tests/qemuxml2argvdata/machine-core-off.args +++ b/tests/qemuxml2argvdata/machine-core-off.args @@ -26,7 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-core-on.args b/tests/qemuxml2ar= gvdata/machine-core-on.args index 1ff7a360fa..964bec75d5 100644 --- a/tests/qemuxml2argvdata/machine-core-on.args +++ b/tests/qemuxml2argvdata/machine-core-on.args @@ -26,7 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args b/tests= /qemuxml2argvdata/machine-deakeywrap-off-cap.args index 77b3be6d58..f25dde8136 100644 --- a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args +++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args @@ -24,7 +24,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,id=3Dv= irtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args b/test= s/qemuxml2argvdata/machine-deakeywrap-off-caps.args index 77b3be6d58..f25dde8136 100644 --- a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args +++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args @@ -24,7 +24,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,id=3Dv= irtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args b/tests/= qemuxml2argvdata/machine-deakeywrap-on-cap.args index bd2632e2b6..78a1edbb3a 100644 --- a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args +++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args @@ -24,7 +24,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,id=3Dv= irtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args b/tests= /qemuxml2argvdata/machine-deakeywrap-on-caps.args index bd2632e2b6..78a1edbb3a 100644 --- a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args +++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args @@ -24,7 +24,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,id=3Dv= irtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args b/tests/= qemuxml2argvdata/machine-keywrap-none-caps.args index 83fd401afa..0f00797b16 100644 --- a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args +++ b/tests/qemuxml2argvdata/machine-keywrap-none-caps.args @@ -24,7 +24,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,id=3Dv= irtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-keywrap-none.args b/tests/qemux= ml2argvdata/machine-keywrap-none.args index 83fd401afa..0f00797b16 100644 --- a/tests/qemuxml2argvdata/machine-keywrap-none.args +++ b/tests/qemuxml2argvdata/machine-keywrap-none.args @@ -24,7 +24,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,id=3Dv= irtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s3= 90.args b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.= args index d544f88a17..bf8ef54fb9 100644 --- a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args +++ b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args @@ -24,10 +24,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-ccw,devno=3Dfe.0.0002,drive=3Ddrive-virtio-disk0,id=3Dv= irtio-disk0,bootindex=3D1 \ --drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk1 \ --device virtio-blk-ccw,devno=3Dfe.0.0003,drive=3Ddrive-virtio-disk1,id=3Dv= irtio-disk1,bootindex=3D3 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ +-device virtio-blk-ccw,devno=3Dfe.0.0002,drive=3Dlibvirt-2-format,id=3Dvir= tio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,devno=3Dfe.0.0003,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk1,bootindex=3D3 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-ccw,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:54= ,bootindex=3D2,devno=3Dfe.0.0000 \ -netdev user,id=3Dhostnet1 \ diff --git a/tests/qemuxml2argvdata/machine-loadparm-s390.args b/tests/qemu= xml2argvdata/machine-loadparm-s390.args index d6a7b8faa5..deb4747e94 100644 --- a/tests/qemuxml2argvdata/machine-loadparm-s390.args +++ b/tests/qemuxml2argvdata/machine-loadparm-s390.args @@ -24,8 +24,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,id=3Dv= irtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0001 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args b/tests/qemuxml= 2argvdata/machine-vmport-opt.args index 8b411a83d2..e855102e34 100644 --- a/tests/qemuxml2argvdata/machine-vmport-opt.args +++ b/tests/qemuxml2argvdata/machine-vmport-opt.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/master-key.args b/tests/qemuxml2argvdat= a/master-key.args index aea6e71c84..ecd2a9ac12 100644 --- a/tests/qemuxml2argvdata/master-key.args +++ b/tests/qemuxml2argvdata/master-key.args @@ -26,7 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args b/tests/q= emuxml2argvdata/memory-hotplug-dimm-addr.args index 00d3180c73..adab0dd027 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args @@ -31,8 +31,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device pc-dimm,node=3D0,memdev=3Dmemdimm0,id=3Ddimm0,slot=3D0,addr=3D4294= 967296 \ -object memory-backend-ram,id=3Dmemdimm2,size=3D536870912 \ -device pc-dimm,node=3D0,memdev=3Dmemdimm2,id=3Ddimm2,slot=3D2 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args b/tests/qemuxm= l2argvdata/memory-hotplug-dimm.args index c4497f5040..90c409754f 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args +++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args @@ -31,8 +31,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device pc-dimm,node=3D0,memdev=3Dmemdimm0,id=3Ddimm0,slot=3D0 \ -object memory-backend-file,id=3Dmemdimm1,mem-path=3D/dev/hugepages2M/libv= irt/qemu/-1-QEMUGuest1,prealloc=3Don,size=3D536870912,host-nodes=3D1-3,poli= cy=3Dbind \ -device pc-dimm,node=3D0,memdev=3Dmemdimm1,id=3Ddimm1,slot=3D1 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug.args b/tests/qemuxml2arg= vdata/memory-hotplug.args index d4e717e8f9..b14cd89743 100644 --- a/tests/qemuxml2argvdata/memory-hotplug.args +++ b/tests/qemuxml2argvdata/memory-hotplug.args @@ -27,8 +27,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args b/tests/qemuxml2= argvdata/memtune-unlimited.args index dbcb959334..24193d008b 100644 --- a/tests/qemuxml2argvdata/memtune-unlimited.args +++ b/tests/qemuxml2argvdata/memtune-unlimited.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/m= emtune.args index dbcb959334..24193d008b 100644 --- a/tests/qemuxml2argvdata/memtune.args +++ b/tests/qemuxml2argvdata/memtune.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/migrate.args b/tests/qemuxml2argvdata/m= igrate.args index 4f67bef4ce..f308c8f364 100644 --- a/tests/qemuxml2argvdata/migrate.args +++ b/tests/qemuxml2argvdata/migrate.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -incoming tcp:10.0.0.1:5000 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/m= inimal.args index dbcb959334..24193d008b 100644 --- a/tests/qemuxml2argvdata/minimal.args +++ b/tests/qemuxml2argvdata/minimal.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/misc-acpi.args b/tests/qemuxml2argvdata= /misc-acpi.args index 052243cd9d..0c6045668a 100644 --- a/tests/qemuxml2argvdata/misc-acpi.args +++ b/tests/qemuxml2argvdata/misc-acpi.args @@ -25,7 +25,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/misc-disable-s3.args b/tests/qemuxml2ar= gvdata/misc-disable-s3.args index 77729307bd..7eb5f2b3ab 100644 --- a/tests/qemuxml2argvdata/misc-disable-s3.args +++ b/tests/qemuxml2argvdata/misc-disable-s3.args @@ -27,7 +27,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -global PIIX4_PM.disable_s3=3D1 \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.args b/tests/qemu= xml2argvdata/misc-disable-suspends.args index 656922aa3e..e126d93f9b 100644 --- a/tests/qemuxml2argvdata/misc-disable-suspends.args +++ b/tests/qemuxml2argvdata/misc-disable-suspends.args @@ -28,7 +28,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -global PIIX4_PM.disable_s4=3D1 \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/misc-enable-s4.args b/tests/qemuxml2arg= vdata/misc-enable-s4.args index 579d508a49..7074f8d9cb 100644 --- a/tests/qemuxml2argvdata/misc-enable-s4.args +++ b/tests/qemuxml2argvdata/misc-enable-s4.args @@ -27,7 +27,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -global PIIX4_PM.disable_s4=3D0 \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/misc-uuid.args b/tests/qemuxml2argvdata= /misc-uuid.args index 052243cd9d..0c6045668a 100644 --- a/tests/qemuxml2argvdata/misc-uuid.args +++ b/tests/qemuxml2argvdata/misc-uuid.args @@ -25,7 +25,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/monitor-json.args b/tests/qemuxml2argvd= ata/monitor-json.args index 65e9e5db26..b6ca2f46c0 100644 --- a/tests/qemuxml2argvdata/monitor-json.args +++ b/tests/qemuxml2argvdata/monitor-json.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-encryptdisk/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/hda1,format=3Dqcow2,if=3Dnone,id=3Ddrive-ide0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/dev/hda1","node-name":"libvirt-1-= storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args b/tests/q= emuxml2argvdata/multifunction-pci-device.args index 22f782a1f3..accb08bd33 100644 --- a/tests/qemuxml2argvdata/multifunction-pci-device.args +++ b/tests/qemuxml2argvdata/multifunction-pci-device.args @@ -35,8 +35,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device lsi,id=3Dscsi7,bus=3Dpci.0,addr=3D0x4.0x6 \ -device lsi,id=3Dscsi8,bus=3Dpci.0,addr=3D0x4.0x7 \ -usb \ --drive file=3D/tmp/scsidisk.img,format=3Draw,if=3Dnone,id=3Ddrive-scsi0-0-= 0 \ --device scsi-hd,bus=3Dscsi0.0,scsi-id=3D0,drive=3Ddrive-scsi0-0-0,id=3Dscs= i0-0-0,bootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"li= bvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device scsi-hd,bus=3Dscsi0.0,scsi-id=3D0,drive=3Dlibvirt-1-format,id=3Dsc= si0-0-0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/net-client.args b/tests/qemuxml2argvdat= a/net-client.args index 4ae01d8b59..648942ff78 100644 --- a/tests/qemuxml2argvdata/net-client.args +++ b/tests/qemuxml2argvdata/net-client.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -netdev socket,connect=3D192.168.0.1:5558,id=3Dhostnet0 \ -device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:8c:b9:05,bus=3D= pci.0,addr=3D0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-eth-hostip.args b/tests/qemuxml2arg= vdata/net-eth-hostip.args index 517c7d0144..4e7b0074fc 100644 --- a/tests/qemuxml2argvdata/net-eth-hostip.args +++ b/tests/qemuxml2argvdata/net-eth-hostip.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -netdev tap,fd=3D3,id=3Dhostnet0 \ -device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3D= pci.0,addr=3D0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-eth-ifname.args b/tests/qemuxml2arg= vdata/net-eth-ifname.args index 517c7d0144..4e7b0074fc 100644 --- a/tests/qemuxml2argvdata/net-eth-ifname.args +++ b/tests/qemuxml2argvdata/net-eth-ifname.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -netdev tap,fd=3D3,id=3Dhostnet0 \ -device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3D= pci.0,addr=3D0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-eth-names.args b/tests/qemuxml2argv= data/net-eth-names.args index b639329316..518e16039f 100644 --- a/tests/qemuxml2argvdata/net-eth-names.args +++ b/tests/qemuxml2argvdata/net-eth-names.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -netdev tap,fd=3D3,id=3Dhostnet0 \ -device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3D= pci.0,addr=3D0x2 \ -netdev tap,fd=3D3,id=3Dhostnet1 \ diff --git a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args b/tests/qemu= xml2argvdata/net-eth-unmanaged-tap.args index 90d9e23b31..ea329d2537 100644 --- a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args +++ b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -netdev tap,fd=3D3,vhost=3Don,vhostfd=3D44,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3Dfe:11:22:33:44:55= ,bus=3Dpci.0,addr=3D0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-eth.args b/tests/qemuxml2argvdata/n= et-eth.args index 517c7d0144..4e7b0074fc 100644 --- a/tests/qemuxml2argvdata/net-eth.args +++ b/tests/qemuxml2argvdata/net-eth.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -netdev tap,fd=3D3,id=3Dhostnet0 \ -device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3D= pci.0,addr=3D0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.args b/tests/qemu= xml2argvdata/net-hostdev-bootorder.args index 7467c91cd1..6475c8a3c2 100644 --- a/tests/qemuxml2argvdata/net-hostdev-bootorder.args +++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D2 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device vfio-pci,host=3D0000:03:07.1,id=3Dhostdev0,bootindex=3D1,bus=3Dpci= .0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.args b/tests/qe= muxml2argvdata/net-hostdev-multidomain.args index 1dfe67a8d9..7a5a4dd91e 100644 --- a/tests/qemuxml2argvdata/net-hostdev-multidomain.args +++ b/tests/qemuxml2argvdata/net-hostdev-multidomain.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device vfio-pci,host=3D2424:21:1c.6,id=3Dhostdev0,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args b/tes= ts/qemuxml2argvdata/net-hostdev-vfio-multidomain.args index 247a7dd790..5c2e632473 100644 --- a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args +++ b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device vfio-pci,host=3D0021:de:1f.1,id=3Dhostdev0,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.args b/tests/qemuxml2a= rgvdata/net-hostdev-vfio.args index d6ef6cc3da..f1c3722ce2 100644 --- a/tests/qemuxml2argvdata/net-hostdev-vfio.args +++ b/tests/qemuxml2argvdata/net-hostdev-vfio.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device vfio-pci,host=3D0000:06:12.1,id=3Dhostdev0,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/net-hostdev.args b/tests/qemuxml2argvda= ta/net-hostdev.args index 6bbb88307a..bed940c349 100644 --- a/tests/qemuxml2argvdata/net-hostdev.args +++ b/tests/qemuxml2argvdata/net-hostdev.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device vfio-pci,host=3D0000:03:07.1,id=3Dhostdev0,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/net-mcast.args b/tests/qemuxml2argvdata= /net-mcast.args index bd8c3b07f8..d59b18933c 100644 --- a/tests/qemuxml2argvdata/net-mcast.args +++ b/tests/qemuxml2argvdata/net-mcast.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -netdev socket,mcast=3D192.0.0.1:5558,id=3Dhostnet0 \ -device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:8c:b9:05,bus=3D= pci.0,addr=3D0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-server.args b/tests/qemuxml2argvdat= a/net-server.args index 32d17e11d0..eec04c797f 100644 --- a/tests/qemuxml2argvdata/net-server.args +++ b/tests/qemuxml2argvdata/net-server.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -netdev socket,listen=3D192.168.0.1:5558,id=3Dhostnet0 \ -device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:8c:b9:05,bus=3D= pci.0,addr=3D0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-udp.args b/tests/qemuxml2argvdata/n= et-udp.args index 2100c0379d..5d8a1c3500 100644 --- a/tests/qemuxml2argvdata/net-udp.args +++ b/tests/qemuxml2argvdata/net-udp.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -netdev socket,udp=3D192.168.10.1:5555,localaddr=3D192.168.10.1:5556,id=3D= hostnet0 \ -device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:8c:b9:05,bus=3D= pci.0,addr=3D0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-user-addr.args b/tests/qemuxml2argv= data/net-user-addr.args index c71817ee53..1da3cec814 100644 --- a/tests/qemuxml2argvdata/net-user-addr.args +++ b/tests/qemuxml2argvdata/net-user-addr.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -netdev user,net=3D172.17.2.0/24,ipv6-prefix=3D2001:db8:ac10:fd01::,ipv6-p= refixlen=3D64,id=3Dhostnet0 \ -device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3D= pci.0,addr=3D0x3 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-user.args b/tests/qemuxml2argvdata/= net-user.args index 993e9a39d4..c554f47608 100644 --- a/tests/qemuxml2argvdata/net-user.args +++ b/tests/qemuxml2argvdata/net-user.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3D= pci.0,addr=3D0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.args b/tests/qemux= ml2argvdata/net-vhostuser-multiq.args index d56a52f88e..aa6a11dcad 100644 --- a/tests/qemuxml2argvdata/net-vhostuser-multiq.args +++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev socket,id=3Dcharnet0,path=3D/tmp/vhost0.sock,server=3Don \ -netdev vhost-user,chardev=3Dcharnet0,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:ee:96:6b= ,bus=3Dpci.0,addr=3D0x2 \ diff --git a/tests/qemuxml2argvdata/net-virtio-device.args b/tests/qemuxml2= argvdata/net-virtio-device.args index 0f7f959a86..fba098c2af 100644 --- a/tests/qemuxml2argvdata/net-virtio-device.args +++ b/tests/qemuxml2argvdata/net-virtio-device.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,tx=3Dbh,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:= 33:44:55,bus=3Dpci.0,addr=3D0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args b/test= s/qemuxml2argvdata/net-virtio-disable-offloads.args index c0e690254c..3170b744ab 100644 --- a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args +++ b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest7,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest7","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,csum=3Doff,gso=3Doff,host_tso4=3Doff,host_tso6=3Dof= f,host_ecn=3Doff,host_ufo=3Doff,mrg_rxbuf=3Doff,guest_csum=3Doff,guest_tso4= =3Doff,guest_tso6=3Doff,guest_ecn=3Doff,guest_ufo=3Doff,netdev=3Dhostnet0,i= d=3Dnet0,mac=3D00:22:44:66:88:aa,bus=3Dpci.0,addr=3D0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.args b/tests/qemuxml2= argvdata/net-virtio-netdev.args index 768e59f5c6..0ff052c0b7 100644 --- a/tests/qemuxml2argvdata/net-virtio-netdev.args +++ b/tests/qemuxml2argvdata/net-virtio-netdev.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55= ,bus=3Dpci.0,addr=3D0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args b/tests/q= emuxml2argvdata/net-virtio-rxtxqueuesize.args index 94849c71e6..187174874c 100644 --- a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args +++ b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,rx_queue_size=3D512,tx_queue_size=3D1024,netdev=3Dh= ostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55,bus=3Dpci.0,addr=3D0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args b/tests= /qemuxml2argvdata/net-virtio-teaming-hostdev.args index 93a7dc7037..1e779538ab 100644 --- a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args +++ b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -netdev user,id=3Dhostua-backup0 \ -device virtio-net-pci,failover=3Don,netdev=3Dhostua-backup0,id=3Dua-backu= p0,mac=3D00:11:22:33:44:55,bus=3Dpci.0,addr=3D0x3 \ -netdev user,id=3Dhostua-backup1 \ diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.args b/tests/qemuxml= 2argvdata/net-virtio-teaming.args index 9c6fb3b4e1..6a575b3b0d 100644 --- a/tests/qemuxml2argvdata/net-virtio-teaming.args +++ b/tests/qemuxml2argvdata/net-virtio-teaming.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -netdev user,id=3Dhostua-backup0 \ -device virtio-net-pci,failover=3Don,netdev=3Dhostua-backup0,id=3Dua-backu= p0,mac=3D00:11:22:33:44:55,bus=3Dpci.0,addr=3D0x2 \ -netdev user,id=3Dhostua-backup1 \ diff --git a/tests/qemuxml2argvdata/net-virtio.args b/tests/qemuxml2argvdat= a/net-virtio.args index 463d2cbf2f..eb6af65948 100644 --- a/tests/qemuxml2argvdata/net-virtio.args +++ b/tests/qemuxml2argvdata/net-virtio.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55= ,bus=3Dpci.0,addr=3D0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/nosharepages.args b/tests/qemuxml2argvd= ata/nosharepages.args index 4a448f0d7b..9cce9b3b3b 100644 --- a/tests/qemuxml2argvdata/nosharepages.args +++ b/tests/qemuxml2argvdata/nosharepages.args @@ -26,7 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args b/te= sts/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args index 2a5455dfaf..f30ed2fed6 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-pl= acement.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-= placement.args index 2a5455dfaf..f30ed2fed6 100644 --- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement= .args +++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement= .args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args b/= tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args index 2a5455dfaf..f30ed2fed6 100644 --- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args +++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args b/te= sts/qemuxml2argvdata/numad-static-memory-auto-vcpu.args index 2a5455dfaf..f30ed2fed6 100644 --- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args +++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/num= ad.args index 2a5455dfaf..f30ed2fed6 100644 --- a/tests/qemuxml2argvdata/numad.args +++ b/tests/qemuxml2argvdata/numad.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args b/te= sts/qemuxml2argvdata/numatune-auto-nodeset-invalid.args index 2a5455dfaf..f30ed2fed6 100644 --- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args +++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numatune-memory.args b/tests/qemuxml2ar= gvdata/numatune-memory.args index 2a5455dfaf..f30ed2fed6 100644 --- a/tests/qemuxml2argvdata/numatune-memory.args +++ b/tests/qemuxml2argvdata/numatune-memory.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.args b/tests/q= emuxml2argvdata/parallel-parport-chardev.args index 98d424d7b3..e3d3d6f3db 100644 --- a/tests/qemuxml2argvdata/parallel-parport-chardev.args +++ b/tests/qemuxml2argvdata/parallel-parport-chardev.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev parport,id=3Dcharparallel0,path=3D/dev/parport0 \ -device isa-parallel,chardev=3Dcharparallel0,id=3Dparallel0 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.args b/tests/qemux= ml2argvdata/parallel-tcp-chardev.args index 2066f97afb..042348b1c2 100644 --- a/tests/qemuxml2argvdata/parallel-tcp-chardev.args +++ b/tests/qemuxml2argvdata/parallel-tcp-chardev.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev socket,id=3Dcharparallel0,host=3D127.0.0.1,port=3D9999,server=3Do= n,wait=3Doff \ -device isa-parallel,chardev=3Dcharparallel0,id=3Dparallel0 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args b/tests/qemuxml2a= rgvdata/pci-autoadd-addr.args index d3b4e9cf6f..3b27af4b71 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-addr.args +++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args @@ -32,8 +32,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fdr-br/.config \ -device pci-bridge,chassis_nr=3D6,id=3Dpci.6,bus=3Dpci.0,addr=3D0x8 \ -device pci-bridge,chassis_nr=3D7,id=3Dpci.7,bus=3Dpci.0,addr=3D0x9 \ -usb \ --drive file=3D/var/iso/f18kde.iso,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1= -0,readonly=3Don \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0 \ +-blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"= libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= \ -audiodev '{"id":"audio1","driver":"none"}' \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.7,addr=3D0x6 \ diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args b/tests/qemuxml2ar= gvdata/pci-autoadd-idx.args index dbb7382918..780154952c 100644 --- a/tests/qemuxml2argvdata/pci-autoadd-idx.args +++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args @@ -33,8 +33,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fdr-br/.config \ -device pci-bridge,chassis_nr=3D6,id=3Dpci.6,bus=3Dpci.0,addr=3D0x9 \ -device pci-bridge,chassis_nr=3D7,id=3Dpci.7,bus=3Dpci.0,addr=3D0xa \ -usb \ --drive file=3D/var/iso/f18kde.iso,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1= -0,readonly=3Don \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0 \ +-blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"= libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= \ -audiodev '{"id":"audio1","driver":"none"}' \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.4,addr=3D0x6 \ diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args b/tests/qemuxml2= argvdata/pci-autofill-addr.args index 98ae53988e..3314ddf387 100644 --- a/tests/qemuxml2argvdata/pci-autofill-addr.args +++ b/tests/qemuxml2argvdata/pci-autofill-addr.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fdr-br/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/var/iso/f18kde.iso,format=3Draw,if=3Dnone,id=3Ddrive-virtio= -disk0,readonly=3Don \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-virtio-disk0,i= d=3Dvirtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"= libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args b/tests/qemu= xml2argvdata/pci-bridge-many-disks.args index c6b8e73a18..d540e79c24 100644 --- a/tests/qemuxml2argvdata/pci-bridge-many-disks.args +++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.args @@ -29,215 +29,320 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-lots-of-disks/.c= onfig \ -device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.0,addr=3D0x3 \ -device pci-bridge,chassis_nr=3D3,id=3Dpci.3,bus=3Dpci.0,addr=3D0x4 \ -usb \ --drive file=3D/var/lib/libvirt/images/test.img,format=3Draw,if=3Dnone,id= =3Ddrive-virtio-disk0 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Ddrive-virtio-disk0,i= d=3Dvirtio-disk0,bootindex=3D1 \ --drive file=3D/var/lib/libvirt/images/disk-a-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk26 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Ddrive-virtio-disk26,= id=3Dvirtio-disk26 \ --drive file=3D/var/lib/libvirt/images/disk-a-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk27 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Ddrive-virtio-disk27,= id=3Dvirtio-disk27 \ --drive file=3D/var/lib/libvirt/images/disk-a-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk28 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x8,drive=3Ddrive-virtio-disk28,= id=3Dvirtio-disk28 \ --drive file=3D/var/lib/libvirt/images/disk-a-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk29 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x9,drive=3Ddrive-virtio-disk29,= id=3Dvirtio-disk29 \ --drive file=3D/var/lib/libvirt/images/disk-b-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk52 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0xa,drive=3Ddrive-virtio-disk52,= id=3Dvirtio-disk52 \ --drive file=3D/var/lib/libvirt/images/disk-b-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk53 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0xb,drive=3Ddrive-virtio-disk53,= id=3Dvirtio-disk53 \ --drive file=3D/var/lib/libvirt/images/disk-b-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk54 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0xc,drive=3Ddrive-virtio-disk54,= id=3Dvirtio-disk54 \ --drive file=3D/var/lib/libvirt/images/disk-b-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk55 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0xd,drive=3Ddrive-virtio-disk55,= id=3Dvirtio-disk55 \ --drive file=3D/var/lib/libvirt/images/disk-c-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk78 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0xe,drive=3Ddrive-virtio-disk78,= id=3Dvirtio-disk78 \ --drive file=3D/var/lib/libvirt/images/disk-c-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk79 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0xf,drive=3Ddrive-virtio-disk79,= id=3Dvirtio-disk79 \ --drive file=3D/var/lib/libvirt/images/disk-c-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk80 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x10,drive=3Ddrive-virtio-disk80= ,id=3Dvirtio-disk80 \ --drive file=3D/var/lib/libvirt/images/disk-c-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk81 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x11,drive=3Ddrive-virtio-disk81= ,id=3Dvirtio-disk81 \ --drive file=3D/var/lib/libvirt/images/disk-d-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk104 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x12,drive=3Ddrive-virtio-disk10= 4,id=3Dvirtio-disk104 \ --drive file=3D/var/lib/libvirt/images/disk-d-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk105 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x13,drive=3Ddrive-virtio-disk10= 5,id=3Dvirtio-disk105 \ --drive file=3D/var/lib/libvirt/images/disk-d-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk106 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x14,drive=3Ddrive-virtio-disk10= 6,id=3Dvirtio-disk106 \ --drive file=3D/var/lib/libvirt/images/disk-d-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk107 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x15,drive=3Ddrive-virtio-disk10= 7,id=3Dvirtio-disk107 \ --drive file=3D/var/lib/libvirt/images/disk-e-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk130 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x16,drive=3Ddrive-virtio-disk13= 0,id=3Dvirtio-disk130 \ --drive file=3D/var/lib/libvirt/images/disk-e-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk131 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x17,drive=3Ddrive-virtio-disk13= 1,id=3Dvirtio-disk131 \ --drive file=3D/var/lib/libvirt/images/disk-e-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk132 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x18,drive=3Ddrive-virtio-disk13= 2,id=3Dvirtio-disk132 \ --drive file=3D/var/lib/libvirt/images/disk-e-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk133 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x19,drive=3Ddrive-virtio-disk13= 3,id=3Dvirtio-disk133 \ --drive file=3D/var/lib/libvirt/images/disk-f-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk156 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1a,drive=3Ddrive-virtio-disk15= 6,id=3Dvirtio-disk156 \ --drive file=3D/var/lib/libvirt/images/disk-f-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk157 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1b,drive=3Ddrive-virtio-disk15= 7,id=3Dvirtio-disk157 \ --drive file=3D/var/lib/libvirt/images/disk-f-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk158 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1c,drive=3Ddrive-virtio-disk15= 8,id=3Dvirtio-disk158 \ --drive file=3D/var/lib/libvirt/images/disk-f-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk159 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1d,drive=3Ddrive-virtio-disk15= 9,id=3Dvirtio-disk159 \ --drive file=3D/var/lib/libvirt/images/disk-g-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk182 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1e,drive=3Ddrive-virtio-disk18= 2,id=3Dvirtio-disk182 \ --drive file=3D/var/lib/libvirt/images/disk-g-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk183 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1f,drive=3Ddrive-virtio-disk18= 3,id=3Dvirtio-disk183 \ --drive file=3D/var/lib/libvirt/images/disk-g-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk184 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x1,drive=3Ddrive-virtio-disk184= ,id=3Dvirtio-disk184 \ --drive file=3D/var/lib/libvirt/images/disk-g-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk185 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x2,drive=3Ddrive-virtio-disk185= ,id=3Dvirtio-disk185 \ --drive file=3D/var/lib/libvirt/images/disk-h-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk208 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x3,drive=3Ddrive-virtio-disk208= ,id=3Dvirtio-disk208 \ --drive file=3D/var/lib/libvirt/images/disk-h-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk209 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x4,drive=3Ddrive-virtio-disk209= ,id=3Dvirtio-disk209 \ --drive file=3D/var/lib/libvirt/images/disk-h-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk210 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x5,drive=3Ddrive-virtio-disk210= ,id=3Dvirtio-disk210 \ --drive file=3D/var/lib/libvirt/images/disk-h-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk211 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x6,drive=3Ddrive-virtio-disk211= ,id=3Dvirtio-disk211 \ --drive file=3D/var/lib/libvirt/images/disk-i-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk234 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x7,drive=3Ddrive-virtio-disk234= ,id=3Dvirtio-disk234 \ --drive file=3D/var/lib/libvirt/images/disk-i-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk235 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x8,drive=3Ddrive-virtio-disk235= ,id=3Dvirtio-disk235 \ --drive file=3D/var/lib/libvirt/images/disk-i-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk236 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x9,drive=3Ddrive-virtio-disk236= ,id=3Dvirtio-disk236 \ --drive file=3D/var/lib/libvirt/images/disk-i-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk237 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0xa,drive=3Ddrive-virtio-disk237= ,id=3Dvirtio-disk237 \ --drive file=3D/var/lib/libvirt/images/disk-j-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk260 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0xb,drive=3Ddrive-virtio-disk260= ,id=3Dvirtio-disk260 \ --drive file=3D/var/lib/libvirt/images/disk-j-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk261 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0xc,drive=3Ddrive-virtio-disk261= ,id=3Dvirtio-disk261 \ --drive file=3D/var/lib/libvirt/images/disk-j-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk262 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0xd,drive=3Ddrive-virtio-disk262= ,id=3Dvirtio-disk262 \ --drive file=3D/var/lib/libvirt/images/disk-j-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk263 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0xe,drive=3Ddrive-virtio-disk263= ,id=3Dvirtio-disk263 \ --drive file=3D/var/lib/libvirt/images/disk-k-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk286 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0xf,drive=3Ddrive-virtio-disk286= ,id=3Dvirtio-disk286 \ --drive file=3D/var/lib/libvirt/images/disk-k-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk287 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x10,drive=3Ddrive-virtio-disk28= 7,id=3Dvirtio-disk287 \ --drive file=3D/var/lib/libvirt/images/disk-k-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk288 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x11,drive=3Ddrive-virtio-disk28= 8,id=3Dvirtio-disk288 \ --drive file=3D/var/lib/libvirt/images/disk-k-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk289 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x12,drive=3Ddrive-virtio-disk28= 9,id=3Dvirtio-disk289 \ --drive file=3D/var/lib/libvirt/images/disk-l-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk312 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x13,drive=3Ddrive-virtio-disk31= 2,id=3Dvirtio-disk312 \ --drive file=3D/var/lib/libvirt/images/disk-l-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk313 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x14,drive=3Ddrive-virtio-disk31= 3,id=3Dvirtio-disk313 \ --drive file=3D/var/lib/libvirt/images/disk-l-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk314 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x15,drive=3Ddrive-virtio-disk31= 4,id=3Dvirtio-disk314 \ --drive file=3D/var/lib/libvirt/images/disk-l-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk315 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x16,drive=3Ddrive-virtio-disk31= 5,id=3Dvirtio-disk315 \ --drive file=3D/var/lib/libvirt/images/disk-m-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk338 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x17,drive=3Ddrive-virtio-disk33= 8,id=3Dvirtio-disk338 \ --drive file=3D/var/lib/libvirt/images/disk-m-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk339 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x18,drive=3Ddrive-virtio-disk33= 9,id=3Dvirtio-disk339 \ --drive file=3D/var/lib/libvirt/images/disk-m-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk340 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x19,drive=3Ddrive-virtio-disk34= 0,id=3Dvirtio-disk340 \ --drive file=3D/var/lib/libvirt/images/disk-m-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk341 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x1a,drive=3Ddrive-virtio-disk34= 1,id=3Dvirtio-disk341 \ --drive file=3D/var/lib/libvirt/images/disk-n-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk364 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x1b,drive=3Ddrive-virtio-disk36= 4,id=3Dvirtio-disk364 \ --drive file=3D/var/lib/libvirt/images/disk-n-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk365 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x1c,drive=3Ddrive-virtio-disk36= 5,id=3Dvirtio-disk365 \ --drive file=3D/var/lib/libvirt/images/disk-n-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk366 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x1d,drive=3Ddrive-virtio-disk36= 6,id=3Dvirtio-disk366 \ --drive file=3D/var/lib/libvirt/images/disk-n-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk367 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x1e,drive=3Ddrive-virtio-disk36= 7,id=3Dvirtio-disk367 \ --drive file=3D/var/lib/libvirt/images/disk-o-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk390 \ --device virtio-blk-pci,bus=3Dpci.1,addr=3D0x1f,drive=3Ddrive-virtio-disk39= 0,id=3Dvirtio-disk390 \ --drive file=3D/var/lib/libvirt/images/disk-o-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk391 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x1,drive=3Ddrive-virtio-disk391= ,id=3Dvirtio-disk391 \ --drive file=3D/var/lib/libvirt/images/disk-o-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk392 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x2,drive=3Ddrive-virtio-disk392= ,id=3Dvirtio-disk392 \ --drive file=3D/var/lib/libvirt/images/disk-o-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk393 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x3,drive=3Ddrive-virtio-disk393= ,id=3Dvirtio-disk393 \ --drive file=3D/var/lib/libvirt/images/disk-p-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk416 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x4,drive=3Ddrive-virtio-disk416= ,id=3Dvirtio-disk416 \ --drive file=3D/var/lib/libvirt/images/disk-p-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk417 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x5,drive=3Ddrive-virtio-disk417= ,id=3Dvirtio-disk417 \ --drive file=3D/var/lib/libvirt/images/disk-p-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk418 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x6,drive=3Ddrive-virtio-disk418= ,id=3Dvirtio-disk418 \ --drive file=3D/var/lib/libvirt/images/disk-p-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk419 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x7,drive=3Ddrive-virtio-disk419= ,id=3Dvirtio-disk419 \ --drive file=3D/var/lib/libvirt/images/disk-q-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk442 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x8,drive=3Ddrive-virtio-disk442= ,id=3Dvirtio-disk442 \ --drive file=3D/var/lib/libvirt/images/disk-q-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk443 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x9,drive=3Ddrive-virtio-disk443= ,id=3Dvirtio-disk443 \ --drive file=3D/var/lib/libvirt/images/disk-q-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk444 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0xa,drive=3Ddrive-virtio-disk444= ,id=3Dvirtio-disk444 \ --drive file=3D/var/lib/libvirt/images/disk-q-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk445 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0xb,drive=3Ddrive-virtio-disk445= ,id=3Dvirtio-disk445 \ --drive file=3D/var/lib/libvirt/images/disk-r-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk468 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0xc,drive=3Ddrive-virtio-disk468= ,id=3Dvirtio-disk468 \ --drive file=3D/var/lib/libvirt/images/disk-r-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk469 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0xd,drive=3Ddrive-virtio-disk469= ,id=3Dvirtio-disk469 \ --drive file=3D/var/lib/libvirt/images/disk-r-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk470 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0xe,drive=3Ddrive-virtio-disk470= ,id=3Dvirtio-disk470 \ --drive file=3D/var/lib/libvirt/images/disk-r-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk471 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0xf,drive=3Ddrive-virtio-disk471= ,id=3Dvirtio-disk471 \ --drive file=3D/var/lib/libvirt/images/disk-s-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk494 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x10,drive=3Ddrive-virtio-disk49= 4,id=3Dvirtio-disk494 \ --drive file=3D/var/lib/libvirt/images/disk-s-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk495 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x11,drive=3Ddrive-virtio-disk49= 5,id=3Dvirtio-disk495 \ --drive file=3D/var/lib/libvirt/images/disk-s-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk496 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x12,drive=3Ddrive-virtio-disk49= 6,id=3Dvirtio-disk496 \ --drive file=3D/var/lib/libvirt/images/disk-s-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk497 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x13,drive=3Ddrive-virtio-disk49= 7,id=3Dvirtio-disk497 \ --drive file=3D/var/lib/libvirt/images/disk-t-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk520 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x14,drive=3Ddrive-virtio-disk52= 0,id=3Dvirtio-disk520 \ --drive file=3D/var/lib/libvirt/images/disk-t-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk521 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x15,drive=3Ddrive-virtio-disk52= 1,id=3Dvirtio-disk521 \ --drive file=3D/var/lib/libvirt/images/disk-t-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk522 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x16,drive=3Ddrive-virtio-disk52= 2,id=3Dvirtio-disk522 \ --drive file=3D/var/lib/libvirt/images/disk-t-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk523 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x17,drive=3Ddrive-virtio-disk52= 3,id=3Dvirtio-disk523 \ --drive file=3D/var/lib/libvirt/images/disk-u-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk546 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x18,drive=3Ddrive-virtio-disk54= 6,id=3Dvirtio-disk546 \ --drive file=3D/var/lib/libvirt/images/disk-u-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk547 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x19,drive=3Ddrive-virtio-disk54= 7,id=3Dvirtio-disk547 \ --drive file=3D/var/lib/libvirt/images/disk-u-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk548 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x1a,drive=3Ddrive-virtio-disk54= 8,id=3Dvirtio-disk548 \ --drive file=3D/var/lib/libvirt/images/disk-u-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk549 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x1b,drive=3Ddrive-virtio-disk54= 9,id=3Dvirtio-disk549 \ --drive file=3D/var/lib/libvirt/images/disk-v-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk572 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x1c,drive=3Ddrive-virtio-disk57= 2,id=3Dvirtio-disk572 \ --drive file=3D/var/lib/libvirt/images/disk-v-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk573 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x1d,drive=3Ddrive-virtio-disk57= 3,id=3Dvirtio-disk573 \ --drive file=3D/var/lib/libvirt/images/disk-v-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk574 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x1e,drive=3Ddrive-virtio-disk57= 4,id=3Dvirtio-disk574 \ --drive file=3D/var/lib/libvirt/images/disk-v-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk575 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x1f,drive=3Ddrive-virtio-disk57= 5,id=3Dvirtio-disk575 \ --drive file=3D/var/lib/libvirt/images/disk-w-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk598 \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0x1,drive=3Ddrive-virtio-disk598= ,id=3Dvirtio-disk598 \ --drive file=3D/var/lib/libvirt/images/disk-w-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk599 \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0x2,drive=3Ddrive-virtio-disk599= ,id=3Dvirtio-disk599 \ --drive file=3D/var/lib/libvirt/images/disk-w-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk600 \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0x3,drive=3Ddrive-virtio-disk600= ,id=3Dvirtio-disk600 \ --drive file=3D/var/lib/libvirt/images/disk-w-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk601 \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0x4,drive=3Ddrive-virtio-disk601= ,id=3Dvirtio-disk601 \ --drive file=3D/var/lib/libvirt/images/disk-x-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk624 \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0x5,drive=3Ddrive-virtio-disk624= ,id=3Dvirtio-disk624 \ --drive file=3D/var/lib/libvirt/images/disk-x-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk625 \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0x6,drive=3Ddrive-virtio-disk625= ,id=3Dvirtio-disk625 \ --drive file=3D/var/lib/libvirt/images/disk-x-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk626 \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0x7,drive=3Ddrive-virtio-disk626= ,id=3Dvirtio-disk626 \ --drive file=3D/var/lib/libvirt/images/disk-x-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk627 \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0x8,drive=3Ddrive-virtio-disk627= ,id=3Dvirtio-disk627 \ --drive file=3D/var/lib/libvirt/images/disk-y-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk650 \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0x9,drive=3Ddrive-virtio-disk650= ,id=3Dvirtio-disk650 \ --drive file=3D/var/lib/libvirt/images/disk-y-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk651 \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0xa,drive=3Ddrive-virtio-disk651= ,id=3Dvirtio-disk651 \ --drive file=3D/var/lib/libvirt/images/disk-y-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk652 \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0xb,drive=3Ddrive-virtio-disk652= ,id=3Dvirtio-disk652 \ --drive file=3D/var/lib/libvirt/images/disk-y-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk653 \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0xc,drive=3Ddrive-virtio-disk653= ,id=3Dvirtio-disk653 \ --drive file=3D/var/lib/libvirt/images/disk-z-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk676 \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0xd,drive=3Ddrive-virtio-disk676= ,id=3Dvirtio-disk676 \ --drive file=3D/var/lib/libvirt/images/disk-z-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk677 \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0xe,drive=3Ddrive-virtio-disk677= ,id=3Dvirtio-disk677 \ --drive file=3D/var/lib/libvirt/images/disk-z-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk678 \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0xf,drive=3Ddrive-virtio-disk678= ,id=3Dvirtio-disk678 \ --drive file=3D/var/lib/libvirt/images/disk-z-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk679 \ --device virtio-blk-pci,bus=3Dpci.3,addr=3D0x10,drive=3Ddrive-virtio-disk67= 9,id=3Dvirtio-disk679 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test.img",= "node-name":"libvirt-105-storage","auto-read-only":true,"discard":"unmap"}'= \ +-blockdev '{"node-name":"libvirt-105-format","read-only":false,"driver":"r= aw","file":"libvirt-105-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-105-format,i= d=3Dvirtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-a.i= mg","node-name":"libvirt-104-storage","auto-read-only":true,"discard":"unma= p"}' \ +-blockdev '{"node-name":"libvirt-104-format","read-only":false,"driver":"r= aw","file":"libvirt-104-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-104-format,i= d=3Dvirtio-disk26 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-b.i= mg","node-name":"libvirt-103-storage","auto-read-only":true,"discard":"unma= p"}' \ +-blockdev '{"node-name":"libvirt-103-format","read-only":false,"driver":"r= aw","file":"libvirt-103-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-103-format,i= d=3Dvirtio-disk27 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-c.i= mg","node-name":"libvirt-102-storage","auto-read-only":true,"discard":"unma= p"}' \ +-blockdev '{"node-name":"libvirt-102-format","read-only":false,"driver":"r= aw","file":"libvirt-102-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x8,drive=3Dlibvirt-102-format,i= d=3Dvirtio-disk28 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-d.i= mg","node-name":"libvirt-101-storage","auto-read-only":true,"discard":"unma= p"}' \ +-blockdev '{"node-name":"libvirt-101-format","read-only":false,"driver":"r= aw","file":"libvirt-101-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x9,drive=3Dlibvirt-101-format,i= d=3Dvirtio-disk29 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-a.i= mg","node-name":"libvirt-100-storage","auto-read-only":true,"discard":"unma= p"}' \ +-blockdev '{"node-name":"libvirt-100-format","read-only":false,"driver":"r= aw","file":"libvirt-100-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0xa,drive=3Dlibvirt-100-format,i= d=3Dvirtio-disk52 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-b.i= mg","node-name":"libvirt-99-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-99-format","read-only":false,"driver":"ra= w","file":"libvirt-99-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0xb,drive=3Dlibvirt-99-format,id= =3Dvirtio-disk53 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-c.i= mg","node-name":"libvirt-98-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-98-format","read-only":false,"driver":"ra= w","file":"libvirt-98-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0xc,drive=3Dlibvirt-98-format,id= =3Dvirtio-disk54 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-d.i= mg","node-name":"libvirt-97-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-97-format","read-only":false,"driver":"ra= w","file":"libvirt-97-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0xd,drive=3Dlibvirt-97-format,id= =3Dvirtio-disk55 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-a.i= mg","node-name":"libvirt-96-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-96-format","read-only":false,"driver":"ra= w","file":"libvirt-96-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0xe,drive=3Dlibvirt-96-format,id= =3Dvirtio-disk78 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-b.i= mg","node-name":"libvirt-95-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-95-format","read-only":false,"driver":"ra= w","file":"libvirt-95-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0xf,drive=3Dlibvirt-95-format,id= =3Dvirtio-disk79 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-c.i= mg","node-name":"libvirt-94-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-94-format","read-only":false,"driver":"ra= w","file":"libvirt-94-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x10,drive=3Dlibvirt-94-format,i= d=3Dvirtio-disk80 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-d.i= mg","node-name":"libvirt-93-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-93-format","read-only":false,"driver":"ra= w","file":"libvirt-93-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x11,drive=3Dlibvirt-93-format,i= d=3Dvirtio-disk81 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-a.i= mg","node-name":"libvirt-92-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-92-format","read-only":false,"driver":"ra= w","file":"libvirt-92-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x12,drive=3Dlibvirt-92-format,i= d=3Dvirtio-disk104 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-b.i= mg","node-name":"libvirt-91-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-91-format","read-only":false,"driver":"ra= w","file":"libvirt-91-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x13,drive=3Dlibvirt-91-format,i= d=3Dvirtio-disk105 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-c.i= mg","node-name":"libvirt-90-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-90-format","read-only":false,"driver":"ra= w","file":"libvirt-90-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x14,drive=3Dlibvirt-90-format,i= d=3Dvirtio-disk106 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-d.i= mg","node-name":"libvirt-89-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-89-format","read-only":false,"driver":"ra= w","file":"libvirt-89-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x15,drive=3Dlibvirt-89-format,i= d=3Dvirtio-disk107 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-a.i= mg","node-name":"libvirt-88-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-88-format","read-only":false,"driver":"ra= w","file":"libvirt-88-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x16,drive=3Dlibvirt-88-format,i= d=3Dvirtio-disk130 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-b.i= mg","node-name":"libvirt-87-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-87-format","read-only":false,"driver":"ra= w","file":"libvirt-87-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x17,drive=3Dlibvirt-87-format,i= d=3Dvirtio-disk131 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-c.i= mg","node-name":"libvirt-86-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-86-format","read-only":false,"driver":"ra= w","file":"libvirt-86-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x18,drive=3Dlibvirt-86-format,i= d=3Dvirtio-disk132 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-d.i= mg","node-name":"libvirt-85-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-85-format","read-only":false,"driver":"ra= w","file":"libvirt-85-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x19,drive=3Dlibvirt-85-format,i= d=3Dvirtio-disk133 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-a.i= mg","node-name":"libvirt-84-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-84-format","read-only":false,"driver":"ra= w","file":"libvirt-84-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1a,drive=3Dlibvirt-84-format,i= d=3Dvirtio-disk156 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-b.i= mg","node-name":"libvirt-83-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-83-format","read-only":false,"driver":"ra= w","file":"libvirt-83-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1b,drive=3Dlibvirt-83-format,i= d=3Dvirtio-disk157 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-c.i= mg","node-name":"libvirt-82-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-82-format","read-only":false,"driver":"ra= w","file":"libvirt-82-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1c,drive=3Dlibvirt-82-format,i= d=3Dvirtio-disk158 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-d.i= mg","node-name":"libvirt-81-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-81-format","read-only":false,"driver":"ra= w","file":"libvirt-81-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1d,drive=3Dlibvirt-81-format,i= d=3Dvirtio-disk159 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-a.i= mg","node-name":"libvirt-80-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-80-format","read-only":false,"driver":"ra= w","file":"libvirt-80-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1e,drive=3Dlibvirt-80-format,i= d=3Dvirtio-disk182 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-b.i= mg","node-name":"libvirt-79-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-79-format","read-only":false,"driver":"ra= w","file":"libvirt-79-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1f,drive=3Dlibvirt-79-format,i= d=3Dvirtio-disk183 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-c.i= mg","node-name":"libvirt-78-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-78-format","read-only":false,"driver":"ra= w","file":"libvirt-78-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x1,drive=3Dlibvirt-78-format,id= =3Dvirtio-disk184 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-d.i= mg","node-name":"libvirt-77-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-77-format","read-only":false,"driver":"ra= w","file":"libvirt-77-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x2,drive=3Dlibvirt-77-format,id= =3Dvirtio-disk185 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-a.i= mg","node-name":"libvirt-76-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-76-format","read-only":false,"driver":"ra= w","file":"libvirt-76-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x3,drive=3Dlibvirt-76-format,id= =3Dvirtio-disk208 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-b.i= mg","node-name":"libvirt-75-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-75-format","read-only":false,"driver":"ra= w","file":"libvirt-75-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x4,drive=3Dlibvirt-75-format,id= =3Dvirtio-disk209 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-c.i= mg","node-name":"libvirt-74-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-74-format","read-only":false,"driver":"ra= w","file":"libvirt-74-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x5,drive=3Dlibvirt-74-format,id= =3Dvirtio-disk210 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-d.i= mg","node-name":"libvirt-73-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-73-format","read-only":false,"driver":"ra= w","file":"libvirt-73-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x6,drive=3Dlibvirt-73-format,id= =3Dvirtio-disk211 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-a.i= mg","node-name":"libvirt-72-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-72-format","read-only":false,"driver":"ra= w","file":"libvirt-72-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x7,drive=3Dlibvirt-72-format,id= =3Dvirtio-disk234 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-b.i= mg","node-name":"libvirt-71-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-71-format","read-only":false,"driver":"ra= w","file":"libvirt-71-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x8,drive=3Dlibvirt-71-format,id= =3Dvirtio-disk235 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-c.i= mg","node-name":"libvirt-70-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-70-format","read-only":false,"driver":"ra= w","file":"libvirt-70-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x9,drive=3Dlibvirt-70-format,id= =3Dvirtio-disk236 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-d.i= mg","node-name":"libvirt-69-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-69-format","read-only":false,"driver":"ra= w","file":"libvirt-69-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0xa,drive=3Dlibvirt-69-format,id= =3Dvirtio-disk237 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-a.i= mg","node-name":"libvirt-68-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-68-format","read-only":false,"driver":"ra= w","file":"libvirt-68-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0xb,drive=3Dlibvirt-68-format,id= =3Dvirtio-disk260 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-b.i= mg","node-name":"libvirt-67-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-67-format","read-only":false,"driver":"ra= w","file":"libvirt-67-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0xc,drive=3Dlibvirt-67-format,id= =3Dvirtio-disk261 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-c.i= mg","node-name":"libvirt-66-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-66-format","read-only":false,"driver":"ra= w","file":"libvirt-66-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0xd,drive=3Dlibvirt-66-format,id= =3Dvirtio-disk262 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-d.i= mg","node-name":"libvirt-65-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-65-format","read-only":false,"driver":"ra= w","file":"libvirt-65-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0xe,drive=3Dlibvirt-65-format,id= =3Dvirtio-disk263 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-a.i= mg","node-name":"libvirt-64-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-64-format","read-only":false,"driver":"ra= w","file":"libvirt-64-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0xf,drive=3Dlibvirt-64-format,id= =3Dvirtio-disk286 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-b.i= mg","node-name":"libvirt-63-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-63-format","read-only":false,"driver":"ra= w","file":"libvirt-63-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x10,drive=3Dlibvirt-63-format,i= d=3Dvirtio-disk287 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-c.i= mg","node-name":"libvirt-62-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-62-format","read-only":false,"driver":"ra= w","file":"libvirt-62-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x11,drive=3Dlibvirt-62-format,i= d=3Dvirtio-disk288 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-d.i= mg","node-name":"libvirt-61-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-61-format","read-only":false,"driver":"ra= w","file":"libvirt-61-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x12,drive=3Dlibvirt-61-format,i= d=3Dvirtio-disk289 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-a.i= mg","node-name":"libvirt-60-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-60-format","read-only":false,"driver":"ra= w","file":"libvirt-60-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x13,drive=3Dlibvirt-60-format,i= d=3Dvirtio-disk312 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-b.i= mg","node-name":"libvirt-59-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-59-format","read-only":false,"driver":"ra= w","file":"libvirt-59-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x14,drive=3Dlibvirt-59-format,i= d=3Dvirtio-disk313 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-c.i= mg","node-name":"libvirt-58-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-58-format","read-only":false,"driver":"ra= w","file":"libvirt-58-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x15,drive=3Dlibvirt-58-format,i= d=3Dvirtio-disk314 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-d.i= mg","node-name":"libvirt-57-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-57-format","read-only":false,"driver":"ra= w","file":"libvirt-57-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x16,drive=3Dlibvirt-57-format,i= d=3Dvirtio-disk315 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-a.i= mg","node-name":"libvirt-56-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-56-format","read-only":false,"driver":"ra= w","file":"libvirt-56-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x17,drive=3Dlibvirt-56-format,i= d=3Dvirtio-disk338 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-b.i= mg","node-name":"libvirt-55-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-55-format","read-only":false,"driver":"ra= w","file":"libvirt-55-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x18,drive=3Dlibvirt-55-format,i= d=3Dvirtio-disk339 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-c.i= mg","node-name":"libvirt-54-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-54-format","read-only":false,"driver":"ra= w","file":"libvirt-54-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x19,drive=3Dlibvirt-54-format,i= d=3Dvirtio-disk340 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-d.i= mg","node-name":"libvirt-53-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-53-format","read-only":false,"driver":"ra= w","file":"libvirt-53-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x1a,drive=3Dlibvirt-53-format,i= d=3Dvirtio-disk341 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-a.i= mg","node-name":"libvirt-52-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-52-format","read-only":false,"driver":"ra= w","file":"libvirt-52-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x1b,drive=3Dlibvirt-52-format,i= d=3Dvirtio-disk364 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-b.i= mg","node-name":"libvirt-51-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-51-format","read-only":false,"driver":"ra= w","file":"libvirt-51-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x1c,drive=3Dlibvirt-51-format,i= d=3Dvirtio-disk365 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-c.i= mg","node-name":"libvirt-50-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-50-format","read-only":false,"driver":"ra= w","file":"libvirt-50-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x1d,drive=3Dlibvirt-50-format,i= d=3Dvirtio-disk366 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-d.i= mg","node-name":"libvirt-49-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-49-format","read-only":false,"driver":"ra= w","file":"libvirt-49-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x1e,drive=3Dlibvirt-49-format,i= d=3Dvirtio-disk367 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-a.i= mg","node-name":"libvirt-48-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-48-format","read-only":false,"driver":"ra= w","file":"libvirt-48-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x1f,drive=3Dlibvirt-48-format,i= d=3Dvirtio-disk390 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-b.i= mg","node-name":"libvirt-47-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-47-format","read-only":false,"driver":"ra= w","file":"libvirt-47-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x1,drive=3Dlibvirt-47-format,id= =3Dvirtio-disk391 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-c.i= mg","node-name":"libvirt-46-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-46-format","read-only":false,"driver":"ra= w","file":"libvirt-46-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x2,drive=3Dlibvirt-46-format,id= =3Dvirtio-disk392 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-d.i= mg","node-name":"libvirt-45-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-45-format","read-only":false,"driver":"ra= w","file":"libvirt-45-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x3,drive=3Dlibvirt-45-format,id= =3Dvirtio-disk393 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-a.i= mg","node-name":"libvirt-44-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-44-format","read-only":false,"driver":"ra= w","file":"libvirt-44-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x4,drive=3Dlibvirt-44-format,id= =3Dvirtio-disk416 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-b.i= mg","node-name":"libvirt-43-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-43-format","read-only":false,"driver":"ra= w","file":"libvirt-43-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x5,drive=3Dlibvirt-43-format,id= =3Dvirtio-disk417 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-c.i= mg","node-name":"libvirt-42-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-42-format","read-only":false,"driver":"ra= w","file":"libvirt-42-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x6,drive=3Dlibvirt-42-format,id= =3Dvirtio-disk418 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-d.i= mg","node-name":"libvirt-41-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-41-format","read-only":false,"driver":"ra= w","file":"libvirt-41-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x7,drive=3Dlibvirt-41-format,id= =3Dvirtio-disk419 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-a.i= mg","node-name":"libvirt-40-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-40-format","read-only":false,"driver":"ra= w","file":"libvirt-40-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x8,drive=3Dlibvirt-40-format,id= =3Dvirtio-disk442 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-b.i= mg","node-name":"libvirt-39-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-39-format","read-only":false,"driver":"ra= w","file":"libvirt-39-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x9,drive=3Dlibvirt-39-format,id= =3Dvirtio-disk443 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-c.i= mg","node-name":"libvirt-38-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-38-format","read-only":false,"driver":"ra= w","file":"libvirt-38-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0xa,drive=3Dlibvirt-38-format,id= =3Dvirtio-disk444 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-d.i= mg","node-name":"libvirt-37-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-37-format","read-only":false,"driver":"ra= w","file":"libvirt-37-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0xb,drive=3Dlibvirt-37-format,id= =3Dvirtio-disk445 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-a.i= mg","node-name":"libvirt-36-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-36-format","read-only":false,"driver":"ra= w","file":"libvirt-36-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0xc,drive=3Dlibvirt-36-format,id= =3Dvirtio-disk468 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-b.i= mg","node-name":"libvirt-35-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-35-format","read-only":false,"driver":"ra= w","file":"libvirt-35-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0xd,drive=3Dlibvirt-35-format,id= =3Dvirtio-disk469 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-c.i= mg","node-name":"libvirt-34-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-34-format","read-only":false,"driver":"ra= w","file":"libvirt-34-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0xe,drive=3Dlibvirt-34-format,id= =3Dvirtio-disk470 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-d.i= mg","node-name":"libvirt-33-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-33-format","read-only":false,"driver":"ra= w","file":"libvirt-33-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0xf,drive=3Dlibvirt-33-format,id= =3Dvirtio-disk471 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-a.i= mg","node-name":"libvirt-32-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-32-format","read-only":false,"driver":"ra= w","file":"libvirt-32-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x10,drive=3Dlibvirt-32-format,i= d=3Dvirtio-disk494 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-b.i= mg","node-name":"libvirt-31-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-31-format","read-only":false,"driver":"ra= w","file":"libvirt-31-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x11,drive=3Dlibvirt-31-format,i= d=3Dvirtio-disk495 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-c.i= mg","node-name":"libvirt-30-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-30-format","read-only":false,"driver":"ra= w","file":"libvirt-30-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x12,drive=3Dlibvirt-30-format,i= d=3Dvirtio-disk496 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-d.i= mg","node-name":"libvirt-29-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-29-format","read-only":false,"driver":"ra= w","file":"libvirt-29-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x13,drive=3Dlibvirt-29-format,i= d=3Dvirtio-disk497 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-a.i= mg","node-name":"libvirt-28-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-28-format","read-only":false,"driver":"ra= w","file":"libvirt-28-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x14,drive=3Dlibvirt-28-format,i= d=3Dvirtio-disk520 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-b.i= mg","node-name":"libvirt-27-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-27-format","read-only":false,"driver":"ra= w","file":"libvirt-27-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x15,drive=3Dlibvirt-27-format,i= d=3Dvirtio-disk521 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-c.i= mg","node-name":"libvirt-26-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-26-format","read-only":false,"driver":"ra= w","file":"libvirt-26-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x16,drive=3Dlibvirt-26-format,i= d=3Dvirtio-disk522 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-d.i= mg","node-name":"libvirt-25-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-25-format","read-only":false,"driver":"ra= w","file":"libvirt-25-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x17,drive=3Dlibvirt-25-format,i= d=3Dvirtio-disk523 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-a.i= mg","node-name":"libvirt-24-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-24-format","read-only":false,"driver":"ra= w","file":"libvirt-24-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x18,drive=3Dlibvirt-24-format,i= d=3Dvirtio-disk546 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-b.i= mg","node-name":"libvirt-23-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-23-format","read-only":false,"driver":"ra= w","file":"libvirt-23-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x19,drive=3Dlibvirt-23-format,i= d=3Dvirtio-disk547 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-c.i= mg","node-name":"libvirt-22-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-22-format","read-only":false,"driver":"ra= w","file":"libvirt-22-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x1a,drive=3Dlibvirt-22-format,i= d=3Dvirtio-disk548 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-d.i= mg","node-name":"libvirt-21-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-21-format","read-only":false,"driver":"ra= w","file":"libvirt-21-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x1b,drive=3Dlibvirt-21-format,i= d=3Dvirtio-disk549 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-a.i= mg","node-name":"libvirt-20-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-20-format","read-only":false,"driver":"ra= w","file":"libvirt-20-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x1c,drive=3Dlibvirt-20-format,i= d=3Dvirtio-disk572 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-b.i= mg","node-name":"libvirt-19-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-19-format","read-only":false,"driver":"ra= w","file":"libvirt-19-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x1d,drive=3Dlibvirt-19-format,i= d=3Dvirtio-disk573 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-c.i= mg","node-name":"libvirt-18-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-18-format","read-only":false,"driver":"ra= w","file":"libvirt-18-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x1e,drive=3Dlibvirt-18-format,i= d=3Dvirtio-disk574 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-d.i= mg","node-name":"libvirt-17-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-17-format","read-only":false,"driver":"ra= w","file":"libvirt-17-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x1f,drive=3Dlibvirt-17-format,i= d=3Dvirtio-disk575 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-a.i= mg","node-name":"libvirt-16-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-16-format","read-only":false,"driver":"ra= w","file":"libvirt-16-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.3,addr=3D0x1,drive=3Dlibvirt-16-format,id= =3Dvirtio-disk598 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-b.i= mg","node-name":"libvirt-15-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-15-format","read-only":false,"driver":"ra= w","file":"libvirt-15-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.3,addr=3D0x2,drive=3Dlibvirt-15-format,id= =3Dvirtio-disk599 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-c.i= mg","node-name":"libvirt-14-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-14-format","read-only":false,"driver":"ra= w","file":"libvirt-14-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.3,addr=3D0x3,drive=3Dlibvirt-14-format,id= =3Dvirtio-disk600 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-d.i= mg","node-name":"libvirt-13-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-13-format","read-only":false,"driver":"ra= w","file":"libvirt-13-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.3,addr=3D0x4,drive=3Dlibvirt-13-format,id= =3Dvirtio-disk601 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-a.i= mg","node-name":"libvirt-12-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-12-format","read-only":false,"driver":"ra= w","file":"libvirt-12-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.3,addr=3D0x5,drive=3Dlibvirt-12-format,id= =3Dvirtio-disk624 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-b.i= mg","node-name":"libvirt-11-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-11-format","read-only":false,"driver":"ra= w","file":"libvirt-11-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.3,addr=3D0x6,drive=3Dlibvirt-11-format,id= =3Dvirtio-disk625 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-c.i= mg","node-name":"libvirt-10-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-10-format","read-only":false,"driver":"ra= w","file":"libvirt-10-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.3,addr=3D0x7,drive=3Dlibvirt-10-format,id= =3Dvirtio-disk626 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-d.i= mg","node-name":"libvirt-9-storage","auto-read-only":true,"discard":"unmap"= }' \ +-blockdev '{"node-name":"libvirt-9-format","read-only":false,"driver":"raw= ","file":"libvirt-9-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.3,addr=3D0x8,drive=3Dlibvirt-9-format,id= =3Dvirtio-disk627 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-a.i= mg","node-name":"libvirt-8-storage","auto-read-only":true,"discard":"unmap"= }' \ +-blockdev '{"node-name":"libvirt-8-format","read-only":false,"driver":"raw= ","file":"libvirt-8-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.3,addr=3D0x9,drive=3Dlibvirt-8-format,id= =3Dvirtio-disk650 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-b.i= mg","node-name":"libvirt-7-storage","auto-read-only":true,"discard":"unmap"= }' \ +-blockdev '{"node-name":"libvirt-7-format","read-only":false,"driver":"raw= ","file":"libvirt-7-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.3,addr=3D0xa,drive=3Dlibvirt-7-format,id= =3Dvirtio-disk651 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-c.i= mg","node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"= }' \ +-blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw= ","file":"libvirt-6-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.3,addr=3D0xb,drive=3Dlibvirt-6-format,id= =3Dvirtio-disk652 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-d.i= mg","node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"= }' \ +-blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw= ","file":"libvirt-5-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.3,addr=3D0xc,drive=3Dlibvirt-5-format,id= =3Dvirtio-disk653 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-a.i= mg","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"= }' \ +-blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.3,addr=3D0xd,drive=3Dlibvirt-4-format,id= =3Dvirtio-disk676 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-b.i= mg","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"= }' \ +-blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.3,addr=3D0xe,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk677 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-c.i= mg","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"= }' \ +-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.3,addr=3D0xf,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk678 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-d.i= mg","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"= }' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.3,addr=3D0x10,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk679 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pci-bridge.args b/tests/qemuxml2argvdat= a/pci-bridge.args index c25780ab64..21c35f6577 100644 --- a/tests/qemuxml2argvdata/pci-bridge.args +++ b/tests/qemuxml2argvdata/pci-bridge.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fdr-br/.config \ -device pci-bridge,chassis_nr=3D1,id=3Dpci.1,bus=3Dpci.0,addr=3D0x3 \ -device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.0,addr=3D0x4 \ -usb \ --drive file=3D/var/iso/f18kde.iso,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1= -0,readonly=3Don \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0 \ +-blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"= libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= \ -netdev user,id=3Dhostnet0 \ -device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:f1:95:51,bus=3D= pci.0,addr=3D0x5 \ -netdev user,id=3Dhostnet1 \ diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/= pci-many.args index 8293f0ba02..b749325e55 100644 --- a/tests/qemuxml2argvdata/pci-many.args +++ b/tests/qemuxml2argvdata/pci-many.args @@ -25,64 +25,93 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fdr-br/.config \ -no-shutdown \ -boot strict=3Don \ -usb \ --drive file=3D/var/iso/f18kde.iso,format=3Draw,if=3Dnone,id=3Ddrive-ide0-1= -0,readonly=3Don \ --device ide-cd,bus=3Dide.1,unit=3D0,drive=3Ddrive-ide0-1-0,id=3Dide0-1-0 \ --drive file=3D/var/lib/libvirt/images/test.img,format=3Draw,if=3Dnone,id= =3Ddrive-virtio-disk0 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Ddrive-virtio-disk0,i= d=3Dvirtio-disk0,bootindex=3D1 \ --drive file=3D/var/lib/libvirt/images/test1.img,format=3Draw,if=3Dnone,id= =3Ddrive-virtio-disk1 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-virtio-disk1,i= d=3Dvirtio-disk1 \ --drive file=3D/var/lib/libvirt/images/disk-a-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk26 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Ddrive-virtio-disk26,= id=3Dvirtio-disk26 \ --drive file=3D/var/lib/libvirt/images/disk-a-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk27 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Ddrive-virtio-disk27,= id=3Dvirtio-disk27 \ --drive file=3D/var/lib/libvirt/images/disk-a-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk28 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x8,drive=3Ddrive-virtio-disk28,= id=3Dvirtio-disk28 \ --drive file=3D/var/lib/libvirt/images/disk-a-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk29 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x9,drive=3Ddrive-virtio-disk29,= id=3Dvirtio-disk29 \ --drive file=3D/var/lib/libvirt/images/disk-b-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk52 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0xa,drive=3Ddrive-virtio-disk52,= id=3Dvirtio-disk52 \ --drive file=3D/var/lib/libvirt/images/disk-b-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk53 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0xb,drive=3Ddrive-virtio-disk53,= id=3Dvirtio-disk53 \ --drive file=3D/var/lib/libvirt/images/disk-b-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk54 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0xc,drive=3Ddrive-virtio-disk54,= id=3Dvirtio-disk54 \ --drive file=3D/var/lib/libvirt/images/disk-b-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk55 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0xd,drive=3Ddrive-virtio-disk55,= id=3Dvirtio-disk55 \ --drive file=3D/var/lib/libvirt/images/disk-c-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk78 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0xe,drive=3Ddrive-virtio-disk78,= id=3Dvirtio-disk78 \ --drive file=3D/var/lib/libvirt/images/disk-c-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk79 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0xf,drive=3Ddrive-virtio-disk79,= id=3Dvirtio-disk79 \ --drive file=3D/var/lib/libvirt/images/disk-c-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk80 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x10,drive=3Ddrive-virtio-disk80= ,id=3Dvirtio-disk80 \ --drive file=3D/var/lib/libvirt/images/disk-c-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk81 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x11,drive=3Ddrive-virtio-disk81= ,id=3Dvirtio-disk81 \ --drive file=3D/var/lib/libvirt/images/disk-d-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk104 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x12,drive=3Ddrive-virtio-disk10= 4,id=3Dvirtio-disk104 \ --drive file=3D/var/lib/libvirt/images/disk-d-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk105 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x13,drive=3Ddrive-virtio-disk10= 5,id=3Dvirtio-disk105 \ --drive file=3D/var/lib/libvirt/images/disk-d-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk106 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x14,drive=3Ddrive-virtio-disk10= 6,id=3Dvirtio-disk106 \ --drive file=3D/var/lib/libvirt/images/disk-d-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk107 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x15,drive=3Ddrive-virtio-disk10= 7,id=3Dvirtio-disk107 \ --drive file=3D/var/lib/libvirt/images/disk-e-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk130 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x16,drive=3Ddrive-virtio-disk13= 0,id=3Dvirtio-disk130 \ --drive file=3D/var/lib/libvirt/images/disk-e-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk131 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x17,drive=3Ddrive-virtio-disk13= 1,id=3Dvirtio-disk131 \ --drive file=3D/var/lib/libvirt/images/disk-e-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk132 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x18,drive=3Ddrive-virtio-disk13= 2,id=3Dvirtio-disk132 \ --drive file=3D/var/lib/libvirt/images/disk-e-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk133 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x19,drive=3Ddrive-virtio-disk13= 3,id=3Dvirtio-disk133 \ --drive file=3D/var/lib/libvirt/images/disk-f-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk156 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1a,drive=3Ddrive-virtio-disk15= 6,id=3Dvirtio-disk156 \ --drive file=3D/var/lib/libvirt/images/disk-f-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk157 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1b,drive=3Ddrive-virtio-disk15= 7,id=3Dvirtio-disk157 \ --drive file=3D/var/lib/libvirt/images/disk-f-c.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk158 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1c,drive=3Ddrive-virtio-disk15= 8,id=3Dvirtio-disk158 \ --drive file=3D/var/lib/libvirt/images/disk-f-d.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk159 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1d,drive=3Ddrive-virtio-disk15= 9,id=3Dvirtio-disk159 \ --drive file=3D/var/lib/libvirt/images/disk-g-a.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk182 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1e,drive=3Ddrive-virtio-disk18= 2,id=3Dvirtio-disk182 \ --drive file=3D/var/lib/libvirt/images/disk-g-b.img,format=3Draw,if=3Dnone,= id=3Ddrive-virtio-disk183 \ --device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1f,drive=3Ddrive-virtio-disk18= 3,id=3Dvirtio-disk183 \ +-blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"= libvirt-29-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-29-format","read-only":true,"driver":"raw= ","file":"libvirt-29-storage"}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-29-format,id=3Dide0-1-= 0 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test.img",= "node-name":"libvirt-28-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-28-format","read-only":false,"driver":"ra= w","file":"libvirt-28-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-28-format,id= =3Dvirtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test1.img"= ,"node-name":"libvirt-27-storage","auto-read-only":true,"discard":"unmap"}'= \ +-blockdev '{"node-name":"libvirt-27-format","read-only":false,"driver":"ra= w","file":"libvirt-27-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-27-format,id= =3Dvirtio-disk1 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-a.i= mg","node-name":"libvirt-26-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-26-format","read-only":false,"driver":"ra= w","file":"libvirt-26-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-26-format,id= =3Dvirtio-disk26 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-b.i= mg","node-name":"libvirt-25-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-25-format","read-only":false,"driver":"ra= w","file":"libvirt-25-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-25-format,id= =3Dvirtio-disk27 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-c.i= mg","node-name":"libvirt-24-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-24-format","read-only":false,"driver":"ra= w","file":"libvirt-24-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x8,drive=3Dlibvirt-24-format,id= =3Dvirtio-disk28 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-d.i= mg","node-name":"libvirt-23-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-23-format","read-only":false,"driver":"ra= w","file":"libvirt-23-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x9,drive=3Dlibvirt-23-format,id= =3Dvirtio-disk29 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-a.i= mg","node-name":"libvirt-22-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-22-format","read-only":false,"driver":"ra= w","file":"libvirt-22-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0xa,drive=3Dlibvirt-22-format,id= =3Dvirtio-disk52 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-b.i= mg","node-name":"libvirt-21-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-21-format","read-only":false,"driver":"ra= w","file":"libvirt-21-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0xb,drive=3Dlibvirt-21-format,id= =3Dvirtio-disk53 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-c.i= mg","node-name":"libvirt-20-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-20-format","read-only":false,"driver":"ra= w","file":"libvirt-20-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0xc,drive=3Dlibvirt-20-format,id= =3Dvirtio-disk54 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-d.i= mg","node-name":"libvirt-19-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-19-format","read-only":false,"driver":"ra= w","file":"libvirt-19-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0xd,drive=3Dlibvirt-19-format,id= =3Dvirtio-disk55 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-a.i= mg","node-name":"libvirt-18-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-18-format","read-only":false,"driver":"ra= w","file":"libvirt-18-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0xe,drive=3Dlibvirt-18-format,id= =3Dvirtio-disk78 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-b.i= mg","node-name":"libvirt-17-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-17-format","read-only":false,"driver":"ra= w","file":"libvirt-17-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0xf,drive=3Dlibvirt-17-format,id= =3Dvirtio-disk79 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-c.i= mg","node-name":"libvirt-16-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-16-format","read-only":false,"driver":"ra= w","file":"libvirt-16-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x10,drive=3Dlibvirt-16-format,i= d=3Dvirtio-disk80 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-d.i= mg","node-name":"libvirt-15-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-15-format","read-only":false,"driver":"ra= w","file":"libvirt-15-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x11,drive=3Dlibvirt-15-format,i= d=3Dvirtio-disk81 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-a.i= mg","node-name":"libvirt-14-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-14-format","read-only":false,"driver":"ra= w","file":"libvirt-14-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x12,drive=3Dlibvirt-14-format,i= d=3Dvirtio-disk104 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-b.i= mg","node-name":"libvirt-13-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-13-format","read-only":false,"driver":"ra= w","file":"libvirt-13-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x13,drive=3Dlibvirt-13-format,i= d=3Dvirtio-disk105 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-c.i= mg","node-name":"libvirt-12-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-12-format","read-only":false,"driver":"ra= w","file":"libvirt-12-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x14,drive=3Dlibvirt-12-format,i= d=3Dvirtio-disk106 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-d.i= mg","node-name":"libvirt-11-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-11-format","read-only":false,"driver":"ra= w","file":"libvirt-11-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x15,drive=3Dlibvirt-11-format,i= d=3Dvirtio-disk107 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-a.i= mg","node-name":"libvirt-10-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-10-format","read-only":false,"driver":"ra= w","file":"libvirt-10-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x16,drive=3Dlibvirt-10-format,i= d=3Dvirtio-disk130 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-b.i= mg","node-name":"libvirt-9-storage","auto-read-only":true,"discard":"unmap"= }' \ +-blockdev '{"node-name":"libvirt-9-format","read-only":false,"driver":"raw= ","file":"libvirt-9-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x17,drive=3Dlibvirt-9-format,id= =3Dvirtio-disk131 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-c.i= mg","node-name":"libvirt-8-storage","auto-read-only":true,"discard":"unmap"= }' \ +-blockdev '{"node-name":"libvirt-8-format","read-only":false,"driver":"raw= ","file":"libvirt-8-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x18,drive=3Dlibvirt-8-format,id= =3Dvirtio-disk132 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-d.i= mg","node-name":"libvirt-7-storage","auto-read-only":true,"discard":"unmap"= }' \ +-blockdev '{"node-name":"libvirt-7-format","read-only":false,"driver":"raw= ","file":"libvirt-7-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x19,drive=3Dlibvirt-7-format,id= =3Dvirtio-disk133 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-a.i= mg","node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"= }' \ +-blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw= ","file":"libvirt-6-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1a,drive=3Dlibvirt-6-format,id= =3Dvirtio-disk156 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-b.i= mg","node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"= }' \ +-blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw= ","file":"libvirt-5-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1b,drive=3Dlibvirt-5-format,id= =3Dvirtio-disk157 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-c.i= mg","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"= }' \ +-blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1c,drive=3Dlibvirt-4-format,id= =3Dvirtio-disk158 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-d.i= mg","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"= }' \ +-blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1d,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk159 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-a.i= mg","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"= }' \ +-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1e,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk182 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-b.i= mg","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"= }' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x1f,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk183 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 \ diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/p= ci-rom.args index b1cdec3d1d..1c02ef4493 100644 --- a/tests/qemuxml2argvdata/pci-rom.args +++ b/tests/qemuxml2argvdata/pci-rom.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:24:a5:9f= ,bus=3Dpci.0,addr=3D0x2,rombar=3D1 \ -netdev user,id=3Dhostnet1 \ diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args b/tests/qem= uxml2argvdata/pci-serial-dev-chardev.args index ecc02d35df..651b2732f5 100644 --- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args +++ b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev tty,id=3Dcharserial0,path=3D/dev/ttyS2 \ -device pci-serial,chardev=3Dcharserial0,id=3Dserial0,bus=3Dpci.0,addr=3D0= x4 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args b/tests/qemuxml2= argvdata/pcie-expander-bus.args index c4f59dd934..7db64d7969 100644 --- a/tests/qemuxml2argvdata/pcie-expander-bus.args +++ b/tests/qemuxml2argvdata/pcie-expander-bus.args @@ -62,8 +62,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-pcie-expander-bus-te= /.config \ -device xio3130-downstream,port=3D29,chassis=3D33,id=3Dpci.33,bus=3Dpci.3,= addr=3D0x1d \ -device xio3130-downstream,port=3D30,chassis=3D34,id=3Dpci.34,bus=3Dpci.3,= addr=3D0x1e \ -device xio3130-downstream,port=3D31,chassis=3D35,id=3Dpci.35,bus=3Dpci.3,= addr=3D0x1f \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ --device ide-hd,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0,bootinde= x=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind= ex=3D1 \ -netdev user,id=3Dhostnet0 \ -device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:f1:95:51,bus=3D= pci.4,addr=3D0x0 \ -netdev user,id=3Dhostnet1 \ diff --git a/tests/qemuxml2argvdata/pcie-root-port.args b/tests/qemuxml2arg= vdata/pcie-root-port.args index 64469264b0..7ae8645b17 100644 --- a/tests/qemuxml2argvdata/pcie-root-port.args +++ b/tests/qemuxml2argvdata/pcie-root-port.args @@ -27,8 +27,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -boot strict=3Don \ -device ioh3420,port=3D16,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multifunctio= n=3Don,addr=3D0x2 \ -device ioh3420,port=3D26,chassis=3D40,id=3Dpci.2,bus=3Dpcie.0,addr=3D0x2.= 0x1 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ --device ide-hd,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0,bootinde= x=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind= ex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D33554432,bus=3Dpcie.0,addr=3D0x1 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args b/test= s/qemuxml2argvdata/pcie-switch-downstream-port.args index 228af19fa4..63769ed0cf 100644 --- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args @@ -35,8 +35,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -device xio3130-downstream,port=3D4,chassis=3D8,id=3Dpci.8,bus=3Dpci.2,add= r=3D0x4 \ -device xio3130-downstream,port=3D5,chassis=3D9,id=3Dpci.9,bus=3Dpci.2,add= r=3D0x5 \ -device xio3130-downstream,port=3D6,chassis=3D10,id=3Dpci.10,bus=3Dpci.2,a= ddr=3D0x6 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ --device ide-hd,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0,bootinde= x=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind= ex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D33554432,bus=3Dpcie.0,addr=3D0x1 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args b/tests/= qemuxml2argvdata/pcie-switch-upstream-port.args index 71970f91d1..a260479b44 100644 --- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args +++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args @@ -29,8 +29,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -device ioh3420,port=3D17,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=3D0x2.0= x1 \ -device x3130-upstream,id=3Dpci.3,bus=3Dpci.1,addr=3D0x0 \ -device x3130-upstream,id=3Dpci.4,bus=3Dpci.2,addr=3D0x0 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ --device ide-hd,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0,bootinde= x=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind= ex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D33554432,bus=3Dpcie.0,addr=3D0x1 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args b/tests/qemuxml2argv= data/pcihole64-q35.args index 77685e127e..e5114936ea 100644 --- a/tests/qemuxml2argvdata/pcihole64-q35.args +++ b/tests/qemuxml2argvdata/pcihole64-q35.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -no-acpi \ -boot strict=3Don \ -global q35-pcihost.pci-hole64-size=3D1048576K \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ --device ide-hd,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0,bootinde= x=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind= ex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D33554432,bus=3Dpcie.0,addr=3D0x1 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args b/tests/= qemuxml2argvdata/pseries-vio-user-assigned.args index 34e9b83556..5989b38a25 100644 --- a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args +++ b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args @@ -27,8 +27,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device spapr-vscsi,id=3Dscsi0,reg=3D8192 \ -device spapr-vscsi,id=3Dscsi1,reg=3D805306368 \ -usb \ --drive file=3D/tmp/scsidisk.img,format=3Draw,if=3Dnone,id=3Ddrive-scsi1-0-= 0-0 \ --device scsi-hd,bus=3Dscsi1.0,channel=3D0,scsi-id=3D0,lun=3D0,drive=3Ddriv= e-scsi1-0-0-0,id=3Dscsi1-0-0-0,bootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"li= bvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device scsi-hd,bus=3Dscsi1.0,channel=3D0,scsi-id=3D0,lun=3D0,drive=3Dlibv= irt-1-format,id=3Dscsi1-0-0-0,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ -device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D536870912 \ -chardev pty,id=3Dcharserial1 \ diff --git a/tests/qemuxml2argvdata/pseries-vio.args b/tests/qemuxml2argvda= ta/pseries-vio.args index a5a641b49b..53277f2287 100644 --- a/tests/qemuxml2argvdata/pseries-vio.args +++ b/tests/qemuxml2argvdata/pseries-vio.args @@ -27,8 +27,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -device spapr-vscsi,id=3Dscsi0,reg=3D8192 \ -device spapr-vscsi,id=3Dscsi1,reg=3D12288 \ -usb \ --drive file=3D/tmp/scsidisk.img,format=3Draw,if=3Dnone,id=3Ddrive-scsi1-0-= 0-0 \ --device scsi-hd,bus=3Dscsi1.0,channel=3D0,scsi-id=3D0,lun=3D0,drive=3Ddriv= e-scsi1-0-0-0,id=3Dscsi1-0-0-0,bootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"li= bvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device scsi-hd,bus=3Dscsi1.0,channel=3D0,scsi-id=3D0,lun=3D0,drive=3Dlibv= irt-1-format,id=3Dscsi1-0-0-0,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ -device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -chardev pty,id=3Dcharserial1 \ diff --git a/tests/qemuxml2argvdata/q35-pcie-autoadd.args b/tests/qemuxml2a= rgvdata/q35-pcie-autoadd.args index 019943f6dd..3db83f2a10 100644 --- a/tests/qemuxml2argvdata/q35-pcie-autoadd.args +++ b/tests/qemuxml2argvdata/q35-pcie-autoadd.args @@ -42,8 +42,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -device nec-usb-xhci,id=3Dusb,bus=3Dpci.6,addr=3D0x0 \ -device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.5,addr=3D0x0 \ -device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.4,addr=3D0x0 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk1 \ --device virtio-blk-pci,bus=3Dpci.7,addr=3D0x0,drive=3Ddrive-virtio-disk1,i= d=3Dvirtio-disk1,bootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.7,addr=3D0x0,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk1,bootindex=3D1 \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/to= /guest \ -device virtio-9p-pci,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3D/import/from/= host,bus=3Dpci.1,addr=3D0x0 \ -netdev user,id=3Dhostnet0 \ diff --git a/tests/qemuxml2argvdata/q35-pcie.args b/tests/qemuxml2argvdata/= q35-pcie.args index 2f922f9352..48e6ae0557 100644 --- a/tests/qemuxml2argvdata/q35-pcie.args +++ b/tests/qemuxml2argvdata/q35-pcie.args @@ -43,8 +43,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -device nec-usb-xhci,id=3Dusb,bus=3Dpci.8,addr=3D0x0 \ -device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.7,addr=3D0x0 \ -device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.6,addr=3D0x0 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk1 \ --device virtio-blk-pci,bus=3Dpci.9,addr=3D0x0,drive=3Ddrive-virtio-disk1,i= d=3Dvirtio-disk1,bootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.9,addr=3D0x0,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk1,bootindex=3D1 \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/to= /guest \ -device virtio-9p-pci,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3D/import/from/= host,bus=3Dpci.3,addr=3D0x0 \ -netdev user,id=3Dhostnet0 \ diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args b/tests/qemuxml2arg= vdata/q35-usb2-multi.args index 0722fd972e..e2a2cbdd19 100644 --- a/tests/qemuxml2argvdata/q35-usb2-multi.args +++ b/tests/qemuxml2argvdata/q35-usb2-multi.args @@ -39,8 +39,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -device ich9-usb-uhci1,masterbus=3Dusb2.0,firstport=3D0,bus=3Dpci.2,multif= unction=3Don,addr=3D0x1 \ -device ich9-usb-uhci2,masterbus=3Dusb2.0,firstport=3D2,bus=3Dpci.2,addr= =3D0x1.0x1 \ -device ich9-usb-uhci3,masterbus=3Dusb2.0,firstport=3D4,bus=3Dpci.2,addr= =3D0x1.0x2 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ --device ide-hd,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0,bootinde= x=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind= ex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D33554432,bus=3Dpcie.0,addr=3D0x1 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args b/tests/qemuxml2a= rgvdata/q35-usb2-reorder.args index 43cb4657bc..3c7f1e6199 100644 --- a/tests/qemuxml2argvdata/q35-usb2-reorder.args +++ b/tests/qemuxml2argvdata/q35-usb2-reorder.args @@ -39,8 +39,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -device ich9-usb-uhci3,masterbus=3Dusb2.0,firstport=3D4,bus=3Dpci.2,addr= =3D0x1.0x2 \ -device ich9-usb-uhci2,masterbus=3Dusb2.0,firstport=3D2,bus=3Dpci.2,addr= =3D0x1.0x1 \ -device ich9-usb-uhci1,masterbus=3Dusb2.0,firstport=3D0,bus=3Dpci.2,multif= unction=3Don,addr=3D0x1 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ --device ide-hd,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0,bootinde= x=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind= ex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D33554432,bus=3Dpcie.0,addr=3D0x1 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/= q35-usb2.args index 745a7bdbc4..325bbd31c7 100644 --- a/tests/qemuxml2argvdata/q35-usb2.args +++ b/tests/qemuxml2argvdata/q35-usb2.args @@ -31,8 +31,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -device ich9-usb-uhci1,masterbus=3Dusb.0,firstport=3D0,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1d \ -device ich9-usb-uhci2,masterbus=3Dusb.0,firstport=3D2,bus=3Dpcie.0,addr= =3D0x1d.0x1 \ -device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpcie.0,addr= =3D0x1d.0x2 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ --device ide-hd,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0,bootinde= x=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind= ex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D33554432,bus=3Dpcie.0,addr=3D0x1 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.args b/tests/qem= uxml2argvdata/q35-virt-manager-basic.args index 4c8e2781c7..fe00c9e0eb 100644 --- a/tests/qemuxml2argvdata/q35-virt-manager-basic.args +++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.args @@ -34,8 +34,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-virt-manager-basic/.= config \ -device ioh3420,port=3D21,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr=3D0x2.0= x5 \ -device nec-usb-xhci,id=3Dusb,bus=3Dpci.2,addr=3D0x0 \ -device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.3,addr=3D0x0 \ --drive file=3D/var/lib/libvirt/images/basic.qcow2,format=3Dqcow2,if=3Dnone= ,id=3Ddrive-virtio-disk0 \ --device virtio-blk-pci,bus=3Dpci.4,addr=3D0x0,drive=3Ddrive-virtio-disk0,i= d=3Dvirtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/basic.qcow= 2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}= ' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:9a:e6:c6= ,bus=3Dpci.1,addr=3D0x0 \ -chardev pty,id=3Dcharserial0 \ diff --git a/tests/qemuxml2argvdata/q35-virtio-pci.args b/tests/qemuxml2arg= vdata/q35-virtio-pci.args index 6fc72ca1df..fe42f07e82 100644 --- a/tests/qemuxml2argvdata/q35-virtio-pci.args +++ b/tests/qemuxml2argvdata/q35-virtio-pci.args @@ -43,8 +43,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -device nec-usb-xhci,id=3Dusb,bus=3Dpci.4,addr=3D0x0 \ -device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.2,addr=3D0x4 \ -device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.2,addr=3D0x3 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk1 \ --device virtio-blk-pci,bus=3Dpci.2,addr=3D0x5,drive=3Ddrive-virtio-disk1,i= d=3Dvirtio-disk1,bootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x5,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk1,bootindex=3D1 \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/to= /guest \ -device virtio-9p-pci,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3D/import/from/= host,bus=3Dpci.2,addr=3D0x1 \ -netdev user,id=3Dhostnet0 \ diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.a= rgs index 5054c6ca17..cd76c36cfa 100644 --- a/tests/qemuxml2argvdata/q35.args +++ b/tests/qemuxml2argvdata/q35.args @@ -29,8 +29,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \ -device ich9-usb-uhci1,masterbus=3Dusb.0,firstport=3D0,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1d \ -device ich9-usb-uhci2,masterbus=3Dusb.0,firstport=3D2,bus=3Dpcie.0,addr= =3D0x1d.0x1 \ -device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpcie.0,addr= =3D0x1d.0x2 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-sat= a0-0-0 \ --device ide-hd,bus=3Dide.0,drive=3Ddrive-sata0-0-0,id=3Dsata0-0-0,bootinde= x=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind= ex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D33554432,bus=3Dpcie.0,addr=3D0x1 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args b/tests/qemuxml2argvda= ta/qemu-ns-alt.args index c96042232b..e815384c1f 100644 --- a/tests/qemuxml2argvdata/qemu-ns-alt.args +++ b/tests/qemuxml2argvdata/qemu-ns-alt.args @@ -28,8 +28,9 @@ BAR=3D'' \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -unknown parameter \ diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args b/tests/qe= muxml2argvdata/qemu-ns-commandline-ns0.args index 4711cfcd93..e9f081d8a1 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 ARGUMENT \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args b/tests/qe= muxml2argvdata/qemu-ns-commandline-ns1.args index 4711cfcd93..e9f081d8a1 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 ARGUMENT \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args b/tests/qemuxm= l2argvdata/qemu-ns-commandline.args index 4711cfcd93..e9f081d8a1 100644 --- a/tests/qemuxml2argvdata/qemu-ns-commandline.args +++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 ARGUMENT \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args b/t= ests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args index 4711cfcd93..e9f081d8a1 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 ARGUMENT \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args b/tests= /qemuxml2argvdata/qemu-ns-domain-commandline.args index 4711cfcd93..e9f081d8a1 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 ARGUMENT \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args b/tests/qemuxml= 2argvdata/qemu-ns-domain-ns0.args index 4711cfcd93..e9f081d8a1 100644 --- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args +++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 ARGUMENT \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.args b/tests/qemuxml2arg= vdata/qemu-ns-no-env.args index 879f0b3e40..73077c6bed 100644 --- a/tests/qemuxml2argvdata/qemu-ns-no-env.args +++ b/tests/qemuxml2argvdata/qemu-ns-no-env.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -unknown parameter \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/restore-v2-fd.args b/tests/qemuxml2argv= data/restore-v2-fd.args index 96a756603d..99dc12827b 100644 --- a/tests/qemuxml2argvdata/restore-v2-fd.args +++ b/tests/qemuxml2argvdata/restore-v2-fd.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -incoming fd:7 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ diff --git a/tests/qemuxml2argvdata/restore-v2.args b/tests/qemuxml2argvdat= a/restore-v2.args index c930c83f0c..34c8ca8bfa 100644 --- a/tests/qemuxml2argvdata/restore-v2.args +++ b/tests/qemuxml2argvdata/restore-v2.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -incoming exec:cat \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/riscv64-virt-pci.args b/tests/qemuxml2a= rgvdata/riscv64-virt-pci.args index 5833041823..d981bfe2c7 100644 --- a/tests/qemuxml2argvdata/riscv64-virt-pci.args +++ b/tests/qemuxml2argvdata/riscv64-virt-pci.args @@ -26,7 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-riscv64/.config \ -boot strict=3Don \ -kernel /var/lib/libvirt/images/riscv64.bbl \ -append root=3D/dev/vda \ --drive file=3D/var/lib/libvirt/images/riscv64.qcow2,format=3Dqcow2,if=3Dno= ne,id=3Ddrive-virtio-disk0 \ --device virtio-blk-pci,bus=3Dpcie.0,addr=3D0x1,drive=3Ddrive-virtio-disk0,= id=3Dvirtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/riscv64.qc= ow2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap= "}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ +-device virtio-blk-pci,bus=3Dpcie.0,addr=3D0x1,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/riscv64-virt.args b/tests/qemuxml2argvd= ata/riscv64-virt.args index ba21b2f307..05f8752120 100644 --- a/tests/qemuxml2argvdata/riscv64-virt.args +++ b/tests/qemuxml2argvdata/riscv64-virt.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-riscv64/.config \ -boot strict=3Don \ -kernel /var/lib/libvirt/images/bbl \ -append 'console=3DttyS0 ro root=3D/dev/vda' \ --drive file=3D/var/lib/libvirt/images/stage4-disk.img,format=3Draw,if=3Dno= ne,id=3Ddrive-virtio-disk0 \ --device virtio-blk-device,drive=3Ddrive-virtio-disk0,id=3Dvirtio-disk0,boo= tindex=3D1 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/stage4-dis= k.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unm= ap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-device,drive=3Dlibvirt-1-format,id=3Dvirtio-disk0,booti= ndex=3D1 \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args b/tests/qemuxml2= argvdata/seclabel-dac-none.args index dbcb959334..24193d008b 100644 --- a/tests/qemuxml2argvdata/seclabel-dac-none.args +++ b/tests/qemuxml2argvdata/seclabel-dac-none.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args b/tests= /qemuxml2argvdata/seclabel-dynamic-baselabel.args index dbcb959334..24193d008b 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args b/tests= /qemuxml2argvdata/seclabel-dynamic-labelskip.args index dbcb959334..24193d008b 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args b/tests/= qemuxml2argvdata/seclabel-dynamic-override.args index c722de5d51..abc349c7f8 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args @@ -26,10 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ --drive file=3D/dev/HostVG/QEMUGuest2,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-1 \ --device ide-hd,bus=3Dide.0,unit=3D1,drive=3Ddrive-ide0-0-1,id=3Dide0-0-1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-0-0= ,bootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-1-format,id=3Dide0-0-1= \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args b/tests/q= emuxml2argvdata/seclabel-dynamic-relabel.args index dbcb959334..24193d008b 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args b/tests/qemuxml2a= rgvdata/seclabel-dynamic.args index dbcb959334..24193d008b 100644 --- a/tests/qemuxml2argvdata/seclabel-dynamic.args +++ b/tests/qemuxml2argvdata/seclabel-dynamic.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-none.args b/tests/qemuxml2argv= data/seclabel-none.args index dbcb959334..24193d008b 100644 --- a/tests/qemuxml2argvdata/seclabel-none.args +++ b/tests/qemuxml2argvdata/seclabel-none.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args b/tests/= qemuxml2argvdata/seclabel-static-labelskip.args index dbcb959334..24193d008b 100644 --- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args +++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args b/tests/qe= muxml2argvdata/seclabel-static-relabel.args index dbcb959334..24193d008b 100644 --- a/tests/qemuxml2argvdata/seclabel-static-relabel.args +++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/seclabel-static.args b/tests/qemuxml2ar= gvdata/seclabel-static.args index dbcb959334..24193d008b 100644 --- a/tests/qemuxml2argvdata/seclabel-static.args +++ b/tests/qemuxml2argvdata/seclabel-static.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args b/tests/= qemuxml2argvdata/serial-dev-chardev-iobase.args index 13911e128c..735dcd053a 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev tty,id=3Dcharserial0,path=3D/dev/ttyS2 \ -device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0,iobase=3D1= 016,irq=3D4 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.args b/tests/qemuxml= 2argvdata/serial-dev-chardev.args index 9f023da2d4..52f9c3d0bb 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev tty,id=3Dcharserial0,path=3D/dev/ttyS2 \ -device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/serial-file-chardev.args b/tests/qemuxm= l2argvdata/serial-file-chardev.args index 3c4b30c577..3d6c0c06af 100644 --- a/tests/qemuxml2argvdata/serial-file-chardev.args +++ b/tests/qemuxml2argvdata/serial-file-chardev.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -add-fd set=3D0,fd=3D1750,opaque=3Dserial0-source \ -chardev file,id=3Dcharserial0,path=3D/dev/fdset/0,append=3Don \ -device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ diff --git a/tests/qemuxml2argvdata/serial-file-log.args b/tests/qemuxml2ar= gvdata/serial-file-log.args index c06750eac6..6be67736e5 100644 --- a/tests/qemuxml2argvdata/serial-file-log.args +++ b/tests/qemuxml2argvdata/serial-file-log.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -add-fd set=3D0,fd=3D1750,opaque=3Dserial0-source \ -add-fd set=3D1,fd=3D1751,opaque=3Dserial0-log \ -chardev file,id=3Dcharserial0,path=3D/dev/fdset/0,append=3Don,logfile=3D/= dev/fdset/1,logappend=3Don \ diff --git a/tests/qemuxml2argvdata/serial-many-chardev.args b/tests/qemuxm= l2argvdata/serial-many-chardev.args index 5a82badf63..0a341b32df 100644 --- a/tests/qemuxml2argvdata/serial-many-chardev.args +++ b/tests/qemuxml2argvdata/serial-many-chardev.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ -device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -add-fd set=3D0,fd=3D1750,opaque=3Dserial1-source \ diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.args b/tests/qemuxml= 2argvdata/serial-pty-chardev.args index cf08357b27..a495cc9c92 100644 --- a/tests/qemuxml2argvdata/serial-pty-chardev.args +++ b/tests/qemuxml2argvdata/serial-pty-chardev.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ -device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/serial-spiceport.args b/tests/qemuxml2a= rgvdata/serial-spiceport.args index f736af38d5..8b1b3460d3 100644 --- a/tests/qemuxml2argvdata/serial-spiceport.args +++ b/tests/qemuxml2argvdata/serial-spiceport.args @@ -25,8 +25,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev spiceport,id=3Dcharserial0,name=3Dorg.qemu.console.serial.0 \ -device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \ diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.args b/tests/qemuxml= 2argvdata/serial-tcp-chardev.args index 6450ecdf8d..d45da68a0f 100644 --- a/tests/qemuxml2argvdata/serial-tcp-chardev.args +++ b/tests/qemuxml2argvdata/serial-tcp-chardev.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev socket,id=3Dcharserial0,host=3D127.0.0.1,port=3D9999 \ -device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args b/tests/= qemuxml2argvdata/serial-tcp-telnet-chardev.args index 7ba22be033..57fd5567e1 100644 --- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args +++ b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev socket,id=3Dcharserial0,host=3D127.0.0.1,port=3D9999,telnet=3Don,= server=3Don,wait=3Doff \ -device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args b= /tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args index 9a8988b79e..e6450c1fbc 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev udp,id=3Dcharserial0,host=3D127.0.0.1,port=3D2222,localaddr=3D127= .0.0.1,localport=3D1111 \ -device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -chardev socket,id=3Dcharserial1,host=3D127.0.0.1,port=3D5555 \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args = b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args index 9cdf2ca6f5..3e487aabbc 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev udp,id=3Dcharserial0,host=3D127.0.0.1,port=3D2222,localaddr=3D127= .0.0.1,localport=3D1111 \ -device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -object tls-creds-x509,id=3Dobjcharserial1_tls0,dir=3D/etc/pki/libvirt-cha= rdev,endpoint=3Dclient,verify-peer=3Don \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args b/tests= /qemuxml2argvdata/serial-tcp-tlsx509-chardev.args index 9cdf2ca6f5..3e487aabbc 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev udp,id=3Dcharserial0,host=3D127.0.0.1,port=3D2222,localaddr=3D127= .0.0.1,localport=3D1111 \ -device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -object tls-creds-x509,id=3Dobjcharserial1_tls0,dir=3D/etc/pki/libvirt-cha= rdev,endpoint=3Dclient,verify-peer=3Don \ diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args = b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args index 3cf523bb80..9bb1198232 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev udp,id=3Dcharserial0,host=3D127.0.0.1,port=3D2222,localaddr=3D127= .0.0.1,localport=3D1111 \ -device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -object secret,id=3Dcharserial1-secret0,data=3D9eao5F8qtkGt+seB1HYivWIxbtw= Uu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=3DmasterKey0,iv=3DAAECAwQFBgcIC= QoLDA0ODw=3D=3D,format=3Dbase64 \ diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.args b/tests/qemuxml= 2argvdata/serial-udp-chardev.args index 4cbd3b4f4c..e2e55363d5 100644 --- a/tests/qemuxml2argvdata/serial-udp-chardev.args +++ b/tests/qemuxml2argvdata/serial-udp-chardev.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev udp,id=3Dcharserial0,host=3D127.0.0.1,port=3D9998,localaddr=3D127= .0.0.1,localport=3D9999 \ -device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -chardev udp,id=3Dcharserial1,host=3D,port=3D9999,localaddr=3D,localport= =3D0 \ diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.args b/tests/qemuxml2= argvdata/serial-vc-chardev.args index 7731c71fcc..e3eff53d26 100644 --- a/tests/qemuxml2argvdata/serial-vc-chardev.args +++ b/tests/qemuxml2argvdata/serial-vc-chardev.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev vc,id=3Dcharserial0 \ -device isa-serial,chardev=3Dcharserial0,id=3Dserial0,index=3D0 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/smbios-type-fwcfg.args b/tests/qemuxml2= argvdata/smbios-type-fwcfg.args index 986f72f6c7..e8897de22d 100644 --- a/tests/qemuxml2argvdata/smbios-type-fwcfg.args +++ b/tests/qemuxml2argvdata/smbios-type-fwcfg.args @@ -31,8 +31,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/sm= bios.args index 31f56159ca..c4ac933b81 100644 --- a/tests/qemuxml2argvdata/smbios.args +++ b/tests/qemuxml2argvdata/smbios.args @@ -31,8 +31,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/smp-dies.args b/tests/qemuxml2argvdata/= smp-dies.args index 4b0188b706..a2852faa74 100644 --- a/tests/qemuxml2argvdata/smp-dies.args +++ b/tests/qemuxml2argvdata/smp-dies.args @@ -26,7 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.a= rgs index d2d4368d29..a4d5aea536 100644 --- a/tests/qemuxml2argvdata/smp.args +++ b/tests/qemuxml2argvdata/smp.args @@ -26,7 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/sound-device.args b/tests/qemuxml2argvd= ata/sound-device.args index 6d8c2b5372..a017aa8567 100644 --- a/tests/qemuxml2argvdata/sound-device.args +++ b/tests/qemuxml2argvdata/sound-device.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -soundhw pcspk \ -device ES1370,id=3Dsound1,audiodev=3Daudio1,bus=3Dpci.0,addr=3D0x2 \ diff --git a/tests/qemuxml2argvdata/sound.args b/tests/qemuxml2argvdata/sou= nd.args index c2f923e51a..80385bfa31 100644 --- a/tests/qemuxml2argvdata/sound.args +++ b/tests/qemuxml2argvdata/sound.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -soundhw pcspk \ -device ES1370,id=3Dsound1,audiodev=3Daudio1,bus=3Dpci.0,addr=3D0x2 \ diff --git a/tests/qemuxml2argvdata/sparc-minimal.args b/tests/qemuxml2argv= data/sparc-minimal.args index 5877b88013..a265a3ad38 100644 --- a/tests/qemuxml2argvdata/sparc-minimal.args +++ b/tests/qemuxml2argvdata/sparc-minimal.args @@ -25,9 +25,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-redhat62sparc/.conf= ig \ -no-shutdown \ -boot strict=3Don \ -usb \ --drive file=3D/home/berrange/VirtualMachines/redhat-6.2-sparc.img,format= =3Dqcow2,if=3Dnone,id=3Ddrive-scsi0-0-0-0 \ --device scsi-hd,bus=3Dscsi.0,scsi-id=3D0,drive=3Ddrive-scsi0-0-0-0,id=3Dsc= si0-0-0-0,bootindex=3D1 \ --drive file=3D/home/berrange/VirtualMachines/redhat-6.2-sparc.iso,format= =3Draw,if=3Dnone,id=3Ddrive-scsi0-0-0-1,readonly=3Don \ --device scsi-cd,bus=3Dscsi.0,scsi-id=3D1,drive=3Ddrive-scsi0-0-0-1,id=3Dsc= si0-0-0-1 \ +-blockdev '{"driver":"file","filename":"/home/berrange/VirtualMachines/red= hat-6.2-sparc.img","node-name":"libvirt-2-storage","auto-read-only":true,"d= iscard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"qco= w2","file":"libvirt-2-storage"}' \ +-device scsi-hd,bus=3Dscsi.0,scsi-id=3D0,drive=3Dlibvirt-2-format,id=3Dscs= i0-0-0-0,bootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/home/berrange/VirtualMachines/red= hat-6.2-sparc.iso","node-name":"libvirt-1-storage","auto-read-only":true,"d= iscard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ +-device scsi-cd,bus=3Dscsi.0,scsi-id=3D1,drive=3Dlibvirt-1-format,id=3Dscs= i0-0-0-1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-device-pciaddr-default.args b/tes= ts/qemuxml2argvdata/video-device-pciaddr-default.args index 50f5067a9d..e216aacc64 100644 --- a/tests/qemuxml2argvdata/video-device-pciaddr-default.args +++ b/tests/qemuxml2argvdata/video-device-pciaddr-default.args @@ -25,8 +25,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/var/lib/libvirt/images/QEMUGuest1,format=3Dqcow2,if=3Dnone,= id=3Ddrive-ide0-0-0,cache=3Dnone \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1= ","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},= "auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/video-none-device.args b/tests/qemuxml2= argvdata/video-none-device.args index 533bb92786..e47545e72a 100644 --- a/tests/qemuxml2argvdata/video-none-device.args +++ b/tests/qemuxml2argvdata/video-none-device.args @@ -25,8 +25,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args b/tests/qe= muxml2argvdata/video-qxl-device-vgamem.args index 7c5d1ef124..1332f798da 100644 --- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/var/lib/libvirt/images/QEMUGuest1,format=3Dqcow2,if=3Dnone,= id=3Ddrive-ide0-0-0,cache=3Dnone \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1= ","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},= "auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,vgamem_mb=3D16,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/video-qxl-device.args b/tests/qemuxml2a= rgvdata/video-qxl-device.args index 666f47a59c..dc679b7aa5 100644 --- a/tests/qemuxml2argvdata/video-qxl-device.args +++ b/tests/qemuxml2argvdata/video-qxl-device.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/var/lib/libvirt/images/QEMUGuest1,format=3Dqcow2,if=3Dnone,= id=3Ddrive-ide0-0-0,cache=3Dnone \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1= ","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},= "auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/video-qxl-heads.args b/tests/qemuxml2ar= gvdata/video-qxl-heads.args index 10d431a633..653c46d005 100644 --- a/tests/qemuxml2argvdata/video-qxl-heads.args +++ b/tests/qemuxml2argvdata/video-qxl-heads.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,bus=3Dpci.0,addr=3D0x2 \ -device qxl,id=3Dvideo1,max_outputs=3D3,ram_size=3D67108864,vram_size=3D33= 554432,bus=3Dpci.0,addr=3D0x4 \ diff --git a/tests/qemuxml2argvdata/video-qxl-noheads.args b/tests/qemuxml2= argvdata/video-qxl-noheads.args index 453c572a4b..8670066b20 100644 --- a/tests/qemuxml2argvdata/video-qxl-noheads.args +++ b/tests/qemuxml2argvdata/video-qxl-noheads.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.args b/tests/qemux= ml2argvdata/video-qxl-resolution.args index c48eef1b4a..f4c896e023 100644 --- a/tests/qemuxml2argvdata/video-qxl-resolution.args +++ b/tests/qemuxml2argvdata/video-qxl-resolution.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,vgamem_mb=3D8,xres=3D1280,yres=3D720,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args b/test= s/qemuxml2argvdata/video-qxl-sec-device-vgamem.args index 560bbfd9b0..42de87528c 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/var/lib/libvirt/images/QEMUGuest1,format=3Dqcow2,if=3Dnone,= id=3Ddrive-ide0-0-0,cache=3Dnone \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1= ","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},= "auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,vgamem_mb=3D16,bus=3Dpci.0,addr=3D0x2 \ -device qxl,id=3Dvideo1,max_outputs=3D1,ram_size=3D67108864,vram_size=3D67= 108864,vgamem_mb=3D16,bus=3Dpci.0,addr=3D0x4 \ diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.args b/tests/qemux= ml2argvdata/video-qxl-sec-device.args index 9d9d883e60..c55e3eb9db 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/var/lib/libvirt/images/QEMUGuest1,format=3Dqcow2,if=3Dnone,= id=3Ddrive-ide0-0-0,cache=3Dnone \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1= ","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},= "auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,bus=3Dpci.0,addr=3D0x2 \ -device qxl,id=3Dvideo1,max_outputs=3D1,ram_size=3D67108864,vram_size=3D67= 108864,bus=3Dpci.0,addr=3D0x4 \ diff --git a/tests/qemuxml2argvdata/video-vga-device-vgamem.args b/tests/qe= muxml2argvdata/video-vga-device-vgamem.args index 73fe9a0672..8d1108216e 100644 --- a/tests/qemuxml2argvdata/video-vga-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-vga-device-vgamem.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/var/lib/libvirt/images/QEMUGuest1,format=3Dqcow2,if=3Dnone,= id=3Ddrive-ide0-0-0,cache=3Dnone \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1= ","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},= "auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device VGA,id=3Dvideo0,vgamem_mb=3D16,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/video-vga-device.args b/tests/qemuxml2a= rgvdata/video-vga-device.args index 296ac69132..1a832df4cb 100644 --- a/tests/qemuxml2argvdata/video-vga-device.args +++ b/tests/qemuxml2argvdata/video-vga-device.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/var/lib/libvirt/images/QEMUGuest1,format=3Dqcow2,if=3Dnone,= id=3Ddrive-ide0-0-0,cache=3Dnone \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1= ","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},= "auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device VGA,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.args b/tests/qemuxm= l2argvdata/video-vga-qxl-heads.args index 10d431a633..653c46d005 100644 --- a/tests/qemuxml2argvdata/video-vga-qxl-heads.args +++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size= =3D67108864,bus=3Dpci.0,addr=3D0x2 \ -device qxl,id=3Dvideo1,max_outputs=3D3,ram_size=3D67108864,vram_size=3D33= 554432,bus=3Dpci.0,addr=3D0x4 \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args b/tests/qemux= ml2argvdata/video-virtio-gpu-ccw.args index 42354c6eca..8267f837bc 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args @@ -23,8 +23,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,id=3Dv= irtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -device virtio-gpu-ccw,id=3Dvideo0,max_outputs=3D1,devno=3Dfe.0.0002 \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.args b/tests/qe= muxml2argvdata/video-virtio-gpu-device.args index 72d3c3bde3..1dd818f5fc 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-device.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-device.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/var/lib/libvirt/images/QEMUGuest1,format=3Dqcow2,if=3Dnone,= id=3Ddrive-ide0-0-0,cache=3Dnone \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1= ","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},= "auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-gpu-pci,id=3Dvideo0,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args b/tests/qe= muxml2argvdata/video-virtio-gpu-sdl-gl.args index 27343bc101..d4ab9fac16 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args @@ -25,8 +25,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/var/lib/libvirt/images/QEMUGuest1,format=3Dqcow2,if=3Dnone,= id=3Ddrive-ide0-0-0,cache=3Dnone \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1= ","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},= "auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -display sdl,gl=3Don \ -device virtio-gpu-pci,id=3Dvideo0,virgl=3Don,max_outputs=3D1,bus=3Dpci.0,= addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args b/tests/= qemuxml2argvdata/video-virtio-gpu-spice-gl.args index c16450e3fd..f198d4da8b 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args @@ -25,8 +25,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/var/lib/libvirt/images/QEMUGuest1,format=3Dqcow2,if=3Dnone,= id=3Ddrive-ide0-0-0,cache=3Dnone \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1= ","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},= "auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D0,gl=3Don,rendernode=3D/dev/dri/foo,seamless-migration=3Don \ -device virtio-gpu-pci,id=3Dvideo0,virgl=3Don,max_outputs=3D1,bus=3Dpci.0,= addr=3D0x2 \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args b/tests/qem= uxml2argvdata/video-virtio-gpu-virgl.args index ab7686b3f8..140bee6187 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/var/lib/libvirt/images/QEMUGuest1,format=3Dqcow2,if=3Dnone,= id=3Ddrive-ide0-0-0,cache=3Dnone \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1= ","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},= "auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-gpu-pci,id=3Dvideo0,virgl=3Don,max_outputs=3D1,bus=3Dpci.0,= addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/video-virtio-vga.args b/tests/qemuxml2a= rgvdata/video-virtio-vga.args index 75be9dc8ed..704a6334b0 100644 --- a/tests/qemuxml2argvdata/video-virtio-vga.args +++ b/tests/qemuxml2argvdata/video-virtio-vga.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/var/lib/libvirt/images/QEMUGuest1,format=3Dqcow2,if=3Dnone,= id=3Ddrive-ide0-0-0,cache=3Dnone \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1= ","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},= "auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-vga,id=3Dvideo0,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ diff --git a/tests/qemuxml2argvdata/virtio-rng-ccw.args b/tests/qemuxml2arg= vdata/virtio-rng-ccw.args index 11650f12b3..a8de4a3789 100644 --- a/tests/qemuxml2argvdata/virtio-rng-ccw.args +++ b/tests/qemuxml2argvdata/virtio-rng-ccw.args @@ -25,8 +25,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -boot strict=3Don \ -device virtio-serial-ccw,id=3Dvirtio-serial0,devno=3Dfe.0.0001 \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-vir= tio-disk0 \ --device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Ddrive-virtio-disk0,id=3Dv= irtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device virtio-blk-ccw,devno=3Dfe.0.0000,drive=3Dlibvirt-1-format,id=3Dvir= tio-disk0,bootindex=3D1 \ -chardev pty,id=3Dcharconsole0 \ -device virtconsole,chardev=3Dcharconsole0,id=3Dconsole0 \ -audiodev '{"id":"audio1","driver":"none"}' \ diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args b/tests/qemuxml2argvdat= a/vmcoreinfo.args index b1912a19d9..e3a99cc8e7 100644 --- a/tests/qemuxml2argvdata/vmcoreinfo.args +++ b/tests/qemuxml2argvdata/vmcoreinfo.args @@ -26,8 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-acpi \ -boot strict=3Don \ -usb \ --drive file=3D/dev/HostVG/QEMUGuest1,format=3Draw,if=3Dnone,id=3Ddrive-ide= 0-0-0 \ --device ide-hd,bus=3Dide.0,unit=3D0,drive=3Ddrive-ide0-0-0,id=3Dide0-0-0,b= ootindex=3D1 \ +-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -device vmcoreinfo \ diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 6dabbaf36a..d44dc09219 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -856,6 +856,10 @@ testQemuInfoSetArgs(struct testQemuInfo *info, if (!(info->args.fakeCaps =3D virQEMUCapsNew())) abort(); + /* until removal of the flags is completed we force them also in tests= */ + virQEMUCapsSet(info->args.fakeCaps, QEMU_CAPS_BLOCKDEV); + virQEMUCapsSet(info->args.fakeCaps, QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI); + info->conf =3D conf; info->args.newargs =3D true; --=20 2.36.1