- Devel - libvirt List Archives

[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'> + <vlan trunk='yes'> + <tag id='42'/> + <tag id='123' nativeMode='untagged'/> + </vlan> + ... + </interface> <devices> ...</pre> @@ -3316,6 +3323,15 @@ qemu-kvm -net nic,model=? /dev/null vlan element. + + For network connections using openvswitch it is possible to + configure the 'native-tagged' and 'native-untagged' vlan modes + (Since 1.0.6). This uses the optional + <code>nativeMode</code> attribute on the <code><tag></code> + element: <code>nativeMode</code> may be set to 'tagged' or + 'untagged'. The id atribute of the element sets the native vlan. + + <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 @@ Since 0.9.4 + <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'> + <vlan trunk='yes'> + <tag id='42'/> + <tag id='123' nativeMode='untagged'/> + </vlan> + ... + </interface> <devices> ...</pre> @@ -452,6 +460,14 @@ be added to the vlan element. + For network connections using openvswitch it is possible to + configure the 'native-tagged' and 'native-untagged' vlan modes + (Since 1.0.6). This uses the optional + <code>nativeMode</code> attribute on the <code><tag></code> + element: <code>nativeMode</code> may be set to 'tagged' or + 'untagged'. The id atribute of the element sets the native vlan. + + <code><vlan></code> elements can also be specified in a <code><portgroup></code> element, as well as directly in a domain's <code><interface></code> element. In the case diff --git a/docs/schemas/networkcommon.rng b/docs/schemas/networkcommon.rng index 51ff759..e60f1fc 100644 --- a/docs/schemas/networkcommon.rng +++ b/docs/schemas/networkcommon.rng @@ -204,6 +204,14 @@ <param name="maxInclusive">4095</param> </data> </attribute> + <optional> + <attribute name="nativeMode"> + <choice> + <value>tagged</value> + <value>untagged</value> + </choice> + </attribute> + </optional> <empty/> </element> </oneOrMore> diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c index 13ba8c6..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 13 May '13

13 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