- Devel - libvirt List Archives

[libvirt] [PATCH] Plug leak in virCgroupMoveTask
by Ján Tomko 26 Jun '13

26 Jun '13

We only break out of the while loop if *content is an empty string. However the buffer has been allocated to BUFSIZ + 1 (8193 in my case), but it gets overwritten in the next for iteration. Move VIR_FREE right before we overwrite it to avoid the leak. ==5777== 16,386 bytes in 2 blocks are definitely lost in loss record 1,022 of 1,027 ==5777== by 0x5296E28: virReallocN (viralloc.c:184) ==5777== by 0x52B0C66: virFileReadLimFD (virfile.c:1137) ==5777== by 0x52B0E1A: virFileReadAll (virfile.c:1199) ==5777== by 0x529B092: virCgroupGetValueStr (vircgroup.c:534) ==5777== by 0x529AF64: virCgroupMoveTask (vircgroup.c:1079) Introduced by 83e4c77. https://bugzilla.redhat.com/show_bug.cgi?id=978352 --- src/util/vircgroup.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 0484c71..5e75355 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1076,6 +1076,7 @@ int virCgroupMoveTask(virCgroupPtr src_group, virCgroupPtr dest_group) * aware that it needs to move. Therefore, we must iterate * until content is empty. */ while (1) { + VIR_FREE(content); rc = virCgroupGetValueStr(src_group, i, "tasks", &content); if (rc != 0) return rc; @@ -1085,8 +1086,6 @@ int virCgroupMoveTask(virCgroupPtr src_group, virCgroupPtr dest_group) rc = virCgroupAddTaskStrController(dest_group, content, i); if (rc != 0) goto cleanup; - - VIR_FREE(content); } } -- 1.8.1.5

2 2

[libvirt] [PATCH] Fix invalid read in virCgroupGetValueStr
by Ján Tomko 26 Jun '13

26 Jun '13

Don't check for '\n' at the end of file if zero bytes were read. Found by valgrind: ==404== Invalid read of size 1 ==404== at 0x529B09F: virCgroupGetValueStr (vircgroup.c:540) ==404== by 0x529AF64: virCgroupMoveTask (vircgroup.c:1079) ==404== by 0x1EB475: qemuSetupCgroupForEmulator (qemu_cgroup.c:1061) ==404== by 0x1D9489: qemuProcessStart (qemu_process.c:3801) ==404== by 0x18557E: qemuDomainObjStart (qemu_driver.c:5787) ==404== by 0x190FA4: qemuDomainCreateWithFlags (qemu_driver.c:5839) Introduced by 0d0b409. https://bugzilla.redhat.com/show_bug.cgi?id=978356 --- src/util/vircgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 0484c71..a0ee3f7 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -537,7 +537,7 @@ static int virCgroupGetValueStr(virCgroupPtr group, VIR_DEBUG("Failed to read %s: %m\n", keypath); } else { /* Terminated with '\n' has sometimes harmful effects to the caller */ - if ((*value)[rc - 1] == '\n') + if (rc > 0 && (*value)[rc - 1] == '\n') (*value)[rc - 1] = '\0'; rc = 0; -- 1.8.1.5

2 2

[libvirt] [PATCH] [docs] Fix sample TPM XML
by Stefan Berger 26 Jun '13

26 Jun '13

Fix an error in the sample TPM XML. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: libvirt-acl/docs/formatdomain.html.in =================================================================== --- libvirt-acl.orig/docs/formatdomain.html.in +++ libvirt-acl/docs/formatdomain.html.in @@ -4735,7 +4735,7 @@ qemu-kvm -net nic,model=? /dev/null <devices> <tpm model='tpm-tis'> <backend type='passthrough'> - <backend path='/dev/tpm0'/> + <device path='/dev/tpm0'/> </backend> </tpm> </devices>

2 3

[libvirt] [PATCHv2 00/12] remains of 'support VFIO groups'
by Laine Stump 26 Jun '13

26 Jun '13

This is what remains of yesterday's VFIO groups patchset that is considered still useful, but wasn't yet ACKed (I've pushed the 5 that were ACKed). In addition, I found a few more bugs in the virPCIDeviceList handling and have included patches for those. There are a couple of these that would be really nice to get into 1.0.7, one in particular which is new functionality, but has 4 prerequisites: The most important patch here from a functionality point of view is PATCH 05/12, which adds the <iommuGroup> element to the output of "virsh nodedev-dumpxml". This is essential for users/management applications to have adequate information to know which devices need to be detached from host drivers. (Unfortunately, all of the patches prior to 05/12 are required for 05/12 to cleanly apply.) The other new patch that I've been told is important is 08/12, which supresses reset of PCI devices that were/will be assigned using VFIO - apparently the vfio driver already resets the devices when appropriate, so having libvirt do it is just redundant. (In order for 08/12 to operate reliably, 07/12 is required, and in order for 07/12 to apply, 06/12 must also be applied). If someone ACKs any of these patches prior to DV cutting the first rc and I don't respond on IRC (not sure what my schedule is in the next 12 hours :-), please feel free to push any of them you like, as long as you push them in order with none missing from the middle. Laine Stump (12): pci: eliminate unused driver arg from virPCIDeviceDetach pci: rename virPCIDeviceGetVFIOGroupDev to virPCIDeviceGetIOMMUGroupDev pci: make virPCIParseDeviceAddress public pci: new iommu_group functions nodedev: add iommuGroup to node device object pci: eliminate repetitive path constructions in virPCIDeviceBindToStub pci: update stubDriver name in virPCIDeviceBindToStub qemu: don't reset PCI devices being assigned with VFIO pci: virPCIDeviceListAddCopy API pci: eliminate leak in OOM condition pci: fix dangling pointer in qemuDomainReAttachHostdevDevices qemu: fix infinite loop in OOM error path docs/formatnode.html.in | 63 +++- docs/schemas/nodedev.rng | 11 + src/conf/node_device_conf.c | 86 +++++- src/conf/node_device_conf.h | 5 +- src/libvirt_private.syms | 8 +- src/node_device/node_device_udev.c | 21 +- src/qemu/qemu_cgroup.c | 4 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hostdev.c | 52 ++-- src/qemu/qemu_hotplug.c | 5 +- src/security/security_apparmor.c | 2 +- src/security/security_dac.c | 4 +- src/security/security_selinux.c | 4 +- src/util/virpci.c | 344 +++++++++++++++++---- src/util/virpci.h | 21 +- src/xen/xen_driver.c | 2 +- tests/nodedevschemadata/pci_8086_10c9_sriov_pf.xml | 16 + tests/nodedevxml2xmltest.c | 1 + 18 files changed, 553 insertions(+), 98 deletions(-) create mode 100644 tests/nodedevschemadata/pci_8086_10c9_sriov_pf.xml -- 1.7.11.7

2 37

[libvirt] Google Summer of Code 2013 has started
by Stefan Hajnoczi 26 Jun '13

26 Jun '13

It is a pleasure to welcome the following GSoC 2013 students to the QEMU, KVM, and libvirt communities: Libvirt Wireshark Dissector - Yuto KAWAMURA (kawamuray) http://qemu-project.org/Features/LibvirtWiresharkDissector Libvirt Introduce API to query IP addresses for given domain - Nehal J. Wani (nehaljwani) http://www.google-melange.com/gsoc/project/google/gsoc2013/nehaljwani/51001 Libvirt More Intelligent virsh auto-completion - Tomas Meszaros http://www.google-melange.com/gsoc/project/google/gsoc2013/examon/13001 QEMU Integrated Copy-Paste - Ozan Çağlayan and Pallav Agrawal (pallav) http://qemu-project.org/Features/IntegratedCopyPaste QEMU Continuation Passing C - Charlie Shepherd (cs648) http://qemu-project.org/Features/Continuation-Passing_C QEMU Kconfig - Ákos Kovács http://qemu-project.org/Features/Kconfig QEMU USB Media Transfer Protocol emulation - a|mond http://www.google-melange.com/gsoc/project/google/gsoc2013/almond/1001 KVM Nested Virtualization Testsuite - Arthur Chunqi Li (xelatex) http://www.google-melange.com/gsoc/project/google/gsoc2013/xelatex/19001 Coding started on Monday, 17th of June and ends Monday, 23rd of September. Feel free to follow these projects - feature pages are being created with git repo and blog links. Stefan

1 0

[libvirt] [PATCH 0/2] a couple of vlan-related fixes
by Laine Stump 26 Jun '13

26 Jun '13

One in the code, one in the documentation (the latter was pushed as trivial) Laine Stump (2): network: allow <vlan> in type='hostdev' networks docs: correct and update network vlan example docs/formatnetwork.html.in | 39 ++++++++++++++++++--------------------- src/network/bridge_driver.c | 6 ++++-- 2 files changed, 22 insertions(+), 23 deletions(-) -- 1.7.11.7

2 3

[libvirt] [PATCH] test: include qemuhotplugtest data files in source rpm
by Laine Stump 26 Jun '13

26 Jun '13

commit 0fc12bca added a new test called qemuhotplugtest which has several data files in tests/qemuhotplugtestdata, but didn't add that directory to EXTRA_DIST in the tests Makefile.am, so the make check done during a make rpm was failing due to missing data files. --- Pushed under the build breaker rule. tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index a019eb9..4c49151 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -80,6 +80,7 @@ EXTRA_DIST = \ nwfilterxml2xmlout \ oomtrace.pl \ qemuhelpdata \ + qemuhotplugtestdata \ qemuxml2argvdata \ qemuxml2xmloutdata \ qemuxmlnsdata \ -- 1.7.11.7

1 0

[libvirt] [PATCHv4] Configure native vlan modes on Open vSwitch ports
by james robson 26 Jun '13

26 Jun '13

This patch adds functionality to allow libvirt to configure the 'native-tagged' and 'native-untagged' modes on openvswitch networks. v2 changes: Fix problems reported by Eric Blake v3 changes: Re work patch to address review comments v4 changes: Use enum for native modes --- diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 9284534..ba32185 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3498,6 +3498,13 @@ qemu-kvm -net nic,model=? /dev/null <parameters interfaceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/> </virtualport> </interface> + <interface type='bridge'> + <vlan trunk='yes'> + <tag id='42'/> + <tag id='123' nativeMode='untagged'/> + </vlan> + ... + </interface> <devices> ...</pre> @@ -3524,6 +3531,15 @@ qemu-kvm -net nic,model=? /dev/null vlan element. + + For network connections using openvswitch it is possible to + configure the 'native-tagged' and 'native-untagged' vlan modes + (Since 1.0.5). This uses the optional + <code>nativeMode</code> attribute on the <code><tag></code> + element: <code>nativeMode</code> may be set to 'tagged' or + 'untagged'. The id atribute of the element sets the native vlan. + + <h5><a name="elementLink">Modifying virtual link state</a></h5> <pre> ... diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index a1198ce..29e12d9 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -446,6 +446,13 @@ <parameters interfaceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/> </virtualport> </interface> + <interface type='bridge'> + <vlan trunk='yes'> + <tag id='42'/> + <tag id='123' nativeMode='untagged'/> + </vlan> + ... + </interface> <devices> ...</pre> @@ -469,6 +476,14 @@ be added to the vlan element. + For network connections using openvswitch it is possible to + configure the 'native-tagged' and 'native-untagged' vlan modes + (Since 1.0.6). This uses the optional + <code>nativeMode</code> attribute on the <code><tag></code> + element: <code>nativeMode</code> may be set to 'tagged' or + 'untagged'. The id atribute of the element sets the native vlan. + + <code><vlan></code> elements can also be specified in a <code><portgroup></code> element, as well as directly in a domain's <code><interface></code> element. In the case diff --git a/docs/schemas/networkcommon.rng b/docs/schemas/networkcommon.rng index 51ff759..e60f1fc 100644 --- a/docs/schemas/networkcommon.rng +++ b/docs/schemas/networkcommon.rng @@ -204,6 +204,14 @@ <param name="maxInclusive">4095</param> </data> </attribute> + <optional> + <attribute name="nativeMode"> + <choice> + <value>tagged</value> + <value>untagged</value> + </choice> + </attribute> + </optional> <empty/> </element> </oneOrMore> diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c index 13ba8c6..2b4cd48 100644 --- a/src/conf/netdev_vlan_conf.c +++ b/src/conf/netdev_vlan_conf.c @@ -17,6 +17,7 @@ * * Authors: * Laine Stump <laine(a)redhat.com> + * James Robson <jrobson(a)websense.com> */ #include <config.h> @@ -27,12 +28,15 @@ #define VIR_FROM_THIS VIR_FROM_NONE +VIR_ENUM_IMPL(virNativeVlanMode, VIR_NATIVE_VLAN_MODE_LAST, "default", "tagged", "untagged") + int virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr def) { int ret = -1; xmlNodePtr save = ctxt->node; const char *trunk = NULL; + const char *nativeMode = NULL; xmlNodePtr *tagNodes = NULL; int nTags, ii; @@ -54,6 +58,8 @@ virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr de goto error; } + def->nativeMode = 0; + def->nativeTag = 0; for (ii = 0; ii < nTags; ii++) { unsigned long id; @@ -68,6 +74,19 @@ virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr de _("vlan tag id %lu too large (maximum 4095)"), id); goto error; } + if ((nativeMode = virXPathString("string(./@nativeMode)", ctxt)) != NULL) { + if (def->nativeMode != 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("duplicate native vlan setting")); + goto error; + } + if ((def->nativeMode = virNativeVlanModeTypeFromString(nativeMode)) <= 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Attribute \"nativeMode='%s'\" is invalid"), nativeMode); + goto error; + } + def->nativeTag = id; + } def->tag[ii] = id; } @@ -89,6 +108,12 @@ virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr de "is required for more than one vlan tag"), trunk); goto error; } + if (def->nativeMode != 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("invalid configuration in <vlan> - \"trunk='no'\" is " + "not allowed with a native vlan id")); + goto error; + } /* allow (but discard) "trunk='no' if there is a single tag */ if (STRCASENEQ(trunk, "no")) { virReportError(VIR_ERR_XML_ERROR, @@ -125,7 +150,17 @@ virNetDevVlanFormat(virNetDevVlanPtr def, virBufferPtr buf) virBufferAsprintf(buf, "<vlan%s>\n", def->trunk ? " trunk='yes'" : ""); for (ii = 0; ii < def->nTags; ii++) { - virBufferAsprintf(buf, " <tag id='%u'/>\n", def->tag[ii]); + if (def->nativeMode != VIR_NATIVE_VLAN_MODE_DEFAULT && def->nativeTag == def->tag[ii]) { + /* check the nativeMode in case we get <tag id='0'/>*/ + const char *mode = virNativeVlanModeTypeToString(def->nativeMode); + if (!mode) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Bad vlaue for nativeMode")); + } + virBufferAsprintf(buf, " <tag id='%u' nativeMode='%s'/>\n", def->tag[ii], mode); + } else { + virBufferAsprintf(buf, " <tag id='%u'/>\n", def->tag[ii]); + } } virBufferAddLit(buf, "</vlan>\n"); return 0; diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index 2aee445..47e6027 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -109,8 +109,22 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, virCommandAddArgList(cmd, "--timeout=5", "--", "--may-exist", "add-port", brname, ifname, NULL); - if (virBufferUse(&buf) != 0) + if (virBufferUse(&buf) != 0) { + switch (virtVlan->nativeMode) { + case VIR_NATIVE_VLAN_MODE_TAGGED: + virCommandAddArg(cmd, "vlan_mode=native-tagged"); + virCommandAddArgFormat(cmd, "tag=%d", virtVlan->nativeTag); + break; + case VIR_NATIVE_VLAN_MODE_UNTAGGED: + virCommandAddArg(cmd, "vlan_mode=native-untagged"); + virCommandAddArgFormat(cmd, "tag=%d", virtVlan->nativeTag); + break; + case VIR_NATIVE_VLAN_MODE_DEFAULT: + default: + break; + } virCommandAddArgList(cmd, virBufferCurrentContent(&buf), NULL); + } if (ovsport->profileID[0] == '\0') { virCommandAddArgList(cmd, diff --git a/src/util/virnetdevvlan.c b/src/util/virnetdevvlan.c index 2fe2017..eed32f7 100644 --- a/src/util/virnetdevvlan.c +++ b/src/util/virnetdevvlan.c @@ -33,6 +33,8 @@ virNetDevVlanClear(virNetDevVlanPtr vlan) { VIR_FREE(vlan->tag); vlan->nTags = 0; + vlan->nativeMode = 0; + vlan->nativeTag = 0; } void @@ -54,7 +56,9 @@ virNetDevVlanEqual(const virNetDevVlanPtr a, const virNetDevVlanPtr b) return false; if (a->trunk != b->trunk || - a->nTags != b->nTags) { + a->nTags != b->nTags || + a->nativeMode != b->nativeMode || + a->nativeTag != b->nativeTag) { return false; } @@ -89,6 +93,8 @@ virNetDevVlanCopy(virNetDevVlanPtr dst, const virNetDevVlanPtr src) dst->trunk = src->trunk; dst->nTags = src->nTags; + dst->nativeMode = src->nativeMode; + dst->nativeTag = src->nativeTag; memcpy(dst->tag, src->tag, src->nTags * sizeof(*src->tag)); return 0; } diff --git a/src/util/virnetdevvlan.h b/src/util/virnetdevvlan.h index c6b16ef..a084938 100644 --- a/src/util/virnetdevvlan.h +++ b/src/util/virnetdevvlan.h @@ -18,16 +18,28 @@ * Authors: * Laine Stump <laine(a)redhat.com> */ - +# include <virutil.h> #ifndef __VIR_NETDEV_VLAN_H__ # define __VIR_NETDEV_VLAN_H__ +typedef enum { + VIR_NATIVE_VLAN_MODE_DEFAULT = 0, + VIR_NATIVE_VLAN_MODE_TAGGED, + VIR_NATIVE_VLAN_MODE_UNTAGGED, + + VIR_NATIVE_VLAN_MODE_LAST +} virNativeVlanMode; + +VIR_ENUM_DECL(virNativeVlanMode) + typedef struct _virNetDevVlan virNetDevVlan; typedef virNetDevVlan *virNetDevVlanPtr; struct _virNetDevVlan { bool trunk; /* true if this is a trunk */ int nTags; /* number of tags in array */ unsigned int *tag; /* pointer to array of tags */ + int nativeMode; + unsigned int nativeTag; }; void virNetDevVlanClear(virNetDevVlanPtr vlan); diff --git a/tests/networkxml2xmlin/openvswitch-net.xml b/tests/networkxml2xmlin/openvswitch-net.xml index a3d82b1..2f6084d 100644 --- a/tests/networkxml2xmlin/openvswitch-net.xml +++ b/tests/networkxml2xmlin/openvswitch-net.xml @@ -21,4 +21,13 @@ <parameters profileid='alice-profile'/> </virtualport> </portgroup> + <portgroup name='native'> + <vlan trunk='yes'> + <tag id='123' nativeMode='tagged'/> + <tag id='444'/> + </vlan> + <virtualport> + <parameters profileid='native-profile'/> + </virtualport> + </portgroup> </network> diff --git a/tests/networkxml2xmlout/openvswitch-net.xml b/tests/networkxml2xmlout/openvswitch-net.xml index a3d82b1..2f6084d 100644 --- a/tests/networkxml2xmlout/openvswitch-net.xml +++ b/tests/networkxml2xmlout/openvswitch-net.xml @@ -21,4 +21,13 @@ <parameters profileid='alice-profile'/> </virtualport> </portgroup> + <portgroup name='native'> + <vlan trunk='yes'> + <tag id='123' nativeMode='tagged'/> + <tag id='444'/> + </vlan> + <virtualport> + <parameters profileid='native-profile'/> + </virtualport> + </portgroup> </network> Protected by Websense Hosted Email Security -- www.websense.com

3 7

[libvirt] [PATCH v2 0/5] Make migration APIs more extensible -- qemu patches
by Jiri Denemark 26 Jun '13

26 Jun '13

These are the patches for qemu driver that were already acked but had to be reworked due to the introduction of ACL checks. Jiri Denemark (5): qemu: Move internals of Begin phase to qemu_migration.c qemu: Move common parts of Prepare phase to qemu_migration.c qemu: Move internals of Confirm phase to qemu_migration.c Implement extensible migration APIs in qemu driver qemu: Implement support for VIR_MIGRATE_PARAM_GRAPHICS_URI src/qemu/qemu_driver.c | 506 ++++++++++++++++++++-------------- src/qemu/qemu_migration.c | 690 +++++++++++++++++++++++++++++++++------------- src/qemu/qemu_migration.h | 22 +- 3 files changed, 825 insertions(+), 393 deletions(-) -- 1.8.2.1

2 11

[libvirt] [PATCH] Use 1.1.0 everywhere in the documentation
by Ján Tomko 26 Jun '13

26 Jun '13

Since we already have the v1.1.0-rc1 tag in git. --- Pushed as trivial. docs/formatdomain.html.in | 2 +- docs/formatnetwork.html.in | 2 +- docs/formatstorage.html.in | 4 ++-- src/libxl/libxl_driver.c | 2 +- src/xen/xen_driver.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 17ea9c2..f000cdb 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3559,7 +3559,7 @@ qemu-kvm -net nic,model=? /dev/null For network connections using openvswitch it is possible to configure the 'native-tagged' and 'native-untagged' vlan modes - Since 1.0.7. This uses the optional + Since 1.1.0. This uses the optional <code>nativeMode</code> attribute on the <code><tag></code> element: <code>nativeMode</code> may be set to 'tagged' or 'untagged'. The id atribute of the element sets the native vlan. diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 6a4b36d..641f15e 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -478,7 +478,7 @@ For network connections using openvswitch it is possible to configure the 'native-tagged' and 'native-untagged' vlan modes - Since 1.0.7. This uses the optional + Since 1.1.0. This uses the optional <code>nativeMode</code> attribute on the <code><tag></code> element: <code>nativeMode</code> may be set to 'tagged' or 'untagged'. The id atribute of the element sets the native vlan. diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index c1c1b15..d702eb1 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -372,14 +372,14 @@ and <code>1.1</code> so far, specifying QEMU version the images should be compatible with. If the <code>feature</code> element is present, 1.1 is used. If omitted, qemu-img default is used. - Since 1.0.7 + Since 1.1.0 </dd> <dt><code>features</code></dt> <dd>Format-specific features. Only used for <code>qcow2</code> now. Valid sub-elements are: <ul> <li><code><lazy_refcounts/></code> - allow delayed reference - counter updates. Since 1.0.7</li> + counter updates. Since 1.1.0</li> </ul> </dd> </dl> diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index a311d78..9f52394 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -4625,7 +4625,7 @@ static virDriver libxlDriver = { .connectGetType = libxlConnectGetType, /* 0.9.0 */ .connectGetVersion = libxlConnectGetVersion, /* 0.9.0 */ .connectGetHostname = libxlConnectGetHostname, /* 0.9.0 */ - .connectGetSysinfo = libxlConnectGetSysinfo, /* 1.0.7 */ + .connectGetSysinfo = libxlConnectGetSysinfo, /* 1.1.0 */ .connectGetMaxVcpus = libxlConnectGetMaxVcpus, /* 0.9.0 */ .nodeGetInfo = libxlNodeGetInfo, /* 0.9.0 */ .connectGetCapabilities = libxlConnectGetCapabilities, /* 0.9.0 */ diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index ffc6e41..38adb23 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -2676,7 +2676,7 @@ static virDriver xenUnifiedDriver = { .connectGetType = xenUnifiedConnectGetType, /* 0.0.3 */ .connectGetVersion = xenUnifiedConnectGetVersion, /* 0.0.3 */ .connectGetHostname = xenUnifiedConnectGetHostname, /* 0.7.3 */ - .connectGetSysinfo = xenUnifiedConnectGetSysinfo, /* 1.0.7 */ + .connectGetSysinfo = xenUnifiedConnectGetSysinfo, /* 1.1.0 */ .connectGetMaxVcpus = xenUnifiedConnectGetMaxVcpus, /* 0.2.1 */ .nodeGetInfo = xenUnifiedNodeGetInfo, /* 0.1.0 */ .connectGetCapabilities = xenUnifiedConnectGetCapabilities, /* 0.2.1 */ -- 1.8.1.5

2 1