From nobody Sat May 4 11:26:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1634278212; cv=none; d=zohomail.com; s=zohoarc; b=GiUMJKZXcP0aGPzPtsoG6/ktXledYTDwRB1HG+EjBmn7jJLCDVBDnzCGTKkXG4z5pptTgZ8nbRHsGyez4T+r5tK6u2h4IcTJNgsmbfclJWLezgXk8Apn5xlj7SrkUp5CtchgbwiCVcM6VTyp4Xxt9A4pkuFx0LKyOfNZq63pAH8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634278212; 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=UanWBJhiQjB66gY/izdrDCiIIV2cA7leDQaEVNrKzEw=; b=gZlzF4iuQHSRPhyuYqmKGY2ILlyKMBvUYNvb4Knrz68LbLT0n5PE9XpPE4BccK+MVoDYLf5K+3fl3os6d0tvW/bhsM9XRDNGl4XroBwf4uBZ4eNM11XKcpdpZh76g4iXZMat4wMS2mT7ts08n95uMnDvwssAThz4mFk7HOsaUto= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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 [216.205.24.124]) by mx.zohomail.com with SMTPS id 1634278212790836.5383453991192; Thu, 14 Oct 2021 23:10:12 -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-401-OiH8Y7OeN9SUQ7r18-2dzA-1; Fri, 15 Oct 2021 02:10:10 -0400 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 83C348042A5; Fri, 15 Oct 2021 06:10:05 +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 0158C60583; Fri, 15 Oct 2021 06:10:05 +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 A032F1819AC1; Fri, 15 Oct 2021 06:10:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19F69fXl013897 for ; Fri, 15 Oct 2021 02:09:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1E175B8540; Fri, 15 Oct 2021 06:09:41 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-13-70.pek2.redhat.com [10.72.13.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9EBAD5C1BB; Fri, 15 Oct 2021 06:09:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634278211; 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=UanWBJhiQjB66gY/izdrDCiIIV2cA7leDQaEVNrKzEw=; b=RNtAsLqhewfydBUfjPgAq1DRtQyNLv0elG4O1QHSZ+5KkHRpLMZa90Hiq39422psii8Tuv O4k9jNGy7ijLWCunPtx2sPV8QKqW/aN7lWiKodmCAPwAE82ecy4r1V1ynPLDcTS4b8RKfm HIBB4FOWpzXY0qQOkQvI37lyFqKLEpw= X-MC-Unique: OiH8Y7OeN9SUQ7r18-2dzA-1 From: Han Han To: libvir-list@redhat.com Subject: [PATCH v3 1/2] conf: Add page_per_vq for driver element Date: Fri, 15 Oct 2021 14:09:29 +0800 Message-Id: <20211015060930.1163897-2-hhan@redhat.com> In-Reply-To: <20211015060930.1163897-1-hhan@redhat.com> References: <20211015060930.1163897-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Han Han , Gavi Teitz 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: 1634278213740100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Han Han Signed-off-by: Gavi Teitz Reviewed-by: Michal Privoznik --- docs/formatdomain.rst | 9 +++++++++ docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 16 ++++++++++++++++ src/conf/domain_conf.h | 1 + src/conf/domain_validate.c | 6 ++++++ 5 files changed, 37 insertions(+) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 80aaf4b033..9bf59936e5 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -3577,6 +3577,15 @@ virtqueues are actually used depends on the feature = negotiation between QEMU, vhost backends and guest drivers. Possible values are ``on`` or ``off``. :since:`Since 6.3.0 (QEMU and KVM only)` =20 +This optional attribute ``page_per_vq`` controls the layout of the notific= ation +capabilities exposed to the guest. When enabled, each virtio queue will ha= ve a +dedicated page on the device BAR exposed to the guest. It is recommended t= o be +used when vDPA is enabled on the hypervisor, as it enables mapping the +notification area to the physical device, which is only supported in page +granularity. The default is determined by QEMU. :since:`Since 7.8.0 (QEMU = 2.8)` +Note: In general you should leave this option alone, unless you are very c= ertain +you know what you are doing. + :anchor:`` =20 Virtio transitional devices diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 6f33d1e774..26990c4d6d 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -6825,6 +6825,11 @@ + + + + + =20 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 818c177e72..6fcf86ba58 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1636,6 +1636,10 @@ virDomainVirtioOptionsParseXML(xmlNodePtr driver, &(*virtio)->packed) < 0) return -1; =20 + if (virXMLPropTristateSwitch(driver, "page_per_vq", VIR_XML_PROP_NONE, + &(*virtio)->page_per_vq) < 0) + return -1; + return 0; } =20 @@ -6321,6 +6325,10 @@ virDomainVirtioOptionsFormat(virBuffer *buf, virBufferAsprintf(buf, " packed=3D'%s'", virTristateSwitchTypeToString(virtio->packed)); } + if (virtio->page_per_vq !=3D VIR_TRISTATE_SWITCH_ABSENT) { + virBufferAsprintf(buf, " page_per_vq=3D'%s'", + virTristateSwitchTypeToString(virtio->page_per_v= q)); + } } =20 =20 @@ -20816,6 +20824,14 @@ virDomainVirtioOptionsCheckABIStability(virDomainV= irtioOptions *src, virTristateSwitchTypeToString(src->packed)); return false; } + if (src->page_per_vq !=3D dst->page_per_vq) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target device page_per_vq option '%s' does not " + "match source '%s'"), + virTristateSwitchTypeToString(dst->page_per_vq), + virTristateSwitchTypeToString(src->page_per_vq)); + return false; + } return true; } =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index e9a9298d86..1ac802feca 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2740,6 +2740,7 @@ struct _virDomainVirtioOptions { virTristateSwitch iommu; virTristateSwitch ats; virTristateSwitch packed; + virTristateSwitch page_per_vq; }; =20 =20 diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c index f023d22f23..80401cf8c7 100644 --- a/src/conf/domain_validate.c +++ b/src/conf/domain_validate.c @@ -135,6 +135,12 @@ virDomainCheckVirtioOptionsAreAbsent(virDomainVirtioOp= tions *virtio) "for virtio devices")); return -1; } + + if (virtio->page_per_vq !=3D VIR_TRISTATE_SWITCH_ABSENT) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("page_per_vq option is only supported for virtio = devices")); + return -1; + } return 0; } =20 --=20 2.31.1 From nobody Sat May 4 11:26:07 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=1634278198; cv=none; d=zohomail.com; s=zohoarc; b=EstsblxxMfIlobfKMRml9EpRp3Gjh1DfZsJivH+QoNRgdCPb8/hr73e6UPjlD+WqVgpBQUGOojwB6SRYkhmwmB8+4JNqhqAt//hrO84x5UQGC2/Vp/3ckgdphIb3UZVDKOX2VqeeMiN/x2mv7U6X8vY581lAql/nBQNx6iDIqfY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634278198; 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=qAW+YFWoM0SPqq5DZJ4rFw1iEmFvOc7IBeJmekjh51A=; b=PjPlH0f7yDTtqj5bKt6OCZ3EysDyCbLt08IWA2saDFwLbGjEJzrVRXq3FKdIEtgg2bg5Zc5VADxUOQF+VfIyyyIgvYpfyNCD9M22UuHMUb8gGwVotqh7iS7rAZ2fPhJjcrdOjBXmPgOPkZJy2617R/P8fLoKfgDT7MVIfh+949E= 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 1634278198268306.1303529671885; Thu, 14 Oct 2021 23:09:58 -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-344-Opk8YKstMCeTOQVlnQhLsQ-1; Fri, 15 Oct 2021 02:09:53 -0400 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 38BC75074B; Fri, 15 Oct 2021 06:09:47 +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 DED1A2B060; Fri, 15 Oct 2021 06:09:46 +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 EAC58180598A; Fri, 15 Oct 2021 06:09:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19F69g5E013902 for ; Fri, 15 Oct 2021 02:09:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id D33415C232; Fri, 15 Oct 2021 06:09:42 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-13-70.pek2.redhat.com [10.72.13.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB5025C1BB; Fri, 15 Oct 2021 06:09:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634278197; 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=qAW+YFWoM0SPqq5DZJ4rFw1iEmFvOc7IBeJmekjh51A=; b=Bv5UpGdM3q+u2IV7K11ZT1FVB3s6naGkDYrhXVOoFBara/GSlVSChwYvd4KGHTmYcp6gfC Lj4jQilyWkSMMm+vqLfIRIM4YwfBM/JdlS+FtiFaOFg1STcRvc/ELgktFrOQ5mvtsLrHUx CeLfyRZ5hAZ/NrErOPAgrCxpzsiGbxk= X-MC-Unique: Opk8YKstMCeTOQVlnQhLsQ-1 From: Han Han To: libvir-list@redhat.com Subject: [PATCH v3 2/2] qemu: Add support for virtio device option page-per-vq Date: Fri, 15 Oct 2021 14:09:30 +0800 Message-Id: <20211015060930.1163897-3-hhan@redhat.com> In-Reply-To: <20211015060930.1163897-1-hhan@redhat.com> References: <20211015060930.1163897-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Han Han 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: 1634278199028100003 Content-Type: text/plain; charset="utf-8" Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D1925363 Signed-off-by: Han Han Reviewed-by: Michal Privoznik --- src/qemu/qemu_command.c | 1 + src/qemu/qemu_hotplug.c | 3 ++- src/qemu/qemu_validate.c | 1 + .../virtio-options.x86_64-latest.args | 24 ++++++++--------- tests/qemuxml2argvdata/virtio-options.xml | 26 +++++++++---------- 5 files changed, 29 insertions(+), 26 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3b2f88bcb9..dba877a740 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1122,6 +1122,7 @@ qemuBuildVirtioDevProps(virDomainDeviceType devtype, "T:iommu_platform", virtioOptions->iommu, "T:ats", virtioOptions->ats, "T:packed", virtioOptions->packed, + "T:page-per-vq", virtioOptions->page_per= _vq, NULL) < 0) return NULL; } diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index af49e58f8e..a7b432b6f5 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3797,7 +3797,8 @@ qemuDomainChangeNet(virQEMUDriver *driver, (olddev->virtio && newdev->virtio && (olddev->virtio->iommu !=3D newdev->virtio->iommu || olddev->virtio->ats !=3D newdev->virtio->ats || - olddev->virtio->packed !=3D newdev->virtio->packed))) { + olddev->virtio->packed !=3D newdev->virtio->packed || + olddev->virtio->page_per_vq !=3D newdev->virtio->page_per_vq))) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("cannot modify virtio network device driver optio= ns")); goto cleanup; diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 75dc9edb7d..4a82b512d1 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1592,6 +1592,7 @@ qemuValidateDomainVirtioOptions(const virDomainVirtio= Options *virtio, "QEMU binary")); return -1; } + return 0; } =20 diff --git a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args b/tes= ts/qemuxml2argvdata/virtio-options.x86_64-latest.args index d6dcbdd90f..6a55134ee8 100644 --- a/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args +++ b/tests/qemuxml2argvdata/virtio-options.x86_64-latest.args @@ -27,26 +27,26 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config= \ -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,iommu_platform=3Don,ats=3Don,packed=3Don,id=3Dvi= rtio-serial0,bus=3Dpci.0,addr=3D0x9 \ +-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 virtio-blk-pci,iommu_platform=3Don,ats=3Don,packed=3Don,bus=3Dpci.= 0,addr=3D0xa,drive=3Dlibvirt-1-format,id=3Dvirtio-disk0,bootindex=3D1 \ +-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 virtio-9p-pci,iommu_platform=3Don,ats=3Don,packed=3Don,id=3Dfs0,fs= dev=3Dfsdev-fs0,mount_tag=3Dfs1,bus=3Dpci.0,addr=3D0x3 \ +-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 virtio-9p-pci,iommu_platform=3Don,ats=3Don,packed=3Don,id=3Dfs1,fs= dev=3Dfsdev-fs1,mount_tag=3Dfs2,bus=3Dpci.0,addr=3D0x4 \ +-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 virtio-net-pci,iommu_platform=3Don,ats=3Don,packed=3Don,netdev=3Dh= ostnet0,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,id=3Dinp= ut0,bus=3Dpci.0,addr=3D0xe \ --device virtio-keyboard-pci,iommu_platform=3Don,ats=3Don,packed=3Don,id=3D= input1,bus=3Dpci.0,addr=3D0x10 \ --device virtio-tablet-pci,iommu_platform=3Don,ats=3Don,packed=3Don,id=3Din= put2,bus=3Dpci.0,addr=3D0x11 \ --device virtio-input-host-pci,iommu_platform=3Don,ats=3Don,packed=3Don,id= =3Dinput3,evdev=3D/dev/input/event1234,bus=3Dpci.0,addr=3D0x12 \ +-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=3Daudio1,driver=3Dnone \ -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 \ --device virtio-balloon-pci,iommu_platform=3Don,ats=3Don,packed=3Don,id=3Db= alloon0,bus=3Dpci.0,addr=3D0xc \ +-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 virtio-rng-pci,iommu_platform=3Don,ats=3Don,packed=3Don,rng=3Dobjr= ng0,id=3Drng0,bus=3Dpci.0,addr=3D0xd \ +-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-options.xml b/tests/qemuxml2argv= data/virtio-options.xml index 9c9b80d5c4..59e293d8e9 100644 --- a/tests/qemuxml2argvdata/virtio-options.xml +++ b/tests/qemuxml2argvdata/virtio-options.xml @@ -18,7 +18,7 @@ /usr/bin/qemu-system-x86_64 - +
@@ -30,22 +30,22 @@
- +
- +
- +
- +
@@ -53,23 +53,23 @@ - +
- +
- +
- +
- +
@@ -77,7 +77,7 @@