- Devel - libvirt List Archives

[libvirt] Can comments be added to libvirt xml files?
by bancfc＠openmailbox.org 15 Aug '14

15 Aug '14

Hi. Is it possible to preserve comments in libvirt's XML files without it failing validate-xml checks?

2 1

[libvirt] [PATCH] build: force configure failed when perl is missing
by Jincheng Miao 15 Aug '14

15 Aug '14

Perl is necessary to our build processing, it will invoke a lot of generating script, like: gendispatch.pl. If perl is missing, it's ok for build from git checkout, because autogen.sh will tell you. But for compiling from a release tarball, configure will just record a missing message, and continue, then build failed, like: https://www.redhat.com/archives/libvirt-users/2014-August/msg00050.html So need to enhance configure script to handle this negative case. Reported-by: Hongbin Lu <hongbin(a)savinetwork.ca> Signed-off-by: Jincheng Miao <jmiao(a)redhat.com> --- configure.ac | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 081f298..af3fe28 100644 --- a/configure.ac +++ b/configure.ac @@ -2173,6 +2173,9 @@ AM_CONDITIONAL([WITH_HYPERV], [test "$with_hyperv" = "yes"]) dnl Allow perl/python overrides AC_PATH_PROGS([PYTHON], [python2 python]) AC_PATH_PROG([PERL], [perl]) +if test -z "$PERL"; then + AC_MSG_ERROR([Failed to find perl.]) +fi AC_ARG_WITH([test-suite], [AS_HELP_STRING([--with-test-suite], -- 1.7.1

3 3

[libvirt] [PATCH V5 00/12] xen_xm.c code refactor
by Kiarie Kahurani 14 Aug '14

14 Aug '14

Kiarie Kahurani (12): src/xenxs: Export code for reuse src/xenxs: Refactor code formating general VM config src/xenxs: Refactor code formating memory config src/xenxs: Refactor code formating virtual time config src/xenxs: Refactor code formating event actions config src/xenxs: Refactor code formating Char devices config src/xenxs: Refactor code formating xm disk config src/xenxs: Refactor code formating CPU features config src/xenxs: Refactor code formating OS config src/xenxs: Refactor code formating Vfb config src/xenxs: Refactor code formating emulated devices config src/xenxs: Export code src/xenxs/xen_xm.c | 858 +++++++++++++-------- src/xenxs/xen_xm.h | 4 + tests/xmconfigdata/test-escape-paths.cfg | 12 +- tests/xmconfigdata/test-fullvirt-force-hpet.cfg | 10 +- tests/xmconfigdata/test-fullvirt-force-nohpet.cfg | 10 +- tests/xmconfigdata/test-fullvirt-localtime.cfg | 10 +- tests/xmconfigdata/test-fullvirt-net-ioemu.cfg | 10 +- tests/xmconfigdata/test-fullvirt-net-netfront.cfg | 10 +- tests/xmconfigdata/test-fullvirt-new-cdrom.cfg | 10 +- tests/xmconfigdata/test-fullvirt-old-cdrom.cfg | 10 +- tests/xmconfigdata/test-fullvirt-parallel-tcp.cfg | 10 +- .../test-fullvirt-serial-dev-2-ports.cfg | 10 +- .../test-fullvirt-serial-dev-2nd-port.cfg | 10 +- tests/xmconfigdata/test-fullvirt-serial-file.cfg | 10 +- tests/xmconfigdata/test-fullvirt-serial-null.cfg | 10 +- tests/xmconfigdata/test-fullvirt-serial-pipe.cfg | 10 +- tests/xmconfigdata/test-fullvirt-serial-pty.cfg | 10 +- tests/xmconfigdata/test-fullvirt-serial-stdio.cfg | 10 +- .../test-fullvirt-serial-tcp-telnet.cfg | 10 +- tests/xmconfigdata/test-fullvirt-serial-tcp.cfg | 10 +- tests/xmconfigdata/test-fullvirt-serial-udp.cfg | 10 +- tests/xmconfigdata/test-fullvirt-serial-unix.cfg | 10 +- tests/xmconfigdata/test-fullvirt-sound.cfg | 12 +- tests/xmconfigdata/test-fullvirt-usbmouse.cfg | 10 +- tests/xmconfigdata/test-fullvirt-usbtablet.cfg | 10 +- tests/xmconfigdata/test-fullvirt-utc.cfg | 10 +- tests/xmconfigdata/test-no-source-cdrom.cfg | 10 +- tests/xmconfigdata/test-paravirt-net-e1000.cfg | 2 +- tests/xmconfigdata/test-paravirt-net-vifname.cfg | 2 +- .../test-paravirt-new-pvfb-vncdisplay.cfg | 2 +- tests/xmconfigdata/test-paravirt-new-pvfb.cfg | 2 +- .../test-paravirt-old-pvfb-vncdisplay.cfg | 2 +- tests/xmconfigdata/test-paravirt-old-pvfb.cfg | 2 +- tests/xmconfigdata/test-paravirt-vcpu.cfg | 2 +- tests/xmconfigdata/test-pci-devs.cfg | 10 +- 35 files changed, 663 insertions(+), 477 deletions(-) This series refactor xen_xm.c code into functions for reuse when writing a xen-xl parser. Changes since V4 fixed SOB issue. -- 1.8.4.5

5 29

[libvirt] [PATCH] qemu_process: fix memleak found by coverity
by Pavel Hrdina 14 Aug '14

14 Aug '14

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed as trivial src/qemu/qemu_process.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 13c396f..52d9052 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2323,8 +2323,10 @@ qemuProcessInitPasswords(virConnectPtr conn, goto cleanup; alias = vm->def->disks[i]->info.alias; - if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) + if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) { + VIR_FREE(secret); goto cleanup; + } ret = qemuMonitorSetDrivePassphrase(priv->mon, alias, secret); VIR_FREE(secret); qemuDomainObjExitMonitor(driver, vm); -- 1.8.5.5

1 0

[libvirt] questions on backing chain file, block lun, active commit
by Eric Blake 14 Aug '14

14 Aug '14

While investigating active commit, I noticed that our code for probing backing chains currently guesses at type="file" vs. type="block" solely based on stat results (regular file vs. block device). Is a block device allowed to be used as <disk type='block' device='lun'> at the same time it has qcow2 format, or does use of device='lun' enforce that the block device is used with raw format? My worry is that if a lun device can be used with qcow2 format, then it can have a non-block backing file, and an active commit would convert <disk type='block' device='lun'> into <disk type='file' device='lun'> which is not valid. On a related vein, that means that an active commit currently auto-picks whether the <disk> will be listed as type='file' or type='block' solely on the stat results. Elsewhere, we allow type='file' even for block devices, where a noticeable difference is how virDomainGetBlockInfo() reports allocation (for type='file', allocation is based on how sparse the file is, but a block device is not sparse; for type='block', allocation is based on asking qemu the maximum used cluster). Should we be auto-converting to type='block' in other cases where we have stat results? For example, I posted a patch today to let the user explicitly request that virsh blockcopy to a block device will use type='block' because the existing code has always used type='file', but if we were doing things automatically, then the user would automatically get type='block' for block device destinations instead of having to request it; but has no way to forcefully list a file even when the destination is a block (at least, not until I implement virDomainBlockCopy() that takes an XML <disk> description). One drawback of autoconversion is the XML changes - with type='file', the host resource is located at xpath disk/source/@file, but with type='block', it is at xpath disk/source/@dev. If we ever convert a user's type='file' into a block device, but the user isn't expecting the conversion, then they won't be able to find the source file name in the output XML. So on that ground, autoprobing type='block' for active commit is fishy; we really should be honoring the user's input for <backingStore> rather than probing it ourselves every time. Until that point, and given that I just proposed a patch to turn on type='block' for blockcopy, where type='file' is used in all other cases, should we have the same sort of flag for active commit? -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 1

[libvirt] [PATCH] [RFC] net: don't segfault on Martin's setup
by Martin Kletzander 14 Aug '14

14 Aug '14

No, don't worry, this is not a real commit message, this is more like an RFC about how to fix it. I'm not sure about this part of libvirt codebase, so I'm rather asking for help. Apparently, I have a network with netdef->forward.pfs == NULL, I suspect this is a network I have, that doesn't have any <forward/> element. With the following fix, everything works as expected, but I'm almost certain this is not enough. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/network/bridge_driver.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 1ba4c3d..3a40124 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2196,6 +2196,9 @@ networkCreateInterfacePool(virNetworkDefPtr netdef) int ret = -1; size_t i; + if (!netdef->forward.pfs) + return 0; + if ((virNetDevGetVirtualFunctions(netdef->forward.pfs->dev, &vfNames, &virtFns, &numVirtFns)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, -- 2.0.4

2 1

[libvirt] [PATCH] Maximum vlanid should be 4095 in interface.rng
by Jianwei Hu 14 Aug '14

14 Aug '14

The correct vlanid range is 0~4095. After merging this patch, we can not validate a interface xml with vlanid >= 4096. [root@localhost ~]# cat vlan.xml <interface type='vlan' name='eno1.4096'> <start mode='onboot'/> <protocol family='ipv4'> <dhcp/> </protocol> <vlan tag='4096'> <interface name='eno1'/> </vlan> </interface> [root@localhost ~]# virt-xml-validate vlan.xml vlan.xml:1: element interface: Relax-NG validity error : Invalid sequence in interleave vlan.xml:6: element vlan: Relax-NG validity error : Element interface failed to validate content vlan.xml:6: element vlan: Relax-NG validity error : Element vlan failed to validate attributes vlan.xml fails to validate [root@localhost ~]# Here is a ip command help on this. [root@localhost /]# ip link add link eno1 name eno1.90 type vlan help Usage: ... vlan [ protocol VLANPROTO ] id VLANID [ FLAG-LIST ] [ ingress-qos-map QOS-MAP ] [ egress-qos-map QOS-MAP ] VLANPROTO: [ 802.1Q / 802.1ad ] VLANID := 0-4095 FLAG-LIST := [ FLAG-LIST ] FLAG FLAG := [ reorder_hdr { on | off } ] [ gvrp { on | off } ] [ mvrp { on | off } ] [ loose_binding { on | off } ] QOS-MAP := [ QOS-MAP ] QOS-MAPPING QOS-MAPPING := FROM:TO --- docs/schemas/interface.rng | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/schemas/interface.rng b/docs/schemas/interface.rng index 80962d4..0f577d6 100644 --- a/docs/schemas/interface.rng +++ b/docs/schemas/interface.rng @@ -440,7 +440,7 @@ <define name='vlan-id'> <data type="unsignedInt"> - <param name="maxInclusive">4096</param> + <param name="maxInclusive">4095</param> </data> </define> </grammar> -- 1.8.3.1

2 1

[libvirt] [PATCH] LXC: Fix virLXCControllerSetupDevPTS() wrt user namespaces
by Richard Weinberger 14 Aug '14

14 Aug '14

The gid value passed to devpts has to be translated by hand as virLXCControllerSetupDevPTS() is called before setting up the user and group mappings. Otherwise devpts will use an unmapped gid and openpty() will fail within containers. Linux commit commit 23adbe12 ("fs,userns: Change inode_capable to capable_wrt_inode_uidgid") uncovered that issue. Signed-off-by: Richard Weinberger <richard(a)nod.at> --- src/lxc/lxc_controller.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 2d220eb..82ecf12 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -1164,6 +1164,19 @@ static int virLXCControllerMain(virLXCControllerPtr ctrl) return rc; } +static uint32_t +virLXCControllerLookupUsernsMap(virDomainIdMapEntryPtr map, int num, + uint32_t src) +{ + int i; + + for (i = 0; i < num; i++) { + if (src > map[i].start && src < map[i].start + map[i].count) + return map[i].target + (src - map[i].start); + } + + return src; +} static int virLXCControllerSetupUsernsMap(virDomainIdMapEntryPtr map, @@ -1930,6 +1943,7 @@ virLXCControllerSetupDevPTS(virLXCControllerPtr ctrl) char *opts = NULL; char *devpts = NULL; int ret = -1; + gid_t ptsgid = 5; VIR_DEBUG("Setting up private /dev/pts"); @@ -1949,10 +1963,17 @@ virLXCControllerSetupDevPTS(virLXCControllerPtr ctrl) goto cleanup; } + if (ctrl->def->idmap.ngidmap) + ptsgid = + virLXCControllerLookupUsernsMap(ctrl->def->idmap.gidmap, + ctrl->def->idmap.ngidmap, + ptsgid); + /* XXX should we support gid=X for X!=5 for distros which use * a different gid for tty? */ - if (virAsprintf(&opts, "newinstance,ptmxmode=0666,mode=0620,gid=5%s", - (mount_options ? mount_options : "")) < 0) + if (virAsprintf + (&opts, "newinstance,ptmxmode=0666,mode=0620,gid=%u%s", ptsgid, + (mount_options ? mount_options : "")) < 0) goto cleanup; VIR_DEBUG("Mount devpts on %s type=tmpfs flags=%x, opts=%s", -- 2.0.1

3 5

[libvirt] [PATCH] qemu: Redundant listen address entry in quest xml
by Erik Skultety 14 Aug '14

14 Aug '14

When editing guest's XML (on QEMU), it was possible to add multiple listen elements into graphics parent element. However QEMU does not support listening on multiple addresses. This patch causes qemu post-parse callback to remove any redundant entries, leaving only 1 listening address if provided, otherwise the configuration remains untouched. --- src/qemu/qemu_domain.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 4f63c88..75a4446 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -827,6 +827,25 @@ qemuDomainDefPostParse(virDomainDefPtr def, VIR_DOMAIN_INPUT_BUS_USB) < 0) return -1; + /* loop over all graphics connections and all listening addresses, + * removing all redundant listening address entries, thus leaving + * only 1 entry + */ + if (def->ngraphics > 0 && def->graphics) { + size_t i, j; + for (i = 0; i < def->ngraphics; i++) { + virDomainGraphicsListenDefPtr listens = def->graphics[i]->listens; + size_t nListens = def->graphics[i]->nListens; + if (nListens <= 1 || !listens) + continue; + for (j = 1; j < nListens; j++) { + VIR_FREE(listens[j].address); + VIR_FREE(listens[j].network); + } + def->graphics[i]->nListens = 1; + } + } + return 0; } -- 1.9.3

3 4

[libvirt] [PATCH] docs: fix missing forward slash
by Jianwei Hu 14 Aug '14

14 Aug '14

Should like below: <interface type='server'> <mac address='52:54:00:22:c9:42'/> <source address='192.168.0.1' port='5558'/> </interface> ... <interface type='client'> <mac address='52:54:00:8b:c9:51'/> <source address='192.168.0.1' port='5558'/> </interface> --- docs/formatdomain.html.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index bd99ae0..ed17389 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3701,12 +3701,12 @@ ... <devices> <interface type='server'> - <mac address='52:54:00:22:c9:42'> + <mac address='52:54:00:22:c9:42'/> <source address='192.168.0.1' port='5558'/> </interface> ... <interface type='client'> - <mac address='52:54:00:8b:c9:51'> + <mac address='52:54:00:8b:c9:51'/> <source address='192.168.0.1' port='5558'/> </interface> </devices> -- 1.8.3.1

2 1

[libvirt] [PATCH v3 0/9] Series on passing FDs to daemon
by Martin Kletzander 14 Aug '14

14 Aug '14

This started as a fix for virsh 20s timeout of waiting for session daemon that failed to start: http://www.redhat.com/archives/libvir-list/2013-April/msg01351.html Then there was a idea that we can pass some FDs around: http://www.redhat.com/archives/libvir-list/2013-April/msg01356.html So we did: https://www.redhat.com/archives/libvir-list/2014-July/msg00841.html And now we are even able to start with socket-activation with systemd; see patch 9/9. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=927369 Martin Kletzander (9): util: abstract parsing of passed FDs into virGetListenFDs() remote: create virNetServerServiceNewFDOrUNIX() wrapper rpc: set listen backlog on FDs as well as on other sockets daemon: support passing FDs from the calling process cfg.mk: allow integers to be assigned a value computed with i|j|k tests: support dynamic prefixes in commandtest util: add virCommandPassListenFDs() function rpc: pass listen FD to the daemon being started daemon: use socket activation with systemd .gitignore | 1 + cfg.mk | 2 +- daemon/Makefile.am | 14 +++++- daemon/libvirtd.c | 45 ++++++++++-------- daemon/libvirtd.conf | 5 ++ daemon/libvirtd.service.in | 5 -- daemon/libvirtd.socket.in | 6 +++ libvirt.spec.in | 26 +++++++++-- src/libvirt_private.syms | 2 + src/libvirt_remote.syms | 1 + src/locking/lock_daemon.c | 47 ++----------------- src/rpc/virnetserverservice.c | 55 +++++++++++++++++++++- src/rpc/virnetserverservice.h | 15 +++++- src/rpc/virnetsocket.c | 102 ++++++++++++++++++++++++++++++++-------- src/util/vircommand.c | 99 +++++++++++++++++++++++++++++++++++++++ src/util/vircommand.h | 4 +- src/util/virutil.c | 62 +++++++++++++++++++++++++ src/util/virutil.h | 2 + tests/commanddata/test24.log | 7 +++ tests/commandtest.c | 105 ++++++++++++++++++++++++++++++++++-------- 20 files changed, 491 insertions(+), 114 deletions(-) create mode 100644 daemon/libvirtd.socket.in create mode 100644 tests/commanddata/test24.log -- 2.0.2

2 30

[libvirt] [PATCH] conf: fix parsing 'cmd_per_lun' and 'max_sectors'
by Wang Rui 14 Aug '14

14 Aug '14

From: Mo yuxiang <moyuxiang(a)huawei.com> commit d9504941 introduces two new attributes "cmd_per_lun" and "max_sectors" same with the names QEMU uses for virtio-scsi. But the case of parsing them is not exact. Change to parse them if controller has "driver" element. Signed-off-by: Mo yuxiang <moyuxiang(a)huawei.com> --- src/conf/domain_conf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 934f6cb..5c762fa 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6295,10 +6295,11 @@ virDomainControllerDefParseXML(xmlNodePtr node, cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { - if (xmlStrEqual(cur->name, BAD_CAST "driver")) + if (xmlStrEqual(cur->name, BAD_CAST "driver")) { queues = virXMLPropString(cur, "queues"); cmd_per_lun = virXMLPropString(cur, "cmd_per_lun"); max_sectors = virXMLPropString(cur, "max_sectors"); + } } cur = cur->next; } -- 1.7.12.4

2 1

[libvirt] [PATCH] qemu: Issue rtc_reset_reinjection command after guest-set-time
by Michal Privoznik 14 Aug '14

14 Aug '14

An advice appeared there on the qemu-devel list [1]. When a domain is suspended and then resumed guest kernel is not aware of this. So we've introduced virDomainSetTime API that resets the time within guest using qemu-ga. On the other hand, qemu itself is trying to make RTC beat faster to catch the difference. But if we don't tell qemu that guest's time was reset via the other method, both mechanisms are applied resulting in again wrong guest time. In order to avoid summing both corrections we need to tell qemu that it should not use the RTC injection if the guest time is set via guest agent. 1: http://www.mail-archive.com/qemu-devel@nongnu.org/msg236435.html Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 10 ++++++++++ src/qemu/qemu_monitor.c | 33 +++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.h | 2 ++ src/qemu/qemu_monitor_json.c | 21 +++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 2 ++ 5 files changed, 68 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b6219ba..bdfd155 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16879,6 +16879,16 @@ qemuDomainSetTime(virDomainPtr dom, rv = qemuAgentSetTime(priv->agent, seconds, nseconds, rtcSync); qemuDomainObjExitAgent(vm); + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto endjob; + } + + qemuDomainObjEnterMonitor(driver, vm); + rv = qemuMonitorRTCResetReinjection(priv->mon); + qemuDomainObjExitMonitor(driver, vm); + if (rv < 0) goto endjob; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 3d9f87b..77627bc 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -4037,3 +4037,36 @@ qemuMonitorGetGuestCPU(qemuMonitorPtr mon, return qemuMonitorJSONGetGuestCPU(mon, arch, data); } + +/** + * qemuMonitorRTCResetReinjection: + * @mon: Pointer to the monitor + * + * Issue rtc-reset-reinjection command. + * This should be used in cases where guest time is restored via + * guest agent so RTC injection is not needed (in fact it will + * confuse guest's RTC). + * + * Returns 0 on success + * -1 on error. + */ +int +qemuMonitorRTCResetReinjection(qemuMonitorPtr mon) +{ + + VIR_DEBUG("mon=%p", mon); + + if (!mon) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("monitor must not be NULL")); + return -1; + } + + if (!mon->json) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("JSON monitor is required")); + return -1; + } + + return qemuMonitorJSONRTCResetReinjection(mon); +} diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index c3695f2..4fd6f01 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -790,6 +790,8 @@ int qemuMonitorGetGuestCPU(qemuMonitorPtr mon, virArch arch, virCPUDataPtr *data); +int qemuMonitorRTCResetReinjection(qemuMonitorPtr mon); + /** * When running two dd process and using <> redirection, we need a * shell that will not truncate files. These two strings serve that diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index a62c02f..538110c 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5851,3 +5851,24 @@ qemuMonitorJSONGetGuestCPU(qemuMonitorPtr mon, return -1; } } + +int +qemuMonitorJSONRTCResetReinjection(qemuMonitorPtr mon) +{ + int ret = -1; + virJSONValuePtr cmd; + virJSONValuePtr reply = NULL; + + if (!(cmd = qemuMonitorJSONMakeCommand("rtc-reset-reinjection", + NULL))) + return ret; + + ret = qemuMonitorJSONCommand(mon, cmd, &reply); + + if (ret == 0) + ret = qemuMonitorJSONCheckError(cmd, reply); + + virJSONValueFree(cmd); + virJSONValueFree(reply); + return ret; +} diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 5f6c846..d8c9308 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -437,4 +437,6 @@ int qemuMonitorJSONGetDeviceAliases(qemuMonitorPtr mon, int qemuMonitorJSONGetGuestCPU(qemuMonitorPtr mon, virArch arch, virCPUDataPtr *data); + +int qemuMonitorJSONRTCResetReinjection(qemuMonitorPtr mon); #endif /* QEMU_MONITOR_JSON_H */ -- 1.8.5.5

2 2

[libvirt] ★ Libvir List, Mig vám poslal zprávu
by Mig 14 Aug '14

14 Aug '14

Mig vám poslal zprávu Zpráva i osoba, která ji odeslala, budou zobrazeny pouze vám a vy je můžete kdykoliv smazat. Můžete ihned odpovědět prostřednictvím výměny zpráv. Chcete-li vidět, co ve zprávě stojí, jednoduše následujte tento odkaz: http://eu1.badoo.com/michal.novotny.6/in/JrkdHLhur0o/?lang_id=16&g=57-0-4&m… Pokud kliknutí na odkazy v této zprávě nefunguje, zkopírujte je a vložte do adresního řádku vašeho prohlížeče. Tento e-mail je součástí procesu doručování zpráv od uživaetle Mig. Pokud vám byla tato zpráva odeslána omylem, prosím ignorujte ji. Zakrátko bude odstraněna ze systému. Dobře se bavte! Tým Badoo Tento e-mail jste obdržel/a od Badoo Trading Limited (korespondeční adresa níže). Pokud si nepřejete dostávat žádné další e-maily od Badoo, klikněte zde k odhlášení: https://eu1.badoo.com/impersonation.phtml?lang_id=16&email=libvir-list%40re…. Badoo Trading Limited je společnost s ručením omezeným registrovaná v Anglii a Walesu pod číslem CRN 7540255 se sídlem na adrese Media Village, 131 - 151 Great Titchfield Street, Londýn, W1W 5BB.

1 0

[libvirt] [PATCH] To provide more accurate help messages of iface/net/pool-define in virsh help and man virsh
by Jianwei Hu 14 Aug '14

14 Aug '14

--- tools/virsh-interface.c | 4 ++-- tools/virsh-network.c | 4 ++-- tools/virsh-pool.c | 4 ++-- tools/virsh.pod | 8 +++++--- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index d4ec854..6b4fd5f 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -507,10 +507,10 @@ cmdInterfaceDumpXML(vshControl *ctl, const vshCmd *cmd) */ static const vshCmdInfo info_interface_define[] = { {.name = "help", - .data = N_("define (but don't start) a physical host interface from an XML file") + .data = N_("define (but don't start) or update a physical host interface from an XML file") }, {.name = "desc", - .data = N_("Define a physical host interface.") + .data = N_("Define a physical host interface or update an existing one.") }, {.name = NULL} }; diff --git a/tools/virsh-network.c b/tools/virsh-network.c index fc08b09..0db333c 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -189,10 +189,10 @@ cmdNetworkCreate(vshControl *ctl, const vshCmd *cmd) */ static const vshCmdInfo info_network_define[] = { {.name = "help", - .data = N_("define (but don't start) a network from an XML file") + .data = N_("define (but don't start) or update a network from an XML file") }, {.name = "desc", - .data = N_("Define a network.") + .data = N_("Define a network or update an existing one.") }, {.name = NULL} }; diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 7c40b5b..b0acd89 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -342,10 +342,10 @@ cmdPoolCreateAs(vshControl *ctl, const vshCmd *cmd) */ static const vshCmdInfo info_pool_define[] = { {.name = "help", - .data = N_("define (but don't start) a pool from an XML file") + .data = N_("define (but don't start) or update a pool from an XML file") }, {.name = "desc", - .data = N_("Define a pool.") + .data = N_("Define a pool or update an existing one.") }, {.name = NULL} }; diff --git a/tools/virsh.pod b/tools/virsh.pod index 849ae31..8086885 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2472,7 +2472,8 @@ to get a description of the XML network format used by libvirt. =item B<net-define> I<file> Define a persistent virtual network from an XML I<file>, the network is just -defined but not instantiated (started). +defined but not instantiated (started). If a persistent virtual network with +the same name and UUID already exists, it will be replaced with the new XML. =item B<net-destroy> I<network> @@ -2631,7 +2632,7 @@ See also B<iface-unbridge> for undoing this operation. =item B<iface-define> I<file> Define a host interface from an XML I<file>, the interface is just defined but -not started. +not started. If a host interface with the same name already exists, it will be replaced with the new XML. =item B<iface-destroy> I<interface> @@ -2778,7 +2779,8 @@ I<type>. =item B<pool-define> I<file> -Create, but do not start, a pool object from the XML I<file>. +Create, but do not start, a pool object from the XML I<file>. If a pool object +with the same name and UUID already exists, it will be replaced with the new XML. =item B<pool-define-as> I<name> I<--print-xml> I<type> [I<source-host>] [I<source-path>] [I<source-dev>] [I<source-name>] [<target>] -- 1.8.1.4

4 4

[libvirt] [PATCH v2 0/2] add support for --config in setmaxmem command
by Chen Hanxiao 14 Aug '14

14 Aug '14

Currently, setmaxmem return success on an active domain, but nothing happened, which is not correct. This series will disable changing max memory on an active domain; then add --config support for setmaxmem command. v2: disable changing max memory on an active domain drop useless as_assert Chen Hanxiao (2): LXC: add support for persistent config in lxcDomainSetMemoryFlags LXC: add support for --config in setmaxmem command src/lxc/lxc_driver.c | 100 ++++++++++++++++++++++++--------------------------- 1 file changed, 46 insertions(+), 54 deletions(-) -- 1.9.0

3 5

[libvirt] [PATCH] Always add 'console' matching the 'serial' device
by Ján Tomko 13 Aug '14

13 Aug '14

We have been formatting the first serial device also as a console device, but only if there were no other consoles. If there is a <serial> device present in the XML, but no serial <console>, or if there isn't any <console> at all but the domain definition hasn't gone through a parse->format->parse round-trip, the <console> device would not be formatted. Change the code to always add the stub device for the first serial device. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1089914 --- src/conf/domain_conf.c | 23 +++++++++++++ .../qemuxml2argv-console-compat2.xml | 35 ++++++++++++++++++++ .../qemuxml2xmlout-console-compat2.xml | 38 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 4 files changed, 97 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-compat2.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat2.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 934f6cb..2a9510e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2965,6 +2965,25 @@ virDomainDefPostParseInternal(virDomainDefPtr def, def->consoles[0]->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE; def->consoles[0]->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL; } + } else if (STREQ(def->os.type, "hvm") && def->nserials > 0 && + def->serials[0]->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && + def->serials[0]->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA) { + /* Create a stub console to match the serial port. + * console[0] either does not exist + * or has a different type than SERIAL or NONE. + */ + virDomainChrDefPtr chr; + if (VIR_ALLOC(chr) < 0) + return -1; + + if (VIR_INSERT_ELEMENT(def->consoles, + 0, + def->nconsoles, + chr) < 0) + return -1; + + def->consoles[0]->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE; + def->consoles[0]->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL; } if (virDomainDefRejectDuplicateControllers(def) < 0) @@ -18288,6 +18307,10 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (virDomainChrDefFormat(buf, &console, flags) < 0) goto error; } + /* The back-compat console device stub is added when parsing the domain XML + * and handled above, this is for formatting definitions created via other + * means. + */ if (STREQ(def->os.type, "hvm") && def->nconsoles == 0 && def->nserials > 0) { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat2.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat2.xml new file mode 100644 index 0000000..ded204a --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat2.xml @@ -0,0 +1,35 @@ +<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'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <controller type='virtio-serial' index='0'/> + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty'> + <target type='virtio' port='0'/> + </console> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat2.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat2.xml new file mode 100644 index 0000000..636e984 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat2.xml @@ -0,0 +1,38 @@ +<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'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <controller type='virtio-serial' index='0'/> + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> + <console type='pty'> + <target type='virtio' port='0'/> + </console> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 5941323..f87f7ea 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -278,6 +278,7 @@ mymain(void) DO_TEST("serial-spiceport-nospice"); DO_TEST("parallel-tcp"); DO_TEST("console-compat"); + DO_TEST_DIFFERENT("console-compat2"); DO_TEST("console-virtio-many"); DO_TEST("channel-guestfwd"); DO_TEST("channel-virtio"); -- 1.8.5.5

1 0

[libvirt] Pass additional environmental variables
by Sean Noonan 13 Aug '14

13 Aug '14

We're using sasl+gssapi+kerberos to do authentication for libvirt, including from hypervisor to hypervisor. However, the environmental variable filtering implemented in libvirt prevents this from working, so we're forced to run a locally patched version. Thoughts on the following patch to pass the location of the local credential cache as well? --- a/src/util/vircommand.c 2014-01-07 14:14:11.388934108 +0000 +++ b/src/util/vircommand.c 2014-01-07 14:18:14.725082505 +0000 @@ -1314,6 +1314,7 @@ virCommandAddEnvPair(cmd, "LC_ALL", "C"); + virCommandAddEnvPassBlockSUID(cmd, "KRB5CCNAME", NULL); virCommandAddEnvPassBlockSUID(cmd, "LD_PRELOAD", NULL); virCommandAddEnvPassBlockSUID(cmd, "LD_LIBRARY_PATH", NULL); virCommandAddEnvPassBlockSUID(cmd, "PATH", "/bin:/usr/bin");

3 2

[libvirt] [RFC PATCH 0/5] ivshmem support
by Maxime Leroy 13 Aug '14

13 Aug '14

The following patches are an implementation proposal for the ivshmem device support in libvirt. Any feedback is welcome. Note: SELinux is not supported (need to be done for the next patchset version) Maxime Leroy (5): doc: schema: Add basic documentation for the ivshmem support conf: Parse and format ivshmem device XML qemu: Add cap flag QEMU_CAPS_IVSHMEM qemu: Build command line for ivshmem device tests: Add tests for ivshmem device handling docs/formatdomain.html.in | 72 +++++++ docs/schemas/domaincommon.rng | 57 ++++++ src/conf/domain_conf.c | 234 ++++++++++++++++++++++- src/conf/domain_conf.h | 40 ++++ src/libvirt_private.syms | 4 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 77 ++++++++ src/qemu/qemu_command.h | 4 + src/qemu/qemu_hotplug.c | 1 + tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemuhelptest.c | 15 +- tests/qemuxml2argvdata/qemuxml2argv-ivshmem.args | 10 + tests/qemuxml2argvdata/qemuxml2argv-ivshmem.xml | 36 ++++ tests/qemuxml2argvtest.c | 3 + tests/qemuxml2xmltest.c | 2 + 21 files changed, 558 insertions(+), 6 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-ivshmem.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-ivshmem.xml -- 1.9.3

5 23

[libvirt] [PATCH 0/2] journald logging rate limit fix
by Peter Krempa 13 Aug '14

13 Aug '14

Peter Krempa (2): libvirtd: conf: Mention support for logging into journald daemon: Limit default log level to journald to VIR_LOG_INFO daemon/libvirtd.c | 10 +++++++++- daemon/libvirtd.conf | 6 ++++++ 2 files changed, 15 insertions(+), 1 deletion(-) -- 2.0.2

4 6

[libvirt] Initializing qemu driver
by David kiarie 13 Aug '14

13 Aug '14

Hi there, I get this errors trying to intialialize libvirtd $libvirtd -vvv 2014-08-12 21:57:47.887+0000: 6449: info : libvirt version: 1.2.8 2014-08-12 21:57:47.887+0000: 6449: warning : virGetHostname:665 : getaddrinfo failed for 'linux-xzc4': Name or service not known 2014-08-12 21:57:48.034+0000: 6461: info : libvirt version: 1.2.8 2014-08-12 21:57:48.034+0000: 6461: error : virFileGetDefaultHugepageSize:2958 : internal error: Unable to parse /proc/meminfo 2014-08-12 21:57:48.034+0000: 6461: error : virStateInitialize:749 : Initialization of QEMU state driver failed: internal error: Unable to parse /proc/meminfo 2014-08-12 21:57:48.034+0000: 6461: error : daemonRunStateInit:922 : Driver state initialization failed Is someone else experiencing the same thing?

2 2

[libvirt] [PATCH] maint: improve syntax check for space around =
by Eric Blake 12 Aug '14

12 Aug '14

Laine Stump noted on IRC that syntax check wasn't flagging his typo of 'i= 0'. This fixes it. * build-aux/bracket-spacing.pl: Tighten space-around-= rule. * src/storage/storage_backend.c (virStorageBackendCreateExecCommand): Fix offenders. * src/util/virnuma.c (virNumaGetDistances): Likewise. * src/vbox/vbox_tmpl.c (vboxDomainSnapshotDeleteMetadataOnly) (vboxNetworkGetXMLDesc): Likewise. * src/xenapi/xenapi_driver.c (xenapiDomainLookupByName): Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- build-aux/bracket-spacing.pl | 11 +++++------ src/storage/storage_backend.c | 2 +- src/util/virnuma.c | 2 +- src/vbox/vbox_tmpl.c | 6 +++--- src/xenapi/xenapi_driver.c | 2 +- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/build-aux/bracket-spacing.pl b/build-aux/bracket-spacing.pl index e4ae8f0..ac01a56 100755 --- a/build-aux/bracket-spacing.pl +++ b/build-aux/bracket-spacing.pl @@ -32,8 +32,8 @@ foreach my $file (@ARGV) { while (defined (my $line = <FILE>)) { my $data = $line; - # Kill any quoted , ; or " - $data =~ s/'[";,]'/'X'/g; + # Kill any quoted , ; = or " + $data =~ s/'[";,=]'/'X'/g; # Kill any quoted strings $data =~ s,"([^\\\"]|\\.)*","XXX",g; @@ -147,10 +147,9 @@ foreach my $file (@ARGV) { # Require spaces around assignment '=', compounds and '==' # with the exception of virAssertCmpInt() - while ($data =~ /[^!<>&|\-+*\/%\^'= ]=\+[^=]/ || - $data =~ /[^!<>&|\-+*\/%\^'=]=[^= \\\n]/ || - $data =~ /[\S]==/ || - ($data =~ /==[^\s,]/ && $data !~ /[\s]virAssertCmpInt\(/)) { + $data =~ s/(virAssertCmpInt\(.* ).?=,/$1op,/; + while ($data =~ /[^ ]\b[!<>&|\-+*\/%\^=]?=[^=]/ || + $data =~ /=[^= \\\n]/) { print "$file:$.: $line"; $ret = 1; last; diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 5cada39..42eee75 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -615,7 +615,7 @@ virStorageBackendCreateExecCommand(virStoragePoolObjPtr pool, if (virCommandRun(cmd, NULL) == 0) { /* command was successfully run, check if the file was created */ - if (stat(vol->target.path, &st) >=0) + if (stat(vol->target.path, &st) >= 0) filecreated = true; } } diff --git a/src/util/virnuma.c b/src/util/virnuma.c index 7a11a3b..9e6e5f7 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -451,7 +451,7 @@ virNumaGetDistances(int node, *ndistances = max_node + 1; - for (i = 0; i<= max_node; i++) { + for (i = 0; i <= max_node; i++) { if (!virNumaNodeIsAvailable(node)) continue; diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index ccba736..bccb4a7 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -8397,7 +8397,7 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapshotPtr snapshot) virDomainPtr dom = snapshot->domain; VBOX_OBJECT_CHECK(dom->conn, int, -1); - virDomainSnapshotDefPtr def= NULL; + virDomainSnapshotDefPtr def = NULL; char *defXml = NULL; vboxIID domiid = VBOX_IID_INITIALIZER; nsresult rc; @@ -10173,7 +10173,7 @@ static char *vboxNetworkGetXMLDesc(virNetworkPtr network, &dhcpServer); if (dhcpServer) { ipdef->nranges = 1; - if (VIR_ALLOC_N(ipdef->ranges, ipdef->nranges) >=0) { + if (VIR_ALLOC_N(ipdef->ranges, ipdef->nranges) >= 0) { PRUnichar *ipAddressUtf16 = NULL; PRUnichar *networkMaskUtf16 = NULL; PRUnichar *fromIPAddressUtf16 = NULL; @@ -10211,7 +10211,7 @@ static char *vboxNetworkGetXMLDesc(virNetworkPtr network, } ipdef->nhosts = 1; - if (VIR_ALLOC_N(ipdef->hosts, ipdef->nhosts) >=0) { + if (VIR_ALLOC_N(ipdef->hosts, ipdef->nhosts) >= 0) { if (VIR_STRDUP(ipdef->hosts[0].name, network->name) < 0) { VIR_FREE(ipdef->hosts); ipdef->nhosts = 0; diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 5bcfd29..50331c9 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -691,7 +691,7 @@ xenapiDomainLookupByName(virConnectPtr conn, } vm = vms->contents[0]; xen_vm_get_uuid(session, &uuid, vm); - if (uuid!=NULL) { + if (uuid != NULL) { ignore_value(virUUIDParse(uuid, raw_uuid)); domP = virGetDomain(conn, name, raw_uuid); if (domP != NULL) { -- 1.7.1

2 2

[libvirt] [PATCH 0/3] Fix libvirtd crash when starting two managedsave operations on a single domain
by Peter Krempa 12 Aug '14

12 Aug '14

We had an unfortunate code path where when you'd start two managedsave operations simultaneously libvirtd would crash. Fix it by adding a VM liveness check. Peter Krempa (3): qemu: managedsave: Check that VM is alive after entering async job security: selinux: Set saved state label only if it is available qemu: migration: Check domain live state after exitting the monitor src/qemu/qemu_driver.c | 6 ++++++ src/qemu/qemu_migration.c | 19 +++++++++++++++++-- src/security/security_selinux.c | 2 +- 3 files changed, 24 insertions(+), 3 deletions(-) -- 2.0.2

3 9

[libvirt] [PATCH] bhyve: fix error message in bhyveStateInitialize
by Dmitry Guryanov 12 Aug '14

12 Aug '14

If we failed to create BHYVE_STATE_DIR, we should show this path, not BHYVE_LOG_DIR. --- src/bhyve/bhyve_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 135cb24..eb8f9af 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1191,7 +1191,7 @@ bhyveStateInitialize(bool priveleged ATTRIBUTE_UNUSED, if (virFileMakePath(BHYVE_STATE_DIR) < 0) { virReportSystemError(errno, _("Failed to mkdir %s"), - BHYVE_LOG_DIR); + BHYVE_STATE_DIR); goto cleanup; } -- 1.9.3

2 1

[libvirt] [PATCH] qemu_conf: Undefine the correct symbol
by Michal Privoznik 12 Aug '14

12 Aug '14

At the beginning of the qemu config file parsing function there are 3 helper macros defined: GET_VALUE_BOOL, GET_VALUE_LONG and GET_VALUE_STR. Later, when they are no longer needed they are undefined in order to keep the namespace clean. However, the GET_VALUE_STRING is undefined instead of GET_VALUE_STR. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed as trivial. src/qemu/qemu_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index b14b1bc..238d2b1 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -662,7 +662,7 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, } #undef GET_VALUE_BOOL #undef GET_VALUE_LONG -#undef GET_VALUE_STRING +#undef GET_VALUE_STR virQEMUDriverConfigPtr virQEMUDriverGetConfig(virQEMUDriverPtr driver) { -- 1.8.5.5

1 0