From nobody Mon May 6 16:21:05 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 1526917248373250.57452633115645; Mon, 21 May 2018 08:40:48 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DE320C107145; Mon, 21 May 2018 15:40:46 +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 9631260F9A; Mon, 21 May 2018 15:40: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 480E5180B536; Mon, 21 May 2018 15:40:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LFbW6Z024076 for ; Mon, 21 May 2018 11:37:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id A66D710EE6D6; Mon, 21 May 2018 15:37:32 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2D83310EE6D5; Mon, 21 May 2018 15:37:32 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 21 May 2018 17:37:11 +0200 Message-Id: <0acc964e4a9399dbe9e4fa77f25013bbd34da3fe.1526916651.git.jtomko@redhat.com> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: stefanha@redhat.com Subject: [libvirt] [PATCH 1/9] conf: split interface target element condition 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-Type: text/plain; charset="utf-8" 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 21 May 2018 15:40:47 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Check for the 'dev' attribute in a separate condition, to make parsing future attributes easier. Signed-off-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3689ac0a82..c0a8ae7898 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11069,15 +11069,16 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xml= opt, } ctxt->node =3D tmpnode; } - } else if (!ifname && - virXMLNodeNameEqual(cur, "target")) { - ifname =3D virXMLPropString(cur, "dev"); - if (ifname && - (flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) && - (STRPREFIX(ifname, VIR_NET_GENERATED_TAP_PREFIX) || - (prefix && STRPREFIX(ifname, prefix)))) { - /* An auto-generated target name, blank it out */ - VIR_FREE(ifname); + } else if (virXMLNodeNameEqual(cur, "target")) { + if (!ifname) { + ifname =3D virXMLPropString(cur, "dev"); + if (ifname && + (flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) && + (STRPREFIX(ifname, VIR_NET_GENERATED_TAP_PREFIX) || + (prefix && STRPREFIX(ifname, prefix)))) { + /* An auto-generated target name, blank it out */ + VIR_FREE(ifname); + } } } else if ((!ifname_guest || !ifname_guest_actual) && virXMLNodeNameEqual(cur, "guest")) { --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 16:21:05 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 1526917242865349.52140073141993; Mon, 21 May 2018 08:40:42 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5F8A029B378; Mon, 21 May 2018 15:40:41 +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 173355D6B5; Mon, 21 May 2018 15:40:41 +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 C6F464BB78; Mon, 21 May 2018 15:40:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LFbXEl024079 for ; Mon, 21 May 2018 11:37:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6598210EE6D7; Mon, 21 May 2018 15:37:33 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id E0A1F10EE6D5; Mon, 21 May 2018 15:37:32 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 21 May 2018 17:37:12 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: stefanha@redhat.com Subject: [libvirt] [PATCH 2/9] qemu: prepare for missing interface model 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-Type: text/plain; charset="utf-8" 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 21 May 2018 15:40:42 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Use STREQ_NULLABLE instead of STREQ to allow future addition of interface types that do not have models. Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain_address.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9da2d609e8..1f03cc70fe 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3375,7 +3375,7 @@ qemuBuildNicDevStr(virDomainDefPtr def, bool usingVirtio =3D false; char macaddr[VIR_MAC_STRING_BUFLEN]; =20 - if (STREQ(net->model, "virtio")) { + if (STREQ_NULLABLE(net->model, "virtio")) { if (net->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) nic =3D "virtio-net-ccw"; else if (net->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRT= IO_S390) diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index b7c82cb6f1..c93e6fd8b2 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -622,14 +622,14 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDev= iceDefPtr dev, * addresses for other hostdev devices. */ if (net->type =3D=3D VIR_DOMAIN_NET_TYPE_HOSTDEV || - STREQ(net->model, "usb-net")) { + STREQ_NULLABLE(net->model, "usb-net")) { return 0; } =20 - if (STREQ(net->model, "virtio")) + if (STREQ_NULLABLE(net->model, "virtio")) return virtioFlags; =20 - if (STREQ(net->model, "e1000e")) + if (STREQ_NULLABLE(net->model, "e1000e")) return pcieFlags; =20 return pciFlags; --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 16:21:05 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 1526917253996603.1879404203221; Mon, 21 May 2018 08:40:53 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3428F394D10; Mon, 21 May 2018 15:40:52 +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 F3DD530012B7; Mon, 21 May 2018 15:40:51 +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 A4F661801250; Mon, 21 May 2018 15:40:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LFbYok024090 for ; Mon, 21 May 2018 11:37:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2436D10EE6D6; Mon, 21 May 2018 15:37:34 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F87C10EE6D5; Mon, 21 May 2018 15:37:33 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 21 May 2018 17:37:13 +0200 Message-Id: <33d80bc593e56e8c0fe4f58c417d01fef62c1fd0.1526916651.git.jtomko@redhat.com> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: stefanha@redhat.com Subject: [libvirt] [PATCH 3/9] Introduce virDomainNetDefNew 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-Type: text/plain; charset="utf-8" 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.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 21 May 2018 15:40:53 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 A helper to allow initialization of virDomainNetDef. Use it for all new network definitions and pass xmlopt where applicable. Signed-off-by: J=C3=A1n Tomko --- src/bhyve/bhyve_parse_command.c | 2 +- src/conf/domain_conf.c | 15 ++++++++++++++- src/conf/domain_conf.h | 1 + src/libvirt_private.syms | 1 + src/openvz/openvz_conf.c | 4 ++-- src/qemu/qemu_parse_command.c | 2 +- src/vbox/vbox_common.c | 2 +- src/vmx/vmx.c | 2 +- src/xenconfig/xen_common.c | 2 +- src/xenconfig/xen_sxpr.c | 2 +- 10 files changed, 24 insertions(+), 9 deletions(-) diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_comman= d.c index 14137d179b..476e8321bc 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -505,7 +505,7 @@ bhyveParsePCINet(virDomainDefPtr def, const char *separator =3D NULL; const char *mac =3D NULL; =20 - if (VIR_ALLOC(net) < 0) + if (!(net =3D virDomainNetDefNew(xmlopt)) goto cleanup; =20 /* As we only support interface type=3D'bridge' and cannot diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c0a8ae7898..f58d354ddd 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2027,6 +2027,19 @@ virDomainActualNetDefFree(virDomainActualNetDefPtr d= ef) VIR_FREE(def); } =20 + +virDomainNetDefPtr +virDomainNetDefNew(virDomainXMLOptionPtr xmlopt ATTRIBUTE_UNUSED) +{ + virDomainNetDefPtr net; + + if (VIR_ALLOC(net) < 0) + return NULL; + + return net; +} + + void virDomainNetDefClear(virDomainNetDefPtr def) { @@ -10941,7 +10954,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlop= t, virDomainChrSourceReconnectDef reconnect =3D {0}; int rv, val; =20 - if (VIR_ALLOC(def) < 0) + if (!(def =3D virDomainNetDefNew(xmlopt))) return NULL; =20 ctxt->node =3D node; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a78fdee40c..5de058c64d 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2788,6 +2788,7 @@ bool virDomainControllerIsPSeriesPHB(const virDomainC= ontrollerDef *cont); virDomainFSDefPtr virDomainFSDefNew(void); void virDomainFSDefFree(virDomainFSDefPtr def); void virDomainActualNetDefFree(virDomainActualNetDefPtr def); +virDomainNetDefPtr virDomainNetDefNew(virDomainXMLOptionPtr xmlopt); void virDomainNetDefClear(virDomainNetDefPtr def); void virDomainNetDefFree(virDomainNetDefPtr def); void virDomainSmartcardDefFree(virDomainSmartcardDefPtr def); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 3dece252df..b4c86b60cc 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -447,6 +447,7 @@ virDomainNetBandwidthUpdate; virDomainNetDefClear; virDomainNetDefFormat; virDomainNetDefFree; +virDomainNetDefNew; virDomainNetFind; virDomainNetFindByName; virDomainNetFindIdx; diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 5ed2b423cb..28fd64895e 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -219,7 +219,7 @@ openvzReadNetworkConf(virDomainDefPtr def, } else if (ret > 0) { token =3D strtok_r(temp, " ", &saveptr); while (token !=3D NULL) { - if (VIR_ALLOC(net) < 0) + if (!(net =3D virDomainNetDefNew(NULL))) goto error; =20 net->type =3D VIR_DOMAIN_NET_TYPE_ETHERNET; @@ -248,7 +248,7 @@ openvzReadNetworkConf(virDomainDefPtr def, token =3D strtok_r(temp, ";", &saveptr); while (token !=3D NULL) { /*add new device to list*/ - if (VIR_ALLOC(net) < 0) + if (!(net =3D virDomainNetDefNew(NULL))) goto error; =20 net->type =3D VIR_DOMAIN_NET_TYPE_BRIDGE; diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index 351425fedd..de349954cf 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -1037,7 +1037,7 @@ qemuParseCommandLineNet(virDomainXMLOptionPtr xmlopt, nkeywords =3D 0; } =20 - if (VIR_ALLOC(def) < 0) + if (!(def =3D virDomainNetDefNew(xmlopt))) goto cleanup; =20 /* 'tap' could turn into libvirt type=3Dethernet, type=3Dbridge or diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 72a24a3464..28a50b477b 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -3690,7 +3690,7 @@ vboxDumpNetwork(vboxDriverPtr data, INetworkAdapter *= adapter) char *utf8 =3D NULL; virDomainNetDefPtr net =3D NULL; =20 - if (VIR_ALLOC(net) < 0) + if (!(net =3D virDomainNetDefNew(NULL))) return NULL; =20 gVBoxAPI.UINetworkAdapter.GetAttachmentType(adapter, &attachmentType); diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index df6a58a474..e6026edc56 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2628,7 +2628,7 @@ virVMXParseEthernet(virConfPtr conf, int controller, = virDomainNetDefPtr *def) if (! present/* && ! startConnected*/) return 0; =20 - if (VIR_ALLOC(*def) < 0) + if (!(*def =3D virDomainNetDefNew(NULL))) return -1; =20 /* vmx:connectionType -> def:type */ diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c index a2b0708ee3..80bc267bbe 100644 --- a/src/xenconfig/xen_common.c +++ b/src/xenconfig/xen_common.c @@ -942,7 +942,7 @@ xenParseVif(virConfPtr conf, virDomainDefPtr def, const= char *vif_typename) key =3D nextkey; } =20 - if (VIR_ALLOC(net) < 0) + if (!(net =3D virDomainNetDefNew(NULL))) goto cleanup; =20 if (mac[0]) { diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c index e868c05695..54dd7fc3ed 100644 --- a/src/xenconfig/xen_sxpr.c +++ b/src/xenconfig/xen_sxpr.c @@ -600,7 +600,7 @@ xenParseSxprNets(virDomainDefPtr def, model =3D sexpr_node(node, "device/vif/model"); type =3D sexpr_node(node, "device/vif/type"); =20 - if (VIR_ALLOC(net) < 0) + if (!(net =3D virDomainNetDefNew(NULL))) goto cleanup; =20 if (tmp !=3D NULL || --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 16:21:05 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 15269170906161017.887614415939; Mon, 21 May 2018 08:38:10 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 14635718D6; Mon, 21 May 2018 15:38:09 +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 D5886977AA; Mon, 21 May 2018 15:38:08 +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 8697C4CAA0; Mon, 21 May 2018 15:38:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LFbYZ8024095 for ; Mon, 21 May 2018 11:37:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id D7FB310EE6D6; Mon, 21 May 2018 15:37:34 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E5D910EE6D5; Mon, 21 May 2018 15:37:34 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 21 May 2018 17:37:14 +0200 Message-Id: <93f1d85587b1d6734069ddfd060c3b591a4854ce.1526916651.git.jtomko@redhat.com> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: stefanha@redhat.com Subject: [libvirt] [PATCH 4/9] Add privateData to virDomainNetDef 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-Type: text/plain; charset="utf-8" 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.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 21 May 2018 15:38:09 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 An object for storing driver-specific data related to the network definition. Signed-off-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 11 +++++++++++ src/conf/domain_conf.h | 3 +++ 2 files changed, 14 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f58d354ddd..ee5fba40c9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2036,7 +2036,16 @@ virDomainNetDefNew(virDomainXMLOptionPtr xmlopt ATTR= IBUTE_UNUSED) if (VIR_ALLOC(net) < 0) return NULL; =20 + if (xmlopt && + xmlopt->privateData.netNew && + !(net->privateData =3D xmlopt->privateData.netNew())) + goto error; + return net; + + error: + virDomainNetDefFree(net); + return NULL; } =20 =20 @@ -2113,6 +2122,8 @@ virDomainNetDefClear(virDomainNetDefPtr def) virNetDevBandwidthFree(def->bandwidth); def->bandwidth =3D NULL; virNetDevVlanClear(&def->vlan); + virObjectUnref(def->privateData); + def->privateData =3D NULL; } =20 void diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 5de058c64d..ea72d4810d 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -969,6 +969,8 @@ struct _virDomainActualNetDef { =20 /* Stores the virtual network interface configuration */ struct _virDomainNetDef { + virObjectPtr privateData; + virDomainNetType type; virMacAddr mac; bool mac_generated; /* true if mac was *just now* auto-generated by li= bvirt */ @@ -2672,6 +2674,7 @@ struct _virDomainXMLPrivateDataCallbacks { virDomainXMLPrivateDataNewFunc diskNew; virDomainXMLPrivateDataNewFunc vcpuNew; virDomainXMLPrivateDataNewFunc chrSourceNew; + virDomainXMLPrivateDataNewFunc netNew; virDomainXMLPrivateDataFormatFunc format; virDomainXMLPrivateDataParseFunc parse; virDomainXMLPrivateDataStorageSourceParseFunc storageParse; --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 16:21:05 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 1526917084544676.8500319570713; Mon, 21 May 2018 08:38:04 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 761C430D07C9; Mon, 21 May 2018 15:38:02 +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 EE93C611D2; Mon, 21 May 2018 15:38:01 +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 EF8364BB79; Mon, 21 May 2018 15:38:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LFbZr7024100 for ; Mon, 21 May 2018 11:37:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id 95E9110EE6D6; Mon, 21 May 2018 15:37:35 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D4AA10EE6D5; Mon, 21 May 2018 15:37:34 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 21 May 2018 17:37:15 +0200 Message-Id: <073aec3fde5a61694083968a3a7608a51836abd3.1526916651.git.jtomko@redhat.com> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: stefanha@redhat.com Subject: [libvirt] [PATCH 5/9] qemu: add private data for interfaces 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-Type: text/plain; charset="utf-8" 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 21 May 2018 15:38:03 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Introduce a structure and a class that will be used to store the private data. Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_domain.c | 36 ++++++++++++++++++++++++++++++++++++ src/qemu/qemu_domain.h | 9 +++++++++ 2 files changed, 45 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d3beee5d87..650909b739 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1134,6 +1134,41 @@ qemuDomainChrSourcePrivateDispose(void *obj) } =20 =20 +static virClassPtr qemuDomainNetPrivateClass; +static void qemuDomainNetPrivateDispose(void *obj); + +static int +qemuDomainNetPrivateOnceInit(void) +{ + if (!VIR_CLASS_NEW(qemuDomainNetPrivate, virClassForObject())) + return -1; + + return 0; +} + +VIR_ONCE_GLOBAL_INIT(qemuDomainNetPrivate) + +static virObjectPtr +qemuDomainNetPrivateNew(void) +{ + qemuDomainNetPrivatePtr priv; + + if (qemuDomainNetPrivateInitialize() < 0) + return NULL; + + if (!(priv =3D virObjectNew(qemuDomainNetPrivateClass))) + return NULL; + + return (virObjectPtr) priv; +} + + +static void +qemuDomainNetPrivateDispose(void *obj ATTRIBUTE_UNUSED) +{ +} + + /* qemuDomainSecretPlainSetup: * @secinfo: Pointer to secret info * @usageType: The virSecretUsageType @@ -2636,6 +2671,7 @@ virDomainXMLPrivateDataCallbacks virQEMUDriverPrivate= DataCallbacks =3D { .diskNew =3D qemuDomainDiskPrivateNew, .vcpuNew =3D qemuDomainVcpuPrivateNew, .chrSourceNew =3D qemuDomainChrSourcePrivateNew, + .netNew =3D qemuDomainNetPrivateNew, .parse =3D qemuDomainObjPrivateXMLParse, .format =3D qemuDomainObjPrivateXMLFormat, .storageParse =3D qemuStorageSourcePrivateDataParse, diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 40d1d095a3..a04ded16ed 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -441,6 +441,15 @@ struct _qemuDomainChrSourcePrivate { }; =20 =20 +typedef struct _qemuDomainNetPrivate qemuDomainNetPrivate; +typedef qemuDomainNetPrivate *qemuDomainNetPrivatePtr; +struct _qemuDomainNetPrivate { + virObject parent; + + virTristateBool maybe; +}; + + typedef enum { QEMU_PROCESS_EVENT_WATCHDOG =3D 0, QEMU_PROCESS_EVENT_GUESTPANIC, --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 16:21:05 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 152691725891166.05025492197763; Mon, 21 May 2018 08:40:58 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3FFC4FA2BD; Mon, 21 May 2018 15:40:57 +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 02F4A60F9A; Mon, 21 May 2018 15:40:57 +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 AD57E4CA95; Mon, 21 May 2018 15:40:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LFbaZL024106 for ; Mon, 21 May 2018 11:37:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 724A110EE6D6; Mon, 21 May 2018 15:37:36 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id D017510EE6D5; Mon, 21 May 2018 15:37:35 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 21 May 2018 17:37:16 +0200 Message-Id: <44f1caa8818a7025a1492d02bf9084f00f207d0b.1526916651.git.jtomko@redhat.com> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: stefanha@redhat.com Subject: [libvirt] [PATCH 6/9] conf: add interface type vsock 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-Type: text/plain; charset="utf-8" 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 21 May 2018 15:40:58 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Add a new 'vsock' interface type with a subelement.
No model is required. https://bugzilla.redhat.com/show_bug.cgi?id=3D1291851 Signed-off-by: J=C3=A1n Tomko --- docs/formatdomain.html.in | 15 ++++++++++++ docs/schemas/domaincommon.rng | 14 +++++++++++ src/conf/domain_conf.c | 40 ++++++++++++++++++++++++++++= ---- src/conf/domain_conf.h | 4 ++++ src/conf/netdev_bandwidth_conf.h | 1 + src/libxl/libxl_conf.c | 1 + src/lxc/lxc_controller.c | 1 + src/lxc/lxc_driver.c | 3 +++ src/lxc/lxc_process.c | 1 + src/qemu/qemu_command.c | 4 ++++ src/qemu/qemu_domain.c | 3 +++ src/qemu/qemu_hotplug.c | 3 +++ src/qemu/qemu_interface.c | 2 ++ src/qemu/qemu_process.c | 1 + src/uml/uml_conf.c | 5 ++++ src/vmx/vmx.c | 1 + src/xenconfig/xen_common.c | 1 + src/xenconfig/xen_sxpr.c | 1 + tests/qemuxml2argvdata/vhost-vsock.xml | 36 ++++++++++++++++++++++++++++ tests/qemuxml2xmloutdata/vhost-vsock.xml | 1 + tests/qemuxml2xmltest.c | 2 ++ tools/virsh-domain.c | 1 + 22 files changed, 137 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/vhost-vsock.xml create mode 120000 tests/qemuxml2xmloutdata/vhost-vsock.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 0d0fd3b9f3..05d991a370 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -5386,6 +5386,21 @@ </source> </interface> </devices> +... + +
Vsock
+ +

A vsock host/guest interface. Attribute cid of the tra= get element + specifies the CID assigned to the guest. + Since 4.4.0

+ +
+...
+<devices>
+  <interface type=3D'vsock'>
+    <target cid=3D'3'/>
+  </interface>
+</devices>
 ...
=20
Setting the NIC model
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 71ac3d079c..c56b615e6e 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2675,6 +2675,20 @@ + + + vsock + + + + + + + + + + + diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ee5fba40c9..77a233012e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -426,7 +426,8 @@ VIR_ENUM_IMPL(virDomainNet, VIR_DOMAIN_NET_TYPE_LAST, "internal", "direct", "hostdev", - "udp") + "udp", + "vsock") =20 VIR_ENUM_IMPL(virDomainNetBackend, VIR_DOMAIN_NET_BACKEND_TYPE_LAST, "default", @@ -2094,6 +2095,10 @@ virDomainNetDefClear(virDomainNetDefPtr def) virDomainHostdevDefClear(&def->data.hostdev.def); break; =20 + case VIR_DOMAIN_NET_TYPE_VSOCK: + def->data.vsock.guest_cid =3D 0; + break; + case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_LAST: @@ -10959,6 +10964,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlop= t, char *vhostuser_type =3D NULL; char *trustGuestRxFilters =3D NULL; char *vhost_path =3D NULL; + char *cid =3D NULL; virHashTablePtr filterparams =3D NULL; virDomainActualNetDefPtr actual =3D NULL; xmlNodePtr oldnode =3D ctxt->node; @@ -11104,6 +11110,8 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlop= t, VIR_FREE(ifname); } } + if (!cid && def->type =3D=3D VIR_DOMAIN_NET_TYPE_VSOCK) + cid =3D virXMLPropString(cur, "cid"); } else if ((!ifname_guest || !ifname_guest_actual) && virXMLNodeNameEqual(cur, "guest")) { ifname_guest =3D virXMLPropString(cur, "dev"); @@ -11190,7 +11198,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlop= t, (const char *)macaddr); goto error; } - } else { + } else if (def->type !=3D VIR_DOMAIN_NET_TYPE_VSOCK) { virDomainNetGenerateMAC(xmlopt, &def->mac); def->mac_generated =3D true; } @@ -11425,6 +11433,21 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlo= pt, } break; =20 + case VIR_DOMAIN_NET_TYPE_VSOCK: + if (cid =3D=3D NULL) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("No 'cid' attribute " + "specified with ")= ); + goto error; + } + if (virStrToLong_uip(cid, NULL, 10, &def->data.vsock.guest_cid) < = 0) { + virReportError(VIR_ERR_XML_DETAIL, + _("'cid' attribute must be positive number: %s"= ), + queues); + goto error; + } + break; + case VIR_DOMAIN_NET_TYPE_ETHERNET: case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_LAST: @@ -11703,6 +11726,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlop= t, case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: + case VIR_DOMAIN_NET_TYPE_VSOCK: break; case VIR_DOMAIN_NET_TYPE_LAST: default: @@ -11771,6 +11795,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlop= t, VIR_FREE(vhost_path); VIR_FREE(localaddr); VIR_FREE(localport); + VIR_FREE(cid); virHashFree(filterparams); =20 return def; @@ -24290,8 +24315,10 @@ virDomainNetDefFormat(virBufferPtr buf, virBufferAddLit(buf, ">\n"); =20 virBufferAdjustIndent(buf, 2); - virBufferAsprintf(buf, "\n", - virMacAddrFormat(&def->mac, macstr)); + if (def->type !=3D VIR_DOMAIN_NET_TYPE_VSOCK) { + virBufferAsprintf(buf, "\n", + virMacAddrFormat(&def->mac, macstr)); + } =20 if (publicActual) { /* when there is a virDomainActualNetDef, and we haven't been @@ -24403,6 +24430,7 @@ virDomainNetDefFormat(virBufferPtr buf, break; =20 case VIR_DOMAIN_NET_TYPE_USER: + case VIR_DOMAIN_NET_TYPE_VSOCK: case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -24461,6 +24489,8 @@ virDomainNetDefFormat(virBufferPtr buf, /* Skip auto-generated target names for inactive config. */ virBufferEscapeString(buf, "\n", def->ifname); } + if (def->type =3D=3D VIR_DOMAIN_NET_TYPE_VSOCK) + virBufferAsprintf(buf, "\n", def->data.vsock.g= uest_cid); =20 if (def->ifname_guest || def->ifname_guest_actual) { virBufferAddLit(buf, "def->nets[i]->ty= pe)); diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index a2e29a2121..fe50750806 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -3949,6 +3949,7 @@ lxcDomainAttachDeviceNetLive(virConnectPtr conn, case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: + case VIR_DOMAIN_NET_TYPE_VSOCK: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Network device type is not supported")); goto cleanup; @@ -4003,6 +4004,7 @@ lxcDomainAttachDeviceNetLive(virConnectPtr conn, case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: + case VIR_DOMAIN_NET_TYPE_VSOCK: case VIR_DOMAIN_NET_TYPE_LAST: default: /* no-op */ @@ -4449,6 +4451,7 @@ lxcDomainDetachDeviceNetLive(virDomainObjPtr vm, case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: + case VIR_DOMAIN_NET_TYPE_VSOCK: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Only bridged veth devices can be detached")); goto cleanup; diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index cc6ed12526..1916ee7e9b 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -582,6 +582,7 @@ static int virLXCProcessSetupInterfaces(virConnectPtr c= onn, case VIR_DOMAIN_NET_TYPE_MCAST: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_INTERNAL: + case VIR_DOMAIN_NET_TYPE_VSOCK: case VIR_DOMAIN_NET_TYPE_LAST: case VIR_DOMAIN_NET_TYPE_HOSTDEV: virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1f03cc70fe..a9c67bbb3b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3657,6 +3657,8 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, =20 case VIR_DOMAIN_NET_TYPE_HOSTDEV: /* Should have been handled earlier via PCI/USB hotplug code. */ + case VIR_DOMAIN_NET_TYPE_VSOCK: + /* We only need to build the frontend */ case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -8265,6 +8267,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, case VIR_DOMAIN_NET_TYPE_MCAST: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: + case VIR_DOMAIN_NET_TYPE_VSOCK: case VIR_DOMAIN_NET_TYPE_LAST: /* nada */ break; @@ -8301,6 +8304,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: + case VIR_DOMAIN_NET_TYPE_VSOCK: case VIR_DOMAIN_NET_TYPE_LAST: /* These types don't use a network device on the host, but * instead use some other type of connection to the emulated diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 650909b739..eb88de83db 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3676,6 +3676,7 @@ qemuDomainNetSupportsCoalesce(virDomainNetType type) case VIR_DOMAIN_NET_TYPE_MCAST: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: + case VIR_DOMAIN_NET_TYPE_VSOCK: case VIR_DOMAIN_NET_TYPE_LAST: break; } @@ -5570,6 +5571,7 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr de= v, =20 if (dev->type =3D=3D VIR_DOMAIN_DEVICE_NET && dev->data.net->type !=3D VIR_DOMAIN_NET_TYPE_HOSTDEV && + dev->data.net->type !=3D VIR_DOMAIN_NET_TYPE_VSOCK && !dev->data.net->model) { if (VIR_STRDUP(dev->data.net->model, qemuDomainDefaultNetModel(def, qemuCaps)) < 0) @@ -9311,6 +9313,7 @@ qemuDomainNetSupportsMTU(virDomainNetType type) case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: + case VIR_DOMAIN_NET_TYPE_VSOCK: case VIR_DOMAIN_NET_TYPE_LAST: break; } diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index b35594be5f..3a07d5eae9 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1052,6 +1052,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, case VIR_DOMAIN_NET_TYPE_MCAST: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: + case VIR_DOMAIN_NET_TYPE_VSOCK: case VIR_DOMAIN_NET_TYPE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("hotplug of interface type of %s is not implement= ed yet"), @@ -3089,6 +3090,7 @@ qemuDomainChangeNetFilter(virDomainObjPtr vm, case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: + case VIR_DOMAIN_NET_TYPE_VSOCK: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("filters not supported on interfaces of type %s"), virDomainNetTypeToString(virDomainNetGetActualType(= newdev))); @@ -3389,6 +3391,7 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, /* all handled in common code directly below this switch */ break; =20 + case VIR_DOMAIN_NET_TYPE_VSOCK: case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_HOSTDEV: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index 5d54a85c53..60bb6b22ef 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -122,6 +122,7 @@ qemuInterfaceStartDevice(virDomainNetDefPtr net) case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: + case VIR_DOMAIN_NET_TYPE_VSOCK: case VIR_DOMAIN_NET_TYPE_LAST: /* these types all require no action */ break; @@ -210,6 +211,7 @@ qemuInterfaceStopDevice(virDomainNetDefPtr net) case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: + case VIR_DOMAIN_NET_TYPE_VSOCK: case VIR_DOMAIN_NET_TYPE_LAST: /* these types all require no action */ break; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 174d932ae7..d73f3764f5 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6895,6 +6895,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: + case VIR_DOMAIN_NET_TYPE_VSOCK: case VIR_DOMAIN_NET_TYPE_LAST: /* No special cleanup procedure for these types. */ break; diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index 9c548f0e80..3cb360d415 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -258,6 +258,11 @@ umlBuildCommandLineNet(virConnectPtr conn, _("hostdev networking type not supported")); goto error; =20 + case VIR_DOMAIN_NET_TYPE_VSOCK: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("vsock networking type not supported")); + goto error; + case VIR_DOMAIN_NET_TYPE_LAST: break; } diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index e6026edc56..3f44eedb29 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -3849,6 +3849,7 @@ virVMXFormatEthernet(virDomainNetDefPtr def, int cont= roller, case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: + case VIR_DOMAIN_NET_TYPE_VSOCK: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported net type= '%s'"), virDomainNetTypeToString(def->type)); return -1; diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c index 80bc267bbe..cddc5f17c7 100644 --- a/src/xenconfig/xen_common.c +++ b/src/xenconfig/xen_common.c @@ -1267,6 +1267,7 @@ xenFormatNet(virConnectPtr conn, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_USER: + case VIR_DOMAIN_NET_TYPE_VSOCK: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported net type= '%s'"), virDomainNetTypeToString(net->type)); goto cleanup; diff --git a/src/xenconfig/xen_sxpr.c b/src/xenconfig/xen_sxpr.c index 54dd7fc3ed..6992b59654 100644 --- a/src/xenconfig/xen_sxpr.c +++ b/src/xenconfig/xen_sxpr.c @@ -1931,6 +1931,7 @@ xenFormatSxprNet(virConnectPtr conn, case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_DIRECT: case VIR_DOMAIN_NET_TYPE_HOSTDEV: + case VIR_DOMAIN_NET_TYPE_VSOCK: case VIR_DOMAIN_NET_TYPE_LAST: break; } diff --git a/tests/qemuxml2argvdata/vhost-vsock.xml b/tests/qemuxml2argvdat= a/vhost-vsock.xml new file mode 100644 index 0000000000..a9253227c0 --- /dev/null +++ b/tests/qemuxml2argvdata/vhost-vsock.xml @@ -0,0 +1,36 @@ + + test + bba65c0e-c049-934f-b6aa-4e2c0582acdf + 1048576 + 1048576 + 1 + + hvm + + + + + destroy + restart + restart + + /usr/bin/qemu-system-x86_64 + +
+ + +
+ + +
+ + + + +
+ + + + + + diff --git a/tests/qemuxml2xmloutdata/vhost-vsock.xml b/tests/qemuxml2xmlou= tdata/vhost-vsock.xml new file mode 120000 index 0000000000..bb24241fb2 --- /dev/null +++ b/tests/qemuxml2xmloutdata/vhost-vsock.xml @@ -0,0 +1 @@ +../qemuxml2argvdata/vhost-vsock.xml \ No newline at end of file diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 7cedc2b999..a2f0cf01bc 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1209,6 +1209,8 @@ mymain(void) DO_TEST_STATUS("migration-in-params"); DO_TEST_STATUS("migration-out-params"); =20 + DO_TEST("vhost-vsock", NONE); + if (getenv("LIBVIRT_SKIP_CLEANUP") =3D=3D NULL) virFileDeleteTree(fakerootdir); =20 diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index cfbbf5a7bc..365618546e 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -935,6 +935,7 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) case VIR_DOMAIN_NET_TYPE_MCAST: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_INTERNAL: + case VIR_DOMAIN_NET_TYPE_VSOCK: case VIR_DOMAIN_NET_TYPE_LAST: vshError(ctl, _("No support for %s in command 'attach-interface'"), type); --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 16:21:05 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 152691726434877.87275339396717; Mon, 21 May 2018 08:41:04 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BBED930C1669; Mon, 21 May 2018 15:41:02 +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 84C6E977A0; Mon, 21 May 2018 15:41:02 +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 27588180B5B1; Mon, 21 May 2018 15:41:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LFbbSr024119 for ; Mon, 21 May 2018 11:37:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 30EFA10EE6D6; Mon, 21 May 2018 15:37:37 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC38D10EE6D5; Mon, 21 May 2018 15:37:36 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 21 May 2018 17:37:17 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: stefanha@redhat.com Subject: [libvirt] [PATCH 7/9] Introduce QEMU_CAPS_DEVICE_VHOST_VSOCK 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-Type: text/plain; charset="utf-8" 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.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Mon, 21 May 2018 15:41:03 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Add a new capability flag for vhost-vsock-device and vhost-vsock-pci. https://bugzilla.redhat.com/show_bug.cgi?id=3D1291851 Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 3 +++ src/qemu/qemu_capabilities.h | 1 + tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 + tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 + 16 files changed, 18 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index bface72de2..b9b2887e5e 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -487,6 +487,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, /* 300 */ "sdl-gl", "screendump_device", + "vhost-vsock", ); =20 =20 @@ -1117,6 +1118,8 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[= ] =3D { { "pr-manager-helper", QEMU_CAPS_PR_MANAGER_HELPER }, { "virtual-css-bridge", QEMU_CAPS_CCW }, { "vfio-ccw", QEMU_CAPS_DEVICE_VFIO_CCW }, + { "vhost-vsock-device", QEMU_CAPS_DEVICE_VHOST_VSOCK }, + { "vhost-vsock-pci", QEMU_CAPS_DEVICE_VHOST_VSOCK }, }; =20 static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[]= =3D { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 6f9953478a..190b94bff4 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -471,6 +471,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ /* 300 */ QEMU_CAPS_SDL_GL, /* -sdl gl */ QEMU_CAPS_SCREENDUMP_DEVICE, /* screendump command accepts device & he= ad */ + QEMU_CAPS_DEVICE_VHOST_VSOCK, /* -device vhost-vsock-* */ =20 QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qem= ucapabilitiesdata/caps_2.10.0.aarch64.xml index 5904306848..6d3b807435 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -155,6 +155,7 @@ + 2010000 0 303541 diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemuc= apabilitiesdata/caps_2.10.0.ppc64.xml index 2912c8d66b..2e876fd7f1 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -154,6 +154,7 @@ + 2010000 0 382824 diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.10.0.s390x.xml index 518788ac13..e14591ed46 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -116,6 +116,7 @@ + 2010000 0 303434 diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemu= capabilitiesdata/caps_2.10.0.x86_64.xml index 77ca3013b5..32e4b6a0bf 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -197,6 +197,7 @@ + 2010000 0 344938 diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.11.0.s390x.xml index 9adca9d46b..b84d03f3a7 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -122,6 +122,7 @@ + 2011000 0 342166 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qem= ucapabilitiesdata/caps_2.12.0.aarch64.xml index de41d96cd0..b6acc58304 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -163,6 +163,7 @@ + 2011090 0 343099 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemuc= apabilitiesdata/caps_2.12.0.ppc64.xml index fc26f934ee..49924ff88c 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -160,6 +160,7 @@ + 2011090 0 419968 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemuc= apabilitiesdata/caps_2.12.0.s390x.xml index bdfb81c998..cdffaed262 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -128,6 +128,7 @@ + 2012000 0 371055 diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemu= capabilitiesdata/caps_2.12.0.x86_64.xml index 820b3ef759..2b04c3d138 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -201,6 +201,7 @@ + 2011090 0 390813 diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_2.8.0.s390x.xml index 84546b72b9..841ff01acb 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -108,6 +108,7 @@ + 2007093 0 241741 diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.8.0.x86_64.xml index 7c329ad4c7..16ce016e8f 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -179,6 +179,7 @@ + 2008000 0 255684 diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_2.9.0.ppc64.xml index cfc9405095..ed2444dc8f 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -146,6 +146,7 @@ + 2009000 0 346538 diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_2.9.0.s390x.xml index 96521efb8a..23f0e33526 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -111,6 +111,7 @@ + 2009000 0 265159 diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_2.9.0.x86_64.xml index 0701c244f6..e0da4d41db 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -192,6 +192,7 @@ + 2009000 0 320947 --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 16:21:05 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 1526917099707355.1994701168579; Mon, 21 May 2018 08:38:19 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id 199272A2D36; Mon, 21 May 2018 15:38:14 +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 D3D65611C1; Mon, 21 May 2018 15:38: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 9593C1801254; Mon, 21 May 2018 15:38:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LFbcpP024129 for ; Mon, 21 May 2018 11:37:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id E340310EE6D6; Mon, 21 May 2018 15:37:37 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6AE4810EE6D5; Mon, 21 May 2018 15:37:37 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 21 May 2018 17:37:18 +0200 Message-Id: <55c7deba357dfa5922cc7659a1035226eaf74156.1526916651.git.jtomko@redhat.com> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: stefanha@redhat.com Subject: [libvirt] [PATCH 8/9] Introduce virNetDevVsockSetGuestCid 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-Type: text/plain; charset="utf-8" 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.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 21 May 2018 15:38:14 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 A wrapper function for setting the guest cid via ioctl. Signed-off-by: J=C3=A1n Tomko --- configure.ac | 8 ++++++++ src/libvirt_private.syms | 1 + src/util/virnetdev.c | 30 ++++++++++++++++++++++++++++++ src/util/virnetdev.h | 4 ++++ 4 files changed, 43 insertions(+) diff --git a/configure.ac b/configure.ac index cc005ea9e8..b869a17afe 100644 --- a/configure.ac +++ b/configure.ac @@ -641,6 +641,14 @@ if test "$with_linux" =3D "yes"; then [[#include ]]) fi =20 +dnl +dnl check for VHOST_VSOCK_SET_GUEST_CID +dnl +if test "$with_linux" =3D "yes"; then + AC_CHECK_DECLS([VHOST_VSOCK_SET_GUEST_CID], [], [], + [[#include ]]) +fi + dnl Allow perl/python overrides AC_PATH_PROGS([PYTHON], [python3 python2 python]) if test -z "$PYTHON"; then diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index b4c86b60cc..204ac3806a 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2287,6 +2287,7 @@ virNetDevSetRcvMulti; virNetDevSetupControl; virNetDevSysfsFile; virNetDevValidateConfig; +virNetDevVsockSetGuestCid; =20 =20 # util/virnetdevbandwidth.h diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index b250af9e2c..6ac2080821 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -50,6 +50,10 @@ # undef HAVE_STRUCT_IFREQ #endif =20 +#if HAVE_DECL_VHOST_VSOCK_SET_GUEST_CID +# include +#endif + #if defined(SIOCETHTOOL) && defined(HAVE_STRUCT_IFREQ) # include # include @@ -3605,3 +3609,29 @@ virNetDevRunEthernetScript(const char *ifname, const= char *script) virCommandFree(cmd); return ret; } + +#if HAVE_DECL_VHOST_VSOCK_SET_GUEST_CID +int +virNetDevVsockSetGuestCid(int fd, + unsigned int guest_cid) +{ + uint64_t val =3D guest_cid; + + if (ioctl(fd, VHOST_VSOCK_SET_GUEST_CID, &val) < 0) { + virReportSystemError(errno, "%s", + _("failed to set guest cid")); + return -1; + } + + return 0; +} +#else +int +virNetDevVsockSetGuestCid(int fd ATTRIBUTE_UNUSED, + unsigned int guest_cid ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("vsock is not supported")); + return -1; +} +#endif diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 71eaf45e30..836603b65d 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -313,4 +313,8 @@ int virNetDevSysfsFile(char **pf_sysfs_device_link, =20 int virNetDevRunEthernetScript(const char *ifname, const char *script) ATTRIBUTE_NOINLINE; + +int +virNetDevVsockSetGuestCid(int fd, + unsigned int guest_cid); #endif /* __VIR_NETDEV_H__ */ --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon May 6 16:21:05 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 152691709194151.63359411914246; Mon, 21 May 2018 08:38:11 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C0C68C0C1128; Mon, 21 May 2018 15:38:09 +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 8EA8128DCC; Mon, 21 May 2018 15:38: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 493D41801256; Mon, 21 May 2018 15:38:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4LFbcYZ024137 for ; Mon, 21 May 2018 11:37:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id A228E10EE6D6; Mon, 21 May 2018 15:37:38 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 296C010EE6D5; Mon, 21 May 2018 15:37:38 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 21 May 2018 17:37:19 +0200 Message-Id: <2fb01f09c7cb526ae35b2da033ebe1110896eb52.1526916651.git.jtomko@redhat.com> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: stefanha@redhat.com Subject: [libvirt] [PATCH 9/9] qemu: implement vhost-vsock-pci support 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-Type: text/plain; charset="utf-8" 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.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 21 May 2018 15:38:10 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Create a new vsock endpoint by opening /dev/vhost-vsock, set the requested CID via ioctl, pass the file descriptor to QEMU and build the command line. Signed-off-by: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 37 ++++++++++++++++++= ---- src/qemu/qemu_domain.c | 10 +++++- src/qemu/qemu_domain.h | 6 +++- src/qemu/qemu_interface.c | 31 ++++++++++++++++++ src/qemu/qemu_interface.h | 4 +++ src/qemu/qemu_process.c | 5 +++ .../vhost-vsock.x86_64-latest.args | 32 +++++++++++++++++++ tests/qemuxml2argvtest.c | 15 +++++++++ 8 files changed, 132 insertions(+), 8 deletions(-) create mode 100644 tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index a9c67bbb3b..2aa47f0980 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3375,6 +3375,9 @@ qemuBuildNicDevStr(virDomainDefPtr def, bool usingVirtio =3D false; char macaddr[VIR_MAC_STRING_BUFLEN]; =20 + if (net->type =3D=3D VIR_DOMAIN_NET_TYPE_VSOCK) + nic =3D "vhost-vsock-pci"; + if (STREQ_NULLABLE(net->model, "virtio")) { if (net->info.type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) nic =3D "virtio-net-ccw"; @@ -3514,13 +3517,23 @@ qemuBuildNicDevStr(virDomainDefPtr def, virBufferAsprintf(&buf, ",host_mtu=3D%u", net->mtu); } =20 - if (vlan =3D=3D -1) - virBufferAsprintf(&buf, ",netdev=3Dhost%s", net->info.alias); - else - virBufferAsprintf(&buf, ",vlan=3D%d", vlan); + if (net->type !=3D VIR_DOMAIN_NET_TYPE_VSOCK) { + if (vlan =3D=3D -1) + virBufferAsprintf(&buf, ",netdev=3Dhost%s", net->info.alias); + else + virBufferAsprintf(&buf, ",vlan=3D%d", vlan); + } virBufferAsprintf(&buf, ",id=3D%s", net->info.alias); - virBufferAsprintf(&buf, ",mac=3D%s", - virMacAddrFormat(&net->mac, macaddr)); + if (net->type !=3D VIR_DOMAIN_NET_TYPE_VSOCK) { + virBufferAsprintf(&buf, ",mac=3D%s", + virMacAddrFormat(&net->mac, macaddr)); + } + + if (net->type =3D=3D VIR_DOMAIN_NET_TYPE_VSOCK) { + virBufferAsprintf(&buf, ",guest-cid=3D%u", net->data.vsock.guest_c= id); + virBufferAsprintf(&buf, ",vhostfd=3D%u", + QEMU_DOMAIN_NET_PRIVATE(net)->vhostfds[0]); + } =20 if (qemuBuildDeviceAddressStr(&buf, def, &net->info, qemuCaps) < 0) goto error; @@ -8375,6 +8388,18 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr drive= r, goto cleanup; } =20 + if (actualType =3D=3D VIR_DOMAIN_NET_TYPE_VSOCK) { + if (!(nic =3D qemuBuildNicDevStr(def, net, -1, bootindex, 0, qemuC= aps))) + goto cleanup; + + virCommandPassFD(cmd, QEMU_DOMAIN_NET_PRIVATE(net)->vhostfds[0], + VIR_COMMAND_PASS_FD_CLOSE_PARENT); + QEMU_DOMAIN_NET_PRIVATE(net)->vhostfds[0] =3D -1; + virCommandAddArgList(cmd, "-device", nic, NULL); + ret =3D 0; + goto cleanup; + } + /* Possible combinations: * * 1. Old way: -net nic,model=3De1000,vlan=3D1 -net tap,vlan=3D1 diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index eb88de83db..33e3bb340f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1164,8 +1164,16 @@ qemuDomainNetPrivateNew(void) =20 =20 static void -qemuDomainNetPrivateDispose(void *obj ATTRIBUTE_UNUSED) +qemuDomainNetPrivateDispose(void *obj) { + qemuDomainNetPrivatePtr priv =3D obj; + size_t i; + + if (priv->vhostfds) { + for (i =3D 0; i < priv->nvhostfds; i++) + VIR_FORCE_CLOSE(priv->vhostfds[i]); + } + VIR_FREE(priv->vhostfds); } =20 =20 diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index a04ded16ed..f1034a57bf 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -353,6 +353,9 @@ struct _qemuDomainObjPrivate { # define QEMU_DOMAIN_DISK_PRIVATE(disk) \ ((qemuDomainDiskPrivatePtr) (disk)->privateData) =20 +# define QEMU_DOMAIN_NET_PRIVATE(net) \ + ((qemuDomainNetPrivatePtr) (net)->privateData) + typedef struct _qemuDomainDiskPrivate qemuDomainDiskPrivate; typedef qemuDomainDiskPrivate *qemuDomainDiskPrivatePtr; struct _qemuDomainDiskPrivate { @@ -446,7 +449,8 @@ typedef qemuDomainNetPrivate *qemuDomainNetPrivatePtr; struct _qemuDomainNetPrivate { virObject parent; =20 - virTristateBool maybe; + int *vhostfds; + size_t nvhostfds; }; =20 =20 diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index 60bb6b22ef..fb38ee0d67 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -698,3 +698,34 @@ qemuInterfaceOpenVhostNet(virDomainDefPtr def, =20 return -1; } + + +int +qemuInterfaceOpenVhostVsock(virDomainDefPtr def, + virDomainNetDefPtr net) +{ + qemuDomainNetPrivatePtr netPriv =3D QEMU_DOMAIN_NET_PRIVATE(net); + const char *vsock_path =3D "/dev/vhost-vsock"; + int fd; + + if (VIR_ALLOC_N(netPriv->vhostfds, 1) < 0) + return -1; + + if ((fd =3D open(vsock_path, O_RDWR)) < 0) { + virDomainAuditNetDevice(def, net, vsock_path, false); + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("unable to open vhost-vsock device")); + return -1; + } + if (virNetDevVsockSetGuestCid(fd, net->data.vsock.guest_cid) < 0) + goto error; + + virDomainAuditNetDevice(def, net, vsock_path, true); + netPriv->vhostfds[0] =3D fd; + netPriv->nvhostfds =3D 1; + return 0; + + error: + VIR_FORCE_CLOSE(fd); + return -1; +} diff --git a/src/qemu/qemu_interface.h b/src/qemu/qemu_interface.h index 45fdbc4b8e..b327a35f99 100644 --- a/src/qemu/qemu_interface.h +++ b/src/qemu/qemu_interface.h @@ -58,4 +58,8 @@ int qemuInterfaceOpenVhostNet(virDomainDefPtr def, virDomainNetDefPtr net, int *vhostfd, size_t *vhostfdSize); + +int +qemuInterfaceOpenVhostVsock(virDomainDefPtr def, + virDomainNetDefPtr net); #endif /* __QEMU_INTERFACE_H__ */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d73f3764f5..0cac864b60 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5348,6 +5348,11 @@ qemuProcessNetworkPrepareDevices(virDomainDefPtr def) if (virDomainHostdevInsert(def, hostdev) < 0) goto cleanup; } + + if (net->type =3D=3D VIR_DOMAIN_NET_TYPE_VSOCK) { + if (qemuInterfaceOpenVhostVsock(def, net) < 0) + goto cleanup; + } } ret =3D 0; cleanup: diff --git a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args b/tests/= qemuxml2argvdata/vhost-vsock.x86_64-latest.args new file mode 100644 index 0000000000..266144f6f0 --- /dev/null +++ b/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args @@ -0,0 +1,32 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/home/test \ +USER=3Dtest \ +LOGNAME=3Dtest \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3Dtest,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-test/master-key.aes \ +-machine pc-0.13,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \ +-m 1024 \ +-realtime mlock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid bba65c0e-c049-934f-b6aa-4e2c0582acdf \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-test/monitor.so= ck,\ +server,nowait \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot menu=3Don,strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-device virtio-serial-pci,id=3Dvirtio-serial0,bus=3Dpci.0,addr=3D0x6 \ +-device vhost-vsock-pci,id=3Dnet0,guest-cid=3D4,vhostfd=3D6789,bus=3Dpci.0= ,addr=3D0x3 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 78454acb1a..761a2628c8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -532,6 +532,19 @@ testCompareXMLToArgv(const void *data) } } =20 + for (i =3D 0; i < vm->def->nnets; i++) { + virDomainNetDefPtr net =3D vm->def->nets[i]; + + if (net->type =3D=3D VIR_DOMAIN_NET_TYPE_VSOCK) { + qemuDomainNetPrivatePtr netPriv =3D QEMU_DOMAIN_NET_PRIVATE(ne= t); + if (VIR_ALLOC_N(netPriv->vhostfds, 1) < 0) + goto cleanup; + + netPriv->vhostfds[0] =3D 6789; + netPriv->nvhostfds =3D 1; + } + } + if (!(cmd =3D qemuProcessCreatePretendCmd(&driver, vm, migrateURI, (flags & FLAG_FIPS), false, VIR_QEMU_PROCESS_START_COLD)))= { @@ -2848,6 +2861,8 @@ mymain(void) QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW, QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW); =20 + DO_TEST_CAPS_LATEST("vhost-vsock"); + if (getenv("LIBVIRT_SKIP_CLEANUP") =3D=3D NULL) virFileDeleteTree(fakerootdir); =20 --=20 2.16.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list