From nobody Sat Feb 7 09:58:59 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; 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 207.211.31.81 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=1587647766; cv=none; d=zohomail.com; s=zohoarc; b=Ks5SI7qaSHvQDjyyFp1doJljrhVda+Em0nacXqiV+8MFEvmr620o1Y0gGeIcETDmzuHmTUla1zRcvymxyHHryKW7nmCy+/YzsO2HQAe3xkgEqrfGCuVV6y18OYi4BLY4NLuK5+WhGhAfdAvLYNRO1kYq0HZIV/TXFPd24LCZICs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1587647766; 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=Jo0cYLsSUZr+IgXHYYH6tmnvDx/sAzf4aqqdHBm+JfM=; b=Rfm+CaqwwUKcTbOJ+gezlN/onSk7tvmk6q+j0dhBDkUYDXc/tPEG7nxcVsePpPQ69YwwhEqBNIBrNIiTBVrcXnWeFevfGTIqS/4UqkT9TWpme3Ow5jqbAzkVRIoCXF6lQIw7lU9+X6jM0Gt3abctPd8PsNmtxMXc3uoMRbS/EmU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 15876477666571.4938617297161727; Thu, 23 Apr 2020 06:16:06 -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-453-CsaGrBqsPOOIEul9M90Iow-1; Thu, 23 Apr 2020 09:16:00 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5A6C3107ACF7; Thu, 23 Apr 2020 13:15:54 +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 31BDC5D9D3; Thu, 23 Apr 2020 13:15:54 +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 E157D4CAA8; Thu, 23 Apr 2020 13:15:53 +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 03NDFQXV032186 for ; Thu, 23 Apr 2020 09:15:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0703F202696C; Thu, 23 Apr 2020 13:15:26 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 02BA92026E04 for ; Thu, 23 Apr 2020 13:15:25 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (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 C243B800C6D for ; Thu, 23 Apr 2020 13:15:25 +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-222-dhXPneYjPr2Hs-y5JY-fvw-1; Thu, 23 Apr 2020 09:15:21 -0400 Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 03ND2f7Q047151 for ; Thu, 23 Apr 2020 09:15:20 -0400 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0a-001b2d01.pphosted.com with ESMTP id 30k7rbyyrb-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 23 Apr 2020 09:15:20 -0400 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 23 Apr 2020 14:14:22 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp05.uk.ibm.com (192.168.101.135) 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:19 +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 03NDFD9c56295664 (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 44F4C5205A; Thu, 23 Apr 2020 13:15:13 +0000 (GMT) Received: from m46lp64.lnxne.boe (unknown [9.152.108.100]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id 2758152050; Thu, 23 Apr 2020 13:15:13 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587647765; 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=Jo0cYLsSUZr+IgXHYYH6tmnvDx/sAzf4aqqdHBm+JfM=; b=EhUejbh0xkqgEZsBfKTLl+PEHjxZvPAFoBx1PNFf25xEtwFGFRQ4yGHAmBWVQFpZB6nzzw NfpPgkeCcY3JLlNcqx/yzUXLnx+sThZDg9AZyMjDeJnJFdZfTyjgjmaPbC+fcK9mVw/hnp ZR4OJGhFPiue4d6g1Qg25+q+B0dIuLI= X-MC-Unique: CsaGrBqsPOOIEul9M90Iow-1 X-MC-Unique: dhXPneYjPr2Hs-y5JY-fvw-1 From: Bjoern Walk To: libvir-list@redhat.com Subject: [PATCH 3/4] qemu: move virtio capability validation Date: Thu, 23 Apr 2020 15:15:08 +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-0020-0000-0000-000003CD2E39 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 20042313-0021-0000-0000-000022262F20 Message-Id: <20200423131509.2708173-4-bwalk@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.676 definitions=2020-04-23_09:2020-04-22, 2020-04-23 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 spamscore=0 clxscore=1015 priorityscore=1501 mlxlogscore=999 impostorscore=0 mlxscore=0 phishscore=0 lowpriorityscore=0 adultscore=0 suspectscore=1 bulkscore=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 03NDFQXV032186 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.14 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" Move capability validation of virtio options from command line generation to post-parse device validation where it belongs. Signed-off-by: Bjoern Walk Reviewed-by: Boris Fiuczynski --- src/qemu/qemu_command.c | 41 ++++++-------------- src/qemu/qemu_validate.c | 70 +++++++++++++++++++++++++++++++-- tests/qemuxml2argvtest.c | 84 ++++++++++++++++++++-------------------- 3 files changed, 120 insertions(+), 75 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 95402fc4..ca9d3f10 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -588,39 +588,20 @@ qemuBuildVirtioDevStr(virBufferPtr buf, =20 static int qemuBuildVirtioOptionsStr(virBufferPtr buf, - virDomainVirtioOptionsPtr virtio, - virQEMUCapsPtr qemuCaps) + virDomainVirtioOptionsPtr virtio) { if (!virtio) return 0; =20 if (virtio->iommu !=3D VIR_TRISTATE_SWITCH_ABSENT) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM)= ) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("the iommu setting is not supported " - "with this QEMU binary")); - return -1; - } virBufferAsprintf(buf, ",iommu_platform=3D%s", virTristateSwitchTypeToString(virtio->iommu)); } if (virtio->ats !=3D VIR_TRISTATE_SWITCH_ABSENT) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PCI_ATS)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("the ats setting is not supported with this " - "QEMU binary")); - return -1; - } virBufferAsprintf(buf, ",ats=3D%s", virTristateSwitchTypeToString(virtio->ats)); } if (virtio->packed !=3D VIR_TRISTATE_SWITCH_ABSENT) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PACKED_QUEUES)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("the packed setting is not supported with thi= s " - "QEMU binary")); - return -1; - } virBufferAsprintf(buf, ",packed=3D%s", virTristateSwitchTypeToString(virtio->packed)); } @@ -2150,7 +2131,7 @@ qemuBuildDiskDeviceStr(const virDomainDef *def, virBufferAsprintf(&opt, ",num-queues=3D%u", disk->queues); } =20 - if (qemuBuildVirtioOptionsStr(&opt, disk->virtio, qemuCaps) < 0) + if (qemuBuildVirtioOptionsStr(&opt, disk->virtio) < 0) return NULL; =20 if (qemuBuildDeviceAddressStr(&opt, def, &disk->info, qemuCaps) < = 0) @@ -2615,7 +2596,7 @@ qemuBuildVHostUserFsCommandLine(virCommandPtr cmd, virBufferAsprintf(&opt, ",queue-size=3D%llu", fs->queue_size); virBufferAddLit(&opt, ",tag=3D"); virQEMUBuildBufferEscapeComma(&opt, fs->dst); - if (qemuBuildVirtioOptionsStr(&opt, fs->virtio, priv->qemuCaps) < 0) + if (qemuBuildVirtioOptionsStr(&opt, fs->virtio) < 0) return -1; =20 if (qemuBuildDeviceAddressStr(&opt, def, &fs->info, priv->qemuCaps) < = 0) @@ -2685,7 +2666,7 @@ qemuBuildFSDevStr(const virDomainDef *def, virBufferAddLit(&opt, ",mount_tag=3D"); virQEMUBuildBufferEscapeComma(&opt, fs->dst); =20 - if (qemuBuildVirtioOptionsStr(&opt, fs->virtio, qemuCaps) < 0) + if (qemuBuildVirtioOptionsStr(&opt, fs->virtio) < 0) return NULL; =20 if (qemuBuildDeviceAddressStr(&opt, def, &fs->info, qemuCaps) < 0) @@ -2917,7 +2898,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainD= ef, def->iothread); } =20 - if (qemuBuildVirtioOptionsStr(&buf, def->virtio, qemuCaps) < 0) + if (qemuBuildVirtioOptionsStr(&buf, def->virtio) < 0) return -1; break; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC: @@ -2964,7 +2945,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainD= ef, virBufferAsprintf(&buf, ",vectors=3D%d", def->opts.vioserial.vectors); } - if (qemuBuildVirtioOptionsStr(&buf, def->virtio, qemuCaps) < 0) + if (qemuBuildVirtioOptionsStr(&buf, def->virtio) < 0) return -1; break; =20 @@ -3916,7 +3897,7 @@ qemuBuildNicDevStr(virDomainDefPtr def, if (bootindex) virBufferAsprintf(&buf, ",bootindex=3D%u", bootindex); if (usingVirtio && - qemuBuildVirtioOptionsStr(&buf, net->virtio, qemuCaps) < 0) + qemuBuildVirtioOptionsStr(&buf, net->virtio) < 0) return NULL; =20 return virBufferContentAndReset(&buf); @@ -4158,7 +4139,7 @@ qemuBuildMemballoonCommandLine(virCommandPtr cmd, virTristateSwitchTypeToString(def->memballoon->a= utodeflate)); } =20 - if (qemuBuildVirtioOptionsStr(&buf, def->memballoon->virtio, qemuCaps)= < 0) + if (qemuBuildVirtioOptionsStr(&buf, def->memballoon->virtio) < 0) return -1; =20 if (qemuCommandAddExtDevice(cmd, &def->memballoon->info) < 0) @@ -4250,7 +4231,7 @@ qemuBuildVirtioInputDevStr(const virDomainDef *def, if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0) return NULL; =20 - if (qemuBuildVirtioOptionsStr(&buf, dev->virtio, qemuCaps) < 0) + if (qemuBuildVirtioOptionsStr(&buf, dev->virtio) < 0) return NULL; =20 return virBufferContentAndReset(&buf); @@ -4561,7 +4542,7 @@ qemuBuildDeviceVideoStr(const virDomainDef *def, if (qemuBuildDeviceAddressStr(&buf, def, &video->info, qemuCaps) < 0) return NULL; =20 - if (qemuBuildVirtioOptionsStr(&buf, video->virtio, qemuCaps) < 0) + if (qemuBuildVirtioOptionsStr(&buf, video->virtio) < 0) return NULL; =20 return virBufferContentAndReset(&buf); @@ -5777,7 +5758,7 @@ qemuBuildRNGDevStr(const virDomainDef *def, virBufferAddLit(&buf, ",period=3D1000"); } =20 - if (qemuBuildVirtioOptionsStr(&buf, dev->virtio, qemuCaps) < 0) + if (qemuBuildVirtioOptionsStr(&buf, dev->virtio) < 0) return NULL; =20 if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index cb0ff8d6..76691a5b 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1045,6 +1045,40 @@ qemuValidateNetSupportsCoalesce(virDomainNetType typ= e) } =20 =20 +static int +qemuValidateDomainVirtioOptions(const virDomainVirtioOptions *virtio, + virQEMUCapsPtr qemuCaps) +{ + if (!virtio) + return 0; + + if (virtio->iommu !=3D VIR_TRISTATE_SWITCH_ABSENT && + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PCI_IOMMU_PLATFORM)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("the iommu setting is not supported " + "with this QEMU binary")); + return -1; + } + + if (virtio->ats !=3D VIR_TRISTATE_SWITCH_ABSENT && + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PCI_ATS)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("the ats setting is not supported with this " + "QEMU binary")); + return -1; + } + + if (virtio->packed !=3D VIR_TRISTATE_SWITCH_ABSENT && + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_PACKED_QUEUES)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("the packed setting is not supported with thi= s " + "QEMU binary")); + return -1; + } + return 0; +} + + static int qemuValidateDomainDeviceDefNetwork(const virDomainNetDef *net, virQEMUCapsPtr qemuCaps) @@ -1122,6 +1156,8 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNet= Def *net, _("tx_queue_size has to be a power of two")); return -1; } + if (qemuValidateDomainVirtioOptions(net->virtio, qemuCaps) < 0) + return -1; } =20 if (net->mtu && @@ -1469,12 +1505,15 @@ qemuValidateDomainSmartcardDef(const virDomainSmart= cardDef *def, =20 static int qemuValidateDomainRNGDef(const virDomainRNGDef *def, - virQEMUCapsPtr qemuCaps G_GNUC_UNUSED) + virQEMUCapsPtr qemuCaps) { if (def->backend =3D=3D VIR_DOMAIN_RNG_BACKEND_EGD && qemuValidateDomainChrSourceDef(def->source.chardev, qemuCaps) < 0) return -1; =20 + if (qemuValidateDomainVirtioOptions(def->virtio, qemuCaps) < 0) + return -1; + return 0; } =20 @@ -1818,6 +1857,9 @@ qemuValidateDomainDeviceDefVideo(const virDomainVideo= Def *video, } } =20 + if (qemuValidateDomainVirtioOptions(video->virtio, qemuCaps) < 0) + return -1; + return 0; } =20 @@ -1916,6 +1958,11 @@ qemuValidateDomainDeviceDefDisk(const virDomainDiskD= ef *disk, return -1; } =20 + if (disk->bus =3D=3D VIR_DOMAIN_DISK_BUS_VIRTIO && + qemuValidateDomainVirtioOptions(disk->virtio, qemuCaps) < 0) { + return -1; + } + return 0; } =20 @@ -2146,7 +2193,8 @@ virValidateControllerPCIModelNameToQEMUCaps(int model= Name) =20 =20 static int -qemuValidateDomainDeviceDefControllerAttributes(const virDomainControllerD= ef *controller) +qemuValidateDomainDeviceDefControllerAttributes(const virDomainControllerD= ef *controller, + virQEMUCapsPtr qemuCaps) { if (!(controller->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_SCSI && (controller->model =3D=3D VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTI= O_SCSI || @@ -2177,6 +2225,13 @@ qemuValidateDomainDeviceDefControllerAttributes(cons= t virDomainControllerDef *co _("'iothread' is only supported for virtio-scsi= controller")); return -1; } + if (qemuValidateDomainVirtioOptions(controller->virtio, qemuCaps) = < 0) + return -1; + } + + if (controller->type =3D=3D VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL && + qemuValidateDomainVirtioOptions(controller->virtio, qemuCaps) < 0)= { + return -1; } =20 return 0; @@ -2719,7 +2774,7 @@ qemuValidateDomainDeviceDefController(const virDomain= ControllerDef *controller, !qemuValidateCheckSCSIControllerModel(qemuCaps, controller->model)) return -1; =20 - if (qemuValidateDomainDeviceDefControllerAttributes(controller) < 0) + if (qemuValidateDomainDeviceDefControllerAttributes(controller, qemuCa= ps) < 0) return -1; =20 switch ((virDomainControllerType)controller->type) { @@ -3056,6 +3111,9 @@ qemuValidateDomainDeviceDefFS(virDomainFSDefPtr fs, return -1; } =20 + if (qemuValidateDomainVirtioOptions(fs->virtio, qemuCaps) < 0) + return -1; + return 0; } =20 @@ -3324,6 +3382,9 @@ qemuValidateDomainDeviceDefInput(const virDomainInput= Def *input, return -1; } =20 + if (qemuValidateDomainVirtioOptions(input->virtio, qemuCaps) < 0) + return -1; + return 0; } =20 @@ -3353,6 +3414,9 @@ qemuValidateDomainDeviceDefMemballoon(const virDomain= MemballoonDef *memballoon, return -1; } =20 + if (qemuValidateDomainVirtioOptions(memballoon->virtio, qemuCaps) < 0) + return -1; + return 0; } =20 diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 7ceb3aee..7a9c65f0 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -3039,48 +3039,48 @@ mymain(void) QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_VHOST_USER_GPU, QEMU_CAPS_VIRTIO_PACKED_QUEUES); - DO_TEST_FAILURE("virtio-options-controller-iommu", QEMU_CAPS_VIRTIO_SC= SI); - DO_TEST_FAILURE("virtio-options-disk-iommu", NONE); - DO_TEST_FAILURE("virtio-options-fs-iommu", NONE); - DO_TEST_FAILURE("virtio-options-input-iommu", QEMU_CAPS_VIRTIO_MOUSE, - QEMU_CAPS_VIRTIO_KEYBOARD); - DO_TEST_FAILURE("virtio-options-memballoon-iommu", NONE); - DO_TEST_FAILURE("virtio-options-net-iommu", NONE); - DO_TEST_FAILURE("virtio-options-rng-iommu", QEMU_CAPS_DEVICE_VIRTIO_RN= G, - QEMU_CAPS_OBJECT_RNG_RANDOM); - DO_TEST_FAILURE("virtio-options-video-iommu", QEMU_CAPS_DEVICE_VIRTIO_= GPU, - QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VIRTIO_GPU_VIRGL, - QEMU_CAPS_DEVICE_VIDEO_PRIMARY, - QEMU_CAPS_DEVICE_VHOST_USER_GPU); - DO_TEST_FAILURE("virtio-options-controller-ats", QEMU_CAPS_VIRTIO_SCSI= ); - DO_TEST_FAILURE("virtio-options-disk-ats", NONE); - DO_TEST_FAILURE("virtio-options-fs-ats", NONE); - DO_TEST_FAILURE("virtio-options-input-ats", QEMU_CAPS_VIRTIO_MOUSE, - QEMU_CAPS_VIRTIO_KEYBOARD); - DO_TEST_FAILURE("virtio-options-memballoon-ats", NONE); - DO_TEST_FAILURE("virtio-options-net-ats", NONE); - DO_TEST_FAILURE("virtio-options-rng-ats", QEMU_CAPS_DEVICE_VIRTIO_RNG, - QEMU_CAPS_OBJECT_RNG_RANDOM); - DO_TEST_FAILURE("virtio-options-video-ats", QEMU_CAPS_DEVICE_VIRTIO_GP= U, - QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VIRTIO_GPU_VIRGL, - QEMU_CAPS_DEVICE_VIDEO_PRIMARY, - QEMU_CAPS_DEVICE_VHOST_USER_GPU); - DO_TEST_FAILURE("virtio-options-controller-packed", QEMU_CAPS_VIRTIO_S= CSI); - DO_TEST_FAILURE("virtio-options-disk-packed", NONE); - DO_TEST_FAILURE("virtio-options-fs-packed", NONE); - DO_TEST_FAILURE("virtio-options-input-packed", QEMU_CAPS_VIRTIO_MOUSE, - QEMU_CAPS_VIRTIO_KEYBOARD); - DO_TEST_FAILURE("virtio-options-memballoon-packed", NONE); - DO_TEST_FAILURE("virtio-options-net-packed", NONE); - DO_TEST_FAILURE("virtio-options-rng-packed", QEMU_CAPS_DEVICE_VIRTIO_R= NG, - QEMU_CAPS_OBJECT_RNG_RANDOM); - DO_TEST_FAILURE("virtio-options-video-packed", QEMU_CAPS_DEVICE_VIRTIO= _GPU, - QEMU_CAPS_DEVICE_VIRTIO_GPU, - QEMU_CAPS_VIRTIO_GPU_VIRGL, - QEMU_CAPS_DEVICE_VIDEO_PRIMARY, - QEMU_CAPS_DEVICE_VHOST_USER_GPU); + DO_TEST_PARSE_ERROR("virtio-options-controller-iommu", QEMU_CAPS_VIRTI= O_SCSI); + DO_TEST_PARSE_ERROR("virtio-options-disk-iommu", NONE); + DO_TEST_PARSE_ERROR("virtio-options-fs-iommu", NONE); + DO_TEST_PARSE_ERROR("virtio-options-input-iommu", QEMU_CAPS_VIRTIO_MOU= SE, + QEMU_CAPS_VIRTIO_KEYBOARD); + DO_TEST_PARSE_ERROR("virtio-options-net-iommu", NONE); + DO_TEST_PARSE_ERROR("virtio-options-memballoon-iommu", NONE); + DO_TEST_PARSE_ERROR("virtio-options-rng-iommu", QEMU_CAPS_DEVICE_VIRTI= O_RNG, + QEMU_CAPS_OBJECT_RNG_RANDOM); + DO_TEST_PARSE_ERROR("virtio-options-video-iommu", QEMU_CAPS_DEVICE_VIR= TIO_GPU, + QEMU_CAPS_DEVICE_VIRTIO_GPU, + QEMU_CAPS_VIRTIO_GPU_VIRGL, + QEMU_CAPS_DEVICE_VIDEO_PRIMARY, + QEMU_CAPS_DEVICE_VHOST_USER_GPU); + DO_TEST_PARSE_ERROR("virtio-options-controller-ats", QEMU_CAPS_VIRTIO_= SCSI); + DO_TEST_PARSE_ERROR("virtio-options-disk-ats", NONE); + DO_TEST_PARSE_ERROR("virtio-options-fs-ats", NONE); + DO_TEST_PARSE_ERROR("virtio-options-input-ats", QEMU_CAPS_VIRTIO_MOUSE, + QEMU_CAPS_VIRTIO_KEYBOARD); + DO_TEST_PARSE_ERROR("virtio-options-memballoon-ats", NONE); + DO_TEST_PARSE_ERROR("virtio-options-net-ats", NONE); + DO_TEST_PARSE_ERROR("virtio-options-rng-ats", QEMU_CAPS_DEVICE_VIRTIO_= RNG, + QEMU_CAPS_OBJECT_RNG_RANDOM); + DO_TEST_PARSE_ERROR("virtio-options-video-ats", QEMU_CAPS_DEVICE_VIRTI= O_GPU, + QEMU_CAPS_DEVICE_VIRTIO_GPU, + QEMU_CAPS_VIRTIO_GPU_VIRGL, + QEMU_CAPS_DEVICE_VIDEO_PRIMARY, + QEMU_CAPS_DEVICE_VHOST_USER_GPU); + DO_TEST_PARSE_ERROR("virtio-options-controller-packed", QEMU_CAPS_VIRT= IO_SCSI); + DO_TEST_PARSE_ERROR("virtio-options-disk-packed", NONE); + DO_TEST_PARSE_ERROR("virtio-options-fs-packed", NONE); + DO_TEST_PARSE_ERROR("virtio-options-input-packed", QEMU_CAPS_VIRTIO_MO= USE, + QEMU_CAPS_VIRTIO_KEYBOARD); + DO_TEST_PARSE_ERROR("virtio-options-memballoon-packed", NONE); + DO_TEST_PARSE_ERROR("virtio-options-net-packed", NONE); + DO_TEST_PARSE_ERROR("virtio-options-rng-packed", QEMU_CAPS_DEVICE_VIRT= IO_RNG, + QEMU_CAPS_OBJECT_RNG_RANDOM); + DO_TEST_PARSE_ERROR("virtio-options-video-packed", QEMU_CAPS_DEVICE_VI= RTIO_GPU, + QEMU_CAPS_DEVICE_VIRTIO_GPU, + QEMU_CAPS_VIRTIO_GPU_VIRGL, + QEMU_CAPS_DEVICE_VIDEO_PRIMARY, + QEMU_CAPS_DEVICE_VHOST_USER_GPU); =20 DO_TEST("fd-memory-numa-topology", QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_KVM); --=20 2.24.1