- Devel - libvirt List Archives

[libvirt] [PATCH 0/7] Some vshCommandOpt rework
by Michal Privoznik 04 Apr '14

04 Apr '14

*** BLURB HERE *** Michal Privoznik (7): virsh: Make vshCommandOpt* report error virsh-domain: Adapt to new error reporting virsh-domain-monitor: Adapt to new error reporting virsh-host: Adapt to new error reporting virsh-interface: Adapt to new error reporting virsh-network: Adapt to new error reporting virsh-volume: Adapt to new error reporting tests/vcpupin | 2 +- tools/virsh-domain-monitor.c | 5 +-- tools/virsh-domain.c | 75 ++++++++++++++------------------------------ tools/virsh-host.c | 19 +++-------- tools/virsh-interface.c | 4 +-- tools/virsh-network.c | 4 +-- tools/virsh-volume.c | 16 +++------- tools/virsh.c | 72 +++++++++++++++++++++++++++++++++++++----- tools/virsh.h | 2 +- 9 files changed, 102 insertions(+), 97 deletions(-) -- 1.9.0

2 10

[libvirt] [PATCH v2] Add V6LOCAL nwfilter parameter.
by Brian Rak 04 Apr '14

04 Apr '14

Currently, adding any sort of IPv6 nwfilter rules is rather difficult. There are no standard rules, and you end up doing a lot of things by hand. This patch makes the $V6LOCAL variable available within nwfilter nules. This is the generated from the interface's mac address using the modified EUI-64 format, which matches what the guest should be using. This is part of what information is needed to correctly filter guest IPv6 traffic. Since this changes with the MAC address, it is significantly easier if libvirt populates it (rather then requiring the user to enter it). As an example, an interface with a MAC address of "12:34:45:46:23:41" would have a V6LOCAL value of "fe80::1034:45ff:fe46:2341" --- docs/formatnwfilter.html.in | 11 ++++++++--- src/conf/nwfilter_params.h | 1 + src/nwfilter/nwfilter_gentech_driver.c | 25 +++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/docs/formatnwfilter.html.in b/docs/formatnwfilter.html.in index 45b97f7..4f10884 100644 --- a/docs/formatnwfilter.html.in +++ b/docs/formatnwfilter.html.in @@ -239,9 +239,9 @@ <h3><a name="nwfconceptsvars">Usage of variables in filters</a></h3> <p> - Two variables names have so far been reserved for usage by the - network traffic filtering subsystem: <code>MAC</code> and - <code>IP</code>. + Three variables names have so far been reserved for usage by the + network traffic filtering subsystem: <code>MAC</code>, + <code>IP</code>, and <code>V6LOCAL</code> (since 1.2.4). <br/><br/> <code>MAC</code> is the MAC address of the network interface. A filtering rule that references this variable @@ -251,6 +251,11 @@ parameter similar to the IP parameter above, it is discouraged since libvirt knows what MAC address an interface will be using. <br/><br/> + <code>V6LOCAL</code> is the computed IPv6 link-local address. + This is based on the MAC address of the interface. As an example, + a MAC address of <code>12:34:45:46:23:41</code> would result in a + link local address of <code>fe80::1034:45ff:fe46:2341</code>. + <br/><br/> The parameter <code>IP</code> represents the IP address that the operating system inside the virtual machine is expected to use on the given interface. The <code>IP</code> parameter diff --git a/src/conf/nwfilter_params.h b/src/conf/nwfilter_params.h index 5e9777b..f61250f 100644 --- a/src/conf/nwfilter_params.h +++ b/src/conf/nwfilter_params.h @@ -98,6 +98,7 @@ bool virNWFilterHashTableEqual(virNWFilterHashTablePtr a, # define NWFILTER_VARNAME_IP "IP" # define NWFILTER_VARNAME_MAC "MAC" +# define NWFILTER_VARNAME_V6LOCAL "V6LOCAL" # define NWFILTER_VARNAME_CTRL_IP_LEARNING "CTRL_IP_LEARNING" # define NWFILTER_VARNAME_DHCPSERVER "DHCPSERVER" diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 1ce5e70..c58df1c 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -45,6 +45,7 @@ VIR_LOG_INIT("nwfilter.nwfilter_gentech_driver"); #define NWFILTER_STD_VAR_MAC NWFILTER_VARNAME_MAC #define NWFILTER_STD_VAR_IP NWFILTER_VARNAME_IP +#define NWFILTER_STD_VAR_V6LOCAL NWFILTER_VARNAME_V6LOCAL #define NWFILTER_DFLT_LEARN "any" @@ -163,6 +164,30 @@ virNWFilterVarHashmapAddStdValues(virNWFilterHashTablePtr table, "%s", _("Could not add variable 'MAC' to hashmap")); return -1; } + + virMacAddr parsedMac; + if (virMacAddrParse(macaddr, &parsedMac) == 0) { + parsedMac.addr[0] ^= 2; + + char euiMacAddr[26]; + snprintf(euiMacAddr, sizeof(euiMacAddr), + "fe80::%02x%02x:%02xff:fe%02x:%02x%02x", parsedMac.addr[0], + parsedMac.addr[1], parsedMac.addr[2], parsedMac.addr[3], + parsedMac.addr[4], parsedMac.addr[5]); + + val = virNWFilterVarValueCreateSimpleCopyValue(euiMacAddr); + if (!val) + return -1; + + if (virHashAddEntry(table->hashTable, + NWFILTER_STD_VAR_V6LOCAL, + val) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Could not add variable 'V6LOCAL' " + "to hashmap")); + return -1; + } + } } if (ipaddr) { -- 1.7.1

2 1

[libvirt] [PATCH] Define CPUINFO_FILE_LEN and fix maxlen of cpuinfo file for powerpc
by Olivia Yin 04 Apr '14

04 Apr '14

This patch define CPUINFO_FILE_LEN as 2KB which is enough for most architectures. For the 24 cores PowerPC machines, the file of /proc/cpuinfo will be larger than 2KB. It will fail to start libvirtd with the error message as below: virFileReadAll: Failed to read file '/proc/cpuinfo': Value too large for defined data type virSysinfoRead: internal error Failed to open /proc/cpuinfo So this patch increases the maxlen of cpuinfo for PowerPC architecture. Signed-off-by: Olivia Yin <Hong-Hua.Yin(a)freescale.com> --- src/util/virsysinfo.c | 6 +++--- src/util/virsysinfo.h | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 7b16157..33c4bc6 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -223,7 +223,7 @@ virSysinfoRead(void) if (VIR_ALLOC(ret) < 0) goto no_memory; - if (virFileReadAll(CPUINFO, 2048, &outbuf) < 0) { + if (virFileReadAll(CPUINFO, 2 * CPUINFO_FILE_LEN, &outbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to open %s"), CPUINFO); return NULL; @@ -341,7 +341,7 @@ virSysinfoRead(void) if (VIR_ALLOC(ret) < 0) goto no_memory; - if (virFileReadAll(CPUINFO, 2048, &outbuf) < 0) { + if (virFileReadAll(CPUINFO, CPUINFO_FILE_LEN, &outbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to open %s"), CPUINFO); return NULL; @@ -470,7 +470,7 @@ virSysinfoRead(void) goto no_memory; /* Gather info from /proc/cpuinfo */ - if (virFileReadAll(CPUINFO, 8192, &outbuf) < 0) { + if (virFileReadAll(CPUINFO, 4 * CPUINFO_FILE_LEN, &outbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to open %s"), CPUINFO); return NULL; diff --git a/src/util/virsysinfo.h b/src/util/virsysinfo.h index fbb505b..630b9ce 100644 --- a/src/util/virsysinfo.h +++ b/src/util/virsysinfo.h @@ -102,4 +102,6 @@ bool virSysinfoIsEqual(virSysinfoDefPtr src, VIR_ENUM_DECL(virSysinfo) +#define CPUINFO_FILE_LEN 2048 /*2KB limit for normal cpuinfo file*/ + #endif /* __VIR_SYSINFOS_H__ */ -- 1.8.5

4 5

[libvirt] [PATCH] virsh: Fix help info of net-event and event command
by liyang 04 Apr '14

04 Apr '14

From: Li Yang <liyang.fnst(a)cn.fujitsu.com> For now the help informatin of net-event and event like this: [root@localhost qemu]# virsh help net-event NAME net-event - (null) ... [root@localhost qemu]# virsh help event NAME event - (null) ... Now fixed them, make them show correct information instead of 'null'. Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> --- tools/virsh-domain.c | 2 +- tools/virsh-network.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index f2856a5..310b5dc 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11030,7 +11030,7 @@ static vshEventCallback vshEventCallbacks[] = { verify(VIR_DOMAIN_EVENT_ID_LAST == ARRAY_CARDINALITY(vshEventCallbacks)); static const vshCmdInfo info_event[] = { - {.name = "event", + {.name = "help", .data = N_("Domain Events") }, {.name = "desc", diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 22d21e7..338db28 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -1180,7 +1180,7 @@ vshEventLifecyclePrint(virConnectPtr conn ATTRIBUTE_UNUSED, } static const vshCmdInfo info_network_event[] = { - {.name = "net-event", + {.name = "help", .data = N_("Network Events") }, {.name = "desc", -- 1.7.1

2 1

[libvirt] [PATCH] Fix Memory Leak in daemon/libvirtd.c
by Nehal J Wani 04 Apr '14

04 Apr '14

Fixes leak introduced by e562e82f ==4937== 64 bytes in 1 blocks are definitely lost in loss record 270 of 405 ==4937== at 0x4A06BE0: realloc (vg_replace_malloc.c:662) ==4937== by 0x6FA41C4: __vasprintf_chk (vasprintf_chk.c:90) ==4937== by 0x50C8D29: virVasprintfInternal (stdio2.h:199) ==4937== by 0x50C8E3A: virAsprintfInternal (virstring.c:362) ==4937== by 0x11D01A: main (libvirtd.c:1170) --- daemon/libvirtd.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index e247259..bb84c90 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1132,6 +1132,7 @@ int main(int argc, char **argv) { bool privileged = geteuid() == 0 ? true : false; bool implicit_conf = false; char *run_dir = NULL; + char *cpumap = NULL; mode_t old_umask; struct option opts[] = { @@ -1159,7 +1160,6 @@ int main(int argc, char **argv) { if (strstr(argv[0], "lt-libvirtd") || strstr(argv[0], "/daemon/.libs/libvirtd")) { char *tmp = strrchr(argv[0], '/'); - char *cpumap; if (!tmp) { fprintf(stderr, _("%s: cannot identify driver directory\n"), argv[0]); exit(EXIT_FAILURE); @@ -1182,6 +1182,7 @@ int main(int argc, char **argv) { virDriverModuleInitialize(driverdir); #endif cpuMapOverride(cpumap); + VIR_FREE(cpumap); *tmp = '/'; /* Must not free 'driverdir' - it is still used */ } -- 1.7.1

2 1

[libvirt] [PATCH v2] Define CPUINFO_FILE_LEN and fix maxlen of cpuinfo file for all uses
by Olivia Yin 04 Apr '14

04 Apr '14

For example, the file /proc/cpuinfo for 24 cores PowerPC platform is larger than the previous maximum size 2KB. It will fail to start libvirtd with the error message as below: virFileReadAll: Failed to read file '/proc/cpuinfo': Value too large for defined data type virSysinfoRead: internal error Failed to open /proc/cpuinfo This patch defines CPUINFO_FILE_LEN as 10KB which is enough for most architectures. Signed-off-by: Olivia Yin <Hong-Hua.Yin(a)freescale.com> --- src/util/virsysinfo.c | 6 +++--- src/util/virsysinfo.h | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 7b16157..873872c 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -223,7 +223,7 @@ virSysinfoRead(void) if (VIR_ALLOC(ret) < 0) goto no_memory; - if (virFileReadAll(CPUINFO, 2048, &outbuf) < 0) { + if (virFileReadAll(CPUINFO, CPUINFO_FILE_LEN, &outbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to open %s"), CPUINFO); return NULL; @@ -341,7 +341,7 @@ virSysinfoRead(void) if (VIR_ALLOC(ret) < 0) goto no_memory; - if (virFileReadAll(CPUINFO, 2048, &outbuf) < 0) { + if (virFileReadAll(CPUINFO, CPUINFO_FILE_LEN, &outbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to open %s"), CPUINFO); return NULL; @@ -470,7 +470,7 @@ virSysinfoRead(void) goto no_memory; /* Gather info from /proc/cpuinfo */ - if (virFileReadAll(CPUINFO, 8192, &outbuf) < 0) { + if (virFileReadAll(CPUINFO, CPUINFO_FILE_LEN, &outbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to open %s"), CPUINFO); return NULL; diff --git a/src/util/virsysinfo.h b/src/util/virsysinfo.h index fbb505b..b5336e2 100644 --- a/src/util/virsysinfo.h +++ b/src/util/virsysinfo.h @@ -102,4 +102,6 @@ bool virSysinfoIsEqual(virSysinfoDefPtr src, VIR_ENUM_DECL(virSysinfo) +#define CPUINFO_FILE_LEN (10*1024) /*10KB limit for /proc/cpuinfo file*/ + #endif /* __VIR_SYSINFOS_H__ */ -- 1.8.5

2 1

[libvirt] libxl: Issues with virt-manager when used to manager Xen domains
by Stefan Bader 03 Apr '14

03 Apr '14

This started off with some regression testing after going forward to Xen-4.4. We currently would pair that with a libvirt version 1.2.2 and right now operations through virsh seem to be working (mostly) well. But when using virt-manager (not the most up-to-date versions but some combinations that quite likely will occur (0.9.1 and 0.9.5)) there are some issues. Two symptoms seem to be caused by the same underlying problem which is caused by the way virt-manager interacts with libvirt. That seems to be that virt-manager acquires a reference to virDomainPtr only once and then uses that for subsequent call. This is a problem because both virDomainPtr object and virDomainObjPtr objects contains a domid but only the latter gets updated. So both, creating a new guest (which must be a define step and then use the handle to start the guest) as well as rebooting a guest cause problems for virt-manager. Mainly because of libxlDomainGetInfo() which retrieves the virDomainObjPtr for a given virDommainPtr. Then checks the domain object to be active or not but uses the domid from the domain to call into libxl: if (!(vm = libxlDomObjFromDomain(dom))) goto cleanup; ... if (!virDomainObjIsActive(vm)) { info->cpuTime = 0; info->memory = vm->def->mem.cur_balloon; info->maxMem = vm->def->mem.max_balloon; } else { if (libxl_domain_info(priv->ctx, &d_info, dom->id) != 0) { This fails either with dom->id being -1 (still) or using the old id from before the reboot. A dirty hack seems to avoid this: static virDomainObjPtr libxlDomObjFromDomain(virDomainPtr dom) { virDomainObjPtr vm; libxlDriverPrivatePtr driver = dom->conn->privateData; char uuidstr[VIR_UUID_STRING_BUFLEN]; vm = virDomainObjListFindByUUID(driver->domains, dom->uuid); if (!vm) { virUUIDFormat(dom->uuid, uuidstr); virReportError(VIR_ERR_NO_DOMAIN, _("no domain with matching uuid '%s' (%s)"), uuidstr, dom->name); return NULL; - } + } else { + if (dom->id != vm->def->id) { + VIR_WARN("libxlDomObjFromDomain: domid changed (%d->%d)", + dom->id, vm->def->id); + dom->id = vm->def->id; + } + } return vm; } Not really sure this is the right way to go. Also because that warning above happens a lot more (repeatedly) than I would have expected. This may or may not be related to the next question. Not a problem but more a confusion on my side: virGetDomain() has commentary that says it will return either a pointer to an existing object or one to a new one. Its just, I cannot see that done in the code. Is that a future plan or was that way but was removed? I must admit I have not looked deeper into that but one explanation of the repeated domid mismatch would be if the virDomainPtr that virt-manager uses to communicate with libvirt would be cloned before doing things inside libvirt. And holding that handle for so long and not obtaining a fresh one through the various lookup interfaces each time could be a mistake of virt-manager. Unfortunately one that needs to be handled in some way. -Stefan

3 6

[libvirt] [PATCH] phyp: fix logic error on volume creation
by Eric Blake 03 Apr '14

03 Apr '14

The phyp code claims that it wants a non-zero value, but actually enforces a capacity of zero. It has been this way since commit ebc46fe in June 2010. Bummer that it has my name as the committer - I guess I should have been much more stubborn about not blindly taking someone else's 1600-line patch. * src/phyp/phyp_driver.c (phypStorageVolCreateXML): Use correct logic. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- The fact that this bug has gone unnoticed for years makes me wonder if we are better off just removing the phyp driver from our code base, since it is obvious it is not getting much testing. I'm also waiting for a review on this, because although I _think_ the code wanted a non-zero capacity, I don't know enough about phyp and the "viosvrcmd -c 'mklv -lv'" command line; maybe the comments are wrong and it always wanted 0 capacity instead (which is the only thing that would get past the pre-patch code check). src/phyp/phyp_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index fc3e7db..3a5eefd 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -2003,15 +2003,15 @@ phypStorageVolCreateXML(virStoragePoolPtr pool, * in the moment you create the volume. * */ if (voldef->key) { VIR_ERROR(_("Key must be empty, Power Hypervisor will create one for you.")); goto err; } - if (voldef->capacity) { + if (!voldef->capacity) { VIR_ERROR(_("Capacity cannot be empty.")); goto err; } key = phypBuildVolume(pool->conn, voldef->name, spdef->name, voldef->capacity); -- 1.9.0

3 3

[libvirt] [PATCH] Add redirdevs to ABI stability check
by Ján Tomko 03 Apr '14

03 Apr '14

Check the bus, type of the source device (tcp vs. spicevmc) and the device address visible in the guest. https://bugzilla.redhat.com/show_bug.cgi?id=1035128 --- src/conf/domain_conf.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0af5be7..9f1c020 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13693,6 +13693,42 @@ virDomainHubDefCheckABIStability(virDomainHubDefPtr src, return true; } + +static bool +virDomainRedirdevDefCheckABIStability(virDomainRedirdevDefPtr src, + virDomainRedirdevDefPtr dst) +{ + if (src->bus != dst->bus) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target redirected device bus %s does not match " + "source %s"), + virDomainRedirdevBusTypeToString(dst->bus), + virDomainRedirdevBusTypeToString(src->bus)); + return false; + } + + switch ((enum virDomainRedirdevBus) src->bus) { + case VIR_DOMAIN_REDIRDEV_BUS_USB: + if (src->source.chr.type != dst->source.chr.type) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target redirected device source type %s does " + "not match source device source type %s"), + virDomainChrTypeToString(dst->source.chr.type), + virDomainChrTypeToString(src->source.chr.type)); + return false; + } + break; + case VIR_DOMAIN_REDIRDEV_BUS_LAST: + break; + } + + if (!virDomainDeviceInfoCheckABIStability(&src->info, &dst->info)) + return false; + + return true; +} + + static bool virDomainRedirFilterDefCheckABIStability(virDomainRedirFilterDefPtr src, virDomainRedirFilterDefPtr dst) @@ -14133,6 +14169,20 @@ virDomainDefCheckABIStability(virDomainDefPtr src, if (!virDomainHubDefCheckABIStability(src->hubs[i], dst->hubs[i])) goto error; + if (src->nredirdevs != dst->nredirdevs) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Target domain redirected devices count %zu " + "does not match source %zu"), + dst->nconsoles, src->nconsoles); + goto error; + } + + for (i = 0; i < src->nredirdevs; i++) { + if (!virDomainRedirdevDefCheckABIStability(src->redirdevs[i], + dst->redirdevs[i])) + goto error; + } + if ((!src->redirfilter && dst->redirfilter) || (src->redirfilter && !dst->redirfilter)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, -- 1.8.3.2

2 1

[libvirt] [PATCH] Use the force flag for mkfs -t xfs
by Ján Tomko 03 Apr '14

03 Apr '14

Without this, building an XFS pool on a formatted partition fails with --overwrite. https://bugzilla.redhat.com/show_bug.cgi?id=927172 --- src/storage/storage_backend_fs.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index e0244ba..1d85871 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -665,11 +665,13 @@ virStorageBackendExecuteMKFS(const char *device, int ret = 0; virCommandPtr cmd = NULL; - cmd = virCommandNewArgList(MKFS, - "-t", - format, - device, - NULL); + cmd = virCommandNewArgList(MKFS, "-t", format, NULL); + + /* use the force, otherwise mkfs.xfs won't overwrite existing fs */ + if (STREQ(format, "xfs")) + virCommandAddArg(cmd, "-f"); + + virCommandAddArg(cmd, device); if (virCommandRun(cmd, NULL) < 0) { virReportSystemError(errno, -- 1.8.3.2

2 1

[libvirt] [PATCH] virsh: Make 'exit' action same as 'quit'
by liyang 03 Apr '14

03 Apr '14

From: Li Yang <liyang.fnst(a)cn.fujitsu.com> For now 'virsh quit' action like this: -------------------------------- [root@localhost /]# virsh quit [root@localhost /]# -------------------------------- And 'virsh exit' action: -------------------------------- [root@localhost /]# virsh exit [root@localhost /]# -------------------------------- There is a small difference('/n') between them. According to manual said: quit, exit quit this interactive terminal And in the code they all called cmdQuit func, They should get same actions. Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> --- tools/virsh.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 02835d9..da7fedd 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1852,7 +1852,8 @@ vshCommandRun(vshControl *ctl, const vshCmd *cmd) if (!ret && disconnected != 0) vshReconnect(ctl); - if (STREQ(cmd->def->name, "quit")) /* hack ... */ + if (STREQ(cmd->def->name, "quit") || + STREQ(cmd->def->name, "exit")) /* hack ... */ return ret; if (enable_timing) { -- 1.7.1

2 1

[libvirt] [PATCH] qemu: make sure agent returns error when required data are missing
by Martin Kletzander 03 Apr '14

03 Apr '14

Commit 5b3492fa aimed to fix this and caught one error but exposed another one. When agent command is being executed and the thread waiting for the reply is woken up by an event (e.g. EOF in case of shutdown), the command finishes with no data (rxObject == NULL), but no error is reported, since this might be desired by the caller (e.g. suspend through agent). However, in other situations, when the data are required (e.g. getting vCPUs), we proceed to getting desired data out of the reply, but none of the virJSON*() functions works well with NULLs. I chose the way of a new parameter for qemuAgentCommand() function that specifies whether reply is required and behaves according to that. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1058149 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: This issue probably exists since qemu-ga is supported in libvirt, so this (along with 5b3492fa and e9d09fe1) might be worth back-porting to some maintenance branches, I just haven't gone through them to see which ones are applicable. src/qemu/qemu_agent.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 92573bd..4082331 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1080,6 +1080,7 @@ static int qemuAgentCommand(qemuAgentPtr mon, virJSONValuePtr cmd, virJSONValuePtr *reply, + bool needReply, int seconds) { int ret = -1; @@ -1111,7 +1112,7 @@ qemuAgentCommand(qemuAgentPtr mon, /* If we haven't obtained any reply but we wait for an * event, then don't report this as error */ if (!msg.rxObject) { - if (await_event) { + if (await_event && !needReply) { VIR_DEBUG("Woken up by event %d", await_event); } else { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1275,7 +1276,7 @@ int qemuAgentShutdown(qemuAgentPtr mon, mon->await_event = QEMU_AGENT_EVENT_RESET; else mon->await_event = QEMU_AGENT_EVENT_SHUTDOWN; - ret = qemuAgentCommand(mon, cmd, &reply, + ret = qemuAgentCommand(mon, cmd, &reply, false, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK); virJSONValueFree(cmd); @@ -1305,7 +1306,7 @@ int qemuAgentFSFreeze(qemuAgentPtr mon) if (!cmd) return -1; - if (qemuAgentCommand(mon, cmd, &reply, + if (qemuAgentCommand(mon, cmd, &reply, true, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) goto cleanup; @@ -1342,7 +1343,7 @@ int qemuAgentFSThaw(qemuAgentPtr mon) if (!cmd) return -1; - if (qemuAgentCommand(mon, cmd, &reply, + if (qemuAgentCommand(mon, cmd, &reply, true, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) goto cleanup; @@ -1379,7 +1380,7 @@ qemuAgentSuspend(qemuAgentPtr mon, return -1; mon->await_event = QEMU_AGENT_EVENT_SUSPEND; - ret = qemuAgentCommand(mon, cmd, &reply, + ret = qemuAgentCommand(mon, cmd, &reply, false, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK); virJSONValueFree(cmd); @@ -1409,7 +1410,7 @@ qemuAgentArbitraryCommand(qemuAgentPtr mon, if (!(cmd = virJSONValueFromString(cmd_str))) goto cleanup; - if ((ret = qemuAgentCommand(mon, cmd, &reply, timeout)) < 0) + if ((ret = qemuAgentCommand(mon, cmd, &reply, true, timeout)) < 0) goto cleanup; if (!(*result = virJSONValueToString(reply, false))) @@ -1436,7 +1437,7 @@ qemuAgentFSTrim(qemuAgentPtr mon, if (!cmd) return ret; - ret = qemuAgentCommand(mon, cmd, &reply, + ret = qemuAgentCommand(mon, cmd, &reply, false, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK); virJSONValueFree(cmd); @@ -1458,7 +1459,7 @@ qemuAgentGetVCPUs(qemuAgentPtr mon, if (!(cmd = qemuAgentMakeCommand("guest-get-vcpus", NULL))) return -1; - if (qemuAgentCommand(mon, cmd, &reply, + if (qemuAgentCommand(mon, cmd, &reply, true, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) goto cleanup; @@ -1566,7 +1567,7 @@ qemuAgentSetVCPUs(qemuAgentPtr mon, cpus = NULL; - if (qemuAgentCommand(mon, cmd, &reply, + if (qemuAgentCommand(mon, cmd, &reply, true, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) goto cleanup; -- 1.9.1

3 3

[libvirt] [PATCHv3 0/3] Time setting and getting in qemu guests
by Michal Privoznik 03 Apr '14

03 Apr '14

Hopefully the last round. Michal Privoznik (3): Introduce virDomain{Get,Set}Time APIs virsh: Expose virDomain{Get,Set}Time qemu: Implement virDomain{Get,Set}Time daemon/remote.c | 37 ++++++++++++ include/libvirt/libvirt.h.in | 14 +++++ src/access/viraccessperm.c | 2 +- src/access/viraccessperm.h | 7 ++- src/driver.h | 14 +++++ src/libvirt.c | 94 ++++++++++++++++++++++++++++++ src/libvirt_public.syms | 5 ++ src/qemu/qemu_agent.c | 99 ++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 8 +++ src/qemu/qemu_driver.c | 109 +++++++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 35 ++++++++++++ src/remote/remote_protocol.x | 31 +++++++++- src/remote_protocol-structs | 16 ++++++ tools/virsh-domain-monitor.c | 132 +++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 16 ++++++ 15 files changed, 616 insertions(+), 3 deletions(-) -- 1.9.0

1 3

[libvirt] [PATCH 0/2] Clean up errors when net device could not be found on detach
by Ján Tomko 03 Apr '14

03 Apr '14

Partially fixes https://bugzilla.redhat.com/show_bug.cgi?id=872028 Does nothing to adress the fact that interface type and other attributes are ignored on device detach Ján Tomko (2): Move error reporting into virDomainNetFindIdx Include PCI address in the error in virDomainNetFindIdx src/conf/domain_conf.c | 26 ++++++++++++++++++++++---- src/lxc/lxc_driver.c | 39 +++++---------------------------------- src/qemu/qemu_driver.c | 28 +++------------------------- src/qemu/qemu_hotplug.c | 15 ++------------- 4 files changed, 32 insertions(+), 76 deletions(-) -- 1.8.3.2

2 5

[libvirt] Release of python bindings for libvirt 1.2.3
by Daniel Veillard 03 Apr '14

03 Apr '14

With a bit of delay due to a dependancy needing fixing, the python bindings update for 1.2.3 are available, tagged in the libvirt-python git module and for download at the usual place: ftp://libvirt.org/libvirt/python/ It carries a mix of improvements, bugs and portability fixes: Portability: - Fix nosetests usage with python3 (Daniel P. Berrange) - setup.py: Allow running --help or clean without pkg-config (Cole Robinson) Bug Fixes: - Fix potential crash when setting partial cpu/memory/numa/interface limits on domains (Brian Rak) - event: fix domain reference bugs (Eric Blake) - override: Return NULL on python failure in getCPUModelNames (Cole Robinson) - override: GetCPUModelNames should return None on failure (Cole Robinson) - setPyVirTypedParameter: free whole return variable on error (Michal Privoznik) Improvements: - setup.py: Make have_libvirt_lxc a function (Cole Robinson) - setup.py: Move module list building to its own function (Cole Robinson) - setup.py: Remove unused import (Cole Robinson) - qemu: support arbitrary monitor events (Eric Blake) - generator: Add virConnectDomainQemuMonitorEventCallback to skipped_types (Martin Kletzander) - maint: balance {} usage (Eric Blake) - maint: Add ctags configuration file and ignore the output (Peter Krempa) - maint: set up preferred emacs settings (Eric Blake) - maint: ignore .pyc files (Eric Blake) - Add test for setting scheduler parameters (Daniel P. Berrange) - Add support for running unit tests with nose (Daniel P. Berrange) - setPyVirTypedParameter: Copy full field name (Michal Privoznik) Thaks everybody for your contributions to this release ! 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] tests: simplify storage test cleanup
by Eric Blake 02 Apr '14

02 Apr '14

No need to spawn a child 'rm' process when we can do it ourselves. * tests/virstoragetest.c (testCleanupImages): Use dedicated helper. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. tests/virstoragetest.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 3089d70..9ec39c7 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -62,8 +62,6 @@ static char *abslink2; static void testCleanupImages(void) { - virCommandPtr cmd; - VIR_FREE(qemuimg); VIR_FREE(absraw); VIR_FREE(canonraw); @@ -79,9 +77,7 @@ testCleanupImages(void) return; } - cmd = virCommandNewArgList("rm", "-rf", datadir, NULL); - ignore_value(virCommandRun(cmd, NULL)); - virCommandFree(cmd); + virFileDeleteTree(datadir); } static int -- 1.9.0

1 0

[libvirt] [PATCH v4 0/5] Expose FSFreeze/FSThaw within the guest as API
by Tomoki Sekiyama 02 Apr '14

02 Apr '14

Hello, This is patchset v4 to add FSFreeze/FSThaw API for custom disk snapshotting. Changes to v3: * fix typp and label spacing * rebased to recent tree (v3: http://www.redhat.com/archives/libvir-list/2014-March/msg01358.html ) === Description === Currently FSFreeze and FSThaw are supported by qemu guest agent and they are used internally in snapshot-create command with --quiesce option. However, when users want to utilize the native snapshot feature of storage devices (such as LVM over iSCSI, enterprise storage appliances, etc.), they need to issue fsfreeze command separately from libvirt-driven snapshots. (OpenStack cinder provides these storages' snapshot feature, but it cannot quiesce the guest filesystems automatically for now.) Although virDomainQemuGuestAgent() API could be used for this purpose, it is only for debugging and is not supported officially. This patchset adds virDomainFSFreeze()/virDomainFSThaw() APIs and virsh domfsfreeze/domfsthaw commands to enable the users to freeze and thaw domain's filesystems cleanly. The APIs have flags option currently unsupported for future extension. --- Tomoki Sekiyama (5): Introduce virDomainFSFreeze() and virDomainFSThaw() public API remote: Implement virDomainFSFreeze and virDomainFSThaw qemu: Track domain quiesced status qemu: Implement virDomainFSFreeze and virDomainFSThaw virsh: Expose new virDomainFSFreeze and virDomainFSThaw API include/libvirt/libvirt.h.in | 6 ++ src/access/viraccessperm.c | 2 - src/access/viraccessperm.h | 6 ++ src/driver.h | 10 +++ src/libvirt.c | 70 ++++++++++++++++++++ src/libvirt_public.syms | 2 + src/qemu/qemu_domain.c | 5 + src/qemu/qemu_domain.h | 2 + src/qemu/qemu_driver.c | 144 ++++++++++++++++++++++++++++++++++++++---- src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 25 +++++++ src/remote_protocol-structs | 9 +++ src/rpc/gendispatch.pl | 2 + tools/virsh-domain.c | 92 +++++++++++++++++++++++++++ tools/virsh.pod | 15 ++++ 15 files changed, 376 insertions(+), 16 deletions(-)

3 13

[libvirt] [PATCH v3] storage: Report error from VolOpen by default
by Cole Robinson 02 Apr '14

02 Apr '14

Currently VolOpen notifies the user of a potentially non-fatal failure by returning -2 and logging a VIR_WARN or VIR_INFO. Unfortunately most callers treat -2 as fatal but don't actually report any message with the error APIs. Rename the VOL_OPEN_ERROR flag to VOL_OPEN_NOERROR. If NOERROR is specified, we preserve the current behavior of returning -2 (there's only one caller that wants this). However in the default case, only return -1, and actually use the error APIs. Fix up a couple callers as a result. --- src/storage/storage_backend.c | 77 ++++++++++++++++++++++++-------------- src/storage/storage_backend.h | 7 ++-- src/storage/storage_backend_fs.c | 28 +++++--------- src/storage/storage_backend_scsi.c | 3 -- 4 files changed, 62 insertions(+), 53 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 8fe3687..f44e323 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1279,8 +1279,9 @@ virStorageBackendDetectBlockVolFormatFD(virStorageSourcePtr target, /* * Allows caller to silently ignore files with improper mode * - * Returns -1 on error, -2 if file mode is unexpected or the - * volume is a dangling symbolic link. + * Returns -1 on error. If VIR_STORAGE_VOL_OPEN_NOERROR is passed, we + * return -2 if file mode is unexpected or the volume is a dangling + * symbolic link. */ int virStorageBackendVolOpen(const char *path, struct stat *sb, @@ -1288,9 +1289,10 @@ virStorageBackendVolOpen(const char *path, struct stat *sb, { int fd, mode = 0; char *base = last_component(path); + bool noerror = (flags * VIR_STORAGE_VOL_OPEN_NOERROR); if (lstat(path, sb) < 0) { - if (errno == ENOENT && !(flags & VIR_STORAGE_VOL_OPEN_ERROR)) { + if (errno == ENOENT && noerror) { VIR_WARN("ignoring missing file '%s'", path); return -2; } @@ -1301,11 +1303,21 @@ virStorageBackendVolOpen(const char *path, struct stat *sb, } if (S_ISFIFO(sb->st_mode)) { - VIR_WARN("ignoring FIFO '%s'", path); - return -2; + if (noerror) { + VIR_WARN("ignoring FIFO '%s'", path); + return -2; + } + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Volume path '%s' is a FIFO"), path); + return -1; } else if (S_ISSOCK(sb->st_mode)) { - VIR_WARN("ignoring socket '%s'", path); - return -2; + if (noerror) { + VIR_WARN("ignoring socket '%s'", path); + return -2; + } + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Volume path '%s' is a socket"), path); + return -1; } /* O_NONBLOCK should only matter during open() for fifos and @@ -1316,25 +1328,21 @@ virStorageBackendVolOpen(const char *path, struct stat *sb, * race. */ if ((fd = open(path, O_RDONLY|O_NONBLOCK|O_NOCTTY)) < 0) { if ((errno == ENOENT || errno == ELOOP) && - S_ISLNK(sb->st_mode)) { + S_ISLNK(sb->st_mode) && noerror) { VIR_WARN("ignoring dangling symlink '%s'", path); return -2; } - if (errno == ENOENT && !(flags & VIR_STORAGE_VOL_OPEN_ERROR)) { + if (errno == ENOENT && noerror) { VIR_WARN("ignoring missing file '%s'", path); return -2; } - virReportSystemError(errno, - _("cannot open volume '%s'"), - path); + virReportSystemError(errno, _("cannot open volume '%s'"), path); return -1; } if (fstat(fd, sb) < 0) { - virReportSystemError(errno, - _("cannot stat file '%s'"), - path); + virReportSystemError(errno, _("cannot stat file '%s'"), path); VIR_FORCE_CLOSE(fd); return -1; } @@ -1351,33 +1359,46 @@ virStorageBackendVolOpen(const char *path, struct stat *sb, if (STREQ(base, ".") || STREQ(base, "..")) { VIR_FORCE_CLOSE(fd); - VIR_INFO("Skipping special dir '%s'", base); - return -2; + if (noerror) { + VIR_INFO("Skipping special dir '%s'", base); + return -2; + } + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Cannot use volume path '%s'"), path); + return -1; } } else { - VIR_WARN("ignoring unexpected type for file '%s'", path); VIR_FORCE_CLOSE(fd); - return -2; + if (noerror) { + VIR_WARN("ignoring unexpected type for file '%s'", path); + return -2; + } + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected type for file '%s'"), path); + return -1; } if (virSetBlocking(fd, true) < 0) { + VIR_FORCE_CLOSE(fd); + if (noerror) { + VIR_WARN("unable to set blocking mode for '%s'", path); + return -2; + } virReportSystemError(errno, _("unable to set blocking mode for '%s'"), path); - VIR_FORCE_CLOSE(fd); - return -2; + return -1; } if (!(mode & flags)) { VIR_FORCE_CLOSE(fd); - VIR_INFO("Skipping volume '%s'", path); - - if (mode & VIR_STORAGE_VOL_OPEN_ERROR) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected storage mode for '%s'"), path); - return -1; + if (noerror) { + VIR_INFO("Skipping volume '%s'", path); + return -2; } - return -2; + virReportError(VIR_ERR_INTERNAL_ERROR, + _("unexpected storage mode for '%s'"), path); + return -1; } return fd; diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h index 89511f8..c695ef7 100644 --- a/src/storage/storage_backend.h +++ b/src/storage/storage_backend.h @@ -120,16 +120,15 @@ virStorageBackendPtr virStorageBackendForType(int type); /* VolOpenCheckMode flags */ enum { - VIR_STORAGE_VOL_OPEN_ERROR = 1 << 0, /* warn if unexpected type - * encountered */ + VIR_STORAGE_VOL_OPEN_NOERROR = 1 << 0, /* don't error if unexpected type + * encountered, just warn */ VIR_STORAGE_VOL_OPEN_REG = 1 << 1, /* regular files okay */ VIR_STORAGE_VOL_OPEN_BLOCK = 1 << 2, /* block files okay */ VIR_STORAGE_VOL_OPEN_CHAR = 1 << 3, /* char files okay */ VIR_STORAGE_VOL_OPEN_DIR = 1 << 4, /* directories okay */ }; -# define VIR_STORAGE_VOL_OPEN_DEFAULT (VIR_STORAGE_VOL_OPEN_ERROR |\ - VIR_STORAGE_VOL_OPEN_REG |\ +# define VIR_STORAGE_VOL_OPEN_DEFAULT (VIR_STORAGE_VOL_OPEN_REG |\ VIR_STORAGE_VOL_OPEN_BLOCK) int virStorageBackendVolOpen(const char *path, struct stat *sb, diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index de6521c..9b958f0 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -56,10 +56,10 @@ VIR_LOG_INIT("storage.storage_backend_fs"); -#define VIR_STORAGE_VOL_FS_OPEN_FLAGS (VIR_STORAGE_VOL_OPEN_DEFAULT |\ - VIR_STORAGE_VOL_OPEN_DIR) -#define VIR_STORAGE_VOL_FS_REFRESH_FLAGS (VIR_STORAGE_VOL_FS_OPEN_FLAGS &\ - ~VIR_STORAGE_VOL_OPEN_ERROR) +#define VIR_STORAGE_VOL_FS_OPEN_FLAGS (VIR_STORAGE_VOL_OPEN_DEFAULT &\ + VIR_STORAGE_VOL_OPEN_DIR) +#define VIR_STORAGE_VOL_FS_PROBE_FLAGS (VIR_STORAGE_VOL_FS_OPEN_FLAGS &\ + VIR_STORAGE_VOL_OPEN_NOERROR) static int ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) virStorageBackendProbeTarget(virStorageSourcePtr target, @@ -80,7 +80,7 @@ virStorageBackendProbeTarget(virStorageSourcePtr target, *encryption = NULL; if ((ret = virStorageBackendVolOpen(target->path, &sb, - VIR_STORAGE_VOL_FS_REFRESH_FLAGS)) < 0) + VIR_STORAGE_VOL_FS_PROBE_FLAGS)) < 0) goto error; /* Take care to propagate ret, it is not always -1 */ fd = ret; @@ -902,19 +902,11 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn ATTRIBUTE_UNUSED, vol->backingStore.path = backingStore; vol->backingStore.format = backingStoreFormat; - if (virStorageBackendUpdateVolTargetInfo(&vol->backingStore, - false, - VIR_STORAGE_VOL_OPEN_DEFAULT) < 0) { - /* The backing file is currently unavailable, the capacity, - * allocation, owner, group and mode are unknown. Just log the - * error and continue. - * Unfortunately virStorageBackendProbeTarget() might already - * have logged a similar message for the same problem, but only - * if AUTO format detection was used. */ - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot probe backing volume info: %s"), - vol->backingStore.path); - } + virStorageBackendUpdateVolTargetInfo(&vol->backingStore, false, + VIR_STORAGE_VOL_OPEN_DEFAULT); + /* If this failed, the backing file is currently unavailable, + * the capacity, allocation, owner, group and mode are unknown. + * An error message was raised, but we just continue. */ } diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index cf546fb..c448d7f 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -201,9 +201,6 @@ virStorageBackendSCSINewLun(virStoragePoolObjPtr pool, if (virStorageBackendUpdateVolInfo(vol, true, VIR_STORAGE_VOL_OPEN_DEFAULT) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Failed to update volume for '%s'"), - devpath); retval = -1; goto free_vol; } -- 1.9.0

2 2

[libvirt] Clock problems on live migration
by Paul Boven 02 Apr '14

02 Apr '14

Hi everyone, When doing a live migration, Linux guests will frequently get stuck and become unresponsive, while the CPU utilization on the host for that guest goes to 100%. If you wait long enough, the guest seems to always recover, with a dmesg entry such as: Clocksource tsc unstable (delta = 35882846234 ns) So the TSC did a jump of nearly 36 seconds. I've actually had a (test-vm) stay stuck for over 11 minutes before becoming responsive again (delta = 662463064082 ns). Migrations often fail when going from server A to B, but will then work fine in the other direction. Both servers and guests are locked to the same NTP servers, and are well within 1ms from one another. Both hosts are running Ubuntu 13.04 with these versions (from Ubuntu packages): Kernel: 3.8.0-35-generic x86_64 Libvirt: 1.0.2 Qemu: 1.4.0 Gluster-fs: 3.4.2 (libvirt access the images via the filesystem, not using libgfapi yet). The interconnect between both machines (both for migration and gluster) is 10GbE. We have different guests (all Ubuntu releases, 13.04 and 13.10), and they all seem to be affected. Clocksource: kvm-clock on all guests. Clock entry from the guest XML: <clock offset='utc'/> Now as far as I've udnerstood the documentation of kvm-clock, it specifically supports live migrations, so I'm a bit surprised by these problems. There isn't all that much information to find on this issue, although I have found postings by others that seem to have run into the same issues, but without a solution. Any help would be much appreciated. Regards, Paul Boven. -- Paul Boven <boven(a)jive.nl> +31 (0)521-596547 Unix/Linux/Networking specialist Joint Institute for VLBI in Europe - www.jive.nl VLBI - It's a fringe science

1 0

[libvirt] [PATCHv2] Fix coverity-reported leak in virSecurityManagerGenLabel
by Ján Tomko 02 Apr '14

02 Apr '14

Coverity complains about a possible leak of seclabel if !sec_managers[i]->drv->domainGenSecurityLabel is true and the seclabel might be overwritten by the next iteration of the loop. This leak should never happen, because every security driver has domainGenSecurityLabel defined. --- v1: 'Remove useless NULL check in virSecurityManagerGenLabel' https://www.redhat.com/archives/libvir-list/2014-April/msg00087.html src/security/security_manager.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/security/security_manager.c b/src/security/security_manager.c index d68c7e9..79edb07 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -514,6 +514,8 @@ int virSecurityManagerGenLabel(virSecurityManagerPtr mgr, if (!sec_managers[i]->drv->domainGenSecurityLabel) { virReportUnsupportedError(); + virSecurityLabelDefFree(seclabel); + seclabel = NULL; } else { /* The seclabel must be added to @vm prior calling domainGenSecurityLabel * which may require seclabel to be presented already */ -- 1.8.3.2

2 2

[libvirt] [PATCH v3] Introduce --without-pm-utils to get rid of pm-is-supported dependency
by Cédric Bosdonnat 02 Apr '14

02 Apr '14

This uses the dbus api of systemd to check the power management capabilities of the node. --- Diff with v2: * Fixed a few dbus call problems configure.ac | 11 +++++++++ libvirt.spec.in | 9 ++++++++ src/libvirt_private.syms | 3 +++ src/util/virnodesuspend.c | 32 +++++++++++++++++++++++++ src/util/virsystemd.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++ src/util/virsystemd.h | 6 +++++ 6 files changed, 120 insertions(+) diff --git a/configure.ac b/configure.ac index 73efffa..807cf0f 100644 --- a/configure.ac +++ b/configure.ac @@ -563,6 +563,10 @@ AC_ARG_WITH([chrdev-lock-files], [location for UUCP style lock files for character devices (use auto for default paths on some platforms) @<:@default=auto@:>@])]) m4_divert_text([DEFAULTS], [with_chrdev_lock_files=auto]) +AC_ARG_WITH([pm-utils], + [AS_HELP_STRING([--with-pm-utils], + [use pm-utils for power management @<:@default=yes@:>@])]) +m4_divert_text([DEFAULTS], [with_pm_utils=yes]) dnl dnl in case someone want to build static binaries @@ -1621,6 +1625,12 @@ fi AM_CONDITIONAL([WITH_PHYP],[test "$with_phyp" = "yes"]) +dnl Should we build with pm-utils support? +if test "$with_pm_utils" = "yes"; then + AC_DEFINE_UNQUOTED([WITH_PM_UTILS], 1, [whether to use pm-utils]) +fi +AM_CONDITIONAL([WITH_PM_UTILS], [test "$with_pm_utils" = "yes"]) + dnl virsh libraries VIRSH_LIBS="$VIRSH_LIBS $READLINE_LIBS" AC_SUBST([VIRSH_LIBS]) @@ -2845,6 +2855,7 @@ AC_MSG_NOTICE([ rbd: $LIBRBD_LIBS]) else AC_MSG_NOTICE([ rbd: no]) fi +AC_MSG_NOTICE([pm-utils: $with_pm_utils]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Test suite]) diff --git a/libvirt.spec.in b/libvirt.spec.in index eab9b23..5c20955 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -132,6 +132,7 @@ %define with_libssh2 0%{!?_without_libssh2:0} %define with_wireshark 0%{!?_without_wireshark:0} %define with_systemd_daemon 0%{!?_without_systemd_daemon:0} +%define with_pm_utils 1 # Non-server/HV driver defaults which are always enabled %define with_sasl 0%{!?_without_sasl:1} @@ -182,6 +183,7 @@ %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 %define with_systemd 1 %define with_systemd_daemon 1 + %define with_pm_utils 0 %endif # Fedora 18 / RHEL-7 are first where firewalld support is enabled @@ -1138,8 +1140,10 @@ Requires: nc Requires: gettext # Needed by virt-pki-validate script. Requires: gnutls-utils +%if %{with_pm_utils} # Needed for probing the power management features of the host. Requires: pm-utils +%{endif} %if %{with_sasl} Requires: cyrus-sasl # Not technically required, but makes 'out-of-box' config @@ -1395,6 +1399,10 @@ driver %define _without_systemd_daemon --without-systemd-daemon %endif +%if ! %{with_pm_utils} + %define _without_pm_utils --without-pm-utils +%endif + %define when %(date +"%%F-%%T") %define where %(hostname) %define who %{?packager}%{!?packager:Unknown} @@ -1471,6 +1479,7 @@ rm -f po/stamp-po %{?_with_firewalld} \ %{?_without_wireshark} \ %{?_without_systemd_daemon} \ + %{?_without_pm_utils} \ %{with_packager} \ %{with_packager_version} \ --with-qemu-user=%{qemu_user} \ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 38fbf63..ce51bdf 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1879,6 +1879,9 @@ virSysinfoSetup; # util/virsystemd.h +virSystemdCanHibernate; +virSystemdCanHybridSleep; +virSystemdCanSuspend; virSystemdCreateMachine; virSystemdMakeMachineName; virSystemdMakeScopeName; diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index 8088931..ba4a338 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -22,6 +22,9 @@ #include <config.h> #include "virnodesuspend.h" +#ifndef WITH_PM_UTILS +# include "virsystemd.h" +#endif #include "vircommand.h" #include "virthread.h" #include "datatypes.h" @@ -260,6 +263,7 @@ int nodeSuspendForDuration(unsigned int target, * * Returns 0 if the query was successful, -1 on failure. */ +#ifdef WITH_PM_UTILS static int virNodeSuspendSupportsTarget(unsigned int target, bool *supported) { @@ -300,6 +304,34 @@ virNodeSuspendSupportsTarget(unsigned int target, bool *supported) virCommandFree(cmd); return ret; } +#else /* ! WITH_PM_UTILS */ +static int +virNodeSuspendSupportsTarget(unsigned int target, bool *supported) +{ + int ret = -1; + + if (virNodeSuspendInitialize() < 0) + return -1; + + *supported = false; + + switch (target) { + case VIR_NODE_SUSPEND_TARGET_MEM: + ret = virSystemdCanSuspend(supported); + break; + case VIR_NODE_SUSPEND_TARGET_DISK: + ret = virSystemdCanHibernate(supported); + break; + case VIR_NODE_SUSPEND_TARGET_HYBRID: + ret = virSystemdCanHybridSleep(supported); + break; + default: + return ret; + } + + return ret; +} +#endif /* WITH_PM_UTILS */ /** * virNodeSuspendGetTargetMask: diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 93b3f9c..d144d12 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -325,3 +325,62 @@ virSystemdNotifyStartup(void) sd_notify(0, "READY=1"); #endif } + +static int +virSystemdPMSupportTarget(const char *methodName, bool *result) +{ + int ret; + DBusConnection *conn; + DBusMessage *message = NULL; + char *response; + + ret = virDBusIsServiceEnabled("org.freedesktop.login1"); + if (ret < 0) + return ret; + + if ((ret = virDBusIsServiceRegistered("org.freedesktop.login1")) < 0) + return ret; + + if (!(conn = virDBusGetSystemBus())) + return -1; + + ret = -1; + + if (virDBusCallMethod(conn, + &message, + NULL, + "org.freedesktop.login1", + "/org/freedesktop/login1", + "org.freedesktop.login1.Manager", + methodName, + NULL) < 0) + return ret; + + if ((ret = virDBusMessageRead(message, "s", &response)) < 0) + goto cleanup; + + *result = STRNEQ("no", response); + + ret = 0; + + cleanup: + dbus_message_unref(message); + VIR_FREE(response); + + return ret; +} + +int virSystemdCanSuspend(bool *result) +{ + return virSystemdPMSupportTarget("CanSuspend", result); +} + +int virSystemdCanHibernate(bool *result) +{ + return virSystemdPMSupportTarget("CanHibernate", result); +} + +int virSystemdCanHybridSleep(bool *result) +{ + return virSystemdPMSupportTarget("CanHybridSleep", result); +} diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h index 7fed456..491c9b7 100644 --- a/src/util/virsystemd.h +++ b/src/util/virsystemd.h @@ -48,4 +48,10 @@ int virSystemdTerminateMachine(const char *name, void virSystemdNotifyStartup(void); +int virSystemdCanSuspend(bool *result); + +int virSystemdCanHibernate(bool *result); + +int virSystemdCanHybridSleep(bool *result); + #endif /* __VIR_SYSTEMD_H__ */ -- 1.8.4.5

4 5

[libvirt] [PATCH] Remove useless NULL check in virSecurityManagerGenLabel
by Ján Tomko 02 Apr '14

02 Apr '14

Every security driver has domainGenSecurityLabel defined. Coverity complains about a possible leak of seclabel if !sec_managers[i]->drv->domainGenSecurityLabel is true and the seclabel might be overwritten by the next iteration of the loop. --- src/security/security_manager.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/src/security/security_manager.c b/src/security/security_manager.c index d68c7e9..24855db 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -512,24 +512,20 @@ int virSecurityManagerGenLabel(virSecurityManagerPtr mgr, } } - if (!sec_managers[i]->drv->domainGenSecurityLabel) { - virReportUnsupportedError(); - } else { - /* The seclabel must be added to @vm prior calling domainGenSecurityLabel - * which may require seclabel to be presented already */ - if (generated && - VIR_APPEND_ELEMENT(vm->seclabels, vm->nseclabels, seclabel) < 0) - goto cleanup; - - if (sec_managers[i]->drv->domainGenSecurityLabel(sec_managers[i], vm) < 0) { - if (VIR_DELETE_ELEMENT(vm->seclabels, - vm->nseclabels -1, vm->nseclabels) < 0) - vm->nseclabels--; - goto cleanup; - } + /* The seclabel must be added to @vm prior calling domainGenSecurityLabel + * which may require seclabel to be presented already */ + if (generated && + VIR_APPEND_ELEMENT(vm->seclabels, vm->nseclabels, seclabel) < 0) + goto cleanup; - seclabel = NULL; + if (sec_managers[i]->drv->domainGenSecurityLabel(sec_managers[i], vm) < 0) { + if (VIR_DELETE_ELEMENT(vm->seclabels, + vm->nseclabels -1, vm->nseclabels) < 0) + vm->nseclabels--; + goto cleanup; } + + seclabel = NULL; } ret = 0; -- 1.8.3.2

3 3

[libvirt] [PATCHv2 0/4] Time setting and getting in qemu guests
by Michal Privoznik 02 Apr '14

02 Apr '14

If we'd come up with a struct to interpret the time, it's written in stone and there's nothing we can do about it. Even if we break up the struct into function arguments. However, we can use typed parameters and have the API extensible. For example, I'm implementing seconds granularity only for now. If later somebody feels like he/she wants to use even finer granularity, we can do that by inventing a new typed param. Same goes for timezone, etc. Michal Privoznik (4): Introduce virDomain{Get,Set}Time APIs remote: Implement remote{Get,Set}Time virsh: Expose virDomain{Get,Set}Time qemu: Implement virDomain{Get,Set}Time daemon/remote.c | 50 +++++++++++++++ include/libvirt/libvirt.h.in | 24 ++++++++ src/access/viraccessperm.c | 2 +- src/access/viraccessperm.h | 7 ++- src/driver.h | 14 +++++ src/libvirt.c | 96 +++++++++++++++++++++++++++++ src/libvirt_public.syms | 6 ++ src/qemu/qemu_agent.c | 95 ++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 6 ++ src/qemu/qemu_driver.c | 139 +++++++++++++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 47 ++++++++++++++ src/remote/remote_protocol.x | 32 +++++++++- src/remote_protocol-structs | 20 ++++++ tools/virsh-domain-monitor.c | 143 +++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 16 +++++ 15 files changed, 694 insertions(+), 3 deletions(-) -- 1.9.0

3 6

Re: [libvirt] RFC: viridentitytest Failure on CentOS 6.5?
by Nehal J Wani 02 Apr '14

02 Apr '14

On Sun, Mar 16, 2014 at 1:28 PM, Nehal J Wani <nehaljw.kkd1(a)gmail.com> wrote: > I followed the following steps to build a clean development version of > libvirt from source. Can't seem to understand what is wrong. (Entire > buildLog has been attached): > > ➜ /tmp cat /etc/issue > CentOS release 6.5 (Final) > Kernel \r on an \m > ➜ /tmp sestatus > SELinux status: enabled > SELinuxfs mount: /selinux > Current mode: enforcing > Mode from config file: enforcing > Policy version: 24 > Policy from config file: targeted > ➜ /tmp git clone git://libvirt.org/libvirt.git > Initialized empty Git repository in /tmp/libvirt/.git/ > remote: Counting objects: 138935, done. > remote: Compressing objects: 100% (21143/21143), done. > remote: Total 138935 (delta 117282), reused 138935 (delta 117282) > Receiving objects: 100% (138935/138935), 137.72 MiB | 559 KiB/s, done. > Resolving deltas: 100% (117282/117282), done. > ➜ /tmp cd libvirt > ➜ libvirt git:(master) ./autogen.sh --system > Running ./configure with --prefix=/usr --sysconfdir=/etc > --localstatedir=/var --libdir=/usr/lib64 > .. > .. > Now type 'make' to compile libvirt. > ➜ libvirt git:(master) make > .. > .. > make[1]: Leaving directory `/tmp/libvirt' > ➜ libvirt git:(master) ✗ cd tests > ➜ tests git:(master) ✗ ./viridentitytest > /tmp/libvirt/tests/.libs/libsecurityselinuxhelper.so: No such file or directory > ➜ tests git:(master) ✗ > > > -- > Nehal J Wani Ping! -- Nehal J Wani

3 4

[libvirt] [PATCH] qemu: cleanup error checking on agent replies
by Martin Kletzander 02 Apr '14

02 Apr '14

On all the places where qemuAgentComand() was called, we did a check for errors in the reply. Unfortunately, some of the places called qemuAgentCheckError() without checking for non-null reply which might have resulted in a crash. So this patch makes the error-checking part of qemuAgentCommand() itself, which: a) makes it look better, b) makes the check mandatory and, most importantly, c) checks for the errors if and only if it is appropriate. This actually fixes a potential crashers when qemuAgentComand() returned 0, but reply was NULL. Having said that, it *should* fix the following bug: https://bugzilla.redhat.com/show_bug.cgi?id=1058149 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_agent.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 27af1be..4c83d7d 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -117,6 +117,8 @@ struct _qemuAgent { qemuAgentEvent await_event; }; +static int qemuAgentCheckError(virJSONValuePtr cmd, virJSONValuePtr reply); + static virClassPtr qemuAgentClass; static void qemuAgentDispose(void *obj); @@ -1009,6 +1011,7 @@ qemuAgentCommand(qemuAgentPtr mon, } } else { *reply = msg.rxObject; + ret = qemuAgentCheckError(cmd, *reply); } } @@ -1277,9 +1280,6 @@ int qemuAgentShutdown(qemuAgentPtr mon, ret = qemuAgentCommand(mon, cmd, &reply, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK); - if (reply && ret == 0) - ret = qemuAgentCheckError(cmd, reply); - virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -1308,8 +1308,7 @@ int qemuAgentFSFreeze(qemuAgentPtr mon) return -1; if (qemuAgentCommand(mon, cmd, &reply, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0 || - qemuAgentCheckError(cmd, reply) < 0) + VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) goto cleanup; if (virJSONValueObjectGetNumberInt(reply, "return", &ret) < 0) { @@ -1346,8 +1345,7 @@ int qemuAgentFSThaw(qemuAgentPtr mon) return -1; if (qemuAgentCommand(mon, cmd, &reply, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0 || - qemuAgentCheckError(cmd, reply) < 0) + VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) goto cleanup; if (virJSONValueObjectGetNumberInt(reply, "return", &ret) < 0) { @@ -1386,9 +1384,6 @@ qemuAgentSuspend(qemuAgentPtr mon, ret = qemuAgentCommand(mon, cmd, &reply, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK); - if (reply && ret == 0) - ret = qemuAgentCheckError(cmd, reply); - virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -1419,9 +1414,6 @@ qemuAgentArbitraryCommand(qemuAgentPtr mon, if ((ret = qemuAgentCommand(mon, cmd, &reply, timeout)) < 0) goto cleanup; - if ((ret = qemuAgentCheckError(cmd, reply)) < 0) - goto cleanup; - if (!(*result = virJSONValueToString(reply, false))) ret = -1; @@ -1449,9 +1441,6 @@ qemuAgentFSTrim(qemuAgentPtr mon, ret = qemuAgentCommand(mon, cmd, &reply, VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK); - if (reply && ret == 0) - ret = qemuAgentCheckError(cmd, reply); - virJSONValueFree(cmd); virJSONValueFree(reply); return ret; @@ -1472,8 +1461,7 @@ qemuAgentGetVCPUs(qemuAgentPtr mon, return -1; if (qemuAgentCommand(mon, cmd, &reply, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0 || - qemuAgentCheckError(cmd, reply) < 0) + VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) goto cleanup; if (!(data = virJSONValueObjectGet(reply, "return"))) { @@ -1581,8 +1569,7 @@ qemuAgentSetVCPUs(qemuAgentPtr mon, cpus = NULL; if (qemuAgentCommand(mon, cmd, &reply, - VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0 || - qemuAgentCheckError(cmd, reply) < 0) + VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) < 0) goto cleanup; if (virJSONValueObjectGetNumberInt(reply, "return", &ret) < 0) { -- 1.9.1

2 3

[libvirt] [PATCH] virsh: man: delete the unexpected character in snapshot-list
by Shanzhi Yu 02 Apr '14

02 Apr '14

--- tools/virsh.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index ba2da20..98d891a 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -3162,7 +3162,7 @@ with I<--current>. =item B<snapshot-list> I<domain> [I<--metadata>] [I<--no-metadata>] [{I<--parent> | I<--roots> | [{I<--tree> | I<--name>}]}] [{[I<--from>] B<snapshot> | I<--current>} [I<--descendants>]] -[I<--leaves>] [I<--no-leaves>] p[I<--inactive>] [I<--active>] +[I<--leaves>] [I<--no-leaves>] [I<--inactive>] [I<--active>] [I<--disk-only>] [I<--internal>] [I<--external>] List all of the available snapshots for the given domain, defaulting -- 1.9.0

3 2

[libvirt] [BUG] xenInotify/keep-alive double-free
by Philipp Hahn 02 Apr '14

02 Apr '14

Hello, There seems to be a double-free bug in libvirt; I've checked libvirt 0.9.12 and 1.2.3: With 0.9.12 xenUnifiedOpen() passes a pointer of "conn" to xenInotifyOpen(), which passes it to virEventAddHandle(...opaque=conn...). After successfully defining a new domain inotify picks up the newly created directory and generates an event, which is processes when virsh already dropped its last public reference to the domain and subsequently already freed the connection. Since *conn is not zero-filled, the data is still valid and usable, but virsh the terminates on double-freeing some internal data. I can reproduce by it doing: virsh undefine $DOM virsh -c xen:// define $DOM.xml For 1.2.3 something similar seems to happen with the keep-alive: $ grep unref ~/BUG/31032_virsh-define-segv.log virUnrefDomain:276 : unref domain 0x7f4ec4003fe0 ucs32-64-segv 1 virReleaseDomain:246 : unref connection 0x917650 2 virUnrefDomain:276 : unref domain 0x934460 ucs32-64-segv 1 virReleaseDomain:246 : unref connection 0x917650 2 virUnrefConnect:145 : unref connection 0x917650 1 virUnrefDomain:276 : unref domain 0x7f4ec4004060 ucs32-64-segv 1 virReleaseDomain:246 : unref connection 0x917650 1 Notice that there are two lines for "unref connection ... 1"! My gut feeling is that libvirt should also increment the reference counter for internal references to delay freeing still used data and add a second counter to track external references, which is used to start closing down things. Comments and ideas welcomed. We're tracking this as <https://forge.univention.org/bugzilla/show_bug.cgi?id=31032> Sincerely Philipp -- Philipp Hahn Open Source Software Engineer Univention GmbH be open. Mary-Somerville-Str. 1 D-28359 Bremen Tel.: +49 421 22232-0 Fax : +49 421 22232-99 hahn(a)univention.de http://www.univention.de/ Geschäftsführer: Peter H. Ganten HRB 20755 Amtsgericht Bremen Steuer-Nr.: 71-597-02876

1 0

[libvirt] [bug?] unix sockets opened via chardev devices not being closed on shutdown
by Chris Friesen 01 Apr '14

01 Apr '14

I have a case where I'm creating a virtio channel between the host and guest using something like this: <channel type="unix"> <source mode="bind" path="/path/in/host/instance_name"/> <target type="virtio" name="name_in_guest"/> </channel> When qemu is started up this gets created as expected, but when qemu is shut down the unix socket is left in the filesystem. It seems to me that libvirt should be deleting this unix socket the same way that it deletes the monitor socket in qemuProcessStop(). Anyone else trying to delete it is going to be subject to race conditions since they can't know whether or not a virtual machine has been (re)created that wants to use the same socket path. Chris

1 0

[libvirt] [PATCH] maint: fix spelling errors in disk pools
by Eric Blake 01 Apr '14

01 Apr '14

Noticed during my work on storage struct cleanups. * src/storage/storage_backend_disk.c (virStorageBackendDiskPartBoundaries): Fix spelling errors. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. Particularly odd that we managed too different ways of mis-spelling partition in the same file! src/storage/storage_backend_disk.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 8d09500..fb7a2a4 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -1,7 +1,7 @@ /* * storage_backend_disk.c: storage backend for disk handling * - * Copyright (C) 2007-2008, 2010-2013 Red Hat, Inc. + * Copyright (C) 2007-2014 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -440,7 +440,7 @@ static int virStorageBackendDiskPartTypeToCreate(virStoragePoolObjPtr pool) { if (pool->def->source.format == VIR_STORAGE_POOL_DISK_DOS) { - /* count primary and extended paritions, + /* count primary and extended partitions, can't be more than 3 to create a new primary partition */ size_t i; int count = 0; @@ -532,10 +532,10 @@ virStorageBackendDiskPartFormat(virStoragePoolObjPtr pool, * partitions */ static int -virStorageBackendDiskPartBoundries(virStoragePoolObjPtr pool, - unsigned long long *start, - unsigned long long *end, - unsigned long long allocation) +virStorageBackendDiskPartBoundaries(virStoragePoolObjPtr pool, + unsigned long long *start, + unsigned long long *end, + unsigned long long allocation) { size_t i; int smallestExtent = -1; @@ -568,7 +568,7 @@ virStorageBackendDiskPartBoundries(virStoragePoolObjPtr pool, the extra bytes we have */ neededSize += cylinderSize; } - /* if we are creating a logical patition, we need one extra + /* if we are creating a logical partition, we need one extra block between partitions (or actually move start one block) */ if (partType == VIR_STORAGE_VOL_DISK_TYPE_LOGICAL) { size -= SECTOR_SIZE; @@ -647,9 +647,9 @@ virStorageBackendDiskCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, } virCommandAddArg(cmd, partFormat); - if (virStorageBackendDiskPartBoundries(pool, &startOffset, - &endOffset, - vol->capacity) != 0) { + if (virStorageBackendDiskPartBoundaries(pool, &startOffset, + &endOffset, + vol->capacity) != 0) { goto cleanup; } -- 1.9.0

1 0

[libvirt] [PATCH] maint: ensure src/ directory includes are clean
by Eric Blake 01 Apr '14

01 Apr '14

In 'make syntax-check', we have a rule that prevents layering violations between the various files in src. However, we forgot to treat conf/ and the more recently-added access/ as lower-level directories, and were not detecting cases where they might have used a driver file. Also, it's not nice that qemu can use storage/ but none of the other drivers could do so. * cfg.mk (sc_prohibit_cross_inclusion): Tighten rules for conf/ and access/, let all other drivers use storage/. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I noticed this because of my work on domain_conf.h: I want to share a struct between util/virstoragefile and conf/domain_conf, and ran into a syntax check when I tried to make util/ depend on conf/. I fixed things to obey layering with conf/ depending on util/, but in the process noticed that some layering violations went undetected. cfg.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cfg.mk b/cfg.mk index a4ae978..19537cf 100644 --- a/cfg.mk +++ b/cfg.mk @@ -760,17 +760,17 @@ sc_prohibit_gettext_markup: # lower-level code must not include higher-level headers. cross_dirs=$(patsubst $(srcdir)/src/%.,%,$(wildcard $(srcdir)/src/*/.)) cross_dirs_re=($(subst / ,/|,$(cross_dirs))) +mid_dirs=access|conf|cpu|locking|network|node_device|rpc|security|storage sc_prohibit_cross_inclusion: @for dir in $(cross_dirs); do \ case $$dir in \ util/) safe="util";; \ - locking/) \ - safe="($$dir|util|conf|rpc)";; \ - cpu/ | locking/ | network/ | rpc/ | security/) \ + access/ | conf/) safe="($$dir|conf|util)";; \ + locking/) safe="($$dir|util|conf|rpc)";; \ + cpu/| network/| node_device/| rpc/| security/| storage/) \ safe="($$dir|util|conf)";; \ xenapi/ | xenxs/ ) safe="($$dir|util|conf|xen)";; \ - qemu/ ) safe="($$dir|util|conf|cpu|network|locking|rpc|security|storage)";; \ - *) safe="($$dir|util|conf|cpu|network|locking|rpc|security)";; \ + *) safe="($$dir|$(mid_dirs)|util)";; \ esac; \ in_vc_files="^src/$$dir" \ prohibit='^# *include .$(cross_dirs_re)' \ -- 1.8.5.3

1 1

[libvirt] [PATCH 0/n] round 2 of storage chain refactoring
by Eric Blake 01 Apr '14

01 Apr '14

In round 1, I split out a new struct in domain_conf.h. This starts round 2: moving the struct into util/virstoragefile.h, so it can be shared by domain, snapshot, and existing virstoragefile backing chain operations. It's turned out to be a bigger process than I first thought, so I've tried splitting it into smaller patches to ease review. I also want to get review started on the parts I have compiling, while still working on the rest of the series, since I know that at least Peter will be heavily impacted by some of the changes in this series. Eric Blake (2): conf: split security label structs to util/ conf: split network host structs to util/ src/Makefile.am | 1 + src/conf/domain_conf.c | 139 +++------------------------------- src/conf/domain_conf.h | 71 +---------------- src/conf/snapshot_conf.c | 5 +- src/conf/snapshot_conf.h | 4 +- src/libvirt_private.syms | 21 ++--- src/qemu/qemu_command.c | 38 +++++----- src/qemu/qemu_command.h | 6 +- src/qemu/qemu_conf.c | 4 +- src/qemu/qemu_driver.c | 24 +++--- src/qemu/qemu_process.c | 2 +- src/security/security_manager.c | 2 +- src/security/security_selinux.c | 2 +- src/storage/storage_backend_gluster.c | 8 +- src/storage/storage_driver.c | 8 +- src/storage/storage_driver.h | 2 +- src/util/virseclabel.c | 82 ++++++++++++++++++++ src/util/virseclabel.h | 67 ++++++++++++++++ src/util/virstoragefile.c | 71 ++++++++++++++++- src/util/virstoragefile.h | 30 +++++++- 20 files changed, 328 insertions(+), 259 deletions(-) create mode 100644 src/util/virseclabel.c create mode 100644 src/util/virseclabel.h -- 1.8.5.3

2 37

[libvirt] [PATCH v2] Introduce --without-pm-utils to get rid of pm-is-supported dependency
by Cédric Bosdonnat 01 Apr '14

01 Apr '14

This uses the dbus api of systemd to check the power management capabilities of the node. --- This replaces the previous pm-utils dropping patch attempt to implement Cole's idea. configure.ac | 11 ++++++++ libvirt.spec.in | 9 +++++++ src/libvirt_private.syms | 3 +++ src/util/virnodesuspend.c | 32 ++++++++++++++++++++++ src/util/virsystemd.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++ src/util/virsystemd.h | 6 +++++ 6 files changed, 129 insertions(+) diff --git a/configure.ac b/configure.ac index 73efffa..807cf0f 100644 --- a/configure.ac +++ b/configure.ac @@ -563,6 +563,10 @@ AC_ARG_WITH([chrdev-lock-files], [location for UUCP style lock files for character devices (use auto for default paths on some platforms) @<:@default=auto@:>@])]) m4_divert_text([DEFAULTS], [with_chrdev_lock_files=auto]) +AC_ARG_WITH([pm-utils], + [AS_HELP_STRING([--with-pm-utils], + [use pm-utils for power management @<:@default=yes@:>@])]) +m4_divert_text([DEFAULTS], [with_pm_utils=yes]) dnl dnl in case someone want to build static binaries @@ -1621,6 +1625,12 @@ fi AM_CONDITIONAL([WITH_PHYP],[test "$with_phyp" = "yes"]) +dnl Should we build with pm-utils support? +if test "$with_pm_utils" = "yes"; then + AC_DEFINE_UNQUOTED([WITH_PM_UTILS], 1, [whether to use pm-utils]) +fi +AM_CONDITIONAL([WITH_PM_UTILS], [test "$with_pm_utils" = "yes"]) + dnl virsh libraries VIRSH_LIBS="$VIRSH_LIBS $READLINE_LIBS" AC_SUBST([VIRSH_LIBS]) @@ -2845,6 +2855,7 @@ AC_MSG_NOTICE([ rbd: $LIBRBD_LIBS]) else AC_MSG_NOTICE([ rbd: no]) fi +AC_MSG_NOTICE([pm-utils: $with_pm_utils]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Test suite]) diff --git a/libvirt.spec.in b/libvirt.spec.in index eab9b23..5c20955 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -132,6 +132,7 @@ %define with_libssh2 0%{!?_without_libssh2:0} %define with_wireshark 0%{!?_without_wireshark:0} %define with_systemd_daemon 0%{!?_without_systemd_daemon:0} +%define with_pm_utils 1 # Non-server/HV driver defaults which are always enabled %define with_sasl 0%{!?_without_sasl:1} @@ -182,6 +183,7 @@ %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 %define with_systemd 1 %define with_systemd_daemon 1 + %define with_pm_utils 0 %endif # Fedora 18 / RHEL-7 are first where firewalld support is enabled @@ -1138,8 +1140,10 @@ Requires: nc Requires: gettext # Needed by virt-pki-validate script. Requires: gnutls-utils +%if %{with_pm_utils} # Needed for probing the power management features of the host. Requires: pm-utils +%{endif} %if %{with_sasl} Requires: cyrus-sasl # Not technically required, but makes 'out-of-box' config @@ -1395,6 +1399,10 @@ driver %define _without_systemd_daemon --without-systemd-daemon %endif +%if ! %{with_pm_utils} + %define _without_pm_utils --without-pm-utils +%endif + %define when %(date +"%%F-%%T") %define where %(hostname) %define who %{?packager}%{!?packager:Unknown} @@ -1471,6 +1479,7 @@ rm -f po/stamp-po %{?_with_firewalld} \ %{?_without_wireshark} \ %{?_without_systemd_daemon} \ + %{?_without_pm_utils} \ %{with_packager} \ %{with_packager_version} \ --with-qemu-user=%{qemu_user} \ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 38fbf63..ce51bdf 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1879,6 +1879,9 @@ virSysinfoSetup; # util/virsystemd.h +virSystemdCanHibernate; +virSystemdCanHybridSleep; +virSystemdCanSuspend; virSystemdCreateMachine; virSystemdMakeMachineName; virSystemdMakeScopeName; diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index 8088931..ba4a338 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -22,6 +22,9 @@ #include <config.h> #include "virnodesuspend.h" +#ifndef WITH_PM_UTILS +# include "virsystemd.h" +#endif #include "vircommand.h" #include "virthread.h" #include "datatypes.h" @@ -260,6 +263,7 @@ int nodeSuspendForDuration(unsigned int target, * * Returns 0 if the query was successful, -1 on failure. */ +#ifdef WITH_PM_UTILS static int virNodeSuspendSupportsTarget(unsigned int target, bool *supported) { @@ -300,6 +304,34 @@ virNodeSuspendSupportsTarget(unsigned int target, bool *supported) virCommandFree(cmd); return ret; } +#else /* ! WITH_PM_UTILS */ +static int +virNodeSuspendSupportsTarget(unsigned int target, bool *supported) +{ + int ret = -1; + + if (virNodeSuspendInitialize() < 0) + return -1; + + *supported = false; + + switch (target) { + case VIR_NODE_SUSPEND_TARGET_MEM: + ret = virSystemdCanSuspend(supported); + break; + case VIR_NODE_SUSPEND_TARGET_DISK: + ret = virSystemdCanHibernate(supported); + break; + case VIR_NODE_SUSPEND_TARGET_HYBRID: + ret = virSystemdCanHybridSleep(supported); + break; + default: + return ret; + } + + return ret; +} +#endif /* WITH_PM_UTILS */ /** * virNodeSuspendGetTargetMask: diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 93b3f9c..d4c1dd3 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -325,3 +325,71 @@ virSystemdNotifyStartup(void) sd_notify(0, "READY=1"); #endif } + +static int +virSystemdPMSupportTarget(const char *methodName, bool *result) +{ + int ret; + DBusConnection *conn; + DBusMessage *message; + char *response; + + ret = virDBusIsServiceEnabled("org.freedesktop.login1"); + if (ret < 0) + return ret; + + if ((ret = virDBusIsServiceRegistered("org.freedesktop.login1")) < 0) + return ret; + + if (!(conn = virDBusGetSystemBus())) + return -1; + + ret = -1; + + /* + * The systemd DBus API we're invoking has the + * following signature + * + * CanSuspend(out s value); + * + * @value one of 'na', 'yes', 'no' or 'challenge' + */ + + if (virDBusCallMethod(conn, + &message, + NULL, + "org.freedesktop.login1", + "/org/freedesktop/login1", + "org.freedesktop.login1.Manager", + methodName, + "") < 0) + goto cleanup; + + if ((ret = virDBusMessageRead(message, "s", &response)) < 0) + goto cleanup; + + *result = STRNEQ("no", response); + + ret = 0; + + cleanup: + dbus_message_unref(message); + VIR_FREE(response); + + return ret; +} + +int virSystemdCanSuspend(bool *result) +{ + return virSystemdPMSupportTarget("CanSuspend", result); +} + +int virSystemdCanHibernate(bool *result) +{ + return virSystemdPMSupportTarget("CanHibernate", result); +} + +int virSystemdCanHybridSleep(bool *result) +{ + return virSystemdPMSupportTarget("CanHybridSleep", result); +} diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h index 7fed456..491c9b7 100644 --- a/src/util/virsystemd.h +++ b/src/util/virsystemd.h @@ -48,4 +48,10 @@ int virSystemdTerminateMachine(const char *name, void virSystemdNotifyStartup(void); +int virSystemdCanSuspend(bool *result); + +int virSystemdCanHibernate(bool *result); + +int virSystemdCanHybridSleep(bool *result); + #endif /* __VIR_SYSTEMD_H__ */ -- 1.8.4.5

2 1

[libvirt] [PATCH v2 0/4] Fix VolOpen error reporting
by Cole Robinson 01 Apr '14

01 Apr '14

In https://bugzilla.redhat.com/show_bug.cgi?id=1080613 , something is causing StorageVolGetXML to fail, but it's not raising any error message. Code inspection found that most users of VolOpen are susceptible to error reporting issues. The first 3 patches are some code reorganization and cleanups that make it easier to identify the VolOpen callers. Patch 4 fixes up the reporting issue. v2: Jan's suggestion to only report an error if caller passed in VOL_OPEN_ERROR Cole Robinson (4): storage: Rename UpdateVolInfoFlags to UpdateVolInfo storage: move block format lookup to shared UpdateVolInfo storage: Rename VolOpenCheckMode to VolOpen storage: Report error from VolOpen if proper flag is passed src/storage/storage_backend.c | 260 ++++++++++++++++++---------------- src/storage/storage_backend.h | 18 +-- src/storage/storage_backend_disk.c | 3 +- src/storage/storage_backend_fs.c | 25 ++-- src/storage/storage_backend_logical.c | 11 +- src/storage/storage_backend_mpath.c | 36 +---- src/storage/storage_backend_scsi.c | 43 +----- 7 files changed, 175 insertions(+), 221 deletions(-) -- 1.8.5.3

4 13

[libvirt] [PATCH 0/6] Gluster pool lookup and few gluster related fixes
by Peter Krempa 01 Apr '14

01 Apr '14

Peter Krempa (6): storage: pool: Fix XML indentation in pool source lookup storage: netfs: Split up and tidy up NFS storage pool source function storage: netfs: Support lookup of glusterfs pool sources storage: gluster: Implement storage pool lookup storage: gluster: Fix crash when initialization of storage backend fails util: storagefile: Don't pursue backing chain of NULL image configure.ac | 6 +++ src/conf/storage_conf.c | 2 + src/storage/storage_backend.c | 86 +++++++++++++++++++++++++++++++++++ src/storage/storage_backend.h | 4 ++ src/storage/storage_backend_fs.c | 54 ++++++++++++++-------- src/storage/storage_backend_gluster.c | 56 ++++++++++++++++++++++- src/util/virstoragefile.c | 2 +- 7 files changed, 187 insertions(+), 23 deletions(-) -- 1.9.1

3 19

[libvirt] Release of libvirt-1.2.3
by Daniel Veillard 01 Apr '14

01 Apr '14

So as scheduled, libvirt-1.2.3 release is ready, it is tagged in git and the tarball and rpms are available at the usual place: ftp://libvirt.org/libvirt/ This release is rather large in the number of commits (more than 400) but includes a lot of changes made to clean up the code base. there is still a fair amount of improvements and a few notable features, and as usual a number of bug fixes :) . To be noted the large improvements on the Xen driver and the bhyve driver for BSD ! Features: - add new virDomainCoreDumpWithFormat API (Qiao Nuohan) - conf: Introduce virDomainDeviceGetInfo API (Jiri Denemark) - more features and fixes on bhyve driver (Roman Bogorodskiy) - lot of cleanups and improvement on the Xen driver (Chunyan Liu, Jim Fehlig) Documentation: - virsh: man: Fix spelling of parameters for --memspec in snapshot-create-as (Shanzhi Yu) - util: fix a typo in virprocess.c and d (Hongwei Bi) - cgroups: fix typo about LXC cgroups (Jean-Baptiste Rouault) - daemon: Enhance documentation for changing NOFILE limit (Jiri Denemark) - domiftune: Reword bandwidth clearing paragraph (Michal Privoznik) - conf: consistent comments about disk enum usage (Eric Blake) - qemu.conf: Mention virtlockd in @lock_manager description (Michal Privoznik) - add VMmanager to web apps (Martin Kletzander) - storage: Explicitly state that it's possible to have non-unique key (Peter Krempa) - typo fix (Roman Bogorodskiy) Portability: - Prohibit Windows special chars in filenames (Matthias Bolte) - tests: Fix SCSI test data filenames for Windows (Matthias Bolte) - apparmor: Fix build after split of disk source metadata (Peter Krempa) - Fix build on mingw32 (Ján Tomko) - build: Fix build with old automake (Jiri Denemark) - Fix build with qemu driver disabled (Roman Bogorodskiy) - Fix type mismatch of virNetDev*NetConfig on non-Linux (Ján Tomko) - virIdentityGetSystem: don't fail if SELinux is disabled (Michael Chapman) Bug Fixes: - build: fix syntax-check for storage_backend (Martin Kletzander) - gluster: Fix "key" attribute for gluster volumes (Peter Krempa) - Fix Memory Leak in testMessageArrayRef() (Nehal J Wani) - virsh: fix 'help event' (Eric Blake) - bhyve: don't leak tap devices on failures (Roman Bogorodskiy) - storage: gluster: Fix crash when initialization of storage backend fails (Peter Krempa) - Fix virNodeDeviceListCaps always returns empty (Jincheng Miao) - Create hostdevmgr in UserRuntimeDirectory for session libvirt (Ján Tomko) - Remove double free in virHostdevManagerDispose (Ján Tomko) - Fix apparmor profile to make vfio pci passthrough work (Cédric Bosdonnat) - Fixed regression in apparmor profiles for qemu brought by 43c030f (Cédric Bosdonnat) - Fix Memory Leak in virQEMUCapsInitGuestFromBinary() (Nehal J Wani) - Fix memory leak in testGetCaps() (Nehal J Wani) - network: fix problems with SRV records (Laine Stump) - Free groups in case of a partial match (Ján Tomko) - qemuDomainAttachDeviceFlags: Parse device xml as inactive (Michal Privoznik) - Coverity: Resolve a RESOURCE_LEAK (John Ferlan) - Coverity: Resolve a FORWARD_NULL (John Ferlan) - Coverity: Resolve a CHECKED_RETURN message (John Ferlan) - bhyve: don't fail on busy tap devices (Roman Bogorodskiy) - libxl: Create log directory earlier (Stefan Bader) - sanlock: Forbid VIR_DOMAIN_LOCK_FAILURE_RESTART (Jiri Denemark) - sanlock: Forbid VIR_DOMAIN_LOCK_FAILURE_IGNORE (Jiri Denemark) - vmware: fix parse of disk source (Eric Blake) - qemuDomainGetImageIds: Skip <seclabel/> without label (Michal Privoznik) - cgroup: Fix start VMs coincidently failed (Wang Yufei) - Remove bogus call to dbus_set_error_from_message (Daniel P. Berrange) - Remove bogus unref in virDBusMessageRead (Daniel P. Berrange) - Check boot order on device attach (Jiri Denemark) - qemu: Return meaningful error when qemu dies early (Jiri Denemark) - Ignore missing files on pool refresh (Ján Tomko) - Ignore char devices in storage pools by default (Ján Tomko) - is_selinux_enabled() returns -1 on error, account for this. (Scott Sullivan) - Fix unitialized data in virSocketAddrMask (Daniel P. Berrange) - Fix virQEMUCapsLoadCache leaks (Ján Tomko) - virNetClientSetTLSSession: Restore original signal mask (Michal Privoznik) - nwfilter: Fix double free of pointer (Stefan Berger) - build: Make sure src/util/virprobe.h is distributed (Jiri Denemark) - qemuhotplugtest: Fix mem-leaking testcases (Nehal J Wani) - build: Fix make distcheck (Martin Kletzander) - virNetServerNewPostExecRestart: Initialize @max_anonymous_clients (Michal Privoznik) - Fix memory leak in virDomainChrSourceDefClear() (Nehal J Wani) - Fix memory leak in virDomainSnapshotDiskDefClear() (Nehal J Wani) - bhyve: allow to destroy only active domains (Roman Bogorodskiy) - Fix leak on OOM when creating nwfilter rule instances (Daniel P. Berrange) - Avoid warning message from libxl driver on non-Xen kernels (Daniel P. Berrange) - Fix mistakes in checking return values (Daniel P. Berrange) - Fix issue found by coverity and cleanup (Pavel Hrdina) - XMLToNative: Parse XML as INACTIVE (Cole Robinson) - qemu: XMLToNative: Don't open vhostfd (Cole Robinson) - qemu: XMLToNative: Don't show -S (Cole Robinson) - qemu: cleanup tap devices on FreeBSD (Roman Bogorodskiy) - openvzRegister: Check for error return (John Ferlan) - nwfilter: Fix rule priority problem (Stefan Berger) - hotplug:Fix log mistake in qemuMonitorAddNetdev (Wang Rui) - libxl: Check for control_d string to decide about dom0 (Stefan Bader) - vircrypto: fix Invalid write in virCryptoHashString() (Nehal J Wani) - Load CPU map from builddir when run uninstalled (Jiri Denemark) - nwfilter: Add missing goto err_exit in error path (Stefan Berger) - Fix sec label setup when attaching to QEMU processes (Daniel P. Berrange) - storage: Fix bugs in VIR_APPEND_ELEMENT series (John Ferlan) - Remove broken error reporting in QEMU mac filtering (Daniel P. Berrange) - BZ1072677: Avoid freeing of 0 file descriptor (Stefan Berger) - Add a mutex to serialize updates to firewall (Daniel P. Berrange) - Fix locking in virsh console (Roman Bogorodskiy) - qemu: Reject unsupported tuning in session mode (Martin Kletzander) - virt-login-shell: silence coverity warning (Eric Blake) - Fix missing char dev lock path case in configure (Roman Bogorodskiy) - storage: Error out when attempting to vol-upload into a remote pool (Peter Krempa) - build: fix cppi warning (Eric Blake) - nwfilter: Increase buffer size for libpcap (Stefan Berger) Improvements: - storage: Rename VolOpenCheckMode to VolOpen (Cole Robinson) - storage: move block format lookup to shared UpdateVolInfo (Cole Robinson) - storage: Rename UpdateVolInfoFlags to UpdateVolInfo (Cole Robinson) - util: storagefile: Don't pursue backing chain of NULL image (Peter Krempa) - storage: pool: Fix XML indentation in pool source lookup (Peter Krempa) - ESX: Add support for virtualHW version 10 (Dawid Zamirski) - Modify help information of virsh list command (Li Yang) - bhyve: add domainLookupByID (Wojciech Macek) - bhyve: add xml2args unittest (Roman Bogorodskiy) - Move virBhyveTapGetRealDeviceName to virnetdevtap (Roman Bogorodskiy) - Shift the for loop over matched vars by one (Ján Tomko) - Use VIR_STRNDUP instead of modifying the matched string (Ján Tomko) - Simplify the loop in virCommandRunRegex (Ján Tomko) - Remove useless 'maxReg' variable (Ján Tomko) - qemu: add unit tests for the capabilities xml (Francesco Romani) - qemu: extract guest capabilities initialization (Francesco Romani) - qemu: export disk snapshot support in capabilities (Francesco Romani) - Show the real cpu shares value in live XML (Ján Tomko) - Treat zero cpu shares as a valid value (Ján Tomko) - qemu: remove redundant virQEMUDriverGetConfig (Tomoki Sekiyama) - Add a rule for indenting labels (Ján Tomko) - Indent top-level labels by one space in tools/ (Ján Tomko) - Indent top-level labels by one space in tests/ (Ján Tomko) - Indent top-level labels by one space in the rest of src/ (Ján Tomko) - Indent top-level labels by one space in src/xen/ (Ján Tomko) - Indent top-level labels by one space in src/vbox/ (Ján Tomko) - Indent top-level labels by one space in src/util/ (Ján Tomko) - Indent top-level labels by one space in src/test/ (Ján Tomko) - Indent top-level labels by one space in src/storage/ (Ján Tomko) - Indent top-level labels by one space in src/rpc/ (Ján Tomko) - Indent top-level labels by one space in src/remote/ (Ján Tomko) - Indent top-level labels by one space in src/qemu/ (Ján Tomko) - Indent top-level labels by one space in src/parallels/ (Ján Tomko) - Indent top-level labels by one space in src/nwfilter/ (Ján Tomko) - Indent top-level labels by one space in src/network/ (Ján Tomko) - Indent top-level labels by one space in src/lxc/ (Ján Tomko) - Indent top-level labels by one space in src/locking/ (Ján Tomko) - Indent top-level labels by one space in libvirt.c (Ján Tomko) - Indent top-level labels by one space in src/libxl/ (Ján Tomko) - Indent top-level labels by one space in src/esx/ (Ján Tomko) - Indent top-level labels by one space in src/cpu/ (Ján Tomko) - Indent top-level labels by one space in src/conf/ (Ján Tomko) - Indent top-level labels by one space in examples/ (Ján Tomko) - Indent top-level labels by one space in daemon/ (Ján Tomko) - util: Sanitize ATTRIBUTE_NONNULL use in viriscsi.h (Peter Krempa) - maint: update to latest gnulib (Eric Blake) - allow "virsh dump --memory-only" specify dump format (Qiao Nuohan) - qemu: add support for virDomainCoreDumpWithFormat API (Qiao Nuohan) - qemu: add qemuMonitorGetDumpGuestMemoryCapability (Qiao Nuohan) - conf: prepare to track multiple host source files per <disk> (Eric Blake) - conf: use disk source accessors in xenxs/ (Eric Blake) - conf: use disk source accessors in xen/ (Eric Blake) - conf: use disk source accessors in vmx/ (Eric Blake) - conf: use disk source accessors in vmware/ (Eric Blake) - conf: use disk source accessors in vbox/ (Eric Blake) - conf: use disk source accessors in uml/ (Eric Blake) - conf: use disk source accessors in security/ (Eric Blake) - conf: use disk source accessors in qemu/ (Eric Blake) - conf: use disk source accessors in phyp/ (Eric Blake) - conf: use disk source accessors in parallels/ (Eric Blake) - conf: use disk source accessors in lxc/ (Eric Blake) - conf: use disk source accessors in locking/ (Eric Blake) - conf: use disk source accessors in libxl/ (Eric Blake) - conf: use disk source accessors in esx/ (Eric Blake) - conf: use disk source accessors in bhyve/ (Eric Blake) - conf: use disk source accessors in conf/ (Eric Blake) - conf: accessors for common source information (Eric Blake) - bhyve: add domainCreateWithFlags support (Roman Bogorodskiy) - bhyve: MAC address configuration (Wojciech Macek) - libxl_driver.c: cleanup code (Chunyan Liu) - Introduce virFDStreamOpenPTY (Roman Bogorodskiy) - Add stubs for virDBusCreateReply{,V} (Ján Tomko) - libvirt support to force convergence of live guest migration (Chegu Vinod) - Allow caller to handle DBus error messages (Daniel P. Berrange) - Introduce alternate way to encode/decode arrays in DBus messages (Daniel P. Berrange) - Add DBus helper methods for creating reply messages (Daniel P. Berrange) - Refactor dbus helper methods for method calls (Daniel P. Berrange) - virlog: Modify virLogParseDefaultPriority's comment of return value (Zhou Yimin) - Fix typo in configure.ac (Ján Tomko) - Define ISCSIADM unconditionally (Ján Tomko) - Pass action to virDomainDefCompatibleDevice (Jiri Denemark) - Fix usage of virDomainDefCompatibleDevice (Jiri Denemark) - tests: Set abs_*dir in a consistent way (Jiri Denemark) - qemu: allow filtering events by regex (Eric Blake) - qemu: enable monitor event filtering by name (Eric Blake) - qemu: enable monitor event reporting (Eric Blake) - qemu: wire up RPC for qemu monitor events (Eric Blake) - qemu: create object for qemu monitor events (Eric Blake) - qemu: virsh wrapper for qemu events (Eric Blake) - qemu: new API for tracking arbitrary monitor events (Eric Blake) - Fix indentation in iscsi storage backend (Ján Tomko) - Add test for virISCSIScanTargets (Ján Tomko) - Add test for virISCSIGetSession (Ján Tomko) - Move functions using iscsiadm to viriscsi.c (Ján Tomko) - Remove storage pool from the arguments of a few functions (Ján Tomko) - Don't create iscsiadm command line in ISCSIPool{Start,Stop} (Ján Tomko) - Switch virCommandRunRegex to use virStringSplit (Ján Tomko) - Move virStorageBackendRun to vircommand (Ján Tomko) - Sort includes in storage_backend_iscsi.c (Ján Tomko) - Require K&R styled curly braces around function bodies (Martin Kletzander) - Use K&R style for curly braces in remaining files (Martin Kletzander) - Use K&R style for curly braces in src/vbox/ (Martin Kletzander) - Use K&R style for curly braces in src/network/bridge_driver.c (Martin Kletzander) - Use K&R style for curly braces in src/lxc/lxc_driver.c (Martin Kletzander) - Use K&R style for curly braces in src/uml/ (Martin Kletzander) - Use K&R style for curly braces in src/test/test_driver.c (Martin Kletzander) - Use K&R style for curly braces in src/nwfilter/ (Martin Kletzander) - Use K&R style for curly braces in src/openvz/ (Martin Kletzander) - Use K&R style for curly braces in src/storage/ (Martin Kletzander) - Use K&R style for curly braces in src/qemu/ (Martin Kletzander) - Use K&R style for curly braces in src/conf/ (Martin Kletzander) - Use K&R style for curly braces in src/rpc/ (Martin Kletzander) - Use K&R style for curly braces in src/util/ (Martin Kletzander) - Use K&R style for curly braces in src/xen*/ (Martin Kletzander) - Use K&R style for curly braces in tests/ (Martin Kletzander) - bhyve: host API support (Wojciech Macek) - libxl: move domain event handler to libxl_domain (Jim Fehlig) - libxl: include a pointer to the driver in libxlDomainObjPrivate (Jim Fehlig) - libxl: move libxlVmStart to libxl_domain (Jim Fehlig) - libxl: move libxlFreeMem to libxl_domain (Jim Fehlig) - libxl: move libxlDomainSetVcpuAffinities to libxl_domain (Jim Fehlig) - libxl: move libxlDoNodeGetInfo to libxl_conf (Jim Fehlig) - libxl: move libxlDomainAutoCoreDump to libxl_domain (Jim Fehlig) - libxl: move libxlDomEventsRegister to libxl_domain (Jim Fehlig) - libxl: move libxlVmCleanup{,Job} to libxl_domain (Jim Fehlig) - libxl: move libxlSaveImageOpen to libxl_domain (Jim Fehlig) - libxl: move libxlDomainManagedSavePath to libxl_domain (Jim Fehlig) - libxl: move libxlDomainEventQueue to libxl_domain (Jim Fehlig) - Add ability to register callback for virCommand dry run (Daniel P. Berrange) - Change CMD_STOPONERR(1) to use true (Daniel P. Berrange) - Change 'int isTempChain' to bool in nwfilter (Daniel P. Berrange) - Remove pointless return values in nwfilter methods (Daniel P. Berrange) - Remove 'int stopOnError' parameters in nwfilter methods (Daniel P. Berrange) - Remove pointless brackets around boolean (Daniel P. Berrange) - Change 'int incoming' to 'bool incoming' in nwfilter code (Daniel P. Berrange) - virhostdev.h: remove ATTRIBUTE_NONNULL from oldStateDir (Chunyan Liu) - libxl: fix framebuffer port setting for HVM domains (Jim Fehlig) - maint: avoid unbalanced {} across vbox #ifdef (Eric Blake) - Remove global log buffer feature entirely (Daniel P. Berrange) - Switch to filtering based on log source name instead of filename (Daniel P. Berrange) - Add virLogSource variables to all source files (Daniel P. Berrange) - Turn virLogSource into a struct instead of an enum (Daniel P. Berrange) - Move dtrace probe macros into separate header file (Daniel P. Berrange) - Refactor code that skips logging of error messages (Daniel P. Berrange) - Reduce performance overhead of the global log buffer (Daniel P. Berrange) - qemuDomainSetInterfaceParameters: Allow bandwidth clear out (Michal Privoznik) - cfg.mk: Fix whitespaces (Martin Kletzander) - Remove double space in file name comment check (Ján Tomko) - Explicitly cast some switch parameters to enum (Martin Kletzander) - Require spaces around equality comparisons (Martin Kletzander) - Remove duplicate network model characters (Martin Kletzander) - tests: cleanup object-locking test (Martin Kletzander) - qemu: agent availability cleanup (Martin Kletzander) - virsh: Prohibit virConnectOpen* functions in virsh (Martin Kletzander) - virsh: Add keepalive in new vshConnect function (Martin Kletzander) - virt-aa-helper: handle 9pfs (Felix Geyer) - Give virNWFilterVarCombIterNext saner semantics (Daniel P. Berrange) - bhyve: fix hostbridge device command generation (Roman Bogorodskiy) - bhyve: add support for virtio block devices (Roman Bogorodskiy) - Enforce attribute check of the virRegister functions (Pavel Hrdina) - daemon: Introduce max_anonymous_clients (Michal Privoznik) - virNetServer: Introduce unauth clients counter (Michal Privoznik) - datatypes: Fix comments (Michael Chapman) - bhyve: implement nodeGetInfo() (Roman Bogorodskiy) - Add parameter to wait for lock in file locking APIs (Nehal J Wani) - spec: move some dirs into appropriate subpackages (Michael Chapman) - build: detect/prohibit hardcoded XML indent in syntax-check (Laine Stump) - conf: eliminate hardcoded indentation in all remaining xml (Laine Stump) - qemu: elminate hardcoded indent in capabilities cache XML (Laine Stump) - util: eliminate hardcoded indent in virConnectSysInfo formatting (Laine Stump) - qemu: eliminate hardcoded indent from migration cookie xml (Laine Stump) - virsh: eliminate hardcoded indentation in xml generated for commands (Laine Stump) - conf: eliminate hardcoded indent in volume/pool xml (Laine Stump) - conf: eliminate hardcoded indentation in node device xml (Laine Stump) - conf: eliminate hardcoded indentation in capabilities xml (Laine Stump) - conf: eliminate hardcoded indentation in nwfilter xml (Laine Stump) - conf: eliminate outmoded/odd indent method from interface xml (Laine Stump) - conf: eliminate hardcoded indent from network xml (Laine Stump) - conf: eliminate hardcoded indent from domain snapshot xml (Laine Stump) - conf: eliminate hardcoded indent from domain xml (Laine Stump) - nwfilter: Add ARP src/dst IP mask for ebtables ARP (Stefan Berger) - hostdev: add virObject field to virHostdevManager struct (Jim Fehlig) - Make ABI stability issue easier to debug (Jiri Denemark) - qemu: Forbid "sgio" support for SCSI generic host device (Osier Yang) - add pci passthrough to libxl driver (Chunyan Liu) - add hostdev pci backend type for xen (Chunyan Liu) - change lxc_hostdev.c to use virhostdev common library APIs (Chunyan Liu) - add unit test for new virhostdev common library (Chunyan Liu) - Add parameter checks/annotations to hostdev APIs (Chunyan Liu) - add 3 wrapper functions for prepare/reattach/update domain hostdevs (Chunyan Liu) - improve virHostdevUpdate* parameters to make it more widely used (Chunyan Liu) - Capitalize USB, PCI and SCSI in hostdev variables (Daniel P. Berrange) - Remove redundant duplicated 'Hostdev' string method names (Daniel P. Berrange) - Capitalize USB, PCI and SCSI in hostdev methods (Chunyan Liu) - Fixed const-ness of parameters in netdev/hostdev code (Daniel P. Berrange) - improve parameter name to let it more meaningful (Chunyan Liu) - move virHostdevNodeDevice* to virhostdev.c (Chunyan Liu) - extract general code of NodeDeviceReset (Chunyan Liu) - extract general code of NodeDeviceReAttach (Chunyan Liu) - extract general code of NodeDeviceDetach (Chunyan Liu) - move virHostdevReAttachHostScsiDevices to virhostdev.c (Chunyan Liu) - pass driver name as parameter to virHostdevReAttachScciHostdevs (Chunyan Liu) - extract general code from qemuDomainReAttachHostScsiDevices (Chunyan Liu) - move virHostdevReAttachUsbHostdevs to virhostdev.c (Chunyan Liu) - pass driver name as paramter to virHostdevReAttachUsbHostdevs (Chunyan Liu) - extract general code from qemuDomainReAttachHostUsbDevices (Chunyan Liu) - move virHostdevPrepareHostSCSIDevices to virhostdev.c (Chunyan Liu) - pass driver name as parameter to virHostdevPrepareSCSIDevices (Chunyan Liu) - extract general code from qemuPrepareHostSCSIDevices (Chunyan Liu) - move virHostdevPrepareHostUSBDevices to virhostdev.c (Chunyan Liu) - pass driver name to virHostdevPrepareUSBDevices (Chunyan Liu) - rename qemu*USBDevices to virHostdev*USBDevices (Chunyan Liu) - extract general code from qemuPrepareHostUSBDevices (Chunyan Liu) - move virHostdevUpdate* functions to virhostdev.c (Chunyan Liu) - pass driver_name as parameter of virHostdevUpdate*Hostdevs functions (Chunyan Liu) - extract general code from qemuUpdateActiveScsiHostdevs (Chunyan Liu) - extract general code from qemuUpdateActiveUsbHostdevs (Chunyan Liu) - extract general code from qemuUpdateActivePciHostdevs (Chunyan Liu) - move virHostdevPrepare(ReAttach)PCIDevices to virhostdev.c (Chunyan Liu) - rename qemuReAttachPciDevice to virHostdevReAttachPciDevice (Daniel P. Berrange) - Conditionally wait for kvm_assigned_device cleanup (Chunyan Liu) - pass driver name as a parameter to virHostdevReAttachPCIDevices (Chunyan Liu) - extract general code from qemuDomainReAttachHostdevDevices (Chunyan Liu) - pass driver name as a parameter to virHostdevPrepareHostdevPCIDevices (Chunyan Liu) - rename qemuGet*PciHostDeviceList to virHostdevGet*PciHostDeviceList (Chunyan Liu) - rename qemu*NetConfigRestore/Replace to virHostdevNetConfigRestore/Replace (Chunyan Liu) - extract general code from qemuPrepareHostdevPCIDevices (Chunyan Liu) - qemu_hostdev: move netconfig file location to virhostdev stateDir (Chunyan Liu) - qemu_hostdev: move ColdBoot as a flag (Chunyan Liu) - qemu_hostdev: move cfg->relaxedACS as a flag (Chunyan Liu) - lxc: use general virhostdev lists instead of its own (Chunyan Liu) - qemu: use general virhostdev lists instead of its own (Chunyan Liu) - qemu: remove functions used internally only from qemu_hostdev.h (Chunyan Liu) - qemu: reuse hostdev interfaces to avoid duplicate (Chunyan Liu) - update qemuPrepareHostUSBDevices parameters to keep consistency (Chunyan Liu) - virhostdev: use virObject to virHostdevManager to keep reference (Chunyan Liu) - Introduce vircommandpriv.h for functions used by tests (Ján Tomko) - Use size_t for ndevice in pool source definition (Ján Tomko) - Introduce virStoragePoolSourceDeviceClear (Ján Tomko) - Change virStorageBackendISCSISession 'probe' arg to bool (Ján Tomko) - qemu: don't munge user input during block commit (Eric Blake) - iptables: don't log command probe failures (Eric Blake) - libxl: support sexpr in native to XML conversion (Jim Fehlig) - Remove unused ebtablesRemoveForwardPolicyReject method (Daniel P. Berrange) - Remove worthless ebtRules data structure (Daniel P. Berrange) - Remove data structure holding list of ebtables rules (Daniel P. Berrange) - Remove unused variables from ebtablesContext (Daniel P. Berrange) - Make ebtablesForwardPolicyReject static (Daniel P. Berrange) - Remove decl of method which doesn't exist in virebtables.h (Daniel P. Berrange) - Remove many decls from bridge driver platform header (Daniel P. Berrange) - Cache result of QEMU capabilities extraction (Daniel P. Berrange) - Change QEMU capabilities cache to check ctime instead of mtime (Daniel P. Berrange) - Add helper APIs to track if libvirtd or loadable modules have changed (Daniel P. Berrange) - virSecurityDACSetSecurityImageLabel: Unmark @def as unused (Michal Privoznik) - tests: Distribute securityselinuxhelperdata (Jiri Denemark) - Convert lock driver plugins to use new crypto APIs (Daniel P. Berrange) - Add helper APIs for generating cryptographic hashes (Daniel P. Berrange) - Change file names in comments to match the files they are in (Ján Tomko) - Wildcard ignore tests/*test instead of listing every one (Daniel P. Berrange) - src/xenxs: Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT (Michal Privoznik) - src/xen: Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT (Michal Privoznik) - src/util: Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT (Michal Privoznik) - src/test: Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT (Michal Privoznik) - src/storage: Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT (Michal Privoznik) - src/rpc: Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT (Michal Privoznik) - src/qemu: Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT (Michal Privoznik) - src/phyp: Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT (Michal Privoznik) - src/parallels: Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT (Michal Privoznik) - src/openvz: Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT (Michal Privoznik) - src/nwfilter: Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT (Michal Privoznik) - src/lxc/: Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT (Michal Privoznik) - conf: Utilize more of VIR_(APPEND|INSERT|DELETE)_ELEMENT (Michal Privoznik) - virsh: Sort options alphabetically (Martin Kletzander) - tests: Fix SELinux tests in VPATH build (Jiri Denemark) - virscsi: Introduce virSCSIDeviceUsedByInfoFree (John Ferlan) - tests: Test virIdentityGetSystem (Michael Chapman) - tests: SELinux tests do not need to be skipped (Michael Chapman) - tests: Flesh out securityselinuxhelper (Michael Chapman) - spec: Let translations be properly updated (Jiri Denemark) - datatypes: update comments of Dispose functions (Michael Chapman) - qemu: monitor: Provide more information in generic block job error (Peter Krempa) - storage: Don't lie about path used to look up in error message (Peter Krempa) - storage: Avoid mangling paths of non-local filesystems when looking up (Peter Krempa) - storage: Use cleanup label instead of out (Peter Krempa) - virsh: volume: Fix lookup of volumes to provide better error messages (Peter Krempa) - add virhostdev files to maintain global state of host devices (Chunyan Liu) - add 'driver' info to used_by (Chunyan Liu) - apparmor: handle "none" type (Cédric Bosdonnat) - add support for apparmor in lxc-enter-namespace (Cédric Bosdonnat) - apparmor: add debug traces when changing profile. (Cédric Bosdonnat) - Make sure apparmor is started before libvirtd (Cédric Bosdonnat) - LXC driver: generate apparmor profiles for guests (Cédric Bosdonnat) - qemu: monitor: Fix error message and comment when getting cpu info (Peter Krempa) - qemu: snapshot: Use better check when reverting external snapshots (Peter Krempa) - qemuBuildNicDevStr: Adapt to new advisory on multiqueue (Michal Privoznik) - Check if systemd is running before creating machines (Ján Tomko) - Split out most of virDBusIsServiceEnabled (Ján Tomko) - Don't always skip virportallocatortest (Ján Tomko) - tests: Create privileged driver config in qemuxml2argvtest (Martin Kletzander) - build: Include sys/wait.h in commandtest.c (Ján Tomko) - nwfilter: Display the pcap errror message (Stefan Berger) - nwfilter: Cap the poll timeout in the DHCP Snooping code (Stefan Berger) - virsh: report exit status of failed lxc-enter-namespace (Eric Blake) - virt-login-shell: saner exit value (Eric Blake) - virt-login-shell: use single instead of double fork (Eric Blake) - virFork: simplify semantics (Eric Blake) - util: make it easier to grab only regular command exit (Eric Blake) - util: make it easier to grab only regular process exit (Eric Blake) - util: preserve exit status from mount namespace callback (Eric Blake) - util: make it easier to reflect child exit status (Eric Blake) - virFork: give specific status on failure prior to exec (Eric Blake) - nwfilter: make ignoring non-zero status easier to follow (Eric Blake) - qemu: Implement a stub cpuArchDriver.baseline() handler for arm (Oleg Strikov) - Fix indentation in virsystemdmock (Ján Tomko) - Replace space with a tab in the Makefile (Ján Tomko) - Add a test for virUSBDeviceList functions (Ján Tomko) - Add tests for virUSBDeviceFind functions (Ján Tomko) - Generate a unique journald log for QEMU capabilities failure (Daniel P. Berrange) - Bump version to 1.2.3 for new dev cycle (Michal Privoznik) Cleanups: - util: remove useless comment for virCgroupMoveTask in vircgroup.c (Hongwei Bi) - Don't leave empty first line in C source files (Martin Kletzander) Thanks everybody for contributing to this release, be it with bug reports, patches, ideas, code reviews and help on localization ! Enjoy ! Daniel P.S.: for those looking for the April Fool part, don't worry that corner of the internet is still sane even today :) -- 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] Introduce virConnectCrashDaemon API
by Ján Tomko 01 Apr '14

01 Apr '14

This reduces the affect of an unexpected DoS vulnerablity in libvirtd. --- include/libvirt/libvirt.h.in | 13 +++++++++++++ src/driver.h | 5 +++++ src/libvirt.c | 32 +++++++++++++++++++++++++++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 4 ++++ src/qemu/qemu_driver.c | 16 ++++++++++++++++ src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 15 ++++++++++++++- src/util/virutil.c | 23 ++++++++++++++++++++++ src/util/virutil.h | 1 + tools/virsh-host.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 11 files changed, 155 insertions(+), 1 deletion(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 930b7e8..d0db483 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1540,6 +1540,19 @@ char * virConnectGetURI (virConnectPtr conn); char * virConnectGetSysinfo (virConnectPtr conn, unsigned int flags); +typedef enum { + VIR_CONNECT_CRASH_RANDOM = 0, /* Randomly choose one crash method */ + VIR_CONNECT_CRASH_NULL_PTR = 1, /* Null pointer access */ + VIR_CONNECT_CRASH_DOUBLE_FREE = 2, /* Double free */ + +# ifdef VIR_ENUM_SENTINELS + VIR_CONNECT_CRASH_LAST +# endif +} virConnectCrashFlags; + +int virConnectCrashDaemon (virConnectPtr conn, + unsigned int flags); + int virConnectSetKeepAlive(virConnectPtr conn, int interval, unsigned int count); diff --git a/src/driver.h b/src/driver.h index e66fc7a..b899a4f 100644 --- a/src/driver.h +++ b/src/driver.h @@ -1149,6 +1149,10 @@ typedef int unsigned int flags, int cancelled); +typedef int +(*virDrvConnectCrashDaemon)(virConnectPtr conn, + unsigned int flags); + typedef struct _virDriver virDriver; typedef virDriver *virDriverPtr; @@ -1363,6 +1367,7 @@ struct _virDriver { virDrvDomainMigrateFinish3Params domainMigrateFinish3Params; virDrvDomainMigrateConfirm3Params domainMigrateConfirm3Params; virDrvConnectGetCPUModelNames connectGetCPUModelNames; + virDrvConnectCrashDaemon connectCrashDaemon; }; diff --git a/src/libvirt.c b/src/libvirt.c index 4454829..739c747 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1717,6 +1717,38 @@ virConnectGetSysinfo(virConnectPtr conn, unsigned int flags) /** + * virConnectCrashDaemon: + * @conn: pointer to a hypervisor connection + * @flags: one of virConnectCrashDaemonFlags + * + * Crashes the daemon by the method selected via @flags. + * + * Returns -1 on error or doesn't return at all in case of success. + */ +int +virConnectCrashDaemon(virConnectPtr conn, unsigned int flags) +{ + VIR_DEBUG("conn=%p, flags=%x", conn, flags); + + virResetLastError(); + + virCheckConnectReturn(conn, -1); + + if (conn->driver->connectCrashDaemon) { + if (conn->driver->connectCrashDaemon(conn, flags) < 0) + goto error; + return 0; + } + + virReportUnsupportedError(); + +error: + virDispatchError(conn); + return -1; +} + + +/** * virConnectGetMaxVcpus: * @conn: pointer to the hypervisor connection * @type: value of the 'type' attribute in the <domain> element diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 38fbf63..18f91b2 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1983,6 +1983,7 @@ virUSBDeviceSetUsedBy; # util/virutil.h virCompareLimitUlong; +virCrashDaemon; virDoubleToStr; virEnumFromString; virEnumToString; diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 9ab0c92..378d256 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -650,5 +650,9 @@ LIBVIRT_1.2.3 { virDomainCoreDumpWithFormat; } LIBVIRT_1.2.1; +LIBVIRT_1.2.4 { + global: + virConnectCrashDaemon; +} LIBVIRT_1.2.3; # .... define new API here using predicted next version number .... diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b032441..cd258b7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16661,6 +16661,21 @@ qemuConnectGetCPUModelNames(virConnectPtr conn, } +static int +qemuConnectCrashDaemon(virConnectPtr conn ATTRIBUTE_UNUSED, + unsigned int flags) +{ + if (flags >= VIR_CONNECT_CRASH_LAST) { + virReportError(VIR_ERR_INVALID_ARG, + _("Unsupported crash method %u"), + flags); + return -1; + } + + return virCrashDaemon(flags); +} + + static virDriver qemuDriver = { .no = VIR_DRV_QEMU, .name = QEMU_DRIVER_NAME, @@ -16851,6 +16866,7 @@ static virDriver qemuDriver = { .domainMigrateFinish3Params = qemuDomainMigrateFinish3Params, /* 1.1.0 */ .domainMigrateConfirm3Params = qemuDomainMigrateConfirm3Params, /* 1.1.0 */ .connectGetCPUModelNames = qemuConnectGetCPUModelNames, /* 1.1.3 */ + .connectCrashDaemon = qemuConnectCrashDaemon, /* 1.2.4 */ }; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index ed7dde6..b01dd5b 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -7800,6 +7800,7 @@ static virDriver remote_driver = { .domainMigrateFinish3Params = remoteDomainMigrateFinish3Params, /* 1.1.0 */ .domainMigrateConfirm3Params = remoteDomainMigrateConfirm3Params, /* 1.1.0 */ .connectGetCPUModelNames = remoteConnectGetCPUModelNames, /* 1.1.3 */ + .connectCrashDaemon = remoteConnectCrashDaemon, /* 1.2.4 */ }; static virNetworkDriver network_driver = { diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 6c445cc..7eb7f83 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -442,6 +442,13 @@ struct remote_connect_get_sysinfo_ret { remote_nonnull_string sysinfo; }; +struct remote_connect_crash_daemon_args { + unsigned int flags; +}; + +struct remote_connect_crash_daemon_ret { + int retval; +}; struct remote_connect_get_uri_ret { remote_nonnull_string uri; }; @@ -5275,5 +5282,11 @@ enum remote_procedure { * @generate: both * @acl: domain:core_dump */ - REMOTE_PROC_DOMAIN_CORE_DUMP_WITH_FORMAT = 334 + REMOTE_PROC_DOMAIN_CORE_DUMP_WITH_FORMAT = 334, + + /** + * @generate: both + * @acl: none + */ + REMOTE_PROC_CONNECT_CRASH_DAEMON = 335 }; diff --git a/src/util/virutil.c b/src/util/virutil.c index 9be1590..97215d0 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -78,6 +78,7 @@ #include "vircommand.h" #include "nonblocking.h" #include "virprocess.h" +#include "virrandom.h" #include "virstring.h" #include "virutil.h" @@ -2204,3 +2205,25 @@ void virUpdateSelfLastChanged(const char *path) selfLastChanged = sb.st_ctime; } } + +int virCrashDaemon(unsigned int flags) +{ + char **bla = NULL; + char **tmp; + + if (flags == VIR_CONNECT_CRASH_RANDOM) + flags = virRandomInt(VIR_CONNECT_CRASH_LAST) + 1; + + switch (flags) { + case VIR_CONNECT_CRASH_NULL_PTR: + bla[1] = bla[0]; + /* fallthrough */ + case VIR_CONNECT_CRASH_DOUBLE_FREE: + if (VIR_ALLOC_N(bla, 2) < 0) + return -1; + tmp = bla; + VIR_FREE(tmp); + VIR_FREE(bla); + } + return -1; +} diff --git a/src/util/virutil.h b/src/util/virutil.h index 1f2efd5..aaf1bef 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -202,4 +202,5 @@ bool virIsSUID(void); time_t virGetSelfLastChanged(void); void virUpdateSelfLastChanged(const char *path); +int virCrashDaemon(unsigned int flags); #endif /* __VIR_UTIL_H__ */ diff --git a/tools/virsh-host.c b/tools/virsh-host.c index cac6086..28e5e3b 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -939,6 +939,45 @@ cmdNodeMemoryTune(vshControl *ctl, const vshCmd *cmd) goto cleanup; } +/* + * "crash" command + */ +static const vshCmdInfo info_crash[] = { + {.name = "help", + .data = N_("crash the daemon") + }, + {.name = "desc", + .data = N_("Crash the libvirt daemon using the selected method.") + }, + {.name = NULL} +}; + +static const vshCmdOptDef opts_crash[] = { + {.name = "null", + .type = VSH_OT_BOOL, + .help = N_("Crash by null pointer access") + }, + {.name = "doublefree", + .type = VSH_OT_BOOL, + .help = N_("Crash by double free") + }, + {.name = NULL} +}; + +static bool +cmdCrash(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +{ + unsigned int flags = VIR_CONNECT_CRASH_RANDOM; + + if (vshCommandOptBool(cmd, "null")) + flags = VIR_CONNECT_CRASH_NULL_PTR; + if (vshCommandOptBool(cmd, "doublefree")) + flags = VIR_CONNECT_CRASH_DOUBLE_FREE; + + virConnectCrashDaemon(ctl->conn, flags); + return true; +} + const vshCmdDef hostAndHypervisorCmds[] = { {.name = "capabilities", .handler = cmdCapabilities, @@ -1024,5 +1063,11 @@ const vshCmdDef hostAndHypervisorCmds[] = { .info = info_version, .flags = 0 }, + {.name = "crash", + .handler = cmdCrash, + .opts = opts_crash, + .info = info_crash, + .flags = 0 + }, {.name = NULL} }; -- 1.8.3.2

3 2

[libvirt] [PATCH] Bump version to 1.2.4 for new dev cycle
by Michal Privoznik 01 Apr '14

01 Apr '14

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed already, just sending a note. configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 73efffa..7b9e38a 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ dnl You should have received a copy of the GNU Lesser General Public dnl License along with this library. If not, see dnl <http://www.gnu.org/licenses/>. -AC_INIT([libvirt], [1.2.3], [libvir-list(a)redhat.com] [], [http://libvirt.org] +AC_INIT([libvirt], [1.2.4], [libvir-list(a)redhat.com] [], [http://libvirt.org] AC_CONFIG_SRCDIR([src/libvirt.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) -- 1.9.0

1 0

[libvirt] [PATCH] build: fix syntax-check for storage_backend
by Martin Kletzander 01 Apr '14

01 Apr '14

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Pushed as a build-breaker. src/storage/storage_backend.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 42bd445..adf0311 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1,7 +1,7 @@ /* * storage_backend.c: internal storage driver backend contract * - * Copyright (C) 2007-2013 Red Hat, Inc. + * Copyright (C) 2007-2014 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -1405,7 +1405,7 @@ virStorageBackendUpdateVolTargetInfo(virStorageVolTargetPtr target, goto cleanup; } - cleanup: + cleanup: VIR_FORCE_CLOSE(fd); return ret; -- 1.9.1

1 0

[libvirt] [for-1.2.3 PATCHv3] gluster: Fix "key" attribute for gluster volumes
by Peter Krempa 01 Apr '14

01 Apr '14

According to our documentation the "key" value has the following meaning: "Providing an identifier for the volume which identifies a single volume." The currently used keys for gluster volumes consist of the gluster volume name and file path. This can't be considered unique as a different storage server can serve a volume with the same name. Unfortunately I wasn't able to figure out a way to retrieve the gluster volume UUID which would avoid the possibility of having two distinct keys identifying a single volume. Use the full URI as the key for the volume to avoid the more critical ambiguity problem and document the possible change to UUID. --- Notes: Version 3: - fix the example too, also state that UUID might be used - repost so we don't have yet another release containing this docs/storage.html.in | 8 +++++--- src/storage/storage_backend_gluster.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/docs/storage.html.in b/docs/storage.html.in index 2706bc5..4bbf378 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -711,12 +711,14 @@ correspond to the files that can be found when mounting the gluster volume. The <code>name</code> is the path relative to the effective mount specified for the pool; and - the <code>key</code> is a path including the gluster volume - name and any subdirectory specified by the pool.</p> + the <code>key</code> is a string that identifies a single volume + uniquely. Currently the <code>key</code> attribute consists of the + URI of the volume but it may be changed to an UUID of the volume + in the future.</p> <pre> <volume> <name>myfile</name> - <key>volname/myfile</key> + <key>gluster://localhost/volname/myfile</key> <source> </source> <capacity unit='bytes'>53687091200</capacity> diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index fe92f15..337ddf4 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -187,6 +187,7 @@ virStorageBackendGlusterSetMetadata(virStorageBackendGlusterStatePtr state, const char *name) { int ret = -1; + char *path = NULL; char *tmp; VIR_FREE(vol->key); @@ -201,12 +202,12 @@ virStorageBackendGlusterSetMetadata(virStorageBackendGlusterStatePtr state, goto cleanup; } - if (virAsprintf(&vol->key, "%s%s%s", state->volname, state->dir, + if (virAsprintf(&path, "%s%s%s", state->volname, state->dir, vol->name) < 0) goto cleanup; tmp = state->uri->path; - if (virAsprintf(&state->uri->path, "/%s", vol->key) < 0) { + if (virAsprintf(&state->uri->path, "/%s", path) < 0) { state->uri->path = tmp; goto cleanup; } @@ -218,9 +219,14 @@ virStorageBackendGlusterSetMetadata(virStorageBackendGlusterStatePtr state, VIR_FREE(state->uri->path); state->uri->path = tmp; + /* the path is unique enough to serve as a volume key */ + if (VIR_STRDUP(vol->key, vol->target.path) < 0) + goto cleanup; + ret = 0; cleanup: + VIR_FREE(path); return ret; } -- 1.9.1

2 2

[libvirt] [PATCH] Fix Memory Leak in testMessageArrayRef()
by Nehal J Wani 31 Mar '14

31 Mar '14

While running virdbustest, it was found that valgrind pointed out the following memory leaks: ==9996== 17 (8 direct, 9 indirect) bytes in 1 blocks are definitely lost in loss record 9 of 36 ==9996== at 0x4A069EE: malloc (vg_replace_malloc.c:270) ==9996== by 0x4A06B62: realloc (vg_replace_malloc.c:662) ==9996== by 0x4C6B587: virReallocN (viralloc.c:245) ==9996== by 0x4C6B6AE: virExpandN (viralloc.c:294) ==9996== by 0x4C82B54: virDBusMessageDecodeArgs (virdbus.c:907) ==9996== by 0x4C83463: virDBusMessageDecode (virdbus.c:1141) ==9996== by 0x402C45: testMessageArrayRef (virdbustest.c:273) ==9996== by 0x404E71: virtTestRun (testutils.c:201) ==9996== by 0x401C2D: mymain (virdbustest.c:479) ==9996== by 0x4055ED: virtTestMain (testutils.c:789) ==9996== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) ==9996== ==9996== 28 (16 direct, 12 indirect) bytes in 1 blocks are definitely lost in loss record 12 of 36 ==9996== at 0x4A06BE0: realloc (vg_replace_malloc.c:662) ==9996== by 0x4C6B587: virReallocN (viralloc.c:245) ==9996== by 0x4C6B6AE: virExpandN (viralloc.c:294) ==9996== by 0x4C82B54: virDBusMessageDecodeArgs (virdbus.c:907) ==9996== by 0x4C83463: virDBusMessageDecode (virdbus.c:1141) ==9996== by 0x402C45: testMessageArrayRef (virdbustest.c:273) ==9996== by 0x404E71: virtTestRun (testutils.c:201) ==9996== by 0x401C2D: mymain (virdbustest.c:479) ==9996== by 0x4055ED: virtTestMain (testutils.c:789) ==9996== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) ==9996== --- tests/virdbustest.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tests/virdbustest.c b/tests/virdbustest.c index 1870f35..bdb1c24 100644 --- a/tests/virdbustest.c +++ b/tests/virdbustest.c @@ -250,6 +250,7 @@ static int testMessageArrayRef(const void *args ATTRIBUTE_UNUSED) size_t out_nstrv2 = 0; const char *in_str2 = "World"; char *out_str1 = NULL, *out_str2 = NULL; + size_t i = 0; if (!(msg = dbus_message_new_method_call("org.libvirt.test", "/org/libvirt/test", @@ -315,6 +316,12 @@ static int testMessageArrayRef(const void *args ATTRIBUTE_UNUSED) VIR_FREE(out_int32); VIR_FREE(out_str1); VIR_FREE(out_str2); + for (i = 0; i < out_nstrv1; i++) + VIR_FREE(out_strv1[i]); + VIR_FREE(out_strv1); + for (i = 0; i < out_nstrv2; i++) + VIR_FREE(out_strv2[i]); + VIR_FREE(out_strv2); dbus_message_unref(msg); return ret; } -- 1.7.1

2 1

[libvirt] [PATCH 0/4] storage: Fix VolOpen error reporting
by Cole Robinson 31 Mar '14

31 Mar '14

In https://bugzilla.redhat.com/show_bug.cgi?id=1080613 , something is causing StorageVolGetXML to fail, but it's not raising any error message. Code inspection found that most users of VolOpen are susceptible to error reporting issues. The first 3 patches are some code reorganization and cleanups that make it easier to identify the VolOpen callers. Patch 4 fixes up the reporting issue. Cole Robinson (4): storage: Rename UpdateVolInfoFlags to UpdateVolInfo storage: move block format lookup to shared UpdateVolInfo storage: Rename VolOpenCheckMode to VolOpen storage: Always report an error from VolOpen src/storage/storage_backend.c | 234 +++++++++++++++++----------------- src/storage/storage_backend.h | 18 +-- src/storage/storage_backend_disk.c | 3 +- src/storage/storage_backend_fs.c | 28 ++-- src/storage/storage_backend_logical.c | 11 +- src/storage/storage_backend_mpath.c | 36 +----- src/storage/storage_backend_scsi.c | 43 +------ 7 files changed, 159 insertions(+), 214 deletions(-) -- 1.8.5.3

3 7

[libvirt] [PATCH tck 0/6] Fix tests which need a full OS image
by Daniel P. Berrange 31 Mar '14

31 Mar '14

A bunch of tests currently attempt to kickstart a full Fedora OS image install. Everytime I try to update this kickstart to a new version of Fedora it causes no end of pain. Switch the tests over to use Richard Jones' virt-builder command which is part of libguestfs. This makes it trivial to deploy and customize full OS images from pre-built templates. Mike - does Suse include a new enough version of libguestfs to get access to the 'virt-builder' tool yet ? Daniel P. Berrange (6): Add ability to provision full OS using virt-builder Fix path to dnsmasq leases file Add ability to setup NIC when creating guest XML Force destroy guests if graceful shutdown fails Convert nwfilter and domain balloon tests to virtbuilder images Remove obsolete kickstart provisioning helper methods Build.PL | 1 - conf/default.cfg | 25 +++ conf/ks.cfg | 30 ---- lib/Sys/Virt/TCK.pm | 280 +++++++++++++++++++++++++----- lib/Sys/Virt/TCK/DomainBuilder.pm | 20 ++- lib/Sys/Virt/TCK/NetworkHelpers.pm | 140 +-------------- perl-Sys-Virt-TCK.spec.PL | 1 - scripts/domain/110-memory-balloon.t | 10 +- scripts/nwfilter/090-install-image.t | 55 ------ scripts/nwfilter/100-ping-still-working.t | 54 +++--- scripts/nwfilter/210-no-mac-spoofing.t | 81 +++++---- scripts/nwfilter/220-no-ip-spoofing.t | 78 +++++---- scripts/nwfilter/230-no-mac-broadcast.t | 53 +++--- scripts/nwfilter/240-no-arp-spoofing.t | 60 ++++--- scripts/nwfilter/300-vsitype.t | 40 +++-- scripts/nwfilter/nwfilter_concurrent.sh | 4 +- 16 files changed, 493 insertions(+), 439 deletions(-) delete mode 100644 conf/ks.cfg delete mode 100644 scripts/nwfilter/090-install-image.t -- 1.8.5.3

4 24

[libvirt] [PATCH tck] Find ebtables in /sbin or /usr/sbin
by Mike Latimer 31 Mar '14

31 Mar '14

If ebtables binary is not found in /sbin, use /usr/sbin. --- scripts/nwfilter/100-ping-still-working.t | 3 ++- scripts/nwfilter/210-no-mac-spoofing.t | 3 ++- scripts/nwfilter/220-no-ip-spoofing.t | 3 ++- scripts/nwfilter/230-no-mac-broadcast.t | 3 ++- scripts/nwfilter/240-no-arp-spoofing.t | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/nwfilter/100-ping-still-working.t b/scripts/nwfilter/100-ping-still-working.t index 0bfdc00..1105d70 100644 --- a/scripts/nwfilter/100-ping-still-working.t +++ b/scripts/nwfilter/100-ping-still-working.t @@ -64,7 +64,8 @@ my $guestip = get_ip_from_leases($mac); diag "ip is $guestip"; # check ebtables entry -my $ebtable = `/sbin/ebtables -L;/sbin/ebtables -t nat -L`; +my $ebtables = (-e '/sbin/ebtables') ? '/sbin/ebtables' : '/usr/sbin/ebtables'; +my $ebtable = `$ebtables -L;$ebtables -t nat -L`; diag $ebtable; # fixme to include mac adress ok($ebtable =~ "vnet0", "check ebtables entry"); diff --git a/scripts/nwfilter/210-no-mac-spoofing.t b/scripts/nwfilter/210-no-mac-spoofing.t index fb20351..d7c57e6 100644 --- a/scripts/nwfilter/210-no-mac-spoofing.t +++ b/scripts/nwfilter/210-no-mac-spoofing.t @@ -64,7 +64,8 @@ my $guestip = get_ip_from_leases($mac); diag "ip is $guestip"; # check ebtables entry -my $ebtable = `/sbin/ebtables -L;/sbin/ebtables -t nat -L`; +my $ebtables = (-e '/sbin/ebtables') ? '/sbin/ebtables' : '/usr/sbin/ebtables'; +my $ebtable = `$ebtables -L;$ebtables -t nat -L`; diag $ebtable; # ebtables shortens :00: to :0: so we need to do that too $_ = $mac; diff --git a/scripts/nwfilter/220-no-ip-spoofing.t b/scripts/nwfilter/220-no-ip-spoofing.t index 063bb5b..5e8e0d7 100644 --- a/scripts/nwfilter/220-no-ip-spoofing.t +++ b/scripts/nwfilter/220-no-ip-spoofing.t @@ -64,7 +64,8 @@ my $guestip = get_ip_from_leases($mac); diag "ip is $guestip"; # check ebtables entry -my $ebtable = `/sbin/ebtables -L;/sbin/ebtables -t nat -L`; +my $ebtables = (-e '/sbin/ebtables') ? '/sbin/ebtables' : '/usr/sbin/ebtables'; +my $ebtable = `$ebtables -L;$ebtables -t nat -L`; diag $ebtable; # check if IP address is listed ok($ebtable =~ "$guestip", "check ebtables entry"); diff --git a/scripts/nwfilter/230-no-mac-broadcast.t b/scripts/nwfilter/230-no-mac-broadcast.t index 09a758b..a7d3b8e 100644 --- a/scripts/nwfilter/230-no-mac-broadcast.t +++ b/scripts/nwfilter/230-no-mac-broadcast.t @@ -63,7 +63,8 @@ my $guestip = get_ip_from_leases($mac); diag "ip is $guestip"; # check ebtables entry -my $ebtable = `/sbin/ebtables -L;/sbin/ebtables -t nat -L`; +my $ebtables = (-e '/sbin/ebtables') ? '/sbin/ebtables' : '/usr/sbin/ebtables'; +my $ebtable = `$ebtables -L;$ebtables -t nat -L`; diag $ebtable; # ebtables shortens :00: to :0: so we need to do that too $_ = $mac; diff --git a/scripts/nwfilter/240-no-arp-spoofing.t b/scripts/nwfilter/240-no-arp-spoofing.t index c31ea48..596a0ce 100644 --- a/scripts/nwfilter/240-no-arp-spoofing.t +++ b/scripts/nwfilter/240-no-arp-spoofing.t @@ -65,7 +65,8 @@ my $guestip = get_ip_from_leases($mac); diag "ip is $guestip"; # check ebtables entry -my $ebtable = `/sbin/ebtables -L;/sbin/ebtables -t nat -L`; +my $ebtables = (-e '/sbin/ebtables') ? '/sbin/ebtables' : '/usr/sbin/ebtables'; +my $ebtable = `$ebtables -L;$ebtables -t nat -L`; diag $ebtable; # check if IP address is listed ok($ebtable =~ "$guestip", "check ebtables entry"); -- 1.8.4.5

2 2

[libvirt] [PATCH tck] 100-ping-still-working.t: Replace vnet0 with mac address
by Mike Latimer 31 Mar '14

31 Mar '14

Using a statically defined vnet0 may fail if multiple VMs are running on the test machine. Switch to mac address, but replace '00' with '0' to match the output of ebtables. --- scripts/nwfilter/100-ping-still-working.t | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/nwfilter/100-ping-still-working.t b/scripts/nwfilter/100-ping-still-working.t index 1105d70..6c931ff 100644 --- a/scripts/nwfilter/100-ping-still-working.t +++ b/scripts/nwfilter/100-ping-still-working.t @@ -67,8 +67,8 @@ diag "ip is $guestip"; my $ebtables = (-e '/sbin/ebtables') ? '/sbin/ebtables' : '/usr/sbin/ebtables'; my $ebtable = `$ebtables -L;$ebtables -t nat -L`; diag $ebtable; -# fixme to include mac adress -ok($ebtable =~ "vnet0", "check ebtables entry"); +$mac =~ s/00/0/g; +ok($ebtable =~ "$mac", "check ebtables entry"); # ping guest1 my $ping = `ping -c 10 $guestip`; -- 1.8.4.5

1 1

[libvirt] guest band width setting
by Pradeep Kiruvale 31 Mar '14

31 Mar '14

Hi All, I am new to QEMU/libvirt I was starting to learn the libvirt code,I was browsing the code how the guest network bandwidth to be set like we mention <inbound> <outbound> tags in the xml,but where in code exactly these values set to the guest interface. I browsed the code a lot could not find it.Please help to understand how this works. Thanks in advance Pradeep

2 2

[libvirt] [PATCH] virsh: fix 'help event'
by Eric Blake 31 Mar '14

31 Mar '14

'virsh help event' included a summary line "event - (null)" due to a misnamed info field. * tools/virsh-domain.c (info_event): Use correct name. * tools/virsh-network.c (info_network_event): Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Deserves to be in 1.2.3 tools/virsh-domain.c | 2 +- tools/virsh-network.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index d9aa4fa..73414f8 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11030,7 +11030,7 @@ static vshEventCallback vshEventCallbacks[] = { verify(VIR_DOMAIN_EVENT_ID_LAST == ARRAY_CARDINALITY(vshEventCallbacks)); static const vshCmdInfo info_event[] = { - {.name = "event", + {.name = "help", .data = N_("Domain Events") }, {.name = "desc", diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 078a3cf..4b0df62 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -1180,7 +1180,7 @@ vshEventLifecyclePrint(virConnectPtr conn ATTRIBUTE_UNUSED, } static const vshCmdInfo info_network_event[] = { - {.name = "net-event", + {.name = "help", .data = N_("Network Events") }, {.name = "desc", -- 1.9.0

3 3

[libvirt] [PATCH] Drop dependency on pm-is-supported
by Cédric Bosdonnat 31 Mar '14

31 Mar '14

From: Cédric Bosdonnat <cedric.bosdonnat(a)free.fr> pm-is-supported is the only thing needed in pm-utils, better get rid of it since systemd is heavily used for libvirt. --- src/util/virnodesuspend.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index 8088931..9839de2 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -29,6 +29,8 @@ #include "viralloc.h" #include "virlog.h" #include "virerror.h" +#include "virfile.h" +#include "virstring.h" #define VIR_FROM_THIS VIR_FROM_NONE @@ -263,41 +265,45 @@ int nodeSuspendForDuration(unsigned int target, static int virNodeSuspendSupportsTarget(unsigned int target, bool *supported) { - virCommandPtr cmd; - int status; int ret = -1; + char *buf = NULL; + char **states = NULL; + bool canSuspend = false; + bool canHibernate = false; if (virNodeSuspendInitialize() < 0) return -1; *supported = false; + if (virFileReadAll("/sys/power/state", 1024, &buf) < 0) + goto cleanup; + + states = virStringSplit(buf, " ", 0); + + canSuspend = (virStringArrayHasString(states, "mem") || + virStringArrayHasString(states, "standby")); + canHibernate = virStringArrayHasString(states, "disk"); + switch (target) { case VIR_NODE_SUSPEND_TARGET_MEM: - cmd = virCommandNewArgList("pm-is-supported", "--suspend", NULL); + *supported = canSuspend; break; case VIR_NODE_SUSPEND_TARGET_DISK: - cmd = virCommandNewArgList("pm-is-supported", "--hibernate", NULL); + *supported = canHibernate; break; case VIR_NODE_SUSPEND_TARGET_HYBRID: - cmd = virCommandNewArgList("pm-is-supported", "--suspend-hybrid", NULL); + *supported = canSuspend && canHibernate; break; default: return ret; } - if (virCommandRun(cmd, &status) < 0) - goto cleanup; - - /* - * Check return code of command == 0 for success - * (i.e., the PM capability is supported) - */ - *supported = (status == 0); ret = 0; cleanup: - virCommandFree(cmd); + VIR_FREE(buf); + virStringFreeList(states); return ret; } -- 1.8.4.5

6 6

[libvirt] [PATCH] bhyve: don't leak tap devices on failures
by Roman Bogorodskiy 31 Mar '14

31 Mar '14

On failures, virBhyveProcessStart() does not cleanup network interfaces that could be created by virBhyveProcessBuildBhyveCmd(), which results in a leaked tap device. To fix that, extract network cleanup code to bhyveNetCleanup() and use it in cleanup stage of virBhyveProcessStart(). --- src/bhyve/bhyve_process.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index b37855e..a557bc5 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -63,6 +63,24 @@ bhyveProcessAutoDestroy(virDomainObjPtr vm, return vm; } +static void +bhyveNetCleanup(virDomainObjPtr vm) +{ + size_t i; + + for (i = 0; i < vm->def->nnets; i++) { + virDomainNetDefPtr net = vm->def->nets[i]; + int actualType = virDomainNetGetActualType(net); + + if (actualType == VIR_DOMAIN_NET_TYPE_BRIDGE) { + ignore_value(virNetDevBridgeRemovePort( + virDomainNetGetActualBridgeName(net), + net->ifname)); + ignore_value(virNetDevTapDelete(net->ifname)); + } + } +} + int virBhyveProcessStart(virConnectPtr conn, bhyveConnPtr driver, @@ -167,6 +185,8 @@ virBhyveProcessStart(virConnectPtr conn, ignore_value(virCommandRun(destroy_cmd, NULL)); virCommandFree(destroy_cmd); } + + bhyveNetCleanup(vm); } virCommandFree(load_cmd); @@ -181,7 +201,6 @@ virBhyveProcessStop(bhyveConnPtr driver, virDomainObjPtr vm, virDomainShutoffReason reason ATTRIBUTE_UNUSED) { - size_t i; int ret = -1; virCommandPtr cmd = NULL; @@ -203,17 +222,8 @@ virBhyveProcessStop(bhyveConnPtr driver, vm->def->name, (int)vm->pid); - for (i = 0; i < vm->def->nnets; i++) { - virDomainNetDefPtr net = vm->def->nets[i]; - int actualType = virDomainNetGetActualType(net); - - if (actualType == VIR_DOMAIN_NET_TYPE_BRIDGE) { - ignore_value(virNetDevBridgeRemovePort( - virDomainNetGetActualBridgeName(net), - net->ifname)); - ignore_value(virNetDevTapDelete(net->ifname)); - } - } + /* Cleanup network interfaces */ + bhyveNetCleanup(vm); /* No matter if shutdown was successful or not, we * need to unload the VM */ -- 1.8.4.2

2 2

[libvirt] [PATCH] util: remove useless comment for virCgroupMoveTask in vircgroup.c
by Hongwei Bi 31 Mar '14

31 Mar '14

Signed-off-by: Hongwei Bi <hwbi2008(a)gmail.com> --- src/util/vircgroup.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index a0904d6..b881c8c 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1148,7 +1148,6 @@ virCgroupAddTaskStrController(virCgroupPtr group, * * @src_group: The source cgroup where all tasks are removed from * @dest_group: The destination where all tasks are added to - * @controller: The cgroup controller to be operated on * * Returns: 0 on success or -1 on failure */ -- 1.7.9.5

2 1

[libvirt] [PATCH] Fix potential crash when setting partial cpu/memory/numa/interface limits on domains
by Brian Rak 31 Mar '14

31 Mar '14

The number of parameters in new_params is not guaranteed to be the same as the number of parameters in params. Use the correct count when freeing new_params to avoid crashes --- libvirt-override.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 9dc6ad4..3fa9b9b 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -914,7 +914,7 @@ libvirt_virDomainSetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED, int i_retval; int nparams = 0; Py_ssize_t size = 0; - virTypedParameterPtr params, new_params = NULL; + virTypedParameterPtr params = NULL, new_params = NULL; if (!PyArg_ParseTuple(args, (char *)"OO:virDomainSetScedulerParameters", &pyobj_domain, &info)) @@ -973,7 +973,7 @@ libvirt_virDomainSetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED, cleanup: virTypedParamsFree(params, nparams); - virTypedParamsFree(new_params, nparams); + virTypedParamsFree(new_params, size); return ret; } @@ -1064,7 +1064,7 @@ libvirt_virDomainSetBlkioParameters(PyObject *self ATTRIBUTE_UNUSED, int nparams = 0; Py_ssize_t size = 0; unsigned int flags; - virTypedParameterPtr params, new_params = NULL; + virTypedParameterPtr params = NULL, new_params = NULL; if (!PyArg_ParseTuple(args, (char *)"OOi:virDomainSetBlkioParameters", @@ -1123,7 +1123,7 @@ libvirt_virDomainSetBlkioParameters(PyObject *self ATTRIBUTE_UNUSED, cleanup: virTypedParamsFree(params, nparams); - virTypedParamsFree(new_params, nparams); + virTypedParamsFree(new_params, size); return ret; } @@ -1184,7 +1184,7 @@ libvirt_virDomainSetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED, int nparams = 0; Py_ssize_t size = 0; unsigned int flags; - virTypedParameterPtr params, new_params = NULL; + virTypedParameterPtr params = NULL, new_params = NULL; if (!PyArg_ParseTuple(args, (char *)"OOi:virDomainSetMemoryParameters", @@ -1243,7 +1243,7 @@ libvirt_virDomainSetMemoryParameters(PyObject *self ATTRIBUTE_UNUSED, cleanup: virTypedParamsFree(params, nparams); - virTypedParamsFree(new_params, nparams); + virTypedParamsFree(new_params, size); return ret; } @@ -1304,7 +1304,7 @@ libvirt_virDomainSetNumaParameters(PyObject *self ATTRIBUTE_UNUSED, int nparams = 0; Py_ssize_t size = 0; unsigned int flags; - virTypedParameterPtr params, new_params = NULL; + virTypedParameterPtr params = NULL, new_params = NULL; if (!PyArg_ParseTuple(args, (char *)"OOi:virDomainSetNumaParameters", @@ -1363,7 +1363,7 @@ libvirt_virDomainSetNumaParameters(PyObject *self ATTRIBUTE_UNUSED, cleanup: virTypedParamsFree(params, nparams); - virTypedParamsFree(new_params, nparams); + virTypedParamsFree(new_params, size); return ret; } @@ -1425,7 +1425,7 @@ libvirt_virDomainSetInterfaceParameters(PyObject *self ATTRIBUTE_UNUSED, Py_ssize_t size = 0; unsigned int flags; const char *device = NULL; - virTypedParameterPtr params, new_params = NULL; + virTypedParameterPtr params = NULL, new_params = NULL; if (!PyArg_ParseTuple(args, (char *)"OzOi:virDomainSetInterfaceParameters", @@ -1484,7 +1484,7 @@ libvirt_virDomainSetInterfaceParameters(PyObject *self ATTRIBUTE_UNUSED, cleanup: virTypedParamsFree(params, nparams); - virTypedParamsFree(new_params, nparams); + virTypedParamsFree(new_params, size); return ret; } @@ -4782,7 +4782,7 @@ libvirt_virDomainSetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED, Py_ssize_t size = 0; const char *disk; unsigned int flags; - virTypedParameterPtr params, new_params = NULL; + virTypedParameterPtr params = NULL, new_params = NULL; if (!PyArg_ParseTuple(args, (char *)"OzOi:virDomainSetBlockIoTune", &pyobj_domain, &disk, &info, &flags)) @@ -4840,7 +4840,7 @@ libvirt_virDomainSetBlockIoTune(PyObject *self ATTRIBUTE_UNUSED, cleanup: virTypedParamsFree(params, nparams); - virTypedParamsFree(new_params, nparams); + virTypedParamsFree(new_params, size); return ret; } -- 1.7.1

2 1