10:37 a.m.
@Stefan, please take a look at the docs/ changes in patch 6
Add <interface type='vsock'>, mapping to vhost-vsock-pci
Missing: hotplug support
Similar to vhost-net, we cannot apply a SELinux label on the
file descriptor, so an adjustment of the policy will probably
be needed to make it work in enforcing mode.
https://bugzilla.redhat.com/show_bug.cgi?id=1291851
Ján Tomko (9):
conf: split interface target element condition
qemu: prepare for missing interface model
Introduce virDomainNetDefNew
Add privateData to virDomainNetDef
qemu: add private data for interfaces
conf: add interface type vsock
Introduce QEMU_CAPS_DEVICE_VHOST_VSOCK
Introduce virNetDevVsockSetGuestCid
qemu: implement vhost-vsock-pci support
configure.ac | 8 ++
docs/formatdomain.html.in | 15 ++++
docs/schemas/domaincommon.rng | 14 ++++
src/bhyve/bhyve_parse_command.c | 2 +-
src/conf/domain_conf.c | 85 ++++++++++++++++++----
src/conf/domain_conf.h | 8 ++
src/conf/netdev_bandwidth_conf.h | 1 +
src/libvirt_private.syms | 2 +
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/openvz/openvz_conf.c | 4 +-
src/qemu/qemu_capabilities.c | 3 +
src/qemu/qemu_capabilities.h | 1 +
src/qemu/qemu_command.c | 43 +++++++++--
src/qemu/qemu_domain.c | 47 ++++++++++++
src/qemu/qemu_domain.h | 13 ++++
src/qemu/qemu_domain_address.c | 6 +-
src/qemu/qemu_hotplug.c | 3 +
src/qemu/qemu_interface.c | 33 +++++++++
src/qemu/qemu_interface.h | 4 +
src/qemu/qemu_parse_command.c | 2 +-
src/qemu/qemu_process.c | 6 ++
src/uml/uml_conf.c | 5 ++
src/util/virnetdev.c | 30 ++++++++
src/util/virnetdev.h | 4 +
src/vbox/vbox_common.c | 2 +-
src/vmx/vmx.c | 3 +-
src/xenconfig/xen_common.c | 3 +-
src/xenconfig/xen_sxpr.c | 3 +-
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 +
.../vhost-vsock.x86_64-latest.args | 32 ++++++++
tests/qemuxml2argvdata/vhost-vsock.xml | 36 +++++++++
tests/qemuxml2argvtest.c | 15 ++++
tests/qemuxml2xmloutdata/vhost-vsock.xml | 1 +
tests/qemuxml2xmltest.c | 2 +
tools/virsh-domain.c | 1 +
51 files changed, 425 insertions(+), 32 deletions(-)
create mode 100644 tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args
create mode 100644 tests/qemuxml2argvdata/vhost-vsock.xml
create mode 120000 tests/qemuxml2xmloutdata/vhost-vsock.xml
--
2.16.1
10:37 a.m.
New subject: [libvirt] [PATCH 1/9] conf: split interface target element condition
Check for the 'dev' attribute in a separate condition, to make
parsing future attributes easier.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
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 xmlopt,
}
ctxt->node = tmpnode;
}
- } else if (!ifname &&
- virXMLNodeNameEqual(cur, "target")) {
- ifname = 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 = 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")) {
--
2.16.1
10:37 a.m.
New subject: [libvirt] [PATCH 2/9] qemu: prepare for missing interface model
Use STREQ_NULLABLE instead of STREQ to allow future addition
of interface types that do not have models.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
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 = false;
char macaddr[VIR_MAC_STRING_BUFLEN];
- if (STREQ(net->model, "virtio")) {
+ if (STREQ_NULLABLE(net->model, "virtio")) {
if (net->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW)
nic = "virtio-net-ccw";
else if (net->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_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(virDomainDeviceDefPtr dev,
* addresses for other hostdev devices.
*/
if (net->type == VIR_DOMAIN_NET_TYPE_HOSTDEV ||
- STREQ(net->model, "usb-net")) {
+ STREQ_NULLABLE(net->model, "usb-net")) {
return 0;
}
- if (STREQ(net->model, "virtio"))
+ if (STREQ_NULLABLE(net->model, "virtio"))
return virtioFlags;
- if (STREQ(net->model, "e1000e"))
+ if (STREQ_NULLABLE(net->model, "e1000e"))
return pcieFlags;
return pciFlags;
--
2.16.1
10:37 a.m.
New subject: [libvirt] [PATCH 3/9] Introduce virDomainNetDefNew
A helper to allow initialization of virDomainNetDef.
Use it for all new network definitions and pass xmlopt
where applicable.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
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_command.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 = NULL;
const char *mac = NULL;
- if (VIR_ALLOC(net) < 0)
+ if (!(net = virDomainNetDefNew(xmlopt))
goto cleanup;
/* As we only support interface type='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 def)
VIR_FREE(def);
}
+
+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 xmlopt,
virDomainChrSourceReconnectDef reconnect = {0};
int rv, val;
- if (VIR_ALLOC(def) < 0)
+ if (!(def = virDomainNetDefNew(xmlopt)))
return NULL;
ctxt->node = 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 virDomainControllerDef
*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 = strtok_r(temp, " ", &saveptr);
while (token != NULL) {
- if (VIR_ALLOC(net) < 0)
+ if (!(net = virDomainNetDefNew(NULL)))
goto error;
net->type = VIR_DOMAIN_NET_TYPE_ETHERNET;
@@ -248,7 +248,7 @@ openvzReadNetworkConf(virDomainDefPtr def,
token = strtok_r(temp, ";", &saveptr);
while (token != NULL) {
/*add new device to list*/
- if (VIR_ALLOC(net) < 0)
+ if (!(net = virDomainNetDefNew(NULL)))
goto error;
net->type = 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 = 0;
}
- if (VIR_ALLOC(def) < 0)
+ if (!(def = virDomainNetDefNew(xmlopt)))
goto cleanup;
/* 'tap' could turn into libvirt type=ethernet, type=bridge 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 = NULL;
virDomainNetDefPtr net = NULL;
- if (VIR_ALLOC(net) < 0)
+ if (!(net = virDomainNetDefNew(NULL)))
return NULL;
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;
- if (VIR_ALLOC(*def) < 0)
+ if (!(*def = virDomainNetDefNew(NULL)))
return -1;
/* 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 = nextkey;
}
- if (VIR_ALLOC(net) < 0)
+ if (!(net = virDomainNetDefNew(NULL)))
goto cleanup;
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 = sexpr_node(node, "device/vif/model");
type = sexpr_node(node, "device/vif/type");
- if (VIR_ALLOC(net) < 0)
+ if (!(net = virDomainNetDefNew(NULL)))
goto cleanup;
if (tmp != NULL ||
--
2.16.1
10:37 a.m.
New subject: [libvirt] [PATCH 4/9] Add privateData to virDomainNetDef
An object for storing driver-specific data related to the network
definition.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
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 ATTRIBUTE_UNUSED)
if (VIR_ALLOC(net) < 0)
return NULL;
+ if (xmlopt &&
+ xmlopt->privateData.netNew &&
+ !(net->privateData = xmlopt->privateData.netNew()))
+ goto error;
+
return net;
+
+ error:
+ virDomainNetDefFree(net);
+ return NULL;
}
@@ -2113,6 +2122,8 @@ virDomainNetDefClear(virDomainNetDefPtr def)
virNetDevBandwidthFree(def->bandwidth);
def->bandwidth = NULL;
virNetDevVlanClear(&def->vlan);
+ virObjectUnref(def->privateData);
+ def->privateData = NULL;
}
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 {
/* 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 libvirt */
@@ -2672,6 +2674,7 @@ struct _virDomainXMLPrivateDataCallbacks {
virDomainXMLPrivateDataNewFunc diskNew;
virDomainXMLPrivateDataNewFunc vcpuNew;
virDomainXMLPrivateDataNewFunc chrSourceNew;
+ virDomainXMLPrivateDataNewFunc netNew;
virDomainXMLPrivateDataFormatFunc format;
virDomainXMLPrivateDataParseFunc parse;
virDomainXMLPrivateDataStorageSourceParseFunc storageParse;
--
2.16.1
10:37 a.m.
New subject: [libvirt] [PATCH 5/9] qemu: add private data for interfaces
Introduce a structure and a class that will be used to store
the private data.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
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)
}
+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 = 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 virQEMUDriverPrivateDataCallbacks =
{
.diskNew = qemuDomainDiskPrivateNew,
.vcpuNew = qemuDomainVcpuPrivateNew,
.chrSourceNew = qemuDomainChrSourcePrivateNew,
+ .netNew = qemuDomainNetPrivateNew,
.parse = qemuDomainObjPrivateXMLParse,
.format = qemuDomainObjPrivateXMLFormat,
.storageParse = 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 {
};
+typedef struct _qemuDomainNetPrivate qemuDomainNetPrivate;
+typedef qemuDomainNetPrivate *qemuDomainNetPrivatePtr;
+struct _qemuDomainNetPrivate {
+ virObject parent;
+
+ virTristateBool maybe;
+};
+
+
typedef enum {
QEMU_PROCESS_EVENT_WATCHDOG = 0,
QEMU_PROCESS_EVENT_GUESTPANIC,
--
2.16.1
10:37 a.m.
New subject: [libvirt] [PATCH 6/9] conf: add interface type vsock
Add a new 'vsock' interface type with a <target cid> subelement.
<interface type='vsock'>
<target cid='4'/>
<address type='pci' .../>
</interface>
No model is required.
https://bugzilla.redhat.com/show_bug.cgi?id=1291851
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
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>
+...</pre>
+
+ <h5><a id="elementsNICSVsock">Vsock</a></h5>
+
+ <p>A vsock host/guest interface. Attribute <code>cid</code> of the
traget element
+ specifies the CID assigned to the guest.
+ <span class="since">Since 4.4.0</span></p>
+
+<pre>
+...
+<devices>
+ <interface type='vsock'>
+ <target cid='3'/>
+ </interface>
+</devices>
...</pre>
<h5><a id="elementsNICSModel">Setting the NIC
model</a></h5>
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 @@
<ref name="interface-options"/>
</interleave>
</group>
+ <group>
+ <attribute name="type">
+ <value>vsock</value>
+ </attribute>
+ <interleave>
+ <element name="target">
+ <attribute name="cid">
+ <ref name="unsignedInt"/>
+ </attribute>
+ <empty/>
+ </element>
+ <ref name="address"/>
+ </interleave>
+ </group>
</choice>
<optional>
<attribute name="trustGuestRxFilters">
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")
VIR_ENUM_IMPL(virDomainNetBackend, VIR_DOMAIN_NET_BACKEND_TYPE_LAST,
"default",
@@ -2094,6 +2095,10 @@ virDomainNetDefClear(virDomainNetDefPtr def)
virDomainHostdevDefClear(&def->data.hostdev.def);
break;
+ case VIR_DOMAIN_NET_TYPE_VSOCK:
+ def->data.vsock.guest_cid = 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 xmlopt,
char *vhostuser_type = NULL;
char *trustGuestRxFilters = NULL;
char *vhost_path = NULL;
+ char *cid = NULL;
virHashTablePtr filterparams = NULL;
virDomainActualNetDefPtr actual = NULL;
xmlNodePtr oldnode = ctxt->node;
@@ -11104,6 +11110,8 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
VIR_FREE(ifname);
}
}
+ if (!cid && def->type == VIR_DOMAIN_NET_TYPE_VSOCK)
+ cid = virXMLPropString(cur, "cid");
} else if ((!ifname_guest || !ifname_guest_actual) &&
virXMLNodeNameEqual(cur, "guest")) {
ifname_guest = virXMLPropString(cur, "dev");
@@ -11190,7 +11198,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
(const char *)macaddr);
goto error;
}
- } else {
+ } else if (def->type != VIR_DOMAIN_NET_TYPE_VSOCK) {
virDomainNetGenerateMAC(xmlopt, &def->mac);
def->mac_generated = true;
}
@@ -11425,6 +11433,21 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
}
break;
+ case VIR_DOMAIN_NET_TYPE_VSOCK:
+ if (cid == NULL) {
+ virReportError(VIR_ERR_XML_ERROR, "%s",
+ _("No <target> 'cid' attribute "
+ "specified with <interface
type='vsock'/>"));
+ 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 xmlopt,
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 xmlopt,
VIR_FREE(vhost_path);
VIR_FREE(localaddr);
VIR_FREE(localport);
+ VIR_FREE(cid);
virHashFree(filterparams);
return def;
@@ -24290,8 +24315,10 @@ virDomainNetDefFormat(virBufferPtr buf,
virBufferAddLit(buf, ">\n");
virBufferAdjustIndent(buf, 2);
- virBufferAsprintf(buf, "<mac address='%s'/>\n",
- virMacAddrFormat(&def->mac, macstr));
+ if (def->type != VIR_DOMAIN_NET_TYPE_VSOCK) {
+ virBufferAsprintf(buf, "<mac address='%s'/>\n",
+ virMacAddrFormat(&def->mac, macstr));
+ }
if (publicActual) {
/* when there is a virDomainActualNetDef, and we haven't been
@@ -24403,6 +24430,7 @@ virDomainNetDefFormat(virBufferPtr buf,
break;
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, "<target dev='%s'/>\n",
def->ifname);
}
+ if (def->type == VIR_DOMAIN_NET_TYPE_VSOCK)
+ virBufferAsprintf(buf, "<target cid='%u'/>\n",
def->data.vsock.guest_cid);
if (def->ifname_guest || def->ifname_guest_actual) {
virBufferAddLit(buf, "<guest");
@@ -28326,6 +28356,7 @@ virDomainNetGetActualVirtPortProfile(virDomainNetDefPtr iface)
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:
default:
return NULL;
@@ -29165,6 +29196,7 @@ virDomainNetTypeSharesHostView(const virDomainNetDef *net)
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:
break;
}
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index ea72d4810d..402e5f7753 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -907,6 +907,7 @@ typedef enum {
VIR_DOMAIN_NET_TYPE_DIRECT,
VIR_DOMAIN_NET_TYPE_HOSTDEV,
VIR_DOMAIN_NET_TYPE_UDP,
+ VIR_DOMAIN_NET_TYPE_VSOCK,
VIR_DOMAIN_NET_TYPE_LAST
} virDomainNetType;
@@ -1040,6 +1041,9 @@ struct _virDomainNetDef {
struct {
virDomainHostdevDef def;
} hostdev;
+ struct {
+ unsigned int guest_cid;
+ } vsock;
} data;
/* virtPortProfile is used by network/bridge/direct/hostdev */
virNetDevVPortProfilePtr virtPortProfile;
diff --git a/src/conf/netdev_bandwidth_conf.h b/src/conf/netdev_bandwidth_conf.h
index 30f988953c..c1da74f1da 100644
--- a/src/conf/netdev_bandwidth_conf.h
+++ b/src/conf/netdev_bandwidth_conf.h
@@ -55,6 +55,7 @@ static inline bool virNetDevSupportBandwidth(virDomainNetType type)
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:
break;
}
diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 452a77f3b8..4e172ff80d 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -1280,6 +1280,7 @@ libxlMakeNic(virDomainDefPtr def,
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:
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unsupported interface type %s"),
diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index d5636b808c..3fe362c8c3 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -395,6 +395,7 @@ static int virLXCControllerGetNICIndexes(virLXCControllerPtr ctrl)
case VIR_DOMAIN_NET_TYPE_INTERNAL:
case VIR_DOMAIN_NET_TYPE_DIRECT:
case VIR_DOMAIN_NET_TYPE_HOSTDEV:
+ case VIR_DOMAIN_NET_TYPE_VSOCK:
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Unsupported net type %s"),
virDomainNetTypeToString(ctrl->def->nets[i]->type));
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 conn,
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,
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 dev,
if (dev->type == VIR_DOMAIN_DEVICE_NET &&
dev->data.net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV &&
+ dev->data.net->type != 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 implemented
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;
+ 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;
+ 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 controller,
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/qemuxml2argvdata/vhost-vsock.xml
new file mode 100644
index 0000000000..a9253227c0
--- /dev/null
+++ b/tests/qemuxml2argvdata/vhost-vsock.xml
@@ -0,0 +1,36 @@
+<domain type='qemu'>
+ <name>test</name>
+ <uuid>bba65c0e-c049-934f-b6aa-4e2c0582acdf</uuid>
+ <memory unit='KiB'>1048576</memory>
+ <currentMemory unit='KiB'>1048576</currentMemory>
+ <vcpu placement='static'>1</vcpu>
+ <os>
+ <type arch='x86_64' machine='pc-0.13'>hvm</type>
+ <boot dev='hd'/>
+ <bootmenu enable='yes'/>
+ </os>
+ <clock offset='utc'/>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>restart</on_crash>
+ <devices>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
+ <controller type='usb' index='0'>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x2'/>
+ </controller>
+ <controller type='virtio-serial' index='0'>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x06' function='0x0'/>
+ </controller>
+ <controller type='ide' index='0'>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x01' function='0x1'/>
+ </controller>
+ <controller type='pci' index='0' model='pci-root'/>
+ <interface type='vsock'>
+ <target cid='4'/>
+ <address type='pci' domain='0x0000' bus='0x00'
slot='0x03' function='0x0'/>
+ </interface>
+ <input type='mouse' bus='ps2'/>
+ <input type='keyboard' bus='ps2'/>
+ <memballoon model='none'/>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/vhost-vsock.xml
b/tests/qemuxml2xmloutdata/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");
+ DO_TEST("vhost-vsock", NONE);
+
if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL)
virFileDeleteTree(fakerootdir);
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);
--
2.16.1
10:37 a.m.
New subject: [libvirt] [PATCH 7/9] Introduce QEMU_CAPS_DEVICE_VHOST_VSOCK
Add a new capability flag for vhost-vsock-device and vhost-vsock-pci.
https://bugzilla.redhat.com/show_bug.cgi?id=1291851
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
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",
);
@@ -1117,6 +1118,8 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
{ "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 },
};
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = {
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 & head */
+ QEMU_CAPS_DEVICE_VHOST_VSOCK, /* -device vhost-vsock-* */
QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags;
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
b/tests/qemucapabilitiesdata/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 @@
<flag name='disk-write-cache'/>
<flag name='nbd-tls'/>
<flag name='sdl-gl'/>
+ <flag name='vhost-vsock'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>303541</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
b/tests/qemucapabilitiesdata/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 @@
<flag name='disk-write-cache'/>
<flag name='nbd-tls'/>
<flag name='sdl-gl'/>
+ <flag name='vhost-vsock'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>382824</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
b/tests/qemucapabilitiesdata/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 @@
<flag name='nbd-tls'/>
<flag name='virtual-css-bridge'/>
<flag name='sdl-gl'/>
+ <flag name='vhost-vsock'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>303434</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
b/tests/qemucapabilitiesdata/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 @@
<flag name='disk-write-cache'/>
<flag name='nbd-tls'/>
<flag name='sdl-gl'/>
+ <flag name='vhost-vsock'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>344938</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
b/tests/qemucapabilitiesdata/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 @@
<flag name='pr-manager-helper'/>
<flag name='virtual-css-bridge'/>
<flag name='sdl-gl'/>
+ <flag name='vhost-vsock'/>
<version>2011000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>342166</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
b/tests/qemucapabilitiesdata/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 @@
<flag name='memory-backend-file.discard-data'/>
<flag name='sdl-gl'/>
<flag name='screendump_device'/>
+ <flag name='vhost-vsock'/>
<version>2011090</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>343099</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
b/tests/qemucapabilitiesdata/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 @@
<flag name='memory-backend-file.discard-data'/>
<flag name='sdl-gl'/>
<flag name='screendump_device'/>
+ <flag name='vhost-vsock'/>
<version>2011090</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>419968</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
b/tests/qemucapabilitiesdata/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 @@
<flag name='vfio-ccw'/>
<flag name='sdl-gl'/>
<flag name='screendump_device'/>
+ <flag name='vhost-vsock'/>
<version>2012000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>371055</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
b/tests/qemucapabilitiesdata/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 @@
<flag name='memory-backend-file.discard-data'/>
<flag name='sdl-gl'/>
<flag name='screendump_device'/>
+ <flag name='vhost-vsock'/>
<version>2011090</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>390813</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
b/tests/qemucapabilitiesdata/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 @@
<flag name='nbd-tls'/>
<flag name='virtual-css-bridge'/>
<flag name='sdl-gl'/>
+ <flag name='vhost-vsock'/>
<version>2007093</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>241741</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
b/tests/qemucapabilitiesdata/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 @@
<flag name='disk-write-cache'/>
<flag name='nbd-tls'/>
<flag name='sdl-gl'/>
+ <flag name='vhost-vsock'/>
<version>2008000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>255684</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
b/tests/qemucapabilitiesdata/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 @@
<flag name='disk-write-cache'/>
<flag name='nbd-tls'/>
<flag name='sdl-gl'/>
+ <flag name='vhost-vsock'/>
<version>2009000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>346538</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
b/tests/qemucapabilitiesdata/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 @@
<flag name='nbd-tls'/>
<flag name='virtual-css-bridge'/>
<flag name='sdl-gl'/>
+ <flag name='vhost-vsock'/>
<version>2009000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>265159</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
b/tests/qemucapabilitiesdata/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 @@
<flag name='disk-write-cache'/>
<flag name='nbd-tls'/>
<flag name='sdl-gl'/>
+ <flag name='vhost-vsock'/>
<version>2009000</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>320947</microcodeVersion>
--
2.16.1
10:37 a.m.
New subject: [libvirt] [PATCH 8/9] Introduce virNetDevVsockSetGuestCid
A wrapper function for setting the guest cid via ioctl.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
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" = "yes"; then
[[#include <linux/devlink.h>]])
fi
+dnl
+dnl check for VHOST_VSOCK_SET_GUEST_CID
+dnl
+if test "$with_linux" = "yes"; then
+ AC_CHECK_DECLS([VHOST_VSOCK_SET_GUEST_CID], [], [],
+ [[#include <linux/vhost.h>]])
+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;
# 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
+#if HAVE_DECL_VHOST_VSOCK_SET_GUEST_CID
+# include <linux/vhost.h>
+#endif
+
#if defined(SIOCETHTOOL) && defined(HAVE_STRUCT_IFREQ)
# include <linux/types.h>
# include <linux/ethtool.h>
@@ -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 = 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,
int virNetDevRunEthernetScript(const char *ifname, const char *script)
ATTRIBUTE_NOINLINE;
+
+int
+virNetDevVsockSetGuestCid(int fd,
+ unsigned int guest_cid);
#endif /* __VIR_NETDEV_H__ */
--
2.16.1
10:37 a.m.
New subject: [libvirt] [PATCH 9/9] qemu: implement vhost-vsock-pci support
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án Tomko <jtomko(a)redhat.com>
---
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 = false;
char macaddr[VIR_MAC_STRING_BUFLEN];
+ if (net->type == VIR_DOMAIN_NET_TYPE_VSOCK)
+ nic = "vhost-vsock-pci";
+
if (STREQ_NULLABLE(net->model, "virtio")) {
if (net->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW)
nic = "virtio-net-ccw";
@@ -3514,13 +3517,23 @@ qemuBuildNicDevStr(virDomainDefPtr def,
virBufferAsprintf(&buf, ",host_mtu=%u", net->mtu);
}
- if (vlan == -1)
- virBufferAsprintf(&buf, ",netdev=host%s", net->info.alias);
- else
- virBufferAsprintf(&buf, ",vlan=%d", vlan);
+ if (net->type != VIR_DOMAIN_NET_TYPE_VSOCK) {
+ if (vlan == -1)
+ virBufferAsprintf(&buf, ",netdev=host%s", net->info.alias);
+ else
+ virBufferAsprintf(&buf, ",vlan=%d", vlan);
+ }
virBufferAsprintf(&buf, ",id=%s", net->info.alias);
- virBufferAsprintf(&buf, ",mac=%s",
- virMacAddrFormat(&net->mac, macaddr));
+ if (net->type != VIR_DOMAIN_NET_TYPE_VSOCK) {
+ virBufferAsprintf(&buf, ",mac=%s",
+ virMacAddrFormat(&net->mac, macaddr));
+ }
+
+ if (net->type == VIR_DOMAIN_NET_TYPE_VSOCK) {
+ virBufferAsprintf(&buf, ",guest-cid=%u",
net->data.vsock.guest_cid);
+ virBufferAsprintf(&buf, ",vhostfd=%u",
+ QEMU_DOMAIN_NET_PRIVATE(net)->vhostfds[0]);
+ }
if (qemuBuildDeviceAddressStr(&buf, def, &net->info, qemuCaps) < 0)
goto error;
@@ -8375,6 +8388,18 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
goto cleanup;
}
+ if (actualType == VIR_DOMAIN_NET_TYPE_VSOCK) {
+ if (!(nic = qemuBuildNicDevStr(def, net, -1, bootindex, 0, qemuCaps)))
+ goto cleanup;
+
+ virCommandPassFD(cmd, QEMU_DOMAIN_NET_PRIVATE(net)->vhostfds[0],
+ VIR_COMMAND_PASS_FD_CLOSE_PARENT);
+ QEMU_DOMAIN_NET_PRIVATE(net)->vhostfds[0] = -1;
+ virCommandAddArgList(cmd, "-device", nic, NULL);
+ ret = 0;
+ goto cleanup;
+ }
+
/* Possible combinations:
*
* 1. Old way: -net nic,model=e1000,vlan=1 -net tap,vlan=1
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)
static void
-qemuDomainNetPrivateDispose(void *obj ATTRIBUTE_UNUSED)
+qemuDomainNetPrivateDispose(void *obj)
{
+ qemuDomainNetPrivatePtr priv = obj;
+ size_t i;
+
+ if (priv->vhostfds) {
+ for (i = 0; i < priv->nvhostfds; i++)
+ VIR_FORCE_CLOSE(priv->vhostfds[i]);
+ }
+ VIR_FREE(priv->vhostfds);
}
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)
+# 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;
- virTristateBool maybe;
+ int *vhostfds;
+ size_t nvhostfds;
};
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,
return -1;
}
+
+
+int
+qemuInterfaceOpenVhostVsock(virDomainDefPtr def,
+ virDomainNetDefPtr net)
+{
+ qemuDomainNetPrivatePtr netPriv = QEMU_DOMAIN_NET_PRIVATE(net);
+ const char *vsock_path = "/dev/vhost-vsock";
+ int fd;
+
+ if (VIR_ALLOC_N(netPriv->vhostfds, 1) < 0)
+ return -1;
+
+ if ((fd = 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] = fd;
+ netPriv->nvhostfds = 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 == VIR_DOMAIN_NET_TYPE_VSOCK) {
+ if (qemuInterfaceOpenVhostVsock(def, net) < 0)
+ goto cleanup;
+ }
}
ret = 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=C \
+PATH=/bin \
+HOME=/home/test \
+USER=test \
+LOGNAME=test \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-x86_64 \
+-name guest=test,debug-threads=on \
+-S \
+-object secret,id=masterKey0,format=raw,\
+file=/tmp/lib/domain--1-test/master-key.aes \
+-machine pc-0.13,accel=tcg,usb=off,dump-guest-core=off \
+-m 1024 \
+-realtime mlock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid bba65c0e-c049-934f-b6aa-4e2c0582acdf \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test/monitor.sock,\
+server,nowait \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot menu=on,strict=on \
+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
+-device vhost-vsock-pci,id=net0,guest-cid=4,vhostfd=6789,bus=pci.0,addr=0x3 \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
+resourcecontrol=deny \
+-msg timestamp=on
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)
}
}
+ for (i = 0; i < vm->def->nnets; i++) {
+ virDomainNetDefPtr net = vm->def->nets[i];
+
+ if (net->type == VIR_DOMAIN_NET_TYPE_VSOCK) {
+ qemuDomainNetPrivatePtr netPriv = QEMU_DOMAIN_NET_PRIVATE(net);
+ if (VIR_ALLOC_N(netPriv->vhostfds, 1) < 0)
+ goto cleanup;
+
+ netPriv->vhostfds[0] = 6789;
+ netPriv->nvhostfds = 1;
+ }
+ }
+
if (!(cmd = 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);
+ DO_TEST_CAPS_LATEST("vhost-vsock");
+
if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL)
virFileDeleteTree(fakerootdir);
--
2.16.1
10:46 a.m.
On Mon, May 21, 2018 at 05:37:10PM +0200, Ján Tomko wrote:
@Stefan, please take a look at the docs/ changes in patch 6
Add <interface type='vsock'>, mapping to vhost-vsock-pci
I think it is pretty misleading to use <interface> for this, because
the whole point of vsock existing is that it is *not* a NIC !
I think we need to use a new type of element for this, because none
of the existing ones are relevant.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
4:40 a.m.
On Mon, May 21, 2018 at 04:46:13PM +0100, Daniel P. Berrangé wrote:
On Mon, May 21, 2018 at 05:37:10PM +0200, Ján Tomko wrote:
> @Stefan, please take a look at the docs/ changes in patch 6
>
> Add <interface type='vsock'>, mapping to vhost-vsock-pci
I think it is pretty misleading to use <interface> for this, because
the whole point of vsock existing is that it is *not* a NIC !
I think we need to use a new type of element for this, because none
of the existing ones are relevant.
Right, how does <vsock> sound?
Also, I probably mixed up the target and source here - the guest_cid
should be in <source>, since that's where the host will see it.
The <target cid> is 2 by definition.
Jano
5:36 a.m.
On Tue, May 22, 2018 at 11:40:25AM +0200, Ján Tomko wrote:
On Mon, May 21, 2018 at 04:46:13PM +0100, Daniel P. Berrangé wrote:
> On Mon, May 21, 2018 at 05:37:10PM +0200, Ján Tomko wrote:
> > @Stefan, please take a look at the docs/ changes in patch 6
> >
> > Add <interface type='vsock'>, mapping to vhost-vsock-pci
>
> I think it is pretty misleading to use <interface> for this, because
> the whole point of vsock existing is that it is *not* a NIC !
>
> I think we need to use a new type of element for this, because none
> of the existing ones are relevant.
>
Right, how does <vsock> sound?
Sure, fine.
Also, I probably mixed up the target and source here - the guest_cid
should be in <source>, since that's where the host will see it.
The <target cid> is 2 by definition.
We are a bit inconsistent but '<source>' typically refers to some
resource in the host, which would mean <target> refers to the guest.
The fun bit is with <interface> both <source> and <target> refer
to things in the host :-)
We could just set the cid as an attribute on <vsock> though, or just
call it <cid>55</cid>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
2366
days inactive
2377
days old
12 comments
2 participants
participants (2)
-
Daniel P. Berrangé -
Ján Tomko