From nobody Tue Feb 10 01:59:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1560499501; cv=none; d=zoho.com; s=zohoarc; b=Xl51RsB7wCcLR4nJCGiypHSmBXKhlscB1yeGaiRt1pOv4euswGaLId6Qc/DMUc0J4uaLAlqcxQalE+F30VC3kIPmwpiIait2gMUdibFHEiHHoOMaH0WJlN5GTe7qfGK3nbCrT1F1LekARhQ+DiiMY83NKv57hnpY1SFMIFGxeDQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560499501; 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:ARC-Authentication-Results; bh=ljYCHFS+BiS6NguOFcHz7RmXGYcJR3Ws4entdFjaNKY=; b=l55Iu5JS7wN+1G9oWouPC6gKlNJR8aTFdxt/UtgamoclR0jswCvmhEbS16kd3V2BXgJ8Tor067cwY5Mn7RGt3cq4wNLZBOko9L2c/r2gb02qeZhF8RC1W1OMb7aZF2WWC6fKwqz/8W4W6BP9BxbiCG6om8bN8t2B/LV1qahCYd4= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1560499501722347.81372835704815; Fri, 14 Jun 2019 01:05:01 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CA1E2C05B03B; Fri, 14 Jun 2019 08:04:55 +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 A0772607A0; Fri, 14 Jun 2019 08:04:52 +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 541EE206D2; Fri, 14 Jun 2019 08:04:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x5E84j1s028890 for ; Fri, 14 Jun 2019 04:04:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id BA1E090A2; Fri, 14 Jun 2019 08:04:45 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.73]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1FEA12855D for ; Fri, 14 Jun 2019 08:04:44 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 14 Jun 2019 10:04:37 +0200 Message-Id: <20190614080439.29627-3-abologna@redhat.com> In-Reply-To: <20190614080439.29627-1-abologna@redhat.com> References: <20190614080439.29627-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/4] tests: Update *-headless and *-graphics 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 14 Jun 2019 08:05:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Use the latest virt-manager to regenerate the files. The command line is once again along the lines of $ virt-install \ --name guest --os-variant fedora29 \ --vcpus 4 --memory 4096 --disk size=3D5 \ --graphics (none|vnc) \ --print-xml with some minor tweaks performed afterwards. This removes a number of inconsistencies between the files, and makes it so the only differences are actually relevant either to the architecture and machine type at hand, or to having graphics rather than being headless. Signed-off-by: Andrea Bolognani Reviewed-by: J=C3=A1n Tomko --- .../aarch64-virt-graphics.aarch64-latest.args | 6 ++-- .../aarch64-virt-graphics.xml | 2 +- .../aarch64-virt-headless.aarch64-latest.args | 21 ++++++++----- .../aarch64-virt-headless.xml | 22 +++++++++++--- .../ppc64-pseries-graphics.xml | 3 +- .../ppc64-pseries-headless.ppc64-latest.args | 8 ++--- .../ppc64-pseries-headless.xml | 18 ++++++++--- .../riscv64-virt-headless.riscv64-latest.args | 16 +++++----- .../riscv64-virt-headless.xml | 18 ++++++++--- .../s390x-ccw-graphics.s390x-latest.args | 6 ++-- tests/qemuxml2argvdata/s390x-ccw-graphics.xml | 7 +++-- .../s390x-ccw-headless.s390x-latest.args | 12 ++++---- tests/qemuxml2argvdata/s390x-ccw-headless.xml | 21 +++++++++---- tests/qemuxml2argvdata/x86_64-pc-graphics.xml | 1 + .../x86_64-pc-headless.x86_64-latest.args | 23 +++++++------- tests/qemuxml2argvdata/x86_64-pc-headless.xml | 30 ++++++++++++++++--- .../qemuxml2argvdata/x86_64-q35-graphics.xml | 1 + .../x86_64-q35-headless.x86_64-latest.args | 15 ++++++---- .../qemuxml2argvdata/x86_64-q35-headless.xml | 30 ++++++++++++++++--- 19 files changed, 185 insertions(+), 75 deletions(-) diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.ar= gs b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args index 7f18f5e9e8..129fac5838 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args @@ -36,6 +36,7 @@ addr=3D0x1 \ -device pcie-root-port,port=3D0xc,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr= =3D0x1.0x4 \ -device pcie-root-port,port=3D0xd,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr= =3D0x1.0x5 \ -device pcie-root-port,port=3D0xe,chassis=3D7,id=3Dpci.7,bus=3Dpcie.0,addr= =3D0x1.0x6 \ +-device pcie-root-port,port=3D0xf,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 \ -drive file=3D/var/lib/libvirt/images/guest.qcow2,format=3Dqcow2,if=3Dnone= ,\ @@ -53,9 +54,10 @@ 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 \ -vnc 127.0.0.1:0 \ --device virtio-gpu-pci,id=3Dvideo0,max_outputs=3D1,bus=3Dpci.6,addr=3D0x0 \ +-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 rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ --device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.5,addr=3D0x0 \ +-device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.6,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.xml b/tests/qemux= ml2argvdata/aarch64-virt-graphics.xml index 54cfea634c..490eb45daf 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-graphics.xml +++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.xml @@ -12,7 +12,6 @@ hvm /usr/share/AAVMF/AAVMF_CODE.f= d - /var/lib/libvirt/qemu/nvram/guest_VARS.fd @@ -42,6 +41,7 @@ + /dev/urandom diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.ar= gs b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args index cc1189031a..b4947f9b0f 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args @@ -13,9 +13,13 @@ QEMU_AUDIO_DRV=3Dnone \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-guest/master-key.aes \ -machine virt,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,gic-version=3D2 \ --m 1024 \ +-drive file=3D/usr/share/AAVMF/AAVMF_CODE.fd,if=3Dpflash,format=3Draw,unit= =3D0,\ +readonly=3Don \ +-drive file=3D/var/lib/libvirt/qemu/nvram/guest_VARS.fd,if=3Dpflash,format= =3Draw,\ +unit=3D1 \ +-m 4096 \ -overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ -display none \ -no-user-config \ @@ -24,7 +28,6 @@ file=3D/tmp/lib/domain--1-guest/master-key.aes \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ -rtc base=3Dutc \ -no-shutdown \ --no-acpi \ -boot strict=3Don \ -device pcie-root-port,port=3D0x8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,mult= ifunction=3Don,\ addr=3D0x1 \ @@ -33,10 +36,12 @@ addr=3D0x1 \ -device pcie-root-port,port=3D0xb,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x1.0x3 \ -device pcie-root-port,port=3D0xc,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr= =3D0x1.0x4 \ -device pcie-root-port,port=3D0xd,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr= =3D0x1.0x5 \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.2,addr=3D0x0 \ +-device pcie-root-port,port=3D0xe,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 \ -drive file=3D/var/lib/libvirt/images/guest.qcow2,format=3Dqcow2,if=3Dnone= ,\ id=3Ddrive-virtio-disk0 \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.3,addr=3D0x0,drive=3Ddrive-vir= tio-disk0,\ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.4,addr=3D0x0,drive=3Ddrive-vir= tio-disk0,\ id=3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.1,\ @@ -46,9 +51,9 @@ addr=3D0x0 \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server,nowait \ -device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,\ id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.4,addr=3D0x0 \ --object rng-random,id=3Dobjrng0,filename=3D/dev/random \ --device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.5,addr=3D0x0 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.5,addr=3D0x0 \ +-object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ +-device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.6,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.xml b/tests/qemux= ml2argvdata/aarch64-virt-headless.xml index ec9ce78c91..2ed7d9a904 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-headless.xml +++ b/tests/qemuxml2argvdata/aarch64-virt-headless.xml @@ -1,11 +1,23 @@ guest 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 - 1048576 - 1 + + + + + + 4194304 + 4194304 + 4 hvm + /usr/share/AAVMF/AAVMF_CODE.f= d + + + + + /usr/bin/qemu-system-aarch64 @@ -13,17 +25,19 @@ + - + + - + /dev/urandom diff --git a/tests/qemuxml2argvdata/ppc64-pseries-graphics.xml b/tests/qemu= xml2argvdata/ppc64-pseries-graphics.xml index c4ef08b2bf..2ba16813de 100644 --- a/tests/qemuxml2argvdata/ppc64-pseries-graphics.xml +++ b/tests/qemuxml2argvdata/ppc64-pseries-graphics.xml @@ -10,7 +10,7 @@ 4194304 4 - hvm + hvm @@ -37,6 +37,7 @@ + /dev/urandom diff --git a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.arg= s b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args index c84443c97f..821c6976f0 100644 --- a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args @@ -13,9 +13,9 @@ QEMU_AUDIO_DRV=3Dnone \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-guest/master-key.aes \ -machine pseries,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 1024 \ +-m 4096 \ -overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ -display none \ -no-user-config \ @@ -25,7 +25,7 @@ file=3D/tmp/lib/domain--1-guest/master-key.aes \ -rtc base=3Dutc \ -no-shutdown \ -boot strict=3Don \ --device pci-ohci,id=3Dusb,bus=3Dpci.0,addr=3D0x2 \ +-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 \ -drive file=3D/var/lib/libvirt/images/guest.qcow2,format=3Dqcow2,if=3Dnone= ,\ id=3Ddrive-virtio-disk0 \ @@ -40,7 +40,7 @@ addr=3D0x1 \ -device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,\ id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x5 \ --object rng-random,id=3Dobjrng0,filename=3D/dev/random \ +-object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ -device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr=3D0x6 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/ppc64-pseries-headless.xml b/tests/qemu= xml2argvdata/ppc64-pseries-headless.xml index b94d47d9d4..ca91240903 100644 --- a/tests/qemuxml2argvdata/ppc64-pseries-headless.xml +++ b/tests/qemuxml2argvdata/ppc64-pseries-headless.xml @@ -1,11 +1,19 @@ guest 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 - 1048576 - 1 + + + + + + 4194304 + 4194304 + 4 hvm + + /usr/bin/qemu-system-ppc64 @@ -13,17 +21,19 @@ + - + + - + /dev/urandom diff --git a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.ar= gs b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args index 42b1ffc568..9a595dc4ee 100644 --- a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args +++ b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args @@ -13,9 +13,9 @@ QEMU_AUDIO_DRV=3Dnone \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-guest/master-key.aes \ -machine virt,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 1024 \ +-m 4096 \ -overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ -display none \ -no-user-config \ @@ -32,10 +32,12 @@ addr=3D0x1 \ -device pcie-root-port,port=3D0xb,chassis=3D4,id=3Dpci.4,bus=3Dpcie.0,addr= =3D0x1.0x3 \ -device pcie-root-port,port=3D0xc,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr= =3D0x1.0x4 \ -device pcie-root-port,port=3D0xd,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr= =3D0x1.0x5 \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.2,addr=3D0x0 \ +-device pcie-root-port,port=3D0xe,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 \ -drive file=3D/var/lib/libvirt/images/guest.qcow2,format=3Dqcow2,if=3Dnone= ,\ id=3Ddrive-virtio-disk0 \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.3,addr=3D0x0,drive=3Ddrive-vir= tio-disk0,\ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.4,addr=3D0x0,drive=3Ddrive-vir= tio-disk0,\ id=3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.1,\ @@ -45,9 +47,9 @@ addr=3D0x0 \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server,nowait \ -device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,\ id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.4,addr=3D0x0 \ --object rng-random,id=3Dobjrng0,filename=3D/dev/random \ --device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.5,addr=3D0x0 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.5,addr=3D0x0 \ +-object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ +-device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.6,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/riscv64-virt-headless.xml b/tests/qemux= ml2argvdata/riscv64-virt-headless.xml index 936f341da1..ff1e0903b1 100644 --- a/tests/qemuxml2argvdata/riscv64-virt-headless.xml +++ b/tests/qemuxml2argvdata/riscv64-virt-headless.xml @@ -1,11 +1,19 @@ guest 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 - 1048576 - 1 + + + + + + 4194304 + 4194304 + 4 hvm + + /usr/bin/qemu-system-riscv64 @@ -13,17 +21,19 @@ + - + + - + /dev/urandom diff --git a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args b/= tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args index f33a66af68..64c11cd046 100644 --- a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args @@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-guest/master-key.aes \ --machine s390-ccw,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-machine s390-ccw-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ -m 4096 \ -overcommit mem-lock=3Doff \ -smp 4,sockets=3D4,cores=3D1,threads=3D1 \ @@ -32,11 +32,11 @@ id=3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-ccw,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:1a:29= ,\ devno=3Dfe.0.0001 \ --chardev pty,id=3Dcharserial0 \ --device sclpconsole,chardev=3Dcharserial0,id=3Dserial0 \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server,nowait \ -device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,\ id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ +-chardev pty,id=3Dcharconsole0 \ +-device sclpconsole,chardev=3Dcharconsole0,id=3Dconsole0 \ -device virtio-tablet-ccw,id=3Dinput0,devno=3Dfe.0.0004 \ -device virtio-keyboard-ccw,id=3Dinput1,devno=3Dfe.0.0005 \ -vnc 127.0.0.1:0 \ diff --git a/tests/qemuxml2argvdata/s390x-ccw-graphics.xml b/tests/qemuxml2= argvdata/s390x-ccw-graphics.xml index a9bb3485db..46374c799e 100644 --- a/tests/qemuxml2argvdata/s390x-ccw-graphics.xml +++ b/tests/qemuxml2argvdata/s390x-ccw-graphics.xml @@ -10,7 +10,7 @@ 4194304 4 - hvm + hvm @@ -25,7 +25,9 @@ - + + + @@ -36,6 +38,7 @@ + /dev/urandom diff --git a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args b/= tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args index aff73e929a..9b3723eff0 100644 --- a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args +++ b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args @@ -12,10 +12,10 @@ QEMU_AUDIO_DRV=3Dnone \ -S \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-guest/master-key.aes \ --machine s390-ccw,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 1024 \ +-machine s390-ccw-virtio,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-m 4096 \ -overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ -display none \ -no-user-config \ @@ -33,13 +33,13 @@ id=3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-ccw,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,\ devno=3Dfe.0.0001 \ --chardev pty,id=3Dcharserial0 \ --device sclpconsole,chardev=3Dcharserial0,id=3Dserial0 \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server,nowait \ -device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,\ id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ +-chardev pty,id=3Dcharconsole0 \ +-device sclpconsole,chardev=3Dcharconsole0,id=3Dconsole0 \ -device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0003 \ --object rng-random,id=3Dobjrng0,filename=3D/dev/random \ +-object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ -device virtio-rng-ccw,rng=3Dobjrng0,id=3Drng0,devno=3Dfe.0.0004 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/s390x-ccw-headless.xml b/tests/qemuxml2= argvdata/s390x-ccw-headless.xml index a8342ab3a7..70b61674c4 100644 --- a/tests/qemuxml2argvdata/s390x-ccw-headless.xml +++ b/tests/qemuxml2argvdata/s390x-ccw-headless.xml @@ -1,11 +1,19 @@ guest 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 - 1048576 - 1 + + + + + + 4194304 + 4194304 + 4 - hvm + hvm + + /usr/bin/qemu-system-s390x @@ -17,13 +25,16 @@ - + + + + - + /dev/urandom diff --git a/tests/qemuxml2argvdata/x86_64-pc-graphics.xml b/tests/qemuxml2= argvdata/x86_64-pc-graphics.xml index 3c7dbc9438..add61e25c3 100644 --- a/tests/qemuxml2argvdata/x86_64-pc-graphics.xml +++ b/tests/qemuxml2argvdata/x86_64-pc-graphics.xml @@ -48,6 +48,7 @@ + /dev/urandom 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 1af229afa2..cc33248272 100644 --- a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args @@ -13,24 +13,27 @@ QEMU_AUDIO_DRV=3Dnone \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-guest/master-key.aes \ -machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 1024 \ +-m 4096 \ -overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ -display none \ -no-user-config \ -nodefaults \ -chardev socket,id=3Dcharmonitor,fd=3D1729,server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ +-rtc base=3Dutc,driftfix=3Dslew \ +-global kvm-pit.lost_tick_policy=3Ddelay \ +-no-hpet \ -no-shutdown \ --no-acpi \ +-global PIIX4_PM.disable_s3=3D1 \ +-global PIIX4_PM.disable_s4=3D1 \ -boot strict=3Don \ --device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x3 \ +-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 \ -drive file=3D/var/lib/libvirt/images/guest.qcow2,format=3Dqcow2,if=3Dnone= ,\ id=3Ddrive-virtio-disk0 \ --device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x4,drive=3Ddrive-vir= tio-disk0,\ +-device virtio-blk-pci,scsi=3Doff,bus=3Dpci.0,addr=3D0x5,drive=3Ddrive-vir= tio-disk0,\ id=3Dvirtio-disk0,bootindex=3D1 \ -netdev user,id=3Dhostnet0 \ -device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:00:09:a4:37= ,bus=3Dpci.0,\ @@ -40,9 +43,9 @@ addr=3D0x2 \ -chardev socket,id=3Dcharchannel0,fd=3D1729,server,nowait \ -device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,\ id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ --device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x5 \ --object rng-random,id=3Dobjrng0,filename=3D/dev/random \ --device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr=3D0x6 \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x6 \ +-object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ +-device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.0,addr=3D0x7 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ -msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/x86_64-pc-headless.xml b/tests/qemuxml2= argvdata/x86_64-pc-headless.xml index 2e8cd8b8ad..a40f09abdf 100644 --- a/tests/qemuxml2argvdata/x86_64-pc-headless.xml +++ b/tests/qemuxml2argvdata/x86_64-pc-headless.xml @@ -1,11 +1,31 @@ guest 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 - 1048576 - 1 + + + + + + 4194304 + 4194304 + 4 hvm + + + + + + + + + + + + + + /usr/bin/qemu-system-x86_64 @@ -13,17 +33,19 @@ + - + + - + /dev/urandom diff --git a/tests/qemuxml2argvdata/x86_64-q35-graphics.xml b/tests/qemuxml= 2argvdata/x86_64-q35-graphics.xml index d3ad87c963..cf69f08546 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-graphics.xml +++ b/tests/qemuxml2argvdata/x86_64-q35-graphics.xml @@ -48,6 +48,7 @@ + /dev/urandom 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 68b984f2ca..b3fb8d8340 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args +++ b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args @@ -13,18 +13,21 @@ QEMU_AUDIO_DRV=3Dnone \ -object secret,id=3DmasterKey0,format=3Draw,\ file=3D/tmp/lib/domain--1-guest/master-key.aes \ -machine q35,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ --m 1024 \ +-m 4096 \ -overcommit mem-lock=3Doff \ --smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-smp 4,sockets=3D4,cores=3D1,threads=3D1 \ -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ -display none \ -no-user-config \ -nodefaults \ -chardev socket,id=3Dcharmonitor,fd=3D1729,server,nowait \ -mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ +-rtc base=3Dutc,driftfix=3Dslew \ +-global kvm-pit.lost_tick_policy=3Ddelay \ +-no-hpet \ -no-shutdown \ --no-acpi \ +-global ICH9-LPC.disable_s3=3D1 \ +-global ICH9-LPC.disable_s4=3D1 \ -boot strict=3Don \ -device pcie-root-port,port=3D0x8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,mult= ifunction=3Don,\ addr=3D0x1 \ @@ -34,7 +37,7 @@ addr=3D0x1 \ -device pcie-root-port,port=3D0xc,chassis=3D5,id=3Dpci.5,bus=3Dpcie.0,addr= =3D0x1.0x4 \ -device pcie-root-port,port=3D0xd,chassis=3D6,id=3Dpci.6,bus=3Dpcie.0,addr= =3D0x1.0x5 \ -device pcie-root-port,port=3D0xe,chassis=3D7,id=3Dpci.7,bus=3Dpcie.0,addr= =3D0x1.0x6 \ --device qemu-xhci,id=3Dusb,bus=3Dpci.2,addr=3D0x0 \ +-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 \ -drive file=3D/var/lib/libvirt/images/guest.qcow2,format=3Dqcow2,if=3Dnone= ,\ id=3Ddrive-virtio-disk0 \ @@ -49,7 +52,7 @@ addr=3D0x0 \ -device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel= 0,\ id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \ -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.5,addr=3D0x0 \ --object rng-random,id=3Dobjrng0,filename=3D/dev/random \ +-object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ -device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.6,addr=3D0x0 \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ resourcecontrol=3Ddeny \ diff --git a/tests/qemuxml2argvdata/x86_64-q35-headless.xml b/tests/qemuxml= 2argvdata/x86_64-q35-headless.xml index 445cc643d5..a92864bc00 100644 --- a/tests/qemuxml2argvdata/x86_64-q35-headless.xml +++ b/tests/qemuxml2argvdata/x86_64-q35-headless.xml @@ -1,11 +1,31 @@ guest 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 - 1048576 - 1 + + + + + + 4194304 + 4194304 + 4 hvm + + + + + + + + + + + + + + /usr/bin/qemu-system-x86_64 @@ -13,17 +33,19 @@ + - + + - + /dev/urandom --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list