- Devel - libvirt List Archives

[libvirt] [PATCH] Refactor loop device setup code in LXC
by Daniel P. Berrange 07 Mar '13

07 Mar '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Minor re-factoring of code for setting up loop devices in the LXC controller Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/lxc/lxc_controller.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 78e8a70..a7e715e 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -383,12 +383,13 @@ static int virLXCControllerSetupLoopDevices(virLXCControllerPtr ctrl) int ret = -1; for (i = 0 ; i < ctrl->def->nfss ; i++) { + virDomainFSDefPtr fs = ctrl->def->fss[i]; int fd; - if (ctrl->def->fss[i]->type != VIR_DOMAIN_FS_TYPE_FILE) + if (fs->type != VIR_DOMAIN_FS_TYPE_FILE) continue; - fd = virLXCControllerSetupLoopDevice(ctrl->def->fss[i]); + fd = virLXCControllerSetupLoopDevice(fs); if (fd < 0) goto cleanup; -- 1.7.11.7

2 1

[libvirt] [PATCH] Fix crash parsing RNG device specification
by Daniel P. Berrange 07 Mar '13

07 Mar '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Code that validates the whitelist for the RNG device filename didn't account for fact that filename may be NULL. This led to a NULL reference crash. This wasn't caught since the test suite was not covering this XML syntax Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/conf/domain_conf.c | 3 ++- .../qemuxml2argv-virtio-rng-default.args | 6 ++++++ .../qemuxml2argv-virtio-rng-default.xml | 23 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 2 ++ 4 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f7c8af1..3c4e043 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7424,7 +7424,8 @@ virDomainRNGDefParseXML(const xmlNodePtr node, switch ((enum virDomainRNGBackend) def->backend) { case VIR_DOMAIN_RNG_BACKEND_RANDOM: def->source.file = virXPathString("string(./backend)", ctxt); - if (STRNEQ(def->source.file, "/dev/random") && + if (def->source.file && + STRNEQ(def->source.file, "/dev/random") && STRNEQ(def->source.file, "/dev/hwrng")) { virReportError(VIR_ERR_XML_ERROR, _("file '%s' is not a supported random source"), diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args new file mode 100644 index 0000000..a5f04fd --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args @@ -0,0 +1,6 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ +-S -M pc -m 214 -smp 1 -nographic -nodefaults \ +-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ +-object rng-random,id=rng0 \ +-device virtio-rng-pci,rng=rng0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.xml b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.xml new file mode 100644 index 0000000..0852dea --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.xml @@ -0,0 +1,23 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static' cpuset='1-4,8-20,525'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <controller type='usb' index='0'/> + <memballoon model='virtio'/> + <rng model='virtio'> + <backend model='random'/> + </rng> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index b6b5489..2354733 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -882,6 +882,8 @@ mymain(void) QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_QXL_VGA); + DO_TEST("virtio-rng-default", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_VIRTIO_RNG, + QEMU_CAPS_OBJECT_RNG_RANDOM); DO_TEST("virtio-rng-random", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_VIRTIO_RNG, QEMU_CAPS_OBJECT_RNG_RANDOM); DO_TEST("virtio-rng-egd", QEMU_CAPS_DEVICE, QEMU_CAPS_DEVICE_VIRTIO_RNG, -- 1.7.11.7

3 2

[libvirt] [PATCHv3] qdev: DEVICE_DELETED event
by Michael S. Tsirkin 07 Mar '13

07 Mar '13

libvirt has a long-standing bug: when removing the device, it can request removal but does not know when the removal completes. Add an event so we can fix this in a robust way. Signed-off-by: Michael S. Tsirkin <mst(a)redhat.com> --- Changes from v2: - move event toward the end of device_unparent, so that parents are reported after their children, as suggested by Paolo Changes from v1: - move to device_unparent - address comments by Andreas and Eric QMP/qmp-events.txt | 15 +++++++++++++++ hw/qdev.c | 6 ++++++ include/monitor/monitor.h | 1 + monitor.c | 1 + qapi-schema.json | 4 +++- 5 files changed, 26 insertions(+), 1 deletion(-) diff --git a/QMP/qmp-events.txt b/QMP/qmp-events.txt index b2698e4..f2f115a 100644 --- a/QMP/qmp-events.txt +++ b/QMP/qmp-events.txt @@ -136,6 +136,21 @@ Example: Note: The "ready to complete" status is always reset by a BLOCK_JOB_ERROR event. +DEVICE_DELETED +----------------- + +Emitted whenever the device removal completion is acknowledged +by the guest. At this point, it's safe to reuse the specified device ID. +Device removal can be initiated by the guest or by HMP/QMP commands. + +Data: + +- "device": device name (json-string) + +{ "event": "DEVICE_DELETED", + "data": { "device": "virtio-net-pci-0" }, + "timestamp": { "seconds": 1265044230, "microseconds": 450486 } } + DEVICE_TRAY_MOVED ----------------- diff --git a/hw/qdev.c b/hw/qdev.c index 689cd54..393e83e 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -29,6 +29,7 @@ #include "sysemu/sysemu.h" #include "qapi/error.h" #include "qapi/visitor.h" +#include "qapi/qmp/qjson.h" int qdev_hotplug = 0; static bool qdev_hot_added = false; @@ -778,6 +779,11 @@ static void device_unparent(Object *obj) object_unref(OBJECT(dev->parent_bus)); dev->parent_bus = NULL; } + if (dev->id) { + QObject *data = qobject_from_jsonf("{ 'device': %s }", dev->id); + monitor_protocol_event(QEVENT_DEVICE_DELETED, data); + qobject_decref(data); + } } static void device_class_init(ObjectClass *class, void *data) diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index 87fb49c..b868760 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -39,6 +39,7 @@ typedef enum MonitorEvent { QEVENT_BLOCK_JOB_CANCELLED, QEVENT_BLOCK_JOB_ERROR, QEVENT_BLOCK_JOB_READY, + QEVENT_DEVICE_DELETED, QEVENT_DEVICE_TRAY_MOVED, QEVENT_SUSPEND, QEVENT_SUSPEND_DISK, diff --git a/monitor.c b/monitor.c index 32a6e74..2a5e7b6 100644 --- a/monitor.c +++ b/monitor.c @@ -457,6 +457,7 @@ static const char *monitor_event_names[] = { [QEVENT_BLOCK_JOB_CANCELLED] = "BLOCK_JOB_CANCELLED", [QEVENT_BLOCK_JOB_ERROR] = "BLOCK_JOB_ERROR", [QEVENT_BLOCK_JOB_READY] = "BLOCK_JOB_READY", + [QEVENT_DEVICE_DELETED] = "DEVICE_DELETED", [QEVENT_DEVICE_TRAY_MOVED] = "DEVICE_TRAY_MOVED", [QEVENT_SUSPEND] = "SUSPEND", [QEVENT_SUSPEND_DISK] = "SUSPEND_DISK", diff --git a/qapi-schema.json b/qapi-schema.json index 28b070f..bb361e1 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -2354,7 +2354,9 @@ # Notes: When this command completes, the device may not be removed from the # guest. Hot removal is an operation that requires guest cooperation. # This command merely requests that the guest begin the hot removal -# process. +# process. Completion of the device removal process is signaled with a +# DEVICE_DELETED event. Guest reset will automatically complete removal +# for all devices. # # Since: 0.14.0 ## -- MST

2 1

Re: [libvirt] [PATCH] qdev: DEVICE_DELETED event
by Eric Blake 07 Mar '13

07 Mar '13

[adding libvirt] On 03/06/2013 07:52 AM, Paolo Bonzini wrote: > Il 06/03/2013 15:44, Eric Blake ha scritto: >> Question - if libvirt misses the event (for example, if libvirtd >> requests a remove, but then gets restarted, and the event arrives before >> libvirtd is back up), is there a way to poll whether the the removal has >> completed? The event is great to minimize polling overhead in the >> common case, but we generally provide this sort of information via a >> pollable interface at the same time. > > Yes, you can use qom-list on /machine/peripheral. Which means libvirt should be patched to use qom-list right now, even before this event makes it in, in order to avoid its current bug of reusing a device id before the deletion has completed. Adding the event is still useful, as polling is never nice; and we already know how to make libvirt do conditional code based on whether query-events shows that the event has been added to minimize polling where possible. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 1

[libvirt] virsh qemu+tls login error
by yue 07 Mar '13

07 Mar '13

hi all on client side , (cacert.pem,clientcert.pem,clientkey.pem) certificate are in position. spicec can connect server(kvm host) successfully. 'virsh -c qemu+tcp ' can work well. but virsh command line error when launch virsh -c qemu+tls.............. [root@ovirtdev libvirt]# virsh -d 0 -c qemu+tls://192.168.5.113/system hostname commands: "hostname" 2013-03-06 07:05:22.716+0000: 22245: info : libvirt version: 0.9.10, package: 21.el6_3.8 (CentOS BuildSystem <http://bugs.centos.org>, 2013-01-28-19:24:16, c6b10.bsys.dev.centos.org) 2013-03-06 07:05:22.716+0000: 22245: warning : virNetTLSContextCheckCertificate:1093 : Certificate check failed Certificate failed validation: The certificate hasn't got a known issuer. error: authentication failed: Failed to verify peer's certificate error: failed to connect to the hypervisor [root@ovirtdev libvirt]#

2 2

[libvirt] Cannot download gnulib
by harryxiyou 07 Mar '13

07 Mar '13

Hi all, When i wanna install libvirt, i happened to following errors. $./autogen.sh I am going to run ./configure with no arguments - if you wish to pass any to it, please specify them on the ./autogen.sh command line. running bootstrap... ./bootstrap: Bootstrapping from checked-out http://libvirt.org sources... ./bootstrap: consider installing git-merge-changelog from gnulib ./bootstrap: getting gnulib files... Submodule 'gnulib' () registered for path '.gnulib' fatal: Needed a single revision Unable to find current revision in submodule path '.gnulib' Failed to bootstrap, please investigate. Could anyone give me some suggestions? Thanks in advance ;-) -- Thanks Harry Wei

2 4

[libvirt] [PATCH] Resolve valgrind error
by John Ferlan 07 Mar '13

07 Mar '13

Resolves the following valgrind error from qemuxml2argvtest: ==20393== 5 bytes in 1 blocks are definitely lost in loss record 2 of 60 ==20393== at 0x4A0883C: malloc (vg_replace_malloc.c:270) ==20393== by 0x38D690A167: __vasprintf_chk (in /usr/lib64/libc-2.16.so) ==20393== by 0x4CB0D97: virVasprintf (stdio2.h:210) ==20393== by 0x4CB0E53: virAsprintf (virutil.c:2017) ==20393== by 0x428DC5: qemuAssignDeviceAliases (qemu_command.c:791) ==20393== by 0x41DF93: testCompareXMLToArgvHelper (qemuxml2argvtest.c:151) ==20393== by 0x41F53F: virtTestRun (testutils.c:157) ==20393== by 0x41DA9B: mymain (qemuxml2argvtest.c:885) ==20393== by 0x41FB7A: virtTestMain (testutils.c:719) ==20393== by 0x38D6821A04: (below main) (in /usr/lib64/libc-2.16.so) ==20393== >From qemu_command.c/line 791: if (def->rng) { if (virAsprintf(&def->rng->info.alias, "rng%d", 0) < 0) goto no_memory; } --- src/conf/domain_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f7c8af1..739bd72 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13760,6 +13760,7 @@ virDomainRNGDefFree(virDomainRNGDefPtr def) break; } + virDomainDeviceInfoClear(&def->info); VIR_FREE(def); } -- 1.8.1.2

2 2

[libvirt] Add NUMA memory info to libvirt
by Dusty Mabe 07 Mar '13

07 Mar '13

Hi guys, Could someone possibly look at my proposed patch (http://www.redhat.com/archives/libvir-list/2013-February/msg00776.html)? It is a small code change that gives us some important information about how much memory each NUMA node of a server has. It is strictly for informational purposes and should not affect any functional aspect of libvirt. Thanks, Dusty Mabe

1 0

[libvirt] [PATCH] rng: restrict passthrough names to known-good files
by Eric Blake 07 Mar '13

07 Mar '13

There is some controversy[1] on the qemu list on whether qemu should have ever allowed arbitrary file name passthrough, or whether it should be restricted to JUST /dev/random and /dev/hwrng. It is always easier to add support for additional filenames than it is to remove support for something once released, so this patch restricts libvirt 1.0.3 (where the virtio-random backend was first supported) to just the two uncontroversial names, letting us defer to a later date any decision on whether supporting arbitrary files makes sense. Additionally, since qemu 1.4 does NOT support /dev/fdset/nnn fd passthrough for the backend, limiting to just two known names means that we don't get tempted to try fd passthrough where it won't work. [1]https://lists.gnu.org/archive/html/qemu-devel/2013-03/threads.html#00023 * src/conf/domain_conf.c (virDomainRNGDefParseXML): Only allow /dev/random and /dev/hwrng. * docs/schemas/domaincommon.rng: Flag invalid files. * docs/formatdomain.html.in (elementsRng): Document this. * tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args: Update test to match. * tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.xml: Likewise. --- This needs to be acked before libvirt 1.0.3; otherwise we are stuck supporting arbitrary name passthrough. docs/formatdomain.html.in | 3 ++- docs/schemas/domaincommon.rng | 5 ++++- src/conf/domain_conf.c | 7 +++++++ tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.xml | 2 +- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 1835b39..4cafc92 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4310,7 +4310,8 @@ qemu-kvm -net nic,model=? /dev/null <code>model</code> attribute. Supported source models are: </p> <ul> - <li>'random' — /dev/random (default) or similar device as source</li> + <li>'random' — /dev/random (default) or /dev/hwrng + device as source (for now, no other sources are permitted)</li> <li>'egd' — a EGD protocol backend</li> </ul> </dd> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index e7231cc..4b60885 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3511,7 +3511,10 @@ <attribute name="model"> <value>random</value> </attribute> - <ref name="filePath"/> + <choice> + <value>/dev/random</value> + <value>/dev/hwrng</value> + </choice> </group> <group> <attribute name="model"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 995cf0c..9c96cf1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7423,6 +7423,13 @@ virDomainRNGDefParseXML(const xmlNodePtr node, switch ((enum virDomainRNGBackend) def->backend) { case VIR_DOMAIN_RNG_BACKEND_RANDOM: def->source.file = virXPathString("string(./backend)", ctxt); + if (STRNEQ(def->source.file, "/dev/random") && + STRNEQ(def->source.file, "/dev/hwrng")) { + virReportError(VIR_ERR_XML_ERROR, + _("file '%s' is not a supported random source"), + def->source.file); + goto error; + } break; case VIR_DOMAIN_RNG_BACKEND_EGD: diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args index ad27132..7ab9dbc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args @@ -2,5 +2,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -S -M pc -m 214 -smp 1 -nographic -nodefaults \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ --object 'rng-random,id=rng0,filename=/test/ph<ile' \ +-object rng-random,id=rng0,filename=/dev/hwrng \ -device virtio-rng-pci,rng=rng0,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.xml b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.xml index 0658f4b..1e2c4be 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.xml @@ -17,7 +17,7 @@ <controller type='usb' index='0'/> <memballoon model='virtio'/> <rng model='virtio'> - <backend model='random'>/test/ph<ile</backend> + <backend model='random'>/dev/hwrng</backend> </rng> </devices> </domain> -- 1.8.1.4

4 5

[libvirt] Minor fixes to ocaml bindings for storage pools/volumes
by David Scott 07 Mar '13

07 Mar '13

These patches fix a couple of minor issues I encountered while trying to manipulate storage pools and volumes from an OCaml program. If you're interested, the OCaml client code is a simple adapter to allow an XCP host to use libvirt (for storage only atm, more later). The client code (so far) is here: https://github.com/djs55/xcp-libvirt-storage/blob/master/server.ml Cheers, Dave Scott http://dave.recoil.org/

2 5

[libvirt] [PATCH] storage: Cleanup logical volume creation code
by Jiri Denemark 06 Mar '13

06 Mar '13

This patch plugs two memory leaks, removes some useless and confusing constructs and renames renames "cleanup" label as "error" since it is only used for error path rather then being common for both success and error paths. --- src/storage/storage_backend_logical.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index bb709df..4757fe7 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -700,7 +700,7 @@ virStorageBackendLogicalCreateVol(virConnectPtr conn, virStoragePoolObjPtr pool, virStorageVolDefPtr vol) { - int fdret, fd = -1; + int fd = -1; virCommandPtr cmd = NULL; virErrorPtr err; @@ -741,11 +741,12 @@ virStorageBackendLogicalCreateVol(virConnectPtr conn, virCommandAddArg(cmd, pool->def->source.name); if (virCommandRun(cmd, NULL) < 0) - goto cleanup; + goto error; - if ((fdret = virStorageBackendVolOpen(vol->target.path)) < 0) - goto cleanup; - fd = fdret; + virCommandFree(cmd); + + if ((fd = virStorageBackendVolOpen(vol->target.path)) < 0) + goto error; /* We can only chown/grp if root */ if (getuid() == 0) { @@ -753,40 +754,40 @@ virStorageBackendLogicalCreateVol(virConnectPtr conn, virReportSystemError(errno, _("cannot set file owner '%s'"), vol->target.path); - goto cleanup; + goto error; } } if (fchmod(fd, vol->target.perms.mode) < 0) { virReportSystemError(errno, _("cannot set file mode '%s'"), vol->target.path); - goto cleanup; + goto error; } if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot close file '%s'"), vol->target.path); - goto cleanup; + goto error; } - fd = -1; /* Fill in data about this new vol */ if (virStorageBackendLogicalFindLVs(pool, vol) < 0) { virReportSystemError(errno, _("cannot find newly created volume '%s'"), vol->target.path); - goto cleanup; + goto error; } return 0; - cleanup: + error: err = virSaveLastError(); VIR_FORCE_CLOSE(fd); virStorageBackendLogicalDeleteVol(conn, pool, vol, 0); virCommandFree(cmd); virSetError(err); + virFreeError(err); return -1; } -- 1.8.1.5

2 4

[libvirt] [PATCH] storage: Fix memory leak in error path
by Jiri Denemark 06 Mar '13

06 Mar '13

This also renames cleanup label as error since it is only used for error path rather then being common for both success and error paths. --- src/storage/storage_backend_logical.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index bb709df..e3b3de4 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -741,10 +741,10 @@ virStorageBackendLogicalCreateVol(virConnectPtr conn, virCommandAddArg(cmd, pool->def->source.name); if (virCommandRun(cmd, NULL) < 0) - goto cleanup; + goto error; if ((fdret = virStorageBackendVolOpen(vol->target.path)) < 0) - goto cleanup; + goto error; fd = fdret; /* We can only chown/grp if root */ @@ -753,21 +753,21 @@ virStorageBackendLogicalCreateVol(virConnectPtr conn, virReportSystemError(errno, _("cannot set file owner '%s'"), vol->target.path); - goto cleanup; + goto error; } } if (fchmod(fd, vol->target.perms.mode) < 0) { virReportSystemError(errno, _("cannot set file mode '%s'"), vol->target.path); - goto cleanup; + goto error; } if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot close file '%s'"), vol->target.path); - goto cleanup; + goto error; } fd = -1; @@ -776,17 +776,18 @@ virStorageBackendLogicalCreateVol(virConnectPtr conn, virReportSystemError(errno, _("cannot find newly created volume '%s'"), vol->target.path); - goto cleanup; + goto error; } return 0; - cleanup: + error: err = virSaveLastError(); VIR_FORCE_CLOSE(fd); virStorageBackendLogicalDeleteVol(conn, pool, vol, 0); virCommandFree(cmd); virSetError(err); + virFreeError(err); return -1; } -- 1.8.1.5

3 4

[libvirt] [PATCH 0/3] Resolve some recently uncovered Coverity warnings
by John Ferlan 06 Mar '13

06 Mar '13

Perhaps due to other related changes in the code paths, my daily Coverity scan uncovered a few new issues last week. It didn't seem any of the issues found were critical path, so I waited for the 1.0.3 before posting. I am running Coverity on a daily basis and trying to fine tune the "blame" algorithm. Unfortunately when changes are made in sometimes related code paths it allows Coverity to scan further thus sometimes uncovering some paths that hadn't been covered before or had been blocked by other issues Coverity uncovered in the path. I have a dialogue going with someone at Coverity regarding these types of discoveries. John Ferlan (3): libxl_conf: Resolve Coverity issue with call to regcomp() libxl_driver: Resolve Coverity errors sheepdog: Add Coverity filter src/libxl/libxl_conf.c | 11 ++++++++++- src/libxl/libxl_driver.c | 10 ++++++---- src/storage/storage_backend_sheepdog.c | 2 ++ 3 files changed, 18 insertions(+), 5 deletions(-) -- 1.8.1.2

3 8

[libvirt] ANNOUNCE: Perl binding Sys-Virt release 1.0.3
by Daniel P. Berrange 06 Mar '13

06 Mar '13

I am pleased to announce that release 1.0.3 of Sys-Virt, the libvirt Perl API binding is now available for download: http://search.cpan.org/CPAN/authors/id/D/DA/DANBERR/Sys-Virt-1.0.3.tar.gz Changed in this release: - Add all new APIs and constants in libvirt 1.0.3 Further information, including online API documentation & previous release archives, is available from the CPAN home page http://search.cpan.org/dist/Sys-Virt/ 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] question about ading spice and vnc hardware
by yue 06 Mar '13

06 Mar '13

i create VM through virt-manage. add hardware--> graphic--(spice,vnc server) i do not understand the word 'server' means, In my opinion , spice or vnc server is on KVM-HOST side, vnc,spice client connect to KVM-HOST. there are nothing to do with guestOS. why virt-manage need me to add "server"? thanks

2 2

[libvirt] [PATCH 00/16] Add ability fill driver specific defaults when parsing the XML
by Peter Krempa 05 Mar '13

05 Mar '13

This monster series cleans up a ton of stuff and then adds the ability to fill driver specific defaults by means of a callback. The usage is demonstrated on automaticaly filling default NIC type with qemu. The long term aim is to move all validations and default settings out of the parser. Peter Krempa (16): conf: Improve core dump config error message qemu: Refactor error paths in virQEMUDriverCreateCapabilities conf: Ensure that new devices are added to conf copy function conf: Fix label naming in virDomainDefFormatInternal conf: Reformat many function headers in domain_conf.c conf: Refactor cpumask handling conf: whitespace cleanups and refactors with no semantic impact conf: Refactor ABI stability checking and break long lines conf: Make virDomainDeviceInfoIterate usable without os type conf: Add separate defaults addition and validation for XML parsing qemu: Implement the device parse callback and use it for interfaces tests: add to the tests and fix fallout qemu_command: Clean up default model passing conf: Don't add default controllers in the XML parser conf: Simplify cputune parameter retrieval conf: Move validation of domain title src/conf/capabilities.h | 6 + src/conf/domain_conf.c | 1177 ++++++++++---------- src/conf/domain_conf.h | 4 +- src/qemu/qemu_command.c | 14 +- src/qemu/qemu_conf.c | 18 +- src/qemu/qemu_domain.c | 23 + src/qemu/qemu_domain.h | 1 + .../qemuxml2argv-net-bandwidth.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-net-client.args | 6 +- .../qemuxml2argv-net-eth-ifname.args | 6 +- .../qemuxml2argv-net-eth-ifname.xml | 1 + .../qemuxml2argv-net-eth-names.args | 8 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.args | 6 +- tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-net-hostdev.xml | 1 + tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args | 6 +- .../qemuxml2argv-net-openvswitch.xml | 1 + .../qemuxml2argvdata/qemuxml2argv-net-server.args | 6 +- tests/qemuxml2argvdata/qemuxml2argv-net-user.args | 5 +- tests/qemuxml2argvdata/qemuxml2argv-net-user.xml | 1 + .../qemuxml2argv-net-virtio-network-portgroup.xml | 2 + .../qemuxml2xmlout-graphics-spice-timeout.xml | 1 + tests/testutilsqemu.c | 1 + 23 files changed, 663 insertions(+), 633 deletions(-) -- 1.8.1.1

4 38

[libvirt] [PATCH 0/2] virsh: Improve snapshot-list
by Peter Krempa 05 Mar '13

05 Mar '13

Peter Krempa (2): virsh-snapshot: Add ability to print only snapshot names virsh-snapshot: Refactor virsh snapshot-list tools/virsh-snapshot.c | 143 ++++++++++++++++++++++++------------------------- tools/virsh.pod | 11 ++-- 2 files changed, 76 insertions(+), 78 deletions(-) -- 1.8.1.1

2 7

[libvirt] [PATCHv4] virtio-rng: Add rate limiting options for virtio-RNG
by Peter Krempa 05 Mar '13

05 Mar '13

Qemu's implementation of virtio RNG supports rate limiting of the entropy used. This patch exposes the option to tune this functionality. This patch is based on qemu commit 904d6f588063fb5ad2b61998acdf1e73fb4 The rate limiting is exported in the XML as: <devices> ... <rng model='virtio'> <rate period='1234'>4321</rate> <backend model='random'/> </rng> ... --- Notes: Version 4: - Reword docs - state it is available since 1.0.4 as the tree is frozen and this was actually never acked before Version 3: - State the time unit in docs Version 2: - Qemu uses bytes/period, adapt the value according to that docs/formatdomain.html.in | 13 +++++++++++++ docs/schemas/domaincommon.rng | 18 +++++++++++++++++- src/conf/domain_conf.c | 17 +++++++++++++++++ src/conf/domain_conf.h | 2 ++ src/qemu/qemu_command.c | 9 +++++++++ .../qemuxml2argv-virtio-rng-random.args | 2 +- .../qemuxml2argv-virtio-rng-random.xml | 1 + 7 files changed, 60 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 1835b39..1c6c73e 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -4280,6 +4280,7 @@ qemu-kvm -net nic,model=? /dev/null ... <devices> <rng model='virtio'> + <rate period="2000">1234</rate> <backend model='random'>/dev/random</backend>  <backend model='egd' type='udp'> @@ -4302,6 +4303,18 @@ qemu-kvm -net nic,model=? /dev/null <li>'virtio' — supported by qemu and virtio-rng kernel module</li> </ul> </dd> + <dt><code>rate</code></dt> + <dd> + <p> + The optional <code>rate</code> element allows limiting the rate at + which entropy can be consumed from the source. An optional + <code>period</code> attribute specifies the duration of a period in + milliseconds; if omitted, the period is taken as 1000 milliseconds + (1 second). The element contents specify how many bits are permitted + per period. Drivers may enforce a minimum rate, and may round the + rate down to a minimum granularity. + </p> + </dd> <dt><code>backend</code></dt> <dd> <p> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index e7231cc..172926c 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -3500,7 +3500,12 @@ <value>virtio</value> </choice> </attribute> - <ref name="rng-backend"/> + <interleave> + <ref name="rng-backend"/> + <optional> + <ref name="rng-rate"/> + </optional> + </interleave> </element> </define> @@ -3524,6 +3529,17 @@ </element> </define> + <define name="rng-rate"> + <element name="rate"> + <optional> + <attribute name="period"> + <ref name="positiveInteger"/> + </attribute> + </optional> + <ref name="positiveInteger"/> + </element> + </define> + <define name="usbmaster"> <element name="master"> <attribute name="startport"> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 995cf0c..f556e4c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7399,6 +7399,17 @@ virDomainRNGDefParseXML(const xmlNodePtr node, ctxt->node = node; + if (virXPathUInt("string(./rate)", ctxt, &def->rate) < -1) { + virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid RNG rate value")); + goto error; + } + + if (def->rate > 0 && + virXPathUInt("string(./rate/@period)", ctxt, &def->period) < -1) { + virReportError(VIR_ERR_XML_ERROR, "%s", _("invalid RNG period value")); + goto error; + } + if ((nbackends = virXPathNodeSet("./backend", ctxt, &backends)) < 0) goto error; @@ -13708,6 +13719,12 @@ virDomainRNGDefFormat(virBufferPtr buf, const char *backend = virDomainRNGBackendTypeToString(def->backend); virBufferAsprintf(buf, " <rng model='%s'>\n", model); + if (def->rate) { + virBufferAddLit(buf, " <rate"); + if (def->period) + virBufferAsprintf(buf, " period='%u'", def->period); + virBufferAsprintf(buf, ">%u</rate>\n", def->rate); + } virBufferAsprintf(buf, " <backend model='%s'", backend); switch ((enum virDomainRNGBackend) def->backend) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 5828ae2..1546f21 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1721,6 +1721,8 @@ enum virDomainRNGBackend { struct _virDomainRNGDef { int model; int backend; + unsigned int rate; /* bits per period */ + unsigned int period; /* milliseconds */ union { char *file; /* file name for 'random' source */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1c9bfc9..6fcc093 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4255,6 +4255,15 @@ qemuBuildRNGDeviceArgs(virCommandPtr cmd, virBufferAsprintf(&buf, "virtio-rng-pci,rng=%s", dev->info.alias); + if (dev->rate > 0) { + /* qemu uses bytes */ + virBufferAsprintf(&buf, ",max-bytes=%u", dev->rate / 8); + if (dev->period) + virBufferAsprintf(&buf, ",period=%u", dev->period); + else + virBufferAddLit(&buf, ",period=1000"); + } + if (qemuBuildDeviceAddressStr(&buf, &dev->info, qemuCaps) < 0) goto cleanup; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args index ad27132..4a0437b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args @@ -3,4 +3,4 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ -object 'rng-random,id=rng0,filename=/test/ph<ile' \ --device virtio-rng-pci,rng=rng0,bus=pci.0,addr=0x4 +-device virtio-rng-pci,rng=rng0,max-bytes=100,period=1234,bus=pci.0,addr=0x4 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.xml b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.xml index 0658f4b..3899408 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.xml @@ -17,6 +17,7 @@ <controller type='usb' index='0'/> <memballoon model='virtio'/> <rng model='virtio'> + <rate period='1234'>800</rate> <backend model='random'>/test/ph<ile</backend> </rng> </devices> -- 1.8.1.1

1 2

[libvirt] [PATCHv2] conf: Report errors on cputune parameter parsing
by Peter Krempa 05 Mar '13

05 Mar '13

This patch adds proper error reporting if parsing of cputune parameters fails due to incorrect values provided by the user. Previously no errors were reported in such a case and the failure was silently ignored. --- v2: report errors instead of ignoring them src/conf/domain_conf.c | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ca645c7..1422b47 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9471,29 +9471,43 @@ virDomainDefParseXML(virCapsPtr caps, /* Extract cpu tunables. */ if (virXPathULong("string(./cputune/shares[1])", ctxt, - &def->cputune.shares) < 0) - def->cputune.shares = 0; + &def->cputune.shares) < -1) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("can't parse cputune shares value")); + goto error; + } if (virXPathULongLong("string(./cputune/period[1])", ctxt, - &def->cputune.period) < 0) - def->cputune.period = 0; + &def->cputune.period) < -1) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("can't parse cputune period value")); + goto error; + } if (virXPathLongLong("string(./cputune/quota[1])", ctxt, - &def->cputune.quota) < 0) - def->cputune.quota = 0; + &def->cputune.quota) < -1) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("can't parse cputune quota value")); + goto error; + } if (virXPathULongLong("string(./cputune/emulator_period[1])", ctxt, - &def->cputune.emulator_period) < 0) - def->cputune.emulator_period = 0; + &def->cputune.emulator_period) < -1) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("can't parse cputune emulator period value")); + goto error; + } if (virXPathLongLong("string(./cputune/emulator_quota[1])", ctxt, - &def->cputune.emulator_quota) < 0) - def->cputune.emulator_quota = 0; - - if ((n = virXPathNodeSet("./cputune/vcpupin", ctxt, &nodes)) < 0) { + &def->cputune.emulator_quota) < -1) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("can't parse cputune emualtor quota value")); goto error; } + if ((n = virXPathNodeSet("./cputune/vcpupin", ctxt, &nodes)) < 0) + goto error; + if (n && VIR_ALLOC_N(def->cputune.vcpupin, n) < 0) goto no_memory; -- 1.8.1.1

2 2

[libvirt] Release of libvirt-1.0.3
by Daniel Veillard 05 Mar '13

05 Mar '13

So that release took a bit longuer to stabilize, but as a result we hopefully have a good release :-) . It is tagged in git now, so the freeze is over, and the source tarball and F17 rpms are available at the usual place at : ftp://libvirt.org/libvirt/ Except for a few new API this release is more oriented toward incremental improvements and bug fixes, with also a large amount of documentation improvements and portability fixes: Features: - Introduce virDomainMigrate*CompressionCache APIs (Jiri Denemark) - Introduce virDomainGetJobStats API (Jiri Denemark) - Add basic support for VDI images (Martin Kletzander) - Introduce API virNodeDeviceLookupSCSIHostByWWN (Osier Yang) - Various locking improvements (Daniel P. Berrange) Documentation: - internals: Update to include RPC and Lock links and add new data (John Ferlan) - Add references for phyp and parallels (John Ferlan) - api: Add text and references for daemon (John Ferlan) - api: Add text and references for drivers section (John Ferlan) - api: Complete list of function and naming conventions (John Ferlan) - api: Reword and clean lists for object description (John Ferlan) - api: Reword objects exposed section (John Ferlan) - hellolibvirt: Adjust code to use new APIs (John Ferlan) - libvirt: Update headers for doc (John Ferlan) - hook: log the exit status of the hook not 256 (Guido Günther) - maint: fix typo in network docs (Eric Blake) - util: Add docs for virXMLProp string (Peter Krempa) - Fix attribute name for virtio-rng backend (Peter Krempa) - document new storage volume/pool types (Philipp Hahn) - schema: Add basic documentation for the virtual RNG device support (Peter Krempa) - util: fix typo in comment (Laine Stump) - Add missing 'vram' in QXL video device doc (Christophe Fergeau) - Fix HTML errors (Jiri Denemark) - fix 1.0.2 release date (Eric Blake) - HACKING: Sync with docs/hacking.html.in (John Ferlan) - hacking: Add some details to handle Valgrind output (John Ferlan) - don't ignore virEvent API (Eric Blake) - use div, not table, for notices on opaque types (Claudio Bley) - abort when missing return or argument documentation (Claudio Bley) - libvirt.h.in: document virConnectDomainEventCallback's return value (Claudio Bley) - libvirt.h.in: add missing return doc for virEventRemoveHandleFunc (Claudio Bley) - libvirt.h.in: fix documentation for virConnectDomainEventBlockJobCallback (Claudio Bley) - libvirt.h.in: add missing documentation for virConnectCloseFunc (Claudio Bley) - Sync HACKING and hacking.html.in (Martin Kletzander) Portability: - build: don't use gcrypt.h without gnutls support (Eric Blake) - tests: skip virstoragetest on RHEL 5 (Eric Blake) - Remove some C99 variable decls in parallels driver (Daniel P. Berrange) - tests: old automake lacks abs_builddir (Eric Blake) - tests: consistent skip messages (Eric Blake) - tests: don't test json when not compiled in (Eric Blake) - tests: avoid segfault if json monitor not present (Eric Blake) - run: use portable shell (Eric Blake) - s/arm/armv7l/ in caps-qemu-kvm.xml (Daniel P. Berrange) - build: force correct gcc syntax for attribute_nonnull (Eric Blake) - build: more mingw fixes (Eric Blake) - build: fix mingw build (Eric Blake) - build: fix vircommand build on mingw (Eric Blake) - regex: gnulib guarantees that we have regex support (Eric Blake) - build: fix compilation of selinux on RHEL 5 (Eric Blake) - build: fix VPATH testsuite (Eric Blake) - build: fix build of HAL node backend (Eric Blake) - sanitytest.py: Do not rely on system libvirt (Jiri Denemark) - tests: reserve more fds for commandtest (Eric Blake) - build: Add libcurl dependency to libvirt_driver.la (Jiri Denemark) - tests: Don't build securityselinuxlabeltest without qemu (Jiri Denemark) Bug Fixes: - Fix TLS tests with gnutls 3 (Daniel P. Berrange) - qemu: fix wrong evaluation in qemuDomainSetMemoryParameters (Satoru Moriya) - libvirt does not logout of iscsi targets, causing system hang on shutdown (Fritz Elfert) - qemu: Remove managed save flag from VM when starting with --force-boot (Peter Krempa) - qemu: Use -1 as unpriviledged uid/gid (Christophe Fergeau) - virnetdevmacvlan.c: Introduce mutex for macvlan creation (Michal Privoznik) - Fix deadlock in QEMU close callback APIs (Daniel P. Berrange) - Fix crash in QEMU auto-destroy with transient guests (Daniel P. Berrange) - python: fix fd leak in generator.py (Guannan Ren) - qemu: Make sure qemuProcessStart is run within a job (Jiri Denemark) - Fix starting qemu instances when apparmor driver is enabled (Jim Fehlig) - qemu: Don't fail to shutdown domains with unresponsive agent (Michal Privoznik) - qemu: virConnectGetVersion returns bogus value (Viktor Mihajlovski) - qemu: fix use-after-free when parsing NBD disk (Paolo Bonzini) - Don't try to add non-existant devices to ACL (Daniel P. Berrange) - Fix typo in internal VIR_QEMU_PROCESS_START_AUTODESROY constant (Daniel P. Berrange) - Fix autodestroy of QEMU guests (Daniel P. Berrange) - qemu: -numa doesn't (yet) support disjoint range (Eric Blake) - interface: udev backend coverity NULL deref (Doug Goldstein) - Fix crash changing CDROM media (Daniel P. Berrange) - qemu: do not set unpriv_sgio if neither supported nor requested (Paolo Bonzini) - conf: Avoid leaking of RNG device definition (Peter Krempa) - interface: Fix udev backend bridge device display (Doug Goldstein) - storage: use f_frsize, not f_bsize, for calculating available space (Sage Weil) - conf: Don't leak 'ram' video property on error (Christophe Fergeau) - conf: Don't leak 'primary' video property on error (Christophe Fergeau) - qemu: check backing chains even when cgroup is omitted (Eric Blake) - qemu: Avoid deadlock in autodestroy (Jiri Denemark) - qemu: fix an off-by-one error in qemuDomainGetPercpuStats (Guannan Ren) - qemu: Fix the memory leak (Osier Yang) - keepalive: Guard against integer overflow (John Ferlan) - libxl: Fix setting of disk backend (Jim Fehlig) - Remove a couple of misplaced VIR_FREE (John Ferlan) - Fix memory leak in virNetClientIOWriteMessage (Sergey Fionov) - qemu: Do not ignore mandatory features in migration cookie (Jiri Denemark) - rpc: Avoid deadlock when closing client connection (Jiri Denemark) - Avoid resetting errors in virTypedParamsFree (Jiri Denemark) - interface: fix udev backend use after free (Doug Goldstein) - virsh: Resolve possible NULL dereference (John Ferlan) - commandtest: Resolve some coverity resource leaks (John Ferlan) - Fix libvirt upgrade path when nwfilter is used (Stefan Berger) - util: maintain caps when running command with uid != 0 (Laine Stump) - virCommand: Don't misuse the eventloop for async IO (Michal Privoznik) - Release VM lock before acquiring virDomainObjListPtr lock (Daniel P. Berrange) - Fix potential deadlock across fork() in QEMU driver (Daniel P. Berrange) - hypervisor: Restore pm initialization (John Ferlan) - Remove re-entrant API call in SELinux/AppArmor security managers (Daniel P. Berrange) - xend: Fix a memory leak found by Coverity (John Ferlan) - network_conf.c: Free xmlDoc after use (Michal Privoznik) - virsh-snapshot: Fix XPath query to determine snapshot state (Peter Krempa) - virnetttlcontext: Resolve issues found by Valgrind (John Ferlan) - qemumonitortestutils: Resolve resource leaks found by Valgrind (John Ferlan) - qemumonitorjsontest: Resolve resource leaks found by Valgrind (John Ferlan) - qemu_command: Resolve resource leaks found by Valgrind (John Ferlan) - domain_conf: Resolve resource leaks found by Valgrind (John Ferlan) - vport_profile_conf: Resolve memory leak found by Valgrind (John Ferlan) - netdev_vlan_conf: Resolve memory leak found by Valgrind. (John Ferlan) - qemuxml2argvtest: Resolve resource leaks found by Valgrind (John Ferlan) - virnettlscontexttest: Resolve memory leak found by Valgrind (John Ferlan) - qemu_hotplug: Need to call virUSBDeviceFree() (John Ferlan) - rpc: Need to virCommandFree on error path (John Ferlan) - uml: Resolve leak if need to requery in umlIdentifyOneChrPTY() (John Ferlan) - openvz: Need to error check openvzDomainSetVcpusFlagsInternal() (John Ferlan) - parallels: Need to free memory on error path (John Ferlan) - network: Remove conditional settings to resolve resource leak (John Ferlan) - storage: Resolve resource leaks with cmd processing (John Ferlan) - keepalive: Resolve Coverity complaint (John Ferlan) - tlscontext: Make sure to get proper pointer to 'dname' (John Ferlan) - Fix leak of usbDevice struct when initializing cgroups (Daniel P. Berrange) - Fix typo in configure.ac causing $LIBS to gain a copy of $CFLAGS (Daniel P. Berrange) - util: Fix mask for 172.16.0.0 private address range (Jiri Denemark) Improvements: - rng: restrict passthrough names to known-good files (Eric Blake) - util: use string libvirt to prefix error message instead of libvir (Guannan Ren) - python: fix typoes and repeated global vars references (Guannan Ren) - Fix a message typo (Serge Hallyn) - Avoid spamming logs with cgroups warnings (Daniel P. Berrange) - tests: Test XML entities in source path for RNG device (Peter Krempa) - tests: fix leaks in storagevolxml2argvtest (Ján Tomko) - libvirt.c: Make VIR_MIGRATE_NON_SHARED_{INC,DISK} mutually exclusive (Michal Privoznik) - schema: Restrict mode to octal (Philipp Hahn) - libvirt: fix error message when connection can't be opened (Ján Tomko) - tests: uniformly report test failures (Eric Blake) - qemu: minor monitor lock cleanups (Eric Blake) - qemu: don't override earlier json error (Eric Blake) - qemu: Refactor qemuDomainSetMemoryParameters (Peter Krempa) - storage: cast -1 for uid_t|gid_t (Philipp Hahn) - storage: Cast uid_t|gid_t to unsigned int (Philipp Hahn) - util: Fix printf format for uid_t|gid_t (Philipp Hahn) - tests: Add tests for virtio-rng device handling (Peter Krempa) - qemu: Implement support for EGD backend for virtio-rng (Peter Krempa) - qemu: Implement support for default 'random' backend for virtio-rng (Peter Krempa) - conf: Add RNG device ABI compatibility check (Peter Krempa) - conf: Add support for RNG device configuration in XML (Peter Krempa) - conf: Add fake switch statement to warn for new device types (Peter Krempa) - use client id for IPv6 DHCP host definition (Gene Czarcinski) - Trivial fix: in dhcp-host the name is optional (Gene Czarcinski) - storage: qemu-img: change INFO to DEBUG (Ján Tomko) - storage: move qemu-img options before positional arguments (Ján Tomko) - storage: add test for qemu-img command line generation (Ján Tomko) - storage: separate qemu-img command generation and execution (Ján Tomko) - storage: move flag setting after declarations (Ján Tomko) - run: license as LGPL (Eric Blake) - qemu_migration: Cancel running jobs on failed migration (Michal Privoznik) - qemu_migration: Stop NBD server at Finish phase (Michal Privoznik) - qemu_migration: Introduce qemuMigrationDriveMirror (Michal Privoznik) - qemu_migration: Introduce qemuMigrationStartNBDServer() (Michal Privoznik) - qemu: Introduce nbd-server-stop command (Michal Privoznik) - qemu: Introduce nbd-server-add command (Michal Privoznik) - qemu: Introduce nbd-server-start command (Michal Privoznik) - Introduce NBD migration cookie (Michal Privoznik) - qemu: Introduce NBD_SERVER capability (Michal Privoznik) - Add support for <option> tag in network config (Pieter Hollants) - maint: check all symfiles for sorting (Eric Blake) - qemu: Implement virDomainMigrate*CompressionCache (Jiri Denemark) - virsh: Add migrate-compcache command (Jiri Denemark) - remote: Implement virDomainMigrate*CompressionCache (Jiri Denemark) - python: Implement virDomainMigrateGetCompressionCache wrapper (Jiri Denemark) - qemu: Implement virDomainGetJobStats (Jiri Denemark) - qemu: Parse more fields from query-migrate QMP command (Jiri Denemark) - virsh: Use virDomainGetJobStats in domjobinfo if available (Jiri Denemark) - remote: Implement virDomainGetJobStats (Jiri Denemark) - remote: Auto-allocate params in remoteDeserializeTypedParameters (Jiri Denemark) - python: Implement virDomainGetJobStats wrapper (Jiri Denemark) - qemu: Add support for compressed migration (Jiri Denemark) - Introduce VIR_MIGRATE_COMPRESSED flag (Jiri Denemark) - Update arch names in RNG schema to match virarch.c (Daniel P. Berrange) - interface: dev type support for bond interfaces (Doug Goldstein) - interface: add bond support to udev backend (Doug Goldstein) - interface: Improve udev backend device type id (Doug Goldstein) - interface: Refactor interface vlan to helper func (Doug Goldstein) - interface: udev bridge code error handling updates (Doug Goldstein) - interface: Refactor udev bridge to helper func (Doug Goldstein) - conf: Refactor ABI stability checking and break long lines (Peter Krempa) - conf: Refactor cpumask handling (Peter Krempa) - conf: Reformat many function headers in domain_conf.c (Peter Krempa) - conf: Fix label naming in virDomainDefFormatInternal (Peter Krempa) - conf: Ensure that new devices are added to conf copy function (Peter Krempa) - qemu: Refactor error paths in virQEMUDriverCreateCapabilities (Peter Krempa) - conf: Improve core dump config error message (Peter Krempa) - qemu: Turn closeCallbacks into virObjectLockable (Jiri Denemark) - qemu: Run lzop with '--ignore-warn' (Michal Privoznik) - qemu: Remove the shared disk entry if the operation is ejecting or updating (Osier Yang) - qemu: Move the shared disk adding and sgio setting prior to attaching (Osier Yang) - qemu: Update shared disk table when reconnecting qemu process (Osier Yang) - qemu: Record names of domain which uses the shared disk in hash table (Osier Yang) - qemu: Merge qemuCheckSharedDisk into qemuAddSharedDisk (Osier Yang) - qemu: Add checking in helpers for sgio setting (Osier Yang) - maint: enforce private symbol section sorting (Eric Blake) - qemu: switch PCI address alocation to use virDevicePCIAddress (Ján Tomko) - virsh: distinguish errors between missing argument and wrong option (Guannan Ren) - maint: sort private syms to reflect recent header renames (Eric Blake) - maint: fix header file owners of private symbols (Eric Blake) - net: use structs for address and port ranges (Natanael Copa) - net: add support for specifying port range for forward mode nat (Natanael Copa) - net: support set public ip range for forward mode nat (Natanael Copa) - qemu: Use atomic ops for driver->nactive (Jiri Denemark) - virsh: Always print capacity unit (Jiri Denemark) - qemu: pass "-1" as uid/gid for unprivileged qemu (Guido Günther) - Add capabilities bit for -no-kvm-pit-reinjection (Doug Goldstein) - Add autogenerated lxc_protocol.[ch] to gitignore (Doug Goldstein) - drivermodule: Ignore coverity warning about leaked_storage (John Ferlan) - storage: test backing chain traversal (Eric Blake) - storage: don't follow backing chain symlinks too eagerly (Eric Blake) - storage: refactor metadata lookup (Eric Blake) - storage: prepare for refactoring (Eric Blake) - storage: rearrange functions (Eric Blake) - vbox: Don't overwrite errors returned by virDomainDeviceDefParse (Jiri Denemark) - util: virSetUIDGIDWithCaps - change uid while keeping caps (Laine Stump) - util: drop capabilities immediately after changing uid/gid of child (Laine Stump) - qemu: let virCommand set child process security labels/uid/gid (Laine Stump) - security: add new virSecurityManagerSetChildProcessLabel API (Laine Stump) - util: add security label setting to virCommand (Laine Stump) - build: define SECDRIVER_LIBS in Makefile.am (Laine Stump) - qemu: replace exec hook with virCommandSetUID/GID in storage_backend (Laine Stump) - qemu: replace exec hook with virCommandSetUID/GID in qemuCaps* (Laine Stump) - util: make virSetUIDGID a NOP only when uid or gid is -1 (Laine Stump) - util: add virCommandSetUID and virCommandSetGID (Laine Stump) - util: refactor virCommandHook into virExec and virCommandHandshakeChild (Laine Stump) - util: eliminate extra args from virExec (Laine Stump) - util: eliminate generic hook from virExecWithHook (Laine Stump) - Remove qemuDriverLock from almost everywhere (Daniel P. Berrange) - virsh-volume.c: Switch to c99 initialization of vshCmdInfo (Michal Privoznik) - virsh-snapshot.c: Switch to c99 initialization of vshCmdInfo (Michal Privoznik) - virsh-secret.c: Switch to c99 initialization of vshCmdInfo (Michal Privoznik) - virsh-pool.c: Switch to c99 initialization of vshCmdInfo (Michal Privoznik) - virsh-nwfilter.c: Switch to c99 initialization of vshCmdInfo (Michal Privoznik) - virsh-nodedev.c: Switch to c99 initialization of vshCmdInfo (Michal Privoznik) - virsh-network.c: Switch to c99 initialization of vshCmdInfo (Michal Privoznik) - virsh-interface.c: Switch to c99 initialization of vshCmdInfo (Michal Privoznik) - virsh-host.c: Switch to c99 initialization of vshCmdInfo (Michal Privoznik) - virsh-domain.c: Switch to c99 initialization of vshCmdInfo (Michal Privoznik) - virsh-domain-monitor.c: Switch to c99 initialization of vshCmdInfo (Michal Privoznik) - virsh.c: Switch to c99 initialization of vshCmdInfo (Michal Privoznik) - virsh: Switch to c99 initialization of vshCmdDef (Michal Privoznik) - xen: clean up the mess with cpumap (Eric Blake) - util: use new virendian.h macros (Eric Blake) - util: add virendian.h macros (Eric Blake) - Check if classes are derived from object (Guido Günther) - virsh: Use virNodeDeviceLookupSCSIHostByWWN (Osier Yang) - nodedev: Implement virNodeDeviceLookupSCSIHostByWWN (Osier Yang) - remote: Wire up the remote protocol (Osier Yang) - hypervisor: Revisit Coverity issues regarding cpumap (John Ferlan) - hypervisor: Remove redundant validity checks, clean up function headers (John Ferlan) - xend: Remove redundant validity checks, clean up function headers (John Ferlan) - xm: Remove redundant validity checks, clean up function headers (John Ferlan) - inotify: Clean up some function headers (John Ferlan) - xs: Remove redundant validity checks, clean up function headers (John Ferlan) - virsh-snapshot: Reject --no-metadata together with --print-xml (Peter Krempa) - virsh-snapshot: Refactor some details in virsh snapshot-create-as (Peter Krempa) - Pass virQEMUDriverPtr into APIs managed shared disk list (Daniel P. Berrange) - Serialize execution of security manager APIs (Daniel P. Berrange) - Turn virSecurityManager into a virObjectLockable (Daniel P. Berrange) - sheepdog: skip refresh on creation failure (Harry Wei) - util: refactor iptables command construction into multiple steps (Natanael Copa) - qemu: support vhost-net for generic ethernet devices (Laine Stump) - Stop accessing driver->caps directly in QEMU driver (Daniel P. Berrange) - Rename 'qemuCapsXXX' to 'virQEMUCapsXXX' (Daniel P. Berrange) - Turn virCapabilities into a virObject (Daniel P. Berrange) - Fix comment about virCgroupPtr locking rules in QEMU driver (Daniel P. Berrange) - Fix PKI directory used for QEMU test suite (Daniel P. Berrange) - virCondDestroy: Lose attribute RETURN_CHECK (Michal Privoznik) - Drop useless virFileWrapperFdCatchError (Michal Privoznik) - valgrind: Adjust the suppression file (John Ferlan) - Add syntax-check to make sure Python files don't contain trailing semicolon (Guido Günther) - Remove more trailing semicolons in Python files (Guido Günther) - syntax-check: Don't check non-reentrant functions in docs (Peter Krempa) - Cosmetics: Remove semicolons (Guido Günther) - bitmap: add way to find next clear bit (Eric Blake) - Initialize qemuImageBinary path at startup (Daniel P. Berrange) - Introduce annotations for virQEMUDriverPtr fields (Daniel P. Berrange) - Protect USB/PCI device list access in QEMU with dedicated locks (Daniel P. Berrange) - Convert virPCIDeviceList and virUSBDeviceList into virObjectLockable (Daniel P. Berrange) - Rename all USB device functions to have a standard name prefix (Daniel P. Berrange) - Rename all PCI device functions to have a standard name prefix (Daniel P. Berrange) - Remove pointless 'qemuVersion' field from virQEMUDriverPtr (Daniel P. Berrange) - Use atomic ops to increment nextvmid (Daniel P. Berrange) - Make virDomainObjList self-locking via virObjectLockable (Daniel P. Berrange) - Merge virDomainObjListIsDuplicate into virDomainObjListAdd (Daniel P. Berrange) - qemu: don't log failure during QMP add-fd probe (Eric Blake) - Turn virDomainObjList into an opaque virObject (Daniel P. Berrange) - Rename all domain list APIs to have virDomainObjList prefix (Daniel P. Berrange) - Introduce a virQEMUDriverConfigPtr object (Daniel P. Berrange) - Fix missing error constants in libvirt python module (Daniel P. Berrange) - qemu: Catch stderr of image compression binary (Michal Privoznik) - qemu: Catch stderr of image decompression binary (Michal Privoznik) - virFileWrapperFd: Switch to new virCommandDoAsyncIO (Michal Privoznik) - tests: Create test for virCommandDoAsyncIO (Michal Privoznik) - Introduce event loop to commandtest (Michal Privoznik) - virCommand: Introduce virCommandDoAsyncIO (Michal Privoznik) - conf: Use correct type for device type enum in virDomainDeviceDefFree (Peter Krempa) - Support shifted magic in storage files (Martin Kletzander) - virsh-secret: Refactor error paths (Peter Krempa) - virsh-nwfilter: Update nwfilter commands to use vshCommandOptStringReq (Peter Krempa) - virsh-snapshot: Update snapshot commands to use vshCommandOptStringReq (Peter Krempa) - virsh-snapshot: Refactor cmdSnapshotDumpXML (Peter Krempa) - virsh-nodedev: Refactor error paths, error messages and whitespace (Peter Krempa) - virsh-nodedev: Update node device commands to use vshCommandOptStringReq (Peter Krempa) - virsh-interface: Update interface commands to use vshCommandOptStringReq (Peter Krempa) - virsh-network: Update network commands to use vshCommandOptStringReq (Peter Krempa) - virsh-host: Update host commands to use vshCommandOptStringReq (Peter Krempa) - virsh-domain: Update domain commands to use vshCommandOptStringReq (Peter Krempa) - virsh-domain-monitor: Update domain commands to use vshCommandOptStringReq (Peter Krempa) - virsh-volume: Update volume commands to use vshCommandOptStringReq (Peter Krempa) - virsh-pool: Update pool commands to use vshCommandOptStringReq (Peter Krempa) - virsh: Add helper to request string arguments with error reporting (Peter Krempa) - virsh-pool: Rename helper function buildPoolXML to vshBuildPoolXML (Peter Krempa) - virsh-volume: Rename helper function makeCloneXML to vshMakeCloneXML (Peter Krempa) - virsh-snapshot: Fix coding style and remove dead code (Peter Krempa) - hyperv: Simplify hypervPrivate pointer handling in hypervOpen (Matthias Bolte) - esx: Simplify esxPrivate pointer handling in esxOpen (Matthias Bolte) - maint: update to latest gnulib (Eric Blake) - Add support for QEMU -add-fd support detection (Stefan Berger) - qemu: expose qemu 1.3 add-fd monitor command (Eric Blake) - tests: add a comment about our fake qmp (Eric Blake) - spec: Avoid using makeinstall relic (Jiri Denemark) - complete virterror->virerror name change (Serge Hallyn) - apibuild.py: fix TypeError raised in except clause (Claudio Bley) - Enforce return check on virAsprintf() calls (John Ferlan) - snapshot: Mention disk-only snapshots in error message (Peter Krempa) Cleanups: - Revert hack for autodestroy in qemuProcessStop (Daniel P. Berrange) - Revert "Add support for <option> tag in network config" (Laine Stump) - security: Remove unnecessary checks for mgr == NULL (John Ferlan) - vircommand: Remove unnecessary sa_assert (John Ferlan) - build: fix make check of remote_protocol-structs (Laine Stump) - spec: Fix minor changelog issues (Jiri Denemark) Thanks everybody for your contributions ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH 0/8] Web page updates/changes
by John Ferlan 05 Mar '13

05 Mar '13

I was [t]asked to make updates to the api webpage including an example of a code path from application into the driver. As I started on the task I found that the api webpage first needed a couple of updates just to fill in what seems to have been missing information. As I went through the various pages I realized that the 'better' location for the example code path seemed to be the internals page and thus I added it there. My simple example (hah!) was the virConnectOpen code path - I figured for a intro- duction to the internals web page - it'd be a good place to start. While I was doing this I used the hellolibvirt example a bit and based on information found on the 'api' page I added some more calls into the example to print network and disk information as well as more domain data. Finally while going through the pages I found a couple of places where drv pages weren't referenced although they were available, so I updated those (phyp and parallels). Hopefully I've figured things out correctly, but I'm sure if I have something a bit wrong someone will correct me. Making the figure was quite frustrating as xfig is a bit less forgiving than say office writer. John Ferlan (8): hellolibvirt: Update hellolibvirt example api: Reword objects exposed section api: Reword and clean lists for object description api: Complete list of function and naming conventions api: Add text and references for drivers section api: Add text and references for daemon Add references for phyp and parallels internals: Update to include RPC and Lock links and add new data docs/api.html.in | 261 +++++++++++++++++++++++++---------- docs/drivers.html.in | 1 + docs/index.html.in | 6 + docs/internals.html.in | 102 +++++++++++++- docs/libvirt-virConnect-example.fig | 58 ++++++++ docs/libvirt-virConnect-example.png | Bin 0 -> 10464 bytes docs/sitemap.html.in | 8 ++ examples/hellolibvirt/hellolibvirt.c | 201 +++++++++++++++++++++++---- 8 files changed, 530 insertions(+), 107 deletions(-) create mode 100644 docs/libvirt-virConnect-example.fig create mode 100644 docs/libvirt-virConnect-example.png -- 1.7.11.7

6 28

Re: [libvirt] virtio-rng and fd passing
by Eric Blake 05 Mar '13

05 Mar '13

[adding libvirt] On 03/03/2013 02:05 PM, Anthony Liguori wrote: > Paolo Bonzini <pbonzini(a)redhat.com> writes: > >> Il 02/03/2013 04:13, Anthony Liguori ha scritto: >>> There is no valid use-case of rng-random other than using /dev/random. >>> In fact, it was probably a mistake to even allow a filename to be >>> specified because it lets people do silly things (like /dev/urandom). >>> >>> If you want anything other than /dev/random, you should use rng-egd. >> >> /dev/hwrng makes sense too. > > Good point. Perhaps we should issue a warning when anything is used > other than /dev/random or /dev/hwrng to discourage people from doing the > wrong thing. I completely understand the confusion and I think we > should try a bit harder to prevent people from getting it wrong. Then libvirt should also make sure that the XML we allow for non-egd virtio-rng is restricted to the two filenames that won't cause a qemu warning, or even modify the XML to not expose a filename in the first place. We haven't released libvirt 1.0.3 yet, so we still have a few hours in which such a change could be made before the XML becomes baked by a release. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 2

[libvirt] vm can not be shutdown
by yue 05 Mar '13

05 Mar '13

i use libvirt-python call shutdownFlags, but it can not assure VM can be shutdown. how to make shutdownFlags call work? install or configure something? thanks

3 2

[libvirt] [PATCH] Fix TLS tests with gnutls 3
by Daniel P. Berrange 05 Mar '13

05 Mar '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> When given a CA cert with basic constraints to set non-critical, and key usage of 'key signing', this should be rejected. Version of GNUTLS < 3 do not rejecte it though, so we never noticed the test case was broken Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- tests/virnettlscontexttest.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index 3df8a70..f53ea0e 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -873,15 +873,6 @@ mymain(void) false, false, NULL, NULL, 0, 0, }; - /* Key usage:dig-sig:not-critical */ - static struct testTLSCertReq cacert5req = { - NULL, NULL, "cacert5.pem", "UK", - "libvirt CA 5", NULL, NULL, NULL, NULL, - true, true, true, - true, false, GNUTLS_KEY_DIGITAL_SIGNATURE, - false, false, NULL, NULL, - 0, 0, - }; DO_CTX_TEST(true, cacert1req, servercertreq, false); DO_CTX_TEST(true, cacert2req, servercertreq, false); @@ -889,10 +880,18 @@ mymain(void) DO_CTX_TEST(true, cacert3req, servercertreq, false); # endif DO_CTX_TEST(true, cacert4req, servercertreq, false); - DO_CTX_TEST(true, cacert5req, servercertreq, false); /* Now some bad certs */ + /* Key usage:dig-sig:not-critical */ + static struct testTLSCertReq cacert5req = { + NULL, NULL, "cacert5.pem", "UK", + "libvirt CA 5", NULL, NULL, NULL, NULL, + true, true, true, + true, false, GNUTLS_KEY_DIGITAL_SIGNATURE, + false, false, NULL, NULL, + 0, 0, + }; /* no-basic */ static struct testTLSCertReq cacert6req = { NULL, NULL, "cacert6.pem", "UK", @@ -912,6 +911,16 @@ mymain(void) 0, 0, }; + /* Technically a CA cert with basic constraints + * key purpose == key signing + non-critical should + * be rejected. GNUTLS < 3 does not reject it and + * we don't anticipate them changing this behaviour + */ +# if GNUTLS_VERSION_MAJOR >= 3 + DO_CTX_TEST(true, cacert5req, servercertreq, true); +# else + DO_CTX_TEST(true, cacert5req, servercertreq, false); +# endif DO_CTX_TEST(true, cacert6req, servercertreq, true); DO_CTX_TEST(true, cacert7req, servercertreq, true); -- 1.8.1.2

2 2

[libvirt] [PATCH] qemu: fix wrong evaluation in qemuDomainSetMemoryParameters
by Satoru Moriya 05 Mar '13

05 Mar '13

19c6ad9a (qemu: Refactor qemuDomainSetMemoryParameters) introduced a new macro, VIR_GET_LIMIT_PARAMETER(PARAM, VALUE). But if statement in the macro is not correct and so set_XXXX flags are set to false in the wrong. As a result, libvirt ignores all memtune parameters. This patch fixes the conditional expression to work correctly. Signed-off-by: Satoru Moriya <satoru.moriya(a)hds.com> --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7048ce9..42b8c77 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7280,7 +7280,7 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, } #define VIR_GET_LIMIT_PARAMETER(PARAM, VALUE) \ - if ((rc = virTypedParamsGetULLong(params, nparams, PARAM, &VALUE) < 0)) \ + if ((rc = virTypedParamsGetULLong(params, nparams, PARAM, &VALUE)) < 0) \ goto cleanup; \ \ if (rc == 1) \ -- 1.7.11.7

3 2