- Devel - libvirt List Archives

[libvirt] Support for qemu snapshot=on drives in libvirt
by Richard W.M. Jones 08 Oct '12

08 Oct '12

I notice that the qemu driver doesn't support snapshot drives (-drive file=foo,snapshot=on). This is important for libguestfs. Currently libguestfs hacks this using <qemu:arg>. That works fine for static disks in the libvirt XML, but lack of direct support in libvirt is a blocker for adding hotplugging to libguestfs. In qemu, the snapshot=on feature does several things: (a) It creates a temporary qcow2 disk in $TMPDIR. (b) It sets the backing file of the temporary disk to the real disk. (c) When running, writes to the disk go to the temporary overlay, and not to the real disk. (d) I believe it also lets you commit changes from the temporary disk to the backing file using a monitor command ("commit"? "save"?). However we don't need or use this feature. (e) When qemu exits, the temporary qcow2 disk is deleted. So note that when you use snapshot=on there is an implicit dependency on the $TMPDIR environment variable. I don't know of a way to create the snapshot in another directory (at least, not using snapshot=on .. possibly one can do it by creating an explicit overlay disk in libvirt). A simple implementation therefore would be to add a <snapshot/> element to <disk>. It would just add snapshot=on and ignore concerns about $TMPDIR. Or reuse the <readonly/> flag? Note that these disks are writable. A more complex implementation would create an explicit overlay disk in libvirt and clean it up afterwards. This would let us control where the temporary disk is created. XML might look like this: <snapshot [tmp=...] /> I'm also concerned about the time is takes to run the external 'qemu-img create' command, which is non-trivial in some versions of qemu. In libguestfs, every millisecond counts. $ time qemu-img create -f qcow2 test.qcow2 10M Formatting 'test.qcow2', fmt=qcow2 size=10485760 encryption=off cluster_size=65536 real 0m0.610s user 0m0.022s sys 0m0.009s Or, can this be done using existing libvirt features? Any thoughts on this before I implement something ... Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora

4 9

[libvirt] [PATCH] python: keep consistent handling of Python integer conversion
by Guannan Ren 08 Oct '12

08 Oct '12

libvirt_ulonglongUnwrap requires the integer type of python obj. But libvirt_longlongUnwrap still could handle python obj of Pyfloat_type which causes the float value to be rounded up to an integer. For example >>> dom.setSchedulerParameters({'vcpu_quota': 0.88}) 0 libvirt_longlongUnwrap treats 0.88 as a valid value 0 However >>> dom.setSchedulerParameters({'cpu_shares': 1000.22}) libvirt_ulonglongUnwrap will throw out an error "TypeError: an integer is required" The patch make this consistent. --- python/typewrappers.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/python/typewrappers.c b/python/typewrappers.c index 7580689..d633603 100644 --- a/python/typewrappers.c +++ b/python/typewrappers.c @@ -220,7 +220,7 @@ libvirt_ulongUnwrap(PyObject *obj, unsigned long *val) int libvirt_longlongUnwrap(PyObject *obj, long long *val) { - long long llong_val; + long long llong_val = -1; if (!obj) { PyErr_SetString(PyExc_TypeError, "unexpected type"); @@ -230,7 +230,11 @@ libvirt_longlongUnwrap(PyObject *obj, long long *val) /* If obj is of PyInt_Type, PyLong_AsLongLong * will call PyInt_AsLong() to handle it automatically. */ - llong_val = PyLong_AsLongLong(obj); + if (PyInt_Check(obj) || PyLong_Check(obj)) + llong_val = PyLong_AsLongLong(obj); + else + PyErr_SetString(PyExc_TypeError, "an integer is required"); + if ((llong_val == -1) && PyErr_Occurred()) return -1; -- 1.7.11.2

2 2

[libvirt] [RFC] Private data pointer for virStoragePool and virStorageVol structs
by Matthias Bolte 08 Oct '12

08 Oct '12

Ata Bohra proposed a backend concept for the ESX storage driver to simplify the addition of iSCSI support to the ESX storage driver. The problem here is that most of the storage driver functions need to determine the backend to be used from the pool name. This overhead can be avoided by adding a private data pointer to the virStoragePool and virStorageVol structs that the ESX storage driver can use to store a pointer to the correct backend. struct _virStoragePool { virObject object; virConnectPtr conn; char *name; unsigned char uuid[VIR_UUID_BUFLEN]; void *privateData; virFreeCallback privateDataFreeFunc; }; struct _virStorageVol { virObject object; virConnectPtr conn; char *pool; char *name; char *key; void *privateData; virFreeCallback privateDataFreeFunc; }; virGetStoragePool and virGetStorageVol would set privateData and privateDataFreeFunc as given by the caller. virStoragePoolDispose and virStorageVolDispose would call privateDataFreeFunc if set. Comments? -- Matthias Bolte http://photron.blogspot.com

2 1

[libvirt] ANNOUNCE: libvirt 0.9.6.3 maintenance release
by Cole Robinson 08 Oct '12

08 Oct '12

libvirt 0.9.6.3 maintenance release is now available. This is libvirt 0.9.6 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-0.9.6.3.tar.gz Changes in this version: * security: Fix libvirtd crash possibility For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] [PATCH v3] esx: Support VLAN tags in virtual network port groups
by Matthias Bolte 07 Oct '12

07 Oct '12

--- v2: Use network level VLAN config if there is no portgroup specific VLAN config given. v3: Add ESX_VLAN_TRUNK define for magic number 4095 src/esx/esx_network_driver.c | 70 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 65 insertions(+), 5 deletions(-) diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 09d46d3..21eabbe 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -45,6 +45,9 @@ */ verify(MD5_DIGEST_SIZE == VIR_UUID_BUFLEN); +/* ESX utilizes the VLAN ID of 4095 to mean that this port is in trunk mode */ +#define ESX_VLAN_TRUNK 4095 + static virDrvOpenStatus @@ -489,7 +492,42 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) goto cleanup; } - hostPortGroupSpec->vlanId->value = 0; + if (def->portGroups[i].vlan.trunk) { + /* FIXME: Change this once tag-less trunk-mode is supported */ + if (def->portGroups[i].vlan.nTags != 1 || + *def->portGroups[i].vlan.tag != ESX_VLAN_TRUNK) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("VLAN tag has to be %d in trunk mode"), + ESX_VLAN_TRUNK); + goto cleanup; + } + + hostPortGroupSpec->vlanId->value = ESX_VLAN_TRUNK; + } else if (def->portGroups[i].vlan.nTags == 1) { + hostPortGroupSpec->vlanId->value = *def->portGroups[i].vlan.tag; + } else if (def->portGroups[i].vlan.nTags > 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Can apply one VLAN tag per port group only")); + goto cleanup; + } else if (def->vlan.trunk) { + /* FIXME: Change this once tag-less trunk-mode is supported */ + if (def->vlan.nTags != 1 || *def->vlan.tag != ESX_VLAN_TRUNK) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("VLAN tag has to be %d in trunk mode"), + ESX_VLAN_TRUNK); + goto cleanup; + } + + hostPortGroupSpec->vlanId->value = ESX_VLAN_TRUNK; + } else if (def->vlan.nTags == 1) { + hostPortGroupSpec->vlanId->value = *def->vlan.tag; + } else if (def->vlan.nTags > 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Can apply one VLAN tag per port group only")); + goto cleanup; + } else { + hostPortGroupSpec->vlanId->value = 0; + } if (def->portGroups[i].bandwidth != NULL) { if (esxBandwidthToShapingPolicy @@ -519,6 +557,8 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) network = virGetNetwork(conn, hostVirtualSwitch->name, md5); cleanup: + /* FIXME: need to remove virtual switch if adding port groups failed */ + virNetworkDefFree(def); esxVI_HostVirtualSwitch_Free(&hostVirtualSwitch); esxVI_HostPortGroup_Free(&hostPortGroupList); @@ -695,6 +735,7 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags) esxVI_String *hostPortGroupKey = NULL; esxVI_String *networkName = NULL; virNetworkDefPtr def; + virPortGroupDefPtr portGroup; if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; @@ -824,9 +865,12 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags) for (networkName = networkNameList; networkName != NULL; networkName = networkName->_next) { if (STREQ(networkName->value, hostPortGroup->spec->name)) { - def->portGroups[def->nPortGroups].name = strdup(networkName->value); + portGroup = &def->portGroups[def->nPortGroups]; + ++def->nPortGroups; + + portGroup->name = strdup(networkName->value); - if (def->portGroups[def->nPortGroups].name == NULL) { + if (portGroup->name == NULL) { virReportOOMError(); goto cleanup; } @@ -834,13 +878,29 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags) if (hostPortGroup->spec->policy != NULL) { if (esxShapingPolicyToBandwidth (hostPortGroup->spec->policy->shapingPolicy, - &def->portGroups[def->nPortGroups].bandwidth) < 0) { + &portGroup->bandwidth) < 0) { ++def->nPortGroups; goto cleanup; } } - ++def->nPortGroups; + if (hostPortGroup->spec->vlanId->value > 0) { + if (hostPortGroup->spec->vlanId->value == ESX_VLAN_TRUNK) { + portGroup->vlan.trunk = true; + } + + /* FIXME: Remove this once tag-less trunk-mode is supported */ + portGroup->vlan.nTags = 1; + + if (VIR_ALLOC_N(portGroup->vlan.tag, 1) < 0) { + virReportOOMError(); + goto cleanup; + } + + *portGroup->vlan.tag = + hostPortGroup->spec->vlanId->value; + } + break; } } -- 1.7.4.1

2 3

[libvirt] [PATCH v2] esx: Support VLAN tags in virtual network port groups
by Matthias Bolte 07 Oct '12

07 Oct '12

--- v2: Utilize tag-less VLAN trunk mode: https://www.redhat.com/archives/libvir-list/2012-October/msg00214.html src/esx/esx_network_driver.c | 64 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 59 insertions(+), 5 deletions(-) diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index c8f101a..98e64ee 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -45,6 +45,9 @@ */ verify(MD5_DIGEST_SIZE == VIR_UUID_BUFLEN); +/* ESX utilizes the VLAN ID of 4095 to mean that this port is in trunk mode */ +#define ESX_VLAN_TRUNK 4095 + static virDrvOpenStatus @@ -489,7 +492,37 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) goto cleanup; } - hostPortGroupSpec->vlanId->value = 0; + if (def->portGroups[i].vlan.trunk) { + if (def->portGroups[i].vlan.nTags != 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Trunk mode cannot be limited to a subset of tags")); + goto cleanup; + } + + hostPortGroupSpec->vlanId->value = ESX_VLAN_TRUNK; + } else if (def->portGroups[i].vlan.nTags == 1) { + hostPortGroupSpec->vlanId->value = *def->portGroups[i].vlan.tag; + } else if (def->portGroups[i].vlan.nTags > 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Can apply one VLAN tag per port group only")); + goto cleanup; + } else if (def->vlan.trunk) { + if (def->vlan.nTags != 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Trunk mode cannot be limited to a subset of tags")); + goto cleanup; + } + + hostPortGroupSpec->vlanId->value = ESX_VLAN_TRUNK; + } else if (def->vlan.nTags == 1) { + hostPortGroupSpec->vlanId->value = *def->vlan.tag; + } else if (def->vlan.nTags > 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Can apply one VLAN tag per port group only")); + goto cleanup; + } else { + hostPortGroupSpec->vlanId->value = 0; + } if (def->portGroups[i].bandwidth != NULL) { if (esxBandwidthToShapingPolicy @@ -519,6 +552,8 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) network = virGetNetwork(conn, hostVirtualSwitch->name, md5); cleanup: + /* FIXME: need to remove virtual switch if adding port groups failed */ + virNetworkDefFree(def); esxVI_HostVirtualSwitch_Free(&hostVirtualSwitch); esxVI_HostPortGroup_Free(&hostPortGroupList); @@ -695,6 +730,7 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags) esxVI_String *hostPortGroupKey = NULL; esxVI_String *networkName = NULL; virNetworkDefPtr def; + virPortGroupDefPtr portGroup; if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; @@ -824,9 +860,12 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags) for (networkName = networkNameList; networkName != NULL; networkName = networkName->_next) { if (STREQ(networkName->value, hostPortGroup->spec->name)) { - def->portGroups[def->nPortGroups].name = strdup(networkName->value); + portGroup = &def->portGroups[def->nPortGroups]; + ++def->nPortGroups; + + portGroup->name = strdup(networkName->value); - if (def->portGroups[def->nPortGroups].name == NULL) { + if (portGroup->name == NULL) { virReportOOMError(); goto cleanup; } @@ -834,13 +873,28 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags) if (hostPortGroup->spec->policy != NULL) { if (esxShapingPolicyToBandwidth (hostPortGroup->spec->policy->shapingPolicy, - &def->portGroups[def->nPortGroups].bandwidth) < 0) { + &portGroup->bandwidth) < 0) { ++def->nPortGroups; goto cleanup; } } - ++def->nPortGroups; + if (hostPortGroup->spec->vlanId->value > 0) { + if (hostPortGroup->spec->vlanId->value == ESX_VLAN_TRUNK) { + portGroup->vlan.trunk = true; + } else { + portGroup->vlan.nTags = 1; + + if (VIR_ALLOC_N(portGroup->vlan.tag, 1) < 0) { + virReportOOMError(); + goto cleanup; + } + + *portGroup->vlan.tag = + hostPortGroup->spec->vlanId->value; + } + } + break; } } -- 1.7.4.1

1 0

[libvirt] [PATCH] network: Allow <vlan trunk='yes'/> without explicit <tag> subelements
by Matthias Bolte 07 Oct '12

07 Oct '12

Until now at least one <tag> subelement was required for a <vlan> element. An optional trunk='yes' attribute can be used to indicate trunking of the given tags. This is not how VLAN tagging works with ESX. One can either specify a single VLAN tag per virtual network or enable trunking for all possible VLAN tags. It is not possible to limit trunking to a subset of tags. This cannot be represented properly with the current network config format. This patch removes the requirement for at least on tag per <vlan> element and adapts all related code to deal with the new situation. --- docs/formatnetwork.html.in | 8 +++- docs/schemas/networkcommon.rng | 4 +- src/conf/domain_conf.c | 6 ++- src/conf/netdev_vlan_conf.c | 58 ++++++++++++++++++++--------------- src/network/bridge_driver.c | 28 +++++++++++++++++ src/util/virnetdevopenvswitch.c | 9 ++++- src/util/virnetdevvlan.c | 8 ++++- tests/networkxml2xmlin/esx-net.xml | 15 +++++++++ tests/networkxml2xmlout/esx-net.xml | 15 +++++++++ tests/networkxml2xmltest.c | 1 + 10 files changed, 118 insertions(+), 34 deletions(-) create mode 100644 tests/networkxml2xmlin/esx-net.xml create mode 100644 tests/networkxml2xmlout/esx-net.xml diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 49206dd..5d601e1 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -398,7 +398,7 @@ transparent to the guest, an optional <code><vlan></code> element can specify one or more vlan tags to apply to the traffic of all guests using this - network Since 0.10.0. (openvswitch + network since 0.10.0. (openvswitch and type='hostdev' SR-IOV networks do support transparent vlan tagging of guest traffic; everything else, including standard linux bridges and libvirt's own virtual networks, do not @@ -410,7 +410,11 @@ assumed that the user wants to do VLAN trunking using all the specified tags. In the case that vlan trunking with a single tag is desired, the optional attribute <code>trunk='yes'</code> can - be added to the vlan element. + be added to the vlan element. Since 0.10.3 + <code>trunk='yes'</code> can be set while specifing no + <code><vlan></code> elements at all to indicate trunking of all + available vlan tags. This is supported by ESX only and is the only + trunking mode that ESX supports. <code><vlan></code> elements can also be specified in diff --git a/docs/schemas/networkcommon.rng b/docs/schemas/networkcommon.rng index c7749e7..70cdcbb 100644 --- a/docs/schemas/networkcommon.rng +++ b/docs/schemas/networkcommon.rng @@ -192,7 +192,7 @@ <value>yes</value> </attribute> </optional> - <oneOrMore> + <zeroOrMore> <element name="tag"> <attribute name="id"> <data type="unsignedInt"> @@ -201,7 +201,7 @@ </attribute> <empty/> </element> - </oneOrMore> + </zeroOrMore> </element> </define> </grammar> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 33e1e7f..65a201c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14897,9 +14897,11 @@ virDomainNetGetActualVlan(virDomainNetDefPtr iface) { if (iface->type == VIR_DOMAIN_NET_TYPE_NETWORK && iface->data.network.actual && - iface->data.network.actual->vlan.nTags > 0) + (iface->data.network.actual->vlan.nTags > 0 || + iface->data.network.actual->vlan.trunk)) return &iface->data.network.actual->vlan; - if (iface->vlan.nTags > 0) + if (iface->vlan.nTags > 0 || + iface->vlan.trunk) return &iface->vlan; return 0; } diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c index 6a0511a..8f9aa04 100644 --- a/src/conf/netdev_vlan_conf.c +++ b/src/conf/netdev_vlan_conf.c @@ -42,33 +42,28 @@ virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr de if (nTags < 0) goto error; - if (nTags == 0) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("missing tag id - each <vlan> must have " - "at least one <tag id='n'/> subelement")); - goto error; - } - - if (VIR_ALLOC_N(def->tag, nTags) < 0) { - virReportOOMError(); - goto error; - } - - for (ii = 0; ii < nTags; ii++) { - unsigned long id; - - ctxt->node = tagNodes[ii]; - if (virXPathULong("string(./@id)", ctxt, &id) < 0) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("missing or invalid vlan tag id attribute")); + if (nTags > 0) { + if (VIR_ALLOC_N(def->tag, nTags) < 0) { + virReportOOMError(); goto error; } - if (id > 4095) { - virReportError(VIR_ERR_XML_ERROR, - _("vlan tag id %lu too large (maximum 4095)"), id); - goto error; + + for (ii = 0; ii < nTags; ii++) { + unsigned long id; + + ctxt->node = tagNodes[ii]; + if (virXPathULong("string(./@id)", ctxt, &id) < 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("missing or invalid vlan tag id attribute")); + goto error; + } + if (id > 4095) { + virReportError(VIR_ERR_XML_ERROR, + _("vlan tag id %lu too large (maximum 4095)"), id); + goto error; + } + def->tag[ii] = id; } - def->tag[ii] = id; } def->nTags = nTags; @@ -99,6 +94,14 @@ virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr de } } + /* only in trunk mode the tag subelements can be omitted */ + if (!def->trunk && nTags == 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("invalid element - each <vlan> must have at least " + "one <tag id='n'/> subelement and/or \"trunk='yes'\"")); + goto error; + } + ret = 0; error: ctxt->node = save; @@ -113,8 +116,13 @@ virNetDevVlanFormat(virNetDevVlanPtr def, virBufferPtr buf) { int ii; - if (def->nTags == 0) + if (def->nTags == 0) { + if (def->trunk) { + virBufferAddLit(buf, "<vlan trunk='yes'/>\n"); + } + return 0; + } if (!def->tag) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index e1846ee..37ddb07 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2616,6 +2616,14 @@ networkValidate(virNetworkDefPtr def) int ii; bool vlanUsed, vlanAllowed; + if (def->vlan.nTags == 0 && def->vlan.trunk) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("<vlan> element specified for network %s is missing at " + "least one <tag> subelement required for trunk mode"), + def->name); + return -1; + } + /* The only type of networks that currently support transparent * vlan configuration are those using hostdev sr-iov devices from * a pool, and those using an Open vSwitch bridge. @@ -2627,6 +2635,13 @@ networkValidate(virNetworkDefPtr def) vlanUsed = def->vlan.nTags > 0; for (ii = 0; ii < def->nPortGroups && !(vlanUsed && vlanAllowed); ii++) { + if (def->portGroups[ii].vlan.nTags == 0 && def->portGroups[ii].vlan.trunk) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("<vlan> element specified for portgroup %s of network %s " + "is missing at least one <tag> subelement required for trunk mode"), + def->portGroups[ii].name, def->name); + return -1; + } if (def->portGroups[ii].vlan.nTags > 0) vlanUsed = true; if (def->forwardType == VIR_NETWORK_FORWARD_BRIDGE && @@ -3352,6 +3367,8 @@ networkAllocateActualDevice(virDomainNetDefPtr iface) /* it's handy to have this initialized if we skip directly to validate */ if (iface->vlan.nTags > 0) vlan = &iface->vlan; + else if (iface->vlan.trunk) + goto trunk_error; if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) goto validate; @@ -3627,10 +3644,16 @@ networkAllocateActualDevice(virDomainNetDefPtr iface) /* copy appropriate vlan info to actualNet */ if (iface->vlan.nTags > 0) vlan = &iface->vlan; + else if (iface->vlan.trunk) + goto trunk_error; else if (portgroup && portgroup->vlan.nTags > 0) vlan = &portgroup->vlan; + else if (portgroup && portgroup->vlan.trunk) + goto trunk_error; else if (netdef && netdef->vlan.nTags > 0) vlan = &netdef->vlan; + else if (netdef && netdef->vlan.trunk) + goto trunk_error; if (virNetDevVlanCopy(&iface->data.network.actual->vlan, vlan) < 0) goto error; @@ -3699,6 +3722,11 @@ error: iface->data.network.actual = NULL; } goto cleanup; + +trunk_error: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("vlan trunk mode without a tag is not supported")); + goto cleanup; } /* networkNotifyActualDevice: diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index a6993b6..3b29dcc 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -80,14 +80,19 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, goto out_of_memory; } - if (virtVlan && virtVlan->nTags > 0) { + if (virtVlan && (virtVlan->nTags > 0 || virtVlan->trunk)) { + if (virtVlan->nTags == 0 && virtVlan->trunk) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("vlan trunk mode without a tag is not supported")); + goto cleanup; + } /* Trunk port first */ if (virtVlan->trunk) { virBufferAddLit(&buf, "trunk="); /* - * Trunk ports have at least one VLAN. Do the first one + * Trunk ports must have at least one VLAN. Do the first one * outside the "for" loop so we can put a "," at the * start of the for loop if there are more than one VLANs * on this trunk port. diff --git a/src/util/virnetdevvlan.c b/src/util/virnetdevvlan.c index 7a6ff9b..4cf95dc 100644 --- a/src/util/virnetdevvlan.c +++ b/src/util/virnetdevvlan.c @@ -31,6 +31,7 @@ void virNetDevVlanClear(virNetDevVlanPtr vlan) { + vlan->trunk = false; VIR_FREE(vlan->tag); vlan->nTags = 0; } @@ -79,9 +80,14 @@ virNetDevVlanEqual(const virNetDevVlanPtr a, const virNetDevVlanPtr b) int virNetDevVlanCopy(virNetDevVlanPtr dst, const virNetDevVlanPtr src) { - if (!src || src->nTags == 0) + if (!src) return 0; + if (src->nTags == 0) { + dst->trunk = src->trunk; + return 0; + } + if (VIR_ALLOC_N(dst->tag, src->nTags) < 0) { virReportOOMError(); return -1; diff --git a/tests/networkxml2xmlin/esx-net.xml b/tests/networkxml2xmlin/esx-net.xml new file mode 100644 index 0000000..546c634 --- /dev/null +++ b/tests/networkxml2xmlin/esx-net.xml @@ -0,0 +1,15 @@ +<network> + <name>vSwitch0</name> + <uuid>2f467347-8b4e-8655-e7d6-c4c3fb968009</uuid> + <forward dev='vmnic0' mode='bridge'> + <interface dev='vmnic0'/> + </forward> + <portgroup name='Network1'> + <vlan trunk='yes'/> + </portgroup> + <portgroup name='Network2'> + <vlan> + <tag id='536'/> + </vlan> + </portgroup> +</network> diff --git a/tests/networkxml2xmlout/esx-net.xml b/tests/networkxml2xmlout/esx-net.xml new file mode 100644 index 0000000..546c634 --- /dev/null +++ b/tests/networkxml2xmlout/esx-net.xml @@ -0,0 +1,15 @@ +<network> + <name>vSwitch0</name> + <uuid>2f467347-8b4e-8655-e7d6-c4c3fb968009</uuid> + <forward dev='vmnic0' mode='bridge'> + <interface dev='vmnic0'/> + </forward> + <portgroup name='Network1'> + <vlan trunk='yes'/> + </portgroup> + <portgroup name='Network2'> + <vlan> + <tag id='536'/> + </vlan> + </portgroup> +</network> diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index e57d190..426c541 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -108,6 +108,7 @@ mymain(void) DO_TEST_FULL("passthrough-pf", VIR_NETWORK_XML_INACTIVE); DO_TEST("hostdev"); DO_TEST_FULL("hostdev-pf", VIR_NETWORK_XML_INACTIVE); + DO_TEST("esx-net"); return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.7.4.1

1 0

[libvirt] [with libvirt-git] creating an f17 guest fails with -- Bus 'pci.0' not found
by Kashyap Chamarthy 07 Oct '12

07 Oct '12

Heya, So, creating a guest w/ virt-install fails w/ latest libvirt This is what I see in the guest logs: qemu-kvm: -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2: Bus 'pci.0' not found 2012-10-07 11:24:49.145+0000: shutting down This is clearly reproducible with latest git on Fedora-18. And I was able to create guest just fine w/ 'libvirt-daemon-kvm-0.10.2-3') ---------------------------------------- $ rpm -q qemu-kvm libvirt-daemon-kvm python-virtinst qemu-kvm-1.2.0-11.fc18.x86_64 libvirt-daemon-kvm-0.10.2-4.fc18.x86_64 python-virtinst-0.600.3-1.fc18.1.noarch ---------------------------------------- (NOTE: The above libvirt is built from git, on OCT-06-2012, hence you see a bump in the 'release' number there) That's what the log in /var/log/libvirt/qemu/f17-jeos4.log says ---------------------------------------------------- 2012-10-07 11:24:48.764+0000: starting up LC_ALL=C PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin /usr/bin/qemu-kvm -name f17jeos-4 -S -M isapc -enable-kvm -m 1024 -smp 1,sockets=1,cores=1,threads=1 -uuid 32036aaf-f0c0-2922-056f-64986f63783e -nographic -no-user-config -nodefaults -chardev socket,id=charmonitor,path=/var/lib/libvirt/qemu/f17jeos-4.monitor,server,nowait -mon chardev=charmonitor,id=monitor,mode=control -rtc base=utc -no-reboot -no-shutdown -kernel /var/lib/libvirt/boot/virtinst-vmlinuz.bfAHEc -initrd /var/lib/libvirt/boot/virtinst-initrd.img.QEwMoX -append method=http://download.eng.pnq.redhat.com/pub/fedora/linux/releases/17/Fedo… ks=file:/fed.ks console=tty0 console=ttyS0,115200 serial rd_NO_PLYMOUTH -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 -drive file=/export/vmimgs2/f17jeos-4.qcow2,if=none,id=drive-virtio-disk0,format=qcow2,cache=none -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 -netdev tap,fd=27,id=hostnet0,vhost=on,vhostfd=28 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:48:3c:ac,bus=pci.0,addr=0x3 -chardev pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -device usb-tablet,id=input0 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 char device redirected to /dev/pts/11 qemu-kvm: -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2: Bus 'pci.0' not found 2012-10-07 11:24:49.145+0000: shutting down [kashyap@moon virt-scripts]$ ---------------------------------------------------- On virt-install stdout: ---------------------------------------------------- . . . Retrieving file vmlinuz... | 8.9 MB 00:00:00 !!! Retrieving file initrd.img... | 46 MB 00:00:02 !!! ERROR Unable to read from monitor: Connection reset by peer Domain installation does not appear to have been successful. ---------------------------------------------------- This was the script I used creat guest -- http://kashyapc.fedorapeople.org/virt/jeos-guest-create.bash Any hints? -- /kashyap

1 0

[libvirt] Two core dumps are generated in multi-thread scenarios
by Benjamin Wang (gendwang) 07 Oct '12

07 Oct '12

Hi, I found two core dumps generated in multi-thread scenarios in ESX part. Case1: libcurl support multi-thread core dump: #12 0x00002aaabea89712 in addbyter () from /usr/local/lib/libcurl.so.4 #13 0x00002aaabea89b86 in dprintf_formatf () from /usr/local/lib/libcurl.so.4 #14 0x00002aaabea8b055 in curl_mvsnprintf () from /usr/local/lib/libcurl.so.4 #15 0x00002aaabea7678f in Curl_failf () from /usr/local/lib/libcurl.so.4 #16 0x00002aaabea6d871 in Curl_resolv_timeout () from /usr/local/lib/libcurl.so.4 #17 0x00000006e8a8f230 in ?? () Fix code: esxVI_CURL_Connect() in esx_vi.c: I add a new line as following: curl_easy_setopt(curl->handle, CURLOPT_NOSIGNAL, 1); Case2: libssl support multi-thread core dump: #0 0x0000003f9b030265 in raise () from /lib64/libc.so.6 #1 0x0000003f9b031d10 in abort () from /lib64/libc.so.6 #2 0x0000003f9b06a84b in __libc_message () from /lib64/libc.so.6 #3 0x0000003f9b072fae in _int_malloc () from /lib64/libc.so.6 #4 0x0000003f9b074cde in malloc () from /lib64/libc.so.6 #5 0x0000003f9b07963b in strerror () from /lib64/libc.so.6 #6 0x0000003fa188032a in ERR_load_ERR_strings () from /lib64/libcrypto.so.6 #7 0x0000003fa187fde9 in ERR_load_crypto_strings () from /lib64/libcrypto.so.6 #8 0x0000003fa48309d9 in SSL_load_error_strings () from /lib64/libssl.so.6 #9 0x00002aaaba8e612e in Curl_ossl_init () from /opt/CSCOppm-unit/hypervisor/libcurl/lib/libcurl.so.4 #10 0x00002aaaba8ee6c1 in curl_global_init () from /opt/CSCOppm-unit/hypervisor/libcurl/lib/libcurl.so.4 #11 0x00002aaaba8ee6f8 in curl_easy_init () from /opt/CSCOppm-unit/hypervisor/libcurl/lib/libcurl.so.4 #12 0x00002aaaba0d932b in esxVI_RegisterVM_Task (ctx=0x2aaaba0d96d1, _this=0x5cf54b20, path=0x50e921c0 "10.74.125.50", name=0x2aaac0ae6e80 "root", asTemplate=3228119712, pool=0x5cf54b20, host=0x2aaac0693270, output=0x50e921a0) at esx/esx_vi_methods.generated.c:480 Possible Problem: Two callback functions(locking_function and threadid_func) need to be set. http://www.openssl.org/docs/crypto/threads.html#DESCRIPTION Would you help to give some comments about this two core dump? B.R. Benjamin Wang

3 5

[libvirt] [PATCH] esx: Disable libcurl's use of signals to fix a segfault
by Matthias Bolte 07 Oct '12

07 Oct '12

libcurl uses a SIGALRM in combination with sigsetjmp/siglongjmp to be able to abort a DNS lookup when it takes too long. The problem with this in a multi-threaded application is that the signal handler for SIGALRM and the call to siglongjmp can be executed on a thread that is different from the one that initially did the SIGALRM setup and the call to sigsetjmp. In the reported case this triggered a segfault. Disable libcurl's use of signals to avoid this situation. This has the disadvantage of losing the ability to abort DNS lookups which might result in libcurl getting stuck in a DNS lookup in the worst case. Reported by Benjamin Wang. --- src/esx/esx_vi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 275b858..125eaee 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -330,6 +330,7 @@ esxVI_CURL_Connect(esxVI_CURL *curl, esxUtil_ParsedUri *parsedUri) } curl_easy_setopt(curl->handle, CURLOPT_USERAGENT, "libvirt-esx"); + curl_easy_setopt(curl->handle, CURLOPT_NOSIGNAL, 1); curl_easy_setopt(curl->handle, CURLOPT_HEADER, 0); curl_easy_setopt(curl->handle, CURLOPT_FOLLOWLOCATION, 0); curl_easy_setopt(curl->handle, CURLOPT_SSL_VERIFYPEER, -- 1.7.4.1

2 2