From nobody Sat Feb 7 09:59:17 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1587647740; cv=none; d=zohomail.com; s=zohoarc; b=S3JwMMOvOoU52vFlW68yDzh9+LltF/gENpCs1PHC3mBN6q8Rd6hmfr038TAsMs61zxEoezSsm8rPM0cPXLwpdYQxNNs4o0550pvHMlhjCQQDTbvqNo4oUuirXGqYLdGraRBfkAauMAU6cgXYyiTerZ11bwqAoDfV0ZagnYcjbHU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587647740; h=Content-Type:Content-Transfer-Encoding:Cc: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=SXoYcURYtwuqx1w0x/gASSk5E53vTVsxmosNYfQDjwU=; b=HcM8cmF+9WhmEsBEf3K6f+d2L5W58F/Esab5GCxjLJMynrj/ERZwfDrOayPX8Z7tmoTApnIz8BSGo49L/RZwqOlkEhhCffa/Z4l4l8Ntuh+Bz87vGWxpnFpmPM4rOgDpy/g4e60Hak/MxKFd1ABX4k+KhluL/rDDeptw2mojXwU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1587647740623689.3665594672593; Thu, 23 Apr 2020 06:15:40 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-294-rZqx5uJjPFuX4bYC7U2Qbg-1; Thu, 23 Apr 2020 09:15:36 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8EBB11895951; Thu, 23 Apr 2020 13:15:30 +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 54AFD60605; Thu, 23 Apr 2020 13:15:30 +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 505DE1809543; Thu, 23 Apr 2020 13:15:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 03NDFOcK032166 for ; Thu, 23 Apr 2020 09:15:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id D20072026E04; Thu, 23 Apr 2020 13:15:24 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CDBB12026DFD for ; Thu, 23 Apr 2020 13:15:22 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B5058811E7A for ; Thu, 23 Apr 2020 13:15:22 +0000 (UTC) Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-475-Rw9g1eNSPE6TK0cdXWUZEA-1; Thu, 23 Apr 2020 09:15:20 -0400 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 03ND2Uxu175725 for ; Thu, 23 Apr 2020 09:15:19 -0400 Received: from e06smtp01.uk.ibm.com (e06smtp01.uk.ibm.com [195.75.94.97]) by mx0a-001b2d01.pphosted.com with ESMTP id 30gmvk9xnq-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 23 Apr 2020 09:15:18 -0400 Received: from localhost by e06smtp01.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 23 Apr 2020 14:14:29 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp01.uk.ibm.com (192.168.101.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 23 Apr 2020 14:14:27 +0100 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 03NDFDg961472796 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 23 Apr 2020 13:15:13 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DB1DF52057; Thu, 23 Apr 2020 13:15:12 +0000 (GMT) Received: from m46lp64.lnxne.boe (unknown [9.152.108.100]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id BCD5E5204F; Thu, 23 Apr 2020 13:15:12 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587647739; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=SXoYcURYtwuqx1w0x/gASSk5E53vTVsxmosNYfQDjwU=; b=UllyF1Y/7OmrEZgO+r7UugLr6Zok94e4SLpqF045iKwHzPU3bHAyb+y8ovIYjag8f/cjY2 cxLMSq54hErL/bNxWh1LS1zo28BRlTb5OlMqaaotN3V2NiWGsnVxYPm0DUZG/RyFOj1rBa 9pOx2Ak00BmDY95uzRoV1Hz/8kmXk/M= X-MC-Unique: rZqx5uJjPFuX4bYC7U2Qbg-1 X-MC-Unique: Rw9g1eNSPE6TK0cdXWUZEA-1 From: Bjoern Walk To: libvir-list@redhat.com Subject: [PATCH 1/4] tests: use latest caps for virtio-options test Date: Thu, 23 Apr 2020 15:15:06 +0200 In-Reply-To: <20200423131509.2708173-1-bwalk@linux.ibm.com> References: <20200423131509.2708173-1-bwalk@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 20042313-4275-0000-0000-000003C53C58 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 20042313-4276-0000-0000-000038DAC717 Message-Id: <20200423131509.2708173-2-bwalk@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.676 definitions=2020-04-23_10:2020-04-22, 2020-04-23 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 malwarescore=0 impostorscore=0 suspectscore=1 phishscore=0 adultscore=0 mlxlogscore=999 clxscore=1015 mlxscore=0 spamscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2003020000 definitions=main-2004230099 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 03NDFOcK032166 X-loop: libvir-list@redhat.com Cc: Bjoern Walk , Daniel Henrique Barboza 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.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Convert the virtio-options test in qemuxml2argv and qemuxml2xml to use the latest available QEMU capabilities. Reviewed-by: Boris Fiuczynski Signed-off-by: Bjoern Walk --- .../virtio-options.x86_64-latest.args | 69 +++++++++++++++++++ tests/qemuxml2argvdata/virtio-options.xml | 5 +- tests/qemuxml2argvtest.c | 12 +--- .../virtio-options.x86_64-latest.xml | 1 + tests/qemuxml2xmltest.c | 16 +---- 5 files changed, 76 insertions(+), 27 deletions(-) create mode 100644 tests/qemuxml2argvdata/virtio-options.x86_64-latest.args create mode 120000 tests/qemuxml2xmloutdata/virtio-options.x86_64-latest.x= ml diff --git a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args b/tes= ts/qemuxml2argvdata/virtio-options.x86_64-latest.args new file mode 100644 index 00000000..e523f73f --- /dev/null +++ b/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args @@ -0,0 +1,69 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-cpu qemu64 \ +-m 214 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server,nowait \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-scsi-pci,iommu_platform=3Don,ats=3Don,packed=3Don,id=3Dscsi= 0,bus=3Dpci.0,\ +addr=3D0x8 \ +-device virtio-serial-pci,id=3Dvirtio-serial0,iommu_platform=3Don,ats=3Don= ,packed=3Don,\ +bus=3Dpci.0,addr=3D0x9 \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/img1",\ +"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ",\ +"file":"libvirt-1-storage"}' \ +-device virtio-blk-pci,scsi=3Doff,iommu_platform=3Don,ats=3Don,packed=3Don= ,bus=3Dpci.0,\ +addr=3D0xa,drive=3Dlibvirt-1-format,id=3Dvirtio-disk0,bootindex=3D1 \ +-fsdev local,security_model=3Dpassthrough,id=3Dfsdev-fs0,path=3D/export/fs= 1 \ +-device virtio-9p-pci,id=3Dfs0,fsdev=3Dfsdev-fs0,mount_tag=3Dfs1,iommu_pla= tform=3Don,\ +ats=3Don,packed=3Don,bus=3Dpci.0,addr=3D0x3 \ +-fsdev local,security_model=3Dmapped,writeout=3Dimmediate,id=3Dfsdev-fs1,\ +path=3D/export/fs2 \ +-device virtio-9p-pci,id=3Dfs1,fsdev=3Dfsdev-fs1,mount_tag=3Dfs2,iommu_pla= tform=3Don,\ +ats=3Don,packed=3Don,bus=3Dpci.0,addr=3D0x4 \ +-netdev user,id=3Dhostnet0 \ +-device virtio-net-pci,netdev=3Dhostnet0,id=3Dnet0,mac=3D52:54:56:58:5a:5c= ,bus=3Dpci.0,\ +addr=3D0x6,iommu_platform=3Don,ats=3Don,packed=3Don \ +-device virtio-mouse-pci,id=3Dinput0,bus=3Dpci.0,addr=3D0xe,iommu_platform= =3Don,ats=3Don,\ +packed=3Don \ +-device virtio-keyboard-pci,id=3Dinput1,bus=3Dpci.0,addr=3D0x10,iommu_plat= form=3Don,\ +ats=3Don,packed=3Don \ +-device virtio-tablet-pci,id=3Dinput2,bus=3Dpci.0,addr=3D0x11,iommu_platfo= rm=3Don,\ +ats=3Don,packed=3Don \ +-device virtio-input-host-pci,id=3Dinput3,evdev=3D/dev/input/event1234,bus= =3Dpci.0,\ +addr=3D0x12,iommu_platform=3Don,ats=3Don,packed=3Don \ +-chardev socket,id=3Dchr-vu-video0,fd=3D1729 \ +-device vhost-user-vga,id=3Dvideo0,max_outputs=3D1,chardev=3Dchr-vu-video0= ,bus=3Dpci.0,\ +addr=3D0x2,iommu_platform=3Don,ats=3Don,packed=3Don \ +-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0xc,iommu_plat= form=3Don,\ +ats=3Don,packed=3Don \ +-object rng-random,id=3Dobjrng0,filename=3D/dev/random \ +-device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,iommu_platform=3Don,ats=3Do= n,packed=3Don,\ +bus=3Dpci.0,addr=3D0xd \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/virtio-options.xml b/tests/qemuxml2argv= data/virtio-options.xml index 3ca27840..ba1bf7c0 100644 --- a/tests/qemuxml2argvdata/virtio-options.xml +++ b/tests/qemuxml2argvdata/virtio-options.xml @@ -8,6 +8,9 @@ hvm + + qemu64 + destroy restart @@ -20,7 +23,7 @@
- +
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 66472a5e..dffca323 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2981,17 +2981,7 @@ mymain(void) DO_TEST_PARSE_ERROR("cpu-hotplug-granularity", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS); =20 - DO_TEST("virtio-options", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_KEYB= OARD, - QEMU_CAPS_VIRTIO_MOUSE, QEMU_CAPS_VIRTIO_TABLET, - QEMU_CAPS_VIRTIO_INPUT_HOST, - QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_DEVICE_VHOST_USER_GPU, - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_DEVICE_VIDEO_PRIMARY, - QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, - QEMU_CAPS_VIRTIO_PCI_ATS, - QEMU_CAPS_VIRTIO_PACKED_QUEUES); + DO_TEST_CAPS_LATEST("virtio-options"); =20 DO_TEST("fd-memory-numa-topology", QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_KVM); diff --git a/tests/qemuxml2xmloutdata/virtio-options.x86_64-latest.xml b/te= sts/qemuxml2xmloutdata/virtio-options.x86_64-latest.xml new file mode 120000 index 00000000..26d8a252 --- /dev/null +++ b/tests/qemuxml2xmloutdata/virtio-options.x86_64-latest.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/virtio-options.xml \ No newline at end of file diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index cf5abeac..d6f9c43b 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1278,21 +1278,7 @@ mymain(void) DO_TEST("memorybacking-set", NONE); DO_TEST("memorybacking-unset", NONE); =20 - DO_TEST("virtio-options", - QEMU_CAPS_VIRTIO_SCSI, - QEMU_CAPS_VIRTIO_KEYBOARD, - QEMU_CAPS_VIRTIO_MOUSE, - QEMU_CAPS_VIRTIO_TABLET, - QEMU_CAPS_VIRTIO_INPUT_HOST, - QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VIRTIO_GPU_VIRGL, - QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM, - QEMU_CAPS_DEVICE_VIDEO_PRIMARY, - QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM, - QEMU_CAPS_VIRTIO_PCI_ATS, - QEMU_CAPS_DEVICE_VHOST_USER_GPU, - QEMU_CAPS_VIRTIO_PACKED_QUEUES); + DO_TEST_CAPS_LATEST("virtio-options"); =20 DO_TEST("fd-memory-numa-topology", QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_KVM); --=20 2.24.1