- Devel - libvirt List Archives

[libvirt] [PATCHv3 0/4] write separate module for hostdev passthrough
by cyliu＠suse.com 16 Aug '13

16 Aug '13

From: Chunyan Liu <cyliu(a)suse.com> These patches implements a separate module for hostdev passthrough so that it could be shared by different drivers and can maintain a global state of a host device. Plus, add passthrough to libxl driver, and change qemu driver and lxc driver to use hostdev common library instead of their own hostdev APIs. --- Changes to v2: * add patches for qemu driver and lxc driver, use common library APIs instead of their own hostdev APIs. * add APIs for nodedev-detach and nodedev-reattach calling. * rename functions to use unified prefix 'virHostdev' * use VIR_ONCE_GLOBAL_INIT() as others instead of previous Init and Cleanup. * use VIR_STRDUP instead of strdup * rebase to latest code v2 is here: https://www.redhat.com/archives/libvir-list/2013-June/msg00263.html Chunyan Liu (4): add hostdev passthrough common library add pci passthrough to libxl driver change qemu driver to use hostdev common library change lxc driver to use hostdev common library po/POTFILES.in | 3 +- src/Makefile.am | 3 +- src/libvirt_private.syms | 22 + src/libxl/libxl_conf.c | 65 ++ src/libxl/libxl_conf.h | 5 +- src/libxl/libxl_driver.c | 250 +++++++- src/lxc/lxc_conf.h | 4 - src/lxc/lxc_driver.c | 45 +- src/lxc/lxc_hostdev.c | 413 ------------ src/lxc/lxc_hostdev.h | 43 -- src/lxc/lxc_process.c | 21 +- src/qemu/qemu_command.c | 1 - src/qemu/qemu_conf.h | 9 +- src/qemu/qemu_driver.c | 72 +-- src/qemu/qemu_hostdev.c | 1289 ----------------------------------- src/qemu/qemu_hostdev.h | 72 -- src/qemu/qemu_hotplug.c | 127 ++-- src/qemu/qemu_process.c | 34 +- src/util/virhostdev.c | 1683 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/virhostdev.h | 123 ++++ src/util/virpci.c | 21 +- src/util/virpci.h | 7 +- src/util/virscsi.c | 22 +- src/util/virscsi.h | 8 +- src/util/virusb.c | 23 +- src/util/virusb.h | 8 +- 26 files changed, 2341 insertions(+), 2032 deletions(-) delete mode 100644 src/lxc/lxc_hostdev.c delete mode 100644 src/lxc/lxc_hostdev.h delete mode 100644 src/qemu/qemu_hostdev.c delete mode 100644 src/qemu/qemu_hostdev.h create mode 100644 src/util/virhostdev.c create mode 100644 src/util/virhostdev.h

3 10

[libvirt] [PATCH] maint: fix typo for 'switch'
by Eric Blake 16 Aug '13

16 Aug '13

* src/util/virnetdevvportprofile.c: Fix typo. * src/conf/domain_conf.c: Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. src/conf/domain_conf.c | 2 +- src/util/virnetdevvportprofile.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7309877..12b68ea 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2603,7 +2603,7 @@ virDomainDeviceInfoIterateInternal(virDomainDefPtr def, } /* This switch statement is here to trigger compiler warning when adding - * a new device type. When you are adding a new field to the swtich you + * a new device type. When you are adding a new field to the switch you * also have to add a iteration statement above. Otherwise the switch * statement has no real function here and should be optimized out by the * compiler. */ diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c index 01ba399..07155b9 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2012 Red Hat, Inc. + * Copyright (C) 2009-2013 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1114,7 +1114,7 @@ cleanup: * @vmOp : The VM operation (i.e., create, no-op) * @setlink_only : Only set the link - dont wait for the link to come up * - * Associate a port on a swtich with a profile. This function + * Associate a port on a switch with a profile. This function * may notify a kernel driver or an external daemon to run * the setup protocol. If profile parameters were not supplied * by the user, then this function returns without doing -- 1.8.3.1

1 0

[libvirt] [PATCH 0/2] gnulib update
by Eric Blake 16 Aug '13

16 Aug '13

I'll probably push this in another 24 hours if I don't get a review (I'm not pushing it now, because I want to test it on a few more machines first...). Eric Blake (2): maint: avoid bootstrap warning maint: update gnulib submodule .gnulib | 2 +- bootstrap | 35 +++++++++++++++++------------------ bootstrap.conf | 6 ++---- 3 files changed, 20 insertions(+), 23 deletions(-) -- 1.8.3.1

1 3

[libvirt] [PATCH v3] xml: introduce startupPolicy for chardev device
by Seiji Aguchi 16 Aug '13

16 Aug '13

[Problem] Currently, guest OS's messages can be logged to a local disk of host OS by creating chadevs with options below. -chardev file,id=charserial0,path=<log file's path> -device isa-serial,chardev=chardevserial0,id=serial0 When a hardware failure happens in the disk, qemu-kvm can't create the chardevs. In this case, guest OS doesn't boot up. Actually, there are users who don't desire that guest OS goes down due to a hardware failure of a log disk only. Therefore, qemu should offer some way to boot guest OS up even if the log disk is broken. [Solution] This patch supports startupPolicy for chardev. The starupPolicy is introduced just in cases where chardev is "file" because this patch aims for making guest OS boot up when a hardware failure happens. In other cases (pty, dev, pipe and unix) it is not introduced because they don't access to hardware. The policy works as follows. - If the value is "optional", guestOS boots up by dropping the chardev. - If other values are specified, guestOS fails to boot up. (the default) Description about original startupPolicy attribute: http://libvirt.org/git/?p=libvirt.git;a=commitdiff;h=e5a84d74a278 Signed-off-by: Seiji Aguchi <seiji.aguchi(a)hds.com> Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Change from v2 - To pass "make check", add followings. - Add serial source optional testing. - check if startupPolicy is NULL in virDomainChrSourceDefParseXML(). - Add xml format of startupPolicy in virDomainChrSourceDefFormat(). Patch v2 and comment from Eric Blake - https://www.redhat.com/archives/libvir-list/2013-May/msg01814.html - https://www.redhat.com/archives/libvir-list/2013-May/msg01943.html --- docs/formatdomain.html.in | 16 ++++++++- docs/schemas/domaincommon.rng | 3 ++ src/conf/domain_conf.c | 22 +++++++++++- src/conf/domain_conf.h | 1 + src/qemu/qemu_process.c | 25 +++++++++++++- .../qemuxml2argv-serial-source-optional.args | 9 +++++ .../qemuxml2argv-serial-source-optional.xml | 35 ++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 + tests/qemuxml2xmltest.c | 1 + tests/virt-aa-helper-test | 3 ++ 10 files changed, 113 insertions(+), 4 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-source-optional.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-serial-source-optional.xml diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 7601aaa..5c9d4fb 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4281,13 +4281,27 @@ qemu-kvm -net nic,model=? /dev/null <p> A file is opened and all data sent to the character device is written to the file. + <span class="since">Since 1.0.6</span>, it is possible to define + policy on what happens if the file is not accessible when + booting or migrating. This is done by + a <code>startupPolicy</code> attribute: </p> + <ul> + <li>If the value is "mandatory" (the default), the guest fails + to boot or migrate if the file is not found.</li> + <li>If the value is "optional", a missing file is at boot or + migration is substituted with /dev/null, so the guest still sees + the device but the host no longer tracks guest data on the device.</li> + <li>If the value is "requisite", the file is required for + booting, but optional on migration.</li> + </ul> + <pre> ... <devices> <serial type="file"> - <source path="/var/log/vm/vm-serial.log"/> + <source path="/var/log/vm/vm-serial.log" startupPolicy="optional"/> <target port="1"/> </serial> </devices> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 745b959..10b3365 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2817,6 +2817,9 @@ </optional> <optional> <attribute name="path"/> + <optional> + <ref name="startupPolicy"/> + </optional> </optional> <optional> <attribute name="host"/> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 10cb7f6..279ff9e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6819,6 +6819,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def, char *path = NULL; char *mode = NULL; char *protocol = NULL; + char *startupPolicy = NULL; int remaining = 0; while (cur != NULL) { @@ -6839,6 +6840,9 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def, !(flags & VIR_DOMAIN_XML_INACTIVE))) path = virXMLPropString(cur, "path"); + if (startupPolicy == NULL && + def->type == VIR_DOMAIN_CHR_TYPE_FILE) + startupPolicy = virXMLPropString(cur, "startupPolicy"); break; case VIR_DOMAIN_CHR_TYPE_UDP: @@ -6911,6 +6915,13 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def, def->data.file.path = path; path = NULL; + + if (startupPolicy) { + def->data.file.startupPolicy = + virDomainStartupPolicyTypeFromString(startupPolicy); + startupPolicy = NULL; + } + break; case VIR_DOMAIN_CHR_TYPE_STDIO: @@ -15014,8 +15025,15 @@ virDomainChrSourceDefFormat(virBufferPtr buf, if (def->type != VIR_DOMAIN_CHR_TYPE_PTY || (def->data.file.path && !(flags & VIR_DOMAIN_XML_INACTIVE))) { - virBufferEscapeString(buf, " <source path='%s'/>\n", - def->data.file.path); + virBufferEscapeString(buf, " <source path='%s'", + def->data.file.path); + + if (def->data.file.path && def->data.file.startupPolicy) { + const char *policy = +virDomainStartupPolicyTypeToString(def->data.file.startupPolicy); + virBufferAsprintf(buf, " startupPolicy='%s'", policy); + } + virBufferAddLit(buf, "/>\n"); } break; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index f265966..0899556 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1102,6 +1102,7 @@ struct _virDomainChrSourceDef { /* no <source> for null, vc, stdio */ struct { char *path; + int startupPolicy; /* enum virDomainStartupPolicy */ } file; /* pty, file, pipe, or device */ struct { char *host; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index a46d944..35d63d5 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2511,7 +2511,30 @@ qemuProcessPrepareChardevDevice(virDomainDefPtr def ATTRIBUTE_UNUSED, virReportSystemError(errno, _("Unable to pre-create chardev file '%s'"), dev->source.data.file.path); - return -1; + if (dev->source.data.file.startupPolicy != + VIR_DOMAIN_STARTUP_POLICY_OPTIONAL) { + return -1; + } + VIR_FREE(dev->source.data.file.path); + /* + * Change a destination to /dev/null to boot guest OS up + * even if a log disk is broken. + */ + VIR_WARN("Switch the destination to /dev/null"); + dev->source.data.file.path = strdup("/dev/null"); + + if (!(dev->source.data.file.path)) { + virReportOOMError(); + return -1; + } + + if ((fd = open(dev->source.data.file.path, + O_CREAT | O_APPEND, S_IRUSR|S_IWUSR)) < 0) { + virReportSystemError(errno, + _("Unable to pre-create chardev file '%s'"), + dev->source.data.file.path); + return -1; + } } VIR_FORCE_CLOSE(fd); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-source-optional.args b/tests/qemuxml2argvdata/qemuxml2argv-serial-source-optional.args new file mode 100644 index 0000000..9ffe8de --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-source-optional.args @@ -0,0 +1,9 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ +-S -M \ +pc -m 214 -smp 1 -nographic -nodefconfig -nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/test-monitor,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=readline \ +-no-acpi -boot c -usb -hdc /tmp/idedisk.img \ +-chardev file,id=charserial0,path=/tmp/serial.log \ +-device isa-serial,chardev=charserial0,id=serial0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-source-optional.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-source-optional.xml new file mode 100644 index 0000000..1aeb82a --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-source-optional.xml @@ -0,0 +1,35 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>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='file' device='disk'> + <source file='/tmp/idedisk.img'/> + <target dev='hdc' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='2'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <serial type='file'> + <source path='/tmp/serial.log' startupPolicy='optional'/> + <target port='0'/> + </serial> + <console type='file'> + <source path='/tmp/serial.log' startupPolicy='optional'/> + <target type='serial' port='0'/> + </console> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0f96eef..588c922 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -728,6 +728,8 @@ mymain(void) QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("console-compat-chardev", QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); + DO_TEST("serial-source-optional", + QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); DO_TEST("channel-guestfwd", QEMU_CAPS_CHARDEV, QEMU_CAPS_DEVICE, QEMU_CAPS_NODEFCONFIG); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 77cac3f..9faca1f 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -234,6 +234,7 @@ mymain(void) DO_TEST("console-virtio-many"); DO_TEST("channel-guestfwd"); DO_TEST("channel-virtio"); + DO_TEST("serial-source-optional"); DO_TEST("hostdev-usb-address"); DO_TEST("hostdev-pci-address"); diff --git a/tests/virt-aa-helper-test b/tests/virt-aa-helper-test index af91c61..7172fd6 100755 --- a/tests/virt-aa-helper-test +++ b/tests/virt-aa-helper-test @@ -255,6 +255,9 @@ testme "0" "disk (empty cdrom)" "-r -u $valid_uuid" "$test_xml" sed -e "s,###UUID###,$uuid,g" -e "s,###DISK###,$disk1,g" -e "s,</devices>,<serial type='file'><source path='$tmpdir/serial.log'/><target port='0'/></serial></devices>,g" "$template_xml" > "$test_xml" testme "0" "serial" "-r -u $valid_uuid" "$test_xml" +sed -e "s,###UUID###,$uuid,g" -e "s,###DISK###,$disk1,g" -e "s,</devices>,<serial type='file'><source path='$tmpdir/serial.log' startupPolicy='optional'/><target port='0'/></serial></devices>,g" "$template_xml" > "$test_xml" +testme "0" "serial" "-r -u $valid_uuid" "$test_xml" + sed -e "s,###UUID###,$uuid,g" -e "s,###DISK###,$disk1,g" -e "s,</devices>,<serial type='pty'><target port='0'/></serial></devices>,g" "$template_xml" > "$test_xml" testme "0" "serial (pty)" "-r -u $valid_uuid" "$test_xml" -- 1.7.1

3 5

[libvirt] [PATCH] libxl: unref DomainObjPrivate on error path
by Jim Fehlig 16 Aug '13

16 Aug '13

There is a potential leak of a newly created libxlDomainObjPrivate when subsequent allocation of the object's chrdev field fails. Unref the object on such an error so that it is properly disposed. --- src/libxl/libxl_driver.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index ddd7943..f09ad61 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -454,8 +454,10 @@ libxlDomainObjPrivateAlloc(void) if (!(priv = virObjectLockableNew(libxlDomainObjPrivateClass))) return NULL; - if (!(priv->devs = virChrdevAlloc())) + if (!(priv->devs = virChrdevAlloc())) { + virObjectUnref(priv); return NULL; + } return priv; } -- 1.8.1.4

2 2

[libvirt] [PATCH] virsh-domain: Fix memleak in cmdUndefine with storage
by Peter Krempa 16 Aug '13

16 Aug '13

When undefining a domain with storage when the volume isn't managed by libvirt the name and path strings weren't freed properly. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=996050 --- tools/virsh-domain.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 8cafce4..57065e4 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -3048,6 +3048,8 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) for (i = 0; i < nvolumes; i++) { ctxt->node = vol_nodes[i]; + VIR_FREE(source); + VIR_FREE(target); /* get volume source and target paths */ if (!(target = virXPathString("string(./target/@dev)", ctxt))) @@ -3090,6 +3092,8 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) } vlist[nvols].source = source; vlist[nvols].target = target; + source = NULL; + target = NULL; nvols++; } @@ -3189,6 +3193,8 @@ out: } cleanup: + VIR_FREE(source); + VIR_FREE(target); for (i = 0; i < nvols; i++) { VIR_FREE(vlist[i].source); VIR_FREE(vlist[i].target); -- 1.8.3.2

3 3

[libvirt] Error while adding volume through virsh
by varun bhatnagar 15 Aug '13

15 Aug '13

Hi, I was trying to add volume...I got one xml snippet and I modified it according to my node configuration: < volume> <name>testNode/cluster.vmdk </name> <allocation>0 </allocation> <capacity unit='G'>2<capacity> </volume> Now when I executed "virsh vol-create datastore1 /local/new_volume.xml" one error message came saying: "Error: Failed to create volume from /local/new_volume.xml" Error: internal error: Creation of raw volumes is not supported" Can anyone tell me what is going wrong here? Regards, Varun

1 0

[libvirt] [PATCH] Fix qemuProcessReadLog with non-zero offset
by Ján Tomko 15 Aug '13

15 Aug '13

This restores the error message when QMP probing is not used. https://bugzilla.redhat.com/show_bug.cgi?id=991334 --- src/qemu/qemu_process.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 0dccac3..31de759 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1435,18 +1435,17 @@ qemuProcessReadLog(int fd, char *buf, int buflen, int off) ssize_t bytes; char *eol; - buf[0] = '\0'; - while (off < buflen - 1) { bytes = saferead(fd, buf + off, buflen - off - 1); if (bytes < 0) return -1; - else if (bytes == 0) - break; off += bytes; buf[off] = '\0'; + if (bytes == 0) + break; + /* Filter out debug messages from intermediate libvirt process */ while ((eol = strchr(filter_next, '\n'))) { *eol = '\0'; -- 1.8.1.5

2 2

[libvirt] [PATCH] Update polkit examples to use 'lookup' method
by Daniel P. Berrange 15 Aug '13

15 Aug '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Feedback from the polkit developers indicates that the "_detail_XXXX" attributes are a private implementation detail. Our examples should be recommending use of the "action.lookup('XXX')" method instead. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/aclpolkit.html.in | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/docs/aclpolkit.html.in b/docs/aclpolkit.html.in index 3f0689e..1a09139 100644 --- a/docs/aclpolkit.html.in +++ b/docs/aclpolkit.html.in @@ -344,10 +344,8 @@ dealing with local clients connected via the UNIX socket). On the <code>action</code> object, the permission name is accessible via the <code>id</code> attribute, while the - object identifying attributes are exposed via a set of - attributes with the naming convention <code>_detail_[attrname]</code>. - For example, the 'domain_name' attribute would be exposed via - a property <code>_detail_domain_name</code>. + object identifying attributes are exposed via the + <code>lookup</code> method. </p> <h3><a name="exconnect">Example: restricting ability to connect to drivers</a></h3> @@ -359,7 +357,7 @@ use the <code>QEMU</code> driver and not the Xen or LXC drivers which are also available in libvirtd. To achieve this we need to write a rule which checks - whether the <code>_detail_connect_driver</code> attribute + whether the <code>connect_driver</code> attribute is <code>QEMU</code>, and match on an action name of <code>org.libvirt.api.connect.getattr</code>. Using the javascript rules format, this ends up written as @@ -369,7 +367,7 @@ polkit.addRule(function(action, subject) { if (action.id == "org.libvirt.api.connect.getattr" && subject.user == "berrange") { - if (action._detail_connect_driver == 'QEMU') { + if (action.lookup("connect_driver") == 'QEMU') { return polkit.Result.YES; } else { return polkit.Result.NO; @@ -386,8 +384,8 @@ polkit.addRule(function(action, subject) { full read-write mode. The goal is to only allow them to see the domain called <code>demo</code> on the LXC driver. To achieve this we need to write a rule which checks - whether the <code>_detail_connect_driver</code> attribute - is <code>LXC</code> and the <code>_detail_domain_name</code> + whether the <code>connect_driver</code> attribute + is <code>LXC</code> and the <code>domain_name</code> attribute is <code>demo</code>, and match on a action name of <code>org.libvirt.api.domain.getattr</code>. Using the javascript rules format, this ends up written as @@ -397,8 +395,8 @@ polkit.addRule(function(action, subject) { polkit.addRule(function(action, subject) { if (action.id == "org.libvirt.api.domain.getattr" && subject.user == "berrange") { - if (action._detail_connect_driver == 'LXC' && - action._detail_domain_name == 'demo') { + if (action.lookup("connect_driver") == 'LXC' && + action.lookup("domain_name") == 'demo') { return polkit.Result.YES; } else { return polkit.Result.NO; -- 1.8.1.4

2 1

[libvirt] Refactored previous patch into 5 patches
by Dan Walsh 15 Aug '13

15 Aug '13

[sandbox PATCH 1/5] Add virt-sandbox -s inherit, to execute the [sandbox PATCH 2/5] Unit files only exist in Systemd Containers. [sandbox PATCH 3/5] -S is not supported by virt-sandbox [sandbox PATCH 4/5] Fix SEE ALSO lines to be multi-line [sandbox PATCH 5/5] virt-sandbox needs to mention LIBVIRT_DEFAULT_URI

2 10

[libvirt] Updated patch for virt-sandbox -s inherit
by Dan Walsh 15 Aug '13

15 Aug '13

> -s static,label=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023 Well running "virt-sandbox -s inherit" would run as unconfined_t for most users. I the future we need to add a check to libvirt to ask SELinux if it is ok for a user to transiton to the label, rather then just to do it. Imagine a confined admin which is allowed to generate containers, he should only be allowed to generate containers with processes labels that he can transition into, not that libvirt can transition into. [sandbox PATCH 1/2] Add virt-sandbox -s inherit, to execute the [sandbox PATCH 2/2] Unit files only exist in Systemd Containers.

3 6

[libvirt] [PATCH] modify the subtitle of usb node
by Xuesong Zhang 15 Aug '13

15 Aug '13

--- docs/formatnode.html.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/formatnode.html.in b/docs/formatnode.html.in index 5f57a5a..b424c96 100644 --- a/docs/formatnode.html.in +++ b/docs/formatnode.html.in @@ -136,11 +136,11 @@ <dl> <dt><code>number</code></dt> <dd>The device number.</dd> - <dt><code>number</code></dt> + <dt><code>class</code></dt> <dd>The device class.</dd> - <dt><code>number</code></dt> + <dt><code>subclass</code></dt> <dd>The device subclass.</dd> - <dt><code>number</code></dt> + <dt><code>protocol</code></dt> <dd>The device protocol.</dd> <dt><code>description</code></dt> <dd>If present, a description of the device.</dd> -- 1.7.11.7

2 1

[libvirt] [test-API][PATCH] Add display of cases result to log.xml
by Hongming Zhang 15 Aug '13

15 Aug '13

The original log.xml only display the testrun result, the patch add display of case result to log.xml. modified: src/generator.py -Perserver case result list and pass it to log_generator class. modified: src/log.xsl -Read from xml and display case result modified: src/log_generator.py -Create case result xml and add it to log.xml --- src/generator.py | 5 +++-- src/log.xsl | 23 ++++++++++++++++++++--- src/log_generator.py | 16 ++++++++++++++-- 3 files changed, 37 insertions(+), 7 deletions(-) diff --git a/src/generator.py b/src/generator.py index 0cdc9de..208fa7b 100644 --- a/src/generator.py +++ b/src/generator.py @@ -87,7 +87,6 @@ class FuncGen(object): env_logger = envlog.env_log() casenumber = len(self.case_name_list) start_time = time.strftime("%Y-%m-%d %H:%M:%S") - env_logger.info("Checking Testing Environment... ") envck = env_inspect.EnvInspect(self.env, env_logger) @@ -103,6 +102,7 @@ class FuncGen(object): # retflag: [pass, fail, skip] retflag = [0, 0, 0] + case_retlist = [] for i in range(casenumber): clean_flag = False @@ -165,7 +165,7 @@ class FuncGen(object): retflag[2] += 1 self.fmt.print_end(mod_case, ret, env_logger) - + case_retlist.append(ret) # close hypervisor connection envck.close_hypervisor_connection() end_time = time.strftime("%Y-%m-%d %H:%M:%S") @@ -179,6 +179,7 @@ class FuncGen(object): self.log_xml_parser.add_test_summary(self.testrunid, self.testid, result, + case_retlist, start_time, end_time, self.logfile) diff --git a/src/log.xsl b/src/log.xsl index 577a0a5..0ca6afe 100644 --- a/src/log.xsl +++ b/src/log.xsl @@ -119,9 +119,10 @@ <tr> <th width="5%">No.</th> <th width="5%">Result</th> - <th width="12%">Start</th> - <th width="12%">End</th> - <th width="66%">Test Procedure</th> + <th width="10%">Start</th> + <th width="10%">End</th> + <th width="65%">Test Procedure</th> + <th width="5%">Case Result</th> </tr> </thead> <tbody> @@ -164,6 +165,22 @@ </xsl:for-each> </table> </td> + <td> + <table class="pro" cellspacing="1" cellspan="0" > + <xsl:for-each select="caseresult/case"> + <tr> + <td> + <xsl:if test="self::node()[text()='FAIL']"> + <tr class="fail"><xsl:value-of select="current()"/></tr> + </xsl:if> + <xsl:if test="self::node()[text()='PASS']"> + <tr class="pass"><xsl:value-of select="current()"/></tr> + </xsl:if> + </td> + </tr> + </xsl:for-each> + </table> + </td> </tr> </xsl:for-each> </tbody> diff --git a/src/log_generator.py b/src/log_generator.py index be483d6..de18654 100644 --- a/src/log_generator.py +++ b/src/log_generator.py @@ -93,7 +93,7 @@ class LogGenerator(object): self. __write_to_file(xmldoc, self.logxml) - def add_test_summary(self, testrunid, testid, result, + def add_test_summary(self, testrunid, testid, result, case_retlist, start_time, end_time, path): """ add a test summary xml block into log xml file """ xmldoc = minidom.parse(self.logxml) @@ -101,6 +101,8 @@ class LogGenerator(object): resulttext = self.doc.createTextNode(result) testresult.appendChild(resulttext) + caseresult = self.doc.createElement('caseresult') + teststarttime = self.doc.createElement('start_time') starttimetext = self.doc.createTextNode(start_time) teststarttime.appendChild(starttimetext) @@ -126,10 +128,20 @@ class LogGenerator(object): test.childNodes.insert(0, testendtime) test.childNodes.insert(0, teststarttime) test.childNodes.insert(0, testresult) + test.childNodes.insert(0, caseresult) + for ret in reversed(case_retlist): + retstr = '' + if ret == 0: + retstr = 'PASS' + else: + retstr = 'FAIL' + itemresult = self.doc.createElement('case') + caseresulttext = self.doc.createTextNode(retstr) + itemresult.appendChild(caseresulttext) + caseresult.childNodes.insert(0,itemresult) self. __write_to_file(xmldoc, self.logxml) - def add_testrun_summary(self, testrunid, passnum, failnum, totalnum, start_time, end_time): """ add a testrun summary xml block into log xml file """ -- 1.7.1

4 6

[libvirt] Please help confirm this upsream issue
by Zhenfeng Wang 15 Aug '13

15 Aug '13

Hi I just try to verify the bug 828546 with the latest libvirt version on rhel7, and found an issue that the on_crash element on guest's xml didn't support the "rename-restart" events on the upsteam. I discussed this issue with eric before, he said that this feature was implemented by fujitsu first, he didn't backported this and he just backported what upstream does, also he was not sure if Fujitsu implemented the "rename-restart" events either, so can you help me confirm that should we support the "rename-restart" events on the upstream? thanks

3 4

[libvirt] [PATCH v4 0/2] libxl: implement some chuncks of the NUMA interface
by Dario Faggioli 15 Aug '13

15 Aug '13

Hi and sorry for being so late at this. :-( This is the leftover of my NUMA series for the libxl driver. Basically, all the patches have been checked in but the one actually building the <topology> capability, which is patch 2/2 of this series. I think I addressed all Daniel's comments about VIR_*ALLOC* and error handling. Patch 1/2 is a bugfix to how the range of available NUMA nodes was being handled in a previous patch (more in the changelog). --- Dario Faggioli (2): libxl: fix node ranges in libxlNodeGetCellsFreeMemory() libxl: implement NUMA capabilities reporting src/libxl/libxl_conf.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_driver.c | 14 ++--- 2 files changed, 146 insertions(+), 8 deletions(-) -- <<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 5

[libvirt] Xen Developers Summit 2013, CfP (24-25 October, Edinburgh)
by Dario Faggioli 15 Aug '13

15 Aug '13

== Call for Proposals == We are pleased to announce that the Call for Proposals (CFP) for the first Xen Project Developer Summit is now open! The event is being held in Edinburgh, UK from October 24-25. All submissions need to be submitted by 11:55pm (BST) on August 30th. The Xen Project Developer Summit will feature content for developers, integrators and power users of the Xen Project. We are looking for presentations related to development, such as development proposals, updates on feature development, project updates, etc. We are also looking for insight into best practices in deploying Xen at scale, case studies by Xen users and other topics that large scale users of Xen care about. == Submit a Speaking Proposal == by visiting this URL: http://events.linuxfoundation.org//events/xen-project-developer-summit/prog… == Proposals == The program committee will be looking for presentations and workshops related to working with the Xen Project. Topics related to Xen Development include development proposals, updates on feature development, project updates, discussions and proposals on the architectural evolution of Xen, best practices of Xen development, studies and benchmarks of system characteristics such as performance/scalability/security/ease of use/power consumption, lessons learned, interfacing with other open source projects, making Xen easier to consume by distros, etc. We are also interested in proposals that provide insight into best practices in deploying Xen, case studies by Xen users and other topics that large users and integrators of Xen care about. This includes everything from deploying Xen or its sister projects at scale, best practices for working with Xen, case studies by users of Xen, Xen benchmarks, tips and tricks in securing Xen based clouds, topics related to managing Xen based environments, open source projects that are related to Xen and deliver benefits to Xen users, 3rd party Xen integrations, etc. As a Xen user, a proposal that catches the developers attention, is your chance to spark a debate that will influence what is developed by the Xen Project. In short, if it’s relevant to Xen development, integration and usage we are interested in what you might have to say. == Timeline and Deadlines == You can submit a proposal at any time for Xen Project Developer Summit. Please keep in mind that the deadline is August 30, 2013. == Presentation Types == Presentations should be for 25 or 50 minutes. Chose the length of your submission based on the content that you have. Note that we have been overwhelmed with talk proposals in the past and have thus asked speakers to modify talks to fit into a shorter slot. == Travel Sponsorships == Not sure if you can afford the airfare and lodging to attend the summit? Please don’t let that stop you from submitting your best proposal. We may be making a number of travel sponsorships available for speakers who have useful information to share with the Xen Project community. 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)

1 0

[libvirt] [PATCH] libxl: remove unnecessary curly braces
by Jim Fehlig 15 Aug '13

15 Aug '13

As per HACKING, remove some unneeded curly braces in the libxl driver. --- Noticed the unneeded braces while reviewing Chunyan's hostdev passthrough series. Not sure if this qualifies as trivial enough to just push, but best for a quick review anyhow to ensure I didn't botch something. src/libxl/libxl_conf.c | 24 ++++++++---------------- src/libxl/libxl_driver.c | 27 ++++++++++++--------------- 2 files changed, 20 insertions(+), 31 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 827dfdd..4362e62 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -244,12 +244,10 @@ libxlMakeCapabilitiesInternal(virArch hostarch, } /* Search for existing matching (model,hvm) tuple */ - for (i = 0; i < nr_guest_archs; i++) { + for (i = 0; i < nr_guest_archs; i++) if ((guest_archs[i].arch == arch) && - guest_archs[i].hvm == hvm) { + guest_archs[i].hvm == hvm) break; - } - } /* Too many arch flavours - highly unlikely ! */ if (i >= ARRAY_CARDINALITY(guest_archs)) @@ -690,10 +688,9 @@ libxlMakeDiskList(virDomainDefPtr def, libxl_domain_config *d_config) if (VIR_ALLOC_N(x_disks, ndisks) < 0) return -1; - for (i = 0; i < ndisks; i++) { + for (i = 0; i < ndisks; i++) if (libxlMakeDisk(l_disks[i], &x_disks[i]) < 0) goto error; - } d_config->disks = x_disks; d_config->num_disks = ndisks; @@ -760,10 +757,9 @@ libxlMakeNicList(virDomainDefPtr def, libxl_domain_config *d_config) if (VIR_ALLOC_N(x_nics, nnics) < 0) return -1; - for (i = 0; i < nnics; i++) { + for (i = 0; i < nnics; i++) if (libxlMakeNic(l_nics[i], &x_nics[i])) goto error; - } d_config->nics = x_nics; d_config->num_nics = nnics; @@ -916,21 +912,17 @@ libxlBuildDomainConfig(libxlDriverPrivatePtr driver, if (libxlMakeDomCreateInfo(driver, def, &d_config->c_info) < 0) return -1; - if (libxlMakeDomBuildInfo(vm, d_config) < 0) { + if (libxlMakeDomBuildInfo(vm, d_config) < 0) return -1; - } - if (libxlMakeDiskList(def, d_config) < 0) { + if (libxlMakeDiskList(def, d_config) < 0) return -1; - } - if (libxlMakeNicList(def, d_config) < 0) { + if (libxlMakeNicList(def, d_config) < 0) return -1; - } - if (libxlMakeVfbList(driver, def, d_config) < 0) { + if (libxlMakeVfbList(driver, def, d_config) < 0) return -1; - } d_config->on_reboot = def->onReboot; d_config->on_poweroff = def->onPoweroff; diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 9dc7261..dc8b6ba 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -301,13 +301,13 @@ libxlTimeoutRegisterEventHook(void *priv, gettimeofday(&now, NULL); timersub(&abs_t, &now, &res); /* Ensure timeout is not overflowed */ - if (timercmp(&res, &zero, <)) { + if (timercmp(&res, &zero, <)) timeout = 0; - } else if (res.tv_sec > INT_MAX / 1000) { + else if (res.tv_sec > INT_MAX / 1000) timeout = INT_MAX; - } else { + else timeout = res.tv_sec * 1000 + (res.tv_usec + 999) / 1000; - } + info->id = virEventAddTimeout(timeout, libxlTimerCallback, info, libxlEventHookInfoFree); if (info->id < 0) { @@ -888,10 +888,9 @@ libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, virDomainObjPtr vm) cpumask = (uint8_t*) def->cputune.vcpupin[vcpu]->cpumask; - for (i = 0; i < VIR_DOMAIN_CPUMASK_LEN; ++i) { + for (i = 0; i < VIR_DOMAIN_CPUMASK_LEN; ++i) if (cpumask[i]) VIR_USE_CPU(cpumap, i); - } map.size = cpumaplen; map.map = cpumap; @@ -1006,10 +1005,10 @@ libxlVmStart(libxlDriverPrivatePtr driver, virDomainObjPtr vm, virDomainObjAssignDef(vm, def, true, NULL); def = NULL; - if (unlink(managed_save_path) < 0) { + if (unlink(managed_save_path) < 0) VIR_WARN("Failed to remove the managed state %s", managed_save_path); - } + vm->hasManagedSave = false; } VIR_FREE(managed_save_path); @@ -4171,12 +4170,12 @@ libxlNodeGetCellsFreeMemory(virConnectPtr conn, if (lastCell >= nr_nodes) lastCell = nr_nodes - 1; - for (numCells = 0, n = startCell; n <= lastCell; n++) { + for (numCells = 0, n = startCell; n <= lastCell; n++) if (numa_info[n].size == LIBXL_NUMAINFO_INVALID_ENTRY) freeMems[numCells++] = 0; else freeMems[numCells++] = numa_info[n].free; - } + ret = numCells; cleanup: @@ -4447,11 +4446,10 @@ libxlDomainGetSchedulerParametersFlags(virDomainPtr dom, VIR_TYPED_PARAM_UINT, sc_info.weight) < 0) goto cleanup; - if (*nparams > 1) { + if (*nparams > 1) if (virTypedParameterAssign(&params[0], VIR_DOMAIN_SCHEDULER_CAP, VIR_TYPED_PARAM_UINT, sc_info.cap) < 0) goto cleanup; - } if (*nparams > XEN_SCHED_CREDIT_NPARAM) *nparams = XEN_SCHED_CREDIT_NPARAM; @@ -4530,11 +4528,10 @@ libxlDomainSetSchedulerParametersFlags(virDomainPtr dom, for (i = 0; i < nparams; ++i) { virTypedParameterPtr param = &params[i]; - if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_WEIGHT)) { + if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_WEIGHT)) sc_info.weight = params[i].value.ui; - } else if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_CAP)) { + else if (STREQ(param->field, VIR_DOMAIN_SCHEDULER_CAP)) sc_info.cap = params[i].value.ui; - } } if (libxl_domain_sched_params_set(priv->ctx, dom->id, &sc_info) != 0) { -- 1.8.1.4

2 2

[libvirt] [PATCH] examples: support crash events in event-test.py
by Giuseppe Scrivano 15 Aug '13

15 Aug '13

commit 14e7e0ae8db9843aea80245a3d9e6cf5f2ef720d adds the support for crash events. Solves: https://bugzilla.redhat.com/show_bug.cgi?id=994317 Signed-off-by: Giuseppe Scrivano <gscrivan(a)redhat.com> --- examples/domain-events/events-python/event-test.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/domain-events/events-python/event-test.py b/examples/domain-events/events-python/event-test.py index b7c10d1..84f5259 100644 --- a/examples/domain-events/events-python/event-test.py +++ b/examples/domain-events/events-python/event-test.py @@ -437,7 +437,8 @@ def eventToString(event): "Resumed", "Stopped", "Shutdown", - "PMSuspended" ) + "PMSuspended", + "Crashed" ) return eventStrings[event] def detailToString(event, detail): @@ -449,7 +450,8 @@ def detailToString(event, detail): ( "Unpaused", "Migrated", "Snapshot" ), ( "Shutdown", "Destroyed", "Crashed", "Migrated", "Saved", "Failed", "Snapshot"), ( "Finished", ), - ( "Memory", "Disk" ) + ( "Memory", "Disk" ), + ( "Panicked", ) ) return eventStrings[event][detail] -- 1.8.3.1

2 1

[libvirt] Libvirt Sandbox mini-website
by Daniel P. Berrange 15 Aug '13

15 Aug '13

While we've been working on it for a little while, we've never really had any content on libvirt.org focusing on the libvirt sandbox toolkit. To address this content gap, I've started a small website to provide useful info around their design, technology & usage. http://sandbox.libvirt.org/ Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH] virtio-rng: Remove double space in error message
by Peter Krempa 14 Aug '13

14 Aug '13

--- Pushed under the trivial rule. src/qemu/qemu_command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b811e1d..8b628d6 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5909,7 +5909,7 @@ qemuBuildRNGBackendArgs(virCommandPtr cmd, if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_RNG_RANDOM)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("this qemu doesn't support the rng-random " - " backend")); + "backend")); goto cleanup; } -- 1.8.3.2

1 0

[libvirt] Using magic ELF notes to export info about QEMU monitor commands
by Daniel P. Berrange 14 Aug '13

14 Aug '13

On another mailing list some folks were discussing how to determine what list of QEMU monitor commands a particular libvirt was written to be able to use. Rich Jones mentioned a thing they are doing in libguestfs using magic ELF notes: > My only suggestion is that we could put the strings into a separate > ELF section to make them easy to pull out of the binary. > > One of our libguestfs contributors did this for the libguestfs daemon > so that it's possible now to examine the daemon and find out what > binaries it runs/requires. He did it using the following macro: > > #define __external_command __attribute__((__section__(".guestfsd_ext_cmds"))) > #define GUESTFSD_EXT_CMD(___ext_cmd_var, ___ext_cmd_str) static const char ___ext_cmd_var[] __external_command = #___ext_cmd_str > > OpenSUSE's spec file has a section to read out the commands and > produce dependencies. It uses objcopy to read out the commands from > the binary: > > objcopy -j .guestfsd_ext_cmds -O binary $RPM_BUILD_ROOT/usr/sbin/guestfsd /dev/stdout | tr '\0' '\n' | sort -u To which I replied > Oooh, that's an interesting approach. It will tell you too much, > in so much that it wouldn't be possible to see that a number of > commands are supported by libvirt, but won't be used with specific > QEMU version. But just having an automated way to extract this > full list would still be pretty useful info. Since, we'd be able > to automatically detect additions between releases. > > So I guess we could take our current code: > > virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-block", > NULL); > > and change it to > > QEMU_JSON_CMD(QUERY_BLOCK, "query-block"); > > ... > virJSONValuePtr cmd = qemuMonitorJSONMakeCommand(QEMU_JSON_CMD_QUERY_BLOCK, > NULL); > > with QEMU_JSON_CMD being a macro you use in global context to > define a string constant + the elf section. ----- End forwarded message ----- In fact it would be preferable if you could just do it inline > virJSONValuePtr cmd = qemuMonitorJSONMakeCommand(QEMU_JSON_CMD("query-block"), > NULL); > instead of having the macro call separate, but it isn't clear that you can define ELF sections from inline code like that. Anyway, I'm not planning to implement this, but I wanted to mention this idea in case if motivates anyone else here to have a go at writing this feature idea.... Regards, Daniel; -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH][Ruby] support: virNetworkUpdate
by Hiroshi Miura 14 Aug '13

14 Aug '13

Hi Chris, I use ruby-libvirt for Vagrant and Vagrant-kvm project. A virNetworkUpdate method with libvirt ruby binding is essential in order to support network configuration among multi VMs in Vagrant. Please find an attachment that is trying to support virNetworkUpdate. https://github.com/miurahr/ruby-libvirt/tree/virNetworkUpdate -- Hiroshi Miura

2 3

[libvirt] [PATCH] Address missed feedback from review of virt-login-shell
by Daniel P. Berrange 14 Aug '13

14 Aug '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Address a number of code, style and docs issues identified in review of virt-login-shell after it was merged. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- tools/Makefile.am | 1 - tools/virt-login-shell.c | 58 ++++++++++++++++++++++++++++++---------------- tools/virt-login-shell.pod | 30 ++++++++++++++++++------ 3 files changed, 61 insertions(+), 28 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 00c582a..d48883c 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -134,7 +134,6 @@ virt_host_validate_CFLAGS = \ $(NULL) virt_login_shell_SOURCES = \ - virt-login-shell.conf \ virt-login-shell.c virt_login_shell_LDFLAGS = $(COVERAGE_LDFLAGS) diff --git a/tools/virt-login-shell.c b/tools/virt-login-shell.c index b27e44f..1157cd0 100644 --- a/tools/virt-login-shell.c +++ b/tools/virt-login-shell.c @@ -41,11 +41,11 @@ #include "vircommand.h" #define VIR_FROM_THIS VIR_FROM_NONE -static ssize_t nfdlist = 0; -static int *fdlist = NULL; +static ssize_t nfdlist; +static int *fdlist; static const char *conf_file = SYSCONFDIR "/libvirt/virt-login-shell.conf"; -static void virLoginShellFini(virConnectPtr conn, virDomainPtr dom) +static void virLoginShellFini(virConnectPtr conn, virDomainPtr dom) { size_t i; @@ -105,7 +105,7 @@ static int virLoginShellAllowedUser(virConfPtr conf, } } } - virReportSystemError(EPERM, _("%s not listed as an allowed_users in %s"), name, conf_file); + virReportSystemError(EPERM, _("%s not matched against 'allowed_users' in %s"), name, conf_file); cleanup: VIR_FREE(gname); return ret; @@ -121,7 +121,7 @@ static char **virLoginShellGetShellArgv(virConfPtr conf) if (!p) return virStringSplit("/bin/sh -l", " ", 3); - if (p && p->type == VIR_CONF_LIST) { + if (p->type == VIR_CONF_LIST) { size_t len; virConfValuePtr pp; @@ -139,7 +139,6 @@ static char **virLoginShellGetShellArgv(virConfPtr conf) if (VIR_STRDUP(shargv[i], pp->str) < 0) goto error; } - shargv[len] = NULL; } return shargv; error: @@ -155,16 +154,27 @@ static char *progname; static void usage(void) { - fprintf(stdout, _("\n" - "%s is a privileged program that allows non root users \n" - "specified in %s to join a Linux container \n" - "with a matching user name and launch a shell. \n" - "\n%s [options]\n\n" - " options:\n" - " -h | --help this help:\n\n"), progname, conf_file, progname); + fprintf(stdout, + _("\n" + "Usage:\n" + " %s [options]\n\n" + "Options:\n" + " -h | --help Display program help:\n" + " -V | --version Display program version:\n" + "\n" + "libvirt login shell\n"), + progname); return; } +/* Display version information. */ +static void +show_version(void) +{ + printf("%s (%s) %s\n", progname, PACKAGE_NAME, PACKAGE_VERSION); +} + + int main(int argc, char **argv) { @@ -190,6 +200,7 @@ main(int argc, char **argv) struct option opt[] = { {"help", no_argument, NULL, 'h'}, + {"version", optional_argument, NULL, 'V'}, {NULL, 0, NULL, 0} }; if (virInitialize() < 0) { @@ -214,20 +225,25 @@ main(int argc, char **argv) return ret; } - /* The only option we support is help - */ - while ((arg = getopt_long(argc, argv, "h", opt, &longindex)) != -1) { + while ((arg = getopt_long(argc, argv, "hV", opt, &longindex)) != -1) { switch (arg) { case 'h': usage(); exit(EXIT_SUCCESS); - break; + + case 'V': + show_version(); + exit(EXIT_SUCCESS); + + case '?': + default: + usage(); + exit(EXIT_FAILURE); } } if (argc > optind) { virReportSystemError(EINVAL, _("%s takes no options"), progname); - errno = EINVAL; goto cleanup; } @@ -268,7 +284,9 @@ main(int argc, char **argv) virErrorPtr last_error; last_error = virGetLastError(); if (last_error->code != VIR_ERR_OPERATION_INVALID) { - virReportSystemError(last_error->code,_("Can't create %s container: %s"), name, virGetLastErrorMessage()); + virReportSystemError(last_error->code, + _("Can't create %s container: %s"), + name, last_error->message); goto cleanup; } } @@ -327,7 +345,7 @@ main(int argc, char **argv) } if (execv(shargv[0], (char *const*) shargv) < 0) { virReportSystemError(errno, _("Unable exec shell %s"), shargv[0]); - return -errno; + return EXIT_FAILURE; } } return virProcessWait(ccpid, &status2); diff --git a/tools/virt-login-shell.pod b/tools/virt-login-shell.pod index 0cd35cf..e27d500 100644 --- a/tools/virt-login-shell.pod +++ b/tools/virt-login-shell.pod @@ -8,26 +8,42 @@ B<virt-login-shell> =head1 DESCRIPTION -The B<virt-login-shell> program is setuid shell that is used to join -an LXC container that matches the users name. If the container is not -running virt-login-shell will attempt to start the container. +The B<virt-login-shell> program is a setuid shell that is used to join +an LXC container that matches the user's name. If the container is not +running, virt-login-shell will attempt to start the container. virt-sandbox-shell is not allowed to be run by root. Normal users will get -added to a container that matches their username, if it exists. And they are +added to a container that matches their username, if it exists, and they are configured in /etc/libvirt/virt-login-shell.conf. The basic structure of most virt-login-shell usage is: virt-login-shell +=head1 OPTIONS + +=over + +=item B<-h, --help> + +Display command line help usage then exit. + +=item B<-V, --version> + +Display version information then exit. + +=back + =head1 CONFIG By default, virt-login-shell will execute the /bin/sh program for the user. -You can modify this behaviour by defining the shell variable in /etc/libvirt/virt-login-shell.conf. +You can modify this behaviour by defining the shell variable in +/etc/libvirt/virt-login-shell.conf. eg. shell = [ "/bin/ksh", "--login"] -By default no users are allowed to user virt-login-shell, if you want to allow -certain users to use virt-login-shell, you need to modify the allowed_users variable in /etc/libvirt/virt-login-shell.conf. +By default no users are allowed to use virt-login-shell, if you want to allow +certain users to use virt-login-shell, you need to modify the allowed_users +variable in /etc/libvirt/virt-login-shell.conf. eg. allowed_users = [ "tom", "dick", "harry" ] -- 1.8.3.1

3 4

[libvirt] [PATCH 0/5] Introduce API to query IP addresses for given domain
by nehaljwani 14 Aug '13

14 Aug '13

This feature has been requested for a very long time. Since qemu guest agent gives us reliable results, now the wait is over. The RFC was first proposed by Michal Privoznik: http://www.mail-archive.com/libvir-list@redhat.com/msg51857.html A patch was submitted, using structs: http://www.mail-archive.com/libvir-list@redhat.com/msg57141.html Another patch was submitted, using XML: http://www.mail-archive.com/libvir-list@redhat.com/msg57829.html Neither of the patches were accepted, probably due to lack of extensibility and usability. Hence, we thought of using virTypedParameters for reporting list of interfaces along with their MAC address and IP addresses. The RFC can be found here: http://www.mail-archive.com/libvir-list@redhat.com/msg79793.html The idea of extensibility was rejected and rendered out of scope of libvirt. Hence, we were back to structs. This API is called virDomainInterfacesAddresses which returns a dynamically allocated array of virDomainInterface struct. The great disadvantage is once this gets released, it's written in stone and we cannot change or add an item into it. The API supports two methods: * Return information (list of all associated interfaces with MAC address and IP addresses) of all of the domain interfaces by default (if no interface name is provided) * Return information for the specified interface (if an interface name is provided) The API queries qemu guest agent to obtain ip addresses and MAC address of each interface the given domain is associated with. In the future, support for more flags will be added to support for DHCP and snooping methods nehaljwani (5): domifaddr: Implement the public API domifaddr: Implement the remote protocol domifaddr: Implement the API for qemu domifaddr: Add virsh support domifaddr: Expose python binding daemon/remote.c | 123 ++++++++++++++++++++++++++++++++ examples/python/Makefile.am | 2 +- examples/python/README | 1 + examples/python/domipaddrs.py | 50 ++++++++++++++ include/libvirt/libvirt.h.in | 32 +++++++++ python/generator.py | 1 + python/libvirt-override-api.xml | 8 ++- python/libvirt-override.c | 117 +++++++++++++++++++++++++++++++ src/driver.h | 7 ++ src/libvirt.c | 99 ++++++++++++++++++++++++++ src/libvirt_public.syms | 5 ++ src/qemu/qemu_agent.c | 150 ++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 4 ++ src/qemu/qemu_driver.c | 57 +++++++++++++++ src/remote/remote_driver.c | 93 +++++++++++++++++++++++++ src/remote/remote_protocol.x | 32 ++++++++- src/remote_protocol-structs | 24 +++++++ tools/virsh-domain-monitor.c | 103 +++++++++++++++++++++++++++ tools/virsh.pod | 10 +++ 19 files changed, 914 insertions(+), 4 deletions(-) create mode 100755 examples/python/domipaddrs.py -- 1.7.11.7

2 10

[libvirt] [PATCH] network: permit upstream forwarding of unqualified DNS names
by Laine Stump 14 Aug '13

14 Aug '13

This resolves the issue that prompted the filing of https://bugzilla.redhat.com/show_bug.cgi?id=928638 (although the request there is for something much larger and more general than this patch). commit f3868259ca0517212e439a65c9060868f673b6c9 disabled the forwarding to upstream DNS servers of unresolved DNS requests for names that had no domain, but were just simple host names (no "." character anywhere in the name). While this behavior is frowned upon by DNS root servers (that's why it was changed in libvirt), it is convenient in some cases, and since dnsmasq can be configured to allow it, it must not be strictly forbidden. This patch restores the old behavior, but since it is usually undesirable, restoring it requires specification of a new option in the network config. Adding the attribute "forwardPlainNames='yes'" to the <dns> elemnt does the trick - when that attribute is added to a network config, any simple hostnames that can't be resolved by the network's dnsmasq instance will be forwarded to the DNS servers listed in the host's /etc/resolv.conf for an attempt at resolution (just as any FQDN would be forwarded). When that attribute *isn't* specified, unresolved simple names will *not* be forwarded to the upstream DNS server - this is the default behavior. --- docs/formatnetwork.html.in | 25 +++++++++++++++---- docs/schemas/network.rng | 8 +++++++ src/conf/network_conf.c | 28 ++++++++++++++++++++-- src/conf/network_conf.h | 1 + src/network/bridge_driver.c | 20 +++++++++++----- .../nat-network-dns-forward-plain.conf | 11 +++++++++ .../nat-network-dns-forward-plain.xml | 9 +++++++ tests/networkxml2conftest.c | 1 + .../nat-network-dns-forward-plain.xml | 9 +++++++ .../nat-network-dns-forward-plain.xml | 11 +++++++++ tests/networkxml2xmltest.c | 1 + 11 files changed, 112 insertions(+), 12 deletions(-) create mode 100644 tests/networkxml2confdata/nat-network-dns-forward-plain.conf create mode 100644 tests/networkxml2confdata/nat-network-dns-forward-plain.xml create mode 100644 tests/networkxml2xmlin/nat-network-dns-forward-plain.xml create mode 100644 tests/networkxml2xmlout/nat-network-dns-forward-plain.xml diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index eb7c4c7..e1482db 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -663,10 +663,27 @@ with the idiosyncrasies of the platform where libvirt is running. <span class="since">Since 0.8.8</span> </dd> - <dt><code>dns</code></dt><dd> - The dns element of a network contains configuration information for the - virtual network's DNS server. <span class="since">Since 0.9.3</span> - Currently supported elements are: + <dt><code>dns</code></dt> + <dd> The dns element of a network contains configuration + information for the virtual network's DNS + server <span class="since">Since 0.9.3</span>. + + <p> + The dns element + can have an optional <code>forwardPlainNames</code> + attribute <span class="since">Since 1.1.2</span>. + If <code>forwardPlainNames</code> is "no", then DNS resolution + requests for names that are not qualified with a domain + (i.e. names with no "." character) will not be forwarded to + the host's upstream DNS server - they will only be resolved if + they are known locally within the virtual network's own DNS + server. If <code>forwardPlainNames</code> is "yes", + unqualified names <b>will</b> be forwarded to the upstream DNS + server if they can't be resolved by the virtual network's own + DNS server. + </p> + + Currently supported sub-elements of <code><dns></code> are: <dl> <dt><code>txt</code></dt> <dd>A <code>dns</code> element can have 0 or more <code>txt</code> elements. diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index ded8580..ab183f1 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -208,6 +208,14 @@ and other features in the <dns> element --> <optional> <element name="dns"> + <optional> + <attribute name="forwardPlainNames"> + <choice> + <value>yes</value> + <value>no</value> + </choice> + </attribute> + </optional> <zeroOrMore> <element name="txt"> <attribute name="name"><ref name="dnsName"/></attribute> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 9141bbb..bbc980b 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1037,6 +1037,7 @@ virNetworkDNSDefParseXML(const char *networkName, xmlNodePtr *hostNodes = NULL; xmlNodePtr *srvNodes = NULL; xmlNodePtr *txtNodes = NULL; + char *forwardPlainNames = NULL; int nhosts, nsrvs, ntxts; size_t i; int ret = -1; @@ -1044,6 +1045,19 @@ virNetworkDNSDefParseXML(const char *networkName, ctxt->node = node; + forwardPlainNames = virXPathString("string(./@forwardPlainNames)", ctxt); + if (forwardPlainNames) { + if (STREQ(forwardPlainNames, "yes")) { + def->forwardPlainNames = true; + } else if (STRNEQ(forwardPlainNames, "no")) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid dns forwardPlainNames setting '%s' " + "in network '%s'"), + forwardPlainNames, networkName); + goto cleanup; + } + } + nhosts = virXPathNodeSet("./host", ctxt, &hostNodes); if (nhosts < 0) { virReportError(VIR_ERR_XML_ERROR, @@ -1106,6 +1120,7 @@ virNetworkDNSDefParseXML(const char *networkName, ret = 0; cleanup: + VIR_FREE(forwardPlainNames); VIR_FREE(hostNodes); VIR_FREE(srvNodes); VIR_FREE(txtNodes); @@ -2252,10 +2267,19 @@ virNetworkDNSDefFormat(virBufferPtr buf, int result = 0; size_t i, j; - if (!(def->nhosts || def->nsrvs || def->ntxts)) + if (!(def->forwardPlainNames || def->nhosts || def->nsrvs || def->ntxts)) goto out; - virBufferAddLit(buf, "<dns>\n"); + virBufferAddLit(buf, "<dns"); + if (def->forwardPlainNames) { + virBufferAddLit(buf, " forwardPlainNames='yes'"); + if (!(def->nhosts || def->nsrvs || def->ntxts)) { + virBufferAddLit(buf, "/>\n"); + goto out; + } + } + + virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); for (i = 0; i < def->ntxts; i++) { diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index a1d3282..920e899 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -115,6 +115,7 @@ struct _virNetworkDNSHostDef { typedef struct _virNetworkDNSDef virNetworkDNSDef; typedef virNetworkDNSDef *virNetworkDNSDefPtr; struct _virNetworkDNSDef { + bool forwardPlainNames; size_t ntxts; virNetworkDNSTxtDefPtr txts; size_t nhosts; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index dd30244..00f2bef 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -678,20 +678,28 @@ networkDnsmasqConfContents(virNetworkObjPtr network, "## virsh net-edit %s\n" "## or other application using the libvirt API.\n" "##\n## dnsmasq conf file created by libvirt\n" - "strict-order\n" - "domain-needed\n", + "strict-order\n", network->def->name); + if (!network->def->dns.forwardPlainNames) + virBufferAddLit(&configbuf, "domain-needed\n"); + if (network->def->domain) { virBufferAsprintf(&configbuf, "domain=%s\n" "expand-hosts\n", network->def->domain); } - /* need to specify local even if no domain specified */ - virBufferAsprintf(&configbuf, - "local=/%s/\n", - network->def->domain ? network->def->domain : ""); + + if (network->def->domain || !network->def->dns.forwardPlainNames) { + /* need to specify local even if no domain specified, unless + * the config says we should forward "plain" names (i.e. not + * fully qualified, no '.' characters) + */ + virBufferAsprintf(&configbuf, + "local=/%s/\n", + network->def->domain ? network->def->domain : ""); + } if (pidfile) virBufferAsprintf(&configbuf, "pid-file=%s\n", pidfile); diff --git a/tests/networkxml2confdata/nat-network-dns-forward-plain.conf b/tests/networkxml2confdata/nat-network-dns-forward-plain.conf new file mode 100644 index 0000000..9a000b8 --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-forward-plain.conf @@ -0,0 +1,11 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made using: +## virsh net-edit default +## or other application using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +except-interface=lo +bind-dynamic +interface=virbr0 +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/nat-network-dns-forward-plain.xml b/tests/networkxml2confdata/nat-network-dns-forward-plain.xml new file mode 100644 index 0000000..10bacb5 --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-forward-plain.xml @@ -0,0 +1,9 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid> + <forward dev='eth0' mode='nat'/> + <bridge name='virbr0' stp='on' delay='0' /> + <dns forwardPlainNames='yes'/> + <ip address='192.168.122.1' netmask='255.255.255.0'> + </ip> +</network> diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index b234b30..5825af3 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -144,6 +144,7 @@ mymain(void) DO_TEST("nat-network-dns-txt-record", full); DO_TEST("nat-network-dns-srv-record", full); DO_TEST("nat-network-dns-hosts", full); + DO_TEST("nat-network-dns-forward-plain", full); DO_TEST("dhcp6-network", dhcpv6); DO_TEST("dhcp6-nat-network", dhcpv6); DO_TEST("dhcp6host-routed-network", dhcpv6); diff --git a/tests/networkxml2xmlin/nat-network-dns-forward-plain.xml b/tests/networkxml2xmlin/nat-network-dns-forward-plain.xml new file mode 100644 index 0000000..10bacb5 --- /dev/null +++ b/tests/networkxml2xmlin/nat-network-dns-forward-plain.xml @@ -0,0 +1,9 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid> + <forward dev='eth0' mode='nat'/> + <bridge name='virbr0' stp='on' delay='0' /> + <dns forwardPlainNames='yes'/> + <ip address='192.168.122.1' netmask='255.255.255.0'> + </ip> +</network> diff --git a/tests/networkxml2xmlout/nat-network-dns-forward-plain.xml b/tests/networkxml2xmlout/nat-network-dns-forward-plain.xml new file mode 100644 index 0000000..3b50828 --- /dev/null +++ b/tests/networkxml2xmlout/nat-network-dns-forward-plain.xml @@ -0,0 +1,11 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid> + <forward dev='eth0' mode='nat'> + <interface dev='eth0'/> + </forward> + <bridge name='virbr0' stp='on' delay='0' /> + <dns forwardPlainNames='yes'/> + <ip address='192.168.122.1' netmask='255.255.255.0'> + </ip> +</network> diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index 0dfed16..11b3f02 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -104,6 +104,7 @@ mymain(void) DO_TEST("netboot-proxy-network"); DO_TEST("nat-network-dns-txt-record"); DO_TEST("nat-network-dns-hosts"); + DO_TEST("nat-network-dns-forward-plain"); DO_TEST("8021Qbh-net"); DO_TEST("direct-net"); DO_TEST("host-bridge-net"); -- 1.7.11.7

2 1

[libvirt] [PATCH 1/1] cpu: Add Power7+ and Power8 CPU definition in map.xml
by Li Zhang 14 Aug '13

14 Aug '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> Power7+ and Power8 are supported in QEMU, so it needs to define CPUs in libvirt to support them. Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/cpu/cpu_map.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index 6d51283..7d34d40 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -603,5 +603,16 @@ <vendor name='IBM'/> <pvr value='0x003f0203'/> </model> + + <model name='POWER7+_v2.1'> + <vendor name='IBM'/> + <pvr value='0x004a0201'/> + </model> + + <model name='POWER8_v1.0'> + <vendor name='IBM'/> + <pvr value='0x004b0100'/> + </model> + </arch> </cpus> -- 1.8.1.4

3 2

[libvirt] [PATCH] doc: storage pool permission copy-paste fix
by Philipp Hahn 14 Aug '13

14 Aug '13

The description for <permissions> was copied from the storage volume section to the storage pool section, but the semantics are different: 1. Currently only the "dir", "fs" and "netfs" storage pools use it. 2. They use it only to build the final directory. 3. A default for the storage volumes can't be set. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- docs/formatstorage.html.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index f4d561f..1fcfb6b 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -214,11 +214,10 @@ <span class="since">Since 0.4.1</span> </dd> <dt><code>permissions</code></dt> - <dd>Provides information about the default permissions to use - when creating volumes. This is currently only useful for directory - or filesystem based pools, where the volumes allocated are simple - files. For pools where the volumes are device nodes, the hotplug - scripts determine permissions. It contains 4 child elements. The + <dd>This is currently only useful for directory or filesystem based + pools, which are mapped as a directory into the local filesystem + namespace. It provides information about the permissions to use for the + final directory when the pool is built. The <code>mode</code> element contains the octal permission set. The <code>owner</code> element contains the numeric user ID. The <code>group</code> element contains the numeric group ID. The <code>label</code> element -- 1.7.10.4

2 1

[libvirt] Add virt-sandbox -s inherit, to execute the sandbox with parents label
by Dan Walsh 14 Aug '13

14 Aug '13

This will allow us to run sandbox as the calling process, If I am running a shell as staff_u:unconfined_r:unconfined_t:s0, and I execute virt-sandbox -c lxc/// -- /bin/sh The second patch fixes a problem when users try to upgrade Generic Containers. [sandbox PATCH 1/2] Add virt-sandbox -s inherit, to execute the [sandbox PATCH 2/2] GenericContainers do not have unit files.

1 0

[libvirt] [PATCH] Directly link against needed libraries
by Guido Günther 13 Aug '13

13 Aug '13

The Linux build revealed another missing direkt link target, this time against selinux libs: http://honk.sigxcpu.org:8001/view/libvirt/job/libvirt-build-debian-sid-amd6… --- Sorry for missing this in the previous patch. -- GUido tests/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index a9bcf4c..9098dec 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -722,7 +722,7 @@ libsecurityselinuxhelper_la_LDFLAGS = -module -avoid-version \ securityselinuxtest_SOURCES = \ securityselinuxtest.c testutils.h testutils.c -securityselinuxtest_LDADD = $(LDADDS) +securityselinuxtest_LDADD = $(LDADDS) $(SELINUX_LIBS) securityselinuxtest_DEPENDENCIES = libsecurityselinuxhelper.la \ ../src/libvirt.la @@ -731,7 +731,7 @@ if WITH_ATTR securityselinuxlabeltest_SOURCES = \ securityselinuxlabeltest.c testutils.h testutils.c \ testutilsqemu.h testutilsqemu.c -securityselinuxlabeltest_LDADD = $(qemu_LDADDS) +securityselinuxlabeltest_LDADD = $(qemu_LDADDS) $(SELINUX_LIBS) securityselinuxlabeltest_DEPENDENCIES = libsecurityselinuxhelper.la \ ../src/libvirt.la endif -- 1.8.4.rc1

2 2

[libvirt] [PATCH] Honour root prefix in lxcContainerMountFSBlockAuto
by Daniel P. Berrange 13 Aug '13

13 Aug '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The lxcContainerMountFSBlockAuto method can be used to mount the initial root filesystem, so it cannot assume a prefix of /.oldroot. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_container.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index a943b22..0ab4026 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1144,7 +1144,8 @@ lxcContainerMountDetectFilesystem(const char *src ATTRIBUTE_UNUSED, */ static int lxcContainerMountFSBlockAuto(virDomainFSDefPtr fs, int fsflags, - const char *src) + const char *src, + const char *srcprefix) { FILE *fp = NULL; int ret = -1; @@ -1154,11 +1155,11 @@ static int lxcContainerMountFSBlockAuto(virDomainFSDefPtr fs, char *line = NULL; const char *type; - VIR_DEBUG("src=%s dst=%s", src, fs->dst); + VIR_DEBUG("src=%s dst=%s srcprefix=%s", src, fs->dst, srcprefix); /* First time around we use /etc/filesystems */ retry: - if (virAsprintf(&fslist, "/.oldroot%s", + if (virAsprintf(&fslist, "%s%s", srcprefix, tryProc ? "/proc/filesystems" : "/etc/filesystems") < 0) goto cleanup; @@ -1270,7 +1271,8 @@ cleanup: * probing for filesystem type */ static int lxcContainerMountFSBlockHelper(virDomainFSDefPtr fs, - const char *src) + const char *src, + const char *srcprefix) { int fsflags = 0; int ret = -1; @@ -1300,7 +1302,7 @@ static int lxcContainerMountFSBlockHelper(virDomainFSDefPtr fs, } ret = 0; } else { - ret = lxcContainerMountFSBlockAuto(fs, fsflags, src); + ret = lxcContainerMountFSBlockAuto(fs, fsflags, src, srcprefix); } cleanup: @@ -1318,7 +1320,7 @@ static int lxcContainerMountFSBlock(virDomainFSDefPtr fs, if (virAsprintf(&src, "%s%s", srcprefix, fs->src) < 0) goto cleanup; - ret = lxcContainerMountFSBlockHelper(fs, src); + ret = lxcContainerMountFSBlockHelper(fs, src, srcprefix); VIR_DEBUG("Done mounting filesystem ret=%d", ret); -- 1.8.3.1

2 1

[libvirt] [PATCH] Properly handle -h / -V for --help/--version aliases in virtlockd/libvirtd
by Daniel P. Berrange 13 Aug '13

13 Aug '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The virtlockd/libvirtd daemons had listed '?' as the short option for --help. getopt_long uses '?' for any unknown option. We want to be able to distinguish unknown options (which use EXIT_FAILURE) from correct usage of help (which should use EXIT_SUCCESS). Thus we should use 'h' as a short option for --help. Also add this to the man page docs The virtlockd/libvirtd daemons did not list any short option for the --version arg. Add -V as a valid short option, since -v is already used for --verbose. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- daemon/libvirtd.c | 31 ++++++++++++++----------------- daemon/libvirtd.pod.in | 4 ++++ src/locking/lock_daemon.c | 29 +++++++++++++---------------- src/locking/virtlockd.pod.in | 6 +++++- 4 files changed, 36 insertions(+), 34 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 402b494..c9cd1a1 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1038,12 +1038,13 @@ daemonUsage(const char *argv0, bool privileged) " %s [options]\n" "\n" "Options:\n" + " -h | --help Display program help:\n" " -v | --verbose Verbose messages.\n" " -d | --daemon Run as a daemon & write PID file.\n" " -l | --listen Listen for TCP/IP connections.\n" " -t | --timeout <secs> Exit after timeout period.\n" " -f | --config <file> Configuration file.\n" - " | --version Display version information.\n" + " -V | --version Display version information.\n" " -p | --pid-file <file> Change name of PID file.\n" "\n" "libvirt management daemon:\n"), @@ -1098,10 +1099,6 @@ daemonUsage(const char *argv0, bool privileged) } } -enum { - OPT_VERSION = 129 -}; - #define MAX_LISTEN 5 int main(int argc, char **argv) { virNetServerPtr srv = NULL; @@ -1123,14 +1120,14 @@ int main(int argc, char **argv) { mode_t old_umask; struct option opts[] = { - { "verbose", no_argument, &verbose, 1}, - { "daemon", no_argument, &godaemon, 1}, - { "listen", no_argument, &ipsock, 1}, + { "verbose", no_argument, &verbose, 'v'}, + { "daemon", no_argument, &godaemon, 'd'}, + { "listen", no_argument, &ipsock, 'l'}, { "config", required_argument, NULL, 'f'}, { "timeout", required_argument, NULL, 't'}, { "pid-file", required_argument, NULL, 'p'}, - { "version", no_argument, NULL, OPT_VERSION }, - { "help", no_argument, NULL, '?' }, + { "version", no_argument, NULL, 'V' }, + { "help", no_argument, NULL, 'h' }, {0, 0, 0, 0} }; @@ -1173,7 +1170,7 @@ int main(int argc, char **argv) { int c; char *tmp; - c = getopt_long(argc, argv, "ldf:p:t:v", opts, &optidx); + c = getopt_long(argc, argv, "ldf:p:t:vVh", opts, &optidx); if (c == -1) { break; @@ -1219,17 +1216,17 @@ int main(int argc, char **argv) { } break; - case OPT_VERSION: + case 'V': daemonVersion(argv[0]); - return 0; + exit(EXIT_SUCCESS); - case '?': + case 'h': daemonUsage(argv[0], privileged); - return 2; + exit(EXIT_SUCCESS); + case '?': default: - VIR_ERROR(_("%s: internal error: unknown flag: %c"), - argv[0], c); + daemonUsage(argv[0], privileged); exit(EXIT_FAILURE); } } diff --git a/daemon/libvirtd.pod.in b/daemon/libvirtd.pod.in index 930b752..9901ecf 100644 --- a/daemon/libvirtd.pod.in +++ b/daemon/libvirtd.pod.in @@ -36,6 +36,10 @@ from the configuration. =over +=item B<-h, --help> + +Display command line help usage then exit. + =item B<-d, --daemon> Run as a daemon & write PID file. diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index c45f45c..77d6e0d 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -1096,10 +1096,11 @@ virLockDaemonUsage(const char *argv0, bool privileged) " %s [options]\n" "\n" "Options:\n" + " -h | --help Display program help:\n" " -v | --verbose Verbose messages.\n" " -d | --daemon Run as a daemon & write PID file.\n" " -f | --config <file> Configuration file.\n" - " | --version Display version information.\n" + " -V | --version Display version information.\n" " -p | --pid-file <file> Change name of PID file.\n" "\n" "libvirt lock management daemon:\n"), argv0); @@ -1138,10 +1139,6 @@ virLockDaemonUsage(const char *argv0, bool privileged) } } -enum { - OPT_VERSION = 129 -}; - #define MAX_LISTEN 5 int main(int argc, char **argv) { virNetServerProgramPtr lockProgram = NULL; @@ -1161,12 +1158,12 @@ int main(int argc, char **argv) { int rv; struct option opts[] = { - { "verbose", no_argument, &verbose, 1}, - { "daemon", no_argument, &godaemon, 1}, + { "verbose", no_argument, &verbose, 'v'}, + { "daemon", no_argument, &godaemon, 'd'}, { "config", required_argument, NULL, 'f'}, { "pid-file", required_argument, NULL, 'p'}, - { "version", no_argument, NULL, OPT_VERSION }, - { "help", no_argument, NULL, '?' }, + { "version", no_argument, NULL, 'V' }, + { "help", no_argument, NULL, 'h' }, {0, 0, 0, 0} }; @@ -1185,7 +1182,7 @@ int main(int argc, char **argv) { int optidx = 0; int c; - c = getopt_long(argc, argv, "ldf:p:t:v", opts, &optidx); + c = getopt_long(argc, argv, "ldf:p:t:vVh", opts, &optidx); if (c == -1) { break; @@ -1218,17 +1215,17 @@ int main(int argc, char **argv) { } break; - case OPT_VERSION: + case 'V': virLockDaemonVersion(argv[0]); - return 0; + exit(EXIT_SUCCESS); - case '?': + case 'h': virLockDaemonUsage(argv[0], privileged); - return 2; + exit(EXIT_SUCCESS); + case '?': default: - fprintf(stderr, _("%s: internal error: unknown flag: %c\n"), - argv[0], c); + virLockDaemonUsage(argv[0], privileged); exit(EXIT_FAILURE); } } diff --git a/src/locking/virtlockd.pod.in b/src/locking/virtlockd.pod.in index f5748ca..99612aa 100644 --- a/src/locking/virtlockd.pod.in +++ b/src/locking/virtlockd.pod.in @@ -26,6 +26,10 @@ The virtlockd daemon listens for requests on a local Unix domain socket. =over +=item B<-h, --help> + +Display command line help usage then exit. + =item B<-d, --daemon> Run as a daemon and write PID file. @@ -42,7 +46,7 @@ Use this name for the PID file, overriding the default value. Enable output of verbose messages. -=item B< --version> +=item B<-V, --version> Display version information then exit. -- 1.8.3.1

2 1

[libvirt] [PATCH] virsh-domain: Flip logic in cmdSetvcpus
by Peter Krempa 13 Aug '13

13 Aug '13

To avoid having to assign a failure code to the returned variable switch this function to negative logic. This will fix issue with invalid number of cpus returning success return code. https://bugzilla.redhat.com/show_bug.cgi?id=996466 --- tools/virsh-domain.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 4081451..3b2513b 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -5965,7 +5965,7 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; int count = 0; - bool ret = true; + bool ret = false; bool maximum = vshCommandOptBool(cmd, "maximum"); bool config = vshCommandOptBool(cmd, "config"); bool live = vshCommandOptBool(cmd, "live"); @@ -5996,9 +5996,8 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) } if (flags == -1) { - if (virDomainSetVcpus(dom, count) != 0) { - ret = false; - } + if (virDomainSetVcpus(dom, count) != 0) + goto cleanup; } else { /* If the --maximum flag was given, we need to ensure only the --config flag is in effect as well */ @@ -6015,18 +6014,18 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) /* Warn the user about the invalid flag combination */ vshError(ctl, _("--maximum must be used with --config only")); - ret = false; goto cleanup; } } /* Apply the virtual cpu changes */ - if (virDomainSetVcpusFlags(dom, count, flags) < 0) { - ret = false; - } + if (virDomainSetVcpusFlags(dom, count, flags) < 0) + goto cleanup; } - cleanup: + ret = true; + +cleanup: virDomainFree(dom); return ret; } -- 1.8.3.2

2 2

[libvirt] [PATCH 0/2] Support settings the 'removable' flag for USB disks
by Fred A. Kemp 13 Aug '13

13 Aug '13

From: "Fred A. Kemp" <anonym(a)lavabit.com> The commit message of patch #2 explains the purpose of this patch set. A review would be greatly appreciated! Note that I've only added the new capability for usb-storage.removable to the qemu help tests of qemu(-kvm) version 1.2.0, since that's what I had easily available to get the output of `-device usb-storage,?` from. I hope that's not an issue, otherwise, is there a way to obtain these outputs without having to hunt down and install all supported versions? Previous submissions of this patch set to this list: http://www.redhat.com/archives/libvir-list/2013-March/msg01051.html http://www.redhat.com/archives/libvir-list/2013-May/msg02039.html Cheers! Fred A. Kemp (2): qemu: Add capability flag for usb-storage qemu: Support setting the 'removable' flag for USB disks docs/formatdomain.html.in | 8 +++-- docs/schemas/domaincommon.rng | 8 +++++ src/conf/domain_conf.c | 31 ++++++++++++++++++-- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 10 +++++++ src/qemu/qemu_capabilities.h | 2 ++ src/qemu/qemu_command.c | 23 +++++++++++++-- tests/qemuhelpdata/qemu-1.2.0-device | 11 +++++++ tests/qemuhelpdata/qemu-kvm-1.2.0-device | 11 +++++++ tests/qemuhelptest.c | 20 +++++++++---- .../qemuxml2argv-disk-usb-device-removable.args | 8 +++++ .../qemuxml2argv-disk-usb-device-removable.xml | 27 +++++++++++++++++ tests/qemuxml2argvtest.c | 6 +++- 13 files changed, 151 insertions(+), 15 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.xml -- 1.7.10.4

3 4

[libvirt] [PATCH v2 0/2] Add support for adjusting the 64-bit PCI hole size
by Ján Tomko 13 Aug '13

13 Aug '13

v2: Use 'pcihole64' attribute of the root PCI controller instead of <pcihole64> element in domain features. v1: https://www.redhat.com/archives/libvir-list/2013-August/msg00510.html https://bugzilla.redhat.com/show_bug.cgi?id=990418 Ján Tomko (2): Add pcihole64 attribute to root PCI controllers Build QEMU command line for pcihole64 docs/formatdomain.html.in | 8 +++ docs/schemas/domaincommon.rng | 32 +++++++++--- src/conf/domain_conf.c | 17 +++++++ src/conf/domain_conf.h | 8 +++ src/qemu/qemu_capabilities.c | 14 ++++++ src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_command.c | 58 ++++++++++++++++++++++ .../qemuxml2argv-pcihole64-none.args | 4 ++ .../qemuxml2argv-pcihole64-none.xml | 21 ++++++++ .../qemuxml2argv-pcihole64-q35.args | 9 ++++ .../qemuxml2argv-pcihole64-q35.xml | 31 ++++++++++++ tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args | 5 ++ tests/qemuxml2argvdata/qemuxml2argv-pcihole64.xml | 21 ++++++++ tests/qemuxml2argvtest.c | 10 ++++ tests/qemuxml2xmltest.c | 4 ++ 15 files changed, 236 insertions(+), 8 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcihole64.xml -- 1.8.1.5

2 7

[libvirt] [PATCH] virsh-domain: Check if domain is running for ttyconsole cmd
by Yanbing Du 13 Aug '13

13 Aug '13

Signed-off-by: Yanbing Du <ydu(a)redhat.com> --- tools/virsh-domain.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 4081451..9ccbc35 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9139,6 +9139,12 @@ cmdTTYConsole(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; + /* Check if the domain is active */ + if (!virDomainIsActive(dom)) { + vshError(ctl, _("Domain is not running")); + goto cleanup; + } + doc = virDomainGetXMLDesc(dom, 0); if (!doc) goto cleanup; -- 1.7.1

1 0

[libvirt] [PATCH] Fix parallel runs of TLS test suites
by Daniel P. Berrange 13 Aug '13

13 Aug '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Use a seperate keyfile name for the two TLS test suites so that they don't clash when running tests in parallel Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- tests/virnettlscontexttest.c | 10 ++++++---- tests/virnettlshelpers.c | 6 ++---- tests/virnettlshelpers.h | 6 ++---- tests/virnettlssessiontest.c | 10 ++++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index 9ade785..53792ee 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -40,6 +40,8 @@ # define VIR_FROM_THIS VIR_FROM_RPC +# define KEYFILE "key-ctx.pem" + struct testTLSContextData { bool isServer; const char *cacrt; @@ -66,7 +68,7 @@ static int testTLSContextInit(const void *opaque) ctxt = virNetTLSContextNewServer(data->cacrt, NULL, data->crt, - keyfile, + KEYFILE, NULL, true, true); @@ -74,7 +76,7 @@ static int testTLSContextInit(const void *opaque) ctxt = virNetTLSContextNewClient(data->cacrt, NULL, data->crt, - keyfile, + KEYFILE, true, true); } @@ -109,7 +111,7 @@ mymain(void) { int ret = 0; - testTLSInit(); + testTLSInit(KEYFILE); # define DO_CTX_TEST(_isServer, _caCrt, _crt, _expectFail) \ do { \ @@ -617,7 +619,7 @@ mymain(void) testTLSDiscardCert(&clientcertlevel2breq); unlink("cacertchain.pem"); - testTLSCleanup(); + testTLSCleanup(KEYFILE); return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE; } diff --git a/tests/virnettlshelpers.c b/tests/virnettlshelpers.c index 39a2df6..8a10340 100644 --- a/tests/virnettlshelpers.c +++ b/tests/virnettlshelpers.c @@ -34,8 +34,6 @@ # define VIR_FROM_THIS VIR_FROM_RPC -const char *keyfile = abs_builddir "/virnettlscontexttest-key.pem"; - /* * These store some static data that is needed when * encoding extensions in the x509 certs @@ -99,7 +97,7 @@ static gnutls_x509_privkey_t testTLSLoadKey(void) } -void testTLSInit(void) +void testTLSInit(const char *keyfile) { gnutls_global_init(); @@ -112,7 +110,7 @@ void testTLSInit(void) } -void testTLSCleanup(void) +void testTLSCleanup(const char *keyfile) { asn1_delete_structure(&pkix_asn1); unlink(keyfile); diff --git a/tests/virnettlshelpers.h b/tests/virnettlshelpers.h index 7c3f8da..3f6afb9 100644 --- a/tests/virnettlshelpers.h +++ b/tests/virnettlshelpers.h @@ -28,8 +28,6 @@ # include "rpc/virnettlscontext.h" -extern const char *keyfile; - /* * This contains parameter about how to generate * certificates. @@ -76,7 +74,7 @@ void testTLSWriteCertChain(const char *filename, size_t ncerts); void testTLSDiscardCert(struct testTLSCertReq *req); -void testTLSInit(void); -void testTLSCleanup(void); +void testTLSInit(const char *keyfile); +void testTLSCleanup(const char *keyfile); #endif diff --git a/tests/virnettlssessiontest.c b/tests/virnettlssessiontest.c index bc176aa..9b171ed 100644 --- a/tests/virnettlssessiontest.c +++ b/tests/virnettlssessiontest.c @@ -38,6 +38,8 @@ # define VIR_FROM_THIS VIR_FROM_RPC +# define KEYFILE "key-sess.pem" + struct testTLSSessionData { const char *servercacrt; const char *clientcacrt; @@ -107,7 +109,7 @@ static int testTLSSessionInit(const void *opaque) serverCtxt = virNetTLSContextNewServer(data->servercacrt, NULL, data->servercrt, - keyfile, + KEYFILE, data->wildcards, false, true); @@ -115,7 +117,7 @@ static int testTLSSessionInit(const void *opaque) clientCtxt = virNetTLSContextNewClient(data->clientcacrt, NULL, data->clientcrt, - keyfile, + KEYFILE, false, true); @@ -236,7 +238,7 @@ mymain(void) { int ret = 0; - testTLSInit(); + testTLSInit(KEYFILE); # define DO_SESS_TEST(_caCrt, _serverCrt, _clientCrt, _expectServerFail, \ _expectClientFail, _hostname, _wildcards) \ @@ -474,7 +476,7 @@ mymain(void) testTLSDiscardCert(&clientcertlevel2breq); unlink("cacertchain.pem"); - testTLSCleanup(); + testTLSCleanup(KEYFILE); return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.8.3.1

3 5

[libvirt] [PATCH] docs: mention VIR_TEST_RANGE
by Eric Blake 13 Aug '13

13 Aug '13

Commit ab92ae333 added a cool feature, but didn't document it. * docs/hacking.html.in: Document debugging a subset of tests. * HACKING: Regenerate. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule, as I found myself wanting to use this during development today. HACKING | 5 +++++ docs/hacking.html.in | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/HACKING b/HACKING index 256e8ae..f9f8381 100644 --- a/HACKING +++ b/HACKING @@ -123,6 +123,11 @@ VIR_TEST_DEBUG may provide larger amounts of information: VIR_TEST_DEBUG=1 make check (or) VIR_TEST_DEBUG=2 make check +When debugging failures during development, it is possible to focus in on just +the failing subtests by using TESTS and VIR_TEST_RANGE: + + make check VIR_TEST_DEBUG=1 VIR_TEST_RANGE=3-5 TESTS=qemuxml2argvtest + Also, individual tests can be run from inside the "tests/" directory, like: ./qemuxml2xmltest diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 0892b73..543c77e 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -141,6 +141,17 @@ VIR_TEST_DEBUG=1 make check (or) VIR_TEST_DEBUG=2 make check </pre> + + <p> + When debugging failures during development, it is possible + to focus in on just the failing subtests by using TESTS and + VIR_TEST_RANGE: + </p> + +<pre> + make check VIR_TEST_DEBUG=1 VIR_TEST_RANGE=3-5 TESTS=qemuxml2argvtest +</pre> + <p> Also, individual tests can be run from inside the <code>tests/</code> directory, like: -- 1.8.3.1

1 0

[libvirt] [PATCH v2 1/5] cgroup macros refactoring
by Roman Bogorodskiy 13 Aug '13

13 Aug '13

- Introduce VIR_CGROUP_SUPPORTED conditional - Convert virCgroupKill* to use it - Convert virCgroupIsolateMount() to use it --- src/util/vircgroup.c | 59 ++++++++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index cfb4b3f..5f656b1 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -56,6 +56,11 @@ #define VIR_FROM_THIS VIR_FROM_CGROUP +#if defined(__linux__) && defined(HAVE_GETMNTENT_R) \ + && defined(_DIRENT_HAVE_D_TYPE) +# define VIR_CGROUP_SUPPORTED +#endif + VIR_ENUM_IMPL(virCgroupController, VIR_CGROUP_CONTROLLER_LAST, "cpu", "cpuacct", "cpuset", "memory", "devices", "freezer", "blkio", "net_cls", "perf_event", @@ -2682,7 +2687,7 @@ int virCgroupGetFreezerState(virCgroupPtr group, char **state) } -#if defined HAVE_KILL && defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R +#ifdef VIR_CGROUP_SUPPORTED /* * Returns 1 if some PIDs are killed, 0 if none are killed, or -1 on error */ @@ -2866,6 +2871,7 @@ cleanup: return ret; } + int virCgroupKillRecursive(virCgroupPtr group, int signum) { int ret; @@ -2911,31 +2917,7 @@ int virCgroupKillPainfully(virCgroupPtr group) return ret; } -#else /* !(HAVE_KILL, HAVE_MNTENT_H, HAVE_GETMNTENT_R) */ -int virCgroupKill(virCgroupPtr group ATTRIBUTE_UNUSED, - int signum ATTRIBUTE_UNUSED) -{ - virReportSystemError(ENOSYS, "%s", - _("Control groups not supported on this platform")); - return -1; -} -int virCgroupKillRecursive(virCgroupPtr group ATTRIBUTE_UNUSED, - int signum ATTRIBUTE_UNUSED) -{ - virReportSystemError(ENOSYS, "%s", - _("Control groups not supported on this platform")); - return -1; -} -int virCgroupKillPainfully(virCgroupPtr group ATTRIBUTE_UNUSED) -{ - virReportSystemError(ENOSYS, "%s", - _("Control groups not supported on this platform")); - return -1; -} -#endif /* HAVE_KILL, HAVE_MNTENT_H, HAVE_GETMNTENT_R */ - -#ifdef __linux__ static char *virCgroupIdentifyRoot(virCgroupPtr group) { char *ret = NULL; @@ -3048,7 +3030,30 @@ cleanup: VIR_FREE(opts); return ret; } -#else /* __linux__ */ +#else /* VIR_CGROUP_SUPPORTED */ +int virCgroupKill(virCgroupPtr group ATTRIBUTE_UNUSED, + int signum ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Control groups not supported on this platform")); + return -1; +} + +int virCgroupKillRecursive(virCgroupPtr group ATTRIBUTE_UNUSED, + int signum ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Control groups not supported on this platform")); + return -1; +} + +int virCgroupKillPainfully(virCgroupPtr group ATTRIBUTE_UNUSED) +{ + virReportSystemError(ENOSYS, "%s", + _("Control groups not supported on this platform")); + return -1; +} + int virCgroupIsolateMount(virCgroupPtr group ATTRIBUTE_UNUSED, const char *oldroot ATTRIBUTE_UNUSED, const char *mountopts ATTRIBUTE_UNUSED) @@ -3057,4 +3062,4 @@ int virCgroupIsolateMount(virCgroupPtr group ATTRIBUTE_UNUSED, _("Control groups not supported on this platform")); return -1; } -#endif /* __linux__ */ +#endif /* VIR_CGROUP_SUPPORTED */ -- 1.8.2.3

2 18

[libvirt] [PATCH] xen: fix memory corruption in legacy driver
by Jim Fehlig 13 Aug '13

13 Aug '13

Commit 632180d1 introduced memory corruption in xenDaemonListDefinedDomains by starting to populate the names array at index -1, causing all sorts of havoc in libvirtd such as aborts like the following *** Error in `/usr/sbin/libvirtd': double free or corruption (out): 0x00007fffe00ccf20 *** ======= Backtrace: ========= /lib64/libc.so.6(+0x7abf6)[0x7ffff3fa0bf6] /lib64/libc.so.6(+0x7b973)[0x7ffff3fa1973] /lib64/libc.so.6(xdr_array+0xde)[0x7ffff403cbae] /usr/sbin/libvirtd(+0x50251)[0x5555555a4251] /lib64/libc.so.6(xdr_free+0x15)[0x7ffff403ccd5] /usr/lib64/libvirt.so.0(+0x1fad34)[0x7ffff76b1d34] /usr/lib64/libvirt.so.0(virNetServerProgramDispatch+0x1fc)[0x7ffff76b16f1] /usr/lib64/libvirt.so.0(+0x1f214a)[0x7ffff76a914a] /usr/lib64/libvirt.so.0(+0x1f222d)[0x7ffff76a922d] /usr/lib64/libvirt.so.0(+0xbcc4f)[0x7ffff7573c4f] /usr/lib64/libvirt.so.0(+0xbc5e5)[0x7ffff75735e5] /lib64/libpthread.so.0(+0x7e0f)[0x7ffff48f7e0f] /lib64/libc.so.6(clone+0x6d)[0x7ffff400e7dd] Fix by initializing ret to 0 and only setting to error on failure path. --- src/xen/xend_internal.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 1ce36e6..f698c8d 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -2896,7 +2896,7 @@ xenDaemonListDefinedDomains(virConnectPtr conn, { struct sexpr *root = NULL; size_t i; - int ret = -1; + int ret = 0; struct sexpr *_for_i, *node; if (maxnames == 0) @@ -2919,16 +2919,15 @@ xenDaemonListDefinedDomains(virConnectPtr conn, break; } - ret = 0; - cleanup: sexpr_free(root); return ret; error: - for (i = 0; ret != -1 && i < ret; ++i) + for (i = 0; i < ret; ++i) VIR_FREE(names[i]); + ret = -1; goto cleanup; } -- 1.8.1.4

3 4

[libvirt] [PATCH] Add missing ATTRIBUTE_UNUSED
by Guido Günther 13 Aug '13

13 Aug '13

to fix the kFreeBSD build. The network parameter is unused in networkCheckRouteCollision: http://honk.sigxcpu.org:8001/job/libvirt-build-debian-jessie-kfreebsd64/ --- src/network/bridge_driver_nop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/bridge_driver_nop.c b/src/network/bridge_driver_nop.c index f983402..23c712d 100644 --- a/src/network/bridge_driver_nop.c +++ b/src/network/bridge_driver_nop.c @@ -21,7 +21,7 @@ #include <config.h> -int networkCheckRouteCollision(virNetworkObjPtr network) +int networkCheckRouteCollision(virNetworkObjPtr network ATTRIBUTE_UNUSED) { return 0; } -- 1.8.4.rc1

2 2

[libvirt] [PATCH] Don't crash in qemuBuildDeviceAddressStr
by Guido Günther 13 Aug '13

13 Aug '13

qemuDomainAttachVirtioDiskDevice passes NULL as domainDef which is later referenced in qemuDomainAttachVirtioDiskDevice: Program terminated with signal 11, Segmentation fault. #0 qemuBuildDeviceAddressStr (buf=buf@entry=0xb646de78, info=info@entry=0xb0a02360, qemuCaps=qemuCaps@entry=0xb8fdfdc8, domainDef=<error reading variable: Unhandled dwarf expression opcode 0xfa>, domainDef=<error reading variable: Unhandled dwarf expression opcode 0xfa>) at qemu/qemu_command.c:2869 2869 for (i = 0; i < domainDef->ncontrollers; i++) { (gdb) bt #0 qemuBuildDeviceAddressStr (buf=buf@entry=0xb646de78, info=info@entry=0xb0a02360, qemuCaps=qemuCaps@entry=0xb8fdfdc8, domainDef=<error reading variable: Unhandled dwarf expression opcode 0xfa>, domainDef=<error reading variable: Unhandled dwarf expression opcode 0xfa>) at qemu/qemu_command.c:2869 #1 0xb18ad6f8 in qemuBuildDriveDevStr (def=def@entry=0x0, disk=disk@entry=0xb0a02288, bootindex=bootindex@entry=0, qemuCaps=0xb8fdfdc8) at qemu/qemu_command.c:4316 #2 0xb18d097f in qemuDomainAttachVirtioDiskDevice (conn=conn@entry=0xb90129a8, driver=driver@entry=0xb8fe29b8, vm=vm@entry=0xb8fe0c40, disk=disk@entry=0xb0a02288) at qemu/qemu_hotplug.c:278 #3 0xb193f7ba in qemuDomainAttachDeviceDiskLive (dev=0xb0a35308, vm=0xb8fe0c40, driver=0xb8fe29b8, conn=0xb90129a8) at qemu/qemu_driver.c:6356 #4 qemuDomainAttachDeviceLive (dev=0xb0a35308, vm=0xb8fe0c40, dom=<optimized out>) at qemu/qemu_driver.c:6418 #5 qemuDomainAttachDeviceFlags (dom=dom@entry=0xb0a020b8, xml=xml@entry=0xb90953f0 "<disk type='file' device='disk'>\n <source file='/var/lib/jenkins/jobs/libvirt-tck-build/workspace/scratchdir/200-disk-hotplug/extra.img'/>\n <target dev='vdb' bus='virtio'/>\n</disk>\n", flags=3103664568, flags@entry=1) at qemu/qemu_driver.c:7079 #6 0xb193f9cb in qemuDomainAttachDevice (dom=0xb0a020b8, xml=0xb90953f0 "<disk type='file' device='disk'>\n <source file='/var/lib/jenkins/jobs/libvirt-tck-build/workspace/scratchdir/200-disk-hotplug/extra.img'/>\n <target dev='vdb' bus='virtio'/>\n</disk>\n") at qemu/qemu_driver.c:7120 #7 0xb7244827 in virDomainAttachDevice (domain=domain@entry=0xb0a020b8, xml=0xb90953f0 "<disk type='file' device='disk'>\n <source file='/var/lib/jenkins/jobs/libvirt-tck-build/workspace/scratchdir/200-disk-hotplug/extra.img'/>\n <target dev='vdb' bus='virtio'/>\n</disk>\n") at libvirt.c:10912 #8 0xb7765ddb in remoteDispatchDomainAttachDevice (args=0xb9094ef0, rerr=0xb646e1f0, client=<optimized out>, server=<optimized out>, msg=<optimized out>) at remote_dispatch.h:2296 #9 remoteDispatchDomainAttachDeviceHelper (server=0xb8fba0e8, client=0xb0a00730, msg=0xb0a350b8, rerr=0xb646e1f0, args=0xb9094ef0, ret=0xb9094dc8) at remote_dispatch.h:2274 #10 0xb72b1013 in virNetServerProgramDispatchCall (msg=0xb0a350b8, client=0xb0a00730, server=0xb8fba0e8, prog=0xb8fc21c8) at rpc/virnetserverprogram.c:435 #11 virNetServerProgramDispatch (prog=0xb8fc21c8, server=server@entry=0xb8fba0e8, client=0xb0a00730, msg=0xb0a350b8) at rpc/virnetserverprogram.c:305 #12 0xb72aa167 in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0xb8fba0e8) at rpc/virnetserver.c:165 #13 virNetServerHandleJob (jobOpaque=0xb0a0a850, opaque=0xb8fba0e8) at rpc/virnetserver.c:186 #14 0xb7189108 in virThreadPoolWorker (opaque=opaque@entry=0xb8fa3250) at util/virthreadpool.c:144 #15 0xb71885e5 in virThreadHelper (data=0xb8fa32a8) at util/virthreadpthread.c:161 #16 0xb70d6954 in start_thread (arg=0xb646eb70) at pthread_create.c:304 #17 0xb704e95e in clone () at ../sysdeps/unix/sysv/linux/i386/clone.S:130 This was found by libvirtt-tck: http://honk.sigxcpu.org:8001/job/libvirt-tck-debian-wheezy-qemu-session/131… --- The problem was introduced somewhere around 4bc331c8945152d8942a23383c3eb92da1bc4194 but I didn't get around to track this earlier. Cheers, -- Guido --- src/qemu/qemu_hotplug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index c9748d9..85d2ca9 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -275,7 +275,7 @@ int qemuDomainAttachVirtioDiskDevice(virConnectPtr conn, if (!(drivestr = qemuBuildDriveStr(conn, disk, false, priv->qemuCaps))) goto error; - if (!(devstr = qemuBuildDriveDevStr(NULL, disk, 0, priv->qemuCaps))) + if (!(devstr = qemuBuildDriveDevStr(vm->def, disk, 0, priv->qemuCaps))) goto error; } @@ -616,7 +616,7 @@ int qemuDomainAttachUsbMassstorageDevice(virConnectPtr conn, goto error; if (!(drivestr = qemuBuildDriveStr(conn, disk, false, priv->qemuCaps))) goto error; - if (!(devstr = qemuBuildDriveDevStr(NULL, disk, 0, priv->qemuCaps))) + if (!(devstr = qemuBuildDriveDevStr(vm->def, disk, 0, priv->qemuCaps))) goto error; } -- 1.8.4.rc1

2 2

[libvirt] [PATCH] virsh: nicer abort of blockcopy
by Eric Blake 13 Aug '13

13 Aug '13

I attempted 'virsh blockcopy $dom vda $path --wait --verbose', then hit Ctrl-C; I was a bit surprised to see this error message: Block Copy: [ 3 %]error: failed to query job for disk vda when I had been expecting: Block Copy: [ 3 %] Copy aborted * tools/virsh-domain.c (cmdBlockCopy): Print graceful exit message rather than error when ctrl-c interrupts job. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- tools/virsh-domain.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 8cafce4..4081451 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1810,10 +1810,13 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) result = virDomainGetBlockJobInfo(dom, path, &info, 0); pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL); - if (result <= 0) { + if (result < 0) { vshError(ctl, _("failed to query job for disk %s"), path); goto cleanup; } + if (result == 0) + break; + if (verbose) print_job_progress(_("Block Copy"), info.end - info.cur, info.end); if (info.cur == info.end) @@ -1840,13 +1843,14 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) } } - if (pivot) { + if (!quit && pivot) { abort_flags |= VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT; if (virDomainBlockJobAbort(dom, path, abort_flags) < 0) { vshError(ctl, _("failed to pivot job for disk %s"), path); goto cleanup; } - } else if (finish && virDomainBlockJobAbort(dom, path, abort_flags) < 0) { + } else if (finish && !quit && + virDomainBlockJobAbort(dom, path, abort_flags) < 0) { vshError(ctl, _("failed to finish job for disk %s"), path); goto cleanup; } -- 1.8.3.1

2 2

[libvirt] [PATCH 0/3] Rest of qemu agent tests and fix of expensive tests
by Peter Krempa 13 Aug '13

13 Aug '13

This series contains the rest of the qemu agent tests that have been tweaked to act according to the VIR_TEST_EXPENSIVE env variable and also uses it for the virsh-all test Peter Krempa (3): qemuagenttest: Test arbitrary command passthrough qemuagenttest: Test timeout of agent commands test-lib.sh: Update helper for VIR_TEST_EXPENSIVE and use it in virsh-all tests/qemuagenttest.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/test-lib.sh | 10 ++--- tests/virsh-all | 2 + 3 files changed, 112 insertions(+), 5 deletions(-) -- 1.8.3.2

2 8

[libvirt] Error while starting the node on ESXi hypervisor
by varun bhatnagar 13 Aug '13

13 Aug '13

Hi, Today I was trying to start a node using libvirt on ESX (esxi-5.1) hypervisor and I got the following error message: *virsh # define /local/myNode/esxdomain.xml* *Domain testNode defined from /local/myNode/esxdomain.xml* *virsh # start testNode* *error: Failed to start domain testNode* *error: internal error: Could not start domain: GenericVmConfigFault - Cannot open the disk /vmfs/volues/5208f99d-760cf4a2-000c29520788/testNode.vmdk or one of the snapshot disks it depends on.* * * * * I checked the datastore of my ESX server and found out that instead of file one directory is getting created with the name* cluster.vmdk *and inside it there are few more files but cluster.vmdk file is not there. * * /vmfs/volumes # cd datastore1 /vmfs/volues/5208f99d-760cf4a2-000c29520788 # ls cluster.vmdk /vmfs/volues/5208f99d-760cf4a2-000c29520788 # cd cluster.vmdk /vmfs/volues/5208f99d-760cf4a2-000c29520788/cluster.vmdk # ls -ltr *-rw-r--r-- 1 root root 261 Aug 12 17:30 cluster.vmdk* *-rw-r--r-- 1 root root 674 Aug 12 17:30 cluster.vmx* *-rw-r--r-- 1 root root 0 Aug 12 17:30 cluster.vmsd* /vmfs/volues/5208f99d-760cf4a2-000c29520788/cluster.vmdk # Can anyone tell me how to start a node and why I am getting that error message. Below is my xml file. *<domain type='vmware'>* * <name>testNode</name>* * <uuid>50115e16-9bdc-49d7-f171-53c4d7f91710</uuid>* * <memory>1048576</memory>* * <currentMemory>1048576</currentMemory>* * <vcpu>1</vcpu>* * <os>* * <type arch='x86_64'>hvm</type>* * </os>* * <devices>* * <disk type='file' device='disk'>* * <source file='[datastore1] cluster.vmdk'/>* * <target dev='sda' bus='scsi'/>* * <address type='drive' controller='0' bus='0' unit='0'/>* * </disk>* * <controller type='scsi' index='0'/>* * <interface type='bridge'>* * <mac address='00:50:56:25:48:c7'/>* * <source bridge='VM Network'/>* * </interface>* * </devices>* *</domain>*

1 0

[libvirt] [PATCHv2] build: add configure option to disable gnulib tests
by Eric Blake 13 Aug '13

13 Aug '13

The gnulib testsuite is relatively stable - the only times it is likely to have a test change from pass to fail is on a gnulib submodule update or a major system change (such as moving from Fedora 18 to 19, or other large change to libc). While it is an important test for end users on arbitrary machines (to make sure that the portability glue works for their machine), it mostly wastes time for development testing (as most developers aren't making any of the major changes that would cause gnulib tests to alter behavior). Thus, it pays to make the tests optional at configure time, defaulting to off for development, on for tarballs, with autobuilders requesting it to be on. It also helps to allow a make-time override, via VIR_TEST_EXPENSIVE=[01] (much the way automake sets up V=[01] for overriding the configure time default of how verbose to be). Automake has some pretty hard-coded magic with regards to the TESTS variable; I had quite a job figuring out how to keep 'make distcheck' passing regardless of the configure option setting in use, while still disabling the tests at runtime when I did not configure them on and did not use the override variable. Thankfully, we require GNU make, which lets me hide some information from Automake's magic handling of TESTS. * bootstrap.conf (bootstrap_epilogue): Munge gnulib test variable. * configure.ac (--enable-expensive-tests): Add new enable switch. (VIR_TEST_EXPENSIVE_DEFAULT, WITH_EXPENSIVE_TESTS): Set new witnesses. * gnulib/tests/Makefile.am (TESTS): Make tests conditional on configure settings and the VIR_TEST_EXPENSIVE variable. * tests/Makefile.am (TESTS_ENVIRONMENT): Expose VIR_TEST_EXPENSIVE to all tests. * autobuild.sh: Enable all tests during autobuilds. * libvirt.spec.in (%configure): Likewise. * mingw-libvirt.spec.in (%mingw_configure): Likewise. * docs/hacking.html.in: Document the option. * HACKING: Regenerate. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- v2: Change the configure name from --enable-gnulib-tests to --enable-expensive-tests; make VIR_TEST_EXPENSIVE=0 work to give a one-shot disable of tests at make time; export the configure default on to all tests HACKING | 9 +++++++++ autobuild.sh | 3 +++ bootstrap.conf | 3 ++- configure.ac | 21 +++++++++++++++++++++ docs/hacking.html.in | 12 ++++++++++++ gnulib/tests/Makefile.am | 15 ++++++++++++++- libvirt.spec.in | 1 + mingw-libvirt.spec.in | 4 ++-- tests/Makefile.am | 2 ++ 9 files changed, 66 insertions(+), 4 deletions(-) diff --git a/HACKING b/HACKING index 207b9ed..256e8ae 100644 --- a/HACKING +++ b/HACKING @@ -107,6 +107,15 @@ and run the tests: Valgrind <http://valgrind.org/> is a test that checks for memory management issues, such as leaks or use of uninitialized variables. +Some tests are skipped by default in a development environment, based on the +time they take in comparison to the likelihood that those tests will turn up +problems during incremental builds. These tests default to being run when when +building from a tarball or with the configure option --enable-expensive-tests; +you can also force a one-time toggle of these tests by setting +VIR_TEST_EXPENSIVE to 0 or 1 at make time, as in: + + make check VIR_TEST_EXPENSIVE=1 + If you encounter any failing tests, the VIR_TEST_DEBUG environment variable may provide extra information to debug the failures. Larger values of VIR_TEST_DEBUG may provide larger amounts of information: diff --git a/autobuild.sh b/autobuild.sh index 7da8cb5..e5aa35c 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -18,6 +18,7 @@ cd build # Run with options not normally exercised by the rpm build, for # more complete code coverage. ../autogen.sh --prefix="$AUTOBUILD_INSTALL_ROOT" \ + --enable-expensive-tests \ --enable-test-coverage \ --disable-nls \ --enable-werror \ @@ -76,6 +77,7 @@ if test -x /usr/bin/i686-w64-mingw32-gcc ; then --build=$(uname -m)-w64-linux \ --host=i686-w64-mingw32 \ --prefix="$AUTOBUILD_INSTALL_ROOT/i686-w64-mingw32/sys-root/mingw" \ + --enable-expensive-tests \ --enable-werror \ --without-libvirtd \ --without-python @@ -96,6 +98,7 @@ if test -x /usr/bin/x86_64-w64-mingw32-gcc ; then --build=$(uname -m)-w64-linux \ --host=x86_64-w64-mingw32 \ --prefix="$AUTOBUILD_INSTALL_ROOT/x86_64-w64-mingw32/sys-root/mingw" \ + --enable-expensive-tests \ --enable-werror \ --without-libvirtd \ --without-python diff --git a/bootstrap.conf b/bootstrap.conf index f166a53..a1d1f07 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -244,9 +244,10 @@ gnulib_extra_files=" bootstrap_epilogue() { # Change paths in gnulib/tests/gnulib.mk from "../../.." to "../..", + # and make tests conditional by changing "TESTS" to "GNULIB_TESTS", # then ensure that gnulib/tests/Makefile.in is up-to-date. m=gnulib/tests/gnulib.mk - sed 's,\.\./\.\./\.\.,../..,g' $m > $m-t + sed 's,\.\./\.\./\.\.,../..,g; s/^TESTS /GNULIB_TESTS /' $m > $m-t mv -f $m-t $m ${AUTOMAKE-automake} gnulib/tests/Makefile } diff --git a/configure.ac b/configure.ac index a155790..2c8cb86 100644 --- a/configure.ac +++ b/configure.ac @@ -1987,6 +1987,27 @@ fi AC_MSG_RESULT([$withval]) AM_CONDITIONAL([WITH_TESTS], [test "$withval" = "yes"]) +AC_ARG_ENABLE([expensive-tests], + [AC_HELP_STRING([--enable-expensive-tests], + [set the default for enabling expensive tests (gnulib and long timeouts) ] + [@<:@default=check@:>@; use VIR_TEST_EXPENSIVE to override during make])], + [case $enableval in + 0|no) VIR_TEST_EXPENSIVE_DEFAULT=0 ;; + 1|yes) VIR_TEST_EXPENSIVE_DEFAULT=1 ;; + check) ;; + *) AC_MSG_ERROR([bad value ${enableval} for enable-expensive-tests option]) + ;; + esac], [enableval=check]) +if test "$enableval" = check; then + if test -d $srcdir/.git ; then + VIR_TEST_EXPENSIVE_DEFAULT=0 + else + VIR_TEST_EXPENSIVE_DEFAULT=1 + fi +fi +AC_SUBST([VIR_TEST_EXPENSIVE_DEFAULT]) +AM_CONDITIONAL([WITH_EXPENSIVE_TESTS], [test $VIR_TEST_EXPENSIVE_DEFAULT = 1]) + AC_ARG_ENABLE([test-coverage], AC_HELP_STRING([--enable-test-coverage], [turn on code coverage instrumentation @<:@default=no@:>@]), [case "${enableval}" in diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 8120b19..0892b73 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -119,6 +119,18 @@ </p> <p> + Some tests are skipped by default in a development environment, + based on the time they take in comparison to the likelihood + that those tests will turn up problems during incremental builds. + These tests default to being run when when building from a + tarball or with the configure option --enable-expensive-tests; + you can also force a one-time toggle of these tests by + setting VIR_TEST_EXPENSIVE to 0 or 1 at make time, as in: + </p> +<pre> + make check VIR_TEST_EXPENSIVE=1 +</pre> + <p> If you encounter any failing tests, the VIR_TEST_DEBUG environment variable may provide extra information to debug the failures. Larger values of VIR_TEST_DEBUG may provide diff --git a/gnulib/tests/Makefile.am b/gnulib/tests/Makefile.am index 6a2f51b..74d71e9 100644 --- a/gnulib/tests/Makefile.am +++ b/gnulib/tests/Makefile.am @@ -1,4 +1,4 @@ -## Makefile for gnulib/lib -*-Makefile-*- +## Makefile for gnulib/lib ## Copyright (C) 2011, 2013 Red Hat, Inc. ## @@ -19,3 +19,16 @@ include gnulib.mk INCLUDES = $(GETTEXT_CPPFLAGS) + +GNULIB_TESTS0 = +GNULIB_TESTS1 = $(GNULIB_TESTS) +if WITH_EXPENSIVE_TESTS +## Automake requires that at least one conditional call out all tests to +## be run, for those tests to be shipped in the tarball +TESTS = $(GNULIB_TESTS) +endif +## However, we want to change the set of tests based on the make environment, +## where the default was set at configure time. Use GNU make constructs to +## hide our actions from Automake, so we don't get it too confused. +VIR_TEST_EXPENSIVE ?= $(VIR_TEST_EXPENSIVE_DEFAULT) +$(eval TESTS=$(GNULIB_TESTS$(VIR_TEST_EXPENSIVE))) diff --git a/libvirt.spec.in b/libvirt.spec.in index 79c5a2c..114b144 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1408,6 +1408,7 @@ of recent versions of Linux (and other OSes). --with-qemu-user=%{qemu_user} \ --with-qemu-group=%{qemu_group} \ %{?enable_werror} \ + --enable-expensive-tests \ %{init_scripts} make %{?_smp_mflags} gzip -9 ChangeLog diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index aa39231..e13407e 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -156,8 +156,8 @@ autoreconf -if --without-parallels \ --without-netcf \ --without-audit \ - --without-dtrace - + --without-dtrace \ + --enable-expensive-tests %mingw_make %{?_smp_mflags} diff --git a/tests/Makefile.am b/tests/Makefile.am index 789de9f..66ae610 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -307,6 +307,7 @@ lv_abs_top_builddir=`cd '$(top_builddir)'; pwd` path_add = $(subst :,$(PATH_SEPARATOR),\ $(subst !,$(lv_abs_top_builddir)/,!daemon:!tools:!tests)) +VIR_TEST_EXPENSIVE ?= $(VIR_TEST_EXPENSIVE_DEFAULT) TESTS_ENVIRONMENT = \ abs_top_builddir=$(lv_abs_top_builddir) \ abs_top_srcdir=`cd '$(top_srcdir)'; pwd` \ @@ -318,6 +319,7 @@ TESTS_ENVIRONMENT = \ LIBVIRT_DRIVER_DIR="$(abs_top_builddir)/src/.libs" \ LIBVIRT_AUTOSTART=0 \ LC_ALL=C \ + VIR_TEST_EXPENSIVE=$(VIR_TEST_EXPENSIVE) \ $(VG) -- 1.8.3.1

2 6

[libvirt] [PATCHv3] build: avoid -lgcrypt with newer gnutls
by Eric Blake 13 Aug '13

13 Aug '13

https://bugzilla.redhat.com/show_bug.cgi?id=951637 Newer gnutls uses nettle, rather than gcrypt, which is a lot nicer regarding initialization. Yet we were unconditionally initializing gcrypt even when gnutls wouldn't be using it, and having two crypto libraries linked into libvirt.so is pointless, but mostly harmless (it doesn't crash, but does interfere with certification efforts). There are three distinct version ranges to worry about when determining which crypto lib gnutls uses, per these gnutls mails: 2.12: http://lists.gnu.org/archive/html/gnutls-devel/2011-03/msg00034.html 3.0: http://lists.gnu.org/archive/html/gnutls-devel/2011-07/msg00035.html If pkg-config can prove version numbers and/or list the crypto library used for static linking, we have our proof; if not, it is safer (even if pointless) to continue to use gcrypt ourselves. * configure.ac (WITH_GNUTLS): Probe whether to add -lgcrypt, and define a witness WITH_GNUTLS_GCRYPT. * src/libvirt.c (virTLSMutexInit, virTLSMutexDestroy) (virTLSMutexLock, virTLSMutexUnlock, virTLSThreadImpl) (virGlobalInit): Honor the witness. * libvirt.spec.in (BuildRequires): Make gcrypt usage conditional, no longer needed in Fedora 19. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- v3: configure logic is enhanced to try harder to get the right answer for gentoo. I tested with Fedora 19 and RHEL 6, but need feedback from a gentoo tester before this can go in. configure.ac | 37 ++++++++++++++++++++++++++++++------- libvirt.spec.in | 2 ++ src/libvirt.c | 10 ++++++---- 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 1817126..e3d148c 100644 --- a/configure.ac +++ b/configure.ac @@ -1076,12 +1076,26 @@ if test "x$with_gnutls" != "xno"; then LIBS="$LIBS $GNUTLS_LIBS" GNUTLS_FOUND=no + GNUTLS_GCRYPT=unknown if test -x "$PKG_CONFIG" ; then + dnl Triple probe: gnutls < 2.12 only used gcrypt, gnutls >= 3.0 uses + dnl only nettle, and versions in between had a configure option. + dnl Our goal is to avoid gcrypt if we can prove gnutls uses nettle, + dnl but it is a safe fallback to use gcrypt if we can't prove anything. + if $PKG_CONFIG --exists 'gnutls >= 3.0'; then + GNUTLS_GCRYPT=no + elif $PKG_CONFIG --exists 'gnutls >= 2.12'; then + GNUTLS_GCRYPT=probe + else + GNUTLS_GCRYPT=yes + fi PKG_CHECK_MODULES(GNUTLS, gnutls >= $GNUTLS_REQUIRED, [GNUTLS_FOUND=yes], [GNUTLS_FOUND=no]) fi if test "$GNUTLS_FOUND" = "no"; then + dnl pkg-config couldn't help us, assume gcrypt is necessary fail=0 + GNUTLS_GCRYPT=yes AC_CHECK_HEADER([gnutls/gnutls.h], [], [fail=1]) AC_CHECK_LIB([gnutls], [gnutls_handshake],[], [fail=1], [-lgcrypt]) @@ -1098,13 +1112,22 @@ if test "x$with_gnutls" != "xno"; then AC_MSG_ERROR([You must install the GnuTLS library in order to compile and run libvirt]) fi else - dnl Not all versions of gnutls include -lgcrypt, and so we add - dnl it explicitly for the calls to gcry_control/check_version - GNUTLS_LIBS="$GNUTLS_LIBS -lgcrypt" - - dnl We're not using gcrypt deprecated features so define - dnl GCRYPT_NO_DEPRECATED to avoid deprecated warnings - GNUTLS_CFLAGS="$GNUTLS_CFLAGS -DGCRYPT_NO_DEPRECATED" + dnl See comments above about when to use gcrypt. + if test "$GNUTLS_GCRYPT" = probe; then + case `$PKG_CONFIG --libs --static gnutls` in + *gcrypt*) GNUTLS_GCRYPT=yes ;; + *nettle*) GNUTLS_GCRYPT=no ;; + *) GNUTLS_GCRYPT=unknown ;; + esac + fi + if test "$GNUTLS_GCRYPT" = yes || test "$GNUTLS_GCRYPT" = unknown; then + GNUTLS_LIBS="$GNUTLS_LIBS -lgcrypt" + dnl We're not using gcrypt deprecated features so define + dnl GCRYPT_NO_DEPRECATED to avoid deprecated warnings + GNUTLS_CFLAGS="$GNUTLS_CFLAGS -DGCRYPT_NO_DEPRECATED" + AC_DEFINE_UNQUOTED([WITH_GNUTLS_GCRYPT], 1, + [set to 1 if it is known or assumed that GNUTLS uses gcrypt]) + fi dnl gnutls 3.x moved some declarations to a new header AC_CHECK_HEADERS([gnutls/crypto.h], [], [], [[ diff --git a/libvirt.spec.in b/libvirt.spec.in index fce7f91..7fd3c85 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -438,7 +438,9 @@ BuildRequires: readline-devel BuildRequires: ncurses-devel BuildRequires: gettext BuildRequires: libtasn1-devel +%if (0%{?rhel} && 0%{?rhel} < 7) || (0%{?fedora} && 0%{?fedora} < 19) BuildRequires: libgcrypt-devel +%endif BuildRequires: gnutls-devel BuildRequires: libattr-devel %if %{with_libvirtd} diff --git a/src/libvirt.c b/src/libvirt.c index 8157488..66e8248 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -55,7 +55,9 @@ #include "intprops.h" #include "virconf.h" #if WITH_GNUTLS -# include <gcrypt.h> +# if WITH_GNUTLS_GCRYPT +# include <gcrypt.h> +# endif # include "rpc/virnettlscontext.h" #endif #include "vircommand.h" @@ -270,7 +272,7 @@ winsock_init(void) #endif -#ifdef WITH_GNUTLS +#ifdef WITH_GNUTLS_GCRYPT static int virTLSMutexInit(void **priv) { virMutexPtr lock = NULL; @@ -323,7 +325,7 @@ static struct gcry_thread_cbs virTLSThreadImpl = { virTLSMutexUnlock, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; -#endif +#endif /* WITH_GNUTLS_GCRYPT */ /* Helper macros to implement VIR_DOMAIN_DEBUG using just C99. This * assumes you pass fewer than 15 arguments to VIR_DOMAIN_DEBUG, but @@ -407,7 +409,7 @@ virGlobalInit(void) virErrorInitialize() < 0) goto error; -#ifdef WITH_GNUTLS +#ifdef WITH_GNUTLS_GCRYPT /* * This sequence of API calls it copied exactly from * gnutls 2.12.23 source lib/gcrypt/init.c, with -- 1.7.1

3 7

[libvirt] [PATCH] Document use of systemd socket activation
by Daniel P. Berrange 12 Aug '13

12 Aug '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Add to the docs/drvlxc.html.in documentation to describe how to configure systemd to auto-activate a container when a client connects to a socket Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/drvlxc.html.in | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in index d5b003e..7e77bdf 100644 --- a/docs/drvlxc.html.in +++ b/docs/drvlxc.html.in @@ -172,6 +172,125 @@ Further block or character devices will be made available to containers depending on their configuration. </p> +<h2><a name="activation">Systemd Socket Activation Integration</a></h2> + +<p> +The libvirt LXC driver provides the ability to pass across pre-opened file +descriptors when starting LXC guests. This allows for libvirt LXC to support +systemd's <a href="http://0pointer.de/blog/projects/socket-activated-containers.html">socket +activation capability</a>, where an incoming client connection +in the host OS will trigger the startup of a container, which runs another +copy of systemd which gets passed the server socket, and then activates the +actual service handler in the container. +</p> + +<p> +Lets assume that you already have a LXC guest created, running +a systemd instance as PID 1 inside the container, which has an +SSHD service configured. The goal is to automatically activate +the container when the first SSH connection is made. The first +step is to create a couple of unit files for the host OS systemd +instance. The <code>/etc/systemd/system/mycontainer.service</code> +unit file specifies how systemd will start the libvirt LXC container +</p> + +<pre> +[Unit] +Description=My little container + +[Service] +[Service] +ExecStart=/usr/bin/virsh -c lxc:/// start --pass-fds 3 mycontainer +ExecStop=/usr/bin/virsh -c lxc:/// destroy mycontainer +Type=oneshot +RemainAfterExit=yes +KillMode=none +</pre> + +<p> +The <code>--pass-fds 3</code> argument specifies that the file +descriptor number 3 that <code>virsh</code> inherits from systemd, +is to be passed into the container. Since <code>virsh</code> will +exit immediately after starting the container, the <code>RemainAfterExit</code> +and <code>KillMode</code> settings must be altered from their defaults. +</p> + +<p> +Next, the <code>/etc/systemd/system/mycontainer.socket</code> unit +file is created to get the host systemd to listen on port 23 for +TCP connections. When this unit file is activated by the first +incoming connection, it will cause the <code>mycontainer.service</code> +unit to be activated with the FD coresponding to the listening TCP +socket passed in as FD 3. +</p> + +<pre> +[Unit] +Description=The SSH socket of my little container + +[Socket] +ListenStream=23 +</pre> + +<p> +Port 23 was picked here so that the container doesn't conflict +with the host's SSH which is on the normal port 22. That's it +in terms of host side configuration. +</p> + +<p> +Inside the container, the <code>/etc/systemd/system/sshd.socket</code> +unit file must be created +</p> + +<pre> +[Unit] +Description=SSH Socket for Per-Connection Servers + +[Socket] +ListenStream=23 +Accept=yes +</pre> + +<p> +The <code>ListenStream</code> value listed in this unit file, must +match the value used in the host file. When systemd in the container +receives the pre-opened FD from libvirt during container startup, it +looks at the <code>ListenStream</code> values to figure out which +FD to give to which servie. The actual service to start is defined +by a correspondingly named <code>/etc/systemd/system/sshd@.service</code> +</p> + +<pre> +[Unit] +Description=SSH Per-Connection Server for %I + +[Service] +ExecStart=-/usr/sbin/sshd -i +StandardInput=socket +</pre> + +<p> +Finally, make sure this SSH service is set to start on boot of the container, +by running the following command inside the container: +</p> + +<pre> +# mkdir -p /etc/systemd/system/sockets.target.wants/ +# ln -s /etc/systemd/system/sshd.socket /etc/systemd/system/sockets.target.wants/ +</pre> + +<p> +This example shows how to activate the container based on an incoming +SSH connection. If the container was also configured to have an httpd +service, it may be desirable to activate it upon either an httpd or a +sshd connection attempt. In this case, the <code>mycontainer.socket</code> +file in the host would simply list multiple socket ports. Inside the +container a separate <code>xxxxx.socket</code> file would need to be +created for each service, with a corresponding <code>ListenStream</code> +value set. +</p> + <!-- <h2>Container configuration</h2> -- 1.8.3.1

2 1

[libvirt] virsh list shows first domain twice
by Stefan Scheglmann 12 Aug '13

12 Aug '13

Hi, do not know since when but i recently realized that the 'virsh list' command shows me the first dom (the one with id 1) twice in the output List, e.g. virsh # list Id Name Status ---------------------------------- 1 essir laufend 1 essir laufend 2 mobile-sensing laufend 3 related-work laufend 4 elisa laufend 5 lehre1 laufend 7 carina laufend VirtManager for instance does not show the dom twice, but i encounter that several stopped machines, especially if they are newly cloned, are not shown in the VirtManager application. A restart/reload of libvirt-bin does not change this issue. Checking with 'ps aux | grep essir' shows that the dom is only running one time. #ps aux | grep essir 104 2156 0.4 5.6 2741560 926164 ? Sl Jun29 293:58 /usr/bin/kvm -S -M pc-0.14 -enable-kvm -m 1024 -smp 1,sockets=1,cores=1,threads=1 -name essir -uuid e5abcb27-eab5-b271-3476-0c9c29eb005c -nodefconfig -nodefaults -chardev socket,id=charmonitor,path=/var/lib/libvirt/qemu/essir.monitor,server,nowait -mon chardev=charmonitor,id=monitor,mode=control -rtc base=utc -no-shutdown -drive file=/lvm-volumes/vms-sas/essir.img,if=none,id=drive-virtio-disk0,format=raw -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 -netdev tap,fd=18,id=hostnet0 -device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:2a:24:65,bus=pci.0,addr=0x3 -chardev pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -usb -vnc 127.0.0.1:0 -vga cirrus -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 root 9840 0.0 0.0 10912 928 pts/0 S+ 10:53 0:00 grep --color=auto essir Not a serious issue but i encounter it on several hypervisors. All hypervisors running 3.2.0-40-generic with libvirt version 0.9.8. Stefan Scheglmann WeST Research Group University of Koblenz-Landau Universitaetsstrasse 1 D-56070 Koblenz Tel.: + 49 261 287 2718 Fax: + 49 261 287 100 2718 schegi(a)uni-koblenz.de http://west.uni-koblenz.de

2 1

[libvirt] [PATCH 0/2] Add support for adjusting the 64-bit PCI hole size
by Ján Tomko 12 Aug '13

12 Aug '13

https://bugzilla.redhat.com/show_bug.cgi?id=990418 Ján Tomko (2): Add pcihole64 element to domain features Build QEMU command line for pcihole64 docs/formatdomain.html.in | 8 +++++ docs/schemas/domaincommon.rng | 7 ++++ src/conf/domain_conf.c | 13 ++++++- src/conf/domain_conf.h | 2 ++ src/qemu/qemu_capabilities.c | 14 ++++++++ src/qemu/qemu_capabilities.h | 2 ++ src/qemu/qemu_command.c | 41 ++++++++++++++++++++++ .../qemuxml2argv-pcihole64-none.args | 4 +++ .../qemuxml2argv-pcihole64-none.xml | 24 +++++++++++++ .../qemuxml2argv-pcihole64-q35.args | 9 +++++ .../qemuxml2argv-pcihole64-q35.xml | 34 ++++++++++++++++++ tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args | 5 +++ tests/qemuxml2argvdata/qemuxml2argv-pcihole64.xml | 24 +++++++++++++ tests/qemuxml2argvtest.c | 10 ++++++ tests/qemuxml2xmltest.c | 4 +++ 15 files changed, 200 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcihole64-none.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pcihole64.xml -- 1.8.1.5

2 3

[libvirt] [PATCH] Remove leftovers from hyperv spinlocks documentation
by Ján Tomko 12 Aug '13

12 Aug '13

Somehow I managed to leave this monstrosity in. Introduced by 800b51d. --- Pushed as trivial. docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index dd22b6d..83d551a 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1175,7 +1175,7 @@ <hyperv> <relaxed state='on'/> <vapic state='on'/> - <spinlocks state='on' retries='4096'</spinlocks> + <spinlocks state='on' retries='4096'/> </hyperv> </features> -- 1.8.1.5

1 0