January 2012 - Devel - libvirt List Archives

[libvirt] [libvirt-glib] Allow custom metadata in domain configuration XML
by Zeeshan Ali (Khattak) 24 Jan '12

24 Jan '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> Applications can now insert custom nodes and hierarchies into domain cofiguration XML. Although currently not enforced, application are required to use their own namespaces on every custom node they insert. --- docs/formatdomain.html.in | 18 +++++++++ docs/schemas/domaincommon.rng | 26 +++++++++++++ src/conf/domain_conf.c | 24 ++++++++++++ src/conf/domain_conf.h | 3 ++ tests/domainsnapshotxml2xmlout/metadata.xml | 38 ++++++++++++++++++++ tests/domainsnapshotxml2xmltest.c | 1 + tests/qemuxml2argvdata/qemuxml2argv-metadata.args | 4 ++ tests/qemuxml2argvdata/qemuxml2argv-metadata.xml | 29 +++++++++++++++ .../qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml | 29 +++++++++++++++ tests/qemuxml2xmltest.c | 2 + 10 files changed, 174 insertions(+), 0 deletions(-) create mode 100644 tests/domainsnapshotxml2xmlout/metadata.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-metadata.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-metadata.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index de9b480..fa7dc7c 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3548,6 +3548,24 @@ qemu-kvm -net nic,model=? /dev/null sub-element <code>label</code> are supported. </p> + <h3><a name="customMetadata">Custom metadata</a></h3> + +<pre> + ... + <metadata> + <app1:foo xmlns:app1="http://app1.org/app1/">..</app1:foo> + <app2:bar xmlns:app2="http://app1.org/app2/">..</app2:bar> + </metadata> + ...</pre> + + <dl> + <dt><code>metadata</code></dt> + <dd><code>metadata</code> node could be used by applications to + store custom metadata in the form of XML nodes/trees. Applications + must use custom namespaces on their XML nodes/trees. + <span class="since">Since 0.9.9</span></dd> + </dl> + <h2><a name="examples">Example configs</a></h2> <p> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 2041dfb..b42d758 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -43,6 +43,9 @@ <ref name="seclabel"/> </optional> <optional> + <ref name="metadata"/> + </optional> + <optional> <ref name='qemucmdline'/> </optional> </interleave> @@ -2942,6 +2945,29 @@ </element> </define> + <define name="metadata"> + <element name="metadata"> + <zeroOrMore> + <ref name="customElement"/> + </zeroOrMore> + </element> + </define> + + <define name="customElement"> + <element> + <anyName/> + <zeroOrMore> + <choice> + <attribute> + <anyName/> + </attribute> + <text/> + <ref name="customElement"/> + </choice> + </zeroOrMore> + </element> + </define> + <!-- Type library diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8eed85b..fb78d93 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1500,6 +1500,9 @@ void virDomainDefFree(virDomainDefPtr def) if (def->namespaceData && def->ns.free) (def->ns.free)(def->namespaceData); + if (def->metadata) + xmlFreeNode(def->metadata); + VIR_FREE(def); } @@ -8072,6 +8075,11 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, def->os.smbios_mode = VIR_DOMAIN_SMBIOS_NONE; /* not present */ } + /* Extract custom metadata */ + if ((node = virXPathNode("./metadata[1]", ctxt)) != NULL) { + def->metadata = xmlCopyNode (node, 1); + } + /* we have to make a copy of all of the callback pointers here since * we won't have the virCaps structure available during free */ @@ -11833,6 +11841,22 @@ virDomainDefFormatInternal(virDomainDefPtr def, goto cleanup; } + /* Custom metadata comes at the end */ + if (def->metadata) { + xmlBufferPtr xmlbuf; + + xmlbuf = xmlBufferCreate(); + if (xmlNodeDump(xmlbuf, def->metadata->doc, def->metadata, 4, 1) < 0) { + xmlBufferFree(xmlbuf); + goto cleanup; + } + virBufferAdjustIndent(buf, 2); + virBufferAdd(buf, (char *) xmlBufferContent(xmlbuf), xmlBufferLength(xmlbuf)); + virBufferAdjustIndent(buf, -2); + xmlBufferFree(xmlbuf); + virBufferAddLit(buf, "\n"); + } + virBufferAddLit(buf, "</domain>\n"); if (virBufferError(buf)) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index a49795c..3b522a9 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1525,6 +1525,9 @@ struct _virDomainDef { void *namespaceData; virDomainXMLNamespace ns; + + /* Application-specific custom metadata */ + xmlNodePtr metadata; }; enum virDomainTaintFlags { diff --git a/tests/domainsnapshotxml2xmlout/metadata.xml b/tests/domainsnapshotxml2xmlout/metadata.xml new file mode 100644 index 0000000..45180c9 --- /dev/null +++ b/tests/domainsnapshotxml2xmlout/metadata.xml @@ -0,0 +1,38 @@ +<domainsnapshot> + <name>my snap name</name> + <description>!@#$%^</description> + <state>running</state> + <parent> + <name>earlier_snap</name> + </parent> + <creationTime>1272917631</creationTime> + <domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219100</memory> + <currentMemory>219100</currentMemory> + <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> + <metadata> + <app1:foo xmlns:app1="http://foo.org/">fooish</app1:foo> + <app2:bar xmlns:app2="http://bar.com/" maman="baz">barish</app2:bar> + </metadata> + </domain> +</domainsnapshot> diff --git a/tests/domainsnapshotxml2xmltest.c b/tests/domainsnapshotxml2xmltest.c index 90ff9bb..5c2e670 100644 --- a/tests/domainsnapshotxml2xmltest.c +++ b/tests/domainsnapshotxml2xmltest.c @@ -109,6 +109,7 @@ mymain(void) DO_TEST("noparent_nodescription_noactive", NULL, 0); DO_TEST("noparent_nodescription", NULL, 1); DO_TEST("noparent", "9d37b878-a7cc-9f9a-b78f-49b3abad25a8", 0); + DO_TEST("metadata", "c7a5fdbd-edaf-9455-926a-d65c16db1809", 0); virCapabilitiesFree(driver.caps); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-metadata.args b/tests/qemuxml2argvdata/qemuxml2argv-metadata.args new file mode 100644 index 0000000..651793d --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-metadata.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M \ +pc -m 214 -smp 1 -name QEMUGuest1 -nographic -monitor unix:/tmp/test-monitor,\ +server,nowait -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -serial \ +none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-metadata.xml b/tests/qemuxml2argvdata/qemuxml2argv-metadata.xml new file mode 100644 index 0000000..a6888ee --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-metadata.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219100</memory> + <currentMemory>219100</currentMemory> + <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> + <metadata> + <app1:foo xmlns:app1="http://foo.org/">fooish</app1:foo> + <app2:bar xmlns:app2="http://bar.com/" maman="baz">barish</app2:bar> + </metadata> +</domain> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml new file mode 100644 index 0000000..a6888ee --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml @@ -0,0 +1,29 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory>219100</memory> + <currentMemory>219100</currentMemory> + <vcpu cpuset='1-4,8-20,525'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> + </disk> + <controller type='ide' index='0'/> + <memballoon model='virtio'/> + </devices> + <metadata> + <app1:foo xmlns:app1="http://foo.org/">fooish</app1:foo> + <app2:bar xmlns:app2="http://bar.com/" maman="baz">barish</app2:bar> + </metadata> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 293c2a7..df317fd 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -210,6 +210,8 @@ mymain(void) DO_TEST_DIFFERENT("graphics-listen-network2"); DO_TEST_DIFFERENT("graphics-spice-timeout"); + DO_TEST_DIFFERENT("metadata"); + virCapabilitiesFree(driver.caps); return (ret==0 ? EXIT_SUCCESS : EXIT_FAILURE); -- 1.7.7.5

1 0

[libvirt] [PATCH RFC 00/12] Fine grained access control proof of concept
by Daniel P. Berrange 24 Jan '12

24 Jan '12

This series of patch is the minimal required to get a working proof of concept implementation of fine grained access control in libvirt. This demonstrates - Obtaining a client identity from a socket - Ensuring RPC calls are executed with the correct identity sset - A policykit access driver that checks based on access vector alone - A SELinux access driver that checks based on access vector + object - A set of hooks in the QEMU driver to protect virDomainObjPtr access Things that are not done - APIs for changing the real/effective identity post-connect - A simple RBAC access driver for doing (Access vector, object) checks - SELinux policy for the SELinux driver - Access control hooks on all other QEMU driver methods - Access control hooks in LXC, UML, other libvirtd side drivers - Access control hooks in storage, network, interface, etc drivers - Document WTF todo to propagate SELinux contexts across TCP sockets using IPSec. Any hints welcome... - Lots more I can't think of right now I should note that the policykit driver is mostly useless because it is unable to let you do checks on anything other than permission name and UNIX process ID at this time. In theory it is supposed to be extendable to allow other types of identity information besides the process ID, and to include some kind of object identiers in the permission check, but no one seems to be attacking this. So I expect the simple RBAC driver to be the most used one in the common case usage of libvirt

1 12

[libvirt] [PATCH v2 0/8] Add ability to store notes with domains
by Peter Krempa 24 Jan '12

24 Jan '12

I've reworked this patches to use a separate element for storing the short note. This v2 also contains som new patches, especially added support for the LXC driver, and optionaly API to get the description. (See patches marked as optional). These are not required, just add a helper api to get the description and it's usage in virsh. v2 patches: xml: Add element <title> to allow short description of domains api: Add api to set domain title and description in runtime qemu: Implement note API in qemu driver virsh: Add support for modifying domain description and titles v1 patches: lxc: implement description API in LXC driver. api: Add API to get domain title and description (optional) lxc, qemu: Add support for virDomainGetDescription (optional) virsh: Add support for virDomainGetDescription api (optional) docs/formatdomain.html.in | 6 + docs/schemas/domaincommon.rng | 13 +- include/libvirt/libvirt.h.in | 13 + src/conf/domain_conf.c | 19 ++ src/conf/domain_conf.h | 1 + src/driver.h | 9 + src/libvirt.c | 92 +++++++ src/libvirt_public.syms | 6 + src/lxc/lxc_driver.c | 139 ++++++++++ src/qemu/qemu_driver.c | 139 ++++++++++ src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 19 ++- .../qemu-simple-description-title.xml | 27 ++ tests/qemuxml2argvdata/qemuxml2argv-minimal.xml | 5 + tools/virsh.c | 268 ++++++++++++++++++-- tools/virsh.pod | 34 +++- 16 files changed, 769 insertions(+), 23 deletions(-) create mode 100644 tests/domainschemadata/qemu-simple-description-title.xml -- 1.7.3.4

3 13

[libvirt] [BUG] EPOLL_CLOEXEC undeclared
by Philipp Hahn 23 Jan '12

23 Jan '12

Hi, $ cat /etc/debian_version 5.0.1 $ dpkg -S eventpoll.h linux-libc-dev: /usr/include/linux/eventpoll.h $ dpkg-query -W linux-libc-dev linux-libc-dev 2.6.32-35~ucs1.48.201109051614 $ git describe v0.9.9-57-g7eb9cfd $ ./autogen.sh ; make ... (cd .libs && rm -f libvirt_test.la && ln -s ../libvirt_test.la libvirt_test.la) gcc -std=gnu99 -DHAVE_CONFIG_H -I. -I.. -I../gnulib/lib -I../gnulib/lib -I../include -I../src/util -I../include -DIN_LIBVIRT -I../src/conf -I/usr/include/libxml2 -Wall -W -Wformat-y2k -Wformat-security -Winit-self -Wmissing-include-dirs -Wunused -Wunknown-pragmas -Wstrict-aliasing -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wwrite-strings -Wlogical-op -Waggregate-return -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wnested-externs -Winline -Winvalid-pch -Wvolatile-register-var -Wdisabled-optimization -Wattributes -Wcoverage-mismatch -Wmultichar -Wdeprecated-declarations -Wdiv-by-zero -Wendif-labels -Wextra -Wformat-contains-nul -Wformat-extra-args -Wformat-zero-length -Wformat=2 -Wmultichar -Wnormalized=nfc -Woverflow -Wpointer-to-int-cast -Wpragmas -Wno-missing-field-initializers -Wno-sign-compare -Wno-format-nonliteral -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-all --param=ssp-buffer-size=4 -fexceptions -fasynchronous-unwind-tables -fdiagnostics-show-option -funit-at-a-time -fipa-pure-const -g -O2 -MT libvirt_lxc-lxc_controller.o -MD -MP -MF .deps/libvirt_lxc-lxc_controller.Tpo -c -o libvirt_lxc-lxc_controller.o `test -f 'lxc/lxc_controller.c' || echo './'`lxc/lxc_controller.c lxc/lxc_controller.c: In function 'lxcControllerMain': lxc/lxc_controller.c:1176: warning: implicit declaration of function 'epoll_create1' lxc/lxc_controller.c:1176: warning: nested extern declaration of 'epoll_create1' [-Wnested-externs] lxc/lxc_controller.c:1176: error: 'EPOLL_CLOEXEC' undeclared (first use in this function) lxc/lxc_controller.c:1176: error: (Each undeclared identifier is reported only once lxc/lxc_controller.c:1176: error: for each function it appears in.) make[3]: *** [libvirt_lxc-lxc_controller.o] Error 1 make[3]: Leaving directory `/root/libvirt/src' ... $ git show v0.9.9-32-g9130396 | head -5 commit 9130396214975ba2251082f943c9717281039050 Author: Daniel P. Berrange <berrange(a)redhat.com> Date: Thu Jan 12 17:03:03 2012 +0000 Re-write LXC controller end-of-file I/O handling yet again Sincerely Philipp -- Philipp Hahn Open Source Software Engineer hahn(a)univention.de Univention GmbH Linux for Your Business fon: +49 421 22 232- 0 Mary-Somerville-Str.1 D-28359 Bremen fax: +49 421 22 232-99 http://www.univention.de/

2 7

[libvirt] [PATCH] xen: Don't crash when we fail to init caps
by Guido Günther 23 Jan '12

23 Jan '12

by dereferencing a NULL pointer in the call to virNodeSuspendGetTargetMask. Only warn but Don't set an error to not overwrite an error code set by xenHypervisorMakeCapabilities. --- src/xen/xen_hypervisor.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 2bb3466..855576c 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -2764,6 +2764,10 @@ xenHypervisorMakeCapabilities(virConnectPtr conn) utsname.machine, cpuinfo, capabilities); + if (caps == NULL) { + VIR_WARN("Failed to get host capabilities"); + return NULL; + } if (virNodeSuspendGetTargetMask(&caps->host.powerMgmt) < 0) VIR_WARN("Failed to get host power management capabilities"); -- 1.7.8.3

2 5

[libvirt] Allow custom metadata in domain configuration XML
by Zeeshan Ali (Khattak) 23 Jan '12

23 Jan '12

Hi, Apologies for not using git-send-mail but for some reason its not working for me at the moment with gmail's SMTP. -- Regards, Zeeshan Ali (Khattak) FSF member#5124

4 5

[libvirt] [PATCH 0/2] consistent use of _LAST enum markers
by Eric Blake 23 Jan '12

23 Jan '12

This patch series will make it harder to add an enum value while forgetting to translate that enum to or from an appropriate string value. It also alters the public API so that users don't get _LAST enum values unless they ask for them, since such values are markers that might change over time rather than an official unchanging API value. Eric Blake (2): API: make declaration of _LAST enum values conditional maint: enforce use of _LAST marker cfg.mk | 12 +++- daemon/libvirtd.h | 8 +- include/libvirt/libvirt.h.in | 186 ++++++++++++++++++++++++++++++++++++----- python/generator.py | 3 +- src/conf/domain_conf.c | 2 +- src/conf/domain_conf.h | 3 +- src/internal.h | 4 + src/qemu/qemu_monitor_json.c | 9 +- src/remote/remote_protocol.x | 3 +- src/util/virtypedparam.c | 2 +- tests/cputest.c | 3 +- tools/virsh.c | 9 ++ 12 files changed, 207 insertions(+), 37 deletions(-) -- 1.7.7.5

3 6

[libvirt] Can't compile libvirt 0.9.9 (complains about apparmor)
by Jean-Philippe Menil 22 Jan '12

22 Jan '12

Hi, I need to compile libvirt 0.9.9 to work with qemu-kvm 1.0. I use to compile libvirt without apparmor or selinux, but this time, with the newer version, it seems that i can't compile with the following options: ./configure --disable-rpath --with-qemu=yes --with-qemu-user=libvirt-qemu --with-qemu-group=kvm --with-init-script=none --without-xen-inotify --without-uml --without-vmware --without-libssh2 --without-phyp --without-xenapi --without-libxl --without-esx --without-hyperv --without-test --without-remote --without-sasl --without-yajl --without-sanlock --without-polkit --without-avahi --without-audit --without-dtrace --without-numactl --without-capng --without-network --without-netcf --without-secrets --without-storage-lvm --without-storage-dir --without-storage-fs --without-storage-iscsi --without-storage-scsi --without-storage-mpath --without-storage-disk --without-python --without-driver-modules --without-hal --without-udev --without-libblkid --without-virtualport --without-macvtap --enable-debug=n --without-xen --without-vbox --without-lxc --without-openvz --with-driver-modules=no --without-apparmor --without-secdriver-apparmor --without-selinux --without-secdriver-selinux Relevant error is : configure:54338: error: You must install the AppArmor development package in order to compile libvirt Note that, if i compile with the option "with-apparmor", configure works fine, and i haven't any errors. Is it possible to compile libvirt without apparmor? Best regards. -- Jean-Philippe Menil - Pôle réseau Service IRTS DSI Université de Nantes jean-philippe.menil(a)univ-nantes.fr Tel : 02.53.48.49.27 - Fax : 02.53.48.49.09

1 0

[libvirt] [PATCH] xen: properly report out of memory when hvm_type is too small
by Guido Günther 22 Jan '12

22 Jan '12

--- src/xen/xen_hypervisor.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 855576c..51b92d3 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -2598,7 +2598,7 @@ xenHypervisorMakeCapabilitiesInternal(virConnectPtr conn, &line[subs[1].rm_so], subs[1].rm_eo-subs[1].rm_so, sizeof(hvm_type)) == NULL) - return NULL; + goto no_memory; } else if (regexec (&flags_pae_rec, line, 0, NULL, 0) == 0) host_pae = 1; } -- 1.7.8.3

2 2

[libvirt] [PATCH 1/2] virsh: extend domif-{get, set}link command to accept target name as a parameter
by Taku Izumi 21 Jan '12

21 Jan '12

Other virsh domifXXX commands can accept target name as a parameter to specify interface. From viewpoint of consistency, virsh domif-getlink command should accept target name as a parameter. This patch achieves this. Signed-off-by: Taku Izumi <izumi.taku(a)jp.fujitsu.com> --- tools/virsh.c | 25 ++++++++++++++++++------- tools/virsh.pod | 3 ++- 2 files changed, 20 insertions(+), 8 deletions(-) Index: libvirt/tools/virsh.c =================================================================== --- libvirt.orig/tools/virsh.c +++ libvirt/tools/virsh.c @@ -1509,7 +1509,10 @@ cmdDomIfGetLink (vshControl *ctl, const const char *iface = NULL; int flags = 0; char *state = NULL; - char *mac = NULL; + char *value = NULL; + unsigned char macaddr[VIR_MAC_BUFLEN]; + const char *element; + const char *attribute; bool ret = false; int i; char *desc; @@ -1552,27 +1555,35 @@ cmdDomIfGetLink (vshControl *ctl, const goto cleanup; } + if (virParseMacAddr(iface, macaddr) == 0) { + element = "mac"; + attribute = "address"; + } else { + element = "target"; + attribute = "dev"; + } + /* find interface with matching mac addr */ for (i = 0; i < obj->nodesetval->nodeNr; i++) { cur = obj->nodesetval->nodeTab[i]->children; while (cur) { if (cur->type == XML_ELEMENT_NODE && - xmlStrEqual(cur->name, BAD_CAST "mac")) { + xmlStrEqual(cur->name, BAD_CAST element)) { - mac = virXMLPropString(cur, "address"); + value = virXMLPropString(cur, attribute); - if (STRCASEEQ(mac, iface)){ - VIR_FREE(mac); + if (STRCASEEQ(value, iface)){ + VIR_FREE(value); goto hit; } - VIR_FREE(mac); + VIR_FREE(value); } cur = cur->next; } } - vshError(ctl, _("Interface with address '%s' not found."), iface); + vshError(ctl, _("Interface (%s: %s) not found."), element, iface); goto cleanup; hit: Index: libvirt/tools/virsh.pod =================================================================== --- libvirt.orig/tools/virsh.pod +++ libvirt/tools/virsh.pod @@ -475,10 +475,11 @@ Modify link state of the domain's virtua state are "up" and "down. If --persistent is specified, only the persistent configuration of the domain is modified. -=item B<domif-getlink> I<domain> I<interface-MAC> I<--persistent> +=item B<domif-getlink> I<domain> I<interface-device> I<--persistent> Query link state of the domain's virtual interface. If --persistent is specified, query the persistent configuration. +I<interface-device> can be the interface's target name or the MAC address. =item B<domiftune> I<domain> I<interface-device> [[I<--config>] [I<--live>] | [I<--current>]]

2 3