From nobody Fri May 16 10:48:42 2025 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.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; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1496148835123678.3075014617909; Tue, 30 May 2017 05:53:55 -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 40B97C04B31F; Tue, 30 May 2017 12:53:53 +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 199CA7C777; Tue, 30 May 2017 12:53:53 +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 3E3A14A499; Tue, 30 May 2017 12:53:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v4UCrnvp013416 for ; Tue, 30 May 2017 08:53:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id 985B319E97; Tue, 30 May 2017 12:53:49 +0000 (UTC) Received: from icr.brq.redhat.com (dhcp129-58.brq.redhat.com [10.34.129.58]) by smtp.corp.redhat.com (Postfix) with ESMTP id DFDCA5C7A5; Tue, 30 May 2017 12:53:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 40B97C04B31F Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 40B97C04B31F From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 30 May 2017 14:50:39 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: jasowang@redhat.com Subject: [libvirt] [PATCH 16/18] Add virtio-related options to input devices 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: , MIME-Version: 1.0 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]); Tue, 30 May 2017 12:53:53 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" https://bugzilla.redhat.com/show_bug.cgi?id=3D1283251 --- docs/formatdomain.html.in | 13 +++++++++++= ++ docs/schemas/domaincommon.rng | 5 +++++ src/conf/domain_conf.c | 15 +++++++++++= ++++ src/conf/domain_conf.h | 1 + tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml | 4 ++++ .../qemuxml2xmloutdata/qemuxml2xmlout-virtio-options.xml | 4 ++++ 6 files changed, 42 insertions(+) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 5c0f3bf..c9c3592 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5715,6 +5715,19 @@ qemu-kvm -net nic,model=3D? /dev/null event device passed through to guests. (KVM only)

=20 +

+ The subelement driver can be used to tune the virtio + options of the device: + Virtio-specific options can also be + set. (Since 3.5.0) +

+

+ The compatibility attribute of the driver = element + can be used to specify the compatibility of virtio devices. Allowed = values + are legacy, transitional and modern<= /code>. + Since 2.2.0. +

+

Hub devices

=20

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 3df4fa4..78ff0a2 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3990,6 +3990,11 @@ =20 + + + + + diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8ef50d7..5dc3e5c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1379,6 +1379,7 @@ void virDomainInputDefFree(virDomainInputDefPtr def) =20 virDomainDeviceInfoClear(&def->info); VIR_FREE(def->source.evdev); + VIR_FREE(def->virtio); VIR_FREE(def); } =20 @@ -11560,6 +11561,9 @@ virDomainInputDefParseXML(const virDomainDef *dom, goto error; } =20 + if (virDomainVirtioOptionsParseXML(ctxt, &def->virtio) < 0) + goto error; + cleanup: VIR_FREE(evdev); VIR_FREE(type); @@ -23347,6 +23351,7 @@ virDomainInputDefFormat(virBufferPtr buf, const char *type =3D virDomainInputTypeToString(def->type); const char *bus =3D virDomainInputBusTypeToString(def->bus); virBuffer childbuf =3D VIR_BUFFER_INITIALIZER; + virBuffer driverBuf =3D VIR_BUFFER_INITIALIZER; =20 /* don't format keyboard into migratable XML for backward compatibilit= y */ if (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE && @@ -23370,6 +23375,16 @@ virDomainInputDefFormat(virBufferPtr buf, type, bus); =20 virBufferAdjustIndent(&childbuf, virBufferGetIndent(buf, false) + 2); + virDomainVirtioOptionsFormat(&driverBuf, def->virtio); + if (virBufferCheckError(&driverBuf) < 0) + return -1; + + if (virBufferUse(&driverBuf)) { + virBufferTrim(&driverBuf, " ", -1); + virBufferAddLit(&childbuf, "\n"); + } virBufferEscapeString(&childbuf, "\n", def->sour= ce.evdev); if (virDomainDeviceInfoFormat(&childbuf, &def->info, flags) < 0) return -1; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 5e38d0f..0038a11 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1289,6 +1289,7 @@ struct _virDomainInputDef { char *evdev; } source; virDomainDeviceInfo info; + virDomainVirtioOptionsPtr virtio; }; =20 typedef enum { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml b/tests= /qemuxml2argvdata/qemuxml2argv-virtio-options.xml index be702cb..f614e68 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-options.xml @@ -66,15 +66,19 @@

+
+
+
+
diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-options.xml b/t= ests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-options.xml index be702cb..f614e68 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-options.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-virtio-options.xml @@ -66,15 +66,19 @@
+
+
+
+
--=20 2.10.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list