From nobody Fri Apr 26 10:20:26 2024 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1553167752130948.5879079042008; Thu, 21 Mar 2019 04:29:12 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1DAE430FE5CD; Thu, 21 Mar 2019 11:29:10 +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 98ED81001E85; Thu, 21 Mar 2019 11:29:09 +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 454701803387; Thu, 21 Mar 2019 11:29:09 +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 x2LBSsv9021168 for ; Thu, 21 Mar 2019 07:28:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id D374B19C7F; Thu, 21 Mar 2019 11:28:54 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5AB0D19C59 for ; Thu, 21 Mar 2019 11:28:54 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 21 Mar 2019 12:28:48 +0100 Message-Id: <20190321112849.8269-2-abologna@redhat.com> In-Reply-To: <20190321112849.8269-1-abologna@redhat.com> References: <20190321112849.8269-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 1/2] tests: Update aarch64-virt-graphics for virtio-blk 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.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Thu, 21 Mar 2019 11:29:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" As of commit db6c7070e25a, virt-manager will default to using virtio-blk rather than virtio-scsi for aarch64/virt guests, bringing them in line with other architectures. Update our test case to reflect this change. Signed-off-by: Andrea Bolognani --- .../aarch64-virt-graphics.aarch64-latest.args | 9 ++++----- tests/qemuxml2argvdata/aarch64-virt-graphics.xml | 3 +-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.ar= gs b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args index ccdbcbfd9e..b61eb56a1f 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args +++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args @@ -37,12 +37,11 @@ addr=3D0x1 \ -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,p2=3D15,p3=3D15,id=3Dusb,bus=3Dpci.2,addr=3D0x0 \ --device virtio-scsi-pci,id=3Dscsi0,bus=3Dpci.3,addr=3D0x0 \ --device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.4,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-scsi0-0-0-0 \ --device scsi-hd,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,drive=3Ddriv= e-scsi0-0-0-0,\ -id=3Dscsi0-0-0-0,bootindex=3D1 \ +id=3Ddrive-virtio-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:53:45:a5= ,bus=3Dpci.1,\ addr=3D0x0 \ diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.xml b/tests/qemux= ml2argvdata/aarch64-virt-graphics.xml index 95aef91beb..0748b8da2d 100644 --- a/tests/qemuxml2argvdata/aarch64-virt-graphics.xml +++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.xml @@ -24,10 +24,9 @@ - + - --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Fri Apr 26 10:20:26 2024 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1553167755924195.64513832553155; Thu, 21 Mar 2019 04:29:15 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 204F5C04FFF7; Thu, 21 Mar 2019 11:29:14 +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 E1C1C1001E85; Thu, 21 Mar 2019 11:29:13 +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 916C141F3F; Thu, 21 Mar 2019 11:29:13 +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 x2LBSttI021176 for ; Thu, 21 Mar 2019 07:28:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id A4CA319C7F; Thu, 21 Mar 2019 11:28:55 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2D4AD19C59 for ; Thu, 21 Mar 2019 11:28:55 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Thu, 21 Mar 2019 12:28:49 +0100 Message-Id: <20190321112849.8269-3-abologna@redhat.com> In-Reply-To: <20190321112849.8269-1-abologna@redhat.com> References: <20190321112849.8269-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/2] tests: Add s390x-ccw-graphics test case 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.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 21 Mar 2019 11:29:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" We have tests for simple guests with graphics for basically all other architectures, so it makes sense to include s390x too. Signed-off-by: Andrea Bolognani --- .../s390x-ccw-graphics.s390x-latest.args | 49 +++++++++++++++++++ tests/qemuxml2argvdata/s390x-ccw-graphics.xml | 43 ++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 3 files changed, 93 insertions(+) create mode 100644 tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.= args create mode 100644 tests/qemuxml2argvdata/s390x-ccw-graphics.xml diff --git a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args b/= tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args new file mode 100644 index 0000000000..f39cd14dd7 --- /dev/null +++ b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args @@ -0,0 +1,49 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-guest \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-guest/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-guest/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-s390x \ +-name guest=3Dguest,debug-threads=3Don \ +-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 4096 \ +-realtime mlock=3Doff \ +-smp 4,sockets=3D4,cores=3D1,threads=3D1 \ +-uuid a7ca230a-fbe0-48b8-8ea6-25836f8cbc32 \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server,nowait \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-boot strict=3Don \ +-device virtio-serial-ccw,id=3Dvirtio-serial0,devno=3Dfe.0.0003 \ +-drive file=3D/var/lib/libvirt/images/guest.qcow2,format=3Dqcow2,if=3Dnone= ,\ +id=3Ddrive-virtio-disk0 \ +-device virtio-blk-ccw,scsi=3Doff,devno=3Dfe.0.0000,drive=3Ddrive-virtio-d= isk0,\ +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 \ +-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 \ +-device virtio-gpu-ccw,id=3Dvideo0,max_outputs=3D1,devno=3Dfe.0.0002 \ +-device virtio-balloon-ccw,id=3Dballoon0,devno=3Dfe.0.0006 \ +-object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \ +-device virtio-rng-ccw,rng=3Dobjrng0,id=3Drng0,devno=3Dfe.0.0007 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/s390x-ccw-graphics.xml b/tests/qemuxml2= argvdata/s390x-ccw-graphics.xml new file mode 100644 index 0000000000..3f54fdf9bd --- /dev/null +++ b/tests/qemuxml2argvdata/s390x-ccw-graphics.xml @@ -0,0 +1,43 @@ + + guest + a7ca230a-fbe0-48b8-8ea6-25836f8cbc32 + + + + + + 4194304 + 4194304 + 4 + + hvm + + + + + /usr/bin/qemu-system-s390x + + + + + + + + + + + + + + + + + + + + /dev/urandom + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 67c5c74ec5..22cf6b2232 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -3024,6 +3024,7 @@ mymain(void) /* Simple guests with graphics for various architectures */ DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-graphics", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("ppc64-pseries-graphics", "ppc64"); + DO_TEST_CAPS_ARCH_LATEST("s390x-ccw-graphics", "s390x"); DO_TEST_CAPS_ARCH_LATEST("x86_64-pc-graphics", "x86_64"); DO_TEST_CAPS_ARCH_LATEST("x86_64-q35-graphics", "x86_64"); =20 --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list