From nobody Sun May 5 00:20:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1641223640; cv=none; d=zohomail.com; s=zohoarc; b=a3uKdMHya4OaijVDRwmweLIc+/Y6LyzOBNaD596gY/RLFOp491xgSZ9tAklqmRjRCPYS/f9Fevu5v/A/dJqmcU+1+/VB6KBka5SvKH3FFPkk4HYGVI0QdK+bMHMTtojaiVjvCblBT3Gz+PXT/I7aG3H9r9159cdsMJ/LHU2HxVg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641223640; 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=bwiGsft6oOXsR/G+YQjT91cEQDo/EtKcPVIfKDJutGQ=; b=RB5twijXMwgRtAUxSKT4MpDAvfyvDh8KdCWexqd2R/9MAWoo6qRSwkWWQSmudFxpJAXb9b6yS5mQJxNfMT/DRpgxLxhk3nnUsXeF3hS42Yu9Ii0gNUya31SySjO16ovLiBBR1oy8TKaXo3KBUJAOw2CaBv5a+Av0213Nlx9GgsE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1641223640042143.72085921235816; Mon, 3 Jan 2022 07:27:20 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-194-WYKYX69JOaeJ0WdC6qCaPA-1; Mon, 03 Jan 2022 10:26:56 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E9F4CAFE82; Mon, 3 Jan 2022 15:26:07 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id ADA887E668; Mon, 3 Jan 2022 15:26:07 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 2D7751809CB9; Mon, 3 Jan 2022 15:26:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 203FQ28H024175 for ; Mon, 3 Jan 2022 10:26:02 -0500 Received: by smtp.corp.redhat.com (Postfix) id BCDF884FFF; Mon, 3 Jan 2022 15:26:02 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9229B84D35 for ; Mon, 3 Jan 2022 15:25:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641223638; 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=bwiGsft6oOXsR/G+YQjT91cEQDo/EtKcPVIfKDJutGQ=; b=XECp9FenyKpm0ProEGH8h66V1s5LUZolQrUHVBCg0ChhOP1cveA7YF0xM4tm6kUg5R1E2h ECARj8RB2+8spn5G8IIEAnlaP6MCIRqnszO4H1HZJ47RUtOcoeqABLsdlQqFFFYUEsKqpL MVuwK+XE/14fyDJqquqoMWU9Y2yG17A= X-MC-Unique: WYKYX69JOaeJ0WdC6qCaPA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/3] qemu: Revert to using non-JSON commandline for -device Date: Mon, 3 Jan 2022 16:25:54 +0100 Message-Id: <03242cc53d0ff5e458f6f0461363545f31a29396.1641223497.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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: 1641223641333100001 Content-Type: text/plain; charset="utf-8" When -device is configured via JSON a bug is triggered in qemu were the DEVICE_DELETED event for the removal of the device frontend is no longer delivered to libvirt. Without the DEVICE_DELETED event we don't remove the corresponding entries in the VM XML. Until qemu will be fixed we must stop using the JSON syntax for -device. This patch removes the detection of the capability. The capability is used only during startup of a fresh VM so we don't need to consider any compaitibility steps for existing VMs. Signed-off-by: Peter Krempa Reviewed-by: Ani Sinha Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 1 - .../caps_6.2.0.aarch64.xml | 1 - .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - .../caps_6.2.0.x86_64.xml | 1 - ...fault-cpu-kvm-virt-4.2.aarch64-latest.args | 6 +-- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args | 6 +-- .../aarch64-tpm.aarch64-latest.args | 2 +- .../aarch64-virt-graphics.aarch64-latest.args | 36 ++++++++-------- .../aarch64-virt-headless.aarch64-latest.args | 28 ++++++------- .../audio-alsa-best.x86_64-latest.args | 4 +- .../audio-alsa-full.x86_64-latest.args | 4 +- .../audio-alsa-minimal.x86_64-latest.args | 4 +- .../audio-coreaudio-best.x86_64-latest.args | 4 +- .../audio-coreaudio-full.x86_64-latest.args | 4 +- ...audio-coreaudio-minimal.x86_64-latest.args | 4 +- ...udio-default-nographics.x86_64-latest.args | 4 +- .../audio-default-sdl.x86_64-latest.args | 6 +-- .../audio-default-spice.x86_64-latest.args | 6 +-- .../audio-default-vnc.x86_64-latest.args | 6 +-- .../audio-file-best.x86_64-latest.args | 4 +- .../audio-file-full.x86_64-latest.args | 4 +- .../audio-file-minimal.x86_64-latest.args | 4 +- .../audio-jack-full.x86_64-latest.args | 4 +- .../audio-jack-minimal.x86_64-latest.args | 4 +- .../audio-many-backends.x86_64-latest.args | 14 +++---- .../audio-none-best.x86_64-latest.args | 4 +- .../audio-none-full.x86_64-latest.args | 4 +- .../audio-none-minimal.x86_64-latest.args | 4 +- .../audio-oss-best.x86_64-latest.args | 4 +- .../audio-oss-full.x86_64-latest.args | 4 +- .../audio-oss-minimal.x86_64-latest.args | 4 +- .../audio-pulseaudio-best.x86_64-latest.args | 4 +- .../audio-pulseaudio-full.x86_64-latest.args | 4 +- ...udio-pulseaudio-minimal.x86_64-latest.args | 4 +- .../audio-sdl-best.x86_64-latest.args | 4 +- .../audio-sdl-full.x86_64-latest.args | 4 +- .../audio-sdl-minimal.x86_64-latest.args | 4 +- .../audio-spice-best.x86_64-latest.args | 4 +- .../audio-spice-full.x86_64-latest.args | 4 +- .../audio-spice-minimal.x86_64-latest.args | 4 +- .../blkdeviotune-group-num.x86_64-latest.args | 8 ++-- ...blkdeviotune-max-length.x86_64-latest.args | 8 ++-- .../blkdeviotune-max.x86_64-latest.args | 8 ++-- .../channel-unix-guestfwd.x86_64-latest.args | 4 +- .../console-compat-auto.x86_64-latest.args | 8 ++-- .../console-compat-chardev.x86_64-latest.args | 8 ++-- .../console-compat.x86_64-latest.args | 6 +-- .../console-virtio-unix.x86_64-latest.args | 10 ++--- .../controller-virtio-scsi.x86_64-latest.args | 24 +++++------ ...-Icelake-Server-pconfig.x86_64-latest.args | 4 +- .../cpu-host-model.x86_64-latest.args | 10 ++--- .../cpu-translation.x86_64-latest.args | 4 +- .../cputune-cpuset-big-id.x86_64-latest.args | 6 +-- ...ult-video-type-aarch64.aarch64-latest.args | 6 +-- ...default-video-type-ppc64.ppc64-latest.args | 8 ++-- .../devices-acpi-index.x86_64-latest.args | 16 +++---- .../disk-aio-io_uring.x86_64-latest.args | 6 +-- .../disk-aio.x86_64-latest.args | 8 ++-- .../disk-arm-virtio-sd.aarch64-latest.args | 2 +- ...-backing-chains-noindex.x86_64-latest.args | 16 +++---- .../disk-blockio.x86_64-latest.args | 8 ++-- .../disk-boot-cdrom.x86_64-latest.args | 6 +-- .../disk-boot-disk.x86_64-latest.args | 6 +-- .../disk-cache.x86_64-latest.args | 14 +++---- .../disk-cdrom-bus-other.x86_64-latest.args | 6 +-- ...m-empty-network-invalid.x86_64-latest.args | 4 +- .../disk-cdrom-network.x86_64-latest.args | 10 ++--- .../disk-cdrom-tray.x86_64-latest.args | 10 ++--- .../disk-cdrom.x86_64-latest.args | 10 ++--- .../disk-copy_on_read.x86_64-latest.args | 12 +++--- .../disk-detect-zeroes.x86_64-latest.args | 8 ++-- .../disk-discard.x86_64-latest.args | 8 ++-- .../disk-error-policy.x86_64-latest.args | 8 ++-- .../disk-floppy-q35-2_11.x86_64-latest.args | 12 +++--- .../disk-floppy-q35-2_9.x86_64-latest.args | 12 +++--- .../disk-floppy-tray.x86_64-latest.args | 10 ++--- .../disk-floppy.x86_64-latest.args | 8 ++-- .../disk-fmt-qcow.x86_64-latest.args | 6 +-- .../disk-geometry.x86_64-latest.args | 6 +-- .../disk-ide-split.x86_64-latest.args | 8 ++-- .../disk-ide-wwn.x86_64-latest.args | 6 +-- .../disk-ioeventfd.x86_64-latest.args | 12 +++--- .../disk-metadata-cache.x86_64-latest.args | 8 ++-- .../disk-network-gluster.x86_64-latest.args | 8 ++-- .../disk-network-http.x86_64-latest.args | 10 ++--- .../disk-network-iscsi.x86_64-latest.args | 18 ++++---- .../disk-network-nbd.x86_64-latest.args | 12 +++--- .../disk-network-nfs.x86_64-latest.args | 6 +-- ...-network-rbd-encryption.x86_64-latest.args | 12 +++--- ...sk-network-rbd-no-colon.x86_64-latest.args | 8 ++-- .../disk-network-rbd.x86_64-latest.args | 14 +++---- ...isk-network-source-auth.x86_64-latest.args | 8 ++-- ...isk-network-tlsx509-nbd.x86_64-latest.args | 4 +- .../disk-no-boot.x86_64-latest.args | 8 ++-- .../disk-nvme.x86_64-latest.args | 12 +++--- .../disk-order.x86_64-latest.args | 12 +++--- .../disk-readonly-disk.x86_64-latest.args | 8 ++-- .../disk-rotation.x86_64-latest.args | 12 +++--- .../disk-sata-device.x86_64-latest.args | 8 ++-- .../disk-scsi-device-auto.x86_64-latest.args | 10 ++--- .../disk-scsi-disk-split.x86_64-latest.args | 20 ++++----- .../disk-scsi-disk-vpd.x86_64-latest.args | 12 +++--- .../disk-scsi-disk-wwn.x86_64-latest.args | 12 +++--- ...sk-scsi-lun-passthrough.x86_64-latest.args | 12 +++--- .../disk-scsi.x86_64-latest.args | 26 ++++++------ .../disk-serial.x86_64-latest.args | 8 ++-- .../disk-shared.x86_64-latest.args | 14 +++---- .../disk-slices.x86_64-latest.args | 14 +++---- .../disk-snapshot.x86_64-latest.args | 10 ++--- .../disk-source-pool-mode.x86_64-latest.args | 12 +++--- .../disk-source-pool.x86_64-latest.args | 14 +++---- .../disk-transient.x86_64-latest.args | 6 +-- ...sk-usb-device-removable.x86_64-latest.args | 8 ++-- .../disk-usb-device.x86_64-latest.args | 8 ++-- .../disk-vhostuser.x86_64-latest.args | 8 ++-- .../disk-virtio-queues.x86_64-latest.args | 8 ++-- ...irtio-scsi-reservations.x86_64-latest.args | 10 ++--- .../disk-virtio.x86_64-latest.args | 10 ++--- .../encrypted-disk-usage.x86_64-latest.args | 6 +-- .../encrypted-disk.x86_64-latest.args | 6 +-- .../eoi-disabled.x86_64-latest.args | 4 +- .../eoi-enabled.x86_64-latest.args | 4 +- .../event_idx.x86_64-latest.args | 12 +++--- ...d-memory-numa-topology4.x86_64-latest.args | 4 +- .../fips-enabled.x86_64-latest.args | 6 +-- .../floppy-drive-fat.x86_64-latest.args | 6 +-- .../qemuxml2argvdata/fs9p.x86_64-latest.args | 6 +-- .../genid-auto.x86_64-latest.args | 4 +- .../qemuxml2argvdata/genid.x86_64-latest.args | 4 +- ...egl-headless-rendernode.x86_64-latest.args | 6 +-- .../graphics-egl-headless.x86_64-latest.args | 6 +-- ...s-spice-agent-file-xfer.x86_64-latest.args | 8 ++-- ...aphics-spice-agentmouse.x86_64-latest.args | 10 ++--- ...s-spice-auto-socket-cfg.x86_64-latest.args | 4 +- ...phics-spice-auto-socket.x86_64-latest.args | 4 +- ...phics-spice-compression.x86_64-latest.args | 8 ++-- ...hics-spice-egl-headless.x86_64-latest.args | 6 +-- ...pice-gl-auto-rendernode.x86_64-latest.args | 6 +-- .../graphics-spice-no-args.x86_64-latest.args | 6 +-- .../graphics-spice-qxl-vga.x86_64-latest.args | 8 ++-- .../graphics-spice-sasl.x86_64-latest.args | 6 +-- .../graphics-spice-socket.x86_64-latest.args | 4 +- .../graphics-spice-timeout.x86_64-latest.args | 14 +++---- ...raphics-spice-usb-redir.x86_64-latest.args | 16 +++---- .../graphics-spice.x86_64-latest.args | 8 ++-- ...ics-vnc-auto-socket-cfg.x86_64-latest.args | 6 +-- ...raphics-vnc-auto-socket.x86_64-latest.args | 4 +- ...aphics-vnc-egl-headless.x86_64-latest.args | 6 +-- ...hics-vnc-no-listen-attr.x86_64-latest.args | 6 +-- .../graphics-vnc-none.x86_64-latest.args | 4 +- .../graphics-vnc-policy.x86_64-latest.args | 6 +-- .../graphics-vnc-power.x86_64-latest.args | 6 +-- ...remove-generated-socket.x86_64-latest.args | 6 +-- .../graphics-vnc-sasl.x86_64-latest.args | 6 +-- ...-vnc-socket-new-cmdline.x86_64-latest.args | 4 +- .../graphics-vnc-socket.x86_64-latest.args | 4 +- ...graphics-vnc-tls-secret.x86_64-latest.args | 4 +- .../graphics-vnc-tls.x86_64-latest.args | 4 +- .../graphics-vnc-websocket.x86_64-latest.args | 4 +- .../graphics-vnc.x86_64-latest.args | 6 +-- ...tdev-mdev-display-ramfb.x86_64-latest.args | 8 ++-- ...play-spice-egl-headless.x86_64-latest.args | 6 +-- ...ev-display-spice-opengl.x86_64-latest.args | 6 +-- ...isplay-vnc-egl-headless.x86_64-latest.args | 6 +-- ...ostdev-mdev-display-vnc.x86_64-latest.args | 6 +-- .../hostdev-scsi-lsi.x86_64-latest.args | 20 ++++----- ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 22 +++++----- .../hugepages-memaccess3.x86_64-latest.args | 2 +- .../hugepages-nvdimm.x86_64-latest.args | 4 +- .../hyperv-off.x86_64-latest.args | 4 +- .../hyperv-panic.x86_64-latest.args | 2 +- .../hyperv-passthrough.x86_64-latest.args | 2 +- .../hyperv-stimer-direct.x86_64-latest.args | 2 +- .../hyperv.x86_64-latest.args | 2 +- .../input-linux.x86_64-latest.args | 4 +- .../intel-iommu-aw-bits.x86_64-latest.args | 2 +- ...ntel-iommu-caching-mode.x86_64-latest.args | 2 +- ...ntel-iommu-device-iotlb.x86_64-latest.args | 2 +- .../intel-iommu-eim.x86_64-latest.args | 2 +- .../intel-iommu.x86_64-latest.args | 2 +- ...threads-virtio-scsi-pci.x86_64-latest.args | 10 ++--- .../kvmclock+eoi-disabled.x86_64-latest.args | 4 +- ...nch-security-sev-direct.x86_64-latest.args | 4 +- ...luks-disks-source-qcow2.x86_64-latest.args | 16 +++---- .../luks-disks-source.x86_64-latest.args | 14 +++---- .../luks-disks.x86_64-latest.args | 8 ++-- ...memory-default-hugepage.x86_64-latest.args | 4 +- .../memfd-memory-numa.x86_64-latest.args | 6 +-- ...y-hotplug-nvdimm-access.x86_64-latest.args | 8 ++-- ...ry-hotplug-nvdimm-align.x86_64-latest.args | 8 ++-- ...ry-hotplug-nvdimm-label.x86_64-latest.args | 8 ++-- ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 8 ++-- ...hotplug-nvdimm-readonly.x86_64-latest.args | 8 ++-- .../memory-hotplug-nvdimm.x86_64-latest.args | 8 ++-- ...mory-hotplug-virtio-mem.x86_64-latest.args | 10 ++--- ...ory-hotplug-virtio-pmem.x86_64-latest.args | 8 ++-- .../misc-no-reboot.x86_64-latest.args | 4 +- .../mlock-off.x86_64-latest.args | 2 +- .../mlock-on.x86_64-latest.args | 2 +- .../name-escape.x86_64-latest.args | 20 ++++----- .../net-vdpa.x86_64-latest.args | 4 +- .../net-vhostuser.x86_64-latest.args | 8 ++-- .../numatune-hmat.x86_64-latest.args | 4 +- ...emnode-restrictive-mode.x86_64-latest.args | 4 +- .../numatune-memnode.x86_64-latest.args | 4 +- .../numatune-system-memory.x86_64-latest.args | 2 +- .../os-firmware-bios.x86_64-latest.args | 16 +++---- ...re-efi-no-enrolled-keys.x86_64-latest.args | 6 +-- ...os-firmware-efi-secboot.x86_64-latest.args | 16 +++---- .../os-firmware-efi.x86_64-latest.args | 16 +++---- .../panic-double.x86_64-latest.args | 4 +- .../panic-no-address.x86_64-latest.args | 8 ++-- .../qemuxml2argvdata/panic.x86_64-latest.args | 8 ++-- ...arallel-parport-chardev.x86_64-latest.args | 8 ++-- .../parallel-tcp-chardev.x86_64-latest.args | 8 ++-- .../parallel-unix-chardev.x86_64-latest.args | 8 ++-- ...pi-root-hotplug-disable.x86_64-latest.args | 4 +- ...cpi-root-hotplug-enable.x86_64-latest.args | 4 +- .../pci-serial-dev-chardev.x86_64-latest.args | 8 ++-- ...e-expander-bus-aarch64.aarch64-latest.args | 2 +- ...cie-root-port-nohotplug.x86_64-latest.args | 18 ++++---- ...ault-cpu-kvm-pseries-2.7.ppc64-latest.args | 8 ++-- ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args | 8 ++-- ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args | 8 ++-- ...ault-cpu-tcg-pseries-2.7.ppc64-latest.args | 8 ++-- ...ault-cpu-tcg-pseries-3.1.ppc64-latest.args | 8 ++-- ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args | 8 ++-- .../ppc64-pseries-graphics.ppc64-latest.args | 22 +++++----- .../ppc64-pseries-headless.ppc64-latest.args | 16 +++---- .../ppc64-tpmproxy-single.ppc64-latest.args | 6 +-- .../ppc64-tpmproxy-with-tpm.ppc64-latest.args | 8 ++-- .../pv-spinlock-disabled.x86_64-latest.args | 4 +- .../pv-spinlock-enabled.x86_64-latest.args | 4 +- .../qemu-ns.x86_64-latest.args | 6 +-- ...rial-dev-chardev-iobase.x86_64-latest.args | 8 ++-- .../serial-dev-chardev.x86_64-latest.args | 8 ++-- .../serial-file-chardev.x86_64-latest.args | 8 ++-- .../serial-file-log.x86_64-latest.args | 6 +-- .../serial-many-chardev.x86_64-latest.args | 10 ++--- .../serial-pty-chardev.x86_64-latest.args | 8 ++-- ...erial-spiceport-nospice.x86_64-latest.args | 6 +-- .../serial-spiceport.x86_64-latest.args | 12 +++--- .../serial-tcp-chardev.x86_64-latest.args | 8 ++-- ...rial-tcp-telnet-chardev.x86_64-latest.args | 8 ++-- ...p-tlsx509-chardev-notls.x86_64-latest.args | 10 ++--- ...-tlsx509-chardev-verify.x86_64-latest.args | 10 ++--- ...ial-tcp-tlsx509-chardev.x86_64-latest.args | 10 ++--- ...-tlsx509-secret-chardev.x86_64-latest.args | 10 ++--- .../serial-udp-chardev.x86_64-latest.args | 10 ++--- .../serial-unix-chardev.x86_64-latest.args | 8 ++-- .../serial-vc-chardev.x86_64-latest.args | 8 ++-- ...rtcard-passthrough-unix.x86_64-latest.args | 8 ++-- .../tpm-emulator-spapr.ppc64-latest.args | 14 +++---- .../tpm-emulator-tpm2-enc.x86_64-latest.args | 6 +-- ...pm-emulator-tpm2-pstate.x86_64-latest.args | 6 +-- .../tpm-emulator-tpm2.x86_64-latest.args | 6 +-- .../tpm-emulator.x86_64-latest.args | 6 +-- .../tpm-passthrough-crb.x86_64-latest.args | 6 +-- .../tpm-passthrough.x86_64-latest.args | 6 +-- .../tseg-explicit-size.x86_64-latest.args | 10 ++--- .../usb-redir-unix.x86_64-latest.args | 14 +++---- ...vhost-user-fs-fd-memory.x86_64-latest.args | 2 +- ...vhost-user-fs-hugepages.x86_64-latest.args | 12 +++--- ...host-user-gpu-secondary.x86_64-latest.args | 10 ++--- .../vhost-user-vga.x86_64-latest.args | 8 ++-- .../vhost-vsock-auto.x86_64-latest.args | 6 +-- .../vhost-vsock.x86_64-latest.args | 6 +-- ...eo-bochs-display-device.x86_64-latest.args | 8 ++-- ...video-qxl-device-vram64.x86_64-latest.args | 6 +-- ...o-qxl-sec-device-vram64.x86_64-latest.args | 8 ++-- ...eo-ramfb-display-device.x86_64-latest.args | 8 ++-- ...video-virtio-vga-gpu-gl.x86_64-latest.args | 8 ++-- .../virtio-9p-createmode.x86_64-latest.args | 14 +++---- .../virtio-9p-multidevs.x86_64-latest.args | 12 +++--- .../virtio-lun.x86_64-latest.args | 12 +++--- ...virtio-non-transitional.x86_64-latest.args | 42 +++++++++---------- ...-options-controller-ats.x86_64-latest.args | 12 +++--- ...ptions-controller-iommu.x86_64-latest.args | 12 +++--- ...tions-controller-packed.x86_64-latest.args | 12 +++--- ...virtio-options-disk-ats.x86_64-latest.args | 8 ++-- ...rtio-options-disk-iommu.x86_64-latest.args | 8 ++-- ...tio-options-disk-packed.x86_64-latest.args | 8 ++-- .../virtio-options-fs-ats.x86_64-latest.args | 8 ++-- ...virtio-options-fs-iommu.x86_64-latest.args | 8 ++-- ...irtio-options-fs-packed.x86_64-latest.args | 8 ++-- ...irtio-options-input-ats.x86_64-latest.args | 8 ++-- ...tio-options-input-iommu.x86_64-latest.args | 8 ++-- ...io-options-input-packed.x86_64-latest.args | 8 ++-- ...-options-memballoon-ats.x86_64-latest.args | 4 +- ...loon-freepage-reporting.x86_64-latest.args | 4 +- ...ptions-memballoon-iommu.x86_64-latest.args | 4 +- ...tions-memballoon-packed.x86_64-latest.args | 4 +- .../virtio-options-net-ats.x86_64-latest.args | 8 ++-- ...irtio-options-net-iommu.x86_64-latest.args | 8 ++-- ...rtio-options-net-packed.x86_64-latest.args | 8 ++-- .../virtio-options-rng-ats.x86_64-latest.args | 8 ++-- ...irtio-options-rng-iommu.x86_64-latest.args | 8 ++-- ...rtio-options-rng-packed.x86_64-latest.args | 8 ++-- ...irtio-options-video-ats.x86_64-latest.args | 8 ++-- ...tio-options-video-iommu.x86_64-latest.args | 8 ++-- ...io-options-video-packed.x86_64-latest.args | 8 ++-- .../virtio-options.x86_64-latest.args | 28 ++++++------- .../virtio-rng-builtin.x86_64-latest.args | 6 +-- .../virtio-rng-egd-unix.x86_64-latest.args | 6 +-- .../virtio-transitional.x86_64-latest.args | 26 ++++++------ .../watchdog-device.x86_64-latest.args | 8 ++-- .../watchdog-dump.x86_64-latest.args | 8 ++-- .../watchdog-injectnmi.x86_64-latest.args | 8 ++-- .../watchdog.x86_64-latest.args | 6 +-- ...-default-cpu-kvm-pc-4.2.x86_64-latest.args | 6 +-- ...default-cpu-kvm-q35-4.2.x86_64-latest.args | 14 +++---- ...efault-cpu-tcg-features.x86_64-latest.args | 10 ++--- ...-default-cpu-tcg-pc-4.2.x86_64-latest.args | 6 +-- ...default-cpu-tcg-q35-4.2.x86_64-latest.args | 14 +++---- .../x86_64-pc-graphics.x86_64-latest.args | 20 ++++----- .../x86_64-pc-headless.x86_64-latest.args | 16 +++---- .../x86_64-q35-graphics.x86_64-latest.args | 34 +++++++-------- .../x86_64-q35-headless.x86_64-latest.args | 30 ++++++------- 318 files changed, 1300 insertions(+), 1304 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 4f63322a9e..2efe5776f8 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1554,7 +1554,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSc= hemaQueries[] =3D { { "chardev-add/arg-type/backend/+socket/data/reconnect", QEMU_CAPS_CHA= RDEV_RECONNECT }, { "chardev-add/arg-type/backend/+file/data/logfile", QEMU_CAPS_CHARDEV= _LOGFILE }, { "chardev-add/arg-type/backend/+file/data/logappend", QEMU_CAPS_CHARD= EV_FILE_APPEND }, - { "device_add/$json-cli", QEMU_CAPS_DEVICE_JSON }, { "human-monitor-command/$savevm-monitor-nodes", QEMU_CAPS_SAVEVM_MONI= TOR_NODES }, { "migrate-set-parameters/arg-type/max-bandwidth", QEMU_CAPS_MIGRATION= _PARAM_BANDWIDTH }, { "migrate-set-parameters/arg-type/downtime-limit", QEMU_CAPS_MIGRATIO= N_PARAM_DOWNTIME }, diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0.aarch64.xml index 9662214cd8..6bf9933bc5 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -201,7 +201,6 @@ - 6001050 diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0.ppc64.xml index 94528ba13a..06cd7fb396 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -197,7 +197,6 @@ - 6001050 diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0.x86_64.xml index b7d6effa94..5c78091eda 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -237,7 +237,6 @@ - diff --git a/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch6= 4-latest.args b/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aar= ch64-latest.args index c17bcad5cf..d8598d8f5b 100644 --- a/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-lates= t.args +++ b/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-lates= t.args @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ +-device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.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 '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x0,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch6= 4-latest.args b/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aar= ch64-latest.args index 12d80b1f02..6a2908bb34 100644 --- a/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-lates= t.args +++ b/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-lates= t.args @@ -27,11 +27,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ +-device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.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 '{"driver":"virtio-blk-pci","bus":"pci.1","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.1,addr=3D0x0,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args b/tests= /qemuxml2argvdata/aarch64-tpm.aarch64-latest.args index 3125460a95..f176bc4c20 100644 --- a/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-aarch64test/.config \ -boot strict=3Don \ -chardev socket,id=3Dchrtpm,path=3D/dev/test \ -tpmdev emulator,id=3Dtpm-tpm0,chardev=3Dchrtpm \ --device '{"driver":"tpm-tis-device","tpmdev":"tpm-tpm0","id":"tpm0"}' \ +-device tpm-tis-device,tpmdev=3Dtpm-tpm0,id=3Dtpm0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.ar= gs b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args index acd3b0afa6..2e311adf33 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args @@ -29,32 +29,32 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ --device '{"driver":"pcie-root-port","port":11,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x3"}' \ --device '{"driver":"pcie-root-port","port":12,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x1.0x4"}' \ --device '{"driver":"pcie-root-port","port":13,"chassis":6,"id":"pci.6","bu= s":"pcie.0","addr":"0x1.0x5"}' \ --device '{"driver":"pcie-root-port","port":14,"chassis":7,"id":"pci.7","bu= s":"pcie.0","addr":"0x1.0x6"}' \ --device '{"driver":"pcie-root-port","port":15,"chassis":8,"id":"pci.8","bu= s":"pcie.0","addr":"0x1.0x7"}' \ --device '{"driver":"qemu-xhci","p2":15,"p3":15,"id":"usb","bus":"pci.2","a= ddr":"0x0"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.3"= ,"addr":"0x0"}' \ +-device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ +-device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ +-device pcie-root-port,port=3D11,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x1.0x3 \ +-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 pcie-root-port,port=3D14,chassis=3D7,id=3Dpci.7,bus=3Dpcie.0,addr= =3D0x1.0x6 \ +-device pcie-root-port,port=3D15,chassis=3D8,id=3Dpci.8,bus=3Dpcie.0,addr= =3D0x1.0x7 \ +-device qemu-xhci,p2=3D15,p3=3D15,id=3Dusb,bus=3Dpci.2,addr=3D0x0 \ +-device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.3,addr=3D0x0 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.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 '{"driver":"virtio-blk-pci","bus":"pci.4","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:53:45:a5","bus":"pci.1","addr":"0x0"}' \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:53:45:a5= ,bus=3Dpci.1,addr=3D0x0 \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ --device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ --device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ --device '{"driver":"usb-kbd","id":"input1","bus":"usb.0","port":"2"}' \ +-device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ +-device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \ +-device usb-kbd,id=3Dinput1,bus=3Dusb.0,port=3D2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ --device '{"driver":"virtio-gpu-pci","id":"video0","max_outputs":1,"bus":"p= ci.7","addr":"0x0"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","add= r":"0x0"}' \ +-device virtio-gpu-pci,id=3Dvideo0,max_outputs=3D1,bus=3Dpci.7,addr=3D0x0 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.5,addr=3D0x0 \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ --device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .6","addr":"0x0"}' \ +-device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.6,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.ar= gs b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args index 25fa0305c9..3ca8409e35 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args @@ -30,27 +30,27 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ --device '{"driver":"pcie-root-port","port":11,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x3"}' \ --device '{"driver":"pcie-root-port","port":12,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x1.0x4"}' \ --device '{"driver":"pcie-root-port","port":13,"chassis":6,"id":"pci.6","bu= s":"pcie.0","addr":"0x1.0x5"}' \ --device '{"driver":"pcie-root-port","port":14,"chassis":7,"id":"pci.7","bu= s":"pcie.0","addr":"0x1.0x6"}' \ --device '{"driver":"qemu-xhci","p2":15,"p3":15,"id":"usb","bus":"pci.2","a= ddr":"0x0"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.3"= ,"addr":"0x0"}' \ +-device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ +-device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ +-device pcie-root-port,port=3D11,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x1.0x3 \ +-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 pcie-root-port,port=3D14,chassis=3D7,id=3Dpci.7,bus=3Dpcie.0,addr= =3D0x1.0x6 \ +-device qemu-xhci,p2=3D15,p3=3D15,id=3Dusb,bus=3Dpci.2,addr=3D0x0 \ +-device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.3,addr=3D0x0 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.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 '{"driver":"virtio-blk-pci","bus":"pci.4","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.1,addr=3D0x0 \ -chardev pty,id=3Dcharserial0 \ -serial chardev:charserial0 \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ --device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ +-device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","add= r":"0x0"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.5,addr=3D0x0 \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ --device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .6","addr":"0x0"}' \ +-device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.6,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args index 06aaace7d2..e5b58d095b 100644 --- a/tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-alsa-best.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"alsa","timer-period":50,"in":{"mixing-= engine":true,"fixed-settings":true,"voices":1,"frequency":44100,"channels":= 2,"format":"s16","dev":"/dev/dsp0"},"out":{"mixing-engine":true,"fixed-sett= ings":true,"voices":2,"frequency":22050,"channels":4,"format":"f32","dev":"= /dev/dsp1"}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args index ffbdd79f3d..5e46e41289 100644 --- a/tests/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-alsa-full.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"alsa","in":{"mixing-engine":true,"fixe= d-settings":true,"voices":1,"buffer-length":100,"frequency":44100,"channels= ":2,"format":"s16","dev":"/dev/dsp0"},"out":{"mixing-engine":true,"fixed-se= ttings":true,"voices":2,"buffer-length":200,"frequency":22050,"channels":4,= "format":"f32","dev":"/dev/dsp1"}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args b= /tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args index 17a4a75718..ca481799fd 100644 --- a/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"alsa"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args= b/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args index beee1cefc9..4e1a30ad24 100644 --- a/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"coreaudio","timer-period":50,"in":{"mi= xing-engine":true,"fixed-settings":true,"voices":1,"frequency":44100,"chann= els":2,"format":"s16"},"out":{"mixing-engine":true,"fixed-settings":true,"v= oices":2,"buffer-length":200,"frequency":22050,"channels":4,"format":"f32",= "buffer-count":42}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args= b/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args index eea6cfe5b3..4367f25997 100644 --- a/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"coreaudio","in":{"mixing-engine":true,= "fixed-settings":true,"voices":1,"buffer-length":100,"frequency":44100,"cha= nnels":2,"format":"s16","buffer-count":50},"out":{"mixing-engine":true,"fix= ed-settings":true,"voices":2,"buffer-length":200,"frequency":22050,"channel= s":4,"format":"f32","buffer-count":42}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.args index ff753482ec..a9d2c198ed 100644 --- a/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"coreaudio"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.= args b/tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.args index 17a4a75718..ca481799fd 100644 --- a/tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-default-nographics.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"alsa"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.args b/= tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.args index 1d7dfc03aa..299e65c6a4 100644 --- a/tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-default-sdl.x86_64-latest.args @@ -27,12 +27,12 @@ SDL_AUDIODRIVER=3Desd \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-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 '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args = b/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args index c20cac9218..b8e4721ae7 100644 --- a/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-default-spice.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-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 '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args b/= tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args index 65c223ab81..b2b3e99e40 100644 --- a/tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-default-vnc.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-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 '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-file-best.x86_64-latest.args index 69cddf490d..cf4ae717db 100644 --- a/tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-file-best.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"wav","timer-period":50,"path":"audio.w= av","in":{"mixing-engine":true,"fixed-settings":true,"voices":1,"frequency"= :44100,"channels":2,"format":"s16"},"out":{"mixing-engine":true,"fixed-sett= ings":true,"voices":2,"frequency":22050,"channels":4,"format":"f32"}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-file-full.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-file-full.x86_64-latest.args index b8bb77ea38..515ead6726 100644 --- a/tests/qemuxml2argvdata/audio-file-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-file-full.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"wav","path":"audio.wav","in":{"mixing-= engine":true,"fixed-settings":true,"voices":1,"buffer-length":100,"frequenc= y":44100,"channels":2,"format":"s16"},"out":{"mixing-engine":true,"fixed-se= ttings":true,"voices":2,"buffer-length":200,"frequency":22050,"channels":4,= "format":"f32"}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args b= /tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args index 3ff3052066..8e5b31a11b 100644 --- a/tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-file-minimal.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"wav"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-jack-full.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-jack-full.x86_64-latest.args index ff2f5a4b19..21d89b302a 100644 --- a/tests/qemuxml2argvdata/audio-jack-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-jack-full.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"jack","in":{"mixing-engine":true,"fixe= d-settings":true,"voices":1,"buffer-length":100,"frequency":44100,"channels= ":2,"format":"s16","server-name":"fish","client-name":"food","connect-ports= ":"yum"},"out":{"mixing-engine":true,"fixed-settings":true,"voices":2,"buff= er-length":200,"frequency":22050,"channels":4,"format":"f32","server-name":= "fish","client-name":"food","connect-ports":"yum"}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args b= /tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args index ccc728a42c..3667d9230d 100644 --- a/tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-jack-minimal.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"jack"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args = b/tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args index 8ef9599b30..3e170242e3 100644 --- a/tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-many-backends.x86_64-latest.args @@ -26,18 +26,18 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -audiodev '{"id":"audio2","driver":"alsa"}' \ -audiodev '{"id":"audio3","driver":"pa"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio2 \ --device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ --device '{"driver":"AC97","id":"sound0","audiodev":"audio1","bus":"pci.0",= "addr":"0x3"}' \ --device '{"driver":"intel-hda","id":"sound1","bus":"pci.0","addr":"0x4"}' \ --device '{"driver":"hda-duplex","id":"sound1-codec0","bus":"sound1.0","cad= ":0,"audiodev":"audio2"}' \ --device '{"driver":"ES1370","id":"sound2","audiodev":"audio3","bus":"pci.0= ","addr":"0x5"}' \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device AC97,id=3Dsound0,audiodev=3Daudio1,bus=3Dpci.0,addr=3D0x3 \ +-device intel-hda,id=3Dsound1,bus=3Dpci.0,addr=3D0x4 \ +-device hda-duplex,id=3Dsound1-codec0,bus=3Dsound1.0,cad=3D0,audiodev=3Dau= dio2 \ +-device ES1370,id=3Dsound2,audiodev=3Daudio3,bus=3Dpci.0,addr=3D0x5 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-none-best.x86_64-latest.args index 6be557cac3..37c028db4e 100644 --- a/tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-none-best.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none","timer-period":50,"in":{"mixing-= engine":true,"fixed-settings":true,"voices":1,"frequency":44100,"channels":= 2,"format":"s16"},"out":{"mixing-engine":true,"fixed-settings":true,"voices= ":2,"frequency":22050,"channels":4,"format":"f32"}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-none-full.x86_64-latest.args b/te= sts/qemuxml2argvdata/audio-none-full.x86_64-latest.args index 4864f66b4b..4bc46edbb6 100644 --- a/tests/qemuxml2argvdata/audio-none-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-none-full.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none","in":{"mixing-engine":true,"fixe= d-settings":true,"voices":1,"buffer-length":100,"frequency":44100,"channels= ":2,"format":"s16"},"out":{"mixing-engine":true,"fixed-settings":true,"voic= es":2,"buffer-length":200,"frequency":22050,"channels":4,"format":"f32"}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args b= /tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args index d82963d169..676bb54922 100644 --- a/tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-none-minimal.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args b/tes= ts/qemuxml2argvdata/audio-oss-best.x86_64-latest.args index 3cf9159569..0ad95eee4d 100644 --- a/tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-oss-best.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"oss","timer-period":50,"in":{"mixing-e= ngine":true,"fixed-settings":true,"voices":1,"frequency":44100,"channels":2= ,"format":"s16","dev":"/dev/dsp0","buffer-count":30,"try-poll":true},"out":= {"mixing-engine":true,"fixed-settings":true,"voices":2,"frequency":22050,"c= hannels":4,"format":"f32","dev":"/dev/dsp1","buffer-count":30,"try-poll":fa= lse}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-oss-full.x86_64-latest.args b/tes= ts/qemuxml2argvdata/audio-oss-full.x86_64-latest.args index 6af29e0a17..f21252af72 100644 --- a/tests/qemuxml2argvdata/audio-oss-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-oss-full.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"oss","try-mmap":true,"exclusive":true,= "dsp-policy":3,"in":{"mixing-engine":true,"fixed-settings":true,"voices":1,= "buffer-length":100,"frequency":44100,"channels":2,"format":"s16","dev":"/d= ev/dsp0","buffer-count":50,"try-poll":true},"out":{"mixing-engine":true,"fi= xed-settings":true,"voices":2,"buffer-length":200,"frequency":22050,"channe= ls":4,"format":"f32","dev":"/dev/dsp1","buffer-count":30,"try-poll":false}}= ' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args b/= tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args index 990e3a3afb..15a2f07977 100644 --- a/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-oss-minimal.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"oss"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.arg= s b/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.args index 2cd1790bc5..1adfcc5846 100644 --- a/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"pa","timer-period":50,"server":"acme.e= xample.org","in":{"mixing-engine":true,"fixed-settings":true,"voices":1,"bu= ffer-length":200,"frequency":44100,"channels":2,"format":"s16","name":"fish= "},"out":{"mixing-engine":true,"fixed-settings":true,"voices":2,"buffer-len= gth":200,"frequency":22050,"channels":4,"format":"f32","name":"fish"}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.arg= s b/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.args index 211d0033ec..82869dc9cb 100644 --- a/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"pa","server":"acme.example.org","in":{= "mixing-engine":true,"fixed-settings":true,"voices":1,"buffer-length":100,"= frequency":44100,"channels":2,"format":"s16","name":"fish","stream-name":"f= ood","latency":100},"out":{"mixing-engine":true,"fixed-settings":true,"voic= es":2,"buffer-length":200,"frequency":22050,"channels":4,"format":"f32","na= me":"fish","stream-name":"food","latency":200}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.= args b/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.args index b67e769086..8c604b15d4 100644 --- a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"pa"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args b/tes= ts/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args index 29874eef8c..9730d18e19 100644 --- a/tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-sdl-best.x86_64-latest.args @@ -28,10 +28,10 @@ SDL_AUDIODRIVER=3Dpulseaudio \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"sdl","timer-period":50,"in":{"mixing-e= ngine":true,"fixed-settings":true,"voices":1,"frequency":44100,"channels":2= ,"format":"s16"},"out":{"mixing-engine":true,"fixed-settings":true,"voices"= :2,"buffer-length":200,"frequency":22050,"channels":4,"format":"f32"}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args b/tes= ts/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args index e041efe50b..0befd4d4c0 100644 --- a/tests/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-sdl-full.x86_64-latest.args @@ -28,10 +28,10 @@ SDL_AUDIODRIVER=3Dpulseaudio \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"sdl","in":{"mixing-engine":true,"fixed= -settings":true,"voices":1,"buffer-length":100,"frequency":44100,"channels"= :2,"format":"s16","buffer-count":40},"out":{"mixing-engine":true,"fixed-set= tings":true,"voices":2,"buffer-length":200,"frequency":22050,"channels":4,"= format":"f32","buffer-count":50}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args b/= tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args index 93c38eae20..a1c1d9676e 100644 --- a/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"sdl"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args b/t= ests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args index 9a845047aa..cf8c695e85 100644 --- a/tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-spice-best.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"spice","timer-period":50,"in":{"mixing= -engine":true,"fixed-settings":true,"voices":1,"frequency":44100,"channels"= :2,"format":"s16"},"out":{"mixing-engine":true,"fixed-settings":true,"voice= s":2,"frequency":22050,"channels":4,"format":"f32"}}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args b/t= ests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args index e324ccc0aa..97f253f2f9 100644 --- a/tests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-spice-full.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"spice","in":{"mixing-engine":true,"fix= ed-settings":true,"voices":1,"buffer-length":100,"frequency":44100,"channel= s":2,"format":"s16"},"out":{"mixing-engine":true,"fixed-settings":true,"voi= ces":2,"buffer-length":200,"frequency":22050,"channels":4,"format":"f32"}}'= \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args = b/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args index 5acf36f429..0fda604f38 100644 --- a/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args +++ b/tests/qemuxml2argvdata/audio-spice-minimal.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"spice"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args index 356e4ef5b7..cfb0e5dae2 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args +++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-latest.args @@ -27,14 +27,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},"auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-2-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1,"write-cache":"on"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-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 '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-1-form= at","id":"ide0-0-1","write-cache":"on"}' \ +-device ide-hd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-1-format,id=3Dide0-0-1= ,write-cache=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args index 356e4ef5b7..cfb0e5dae2 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args +++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-latest.args @@ -27,14 +27,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},"auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-2-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1,"write-cache":"on"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-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 '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-1-form= at","id":"ide0-0-1","write-cache":"on"}' \ +-device ide-hd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-1-format,id=3Dide0-0-1= ,write-cache=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args b/t= ests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args index 356e4ef5b7..cfb0e5dae2 100644 --- a/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args +++ b/tests/qemuxml2argvdata/blkdeviotune-max.x86_64-latest.args @@ -27,14 +27,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},"auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-2-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1,"write-cache":"on"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-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 '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-1-form= at","id":"ide0-0-1","write-cache":"on"}' \ +-device ide-hd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-1-format,id=3Dide0-0-1= ,write-cache=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.arg= s b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args index 6d34fa71bf..75a5fe2b5e 100644 --- a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ -netdev user,guestfwd=3Dtcp:10.0.2.1:4600-chardev:charchannel0,id=3Dchanne= l0 \ -chardev socket,id=3Dcharchannel1,path=3D/tmp/guestfwd-connect.socket \ -netdev user,guestfwd=3Dtcp:10.0.2.1:4601-chardev:charchannel1,id=3Dchanne= l1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/console-compat-auto.x86_64-latest.args = b/tests/qemuxml2argvdata/console-compat-auto.x86_64-latest.args index 7b31c86820..6f39a1e0da 100644 --- a/tests/qemuxml2argvdata/console-compat-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/console-compat-auto.x86_64-latest.args @@ -27,13 +27,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/console-compat-chardev.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/console-compat-chardev.x86_64-latest.args index 7b31c86820..6f39a1e0da 100644 --- a/tests/qemuxml2argvdata/console-compat-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/console-compat-chardev.x86_64-latest.args @@ -27,13 +27,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/console-compat.x86_64-latest.args b/tes= ts/qemuxml2argvdata/console-compat.x86_64-latest.args index 17a356b480..9dab7b70ab 100644 --- a/tests/qemuxml2argvdata/console-compat.x86_64-latest.args +++ b/tests/qemuxml2argvdata/console-compat.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args = b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args index 7803b4ff37..3cd77e8e09 100644 --- a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args @@ -27,13 +27,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x2 \ -chardev socket,id=3Dcharconsole0,fd=3D1729,server=3Don,wait=3Doff \ --device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}= ' \ +-device virtconsole,chardev=3Dcharconsole0,id=3Dconsole0 \ -chardev socket,id=3Dcharconsole1,path=3D/tmp/connect.socket \ --device '{"driver":"virtconsole","chardev":"charconsole1","id":"console1"}= ' \ +-device virtconsole,chardev=3Dcharconsole1,id=3Dconsole1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args index b584f93f44..baf9ed093c 100644 --- a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args @@ -27,28 +27,28 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 2"}' \ --device '{"driver":"virtio-scsi-pci","id":"scsi1","num_queues":8,"bus":"pc= i.0","addr":"0x3"}' \ --device '{"driver":"virtio-scsi-pci","id":"scsi2","cmd_per_lun":50,"bus":"= pci.0","addr":"0x4"}' \ --device '{"driver":"virtio-scsi-pci","id":"scsi3","max_sectors":512,"bus":= "pci.0","addr":"0x5"}' \ --device '{"driver":"virtio-scsi-pci","id":"scsi4","ioeventfd":true,"bus":"= pci.0","addr":"0x6"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ +-device virtio-scsi-pci,id=3Dscsi1,num_queues=3D8,bus=3Dpci.0,addr=3D0x3 \ +-device virtio-scsi-pci,id=3Dscsi2,cmd_per_lun=3D50,bus=3Dpci.0,addr=3D0x4= \ +-device virtio-scsi-pci,id=3Dscsi3,max_sectors=3D512,bus=3Dpci.0,addr=3D0x= 5 \ +-device virtio-scsi-pci,id=3Dscsi4,ioeventfd=3Don,bus=3Dpci.0,addr=3D0x6 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi0-0-0-0","drive":"libvirt-5-format","id":"scsi0-0= -0-0","bootindex":1}' \ +-device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi0-0-0-0,drive=3Dlibvirt-5-format,id=3Dscsi0-0-0-0,bootindex=3D1 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","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 '{"driver":"scsi-hd","bus":"scsi1.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi1-0-0-0","drive":"libvirt-4-format","id":"scsi1-0= -0-0"}' \ +-device scsi-hd,bus=3Dscsi1.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi1-0-0-0,drive=3Dlibvirt-4-format,id=3Dscsi1-0-0-0 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest3","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 '{"driver":"scsi-hd","bus":"scsi2.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi2-0-0-0","drive":"libvirt-3-format","id":"scsi2-0= -0-0"}' \ +-device scsi-hd,bus=3Dscsi2.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi2-0-0-0,drive=3Dlibvirt-3-format,id=3Dscsi2-0-0-0 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest4","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 '{"driver":"scsi-hd","bus":"scsi3.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi3-0-0-0","drive":"libvirt-2-format","id":"scsi3-0= -0-0"}' \ +-device scsi-hd,bus=3Dscsi3.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi3-0-0-0,drive=3Dlibvirt-2-format,id=3Dscsi3-0-0-0 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest5","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 '{"driver":"scsi-hd","bus":"scsi4.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi4-0-0-0","drive":"libvirt-1-format","id":"scsi4-0= -0-0"}' \ +-device scsi-hd,bus=3Dscsi4.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi4-0-0-0,drive=3Dlibvirt-1-format,id=3Dscsi4-0-0-0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x7"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x7 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-lates= t.args b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.ar= gs index d8857f9c36..604bd907f6 100644 --- a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args @@ -27,8 +27,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args b/tes= ts/qemuxml2argvdata/cpu-host-model.x86_64-latest.args index 7ed0ee28b8..aa1cd5e3c4 100644 --- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args @@ -27,11 +27,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ --device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ +-device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ +-device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add= r":"0x0"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args b/te= sts/qemuxml2argvdata/cpu-translation.x86_64-latest.args index 866b7363b8..2dab572a6b 100644 --- a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args @@ -27,8 +27,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.arg= s b/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args index d77c1db2c2..4f621559cf 100644 --- a/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args +++ b/tests/qemuxml2argvdata/cputune-cpuset-big-id.x86_64-latest.args @@ -27,11 +27,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-late= st.args b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.= args index e13a2be3f0..567bbeb4d8 100644 --- a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args @@ -25,10 +25,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-default-video-type= -a/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ +-device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ +-device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ --device '{"driver":"virtio-gpu-pci","id":"video0","max_outputs":1,"bus":"p= ci.1","addr":"0x0"}' \ +-device virtio-gpu-pci,id=3Dvideo0,max_outputs=3D1,bus=3Dpci.1,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.a= rgs b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args index 25c5eb3140..1e70b2a83f 100644 --- a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args +++ b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args @@ -25,10 +25,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-default-video-type= -p/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \ --device '{"driver":"usb-kbd","id":"input0","bus":"usb.0","port":"1"}' \ --device '{"driver":"usb-mouse","id":"input1","bus":"usb.0","port":"2"}' \ +-device pci-ohci,id=3Dusb,bus=3Dpci.0,addr=3D0x1 \ +-device usb-kbd,id=3Dinput0,bus=3Dusb.0,port=3D1 \ +-device usb-mouse,id=3Dinput1,bus=3Dusb.0,port=3D2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ --device '{"driver":"VGA","id":"video0","vgamem_mb":16,"bus":"pci.0","addr"= :"0x2"}' \ +-device VGA,id=3Dvideo0,vgamem_mb=3D16,bus=3Dpci.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/devices-acpi-index.x86_64-latest.args b= /tests/qemuxml2argvdata/devices-acpi-index.x86_64-latest.args index 41136d7d49..62ad1138ff 100644 --- a/tests/qemuxml2argvdata/devices-acpi-index.x86_64-latest.args +++ b/tests/qemuxml2argvdata/devices-acpi-index.x86_64-latest.args @@ -26,21 +26,21 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fdr-br/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test.img",= "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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","acpi-index= ":1,"drive":"libvirt-2-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,acpi-index=3D1,drive=3Dlibvi= rt-2-format,id=3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test1.img"= ,"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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","acpi-index= ":42,"drive":"libvirt-1-format","id":"virtio-disk1"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,acpi-index=3D42,drive=3Dlibv= irt-1-format,id=3Dvirtio-disk1 \ -netdev user,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "00:11:22:33:44:55","bus":"pci.0","addr":"0x5","acpi-index":100}' \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:11:22:33:44:55= ,bus=3Dpci.0,addr=3D0x5,acpi-index=3D100 \ -netdev user,id=3Dhostnet1 \ --device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":= "00:11:22:33:44:55","bus":"pci.0","addr":"0x7","acpi-index":200}' \ +-device virtio-net-pci,netdev=3Dhostnet1,id=3Dnet1,mac=3D00:11:22:33:44:55= ,bus=3Dpci.0,addr=3D0x7,acpi-index=3D200 \ -netdev user,id=3Dhostnet2 \ --device '{"driver":"virtio-net-pci","netdev":"hostnet2","id":"net2","mac":= "00:11:22:33:44:55","bus":"pci.0","addr":"0x8","acpi-index":300}' \ +-device virtio-net-pci,netdev=3Dhostnet2,id=3Dnet2,mac=3D00:11:22:33:44:55= ,bus=3Dpci.0,addr=3D0x8,acpi-index=3D300 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2","= acpi-index":1729}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2,acpi-index=3D1729 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args b/= tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args index 5500f70bf9..59fba80ce7 100644 --- a/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-aio-io_uring.x86_64-latest.args @@ -27,11 +27,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","ai= o":"io_uring","node-name":"libvirt-1-storage","auto-read-only":true,"discar= d":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x9","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x9,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args b/tests/qem= uxml2argvdata/disk-aio.x86_64-latest.args index e5be1d2db2..eb0313eec3 100644 --- a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args @@ -27,14 +27,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","ai= o":"native","node-name":"libvirt-2-storage","cache":{"direct":true,"no-flus= h":false},"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-2-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1,"write-cache":"on"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","ai= o":"threads","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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args = b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args index 3acd6491e4..0a222b4b1f 100644 --- a/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args +++ b/tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-latest.args @@ -34,7 +34,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-armtest/.config \ -drive file=3D/arm-sd.qcow2,format=3Dqcow2,if=3Dsd,index=3D0 \ -blockdev '{"driver":"file","filename":"/arm-virtio.qcow2","node-name":"li= bvirt-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 '{"driver":"virtio-blk-device","drive":"libvirt-1-format","id":"vi= rtio-disk0"}' \ +-device virtio-blk-device,drive=3Dlibvirt-1-format,id=3Dvirtio-disk0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-late= st.args b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.= args index fb2dc9f7ce..bd24dab1b1 100644 --- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"file","filename":"/tmp/missing-backing-store.qcow","= node-name":"libvirt-25-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-25-format","read-only":true,"driver":"qco= w2","file":"libvirt-25-storage"}' \ -blockdev '{"driver":"gluster","volume":"Volume2","path":"Image","server":= [{"type":"unix","path":"/path/to/sock"}],"debug":4,"node-name":"libvirt-24-= storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-24-format","read-only":false,"driver":"qc= ow2","file":"libvirt-24-storage","backing":"libvirt-25-format"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-24-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-24-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"file","filename":"/tmp/Fedora-17-x86_64-Live-KDE.iso= ","node-name":"libvirt-23-storage","auto-read-only":true,"discard":"unmap"}= ' \ -blockdev '{"node-name":"libvirt-23-format","read-only":true,"driver":"raw= ","file":"libvirt-23-storage"}' \ -blockdev '{"driver":"file","filename":"/tmp/image5.qcow","node-name":"lib= virt-22-storage","auto-read-only":true,"discard":"unmap"}' \ @@ -47,19 +47,19 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -blockdev '{"node-name":"libvirt-18-format","read-only":true,"driver":"qco= w2","file":"libvirt-18-storage","backing":"libvirt-19-format"}' \ -blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/run/nbdsoc= k"},"export":"bar","node-name":"libvirt-17-storage","auto-read-only":true,"= discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-17-format","read-only":false,"driver":"qc= ow2","file":"libvirt-17-storage","backing":"libvirt-18-format"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-17-format","id":"virtio-disk1"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-17-format,id= =3Dvirtio-disk1 \ -blockdev '{"driver":"gluster","volume":"Volume1","path":"Image","server":= [{"type":"inet","host":"example.org","port":"6000"}],"debug":4,"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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-16-format","id":"virtio-disk2"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-16-format,id= =3Dvirtio-disk2 \ -blockdev '{"driver":"file","filename":"/tmp/image.qcow","node-name":"libv= irt-15-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-15-format","read-only":true,"driver":"qco= w2","file":"libvirt-15-storage","backing":null}' \ -object '{"qom-type":"secret","id":"libvirt-14-storage-auth-secret0","data= ":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid= ":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"rbd","pool":"pool","image":"image","server":[{"host"= :"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"= },{"host":"mon3.example.org","port":"6322"}],"user":"myname","auth-client-r= equired":["cephx","none"],"key-secret":"libvirt-14-storage-auth-secret0","n= ode-name":"libvirt-14-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-14-format","read-only":false,"driver":"qc= ow2","file":"libvirt-14-storage","backing":"libvirt-15-format"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-14-format","id":"virtio-disk3"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-14-format,id= =3Dvirtio-disk3 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest11","n= ode-name":"libvirt-13-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-13-format","read-only":false,"driver":"qc= ow2","file":"libvirt-13-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-13-format","id":"virtio-disk4"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-13-format,id= =3Dvirtio-disk4 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/rhel7.qcow= 2","node-name":"libvirt-12-storage","auto-read-only":true,"discard":"unmap"= }' \ -blockdev '{"node-name":"libvirt-12-format","read-only":true,"driver":"qco= w2","file":"libvirt-12-storage","backing":null}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/rhel7.1483= 536402","node-name":"libvirt-11-storage","auto-read-only":true,"discard":"u= nmap"}' \ @@ -84,8 +84,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"qcow= 2","file":"libvirt-2-storage","backing":"libvirt-3-format"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/rhel7.1484= 071880","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"un= map"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage","backing":"libvirt-2-format"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-1-format","id":"virtio-disk5"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk5 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x8"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x8 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-blockio.x86_64-latest.args b/tests= /qemuxml2argvdata/disk-blockio.x86_64-latest.args index 876c8a56fd..954c953ff0 100644 --- a/tests/qemuxml2argvdata/disk-blockio.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-blockio.x86_64-latest.args @@ -27,14 +27,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-2-form= at","id":"ide0-0-1"}' \ +-device ide-cd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-2-format,id=3Dide0-0-1= \ -blockdev '{"driver":"file","filename":"/tmp/idedisk.img","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":2,"drive":"libvirt-1-form= at","id":"ide0-0-2","bootindex":1,"logical_block_size":512,"physical_block_= size":512}' \ +-device ide-hd,bus=3Dide.0,unit=3D2,drive=3Dlibvirt-1-format,id=3Dide0-0-2= ,bootindex=3D1,logical_block_size=3D512,physical_block_size=3D512 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-boot-cdrom.x86_64-latest.args b/te= sts/qemuxml2argvdata/disk-boot-cdrom.x86_64-latest.args index 146c3542ff..e8a3d057d8 100644 --- a/tests/qemuxml2argvdata/disk-boot-cdrom.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-boot-cdrom.x86_64-latest.args @@ -27,13 +27,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-0-0= \ -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":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-boot-disk.x86_64-latest.args b/tes= ts/qemuxml2argvdata/disk-boot-disk.x86_64-latest.args index 3433ef9a84..43c65d23c2 100644 --- a/tests/qemuxml2argvdata/disk-boot-disk.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-boot-disk.x86_64-latest.args @@ -27,13 +27,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1}' \ +-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":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args b/tests/q= emuxml2argvdata/disk-cache.x86_64-latest.args index 6576f0feba..de0b011b0b 100644 --- a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args @@ -27,23 +27,23 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"lsi","id":"scsi0","bus":"pci.0","addr":"0x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device lsi,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-5-storage","cache":{"direct":false,"no-flush":false},"aut= o-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":false,"cache":{"dir= ect":false,"no-flush":false},"driver":"qcow2","file":"libvirt-5-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-5-form= at","id":"ide0-0-0","bootindex":1,"write-cache":"on"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-5-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-4-storage","cache":{"direct":false,"no-flush":true},"auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"cache":{"dir= ect":false,"no-flush":true},"driver":"qcow2","file":"libvirt-4-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-4-form= at","id":"ide0-0-1","write-cache":"on"}' \ +-device ide-hd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-4-format,id=3Dide0-0-1= ,write-cache=3Don \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-3-storage","cache":{"direct":true,"no-flush":false},"auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-3-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi0.0","scsi-id":0,"device_id":"driv= e-scsi0-0-0","drive":"libvirt-3-format","id":"scsi0-0-0","write-cache":"on"= }' \ +-device scsi-hd,bus=3Dscsi0.0,scsi-id=3D0,device_id=3Ddrive-scsi0-0-0,driv= e=3Dlibvirt-3-format,id=3Dscsi0-0-0,write-cache=3Don \ -blockdev '{"driver":"host_device","filename":"/dev/disk/by-path/ip-192.16= 8.44.1:3260-iscsi-iqn.2011-02.lan.hdserver:hydrar-desktop.win7vm-lun-0","no= de-name":"libvirt-2-storage","cache":{"direct":false,"no-flush":false},"aut= o-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"dir= ect":false,"no-flush":false},"driver":"qcow2","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-2-format","id":"virtio-disk0","write-cache":"off"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk0,write-cache=3Doff \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"usb-storage","bus":"usb.0","port":"1","drive":"libvirt= -1-format","id":"usb-disk1","removable":false,"write-cache":"off"}' \ +-device usb-storage,bus=3Dusb.0,port=3D1,drive=3Dlibvirt-1-format,id=3Dusb= -disk1,removable=3Doff,write-cache=3Doff \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args= b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args index 9c1b567ed1..1944f9b272 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args @@ -27,11 +27,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"file","filename":"/root/boot.iso","node-name":"libvi= rt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device '{"driver":"usb-storage","bus":"usb.0","port":"1","drive":"libvirt= -2-format","id":"usb-disk0","removable":false}' \ --device '{"driver":"usb-storage","bus":"usb.0","port":"2","id":"usb-disk1"= ,"removable":false}' \ +-device usb-storage,bus=3Dusb.0,port=3D1,drive=3Dlibvirt-2-format,id=3Dusb= -disk0,removable=3Doff \ +-device usb-storage,bus=3Dusb.0,port=3D2,id=3Dusb-disk1,removable=3Doff \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64= -latest.args b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_= 64-latest.args index bcfab650f5..b28c1f5b71 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest= .args @@ -27,8 +27,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":1,"id":"ide0-1-1"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device ide-cd,bus=3Dide.1,unit=3D1,id=3Dide0-1-1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args index 6bc09072eb..085a3a122a 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args @@ -26,17 +26,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"ftp","url":"ftp://host.name:21/url/path/file.iso","n= ode-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 '{"driver":"ide-cd","bus":"ide.0","unit":0,"drive":"libvirt-3-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-0-0= ,bootindex=3D1 \ -blockdev '{"driver":"ftps","url":"ftps://host.name:990/url/path/file.iso"= ,"node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-2-form= at","id":"ide0-0-1"}' \ +-device ide-cd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-2-format,id=3Dide0-0-1= \ -blockdev '{"driver":"https","url":"https://host.name:443/url/path/file.is= o?test=3Dval","node-name":"libvirt-1-storage","auto-read-only":true,"discar= d":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args b/te= sts/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args index a68a5fe400..872bb49b16 100644 --- a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args @@ -27,17 +27,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -no-shutdown \ -no-acpi \ -boot menu=3Don,strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14.img","= node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"qco= w2","file":"libvirt-3-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-3-format","id":"virtio-disk0","bootindex":2}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk0,bootindex=3D2 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-2-storage","auto-read-only":true,"discar= d":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-2-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-1-0= ,bootindex=3D1 \ -blockdev '{"driver":"file","filename":"/tmp/cdrom.img","node-name":"libvi= rt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":1,"drive":"libvirt-1-form= at","id":"ide0-1-1"}' \ +-device ide-cd,bus=3Dide.1,unit=3D1,drive=3Dlibvirt-1-format,id=3Dide0-1-1= \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args b/tests/q= emuxml2argvdata/disk-cdrom.x86_64-latest.args index b4fa98842d..0a4b001f01 100644 --- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args @@ -27,15 +27,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"lib= virt-4-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":true,"driver":"raw"= ,"file":"libvirt-4-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.0","unit":0,"drive":"libvirt-4-form= at","id":"ide0-0-0"}' \ +-device ide-cd,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 '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-3-form= at","id":"ide0-0-1"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"id":"ide0-1-0","write-= cache":"on"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":1,"id":"ide0-1-1"}' \ +-device ide-cd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-3-format,id=3Dide0-0-1= \ +-device ide-cd,bus=3Dide.1,unit=3D0,id=3Dide0-1-0,write-cache=3Don \ +-device ide-cd,bus=3Dide.1,unit=3D1,id=3Dide0-1-1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args b/= tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args index 9041eda95a..0d6b4773b8 100644 --- a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args @@ -27,18 +27,18 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -no-shutdown \ -no-acpi \ -boot menu=3Don,strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x6"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x6 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14.img","= node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"qco= w2","file":"libvirt-2-storage"}' \ -blockdev '{"driver":"copy-on-read","node-name":"libvirt-CoR-vda","file":"= libvirt-2-format","discard":"unmap"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-CoR-vda","id":"virtio-disk0","bootindex":2}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-CoR-vda,id= =3Dvirtio-disk0,bootindex=3D2 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discar= d":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci","tx":"bh","netdev":"hostnet0","id":"ne= t0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ +-device virtio-net-pci,tx=3Dbh,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:= e5:48:58,bus=3Dpci.0,addr=3D0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args index 3df2fc79fa..90c76d307f 100644 --- a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args @@ -27,14 +27,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -no-shutdown \ -no-acpi \ -boot menu=3Don,strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14.img","= node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"discard":"un= map","detect-zeroes":"unmap","driver":"qcow2","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-2-format","id":"virtio-disk0","bootindex":2}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk0,bootindex=3D2 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discar= d":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"discard":"ign= ore","detect-zeroes":"on","driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args b/tests= /qemuxml2argvdata/disk-discard.x86_64-latest.args index 033cea0be1..24d2b3b3be 100644 --- a/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-discard.x86_64-latest.args @@ -27,14 +27,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -no-shutdown \ -no-acpi \ -boot menu=3Don,strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14.img","= node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"discard":"un= map","driver":"qcow2","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-2-format","id":"virtio-disk0","bootindex":2}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk0,bootindex=3D2 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discar= d":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"discard":"ign= ore","driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args b/= tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args index c2b986600a..19d4cf9b34 100644 --- a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args @@ -27,16 +27,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-3-storage","cache":{"direct":true,"no-flush":false},"auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-3-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-3-form= at","id":"ide0-0-0","bootindex":1,"write-cache":"on","werror":"stop","rerro= r":"stop"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don,werror=3Dstop,rerror=3Dstop \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},"auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-2-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-2-form= at","id":"ide0-0-1","write-cache":"on","werror":"enospc"}' \ +-device ide-hd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-2-format,id=3Dide0-0-1= ,write-cache=3Don,werror=3Denospc \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest3","no= de-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 '{"driver":"ide-hd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","write-cache":"on","werror":"report","rerror":"ignore"}= ' \ +-device ide-hd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,write-cache=3Don,werror=3Dreport,rerror=3Dignore \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args= b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args index 88144f5f98..6692090b0d 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args @@ -27,16 +27,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ --device '{"driver":"isa-fdc","bootindexA":1}' \ +-device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ +-device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ +-device isa-fdc,bootindexA=3D1 \ -blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"li= bvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"floppy","unit":0,"drive":"libvirt-2-format","id":"fdc0= -0-0"}' \ +-device floppy,unit=3D0,drive=3Dlibvirt-2-format,id=3Dfdc0-0-0 \ -blockdev '{"driver":"file","filename":"/tmp/data.img","node-name":"libvir= t-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 '{"driver":"floppy","unit":1,"drive":"libvirt-1-format","id":"fdc0= -0-1"}' \ +-device floppy,unit=3D1,drive=3Dlibvirt-1-format,id=3Dfdc0-0-1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args = b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args index c04f0e2a2f..14d14e27c1 100644 --- a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args @@ -27,16 +27,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ --device '{"driver":"isa-fdc","bootindexA":1}' \ +-device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ +-device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ +-device isa-fdc,bootindexA=3D1 \ -blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"li= bvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"floppy","unit":0,"drive":"libvirt-2-format","id":"fdc0= -0-0"}' \ +-device floppy,unit=3D0,drive=3Dlibvirt-2-format,id=3Dfdc0-0-0 \ -blockdev '{"driver":"file","filename":"/tmp/data.img","node-name":"libvir= t-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 '{"driver":"floppy","unit":1,"drive":"libvirt-1-format","id":"fdc0= -0-1"}' \ +-device floppy,unit=3D1,drive=3Dlibvirt-1-format,id=3Dfdc0-0-1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-floppy-tray.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-floppy-tray.x86_64-latest.args index 4decfb924d..e2ca155ea2 100644 --- a/tests/qemuxml2argvdata/disk-floppy-tray.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy-tray.x86_64-latest.args @@ -27,17 +27,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-3-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-0-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 '{"driver":"floppy","unit":0,"drive":"libvirt-2-format","id":"fdc0= -0-0"}' \ +-device floppy,unit=3D0,drive=3Dlibvirt-2-format,id=3Dfdc0-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 '{"driver":"floppy","unit":1,"drive":"libvirt-1-format","id":"fdc0= -0-1"}' \ +-device floppy,unit=3D1,drive=3Dlibvirt-1-format,id=3Dfdc0-0-1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-floppy.x86_64-latest.args index f717ed548f..c65a32ddb3 100644 --- a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args @@ -27,16 +27,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-3-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-0-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 '{"driver":"floppy","unit":0,"drive":"libvirt-2-format","id":"fdc0= -0-0"}' \ +-device floppy,unit=3D0,drive=3Dlibvirt-2-format,id=3Dfdc0-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 '{"driver":"floppy","unit":1,"drive":"libvirt-1-format","id":"fdc0= -0-1"}' \ +-device floppy,unit=3D1,drive=3Dlibvirt-1-format,id=3Dfdc0-0-1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-latest.args b/test= s/qemuxml2argvdata/disk-fmt-qcow.x86_64-latest.args index c90da3c0ca..84ce3a107f 100644 --- a/tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-latest.args @@ -27,13 +27,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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":"qco= w2","file":"libvirt-2-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1}' \ +-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":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-geometry.x86_64-latest.args b/test= s/qemuxml2argvdata/disk-geometry.x86_64-latest.args index 31e082ffd6..da1468c4ca 100644 --- a/tests/qemuxml2argvdata/disk-geometry.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-geometry.x86_64-latest.args @@ -27,11 +27,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1,"cyls":16383,"heads":16,"secs":63,"bios-c= hs-trans":"lba"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1,cyls=3D16383,heads=3D16,secs=3D63,bios-chs-trans=3Dlba \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-ide-split.x86_64-latest.args b/tes= ts/qemuxml2argvdata/disk-ide-split.x86_64-latest.args index 887b5903ad..98683123c4 100644 --- a/tests/qemuxml2argvdata/disk-ide-split.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-ide-split.x86_64-latest.args @@ -27,14 +27,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-2-form= at","id":"ide0-0-1"}' \ +-device ide-cd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-2-format,id=3Dide0-0-1= \ -blockdev '{"driver":"file","filename":"/tmp/idedisk.img","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":2,"drive":"libvirt-1-form= at","id":"ide0-0-2","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D2,drive=3Dlibvirt-1-format,id=3Dide0-0-2= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-ide-wwn.x86_64-latest.args b/tests= /qemuxml2argvdata/disk-ide-wwn.x86_64-latest.args index 037ab605ac..f360ec2d72 100644 --- a/tests/qemuxml2argvdata/disk-ide-wwn.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-ide-wwn.x86_64-latest.args @@ -27,11 +27,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-1-form= at","id":"ide0-0-1","bootindex":1,"wwn":5764824127192592813,"serial":"WD-WM= AP9A966149"}' \ +-device ide-hd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-1-format,id=3Dide0-0-1= ,bootindex=3D1,wwn=3D5764824127192592813,serial=3DWD-WMAP9A966149 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args b/tes= ts/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args index 0715c1fb43..7b092102c2 100644 --- a/tests/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-ioeventfd.x86_64-latest.args @@ -27,17 +27,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -no-shutdown \ -no-acpi \ -boot menu=3Don,strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x6"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x6 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14.img","= node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"qco= w2","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","ioeventfd":true,"bus":"pci.0","addr":= "0x4","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \ +-device virtio-blk-pci,ioeventfd=3Don,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvi= rt-2-format,id=3Dvirtio-disk0,bootindex=3D2 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discar= d":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci","tx":"bh","ioeventfd":false,"netdev":"= hostnet0","id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}= ' \ +-device virtio-net-pci,tx=3Dbh,ioeventfd=3Doff,netdev=3Dhostnet0,id=3Dnet0= ,mac=3D52:54:00:e5:48:58,bus=3Dpci.0,addr=3D0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args = b/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args index 48ab5517b7..8e8b5cec2d 100644 --- a/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-metadata-cache.x86_64-latest.args @@ -27,16 +27,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"file","filename":"/tmp/QEMUGuest1.img","node-name":"= libvirt-3-storage","cache":{"direct":true,"no-flush":false},"auto-read-only= ":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","cache-size":12345,"file":"lib= virt-3-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-3-form= at","id":"ide0-0-0","bootindex":1,"write-cache":"on"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ -blockdev '{"driver":"file","filename":"/tmp/backing-store.qcow","node-nam= e":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},"auto-read-= only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"cache":{"dire= ct":true,"no-flush":false},"driver":"qcow2","cache-size":1048576,"file":"li= bvirt-2-storage","backing":null}' \ -blockdev '{"driver":"file","filename":"/tmp/QEMUGuest2.img","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","ba= cking":"libvirt-2-format"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-1-form= at","id":"ide0-0-1","write-cache":"on"}' \ +-device ide-hd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-1-format,id=3Dide0-0-1= ,write-cache=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args= b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args index 53040c8d86..85a2fff618 100644 --- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args @@ -27,16 +27,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"gluster","volume":"Volume1","path":"Image","server":= [{"type":"inet","host":"example.org","port":"6000"}],"debug":4,"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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-3-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"gluster","volume":"Volume2","path":"Image","server":= [{"type":"unix","path":"/path/to/sock"}],"debug":4,"node-name":"libvirt-2-s= torage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-2-format","id":"virtio-disk1"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk1 \ -blockdev '{"driver":"gluster","volume":"Volume3","path":"Image.qcow2","se= rver":[{"type":"inet","host":"example.org","port":"6000"},{"type":"inet","h= ost":"example.org","port":"24007"},{"type":"unix","path":"/path/to/sock"}],= "debug":4,"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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-1-format","id":"virtio-disk2"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args b/= tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args index f98f0815ee..f535441b86 100644 --- a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args @@ -27,21 +27,21 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"http","url":"http://example.org:80/test.img","timeou= t":1234,"node-name":"libvirt-4-storage","auto-read-only":true,"discard":"un= map"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-4-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-4-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"https","url":"https://example.org:443/test2.img","re= adahead":1024,"node-name":"libvirt-3-storage","auto-read-only":true,"discar= d":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-3-format","id":"virtio-disk1"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk1 \ -object '{"qom-type":"secret","id":"libvirt-2-storage-httpcookie-secret0",= "data":"DrPR9NA6GKJb7qi1KbjHaealKEMVtOWUl2h3yvO5lgIh6cyLHemmlg+h9fcgwREA","= keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}'= \ -blockdev '{"driver":"http","url":"http://example.org:1234/test3.img","coo= kie-secret":"libvirt-2-storage-httpcookie-secret0","node-name":"libvirt-2-s= torage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-2-format","id":"virtio-disk2"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk2 \ -object '{"qom-type":"secret","id":"libvirt-1-storage-httpcookie-secret0",= "data":"DrPR9NA6GKJb7qi1KbjHaealKEMVtOWUl2h3yvO5lgIh6cyLHemmlg+h9fcgwREA","= keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}'= \ -blockdev '{"driver":"https","url":"https://example.org:1234/test4.img?par= =3Dval&other=3Dble","sslverify":false,"cookie-secret":"libvirt-1-storage-ht= tpcookie-secret0","node-name":"libvirt-1-storage","auto-read-only":true,"di= scard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-1-format","id":"virtio-disk3"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk3 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args index cee236a169..ba69ef6983 100644 --- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args @@ -27,32 +27,32 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ -blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example","lun":0,"transport":"tcp","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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-7-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-7-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example","lun":1,"transport":"tcp","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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-6-format","id":"virtio-disk1"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-6-format,id= =3Dvirtio-disk1 \ -object '{"qom-type":"secret","id":"libvirt-5-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example:storage","lun":1,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-5-storage-auth-secret0","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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-5-format","id":"virtio-disk2"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-5-format,id= =3Dvirtio-disk2 \ -object '{"qom-type":"secret","id":"libvirt-4-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example:storage","lun":2,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-4-storage-auth-secret0","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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-4-format","id":"virtio-disk3"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-4-format,id= =3Dvirtio-disk3 \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example","lun":0,"transport":"tcp","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 '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"l= un":0,"drive":"libvirt-3-format","id":"scsi0-0-0-0"}' \ +-device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive=3Dl= ibvirt-3-format,id=3Dscsi0-0-0-0 \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example:server","lun":0,"transport":"tcp","initiator-name":"iqn.19= 92-01.com.example:client","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 '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"l= un":1,"drive":"libvirt-2-format","id":"scsi0-0-0-1"}' \ +-device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D1,drive=3Dl= ibvirt-2-format,id=3Dscsi0-0-0-1 \ -object '{"qom-type":"secret","id":"libvirt-1-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example:server","lun":0,"transport":"tcp","user":"myname","passwor= d-secret":"libvirt-1-storage-auth-secret0","initiator-name":"iqn.1992-01.co= m.example:client","node-name":"libvirt-1-storage","auto-read-only":true,"di= scard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"l= un":2,"drive":"libvirt-1-format","id":"scsi0-0-0-2"}' \ +-device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D2,drive=3Dl= ibvirt-1-format,id=3Dscsi0-0-0-2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args index 0cd6268ee0..53b325b8bc 100644 --- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args @@ -27,22 +27,22 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","p= ort":"6000"},"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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-5-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-5-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","p= ort":"6000"},"export":"bar","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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-4-format","id":"virtio-disk1"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-4-format,id= =3Dvirtio-disk1 \ -blockdev '{"driver":"nbd","server":{"type":"inet","host":"::1","port":"60= 00"},"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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-3-format","id":"virtio-disk2"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk2 \ -blockdev '{"driver":"nbd","server":{"type":"inet","host":"::1","port":"60= 00"},"export":"bar","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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-2-format","id":"virtio-disk3"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk3 \ -blockdev '{"driver":"nbd","server":{"type":"unix","path":"/var/run/nbdsoc= k"},"export":"bar","node-name":"libvirt-1-storage","auto-read-only":true,"d= iscard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-1-format","id":"virtio-disk4"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk4 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args index 1918038f2c..3d7e6e55d3 100644 --- a/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-nfs.x86_64-latest.args @@ -27,15 +27,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"nfs","server":{"host":"example.com","type":"inet"},"= path":"/foo/bar/baz","user":6234,"group":12354,"node-name":"libvirt-3-stora= ge","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard= ":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"raw","file":"libvirt-3-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-3-format","id":"virtio-disk0","bootindex":1,"write-cache":"on","seria= l":"eb90327c-8302-4725-9e1b-4e85ed4dc251"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk0,bootindex=3D1,write-cache=3Don,serial=3Deb90327c-8302-4725-= 9e1b-4e85ed4dc251 \ -blockdev '{"driver":"nfs","server":{"host":"example.org","type":"inet"},"= path":"/backing/store/nfs","user":1234,"group":5678,"node-name":"libvirt-2-= storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"qcow= 2","file":"libvirt-2-storage","backing":null}' \ -blockdev '{"driver":"gluster","volume":"Volume2","path":"Image","server":= [{"type":"unix","path":"/path/to/sock"}],"debug":4,"node-name":"libvirt-1-s= torage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","file":"libvirt-1-storage","backing":"libvirt-2-format"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk1"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-rbd-encryption.x86_64-late= st.args b/tests/qemuxml2argvdata/disk-network-rbd-encryption.x86_64-latest.= args index 2de29d8174..459330a081 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd-encryption.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-rbd-encryption.x86_64-latest.args @@ -27,24 +27,24 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-encryptdisk/.confi= g \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -object '{"qom-type":"secret","id":"libvirt-4-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"rbd","pool":"pool","image":"image","server":[{"host"= :"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"= },{"host":"mon3.example.org","port":"6322"}],"node-name":"libvirt-4-storage= ","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"luk= s","key-secret":"libvirt-4-format-encryption-secret0","file":"libvirt-4-sto= rage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-4-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-4-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -object '{"qom-type":"secret","id":"libvirt-3-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"rbd","pool":"pool","image":"image","server":[{"host"= :"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"= },{"host":"mon3.example.org","port":"6322"}],"node-name":"libvirt-3-storage= ","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"luk= s","key-secret":"libvirt-3-format-encryption-secret0","file":"libvirt-3-sto= rage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-3-format","id":"virtio-disk1"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk1 \ -object '{"qom-type":"secret","id":"libvirt-2-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"rbd","pool":"pool","image":"image","server":[{"host"= :"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"= },{"host":"mon3.example.org","port":"6322"}],"encrypt":{"format":"luks","ke= y-secret":"libvirt-2-format-encryption-secret0"},"node-name":"libvirt-2-sto= rage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-2-format","id":"virtio-disk2"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk2 \ -object '{"qom-type":"secret","id":"libvirt-1-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"rbd","pool":"pool","image":"image2","server":[{"host= ":"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322= "},{"host":"mon3.example.org","port":"6322"}],"encrypt":{"format":"luks2","= key-secret":"libvirt-1-format-encryption-secret0"},"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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-1-format","id":"virtio-disk3"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk3 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest= .args b/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest.args index f129013eda..f100cfdda8 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-latest.args @@ -27,14 +27,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-0-0= ,bootindex=3D1 \ -blockdev '{"driver":"rbd","pool":"poolname","image":"imagename:rbd_cache= =3D1:rbd_cache_size=3D67108864:rbd_cache_max_dirty=3D0","server":[{"host":"= mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"},= {"host":"mon3.example.org","port":"6322"}],"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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk0"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args index 2fa42a0726..e1a702dd1f 100644 --- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args @@ -27,26 +27,26 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"rbd","pool":"pool","image":"image","server":[{"host"= :"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"= },{"host":"mon3.example.org","port":"6322"}],"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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-6-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-6-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"rbd","pool":"pool","image":"image","snapshot":"asdf"= ,"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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-5-format","id":"virtio-disk1"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-5-format,id= =3Dvirtio-disk1 \ -blockdev '{"driver":"rbd","pool":"pool","image":"image","snapshot":"foo",= "server":[{"host":"mon1.example.org","port":"6321"},{"host":"mon2.example.o= rg","port":"6322"},{"host":"mon3.example.org","port":"6322"}],"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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-4-format","id":"virtio-disk2"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-4-format,id= =3Dvirtio-disk2 \ -blockdev '{"driver":"rbd","pool":"pool","image":"image","snapshot":"foo",= "conf":"/blah/test.conf","node-name":"libvirt-3-storage","auto-read-only":t= rue,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-3-format","id":"virtio-disk3"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk3 \ -object '{"qom-type":"secret","id":"libvirt-2-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"rbd","pool":"pool","image":"image","server":[{"host"= :"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"= },{"host":"mon3.example.org","port":"6322"}],"user":"myname","auth-client-r= equired":["cephx","none"],"key-secret":"libvirt-2-storage-auth-secret0","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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-2-format","id":"virtio-disk4"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk4 \ -blockdev '{"driver":"rbd","pool":"pool","image":"image","server":[{"host"= :"::1","port":"6321"},{"host":"example.org","port":"6789"},{"host":"ffff:12= 34:567:abc::0f","port":"6322"},{"host":"2001:db8::ff00:42:8329","port":"632= 2"}],"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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-1-format","id":"virtio-disk5"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk5 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.= args b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args index 032605793f..873e1c6c0b 100644 --- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args @@ -27,19 +27,19 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -object '{"qom-type":"secret","id":"libvirt-3-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example:storage","lun":1,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-3-storage-auth-secret0","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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-3-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -object '{"qom-type":"secret","id":"libvirt-2-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"rbd","pool":"pool","image":"image","server":[{"host"= :"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"= },{"host":"mon3.example.org","port":"6322"}],"user":"myname","auth-client-r= equired":["cephx","none"],"key-secret":"libvirt-2-storage-auth-secret0","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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-2-format","id":"virtio-disk1"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk1 \ -object '{"qom-type":"secret","id":"libvirt-1-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"rbd","pool":"pool","image":"image2","server":[{"host= ":"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322= "},{"host":"mon3.example.org","port":"6322"}],"user":"myname","auth-client-= required":["cephx","none"],"key-secret":"libvirt-1-storage-auth-secret0","n= ode-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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-1-format","id":"virtio-disk2"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.= args b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args index 6df20bc6f5..7d285c4c28 100644 --- a/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -object '{"qom-type":"secret","id":"objlibvirt-1-storage_tls0-secret0","da= ta":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","key= id":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -object '{"qom-type":"tls-creds-x509","id":"objlibvirt-1-storage_tls0","di= r":"/etc/pki/libvirt-nbd/dummy,path","endpoint":"client","verify-peer":true= ,"passwordid":"objlibvirt-1-storage_tls0-secret0"}' \ -blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.com","p= ort":"1234"},"tls-creds":"objlibvirt-1-storage_tls0","node-name":"libvirt-1= -storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"d= iscard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-1-format","id":"virtio-disk3","bootindex":1,"write-cache":"on"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk3,bootindex=3D1,write-cache=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-no-boot.x86_64-latest.args b/tests= /qemuxml2argvdata/disk-no-boot.x86_64-latest.args index 1961f35b08..a27e5f7eda 100644 --- a/tests/qemuxml2argvdata/disk-no-boot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-no-boot.x86_64-latest.args @@ -27,17 +27,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -global isa-fdc.bootindexA=3D3 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-3-form= at","id":"ide0-0-0","bootindex":2}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-0-0= ,bootindex=3D2 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-2-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-1-0= ,bootindex=3D1 \ -blockdev '{"driver":"host_device","filename":"/dev/fd0","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 '{"driver":"floppy","unit":0,"drive":"libvirt-1-format","id":"fdc0= -0-0"}' \ +-device floppy,unit=3D0,drive=3Dlibvirt-1-format,id=3Dfdc0-0-0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args b/tests/qe= muxml2argvdata/disk-nvme.x86_64-latest.args index a7c1ee66a9..a7d84fc893 100644 --- a/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args @@ -27,21 +27,21 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 3"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x3 \ -blockdev '{"driver":"nvme","device":"0000:01:00.0","namespace":1,"node-na= me":"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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-4-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-4-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"nvme","device":"0000:01:00.0","namespace":2,"node-na= me":"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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-3-format","id":"virtio-disk1"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk1 \ -blockdev '{"driver":"nvme","device":"0000:02:00.0","namespace":1,"node-na= me":"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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-2-format","id":"virtio-disk2"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk2 \ -object '{"qom-type":"secret","id":"libvirt-1-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"nvme","device":"0001:02:00.0","namespace":2,"node-na= me":"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","encrypt":{"format":"luks","ke= y-secret":"libvirt-1-format-encryption-secret0"},"file":"libvirt-1-storage"= }' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-1-format","id":"virtio-disk3","write-cache":"on"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk3,write-cache=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-order.x86_64-latest.args b/tests/q= emuxml2argvdata/disk-order.x86_64-latest.args index bd3ebeee20..a0ce40c6a0 100644 --- a/tests/qemuxml2argvdata/disk-order.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-order.x86_64-latest.args @@ -27,20 +27,20 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-4-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-4-format,id=3Dide0-0-0= ,bootindex=3D1 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-3-form= at","id":"ide0-1-0"}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-1-0= \ -blockdev '{"driver":"file","filename":"/tmp/data.img","node-name":"libvir= t-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-2-format","id":"virtio-disk0"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk0 \ -blockdev '{"driver":"file","filename":"/tmp/logs.img","node-name":"libvir= t-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-1-format","id":"virtio-disk1"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args index 1f17124e8f..96dc3f68fc 100644 --- a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args @@ -27,14 +27,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-0-0= ,bootindex=3D1 \ -blockdev '{"driver":"host_device","filename":"/dev/sr0","node-name":"libv= irt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-rotation.x86_64-latest.args b/test= s/qemuxml2argvdata/disk-rotation.x86_64-latest.args index 4a04c9720a..4c1df40442 100644 --- a/tests/qemuxml2argvdata/disk-rotation.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-rotation.x86_64-latest.args @@ -27,18 +27,18 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ -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 '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi0-0-0-0","drive":"libvirt-3-format","id":"scsi0-0= -0-0","bootindex":1,"rotation_rate":7200}' \ +-device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi0-0-0-0,drive=3Dlibvirt-3-format,id=3Dscsi0-0-0-0,bootindex=3D1,r= otation_rate=3D7200 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","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 '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :1,"device_id":"drive-scsi0-0-0-1","drive":"libvirt-2-format","id":"scsi0-0= -0-1","rotation_rate":1}' \ +-device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D1,device_id=3D= drive-scsi0-0-0-1,drive=3Dlibvirt-2-format,id=3Dscsi0-0-0-1,rotation_rate= =3D1 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest3","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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","rotation_rate":4500}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,rotation_rate=3D4500 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args index 3a8bb61675..8dddf49993 100644 --- a/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-sata-device.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"ahci","id":"sata0","bus":"pci.0","addr":"0x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device ahci,id=3Dsata0,bus=3Dpci.0,addr=3D0x2 \ -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 '{"driver":"ide-hd","bus":"sata0.0","drive":"libvirt-1-format","id= ":"sata0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dsata0.0,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,booti= ndex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.arg= s b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args index e2189faa27..3130aebd8a 100644 --- a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args @@ -27,15 +27,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"lsi","id":"scsi0","bus":"pci.0","addr":"0x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device lsi,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-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 '{"driver":"scsi-hd","bus":"scsi0.0","scsi-id":0,"device_id":"driv= e-scsi0-0-0","drive":"libvirt-1-format","id":"scsi0-0-0"}' \ +-device scsi-hd,bus=3Dscsi0.0,scsi-id=3D0,device_id=3Ddrive-scsi0-0-0,driv= e=3Dlibvirt-1-format,id=3Dscsi0-0-0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-split.x86_64-latest.args= b/tests/qemuxml2argvdata/disk-scsi-disk-split.x86_64-latest.args index 3921050420..2e565db4e8 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-split.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-disk-split.x86_64-latest.args @@ -27,24 +27,24 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 2"}' \ --device '{"driver":"lsi","id":"scsi1","bus":"pci.0","addr":"0x3"}' \ --device '{"driver":"lsi","id":"scsi2","bus":"pci.0","addr":"0x4"}' \ --device '{"driver":"virtio-scsi-pci","id":"scsi3","bus":"pci.0","addr":"0x= 5"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ +-device lsi,id=3Dscsi1,bus=3Dpci.0,addr=3D0x3 \ +-device lsi,id=3Dscsi2,bus=3Dpci.0,addr=3D0x4 \ +-device virtio-scsi-pci,id=3Dscsi3,bus=3Dpci.0,addr=3D0x5 \ -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":true,"driver":"raw"= ,"file":"libvirt-4-storage"}' \ --device '{"driver":"scsi-cd","bus":"scsi0.0","channel":0,"scsi-id":1,"lun"= :0,"device_id":"drive-scsi0-0-1-0","drive":"libvirt-4-format","id":"scsi0-0= -1-0"}' \ +-device scsi-cd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D1,lun=3D0,device_id=3D= drive-scsi0-0-1-0,drive=3Dlibvirt-4-format,id=3Dscsi0-0-1-0 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-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 '{"driver":"scsi-cd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi0-0-0-0","drive":"libvirt-3-format","id":"scsi0-0= -0-0"}' \ +-device scsi-cd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi0-0-0-0,drive=3Dlibvirt-3-format,id=3Dscsi0-0-0-0 \ -blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"li= bvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :1,"device_id":"drive-scsi0-0-0-1","drive":"libvirt-2-format","id":"scsi0-0= -0-1","bootindex":1}' \ +-device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D1,device_id=3D= drive-scsi0-0-0-1,drive=3Dlibvirt-2-format,id=3Dscsi0-0-0-1,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 '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":1,"lun"= :1,"device_id":"drive-scsi0-0-1-1","drive":"libvirt-1-format","id":"scsi0-0= -1-1"}' \ +-device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D1,lun=3D1,device_id=3D= drive-scsi0-0-1-1,drive=3Dlibvirt-1-format,id=3Dscsi0-0-1-1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-scsi-disk-vpd.x86_64-latest.args index 4c7515df3a..58992405a1 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.x86_64-latest.args @@ -27,16 +27,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 2"}' \ --device '{"driver":"lsi","id":"scsi1","bus":"pci.0","addr":"0x3"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ +-device lsi,id=3Dscsi1,bus=3Dpci.0,addr=3D0x3 \ -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":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device '{"driver":"scsi-cd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi0-0-0-0","drive":"libvirt-2-format","id":"scsi0-0= -0-0","vendor":"SEAGATE","product":"ST3146707LC"}' \ +-device scsi-cd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi0-0-0-0,drive=3Dlibvirt-2-format,id=3Dscsi0-0-0-0,vendor=3DSEAGAT= E,product=3DST3146707LC \ -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":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi1.0","scsi-id":0,"device_id":"driv= e-scsi1-0-0","drive":"libvirt-1-format","id":"scsi1-0-0","bootindex":1,"ven= dor":"SEA GATE","product":"ST67 807GD"}' \ +-device 'scsi-hd,bus=3Dscsi1.0,scsi-id=3D0,device_id=3Ddrive-scsi1-0-0,dri= ve=3Dlibvirt-1-format,id=3Dscsi1-0-0,bootindex=3D1,vendor=3DSEA GATE,produc= t=3DST67 807GD' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-scsi-disk-wwn.x86_64-latest.args index a8d0e271c8..b85a2c1967 100644 --- a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.x86_64-latest.args @@ -27,16 +27,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 2"}' \ --device '{"driver":"lsi","id":"scsi1","bus":"pci.0","addr":"0x3"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ +-device lsi,id=3Dscsi1,bus=3Dpci.0,addr=3D0x3 \ -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":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device '{"driver":"scsi-cd","bus":"scsi0.0","channel":0,"scsi-id":1,"lun"= :0,"device_id":"WD-WMAP9A966149","drive":"libvirt-2-format","id":"scsi0-0-1= -0","wwn":5764824127192592812,"serial":"WD-WMAP9A966149"}' \ +-device scsi-cd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D1,lun=3D0,device_id=3D= WD-WMAP9A966149,drive=3Dlibvirt-2-format,id=3Dscsi0-0-1-0,wwn=3D57648241271= 92592812,serial=3DWD-WMAP9A966149 \ -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 '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi0-0-0-0","drive":"libvirt-1-format","id":"scsi0-0= -0-0","bootindex":1,"wwn":5764824127192592813}' \ +-device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi0-0-0-0,drive=3Dlibvirt-1-format,id=3Dscsi0-0-0-0,bootindex=3D1,w= wn=3D5764824127192592813 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.x86_64-latest= .args b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.x86_64-latest.args index 6c93169fbb..84dc2f9983 100644 --- a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.x86_64-latest.args @@ -27,16 +27,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 2"}' \ --device '{"driver":"lsi","id":"scsi1","bus":"pci.0","addr":"0x3"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ +-device lsi,id=3Dscsi1,bus=3Dpci.0,addr=3D0x3 \ -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 '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"l= un":0,"drive":"libvirt-2-format","id":"scsi0-0-0-0","bootindex":1}' \ +-device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive=3Dl= ibvirt-2-format,id=3Dscsi0-0-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 '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":1,"l= un":1,"drive":"libvirt-1-format","id":"scsi0-0-1-1"}' \ +-device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D1,lun=3D1,drive=3Dl= ibvirt-1-format,id=3Dscsi0-0-1-1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args b/tests/qe= muxml2argvdata/disk-scsi.x86_64-latest.args index 4b4b7e381e..cd97a5f136 100644 --- a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args @@ -27,31 +27,31 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"lsi","id":"scsi0","bus":"pci.0","addr":"0x2"}' \ --device '{"driver":"megasas","id":"scsi1","bus":"pci.0","addr":"0x3"}' \ --device '{"driver":"mptsas1068","id":"scsi2","bus":"pci.0","addr":"0x4"}' \ --device '{"driver":"spapr-vscsi","id":"scsi3","reg":8192}' \ --device '{"driver":"pvscsi","id":"scsi4","bus":"pci.0","addr":"0x5"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device lsi,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ +-device megasas,id=3Dscsi1,bus=3Dpci.0,addr=3D0x3 \ +-device mptsas1068,id=3Dscsi2,bus=3Dpci.0,addr=3D0x4 \ +-device spapr-vscsi,id=3Dscsi3,reg=3D8192 \ +-device pvscsi,id=3Dscsi4,bus=3Dpci.0,addr=3D0x5 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-6-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-6-format,id=3Dide0-0-0= ,bootindex=3D1 \ -blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"li= bvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw= ","file":"libvirt-5-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi0.0","scsi-id":0,"device_id":"driv= e-scsi0-0-0","drive":"libvirt-5-format","id":"scsi0-0-0"}' \ +-device scsi-hd,bus=3Dscsi0.0,scsi-id=3D0,device_id=3Ddrive-scsi0-0-0,driv= e=3Dlibvirt-5-format,id=3Dscsi0-0-0 \ -blockdev '{"driver":"file","filename":"/tmp/scsidisk2.img","node-name":"l= ibvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"raw= ","file":"libvirt-4-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi1.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"abcdefghijklmn","drive":"libvirt-4-format","id":"scsi1-0-0-= 0","serial":"abcdefghijklmn"}' \ +-device scsi-hd,bus=3Dscsi1.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= abcdefghijklmn,drive=3Dlibvirt-4-format,id=3Dscsi1-0-0-0,serial=3Dabcdefghi= jklmn \ -blockdev '{"driver":"file","filename":"/tmp/scsidisk3.img","node-name":"l= ibvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi2.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi2-0-0-0","drive":"libvirt-3-format","id":"scsi2-0= -0-0","wwn":5764824127192592812}' \ +-device scsi-hd,bus=3Dscsi2.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi2-0-0-0,drive=3Dlibvirt-3-format,id=3Dscsi2-0-0-0,wwn=3D576482412= 7192592812 \ -blockdev '{"driver":"file","filename":"/tmp/scsidisk4.img","node-name":"l= ibvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi3.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi3-0-0-0","drive":"libvirt-2-format","id":"scsi3-0= -0-0"}' \ +-device scsi-hd,bus=3Dscsi3.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi3-0-0-0,drive=3Dlibvirt-2-format,id=3Dscsi3-0-0-0 \ -blockdev '{"driver":"file","filename":"/tmp/scsidisk5.img","node-name":"l= ibvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"scsi-hd","bus":"scsi4.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi4-0-0-0","drive":"libvirt-1-format","id":"scsi4-0= -0-0"}' \ +-device scsi-hd,bus=3Dscsi4.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi4-0-0-0,drive=3Dlibvirt-1-format,id=3Dscsi4-0-0-0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-serial.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-serial.x86_64-latest.args index be4ed131e3..760e89235e 100644 --- a/tests/qemuxml2argvdata/disk-serial.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-serial.x86_64-latest.args @@ -27,15 +27,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":1,"drive":"libvirt-2-form= at","id":"ide0-0-1","bootindex":1,"serial":"\\ \\ WD-WMAP9A966149"}' \ +-device 'ide-hd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-2-format,id=3Dide0-0-= 1,bootindex=3D1,serial=3D\ \ WD-WMAP9A966149' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/AllSerialChars"= ,"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 '{"driver":"ide-hd","bus":"ide.0","unit":2,"drive":"libvirt-1-form= at","id":"ide0-0-2","serial":"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRS= TUVWXYZ0123456789-_\\ .+"}' \ +-device 'ide-hd,bus=3Dide.0,unit=3D2,drive=3Dlibvirt-1-format,id=3Dide0-0-= 2,serial=3DabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_= \ .+' \ -drive file=3D/some/file,format=3Draw,if=3Dsd,index=3D0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-shared.x86_64-latest.args index 72967dd57b..e479d5e3b6 100644 --- a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args @@ -27,21 +27,21 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-4-storage","cache":{"direct":true,"no-flush":false},"auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"raw","file":"libvirt-4-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"share-rw":true,"drive"= :"libvirt-4-format","id":"ide0-0-0","bootindex":1,"write-cache":"on","seria= l":"XYZXYZXYZYXXYZYZYXYZY"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,share-rw=3Don,drive=3Dlibvirt-4-format= ,id=3Dide0-0-0,bootindex=3D1,write-cache=3Don,serial=3DXYZXYZXYZYXXYZYZYXYZ= Y \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-3-form= at","id":"ide0-1-0"}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-1-0= \ -blockdev '{"driver":"host_device","filename":"/dev/scsi","node-name":"lib= virt-2-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":t= rue,"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 '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi0-0-0-0","share-rw":true,"drive":"libvirt-2-forma= t","id":"scsi0-0-0-0","write-cache":"on"}' \ +-device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi0-0-0-0,share-rw=3Don,drive=3Dlibvirt-2-format,id=3Dscsi0-0-0-0,w= rite-cache=3Don \ -blockdev '{"driver":"host_device","filename":"/dev/virtio","node-name":"l= ibvirt-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":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","share-rw":= true,"drive":"libvirt-1-format","id":"virtio-disk0","write-cache":"on"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,share-rw=3Don,drive=3Dlibvir= t-1-format,id=3Dvirtio-disk0,write-cache=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-slices.x86_64-latest.args index 1374424214..7590305fb7 100644 --- a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args @@ -27,30 +27,30 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/raw.img","= node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw= ","offset":0,"size":321,"file":"libvirt-6-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-6-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-6-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/raw.img","= node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"driver":"raw","node-name":"libvirt-5-slice-sto","offset":9876= ,"size":123456789,"file":"libvirt-5-storage","auto-read-only":true,"discard= ":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":true,"driver":"qcow= 2","file":"libvirt-5-slice-sto","backing":null}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/overlay.qc= ow2","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap= "}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"qco= w2","file":"libvirt-4-storage","backing":"libvirt-5-format"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-4-format","id":"virtio-disk1"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-4-format,id= =3Dvirtio-disk1 \ -object '{"qom-type":"secret","id":"libvirt-3-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/luks.img",= "node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"driver":"raw","node-name":"libvirt-3-slice-sto","offset":1234= ,"size":321,"file":"libvirt-3-storage","auto-read-only":true,"discard":"unm= ap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"luk= s","key-secret":"libvirt-3-format-encryption-secret0","file":"libvirt-3-sli= ce-sto"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-3-format","id":"virtio-disk2"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk2 \ -blockdev '{"driver":"nvme","device":"0000:02:00.0","namespace":1,"node-na= me":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","offset":1234,"size":321,"file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-2-format","id":"virtio-disk3"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk3 \ -object '{"qom-type":"secret","id":"libvirt-1-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"nvme","device":"0001:02:00.0","namespace":2,"node-na= me":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read= -only":true,"discard":"unmap"}' \ -blockdev '{"driver":"raw","node-name":"libvirt-1-slice-sto","offset":1234= ,"size":321,"file":"libvirt-1-storage","auto-read-only":true,"discard":"unm= ap","cache":{"direct":true,"no-flush":false}}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","encrypt":{"format":"luks","ke= y-secret":"libvirt-1-format-encryption-secret0"},"file":"libvirt-1-slice-st= o"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-1-format","id":"virtio-disk4","write-cache":"on"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk4,write-cache=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x5"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x5 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-snapshot.x86_64-latest.args b/test= s/qemuxml2argvdata/disk-snapshot.x86_64-latest.args index 0bb023e64d..efa884ba41 100644 --- a/tests/qemuxml2argvdata/disk-snapshot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-snapshot.x86_64-latest.args @@ -27,17 +27,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-name":"libvirt-3-storage","cache":{"direct":true,"no-flush":false},"auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-3-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-3-form= at","id":"ide0-0-0","bootindex":1,"write-cache":"on"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest3","no= de-name":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},"auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"dir= ect":true,"no-flush":false},"driver":"qcow2","file":"libvirt-2-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.2","unit":0,"drive":"libvirt-2-form= at","id":"ide0-2-0","write-cache":"on"}' \ +-device ide-hd,bus=3Dide.2,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-2-0= ,write-cache=3Don \ -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":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0"}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-latest.arg= s b/tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-latest.args index e7a3b40aa2..79b49738f7 100644 --- a/tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-latest.args @@ -27,20 +27,20 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"host_device","filename":"/some/block/device/unit:0:0= :1","node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"= }' \ -blockdev '{"node-name":"libvirt-4-format","read-only":true,"driver":"raw"= ,"file":"libvirt-4-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-4-form= at","id":"ide0-0-1"}' \ +-device ide-cd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-4-format,id=3Dide0-0-1= \ -blockdev '{"driver":"iscsi","portal":"iscsi.example.com:3260","target":"d= emo-target","lun":2,"transport":"tcp","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 '{"driver":"ide-cd","bus":"ide.0","unit":2,"drive":"libvirt-3-form= at","id":"ide0-0-2"}' \ +-device ide-cd,bus=3Dide.0,unit=3D2,drive=3Dlibvirt-3-format,id=3Dide0-0-2= \ -blockdev '{"driver":"file","filename":"/tmp/idedisk.img","node-name":"lib= virt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":3,"drive":"libvirt-2-form= at","id":"ide0-0-3","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D3,drive=3Dlibvirt-2-format,id=3Dide0-0-3= ,bootindex=3D1 \ -blockdev '{"driver":"iscsi","portal":"iscsi.example.com:3260","target":"d= emo-target","lun":3,"transport":"tcp","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 '{"driver":"ide-cd","bus":"ide.0","unit":4,"drive":"libvirt-1-form= at","id":"ide0-0-4"}' \ +-device ide-cd,bus=3Dide.0,unit=3D4,drive=3Dlibvirt-1-format,id=3Dide0-0-4= \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-source-pool.x86_64-latest.args b/t= ests/qemuxml2argvdata/disk-source-pool.x86_64-latest.args index 34ba9a0ed2..a1141138f2 100644 --- a/tests/qemuxml2argvdata/disk-source-pool.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-source-pool.x86_64-latest.args @@ -27,21 +27,21 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"host_device","filename":"/some/block/device/cdrom","= node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":true,"driver":"raw"= ,"file":"libvirt-5-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.0","unit":1,"drive":"libvirt-5-form= at","id":"ide0-0-1"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"id":"ide0-1-0"}' \ +-device ide-cd,bus=3Dide.0,unit=3D1,drive=3Dlibvirt-5-format,id=3Dide0-0-1= \ +-device ide-cd,bus=3Dide.1,unit=3D0,id=3Dide0-1-0 \ -blockdev '{"driver":"file","filename":"/tmp/idedisk.img","node-name":"lib= virt-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device '{"driver":"ide-hd","bus":"ide.0","unit":2,"drive":"libvirt-3-form= at","id":"ide0-0-2","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D2,drive=3Dlibvirt-3-format,id=3Dide0-0-2= ,bootindex=3D1 \ -blockdev '{"driver":"vvfat","dir":"/some/dir/device/vol1","floppy":false,= "rw":false,"node-name":"libvirt-2-storage","auto-read-only":true,"discard":= "unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"raw"= ,"file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-2-format","id":"virtio-disk0"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk0 \ -blockdev '{"driver":"vvfat","dir":"/some/dir/device/vol2","floppy":false,= "rw":false,"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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-1-format","id":"virtio-disk1"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args b/tes= ts/qemuxml2argvdata/disk-transient.x86_64-latest.args index 339f543628..497d9d88bb 100644 --- a/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-transient.x86_64-latest.args @@ -27,11 +27,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"file","filename":"/tmp/QEMUGuest1.img","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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","write-cache":"on"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,write-cache=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-usb-device-removable.x86_64-latest= .args b/tests/qemuxml2argvdata/disk-usb-device-removable.x86_64-latest.args index 44a4665022..5ff9368482 100644 --- a/tests/qemuxml2argvdata/disk-usb-device-removable.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-usb-device-removable.x86_64-latest.args @@ -27,14 +27,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-0-0= ,bootindex=3D1 \ -blockdev '{"driver":"file","filename":"/tmp/usbdisk.img","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"usb-storage","bus":"usb.0","port":"1","drive":"libvirt= -1-format","id":"usb-disk0","removable":true}' \ +-device usb-storage,bus=3Dusb.0,port=3D1,drive=3Dlibvirt-1-format,id=3Dusb= -disk0,removable=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-usb-device.x86_64-latest.args b/te= sts/qemuxml2argvdata/disk-usb-device.x86_64-latest.args index 96186782f6..fb91ba66e6 100644 --- a/tests/qemuxml2argvdata/disk-usb-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-usb-device.x86_64-latest.args @@ -27,14 +27,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-2-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-2-format,id=3Dide0-0-0= ,bootindex=3D1 \ -blockdev '{"driver":"file","filename":"/tmp/usbdisk.img","node-name":"lib= virt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"usb-storage","bus":"usb.0","port":"1","drive":"libvirt= -1-format","id":"usb-disk0","removable":false}' \ +-device usb-storage,bus=3Dusb.0,port=3D1,drive=3Dlibvirt-1-format,id=3Dusb= -disk0,removable=3Doff \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args b/tes= ts/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args index 31428fc697..4d1f7ba75b 100644 --- a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -chardev socket,id=3Dchr-vu-virtio-disk0,path=3D/tmp/vhost1.sock \ --device '{"driver":"vhost-user-blk-pci","bus":"pci.0","addr":"0x2","charde= v":"chr-vu-virtio-disk0","id":"virtio-disk0","bootindex":1}' \ +-device vhost-user-blk-pci,bus=3Dpci.0,addr=3D0x2,chardev=3Dchr-vu-virtio-= disk0,id=3Dvirtio-disk0,bootindex=3D1 \ -chardev socket,id=3Dchr-vu-virtio-disk1,path=3D/tmp/vhost1.sock,reconnect= =3D10 \ --device '{"driver":"vhost-user-blk-pci","iommu_platform":true,"ats":true,"= packed":true,"bus":"pci.0","addr":"0x3","chardev":"chr-vu-virtio-disk1","id= ":"virtio-disk1"}' \ +-device vhost-user-blk-pci,iommu_platform=3Don,ats=3Don,packed=3Don,bus=3D= pci.0,addr=3D0x3,chardev=3Dchr-vu-virtio-disk1,id=3Dvirtio-disk1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args b= /tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args index 695ba4e39f..ac2736833a 100644 --- a/tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-virtio-queues.x86_64-latest.args @@ -27,16 +27,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"file","filename":"/tmp/data.img","node-name":"libvir= t-3-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw= ","file":"libvirt-3-storage"}' \ --device '{"driver":"virtio-blk-pci","num-queues":4,"bus":"pci.0","addr":"0= x3","drive":"libvirt-3-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,num-queues=3D4,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvi= rt-3-format,id=3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"file","filename":"/tmp/data1.img","node-name":"libvi= rt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","queue-size":256,"bus":"pci.0","addr":= "0x4","drive":"libvirt-2-format","id":"virtio-disk1"}' \ +-device virtio-blk-pci,queue-size=3D256,bus=3Dpci.0,addr=3D0x4,drive=3Dlib= virt-2-format,id=3Dvirtio-disk1 \ -blockdev '{"driver":"file","filename":"/tmp/data2.img","node-name":"libvi= rt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","num-queues":4,"queue-size":256,"bus":= "pci.0","addr":"0x5","drive":"libvirt-1-format","id":"virtio-disk2"}' \ +-device virtio-blk-pci,num-queues=3D4,queue-size=3D256,bus=3Dpci.0,addr=3D= 0x5,drive=3Dlibvirt-1-format,id=3Dvirtio-disk2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-la= test.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-lat= est.args index 49dbd383d1..ee2ab63bc2 100644 --- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.ar= gs @@ -28,16 +28,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-scsi-pci","id":"scsi0","num_queues":8,"bus":"pc= i.0","addr":"0x3"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-scsi-pci,id=3Dscsi0,num_queues=3D8,bus=3Dpci.0,addr=3D0x3 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","pr= -manager":"pr-helper0","node-name":"libvirt-2-storage","auto-read-only":tru= e,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"l= un":0,"drive":"libvirt-2-format","id":"scsi0-0-0-0","bootindex":1}' \ +-device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive=3Dl= ibvirt-2-format,id=3Dscsi0-0-0-0,bootindex=3D1 \ -object '{"qom-type":"pr-manager-helper","id":"pr-helper-libvirt-1-storage= ","path":"/path/to/qemu-pr-helper.sock"}' \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","pr= -manager":"pr-helper-libvirt-1-storage","node-name":"libvirt-1-storage","au= to-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"scsi-block","bus":"scsi0.0","channel":0,"scsi-id":0,"l= un":1,"drive":"libvirt-1-format","id":"scsi0-0-0-1"}' \ +-device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D1,drive=3Dl= ibvirt-1-format,id=3Dscsi0-0-0-1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-virtio.x86_64-latest.args b/tests/= qemuxml2argvdata/disk-virtio.x86_64-latest.args index fc9bb9aed9..4d688cb8a5 100644 --- a/tests/qemuxml2argvdata/disk-virtio.x86_64-latest.args +++ b/tests/qemuxml2argvdata/disk-virtio.x86_64-latest.args @@ -27,19 +27,19 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-4-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-4-format,id=3Dide0-0-0= ,bootindex=3D1 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","no= de-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 '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-3-form= at","id":"ide0-1-0"}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-3-format,id=3Dide0-1-0= \ -blockdev '{"driver":"file","filename":"/tmp/data.img","node-name":"libvir= t-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-2-format","id":"virtio-disk0"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk0 \ -blockdev '{"driver":"file","filename":"/tmp/logs.img","node-name":"libvir= t-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x3","drive":"li= bvirt-1-format","id":"virtio-disk1"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-latest.args= b/tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-latest.args index 03926ef56c..a382e595a5 100644 --- a/tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-latest.args +++ b/tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-encryptdisk/.confi= g \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -object '{"qom-type":"secret","id":"libvirt-1-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"file","filename":"/storage/guest_disks/encryptdisk",= "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","encrypt":{"format":"luks","key-secret":"libvirt-1-format-encryption-se= cret0"},"file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/encrypted-disk.x86_64-latest.args b/tes= ts/qemuxml2argvdata/encrypted-disk.x86_64-latest.args index 421ea42d92..f2b1026a98 100644 --- a/tests/qemuxml2argvdata/encrypted-disk.x86_64-latest.args +++ b/tests/qemuxml2argvdata/encrypted-disk.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-encryptdisk/.confi= g \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -object '{"qom-type":"secret","id":"libvirt-1-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"file","filename":"/storage/guest_disks/encryptdisk",= "node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","encrypt":{"format":"luks","key-secret":"libvirt-1-format-encryption-se= cret0"},"file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args b/tests= /qemuxml2argvdata/eoi-disabled.x86_64-latest.args index e5d5df217a..9c6a6cf006 100644 --- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args b/tests/= qemuxml2argvdata/eoi-enabled.x86_64-latest.args index 7110398e8b..87e80abd92 100644 --- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/event_idx.x86_64-latest.args b/tests/qe= muxml2argvdata/event_idx.x86_64-latest.args index afdde09e8a..9b5bc8c3f3 100644 --- a/tests/qemuxml2argvdata/event_idx.x86_64-latest.args +++ b/tests/qemuxml2argvdata/event_idx.x86_64-latest.args @@ -27,17 +27,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -no-shutdown \ -no-acpi \ -boot menu=3Don,strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x6"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x6 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/f14.img","= node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"qco= w2","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","event_idx":true,"bus":"pci.0","addr":= "0x4","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \ +-device virtio-blk-pci,event_idx=3Don,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvi= rt-2-format,id=3Dvirtio-disk0,bootindex=3D2 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/Fedora-14-x86_64-= Live-KDE.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discar= d":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw"= ,"file":"libvirt-1-storage"}' \ --device '{"driver":"ide-cd","bus":"ide.1","unit":0,"drive":"libvirt-1-form= at","id":"ide0-1-0","bootindex":1}' \ +-device ide-cd,bus=3Dide.1,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-1-0= ,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci","event_idx":false,"netdev":"hostnet0",= "id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ +-device virtio-net-pci,event_idx=3Doff,netdev=3Dhostnet0,id=3Dnet0,mac=3D5= 2:54:00:e5:48:58,bus=3Dpci.0,addr=3D0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology4.x86_64-latest.= args b/tests/qemuxml2argvdata/fd-memory-numa-topology4.x86_64-latest.args index acf027ee16..9ca90de623 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology4.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology4.x86_64-latest.args @@ -28,8 +28,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-pc/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args b/tests= /qemuxml2argvdata/fips-enabled.x86_64-latest.args index 7a52bb6a8c..bb70bd2f6a 100644 --- a/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fips-enabled.x86_64-latest.args @@ -27,11 +27,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args b/t= ests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args index 3d28e9d9db..a89c646876 100644 --- a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args +++ b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -global isa-fdc.bootindexA=3D1 \ -blockdev '{"driver":"vvfat","dir":"/var/somefiles","floppy":true,"rw":fal= se,"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 '{"driver":"floppy","unit":0,"drive":"libvirt-1-format","id":"fdc0= -0-0"}' \ +-device floppy,unit=3D0,drive=3Dlibvirt-1-format,id=3Dfdc0-0-0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/fs9p.x86_64-latest.args b/tests/qemuxml= 2argvdata/fs9p.x86_64-latest.args index 75c01a9e86..937e2aedfe 100644 --- a/tests/qemuxml2argvdata/fs9p.x86_64-latest.args +++ b/tests/qemuxml2argvdata/fs9p.x86_64-latest.args @@ -28,11 +28,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-acpi \ -boot strict=3Don \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/to= /guest \ --device '{"driver":"virtio-9p-pci","id":"fs0","fsdev":"fsdev-fs0","mount_t= ag":"/import/from/host","bus":"pci.0","addr":"0x2"}' \ +-device virtio-9p-pci,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3D/import/from/= host,bus=3Dpci.0,addr=3D0x2 \ -fsdev local,security_model=3Dmapped,writeout=3Dimmediate,id=3Dfsdev-fs1,p= ath=3D/export/to/guest2 \ --device '{"driver":"virtio-9p-pci","id":"fs1","fsdev":"fsdev-fs1","mount_t= ag":"/import/from/host2","bus":"pci.0","addr":"0x3"}' \ +-device virtio-9p-pci,id=3Dfs1,fsdev=3Dfsdev-fs1,mount_tag=3D/import/from/= host2,bus=3Dpci.0,addr=3D0x3 \ -fsdev handle,writeout=3Dimmediate,id=3Dfsdev-fs2,path=3D/export/to/guest3= \ --device '{"driver":"virtio-9p-pci","id":"fs2","fsdev":"fsdev-fs2","mount_t= ag":"/import/from/host3","bus":"pci.0","addr":"0x4"}' \ +-device virtio-9p-pci,id=3Dfs2,fsdev=3Dfsdev-fs2,mount_tag=3D/import/from/= host3,bus=3Dpci.0,addr=3D0x4 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args b/tests/q= emuxml2argvdata/genid-auto.x86_64-latest.args index 110d031d50..f2f422932a 100644 --- a/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args @@ -18,7 +18,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --device '{"driver":"vmgenid","guid":"00010203-0405-4607-8809-0a0b0c0d0e0f"= ,"id":"vmgenid0"}' \ +-device vmgenid,guid=3D00010203-0405-4607-8809-0a0b0c0d0e0f,id=3Dvmgenid0 \ -display none \ -no-user-config \ -nodefaults \ @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/genid.x86_64-latest.args b/tests/qemuxm= l2argvdata/genid.x86_64-latest.args index e66b0499a2..98dcc17d97 100644 --- a/tests/qemuxml2argvdata/genid.x86_64-latest.args +++ b/tests/qemuxml2argvdata/genid.x86_64-latest.args @@ -18,7 +18,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -overcommit mem-lock=3Doff \ -smp 1,sockets=3D1,cores=3D1,threads=3D1 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --device '{"driver":"vmgenid","guid":"e9392370-2917-565e-692b-d057f46512d6"= ,"id":"vmgenid0"}' \ +-device vmgenid,guid=3De9392370-2917-565e-692b-d057f46512d6,id=3Dvmgenid0 \ -display none \ -no-user-config \ -nodefaults \ @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64= -latest.args b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_= 64-latest.args index a62d79fe6b..3c42398fbe 100644 --- a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest= .args @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -display egl-headless,rendernode=3D/dev/dri/foo \ --device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.arg= s b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args index a62d79fe6b..3c42398fbe 100644 --- a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -display egl-headless,rendernode=3D/dev/dri/foo \ --device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x86_64-l= atest.args b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x86_64-l= atest.args index e7464037cc..73ee3b882e 100644 --- a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.x86_64-latest.a= rgs @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,tls-channel=3Dmain,plaintext-channel=3Dinputs,disable-agent-fil= e-xfer=3Don,seamless-migration=3Don \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :33554432,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","= addr":"0x2"}' \ --device '{"driver":"qxl","id":"video1","ram_size":67108864,"vram_size":671= 08864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","addr= ":"0x4"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,vram6= 4_size_mb=3D0,vgamem_mb=3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ +-device qxl,id=3Dvideo1,ram_size=3D67108864,vram_size=3D67108864,vram64_si= ze_mb=3D0,vgamem_mb=3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x4 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.x86_64-latest= .args b/tests/qemuxml2argvdata/graphics-spice-agentmouse.x86_64-latest.args index 1fffb421b4..daad59bfb2 100644 --- a/tests/qemuxml2argvdata/graphics-spice-agentmouse.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-agentmouse.x86_64-latest.args @@ -26,13 +26,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial1","bus":"pci.0"= ,"addr":"0xa"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-serial-pci,id=3Dvirtio-serial1,bus=3Dpci.0,addr=3D0xa \ -chardev spicevmc,id=3Dcharchannel0,name=3Dvdagent \ --device '{"driver":"virtserialport","bus":"virtio-serial1.0","nr":3,"chard= ev":"charchannel0","id":"channel0","name":"com.redhat.spice.0"}' \ +-device virtserialport,bus=3Dvirtio-serial1.0,nr=3D3,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dcom.redhat.spice.0 \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,agent-mouse=3Doff,x509= -dir=3D/etc/pki/libvirt-spice,tls-channel=3Dmain,seamless-migration=3Don \ --device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-l= atest.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-l= atest.args index 9e167c7df6..ee572908a5 100644 --- a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.x86_64-latest.a= rgs @@ -26,9 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice unix,addr=3D/tmp/lib/domain--1-QEMUGuest1/spice.sock,seamless-migra= tion=3Don \ --device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-lates= t.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-latest.ar= gs index 9e167c7df6..ee572908a5 100644 --- a/tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket.x86_64-latest.args @@ -26,9 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice unix,addr=3D/tmp/lib/domain--1-QEMUGuest1/spice.sock,seamless-migra= tion=3Don \ --device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.x86_64-lates= t.args b/tests/qemuxml2argvdata/graphics-spice-compression.x86_64-latest.ar= gs index c385a26661..8fc83773a7 100644 --- a/tests/qemuxml2argvdata/graphics-spice-compression.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-compression.x86_64-latest.args @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,image-compression=3Dauto_glz,jpeg-wan-compression=3Dauto,zlib-g= lz-wan-compression=3Dauto,playback-compression=3Don,streaming-video=3Dfilte= r,seamless-migration=3Don \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :33554432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","a= ddr":"0x2"}' \ --device '{"driver":"qxl","id":"video1","ram_size":67108864,"vram_size":335= 54432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","addr"= :"0x4"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,vram6= 4_size_mb=3D0,vgamem_mb=3D8,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ +-device qxl,id=3Dvideo1,ram_size=3D67108864,vram_size=3D33554432,vram64_si= ze_mb=3D0,vgamem_mb=3D8,max_outputs=3D1,bus=3Dpci.0,addr=3D0x4 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_64-late= st.args b/tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_64-latest.= args index be696759e0..1089520ef0 100644 --- a/tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.x86_64-latest.args @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5903,addr=3D127.0.0.1,seamless-migration=3Don \ -display egl-headless,rendernode=3D/dev/dri/foo \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :33554432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","a= ddr":"0x2"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,vram6= 4_size_mb=3D0,vgamem_mb=3D8,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_6= 4-latest.args b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x8= 6_64-latest.args index 7d125af4ce..0b96999fda 100644 --- a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-lates= t.args +++ b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-lates= t.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D0,gl=3Don,rendernode=3D/dev/dri/foo,seamless-migration=3Don \ --device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-no-args.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/graphics-spice-no-args.x86_64-latest.args index 278854eee1..c96810ac59 100644 --- a/tests/qemuxml2argvdata/graphics-spice-no-args.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-no-args.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D0,seamless-migration=3Don \ --device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-latest.args index dfd2e37eb5..c6e3cfe43d 100644 --- a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.x86_64-latest.args @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,tls-channel=3Dmain,plaintext-channel=3Dinputs,seamless-migratio= n=3Don \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :33554432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","a= ddr":"0x2"}' \ --device '{"driver":"qxl","id":"video1","ram_size":67108864,"vram_size":671= 08864,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","addr"= :"0x4"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,vram6= 4_size_mb=3D0,vgamem_mb=3D8,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ +-device qxl,id=3Dvideo1,ram_size=3D67108864,vram_size=3D67108864,vram64_si= ze_mb=3D0,vgamem_mb=3D8,max_outputs=3D1,bus=3Dpci.0,addr=3D0x4 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args = b/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args index f274f31cfc..80ab956b27 100644 --- a/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args @@ -27,10 +27,10 @@ SASL_CONF_PATH=3D/root/.sasl2 \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,sasl=3Don,x509-dir=3D/= etc/pki/libvirt-spice,tls-channel=3Ddefault,seamless-migration=3Don \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :33554432,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","= addr":"0x2"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,vram6= 4_size_mb=3D0,vgamem_mb=3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.arg= s b/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args index eb39816574..2fdc9b1d2f 100644 --- a/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-socket.x86_64-latest.args @@ -26,9 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice unix,addr=3D/tmp/spice.sock,seamless-migration=3Don \ --device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args index 541634b807..02c5f64efc 100644 --- a/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-timeout.x86_64-latest.args @@ -25,15 +25,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-f14/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot menu=3Don,strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x6"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x6 \ -netdev tap,fd=3D3,id=3Dhostnet0 \ --device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:= 00:71:70:89","bus":"pci.0","addr":"0x7"}' \ --device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ +-device rtl8139,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:71:70:89,bus=3D= pci.0,addr=3D0x7 \ +-device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5900,addr=3D127.0.0.1,seamless-migration=3Don \ --device '{"driver":"VGA","id":"video0","vgamem_mb":16,"bus":"pci.0","addr"= :"0x2"}' \ --device '{"driver":"AC97","id":"sound0","audiodev":"audio1","bus":"pci.0",= "addr":"0x3"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x5"}' \ +-device VGA,id=3Dvideo0,vgamem_mb=3D16,bus=3Dpci.0,addr=3D0x2 \ +-device AC97,id=3Dsound0,audiodev=3Daudio1,bus=3Dpci.0,addr=3D0x3 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x5 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice-usb-redir.x86_64-latest.= args b/tests/qemuxml2argvdata/graphics-spice-usb-redir.x86_64-latest.args index d82387379f..0a29a22812 100644 --- a/tests/qemuxml2argvdata/graphics-spice-usb-redir.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice-usb-redir.x86_64-latest.args @@ -26,17 +26,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x4.0= x7"}' \ --device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pci.0","multifunction":true,"addr":"0x4"}' \ --device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus= ":"pci.0","addr":"0x4.0x1"}' \ --device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus= ":"pci.0","addr":"0x4.0x2"}' \ +-device ich9-usb-ehci1,id=3Dusb,bus=3Dpci.0,addr=3D0x4.0x7 \ +-device ich9-usb-uhci1,masterbus=3Dusb.0,firstport=3D0,bus=3Dpci.0,multifu= nction=3Don,addr=3D0x4 \ +-device ich9-usb-uhci2,masterbus=3Dusb.0,firstport=3D2,bus=3Dpci.0,addr=3D= 0x4.0x1 \ +-device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpci.0,addr=3D= 0x4.0x2 \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,tls-channel=3Dmain,plaintext-channel=3Dinputs,tls-channel=3Dusb= redir,image-compression=3Dauto_glz,jpeg-wan-compression=3Dauto,zlib-glz-wan= -compression=3Dauto,playback-compression=3Don,streaming-video=3Dfilter,disa= ble-copy-paste=3Don,seamless-migration=3Don \ --device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -chardev socket,id=3Dcharredir0,host=3Dlocalhost,port=3D4000 \ --device '{"driver":"usb-redir","chardev":"charredir0","id":"redir0","bus":= "usb.0","port":"1"}' \ +-device usb-redir,chardev=3Dcharredir0,id=3Dredir0,bus=3Dusb.0,port=3D1 \ -chardev spicevmc,id=3Dcharredir1,name=3Dusbredir \ --device '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","bus":= "usb.0","port":"4"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device usb-redir,chardev=3Dcharredir1,id=3Dredir1,bus=3Dusb.0,port=3D4 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-spice.x86_64-latest.args b/tes= ts/qemuxml2argvdata/graphics-spice.x86_64-latest.args index bfe587f3f1..11d8e8e4d0 100644 --- a/tests/qemuxml2argvdata/graphics-spice.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-spice.x86_64-latest.args @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,tls-channel=3Ddefault,tls-channel=3Dmain,plaintext-channel=3Din= puts,image-compression=3Dauto_glz,jpeg-wan-compression=3Dauto,zlib-glz-wan-= compression=3Dauto,playback-compression=3Don,streaming-video=3Dfilter,disab= le-copy-paste=3Don,disable-agent-file-xfer=3Don,seamless-migration=3Don \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :33554432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","a= ddr":"0x2"}' \ --device '{"driver":"qxl","id":"video1","ram_size":67108864,"vram_size":335= 54432,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","addr"= :"0x4"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D33554432,vram6= 4_size_mb=3D0,vgamem_mb=3D8,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ +-device qxl,id=3Dvideo1,ram_size=3D67108864,vram_size=3D33554432,vram64_si= ze_mb=3D0,vgamem_mb=3D8,max_outputs=3D1,bus=3Dpci.0,addr=3D0x4 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-lat= est.args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-lates= t.args index 6332127fdd..06b61300a1 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc vnc=3Dunix:/tmp/lib/domain--1-QEMUGuest1/vnc.sock,audiodev=3Daudio1 \ --device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-latest.= args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-latest.args index 80e361307b..457ae110f5 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.x86_64-latest.args @@ -26,9 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc vnc=3Dunix:/tmp/lib/domain--1-QEMUGuest1/vnc.sock,audiodev=3Daudio1 \ --device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-latest= .args b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-latest.args index 3533fcc868..b7ae29562a 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.x86_64-latest.args @@ -26,13 +26,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc '[2001:1:2:3:4:5:1234:1234]:3,audiodev=3Daudio1' \ -display egl-headless,rendernode=3D/dev/dri/foo \ --device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-late= st.args b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-latest.= args index 2788d8bb45..29f2842752 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc '[2001:1:2:3:4:5:1234:1234]:3,audiodev=3Daudio1' \ --device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-none.x86_64-latest.args b/= tests/qemuxml2argvdata/graphics-vnc-none.x86_64-latest.args index 3c30c99c17..223fd0949f 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-none.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-none.x86_64-latest.args @@ -26,9 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc none,audiodev=3Daudio1 \ --device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args = b/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args index 0710b20c90..57cbdcbf59 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-policy.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc '[::]:59630,share=3Dallow-exclusive,audiodev=3Daudio1' \ --device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-power.x86_64-latest.args b= /tests/qemuxml2argvdata/graphics-vnc-power.x86_64-latest.args index 609a4f4ac2..4d1da2e747 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-power.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-power.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc '[::]:59630,power-control=3Don,audiodev=3Daudio1' \ --device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x8= 6_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-soc= ket.x86_64-latest.args index 54887a84fe..581515ce95 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x86_64-la= test.args +++ b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.x86_64-la= test.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-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 '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args b/= tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args index d3948de087..c4ab693a53 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args @@ -27,12 +27,12 @@ SASL_CONF_PATH=3D/root/.sasl2 \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-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:3,sasl=3Don,audiodev=3Daudio1 \ --device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64-= latest.args b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64= -latest.args index 9568bdd579..75d3cd7b43 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.x86_64-latest.= args @@ -26,9 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc vnc=3Dunix:/tmp/foo=3Dbar.sock,audiodev=3Daudio1 \ --device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-latest.args = b/tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-latest.args index 38f461924d..19e32e8f2e 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-socket.x86_64-latest.args @@ -26,9 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc vnc=3Dunix:/tmp/vnc.sock,audiodev=3Daudio1 \ --device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args index e50f6bef4f..63188d0467 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args @@ -27,11 +27,11 @@ SASL_CONF_PATH=3D/root/.sasl2 \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -object '{"qom-type":"secret","id":"vnc-tls-creds0-secret0","data":"9eao5F= 8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"master= Key0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -object '{"qom-type":"tls-creds-x509","id":"vnc-tls-creds0","dir":"/etc/pk= i/libvirt-vnc","endpoint":"server","verify-peer":true,"passwordid":"vnc-tls= -creds0-secret0"}' \ -vnc 127.0.0.1:3,tls-creds=3Dvnc-tls-creds0,sasl=3Don,audiodev=3Daudio1 \ --device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args b/t= ests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args index 8737d8b9d5..baca4ff656 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args @@ -27,10 +27,10 @@ SASL_CONF_PATH=3D/root/.sasl2 \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -object '{"qom-type":"tls-creds-x509","id":"vnc-tls-creds0","dir":"/etc/pk= i/libvirt-vnc","endpoint":"server","verify-peer":true}' \ -vnc 127.0.0.1:3,tls-creds=3Dvnc-tls-creds0,sasl=3Don,audiodev=3Daudio1 \ --device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-latest.args index 340c722749..b1a607b851 100644 --- a/tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc-websocket.x86_64-latest.args @@ -26,9 +26,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,websocket=3D5700,audiodev=3Daudio1 \ --device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/graphics-vnc.x86_64-latest.args b/tests= /qemuxml2argvdata/graphics-vnc.x86_64-latest.args index 2788d8bb45..29f2842752 100644 --- a/tests/qemuxml2argvdata/graphics-vnc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/graphics-vnc.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc '[2001:1:2:3:4:5:1234:1234]:3,audiodev=3Daudio1' \ --device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-lates= t.args b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.ar= gs index c51f961cb3..1615d86702 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","= addr":"0x2"}' \ --device '{"driver":"vfio-pci-nohotplug","id":"hostdev0","sysfsdev":"/sys/b= us/mdev/devices/53764d0e-85a0-42b4-af5c-2046b460b1dc","display":"on","ramfb= ":true,"bus":"pci.0","addr":"0x3"}' \ --device '{"driver":"vfio-pci","id":"hostdev1","sysfsdev":"/sys/bus/mdev/de= vices/53764d0e-85a0-42b4-af5c-2046b460b1dd","display":"on","bus":"pci.0","a= ddr":"0x4"}' \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vram6= 4_size_mb=3D0,vgamem_mb=3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ +-device vfio-pci-nohotplug,id=3Dhostdev0,sysfsdev=3D/sys/bus/mdev/devices/= 53764d0e-85a0-42b4-af5c-2046b460b1dc,display=3Don,ramfb=3Don,bus=3Dpci.0,ad= dr=3D0x3 \ +-device vfio-pci,id=3Dhostdev1,sysfsdev=3D/sys/bus/mdev/devices/53764d0e-8= 5a0-42b4-af5c-2046b460b1dd,display=3Don,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless= .x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl= -headless.x86_64-latest.args index f125bdb527..cdbd44e5fd 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64= -latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64= -latest.args @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D0,seamless-migration=3Don \ -display egl-headless,rendernode=3D/dev/dri/foo \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","= addr":"0x2"}' \ --device '{"driver":"vfio-pci","id":"hostdev0","sysfsdev":"/sys/bus/mdev/de= vices/53764d0e-85a0-42b4-af5c-2046b460b1dc","display":"on","bus":"pci.0","a= ddr":"0x3"}' \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vram6= 4_size_mb=3D0,vgamem_mb=3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ +-device vfio-pci,id=3Dhostdev0,sysfsdev=3D/sys/bus/mdev/devices/53764d0e-8= 5a0-42b4-af5c-2046b460b1dc,display=3Don,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_6= 4-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x8= 6_64-latest.args index af11ef633f..d3ace13fe9 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-lates= t.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-lates= t.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D0,gl=3Don,rendernode=3D/dev/dri/foo,seamless-migration=3Don \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","= addr":"0x2"}' \ --device '{"driver":"vfio-pci","id":"hostdev0","sysfsdev":"/sys/bus/mdev/de= vices/53764d0e-85a0-42b4-af5c-2046b460b1dc","display":"on","bus":"pci.0","a= ddr":"0x3"}' \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vram6= 4_size_mb=3D0,vgamem_mb=3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ +-device vfio-pci,id=3Dhostdev0,sysfsdev=3D/sys/bus/mdev/devices/53764d0e-8= 5a0-42b4-af5c-2046b460b1dc,display=3Don,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x= 86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-hea= dless.x86_64-latest.args index 7504717234..db04038fa1 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-l= atest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-l= atest.args @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ -display egl-headless,rendernode=3D/dev/dri/foo \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","= addr":"0x2"}' \ --device '{"driver":"vfio-pci","id":"hostdev0","sysfsdev":"/sys/bus/mdev/de= vices/53764d0e-85a0-42b4-af5c-2046b460b1dc","display":"on","bus":"pci.0","a= ddr":"0x3"}' \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vram6= 4_size_mb=3D0,vgamem_mb=3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ +-device vfio-pci,id=3Dhostdev0,sysfsdev=3D/sys/bus/mdev/devices/53764d0e-8= 5a0-42b4-af5c-2046b460b1dc,display=3Don,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.= args b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args index 5f42d0a9fe..62ddf47990 100644 --- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args @@ -26,10 +26,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","= addr":"0x2"}' \ --device '{"driver":"vfio-pci","id":"hostdev0","sysfsdev":"/sys/bus/mdev/de= vices/53764d0e-85a0-42b4-af5c-2046b460b1dc","display":"on","bus":"pci.0","a= ddr":"0x3"}' \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vram6= 4_size_mb=3D0,vgamem_mb=3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ +-device vfio-pci,id=3Dhostdev0,sysfsdev=3D/sys/bus/mdev/devices/53764d0e-8= 5a0-42b4-af5c-2046b460b1dc,display=3Don,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args b/t= ests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args index e3d12ecf98..7637910c3b 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-latest.args @@ -27,26 +27,26 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"lsi","id":"scsi0","bus":"pci.0","addr":"0x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device lsi,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -blockdev '{"driver":"host_device","filename":"/dev/sg0","node-name":"libv= irt-2-backend","read-only":false}' \ --device '{"driver":"scsi-generic","drive":"libvirt-2-backend","id":"hostde= v0","bus":"scsi0.0","scsi-id":7}' \ +-device scsi-generic,drive=3Dlibvirt-2-backend,id=3Dhostdev0,bus=3Dscsi0.0= ,scsi-id=3D7 \ -blockdev '{"driver":"host_device","filename":"/dev/sg0","node-name":"libv= irt-3-backend","read-only":true}' \ --device '{"driver":"scsi-generic","drive":"libvirt-3-backend","id":"hostde= v1","bus":"scsi0.0","scsi-id":6}' \ +-device scsi-generic,drive=3Dlibvirt-3-backend,id=3Dhostdev1,bus=3Dscsi0.0= ,scsi-id=3D6 \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example","lun":0,"transport":"tcp","node-name":"libvirt-4-backend"= ,"read-only":false}' \ --device '{"driver":"scsi-generic","drive":"libvirt-4-backend","id":"hostde= v2","bus":"scsi0.0","scsi-id":4}' \ +-device scsi-generic,drive=3Dlibvirt-4-backend,id=3Dhostdev2,bus=3Dscsi0.0= ,scsi-id=3D4 \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example","lun":1,"transport":"tcp","node-name":"libvirt-5-backend"= ,"read-only":false}' \ --device '{"driver":"scsi-generic","drive":"libvirt-5-backend","id":"hostde= v3","bus":"scsi0.0","scsi-id":5}' \ +-device scsi-generic,drive=3Dlibvirt-5-backend,id=3Dhostdev3,bus=3Dscsi0.0= ,scsi-id=3D5 \ -object '{"qom-type":"secret","id":"libvirt-6-backend-secret0","data":"9ea= o5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"mas= terKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example:storage","lun":1,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-6-backend-secret0","node-name":"libvirt-6-backend","rea= d-only":false}' \ --device '{"driver":"scsi-generic","drive":"libvirt-6-backend","id":"hostde= v4","bus":"scsi0.0","scsi-id":3}' \ +-device scsi-generic,drive=3Dlibvirt-6-backend,id=3Dhostdev4,bus=3Dscsi0.0= ,scsi-id=3D3 \ -object '{"qom-type":"secret","id":"libvirt-7-backend-secret0","data":"9ea= o5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"mas= terKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example:storage","lun":2,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-7-backend-secret0","node-name":"libvirt-7-backend","rea= d-only":false}' \ --device '{"driver":"scsi-generic","drive":"libvirt-7-backend","id":"hostde= v5","bus":"scsi0.0","scsi-id":2}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device scsi-generic,drive=3Dlibvirt-7-backend,id=3Dhostdev5,bus=3Dscsi0.0= ,scsi-id=3D2 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.= args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args index 7173c8de36..e35772ac03 100644 --- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args @@ -27,28 +27,28 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -blockdev '{"driver":"host_device","filename":"/dev/sg0","node-name":"libv= irt-2-backend","read-only":false}' \ --device '{"driver":"scsi-generic","drive":"libvirt-2-backend","id":"hostde= v0","bus":"scsi0.0","channel":0,"scsi-id":4,"lun":8}' \ +-device scsi-generic,drive=3Dlibvirt-2-backend,id=3Dhostdev0,bus=3Dscsi0.0= ,channel=3D0,scsi-id=3D4,lun=3D8 \ -blockdev '{"driver":"host_device","filename":"/dev/sg0","node-name":"libv= irt-3-backend","read-only":true}' \ --device '{"driver":"scsi-generic","drive":"libvirt-3-backend","id":"hostde= v1","bus":"scsi0.0","channel":0,"scsi-id":4,"lun":7}' \ +-device scsi-generic,drive=3Dlibvirt-3-backend,id=3Dhostdev1,bus=3Dscsi0.0= ,channel=3D0,scsi-id=3D4,lun=3D7 \ -blockdev '{"driver":"host_device","filename":"/dev/sg0","node-name":"libv= irt-4-backend","read-only":false}' \ --device '{"driver":"scsi-generic","drive":"libvirt-4-backend","id":"ua-799= 6c8dc-a4fa-4012-b76f-043d20144263","bus":"scsi0.0","channel":0,"scsi-id":4,= "lun":6}' \ +-device scsi-generic,drive=3Dlibvirt-4-backend,id=3Dua-7996c8dc-a4fa-4012-= b76f-043d20144263,bus=3Dscsi0.0,channel=3D0,scsi-id=3D4,lun=3D6 \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example","lun":0,"transport":"tcp","node-name":"libvirt-5-backend"= ,"read-only":false}' \ --device '{"driver":"scsi-generic","drive":"libvirt-5-backend","id":"hostde= v2","bus":"scsi0.0","channel":0,"scsi-id":2,"lun":4}' \ +-device scsi-generic,drive=3Dlibvirt-5-backend,id=3Dhostdev2,bus=3Dscsi0.0= ,channel=3D0,scsi-id=3D2,lun=3D4 \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example","lun":1,"transport":"tcp","node-name":"libvirt-6-backend"= ,"read-only":true}' \ --device '{"driver":"scsi-generic","drive":"libvirt-6-backend","id":"hostde= v3","bus":"scsi0.0","channel":0,"scsi-id":2,"lun":5}' \ +-device scsi-generic,drive=3Dlibvirt-6-backend,id=3Dhostdev3,bus=3Dscsi0.0= ,channel=3D0,scsi-id=3D2,lun=3D5 \ -object '{"qom-type":"secret","id":"libvirt-7-backend-secret0","data":"9ea= o5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"mas= terKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example:storage","lun":1,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-7-backend-secret0","node-name":"libvirt-7-backend","rea= d-only":false}' \ --device '{"driver":"scsi-generic","drive":"libvirt-7-backend","id":"hostde= v4","bus":"scsi0.0","channel":0,"scsi-id":3,"lun":4}' \ +-device scsi-generic,drive=3Dlibvirt-7-backend,id=3Dhostdev4,bus=3Dscsi0.0= ,channel=3D0,scsi-id=3D3,lun=3D4 \ -object '{"qom-type":"secret","id":"libvirt-8-backend-secret0","data":"9ea= o5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"mas= terKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"example.org:3260","target":"iqn.199= 2-01.com.example:storage","lun":2,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-8-backend-secret0","initiator-name":"iqn.2020-07.com.ex= ample:test","node-name":"libvirt-8-backend","read-only":false}' \ --device '{"driver":"scsi-generic","drive":"libvirt-8-backend","id":"hostde= v5","bus":"scsi0.0","channel":0,"scsi-id":3,"lun":5}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device scsi-generic,drive=3Dlibvirt-8-backend,id=3Dhostdev5,bus=3Dscsi0.0= ,channel=3D0,scsi-id=3D3,lun=3D5 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args= b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args index 1d8ecbcf52..1b5da4b502 100644 --- a/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-memaccess3.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -no-shutdown \ -no-acpi \ -boot menu=3Don,strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args b/t= ests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args index abf5861c5a..ad90b547f6 100644 --- a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args @@ -19,7 +19,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/d= ev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","share":true,"prealloc":true,"si= ze":1073741824}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/= tmp/nvdimm","share":true,"prealloc":true,"size":536870912}' \ --device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0",= "slot":0}' \ +-device nvdimm,node=3D0,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot=3D0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -30,7 +30,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args b/tests/q= emuxml2argvdata/hyperv-off.x86_64-latest.args index c1a215bda5..b3c2ff26e7 100644 --- a/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args b/tests= /qemuxml2argvdata/hyperv-panic.x86_64-latest.args index c72a606480..fdad166be7 100644 --- a/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hyperv-passthrough.x86_64-latest.args b= /tests/qemuxml2argvdata/hyperv-passthrough.x86_64-latest.args index aab8c09d71..d936fa5f8d 100644 --- a/tests/qemuxml2argvdata/hyperv-passthrough.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-passthrough.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args= b/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args index db73d6aa26..db324bf533 100644 --- a/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/hyperv.x86_64-latest.args b/tests/qemux= ml2argvdata/hyperv.x86_64-latest.args index bbd17d4bdd..719d38d547 100644 --- a/tests/qemuxml2argvdata/hyperv.x86_64-latest.args +++ b/tests/qemuxml2argvdata/hyperv.x86_64-latest.args @@ -26,7 +26,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/input-linux.x86_64-latest.args b/tests/= qemuxml2argvdata/input-linux.x86_64-latest.args index 179cc162e7..181e066608 100644 --- a/tests/qemuxml2argvdata/input-linux.x86_64-latest.args +++ b/tests/qemuxml2argvdata/input-linux.x86_64-latest.args @@ -27,9 +27,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -object '{"qom-type":"input-linux","id":"input0","evdev":"/dev/input/event= 1234","repeat":true,"grab_all":true,"grab-toggle":"alt-alt"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args = b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args index f61ff3f8ff..670e62c28f 100644 --- a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"intel-iommu","intremap":"on","aw-bits":48}' \ +-device intel-iommu,intremap=3Don,aw-bits=3D48 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.= args b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args index 083c6bfe4b..09bd1bf6e3 100644 --- a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"intel-iommu","intremap":"on","caching-mode":true}' \ +-device intel-iommu,intremap=3Don,caching-mode=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.= args b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args index fc06e15191..49f2ff0011 100644 --- a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"intel-iommu","intremap":"on","device-iotlb":true}' \ +-device intel-iommu,intremap=3Don,device-iotlb=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args b/te= sts/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args index c8dd31c5fe..f6df3a60d2 100644 --- a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"intel-iommu","intremap":"on","eim":"on"}' \ +-device intel-iommu,intremap=3Don,eim=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args b/tests/= qemuxml2argvdata/intel-iommu.x86_64-latest.args index db69543298..38b11c3085 100644 --- a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"intel-iommu"}' \ +-device intel-iommu \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest= .args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args index 415b46c771..0a54c78683 100644 --- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args +++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args @@ -29,17 +29,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-scsi-pci","iothread":"iothread2","id":"scsi0","= bus":"pci.0","addr":"0xb"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-scsi-pci,iothread=3Diothread2,id=3Dscsi0,bus=3Dpci.0,addr= =3D0xb \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-3-form= at","id":"ide0-0-0","bootindex":1}' \ +-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 '{"driver":"virtio-blk-pci","iothread":"iothread1","bus":"pci.0","= addr":"0x4","drive":"libvirt-2-format","id":"virtio-disk1"}' \ +-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 '{"driver":"scsi-hd","bus":"scsi0.0","channel":0,"scsi-id":0,"lun"= :3,"device_id":"drive-scsi0-0-0-3","drive":"libvirt-1-format","id":"scsi0-0= -0-3"}' \ +-device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D3,device_id=3D= drive-scsi0-0-0-3,drive=3Dlibvirt-1-format,id=3Dscsi0-0-0-3 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.arg= s b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args index 0065265364..4969971882 100644 --- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/launch-security-sev-direct.x86_64-lates= t.args b/tests/qemuxml2argvdata/launch-security-sev-direct.x86_64-latest.ar= gs index dac312e301..25efc556df 100644 --- a/tests/qemuxml2argvdata/launch-security-sev-direct.x86_64-latest.args +++ b/tests/qemuxml2argvdata/launch-security-sev-direct.x86_64-latest.args @@ -30,10 +30,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -kernel /vmlinuz \ -initrd /initrd \ -append runme \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -object '{"qom-type":"sev-guest","id":"lsec0","cbitpos":47,"reduced-phys-b= its":1,"policy":1,"dh-cert-file":"/tmp/lib/domain--1-QEMUGuest1/dh_cert.bas= e64","session-file":"/tmp/lib/domain--1-QEMUGuest1/session.base64","kernel-= hashes":true}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args index a5f06dc24e..be83e14efb 100644 --- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args @@ -27,36 +27,36 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-encryptdisk/.confi= g \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -object '{"qom-type":"secret","id":"libvirt-7-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"file","filename":"/storage/guest_disks/encryptdisk",= "node-name":"libvirt-7-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-7-format","read-only":false,"driver":"qco= w2","encrypt":{"format":"luks","key-secret":"libvirt-7-format-encryption-se= cret0"},"file":"libvirt-7-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-7-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-7-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -object '{"qom-type":"secret","id":"libvirt-6-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"file","filename":"/storage/guest_disks/encryptdisk2"= ,"node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"qco= w2","encrypt":{"format":"luks","key-secret":"libvirt-6-format-encryption-se= cret0"},"file":"libvirt-6-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-6-format","id":"virtio-disk1"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-6-format,id= =3Dvirtio-disk1 \ -object '{"qom-type":"secret","id":"libvirt-5-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -object '{"qom-type":"secret","id":"libvirt-5-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example:storage","lun":1,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-5-storage-auth-secret0","node-name":"libvirt-5-storage"= ,"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"qco= w2","encrypt":{"format":"luks","key-secret":"libvirt-5-format-encryption-se= cret0"},"file":"libvirt-5-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-5-format","id":"virtio-disk2"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-5-format,id= =3Dvirtio-disk2 \ -object '{"qom-type":"secret","id":"libvirt-4-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"iscsi.example.com:3260","target":"d= emo-target","lun":3,"transport":"tcp","node-name":"libvirt-4-storage","auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"qco= w2","encrypt":{"format":"luks","key-secret":"libvirt-4-format-encryption-se= cret0"},"file":"libvirt-4-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-4-format","id":"virtio-disk3"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-4-format,id= =3Dvirtio-disk3 \ -object '{"qom-type":"secret","id":"libvirt-3-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"rbd","pool":"pool","image":"image","server":[{"host"= :"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"= },{"host":"mon3.example.org","port":"6322"}],"node-name":"libvirt-3-storage= ","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"qco= w2","encrypt":{"format":"luks","key-secret":"libvirt-3-format-encryption-se= cret0"},"file":"libvirt-3-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-3-format","id":"virtio-disk4"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk4 \ -object '{"qom-type":"secret","id":"libvirt-2-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"file","filename":"/storage/guest_disks/base.qcow2","= node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":true,"driver":"qcow= 2","encrypt":{"format":"luks","key-secret":"libvirt-2-format-encryption-sec= ret0"},"file":"libvirt-2-storage","backing":null}' \ -object '{"qom-type":"secret","id":"libvirt-1-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"file","filename":"/storage/guest_disks/encryptdisk5"= ,"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco= w2","encrypt":{"format":"luks","key-secret":"libvirt-1-format-encryption-se= cret0"},"file":"libvirt-1-storage","backing":"libvirt-2-format"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x8","drive":"li= bvirt-1-format","id":"virtio-disk5"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x8,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk5 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/luks-disks-source.x86_64-latest.args b/= tests/qemuxml2argvdata/luks-disks-source.x86_64-latest.args index a234e89b51..b90bbc4789 100644 --- a/tests/qemuxml2argvdata/luks-disks-source.x86_64-latest.args +++ b/tests/qemuxml2argvdata/luks-disks-source.x86_64-latest.args @@ -27,29 +27,29 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-encryptdisk/.confi= g \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -object '{"qom-type":"secret","id":"libvirt-5-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"file","filename":"/storage/guest_disks/encryptdisk",= "node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"luk= s","key-secret":"libvirt-5-format-encryption-secret0","file":"libvirt-5-sto= rage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-5-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-5-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -object '{"qom-type":"secret","id":"libvirt-4-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"file","filename":"/storage/guest_disks/encryptdisk2"= ,"node-name":"libvirt-4-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-4-format","read-only":false,"driver":"luk= s","key-secret":"libvirt-4-format-encryption-secret0","file":"libvirt-4-sto= rage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-4-format","id":"virtio-disk1"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-4-format,id= =3Dvirtio-disk1 \ -object '{"qom-type":"secret","id":"libvirt-3-storage-auth-secret0","data"= :"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid"= :"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -object '{"qom-type":"secret","id":"libvirt-3-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"example.org:6000","target":"iqn.199= 2-01.com.example:storage","lun":1,"transport":"tcp","user":"myname","passwo= rd-secret":"libvirt-3-storage-auth-secret0","node-name":"libvirt-3-storage"= ,"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"luk= s","key-secret":"libvirt-3-format-encryption-secret0","file":"libvirt-3-sto= rage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-3-format","id":"virtio-disk2"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-3-format,id= =3Dvirtio-disk2 \ -object '{"qom-type":"secret","id":"libvirt-2-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"iscsi","portal":"iscsi.example.com:3260","target":"d= emo-target","lun":3,"transport":"tcp","node-name":"libvirt-2-storage","auto= -read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"luk= s","key-secret":"libvirt-2-format-encryption-secret0","file":"libvirt-2-sto= rage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-2-format","id":"virtio-disk3"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk3 \ -object '{"qom-type":"secret","id":"libvirt-1-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"rbd","pool":"pool","image":"image","server":[{"host"= :"mon1.example.org","port":"6321"},{"host":"mon2.example.org","port":"6322"= },{"host":"mon3.example.org","port":"6322"}],"node-name":"libvirt-1-storage= ","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"luk= s","key-secret":"libvirt-1-format-encryption-secret0","file":"libvirt-1-sto= rage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"li= bvirt-1-format","id":"virtio-disk4"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x7,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk4 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/luks-disks.x86_64-latest.args b/tests/q= emuxml2argvdata/luks-disks.x86_64-latest.args index 2761745324..897bf1db55 100644 --- a/tests/qemuxml2argvdata/luks-disks.x86_64-latest.args +++ b/tests/qemuxml2argvdata/luks-disks.x86_64-latest.args @@ -27,16 +27,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-encryptdisk/.confi= g \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -object '{"qom-type":"secret","id":"libvirt-2-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"file","filename":"/storage/guest_disks/encryptdisk",= "node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"luk= s","key-secret":"libvirt-2-format-encryption-secret0","file":"libvirt-2-sto= rage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-2-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-2-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -object '{"qom-type":"secret","id":"libvirt-1-format-encryption-secret0","= data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","k= eyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -blockdev '{"driver":"file","filename":"/storage/guest_disks/encryptdisk2"= ,"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"luk= s","key-secret":"libvirt-1-format-encryption-secret0","file":"libvirt-1-sto= rage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-1-format","id":"virtio-disk1"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-la= test.args b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-lat= est.args index 383635c8cd..99864aa2d4 100644 --- a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.ar= gs @@ -28,8 +28,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-instance-00000092/.c= onfig \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args b/= tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args index 9d1f9831d9..8a40e2d79c 100644 --- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args @@ -19,7 +19,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-instance-00000092/.c= onfig \ -object '{"qom-type":"memory-backend-memfd","id":"ram-node0","hugetlb":tru= e,"hugetlbsize":2097152,"share":true,"prealloc":true,"size":15032385536,"ho= st-nodes":[3],"policy":"preferred"}' \ -numa node,nodeid=3D0,cpus=3D0-7,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/= tmp/nvdimm","share":true,"prealloc":true,"size":536870912,"host-nodes":[3],= "policy":"preferred"}' \ --device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0",= "slot":0}' \ +-device nvdimm,node=3D0,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot=3D0 \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ -display none \ -no-user-config \ @@ -30,8 +30,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-instance-00000092/.c= onfig \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-lat= est.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-lates= t.args index 7b0fd22acb..14c67e88d3 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args @@ -19,7 +19,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/= tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ --device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0",= "slot":0}' \ +-device nvdimm,node=3D0,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot=3D0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -30,11 +30,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-late= st.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.= args index 97e2deeff9..d01c07c5fe 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args @@ -19,7 +19,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/= tmp/nvdimm","share":false,"prealloc":true,"size":536870912,"align":2097152}= ' \ --device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0",= "slot":0}' \ +-device nvdimm,node=3D0,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot=3D0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -30,11 +30,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-late= st.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.= args index 6b92b50053..730e44c0a8 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args @@ -19,7 +19,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/= tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ --device '{"driver":"nvdimm","node":0,"label-size":131072,"memdev":"memnvdi= mm0","id":"nvdimm0","slot":0}' \ +-device nvdimm,node=3D0,label-size=3D131072,memdev=3Dmemnvdimm0,id=3Dnvdim= m0,slot=3D0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -30,11 +30,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-lates= t.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.ar= gs index d1efa79bfe..24e1d3d41a 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args @@ -19,7 +19,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/= tmp/nvdimm","share":false,"size":536870912,"pmem":true}' \ --device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0",= "slot":0}' \ +-device nvdimm,node=3D0,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot=3D0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -30,11 +30,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-l= atest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-l= atest.args index 2c9641ee77..cf63274838 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.a= rgs @@ -19,7 +19,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":22439526= 4}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/= tmp/nvdimm","share":false,"prealloc":true,"size":536870912}' \ --device '{"driver":"nvdimm","node":0,"unarmed":true,"memdev":"memnvdimm0",= "id":"nvdimm0","slot":0}' \ +-device nvdimm,node=3D0,unarmed=3Don,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot= =3D0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -30,11 +30,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.arg= s b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args index dca37fc55e..45907d08c1 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args @@ -19,7 +19,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":10737418= 24}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-file","id":"memnvdimm0","mem-path":"/= tmp/nvdimm","prealloc":true,"size":536870912}' \ --device '{"driver":"nvdimm","node":0,"memdev":"memnvdimm0","id":"nvdimm0",= "slot":0}' \ +-device nvdimm,node=3D0,memdev=3Dmemnvdimm0,id=3Dnvdimm0,slot=3D0 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -30,11 +30,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest= .args b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args index 62b31689d7..b6235aca28 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args @@ -19,9 +19,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":21453864= 96}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-ram","id":"memvirtiomem0","reserve":f= alse,"size":1073741824}' \ --device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"request= ed-size":536870912,"memdev":"memvirtiomem0","id":"virtiomem0","bus":"pci.0"= ,"addr":"0x2"}' \ +-device virtio-mem-pci,node=3D0,block-size=3D2097152,requested-size=3D5368= 70912,memdev=3Dmemvirtiomem0,id=3Dvirtiomem0,bus=3Dpci.0,addr=3D0x2 \ -object '{"qom-type":"memory-backend-file","id":"memvirtiomem1","mem-path"= :"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","reserve":false,"size":21474= 83648,"host-nodes":[1,2,3],"policy":"bind"}' \ --device '{"driver":"virtio-mem-pci","node":0,"block-size":2097152,"request= ed-size":1073741824,"memdev":"memvirtiomem1","id":"virtiomem1","bus":"pci.0= ","addr":"0x3"}' \ +-device virtio-mem-pci,node=3D0,block-size=3D2097152,requested-size=3D1073= 741824,memdev=3Dmemvirtiomem1,id=3Dvirtiomem1,bus=3Dpci.0,addr=3D0x3 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -32,11 +32,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-lates= t.args b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.ar= gs index 5ac1031cdf..b46aed8f8b 100644 --- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args +++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args @@ -19,7 +19,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":21453864= 96}' \ -numa node,nodeid=3D0,cpus=3D0-1,memdev=3Dram-node0 \ -object '{"qom-type":"memory-backend-file","id":"memvirtiopmem0","mem-path= ":"/tmp/virtio_pmem","share":true,"size":536870912}' \ --device '{"driver":"virtio-pmem-pci","memdev":"memvirtiopmem0","id":"virti= opmem0","bus":"pci.0","addr":"0x5"}' \ +-device virtio-pmem-pci,memdev=3Dmemvirtiopmem0,id=3Dvirtiopmem0,bus=3Dpci= .0,addr=3D0x5 \ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ -display none \ -no-user-config \ @@ -30,11 +30,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/misc-no-reboot.x86_64-latest.args b/tes= ts/qemuxml2argvdata/misc-no-reboot.x86_64-latest.args index 68b112e81f..18d9222f3a 100644 --- a/tests/qemuxml2argvdata/misc-no-reboot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/misc-no-reboot.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args b/tests/qe= muxml2argvdata/mlock-off.x86_64-latest.args index aad939f1cb..5a6fad8384 100644 --- a/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args +++ b/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args b/tests/qem= uxml2argvdata/mlock-on.x86_64-latest.args index a5afe9dae1..3d2cfa317d 100644 --- a/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args +++ b/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/name-escape.x86_64-latest.args b/tests/= qemuxml2argvdata/name-escape.x86_64-latest.args index 336ea5f4d4..bdf4ce55f8 100644 --- a/tests/qemuxml2argvdata/name-escape.x86_64-latest.args +++ b/tests/qemuxml2argvdata/name-escape.x86_64-latest.args @@ -26,26 +26,26 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-foo=3D1,bar=3D2/.c= onfig \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-scsi-pci","id":"scsi0","bus":"pci.0","addr":"0x= 3"}' \ --device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.0,addr=3D0x3 \ +-device usb-ccid,id=3Dccid0,bus=3Dusb.0,port=3D1 \ -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no= de-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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1,"write-cache":"on"}' \ --device '{"driver":"ccid-card-emulated","backend":"certificates","cert1":"= cert1,foo","cert2":"cert2","cert3":"cert3","db":"/etc/pki/nssdb,foo","id":"= smartcard0","bus":"ccid0.0"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ +-device ccid-card-emulated,backend=3Dcertificates,cert1=3Dcert1,,foo,cert2= =3Dcert2,cert3=3Dcert3,db=3D/etc/pki/nssdb,,foo,id=3Dsmartcard0,bus=3Dccid0= .0 \ -chardev tty,id=3Dcharserial0,path=3D/dev/ttyS2,,foo \ --device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ -add-fd set=3D0,fd=3D1750 \ -chardev file,id=3Dcharserial1,path=3D/dev/fdset/0,append=3Don \ --device '{"driver":"isa-serial","chardev":"charserial1","id":"serial1"}' \ +-device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ -chardev pipe,id=3Dcharchannel0,path=3D/tmp/guestfwd,,foo \ -netdev user,guestfwd=3Dtcp:10.0.2.1:4600-chardev:charchannel0,id=3Dchanne= l0 \ -audiodev '{"id":"audio1","driver":"spice"}' \ -vnc vnc=3Dunix:/tmp/lib/domain--1-foo=3D1,,bar=3D2/vnc.sock,audiodev=3Dau= dio1 \ -spice unix,addr=3D/tmp/lib/domain--1-foo=3D1,,bar=3D2/spice.sock,gl=3Don,= rendernode=3D/dev/dri/foo,,bar,seamless-migration=3Don \ --device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}'= \ +-device cirrus-vga,id=3Dvideo0,bus=3Dpci.0,addr=3D0x2 \ -blockdev '{"driver":"iscsi","portal":"example.foo.org:3260","target":"iqn= .1992-01.com.example:my,storage","lun":1,"transport":"tcp","node-name":"lib= virt-2-backend","read-only":false}' \ --device '{"driver":"scsi-generic","drive":"libvirt-2-backend","id":"hostde= v0","bus":"scsi0.0","channel":0,"scsi-id":0,"lun":4}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-device scsi-generic,drive=3Dlibvirt-2-backend,id=3Dhostdev0,bus=3Dscsi0.0= ,channel=3D0,scsi-id=3D0,lun=3D4 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args b/tests/qem= uxml2argvdata/net-vdpa.x86_64-latest.args index 0e05c6947d..b9c981a8d1 100644 --- a/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-vdpa.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -add-fd set=3D0,fd=3D1732,opaque=3D/dev/vhost-vdpa-0 \ -netdev vhost-vdpa,vhostdev=3D/dev/fdset/0,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:95:db:c0","bus":"pci.0","addr":"0x2"}' \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:95:db:c0= ,bus=3Dpci.0,addr=3D0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args b/test= s/qemuxml2argvdata/net-vhostuser.x86_64-latest.args index efb04ae3fa..52f193df4f 100644 --- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args +++ b/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args @@ -27,15 +27,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -chardev socket,id=3Dcharnet0,path=3D/tmp/vhost0.sock,server=3Don \ -netdev vhost-user,chardev=3Dcharnet0,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:ee:96:6b","bus":"pci.0","addr":"0x2"}' \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:ee:96:6b= ,bus=3Dpci.0,addr=3D0x2 \ -chardev socket,id=3Dcharnet1,path=3D/tmp/vhost1.sock \ -netdev vhost-user,chardev=3Dcharnet1,id=3Dhostnet1 \ --device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":= "52:54:00:ee:96:6c","bus":"pci.0","addr":"0x3"}' \ +-device virtio-net-pci,netdev=3Dhostnet1,id=3Dnet1,mac=3D52:54:00:ee:96:6c= ,bus=3Dpci.0,addr=3D0x3 \ -netdev socket,listen=3D:2015,id=3Dhostnet2 \ --device '{"driver":"rtl8139","netdev":"hostnet2","id":"net2","mac":"52:54:= 00:95:db:c0","bus":"pci.0","addr":"0x4"}' \ +-device rtl8139,netdev=3Dhostnet2,id=3Dnet2,mac=3D52:54:00:95:db:c0,bus=3D= pci.0,addr=3D0x4 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args b/test= s/qemuxml2argvdata/numatune-hmat.x86_64-latest.args index 178eb78356..8951f1b1cd 100644 --- a/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numatune-hmat.x86_64-latest.args @@ -42,8 +42,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.x86_6= 4-latest.args b/tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.x8= 6_64-latest.args index e140e10d65..6386353d46 100644 --- a/tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.x86_64-lates= t.args +++ b/tests/qemuxml2argvdata/numatune-memnode-restrictive-mode.x86_64-lates= t.args @@ -32,8 +32,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args b/t= ests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args index 7cb7e659a4..3b737372c5 100644 --- a/tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numatune-memnode.x86_64-latest.args @@ -32,8 +32,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/numatune-system-memory.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/numatune-system-memory.x86_64-latest.args index fd93abe3eb..3214b65620 100644 --- a/tests/qemuxml2argvdata/numatune-system-memory.x86_64-latest.args +++ b/tests/qemuxml2argvdata/numatune-system-memory.x86_64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args b/t= ests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args index dd159e2604..17de350270 100644 --- a/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args @@ -29,14 +29,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -global ICH9-LPC.disable_s3=3D0 \ -global ICH9-LPC.disable_s4=3D1 \ -boot menu=3Don,strict=3Don \ --device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"= 0x1e"}' \ --device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1",= "addr":"0x0"}' \ --device '{"driver":"ioh3420","port":8,"chassis":3,"id":"pci.3","bus":"pcie= .0","addr":"0x1"}' \ --device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pcie.0","addr":"0x1d= .0x7"}' \ --device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pcie.0","multifunction":true,"addr":"0x1d"}' \ --device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus= ":"pcie.0","addr":"0x1d.0x1"}' \ --device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus= ":"pcie.0","addr":"0x1d.0x2"}' \ +-device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ +-device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ +-device ioh3420,port=3D8,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x1 \ +-device ich9-usb-ehci1,id=3Dusb,bus=3Dpcie.0,addr=3D0x1d.0x7 \ +-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 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add= r":"0x1"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x1 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.x86_64= -latest.args b/tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.x86_= 64-latest.args index 57fc34cc4d..52f36ffe2e 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/os-firmware-efi-no-enrolled-keys.x86_64-latest= .args @@ -30,9 +30,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ +-device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args index fdbf8deabe..5bea122beb 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args @@ -33,14 +33,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -global ICH9-LPC.disable_s3=3D0 \ -global ICH9-LPC.disable_s4=3D1 \ -boot menu=3Don,strict=3Don \ --device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"= 0x1e"}' \ --device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1",= "addr":"0x0"}' \ --device '{"driver":"ioh3420","port":8,"chassis":3,"id":"pci.3","bus":"pcie= .0","addr":"0x1"}' \ --device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pcie.0","addr":"0x1d= .0x7"}' \ --device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pcie.0","multifunction":true,"addr":"0x1d"}' \ --device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus= ":"pcie.0","addr":"0x1d.0x1"}' \ --device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus= ":"pcie.0","addr":"0x1d.0x2"}' \ +-device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ +-device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ +-device ioh3420,port=3D8,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x1 \ +-device ich9-usb-ehci1,id=3Dusb,bus=3Dpcie.0,addr=3D0x1d.0x7 \ +-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 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add= r":"0x1"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x1 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args b/te= sts/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args index 470fe31256..4869c0749f 100644 --- a/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args @@ -32,14 +32,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \ -global ICH9-LPC.disable_s3=3D0 \ -global ICH9-LPC.disable_s4=3D1 \ -boot menu=3Don,strict=3Don \ --device '{"driver":"i82801b11-bridge","id":"pci.1","bus":"pcie.0","addr":"= 0x1e"}' \ --device '{"driver":"pci-bridge","chassis_nr":2,"id":"pci.2","bus":"pci.1",= "addr":"0x0"}' \ --device '{"driver":"ioh3420","port":8,"chassis":3,"id":"pci.3","bus":"pcie= .0","addr":"0x1"}' \ --device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pcie.0","addr":"0x1d= .0x7"}' \ --device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pcie.0","multifunction":true,"addr":"0x1d"}' \ --device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus= ":"pcie.0","addr":"0x1d.0x1"}' \ --device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus= ":"pcie.0","addr":"0x1d.0x2"}' \ +-device i82801b11-bridge,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1e \ +-device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ +-device ioh3420,port=3D8,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x1 \ +-device ich9-usb-ehci1,id=3Dusb,bus=3Dpcie.0,addr=3D0x1d.0x7 \ +-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 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add= r":"0x1"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x1 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/panic-double.x86_64-latest.args b/tests= /qemuxml2argvdata/panic-double.x86_64-latest.args index 96fe0b9bb6..962baa0bee 100644 --- a/tests/qemuxml2argvdata/panic-double.x86_64-latest.args +++ b/tests/qemuxml2argvdata/panic-double.x86_64-latest.args @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device '{"driver":"pvpanic","ioport":1285}' \ +-device pvpanic,ioport=3D1285 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/panic-no-address.x86_64-latest.args b/t= ests/qemuxml2argvdata/panic-no-address.x86_64-latest.args index 575720799f..1d5737dbcf 100644 --- a/tests/qemuxml2argvdata/panic-no-address.x86_64-latest.args +++ b/tests/qemuxml2argvdata/panic-no-address.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device '{"driver":"pvpanic"}' \ +-device pvpanic \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/panic.x86_64-latest.args b/tests/qemuxm= l2argvdata/panic.x86_64-latest.args index 873aab9428..1531c11fff 100644 --- a/tests/qemuxml2argvdata/panic.x86_64-latest.args +++ b/tests/qemuxml2argvdata/panic.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device '{"driver":"pvpanic","ioport":1285}' \ +-device pvpanic,ioport=3D1285 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.x86_64-latest.= args b/tests/qemuxml2argvdata/parallel-parport-chardev.x86_64-latest.args index eecdb27463..89201a9073 100644 --- a/tests/qemuxml2argvdata/parallel-parport-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/parallel-parport-chardev.x86_64-latest.args @@ -27,13 +27,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-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 '{"driver":"isa-parallel","chardev":"charparallel0","id":"parallel= 0"}' \ +-device isa-parallel,chardev=3Dcharparallel0,id=3Dparallel0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.x86_64-latest.args= b/tests/qemuxml2argvdata/parallel-tcp-chardev.x86_64-latest.args index b549c433a5..190b43d918 100644 --- a/tests/qemuxml2argvdata/parallel-tcp-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/parallel-tcp-chardev.x86_64-latest.args @@ -27,13 +27,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-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 '{"driver":"isa-parallel","chardev":"charparallel0","id":"parallel= 0"}' \ +-device isa-parallel,chardev=3Dcharparallel0,id=3Dparallel0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.arg= s b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args index f9f9cde4e7..82c7b4bf4a 100644 --- a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -chardev socket,id=3Dcharparallel0,fd=3D1729,server=3Don,wait=3Doff \ --device '{"driver":"isa-parallel","chardev":"charparallel0","id":"parallel= 0"}' \ +-device isa-parallel,chardev=3Dcharparallel0,id=3Dparallel0 \ -chardev socket,id=3Dcharparallel1,path=3D/tmp/parport1.socket \ --device '{"driver":"isa-parallel","chardev":"charparallel1","id":"parallel= 1"}' \ +-device isa-parallel,chardev=3Dcharparallel1,id=3Dparallel1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86= _64-latest.args b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disabl= e.x86_64-latest.args index 109651c465..9cc8563d22 100644 --- a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-lat= est.args +++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-disable.x86_64-lat= est.args @@ -28,8 +28,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-i440fx/.config \ -no-acpi \ -boot strict=3Don \ -global PIIX4_PM.acpi-root-pci-hotplug=3Doff \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_= 64-latest.args b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.= x86_64-latest.args index 77c79a3d7b..f7c9b57b84 100644 --- a/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-late= st.args +++ b/tests/qemuxml2argvdata/pc-i440fx-acpi-root-hotplug-enable.x86_64-late= st.args @@ -28,8 +28,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-i440fx/.config \ -no-acpi \ -boot strict=3Don \ -global PIIX4_PM.acpi-root-pci-hotplug=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/pci-serial-dev-chardev.x86_64-latest.args index 988ec823b4..2a5cd974c9 100644 --- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pci-serial-dev-chardev.x86_64-latest.args @@ -27,13 +27,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-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 '{"driver":"pci-serial","chardev":"charserial0","id":"serial0","bu= s":"pci.0","addr":"0x4"}' \ +-device pci-serial,chardev=3Dcharserial0,id=3Dserial0,bus=3Dpci.0,addr=3D0= x4 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-lates= t.args b/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-latest.ar= gs index 4f4d5f9a08..587d875384 100644 --- a/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-latest.args +++ b/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-pcie-expander-bus-te= /.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"pxb-pcie","bus_nr":254,"id":"pci.1","bus":"pcie.0","ad= dr":"0x1"}' \ +-device pxb-pcie,bus_nr=3D254,id=3Dpci.1,bus=3Dpcie.0,addr=3D0x1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.= args b/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args index 1e0a42a8ed..2103d93b30 100644 --- a/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args @@ -27,15 +27,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","hot= plug":false,"bus":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"ioh3420","port":10,"chassis":3,"id":"pci.3","hotplug":= false,"bus":"pcie.0","addr":"0x1.0x2"}' \ --device '{"driver":"x3130-upstream","id":"pci.4","bus":"pci.1","addr":"0x0= "}' \ --device '{"driver":"xio3130-downstream","port":0,"chassis":5,"id":"pci.5",= "hotplug":false,"bus":"pci.4","addr":"0x0"}' \ --device '{"driver":"xio3130-downstream","port":1,"chassis":6,"id":"pci.6",= "hotplug":true,"bus":"pci.4","addr":"0x1"}' \ --device '{"driver":"xio3130-downstream","port":2,"chassis":7,"id":"pci.7",= "bus":"pci.4","addr":"0x2"}' \ --device '{"driver":"xio3130-downstream","port":39,"chassis":30,"id":"pci.8= ","bus":"pci.4","addr":"0x3"}' \ --device '{"driver":"qemu-xhci","id":"usb","bus":"pci.2","addr":"0x0"}' \ +-device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ +-device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,hotplug=3Doff,bus= =3Dpcie.0,addr=3D0x1.0x1 \ +-device ioh3420,port=3D10,chassis=3D3,id=3Dpci.3,hotplug=3Doff,bus=3Dpcie.= 0,addr=3D0x1.0x2 \ +-device x3130-upstream,id=3Dpci.4,bus=3Dpci.1,addr=3D0x0 \ +-device xio3130-downstream,port=3D0,chassis=3D5,id=3Dpci.5,hotplug=3Doff,b= us=3Dpci.4,addr=3D0x0 \ +-device xio3130-downstream,port=3D1,chassis=3D6,id=3Dpci.6,hotplug=3Don,bu= s=3Dpci.4,addr=3D0x1 \ +-device xio3130-downstream,port=3D2,chassis=3D7,id=3Dpci.7,bus=3Dpci.4,add= r=3D0x2 \ +-device xio3130-downstream,port=3D39,chassis=3D30,id=3Dpci.8,bus=3Dpci.4,a= ddr=3D0x3 \ +-device qemu-xhci,id=3Dusb,bus=3Dpci.2,addr=3D0x0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc= 64-latest.args index 65ba777f02..94802171ad 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest= .args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \ +-device pci-ohci,id=3Dusb,bus=3Dpci.0,addr=3D0x1 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc= 64-latest.args index 0e01aa595d..140c5b51f3 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest= .args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \ +-device pci-ohci,id=3Dusb,bus=3Dpci.0,addr=3D0x1 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc= 64-latest.args index a44dac6afd..0b5ded5c2d 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest= .args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \ +-device pci-ohci,id=3Dusb,bus=3Dpci.0,addr=3D0x1 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc= 64-latest.args index 029f2312cf..cf731aaf4a 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest= .args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \ +-device pci-ohci,id=3Dusb,bus=3Dpci.0,addr=3D0x1 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc= 64-latest.args index 249d1c1a0b..760c0664fa 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest= .args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \ +-device pci-ohci,id=3Dusb,bus=3Dpci.0,addr=3D0x1 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64= -latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc= 64-latest.args index 2577b8e07d..9b3a846dd4 100644 --- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest= .args +++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest= .args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \ +-device pci-ohci,id=3Dusb,bus=3Dpci.0,addr=3D0x1 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.arg= s b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args index 2a39ac718f..3da23bb782 100644 --- a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args @@ -25,23 +25,23 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"qemu-xhci","p2":15,"p3":15,"id":"usb","bus":"pci.0","a= ddr":"0x2"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x3"}' \ +-device qemu-xhci,p2=3D15,p3=3D15,id=3Dusb,bus=3Dpci.0,addr=3D0x2 \ +-device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x3 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:a2:44:92","bus":"pci.0","addr":"0x1"}' \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:a2:44:92= ,bus=3Dpci.0,addr=3D0x1 \ -chardev pty,id=3Dcharserial0 \ --device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ --device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ --device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ --device '{"driver":"usb-kbd","id":"input1","bus":"usb.0","port":"2"}' \ +-device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ +-device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \ +-device usb-kbd,id=3Dinput1,bus=3Dusb.0,port=3D2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ --device '{"driver":"VGA","id":"video0","vgamem_mb":16,"bus":"pci.0","addr"= :"0x7"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x5"}' \ +-device VGA,id=3Dvideo0,vgamem_mb=3D16,bus=3Dpci.0,addr=3D0x7 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x5 \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ --device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .0","addr":"0x6"}' \ +-device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr=3D0x6 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.arg= s b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args index b8b54b7b80..fb890bb9e0 100644 --- a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args @@ -26,19 +26,19 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"qemu-xhci","p2":15,"p3":15,"id":"usb","bus":"pci.0","a= ddr":"0x2"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x3"}' \ +-device qemu-xhci,p2=3D15,p3=3D15,id=3Dusb,bus=3Dpci.0,addr=3D0x2 \ +-device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x3 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x4","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.0","addr":"0x1"}' \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.0,addr=3D0x1 \ -chardev pty,id=3Dcharserial0 \ --device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ --device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ +-device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x5"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x5 \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ --device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .0","addr":"0x6"}' \ +-device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr=3D0x6 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args= b/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args index 5ed0240e5e..a6183a47b8 100644 --- a/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-tpmproxy-single.ppc64-latest.args @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \ --device '{"driver":"spapr-tpm-proxy","id":"tpm0","host-path":"/dev/tpmrm0"= }' \ +-device pci-ohci,id=3Dusb,bus=3Dpci.0,addr=3D0x1 \ +-device spapr-tpm-proxy,id=3Dtpm0,host-path=3D/dev/tpmrm0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.ar= gs b/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args index 90a27ca1a8..a962ac6ef4 100644 --- a/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-tpmproxy-with-tpm.ppc64-latest.args @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \ --device '{"driver":"spapr-tpm-proxy","id":"tpm0","host-path":"/dev/tpmrm0"= }' \ +-device pci-ohci,id=3Dusb,bus=3Dpci.0,addr=3D0x1 \ +-device spapr-tpm-proxy,id=3Dtpm0,host-path=3D/dev/tpmrm0 \ -chardev socket,id=3Dchrtpm,path=3D/dev/test \ -tpmdev emulator,id=3Dtpm-tpm1,chardev=3Dchrtpm \ --device '{"driver":"tpm-spapr","tpmdev":"tpm-tpm1","id":"tpm1","reg":16384= }' \ +-device tpm-spapr,tpmdev=3Dtpm-tpm1,id=3Dtpm1,reg=3D16384 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args= b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args index e5bb41a91e..b63bd00318 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args = b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args index 60aaa0c859..9e7c660c08 100644 --- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args +++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args @@ -26,8 +26,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args b/tests/qemu= xml2argvdata/qemu-ns.x86_64-latest.args index fc520a1e5c..2a969a316c 100644 --- a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args +++ b/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args @@ -30,12 +30,12 @@ BAR=3D'' \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -unknown parameter \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.x86_64-latest= .args b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.x86_64-latest.args index 512d1f7e9d..b70babd0f0 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.x86_64-latest.args @@ -27,13 +27,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-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 '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","io= base":1016,"irq":4}' \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0,iobase=3D1016,irq=3D= 4 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.x86_64-latest.args b= /tests/qemuxml2argvdata/serial-dev-chardev.x86_64-latest.args index cfa0f8ce02..c77de86f70 100644 --- a/tests/qemuxml2argvdata/serial-dev-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-dev-chardev.x86_64-latest.args @@ -27,13 +27,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-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 '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-file-chardev.x86_64-latest.args = b/tests/qemuxml2argvdata/serial-file-chardev.x86_64-latest.args index 9c7fd01f97..8ef2d39c17 100644 --- a/tests/qemuxml2argvdata/serial-file-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-file-chardev.x86_64-latest.args @@ -27,14 +27,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -add-fd set=3D0,fd=3D1750 \ -chardev file,id=3Dcharserial0,path=3D/dev/fdset/0,append=3Don \ --device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-file-log.x86_64-latest.args b/te= sts/qemuxml2argvdata/serial-file-log.x86_64-latest.args index f7f59bc542..9a6a802dbb 100644 --- a/tests/qemuxml2argvdata/serial-file-log.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-file-log.x86_64-latest.args @@ -27,14 +27,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -add-fd set=3D0,fd=3D1750 \ -add-fd set=3D1,fd=3D1751 \ -chardev file,id=3Dcharserial0,path=3D/dev/fdset/0,append=3Don,logfile=3D/= dev/fdset/1,logappend=3Don \ --device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-many-chardev.x86_64-latest.args = b/tests/qemuxml2argvdata/serial-many-chardev.x86_64-latest.args index 1e0f0110bf..8995320941 100644 --- a/tests/qemuxml2argvdata/serial-many-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-many-chardev.x86_64-latest.args @@ -27,16 +27,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ -add-fd set=3D0,fd=3D1750 \ -chardev file,id=3Dcharserial1,path=3D/dev/fdset/0,append=3Don \ --device '{"driver":"isa-serial","chardev":"charserial1","id":"serial1"}' \ +-device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.x86_64-latest.args b= /tests/qemuxml2argvdata/serial-pty-chardev.x86_64-latest.args index 7b31c86820..6f39a1e0da 100644 --- a/tests/qemuxml2argvdata/serial-pty-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-pty-chardev.x86_64-latest.args @@ -27,13 +27,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-spiceport-nospice.x86_64-latest.= args b/tests/qemuxml2argvdata/serial-spiceport-nospice.x86_64-latest.args index 7a52bb6a8c..bb70bd2f6a 100644 --- a/tests/qemuxml2argvdata/serial-spiceport-nospice.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-spiceport-nospice.x86_64-latest.args @@ -27,11 +27,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-spiceport.x86_64-latest.args b/t= ests/qemuxml2argvdata/serial-spiceport.x86_64-latest.args index f552782edf..a3f5c8bce4 100644 --- a/tests/qemuxml2argvdata/serial-spiceport.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-spiceport.x86_64-latest.args @@ -26,16 +26,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-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 '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ --device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ +-device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=3D5903,tls-port=3D5904,addr=3D127.0.0.1,x509-dir=3D/etc/pki/li= bvirt-spice,seamless-migration=3Don \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":0,"vgamem_mb":8,"max_outputs":1,"bus":"pci.0","a= ddr":"0x2"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vram6= 4_size_mb=3D0,vgamem_mb=3D8,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.x86_64-latest.args b= /tests/qemuxml2argvdata/serial-tcp-chardev.x86_64-latest.args index 33e6215ebb..f27eb257e6 100644 --- a/tests/qemuxml2argvdata/serial-tcp-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-tcp-chardev.x86_64-latest.args @@ -27,13 +27,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-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 '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.x86_64-latest= .args b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.x86_64-latest.args index 4433ce50f5..611d2825f2 100644 --- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.x86_64-latest.args @@ -27,13 +27,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-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 '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.x86_64= -latest.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.x86_= 64-latest.args index f4c3ca4cbd..90f0c193d4 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.x86_64-latest= .args @@ -27,15 +27,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-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 '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ -chardev socket,id=3Dcharserial1,host=3D127.0.0.1,port=3D5555 \ --device '{"driver":"isa-serial","chardev":"charserial1","id":"serial1"}' \ +-device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.x86_6= 4-latest.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.x8= 6_64-latest.args index 39d8c562c0..8742131063 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.x86_64-lates= t.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.x86_64-lates= t.args @@ -27,16 +27,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-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 '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ -object '{"qom-type":"tls-creds-x509","id":"objcharserial1_tls0","dir":"/e= tc/pki/libvirt-chardev","endpoint":"client","verify-peer":true}' \ -chardev socket,id=3Dcharserial1,host=3D127.0.0.1,port=3D5555,tls-creds=3D= objcharserial1_tls0 \ --device '{"driver":"isa-serial","chardev":"charserial1","id":"serial1"}' \ +-device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.x86_64-lates= t.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.x86_64-latest.ar= gs index 39d8c562c0..8742131063 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.x86_64-latest.args @@ -27,16 +27,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-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 '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ -object '{"qom-type":"tls-creds-x509","id":"objcharserial1_tls0","dir":"/e= tc/pki/libvirt-chardev","endpoint":"client","verify-peer":true}' \ -chardev socket,id=3Dcharserial1,host=3D127.0.0.1,port=3D5555,tls-creds=3D= objcharserial1_tls0 \ --device '{"driver":"isa-serial","chardev":"charserial1","id":"serial1"}' \ +-device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.x86_6= 4-latest.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.x8= 6_64-latest.args index 4f20639bcf..57771219f0 100644 --- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.x86_64-lates= t.args +++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.x86_64-lates= t.args @@ -27,17 +27,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-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 '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ -object '{"qom-type":"secret","id":"charserial1-secret0","data":"9eao5F8qt= kGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey= 0","iv":"AAECAwQFBgcICQoLDA0ODw=3D=3D","format":"base64"}' \ -object '{"qom-type":"tls-creds-x509","id":"objcharserial1_tls0","dir":"/e= tc/pki/libvirt-chardev","endpoint":"client","verify-peer":true,"passwordid"= :"charserial1-secret0"}' \ -chardev socket,id=3Dcharserial1,host=3D127.0.0.1,port=3D5555,tls-creds=3D= objcharserial1_tls0 \ --device '{"driver":"isa-serial","chardev":"charserial1","id":"serial1"}' \ +-device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.x86_64-latest.args b= /tests/qemuxml2argvdata/serial-udp-chardev.x86_64-latest.args index 95e6e6ed90..dda71c9fea 100644 --- a/tests/qemuxml2argvdata/serial-udp-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-udp-chardev.x86_64-latest.args @@ -27,15 +27,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-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 '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ -chardev udp,id=3Dcharserial1,host=3D,port=3D9999,localaddr=3D,localport= =3D0 \ --device '{"driver":"isa-serial","chardev":"charserial1","id":"serial1"}' \ +-device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args = b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args index 1e3d5772b4..8bd007242e 100644 --- a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -chardev socket,id=3Dcharserial0,path=3D/tmp/serial.sock \ --device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ -chardev socket,id=3Dcharserial1,fd=3D1729,server=3Don,wait=3Doff \ --device '{"driver":"isa-serial","chardev":"charserial1","id":"serial1"}' \ +-device isa-serial,chardev=3Dcharserial1,id=3Dserial1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.x86_64-latest.args b/= tests/qemuxml2argvdata/serial-vc-chardev.x86_64-latest.args index d15062b94f..f91a9af1e9 100644 --- a/tests/qemuxml2argvdata/serial-vc-chardev.x86_64-latest.args +++ b/tests/qemuxml2argvdata/serial-vc-chardev.x86_64-latest.args @@ -27,13 +27,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -chardev vc,id=3Dcharserial0 \ --device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-lates= t.args b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.ar= gs index 5b1e4e6161..6ce088c7df 100644 --- a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args @@ -27,11 +27,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"usb-ccid","id":"ccid0","bus":"usb.0","port":"1"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device usb-ccid,id=3Dccid0,bus=3Dusb.0,port=3D1 \ -chardev socket,id=3Dcharsmartcard0,fd=3D1729,server=3Don,wait=3Doff \ --device '{"driver":"ccid-card-passthru","chardev":"charsmartcard0","id":"s= martcard0","bus":"ccid0.0"}' \ +-device ccid-card-passthru,chardev=3Dcharsmartcard0,id=3Dsmartcard0,bus=3D= ccid0.0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args b/= tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args index 97d310d8dc..399b588355 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args @@ -26,19 +26,19 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot menu=3Don,strict=3Don \ --device '{"driver":"pci-ohci","id":"usb","bus":"pci.0","addr":"0x1"}' \ --device '{"driver":"spapr-vscsi","id":"scsi0","reg":8192}' \ --device '{"driver":"spapr-vscsi","id":"scsi1","reg":12288}' \ +-device pci-ohci,id=3Dusb,bus=3Dpci.0,addr=3D0x1 \ +-device spapr-vscsi,id=3Dscsi0,reg=3D8192 \ +-device spapr-vscsi,id=3Dscsi1,reg=3D12288 \ -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 '{"driver":"scsi-hd","bus":"scsi1.0","channel":0,"scsi-id":0,"lun"= :0,"device_id":"drive-scsi1-0-0-0","drive":"libvirt-1-format","id":"scsi1-0= -0-0","bootindex":1}' \ +-device scsi-hd,bus=3Dscsi1.0,channel=3D0,scsi-id=3D0,lun=3D0,device_id=3D= drive-scsi1-0-0-0,drive=3Dlibvirt-1-format,id=3Dscsi1-0-0-0,bootindex=3D1 \ -chardev pty,id=3Dcharserial0 \ --device '{"driver":"spapr-vty","chardev":"charserial0","id":"serial0","reg= ":805306368}' \ +-device spapr-vty,chardev=3Dcharserial0,id=3Dserial0,reg=3D805306368 \ -chardev pty,id=3Dcharserial1 \ --device '{"driver":"spapr-vty","chardev":"charserial1","id":"serial1","reg= ":805310464}' \ +-device spapr-vty,chardev=3Dcharserial1,id=3Dserial1,reg=3D805310464 \ -chardev socket,id=3Dchrtpm,path=3D/dev/test \ -tpmdev emulator,id=3Dtpm-tpm0,chardev=3Dchrtpm \ --device '{"driver":"tpm-spapr","tpmdev":"tpm-tpm0","id":"tpm0","reg":20480= }' \ +-device tpm-spapr,tpmdev=3Dtpm-tpm0,id=3Dtpm0,reg=3D20480 \ -audiodev '{"id":"audio1","driver":"none"}' \ -global spapr-nvram.reg=3D0x4000 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.arg= s b/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args index 3b418917f3..059960b818 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot menu=3Don,strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -chardev socket,id=3Dchrtpm,path=3D/dev/test \ -tpmdev emulator,id=3Dtpm-tpm0,chardev=3Dchrtpm \ --device '{"driver":"tpm-tis","tpmdev":"tpm-tpm0","id":"tpm0"}' \ +-device tpm-tis,tpmdev=3Dtpm-tpm0,id=3Dtpm0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.= args b/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args index 3b418917f3..059960b818 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2-pstate.x86_64-latest.args @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot menu=3Don,strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -chardev socket,id=3Dchrtpm,path=3D/dev/test \ -tpmdev emulator,id=3Dtpm-tpm0,chardev=3Dchrtpm \ --device '{"driver":"tpm-tis","tpmdev":"tpm-tpm0","id":"tpm0"}' \ +-device tpm-tis,tpmdev=3Dtpm-tpm0,id=3Dtpm0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args b/= tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args index 3b418917f3..059960b818 100644 --- a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot menu=3Don,strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -chardev socket,id=3Dchrtpm,path=3D/dev/test \ -tpmdev emulator,id=3Dtpm-tpm0,chardev=3Dchrtpm \ --device '{"driver":"tpm-tis","tpmdev":"tpm-tpm0","id":"tpm0"}' \ +-device tpm-tis,tpmdev=3Dtpm-tpm0,id=3Dtpm0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args b/tests= /qemuxml2argvdata/tpm-emulator.x86_64-latest.args index 3b418917f3..059960b818 100644 --- a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot menu=3Don,strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -chardev socket,id=3Dchrtpm,path=3D/dev/test \ -tpmdev emulator,id=3Dtpm-tpm0,chardev=3Dchrtpm \ --device '{"driver":"tpm-tis","tpmdev":"tpm-tpm0","id":"tpm0"}' \ +-device tpm-tis,tpmdev=3Dtpm-tpm0,id=3Dtpm0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args = b/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args index e099cf0fa1..4d4b2b9676 100644 --- a/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot menu=3Don,strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -tpmdev passthrough,id=3Dtpm-tpm0,path=3D/dev/fdset/0,cancel-path=3D/dev/f= dset/1 \ -add-fd set=3D0,fd=3D1730 \ -add-fd set=3D1,fd=3D1731 \ --device '{"driver":"tpm-crb","tpmdev":"tpm-tpm0","id":"tpm0"}' \ +-device tpm-crb,tpmdev=3Dtpm-tpm0,id=3Dtpm0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args b/te= sts/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args index beb6a307cb..720e344a1a 100644 --- a/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args @@ -26,12 +26,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-TPM-VM/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot menu=3Don,strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -tpmdev passthrough,id=3Dtpm-tpm0,path=3D/dev/fdset/0,cancel-path=3D/dev/f= dset/1 \ -add-fd set=3D0,fd=3D1730 \ -add-fd set=3D1,fd=3D1731 \ --device '{"driver":"tpm-tis","tpmdev":"tpm-tpm0","id":"tpm0"}' \ +-device tpm-tis,tpmdev=3Dtpm-tpm0,id=3Dtpm0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args b= /tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args index 3371199be5..3d317cb931 100644 --- a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args +++ b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args @@ -28,11 +28,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ --device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ +-device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ +-device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add= r":"0x0"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args b/tes= ts/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args index f8b98899c5..b03e742fd1 100644 --- a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args @@ -27,15 +27,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"ich9-usb-ehci1","id":"usb","bus":"pci.0","addr":"0x4.0= x7"}' \ --device '{"driver":"ich9-usb-uhci1","masterbus":"usb.0","firstport":0,"bus= ":"pci.0","multifunction":true,"addr":"0x4"}' \ --device '{"driver":"ich9-usb-uhci2","masterbus":"usb.0","firstport":2,"bus= ":"pci.0","addr":"0x4.0x1"}' \ --device '{"driver":"ich9-usb-uhci3","masterbus":"usb.0","firstport":4,"bus= ":"pci.0","addr":"0x4.0x2"}' \ +-device ich9-usb-ehci1,id=3Dusb,bus=3Dpci.0,addr=3D0x4.0x7 \ +-device ich9-usb-uhci1,masterbus=3Dusb.0,firstport=3D0,bus=3Dpci.0,multifu= nction=3Don,addr=3D0x4 \ +-device ich9-usb-uhci2,masterbus=3Dusb.0,firstport=3D2,bus=3Dpci.0,addr=3D= 0x4.0x1 \ +-device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpci.0,addr=3D= 0x4.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -chardev socket,id=3Dcharredir0,path=3D/tmp/connect.socket \ --device '{"driver":"usb-redir","chardev":"charredir0","id":"redir0","bus":= "usb.0","port":"1"}' \ +-device usb-redir,chardev=3Dcharredir0,id=3Dredir0,bus=3Dusb.0,port=3D1 \ -chardev socket,id=3Dcharredir1,fd=3D1729,server=3Don,wait=3Doff \ --device '{"driver":"usb-redir","chardev":"charredir1","id":"redir1","bus":= "usb.0","port":"2"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device usb-redir,chardev=3Dcharredir1,id=3Dredir1,bus=3Dusb.0,port=3D2 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args index e6e7ab3b6a..c9b380d3bf 100644 --- a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -no-acpi \ -boot strict=3Don \ -chardev socket,id=3Dchr-vu-fs0,path=3D/tmp/lib/domain--1-guest/fs0-fs.soc= k \ --device '{"driver":"vhost-user-fs-pci","id":"fs0","chardev":"chr-vu-fs0","= queue-size":1024,"tag":"mount_tag","bus":"pci.0","addr":"0x2"}' \ +-device vhost-user-fs-pci,id=3Dfs0,chardev=3Dchr-vu-fs0,queue-size=3D1024,= tag=3Dmount_tag,bus=3Dpci.0,addr=3D0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args index 6ce2aa0b22..8707978048 100644 --- a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args @@ -27,15 +27,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ --device '{"driver":"pcie-root-port","port":11,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x3"}' \ +-device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ +-device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ +-device pcie-root-port,port=3D11,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x1.0x3 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.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 '{"driver":"virtio-blk-pci","bus":"pci.4","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -chardev socket,id=3Dchr-vu-fs0,path=3D/tmp/lib/domain--1-guest/fs0-fs.soc= k \ --device '{"driver":"vhost-user-fs-pci","id":"fs0","chardev":"chr-vu-fs0","= tag":"mount_tag","bootindex":2,"bus":"pci.1","addr":"0x0"}' \ +-device vhost-user-fs-pci,id=3Dfs0,chardev=3Dchr-vu-fs0,tag=3Dmount_tag,bo= otindex=3D2,bus=3Dpci.1,addr=3D0x0 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.= args b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args index 43ae421715..b330d45e7c 100644 --- a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args @@ -28,15 +28,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -chardev socket,id=3Dchr-vu-video0,fd=3D1729 \ --device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ +-device vhost-user-vga,id=3Dvideo0,max_outputs=3D1,chardev=3Dchr-vu-video0= ,bus=3Dpci.0,addr=3D0x2 \ -chardev socket,id=3Dchr-vu-video1,fd=3D1729 \ --device '{"driver":"vhost-user-gpu-pci","id":"video1","max_outputs":1,"cha= rdev":"chr-vu-video1","bus":"pci.0","addr":"0x4"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device vhost-user-gpu-pci,id=3Dvideo1,max_outputs=3D1,chardev=3Dchr-vu-vi= deo1,bus=3Dpci.0,addr=3D0x4 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args b/tes= ts/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args index aa008ea129..abed154366 100644 --- a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args @@ -28,13 +28,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -chardev socket,id=3Dchr-vu-video0,fd=3D1729 \ --device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device vhost-user-vga,id=3Dvideo0,max_outputs=3D1,chardev=3Dchr-vu-video0= ,bus=3Dpci.0,addr=3D0x2 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args b/t= ests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args index 2ffc03f294..45984599d8 100644 --- a/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args @@ -27,9 +27,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -no-shutdown \ -no-acpi \ -boot menu=3Don,strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x6"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x6 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device '{"driver":"vhost-vsock-pci","id":"vsock0","guest-cid":42,"vhostfd= ":"6789","bus":"pci.0","addr":"0x2"}' \ +-device vhost-vsock-pci,id=3Dvsock0,guest-cid=3D42,vhostfd=3D6789,bus=3Dpc= i.0,addr=3D0x2 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args b/tests/= qemuxml2argvdata/vhost-vsock.x86_64-latest.args index e500054e42..2b8ed25e8a 100644 --- a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args +++ b/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args @@ -27,9 +27,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -no-shutdown \ -no-acpi \ -boot menu=3Don,strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x6"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x6 \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device '{"driver":"vhost-vsock-pci","id":"vsock0","guest-cid":4,"vhostfd"= :"6789","bus":"pci.0","addr":"0x7"}' \ +-device vhost-vsock-pci,id=3Dvsock0,guest-cid=3D4,vhostfd=3D6789,bus=3Dpci= .0,addr=3D0x7 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-lates= t.args b/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.ar= gs index 012ef023e1..9079625895 100644 --- a/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1,"write-cache":"on"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"bochs-display","id":"video0","vgamem":16777216,"bus":"= pci.0","addr":"0x2"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device bochs-display,id=3Dvideo0,vgamem=3D16777216,bus=3Dpci.0,addr=3D0x2= \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args index f42498a616..1315eaca11 100644 --- a/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args @@ -27,9 +27,9 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":128,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0"= ,"addr":"0x2"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vram6= 4_size_mb=3D128,vgamem_mb=3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-late= st.args b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.= args index bcd2739c04..86e4a95577 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","= addr":"0x2"}' \ --device '{"driver":"qxl","id":"video1","ram_size":67108864,"vram_size":671= 08864,"vram64_size_mb":128,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","ad= dr":"0x4"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vram6= 4_size_mb=3D0,vgamem_mb=3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ +-device qxl,id=3Dvideo1,ram_size=3D67108864,vram_size=3D67108864,vram64_si= ze_mb=3D128,vgamem_mb=3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x4 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-lates= t.args b/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.ar= gs index 061f89a4f3..ca46b75a45 100644 --- a/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1,"write-cache":"on"}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1,write-cache=3Don \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"ramfb","id":"video0"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device ramfb,id=3Dvideo0 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.x86_64-latest.args index c49c00ed34..330243ef35 100644 --- a/tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.x86_64-latest.args +++ b/tests/qemuxml2argvdata/video-virtio-vga-gpu-gl.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-vga-gl","id":"video0","max_outputs":1,"bus":"pc= i.0","addr":"0x2"}' \ --device '{"driver":"virtio-gpu-gl-pci","id":"video1","max_outputs":1,"bus"= :"pci.0","addr":"0x4"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-vga-gl,id=3Dvideo0,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ +-device virtio-gpu-gl-pci,id=3Dvideo1,max_outputs=3D1,bus=3Dpci.0,addr=3D0= x4 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args= b/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args index 01fe01e3c6..697bb1e655 100644 --- a/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-9p-createmode.x86_64-latest.args @@ -27,18 +27,18 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -fsdev local,security_model=3Dmapped,fmode=3D0644,id=3Dfsdev-fs0,path=3D/e= xport/fs0 \ --device '{"driver":"virtio-9p-pci","id":"fs0","fsdev":"fsdev-fs0","mount_t= ag":"fs0","bus":"pci.0","addr":"0x2"}' \ +-device virtio-9p-pci,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3Dfs0,bus=3Dpci= .0,addr=3D0x2 \ -fsdev local,security_model=3Dmapped,dmode=3D0755,id=3Dfsdev-fs1,path=3D/e= xport/fs1 \ --device '{"driver":"virtio-9p-pci","id":"fs1","fsdev":"fsdev-fs1","mount_t= ag":"fs1","bus":"pci.0","addr":"0x3"}' \ +-device virtio-9p-pci,id=3Dfs1,fsdev=3Dfsdev-fs1,mount_tag=3Dfs1,bus=3Dpci= .0,addr=3D0x3 \ -fsdev local,security_model=3Dmapped,fmode=3D0640,dmode=3D0750,id=3Dfsdev-= fs2,path=3D/export/fs2 \ --device '{"driver":"virtio-9p-pci","id":"fs2","fsdev":"fsdev-fs2","mount_t= ag":"fs2","bus":"pci.0","addr":"0x4"}' \ +-device virtio-9p-pci,id=3Dfs2,fsdev=3Dfsdev-fs2,mount_tag=3Dfs2,bus=3Dpci= .0,addr=3D0x4 \ -fsdev local,security_model=3Dmapped,id=3Dfsdev-fs3,path=3D/export/fs3 \ --device '{"driver":"virtio-9p-pci","id":"fs3","fsdev":"fsdev-fs3","mount_t= ag":"fs3","bus":"pci.0","addr":"0x5"}' \ +-device virtio-9p-pci,id=3Dfs3,fsdev=3Dfsdev-fs3,mount_tag=3Dfs3,bus=3Dpci= .0,addr=3D0x5 \ -chardev pty,id=3Dcharserial0 \ --device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0xc"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0xc \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args = b/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args index 8b325bb7ec..e52826f2c4 100644 --- a/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-9p-multidevs.x86_64-latest.args @@ -27,16 +27,16 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -fsdev local,security_model=3Dmapped,multidevs=3Dremap,id=3Dfsdev-fs0,path= =3D/export/fs0 \ --device '{"driver":"virtio-9p-pci","id":"fs0","fsdev":"fsdev-fs0","mount_t= ag":"fs0","bus":"pci.0","addr":"0x2"}' \ +-device virtio-9p-pci,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3Dfs0,bus=3Dpci= .0,addr=3D0x2 \ -fsdev local,security_model=3Dmapped,multidevs=3Dforbid,id=3Dfsdev-fs1,pat= h=3D/export/fs1 \ --device '{"driver":"virtio-9p-pci","id":"fs1","fsdev":"fsdev-fs1","mount_t= ag":"fs1","bus":"pci.0","addr":"0x3"}' \ +-device virtio-9p-pci,id=3Dfs1,fsdev=3Dfsdev-fs1,mount_tag=3Dfs1,bus=3Dpci= .0,addr=3D0x3 \ -fsdev local,security_model=3Dmapped,multidevs=3Dwarn,id=3Dfsdev-fs2,path= =3D/export/fs2 \ --device '{"driver":"virtio-9p-pci","id":"fs2","fsdev":"fsdev-fs2","mount_t= ag":"fs2","bus":"pci.0","addr":"0x4"}' \ +-device virtio-9p-pci,id=3Dfs2,fsdev=3Dfsdev-fs2,mount_tag=3Dfs2,bus=3Dpci= .0,addr=3D0x4 \ -chardev pty,id=3Dcharserial0 \ --device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0xc"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0xc \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-lun.x86_64-latest.args b/tests/q= emuxml2argvdata/virtio-lun.x86_64-latest.args index c6c9a98ffe..d99768097e 100644 --- a/tests/qemuxml2argvdata/virtio-lun.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-lun.x86_64-latest.args @@ -27,17 +27,17 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \ -no-shutdown \ -no-acpi \ -boot menu=3Don,strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x6"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x6 \ -blockdev '{"driver":"host_device","filename":"/dev/sdfake","node-name":"l= ibvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ","file":"libvirt-2-storage"}' \ --device '{"driver":"virtio-blk-pci","scsi":true,"bus":"pci.0","addr":"0x4"= ,"drive":"libvirt-2-format","id":"virtio-disk0","bootindex":2}' \ +-device virtio-blk-pci,scsi=3Don,bus=3Dpci.0,addr=3D0x4,drive=3Dlibvirt-2-= format,id=3Dvirtio-disk0,bootindex=3D2 \ -blockdev '{"driver":"host_device","filename":"/dev/sdfake2","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 '{"driver":"virtio-blk-pci","scsi":true,"bus":"pci.0","addr":"0x5"= ,"drive":"libvirt-1-format","id":"virtio-disk1"}' \ +-device virtio-blk-pci,scsi=3Don,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-1-= format,id=3Dvirtio-disk1 \ -netdev user,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci","event_idx":false,"netdev":"hostnet0",= "id":"net0","mac":"52:54:00:e5:48:58","bus":"pci.0","addr":"0x2"}' \ +-device virtio-net-pci,event_idx=3Doff,netdev=3Dhostnet0,id=3Dnet0,mac=3D5= 2:54:00:e5:48:58,bus=3Dpci.0,addr=3D0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args index 8fa615b0b0..de4cd521e3 100644 --- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args @@ -27,32 +27,32 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ --device '{"driver":"pcie-root-port","port":11,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x3"}' \ --device '{"driver":"pcie-root-port","port":12,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x1.0x4"}' \ --device '{"driver":"pcie-root-port","port":13,"chassis":6,"id":"pci.6","bu= s":"pcie.0","addr":"0x1.0x5"}' \ --device '{"driver":"pcie-root-port","port":14,"chassis":7,"id":"pci.7","bu= s":"pcie.0","addr":"0x1.0x6"}' \ --device '{"driver":"pcie-root-port","port":15,"chassis":8,"id":"pci.8","bu= s":"pcie.0","addr":"0x1.0x7"}' \ --device '{"driver":"pcie-root-port","port":16,"chassis":9,"id":"pci.9","bu= s":"pcie.0","multifunction":true,"addr":"0x2"}' \ --device '{"driver":"pcie-root-port","port":17,"chassis":10,"id":"pci.10","= bus":"pcie.0","addr":"0x2.0x1"}' \ --device '{"driver":"pcie-root-port","port":18,"chassis":11,"id":"pci.11","= bus":"pcie.0","addr":"0x2.0x2"}' \ --device '{"driver":"virtio-scsi-pci-non-transitional","id":"scsi0","bus":"= pci.4","addr":"0x0"}' \ --device '{"driver":"virtio-serial-pci-non-transitional","id":"virtio-seria= l0","bus":"pci.3","addr":"0x0"}' \ +-device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ +-device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ +-device pcie-root-port,port=3D11,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x1.0x3 \ +-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 pcie-root-port,port=3D14,chassis=3D7,id=3Dpci.7,bus=3Dpcie.0,addr= =3D0x1.0x6 \ +-device pcie-root-port,port=3D15,chassis=3D8,id=3Dpci.8,bus=3Dpcie.0,addr= =3D0x1.0x7 \ +-device pcie-root-port,port=3D16,chassis=3D9,id=3Dpci.9,bus=3Dpcie.0,multi= function=3Don,addr=3D0x2 \ +-device pcie-root-port,port=3D17,chassis=3D10,id=3Dpci.10,bus=3Dpcie.0,add= r=3D0x2.0x1 \ +-device pcie-root-port,port=3D18,chassis=3D11,id=3Dpci.11,bus=3Dpcie.0,add= r=3D0x2.0x2 \ +-device virtio-scsi-pci-non-transitional,id=3Dscsi0,bus=3Dpci.4,addr=3D0x0= \ +-device virtio-serial-pci-non-transitional,id=3Dvirtio-serial0,bus=3Dpci.3= ,addr=3D0x0 \ -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 '{"driver":"virtio-blk-pci-non-transitional","bus":"pci.5","addr":= "0x0","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci-non-transitional,bus=3Dpci.5,addr=3D0x0,drive=3Dlib= virt-1-format,id=3Dvirtio-disk0,bootindex=3D1 \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/fs= 1 \ --device '{"driver":"virtio-9p-pci-non-transitional","id":"fs0","fsdev":"fs= dev-fs0","mount_tag":"fs1","bus":"pci.1","addr":"0x0"}' \ +-device virtio-9p-pci-non-transitional,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_ta= g=3Dfs1,bus=3Dpci.1,addr=3D0x0 \ -netdev user,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci-non-transitional","netdev":"hostnet0","= id":"net0","mac":"00:11:22:33:44:55","bus":"pci.2","addr":"0x0"}' \ --device '{"driver":"virtio-input-host-pci-non-transitional","id":"input0",= "evdev":"/dev/input/event1234","bus":"pci.9","addr":"0x0"}' \ +-device virtio-net-pci-non-transitional,netdev=3Dhostnet0,id=3Dnet0,mac=3D= 00:11:22:33:44:55,bus=3Dpci.2,addr=3D0x0 \ +-device virtio-input-host-pci-non-transitional,id=3Dinput0,evdev=3D/dev/in= put/event1234,bus=3Dpci.9,addr=3D0x0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"vhost-scsi-pci-non-transitional","wwpn":"naa.512345678= 9abcde0","vhostfd":"3","id":"hostdev0","bus":"pci.6","addr":"0x0"}' \ --device '{"driver":"virtio-balloon-pci-non-transitional","id":"balloon0","= bus":"pci.7","addr":"0x0"}' \ +-device vhost-scsi-pci-non-transitional,wwpn=3Dnaa.5123456789abcde0,vhostf= d=3D3,id=3Dhostdev0,bus=3Dpci.6,addr=3D0x0 \ +-device virtio-balloon-pci-non-transitional,id=3Dballoon0,bus=3Dpci.7,addr= =3D0x0 \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ --device '{"driver":"virtio-rng-pci-non-transitional","rng":"objrng0","id":= "rng0","bus":"pci.8","addr":"0x0"}' \ +-device virtio-rng-pci-non-transitional,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.= 8,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device '{"driver":"vhost-vsock-pci-non-transitional","id":"vsock0","guest= -cid":4,"vhostfd":"6789","bus":"pci.10","addr":"0x0"}' \ +-device vhost-vsock-pci-non-transitional,id=3Dvsock0,guest-cid=3D4,vhostfd= =3D6789,bus=3Dpci.10,addr=3D0x0 \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-la= test.args b/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-lat= est.args index c4c7b09f4e..86bd17eca6 100644 --- a/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/virtio-options-controller-ats.x86_64-latest.ar= gs @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-scsi-pci","ats":true,"id":"scsi0","bus":"pci.0"= ,"addr":"0x2"}' \ --device '{"driver":"virtio-scsi-pci","ats":false,"id":"scsi1","bus":"pci.0= ","addr":"0x3"}' \ --device '{"driver":"virtio-serial-pci","ats":true,"id":"virtio-serial0","b= us":"pci.0","addr":"0x4"}' \ --device '{"driver":"virtio-serial-pci","ats":false,"id":"virtio-serial1","= bus":"pci.0","addr":"0x5"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-scsi-pci,ats=3Don,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ +-device virtio-scsi-pci,ats=3Doff,id=3Dscsi1,bus=3Dpci.0,addr=3D0x3 \ +-device virtio-serial-pci,ats=3Don,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D= 0x4 \ +-device virtio-serial-pci,ats=3Doff,id=3Dvirtio-serial1,bus=3Dpci.0,addr= =3D0x5 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-= latest.args b/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64= -latest.args index d47594ad65..bdee772fc2 100644 --- a/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/virtio-options-controller-iommu.x86_64-latest.= args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-scsi-pci","iommu_platform":true,"id":"scsi0","b= us":"pci.0","addr":"0x2"}' \ --device '{"driver":"virtio-scsi-pci","iommu_platform":false,"id":"scsi1","= bus":"pci.0","addr":"0x3"}' \ --device '{"driver":"virtio-serial-pci","iommu_platform":true,"id":"virtio-= serial0","bus":"pci.0","addr":"0x4"}' \ --device '{"driver":"virtio-serial-pci","iommu_platform":false,"id":"virtio= -serial1","bus":"pci.0","addr":"0x5"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-scsi-pci,iommu_platform=3Don,id=3Dscsi0,bus=3Dpci.0,addr=3D= 0x2 \ +-device virtio-scsi-pci,iommu_platform=3Doff,id=3Dscsi1,bus=3Dpci.0,addr= =3D0x3 \ +-device virtio-serial-pci,iommu_platform=3Don,id=3Dvirtio-serial0,bus=3Dpc= i.0,addr=3D0x4 \ +-device virtio-serial-pci,iommu_platform=3Doff,id=3Dvirtio-serial1,bus=3Dp= ci.0,addr=3D0x5 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64= -latest.args b/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_= 64-latest.args index 840a21421f..201f0e1d13 100644 --- a/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/virtio-options-controller-packed.x86_64-latest= .args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-scsi-pci","packed":true,"id":"scsi0","bus":"pci= .0","addr":"0x2"}' \ --device '{"driver":"virtio-scsi-pci","packed":false,"id":"scsi1","bus":"pc= i.0","addr":"0x3"}' \ --device '{"driver":"virtio-serial-pci","packed":true,"id":"virtio-serial0"= ,"bus":"pci.0","addr":"0x4"}' \ --device '{"driver":"virtio-serial-pci","packed":false,"id":"virtio-serial1= ","bus":"pci.0","addr":"0x5"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-scsi-pci,packed=3Don,id=3Dscsi0,bus=3Dpci.0,addr=3D0x2 \ +-device virtio-scsi-pci,packed=3Doff,id=3Dscsi1,bus=3Dpci.0,addr=3D0x3 \ +-device virtio-serial-pci,packed=3Don,id=3Dvirtio-serial0,bus=3Dpci.0,addr= =3D0x4 \ +-device virtio-serial-pci,packed=3Doff,id=3Dvirtio-serial1,bus=3Dpci.0,add= r=3D0x5 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args index 2092188250..598d8c87b7 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-ats.x86_64-latest.args @@ -27,14 +27,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img1","nod= e-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 '{"driver":"virtio-blk-pci","ats":true,"bus":"pci.0","addr":"0x2",= "drive":"libvirt-2-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,ats=3Don,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-2-f= ormat,id=3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img2","nod= e-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 '{"driver":"virtio-blk-pci","ats":false,"bus":"pci.0","addr":"0x3"= ,"drive":"libvirt-1-format","id":"virtio-disk1"}' \ +-device virtio-blk-pci,ats=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-1-= format,id=3Dvirtio-disk1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest= .args b/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args index 972af66b93..7dc742775c 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-iommu.x86_64-latest.args @@ -27,14 +27,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img1","nod= e-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 '{"driver":"virtio-blk-pci","iommu_platform":true,"bus":"pci.0","a= ddr":"0x2","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,iommu_platform=3Don,bus=3Dpci.0,addr=3D0x2,drive=3D= libvirt-2-format,id=3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img2","nod= e-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 '{"driver":"virtio-blk-pci","iommu_platform":false,"bus":"pci.0","= addr":"0x3","drive":"libvirt-1-format","id":"virtio-disk1"}' \ +-device virtio-blk-pci,iommu_platform=3Doff,bus=3Dpci.0,addr=3D0x3,drive= =3Dlibvirt-1-format,id=3Dvirtio-disk1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-lates= t.args b/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.ar= gs index 6b32a32664..b74b1ecdf3 100644 --- a/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-disk-packed.x86_64-latest.args @@ -27,14 +27,14 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img1","nod= e-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 '{"driver":"virtio-blk-pci","packed":true,"bus":"pci.0","addr":"0x= 2","drive":"libvirt-2-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,packed=3Don,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-= 2-format,id=3Dvirtio-disk0,bootindex=3D1 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img2","nod= e-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 '{"driver":"virtio-blk-pci","packed":false,"bus":"pci.0","addr":"0= x3","drive":"libvirt-1-format","id":"virtio-disk1"}' \ +-device virtio-blk-pci,packed=3Doff,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt= -1-format,id=3Dvirtio-disk1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.arg= s b/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args index 85a7eec07b..e5f55bbe2e 100644 --- a/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-fs-ats.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/fs= 1 \ --device '{"driver":"virtio-9p-pci","ats":true,"id":"fs0","fsdev":"fsdev-fs= 0","mount_tag":"fs1","bus":"pci.0","addr":"0x2"}' \ +-device virtio-9p-pci,ats=3Don,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3Dfs1,= bus=3Dpci.0,addr=3D0x2 \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs1,path=3D/export/fs= 2 \ --device '{"driver":"virtio-9p-pci","ats":false,"id":"fs1","fsdev":"fsdev-f= s1","mount_tag":"fs2","bus":"pci.0","addr":"0x3"}' \ +-device virtio-9p-pci,ats=3Doff,id=3Dfs1,fsdev=3Dfsdev-fs1,mount_tag=3Dfs2= ,bus=3Dpci.0,addr=3D0x3 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.a= rgs b/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args index e06d047baa..06918581bb 100644 --- a/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-fs-iommu.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/fs= 1 \ --device '{"driver":"virtio-9p-pci","iommu_platform":true,"id":"fs0","fsdev= ":"fsdev-fs0","mount_tag":"fs1","bus":"pci.0","addr":"0x2"}' \ +-device virtio-9p-pci,iommu_platform=3Don,id=3Dfs0,fsdev=3Dfsdev-fs0,mount= _tag=3Dfs1,bus=3Dpci.0,addr=3D0x2 \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs1,path=3D/export/fs= 2 \ --device '{"driver":"virtio-9p-pci","iommu_platform":false,"id":"fs1","fsde= v":"fsdev-fs1","mount_tag":"fs2","bus":"pci.0","addr":"0x3"}' \ +-device virtio-9p-pci,iommu_platform=3Doff,id=3Dfs1,fsdev=3Dfsdev-fs1,moun= t_tag=3Dfs2,bus=3Dpci.0,addr=3D0x3 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.= args b/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args index 369f86c55c..3881d24db7 100644 --- a/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-fs-packed.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/fs= 1 \ --device '{"driver":"virtio-9p-pci","packed":true,"id":"fs0","fsdev":"fsdev= -fs0","mount_tag":"fs1","bus":"pci.0","addr":"0x2"}' \ +-device virtio-9p-pci,packed=3Don,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3Df= s1,bus=3Dpci.0,addr=3D0x2 \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs1,path=3D/export/fs= 2 \ --device '{"driver":"virtio-9p-pci","packed":false,"id":"fs1","fsdev":"fsde= v-fs1","mount_tag":"fs2","bus":"pci.0","addr":"0x3"}' \ +-device virtio-9p-pci,packed=3Doff,id=3Dfs1,fsdev=3Dfsdev-fs1,mount_tag=3D= fs2,bus=3Dpci.0,addr=3D0x3 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.= args b/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args index 7ace0a898f..2b10ab4976 100644 --- a/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-input-ats.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-mouse-pci","ats":true,"id":"input0","bus":"pci.= 0","addr":"0x2"}' \ --device '{"driver":"virtio-keyboard-pci","ats":false,"id":"input1","bus":"= pci.0","addr":"0x3"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-mouse-pci,ats=3Don,id=3Dinput0,bus=3Dpci.0,addr=3D0x2 \ +-device virtio-keyboard-pci,ats=3Doff,id=3Dinput1,bus=3Dpci.0,addr=3D0x3 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-lates= t.args b/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.ar= gs index 15647c8a67..c1866a1cf8 100644 --- a/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-input-iommu.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-mouse-pci","iommu_platform":true,"id":"input0",= "bus":"pci.0","addr":"0x2"}' \ --device '{"driver":"virtio-keyboard-pci","iommu_platform":false,"id":"inpu= t1","bus":"pci.0","addr":"0x3"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-mouse-pci,iommu_platform=3Don,id=3Dinput0,bus=3Dpci.0,addr= =3D0x2 \ +-device virtio-keyboard-pci,iommu_platform=3Doff,id=3Dinput1,bus=3Dpci.0,a= ddr=3D0x3 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-late= st.args b/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.= args index ff9742d672..1669ac5741 100644 --- a/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-input-packed.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-mouse-pci","packed":true,"id":"input0","bus":"p= ci.0","addr":"0x2"}' \ --device '{"driver":"virtio-keyboard-pci","packed":false,"id":"input1","bus= ":"pci.0","addr":"0x3"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-mouse-pci,packed=3Don,id=3Dinput0,bus=3Dpci.0,addr=3D0x2 \ +-device virtio-keyboard-pci,packed=3Doff,id=3Dinput1,bus=3Dpci.0,addr=3D0x= 3 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-la= test.args b/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-lat= est.args index 99b8b91df6..17191c5369 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-ats.x86_64-latest.ar= gs @@ -27,8 +27,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","ats":true,"id":"balloon0","bus":"= pci.0","addr":"0x2"}' \ +-device virtio-balloon-pci,ats=3Don,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-repo= rting.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon= -freepage-reporting.x86_64-latest.args index 122ef285df..b449563ba6 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x= 86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-freepage-reporting.x= 86_64-latest.args @@ -27,8 +27,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","free-page-reporti= ng":true,"bus":"pci.0","addr":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,free-page-reporting=3Don,bus=3Dpc= i.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-= latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64= -latest.args index 606ad28548..5fd0058b65 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-iommu.x86_64-latest.= args @@ -27,8 +27,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","iommu_platform":true,"id":"balloo= n0","bus":"pci.0","addr":"0x2"}' \ +-device virtio-balloon-pci,iommu_platform=3Don,id=3Dballoon0,bus=3Dpci.0,a= ddr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64= -latest.args b/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_= 64-latest.args index 8d147d3eff..1e93eb0597 100644 --- a/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest= .args +++ b/tests/qemuxml2argvdata/virtio-options-memballoon-packed.x86_64-latest= .args @@ -27,8 +27,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","packed":true,"id":"balloon0","bus= ":"pci.0","addr":"0x2"}' \ +-device virtio-balloon-pci,packed=3Don,id=3Dballoon0,bus=3Dpci.0,addr=3D0x= 2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args index c35e26b21f..0dcb1cecf5 100644 --- a/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-net-ats.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -netdev user,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci","ats":true,"netdev":"hostnet0","id":"n= et0","mac":"52:54:56:58:5a:5c","bus":"pci.0","addr":"0x2"}' \ +-device virtio-net-pci,ats=3Don,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:56= :58:5a:5c,bus=3Dpci.0,addr=3D0x2 \ -netdev user,id=3Dhostnet1 \ --device '{"driver":"virtio-net-pci","ats":false,"netdev":"hostnet1","id":"= net1","mac":"62:64:66:68:6a:6c","bus":"pci.0","addr":"0x3"}' \ +-device virtio-net-pci,ats=3Doff,netdev=3Dhostnet1,id=3Dnet1,mac=3D62:64:6= 6:68:6a:6c,bus=3Dpci.0,addr=3D0x3 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.= args b/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args index ec0247f42e..4715951b58 100644 --- a/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-net-iommu.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -netdev user,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci","iommu_platform":true,"netdev":"hostne= t0","id":"net0","mac":"52:54:56:58:5a:5c","bus":"pci.0","addr":"0x2"}' \ +-device virtio-net-pci,iommu_platform=3Don,netdev=3Dhostnet0,id=3Dnet0,mac= =3D52:54:56:58:5a:5c,bus=3Dpci.0,addr=3D0x2 \ -netdev user,id=3Dhostnet1 \ --device '{"driver":"virtio-net-pci","iommu_platform":false,"netdev":"hostn= et1","id":"net1","mac":"62:64:66:68:6a:6c","bus":"pci.0","addr":"0x3"}' \ +-device virtio-net-pci,iommu_platform=3Doff,netdev=3Dhostnet1,id=3Dnet1,ma= c=3D62:64:66:68:6a:6c,bus=3Dpci.0,addr=3D0x3 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest= .args b/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args index 7aad3173f9..5931a52728 100644 --- a/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-net-packed.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -netdev user,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci","packed":true,"netdev":"hostnet0","id"= :"net0","mac":"52:54:56:58:5a:5c","bus":"pci.0","addr":"0x2"}' \ +-device virtio-net-pci,packed=3Don,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54= :56:58:5a:5c,bus=3Dpci.0,addr=3D0x2 \ -netdev user,id=3Dhostnet1 \ --device '{"driver":"virtio-net-pci","packed":false,"netdev":"hostnet1","id= ":"net1","mac":"62:64:66:68:6a:6c","bus":"pci.0","addr":"0x3"}' \ +-device virtio-net-pci,packed=3Doff,netdev=3Dhostnet1,id=3Dnet1,mac=3D62:6= 4:66:68:6a:6c,bus=3Dpci.0,addr=3D0x3 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.ar= gs b/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args index 1d0fd5591a..f354f66f22 100644 --- a/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-rng-ats.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}= ' \ --device '{"driver":"virtio-rng-pci","ats":true,"rng":"objrng0","id":"rng0"= ,"bus":"pci.0","addr":"0x2"}' \ +-device virtio-rng-pci,ats=3Don,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr= =3D0x2 \ -object '{"qom-type":"rng-random","id":"objrng1","filename":"/dev/random"}= ' \ --device '{"driver":"virtio-rng-pci","ats":false,"rng":"objrng1","id":"rng1= ","bus":"pci.0","addr":"0x3"}' \ +-device virtio-rng-pci,ats=3Doff,rng=3Dobjrng1,id=3Drng1,bus=3Dpci.0,addr= =3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.= args b/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args index fe5ee2abf7..81941631b4 100644 --- a/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-rng-iommu.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}= ' \ --device '{"driver":"virtio-rng-pci","iommu_platform":true,"rng":"objrng0",= "id":"rng0","bus":"pci.0","addr":"0x2"}' \ +-device virtio-rng-pci,iommu_platform=3Don,rng=3Dobjrng0,id=3Drng0,bus=3Dp= ci.0,addr=3D0x2 \ -object '{"qom-type":"rng-random","id":"objrng1","filename":"/dev/random"}= ' \ --device '{"driver":"virtio-rng-pci","iommu_platform":false,"rng":"objrng1"= ,"id":"rng1","bus":"pci.0","addr":"0x3"}' \ +-device virtio-rng-pci,iommu_platform=3Doff,rng=3Dobjrng1,id=3Drng1,bus=3D= pci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest= .args b/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args index 0d290769dd..c41f92c7ca 100644 --- a/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-rng-packed.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}= ' \ --device '{"driver":"virtio-rng-pci","packed":true,"rng":"objrng0","id":"rn= g0","bus":"pci.0","addr":"0x2"}' \ +-device virtio-rng-pci,packed=3Don,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,add= r=3D0x2 \ -object '{"qom-type":"rng-random","id":"objrng1","filename":"/dev/random"}= ' \ --device '{"driver":"virtio-rng-pci","packed":false,"rng":"objrng1","id":"r= ng1","bus":"pci.0","addr":"0x3"}' \ +-device virtio-rng-pci,packed=3Doff,rng=3Dobjrng1,id=3Drng1,bus=3Dpci.0,ad= dr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.= args b/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args index c0b5ad781a..9cd705da7a 100644 --- a/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-video-ats.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -chardev socket,id=3Dchr-vu-video0,fd=3D1729 \ --device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ +-device vhost-user-vga,id=3Dvideo0,max_outputs=3D1,chardev=3Dchr-vu-video0= ,bus=3Dpci.0,addr=3D0x2 \ -chardev socket,id=3Dchr-vu-video1,fd=3D1729 \ --device '{"driver":"vhost-user-gpu-pci","ats":false,"id":"video1","max_out= puts":1,"chardev":"chr-vu-video1","bus":"pci.0","addr":"0x3"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-device vhost-user-gpu-pci,ats=3Doff,id=3Dvideo1,max_outputs=3D1,chardev= =3Dchr-vu-video1,bus=3Dpci.0,addr=3D0x3 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-lates= t.args b/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.ar= gs index 48c7bcf7f6..d747fcf2fb 100644 --- a/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-video-iommu.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -chardev socket,id=3Dchr-vu-video0,fd=3D1729 \ --device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ +-device vhost-user-vga,id=3Dvideo0,max_outputs=3D1,chardev=3Dchr-vu-video0= ,bus=3Dpci.0,addr=3D0x2 \ -chardev socket,id=3Dchr-vu-video1,fd=3D1729 \ --device '{"driver":"vhost-user-gpu-pci","iommu_platform":false,"id":"video= 1","max_outputs":1,"chardev":"chr-vu-video1","bus":"pci.0","addr":"0x3"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-device vhost-user-gpu-pci,iommu_platform=3Doff,id=3Dvideo1,max_outputs=3D= 1,chardev=3Dchr-vu-video1,bus=3Dpci.0,addr=3D0x3 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-late= st.args b/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.= args index f1b96b92d7..63d0a141f6 100644 --- a/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options-video-packed.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ -chardev socket,id=3Dchr-vu-video0,fd=3D1729 \ --device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ +-device vhost-user-vga,id=3Dvideo0,max_outputs=3D1,chardev=3Dchr-vu-video0= ,bus=3Dpci.0,addr=3D0x2 \ -chardev socket,id=3Dchr-vu-video1,fd=3D1729 \ --device '{"driver":"vhost-user-gpu-pci","packed":false,"id":"video1","max_= outputs":1,"chardev":"chr-vu-video1","bus":"pci.0","addr":"0x3"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x4"}' \ +-device vhost-user-gpu-pci,packed=3Doff,id=3Dvideo1,max_outputs=3D1,charde= v=3Dchr-vu-video1,bus=3Dpci.0,addr=3D0x3 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args b/tes= ts/qemuxml2argvdata/virtio-options.x86_64-latest.args index 48f6b23c0d..65328a756c 100644 --- a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args @@ -27,27 +27,27 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ --device '{"driver":"virtio-scsi-pci","iommu_platform":true,"ats":true,"pac= ked":true,"page-per-vq":true,"id":"scsi0","bus":"pci.0","addr":"0x8"}' \ --device '{"driver":"virtio-serial-pci","iommu_platform":true,"ats":true,"p= acked":true,"page-per-vq":true,"id":"virtio-serial0","bus":"pci.0","addr":"= 0x9"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-scsi-pci,iommu_platform=3Don,ats=3Don,packed=3Don,page-per-= vq=3Don,id=3Dscsi0,bus=3Dpci.0,addr=3D0x8 \ +-device virtio-serial-pci,iommu_platform=3Don,ats=3Don,packed=3Don,page-pe= r-vq=3Don,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x9 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img1","nod= e-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 '{"driver":"virtio-blk-pci","iommu_platform":true,"ats":true,"pack= ed":true,"page-per-vq":true,"bus":"pci.0","addr":"0xa","drive":"libvirt-1-f= ormat","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,iommu_platform=3Don,ats=3Don,packed=3Don,page-per-v= q=3Don,bus=3Dpci.0,addr=3D0xa,drive=3Dlibvirt-1-format,id=3Dvirtio-disk0,bo= otindex=3D1 \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/fs= 1 \ --device '{"driver":"virtio-9p-pci","iommu_platform":true,"ats":true,"packe= d":true,"page-per-vq":true,"id":"fs0","fsdev":"fsdev-fs0","mount_tag":"fs1"= ,"bus":"pci.0","addr":"0x3"}' \ +-device virtio-9p-pci,iommu_platform=3Don,ats=3Don,packed=3Don,page-per-vq= =3Don,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3Dfs1,bus=3Dpci.0,addr=3D0x3 \ -fsdev local,security_model=3Dmapped,writeout=3Dimmediate,id=3Dfsdev-fs1,p= ath=3D/export/fs2 \ --device '{"driver":"virtio-9p-pci","iommu_platform":true,"ats":true,"packe= d":true,"page-per-vq":true,"id":"fs1","fsdev":"fsdev-fs1","mount_tag":"fs2"= ,"bus":"pci.0","addr":"0x4"}' \ +-device virtio-9p-pci,iommu_platform=3Don,ats=3Don,packed=3Don,page-per-vq= =3Don,id=3Dfs1,fsdev=3Dfsdev-fs1,mount_tag=3Dfs2,bus=3Dpci.0,addr=3D0x4 \ -netdev user,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci","iommu_platform":true,"ats":true,"pack= ed":true,"page-per-vq":true,"netdev":"hostnet0","id":"net0","mac":"52:54:56= :58:5a:5c","bus":"pci.0","addr":"0x6"}' \ --device '{"driver":"virtio-mouse-pci","iommu_platform":true,"ats":true,"pa= cked":true,"page-per-vq":true,"id":"input0","bus":"pci.0","addr":"0xe"}' \ --device '{"driver":"virtio-keyboard-pci","iommu_platform":true,"ats":true,= "packed":true,"page-per-vq":true,"id":"input1","bus":"pci.0","addr":"0x10"}= ' \ --device '{"driver":"virtio-tablet-pci","iommu_platform":true,"ats":true,"p= acked":true,"page-per-vq":true,"id":"input2","bus":"pci.0","addr":"0x11"}' \ --device '{"driver":"virtio-input-host-pci","iommu_platform":true,"ats":tru= e,"packed":true,"page-per-vq":true,"id":"input3","evdev":"/dev/input/event1= 234","bus":"pci.0","addr":"0x12"}' \ +-device virtio-net-pci,iommu_platform=3Don,ats=3Don,packed=3Don,page-per-v= q=3Don,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:56:58:5a:5c,bus=3Dpci.0,addr= =3D0x6 \ +-device virtio-mouse-pci,iommu_platform=3Don,ats=3Don,packed=3Don,page-per= -vq=3Don,id=3Dinput0,bus=3Dpci.0,addr=3D0xe \ +-device virtio-keyboard-pci,iommu_platform=3Don,ats=3Don,packed=3Don,page-= per-vq=3Don,id=3Dinput1,bus=3Dpci.0,addr=3D0x10 \ +-device virtio-tablet-pci,iommu_platform=3Don,ats=3Don,packed=3Don,page-pe= r-vq=3Don,id=3Dinput2,bus=3Dpci.0,addr=3D0x11 \ +-device virtio-input-host-pci,iommu_platform=3Don,ats=3Don,packed=3Don,pag= e-per-vq=3Don,id=3Dinput3,evdev=3D/dev/input/event1234,bus=3Dpci.0,addr=3D0= x12 \ -audiodev '{"id":"audio1","driver":"none"}' \ -chardev socket,id=3Dchr-vu-video0,fd=3D1729 \ --device '{"driver":"vhost-user-vga","id":"video0","max_outputs":1,"chardev= ":"chr-vu-video0","bus":"pci.0","addr":"0x2"}' \ --device '{"driver":"virtio-balloon-pci","iommu_platform":true,"ats":true,"= packed":true,"page-per-vq":true,"id":"balloon0","bus":"pci.0","addr":"0xc"}= ' \ +-device vhost-user-vga,id=3Dvideo0,max_outputs=3D1,chardev=3Dchr-vu-video0= ,bus=3Dpci.0,addr=3D0x2 \ +-device virtio-balloon-pci,iommu_platform=3Don,ats=3Don,packed=3Don,page-p= er-vq=3Don,id=3Dballoon0,bus=3Dpci.0,addr=3D0xc \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}= ' \ --device '{"driver":"virtio-rng-pci","iommu_platform":true,"ats":true,"pack= ed":true,"page-per-vq":true,"rng":"objrng0","id":"rng0","bus":"pci.0","addr= ":"0xd"}' \ +-device virtio-rng-pci,iommu_platform=3Don,ats=3Don,packed=3Don,page-per-v= q=3Don,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr=3D0xd \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args b= /tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args index a0aeb74319..0508b03ded 100644 --- a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args @@ -27,10 +27,10 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -object '{"qom-type":"rng-builtin","id":"objrng0"}' \ --device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .0","addr":"0x3"}' \ +-device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args = b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args index b5611e9fe4..7889bde6c8 100644 --- a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args @@ -27,11 +27,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -chardev socket,id=3Dcharrng0,fd=3D1729,server=3Don,wait=3Doff \ -object '{"qom-type":"rng-egd","id":"objrng0","chardev":"charrng0"}' \ --device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .0","addr":"0x3"}' \ +-device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args = b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args index 255f8495e4..a205871834 100644 --- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args @@ -27,24 +27,24 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-pci-bridge","id":"pci.2","bus":"pci.1","addr":"0x= 0"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":3,"id":"pci.3","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"virtio-scsi-pci-transitional","id":"scsi0","bus":"pci.= 2","addr":"0x4"}' \ --device '{"driver":"virtio-serial-pci-transitional","id":"virtio-serial0",= "bus":"pci.2","addr":"0x3"}' \ +-device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ +-device pcie-pci-bridge,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \ +-device pcie-root-port,port=3D9,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-device virtio-scsi-pci-transitional,id=3Dscsi0,bus=3Dpci.2,addr=3D0x4 \ +-device virtio-serial-pci-transitional,id=3Dvirtio-serial0,bus=3Dpci.2,add= r=3D0x3 \ -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 '{"driver":"virtio-blk-pci-transitional","bus":"pci.2","addr":"0x5= ","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci-transitional,bus=3Dpci.2,addr=3D0x5,drive=3Dlibvirt= -1-format,id=3Dvirtio-disk0,bootindex=3D1 \ -fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/fs= 1 \ --device '{"driver":"virtio-9p-pci-transitional","id":"fs0","fsdev":"fsdev-= fs0","mount_tag":"fs1","bus":"pci.2","addr":"0x1"}' \ +-device virtio-9p-pci-transitional,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3D= fs1,bus=3Dpci.2,addr=3D0x1 \ -netdev user,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci-transitional","netdev":"hostnet0","id":= "net0","mac":"00:11:22:33:44:55","bus":"pci.2","addr":"0x2"}' \ --device '{"driver":"virtio-input-host-pci-transitional","id":"input0","evd= ev":"/dev/input/event1234","bus":"pci.2","addr":"0x9"}' \ +-device virtio-net-pci-transitional,netdev=3Dhostnet0,id=3Dnet0,mac=3D00:1= 1:22:33:44:55,bus=3Dpci.2,addr=3D0x2 \ +-device virtio-input-host-pci-transitional,id=3Dinput0,evdev=3D/dev/input/= event1234,bus=3Dpci.2,addr=3D0x9 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"vhost-scsi-pci-transitional","wwpn":"naa.5123456789abc= de0","vhostfd":"3","id":"hostdev0","bus":"pci.2","addr":"0x6"}' \ --device '{"driver":"virtio-balloon-pci-transitional","id":"balloon0","bus"= :"pci.2","addr":"0x7"}' \ +-device vhost-scsi-pci-transitional,wwpn=3Dnaa.5123456789abcde0,vhostfd=3D= 3,id=3Dhostdev0,bus=3Dpci.2,addr=3D0x6 \ +-device virtio-balloon-pci-transitional,id=3Dballoon0,bus=3Dpci.2,addr=3D0= x7 \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ --device '{"driver":"virtio-rng-pci-transitional","rng":"objrng0","id":"rng= 0","bus":"pci.2","addr":"0x8"}' \ +-device virtio-rng-pci-transitional,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.2,ad= dr=3D0x8 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ --device '{"driver":"vhost-vsock-pci-transitional","id":"vsock0","guest-cid= ":4,"vhostfd":"6789","bus":"pci.2","addr":"0xa"}' \ +-device vhost-vsock-pci-transitional,id=3Dvsock0,guest-cid=3D4,vhostfd=3D6= 789,bus=3Dpci.2,addr=3D0xa \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/watchdog-device.x86_64-latest.args b/te= sts/qemuxml2argvdata/watchdog-device.x86_64-latest.args index 8d58f1d647..3a64d2ef9a 100644 --- a/tests/qemuxml2argvdata/watchdog-device.x86_64-latest.args +++ b/tests/qemuxml2argvdata/watchdog-device.x86_64-latest.args @@ -27,13 +27,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"i6300esb","id":"watchdog0","bus":"pci.0","addr":"0x3"}= ' \ +-device i6300esb,id=3Dwatchdog0,bus=3Dpci.0,addr=3D0x3 \ -watchdog-action poweroff \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/watchdog-dump.x86_64-latest.args b/test= s/qemuxml2argvdata/watchdog-dump.x86_64-latest.args index 0ccb818c4e..56c0369ea0 100644 --- a/tests/qemuxml2argvdata/watchdog-dump.x86_64-latest.args +++ b/tests/qemuxml2argvdata/watchdog-dump.x86_64-latest.args @@ -27,13 +27,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"ib700","id":"watchdog0"}' \ +-device ib700,id=3Dwatchdog0 \ -watchdog-action pause \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/watchdog-injectnmi.x86_64-latest.args b= /tests/qemuxml2argvdata/watchdog-injectnmi.x86_64-latest.args index 157c8da100..2cf5b00077 100644 --- a/tests/qemuxml2argvdata/watchdog-injectnmi.x86_64-latest.args +++ b/tests/qemuxml2argvdata/watchdog-injectnmi.x86_64-latest.args @@ -27,13 +27,13 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"ib700","id":"watchdog0"}' \ +-device ib700,id=3Dwatchdog0 \ -watchdog-action inject-nmi \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x2"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/watchdog.x86_64-latest.args b/tests/qem= uxml2argvdata/watchdog.x86_64-latest.args index d8b66053bf..645ccbffb4 100644 --- a/tests/qemuxml2argvdata/watchdog.x86_64-latest.args +++ b/tests/qemuxml2argvdata/watchdog.x86_64-latest.args @@ -27,12 +27,12 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -no-shutdown \ -no-acpi \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -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 '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form= at","id":"ide0-0-0","bootindex":1}' \ +-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0= ,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"ib700","id":"watchdog0"}' \ +-device ib700,id=3Dwatchdog0 \ -watchdog-action poweroff \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-la= test.args b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-lat= est.args index 114cc06f46..f5d105bbb5 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.ar= gs @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-l= atest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-l= atest.args index 0368ecc699..2d435ab81b 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.a= rgs @@ -26,15 +26,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ --device '{"driver":"pcie-root-port","port":11,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x3"}' \ --device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ +-device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ +-device pcie-root-port,port=3D11,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x1.0x3 \ +-device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.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 '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x0,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.3","add= r":"0x0"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.3,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-features.x86_64-= latest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-features.x86_64= -latest.args index c9c71cf4e6..974626a61b 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-features.x86_64-latest.= args +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-features.x86_64-latest.= args @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ --device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ +-device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ +-device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add= r":"0x0"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-la= test.args b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-lat= est.args index cfdf147c47..288e1e678e 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.ar= gs +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.ar= gs @@ -26,11 +26,11 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0= x2"}' \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x2","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x3"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x3 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-l= atest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-l= atest.args index c2eb8066df..c06d678301 100644 --- a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.a= rgs +++ b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.a= rgs @@ -26,15 +26,15 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ --device '{"driver":"pcie-root-port","port":11,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x3"}' \ --device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \ +-device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ +-device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ +-device pcie-root-port,port=3D11,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x1.0x3 \ +-device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.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 '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.2,addr=3D0x0,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.3","add= r":"0x0"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.3,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args b= /tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args index 3cae9fafa0..313d1e684f 100644 --- a/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args @@ -29,23 +29,23 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -global PIIX4_PM.disable_s3=3D1 \ -global PIIX4_PM.disable_s4=3D1 \ -boot strict=3Don \ --device '{"driver":"qemu-xhci","p2":15,"p3":15,"id":"usb","bus":"pci.0","a= ddr":"0x4"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x5"}' \ +-device qemu-xhci,p2=3D15,p3=3D15,id=3Dusb,bus=3Dpci.0,addr=3D0x4 \ +-device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x5 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x6","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x6,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:4c:e3:86","bus":"pci.0","addr":"0x3"}' \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:4c:e3:86= ,bus=3Dpci.0,addr=3D0x3 \ -chardev pty,id=3Dcharserial0 \ --device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ --device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ --device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ +-device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ +-device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pci.0","= addr":"0x2"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x7"}' \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vram6= 4_size_mb=3D0,vgamem_mb=3D16,max_outputs=3D1,bus=3Dpci.0,addr=3D0x2 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x7 \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ --device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .0","addr":"0x8"}' \ +-device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr=3D0x8 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args b= /tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args index fbfb823d83..0ce0be2bc8 100644 --- a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args @@ -30,20 +30,20 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -global PIIX4_PM.disable_s3=3D1 \ -global PIIX4_PM.disable_s4=3D1 \ -boot strict=3Don \ --device '{"driver":"qemu-xhci","p2":15,"p3":15,"id":"usb","bus":"pci.0","a= ddr":"0x3"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0"= ,"addr":"0x4"}' \ +-device qemu-xhci,p2=3D15,p3=3D15,id=3Dusb,bus=3Dpci.0,addr=3D0x3 \ +-device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x4 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.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 '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x5,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.0","addr":"0x2"}' \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.0,addr=3D0x2 \ -chardev pty,id=3Dcharserial0 \ --device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ --device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ +-device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add= r":"0x6"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ --device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .0","addr":"0x7"}' \ +-device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr=3D0x7 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args = b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args index ca0e00f468..deab063476 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args @@ -29,30 +29,30 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -global ICH9-LPC.disable_s3=3D1 \ -global ICH9-LPC.disable_s4=3D1 \ -boot strict=3Don \ --device '{"driver":"pcie-root-port","port":16,"chassis":1,"id":"pci.1","bu= s":"pcie.0","multifunction":true,"addr":"0x2"}' \ --device '{"driver":"pcie-root-port","port":17,"chassis":2,"id":"pci.2","bu= s":"pcie.0","addr":"0x2.0x1"}' \ --device '{"driver":"pcie-root-port","port":18,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x2.0x2"}' \ --device '{"driver":"pcie-root-port","port":19,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x2.0x3"}' \ --device '{"driver":"pcie-root-port","port":20,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x2.0x4"}' \ --device '{"driver":"pcie-root-port","port":21,"chassis":6,"id":"pci.6","bu= s":"pcie.0","addr":"0x2.0x5"}' \ --device '{"driver":"pcie-root-port","port":22,"chassis":7,"id":"pci.7","bu= s":"pcie.0","addr":"0x2.0x6"}' \ --device '{"driver":"qemu-xhci","p2":15,"p3":15,"id":"usb","bus":"pci.2","a= ddr":"0x0"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.3"= ,"addr":"0x0"}' \ +-device pcie-root-port,port=3D16,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multi= function=3Don,addr=3D0x2 \ +-device pcie-root-port,port=3D17,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x2.0x1 \ +-device pcie-root-port,port=3D18,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x2.0x2 \ +-device pcie-root-port,port=3D19,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x2.0x3 \ +-device pcie-root-port,port=3D20,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr= =3D0x2.0x4 \ +-device pcie-root-port,port=3D21,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr= =3D0x2.0x5 \ +-device pcie-root-port,port=3D22,chassis=3D7,id=3Dpci.7,bus=3Dpcie.0,addr= =3D0x2.0x6 \ +-device qemu-xhci,p2=3D15,p3=3D15,id=3Dusb,bus=3Dpci.2,addr=3D0x0 \ +-device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.3,addr=3D0x0 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.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 '{"driver":"virtio-blk-pci","bus":"pci.4","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:d2:70:0b","bus":"pci.1","addr":"0x0"}' \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:d2:70:0b= ,bus=3Dpci.1,addr=3D0x0 \ -chardev pty,id=3Dcharserial0 \ --device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ --device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ --device '{"driver":"usb-tablet","id":"input0","bus":"usb.0","port":"1"}' \ +-device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ +-device usb-tablet,id=3Dinput0,bus=3Dusb.0,port=3D1 \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=3Daudio1 \ --device '{"driver":"qxl-vga","id":"video0","ram_size":67108864,"vram_size"= :67108864,"vram64_size_mb":0,"vgamem_mb":16,"max_outputs":1,"bus":"pcie.0",= "addr":"0x1"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","add= r":"0x0"}' \ +-device qxl-vga,id=3Dvideo0,ram_size=3D67108864,vram_size=3D67108864,vram6= 4_size_mb=3D0,vgamem_mb=3D16,max_outputs=3D1,bus=3Dpcie.0,addr=3D0x1 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.5,addr=3D0x0 \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ --device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .6","addr":"0x0"}' \ +-device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.6,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args = b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args index c6970e349d..f35385702a 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args @@ -30,27 +30,27 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ -global ICH9-LPC.disable_s3=3D1 \ -global ICH9-LPC.disable_s4=3D1 \ -boot strict=3Don \ --device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus= ":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus= ":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu= s":"pcie.0","addr":"0x1.0x2"}' \ --device '{"driver":"pcie-root-port","port":11,"chassis":4,"id":"pci.4","bu= s":"pcie.0","addr":"0x1.0x3"}' \ --device '{"driver":"pcie-root-port","port":12,"chassis":5,"id":"pci.5","bu= s":"pcie.0","addr":"0x1.0x4"}' \ --device '{"driver":"pcie-root-port","port":13,"chassis":6,"id":"pci.6","bu= s":"pcie.0","addr":"0x1.0x5"}' \ --device '{"driver":"pcie-root-port","port":14,"chassis":7,"id":"pci.7","bu= s":"pcie.0","addr":"0x1.0x6"}' \ --device '{"driver":"qemu-xhci","p2":15,"p3":15,"id":"usb","bus":"pci.2","a= ddr":"0x0"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.3"= ,"addr":"0x0"}' \ +-device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif= unction=3Don,addr=3D0x1 \ +-device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr= =3D0x1.0x1 \ +-device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr= =3D0x1.0x2 \ +-device pcie-root-port,port=3D11,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x1.0x3 \ +-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 pcie-root-port,port=3D14,chassis=3D7,id=3Dpci.7,bus=3Dpcie.0,addr= =3D0x1.0x6 \ +-device qemu-xhci,p2=3D15,p3=3D15,id=3Dusb,bus=3Dpci.2,addr=3D0x0 \ +-device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.3,addr=3D0x0 \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.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 '{"driver":"virtio-blk-pci","bus":"pci.4","addr":"0x0","drive":"li= bvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-device virtio-blk-pci,bus=3Dpci.4,addr=3D0x0,drive=3Dlibvirt-1-format,id= =3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ --device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":= "52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.1,addr=3D0x0 \ -chardev pty,id=3Dcharserial0 \ --device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0"}' \ +-device isa-serial,chardev=3Dcharserial0,id=3Dserial0 \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \ --device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard= ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ +-device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","add= r":"0x0"}' \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.5,addr=3D0x0 \ -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"= }' \ --device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci= .6","addr":"0x0"}' \ +-device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.6,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ -msg timestamp=3Don --=20 2.31.1 From nobody Sun May 5 00:20:17 2024 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=1641223651; cv=none; d=zohomail.com; s=zohoarc; b=A94dMLqflh0QtASMWbLxzPKaogJmltekNI2hqI547l8Zv0tdwsvFjyV+Xe9MJWXq2JorH6drrTX/G672WvzlmNwkcwLtFCBWg8NWeh6OvRMIH+nb8hWjcHmFybWdXEd4vOvVPKw0YGWHJWRcqvtvq9ysNpIq6Cdu88sbHyPSNwY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641223651; 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=qMgcec0YleE55pM66ffq0nK0mwv/6XW3QJ9G7sOqePs=; b=hV6JFI1dc4HSZMP+acm9gdYMrUdsSm/rJJjyZBPpkfdalnjL6lpZSjhexrdBB57Afp5LF1eS0qHAKyB+dxoyLVMr+vzOfaqqvZSk/Q1rNVnOlHh7VKbLqUz1/WBhi70Dpv5hm+2dlBk/bDL2bjwXIPljsKHA3jdftzehkL01KY4= 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 1641223651169935.0445240684984; Mon, 3 Jan 2022 07:27:31 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-353-L_VFSWY3Nh-zJ2XKWeGllg-1; Mon, 03 Jan 2022 10:27:22 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 33517192FDD5; Mon, 3 Jan 2022 15:26:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 666752C1AE; Mon, 3 Jan 2022 15:26:20 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 264FE4A7C8; Mon, 3 Jan 2022 15:26:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 203FQ3Bo024180 for ; Mon, 3 Jan 2022 10:26:03 -0500 Received: by smtp.corp.redhat.com (Postfix) id CADBC84D0A; Mon, 3 Jan 2022 15:26:03 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 26DBB85EE0 for ; Mon, 3 Jan 2022 15:26:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641223650; 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=qMgcec0YleE55pM66ffq0nK0mwv/6XW3QJ9G7sOqePs=; b=I0eT27ijQ/FfeIEOoeHrZ1KgC+dLmNWNJbhIs0CVjUEGFsKHH9NgiA4Wa9QrHlL8D0EoEk zSY6Ko9FI8vDNAJ0MSvupfL67rPtRHKdx+1PsekpMpKQ5tfHRRrxUzj9bveYbQeUt6MhJZ hTVnPxa95q9/HbDZDOEezwbs1JvRVf0= X-MC-Unique: L_VFSWY3Nh-zJ2XKWeGllg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/3] qemu: capabilities: Condemn the use of 'device.json' capability name Date: Mon, 3 Jan 2022 16:25:55 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1641223652938100003 Content-Type: text/plain; charset="utf-8" As a workaround for users using 'libvirt-7.9' and 'libvirt-7.10' with 'qemu-6.2' who wish to use device hot-unplug we are going to be suggesting to filter out the 'device.json' qemu capability via either the global 'qemu.conf' config: capability_filters =3D [ "device.json" ] or the per-VM XML capability override: [...] Doing this poisons the capability name 'device.json' for any further use, so to ensure that we can re-add JSON usage for -device also for users which filtered it out originally once it's fixed in qemu we need to condemn the old name and add a new one. To achieve this the old capability is renamed to 'X_QEMU_CAPS_DEVICE_JSON_BROKEN' and a new capability 'QEMU_CAPS_DEVICE_JSON' is mapped to 'device.json-fixed'. For now we leave it unasserted, but this allows to keep all the code in place. Signed-off-by: Peter Krempa Reviewed-by: Ani Sinha Reviewed-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 3 ++- src/qemu/qemu_capabilities.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 2efe5776f8..e650e81ab8 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -649,10 +649,11 @@ VIR_ENUM_IMPL(virQEMUCaps, "chardev.json", /* QEMU_CAPS_CHARDEV_JSON */ /* 415 */ - "device.json", /* QEMU_CAPS_DEVICE_JSON */ + "device.json", /* X_QEMU_CAPS_DEVICE_JSON_BROKEN */ "query-dirty-rate", /* QEMU_CAPS_QUERY_DIRTY_RATE */ "rbd-encryption", /* QEMU_CAPS_RBD_ENCRYPTION */ "sev-guest-kernel-hashes", /* QEMU_CAPS_SEV_GUEST_KERNEL_HAS= HES */ + "device.json-fixed" /* QEMU_CAPS_DEVICE_JSON */ ); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index aaac20a834..43cf8464ae 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -628,10 +628,11 @@ typedef enum { /* virQEMUCapsFlags grouping marker fo= r syntax-check */ QEMU_CAPS_CHARDEV_JSON, /* -chardev accepts JSON */ /* 415 */ - QEMU_CAPS_DEVICE_JSON, /* -device accepts JSON */ + X_QEMU_CAPS_DEVICE_JSON_BROKEN, /* -device accepts JSON - unused due a= qemu regression */ QEMU_CAPS_QUERY_DIRTY_RATE, /* accepts query-dirty-rate */ QEMU_CAPS_RBD_ENCRYPTION, /* Ceph RBD encryption support */ QEMU_CAPS_SEV_GUEST_KERNEL_HASHES, /* sev-guest.kernel-hashes=3D */ + QEMU_CAPS_DEVICE_JSON, /* -device accepts JSON */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; --=20 2.31.1 From nobody Sun May 5 00:20:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1641223657; cv=none; d=zohomail.com; s=zohoarc; b=TAjtwPMnC1+WD+TIXiRmwGxymZKWhQyGu+A2vBS2HfC9V0CP5w2OqyhwkNTJWu5+er+uYXgDzWHHNqVwuYsCkcEEDuZsW7EvzRUbUD7lOyFn08pxvvLHTVEzD+9TdQL82GnZtmsovi+eixgr5VOCc0TDWmXUlZ37Sa3DScfZTt4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1641223657; 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=O/BIgF8rBHu5fT9Kjpjw6roFFumERpRKA3x6lLzoqLo=; b=fWJyd0STzctkL4pLSt+QtvSJPZNW2lGp1fC/X/4AoPRPfhT9PHmlHY3FSCklGmQunNBiuR6TP7n5sDrDTKWpydinr4baj1yLH/+bR57B9F8TAjADSLQFAvj5aUy5v4ZhTqpjnvw+lN8mjeXUqmdQn2Wb70n5BB/Ln7IiuX3DDYM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1641223657957333.30740165014265; Mon, 3 Jan 2022 07:27:37 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-486-UupS5z2vMGGYzngYh8PySw-1; Mon, 03 Jan 2022 10:27:33 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 261EB1018720; Mon, 3 Jan 2022 15:26:23 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0392C7D3DB; Mon, 3 Jan 2022 15:26:23 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id C60CD1809CB9; Mon, 3 Jan 2022 15:26:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 203FQ5N7024190 for ; Mon, 3 Jan 2022 10:26:05 -0500 Received: by smtp.corp.redhat.com (Postfix) id 0DAF884D34; Mon, 3 Jan 2022 15:26:05 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4DA0885886 for ; Mon, 3 Jan 2022 15:26:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641223656; 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=O/BIgF8rBHu5fT9Kjpjw6roFFumERpRKA3x6lLzoqLo=; b=CV5a+cyqYh/B8qOYHFFxzdhEt7O1Z8jDuLSZjgkUh0h2X+BLiotE8T9GRXD23eDhpV9edO SQZRaUlAKyPJ84iAV2+ak2yKntmj9gvwwRc7CL/3sgpm0jfo/iVRoNvgXQttyfdnfy+HCj rqXSFvKDi+bascE3pEQKhjiwF2qA5t0= X-MC-Unique: UupS5z2vMGGYzngYh8PySw-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 3/3] NEWS: Mention device hot-unplug regression with qemu-6.2 and workarounds for it Date: Mon, 3 Jan 2022 16:25:56 +0100 Message-Id: <5236f8734e68de41f9dd8ed30cec44fe72f2f746.1641223497.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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: 1641223660058100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: Ani Sinha Reviewed-by: J=C3=A1n Tomko --- NEWS.rst | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index e7d5316721..032a61a006 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -46,6 +46,37 @@ v8.0.0 (unreleased) * **Bug fixes** + * qemu: Fix device hot-unplug with ``libvirt-7.9`` or ``libvirt-7.10`` u= sed with ``qemu-6.2`` + + An internal change to the configuration format used by the above libvi= rt + versions triggers a bug in ``qemu-6.2`` where qemu no longer emits the + event notifying that the device was unplugged successfully and thus li= bvirt + never removes the device from the definition. + + This impacts only devices which were present at startup of the VM, hot= plugged + devices behave correctly. + + This is fixed in ``libvirt-8.0`` by reverting to the old configuration + approach until qemu is fixed. + + As a workaround for ``libvirt-7.9`` and ``libvirt-7.10`` the old confi= guration + approach can be forced by: + + Option 1, global ``qemu.conf``:: + + capability_filters =3D [ "device.json" ] + + Option 2, per VM XML override:: + + + + [...] + + + + + + v7.10.0 (2021-12-01) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --=20 2.31.1