- Devel - libvirt List Archives

[libvirt] [libvirt PATCH 0/8] Fixes for cgroup setting
by Osier Yang 15 May '13

15 May '13

1/8 ~ 5/8 are refactorings, real fixes are 6/8, 7/8. 8/8 is RFC. Osier Yang (8): qemu: Abstract the code for blkio controller setting into a helper qemu: Abstract code for memory controller setting into a helper qemu: Abstract code for devices controller setting into a helper qemu: Abstract code for cpuset controller setting into a helper qemu: Abstract code for the cpu controller setting into a helper qemu: Set cpuset.cpus for domain process qemu: Prohibit getting the numa parameters if mode is not strict qemu: Set cpuset.mems even if the numatune mode is not strict src/qemu/qemu_cgroup.c | 564 +++++++++++++++++++++++++++++-------------------- src/qemu/qemu_driver.c | 11 +- 2 files changed, 348 insertions(+), 227 deletions(-) -- 1.8.1.4

2 14

[libvirt] libxl requires libuuid?
by Eric Blake 14 May '13

14 May '13

I got this compile error on a relatively new rawhide machine install: CC libvirt_driver_libxl_impl_la-libxl_conf.lo In file included from /usr/include/libxl.h:259:0, from libxl/libxl_conf.c:29: /usr/include/libxl_uuid.h:27:23: fatal error: uuid/uuid.h: No such file or directory #include <uuid/uuid.h> ^ compilation terminated. Is this a case of the libxl development package not pulling in enough pre-reqs? Does libvirt need to work around this, or do I just file a bug against libxl? -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 2

[libvirt] [PATCH] storage: Ensure 'qemu-img resize' size arg is a 512 multiple
by Christophe Fergeau 14 May '13

14 May '13

qemu-img resize will fail with "The new size must be a multiple of 512" if libvirt doesn't round it first. This fixes rhbz#951495 Signed-off-by: Christophe Fergeau <cfergeau(a)redhat.com> --- src/storage/storage_backend_fs.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 9b83e57..99973b0 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -1219,6 +1219,10 @@ virStorageBackendFilesystemResizeQemuImg(const char *path, return -1; } + /* Round capacity up to the closest 512 multiple as qemu-img errors out + * on sizes which are not a multiple of 512 */ + capacity = (capacity + 511) / 512 * 512; + cmd = virCommandNew(img_tool); virCommandAddArgList(cmd, "resize", path, NULL); virCommandAddArgFormat(cmd, "%llu", capacity); -- 1.8.2.1

4 4

[libvirt] [PATCH] docs: Fix the wrong links in secret documentation
by Osier Yang 14 May '13

14 May '13

docs/formatsecret.html.in: (s/domain\.html/formatdomain\.html/g) --- Pushed under trivial rule. --- docs/formatsecret.html.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/formatsecret.html.in b/docs/formatsecret.html.in index cfea459..50c9533 100644 --- a/docs/formatsecret.html.in +++ b/docs/formatsecret.html.in @@ -64,7 +64,7 @@ a single <code>name</code> element that specifies a usage name for the secret. The Ceph secret can then be used by UUID or by this usage name via the <code><auth></code> element of - a <a href="domain.html#elementsDisks">disk + a <a href="formatdomain.html#elementsDisks">disk device</a>. <span class="since">Since 0.9.7</span>. </p> @@ -76,7 +76,7 @@ a single <code>target</code> element that specifies a usage name for the secret. The iSCSI secret can then be used by UUID or by this usage name via the <code><auth></code> element of - a <a href="domain.html#elementsDisks">disk + a <a href="formatdomain.html#elementsDisks">disk device</a>. <span class="since">Since 1.0.4</span>. </p> -- 1.8.1.4

1 0

[libvirt] [PATCH] docs: Add the missed usage type 'iscsi'
by Osier Yang 14 May '13

14 May '13

Pushed under trivial rule. --- docs/formatsecret.html.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/formatsecret.html.in b/docs/formatsecret.html.in index f816b50..cfea459 100644 --- a/docs/formatsecret.html.in +++ b/docs/formatsecret.html.in @@ -41,8 +41,8 @@ <dd> Specifies what this secret is used for. A mandatory <code>type</code> attribute specifies the usage category, currently - only <code>volume</code> and <code>ceph</code> are defined. - Specific usage categories are described below. + only <code>volume</code>, <code>ceph</code> and <code>iscsi</code> + are defined. Specific usage categories are described below. </dd> </dl> -- 1.8.1.4

1 0

[libvirt] [PATCHv3] Configure native vlan modes on Open vSwitch ports
by james robson 14 May '13

14 May '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 --- diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 888c005..5278534 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3290,6 +3290,13 @@ qemu-kvm -net nic,model=? /dev/null <parameters interfaceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/> </virtualport> </interface> + <interface type='bridge'> + <b><vlan trunk='yes'></b> + <b><tag id='42'/></b> + <b><tag id='123' nativeMode='untagged'/></b> + <b></vlan></b> + ... + </interface> <devices> ...</pre> @@ -3316,6 +3323,15 @@ qemu-kvm -net nic,model=? /dev/null vlan element. </p> + <p> + For network connections using openvswitch it is possible to + configure the 'native-tagged' and 'native-untagged' vlan modes + <span class="since">(Since 1.0.6).</span> 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. + </p> + <h5><a name="elementLink">Modifying virtual link state</a></h5> <pre> ... diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 4dd0415..e065ca4 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -414,6 +414,7 @@ <span class="since">Since 0.9.4</span> </p> + <h5><a name="elementVlanTag">Setting VLAN tag (on supported network types only)</a></h5> <pre> @@ -429,6 +430,13 @@ <parameters interfaceid='09b11c53-8b5c-4eeb-8f00-d84eaa0aaa4f'/> </virtualport> </interface> + <interface type='bridge'> + <b><vlan trunk='yes'></b> + <b><tag id='42'/></b> + <b><tag id='123' nativeMode='untagged'/></b> + <b></vlan></b> + ... + </interface> <devices> ...</pre> @@ -452,6 +460,14 @@ be added to the vlan element. </p> <p> + For network connections using openvswitch it is possible to + configure the 'native-tagged' and 'native-untagged' vlan modes + <span class="since">(Since 1.0.6).</span> 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. + </p> + <p> <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..dd5b64e 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> @@ -33,6 +34,7 @@ virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr de int ret = -1; xmlNodePtr save = ctxt->node; const char *trunk = NULL; + const char *nativeMode = NULL; xmlNodePtr *tagNodes = NULL; int nTags, ii; @@ -54,6 +56,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 +72,21 @@ 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 (STRCASENEQ(nativeMode, "tagged") && STRCASENEQ(nativeMode, "untagged")) { + virReportError(VIR_ERR_XML_ERROR, + _("invalid \"nativeMode='%s'\" in <tag> - " + "native_mode must be 'tagged' or 'untagged'"), nativeMode); + goto error; + } + if (def->nativeMode != 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("duplicate native vlan setting")); + goto error; + } + def->nativeMode = STRCASEEQ(nativeMode, "tagged") ? 1 : 2; + 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,11 @@ 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->nativeTag == def->tag[ii]) { + virBufferAsprintf(buf, " <tag id='%u' nativeMode='% s'/>\n", def->tag[ii], def->nativeMode == 1 ? "tagged" : "untagged"); + } 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 4fe077a..69cc1ac 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -19,6 +19,7 @@ * Dan Wendlandt <dan(a)nicira.com> * Kyle Mestery <kmestery(a)cisco.com> * Ansis Atteka <aatteka(a)nicira.com> + * James Robson <jrobson(a)websense.com> */ #include <config.h> @@ -108,8 +109,13 @@ 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) { + if (virtVlan->nativeMode > 0) { + virCommandAddArgFormat(cmd, "vlan_mode=%s", virtVlan->nativeMode == 1 ? "native-tagged" : "native-untagged"); + virCommandAddArgFormat(cmd, "tag=%d", virtVlan->nativeTag); + } 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..b81c037 100644 --- a/src/util/virnetdevvlan.c +++ b/src/util/virnetdevvlan.c @@ -17,6 +17,7 @@ * * Authors: * Laine Stump <laine(a)redhat.com> + * James Robson <jrobson(a)websense.com> */ #include <config.h> @@ -33,6 +34,8 @@ virNetDevVlanClear(virNetDevVlanPtr vlan) { VIR_FREE(vlan->tag); vlan->nTags = 0; + vlan->nativeMode = 0; + vlan->nativeTag = 0; } void @@ -54,7 +57,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 +94,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..93426cc 100644 --- a/src/util/virnetdevvlan.h +++ b/src/util/virnetdevvlan.h @@ -17,6 +17,7 @@ * * Authors: * Laine Stump <laine(a)redhat.com> + * James Robson <jrobson(a)websense.com> */ #ifndef __VIR_NETDEV_VLAN_H__ @@ -28,6 +29,8 @@ 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 */ + short int nativeMode; /* 0=off, 1=tagged, 2=untagged */ + 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 3

[libvirt] [PATCH] virsh: lookup interface by name or mac other than one by one
by Guannan Ren 14 May '13

14 May '13

On host without interface eth1, 'virsh iface-dumpxml eth1' it reports error: Interface not found: couldn't find interface with MAC address 'eth1' after fix, it reports error: Interface not found: couldn't find interface named 'eth1' --- tools/virsh-interface.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index f75c572..47883ae 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -46,6 +46,7 @@ vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd, { virInterfacePtr iface = NULL; const char *n = NULL; + bool is_name = false; virCheckFlags(VSH_BYNAME | VSH_BYMAC, NULL); if (!optname) @@ -62,14 +63,17 @@ vshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd, if (name) *name = n; + if (!strchr(n, ':')) + is_name = true; + /* try it by NAME */ - if (flags & VSH_BYNAME) { + if (is_name && (flags & VSH_BYNAME)) { vshDebug(ctl, VSH_ERR_DEBUG, "%s: <%s> trying as interface NAME\n", cmd->def->name, optname); iface = virInterfaceLookupByName(ctl->conn, n); - } + /* try it by MAC */ - if (!iface && (flags & VSH_BYMAC)) { + } else if (!is_name && (flags & VSH_BYMAC)) { vshDebug(ctl, VSH_ERR_DEBUG, "%s: <%s> trying as interface MAC\n", cmd->def->name, optname); iface = virInterfaceLookupByMACString(ctl->conn, n); -- 1.8.1.4

4 4

[libvirt] [PATCH v2 0/3]add 'sharePolicy' attribute for qemu vnc sharing policy
by Guannan Ren 14 May '13

14 May '13

v1->v2: changed attribute name from 'policy' to 'sharePolicy' renamed caps flag name: QEMU_CAPS_VNC_SHARE_POLICY fixed issues pointed out in v1 review have to keep hard-coded version probe after checking qemu -help and qmp command. These patches try to add a new attribute 'sharePolicy' to element graphics of vnc type. This attribute has three values: libvirt XML: <graphics type='vnc' port='5900' sharePolicy='allow-exclusive'> QEMU commandline -vnc :5900,share=allow-exclusive Allows clients to ask for exclusive access which is implemented by dropping other connections Connecting multiple clients in parallel requires all clients asking for a shared session (vncviewer: -shared switch) libvirt XML: <graphics type='vnc' port='5900' sharePolicy='force-shared'> QEMU commandline -vnc :5900,share=force-shared Disables exclusive client access. Useful for shared desktop sessions, where you don't want someone forgetting specify -shared disconnect everybody else. libvirt XML: <graphics type='vnc' port='5900' sharePolicy='ignore'> QEMU commandline -vnc :5900,share=ignore Dompletely ignores the shared flag and allows everybody connect unconditionally Guannan Ren(3) [PATCH v2 1/3] qemu: new vnc display sharing policy caps flag [PATCH v2 2/3] conf: add 'sharePolicy' attribute to graphics element for vnc [PATCH v2 3/3] qemu: support share attribute and its values to -vnc docs/formatdomain.html.in | 13 +++++++++++-- docs/schemas/domaincommon.rng | 9 +++++++++ src/conf/domain_conf.c | 28 ++++++++++++++++++++++++++++ src/conf/domain_conf.h | 11 +++++++++++ src/libvirt_private.syms | 2 ++ src/qemu/qemu_capabilities.c | 12 ++++++++---- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 13 +++++++++++++ tests/qemuhelptest.c | 9 ++++++--- tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args | 4 ++++ tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.xml | 35 +++++++++++++++++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 12 files changed, 129 insertions(+), 9 deletions(-)

2 5

Re: [libvirt] Welcome to the "libvir-list" mailing list
by prakash b 14 May '13

14 May '13

Hi team, Is libvirt support armv8 architecture. thanks.. Prakash B On Tue, May 14, 2013 at 10:42 AM, <libvir-list-request(a)redhat.com> wrote: > Welcome to the libvir-list(a)redhat.com mailing list! > > To post to this list, send your email to: > > libvir-list(a)redhat.com > > General information about the mailing list is at: > > https://www.redhat.com/mailman/listinfo/libvir-list > > If you ever want to unsubscribe or change your options (eg, switch to > or from digest mode, change your password, etc.), visit your > subscription page at: > > > https://www.redhat.com/mailman/options/libvir-list/bjsprakash%40gmail.com > > > You can also make such adjustments via email by sending a message to: > > libvir-list-request(a)redhat.com > > with the word `help' in the subject or body (don't include the > quotes), and you will get back a message with instructions. > > You must know your password to change your options (including changing > the password, itself) or to unsubscribe. It is: > > zavoda4 > > Normally, Mailman will remind you of your redhat.com mailing list > passwords once every month, although you can disable this if you > prefer. This reminder will also include instructions on how to > unsubscribe or change your account options. There is also a button on > your options page that will email your current password to you. > -- pracash

2 1

[libvirt] [libvirt-glib PATCHv2 0/6] gconfig: Add classes/methods for snapshot configuration
by Christophe Fergeau 14 May '13

14 May '13

Hey, This v2 has 3 more patches than the initial series, they were needed to address various issues with the initial series. 3/6 is not strictly needed, I'm still undecided as to whether it makes things nicer or not, so it's open for discussion (the deprecation it introduces would be triggered when building Boxes). Changes since v1: - fix a bug in gvir_config_domain_snapshot_get_parent() when the <parent> element is missing (which happens with the initial snapshot in a given domain) - add missing gvir_config_domain_snapshot_[gs]et_memory_state() and gvir_config_domain_snapshot_[gs]et_memory_file() - return a time_t from gvir_config_domain_snapshot_get_creation_time() - rename the GVirConfigDomainSnapshotState enum to GVirConfigDomainSnapshotDomainState - add a GVirConfigDomainDiskFormat enum and return it from gvir_config_domain_snapshot_disk_get_driver_type() Christophe

2 10

[libvirt] [libvirt-designer PATCHv2 0/9] Handle more devices in GVirDesignerDomain
by Christophe Fergeau 14 May '13

14 May '13

This goes on top of v2 of the "Improve disk bus type generation" series. Diff with the previous version is that it's rebased against latest master, and I've reworked "Implement gvir_designer_domain_add_sound()" patch to address danpb's comments (gvir_designer_domain_add_sound() is now a public method that must be called explicitly rather than being implicitly called on domain creation. Christophe

2 13

[libvirt] [PATCH] build: mark conditionally unused variables
by Eric Blake 14 May '13

14 May '13

These fixes solve a compilation failure on FreeBSD: util/virnetdevtap.c: In function 'virNetDevTapGetName': util/virnetdevtap.c:56: warning: unused parameter 'tapfd' [-Wunused-parameter] util/virnetdevtap.c:56: warning: unused parameter 'ifname' [-Wunused-parameter] * src/util/virnetdevtap.c (virNetDevTapGetName): Add attributes when TUNGETIFF is not present. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. src/util/virnetdevtap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index fac95ec..7d77f81 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -53,7 +53,7 @@ * Returns 0 if the interface name is successfully queried, -1 otherwise */ int -virNetDevTapGetName(int tapfd, char **ifname) +virNetDevTapGetName(int tapfd ATTRIBUTE_UNUSED, char **ifname ATTRIBUTE_UNUSED) { #ifdef TUNGETIFF struct ifreq ifr; -- 1.8.1.4

2 9

[libvirt] [PATCH] qemu: fix bad free
by Eric Blake 14 May '13

14 May '13

Commit bd56d0d8 could lead to freeing an uninitialized pointer: qemu/qemu_monitor_json.c: In function 'qemuMonitorJSONGetCommandLineOptionParameters': qemu/qemu_monitor_json.c:4284: warning: 'cmd' may be used uninitialized in this function * src/qemu/qemu_monitor_json.c (qemuMonitorJSONGetCommandLineOptionParameters): Initialize variable. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule (and I _really_ wish you didn't have to use -O to make gcc raise this sort of warning) src/qemu/qemu_monitor_json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 0c011d3..d95198b 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -4281,7 +4281,7 @@ qemuMonitorJSONGetCommandLineOptionParameters(qemuMonitorPtr mon, char ***params) { int ret; - virJSONValuePtr cmd; + virJSONValuePtr cmd = NULL; virJSONValuePtr reply = NULL; virJSONValuePtr data = NULL; virJSONValuePtr array = NULL; -- 1.8.1.4

1 0

[libvirt] [PATCH 0/4] prepare for qemu 1.5 command-line probing via QMP
by Eric Blake 14 May '13

14 May '13

This series sets up the groundwork to make it easy to add a capability bit in qemu_capabilities based on whether a particular qemu command-line option has a given parameter. Future patches, such as Osier's work to use '-machine mem-merge' when it exists, will benefit from this new probing ability. Since this missed rc1 freeze, I'm a bit reluctant to include it in libvirt 1.0.5 without a client that actually needs it. Hmm, in writing up this cover letter, I think I should work on a patch 5/4 that enhances qemu_capabilities to make it easy to search for a given option and capability whether parsing -help output (hello RHEL qemu) or using QMP (upstream). Eric Blake (4): json: support removing a value from an object qemu: use bool in monitor struct qemu: simplify string cleanup qemu: query command line options in QMP src/libvirt_private.syms | 1 + src/qemu/qemu_domain.c | 7 +- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_monitor.c | 59 ++++++++++++--- src/qemu/qemu_monitor.h | 13 +++- src/qemu/qemu_monitor_json.c | 174 +++++++++++++++++++++++++++++++++++-------- src/qemu/qemu_monitor_json.h | 4 + src/qemu/qemu_process.c | 8 +- src/util/virjson.c | 34 ++++++++- src/util/virjson.h | 9 ++- tests/jsontest.c | 83 ++++++++++++++++++++- tests/qemumonitorjsontest.c | 103 +++++++++++++++++++++++++ tests/qemumonitortestutils.c | 2 +- 13 files changed, 437 insertions(+), 62 deletions(-) -- 1.8.1.4

3 13

[libvirt] [PATCH-v5.1] Support for static routes on a virtual bridge
by Gene Czarcinski 14 May '13

14 May '13

network: static route support for <network> This update includes Laine Stump's comments/suggestions. Once again he has improved my over-engineered solutions. My original patch and his patch have been squashed/merged with this being the result. That plus a little simplified code added to bridge_driver.c to handle the zero address situations. This code does not restrict any combination of address/netmask/prefix for a static route specification. The metric attribute has been added so that existing route specifications can be overridden. Documentation has been updated to reflect a v1.0.6 target. This patch adds the <route> subelement of <network> to define a static route. the address and prefix (or netmask) attribute identify the destination network, and the gateway attribute specifies the next hop address (which must be directly reachable from the containing <network>) which is to receive the packets destined for "address/(prefix|netmask)". Tests are done to validate that the input definitions are correct. For example, for a static route ip definition, the address must be a network address and not a host address. Additional checks are added to ensure that the specified gateway is directly reachable via a network defined on this bridge. The command used is of the following form: ip route add <address>/<prefix> via <gateway> dev <virbr-bridge> \ proto static metric 1 For family='ipv4' address='0.0.0.0' netmask='0.0.0.0' or prefix='0' is supported. For family='ipv6' address='::' prefix=0' is supported. Anytime an attempt is made to define a static route which duplicates an existing static route (for example, address=::, prefix=0, metric=1), the following error message will be sent to syslog: RTNETLINK answers: File exists This can be overridden by increasing the value of metric. Caution should be used when doing this ... especially for a default route. Note: The use of the command-line interface should be replaced by direct use of libnl so that error conditions can be handled better. But, that is being left as an exersize for another day. . Signed-off-by: Gene Czarcinski <gene(a)czarc.net> --- docs/formatnetwork.html.in | 77 +++++ docs/schemas/network.rng | 22 ++ src/conf/network_conf.c | 340 ++++++++++++++++++++- src/conf/network_conf.h | 22 ++ src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 64 ++++ src/util/virnetdev.c | 46 +++ src/util/virnetdev.h | 7 + .../networkxml2xmlin/dhcp6host-routed-network.xml | 2 + .../networkxml2xmlout/dhcp6host-routed-network.xml | 2 + 10 files changed, 582 insertions(+), 1 deletion(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index d72bd0a..4c7e74f 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -546,6 +546,56 @@ starting. </p> + <h5><a name="elementsStaticroute">Static Routes</a></h5> + <p> + Static route definitions are used to provide routing + information to the virtualization host for networks which are not + defined as a network on one of the virtual bridges so that such + networks can be reachable from the virtualization + host <span class="since">Since 1.0.6</span>. + </p> + + <p> + As shown in <a href="formatnetwork.html#examplesNoGateway">this example</a>, + it is possible to define a virtual bridge interface with no + IPv4 or IPv6 networks. Such interfaces are useful in supporting + networks which have no visibility or direct connectivity with the + virtualization host, but can be used to support + virtual networks which only have guest connectivity. A guest + with connectivity to the guest-only network and another network + that is directly reachable from the host can act as a gateway between the + networks. A static route added to the "visible" network definition + provides the routing information so that IP packets can be sent + from the virtualization host to guests on the hidden network. + </p> + + <p> + Here is a fragment of a definition which shows the static + route specification as well as the IPv4 and IPv6 definitions + for network addresses which are referred to in the + <code>gateway</code> gateway address specifications. Note + that the third static route specification includes the + <code>metric</code> attribute specification with a value of 2. + This indicates that this particular definition is overriding another + route definition with the same address and prefix but with a lower + value for the metric. + </p> + + <pre> + ... + <ip address="192.168.122.1" netmask="255.255.255.0"> + <dhcp> + <range start="192.168.122.128" end="192.168.122.254" /> + </dhcp> + </ip> + <route address="192.168.222.0" prefix="24" gateway="192.168.122.2" /> + <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" /> + <route family="ipv6" address="2001:db8:ca2:3::" prefix="64" gateway="2001:db8:ca2:2::2"/> + <route family="ipv6" address="2001:db9:4:1::" prefix="64" gateway="2001:db8:ca2:2::3" metric='2'> + </route> + ... + </pre> + <h3><a name="elementsAddress">Addressing</a></h3> <p> @@ -577,6 +627,7 @@ </dhcp> </ip> <ip family="ipv6" address="2001:db8:ca2:2::1" prefix="64" /> + <route family="ipv6" address="2001:db9:ca1:1::" prefix="64" gateway="2001:db8:ca2:2::2" /> </network></pre> <dl> @@ -826,6 +877,32 @@ </ip> </network></pre> + <p> + Below is yet another IPv6 variation. This variation has only IPv6 + defined with DHCPv6 on the primary IPv6 network. A static link + if defined for a second IPv6 network which will not be visable on + the bridge interface but will have a static route defined for this + network via the specified gateway. Note that the gateway address + must be directly reachable via (on the same subnet as) one of the + <ip> addresses defined for this <network>. + <span class="since">Since 1.0.5</span> + </p> + + <pre> + <network> + <name>net7</name> + <bridge name="virbr7" /> + <forward mode="route"/> + <ip family="ipv6" address="2001:db8:ca2:7::1" prefix="64" > + <dhcp> + <range start="2001:db8:ca2:7::100" end="2001:db8:ca2::1ff" /> + <host id="0:4:7e:7d:f0:7d:a8:bc:c5:d2:13:32:11:ed:16:ea:84:63" name="lucas" ip="2001:db8:ca2:2:3::4" /> + </dhcp> + </ip> + <route family="ipv6" address="2001:db8:ca2:8::" prefix="64" gateway="2001:db8:ca2:7::4" > + </route> + </network></pre> + <h3><a name="examplesPrivate">Isolated network config</a></h3> <p> diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 493edae..ded8580 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -316,6 +316,28 @@ </optional> </element> </zeroOrMore> +  + <zeroOrMore> +  + <element name="route"> + <optional> + <attribute name="family"><ref name="addr-family"/></attribute> + </optional> + <attribute name="address"><ref name="ipAddr"/></attribute> + <optional> + <choice> + <attribute name="netmask"><ref name="ipv4Addr"/></attribute> + <attribute name="prefix"><ref name="ipPrefix"/></attribute> + </choice> + </optional> + <attribute name="gateway"><ref name="ipAddr"/></attribute> + <optional> + <attribute name="metric"><ref name="unsignedInt"/></attribute> + </optional> + </element> + </zeroOrMore> </interleave> </element> </define> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 8abfa53..12ac879 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -143,6 +143,12 @@ virNetworkIpDefClear(virNetworkIpDefPtr def) } static void +virNetworkRouteDefClear(virNetworkRouteDefPtr def) +{ + VIR_FREE(def->family); +} + +static void virNetworkDNSTxtDefClear(virNetworkDNSTxtDefPtr def) { VIR_FREE(def->name); @@ -221,6 +227,11 @@ virNetworkDefFree(virNetworkDefPtr def) } VIR_FREE(def->ips); + for (ii = 0 ; ii < def->nroutes && def->routes ; ii++) { + virNetworkRouteDefClear(&def->routes[ii]); + } + VIR_FREE(def->routes); + for (ii = 0; ii < def->nPortGroups && def->portGroups; ii++) { virPortGroupDefClear(&def->portGroups[ii]); } @@ -1270,6 +1281,219 @@ cleanup: } static int +virNetworkRouteDefParseXML(const char *networkName, + xmlNodePtr node, + xmlXPathContextPtr ctxt, + virNetworkRouteDefPtr def) +{ + /* + * virNetworkRouteDef object is already allocated as part + * of an array. On failure clear: it out, but don't free it. + */ + + xmlNodePtr save; + char *address = NULL, *netmask = NULL; + char *gateway = NULL; + unsigned long prefix = 0, metric = 0; + int result = -1; + int prefixRc, metricRc; + virSocketAddr testAddr; + + save = ctxt->node; + ctxt->node = node; + + /* grab raw data from XML */ + def->family = virXPathString("string(./@family)", ctxt); + address = virXPathString("string(./@address)", ctxt); + netmask = virXPathString("string(./@netmask)", ctxt); + gateway = virXPathString("string(./@gateway)", ctxt); + prefixRc = virXPathULong("string(./@prefix)", ctxt, &prefix); + if (prefixRc == -2) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid prefix specified " + "in route definition of network '%s'"), + networkName); + goto cleanup; + } + def->has_prefix = (prefixRc == 0); + def->prefix = prefix; + metricRc = virXPathULong("string(./@metric)", ctxt, &metric); + if (metricRc == -2) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid metric specified " + "in route definition of network '%s'"), + networkName); + goto cleanup; + } + def->has_metric = (metricRc == 0); + def->metric = metric; + + /* Note: both network and gateway addresses must be specified */ + + if (!address) { + virReportError(VIR_ERR_XML_ERROR, + _("Missing required address attribute " + "in route definition of network '%s'"), + networkName); + goto cleanup; + } + + if (!gateway) { + virReportError(VIR_ERR_XML_ERROR, + _("Missing required gateway attribute " + "in route definition of network '%s'"), + networkName); + goto cleanup; + } + + if (virSocketAddrParse(&def->address, address, AF_UNSPEC) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Bad network address '%s' " + "in route definition of network '%s'"), + address, networkName); + goto cleanup; + } + + if (virSocketAddrParse(&def->gateway, gateway, AF_UNSPEC) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Bad gateway address '%s' " + "in route definition of network '%s'"), + gateway, networkName); + goto cleanup; + } + + /* validate network address, etc. for each family */ + if ((def->family == NULL) || (STREQ(def->family, "ipv4"))) { + if (!(VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET) || + VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_UNSPEC))) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("%s family specified for non-IPv4 address '%s' " + "in route definition of network '%s'"), + def->family == NULL? "no" : "ipv4", + address, networkName); + goto cleanup; + } + if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->gateway, AF_INET)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("%s family specified for non-IPv4 gateway '%s' " + "in route definition of network '%s'"), + def->family == NULL? "no" : "ipv4", + address, networkName); + goto cleanup; + } + if (netmask) { + if (virSocketAddrParse(&def->netmask, netmask, AF_UNSPEC) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Bad netmask address '%s' " + "in route definition of network '%s'"), + netmask, networkName); + goto cleanup; + } + if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->netmask, AF_INET)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("network '%s' has invalid netmask '%s' " + "for address '%s' (both must be IPv4)"), + networkName, netmask, address); + goto cleanup; + } + if (def->has_prefix) { + /* can't have both netmask and prefix at the same time */ + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("route definition '%s' cannot have both " + "a prefix and a netmask"), + networkName); + goto cleanup; + } + } + if (def->prefix > 32) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Invalid IPv4 prefix %u for '%s' specified " + "in route definition of network '%s'"), + def->prefix, + def->family == NULL? "no" : "ipv4", networkName); + goto cleanup; + } + } else if (STREQ(def->family, "ipv6")) { + if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->address, AF_INET6)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("ipv6 family specified for non-IPv6 address '%s' " + "in route definition of network '%s'"), + address, networkName); + goto cleanup; + } + if (netmask) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("specifying netmask invalid for IPv6 address '%s' " + "in route definition of network '%s'"), + address, networkName); + goto cleanup; + } + if (!VIR_SOCKET_ADDR_IS_FAMILY(&def->gateway, AF_INET6)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("ipv6 specified for non-IPv6 gateway address '%s' " + "in route definition of network '%s'"), + gateway, networkName); + goto cleanup; + } + if (def->prefix > 128) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Invalid IPv6 prefix %u for '%s' specified " + "in route definition of network '%s'"), + def->prefix, def->family, networkName); + goto cleanup; + } + } else { + virReportError(VIR_ERR_XML_ERROR, + _("Unrecognized family '%s' " + "in route definition of network'%s'"), + def->family, networkName); + goto cleanup; + } + + /* make sure the address is a network address */ + if (netmask) { + if (virSocketAddrMask(&def->address, &def->netmask, &testAddr) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("error converting address '%s' with netmask '%s' " + "to network-address " + "in route definition of network '%s'"), + address, netmask, networkName); + goto cleanup; + } + } else { + if (virSocketAddrMaskByPrefix(&def->address, + def->prefix, &testAddr) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("error converting address '%s' with prefix %u " + "to network-address " + "in route definition of network '%s'"), + address, def->prefix, networkName); + goto cleanup; + } + } + if (!virSocketAddrEqual(&def->address, &testAddr)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("address '%s' in route definition of network '%s' " + "is not a network address"), + address, networkName); + goto cleanup; + } + + result = 0; + +cleanup: + if (result < 0) { + virNetworkRouteDefClear(def); + } + VIR_FREE(address); + VIR_FREE(netmask); + VIR_FREE(gateway); + + ctxt->node = save; + return result; +} + +static int virNetworkPortGroupParseXML(virPortGroupDefPtr def, xmlNodePtr node, xmlXPathContextPtr ctxt) @@ -1684,8 +1908,9 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) char *tmp; char *stp = NULL; xmlNodePtr *ipNodes = NULL; + xmlNodePtr *routeNodes = NULL; xmlNodePtr *portGroupNodes = NULL; - int nIps, nPortGroups; + int nIps, nPortGroups, nRoutes; xmlNodePtr dnsNode = NULL; xmlNodePtr virtPortNode = NULL; xmlNodePtr forwardNode = NULL; @@ -1839,6 +2064,68 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) } VIR_FREE(ipNodes); + nRoutes = virXPathNodeSet("./route", ctxt, &routeNodes); + if (nRoutes < 0) + goto error; + + if (nRoutes > 0) { + int ii; + + /* allocate array to hold all the route definitions */ + if (VIR_ALLOC_N(def->routes, nRoutes) < 0) { + virReportOOMError(); + goto error; + } + /* parse each definition */ + for (ii = 0; ii < nRoutes; ii++) { + int ret = virNetworkRouteDefParseXML(def->name, routeNodes[ii], + ctxt, &def->routes[ii]); + if (ret < 0) + goto error; + def->nroutes++; + } + + /* now validate the correctness of any static route gateways specified + * + * note: the parameters within each definition are verified/assumed valid; + * the question being asked and answered here is if the specified gateway + * is directly reachable from this bridge. + */ + nRoutes = def->nroutes; + nIps = def->nips; + for (ii = 0; ii < nRoutes; ii++) { + int jj; + virSocketAddr testAddr, testGw; + bool addrMatch; + virNetworkRouteDefPtr gwdef = &def->routes[ii]; + addrMatch = false; + for (jj = 0; jj < nIps; jj++) { + virNetworkIpDefPtr def2 = &def->ips[jj]; + if (VIR_SOCKET_ADDR_FAMILY(&gwdef->gateway) + != VIR_SOCKET_ADDR_FAMILY(&def2->address)) { + continue; + } + int prefix = virNetworkIpDefPrefix(def2); + virSocketAddrMaskByPrefix(&def2->address, prefix, &testAddr); + virSocketAddrMaskByPrefix(&gwdef->gateway, prefix, &testGw); + if (VIR_SOCKET_ADDR_VALID(&testAddr) && + VIR_SOCKET_ADDR_VALID(&testGw) && + virSocketAddrEqual(&testAddr, &testGw)) { + addrMatch = true; + break; + } + } + if (!addrMatch) { + char *gw = virSocketAddrFormat(&gwdef->gateway); + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unreachable static route gateway '%s' specified for network '%s'"), + gw, def->name); + VIR_FREE(gw); + goto error; + } + } + } + forwardNode = virXPathNode("./forward", ctxt); if (forwardNode && virNetworkForwardDefParseXML(def->name, forwardNode, ctxt, &def->forward) < 0) { @@ -1911,6 +2198,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) return def; error: + VIR_FREE(routeNodes); VIR_FREE(stp); virNetworkDefFree(def); VIR_FREE(ipNodes); @@ -2136,6 +2424,51 @@ error: } static int +virNetworkRouteDefFormat(virBufferPtr buf, + const virNetworkRouteDefPtr def) +{ + int result = -1; + + virBufferAddLit(buf, "<route"); + + if (def->family) { + virBufferAsprintf(buf, " family='%s'", def->family); + } + if (VIR_SOCKET_ADDR_VALID(&def->address)) { + char *addr = virSocketAddrFormat(&def->address); + if (!addr) + goto error; + virBufferAsprintf(buf, " address='%s'", addr); + VIR_FREE(addr); + } + if (VIR_SOCKET_ADDR_VALID(&def->netmask)) { + char *addr = virSocketAddrFormat(&def->netmask); + if (!addr) + goto error; + virBufferAsprintf(buf, " netmask='%s'", addr); + VIR_FREE(addr); + } + if (def->has_prefix) { + virBufferAsprintf(buf," prefix='%u'", def->prefix); + } + if (VIR_SOCKET_ADDR_VALID(&def->gateway)) { + char *addr = virSocketAddrFormat(&def->gateway); + if (!addr) + goto error; + virBufferAsprintf(buf, " gateway='%s'", addr); + VIR_FREE(addr); + } + if (def->has_metric && def->metric > 0) { + virBufferAsprintf(buf," metric='%u'", def->metric); + } + virBufferAddLit(buf, "/>\n"); + + result = 0; +error: + return result; +} + +static int virPortGroupDefFormat(virBufferPtr buf, const virPortGroupDefPtr def) { @@ -2347,6 +2680,11 @@ virNetworkDefFormatInternal(virBufferPtr buf, goto error; } + for (ii = 0; ii < def->nroutes; ii++) { + if (virNetworkRouteDefFormat(buf, &def->routes[ii]) < 0) + goto error; + } + if (virNetDevVPortProfileFormat(def->virtPortProfile, buf) < 0) goto error; diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index e187f05..43f80d4 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -149,6 +149,25 @@ struct _virNetworkIpDef { virSocketAddr bootserver; }; +typedef struct _virNetworkRouteDef virNetworkRouteDef; +typedef virNetworkRouteDef *virNetworkRouteDefPtr; +struct _virNetworkRouteDef { + char *family; /* ipv4 or ipv6 - default is ipv4 */ + virSocketAddr address; /* Routed Network IP address */ + + /* One or the other of the following two will be used for a given + * Network address, but never both. The parser guarantees this. + * The virSocketAddrGetIpPrefix() can be used to get a + * valid prefix. + */ + virSocketAddr netmask; /* ipv4 - either netmask or prefix specified */ + unsigned int prefix; /* ipv6 - only prefix allowed */ + bool has_prefix; /* prefix= was specified */ + unsigned int metric; /* value for metric (defaults to 1) */ + bool has_metric; /* metric= was specified */ + virSocketAddr gateway; /* gateway IP address for ip-route */ + }; + typedef struct _virNetworkForwardIfDef virNetworkForwardIfDef; typedef virNetworkForwardIfDef *virNetworkForwardIfDefPtr; struct _virNetworkForwardIfDef { @@ -224,6 +243,9 @@ struct _virNetworkDef { size_t nips; virNetworkIpDefPtr ips; /* ptr to array of IP addresses on this network */ + size_t nroutes; + virNetworkRouteDefPtr routes; /* ptr to array of static routes on this interface */ + virNetworkDNSDef dns; /* dns related configuration */ virNetDevVPortProfilePtr virtPortProfile; diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d4cb4a3..dfa4779 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1463,6 +1463,7 @@ virMacAddrSetRaw; # util/virnetdev.h +virNetDevAddRoute; virNetDevClearIPv4Address; virNetDevExists; virNetDevGetIndex; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 9c5a8ae..4392e20 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2391,6 +2391,7 @@ out: return ret; } +/* add an IP address to a bridge */ static int networkAddAddrToBridge(virNetworkObjPtr network, virNetworkIpDefPtr ipdef) @@ -2411,6 +2412,55 @@ networkAddAddrToBridge(virNetworkObjPtr network, return 0; } +/* add an IP (static) route to a bridge */ +static int +networkAddRouteToBridge(virNetworkObjPtr network, + virNetworkRouteDefPtr routedef) +{ + int prefix = 0; + unsigned int metric; + virSocketAddrPtr addr = &routedef->address; + virSocketAddrPtr mask = &routedef->netmask; + virSocketAddr zero; + + /* this creates an all-0 address of the appropriate family */ + ignore_value(virSocketAddrParse(&zero, + (VIR_SOCKET_ADDR_IS_FAMILY(addr,AF_INET) + ? "0.0.0.0" : "::"), + VIR_SOCKET_ADDR_FAMILY(addr))); + + if (virSocketAddrEqual(addr, &zero)) { + if (routedef->has_prefix && routedef->prefix == 0) + prefix = 0; + else if ((VIR_SOCKET_ADDR_IS_FAMILY(mask, AF_INET) && + virSocketAddrEqual(mask, &zero))) + prefix = 0; + else + prefix = virSocketAddrGetIpPrefix(addr, mask, routedef->prefix); + } else { + prefix = virSocketAddrGetIpPrefix(addr, mask, routedef->prefix); + } + + if (prefix < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("network '%s' has an invalid netmask " + "or IP address in route definition"), + network->def->name); + return -1; + } + + if (routedef->has_metric && routedef->metric > 0) + metric = routedef->metric; + else + metric = 1; + + if (virNetDevAddRoute(network->def->bridge, &routedef->address, + prefix, &routedef->gateway, metric) < 0) { + return -1; + } + return 0; +} + static int networkStartNetworkVirtual(struct network_driver *driver, virNetworkObjPtr network) @@ -2419,6 +2469,7 @@ networkStartNetworkVirtual(struct network_driver *driver, bool v4present = false, v6present = false; virErrorPtr save_err = NULL; virNetworkIpDefPtr ipdef; + virNetworkRouteDefPtr routedef; char *macTapIfName = NULL; int tapfd = -1; @@ -2495,6 +2546,19 @@ networkStartNetworkVirtual(struct network_driver *driver, if (virNetDevSetOnline(network->def->bridge, 1) < 0) goto err2; + for (ii = 0; ii < network->def->nroutes; ii++) { + routedef = &network->def->routes[ii]; + /* Add the IP route to the bridge */ + /* ignore errors, error msg will be generated */ + /* but libvirt will not know and net-destroy will work. */ + if (VIR_SOCKET_ADDR_VALID(&routedef->gateway)) { + if (networkAddRouteToBridge(network, routedef) < 0) { + /* an error occurred adding the static route */ + continue; /* for now, do nothing */ + } + } + } + /* If forward.type != NONE, turn on global IP forwarding */ if (network->def->forward.type != VIR_NETWORK_FORWARD_NONE && networkEnableIpForwarding(v4present, v6present) < 0) { diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index d987b8e..01aaff1 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -783,6 +783,52 @@ cleanup: } /** + * virNetDevSetGateway: + * @ifname: the interface name + * @addr: the IP network address (IPv4 or IPv6) + * @prefix: number of 1 bits in the netmask + * @gateway: via address for route (same as @addr) + * + * Add a route for a network IP address to an interface. This function + * *does not* remove any previously added IP static routes. + * + * Returns 0 in case of success or -1 in case of error. + */ + +int +virNetDevAddRoute(const char *ifname, + virSocketAddrPtr addr, + unsigned int prefix, + virSocketAddrPtr gateway, + unsigned int metric) +{ + virCommandPtr cmd = NULL; + char *addrstr = NULL, *gatewaystr = NULL; + int ret = -1; + + if (!(addrstr = virSocketAddrFormat(addr))) + goto cleanup; + if (!(gatewaystr = virSocketAddrFormat(gateway))) + goto cleanup; + cmd = virCommandNew(IP_PATH); + virCommandAddArgList(cmd, "route", "add", NULL); + virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); + virCommandAddArgList(cmd, "via", gatewaystr, "dev", ifname, + "proto", "static", "metric", NULL); + virCommandAddArgFormat(cmd, "%u", metric); + + if (virCommandRun(cmd, NULL) < 0) + goto cleanup; + + ret = 0; +cleanup: + VIR_FREE(addrstr); + VIR_FREE(gatewaystr); + virCommandFree(cmd); + return ret; +} + +/** * virNetDevClearIPv4Address: * @ifname: the interface name * @addr: the IP address (IPv4 or IPv6) diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 551ea22..0b394ad 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -42,6 +42,13 @@ int virNetDevSetIPv4Address(const char *ifname, virSocketAddr *addr, unsigned int prefix) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; +int virNetDevAddRoute(const char *ifname, + virSocketAddrPtr addr, + unsigned int prefix, + virSocketAddrPtr gateway, + unsigned int metric) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4) + ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK; int virNetDevClearIPv4Address(const char *ifname, virSocketAddr *addr, unsigned int prefix) diff --git a/tests/networkxml2xmlin/dhcp6host-routed-network.xml b/tests/networkxml2xmlin/dhcp6host-routed-network.xml index 2693d87..40f6dfe 100644 --- a/tests/networkxml2xmlin/dhcp6host-routed-network.xml +++ b/tests/networkxml2xmlin/dhcp6host-routed-network.xml @@ -19,4 +19,6 @@ <host id='0:1:0:1:18:aa:62:fe:0:16:3e:44:55:66' name='badbob' ip='2001:db8:ac10:fd01::1:24' /> </dhcp> </ip> + <route address="192.168.222.0" netmask="255.255.255.0" gateway="192.168.122.10"/> + <route family="ipv6" address="2001:db8:ac10:fc00::" prefix="64" gateway="2001:db8:ac10:fd01::1:24"/> </network> diff --git a/tests/networkxml2xmlout/dhcp6host-routed-network.xml b/tests/networkxml2xmlout/dhcp6host-routed-network.xml index 1d3035b..fc8666b 100644 --- a/tests/networkxml2xmlout/dhcp6host-routed-network.xml +++ b/tests/networkxml2xmlout/dhcp6host-routed-network.xml @@ -21,4 +21,6 @@ <host id='0:1:0:1:18:aa:62:fe:0:16:3e:44:55:66' name='badbob' ip='2001:db8:ac10:fd01::1:24' /> </dhcp> </ip> + <route address='192.168.222.0' netmask='255.255.255.0' gateway='192.168.122.10'/> + <route family='ipv6' address='2001:db8:ac10:fc00::' prefix='64' gateway='2001:db8:ac10:fd01::1:24'/> </network> -- 1.8.1.4

2 2

[libvirt] [PATCH 0/4] Extra validation for the <sysinfo> section
by John Ferlan 14 May '13

14 May '13

Not necessary for 1.0.5, but figured I'd put it out there now. https://bugzilla.redhat.com/show_bug.cgi?id=890494 The <sysinfo> section needs an extra uuid validation check. The current check compares the numerical sysinfo/system_uuid with the domain uuid; however, it's possible that someone added extra hyphens into the sysinfo uuid which results in the inability to start the domain (at least qemu). The bug report indicates the 'date' field should at least be syntax checked based on what's desribed in the SMBIOS spec. From the spec: "String number of the BIOS release date. The date string, if supplied, is in either mm/dd/yy or mm/dd/yyyy format. If the year portion of the string is two digits, the year is assumed to be 19yy. NOTE: The mm/dd/yyyy format is required for SMBIOS version 2.3 and later" John Ferlan (4): docs: Fix syntax in sysinfo description docs: Update description of SMBIOS fields Validate the bios_date format for <sysinfo> Need better validation of <sysinfo> uuid docs/formatdomain.html.in | 51 ++++++++++++++++++++++++++++++++++++++--------- src/conf/domain_conf.c | 47 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 85 insertions(+), 13 deletions(-) -- 1.8.1.4

3 19

[libvirt] [PATCH] build: avoid shadowed variable in fdstreamtest
by Eric Blake 14 May '13

14 May '13

On RHEL 6.4 (gcc 4.4.7), I got: fdstreamtest.c: In function 'testFDStreamReadCommon': fdstreamtest.c:44: error: declaration of 'tmpfile' shadows a global declaration [-Wshadow] * tests/fdstreamtest.c (testFDStreamReadCommon) (testFDStreamWriteCommon): Rename 'tmpfile' variable. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. tests/fdstreamtest.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/fdstreamtest.c b/tests/fdstreamtest.c index cda2689..9f780c9 100644 --- a/tests/fdstreamtest.c +++ b/tests/fdstreamtest.c @@ -41,7 +41,7 @@ static int testFDStreamReadCommon(const char *scratchdir, bool blocking) { int fd = -1; - char *tmpfile = NULL; + char *file = NULL; int ret = -1; char *pattern = NULL; char *buf = NULL; @@ -63,10 +63,10 @@ static int testFDStreamReadCommon(const char *scratchdir, bool blocking) for (i = 0 ; i < PATTERN_LEN ; i++) pattern[i] = i; - if (virAsprintf(&tmpfile, "%s/input.data", scratchdir) < 0) + if (virAsprintf(&file, "%s/input.data", scratchdir) < 0) goto cleanup; - if ((fd = open(tmpfile, O_CREAT|O_WRONLY|O_EXCL, 0600)) < 0) + if ((fd = open(file, O_CREAT|O_WRONLY|O_EXCL, 0600)) < 0) goto cleanup; for (i = 0 ; i < 10 ; i++) { @@ -83,7 +83,7 @@ static int testFDStreamReadCommon(const char *scratchdir, bool blocking) /* Start reading 1/2 way through first pattern * and end 1/2 way through last pattern */ - if (virFDStreamOpenFile(st, tmpfile, + if (virFDStreamOpenFile(st, file, PATTERN_LEN / 2, PATTERN_LEN * 9, O_RDONLY) < 0) goto cleanup; @@ -149,11 +149,11 @@ cleanup: if (st) virStreamFree(st); VIR_FORCE_CLOSE(fd); - if (tmpfile != NULL) - unlink(tmpfile); + if (file != NULL) + unlink(file); if (conn) virConnectClose(conn); - VIR_FREE(tmpfile); + VIR_FREE(file); VIR_FREE(pattern); VIR_FREE(buf); return ret; @@ -173,7 +173,7 @@ static int testFDStreamReadNonblock(const void *data) static int testFDStreamWriteCommon(const char *scratchdir, bool blocking) { int fd = -1; - char *tmpfile = NULL; + char *file = NULL; int ret = -1; char *pattern = NULL; char *buf = NULL; @@ -195,7 +195,7 @@ static int testFDStreamWriteCommon(const char *scratchdir, bool blocking) for (i = 0 ; i < PATTERN_LEN ; i++) pattern[i] = i; - if (virAsprintf(&tmpfile, "%s/input.data", scratchdir) < 0) + if (virAsprintf(&file, "%s/input.data", scratchdir) < 0) goto cleanup; if (!(st = virStreamNew(conn, flags))) @@ -204,7 +204,7 @@ static int testFDStreamWriteCommon(const char *scratchdir, bool blocking) /* Start writing 1/2 way through first pattern * and end 1/2 way through last pattern */ - if (virFDStreamCreateFile(st, tmpfile, + if (virFDStreamCreateFile(st, file, PATTERN_LEN / 2, PATTERN_LEN * 9, O_WRONLY, 0600) < 0) goto cleanup; @@ -244,7 +244,7 @@ static int testFDStreamWriteCommon(const char *scratchdir, bool blocking) goto cleanup; } - if ((fd = open(tmpfile, O_RDONLY)) < 0) + if ((fd = open(file, O_RDONLY)) < 0) goto cleanup; for (i = 0 ; i < 10 ; i++) { @@ -292,11 +292,11 @@ cleanup: if (st) virStreamFree(st); VIR_FORCE_CLOSE(fd); - if (tmpfile != NULL) - unlink(tmpfile); + if (file != NULL) + unlink(file); if (conn) virConnectClose(conn); - VIR_FREE(tmpfile); + VIR_FREE(file); VIR_FREE(pattern); VIR_FREE(buf); return ret; -- 1.8.1.4

1 0

[libvirt] [PATCH] Don't overwrite useful message when creating macvlan fails
by Daniel P. Berrange 14 May '13

14 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Currently we report a bogus error message when macvlan creation fails: error: Failed to start domain migtest error: operation failed: Unable to create macvlan device With this removed, we see the real error: error: Failed to start domain migtest error: Unable to get index for interface p31p1: No such device Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/util/virnetdevmacvlan.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 0c4fcbd..5316520 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -897,11 +897,8 @@ create_name: } virMutexUnlock(&virNetDevMacVLanCreateMutex); - if (!cr_ifname) { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", - _("Unable to create macvlan device")); + if (!cr_ifname) return -1; - } } if (virNetDevVPortProfileAssociate(cr_ifname, -- 1.8.2.1

2 1

[libvirt] [PATCH] Remove & ban use of select() for waiting for I/O
by Daniel P. Berrange 14 May '13

14 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Use of the select() system call is inherantly dangerous since applications will hit a buffer overrun if any FD number exceeds the size of the select set size (typically 1024). Replace the two uses of select() with poll() and use cfg.mk to ban any future use of select(). NB: This changes the phyp driver so that it uses an infinite timeout, instead of busy-waiting for 1ms at a time. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- cfg.mk | 8 ++++++++ src/phyp/phyp_driver.c | 20 +++++++------------- src/util/virnetlink.c | 16 +++++++--------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cfg.mk b/cfg.mk index 0bf5bfc..0e809fc 100644 --- a/cfg.mk +++ b/cfg.mk @@ -444,6 +444,14 @@ sc_prohibit_nonreentrant: done ; \ exit $$fail +sc_prohibit_select: + @fail=0 ; \ + (prohibit="\\<select *\\(" \ + halt="use poll(), not select()" \ + $(_sc_search_regexp) \ + ) || fail=1; \ + exit $$fail + # Prohibit the inclusion of <ctype.h>. sc_prohibit_ctype_h: @prohibit='^# *include *<ctype\.h>' \ diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index f0007c0..4594cbf 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -40,6 +40,7 @@ #include <netdb.h> #include <fcntl.h> #include <domain_event.h> +#include <poll.h> #include "internal.h" #include "virauth.h" @@ -72,29 +73,22 @@ static unsigned const int PHYP_MAC_SIZE= 12; static int waitsocket(int socket_fd, LIBSSH2_SESSION * session) { - struct timeval timeout; - fd_set fd; - fd_set *writefd = NULL; - fd_set *readfd = NULL; + struct pollfd fds[1]; int dir; - timeout.tv_sec = 0; - timeout.tv_usec = 1000; - - FD_ZERO(&fd); - - FD_SET(socket_fd, &fd); + memset(fds, 0, sizeof(fds)); + fds[0].fd = socket_fd; /* now make sure we wait in the correct direction */ dir = libssh2_session_block_directions(session); if (dir & LIBSSH2_SESSION_BLOCK_INBOUND) - readfd = &fd; + fds[0].events |= POLLIN; if (dir & LIBSSH2_SESSION_BLOCK_OUTBOUND) - writefd = &fd; + fds[0].events |= POLLOUT; - return select(socket_fd + 1, readfd, writefd, NULL, &timeout); + return poll(fds, ARRAY_CARDINALITY(fds), -1); } /* this function is the layer that manipulates the ssh channel itself diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index d340eda..f5865a0 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -48,7 +48,7 @@ #define VIR_FROM_THIS VIR_FROM_NET -#define NETLINK_ACK_TIMEOUT_S 2 +#define NETLINK_ACK_TIMEOUT_S 2*1000 #if defined(__linux__) && defined(HAVE_LIBNL) /* State for a single netlink event handle */ @@ -185,10 +185,7 @@ int virNetlinkCommand(struct nl_msg *nl_msg, .nl_groups = 0, }; ssize_t nbytes; - struct timeval tv = { - .tv_sec = NETLINK_ACK_TIMEOUT_S, - }; - fd_set readfds; + struct pollfd fds[1]; int fd; int n; struct nlmsghdr *nlmsg = nlmsg_hdr(nl_msg); @@ -242,14 +239,15 @@ int virNetlinkCommand(struct nl_msg *nl_msg, goto error; } - FD_ZERO(&readfds); - FD_SET(fd, &readfds); + memset(fds, 0, sizeof(fds)); + fds[0].fd = fd; + fds[0].events = POLLIN; - n = select(fd + 1, &readfds, NULL, NULL, &tv); + n = poll(fds, ARRAY_CARDINALITY(fds), NETLINK_ACK_TIMEOUT_S); if (n <= 0) { if (n < 0) virReportSystemError(errno, "%s", - _("error in select call")); + _("error in poll call")); if (n == 0) virReportSystemError(ETIMEDOUT, "%s", _("no valid netlink response was received")); -- 1.8.2.1

2 1

[libvirt] [PATCH] portability: fix virNetDevSetMAC and virNetDevExists on BSD
by Roman Bogorodskiy 13 May '13

13 May '13

- provide virNetDevSetMAC() implementation based on SIOCSIFLLADDR ioctl. - adjust virNetDevExists() to check for ENXIO error because FreeBSD throws it when device doesn't exist --- configure.ac | 8 ++++++++ src/util/virnetdev.c | 41 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 992a778..95d303f 100644 --- a/configure.ac +++ b/configure.ac @@ -2372,6 +2372,14 @@ AC_CHECK_MEMBERS([struct ifreq.ifr_newname, #include <net/if.h> ]) +AC_CHECK_DECLS([link_addr], + [], [], + [#include <sys/types.h> + #include <sys/socket.h> + #include <net/if_dl.h> + ]) + + # Only COPYING.LIB is under version control, yet COPYING # is included as part of the distribution tarball. # Copy one to the other, but only if this is a srcdir-build. diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index d987b8e..0527a27 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -47,6 +47,11 @@ # undef HAVE_STRUCT_IFREQ #endif +#ifdef HAVE_DECL_LINK_ADDR +# include <sys/sockio.h> +# include <net/if_dl.h> +#endif + #define VIR_FROM_THIS VIR_FROM_NONE #if defined(HAVE_STRUCT_IFREQ) @@ -110,7 +115,7 @@ int virNetDevExists(const char *ifname) return -1; if (ioctl(fd, SIOCGIFFLAGS, &ifr)) { - if (errno == ENODEV) + if (errno == ENODEV || errno == ENXIO) ret = 0; else virReportSystemError(errno, @@ -179,6 +184,40 @@ cleanup: VIR_FORCE_CLOSE(fd); return ret; } +#elif defined(SIOCSIFLLADDR) && defined(HAVE_STRUCT_IFREQ) && \ + defined(HAVE_DECL_LINK_ADDR) +int virNetDevSetMAC(const char *ifname, + const virMacAddrPtr macaddr) +{ + struct ifreq ifr; + struct sockaddr_dl sdl; + char mac[VIR_MAC_STRING_BUFLEN + 1] = ":"; + int s; + int ret = -1; + + if ((s = virNetDevSetupControl(ifname, &ifr)) < 0) + return -1; + + virMacAddrFormat(macaddr, mac + 1); + sdl.sdl_len = sizeof(sdl); + link_addr(mac, &sdl); + + memcpy(ifr.ifr_addr.sa_data, sdl.sdl_data, VIR_MAC_BUFLEN); + ifr.ifr_addr.sa_len = VIR_MAC_BUFLEN; + + if (ioctl(s, SIOCSIFLLADDR, &ifr) < 0) { + virReportSystemError(errno, + _("Cannot set interface MAC on '%s'"), + ifname); + goto cleanup; + } + + ret = 0; +cleanup: + VIR_FORCE_CLOSE(s); + + return ret; +} #else int virNetDevSetMAC(const char *ifname, const virMacAddrPtr macaddr ATTRIBUTE_UNUSED) -- 1.8.0

2 3

[libvirt] [PATCH] Fix starting domains when kernel has no cgroups support
by Jim Fehlig 13 May '13

13 May '13

Found that I was unable to start existing domains after updating to a kernel with no cgroups support # zgrep CGROUP /proc/config.gz # CONFIG_CGROUPS is not set # virsh start test error: Failed to start domain test error: Unable to initialize /machine cgroup: Cannot allocate memory virCgroupPartitionNeedsEscaping() correctly returns errno (ENOENT) when attempting to open /proc/cgroups on such a system, but it was being dropped in virCgroupSetPartitionSuffix(). Change virCgroupSetPartitionSuffix() to propogate errors returned by its callees. Also check for ENOENT in qemuInitCgroup() when determining if cgroups support is available. --- src/qemu/qemu_cgroup.c | 3 ++- src/util/vircgroup.c | 19 +++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 9c45b76..40777aa 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -414,7 +414,8 @@ int qemuInitCgroup(virQEMUDriverPtr driver, if (rc != 0) { if (rc == -ENXIO || rc == -EPERM || - rc == -EACCES) { /* No cgroups mounts == success */ + rc == -EACCES || + rc == -ENOENT) { /* No cgroups mounts == success */ VIR_DEBUG("No cgroups present/configured/accessible, ignoring error"); goto done; } diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 473d2fc..ef619dc 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1167,14 +1167,14 @@ static int virCgroupPartitionEscape(char **path) return 0; } -static char *virCgroupSetPartitionSuffix(const char *path) +static int virCgroupSetPartitionSuffix(const char *path, char **res) { char **tokens = virStringSplit(path, "/", 0); size_t i; - char *ret = NULL; + int ret = -1; if (!tokens) - return NULL; + return ret; for (i = 0 ; tokens[i] != NULL ; i++) { /* Whitelist the 3 top level fixed dirs @@ -1193,20 +1193,27 @@ static char *virCgroupSetPartitionSuffix(const char *path) !strchr(tokens[i], '.')) { if (VIR_REALLOC_N(tokens[i], strlen(tokens[i]) + strlen(".partition") + 1) < 0) { + ret = -ENOMEM; virReportOOMError(); goto cleanup; } strcat(tokens[i], ".partition"); } - if (virCgroupPartitionEscape(&(tokens[i])) < 0) { - virReportOOMError(); + ret = virCgroupPartitionEscape(&(tokens[i])); + if (ret < 0) { + if (ret == -ENOMEM) + virReportOOMError(); goto cleanup; } } - if (!(ret = virStringJoin((const char **)tokens, "/"))) + if (!(*res = virStringJoin((const char **)tokens, "/"))) { + ret = -ENOMEM; goto cleanup; + } + + ret = 0; cleanup: virStringFreeList(tokens); -- 1.8.0.1

2 4

[libvirt] [PATCH] .gitignore: add fchosttest
by Ján Tomko 13 May '13

13 May '13

--- Pushed under the trivial rule. .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f181f89..3d874a9 100644 --- a/.gitignore +++ b/.gitignore @@ -144,6 +144,7 @@ /tests/domainsnapshotxml2xmltest /tests/esxutilstest /tests/eventtest +/tests/fchosttest /tests/fdstreamtest /tests/hashtest /tests/jsontest -- 1.8.1.5

1 0

[libvirt] RFC version information in API docs
by Claudio Bley 13 May '13

13 May '13

Hi. Sometimes, it's a bit hard to determine when exactly a function, flag or macro appeared in libvirt, ie. whether it will be supported on my target machine having a specific version of libvirt or not. So, I have created an enriched version of the API docs, using a XSL stylesheet enumerating the libvirt?-api.xml files of all libvirt releases. For an example, you can have a look here: http://avdv.github.io/libvirt/html/libvirt-libvirt.html#virVcpuState Hovering over an enum value displays version information in a tooltip. What do you think? Should this information be included by default in the API docs? If so, I could use a little help on how to integrate the generation of this information into the automake process. Basically, the XSL stylesheet enriches the generated libvirt-api.xml with the current version given as a parameter to xsltproc plus version information gathered from a previous enriched libvirt-api.xml file. That way, every symbol/node() gets a since="..." version attribute. So, during a build there's an extra step necessary when generating the libvirt-api.xml file: 1. apibuild.py => libvirt-api.1.xml 2. (libvirt-api.1.xml + libvirt-api.0.xml) => XSLT => libvirt-api.xml When releasing, libvirt-api.xml should be moved to libvirt-api.0.xml. Alternatively, there could be a second XSL file only extracting the version information without the boilerplate. Claudio -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

3 6

[libvirt] [PATCH v2 0/2] Support for VNC WebSocket
by Martin Kletzander 13 May '13

13 May '13

This series, which is meant to be applied _after_ 1.0.5 release, is adding support for the VNC WebSocket to be configured for QEMU. Documentation from qemu_options.hx: qemu -vnc ...,websocket[=<port>] Opens an additional TCP listening port dedicated to VNC Websocket connections. By definition the Websocket port is 5700+@var{display}. If @var{host} is specified connections will only be allowed from this host. As an alternative the Websocket port could be specified by using @code{websocket}=@var{port}. v2: - Incorporated recommendations from RFC [1] [1] http://www.redhat.com/archives/libvir-list/2013-April/msg02056.html Martin Kletzander (2): Add VNC WebSocket support qemu: Add VNC WebSocket support docs/formatdomain.html.in | 5 ++++ docs/schemas/domaincommon.rng | 5 ++++ src/conf/domain_conf.c | 16 ++++++++++ src/conf/domain_conf.h | 1 + src/qemu/libvirtd_qemu.aug | 2 ++ src/qemu/qemu.conf | 7 +++++ src/qemu/qemu_capabilities.c | 11 +++++-- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 60 ++++++++++++++++++++++++++++++++++++-- src/qemu/qemu_command.h | 5 +++- src/qemu/qemu_conf.c | 32 ++++++++++++++++++++ src/qemu/qemu_conf.h | 6 ++++ src/qemu/qemu_driver.c | 5 ++++ src/qemu/qemu_process.c | 31 ++++++++++++++++---- src/qemu/test_libvirtd_qemu.aug.in | 2 ++ tests/qemuargv2xmltest.c | 1 + tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmltest.c | 1 + 18 files changed, 180 insertions(+), 12 deletions(-) -- 1.8.2.1

3 10

[libvirt] qemu command line quoting (was: Re: [Libguestfs] [PATCH 0/5] rbd improvements)
by Richard W.M. Jones 13 May '13

13 May '13

On Sun, May 12, 2013 at 02:42:36PM -0400, Mike Kelly wrote: > On Thu, May 9, 2013 at 12:21 PM, Richard W.M. Jones <rjones(a)redhat.com> wrote: > > On Thu, May 09, 2013 at 11:23:55AM -0400, Mike Kelly wrote: > >> On Wed, May 8, 2013 at 6:53 AM, Richard W.M. Jones <rjones(a)redhat.com> wrote: > >> > One worry I have is whether quoting is required for the server > >> > name(s), export name, username and secret. > >> > >> Well. I think the main things we had to quote were ':' and ';', but > >> none of those are valid in a hostname. Username also probably doesn't > >> contain anything special, and secret is a base64-encoded string. I > >> confirmed that even with the string ending in '==', it was parsed just > >> fine by qemu, at least in my limited manual testing. > >> > >> If you can suggest a way to be more robust this, though, then I can > >> try to work that into a future patch series. > > > > The quoting problem happens when someone writes a program which takes > > (eg) a hostname string from the user and passes it unmodified to the > > guestfs API. It's an issue if this string can cause unexpected [even > > malicious/exploitable] things to happen when passed unquoted on the > > qemu command line. > > Well, I'm not sure if this way of setting things up is still > encouraged, but at least this documentation suggests basically using > the fact that libvirt won't quote the image name as a "feature": > > http://ceph.com/w/index.php?title=QEMU-RBD#Caching > > <disk type='network' device='disk'> > <source protocol='rbd' > name='poolname/imagename:rbd_cache=1:rbd_cache_size=67108864:rbd_cache_max_dirty=0'/> Hmmm ... This is a bug in libvirt, but also a missing feature of libvirt since it cannot express these other configuration fields. > <driver name='qemu' type='rbd'/> > <target dev='vda' bus='virtio'/> > </disk> > > The more official documentation for configuring caching doesn't seem > to make any specific mention of this: > > http://ceph.com/docs/master/rbd/qemu-rbd/#qemu-cache-options > http://ceph.com/docs/master/rbd/libvirt/ > http://ceph.com/docs/master/rbd/rbd-config-ref/ By the way, I fixed some qemu-img command line quoting issues yesterday (but not in ceph): https://github.com/libguestfs/libguestfs/commit/914d3e68ec272436f91080f47dd… 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#)

2 1

[libvirt] [PATCH] Escaping leading '.' in cgroup names
by Daniel P. Berrange 13 May '13

13 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Escaping a leading '.' with '_' in the cgroup names Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/util/vircgroup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 473d2fc..4de1d55 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1106,7 +1106,8 @@ static int virCgroupPartitionNeedsEscaping(const char *path) if (STRPREFIX(path, "cgroup.")) return 1; - if (path[0] == '_') + if (path[0] == '_' || + path[0] == '.') return 1; if (!(fp = fopen("/proc/cgroups", "r"))) -- 1.8.1.4

2 1

[libvirt] [PATCH] security_apparmor.c: Include virscsi.h
by Michal Privoznik 13 May '13

13 May '13

After introducing AppArmorSetSecuritySCSILabel() in 2691cd5f we are using virSCSIDevicePtr type without proper include. --- Pushed as build breaker. src/security/security_apparmor.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 50d7983..3680279 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -49,6 +49,7 @@ #include "vircommand.h" #include "virlog.h" #include "virstring.h" +#include "virscsi.h" #define VIR_FROM_THIS VIR_FROM_SECURITY #define SECURITY_APPARMOR_VOID_DOI "0" -- 1.8.2.1

1 0

[libvirt] wrong warning flags for clang
by Roman Bogorodskiy 13 May '13

13 May '13

Appears that configure doesn't properly detect the case when clang is used instead of gcc: CC=clang ./configure runs fine, but produces a long list of warning flags that clang doesn't support: configure: Warning Flags: -W -Waddress -Wall -Warray-bounds -Wattributes -Wbad-function-cast ... trimmed ... At some point, compilation fails: CC libvirt_util_la-viralloc.lo clang: error: unknown warning option '-Wclobbered' [-Werror,-Wunknown-warning-option] clang: error: unknown warning option '-Wcoverage-mismatch'; did you mean '-Wpointer-type-mismatch'? [-Werror,-Wunknown-warning-option] and many other similar errors. Any idea what would be a proper fix for that? Roman Bogorodskiy

2 1

[libvirt] [libvirt PATCH] node_device: Clean up unused macros
by Osier Yang 13 May '13

13 May '13

All of these macros are not used anymore, remove them. --- src/node_device/node_device_driver.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h index 2dff70f..0f62c83 100644 --- a/src/node_device/node_device_driver.h +++ b/src/node_device/node_device_driver.h @@ -28,15 +28,6 @@ # include "driver.h" # include "node_device_conf.h" -# define LINUX_SYSFS_SCSI_HOST_PREFIX "/sys/class/scsi_host/" -# define LINUX_SYSFS_SCSI_HOST_POSTFIX "device" -# define LINUX_SYSFS_FC_HOST_PREFIX "/sys/class/fc_host/" - -# define VPORT_CREATE 0 -# define VPORT_DELETE 1 -# define LINUX_SYSFS_VPORT_CREATE_POSTFIX "/vport_create" -# define LINUX_SYSFS_VPORT_DELETE_POSTFIX "/vport_delete" - # define LINUX_NEW_DEVICE_WAIT_TIME 60 # ifdef WITH_HAL -- 1.8.1.4

2 2

[libvirt] [PATCH v3] domain: add 'pre-startup' signal and do nodedevs checking
by Guannan Ren 13 May '13

13 May '13

This patch introduces 'pre-start' signal and registers nodedev checking handler to check duplicate USB devices. If virt-manager can not identify unique usb device any more before domain startup, it will throw a tip error to tell it is time to reattach host USB devices to get updated bus/addr info. --- virtManager/domain.py | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/virtManager/domain.py b/virtManager/domain.py index 791f2af..89c226b 100644 --- a/virtManager/domain.py +++ b/virtManager/domain.py @@ -149,6 +149,7 @@ class vmmDomain(vmmLibvirtObject): "status-changed": (GObject.SignalFlags.RUN_FIRST, None, [int, int]), "resources-sampled": (GObject.SignalFlags.RUN_FIRST, None, []), "inspection-changed": (GObject.SignalFlags.RUN_FIRST, None, []), + "pre-startup": (GObject.SignalFlags.RUN_FIRST, None, [object]), } def __init__(self, conn, backend, uuid): @@ -252,7 +253,34 @@ class vmmDomain(vmmLibvirtObject): self.connect("status-changed", self._update_start_vcpus) self.connect("config-changed", self._reparse_xml) + self.connect("pre-startup", self._prestartup_nodedev_check) + def _prestartup_nodedev_check(self, src, ret): + ignore = src + error = _("These is more than one '%s' device attached to " + "your host, and we can't determine which one to " + "use for your guest.\n" + "To fix this, remove and reattach the USB device " + "to your guest using the 'Add Hardware' wizard.") + + for hostdev in self.get_hostdev_devices(): + devtype = hostdev.type + + if devtype != "usb": + continue + + vendor = hostdev.vendor + product = hostdev.product + bus = hostdev.bus + device = hostdev.device + + if vendor and product: + count = self.conn.get_nodedevs_number("usb_device", + vendor, + product) + if count > 1 and not (bus and device): + prettyname = "%s %s" % (vendor, product) + ret.append(error % prettyname) ########################### # Misc API getter methods # @@ -1171,6 +1199,13 @@ class vmmDomain(vmmLibvirtObject): if self.get_cloning(): raise RuntimeError(_("Cannot start guest while cloning " "operation in progress")) + + pre_startup_ret = [] + self.emit("pre-startup", pre_startup_ret) + + for error in pre_startup_ret: + raise RuntimeError(error) + self._backend.create() self.idle_add(self.force_update_status) -- 1.8.1.4

1 1

[libvirt] [libvirt-glib 0/3] small cleanups
by Christophe Fergeau 13 May '13

13 May '13

The 3 patches fix various small warnings when building, and a misnamed function call in some examples. Christophe

2 4

[libvirt] Another pass. virt-sandbox-service create --mount suport
by dwalsh＠redhat.com 13 May '13

13 May '13

[sandbox PATCH] Add support for virt-sandbox-service to add

2 2

[libvirt] [PATCH v2 0/8] Add user namespace support for libvirt lxc
by Gao feng 13 May '13

13 May '13

This patchset try to add userns support for libvirt lxc. Since userns is nearly completed in linux-3.9, the old kernel doesn't support userns, I add some New XML elements to let people decide if enable userns.The userns is enabled only when user configure the XML. The format of user namespace related XML file like below: <idmap> <uid start='0' target='1000' count='10'> <gid start='0' target='1000' count='10'> </idmap> it means the user in container (which uid:gid is 0:0) will be mapped to the user in host (uid:gid is 1000:1000), count is used to form an u/gid range: The users in container which uid in [start, start + count -1] will be mapped. You can have multiple lines to map differnet id ranges, caution, you must make sure the root user of container has been mapped. This patchset also does the below jobs. 1, Because the uninit userns has no right to create devices, we should create devices for container on host. 2, Changes the owner of fuse and tty device. Gao feng (8): LXC: Introduce New XML element for user namespace LXC: enable user namespace when user set the uidmap LXC: sort the uidmap/gidmap of domain LXC: introduce virLXCControllerSetupUserns and lxcContainerSetUserns LXC: Creating devices for container on host side LXC: change the owner of devices created on host LXC: change the owner of tty devices to the root user of container LXC: fuse: Change files owner to the root user of container docs/formatdomain.html.in | 23 +++++ docs/schemas/domaincommon.rng | 28 ++++++ src/conf/domain_conf.c | 111 +++++++++++++++++++++ src/conf/domain_conf.h | 19 ++++ src/lxc/lxc_container.c | 120 +++++++++++------------ src/lxc/lxc_controller.c | 218 +++++++++++++++++++++++++++++++++++++++++- src/lxc/lxc_fuse.c | 6 ++ 7 files changed, 455 insertions(+), 70 deletions(-) -- 1.8.1.4

3 17

[libvirt] [PATCH] build: fix use of mmap
by Eric Blake 11 May '13

11 May '13

Commit bfe7721d introduced a regression, but only on platforms like FreeBSD that lack posix_fallocate and where mmap serves as a nice fallback for safezero. util/virfile.c: In function 'safezero': util/virfile.c:837: error: 'PROT_READ' undeclared (first use in this function) * src/util/virutil.c (includes): Move use of <sys/mman.h>... * src/util/virfile.c (includes): ...to the file that uses mmap. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. src/util/virfile.c | 3 +++ src/util/virutil.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index 1491f27..a59d67d 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -39,6 +39,9 @@ # include <mntent.h> #endif #include <stdlib.h> +#if HAVE_MMAP +# include <sys/mman.h> +#endif #if defined(__linux__) && HAVE_DECL_LO_FLAGS_AUTOCLEAR # include <linux/loop.h> diff --git a/src/util/virutil.c b/src/util/virutil.c index 43814df..3c0a481 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -36,9 +36,6 @@ #include <sys/stat.h> #include <sys/types.h> #include <sys/ioctl.h> -#if HAVE_MMAP -# include <sys/mman.h> -#endif #include <string.h> #include <termios.h> #include <locale.h> -- 1.8.1.4

1 0

[libvirt] [PATCH] build: update to latest gnulib, for syntax-check
by Eric Blake 11 May '13

11 May '13

This picks up a fix for a syntax-check weakness mentioned here: https://www.redhat.com/archives/libvir-list/2013-May/msg00811.html * .gnulib: Update to latest, for maint.mk improvement. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. * .gnulib 0f8ddbf...a363f4e (3): > maint.mk: catch more abuse of HAVE_DECL in syntax-check > deps: require Automake >= 1.9.6 in generated Makefile fragments > autoupdate .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index 0f8ddbf..a363f4e 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 0f8ddbf1a13a93a4584afdd82f0f87e498a0db6f +Subproject commit a363f4ed4a0e69187c97686ac44502c49c7f4b3d -- 1.8.1.4

1 0

[libvirt] patch set for virt-sandbox-service
by dwalsh＠redhat.com 11 May '13

11 May '13

The patch will add proper handling of duplicate Generic Sandbox. It will also add support for adding mount points via virt-sandbox-service using the same syntax as virt-sandbox. [sandbox PATCH 1/2] Verify that a created Generic Sandbox does not [sandbox PATCH 2/2] Add support for virt-sandbox-service to add

2 4

[libvirt] [PATCH] Update hellolibvirt to demo virGetLastErrorMessage()
by Daniel P. Berrange 11 May '13

11 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Update the hellolibvirt example program to demonstrate use of the virGetLastErrorMessage() API for quick error reporting Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- examples/hellolibvirt/hellolibvirt.c | 64 ++++++++---------------------------- 1 file changed, 14 insertions(+), 50 deletions(-) diff --git a/examples/hellolibvirt/hellolibvirt.c b/examples/hellolibvirt/hellolibvirt.c index 26dd67f..4ae60fc 100644 --- a/examples/hellolibvirt/hellolibvirt.c +++ b/examples/hellolibvirt/hellolibvirt.c @@ -9,42 +9,6 @@ #include <libvirt/libvirt.h> #include <libvirt/virterror.h> -static void -showError(virConnectPtr conn) -{ - int ret; - virErrorPtr err; - - err = malloc(sizeof(*err)); - if (!err) { - printf("Could not allocate memory for error data\n"); - goto out; - } - - ret = virConnCopyLastError(conn, err); - - switch (ret) { - case 0: - printf("No error found\n"); - break; - - case -1: - printf("Parameter error when attempting to get last error\n"); - break; - - default: - printf("libvirt reported: \"%s\"\n", err->message); - break; - } - - virResetError(err); - free(err); - -out: - return; -} - - static int showHypervisorInfo(virConnectPtr conn) { @@ -59,15 +23,15 @@ showHypervisorInfo(virConnectPtr conn) hvType = virConnectGetType(conn); if (!hvType) { ret = 1; - printf("Failed to get hypervisor type\n"); - showError(conn); + printf("Failed to get hypervisor type: %s\n", + virGetLastErrorMessage()); goto out; } if (0 != virConnectGetVersion(conn, &hvVer)) { ret = 1; - printf("Failed to get hypervisor version\n"); - showError(conn); + printf("Failed to get hypervisor version: %s\n", + virGetLastErrorMessage()); goto out; } @@ -102,16 +66,16 @@ showDomains(virConnectPtr conn) numActiveDomains = virConnectNumOfDomains(conn); if (numActiveDomains == -1) { ret = 1; - printf("Failed to get number of active domains\n"); - showError(conn); + printf("Failed to get number of active domains: %s\n", + virGetLastErrorMessage()); goto out; } numInactiveDomains = virConnectNumOfDefinedDomains(conn); if (numInactiveDomains == -1) { ret = 1; - printf("Failed to get number of inactive domains\n"); - showError(conn); + printf("Failed to get number of inactive domains: %s\n", + virGetLastErrorMessage()); goto out; } @@ -157,16 +121,16 @@ main(int argc, char *argv[]) if (!conn) { ret = 1; - printf("No connection to hypervisor\n"); - showError(conn); + printf("No connection to hypervisor: %s\n", + virGetLastErrorMessage()); goto out; } uri = virConnectGetURI(conn); if (!uri) { ret = 1; - printf("Failed to get URI for hypervisor connection\n"); - showError(conn); + printf("Failed to get URI for hypervisor connection: %s\n", + virGetLastErrorMessage()); goto disconnect; } @@ -185,8 +149,8 @@ main(int argc, char *argv[]) disconnect: if (0 != virConnectClose(conn)) { - printf("Failed to disconnect from hypervisor\n"); - showError(conn); + printf("Failed to disconnect from hypervisor: %s\n", + virGetLastErrorMessage()); ret = 1; } else { printf("Disconnected from hypervisor\n"); -- 1.8.2.1

2 1

[libvirt] [PATCH 0/3] Test case for fdstream / iohelper code
by Daniel P. Berrange 11 May '13

11 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> There was a recent embarassing regression in the fdstream iohelper code which broke many commands/APIs. The problem code in question is quite easily testable via the unit tests. Daniel P. Berrange (3): Add a virGetLastErrorMessage() function Allow the iohelper path to be customized by test programs Add a test case for the fdstream file read/write code .gitignore | 1 + include/libvirt/virterror.h | 2 + src/fdstream.c | 14 +- src/fdstream.h | 3 + src/libvirt_private.syms | 1 + src/libvirt_public.syms | 5 + src/util/virerror.c | 21 +++ tests/Makefile.am | 5 + tests/fdstreamtest.c | 353 ++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 404 insertions(+), 1 deletion(-) create mode 100644 tests/fdstreamtest.c -- 1.8.2.1

2 7

[libvirt] [PATCH] Fix iohelper usage with streams opened for read
by Daniel P. Berrange 10 May '13

10 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> In b2878ed860ceceec3cd6481424fed0b543b687cd we added the O_NOCTTY flag when opening files in the stream code. Unfortunately a later piece of code was comparing the flags == O_RDONLY, without masking out the non-access mode flags. This broke the iohelper when used with streams for read, since it caused us to attach the stream output pipe to the stream input FD instead of output FD :-( Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/fdstream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fdstream.c b/src/fdstream.c index 6f8ce53..a9a4851 100644 --- a/src/fdstream.c +++ b/src/fdstream.c @@ -641,7 +641,7 @@ virFDStreamOpenFileInternal(virStreamPtr st, virCommandTransferFD(cmd, fd); virCommandAddArgFormat(cmd, "%d", fd); - if (oflags == O_RDONLY) { + if ((oflags & O_ACCMODE) == O_RDONLY) { childfd = fds[1]; fd = fds[0]; virCommandSetOutputFD(cmd, &childfd); -- 1.8.2.1

2 2

[libvirt] [PATCH] Build breaker - requires VIR_FROM_THIS
by John Ferlan 10 May '13

10 May '13

Push under build-breaker --- tests/storagebackendsheepdogtest.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c index 39b2299..d4fa479 100644 --- a/tests/storagebackendsheepdogtest.c +++ b/tests/storagebackendsheepdogtest.c @@ -34,6 +34,7 @@ #include "storage/storage_backend_sheepdog.h" #include "virstring.h" +#define VIR_FROM_THIS VIR_FROM_NONE typedef struct { const char *output; -- 1.8.1.4

1 0

[libvirt] [libvirt-java] [PATCH] trivial remove unused imports
by Stefan Majer 10 May '13

10 May '13

Signed-off-by: Stefan Majer <stefan.majer at gmail dot com> --- src/main/java/org/libvirt/jna/Libvirt.java | 1 - src/main/java/org/libvirt/jna/virError.java | 1 - 2 files changed, 2 deletions(-) diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 0a5e372..6da368f 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -7,7 +7,6 @@ import com.sun.jna.NativeLong; import com.sun.jna.Pointer; import com.sun.jna.ptr.IntByReference; import com.sun.jna.ptr.LongByReference; -import com.sun.jna.ptr.PointerByReference; /** * The libvirt interface which is exposed via JNA. The complete API is diff --git a/src/main/java/org/libvirt/jna/virError.java b/src/main/java/org/libvirt/jna/virError.java index 3c11311..36b9f69 100644 --- a/src/main/java/org/libvirt/jna/virError.java +++ b/src/main/java/org/libvirt/jna/virError.java @@ -3,7 +3,6 @@ package org.libvirt.jna; import java.util.Arrays; import java.util.List; -import com.sun.jna.Pointer; import com.sun.jna.Structure; /** -- 1.8.1.2 -- Stefan Majer

3 2

[libvirt] This patch allows virt-sandbox-service to add additional mount points.
by dwalsh＠redhat.com 10 May '13

10 May '13

We want to allow an admin to specify additional mount points at the command line. [sandbox PATCH 1/1] Add support for adding mountpoints via the

2 2

[libvirt] [PATCH 0/6 v3] Support NBD volumes with LXC containers
by Daniel P. Berrange 10 May '13

10 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> A third version of: https://www.redhat.com/archives/libvir-list/2013-April/msg01539.html In v3 - Split patch 3 into 2 pieces - Added XML formatting tests - Fixed XML formatting - Remove !! from vars that are now bools Daniel P. Berrange (6): Add support for storage format in FS <driver> Re-arrange code setting up ifs/disk loop devices for LXC Fix error handling of readdir() in virFileLoopDeviceOpen Add a helper API for setting up a NBD device with qemu-nbd Add 'nbd' as a valid filesystem driver type Support NBD backed disks/filesystems in LXC driver docs/formatdomain.html.in | 25 +++++ docs/schemas/domaincommon.rng | 74 +++++++++++---- src/conf/domain_conf.c | 33 +++++-- src/conf/domain_conf.h | 7 +- src/libvirt_private.syms | 1 + src/lxc/lxc_controller.c | 152 ++++++++++++++++++++++------- src/qemu/qemu_command.c | 4 +- src/util/virfile.c | 153 +++++++++++++++++++++++++++++- src/util/virfile.h | 6 ++ tests/lxcxml2xmldata/lxc-disk-formats.xml | 31 ++++++ tests/lxcxml2xmltest.c | 1 + 11 files changed, 421 insertions(+), 66 deletions(-) create mode 100644 tests/lxcxml2xmldata/lxc-disk-formats.xml -- 1.8.2.1

2 13

[libvirt] [PATCH] virGetStorageVol: Don't ignore NULL pool name
by Michal Privoznik 10 May '13

10 May '13

The function takes pool name as argument. However, it is not acceptable for it to be NULL. Hence, we should check it and report error in case it is. --- src/datatypes.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/datatypes.c b/src/datatypes.c index f815b6c..884eb3e 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -520,6 +520,7 @@ virGetStorageVol(virConnectPtr conn, const char *pool, const char *name, virLibConnError(VIR_ERR_INVALID_CONN, "%s", _("no connection")); return NULL; } + virCheckNonNullArgReturn(pool, NULL); virCheckNonNullArgReturn(name, NULL); virCheckNonNullArgReturn(key, NULL); -- 1.8.2.1

2 1

[libvirt] [PATCH 0/2] Domain event example C code misues api
by Jesse J. Cook 10 May '13

10 May '13

From: "Jesse J. Cook" <jcook(a)camber.com> The example program makes a call to virEventRegisterDefaultImpl before calling virConnectOpen without a call to virInitialize. Interestingly enough, the example code works. However, once you introduce a call to g_string_new it breaks. This can result in unintentional misuse of the API. Relates to: Red Hat Bugzilla – Bug 961155 Jesse J. Cook (2): dom event example: init before register event impl dom event example: Add error check to impl call examples/domain-events/events-c/event-test.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) -- 1.7.10.4

2 5

[libvirt] [PATCH] Fix naming of methods in ESX storage backends to follow public APIs
by Daniel P. Berrange 10 May '13

10 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The previous update of method naming missed the ESX storage backend files. Update them is that the driver impl methods follow the naming of the public API but with s/vir/esx/ Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/esx/esx_storage_backend_iscsi.c | 104 ++++++++++++++++++------------------ src/esx/esx_storage_backend_vmfs.c | 104 ++++++++++++++++++------------------ 2 files changed, 104 insertions(+), 104 deletions(-) diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c index a22adb4..d91d7b0 100644 --- a/src/esx/esx_storage_backend_iscsi.c +++ b/src/esx/esx_storage_backend_iscsi.c @@ -51,7 +51,7 @@ verify(MD5_DIGEST_SIZE == VIR_UUID_BUFLEN); static int -esxStorageBackendISCSINumberOfPools(virConnectPtr conn) +esxConnectNumOfStoragePools(virConnectPtr conn) { bool success = false; int count = 0; @@ -95,8 +95,8 @@ esxStorageBackendISCSINumberOfPools(virConnectPtr conn) static int -esxStorageBackendISCSIListPools(virConnectPtr conn, char **const names, - const int maxnames) +esxConnectListStoragePools(virConnectPtr conn, char **const names, + const int maxnames) { bool success = false; int count = 0; @@ -154,8 +154,8 @@ esxStorageBackendISCSIListPools(virConnectPtr conn, char **const names, static virStoragePoolPtr -esxStorageBackendISCSIPoolLookupByName(virConnectPtr conn, - const char *name) +esxStoragePoolLookupByName(virConnectPtr conn, + const char *name) { esxPrivate *priv = conn->storagePrivateData; esxVI_HostInternetScsiHbaStaticTarget *target = NULL; @@ -196,8 +196,8 @@ esxStorageBackendISCSIPoolLookupByName(virConnectPtr conn, static virStoragePoolPtr -esxStorageBackendISCSIPoolLookupByUUID(virConnectPtr conn, - const unsigned char *uuid) +esxStoragePoolLookupByUUID(virConnectPtr conn, + const unsigned char *uuid) { virStoragePoolPtr pool = NULL; esxPrivate *priv = conn->storagePrivateData; @@ -245,8 +245,8 @@ esxStorageBackendISCSIPoolLookupByUUID(virConnectPtr conn, static int -esxStorageBackendISCSIPoolRefresh(virStoragePoolPtr pool, - unsigned int flags) +esxStoragePoolRefresh(virStoragePoolPtr pool, + unsigned int flags) { int result = -1; esxPrivate *priv = pool->conn->storagePrivateData; @@ -280,8 +280,8 @@ esxStorageBackendISCSIPoolRefresh(virStoragePoolPtr pool, static int -esxStorageBackendISCSIPoolGetInfo(virStoragePoolPtr pool ATTRIBUTE_UNUSED, - virStoragePoolInfoPtr info) +esxStoragePoolGetInfo(virStoragePoolPtr pool ATTRIBUTE_UNUSED, + virStoragePoolInfoPtr info) { /* These fields are not valid for iSCSI pool */ info->allocation = info->capacity = info->available = 0; @@ -293,7 +293,7 @@ esxStorageBackendISCSIPoolGetInfo(virStoragePoolPtr pool ATTRIBUTE_UNUSED, static char * -esxStorageBackendISCSIPoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) +esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) { char *xml = NULL; esxPrivate *priv = pool->conn->storagePrivateData; @@ -358,7 +358,7 @@ esxStorageBackendISCSIPoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) static int -esxStorageBackendISCSIPoolNumberOfVolumes(virStoragePoolPtr pool) +esxStoragePoolNumOfVolumes(virStoragePoolPtr pool) { int count = 0; esxPrivate *priv = pool->conn->storagePrivateData; @@ -384,8 +384,8 @@ esxStorageBackendISCSIPoolNumberOfVolumes(virStoragePoolPtr pool) static int -esxStorageBackendISCSIPoolListVolumes(virStoragePoolPtr pool, char **const names, - int maxnames) +esxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names, + int maxnames) { bool success = false; int count = 0; @@ -444,8 +444,8 @@ esxStorageBackendISCSIPoolListVolumes(virStoragePoolPtr pool, char **const names static virStorageVolPtr -esxStorageBackendISCSIVolumeLookupByName(virStoragePoolPtr pool, - const char *name) +esxStorageVolLookupByName(virStoragePoolPtr pool, + const char *name) { virStorageVolPtr volume = NULL; esxPrivate *priv = pool->conn->storagePrivateData; @@ -491,7 +491,7 @@ esxStorageBackendISCSIVolumeLookupByName(virStoragePoolPtr pool, static virStorageVolPtr -esxStorageBackendISCSIVolumeLookupByPath(virConnectPtr conn, const char *path) +esxStorageVolLookupByPath(virConnectPtr conn, const char *path) { virStorageVolPtr volume = NULL; esxPrivate *priv = conn->storagePrivateData; @@ -539,7 +539,7 @@ esxStorageBackendISCSIVolumeLookupByPath(virConnectPtr conn, const char *path) static virStorageVolPtr -esxStorageBackendISCSIVolumeLookupByKey(virConnectPtr conn, const char *key) +esxStorageVolLookupByKey(virConnectPtr conn, const char *key) { virStorageVolPtr volume = NULL; esxPrivate *priv = conn->storagePrivateData; @@ -552,7 +552,7 @@ esxStorageBackendISCSIVolumeLookupByKey(virConnectPtr conn, const char *key) /* key may be LUN device path */ if (STRPREFIX(key, "/")) { - return esxStorageBackendISCSIVolumeLookupByPath(conn, key); + return esxStorageVolLookupByPath(conn, key); } if (esxVI_LookupScsiLunList(priv->primary, &scsiLunList) < 0) { @@ -594,9 +594,9 @@ esxStorageBackendISCSIVolumeLookupByKey(virConnectPtr conn, const char *key) static virStorageVolPtr -esxStorageBackendISCSIVolumeCreateXML(virStoragePoolPtr pool ATTRIBUTE_UNUSED, - const char *xmldesc ATTRIBUTE_UNUSED, - unsigned int flags) +esxStorageVolCreateXML(virStoragePoolPtr pool ATTRIBUTE_UNUSED, + const char *xmldesc ATTRIBUTE_UNUSED, + unsigned int flags) { virCheckFlags(0, NULL); @@ -609,10 +609,10 @@ esxStorageBackendISCSIVolumeCreateXML(virStoragePoolPtr pool ATTRIBUTE_UNUSED, static virStorageVolPtr -esxStorageBackendISCSIVolumeCreateXMLFrom(virStoragePoolPtr pool ATTRIBUTE_UNUSED, - const char *xmldesc ATTRIBUTE_UNUSED, - virStorageVolPtr sourceVolume ATTRIBUTE_UNUSED, - unsigned int flags) +esxStorageVolCreateXMLFrom(virStoragePoolPtr pool ATTRIBUTE_UNUSED, + const char *xmldesc ATTRIBUTE_UNUSED, + virStorageVolPtr sourceVolume ATTRIBUTE_UNUSED, + unsigned int flags) { virCheckFlags(0, NULL); @@ -625,8 +625,8 @@ esxStorageBackendISCSIVolumeCreateXMLFrom(virStoragePoolPtr pool ATTRIBUTE_UNUSE static char * -esxStorageBackendISCSIVolumeGetXMLDesc(virStorageVolPtr volume, - unsigned int flags) +esxStorageVolGetXMLDesc(virStorageVolPtr volume, + unsigned int flags) { char *xml = NULL; esxPrivate *priv = volume->conn->storagePrivateData; @@ -701,8 +701,8 @@ esxStorageBackendISCSIVolumeGetXMLDesc(virStorageVolPtr volume, static int -esxStorageBackendISCSIVolumeDelete(virStorageVolPtr volume ATTRIBUTE_UNUSED, - unsigned int flags) +esxStorageVolDelete(virStorageVolPtr volume ATTRIBUTE_UNUSED, + unsigned int flags) { virCheckFlags(0, -1); @@ -715,8 +715,8 @@ esxStorageBackendISCSIVolumeDelete(virStorageVolPtr volume ATTRIBUTE_UNUSED, static int -esxStorageBackendISCSIVolumeWipe(virStorageVolPtr volume ATTRIBUTE_UNUSED, - unsigned int flags) +esxStorageVolWipe(virStorageVolPtr volume ATTRIBUTE_UNUSED, + unsigned int flags) { virCheckFlags(0, -1); @@ -730,7 +730,7 @@ esxStorageBackendISCSIVolumeWipe(virStorageVolPtr volume ATTRIBUTE_UNUSED, static char * -esxStorageBackendISCSIVolumeGetPath(virStorageVolPtr volume) +esxStorageVolGetPath(virStorageVolPtr volume) { char *path; @@ -741,22 +741,22 @@ esxStorageBackendISCSIVolumeGetPath(virStorageVolPtr volume) virStorageDriver esxStorageBackendISCSI = { - .connectNumOfStoragePools = esxStorageBackendISCSINumberOfPools, /* 1.0.1 */ - .connectListStoragePools = esxStorageBackendISCSIListPools, /* 1.0.1 */ - .storagePoolLookupByName = esxStorageBackendISCSIPoolLookupByName, /* 1.0.1 */ - .storagePoolLookupByUUID = esxStorageBackendISCSIPoolLookupByUUID, /* 1.0.1 */ - .storagePoolRefresh = esxStorageBackendISCSIPoolRefresh, /* 1.0.1 */ - .storagePoolGetInfo = esxStorageBackendISCSIPoolGetInfo, /* 1.0.1 */ - .storagePoolGetXMLDesc = esxStorageBackendISCSIPoolGetXMLDesc, /* 1.0.1 */ - .storagePoolNumOfVolumes = esxStorageBackendISCSIPoolNumberOfVolumes, /* 1.0.1 */ - .storagePoolListVolumes = esxStorageBackendISCSIPoolListVolumes, /* 1.0.1 */ - .storageVolLookupByName = esxStorageBackendISCSIVolumeLookupByName, /* 1.0.1 */ - .storageVolLookupByPath = esxStorageBackendISCSIVolumeLookupByPath, /* 1.0.1 */ - .storageVolLookupByKey = esxStorageBackendISCSIVolumeLookupByKey, /* 1.0.1 */ - .storageVolCreateXML = esxStorageBackendISCSIVolumeCreateXML, /* 1.0.1 */ - .storageVolCreateXMLFrom = esxStorageBackendISCSIVolumeCreateXMLFrom, /* 1.0.1 */ - .storageVolGetXMLDesc = esxStorageBackendISCSIVolumeGetXMLDesc, /* 1.0.1 */ - .storageVolDelete = esxStorageBackendISCSIVolumeDelete, /* 1.0.1 */ - .storageVolWipe = esxStorageBackendISCSIVolumeWipe, /* 1.0.1 */ - .storageVolGetPath = esxStorageBackendISCSIVolumeGetPath, /* 1.0.1 */ + .connectNumOfStoragePools = esxConnectNumOfStoragePools, /* 1.0.1 */ + .connectListStoragePools = esxConnectListStoragePools, /* 1.0.1 */ + .storagePoolLookupByName = esxStoragePoolLookupByName, /* 1.0.1 */ + .storagePoolLookupByUUID = esxStoragePoolLookupByUUID, /* 1.0.1 */ + .storagePoolRefresh = esxStoragePoolRefresh, /* 1.0.1 */ + .storagePoolGetInfo = esxStoragePoolGetInfo, /* 1.0.1 */ + .storagePoolGetXMLDesc = esxStoragePoolGetXMLDesc, /* 1.0.1 */ + .storagePoolNumOfVolumes = esxStoragePoolNumOfVolumes, /* 1.0.1 */ + .storagePoolListVolumes = esxStoragePoolListVolumes, /* 1.0.1 */ + .storageVolLookupByName = esxStorageVolLookupByName, /* 1.0.1 */ + .storageVolLookupByPath = esxStorageVolLookupByPath, /* 1.0.1 */ + .storageVolLookupByKey = esxStorageVolLookupByKey, /* 1.0.1 */ + .storageVolCreateXML = esxStorageVolCreateXML, /* 1.0.1 */ + .storageVolCreateXMLFrom = esxStorageVolCreateXMLFrom, /* 1.0.1 */ + .storageVolGetXMLDesc = esxStorageVolGetXMLDesc, /* 1.0.1 */ + .storageVolDelete = esxStorageVolDelete, /* 1.0.1 */ + .storageVolWipe = esxStorageVolWipe, /* 1.0.1 */ + .storageVolGetPath = esxStorageVolGetPath, /* 1.0.1 */ }; diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c index dd638ad..63974ab 100644 --- a/src/esx/esx_storage_backend_vmfs.c +++ b/src/esx/esx_storage_backend_vmfs.c @@ -111,7 +111,7 @@ esxLookupVMFSStoragePoolType(esxVI_Context *ctx, const char *poolName, static int -esxStorageBackendVMFSNumberOfPools(virConnectPtr conn) +esxConnectNumOfStoragePools(virConnectPtr conn) { int count = 0; esxPrivate *priv = conn->storagePrivateData; @@ -135,8 +135,8 @@ esxStorageBackendVMFSNumberOfPools(virConnectPtr conn) static int -esxStorageBackendVMFSListPools(virConnectPtr conn, char **const names, - const int maxnames) +esxConnectListStoragePools(virConnectPtr conn, char **const names, + const int maxnames) { bool success = false; esxPrivate *priv = conn->storagePrivateData; @@ -199,8 +199,8 @@ esxStorageBackendVMFSListPools(virConnectPtr conn, char **const names, static virStoragePoolPtr -esxStorageBackendVMFSPoolLookupByName(virConnectPtr conn, - const char *name) +esxStoragePoolLookupByName(virConnectPtr conn, + const char *name) { esxPrivate *priv = conn->storagePrivateData; esxVI_ObjectContent *datastore = NULL; @@ -252,8 +252,8 @@ esxStorageBackendVMFSPoolLookupByName(virConnectPtr conn, static virStoragePoolPtr -esxStorageBackendVMFSPoolLookupByUUID(virConnectPtr conn, - const unsigned char *uuid) +esxStoragePoolLookupByUUID(virConnectPtr conn, + const unsigned char *uuid) { esxPrivate *priv = conn->storagePrivateData; esxVI_String *propertyNameList = NULL; @@ -321,7 +321,7 @@ esxStorageBackendVMFSPoolLookupByUUID(virConnectPtr conn, static int -esxStorageBackendVMFSPoolRefresh(virStoragePoolPtr pool, unsigned int flags) +esxStoragePoolRefresh(virStoragePoolPtr pool, unsigned int flags) { int result = -1; esxPrivate *priv = pool->conn->storagePrivateData; @@ -346,8 +346,8 @@ esxStorageBackendVMFSPoolRefresh(virStoragePoolPtr pool, unsigned int flags) static int -esxStorageBackendVMFSPoolGetInfo(virStoragePoolPtr pool, - virStoragePoolInfoPtr info) +esxStoragePoolGetInfo(virStoragePoolPtr pool, + virStoragePoolInfoPtr info) { int result = -1; esxPrivate *priv = pool->conn->storagePrivateData; @@ -407,7 +407,7 @@ esxStorageBackendVMFSPoolGetInfo(virStoragePoolPtr pool, static char * -esxStorageBackendVMFSPoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) +esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) { esxPrivate *priv = pool->conn->storagePrivateData; esxVI_String *propertyNameList = NULL; @@ -527,7 +527,7 @@ esxStorageBackendVMFSPoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) static int -esxStorageBackendVMFSPoolNumberOfVolumes(virStoragePoolPtr pool) +esxStoragePoolNumOfVolumes(virStoragePoolPtr pool) { bool success = false; esxPrivate *priv = pool->conn->storagePrivateData; @@ -561,8 +561,8 @@ esxStorageBackendVMFSPoolNumberOfVolumes(virStoragePoolPtr pool) static int -esxStorageBackendVMFSPoolListVolumes(virStoragePoolPtr pool, char **const names, - int maxnames) +esxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names, + int maxnames) { bool success = false; esxPrivate *priv = pool->conn->storagePrivateData; @@ -642,8 +642,8 @@ esxStorageBackendVMFSPoolListVolumes(virStoragePoolPtr pool, char **const names, static virStorageVolPtr -esxStorageBackendVMFSVolumeLookupByName(virStoragePoolPtr pool, - const char *name) +esxStorageVolLookupByName(virStoragePoolPtr pool, + const char *name) { virStorageVolPtr volume = NULL; esxPrivate *priv = pool->conn->storagePrivateData; @@ -673,7 +673,7 @@ esxStorageBackendVMFSVolumeLookupByName(virStoragePoolPtr pool, static virStorageVolPtr -esxStorageBackendVMFSVolumeLookupByPath(virConnectPtr conn, const char *path) +esxStorageVolLookupByPath(virConnectPtr conn, const char *path) { virStorageVolPtr volume = NULL; esxPrivate *priv = conn->storagePrivateData; @@ -705,7 +705,7 @@ esxStorageBackendVMFSVolumeLookupByPath(virConnectPtr conn, const char *path) static virStorageVolPtr -esxStorageBackendVMFSVolumeLookupByKey(virConnectPtr conn, const char *key) +esxStorageVolLookupByKey(virConnectPtr conn, const char *key) { virStorageVolPtr volume = NULL; esxPrivate *priv = conn->storagePrivateData; @@ -725,7 +725,7 @@ esxStorageBackendVMFSVolumeLookupByKey(virConnectPtr conn, const char *key) if (STRPREFIX(key, "[")) { /* Key is probably a datastore path */ - return esxStorageBackendVMFSVolumeLookupByPath(conn, key); + return esxStorageVolLookupByPath(conn, key); } if (!priv->primary->hasQueryVirtualDiskUuid) { @@ -842,9 +842,9 @@ esxStorageBackendVMFSVolumeLookupByKey(virConnectPtr conn, const char *key) static virStorageVolPtr -esxStorageBackendVMFSVolumeCreateXML(virStoragePoolPtr pool, - const char *xmldesc, - unsigned int flags) +esxStorageVolCreateXML(virStoragePoolPtr pool, + const char *xmldesc, + unsigned int flags) { virStorageVolPtr volume = NULL; esxPrivate *priv = pool->conn->storagePrivateData; @@ -1071,10 +1071,10 @@ esxStorageBackendVMFSVolumeCreateXML(virStoragePoolPtr pool, static virStorageVolPtr -esxStorageBackendVMFSVolumeCreateXMLFrom(virStoragePoolPtr pool, - const char *xmldesc, - virStorageVolPtr sourceVolume, - unsigned int flags) +esxStorageVolCreateXMLFrom(virStoragePoolPtr pool, + const char *xmldesc, + virStorageVolPtr sourceVolume, + unsigned int flags) { virStorageVolPtr volume = NULL; esxPrivate *priv = pool->conn->storagePrivateData; @@ -1268,7 +1268,7 @@ esxStorageBackendVMFSVolumeCreateXMLFrom(virStoragePoolPtr pool, static int -esxStorageBackendVMFSVolumeDelete(virStorageVolPtr volume, unsigned int flags) +esxStorageVolDelete(virStorageVolPtr volume, unsigned int flags) { int result = -1; esxPrivate *priv = volume->conn->storagePrivateData; @@ -1313,7 +1313,7 @@ esxStorageBackendVMFSVolumeDelete(virStorageVolPtr volume, unsigned int flags) static int -esxStorageBackendVMFSVolumeWipe(virStorageVolPtr volume, unsigned int flags) +esxStorageVolWipe(virStorageVolPtr volume, unsigned int flags) { int result = -1; esxPrivate *priv = volume->conn->storagePrivateData; @@ -1358,8 +1358,8 @@ esxStorageBackendVMFSVolumeWipe(virStorageVolPtr volume, unsigned int flags) static int -esxStorageBackendVMFSVolumeGetInfo(virStorageVolPtr volume, - virStorageVolInfoPtr info) +esxStorageVolGetInfo(virStorageVolPtr volume, + virStorageVolInfoPtr info) { int result = -1; esxPrivate *priv = volume->conn->storagePrivateData; @@ -1405,8 +1405,8 @@ esxStorageBackendVMFSVolumeGetInfo(virStorageVolPtr volume, static char * -esxStorageBackendVMFSVolumeGetXMLDesc(virStorageVolPtr volume, - unsigned int flags) +esxStorageVolGetXMLDesc(virStorageVolPtr volume, + unsigned int flags) { esxPrivate *priv = volume->conn->storagePrivateData; virStoragePoolDef pool; @@ -1489,7 +1489,7 @@ esxStorageBackendVMFSVolumeGetXMLDesc(virStorageVolPtr volume, static char * -esxStorageBackendVMFSVolumeGetPath(virStorageVolPtr volume) +esxStorageVolGetPath(virStorageVolPtr volume) { char *path; @@ -1504,23 +1504,23 @@ esxStorageBackendVMFSVolumeGetPath(virStorageVolPtr volume) virStorageDriver esxStorageBackendVMFS = { - .connectNumOfStoragePools = esxStorageBackendVMFSNumberOfPools, /* 0.8.2 */ - .connectListStoragePools = esxStorageBackendVMFSListPools, /* 0.8.2 */ - .storagePoolLookupByName = esxStorageBackendVMFSPoolLookupByName, /* 0.8.2 */ - .storagePoolLookupByUUID = esxStorageBackendVMFSPoolLookupByUUID, /* 0.8.2 */ - .storagePoolRefresh = esxStorageBackendVMFSPoolRefresh, /* 0.8.2 */ - .storagePoolGetInfo = esxStorageBackendVMFSPoolGetInfo, /* 0.8.2 */ - .storagePoolGetXMLDesc = esxStorageBackendVMFSPoolGetXMLDesc, /* 0.8.2 */ - .storagePoolNumOfVolumes = esxStorageBackendVMFSPoolNumberOfVolumes, /* 0.8.4 */ - .storagePoolListVolumes = esxStorageBackendVMFSPoolListVolumes, /* 0.8.4 */ - .storageVolLookupByName = esxStorageBackendVMFSVolumeLookupByName, /* 0.8.4 */ - .storageVolLookupByPath = esxStorageBackendVMFSVolumeLookupByPath, /* 0.8.4 */ - .storageVolLookupByKey = esxStorageBackendVMFSVolumeLookupByKey, /* 0.8.4 */ - .storageVolCreateXML = esxStorageBackendVMFSVolumeCreateXML, /* 0.8.4 */ - .storageVolCreateXMLFrom = esxStorageBackendVMFSVolumeCreateXMLFrom, /* 0.8.7 */ - .storageVolDelete = esxStorageBackendVMFSVolumeDelete, /* 0.8.7 */ - .storageVolWipe = esxStorageBackendVMFSVolumeWipe, /* 0.8.7 */ - .storageVolGetInfo = esxStorageBackendVMFSVolumeGetInfo, /* 0.8.4 */ - .storageVolGetXMLDesc = esxStorageBackendVMFSVolumeGetXMLDesc, /* 0.8.4 */ - .storageVolGetPath = esxStorageBackendVMFSVolumeGetPath, /* 0.8.4 */ + .connectNumOfStoragePools = esxConnectNumOfStoragePools, /* 0.8.2 */ + .connectListStoragePools = esxConnectListStoragePools, /* 0.8.2 */ + .storagePoolLookupByName = esxStoragePoolLookupByName, /* 0.8.2 */ + .storagePoolLookupByUUID = esxStoragePoolLookupByUUID, /* 0.8.2 */ + .storagePoolRefresh = esxStoragePoolRefresh, /* 0.8.2 */ + .storagePoolGetInfo = esxStoragePoolGetInfo, /* 0.8.2 */ + .storagePoolGetXMLDesc = esxStoragePoolGetXMLDesc, /* 0.8.2 */ + .storagePoolNumOfVolumes = esxStoragePoolNumOfVolumes, /* 0.8.4 */ + .storagePoolListVolumes = esxStoragePoolListVolumes, /* 0.8.4 */ + .storageVolLookupByName = esxStorageVolLookupByName, /* 0.8.4 */ + .storageVolLookupByPath = esxStorageVolLookupByPath, /* 0.8.4 */ + .storageVolLookupByKey = esxStorageVolLookupByKey, /* 0.8.4 */ + .storageVolCreateXML = esxStorageVolCreateXML, /* 0.8.4 */ + .storageVolCreateXMLFrom = esxStorageVolCreateXMLFrom, /* 0.8.7 */ + .storageVolDelete = esxStorageVolDelete, /* 0.8.7 */ + .storageVolWipe = esxStorageVolWipe, /* 0.8.7 */ + .storageVolGetInfo = esxStorageVolGetInfo, /* 0.8.4 */ + .storageVolGetXMLDesc = esxStorageVolGetXMLDesc, /* 0.8.4 */ + .storageVolGetPath = esxStorageVolGetPath, /* 0.8.4 */ }; -- 1.8.1.4

2 2

[libvirt] libxl driver issue with console/virt-viewer
by Dario Faggioli 10 May '13

10 May '13

Hi Jim, everyone, I'm having an issue using the libvirt's libxl driver while installing a Fedora 18 (via netinstall) on both Fedora 18 or rawhide host. So, what happens is, basically, that I do not see the output from the installer at all, neither in the virt-viewer instance that virt-install does pop-up automatically, nor trying to manually connect to the VM (either with virt-viewer or VNC). So, when I do: [xen@zhaman ~]$ sudo virt-install --paravirt --name f18-i386 --ram 2048 --vcpus 2 -f /dev/vms/f18_i386 --network bridge=virbr0 --location http://mirrors.rit.edu/fedora/linux//releases/18/Fedora/i386/os/ Starting install... Retrieving file .treeinfo... | 2.4 kB 00:00:00 !!! Retrieving file vmlinuz-PAE... | 9.3 MB 00:00:33 !!! Retrieving file initrd-PAE.img... | 52 MB 00:04:11 !!! Creating domain... And then, in the virt-viewer window, I see a black screen and all it says is "serial0 console". using `xl console f18-i386' gives me some of the textual output of the installer (but nothing graphical, of course). Both Fedora 18 and rawhide have the following version of Xen: [xen@zhaman ~]$ rpm -qa | grep xen xen-hypervisor-4.2.2-3.{fc18|fc20}.x86_64 xen-4.2.2-3.{fc18|fc20}.x86_64 ... Regarding libvirt, on F18 I have: [xen@zhaman ~]$ rpm -qa | grep libvirt libvirt-client-0.10.2.4-1.fc18.x86_64 libvirt-daemon-driver-libxl-0.10.2.4-1.fc18.x86_64 libvirt-daemon-0.10.2.4-1.fc18.x86_64 libvirt-daemon-xen-0.10.2.4-1.fc18.x86_64 ... While, on rawhide: [xen@zhaman ~]$ rpm -qa | grep libvirt libvirt-client-1.0.5-2.fc20.x86_64 libvirt-daemon-driver-libxl-1.0.5-2.fc20.x86_64 libvirt-daemon-1.0.5-2.fc20.x86_64 libvirt-daemon-xen-1.0.5-2.fc20.x86_64 ... I'm calling it a libxl driver problem since, with both versions, if I start xend, things work fine, and I can see both the textual and graphical phases of the Fedora installer in the virt-viewer window from the very beginning. I checked in /var/log/libvirt/libxl/libxl.log, but couldn't find anything particular. Also, I tried to `virsh edit xxx' in the libxl and xend cases, and the result is attached. The only difference between the two files that looks relevant to me is the presence of the following section in the xend version: <console type='pty'> <target type='xen' port='0'/> </console> However, I tried passing "--console pty,target_type=xen" to virt-install when using the libxl driver, which caused a similar section to appear in the XML of that solution too, but _did_NOT_ solve the issue. Any idea on what can cause this? Thanks and Regards, Dario -- <<This happens because I choose it to happen!>> (Raistlin Majere) ----------------------------------------------------------------- Dario Faggioli, Ph.D, http://about.me/dario.faggioli Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK)

2 3

[libvirt] [PATCH] conf: Fix typo in error message in ABI stability check
by Peter Krempa 10 May '13

10 May '13

s/vpu/vCPU/ --- Pushed as trivial. src/conf/domain_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b7e253e..e0bd8aa 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12596,13 +12596,13 @@ virDomainDefCheckABIStability(virDomainDefPtr src, if (src->vcpus != dst->vcpus) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain vpu count %d does not match source %d"), + _("Target domain vCPU count %d does not match source %d"), dst->vcpus, src->vcpus); return false; } if (src->maxvcpus != dst->maxvcpus) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain vpu max %d does not match source %d"), + _("Target domain vCPU max %d does not match source %d"), dst->maxvcpus, src->maxvcpus); return false; } -- 1.8.2.1

1 0

[libvirt] [PATCH 1/2] util: fix virFileOpenAs return value and resulting error logs
by Laine Stump 10 May '13

10 May '13

This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=851411 https://bugzilla.redhat.com/show_bug.cgi?id=955500 The first problem was that virFileOpenAs was returning fd (-1) in one of the error cases rather than ret (-errno), so the caller thought that the error was EPERM rather than ENOENT. The second problem was that some log messages in the general purpose qemuOpenFile() function would always say "Failed to create" even if the caller hadn't included O_CREAT (i.e. they were trying to open an existing file). This fixes virFileOpenAs to jup down to the error return (which returns ret instead of fd) in the previously incorrect failure case of virFileOpenAs(), removes all error logging from virFileOpenAs() (since the callers report it), and modifies qemuOpenFile to appropriately use "open" or "create" in its log messages. NB: I seriously considered removing logging from all callers of virFileOpenAs(), but there is at least one case where the callers doesn't want virFileOpenAs() to log any errors, because it's just going to try again (qemuOpenFile(). We can't simply make a silent variation of virFileOpenAs() though, because qemuOpenFile() can't make the decision about whether or not it wants to retry until after virFileOpenAs() has already returned an error code. Likewise, I also considered changing virFileOpenAs() to return -1 with errno set on return, and may still do that, but only as a separate patch, as it obscures the intent of this patch too much. --- src/libxl/libxl_driver.c | 6 ++--- src/qemu/qemu_driver.c | 55 ++++++++++++++++++++++--------------------- src/storage/storage_backend.c | 2 +- src/util/virstoragefile.c | 4 ++-- src/util/virutil.c | 35 ++++++++------------------- 5 files changed, 44 insertions(+), 58 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 7361743..f09f7eb 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1,5 +1,5 @@ /*---------------------------------------------------------------------------*/ -/* Copyright (C) 2006-2012 Red Hat, Inc. +/* Copyright (C) 2006-2013 Red Hat, Inc. * Copyright (C) 2011-2013 SUSE LINUX Products GmbH, Nuernberg, Germany. * Copyright (C) 2011 Univention GmbH. * @@ -550,8 +550,8 @@ libxlSaveImageOpen(libxlDriverPrivatePtr driver, const char *from, char *xml = NULL; if ((fd = virFileOpenAs(from, O_RDONLY, 0, -1, -1, 0)) < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, - "%s", _("cannot read domain image")); + virReportSystemError(-fd, + _("Failed to open domain image file '%s'"), from); goto error; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0aceb17..5657abc 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2562,10 +2562,9 @@ qemuOpenFile(virQEMUDriverPtr driver, const char *path, int oflags, /* First try creating the file as root */ if (!is_reg) { - fd = open(path, oflags & ~O_CREAT); - if (fd < 0) { - virReportSystemError(errno, _("unable to open %s"), path); - goto cleanup; + if ((fd = open(path, oflags & ~O_CREAT)) < 0) { + fd = -errno; + goto error; } } else { if ((fd = virFileOpenAs(path, oflags, S_IRUSR | S_IWUSR, uid, gid, @@ -2576,36 +2575,30 @@ qemuOpenFile(virQEMUDriverPtr driver, const char *path, int oflags, qemu user (cfg->user) is non-root, just set a flag to bypass security driver shenanigans, and retry the operation after doing setuid to qemu user */ - if ((fd != -EACCES && fd != -EPERM) || - cfg->user == getuid()) { - virReportSystemError(-fd, - _("Failed to create file '%s'"), - path); - goto cleanup; - } + if ((fd != -EACCES && fd != -EPERM) || cfg->user == getuid()) + goto error; /* On Linux we can also verify the FS-type of the directory. */ switch (path_shared) { case 1: - /* it was on a network share, so we'll continue - * as outlined above - */ - break; + /* it was on a network share, so we'll continue + * as outlined above + */ + break; case -1: - virReportSystemError(errno, - _("Failed to create file " - "'%s': couldn't determine fs type"), - path); - goto cleanup; + virReportSystemError(-fd, oflags & O_CREAT + ? _("Failed to create file " + "'%s': couldn't determine fs type") + : _("Failed to open file " + "'%s': couldn't determine fs type"), + path); + goto cleanup; case 0: default: - /* local file - log the error returned by virFileOpenAs */ - virReportSystemError(-fd, - _("Failed to create file '%s'"), - path); - goto cleanup; + /* local file - log the error returned by virFileOpenAs */ + goto error; } /* Retry creating the file as cfg->user */ @@ -2614,8 +2607,9 @@ qemuOpenFile(virQEMUDriverPtr driver, const char *path, int oflags, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP, cfg->user, cfg->group, vfoflags | VIR_FILE_OPEN_FORK)) < 0) { - virReportSystemError(-fd, - _("Error from child process creating '%s'"), + virReportSystemError(-fd, oflags & O_CREAT + ? _("Error from child process creating '%s'") + : _("Error from child process opening '%s'"), path); goto cleanup; } @@ -2634,6 +2628,13 @@ cleanup: *bypassSecurityDriver = bypass_security; virObjectUnref(cfg); return fd; + +error: + virReportSystemError(-fd, oflags & O_CREAT + ? _("Failed to create file '%s'") + : _("Failed to open file '%s'"), + path); + goto cleanup; } /* Helper function to execute a migration to file with a correct save header diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index b85a5a9..39f9a99 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -405,7 +405,7 @@ virStorageBackendCreateRaw(virConnectPtr conn ATTRIBUTE_UNUSED, vol->target.perms.gid, operation_flags)) < 0) { virReportSystemError(-fd, - _("cannot create path '%s'"), + _("Failed to create file '%s'"), vol->target.path); goto cleanup; } diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index c7bb85a..0c43397 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -893,7 +893,7 @@ virStorageFileProbeFormat(const char *path, uid_t uid, gid_t gid) int fd, ret; if ((fd = virFileOpenAs(path, O_RDONLY, 0, uid, gid, 0)) < 0) { - virReportSystemError(errno, _("cannot open file '%s'"), path); + virReportSystemError(-fd, _("Failed to open file '%s'"), path); return -1; } @@ -952,7 +952,7 @@ virStorageFileGetMetadataRecurse(const char *path, const char *directory, return NULL; if ((fd = virFileOpenAs(path, O_RDONLY, 0, uid, gid, 0)) < 0) { - virReportSystemError(-fd, _("cannot open file '%s'"), path); + virReportSystemError(-fd, _("Failed to open file '%s'"), path); return NULL; } diff --git a/src/util/virutil.c b/src/util/virutil.c index 982d4a3..8079b0b 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -973,9 +973,11 @@ virFileOpenForked(const char *path, int openflags, mode_t mode, * uid:gid before returning (even if it already existed with a * different owner). If @flags includes VIR_FILE_OPEN_FORCE_MODE, * ensure it has those permissions before returning (again, even if - * the file already existed with different permissions). The return - * value (if non-negative) is the file descriptor, left open. Returns - * -errno on failure. */ + * the file already existed with different permissions). + * + * The return value (if non-negative) is the file descriptor, left + * open. Returns -errno on failure. + */ int virFileOpenAs(const char *path, int openflags, mode_t mode, uid_t uid, gid_t gid, unsigned int flags) @@ -999,6 +1001,8 @@ virFileOpenAs(const char *path, int openflags, mode_t mode, if ((fd = open(path, openflags, mode)) < 0) { ret = -errno; + if (!(flags & VIR_FILE_OPEN_FORK)) + goto error; } else { ret = virFileOpenForceOwnerMode(path, fd, mode, uid, gid, flags); if (ret < 0) @@ -1024,45 +1028,26 @@ virFileOpenAs(const char *path, int openflags, mode_t mode, /* On Linux we can also verify the FS-type of the * directory. (this is a NOP on other platforms). */ - switch (virStorageFileIsSharedFS(path)) { - case 1: - /* it was on a network share, so we'll re-try */ - break; - case -1: - /* failure detecting fstype */ - virReportSystemError(errno, _("couldn't determine fs type " - "of mount containing '%s'"), path); - goto error; - case 0: - default: - /* file isn't on a recognized network FS */ + if (virStorageFileIsSharedFS(path) <= 0) goto error; - } } /* passed all prerequisites - retry the open w/fork+setuid */ if ((fd = virFileOpenForked(path, openflags, mode, uid, gid, flags)) < 0) { ret = fd; - fd = -1; goto error; } } /* File is successfully opened */ - return fd; error: - if (fd < 0) { - /* whoever failed the open last has already set ret = -errno */ - virReportSystemError(-ret, openflags & O_CREAT - ? _("failed to create file '%s'") - : _("failed to open file '%s'"), - path); - } else { + if (fd >= 0) { /* some other failure after the open succeeded */ VIR_FORCE_CLOSE(fd); } + /* whoever failed the open last has already set ret = -errno */ return ret; } -- 1.8.1.4

2 1

[libvirt] [PATCH v2 0/2] don't crash on a tpm device with no backends
by Ján Tomko 10 May '13

10 May '13

v2: added tests v1: https://www.redhat.com/archives/libvir-list/2013-May/msg00651.html Ján Tomko (2): tests: files named '.*-invalid.xml' should fail validation conf: don't crash on a tpm device with no backends src/conf/domain_conf.c | 6 +++++ .../qemuxml2argv-tpm-no-backend-invalid.xml | 27 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ tests/schematestutils.sh | 12 ++++++++++ 4 files changed, 47 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-tpm-no-backend-invalid.xml -- 1.8.1.5

3 8