- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: avoid NULL derefs
by Eric Blake 15 Feb '11

15 Feb '11

The processWatchdogEvent fix is real, although it can only trigger on OOM, since bad things happen if doCoreDump is called with a NULL pathname argument. The other fixes silence clang, but aren't a real bug because virReportErrorHelper tolerates a NULL format string even though *printf does not. * src/qemu/qemu_driver.c (processWatchdogEvent): Exit on OOM. (qemuDomainIsActive, qemuDomainIsPersistent, qemuDomainIsUpdated): Provide valid message. --- Another valid clang finding. Maybe we whould mark virReportErrorHelper as ATTRIBUTE_NONNULL for the format string argument, and require all clients to pass in a valid error string (after all, that's what the printf attritube already assumes, and passing NULL just means that we aren't giving back any useful error information to the user); but that can be a separate cleanup. src/qemu/qemu_driver.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c581cfe..82a2210 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3489,7 +3489,10 @@ static int qemuDomainIsActive(virDomainPtr dom) obj = virDomainFindByUUID(&driver->domains, dom->uuid); qemuDriverUnlock(driver); if (!obj) { - qemuReportError(VIR_ERR_NO_DOMAIN, NULL); + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + qemuReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); goto cleanup; } ret = virDomainObjIsActive(obj); @@ -3510,7 +3513,10 @@ static int qemuDomainIsPersistent(virDomainPtr dom) obj = virDomainFindByUUID(&driver->domains, dom->uuid); qemuDriverUnlock(driver); if (!obj) { - qemuReportError(VIR_ERR_NO_DOMAIN, NULL); + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + qemuReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); goto cleanup; } ret = obj->persistent; @@ -3531,7 +3537,10 @@ static int qemuDomainIsUpdated(virDomainPtr dom) obj = virDomainFindByUUID(&driver->domains, dom->uuid); qemuDriverUnlock(driver); if (!obj) { - qemuReportError(VIR_ERR_NO_DOMAIN, NULL); + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + qemuReportError(VIR_ERR_NO_DOMAIN, + _("no domain with matching uuid '%s'"), uuidstr); goto cleanup; } ret = obj->updated; @@ -4981,12 +4990,14 @@ static void processWatchdogEvent(void *data, void *opaque) case VIR_DOMAIN_WATCHDOG_ACTION_DUMP: { char *dumpfile; - int i; - i = virAsprintf(&dumpfile, "%s/%s-%u", + if (virAsprintf(&dumpfile, "%s/%s-%u", driver->autoDumpPath, wdEvent->vm->def->name, - (unsigned int)time(NULL)); + (unsigned int)time(NULL)) < 0) { + virReportOOMError(); + break; + } qemuDriverLock(driver); virDomainObjLock(wdEvent->vm); -- 1.7.4

2 2

[libvirt] [PATCH] virDomainMemoryStats: avoid null dereference
by Eric Blake 15 Feb '11

15 Feb '11

* src/libvirt.c (virDomainMemoryStats): Check domain before flags. --- Another valid bug found by clang. User's generally should't call virDomainMemoryStats(NULL,...), but we don't forbid it elsewhere, and doing so is not supposed to crash libvirt. All other flags checks in this file occur after validating the object first. src/libvirt.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 479a9b5..f65cc24 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -4411,12 +4411,6 @@ int virDomainMemoryStats (virDomainPtr dom, virDomainMemoryStatPtr stats, VIR_DOMAIN_DEBUG(dom, "stats=%p, nr_stats=%u", stats, nr_stats); - if (flags != 0) { - virLibDomainError(VIR_ERR_INVALID_ARG, - _("flags must be zero")); - goto error; - } - virResetLastError(); if (!VIR_IS_CONNECTED_DOMAIN (dom)) { @@ -4424,6 +4418,12 @@ int virDomainMemoryStats (virDomainPtr dom, virDomainMemoryStatPtr stats, virDispatchError(NULL); return -1; } + if (flags != 0) { + virLibDomainError(VIR_ERR_INVALID_ARG, + _("flags must be zero")); + goto error; + } + if (!stats || nr_stats == 0) return 0; -- 1.7.4

2 2

[libvirt] libvirt 0.8.7 tests failure on arm and ppc
by Serge E. Hallyn 15 Feb '11

15 Feb '11

Hi, as per the message after the tests fail, I'm reporting this on the list. Hopefully someone has seen this before. I've not yet tried this with the latest git snapshot. With 0.8.7, I get: TEST: qemuxml2argvtest ........................................ 40 ........................................ 80 .............................!.!!!!! 116 FAIL -serge

4 9

[libvirt] [PATCH] macvtap: Work-around failing nl_connect calls (weird problem)
by Stefan Berger 15 Feb '11

15 Feb '11

When trying to start / stop a domain with macvtap device (direct type of interface) having a device description like this one here <interface type='direct'> <source dev='static' mode='vepa'/> </interface> then I see netlink related errors when a 'virsh edit' session is happening at the same time. So, to reproduce this error you should try the following (on a kernel supporting macvtap): virsh edit <macvtap domain> -> do not terminate the edit sessions virsh start <macvtap domain> -> works virsh destroy <macvtap domain> -> leaves a macvtap device due to nl_connect failing virsh start <macvtap domain> -> does not start anymore That should make it fail. The work-around basically keeps on allocating new netlink library handles until the nl_connect() succeeds. New netlink library handles cause the next available port (intern to libnl; nl_pid) to be allocated. For every ongoing virsh edit session, one new handle seems to be required. So for 2 virsh edit session, the 3rd one (usually) works. I do not know what in the system is causing this, but my guess it that 'something' is blocking the same port (nl_pid) -- it may not be in libvirt but in a dependent library that's not using libnl (?). Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> Index: libvirt-acl/src/util/macvtap.c =================================================================== --- libvirt-acl.orig/src/util/macvtap.c +++ libvirt-acl/src/util/macvtap.c @@ -120,13 +120,43 @@ int nlComm(struct nl_msg *nl_msg, fd_set readfds; int fd; int n; - struct nl_handle *nlhandle = nl_handle_alloc(); + struct nl_handle **nlhandles = NULL; struct nlmsghdr *nlmsg = nlmsg_hdr(nl_msg); + unsigned int idx = 0, num_elms = 1, i; - if (!nlhandle) - return -1; +realloc: + if (VIR_REALLOC_N(nlhandles, num_elms * sizeof(struct nl_handle *)) < 0) { + virReportOOMError(); + rc = -1; + goto err_exit; + } + + for (i = idx; i < num_elms ; i++) + nlhandles[i] = NULL; + +next_handle: + nlhandles[idx] = nl_handle_alloc(); - if (nl_connect(nlhandle, NETLINK_ROUTE) < 0) { + if (nlhandles[idx] == NULL) { + virReportOOMError(); + rc = -1; + goto err_exit; + } + + if (nl_connect(nlhandles[idx], NETLINK_ROUTE) < 0) { + VIR_DEBUG0("Could not create netlink socket - trying a new one\n"); + /* get a new handle and keep the ones we have */ + idx++; + if (idx < num_elms) + goto next_handle; + /* need to reallocate */ + num_elms += 10; + if (idx < 500) + goto realloc; + + macvtapError(VIR_ERR_INTERNAL_ERROR, "%s [%s]", + _("Could not create netlink socket"), + nl_geterror()); rc = -1; goto err_exit; } @@ -135,15 +165,16 @@ int nlComm(struct nl_msg *nl_msg, nlmsg->nlmsg_pid = getpid(); - nbytes = nl_send_auto_complete(nlhandle, nl_msg); + nbytes = nl_send_auto_complete(nlhandles[idx], nl_msg); if (nbytes < 0) { virReportSystemError(errno, - "%s", _("cannot send to netlink socket")); + "%s [%s]", _("cannot send to netlink socket"), + nl_geterror()); rc = -1; goto err_exit; } - fd = nl_socket_get_fd(nlhandle); + fd = nl_socket_get_fd(nlhandles[idx]); FD_ZERO(&readfds); FD_SET(fd, &readfds); @@ -160,7 +191,7 @@ int nlComm(struct nl_msg *nl_msg, goto err_exit; } - *respbuflen = nl_recv(nlhandle, &nladdr, respbuf, NULL); + *respbuflen = nl_recv(nlhandles[idx], &nladdr, respbuf, NULL); if (*respbuflen <= 0) rc = -1; @@ -171,7 +202,12 @@ err_exit: *respbuflen = 0; } - nl_handle_destroy(nlhandle); + if (nlhandles) + for (idx = 0; idx < num_elms; idx++) + nl_handle_destroy(nlhandles[idx]); + + VIR_FREE(nlhandles); + return rc; }

2 5

[libvirt] [PATCH] docs: added link for nimbus to apps page
by Justin Clift 15 Feb '11

15 Feb '11

--- docs/apps.html.in | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/docs/apps.html.in b/docs/apps.html.in index d8bc265..8b949f3 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -197,6 +197,18 @@ </dd> </dl> + <h2><a name="iaas">Infrastructure as a Service (IaaS)</a></h2> + + <dl> + <dt><a href="http://www.nimbusproject.org">Nimbus</a></dt> + <dd> + Nimbus is an open-source toolkit focused on providing + Infrastructure-as-a-Service (IaaS) capabilities to the scientific + community. It uses libvirt for communication with all KVM and Xen + virtual machines. + </dd> + </dl> + <h2><a name="libraries">Libraries</a></h2> <dl> -- 1.7.4.1

4 6

[libvirt] Mails rejected by mailist?
by Lyre 15 Feb '11

15 Feb '11

Hi all: I've tried to send a patch for libvirt-php using git send-email yesterday. My user.email is configured as a gmail address, that is this one. But git sent patches from local postfix. git CC the patchs to my gmail and I can revice it, but not listed on the maillist. Is it rejected by the maillist? And what should I do to send the patches?

4 5

[libvirt] [PATCH] Output commandline on status != 0 in virCommandWait
by Matthias Bolte 15 Feb '11

15 Feb '11

I pushed this one as suggested by Daniel in https://www.redhat.com/archives/libvir-list/2011-February/msg00519.html Matthias

1 0

[libvirt] [PATCH 0/3 PHP] Misc changes to build / git
by Daniel P. Berrange 15 Feb '11

15 Feb '11

This series does some cleanups to GIT and introduces support for automated build testing

3 9

[libvirt] [PATCH] qemu: avoid NULL deref on error
by Eric Blake 15 Feb '11

15 Feb '11

* src/qemu/qemu_command.c (qemuParseCommandLineDisk): Report error before cleaning def. --- Pushing under the trivial rule, as this is a blatant NULL deref. src/qemu/qemu_command.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3ba0950..1687203 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4603,9 +4603,10 @@ qemuParseCommandLineDisk(virCapsPtr caps, host = def->src + strlen("nbd:"); port = strchr(host, ':'); if (!port) { - def = NULL; qemuReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse nbd filename '%s'"), def->src); + _("cannot parse nbd filename '%s'"), + def->src); + def = NULL; goto cleanup; } *port++ = '\0'; -- 1.7.4

2 1

[libvirt] [PATCH] storage: Create enough volumes for mpath pool
by Osier Yang 15 Feb '11

15 Feb '11

"virStorageBackendCreateVols": "names->next" serves as condition expression for "do...while", however, "names" was shifted before, it then results in one less loop, and thus, one less volume will be created for mpath pool, the patch is to fix it. * src/storage/storage_backend_mpath.c --- src/storage/storage_backend_mpath.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c index be4db78..2e85561 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -212,6 +212,7 @@ virStorageBackendCreateVols(virStoragePoolObjPtr pool, int retval = -1, is_mpath = 0; char *map_device = NULL; uint32_t minor = -1; + uint32_t next; do { is_mpath = virStorageBackendIsMultipath(names->name); @@ -243,9 +244,10 @@ virStorageBackendCreateVols(virStoragePoolObjPtr pool, /* Given the way libdevmapper returns its data, I don't see * any way to avoid this series of casts. */ - names = (struct dm_names *)(((char *)names) + names->next); + next = names->next; + names = (struct dm_names *)(((char *)names) + next); - } while (names->next); + } while (next); retval = 0; out: -- 1.7.4

2 2

[libvirt] [PATCH] maint: kill dead assignments
by Eric Blake 15 Feb '11

15 Feb '11

* src/network/bridge_driver.c (networkStartNetworkDaemon): Delete unused assignments. --- Detected by clang. Pushing under the trivial rule, as it's pretty easy to see. src/network/bridge_driver.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 08aaa36..c4ee1e8 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1,7 +1,7 @@ /* * bridge_driver.c: core driver methods for managing network * - * Copyright (C) 2006-2010 Red Hat, Inc. + * Copyright (C) 2006-2011 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -1586,16 +1586,16 @@ networkStartNetworkDaemon(struct network_driver *driver, } /* Set bridge options */ - if ((err = brSetForwardDelay(driver->brctl, network->def->bridge, - network->def->delay))) { + if (brSetForwardDelay(driver->brctl, network->def->bridge, + network->def->delay)) { networkReportError(VIR_ERR_INTERNAL_ERROR, _("cannot set forward delay on bridge '%s'"), network->def->bridge); goto err1; } - if ((err = brSetEnableSTP(driver->brctl, network->def->bridge, - network->def->stp ? 1 : 0))) { + if (brSetEnableSTP(driver->brctl, network->def->bridge, + network->def->stp ? 1 : 0)) { networkReportError(VIR_ERR_INTERNAL_ERROR, _("cannot set STP '%s' on bridge '%s'"), network->def->stp ? "on" : "off", network->def->bridge); -- 1.7.4

1 0

[libvirt] [PATCH] build: silence some clang warnings
by Eric Blake 15 Feb '11

15 Feb '11

* tools/virsh.c (cmdHelp): Kill dead variables. --- Pushing under the trivial rule. tools/virsh.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index c2d165d..50d5e33 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -589,8 +589,6 @@ static const vshCmdOptDef opts_help[] = { static int cmdHelp(vshControl *ctl, const vshCmd *cmd) { - const vshCmdDef *c; - const vshCmdGrp *g; const char *name; name = vshCommandOptString(cmd, "command", NULL); @@ -615,9 +613,9 @@ cmdHelp(vshControl *ctl, const vshCmd *cmd) return TRUE; } - if ((c = vshCmddefSearch(name))) { + if (vshCmddefSearch(name)) { return vshCmddefHelp(ctl, name); - } else if ((g = vshCmdGrpSearch(name))) { + } else if (vshCmdGrpSearch(name)) { return vshCmdGrpHelp(ctl, name); } else { vshError(ctl, _("command or command group '%s' doesn't exist"), name); -- 1.7.4

1 0

[libvirt] [PATCH] build: silence false positive clang report
by Eric Blake 14 Feb '11

14 Feb '11

clang complained that STREQ(group->controllers[i].mountPoint,...) was a NULL dereference when i==VIR_CGROUP_CONTROLLER_CPUSET, because it assumes the worst about virCgroupPathOfController. Marking the argument const doesn't yet have an effect, per this clang bug: http://llvm.org/bugs/show_bug.cgi?id=7758 So, we use sa_assert, which was designed to shut up false positives from tools like clang. * src/util/cgroup.c (virCgroupMakeGroup): Teach clang that there is no NULL dereference. --- I'm including enough context to show the STREQ that clang complained about. And yes, I'm plowing through clang reports right now - there were less than 20, so it seemed worth tackling before 0.8.8. This one is a one-liner fix (tested by re-running clang and no longer seeing a false positive, and sa_assert() is a no-op for gcc compilation), but I'd rather get an ACK before pushing. src/util/cgroup.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/util/cgroup.c b/src/util/cgroup.c index de1fd8e..47c4633 100644 --- a/src/util/cgroup.c +++ b/src/util/cgroup.c @@ -496,24 +496,27 @@ static int virCgroupMakeGroup(virCgroupPtr parent, virCgroupPtr group, VIR_DEBUG("Make group %s", group->path); for (i = 0 ; i < VIR_CGROUP_CONTROLLER_LAST ; i++) { char *path = NULL; /* Skip over controllers that aren't mounted */ if (!group->controllers[i].mountPoint) continue; rc = virCgroupPathOfController(group, i, "", &path); if (rc < 0) return rc; + /* As of Feb 2011, clang can't see that the above function + * call did not modify group. */ + sa_assert(group->controllers[i].mountPoint); VIR_DEBUG("Make controller %s", path); if (access(path, F_OK) != 0) { if (!create || mkdir(path, 0755) < 0) { rc = -errno; VIR_FREE(path); break; } if (group->controllers[VIR_CGROUP_CONTROLLER_CPUSET].mountPoint != NULL && (i == VIR_CGROUP_CONTROLLER_CPUSET || STREQ(group->controllers[i].mountPoint, group->controllers[VIR_CGROUP_CONTROLLER_CPUSET].mountPoint))) { -- 1.7.4

2 2

[libvirt] [PATCH] qemu: ignore failure of qemu -M ? on older qemu
by Eric Blake 14 Feb '11

14 Feb '11

https://bugzilla.redhat.com/show_bug.cgi?id=676563 Regression introduced in commit 2211518. * src/qemu/qemu_capabilities.c (qemuCapsProbeMachineTypes): Allow non-zero exit status. --- src/qemu/qemu_capabilities.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ca7d842..cc5552c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -171,6 +171,7 @@ qemuCapsProbeMachineTypes(const char *binary, char *output; int ret = -1; virCommandPtr cmd; + int status; /* Make sure the binary we are about to try exec'ing exists. * Technically we could catch the exec() failure, but that's @@ -186,7 +187,8 @@ qemuCapsProbeMachineTypes(const char *binary, virCommandSetOutputBuffer(cmd, &output); virCommandClearCaps(cmd); - if (virCommandRun(cmd, NULL) < 0) + /* Ignore failure from older qemu that did not understand '-M ?'. */ + if (virCommandRun(cmd, &status) < 0) goto cleanup; if (qemuCapsParseMachineTypesStr(output, machines, nmachines) < 0) -- 1.7.4

2 2

[libvirt] [PATCH] xml: avoid compiler warning
by Eric Blake 14 Feb '11

14 Feb '11

Detected by clang. * src/util/xml.c (virXPathStringLimit): Use %zd, not obsolete %Zd. --- Pushing under the trivial rule; just because glibc treats %Zd as a synonym for %zd does not mean other platforms do likewise, nor that gettext() gracefully handles it. src/util/xml.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/xml.c b/src/util/xml.c index de5e9de..ff340d8 100644 --- a/src/util/xml.c +++ b/src/util/xml.c @@ -105,7 +105,7 @@ virXPathStringLimit(const char *xpath, if (tmp != NULL && strlen(tmp) >= maxlen) { virXMLError(VIR_ERR_INTERNAL_ERROR, - _("\'%s\' value longer than %Zd bytes in virXPathStringLimit()"), + _("\'%s\' value longer than %zd bytes in virXPathStringLimit()"), xpath, maxlen); return NULL; } -- 1.7.4

1 0

[libvirt] [PATCH] nwfilter: reorder match extensions relative to state match
by Stefan Berger 14 Feb '11

14 Feb '11

This patch reorders the connlimit and comment match extensions relative to the state match (-m state); connlimit being most useful if found after a -m state --state NEW and not before it. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- src/nwfilter/nwfilter_ebiptables_driver.c | 38 ++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -862,6 +862,7 @@ err_exit: static int iptablesHandleIpHdr(virBufferPtr buf, + virBufferPtr afterStateMatch, virNWFilterHashTablePtr vars, ipHdrDataDefPtr ipHdr, int directionIn, @@ -1005,7 +1006,9 @@ iptablesHandleIpHdr(virBufferPtr buf, &ipHdr->dataConnlimitAbove)) goto err_exit; - virBufferVSprintf(buf, + /* place connlimit after potential -m state --state ... + since this is the most useful order */ + virBufferVSprintf(afterStateMatch, " -m connlimit %s --connlimit-above %s", ENTRY_GET_NEG_SIGN(&ipHdr->dataConnlimitAbove), number); @@ -1016,7 +1019,9 @@ iptablesHandleIpHdr(virBufferPtr buf, if (HAS_ENTRY_ITEM(&ipHdr->dataComment)) { printCommentVar(prefix, ipHdr->dataComment.u.string); - virBufferAddLit(buf, + /* keep comments behind everything else -- they are packet eval. + no-ops */ + virBufferAddLit(afterStateMatch, " -m comment --comment \"$" COMMENT_VARNAME "\""); } @@ -1024,6 +1029,7 @@ iptablesHandleIpHdr(virBufferPtr buf, err_exit: virBufferFreeAndReset(buf); + virBufferFreeAndReset(afterStateMatch); return 1; } @@ -1148,6 +1154,7 @@ _iptablesCreateRuleInstance(int directio char number[20]; virBuffer prefix = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER; + virBuffer afterStateMatch = VIR_BUFFER_INITIALIZER; virBufferPtr final = NULL; const char *target; const char *iptables_cmd = (isIPv6) ? ip6tables_cmd_path @@ -1188,6 +1195,7 @@ _iptablesCreateRuleInstance(int directio goto err_exit; if (iptablesHandleIpHdr(&buf, + &afterStateMatch, vars, &rule->p.tcpHdrFilter.ipHdr, directionIn, @@ -1234,6 +1242,7 @@ _iptablesCreateRuleInstance(int directio goto err_exit; if (iptablesHandleIpHdr(&buf, + &afterStateMatch, vars, &rule->p.udpHdrFilter.ipHdr, directionIn, @@ -1267,6 +1276,7 @@ _iptablesCreateRuleInstance(int directio goto err_exit; if (iptablesHandleIpHdr(&buf, + &afterStateMatch, vars, &rule->p.udpliteHdrFilter.ipHdr, directionIn, @@ -1295,6 +1305,7 @@ _iptablesCreateRuleInstance(int directio goto err_exit; if (iptablesHandleIpHdr(&buf, + &afterStateMatch, vars, &rule->p.espHdrFilter.ipHdr, directionIn, @@ -1323,6 +1334,7 @@ _iptablesCreateRuleInstance(int directio goto err_exit; if (iptablesHandleIpHdr(&buf, + &afterStateMatch, vars, &rule->p.ahHdrFilter.ipHdr, directionIn, @@ -1351,6 +1363,7 @@ _iptablesCreateRuleInstance(int directio goto err_exit; if (iptablesHandleIpHdr(&buf, + &afterStateMatch, vars, &rule->p.sctpHdrFilter.ipHdr, directionIn, @@ -1387,6 +1400,7 @@ _iptablesCreateRuleInstance(int directio goto err_exit; if (iptablesHandleIpHdr(&buf, + &afterStateMatch, vars, &rule->p.icmpHdrFilter.ipHdr, directionIn, @@ -1449,6 +1463,7 @@ _iptablesCreateRuleInstance(int directio goto err_exit; if (iptablesHandleIpHdr(&buf, + &afterStateMatch, vars, &rule->p.igmpHdrFilter.ipHdr, directionIn, @@ -1477,6 +1492,7 @@ _iptablesCreateRuleInstance(int directio goto err_exit; if (iptablesHandleIpHdr(&buf, + &afterStateMatch, vars, &rule->p.allHdrFilter.ipHdr, directionIn, @@ -1512,6 +1528,22 @@ _iptablesCreateRuleInstance(int directio rule, &buf); + if (virBufferError(&afterStateMatch)) { + virBufferFreeAndReset(&buf); + virBufferFreeAndReset(&prefix); + virBufferFreeAndReset(&afterStateMatch); + virReportOOMError(); + return -1; + } + + if (virBufferUse(&afterStateMatch)) { + char *s = virBufferContentAndReset(&afterStateMatch); + + virBufferAdd(&buf, s, -1); + + VIR_FREE(s); + } + virBufferVSprintf(&buf, " -j %s" CMD_DEF_POST CMD_SEPARATOR CMD_EXEC, @@ -1553,12 +1585,14 @@ _iptablesCreateRuleInstance(int directio err_exit: virBufferFreeAndReset(&buf); virBufferFreeAndReset(&prefix); + virBufferFreeAndReset(&afterStateMatch); return -1; exit_no_error: virBufferFreeAndReset(&buf); virBufferFreeAndReset(&prefix); + virBufferFreeAndReset(&afterStateMatch); return 0; }

2 2

[libvirt] [PATCH] conf: Fix XMl generation for smartcards
by Jiri Denemark 14 Feb '11

14 Feb '11

When formating XML for smartcard device with mode=host, libvirt generates invalid XML if the device has address info associated: <smartcard mode='host' <address type='ccid' controller='0' slot='1'/> --- src/conf/domain_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 59adf36..f2bb3aa 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7058,6 +7058,7 @@ virDomainSmartcardDefFormat(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); return 0; } + virBufferAddLit(buf, ">\n"); break; case VIR_DOMAIN_SMARTCARD_TYPE_HOST_CERTIFICATES: -- 1.7.4

2 2

[libvirt] Currently in freeze for 0.8.8, rc2 available
by Daniel Veillard 14 Feb '11

14 Feb '11

Just a reminder that we are in feature freeze for 0.8.8, I just uploaded a new candidate version: ftp://libvirt.org/libvirt/libvirt-0.8.8-rc2.tar.gz it does fix the error messages I had on linux configure, but I'm not sure the issues on Win32 and OS-X are all sorted out yet, so please check. Note that I didn't tried to update the localizations from the fedora side yet so those tarballs may be a little off from that perspective. thanks ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

7 17

[libvirt] Strange periodic failures of the commandtest case
by Daniel P. Berrange 14 Feb '11

14 Feb '11

I'm getting periodic failures of the 'commandtest' case where the diff is > DAEMON:no -- < DAEMON:yes For test cases 'test3' through to 'test15', except 'test'4. Tests 1, 2, 4, 16, 17, 18 are all unaffected. I can never reproduce it when I run just that one test case manually, but the automated builds I'm doing hit it > 50% of the time so it is clearly some kind of race condition. The line of code that's getting confused is this fprintf(log, "DAEMON:%s\n", getpgrp() == getsid(0) ? "yes" : "no"); but I'm not clear how this can be going wrong. Ideas ? Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

2 2

[libvirt] [PATCH 0/2] Fix cpuMhz of virNodeGetInfo() don't returns maximum cpu frequency
by Minoru Usui 14 Feb '11

14 Feb '11

cpuMhz of virNodeGetInfo() should return maximum cpu frequency. (See. http://fossplanet.com/f13/%5Blibvirt%5D-%5Brfd%5D-add-modify-some-api-funct…) virNodeGetInfo() gets it from "cpu MHz" of /proc/cpuinfo, but this value is scaled by cpu power saving feature. This patch gets from /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq, if exist. And if this file doesn't exist, it gets from /proc/cpuinfo. -- Minoru Usui <usui(a)mxm.nes.nec.co.jp>

3 8

[libvirt] [PATCH] Fix cleanup on VM state after failed QEMU startup
by Daniel P. Berrange 14 Feb '11

14 Feb '11

Commit 9962e406c664ed5521f5aca500c860a331cb3979 introduced a problem where if the VM failed to startup, it would not be correctly cleaned up. Amongst other things the SELinux security label would not be removed, which prevents the VM from ever starting again. The virDomainIsActive() check at the start of qemudShutdownVMDaemon checks for vm->def->id not being -1. By moving the assignment of the VM id to the start of qemudStartVMDaemon, we can ensure cleanup will occur on failure * src/qemu/qemu_driver.c: Move initialization of 'vm->def->id' so that qemudShutdownVMDaemon() will process the shutdown --- src/qemu/qemu_driver.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 21d7779..d7c806b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2652,6 +2652,8 @@ static int qemudStartVMDaemon(virConnectPtr conn, if (virDomainObjSetDefTransient(driver->caps, vm, true) < 0) goto cleanup; + vm->def->id = driver->nextvmid++; + /* Must be run before security labelling */ DEBUG0("Preparing host devices"); if (qemuPrepareHostDevices(driver, vm->def) < 0) @@ -2818,7 +2820,6 @@ static int qemudStartVMDaemon(virConnectPtr conn, } DEBUG0("Building emulator command line"); - vm->def->id = driver->nextvmid++; if (!(cmd = qemuBuildCommandLine(conn, driver, vm->def, priv->monConfig, priv->monJSON != 0, qemuCmdFlags, migrateFrom, stdin_fd, -- 1.7.4

3 3

[libvirt] [PATCH] libxenlight driver
by Jim Fehlig 14 Feb '11

14 Feb '11

Hi All, Here's a first cut of libxenlight driver for libvirt. The driver is stateful and provides functionality for managed (persistent) domains. The driver only maintains state for and manages domains under its control, ignoring domains created by other libxenlight clients, e.g. xl. As you can see, a fair number of the driver functions are implemented, at least what I think constitutes a minimal set for upstream inclusion. Are there any required functions missing? I'm still looking into a problem with failure to restart a domain, persistent or otherwise. E.g. virsh start|create domU; virsh shutdown domU; virsh start|create domU. The second start/create fails in libxenlight, but I've not yet tracked down the cause. Also, I've not yet handled restart of libvirtd if domains are running - not sure if this is a requirement for initial inclusion. TIA for your review and comment. Regards, Jim

2 1

[libvirt] [PATCH] libvirt-qemu: Fix enum type declaration
by Jiri Denemark 14 Feb '11

14 Feb '11

--- Ugh! Sorry for this stupid typo. include/libvirt/libvirt-qemu.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/libvirt/libvirt-qemu.h b/include/libvirt/libvirt-qemu.h index 9257c2f..f172eff 100644 --- a/include/libvirt/libvirt-qemu.h +++ b/include/libvirt/libvirt-qemu.h @@ -20,7 +20,7 @@ extern "C" { # endif -enum { +typedef enum { VIR_DOMAIN_QEMU_MONITOR_COMMAND_DEFAULT = 0, VIR_DOMAIN_QEMU_MONITOR_COMMAND_HMP = (1 << 0), /* cmd is in HMP */ } virDomainQemuMonitorCommandFlags; -- 1.7.4

2 2

[libvirt] [PATCH] osx: fix broken enum typedef declaration breaking compilation on osx
by Justin Clift 14 Feb '11

14 Feb '11

As pointed out by Daniel Berrange, this broken enum declaration was the cause of "duplicate symbol _virDomainQemuMonitorCommandFlags ..." errors on OSX. --- include/libvirt/libvirt-qemu.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/libvirt/libvirt-qemu.h b/include/libvirt/libvirt-qemu.h index 9257c2f..f172eff 100644 --- a/include/libvirt/libvirt-qemu.h +++ b/include/libvirt/libvirt-qemu.h @@ -20,7 +20,7 @@ extern "C" { # endif -enum { +typedef enum { VIR_DOMAIN_QEMU_MONITOR_COMMAND_DEFAULT = 0, VIR_DOMAIN_QEMU_MONITOR_COMMAND_HMP = (1 << 0), /* cmd is in HMP */ } virDomainQemuMonitorCommandFlags; -- 1.7.4.1

1 1

[libvirt] [PATCH 0/3] Basic libxenlight driver
by Markus Groß 14 Feb '11

14 Feb '11

Hi, I started working on a libxenlight driver for libvirt a few weeks ago. By that time I didn't knew Jim Fehlig was also working on a driver for that api: http://article.gmane.org/gmane.comp.emulators.libvirt/33024 Because I already did some work and there is no driver from Jim yet, I am posting my current version of the driver here. It is a driver for the libxl (libxenlight) interface from the upcoming xen 4.1. This driver is divided into 3 patches, the first adds the driver without changing anything in libvirt, the second one integrates it into the build system of libvirt. The last one is self explanatory. However there are a few caveats. 1. The driver offers only basic functionality like: suspend, resume, pinvcpu, etc. create, restore, definexml and others are not yet implemented. 2. The driver supports libvirtxml <-> xen-xm conversion, thanks to the unified xen driver which already offered this functionality. But since this driver is not part of xen unified, I had to copy this functionality, rather than reusing it. 3. To compile libvirt with this driver, there is a new flag --with-xenlight. To fix some linker errors, libvirt has to link against several additional libraries now which are used in xen's libxenlight. These libraries are not directly used within libvirt, but I believe that some of them are GPL licensed, so that could be an issue. 4. To compile the driver you may need to copy the libxl_utils.h from tools/libxl of your xen-source directory to an include dir in your PATH. Right now this file is not copied when installing xen, but I will talk with the xen developers about that. Please let me know what you think about it. Thanks, Markus Markus Groß (3): Add basic libxenlight driver Integrate libxenlight driver into libvirt Add myself to AUTHORS AUTHORS | 1 + configure.ac | 35 +- include/libvirt/virterror.h | 1 + po/POTFILES.in | 2 + src/Makefile.am | 25 + src/driver.h | 3 +- src/libvirt.c | 13 + src/util/virterror.c | 3 + src/xenlight/xl_driver.c | 948 ++++++++++++++++++ src/xenlight/xl_driver.h | 46 + src/xenlight/xl_driver_private.h | 52 + src/xenlight/xl_utils.c | 1969 ++++++++++++++++++++++++++++++++++++++ src/xenlight/xl_utils.h | 90 ++ tools/virsh.c | 3 + 14 files changed, 3188 insertions(+), 3 deletions(-) create mode 100644 src/xenlight/xl_driver.c create mode 100644 src/xenlight/xl_driver.h create mode 100644 src/xenlight/xl_driver_private.h create mode 100644 src/xenlight/xl_utils.c create mode 100644 src/xenlight/xl_utils.h -- 1.7.4

3 7

[libvirt] [PATCH 0/2] Give each virtual network bridge its own fixed MAC address
by Laine Stump 14 Feb '11

14 Feb '11

This fixes https://bugzilla.redhat.com/show_bug.cgi?id=609463 As usual for me, this series has a problem searching for a more elegant solution. See PATCH 2/2 for details. Is it too late to put this in 0.8.8? (assuming a solution to that problem, of course).

4 10

[libvirt] Entering freeze for libvirt-0.8.8
by Daniel Veillard 13 Feb '11

13 Feb '11

We're entering the week freeze for 0.8.8, so let's delay new feature until the end of next week and let's focuse on bug fixes. I have put an initial release candidate at: ftp://libvirt.org/libvirt/libvirt-0.8.8-rc1.tar.gz it seems to compile and work fine for me. there is however a small problem at configure time: ------------------------------------- thinkpad:~/tmp/libvirt-0.8.8 -> ./autogen.sh --system ; make Running ./configure with --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib fatal: Not a git repository (or any of the parent directories): .git fatal: Cannot open 'bootstrap.conf': No such file or directory usage: git diff [--no-index] <path> <path> /home/veillard/tmp/libvirt-0.8.8/tmpwrk2661/archive /home/veillard/tmp/libvirt-0.8.8/tmpwrk2661/archive /home/veillard/tmp/libvirt-0.8.8/tmpwrk2661/archive Copying file m4/codeset.m4 ------------------------------------- Seems some git command is launched but errors out, that's normal but it should not pollute the output (there is also the extra paths output but that's due to the fact that I use CDPATH env variable and as a result "cd dir" is not silent when successful but output the target dir). Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

6 9

[libvirt] [PATCH] Update src/README
by Matthias Bolte 12 Feb '11

12 Feb '11

Add missing subdirectories. --- src/README | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/README b/src/README index 75acbe0..ad171a5 100644 --- a/src/README +++ b/src/README @@ -20,6 +20,8 @@ There are two core shared modules to be aware of: files used by the public API. This directory is only in the include path for driver implementation modules + * vmx/ - VMware VMX config handling (used by esx/ and vmware/) + Then there are the hypervisor implementations: @@ -33,7 +35,9 @@ Then there are the hypervisor implementations: * test/ - A "mock" driver for testing * uml/ - User Mode Linux * vbox/ - Virtual Box using native API + * vmware/ - VMware Workstation and Player using the vmrun tool * xen/ - Xen using hypercalls, XenD SEXPR & XenStore + * xenapi/ - Xen using libxenserver Finally some secondary drivers that are shared for several HVs. @@ -41,8 +45,10 @@ Currently these are used by LXC, OpenVZ, QEMU, UML and Xen drivers. The ESX, OpenNebula, Power Hypervisor, Remote, Test & VirtualBox drivers all implement the secondary drivers directly + * cpu/ - CPU feature management * interface/ - Host network interface management * network/ - Virtual NAT networking + * nwfilter/ - Network traffic filtering rules * node_device/ - Host device enumeration * secret/ - Secret management * security/ - Mandatory access control drivers -- 1.7.0.4

2 2

[libvirt] [PATCH] Avoid pthread_sigmask on Win32 platforms
by Daniel P. Berrange 12 Feb '11

12 Feb '11

Win32 doesn't have a concept of signal masks so disable that code. It is unclear how SIGINT is delivered (if at all) on Win32, so this might further work to provide an alternative to pthread_sigmask * tools/virsh.c: Avoid pthread_sigmask on Win32 --- tools/virsh.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index be2cd67..6d9861f 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -3489,15 +3489,17 @@ doMigrate (void *opaque) const char *migrateuri; const char *dname; int flags = 0, found; - sigset_t sigmask, oldsigmask; vshCtrlData *data = opaque; vshControl *ctl = data->ctl; const vshCmd *cmd = data->cmd; +#if HAVE_PTHREAD_SIGMASK + sigset_t sigmask, oldsigmask; sigemptyset(&sigmask); sigaddset(&sigmask, SIGINT); if (pthread_sigmask(SIG_BLOCK, &sigmask, &oldsigmask) < 0) goto out_sig; +#endif if (!vshConnectionUsability (ctl, ctl->conn)) goto out; @@ -3563,8 +3565,10 @@ doMigrate (void *opaque) } out: +#if HAVE_PTHREAD_SIGMASK pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL); out_sig: +#endif if (dom) virDomainFree (dom); ignore_value(safewrite(data->writefd, &ret, sizeof(ret))); } @@ -3607,12 +3611,16 @@ cmdMigrate (vshControl *ctl, const vshCmd *cmd) struct sigaction old_sig_action; virDomainJobInfo jobinfo; bool verbose = false; - sigset_t sigmask, oldsigmask; int timeout; struct timeval start, curr; bool live_flag = false; - vshCtrlData data; +#if HAVE_PTHREAD_SIGMASK + sigset_t sigmask, oldsigmask; + + sigemptyset(&sigmask); + sigaddset(&sigmask, SIGINT); +#endif if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; @@ -3665,8 +3673,6 @@ cmdMigrate (vshControl *ctl, const vshCmd *cmd) pollfd.fd = p[0]; pollfd.events = POLLIN; pollfd.revents = 0; - sigemptyset(&sigmask); - sigaddset(&sigmask, SIGINT); GETTIMEOFDAY(&start); while (1) { @@ -3709,9 +3715,13 @@ repoll: } if (verbose) { +#if HAVE_PTHREAD_SIGMASK pthread_sigmask(SIG_BLOCK, &sigmask, &oldsigmask); +#endif ret = virDomainGetJobInfo(dom, &jobinfo); +#if HAVE_PTHREAD_SIGMASK pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL); +#endif if (ret == 0) print_job_progress(jobinfo.dataRemaining, jobinfo.dataTotal); } -- 1.7.4

3 9

[libvirt] [PATCH] build: avoid problems with autogen.sh runs from tarball
by Eric Blake 12 Feb '11

12 Feb '11

Introduced by commit fac97c65c distributing cfg.mk, which previously could blindly assume it was in a git checkout. * cfg.mk (_update_required): Also check for .git. * autogen.sh: Don't run bootstrap from a tarball. Reported by Daniel Veillard. --- This should fix the issues of mistakenly running git on a tarball, as reported here: https://www.redhat.com/archives/libvir-list/2011-February/msg00371.html autogen.sh | 27 +++++++++++++++------------ cfg.mk | 1 + 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/autogen.sh b/autogen.sh index ff13fd1..b64521e 100755 --- a/autogen.sh +++ b/autogen.sh @@ -8,8 +8,8 @@ THEDIR=`pwd` cd "$srcdir" test -f src/libvirt.c || { - echo "You must run this script in the top-level libvirt directory" - exit 1 + echo "You must run this script in the top-level libvirt directory" + exit 1 } @@ -52,16 +52,19 @@ bootstrap_hash() # Also, running 'make rpm' tends to litter the po/ directory, and some people # like to run 'git clean -x -f po' to fix it; but only ./bootstrap regenerates # the required file po/Makevars. -curr_status=.git-module-status -t=$(bootstrap_hash; git diff .gnulib) -if test "$t" = "$(cat $curr_status 2>/dev/null)" \ - && test -f "po/Makevars"; then - # good, it's up to date, all we need is autoreconf - autoreconf -if -else - echo running bootstrap$no_git... - ./bootstrap$no_git --bootstrap-sync && bootstrap_hash > $curr_status \ - || { echo "Failed to bootstrap, please investigate."; exit 1; } +# Only run bootstrap from a git checkout, never from a tarball. +if test -d .git; then + curr_status=.git-module-status + t=$(bootstrap_hash; git diff .gnulib) + if test "$t" = "$(cat $curr_status 2>/dev/null)" \ + && test -f "po/Makevars"; then + # good, it's up to date, all we need is autoreconf + autoreconf -if + else + echo running bootstrap$no_git... + ./bootstrap$no_git --bootstrap-sync && bootstrap_hash > $curr_status \ + || { echo "Failed to bootstrap, please investigate."; exit 1; } + fi fi cd "$THEDIR" diff --git a/cfg.mk b/cfg.mk index 120f452..4bbeb96 100644 --- a/cfg.mk +++ b/cfg.mk @@ -507,6 +507,7 @@ ifeq (0,$(MAKELEVEL)) _submodule_hash = sed 's/^[ +-]//;s/ .*//' _update_required := $(shell \ cd '$(srcdir)'; \ + test -d .git || { echo 0; exit; }; \ test -f po/Makevars || { echo 1; exit; }; \ actual=$$(git submodule status | $(_submodule_hash); \ git hash-object bootstrap.conf; \ -- 1.7.4

2 2

[libvirt] [PATCH] qemu: Report a more informative error for missing cgroup controllers
by Matthias Bolte 12 Feb '11

12 Feb '11

Patch attached. Matthias

2 2

[libvirt] [PATCH] docs: Distribute XSLT files to generate HACKING
by Matthias Bolte 12 Feb '11

12 Feb '11

Patch attached. Matthias

2 2

[libvirt] Unix socket credentials on OSX?
by Justin Clift 12 Feb '11

12 Feb '11

Hi all, Interestingly, MacOS X has a working PolicyKit port, providing version 0.96. Attempting to build libvirt 0.8.7 against it gives this error though: libvirtd.c:1298:4: error: #error "UNIX socket credentials not supported/implemented on this platform yet..." Does anyone have an idea of whether implementing Unix socket credentials for OSX would be a big task, or a small one, or ? I'm thinking this could be what's needed to let qemu+ssh:// connections from OSX to RHEL/Fedora servers work. Not critical at all, but would be nice, etc. :) Regards and best wishes, Justin Clift

1 0

[libvirt] [PATCH v2] xen: Prevent updating device when attaching a device
by Osier Yang 12 Feb '11

12 Feb '11

When attaching a device that already exists, xend driver updates the device with "device_configure", it causes problems (e.g. for disk device, 'device_configure' only can be used to update device like CDROM), on the other hand, we provide additional API (virDomainUpdateDevice) to update device, this fix is to raise up errors instead of updating the existed device which is not CDROM device. Changes from v1 to v2: - allow update CDROM * src/xen/xend_internal.c --- src/xen/xend_internal.c | 42 +++++++++++++++++++++++++++++++++++++----- 1 files changed, 37 insertions(+), 5 deletions(-) diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index cd30336..bc23595 100644 --- a/src/xen/xend_internal.c +++ b/src/xen/xend_internal.c @@ -3965,6 +3965,7 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, virDomainDefPtr def = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; char class[8], ref[80]; + char *target = NULL; if ((domain == NULL) || (domain->conn == NULL) || (domain->name == NULL)) { virXendError(VIR_ERR_INVALID_ARG, __FUNCTION__); @@ -4029,6 +4030,13 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, STREQ(def->os.type, "hvm") ? 1 : 0, priv->xendConfigVersion, 1) < 0) goto cleanup; + + if (dev->data.disk->device != VIR_DOMAIN_DISK_DEVICE_CDROM) { + if (!(target = strdup(dev->data.disk->dst))) { + virReportOOMError(); + goto cleanup; + } + } break; case VIR_DOMAIN_DEVICE_NET: @@ -4038,6 +4046,14 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, STREQ(def->os.type, "hvm") ? 1 : 0, priv->xendConfigVersion, 1) < 0) goto cleanup; + + char macStr[VIR_MAC_STRING_BUFLEN]; + virFormatMacAddr(dev->data.net->mac, macStr); + + if (!(target = strdup(macStr))) { + virReportOOMError(); + goto cleanup; + } break; case VIR_DOMAIN_DEVICE_HOSTDEV: @@ -4046,6 +4062,17 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, if (xenDaemonFormatSxprOnePCI(dev->data.hostdev, &buf, 0) < 0) goto cleanup; + + virDomainDevicePCIAddress PCIAddr; + + PCIAddr = dev->data.hostdev->source.subsys.u.pci; + virAsprintf(&target, "PCI device: %.4x:%.2x:%.2x", PCIAddr.domain, + PCIAddr.bus, PCIAddr.slot); + + if (target == NULL) { + virReportOOMError(); + goto cleanup; + } } else { virXendError(VIR_ERR_NO_SUPPORT, "%s", _("unsupported device type")); @@ -4065,17 +4092,22 @@ xenDaemonAttachDeviceFlags(virDomainPtr domain, const char *xml, /* device doesn't exist, define it */ ret = xend_op(domain->conn, domain->name, "op", "device_create", "config", sexpr, NULL); - } - else { - /* device exists, attempt to modify it */ - ret = xend_op(domain->conn, domain->name, "op", "device_configure", - "config", sexpr, "dev", ref, NULL); + } else { + if (dev->data.disk->device != VIR_DOMAIN_DISK_DEVICE_CDROM) { + virXendError(VIR_ERR_OPERATION_INVALID, + _("target '%s' already exists"), target); + } else { + /* device exists, attempt to modify it */ + ret = xend_op(domain->conn, domain->name, "op", "device_configure", + "config", sexpr, "dev", ref, NULL); + } } cleanup: VIR_FREE(sexpr); virDomainDefFree(def); virDomainDeviceDefFree(dev); + VIR_FREE(target); return ret; } -- 1.7.3.2

3 5

[libvirt] [PATCH] build: fix cygwin strerror_r failure
by Eric Blake 11 Feb '11

11 Feb '11

Building the 0.8.8 release candidate on cygwin produced this compiler warning, which is indicative of catastrophic failure on any attempt to print an error message with errno turned to a string: CC strerror_r.lo strerror_r.c: In function 'rpl_strerror_r': strerror_r.c:67: warning: assignment makes integer from pointer without a cast This has been fixed in gnulib. * .gnulib: Update to latest, for strerror_r fix. * src/util/memory.c (includes): Satisfy 'make syntax-check'. --- Pushing this under the build-breaker rule, even if cygwin is the only platform where the build was broken. * .gnulib 2f41af6...4cce65c (113): > doc: update users.txt > doc: update users.txt > doc: update users.txt > gnulib-tool: Make copyright notice adjustment more robust. > New module 'towctrans'. > New module 'wctrans'. > New module 'iswctype'. > New module 'wctype'. > wctype-h: Ensure wctype_t and wctrans_t are defined. > flock: fix license typo > Split large sed scripts, for HP-UX sed. > stdlib: improve random_r modularization > stdlib: don't depend on stdint > getloadavg: don't depend on c-strtod, cloexec, fcntl-safer > di-set.h, ino-map.h: add multiple-inclusion guard > iswblank: Ensure declaration on glibc systems. > New module 'iswblank'. > di-set tests: Refactor. > ino-map tests: Refactor. > di-set: add "const" to a cast > ChangeLog: fix my old entry to give credit to Bastien > update from texinfo > Rename module 'wctype' to 'wctype-h'. > New module 'wcswidth'. > New module 'wcstok'. > New module 'wcsstr'. > New module 'wcspbrk'. > New module 'wcsspn'. > New module 'wcscspn'. > New module 'wcsrchr'. > New module 'wcschr'. > New module 'wcsdup'. > New module 'wcsxfrm'. > New module 'wcscoll'. > New module 'wcsncasecmp'. > New module 'wcscasecmp'. > New module 'wcsncmp'. > New module 'wcscmp'. > New module 'wcsncat'. > New module 'wcscat'. > New module 'wcpncpy'. > New module 'wcsncpy'. > New module 'wcpcpy'. > New module 'wcscpy'. > New module 'wcsnlen'. > New module 'wcslen'. > New module 'wmemset'. > New module 'wmemmove'. > New module 'wmemcpy'. > New module 'wmemcmp'. > di-set, ino-map: new modules, from coreutils > getloadavg: merge minor changes from Emacs > Allow multiple gnulib generated replacements to coexist. > libposix: Revert the unreviewed part of yesterday's big merge. > unsetenv: work around Haiku issues > libposix: Add _HEADERS primaries to posix modules. Modify gnulib-tool to strip them from generated Makefile.am-s where they are not needed. Also, replace M4 macro prefixes when requested. Finally, omit calls to error() for libposix. > strerror_r-posix: port to cygwin > New module 'wmemchr', part 3. > New module 'wmemchr', part 2. > New module 'wmemchr'. > fdopendir: detect FreeBSD bug > stdbool: do not define HAVE_STDBOOL_H > wcsnrtombs: Prepare for new module wwcsnrtombs. > wcsrtombs: Prepare for new module wwcsrtombs. > mbsnrtowcs: Prepare for new module mbsnrtowwcs. > mbsrtowcs: Prepare for new module mbsrtowwcs. > vasnprintf: Reduce use of malloc for small format strings. > autoudpate > update from texinfo > dup2: work around Haiku bug > doc: off_t is not available in eglibc 2.11.2 stdio.h. > ignore-value: add missing test dependency > mktime: clarify long_int width checking > ignore-value: Fix self-test. > TYPE_MAXIMUM: avoid theoretically undefined behavior > mktime: #undef mktime before #defining it > mktime: systematically normalize tm_isdst comparisons > mktime: fix some integer overflow issues and sidestep the rest > mktime: avoid infinite loop > rename, unlink, same-inode: Relicense. > mktime: avoid problems on NetBSD 5 / i386 > autoupdate > mktime: fix misspelling in comment > move-if-change: cope with concurrent mv of identical file. > users.txt: Mention sharutils. > doc: Update users.txt > Prepare for supporting FreeBSD 10. > Prepare for supporting FreeBSD 10. > vma-iter, get-rusage-as: Add OpenBSD support. > more make vars for makeinfo > regen > fcntl: work around Haiku F_DUPFD bugs > autoupdate > Enable memory leak tests on AIX. > Tests for module 'get-rusage-data'. > New module 'get-rusage-data'. > get-rusage-as: Allow for easier testing. > vma-iter: Treat Haiku like BeOS. > c-stack: fix regression on cygwin when libsigsegv is present > autoupdate > vma-iter: Avoid empty intervals. > u64: remove unnecessary #include > Allow the user to avoid the GNULIB_TEST_* macros. > New module 'vma-iter'. > uninorm: Tweak includes. > get-rusage-as: Improve on NetBSD. > xreadlink.h: remove unnecessary #include > maint.mk: add syntax-check rule: detect unnecessary #include <stddef.h> > get-rusage-as: Fix bug. > wctype: Ensure valid C syntax. > wctype: Ensure valid C syntax. > getopt: omit HAVE_OPTRESET, HAVE_GETOPT_CLIP from config.h > gl_CHECK_NEXT_HEADERS implies AC_CHECK_HEADERS_ONCE .gnulib | 2 +- src/util/memory.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gnulib b/.gnulib index 2f41af6..4cce65c 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 2f41af65087fb2460779bc4e7fb62453f79ebae3 +Subproject commit 4cce65cb2f10936f13760625f39d532564984fde diff --git a/src/util/memory.c b/src/util/memory.c index 03e2e80..bfa32a8 100644 --- a/src/util/memory.c +++ b/src/util/memory.c @@ -1,7 +1,7 @@ /* * memory.c: safer memory allocation * - * Copyright (C) 2010 Red Hat, Inc. + * Copyright (C) 2010-2011 Red Hat, Inc. * Copyright (C) 2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -22,7 +22,6 @@ #include <config.h> #include <stdlib.h> -#include <stddef.h> #include "memory.h" #include "ignore-value.h" -- 1.7.4

1 0

[libvirt] [PATCH] qemu: Fix escape_monitor(escape_shell(command))
by Philipp Hahn 11 Feb '11

11 Feb '11

Suspending a VM which contains shell meta characters doesn't work with libvirt-0.8.7: /var/log/libvirt/qemu/andreas_231-ne\ doch\ nicht.log: sh: -c: line 0: syntax error near unexpected token `doch' sh: -c: line 0: `cat | { dd bs=4096 seek=1 if=/dev/null && dd bs=1048576; } Although target="andreas_231-ne doch nicht" contains shell meta characters (here: blanks), they are not properly escaped by src/qemu/qemu_monitor_{json,text}.c#qemuMonitor{JSON,Text}MigrateToFile() First, the filename needs to be properly escaped for the shell, than this command line has to be properly escaped for qemu again. For this to work, remove the old qemuMonitorEscapeArg() wrapper, rename qemuMonitorEscape() to it removing the handling for shell=TRUE, and implement a new qemuMonitorEscapeShell() returning strings using single quotes. Using double quotes or escaping special shell characters with backslashes would also be possible, but the set of special characters heavily depends on the concrete shell (dsh, bash, zsh) and its setting (history expansion, interactive use, ...) Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- src/qemu/qemu_monitor.c | 65 +++++++++++++++++++++++++++------------------- 1 files changed, 38 insertions(+), 27 deletions(-)

2 1

[libvirt] [RFC PATCH 0/6] Switch over qemu command line capabilities to virBitmap
by Jiri Denemark 11 Feb '11

11 Feb '11

There are two main reasons behind this patchset: - we are getting very close to 64 flags which is the maximum we can use with unsigned long long - by using LL constants in enum we already violates C99 constraint that enum values have to fit into int This is a very conflict-prone patchset so I'd like to get some feedback on the ideas and naming used so that this could possible be among the first patches pushed after 0.8.8 release. Patches 2/6 and 4/6 are fully and 3/6 mostly mechanical. 5/6 and 6/6 need to be squashed into a single patch but are provided separately for easier review. Jiri Denemark (6): util: Add API for converting virBitmap into printable string qemu: Rename QEMUD_CMD_FLAG_* to QEMU_CAPS_* qemu: Use helper functions for handling cmd line capabilities qemu: Rename qemud\?CmdFlags to qemuCaps qemu: Switch over command line capabilities to virBitmap tests: Use virBitmap for qemu command line caps src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 238 +++++++++----- src/qemu/qemu_capabilities.h | 150 +++++---- src/qemu/qemu_command.c | 384 +++++++++++----------- src/qemu/qemu_command.h | 30 +- src/qemu/qemu_driver.c | 106 ++++--- src/qemu/qemu_hotplug.c | 162 +++++----- src/qemu/qemu_hotplug.h | 32 +- src/util/bitmap.c | 32 ++- src/util/bitmap.h | 3 + tests/qemuargv2xmltest.c | 2 +- tests/qemuhelptest.c | 745 +++++++++++++++++++++--------------------- tests/qemuxml2argvtest.c | 470 +++++++++++++------------- 13 files changed, 1249 insertions(+), 1106 deletions(-) -- 1.7.4

3 20

[libvirt] [PATCH] Imprint all logs with version + package build information
by Daniel P. Berrange 11 Feb '11

11 Feb '11

The logging functions are enhanced so that immediately prior to the first log message being printed to any output channel, the libvirt package version will be printed. eg $ LIBVIRT_DEBUG=1 virsh 18:13:28.013: 17536: info : libvirt version: 0.8.7 18:13:28.013: 17536: debug : virInitialize:361 : register drivers ... The 'configure' script gains two new arguments which can be used as --with-packager="Fedora Project, x86-01.phx2.fedoraproject.org, 01-27-2011-18:00:10" --with-packager-version="1.fc14" to allow distros to append a custom string with package specific data. The RPM specfile is modified so that it appends the RPM version, the build host, the build date and the packager name. eg $ LIBVIRT_DEBUG=1 virsh 18:14:52.086: 17551: info : libvirt version: 0.8.7, package: 1.fc13 (Fedora Project, x86-01.phx2.fedoraproject.org, 01-27-2011-18:00:10) 18:14:52.086: 17551: debug : virInitialize:361 : register drivers Thus when distro packagers receive bug reports they can clearly see what version was in use, even if the bug reporter mistakenly or intentionally lies about version/builds * src/util/logging.c: Output version data prior to first log message * libvirt.spec.in: Include RPM release, date, hostname & packager * configure.ac: Add --with-packager & --with-packager-version args --- configure.ac | 19 +++++++++++ libvirt.spec.in | 9 +++++ src/util/logging.c | 91 +++++++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 104 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 8a4083f..3cd824a 100644 --- a/configure.ac +++ b/configure.ac @@ -29,6 +29,25 @@ AC_SUBST([LIBVIRT_VERSION]) AC_SUBST([LIBVIRT_VERSION_INFO]) AC_SUBST([LIBVIRT_VERSION_NUMBER]) +AC_ARG_WITH([packager], + [AS_HELP_STRING([--with-packager], + [Extra packager name])], + [],[]) +AC_ARG_WITH([packager-version], + [AS_HELP_STRING([--with-packager-version], + [Extra packager version])], + [],[]) +if test "x$with_packager" != "xno" +then + AC_DEFINE_UNQUOTED([PACKAGER], ["$with_packager"], + [Extra package name]) +fi +if test "x$with_packager_version" != "xno" +then + AC_DEFINE_UNQUOTED([PACKAGER_VERSION], ["$with_packager_version"], + [Extra package version]) +fi + dnl Required minimum versions of all libs we depend on LIBXML_REQUIRED="2.6.0" GNUTLS_REQUIRED="1.0.25" diff --git a/libvirt.spec.in b/libvirt.spec.in index 0a2d10e..da1fe4a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -592,6 +592,13 @@ of recent versions of Linux (and other OSes). %define _without_dtrace --without-dtrace %endif +%define when %(date +"%%m-%%d-%%Y-%%H:%%M:%%S") +%define where %(hostname) +%define who %{?packager}%{!?packager:Unknown} +%define with_packager --with-packager="%{who}, %{when}, %{where}" +%define with_packager_version --with-packager-version="%{release}" + + %configure %{?_without_xen} \ %{?_without_qemu} \ %{?_without_openvz} \ @@ -626,6 +633,8 @@ of recent versions of Linux (and other OSes). %{?_without_macvtap} \ %{?_without_audit} \ %{?_without_dtrace} \ + %{with_packager} \ + %{with_packager_version} \ --with-qemu-user=%{qemu_user} \ --with-qemu-group=%{qemu_group} \ --with-init-script=redhat \ diff --git a/src/util/logging.c b/src/util/logging.c index a80c3e3..85406bf 100644 --- a/src/util/logging.c +++ b/src/util/logging.c @@ -108,6 +108,7 @@ static int virLogNbFilters = 0; * after filtering, multiple output can be used simultaneously */ struct _virLogOutput { + bool logVersion; void *data; virLogOutputFunc f; virLogCloseFunc c; @@ -490,6 +491,7 @@ int virLogDefineOutput(virLogOutputFunc f, virLogCloseFunc c, void *data, goto cleanup; } ret = virLogNbOutputs++; + virLogOutputs[ret].logVersion = true; virLogOutputs[ret].f = f; virLogOutputs[ret].c = c; virLogOutputs[ret].data = data; @@ -501,6 +503,55 @@ cleanup: return ret; } +static int +virLogFormatString(char **msg, + const char *funcname, + long long linenr, + struct tm *time_info, + struct timeval *cur_time, + int priority, + const char *str) +{ + int ret; + if ((funcname != NULL)) { + ret = virAsprintf(msg, "%02d:%02d:%02d.%03d: %d: %s : %s:%lld : %s\n", + time_info->tm_hour, time_info->tm_min, + time_info->tm_sec, (int) cur_time->tv_usec / 1000, + virThreadSelfID(), + virLogPriorityString(priority), funcname, linenr, str); + } else { + ret = virAsprintf(msg, "%02d:%02d:%02d.%03d: %d: %s : %s\n", + time_info->tm_hour, time_info->tm_min, + time_info->tm_sec, (int) cur_time->tv_usec / 1000, + virThreadSelfID(), + virLogPriorityString(priority), str); + } + return ret; +} + +static int +virLogVersionString(char **msg, + struct tm *time_info, + struct timeval *cur_time) +{ +#ifdef PACKAGER_VERSION +# ifdef PACKAGER +# define LOG_VERSION_STRING \ + "libvirt version: " VERSION ", package: " PACKAGER_VERSION " (" PACKAGER ")" +# else +# define LOG_VERSION_STRING \ + "libvirt version: " VERSION ", package: " PACKAGER_VERSION +# endif +#else +# define LOG_VERSION_STRING \ + "libvirt version: " VERSION +#endif + + return virLogFormatString(msg, NULL, 0, + time_info, cur_time, + VIR_LOG_INFO, LOG_VERSION_STRING); +} + /** * virLogMessage: * @category: where is that message coming from @@ -516,6 +567,7 @@ cleanup: */ void virLogMessage(const char *category, int priority, const char *funcname, long long linenr, int flags, const char *fmt, ...) { + static bool logVersionStderr = true; char *str = NULL; char *msg; struct timeval cur_time; @@ -547,19 +599,9 @@ void virLogMessage(const char *category, int priority, const char *funcname, gettimeofday(&cur_time, NULL); localtime_r(&cur_time.tv_sec, &time_info); - if ((funcname != NULL)) { - ret = virAsprintf(&msg, "%02d:%02d:%02d.%03d: %d: %s : %s:%lld : %s\n", - time_info.tm_hour, time_info.tm_min, - time_info.tm_sec, (int) cur_time.tv_usec / 1000, - virThreadSelfID(), - virLogPriorityString(priority), funcname, linenr, str); - } else { - ret = virAsprintf(&msg, "%02d:%02d:%02d.%03d: %d: %s : %s\n", - time_info.tm_hour, time_info.tm_min, - time_info.tm_sec, (int) cur_time.tv_usec / 1000, - virThreadSelfID(), - virLogPriorityString(priority), str); - } + ret = virLogFormatString(&msg, funcname, linenr, + &time_info, &cur_time, + priority, str); VIR_FREE(str); if (ret < 0) { /* apparently we're running out of memory */ @@ -578,12 +620,31 @@ void virLogMessage(const char *category, int priority, const char *funcname, virLogStr(msg, len); virLogLock(); for (i = 0; i < virLogNbOutputs;i++) { - if (priority >= virLogOutputs[i].priority) + if (priority >= virLogOutputs[i].priority) { + if (virLogOutputs[i].logVersion) { + char *ver = NULL; + if (virLogVersionString(&ver, &time_info, &cur_time) >= 0) + virLogOutputs[i].f(category, priority, __func__, __LINE__, + ver, strlen(ver), + virLogOutputs[i].data); + VIR_FREE(ver); + virLogOutputs[i].logVersion = false; + } virLogOutputs[i].f(category, priority, funcname, linenr, msg, len, virLogOutputs[i].data); + } } - if ((virLogNbOutputs == 0) && (flags != 1)) + if ((virLogNbOutputs == 0) && (flags != 1)) { + if (logVersionStderr) { + char *ver = NULL; + if (virLogVersionString(&ver, &time_info, &cur_time) >= 0) + ignore_value (safewrite(STDERR_FILENO, + ver, strlen(ver))); + VIR_FREE(ver); + logVersionStderr = false; + } ignore_value (safewrite(STDERR_FILENO, msg, len)); + } virLogUnlock(); VIR_FREE(msg); -- 1.7.3.5

2 3

[libvirt] [PATCH JAVA] Add an automated build control script
by Daniel P. Berrange 11 Feb '11

11 Feb '11

Add a control script to be used by the automated build system * autobuild.sh: Automated build control file * libvirt-java.spec.in: Include %extra_release --- autobuild.sh | 31 +++++++++++++++++++++++++++++++ libvirt-java.spec.in | 2 +- 2 files changed, 32 insertions(+), 1 deletions(-) create mode 100755 autobuild.sh diff --git a/autobuild.sh b/autobuild.sh new file mode 100755 index 0000000..cca4066 --- /dev/null +++ b/autobuild.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +set -e +set -v + +test -n "$1" && RESULTS=$1 || RESULTS=results.log + +ant clean || : + +ant build docs + +ant test 2>&1 | tee $RESULTS + +rm -f *.tar.gz +ant src + +if [ -n "$AUTOBUILD_COUNTER" ]; then + EXTRA_RELEASE=".auto$AUTOBUILD_COUNTER" +else + NOW=`date +"%s"` + EXTRA_RELEASE=".$USER$NOW" +fi + +if [ -x /usr/bin/rpmbuild ] +then + ant spec + rpmbuild --nodeps \ + --define "extra_release $EXTRA_RELEASE" \ + --define "_sourcedir `pwd`/target" \ + -ba --clean target/libvirt-java.spec +fi diff --git a/libvirt-java.spec.in b/libvirt-java.spec.in index 1ded8a0..2c972b7 100644 --- a/libvirt-java.spec.in +++ b/libvirt-java.spec.in @@ -2,7 +2,7 @@ Summary: Java bindings for the libvirt virtualization API Name: libvirt-java Version: @version@ Prefix: libvirt -Release: @release@%{?dist} +Release: @release@%{?dist}%{?extra_release} License: LGPLv2+ BuildArch: noarch Group: Development/Libraries -- 1.7.4

2 1

[libvirt] consistency of virsh help output
by Zdenek Styblik 11 Feb '11

11 Feb '11

Hello, I've found virsh help output to be inconsistent. ~~~ SNIP ~~~ attach-disk <domain> <source> <target> [--driver <string>]... X attach-interface <domain> <type> <source> [<target>] ... ~~~ SNIP ~~~ where <KEYWORD> is usually explained in OPTIONS as: ~~~ SNIP ~~~ [--domain] <string> domain name, id or uuid ~~~ SNIP ~~~ Substitution of <domain> -> [--domain] <string> resp. that you can only provide a <string> without [--domain] and it's still going to work. This took me some time to figure out. But back on point. As you can see from snips, once you use eg. <domain> and substitution resp. explanation is in OPTIONS and second you put "explanation" right into SYNOPSIS. I think it would be worth of cleaning out and make everything one way or another. Would it be a problem? I presume it's just matter of modifying "couple" printf()-s. Have a nice day, Z. -- Zdenek Styblik Net/Linux admin OS TurnovFree.net email: stybla(a)turnovfree.net jabber: stybla(a)jabber.turnovfree.net

3 8

[libvirt] [PATCH 0/2] set QEMUD_CMD_FLAG_PCI_MULTIBUS for x86_64 and i686 architectures
by Wen Congyang 11 Feb '11

11 Feb '11

When we attach a interface to a guest machine, we receive the following error messages: [root@wency ~]# virsh attach-interface RHEL6RC network default error: Failed to attach interface error: internal error unable to execute QEMU command 'device_add': Bus 'pci' not found This bug was caused by 0b864eb1. Wen Congyang (2): QEMUD_CMD_FLAG_PCI_MULTIBUS should be set in the function qemuCapsExtractVersionInfo() tests: set QEMUD_CMD_FLAG_PCI_MULTIBUS in testCompareXMLToArgvFiles() src/qemu/qemu_capabilities.c | 12 +++++++++--- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 6 ------ src/qemu/qemu_driver.c | 20 +++++++++++--------- tests/qemuxml2argvtest.c | 9 +++++++++ 5 files changed, 30 insertions(+), 19 deletions(-)

3 5

[libvirt] [PATCH ruby-libvirt] Add a control file for automated builds
by Daniel P. Berrange 10 Feb '11

10 Feb '11

* autobuild.sh: Automated build control * ruby-libvirt.spec: Add autobuild release tag --- autobuild.sh | 29 +++++++++++++++++++++++++++++ ruby-libvirt.spec | 2 +- 2 files changed, 30 insertions(+), 1 deletions(-) create mode 100755 autobuild.sh diff --git a/autobuild.sh b/autobuild.sh new file mode 100755 index 0000000..216264e --- /dev/null +++ b/autobuild.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +set -e +set -v + +rake clean || : + +rake build +#rake test + +rm -rf pkg +rake package + +if [ -n "$AUTOBUILD_COUNTER" ]; then + EXTRA_RELEASE=".auto$AUTOBUILD_COUNTER" +else + NOW=`date +"%s"` + EXTRA_RELEASE=".$USER$NOW" +fi + +if [ -f /usr/bin/rpmbuild ]; then + ver=`grep '^PKG_VERSION' Rakefile | sed -e "s/PKG_VERSION=//" -e "s/'//g"` + sed -e "s/\@VERSION\@/$ver/" < ruby-libvirt.spec > pkg/ruby-libvirt.spec + rpmbuild --nodeps \ + --define "extra_release $EXTRA_RELEASE" \ + --define "_sourcedir `pwd`/pkg" \ + -ba --clean pkg/ruby-libvirt.spec +fi + diff --git a/ruby-libvirt.spec b/ruby-libvirt.spec index 2cefe2c..dd82a73 100644 --- a/ruby-libvirt.spec +++ b/ruby-libvirt.spec @@ -3,7 +3,7 @@ Name: ruby-libvirt Version: @VERSION@ -Release: 1%{?dist} +Release: 1%{?dist}%{?extra_release} Summary: Ruby bindings for libvirt Group: Development/Languages -- 1.7.4

2 1

[libvirt] domain.rng updated ?
by arnaud.champion＠devatom.fr 10 Feb '11

10 Feb '11

?Hi, I'm working on C# bindings, my goal is to expose xml descriptions (domain, node, storage and so on...) as real C# objects, for this, I'm studying the rng files provided in /docs/schemas/ directory of the sources. I'm currently working on domain.rng. I don't know if the domain.rng file is up to date because, for example, the disk device definition in the rng doesn't speak about the "address" node that a virhs dumpxml show : <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/var/lib/libvirt/image/Ubuntu-10.10.img'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' unit='0'/> </disk> Is the domain.rng up to date or should I use the libvirt.org XML format page only ? Regards, Arnaud

2 2

[libvirt] [PATCH] Avoid warnings from nwfilter driver when run non-root
by Daniel P. Berrange 10 Feb '11

10 Feb '11

When run non-root the nwfilter driver logs error messages about being unable to find iptables/ebtables commands (they are in /sbin which isn't in $PATH). The nwfilter driver can't ever work as non-root, so simply skip it entirely thus avoiding the error messages * src/conf/nwfilter_conf.h, src/nwfilter/nwfilter_driver.c, src/nwfilter/nwfilter_gentech_driver.c, src/nwfilter/nwfilter_gentech_driver.h: Pass 'bool privileged' flag down to final driver impl * src/nwfilter/nwfilter_ebiptables_driver.c: Skip initialization if not privileged --- src/conf/nwfilter_conf.h | 2 +- src/nwfilter/nwfilter_driver.c | 2 +- src/nwfilter/nwfilter_ebiptables_driver.c | 9 ++++++--- src/nwfilter/nwfilter_gentech_driver.c | 6 +++--- src/nwfilter/nwfilter_gentech_driver.h | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 8f8383f..34ff399 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -502,7 +502,7 @@ struct domUpdateCBStruct { }; -typedef int (*virNWFilterTechDrvInit)(void); +typedef int (*virNWFilterTechDrvInit)(bool privileged); typedef void (*virNWFilterTechDrvShutdown)(void); enum virDomainNetType; diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index f903311..a579306 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -69,7 +69,7 @@ nwfilterDriverStartup(int privileged) { if (virNWFilterLearnInit() < 0) return -1; - virNWFilterTechDriversInit(); + virNWFilterTechDriversInit(privileged); if (virNWFilterConfLayerInit(virNWFilterDomainFWUpdateCB) < 0) goto conf_init_err; diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 1b8730d..39cd0f3 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -114,7 +114,7 @@ static const char *m_physdev_out_str = "-m physdev " PHYSDEV_OUT; #define COMMENT_VARNAME "comment" static int ebtablesRemoveBasicRules(const char *ifname); -static int ebiptablesDriverInit(void); +static int ebiptablesDriverInit(bool privileged); static void ebiptablesDriverShutdown(void); static int ebtablesCleanAll(const char *ifname); static int ebiptablesAllTeardown(const char *ifname); @@ -3653,11 +3653,14 @@ virNWFilterTechDriver ebiptables_driver = { static int -ebiptablesDriverInit(void) +ebiptablesDriverInit(bool privileged) { virBuffer buf = VIR_BUFFER_INITIALIZER; int cli_status; + if (!privileged) + return 0; + if (virMutexInit(&execCLIMutex)) return EINVAL; @@ -3730,7 +3733,7 @@ ebiptablesDriverInit(void) static void -ebiptablesDriverShutdown() +ebiptablesDriverShutdown(void) { VIR_FREE(gawk_cmd_path); VIR_FREE(grep_cmd_path); diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index e64c3ec..9ef3692 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -50,17 +50,17 @@ static virNWFilterTechDriverPtr filter_tech_drivers[] = { }; -void virNWFilterTechDriversInit() { +void virNWFilterTechDriversInit(bool privileged) { int i = 0; while (filter_tech_drivers[i]) { if (!(filter_tech_drivers[i]->flags & TECHDRV_FLAG_INITIALIZED)) - filter_tech_drivers[i]->init(); + filter_tech_drivers[i]->init(privileged); i++; } } -void virNWFilterTechDriversShutdown() { +void virNWFilterTechDriversShutdown(void) { int i = 0; while (filter_tech_drivers[i]) { if ((filter_tech_drivers[i]->flags & TECHDRV_FLAG_INITIALIZED)) diff --git a/src/nwfilter/nwfilter_gentech_driver.h b/src/nwfilter/nwfilter_gentech_driver.h index c9dd4a1..271bf85 100644 --- a/src/nwfilter/nwfilter_gentech_driver.h +++ b/src/nwfilter/nwfilter_gentech_driver.h @@ -28,7 +28,7 @@ virNWFilterTechDriverPtr virNWFilterTechDriverForName(const char *name); int virNWFilterRuleInstAddData(virNWFilterRuleInstPtr res, void *data); -void virNWFilterTechDriversInit(void); +void virNWFilterTechDriversInit(bool privileged); void virNWFilterTechDriversShutdown(void); enum instCase { -- 1.7.4

2 1

[libvirt] [PATCH] Reduce log level when cgroups aren't mounted
by Daniel P. Berrange 10 Feb '11

10 Feb '11

Quite a few hosts don't have cgroups mounted and so see warnings from libvirt logged, which then cause bug reports, etc. Reduce the log level to INFO so they're not visible by default * src/qemu/qemu_driver.c: Reduce log level for cgroups --- src/qemu/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 52ea98e..20a4157 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1331,7 +1331,7 @@ qemudStartup(int privileged) { rc = virCgroupForDriver("qemu", &qemu_driver->cgroup, privileged, 1); if (rc < 0) { char buf[1024]; - VIR_WARN("Unable to create cgroup for driver: %s", + VIR_INFO("Unable to create cgroup for driver: %s, disabling cgroups", virStrerror(-rc, buf, sizeof(buf))); } -- 1.7.4

2 1

[libvirt] [libvirt-snmp][PATCH v2] Remove the hard coded connection URI.
by Michal Privoznik 10 Feb '11

10 Feb '11

So now we rely on libvirt LIBVIRT_DEFAULT_URI environment variable. --- src/libvirtSnmp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/libvirtSnmp.c b/src/libvirtSnmp.c index ce21369..39b74bd 100644 --- a/src/libvirtSnmp.c +++ b/src/libvirtSnmp.c @@ -180,7 +180,8 @@ int libvirtSnmpInit(void) /* virConnectOpenAuth is called here with all default parameters, * except, possibly, the URI of the hypervisor. */ /* TODO: configure the URI */ - conn = virConnectOpenAuth("qemu:///system", virConnectAuthPtrDefault, 0); + /* Use libvirt env variable LIBVIRT_DEFAULT_URI by default*/ + conn = virConnectOpenAuth("", virConnectAuthPtrDefault, 0); if (NULL == conn) { printf("No connection to hypervisor\n"); -- 1.7.3.5

3 2

[libvirt] [PATCH] Fix spice's passwdValidTo setting
by Michal Privoznik 10 Feb '11

10 Feb '11

This fix the typo in the source. https://bugzilla.redhat.com/show_bug.cgi?id=676374 --- src/conf/domain_conf.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7c1fb47..59adf36 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3873,7 +3873,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, int flags) { def->data.spice.listenAddr = virXMLPropString(node, "listen"); def->data.spice.keymap = virXMLPropString(node, "keymap"); - if (virDomainGraphicsAuthDefParseXML(node, &def->data.vnc.auth) < 0) + if (virDomainGraphicsAuthDefParseXML(node, &def->data.spice.auth) < 0) goto error; cur = node->children; -- 1.7.3.5

2 1

[libvirt] [libvirt-snmp][PATCH] New environment variable managing connection URI.
by Michal Privoznik 10 Feb '11

10 Feb '11

Add environment variable LIBVIRT_MIB_CONNECT_URI to control URI which snmp agent is connecting to. It is now possible to connect to all hypervisors (including test:///) instead of hardcoded qemu:///system, which is used now by default when variable is not set. --- src/libvirtSnmp.c | 5 ++++- src/libvirtSnmp.h | 3 +++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/libvirtSnmp.c b/src/libvirtSnmp.c index ce21369..7652da0 100644 --- a/src/libvirtSnmp.c +++ b/src/libvirtSnmp.c @@ -180,7 +180,10 @@ int libvirtSnmpInit(void) /* virConnectOpenAuth is called here with all default parameters, * except, possibly, the URI of the hypervisor. */ /* TODO: configure the URI */ - conn = virConnectOpenAuth("qemu:///system", virConnectAuthPtrDefault, 0); + /* A simple workaround for testing - environment variable */ + char *connect_uri = getenv(CONNECT_URI_ENV); + + conn = virConnectOpenAuth((connect_uri ? connect_uri : "qemu:///system"), virConnectAuthPtrDefault, 0); if (NULL == conn) { printf("No connection to hypervisor\n"); diff --git a/src/libvirtSnmp.h b/src/libvirtSnmp.h index 4ac6130..67b6125 100644 --- a/src/libvirtSnmp.h +++ b/src/libvirtSnmp.h @@ -10,6 +10,9 @@ #include <net-snmp/net-snmp-includes.h> #include <net-snmp/agent/net-snmp-agent-includes.h> +/* Environment variable to control connection URI */ +#define CONNECT_URI_ENV "LIBVIRT_MIB_CONNECT_URI" + /* * Populate libvirtGuestTable into given container. */ -- 1.7.3.5

3 2

[libvirt] [PATCH libvirt-site v2] Add information about libvirt-php new location [was Change PHP binding link to new one hosted on libvirt.org]
by Michal Novotny 10 Feb '11

10 Feb '11

Signed-off-by: Michal Novotny <minovotn(a)redhat.com> --- docs/bindings.html.in | 8 +++--- docs/php.html.in | 57 ++---------------------------------------------- 2 files changed, 7 insertions(+), 58 deletions(-) diff --git a/docs/bindings.html.in b/docs/bindings.html.in index 87d894d..2d936a0 100644 --- a/docs/bindings.html.in +++ b/docs/bindings.html.in @@ -28,16 +28,16 @@ <li> <p> <strong>PHP</strong>: Radek Hladik started developing - <a href="http://phplibvirt.cybersales.cz/">PHP bindings</a> in 2010. + <a href="http://libvirt.org/php">PHP bindings</a> in 2010. </p> <p> - In February 2011 the binding development has been moved to the - <a href="http://libvirt.org/git/?p=libvirt-php.git;a=summary">libvirt.org as libvirt-php project</a>. + In February 2011 the binding development has been moved to the libvirt.org website as + libvirt-php project. </p> <p> The project is now maintained by Michal Novotny and it's heavily based on Radek's version. For more information including the information on posting - the patches you to libvirt-php please refer to <a href="php.html">PHP binding page</a>. + the patches you to libvirt-php please refer to <a href="http://libvirt.org/php">PHP binding</a>. </p> </li> <li> diff --git a/docs/php.html.in b/docs/php.html.in index ea4f76a..5283e67 100644 --- a/docs/php.html.in +++ b/docs/php.html.in @@ -24,60 +24,9 @@ It can also be browsed at </pre> <p></p> -<h2>Building</h2> -<p>The code is using autotools to generate the files necessary for compilation. The preferred way of building is - to run autogen.sh to generate configure script and then go on with the standard linux make commands, i.e.</p> - -<pre> -$ cd libvirt-php -$ ./autogen.sh -$ make -</pre> - - -<h2>Enabling the module in PHP</h2> -<p>Before you start using the module you have to install the module first. The module -php_libvirt.so is being generated when you compile it. This is necessary to be loaded -in the extensions sections of php.ini file for PHP version older than PHP-5.</p> -<p> -Starting with PHP-5 you can create a file called libvirt.ini in /etc/php.d having just -one line <code>extension=php_libvirt.so</code> to enable the extension. Of course, you -need to have this module copied in the directory with the rest of your PHP modules to -make PHP find the module for you.</p> -<p> -If you're using PHP as a module (mod_php5.so) in the Apache webserver you need to -restart your Apache to trigger configuration reload for PHP. -</p> -<p> -If you're not sure that you have everything set up right and you don't want to restart -your Apache webserver before you're sure everything will be working fine you could try -running the test using cli-based PHP interpreter. There are some example scripts coming -along the source codes in the <code>example</code> subdirectory so you can try to run -php on the index.php script to check whether it's working fine to establish connection or not. -</p> -<p> -When you're having some issues with the connection make sure the apache user is having -access to libvirt. For more information please see <a href="auth.html">Libvirt access control</a> page. -</p> -<h2>Contribution</h2> -<p> -If you would like to contribute to the libvirt-php project you could write patches for it but please -make sure you're following the procedure below: - -<ol> - <li>Sign up to libvirt list if you're not on it yet (libvir-list(a)redhat.com)</li> - <li>Clone the repository from libvirt.org site using: - <pre>git clone git://libvirt.org/libvirt-php</pre> - </li> - <li>Set your git username and e-mail and also set the subject prefix in the project's repository using: - <pre>git config --local format.subjectprefix "libvirt-php"</pre> - </li> - <li>Create the patch in the form of the commits and include also information about usage (example source codes maybe) and testing</li> - <li>Format it using <code>git format-patch -X</code> where X is the number of patch parts to be posted, for multipart patch (X is greater than 1) please use also numbering (-n) option and include the cover-letter (--cover-letter).</li> - <li>Send to libvir-list(a)redhat.com using the <code>git send-email <files> --to libvir-list(a)redhat.com</code> command where <files> can be <i>000*</i> to send all the patches formatted by git format-patch since git format-patch names the files starting with the 4 digit numbers.</li> -</ol> - -When you send the patch you're patch will be reviewed and later committed to the libvirt-php repository. You'll be contacted in case some flaws are found during the review. +<h2>Project pages</h2> +<p>Since February 2011 the project have it's own pages hosted at libvirt.org. For more information on the project + please refer to <a href="http://libvirt.org/php">http://libvirt.org/php</a>. </p> -- 1.7.3.2

2 2

Re: [libvirt] [PATCH] Basic support for VDE networking
by LiuCougar 09 Feb '11

09 Feb '11

On 12/01/2011, at 11:29 PM, Daniel P. Berrange wrote: > On Tue, Jan 11, 2011 at 04:12:57PM +0100, Renzo Davoli wrote: >> I have seen several messages asking for VDE networking support. >> There is an item also in your todo web page. >> http://libvirt.org/todo.html >> I have developed a patch to provide a basic support for VDE. >> It defines and manages the syntax: >> >> <domain ....> >> <device> >> <interface type='vde'> >> ... >> <switch path='/tmp/vde.ctl'/> >> </interface> >> </device> >> </domain> >> >> the switch tag can be omitted: vde uses the default switch. >> I have tested the qemu/kvm support. >> user-mode linux support is included but not tested yet. >> libvirt vde support for virtualbox has not been coded yet (virtualbox >> itself supports vde). ... > eg, so you'd be able to create/delete/manage VDE daemon instances > using the 'virsh net-XXX' command set. The guest domains would be > connected to VDE using the existing <interface type='network'> > syntax, and not expose any 'vde' syntax in the guest XML directly. > I think letting apps manage VDE daemon instances via the libvirt > APi would make this functionality much more friendly & useful The patch as it's submitted in this thread is very useful for all users of qemu/kvm with VDE: it makes it possible for these users to directly migrated to libvirt to manage VMs without too much hassle. If it can be managed automatically by libvirt, that would be a plus, but even then, I think it would be good to still support exposing VDE directly in the XML so users can manually handle VDE configuration if they choose to do so. Is it possible to merge this patch into libvirt so VDE users can benefit from libvirt? thanks, liucougar

1 0