- Devel - libvirt List Archives

[libvirt] [PATCH] build: add compiler attributes to virUUIDParse
by Eric Blake 14 Oct '11

14 Oct '11

Coverity complained that most, but not all, clients of virUUIDParse were checking for errors. Silence those coverity warnings by explicitly marking the cases where we trust the input, and fixing one instance that really should have been checking. In particular, this silences about half of the 46 warnings I saw on my most recent Coverity analysis run. * src/util/uuid.h (virUUIDParse): Enforce rules. * src/util/uuid.c (virUUIDParse): Drop impossible check; at least Coverity will detect if we break rules and pass NULL. * src/xenapi/xenapi_driver.c (xenapiDomainCreateXML) (xenapiDomainLookupByID, xenapiDomainLookupByName) (xenapiDomainDefineXML): Ignore return when we trust data source. * src/vbox/vbox_tmpl.c (nsIDtoChar, vboxIIDToUUID_v3_x) (vboxCallbackOnMachineStateChange) (vboxCallbackOnMachineRegistered, vboxStoragePoolLookupByName): Likewise. * src/node_device/node_device_hal.c (gather_system_cap): Likewise. * src/xenxs/xen_sxpr.c (xenParseSxpr): Check for errors. --- This one's big enough that I'll wait for ACK before pushing. src/node_device/node_device_hal.c | 3 ++- src/util/uuid.c | 5 +---- src/util/uuid.h | 3 ++- src/vbox/vbox_tmpl.c | 12 ++++++------ src/xenapi/xenapi_driver.c | 11 ++++++----- src/xenxs/xen_sxpr.c | 3 ++- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 481be97..a028886 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -38,6 +38,7 @@ #include "pci.h" #include "logging.h" #include "node_device_driver.h" +#include "ignore-value.h" #define VIR_FROM_THIS VIR_FROM_NODEDEV @@ -299,7 +300,7 @@ static int gather_system_cap(LibHalContext *ctx, const char *udi, (void)get_str_prop(ctx, udi, "system.hardware.serial", &d->system.hardware.serial); if (get_str_prop(ctx, udi, "system.hardware.uuid", &uuidstr) == 0) { - (void)virUUIDParse(uuidstr, d->system.hardware.uuid); + ignore_value(virUUIDParse(uuidstr, d->system.hardware.uuid)); VIR_FREE(uuidstr); } (void)get_str_prop(ctx, udi, "system.firmware.vendor", diff --git a/src/util/uuid.c b/src/util/uuid.c index b4317df..0df3ebc 100644 --- a/src/util/uuid.c +++ b/src/util/uuid.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007, 2008, 2009, 2010 Red Hat, Inc. + * Copyright (C) 2007-2011 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -129,9 +129,6 @@ virUUIDParse(const char *uuidstr, unsigned char *uuid) { const char *cur; int i; - if ((uuidstr == NULL) || (uuid == NULL)) - return(-1); - /* * do a liberal scan allowing '-' and ' ' anywhere between character * pairs, and surrounding whitespace, as long as there are exactly diff --git a/src/util/uuid.h b/src/util/uuid.h index b5d7878..7dbfad5 100644 --- a/src/util/uuid.h +++ b/src/util/uuid.h @@ -32,7 +32,8 @@ int virUUIDIsValid(unsigned char *uuid); int virUUIDGenerate(unsigned char *uuid); int virUUIDParse(const char *uuidstr, - unsigned char *uuid); + unsigned char *uuid) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; void virUUIDFormat(const unsigned char *uuid, char *uuidstr) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 9b674a9..bc19b63 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -300,7 +300,7 @@ static void nsIDtoChar(unsigned char *uuid, const nsID *iid) { } uuidstrdst[VIR_UUID_STRING_BUFLEN-1] = '\0'; - virUUIDParse(uuidstrdst, uuid); + ignore_value(virUUIDParse(uuidstrdst, uuid)); } static void nsIDFromChar(nsID *iid, const unsigned char *uuid) { @@ -339,7 +339,7 @@ static void nsIDFromChar(nsID *iid, const unsigned char *uuid) { } uuidstrdst[VIR_UUID_STRING_BUFLEN-1] = '\0'; - virUUIDParse(uuidstrdst, uuidinterim); + ignore_value(virUUIDParse(uuidstrdst, uuidinterim)); memcpy(iid, uuidinterim, VIR_UUID_BUFLEN); } @@ -511,7 +511,7 @@ vboxIIDToUUID_v3_x(vboxGlobalData *data, vboxIID_v3_x *iid, data->pFuncs->pfnUtf16ToUtf8(iid->value, &utf8); - virUUIDParse(utf8, uuid); + ignore_value(virUUIDParse(utf8, uuid)); data->pFuncs->pfnUtf8Free(utf8); } @@ -6558,7 +6558,7 @@ vboxCallbackOnMachineStateChange(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED, unsigned char uuid[VIR_UUID_BUFLEN]; g_pVBoxGlobalData->pFuncs->pfnUtf16ToUtf8(machineId, &machineIdUtf8); - virUUIDParse(machineIdUtf8, uuid); + ignore_value(virUUIDParse(machineIdUtf8, uuid)); dom = vboxDomainLookupByUUID(g_pVBoxGlobalData->conn, uuid); if (dom) { @@ -6686,7 +6686,7 @@ vboxCallbackOnMachineRegistered(IVirtualBoxCallback *pThis ATTRIBUTE_UNUSED, unsigned char uuid[VIR_UUID_BUFLEN]; g_pVBoxGlobalData->pFuncs->pfnUtf16ToUtf8(machineId, &machineIdUtf8); - virUUIDParse(machineIdUtf8, uuid); + ignore_value(virUUIDParse(machineIdUtf8, uuid)); dom = vboxDomainLookupByUUID(g_pVBoxGlobalData->conn, uuid); if (dom) { @@ -7983,7 +7983,7 @@ static virStoragePoolPtr vboxStoragePoolLookupByName(virConnectPtr conn, const c unsigned char uuid[VIR_UUID_BUFLEN]; const char *uuidstr = "1deff1ff-1481-464f-967f-a50fe8936cc4"; - virUUIDParse(uuidstr, uuid); + ignore_value(virUUIDParse(uuidstr, uuid)); ret = virGetStoragePool(conn, name, uuid); } diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 80a706a..3946455 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -40,6 +40,7 @@ #include "xenapi_driver.h" #include "xenapi_driver_private.h" #include "xenapi_utils.h" +#include "ignore-value.h" #define VIR_FROM_THIS VIR_FROM_XENAPI @@ -528,7 +529,7 @@ xenapiDomainCreateXML (virConnectPtr conn, virDomainDefFree(defPtr); if (record) { unsigned char raw_uuid[VIR_UUID_BUFLEN]; - virUUIDParse(record->uuid, raw_uuid); + ignore_value(virUUIDParse(record->uuid, raw_uuid)); if (vm) { if (xen_vm_start(session, vm, false, false)) { domP = virGetDomain(conn, record->name_label, raw_uuid); @@ -574,13 +575,13 @@ xenapiDomainLookupByID (virConnectPtr conn, int id) xen_session_get_this_host(session, &host, session); if (host != NULL && session->ok) { xen_host_get_resident_vms(session, &result, host); - if (result != NULL ) { + if (result != NULL) { for (i = 0; i < result->size; i++) { xen_vm_get_domid(session, &domID, result->contents[i]); if (domID == id) { xen_vm_get_record(session, &record, result->contents[i]); xen_vm_get_uuid(session, &uuid, result->contents[i]); - virUUIDParse(uuid, raw_uuid); + ignore_value(virUUIDParse(uuid, raw_uuid)); domP = virGetDomain(conn, record->name_label, raw_uuid); if (domP) { int64_t domid = -1; @@ -672,7 +673,7 @@ xenapiDomainLookupByName (virConnectPtr conn, vm = vms->contents[0]; xen_vm_get_uuid(session, &uuid, vm); if (uuid!=NULL) { - virUUIDParse(uuid, raw_uuid); + ignore_value(virUUIDParse(uuid, raw_uuid)); domP = virGetDomain(conn, name, raw_uuid); if (domP != NULL) { int64_t domid = -1; @@ -1683,7 +1684,7 @@ xenapiDomainDefineXML (virConnectPtr conn, const char *xml) } if (record != NULL) { unsigned char raw_uuid[VIR_UUID_BUFLEN]; - virUUIDParse(record->uuid, raw_uuid); + ignore_value(virUUIDParse(record->uuid, raw_uuid)); domP = virGetDomain(conn, record->name_label, raw_uuid); if (!domP && !session->ok) xenapiSessionErrorHandler(conn, VIR_ERR_NO_DOMAIN, NULL); diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c index f2447f7..d44b0dc 100644 --- a/src/xenxs/xen_sxpr.c +++ b/src/xenxs/xen_sxpr.c @@ -1094,7 +1094,8 @@ xenParseSxpr(const struct sexpr *root, "%s", _("domain information incomplete, missing name")); goto error; } - virUUIDParse(tmp, def->uuid); + if (virUUIDParse(tmp, def->uuid) < 0) + goto error; if (sexpr_node_copy(root, "domain/description", &def->description) < 0) goto no_memory; -- 1.7.4.4

3 4

[libvirt] [PATCH] qemu: plug memory leak on migration
by Eric Blake 13 Oct '11

13 Oct '11

Detected by Coverity. Leak introduced in commit 72de0d2. * src/qemu/qemu_migration.c (qemuMigrationCookieGraphicsXMLParse): Clean up on success. --- Pushing under the trivial rule. src/qemu/qemu_migration.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 4516231..f0a0e49 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -460,22 +460,23 @@ qemuMigrationCookieGraphicsXMLParse(xmlXPathContextPtr ctxt) if (!(tmp = virXPathString("string(./graphics/@type)", ctxt))) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing type attribute in migration data")); goto error; } if ((grap->type = virDomainGraphicsTypeFromString(tmp)) < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, _("unknown graphics type %s"), tmp); VIR_FREE(tmp); goto error; } + VIR_FREE(tmp); if (virXPathInt("string(./graphics/@port)", ctxt, &grap->port) < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing port attribute in migration data")); goto error; } if (grap->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) { if (virXPathInt("string(./graphics/@tlsPort)", ctxt, &grap->tlsPort) < 0) { qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing tlsPort attribute in migration data")); goto error; } -- 1.7.4.4

1 0

[libvirt] [PATCH] conf: plug memory leak on error
by Eric Blake 13 Oct '11

13 Oct '11

Detected by Coverity. Leak present since commit 874e65a; and while commit d50bb45 tried to fix the issue, it missed a path. * src/conf/domain_conf.c (virDomainDefParseBootXML): Always clean up useserial. --- Pushing under the trivial rule. 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 8cd493b..844af27 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6316,35 +6316,35 @@ virDomainDefParseBootXML(xmlXPathContextPtr ctxt, useserial = virXPathString("string(./os/bios[1]/@useserial)", ctxt); if (useserial) { if (STREQ(useserial, "yes")) { if (virXPathULong("count(./devices/serial)", ctxt, &serialPorts) < 0) { virDomainReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("need at least one serial port " "for useserial")); goto cleanup; } def->os.bios.useserial = VIR_DOMAIN_BIOS_USESERIAL_YES; } else { def->os.bios.useserial = VIR_DOMAIN_BIOS_USESERIAL_NO; } - VIR_FREE(useserial); } *bootCount = deviceBoot; ret = 0; cleanup: + VIR_FREE(useserial); VIR_FREE(nodes); return ret; } /* Parse the XML definition for a vcpupin */ static virDomainVcpuPinDefPtr virDomainVcpuPinDefParseXML(const xmlNodePtr node, xmlXPathContextPtr ctxt, int maxvcpus) { virDomainVcpuPinDefPtr def; xmlNodePtr oldnode = ctxt->node; unsigned int vcpuid; char *tmp = NULL; -- 1.7.4.4

1 0

[libvirt] [PATCH 2/3] Add virBufferEscapeShell
by Guido Günther 13 Oct '11

13 Oct '11

Escape strings so they're safe to pass to the shell. Based on glib's g_quote_string. --- src/libvirt_private.syms | 1 + src/util/buf.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/buf.h | 1 + 3 files changed, 56 insertions(+), 0 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 4f96518..862f3ac 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -29,6 +29,7 @@ virBufferEscape; virBufferEscapeSexpr; virBufferEscapeString; virBufferFreeAndReset; +virBufferEscapeShell; virBufferStrcat; virBufferURIEncodeString; virBufferUse; diff --git a/src/util/buf.c b/src/util/buf.c index fa12855..f9d7cd7 100644 --- a/src/util/buf.c +++ b/src/util/buf.c @@ -486,6 +486,60 @@ virBufferURIEncodeString (virBufferPtr buf, const char *str) } /** + * virBufferEscapeShell: + * @buf: the buffer to append to + * @str: an unquoted string + * + * Quotes a string so that the shell (/bin/sh) will interpret the + * quoted string as unquoted_string. + */ +void +virBufferEscapeShell(const virBufferPtr buf, const char *str) +{ + int len; + bool close_quote = false; + char *escaped, *out; + const char *cur; + + if ((buf == NULL) || (str == NULL)) + return; + + if (buf->error) + return; + + len = strlen(str); + if (xalloc_oversized(4, len) || + VIR_ALLOC_N(escaped, 4 * len + 3) < 0) { + virBufferSetError(buf); + return; + } + + cur = str; + out = escaped; + + /* Add outer '...' only if arg included shell metacharacters. */ + if (strpbrk(str, "\r\t\n !\"#$&'()*;<>?[\\]^`{|}~")) { + *out++ = '\''; + close_quote = true; + } + while (*cur != 0) { + if (*cur == '\'') { + /* Replace literal ' with a close ', a \', and a open ' */ + *out++ = '\''; + *out++ = '\\'; + *out++ = *cur++; + *out++ = '\''; + } else + *out++ = *cur++; + } + if (close_quote) + *out++ = '\''; + *out = 0; + virBufferAdd(buf, escaped, -1); + VIR_FREE(escaped); +} + +/** * virBufferStrcat: * @buf: the buffer to dump * @...: the variable list of strings, the last argument must be NULL diff --git a/src/util/buf.h b/src/util/buf.h index e545ed9..ad8ef86 100644 --- a/src/util/buf.h +++ b/src/util/buf.h @@ -52,6 +52,7 @@ void virBufferEscapeString(const virBufferPtr buf, const char *format, const cha void virBufferEscapeSexpr(const virBufferPtr buf, const char *format, const char *str); void virBufferEscape(const virBufferPtr buf, const char *toescape, const char *format, const char *str); void virBufferURIEncodeString (const virBufferPtr buf, const char *str); +void virBufferEscapeShell(const virBufferPtr buf, const char *str); # define virBufferAddLit(buf_, literal_string_) \ virBufferAdd (buf_, "" literal_string_ "", sizeof literal_string_ - 1) -- 1.7.6.3

3 5

[libvirt] [PATCH 3/3] Use virBufferEscapeShell in virNetSocketNewConnectSSH
by Guido Günther 13 Oct '11

13 Oct '11

to escape the netcat command since it's passed to the shell. Adjust expected test case output accordingly. --- src/rpc/virnetsocket.c | 25 ++++++++++++++++++++----- tests/virnetsockettest.c | 10 +++++----- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index ea653da..0105e45 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -612,7 +612,10 @@ int virNetSocketNewConnectSSH(const char *nodename, const char *path, virNetSocketPtr *retsock) { + char *quoted; virCommandPtr cmd; + virBuffer buf = VIR_BUFFER_INITIALIZER; + *retsock = NULL; cmd = virCommandNew(binary ? binary : "ssh"); @@ -636,6 +639,19 @@ int virNetSocketNewConnectSSH(const char *nodename, virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL); virCommandAddArgList(cmd, nodename, "sh", "-c", NULL); + + virBufferEscapeShell(&buf, netcat ? netcat : "nc"); + if (virBufferError(&buf)) { + virBufferFreeAndReset(&buf); + virReportOOMError(); + return -1; + } + quoted = virBufferContentAndReset(&buf); + if (quoted == NULL) { + virReportOOMError(); + return -1; + } + /* * This ugly thing is a shell script to detect availability of * the -q option for 'nc': debian and suse based distros need this @@ -647,14 +663,13 @@ int virNetSocketNewConnectSSH(const char *nodename, * behavior. */ virCommandAddArgFormat(cmd, - "'if %s -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then" + "'if '%s' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then" " ARG=-q0;" "fi;" - "%s $ARG -U %s'", - netcat ? netcat : "nc", - netcat ? netcat : "nc", - path); + "'%s' $ARG -U %s'", + quoted, quoted, path); + VIR_FREE(quoted); return virNetSocketNewConnectCommand(cmd, retsock); } diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index b3a2705..c063e74 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -496,7 +496,7 @@ mymain(void) struct testSSHData sshData1 = { .nodename = "somehost", .path = "/tmp/socket", - .expectOut = "somehost sh -c 'if nc -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then ARG=-q0;fi;nc $ARG -U /tmp/socket'\n", + .expectOut = "somehost sh -c 'if 'nc' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then ARG=-q0;fi;'nc' $ARG -U /tmp/socket'\n", }; if (virtTestRun("SSH test 1", 1, testSocketSSH, &sshData1) < 0) ret = -1; @@ -509,7 +509,7 @@ mymain(void) .noTTY = true, .noVerify = false, .path = "/tmp/socket", - .expectOut = "-p 9000 -l fred -T -o BatchMode=yes -e none somehost sh -c 'if netcat -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then ARG=-q0;fi;netcat $ARG -U /tmp/socket'\n", + .expectOut = "-p 9000 -l fred -T -o BatchMode=yes -e none somehost sh -c 'if 'netcat' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then ARG=-q0;fi;'netcat' $ARG -U /tmp/socket'\n", }; if (virtTestRun("SSH test 2", 1, testSocketSSH, &sshData2) < 0) ret = -1; @@ -522,7 +522,7 @@ mymain(void) .noTTY = false, .noVerify = true, .path = "/tmp/socket", - .expectOut = "-p 9000 -l fred -o StrictHostKeyChecking=no somehost sh -c 'if netcat -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then ARG=-q0;fi;netcat $ARG -U /tmp/socket'\n", + .expectOut = "-p 9000 -l fred -o StrictHostKeyChecking=no somehost sh -c 'if 'netcat' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then ARG=-q0;fi;'netcat' $ARG -U /tmp/socket'\n", }; if (virtTestRun("SSH test 3", 1, testSocketSSH, &sshData3) < 0) ret = -1; @@ -538,7 +538,7 @@ mymain(void) struct testSSHData sshData5 = { .nodename = "crashyhost", .path = "/tmp/socket", - .expectOut = "crashyhost sh -c 'if nc -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then ARG=-q0;fi;nc $ARG -U /tmp/socket'\n", + .expectOut = "crashyhost sh -c 'if 'nc' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then ARG=-q0;fi;'nc' $ARG -U /tmp/socket'\n", .dieEarly = true, }; @@ -550,7 +550,7 @@ mymain(void) .path = "/tmp/socket", .keyfile = "/root/.ssh/example_key", .noVerify = true, - .expectOut = "-i /root/.ssh/example_key -o StrictHostKeyChecking=no example.com sh -c 'if nc -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then ARG=-q0;fi;nc $ARG -U /tmp/socket'\n", + .expectOut = "-i /root/.ssh/example_key -o StrictHostKeyChecking=no example.com sh -c 'if 'nc' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then ARG=-q0;fi;'nc' $ARG -U /tmp/socket'\n", }; if (virtTestRun("SSH test 6", 1, testSocketSSH, &sshData6) < 0) ret = -1; -- 1.7.6.3

2 5

[libvirt] [PATCH 1/3] Autodetect if the remote nc command supports the -q option
by Guido Günther 13 Oct '11

13 Oct '11

Based on a patch by Marc Deslauriers <marc.deslauriers(a)ubuntu.com> RH: https://bugzilla.redhat.com/show_bug.cgi?id=562176 Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/517478 Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=573172 --- src/rpc/virnetsocket.c | 23 ++++++++++++++++++++--- tests/virnetsockettest.c | 11 ++++++----- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index e4289b1..ea653da 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -634,9 +634,26 @@ int virNetSocketNewConnectSSH(const char *nodename, "-e", "none", NULL); if (noVerify) virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL); - virCommandAddArgList(cmd, nodename, - netcat ? netcat : "nc", - "-U", path, NULL); + + virCommandAddArgList(cmd, nodename, "sh", "-c", NULL); + /* + * This ugly thing is a shell script to detect availability of + * the -q option for 'nc': debian and suse based distros need this + * flag to ensure the remote nc will exit on EOF, so it will go away + * when we close the connection tunnel. If it doesn't go away, subsequent + * connection attempts will hang. + * + * Fedora's 'nc' doesn't have this option, and defaults to the desired + * behavior. + */ + virCommandAddArgFormat(cmd, + "'if %s -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then" + " ARG=-q0;" + "fi;" + "%s $ARG -U %s'", + netcat ? netcat : "nc", + netcat ? netcat : "nc", + path); return virNetSocketNewConnectCommand(cmd, retsock); } diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index fae15a3..b3a2705 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -496,7 +496,7 @@ mymain(void) struct testSSHData sshData1 = { .nodename = "somehost", .path = "/tmp/socket", - .expectOut = "somehost nc -U /tmp/socket\n", + .expectOut = "somehost sh -c 'if nc -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then ARG=-q0;fi;nc $ARG -U /tmp/socket'\n", }; if (virtTestRun("SSH test 1", 1, testSocketSSH, &sshData1) < 0) ret = -1; @@ -509,7 +509,7 @@ mymain(void) .noTTY = true, .noVerify = false, .path = "/tmp/socket", - .expectOut = "-p 9000 -l fred -T -o BatchMode=yes -e none somehost netcat -U /tmp/socket\n", + .expectOut = "-p 9000 -l fred -T -o BatchMode=yes -e none somehost sh -c 'if netcat -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then ARG=-q0;fi;netcat $ARG -U /tmp/socket'\n", }; if (virtTestRun("SSH test 2", 1, testSocketSSH, &sshData2) < 0) ret = -1; @@ -522,7 +522,7 @@ mymain(void) .noTTY = false, .noVerify = true, .path = "/tmp/socket", - .expectOut = "-p 9000 -l fred -o StrictHostKeyChecking=no somehost netcat -U /tmp/socket\n", + .expectOut = "-p 9000 -l fred -o StrictHostKeyChecking=no somehost sh -c 'if netcat -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then ARG=-q0;fi;netcat $ARG -U /tmp/socket'\n", }; if (virtTestRun("SSH test 3", 1, testSocketSSH, &sshData3) < 0) ret = -1; @@ -538,7 +538,8 @@ mymain(void) struct testSSHData sshData5 = { .nodename = "crashyhost", .path = "/tmp/socket", - .expectOut = "crashyhost nc -U /tmp/socket\n", + .expectOut = "crashyhost sh -c 'if nc -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then ARG=-q0;fi;nc $ARG -U /tmp/socket'\n", + .dieEarly = true, }; if (virtTestRun("SSH test 5", 1, testSocketSSH, &sshData5) < 0) @@ -549,7 +550,7 @@ mymain(void) .path = "/tmp/socket", .keyfile = "/root/.ssh/example_key", .noVerify = true, - .expectOut = "-i /root/.ssh/example_key -o StrictHostKeyChecking=no example.com nc -U /tmp/socket\n", + .expectOut = "-i /root/.ssh/example_key -o StrictHostKeyChecking=no example.com sh -c 'if nc -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then ARG=-q0;fi;nc $ARG -U /tmp/socket'\n", }; if (virtTestRun("SSH test 6", 1, testSocketSSH, &sshData6) < 0) ret = -1; -- 1.7.6.3

2 3

[libvirt] [PATCH] storage: plug memory leak on error
by Eric Blake 13 Oct '11

13 Oct '11

Detected by Coverity. Present since commit 82c1740. * src/storage/storage_backend_logical.c (virStorageBackendLogicalMakeVol): Fix leak. --- Pushing under the trivial rule. src/storage/storage_backend_logical.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 51624a7..50d0407 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -231,16 +231,17 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool, if (!(offset_str = strndup(p + vars[j + 1].rm_so, len))) { virReportOOMError(); goto cleanup; } if (virStrToLong_ull(offset_str, NULL, 10, &offset) < 0) { virStorageReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("malformed volume extent offset value")); + VIR_FREE(offset_str); goto cleanup; } VIR_FREE(offset_str); vol->source.extents[vol->source.nextent].start = offset * size; vol->source.extents[vol->source.nextent].end = (offset * size) + length; vol->source.nextent++; -- 1.7.4.4

1 0

[libvirt] How to identify a VirtFS using libvirt
by Richard Maciel 13 Oct '11

13 Oct '11

Hi, Is there any way to fetch info on a VirtFS share, aside from reading the guest's XML file? For instance, I'd like to read the source and target dir of the VirtFS mount created on guest by using the following XML code: <filesystem type='mount' accessmode='passthrough'> <source dir='/mnt/9p_setup'/> <target dir='9p_test'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> </filesystem> I tried to use the pool and volume-related functions on the API, but that didn't work. Richard Maciel

1 0

[libvirt] [PATCH] qemu: fix text block info parsing
by Eric Blake 13 Oct '11

13 Oct '11

Detected by Coverity. p (the pointer to the string) is always true; when in reality, we wanted to know whether the integer value of the just-parsed string is '0' or '1'. Logic bug since commit b1b5b51. * src/qemu/qemu_monitor_text.c (qemuMonitorTextGetBlockInfo): Set results to proper value. --- Second bug introduced by the same commit. And I think I reviewed it originally. Sorry for not catching it earlier. src/qemu/qemu_monitor_text.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 1eb9846..49c469b 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -817,19 +817,19 @@ int qemuMonitorTextGetBlockInfo(qemuMonitorPtr mon, if (virStrToLong_i(p, &dummy, 10, &tmp) == -1) VIR_DEBUG("error reading removable: %s", p); else - info->removable = p != NULL; + info->removable = tmp != 0; } else if (STRPREFIX(p, "locked=")) { p += strlen("locked="); if (virStrToLong_i(p, &dummy, 10, &tmp) == -1) VIR_DEBUG("error reading locked: %s", p); else - info->locked = p ? true : false; + info->locked = tmp != 0; } else if (STRPREFIX(p, "tray_open=")) { p += strlen("tray_open="); if (virStrToLong_i(p, &dummy, 10, &tmp) == -1) VIR_DEBUG("error reading tray_open: %s", p); else - info->tray_open = p ? true : false; + info->tray_open = tmp != 0; } else { /* ignore because we don't parse all options */ } -- 1.7.4.4

2 2

[libvirt] [PATCH] qemu: avoid text monitor null deref
by Eric Blake 13 Oct '11

13 Oct '11

Detected by Coverity. If, for some reason, our text monitor input does not match our assumptions, we end up incrementing p while it is NULL, then dereferencing the pointer 0x1, which will fault. * src/qemu/qemu_monitor_text.c (qemuMonitorTextGetBlockStatsParamsNumber): Rewrite to avoid deref of strchr failure. Fix indentation. --- src/qemu/qemu_monitor_text.c | 33 +++++++++++++++------------------ 1 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 51e8c5c..1eb9846 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -1036,26 +1036,23 @@ int qemuMonitorTextGetBlockStatsParamsNumber(qemuMonitorPtr mon, * "floppy0: ") */ p = strchr(p, ' '); - p++; - while (*p) { - if (STRPREFIX (p, "rd_bytes=") || - STRPREFIX (p, "wr_bytes=") || - STRPREFIX (p, "rd_operations=") || - STRPREFIX (p, "wr_operations=") || - STRPREFIX (p, "rd_total_times_ns=") || - STRPREFIX (p, "wr_total_times_ns=") || - STRPREFIX (p, "flush_operations=") || - STRPREFIX (p, "flush_total_times_ns=")) { - num++; - } else { - VIR_DEBUG ("unknown block stat near %s", p); - } + while (p && p < eol) { + if (STRPREFIX (p, " rd_bytes=") || + STRPREFIX (p, " wr_bytes=") || + STRPREFIX (p, " rd_operations=") || + STRPREFIX (p, " wr_operations=") || + STRPREFIX (p, " rd_total_times_ns=") || + STRPREFIX (p, " wr_total_times_ns=") || + STRPREFIX (p, " flush_operations=") || + STRPREFIX (p, " flush_total_times_ns=")) { + num++; + } else { + VIR_DEBUG ("unknown block stat near %s", p); + } - /* Skip to next label. */ - p = strchr (p, ' '); - if (!p || p >= eol) break; - p++; + /* Skip to next label. */ + p = strchr(p + 1, ' '); } *nparams = num; -- 1.7.4.4

2 2

[libvirt] [PATCH] qemu: check for json allocation failure
by Eric Blake 13 Oct '11

13 Oct '11

Detected by Coverity. Introduced in commit b1b5b51. * src/qemu/qemu_monitor_json.c (qemuMonitorJSONGetBlockInfo): Avoid null dereference on OOM. --- src/qemu/qemu_monitor_json.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 18d1c9f..cd8f1e5 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1364,6 +1364,9 @@ int qemuMonitorJSONGetBlockInfo(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr devices; + if (!cmd) + return -1; + ret = qemuMonitorJSONCommand(mon, cmd, &reply); if (ret == 0) ret = qemuMonitorJSONCheckError(cmd, reply); -- 1.7.4.4

2 2

[libvirt] [PATCH] virFDStream: close also given errfd (fd leak)
by Marc-André Lureau 13 Oct '11

13 Oct '11

In virFDStreamOpenFileInternal(), a errfd pipe is opened by virCommandRunAsync() and given to virFDStreamOpenInternal(). It seems virFDStream should close errfd, just like the other fd it is given. This fixes screenshots leaking FDs: http://bugzilla.redhat.com/show_bug.cgi?id=745761 --- src/fdstream.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/fdstream.c b/src/fdstream.c index b60162c..841f979 100644 --- a/src/fdstream.c +++ b/src/fdstream.c @@ -268,6 +268,10 @@ virFDStreamClose(virStreamPtr st) virCommandFree(fdst->cmd); fdst->cmd = NULL; } + + if (VIR_CLOSE(fdst->errfd) < 0) + VIR_DEBUG("ignoring failed close on fd %d", fdst->errfd); + st->privateData = NULL; if (fdst->dispatching) { -- 1.7.6.2

2 1

[libvirt] [PATCH RESEND] command: avoid fd leak on failure
by Eric Blake 13 Oct '11

13 Oct '11

virCommandTransferFD promises that the fd is no longer owned by the caller. Normally, we want the fd to remain open until the child runs, but in error situations, we must close it earlier. * src/util/command.c (virCommandTransferFD): Close fd now if we can't track it to close later. (virCommandKeepFD): Adjust helper to make this easier. --- This leak can only happen on OOM or other extreme error conditions, but ought to be plugged. When I originally posted this: https://www.redhat.com/archives/libvir-list/2011-July/msg00674.html DV was worried that callers might abuse things and use fd even after this function closed it; but I proved to myself in writing a (non-working) v2 that all callers were already safe, and that this v1 was indeed a smaller solution. src/util/command.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/util/command.c b/src/util/command.c index 699ba2d..c3ce361 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -730,23 +730,26 @@ virCommandNewArgList(const char *binary, ...) * closing it. FD must not be one of the three standard streams. If * transfer is true, then fd will be closed in the parent after a call * to Run/RunAsync/Free, otherwise caller is still responsible for fd. + * Returns true if a transferring caller should close FD now, and + * false if the transfer is successfully recorded. */ -static void +static bool virCommandKeepFD(virCommandPtr cmd, int fd, bool transfer) { if (!cmd) - return; + return fd > STDERR_FILENO; if (fd <= STDERR_FILENO || FD_SETSIZE <= fd) { if (!cmd->has_error) cmd->has_error = -1; VIR_DEBUG("cannot preserve %d", fd); - return; + return fd > STDERR_FILENO; } FD_SET(fd, &cmd->preserve); if (transfer) FD_SET(fd, &cmd->transfer); + return false; } /** @@ -761,7 +764,7 @@ virCommandKeepFD(virCommandPtr cmd, int fd, bool transfer) void virCommandPreserveFD(virCommandPtr cmd, int fd) { - return virCommandKeepFD(cmd, fd, false); + virCommandKeepFD(cmd, fd, false); } /** @@ -771,12 +774,14 @@ virCommandPreserveFD(virCommandPtr cmd, int fd) * * Transfer the specified file descriptor * to the child, instead of closing it on exec. - * Close the fd in the parent during Run/RunAsync/Free. + * The parent should no longer use fd, and the parent's copy will + * be automatically closed no later than during Run/RunAsync/Free. */ void virCommandTransferFD(virCommandPtr cmd, int fd) { - return virCommandKeepFD(cmd, fd, true); + if (virCommandKeepFD(cmd, fd, true)) + VIR_FORCE_CLOSE(fd); } -- 1.7.4.4

2 2

[libvirt] ALERT Virtualization Automatic Builder
by berrange＠redhat.com 13 Oct '11

13 Oct '11

Overall status: failed Start date: Thu Oct 13 2011 Start time: 11:05:02 UTC / 07:05:02 EDT Build counter: 1318503902 Build timestamp: 1318503902 URL: http://builder.virt-tools.org/index.html Module: libvirt Status: failed URL: http://builder.virt-tools.org/module-libvirt.html

3 2

[libvirt] [PATCH RESEND] spec: mingw cleanups
by Eric Blake 13 Oct '11

13 Oct '11

* libvirt.spec.in (%configure): Drop unused %{one} macro. * mingw32-libvirt.spec.in (%{rhel}): Compile ESX but not HyperV on mingw build for RHEL. (%build): Make configure honor spec conditionals. Reorder to match libvirt.spec. * autobuild.sh (mingw): Update list to match. Suggested by Daniel P. Berrange. --- No comment when buried in a thread, so I'll resend: https://www.redhat.com/archives/libvir-list/2011-September/msg01072.html autobuild.sh | 16 +++++++----- libvirt.spec.in | 3 +- mingw32-libvirt.spec.in | 58 ++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 60 insertions(+), 17 deletions(-) diff --git a/autobuild.sh b/autobuild.sh index 491f1b8..9853287 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -71,21 +71,23 @@ if [ -x /usr/bin/i686-pc-mingw32-gcc ]; then --host=i686-pc-mingw32 \ --prefix="$AUTOBUILD_INSTALL_ROOT/i686-pc-mingw32/sys-root/mingw" \ --enable-compile-warnings=error \ - --without-sasl \ - --without-avahi \ - --without-polkit \ - --without-python \ --without-xen \ --without-qemu \ + --without-openvz \ --without-lxc \ - --without-uml \ --without-vbox \ - --without-openvz \ + --without-xenapi \ + --without-uml \ + --without-sasl \ + --without-avahi \ + --without-polkit \ + --without-python \ + --without-libvirtd \ --without-phyp \ + --without-hyperv \ --without-netcf \ --without-audit \ --without-dtrace \ - --without-libvirtd make make install diff --git a/libvirt.spec.in b/libvirt.spec.in index 7c63710..03bd7c7 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -47,7 +47,7 @@ %define with_libxl 0%{!?_without_libxl:%{server_drivers}} %define with_vmware 0%{!?_without_vmware:%{server_drivers}} -# Then the hypervisor drivers that talk a native remote protocol +# Then the hypervisor drivers that talk via a native remote protocol %define with_phyp 0%{!?_without_phyp:1} %define with_esx 0%{!?_without_esx:1} %define with_hyperv 0%{!?_without_hyperv:1} @@ -711,7 +711,6 @@ of recent versions of Linux (and other OSes). %{?_without_python} \ %{?_without_libvirtd} \ %{?_without_uml} \ - %{?_without_one} \ %{?_without_phyp} \ %{?_without_esx} \ %{?_without_hyperv} \ diff --git a/mingw32-libvirt.spec.in b/mingw32-libvirt.spec.in index f651d11..57c67ae 100644 --- a/mingw32-libvirt.spec.in +++ b/mingw32-libvirt.spec.in @@ -5,6 +5,21 @@ %define __find_provides %{_mingw32_findprovides} %define __debug_install_post %{_mingw32_debug_install_post} +# The mingw build is client only. Set up defaults for hypervisor drivers +# that talk via a native remote protocol, and for which prereq mingw +# libraries exist. +%define with_phyp 0%{!?_without_phyp:1} +%define with_esx 0%{!?_without_esx:1} +%define with_hyperv 0%{!?_without_hyperv:0} # missing libwsman +%define with_xenapi 0%{!?_without_xenapi:1} + +# RHEL ships ESX but not PowerHypervisor, HyperV, or libxenserver (xenapi) +%if 0%{?rhel} +%define with_phyp 0 +%define with_xenapi 0 +%define with_hyperv 0 +%endif + Name: mingw32-libvirt Version: @VERSION@ Release: 3%{?dist}%{?extra_release} @@ -29,6 +44,13 @@ BuildRequires: pkgconfig # Need native version for msgfmt BuildRequires: gettext +%if %{with_phyp} +BuildRequires: mingw32-libssh2 +%endif +%if %{with_esx} +BuildRequires: mingw32-curl +%endif + BuildArch: noarch %{?_mingw32_debug_package} @@ -42,23 +64,43 @@ MinGW Windows libvirt virtualization library. %build +%if ! %{with_phyp} +%define _without_phyp --without-phyp +%endif + +%if ! %{with_esx} +%define _without_esx --without-esx +%endif + +%if ! %{with_hyperv} +%define _without_hyperv --without-hyperv +%endif + +%if ! %{with_xenapi} +%define _without_xenapi --without-xenapi +%endif + # XXX enable SASL in future %{_mingw32_configure} \ + --without-xen \ + --without-qemu \ + --without-openvz \ + --without-lxc \ + --without-vbox \ + %{?_without_xenapi} \ --without-sasl \ --without-avahi \ --without-polkit \ --without-python \ - --without-xen \ - --without-qemu \ - --without-lxc \ + --without-libvirtd \ --without-uml \ - --without-vbox \ - --without-openvz \ - --without-phyp \ + %{?_without_phyp} \ + %{?_without_esx} \ + %{?_without_hyperv} \ + --without-vmware \ --without-netcf \ --without-audit \ - --without-dtrace \ - --without-libvirtd + --without-dtrace make -- 1.7.4.4

2 2

[libvirt] [PATCH] build: update to latest gnulib
by Eric Blake 13 Oct '11

13 Oct '11

358 changes; most probably have no impact on libvirt, but we might as well stay current. * .gnulib: Update to latest. --- * .gnulib da1717b...2394a60 (358): > atanl: Simplify for platforms where 'long double' == 'double'. > acosl: Simplify for platforms where 'long double' == 'double'. > asinl: Simplify for platforms where 'long double' == 'double'. > tanl: Simplify for platforms where 'long double' == 'double'. > cosl: Simplify for platforms where 'long double' == 'double'. > sinl: Simplify for platforms where 'long double' == 'double'. > logl: Simplify for platforms where 'long double' == 'double'. > expl: Simplify for platforms where 'long double' == 'double'. > sqrtl: Simplify for platforms where 'long double' == 'double'. > ldexpl: Simplify for platforms where 'long double' == 'double'. > ffsll: set correct witness > printf-frexpl: Simplify for platforms where 'long double' == 'double'. > frexpl: Simplify for platforms where 'long double' == 'double'. > test-renameat: don't leave behind a temporary file > rint: Determine RINT_LIBM correctly on AIX 7. > mathfunc.m4: Refactor. > rintl: Simplify for platforms where 'long double' == 'double'. > roundl: Simplify for platforms where 'long double' == 'double'. > truncl: Simplify for platforms where 'long double' == 'double'. > ceill: Simplify for platforms where 'long double' == 'double'. > floorl: Simplify for platforms where 'long double' == 'double'. > rint: Fix ordering constraints. > copysignl: Simplify for platforms where 'long double' == 'double'. > Tests for module 'rintl'. > New module 'rintl'. > Tests for module 'rintf'. > New module 'rintf'. > rint: Support for MSVC. > rint tests: More tests. > autoupdate > Tests for module 'copysignl'. > New module 'copysignl'. > Tests for module 'copysignf'. > New module 'copysignf'. > Ensure that HAVE_* variables are set to 1 before they are set to 0. > poll: Make macro safer. > copysign: Provide replacement. > isinf: Ensure macro on AIX 5.1. > *printf-posix tests: Fix for platforms where 'long double' == 'double'. > *printf: Fix for platforms where 'long double' == 'double'. > isnanl[-nolibm]: Fix for platforms where 'long double' == 'double'. > isinf: Fix for platforms where 'long double' == 'double'. > isfinite: Fix for platforms where 'long double' == 'double'. > isfinite, isinf, isnan tests: Avoid syntax error on MSVC 9. > Tests for module 'tanhf'. > New module 'tanhf'. > tanh: Use a .m4 file. > Tests for module 'coshf'. > New module 'coshf'. > cosh: Use a .m4 file. > Tests for module 'sinhf'. > New module 'sinhf'. > sinh: Use a .m4 file. > Tests for module 'atan2f'. > New module 'atan2f'. > atan2: Use a .m4 file. > Tests for module 'atanf'. > New module 'atanf'. > atan: Use a .m4 file. > Tests for module 'acosf'. > New module 'acosf'. > acos: Use a .m4 file. > Tests for module 'asinf'. > New module 'asinf'. > asin: Use a .m4 file. > Tests for module 'tanf'. > New module 'tanf'. > tan: Use a .m4 file. > Tests for module 'cosf'. > New module 'cosf'. > cos: Use a .m4 file. > Tests for module 'sinf'. > New module 'sinf'. > sin: Use a .m4 file. > Tests for module 'powf'. > New module 'powf'. > pow: Use a .m4 file. > Tests for module 'log10f'. > New module 'log10f'. > log10: Use a .m4 file. > Tests for module 'logf'. > New module 'logf'. > log: Use a .m4 file. > Tests for module 'expf'. > New module 'expf'. > exp: Use a .m4 file. > Tests for module 'sqrtf'. > New module 'sqrtf'. > Tests: Avoid link failures w.r.t. libintl. > pow tests: Defeat compiler optimizations. > gnulib-tool: Improve last commit. > gnulib-tool: don't follow dependencies to avoided modules > gnulib-tool: fix typo that broke Emacs on powerpc-apple-darwin9.8.0. > Fix documentation about math functions on MacOS X. > modff: Drop assumption about library that defines modff. > raise tests: Avoid a GCC warning. > Tests for module 'ldexpf'. > New module 'ldexpf'. > Tweak last commit. > frexpf: Work around problems on IRIX and mingw. > fabsf: Drop assumption about library that defines fabsf. > frexpf: Drop assumption about library that defines frexpf. > Tests for module 'frexpf'. > New module 'frexpf'. > math: Sort function declarations of math.in.h. > Tests for module 'modff'. > New module 'modff'. > modf tests: Make test sharper. > modf: Use a .m4 file. > Tweak new module 'fmodf'. > Tweak new module 'fmodf'. > Tests for module 'fmodf'. > New module 'fmodf'. > fmod: Use a .m4 file. > New module 'fabsf'. > Tests for module 'fabsf'. > New module 'fabsf'. > fabs: Use a .m4 file. > file-has-acl: revert both recent changes, 80af92af and 95f7c57f > file-has-acl: revert unintended change in behavior of ls -L > poll: Avoid link errors on MSVC. > sys_select tests: Fix link error on MSVC 9. > sys_select: Fix compilation error on mingw. > wmemset: Support for MSVC. > wmemmove: Support for MSVC. > wmemcpy: Support for MSVC. > wmemcmp: Support for MSVC. > wmemchr: Support for MSVC. > glthread/*, strsignal: Support for MSVC. > nonblocking tests: Fix test failure on OpenBSD/SPARC64. > acl: Fix specification. > relocatable-lib[-lgpl]: Avoid expensive /proc access on Linux, Cygwin. > autoupdate > maint.mk: adjust a release-related rule not to require use of gzip > test-linkat: don't leave behind a temporary file > float, math: add omitted file > isinf: Fix for OpenBSD/x86. > isfinite: Fix syntax error in configure test. > isfinite: Fix typo. > nonblocking tests: Fix test failure on Linux/IA-64. > mkfifoat tests: Fix a test failure on mingw. > float, math: Fix 'int' to 'long double' conversion on Linux/SPARC64. > nonblocking tests: Fix test failure on Linux/SPARC (32-bit and 64-bit). > gnulib-tool: Improve suggestion where to put gl_EARLY invocation. > Centralize C99 requirement. > float: Fix LDBL_MAX value on Linux/PowerPC. > Tweak last ChangeLog entry. > doc: Improve doc about gl_EARLY. > fgetc, fputc, fread, fwrite tests: Fix link error. > fputc, fwrite tests: Avoid test failure on MSVC. > raise: Fix double declaration with modules 'sigprocmask' and 'sigpipe'. > autoupdate > base64-tests: avoid memory leak > base32: new module > gnulib: use more-standard license notice wording > dup2: minor simplification > strings: Fix compilation error on MSVC. > fflush et al.: Document limitation on MSVC. > msvc-inval: Allow three invalid parameter handling modes. > msvc-inval: Make handler multithread-safe. > msvc-inval: Install handler globally. > strerror_r-posix: Fix for MSVC 9. > ftruncate: Support for MSVC 9. > New module 'fstat'. > linkat: Fix compilation on MSVC 9. > fclose: Support for MSVC 9. > dup2: minor simplifications > test-futimens: avoid a warning from gcc -Wshadow > fdopen: Support for MSVC 9. > fgetc, fputc, fread, fwrite tests: Avoid compilation error on MSVC. > dup: Simplify autoconf test. > Tests for function fwrite(). > Tests for function fread(). > Activate fputc tests. > Enhance fgetc, fputc tests. > write: Support for MSVC 9. > read: Fix last commit. > dup2: Fix last commit. > sigprocmask: Make code safer. > dup2: clarify by coalescing Windows-specific material > sigprocmask: move #include directive > read: Support for MSVC 9. > close: Support for MSVC 9. > msvc-nothrow: Avoid a compiler warning. > New module 'dup'. > getdtablesize: Support for MSVC 9. > signal-h: Rename from signal. > sigprocmask: Avoid crashes through signal() on MSVC 9. > Tests for module 'raise'. > raise: Support for MSVC. > pipe2: Fix compilation on pre-C99 compilers. > dup2: Fix typo in last commit. > New module 'msvc-nothrow'. Makes _get_osfhandle safe on MSVC 9. > dup2: Make code more maintainable. > msvc-inval: Fix compilation error. > update from texinfo > mkdir: Tweak for MSVC 9. > Tests for module 'chdir'. > New module 'chdir'. > rmdir: Support for mingw, MSVC 9. > getcwd: Tweak for MSVC 9. > strerror_r-posix: Avoid a link error on MSVC. > select: Avoid link errors on MSVC. > select: Avoid compilation error on MSVC. > Consolidate all uses of PATH_MAX in *.m4 files. > ftruncate: Un-deprecate, concentrate on Win32 support. > Add dependencies to new dirent related modules. > opendir: Avoid compilation error on mingw. > ftruncate tests: Avoid a test failure on mingw. > select tests: Avoid test failures on OSF/1 5.1 and mingw. > New module 'fdopen'. > unlockpt tests: Avoid test failure on NetBSD 5.1. > getlogin, getlogin_r tests: Avoid test failure on Linux/SPARC. > time tests: Don't require pid_t. > time tests: Don't require pid_t. > fsync tests: Avoid a test failure on mingw. > euidaccess: Update comments. > Ensure EBADF returns for socket functions on mingw. > select tests: EBADF tests. > Tests for module 'posix_spawn_file_actions_addopen. > Tests for module 'posix_spawn_file_actions_adddup2'. > Tests for module 'posix_spawn_file_actions_addclose'. > Tests for module 'unlockpt'. > Tests for module 'grantpt'. > freopen tests: EBADF tests. > fclose tests: EBADF tests. > fflush tests: EBADF tests. > ftello tests: EBADF tests. > fseeko tests: EBADF tests. > Tests for function fputc(). > Tests for function fgetc(). > Tests for function fdopen(). > Tests for module 'vdprintf'. > Tests for module 'dprintf'. > Tests for module 'ioctl'. > fcntl tests: EBADF tests. > utimensat tests: EBADF tests. > renameat tests: EBADF tests. > mkfifoat tests: EBADF tests. > readlinkat tests: EBADF tests. > symlinkat tests: EBADF tests. > linkat tests: EBADF tests. > Tests for module 'faccessat'. > fdopendir tests: EBADF tests. > openat tests: EBADF tests. > utimens, futimens, fdutimensat tests: EBADF tests. > Tests for function fstat(). > test-ttyname_r tests: EBADF tests. > Tests for module 'isatty'. > Tests for module 'write'. > Tests for module 'read'. > pwrite tests: EBADF tests. > pread tests: EBADF tests. > lseek tests: EBADF tests. > Tests for module 'ftruncate'. > fsync tests: EBADF tests. > fdatasync tests: EBADF tests. > Tests for module 'fchown'. > Tests for module 'fchmod'. > fchdir tests: EBADF tests. > dup2 tests: EBADF tests. > Tests for module 'dup'. > Tests for module 'close'. > Tests for module 'shutdown'. > Tests for module 'setsockopt'. > Tests for module 'sendto'. > Tests for module 'send'. > Tests for module 'recvfrom'. > Tests for module 'recv'. > Tests for module 'listen'. > Tests for module 'getsockopt'. > Tests for module 'getsockname'. > Tests for module 'getpeername'. > Tests for module 'connect'. > Tests for module 'bind'. > accept4 tests: Fix for native Windows. > accept tests: Fix for native Windows. > msvc-inval: Require a semicolon after DONE_MSVC_INVAL. > sched: Ensure pid_t is defined. > msvc-inval: Ensure the entire expansion is a single statement. > tests: use printf, not echo in init.sh's warn_ function > futimens: enhance test > date: accept 'hence' as opposite of 'ago' > getcwd: don't fail in a deep directory on a system without openat > maint.mk: avoid warnings from perl about missing files > * lib/stat.c: Move comment. > stat: use pathmax.h only if needed > utimens: remove dependency on dup2 > inet_ntop, inet_pton: Look for it also in libresolv. > accept, accept4 tests: Avoid link error on Solaris. > accept4: Avoid link error on Solaris. > socket functions: Avoid link errors on Solaris. > ptsname tests: Let the test fail rather than hang (e.g. on AIX 5.1). > posix_spawn_file_actions_add*: Fix module dependencies. > rename, renameat tests: Avoid test failures on FreeBSD 6.4. > Tests for module 'accept4'. > accept tests: Fix last commit. > Tests for module 'accept'. > dup2: Support for MSVC. > New module 'msvc-inval'. > Tests for module 'pclose'. > New module 'pclose'. > popen: Support for MSVC. > isnanl, isnand, isnanf: Work around MSVC bug. > sys_socket tests: Fix recent mistake. > putenv: Support for MSVC. > math: Avoid macro redefinition warnings on MSVC. > doc: Mention functions which are declared as macros. > Add dependencies to new dirent related modules. > inet_pton: Fix mistake in last commit. > inet_pton: Support for MSVC on Windows Vista or newer. > inet_ntop: Support for MSVC on Windows Vista or newer. > test-fsync: yet another enhancement > Enhance fsync, fdatasync tests. > Fix last ChangeLog entry. > Support for MSVC compiler: Ensure mode_t gets defined. > sys_stat: Support for MSVC. > Support for MSVC compiler: Ensure off_t gets defined. > fdatasync: port to Solaris > fdatasync: port to MacOS X 10.7 > fdatasync: minor improvements > unistd: update refs to newer POSIX > fdatasync: new module > test-fsync: enhance tests > Support for MSVC compiler: Ensure ssize_t gets defined. > Avoid using #, the m4 comment starter character, near brackets. > Properly quote AC_CHECK_DECLS' 4th argument. > Properly quote AC_CHECK_DECL's 4th argument. > opendir: avoid compile warning > maint.mk: sc_tight_scope: propagate failure from sub-make > tempname: Support for MSVC. > sys_time: Support for MSVC. > stat: Support for MSVC. > pathmax: Support for native Windows. > New modules 'opendir', 'readdir', 'rewinddir', 'closedir'. > asm-underscore.m4: Support for MSVC. > Expand range of versions of glibc for which _GNU_SOURCE is needed to get crypt. > doc: Update regarding MSVC 9. > unistd et al.: Don't assume <unistd.h> exists. > strcase: Support for MSVC. > strings: Don't assume <strings.h> exists. > dirent: Don't assume <dirent.h> exists. > Fix wint_t on MSVC. > sys_types: Fix typo. > autoupdate > Support for MSVC compiler: Ensure size_t gets defined. > C++ tests for module 'sys_types'. > Tests for module 'sys_types'. > New module 'sys_types'. > Support for MSVC compiler: Avoid division by a literal 0. > Ensure pid_t gets defined. > acl: Fix compilation on Solaris 10 (older version). > iconv, unsetenv: Add support for MSVC compiler. > *printf: Add support for MSVC compiler. > nocrash: Add support for native Windows. > absolute-header, include-next: Add support for MSVC compiler. > ChangeLog: change each leading sequence of 8 spaces to a TAB > maint.mk: mark the post-release commit log with "maint: " prefix .gnulib | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.gnulib b/.gnulib index da1717b..2394a60 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit da1717b7f93b77469f980ea5e13178e4e9e7ae09 +Subproject commit 2394a603e7586e671226478e5b15d924c3841f42 -- 1.7.4.4

2 2

[libvirt] [RFC PATCH 1/5] Add new API virDomainBlockIoThrottle
by Lei Li 13 Oct '11

13 Oct '11

Signed-off-by: Zhi Yong Wu <wuzhy(a)linux.vnet.ibm.com> --- include/libvirt/libvirt.h.in | 22 ++++++++++++ src/conf/domain_conf.c | 77 ++++++++++++++++++++++++++++++++++++++++++ src/conf/domain_conf.h | 11 ++++++ src/driver.h | 11 ++++++ src/libvirt.c | 66 ++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 1 + src/util/xml.h | 3 ++ 7 files changed, 191 insertions(+), 0 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 07617be..f7b892d 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1573,6 +1573,28 @@ int virDomainBlockJobSetSpeed(virDomainPtr dom, const char *path, int virDomainBlockPull(virDomainPtr dom, const char *path, unsigned long bandwidth, unsigned int flags); +/* + * Block I/O throttling support + */ + +typedef unsigned long long virDomainBlockIoThrottleUnits; + +typedef struct _virDomainBlockIoThrottleInfo virDomainBlockIoThrottleInfo; +struct _virDomainBlockIoThrottleInfo { + virDomainBlockIoThrottleUnits bps; + virDomainBlockIoThrottleUnits bps_rd; + virDomainBlockIoThrottleUnits bps_wr; + virDomainBlockIoThrottleUnits iops; + virDomainBlockIoThrottleUnits iops_rd; + virDomainBlockIoThrottleUnits iops_wr; +}; +typedef virDomainBlockIoThrottleInfo *virDomainBlockIoThrottleInfoPtr; + +int virDomainBlockIoThrottle(virDomainPtr dom, + const char *disk, + virDomainBlockIoThrottleInfoPtr info, + virDomainBlockIoThrottleInfoPtr reply, + unsigned int flags); /* * NUMA support diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 944cfa9..d0ba07e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2422,6 +2422,42 @@ virDomainDiskDefParseXML(virCapsPtr caps, iotag = virXMLPropString(cur, "io"); ioeventfd = virXMLPropString(cur, "ioeventfd"); event_idx = virXMLPropString(cur, "event_idx"); + } else if (xmlStrEqual(cur->name, BAD_CAST "iothrottle")) { + char *io_throttle = NULL; + io_throttle = virXMLPropString(cur, "bps"); + if (io_throttle) { + def->blkiothrottle.bps = strtoull(io_throttle, NULL, 10); + VIR_FREE(io_throttle); + } + + io_throttle = virXMLPropString(cur, "bps_rd"); + if (io_throttle) { + def->blkiothrottle.bps_rd = strtoull(io_throttle, NULL, 10); + VIR_FREE(io_throttle); + } + + io_throttle = virXMLPropString(cur, "bps_wr"); + if (io_throttle) { + def->blkiothrottle.bps_wr = strtoull(io_throttle, NULL, 10); + VIR_FREE(io_throttle); + } + + io_throttle = virXMLPropString(cur, "iops"); + if (io_throttle) { + def->blkiothrottle.iops = strtoull(io_throttle, NULL, 10); + VIR_FREE(io_throttle); + } + + io_throttle = virXMLPropString(cur, "iops_rd"); + if (io_throttle) { + def->blkiothrottle.iops_rd = strtoull(io_throttle, NULL, 10); + VIR_FREE(io_throttle); + } + + io_throttle = virXMLPropString(cur, "iops_wr"); + if (io_throttle) { + def->blkiothrottle.iops_wr = strtoull(io_throttle, NULL, 10); + } } else if (xmlStrEqual(cur->name, BAD_CAST "readonly")) { def->readonly = 1; } else if (xmlStrEqual(cur->name, BAD_CAST "shareable")) { @@ -9249,6 +9285,47 @@ virDomainDiskDefFormat(virBufferPtr buf, virBufferAsprintf(buf, " <target dev='%s' bus='%s'/>\n", def->dst, bus); + /*disk I/O throttling*/ + if (def->blkiothrottle.bps + || def->blkiothrottle.bps_rd + || def->blkiothrottle.bps_wr + || def->blkiothrottle.iops + || def->blkiothrottle.iops_rd + || def->blkiothrottle.iops_wr) { + virBufferAsprintf(buf, " <iothrottle"); + if (def->blkiothrottle.bps) { + virBufferAsprintf(buf, " bps='%llu'", + def->blkiothrottle.bps); + } + + if (def->blkiothrottle.bps_rd) { + virBufferAsprintf(buf, " bps_rd='%llu'", + def->blkiothrottle.bps_rd); + } + + if (def->blkiothrottle.bps_wr) { + virBufferAsprintf(buf, " bps_wr='%llu'", + def->blkiothrottle.bps_wr); + } + + if (def->blkiothrottle.iops) { + virBufferAsprintf(buf, " iops='%llu'", + def->blkiothrottle.iops); + } + + if (def->blkiothrottle.iops_rd) { + virBufferAsprintf(buf, " iops_rd='%llu'", + def->blkiothrottle.iops_rd); + } + + if (def->blkiothrottle.iops_wr) { + virBufferAsprintf(buf, " iops_wr='%llu'", + def->blkiothrottle.iops_wr); + } + + virBufferAsprintf(buf, "/>\n"); + } + if (def->bootIndex) virBufferAsprintf(buf, " <boot order='%d'/>\n", def->bootIndex); if (def->readonly) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index e07fd2f..b60a6de 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -283,6 +283,17 @@ struct _virDomainDiskDef { virDomainDiskHostDefPtr hosts; char *driverName; char *driverType; + + /*disk I/O throttling*/ + struct { + unsigned long long bps; + unsigned long long bps_rd; + unsigned long long bps_wr; + unsigned long long iops; + unsigned long long iops_rd; + unsigned long long iops_wr; + } blkiothrottle; + char *serial; int cachemode; int error_policy; /* enum virDomainDiskErrorPolicy */ diff --git a/src/driver.h b/src/driver.h index f85a1b1..741e196 100644 --- a/src/driver.h +++ b/src/driver.h @@ -725,6 +725,16 @@ typedef int (*virDrvDomainBlockPull)(virDomainPtr dom, const char *path, unsigned long bandwidth, unsigned int flags); +/* + * Block I/O throttling support + */ + +typedef int + (*virDrvDomainBlockIoThrottle)(virDomainPtr dom, + const char *disk, + virDomainBlockIoThrottleInfoPtr info, + virDomainBlockIoThrottleInfoPtr reply, + unsigned int flags); /** * _virDriver: @@ -881,6 +891,7 @@ struct _virDriver { virDrvDomainGetBlockJobInfo domainGetBlockJobInfo; virDrvDomainBlockJobSetSpeed domainBlockJobSetSpeed; virDrvDomainBlockPull domainBlockPull; + virDrvDomainBlockIoThrottle domainBlockIoThrottle; }; typedef int diff --git a/src/libvirt.c b/src/libvirt.c index 182e031..5f4514c 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -16706,3 +16706,69 @@ error: virDispatchError(dom->conn); return -1; } + +/** + * virDomainBlockIoThrottle: + * @dom: pointer to domain object + * @disk: Fully-qualified disk name + * @info: specify block I/O limits in bytes + * @reply: store block I/O limits setting + * @flags: indicate if it set or display block I/O limits info + * + * This function is mainly to enable Block I/O throttling function in libvirt. + * It is used to set or display block I/O throttling setting for specified domain. + * + * Returns 0 if the operation has started, -1 on failure. + */ +int virDomainBlockIoThrottle(virDomainPtr dom, + const char *disk, + virDomainBlockIoThrottleInfoPtr info, + virDomainBlockIoThrottleInfoPtr reply, + unsigned int flags) +{ + virConnectPtr conn; + + VIR_DOMAIN_DEBUG(dom, "disk=%p, info=%p, reply=%p,flags=%x", + disk, info, reply, flags); + + virResetLastError(); + + if (!VIR_IS_CONNECTED_DOMAIN (dom)) { + virLibDomainError(VIR_ERR_INVALID_DOMAIN, __FUNCTION__); + virDispatchError(NULL); + return -1; + } + conn = dom->conn; + + if (dom->conn->flags & VIR_CONNECT_RO) { + virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } + + if (!disk) { + virLibDomainError(VIR_ERR_INVALID_ARG, + _("disk name is NULL")); + goto error; + } + + if (!reply) { + virLibDomainError(VIR_ERR_INVALID_ARG, + _("reply is NULL")); + goto error; + } + + if (conn->driver->domainBlockIoThrottle) { + int ret; + ret = conn->driver->domainBlockIoThrottle(dom, disk, info, reply, flags); + if (ret < 0) + goto error; + return ret; + } + + virLibDomainError(VIR_ERR_NO_SUPPORT, __FUNCTION__); + +error: + virDispatchError(dom->conn); + return -1; +} + diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index afea29b..0a79167 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -493,6 +493,7 @@ LIBVIRT_0.9.7 { global: virDomainReset; virDomainSnapshotGetParent; + virDomainBlockIoThrottle; } LIBVIRT_0.9.5; # .... define new API here using predicted next version number .... diff --git a/src/util/xml.h b/src/util/xml.h index d30e066..14b35b2 100644 --- a/src/util/xml.h +++ b/src/util/xml.h @@ -50,6 +50,9 @@ xmlNodePtr virXPathNode(const char *xpath, int virXPathNodeSet(const char *xpath, xmlXPathContextPtr ctxt, xmlNodePtr **list); +int virXMLStringToULongLong (const char *stringval, + unsigned long long *value); + char * virXMLPropString(xmlNodePtr node, const char *name); -- 1.7.1

5 15

[libvirt] [PATCH v2 0/2] Allow to make disk optional on migration
by Michal Privoznik 13 Oct '11

13 Oct '11

If user wants to migrate a machine, it's all or nothing. Either he/she has all storage accessible under same paths, or migration will fail. But there are some cases, where allowing migration to drop some disks, may be useful. E.g. when host gets itself to a state where domains need to be migrated so host can be say rebooted. Therefore we might want to give user possibility to mark some cdroms/floppy as optional, meaning if destination cannot access them, they get ejected (on destination). This idea is implemented via <migration> element, which basically says what to do with (currently) disk on migration. Right now it contains only one attribute 'optional' accepting values 'require', 'optional' and 'drop'. Then, if destination cannot access a path and corresponding disk is marked as: a) 'require' - migration will fail b) 'optional' - disk gets force ejected (source is free()'d), regardless tray being locked c) 'drop' - disk gets force ejected even if destination could access the path. diff to v1: -change xml representation from 'yes' & 'no' to 'require', 'optional' & 'drop' Michal Privoznik (2): migration: Introduce <migration> element for cdrom and floppy qemu: Implement migration optional disk docs/formatdomain.html.in | 23 ++++++ docs/schemas/domaincommon.rng | 17 ++++ src/conf/domain_conf.c | 78 +++++++++++++++++++- src/conf/domain_conf.h | 17 ++++ src/libvirt_private.syms | 2 + src/qemu/qemu_migration.c | 51 ++++++++++++- .../domain-qemu-complex-migration.xml | 68 +++++++++++++++++ 7 files changed, 253 insertions(+), 3 deletions(-) create mode 100644 tests/domainschemadata/domain-qemu-complex-migration.xml -- 1.7.3.4

3 5

[libvirt] [test-API][PATCH 0/5] Update migrate module
by Wayne Sun 13 Oct '11

13 Oct '11

Current migrate module include the remote_guest_define function which has problem with transient guest created on local, it can't find persistent domain xml on local and copy to remote. This series fixes aim to solve this problem. First, remote_guest_define function in migrate is removed, then add support for define domain on remote in define module. New xml element uuid is added into xmlgenerator, and new variable static_uuid is introduced into env.cfg, this will help domain created on local and defined on remote get the same uuid. At last, all related conf files are updated. [test-API][PATCH 1/5] Remove remote_guest_define function in migrate [test-API][PATCH 2/5] Add new variable static_uuid into env.cfg [test-API][PATCH 3/5] Update add_option_value function in parser [test-API][PATCH 4/5] Add new element uuid in xmlgenerator [test-API][PATCH 5/5] Update the migration case conf file .../migration/ssh_persistent_paused_with_dst.conf | 192 ------------------- .../migration/ssh_persistent_running_with_dst.conf | 192 ------------------- cases/migration/ssh_transient_paused_with_dst.conf | 200 -------------------- .../migration/ssh_transient_running_with_dst.conf | 198 ------------------- .../migration/tcp_persistent_paused_with_dst.conf | 192 ------------------- .../migration/tcp_persistent_running_with_dst.conf | 192 ------------------- .../tcp_sasl_persistent_paused_with_dst.conf | 64 ------- .../tcp_sasl_persistent_running_with_dst.conf | 64 ------- .../tcp_sasl_transient_paused_with_dst.conf | 64 ------- .../tcp_sasl_transient_running_with_dst.conf | 64 ------- cases/migration/tcp_transient_paused_with_dst.conf | 200 -------------------- .../migration/tcp_transient_running_with_dst.conf | 198 ------------------- .../migration/tls_persistent_paused_with_dst.conf | 192 ------------------- .../migration/tls_persistent_running_with_dst.conf | 192 ------------------- .../tls_sasl_persistent_paused_with_dst.conf | 64 ------- .../tls_sasl_persistent_running_with_dst.conf | 64 ------- .../tls_sasl_transient_paused_with_dst.conf | 64 ------- .../tls_sasl_transient_running_with_dst.conf | 64 ------- cases/migration/tls_transient_paused_with_dst.conf | 200 -------------------- .../migration/tls_transient_running_with_dst.conf | 198 ------------------- env.cfg | 3 - parser.py | 12 +- repos/domain/migrate.py | 31 +++- utils/Python/xmlgenerator.py | 7 - 24 files changed, 33 insertions(+), 2878 deletions(-)

2 10

[libvirt] [PATCH] [libvirt-tck] Allow to pass --timer to prove
by Guido Günther 13 Oct '11

13 Oct '11

so execution times can be reported too. --- bin/libvirt-tck | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/bin/libvirt-tck b/bin/libvirt-tck index dcb053c..816234b 100644 --- a/bin/libvirt-tck +++ b/bin/libvirt-tck @@ -109,6 +109,10 @@ Generate an archive containing all the raw test results. The filename given should end in either C<.bz>, C<.tar.gz> or C<.tgz> +=item --timer + +Print elapsed time after each test. + =back =cut @@ -136,6 +140,7 @@ my $quiet = 0; my $help = 0; my $force = 0; my $debug = 0; +my $timer = 0; my $archive; my $config = catfile($confdir, "default.cfg"); my $format = "text"; @@ -149,7 +154,8 @@ if (!GetOptions("verbose" => \$verbose, "config=s" => \$config, "force" => \$force, "format=s" => \$format, - "testdir=s" => \$testdir) || $help) { + "testdir=s" => \$testdir, + "timer" => \$timer) || $help) { pod2usage(-verbose => $help, -output => $help ? \*STDOUT : \*STDERR, -exitval => $help ? 0 : 1); @@ -204,6 +210,9 @@ if ($format eq "xml") { -output => \*STDERR); } +if ($timer) { + push @newargv, "--timer"; +} # This env variable is the only way to pass config into # the Sys::Virt::TCK module from here -- 1.7.6.3

2 2

[libvirt] [libvirt-glib] Don't leak virStreams, take the reference
by Marc-André Lureau 13 Oct '11

13 Oct '11

Without this change, after virStreamNew() and g_value_dup_boxed() it will have refcnt = 2 and will leak when GVirStream is destroyed. --- libvirt-gobject/libvirt-gobject-stream.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-stream.c b/libvirt-gobject/libvirt-gobject-stream.c index 88e3a40..4aeb182 100644 --- a/libvirt-gobject/libvirt-gobject-stream.c +++ b/libvirt-gobject/libvirt-gobject-stream.c @@ -160,7 +160,7 @@ static void gvir_stream_set_property(GObject *object, case PROP_HANDLE: if (priv->handle) virStreamFree(priv->handle); - priv->handle = g_value_dup_boxed(value); + priv->handle = g_value_get_boxed(value); break; default: -- 1.7.6.2

2 1

[libvirt] RPM build failure on Redhat6
by Wayne Xia 13 Oct '11

13 Oct '11

Hi, I want to build rpm for latest libvit version on Redhat6, but when I type: ./autogen.sh --system make rpm -j4 error happens: sitemap.html.tmp index.html.tmp archdomain.html.tmp downloads.html.tmp auth.html.tmp internals/locking.html.tmp archnode.html.tmp hvsupport.html.tmp bugs.html.tmp java.html.tmp locking.html.tmp logging.html.tmp testapi.html.tmp formatnetwork.html.tmp bindings.html.tmp uri.html.tmp drvtest.html.tmp contact.html.tmp formatnwfilter.html.tmp intro.html.tmp drvxen.html.tmp drvesx.html.tmp drvqemu.html.tmp drvvmware.html.tmp testsuites.html.tmp devguide.html.tmp firewall.html.tmp architecture.html.tmp todo.html.tmp formatsnapshot.html.tmp formatstorage.html.tmp deployment.html.tmp internals.html.tmp api_extension.html.tmp drvuml.html.tmp virshcmdref.html.tmp csharp.html.tmp python.html.tmp drvremote.html.tmp archstorage.html.tmp remote.html.tmp drivers.html.tmp formatnode.html.tmp make[2]: Leaving directory `/home/xiawenc/WorkDir/Source/libvirt/libvirt/docs' make[1]: *** [distdir] Error 1 make[1]: Leaving directory `/home/xiawenc/WorkDir/Source/libvirt/libvirt' make: *** [rpm] Error 2 does anyone knows what is happening? -- Best Regards Wayne Xia mail:xiawenc@linux.vnet.ibm.com tel:86-010-82450803

3 4

[libvirt] [PATCH] qemu: Check for domain being active on successful job acquire
by Michal Privoznik 13 Oct '11

13 Oct '11

As this is needed. Although some functions check for domain being active before obtaining job, we need to check it after, because obtaining job unlocks domain object, during which a state of domain can be changed. --- src/qemu/qemu_driver.c | 75 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 69 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ec01cd5..1efc66b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1948,9 +1948,18 @@ static int qemuDomainInjectNMI(virDomainPtr domain, unsigned int flags) if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; + + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto endjob; + } + qemuDomainObjEnterMonitorWithDriver(driver, vm); ret = qemuMonitorInjectNMI(priv->mon); qemuDomainObjExitMonitorWithDriver(driver, vm); + +endjob: if (qemuDomainObjEndJob(driver, vm) == 0) { vm = NULL; goto cleanup; @@ -4387,7 +4396,7 @@ static char *qemuDomainGetXMLDesc(virDomainPtr dom, virDomainObjPtr vm; char *ret = NULL; unsigned long balloon; - int err; + int err = 0; /* Flags checked by virDomainDefFormat */ @@ -4413,9 +4422,17 @@ static char *qemuDomainGetXMLDesc(virDomainPtr dom, if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto endjob; + } + qemuDomainObjEnterMonitorWithDriver(driver, vm); err = qemuMonitorGetBalloonInfo(priv->mon, &balloon); qemuDomainObjExitMonitorWithDriver(driver, vm); + +endjob: if (qemuDomainObjEndJob(driver, vm) == 0) { vm = NULL; goto cleanup; @@ -7153,6 +7170,12 @@ qemudDomainBlockStatsFlags (virDomainPtr dom, if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto endjob; + } + qemuDomainObjEnterMonitor(driver, vm); tmp = *nparams; ret = qemuMonitorGetBlockStatsParamsNumber(priv->mon, nparams); @@ -8672,6 +8695,12 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom, if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MIGRATION_OP) < 0) goto cleanup; + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto endjob; + } + VIR_DEBUG("Setting migration bandwidth to %luMbs", bandwidth); qemuDomainObjEnterMonitor(driver, vm); ret = qemuMonitorSetMigrationSpeed(priv->mon, bandwidth); @@ -8680,6 +8709,7 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom, if (ret == 0) priv->migMaxBandwidth = bandwidth; +endjob: if (qemuDomainObjEndJob(driver, vm) == 0) vm = NULL; } else { @@ -8774,6 +8804,12 @@ qemuDomainSnapshotCreateActive(virConnectPtr conn, if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_MODIFY) < 0) return -1; + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto endjob; + } + if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) { /* savevm monitor command pauses the domain emitting an event which * confuses libvirt since it's not notified when qemu resumes the @@ -8823,6 +8859,7 @@ cleanup: _("resuming after snapshot failed")); } +endjob: if (vm && qemuDomainObjEndJob(driver, vm) == 0) { /* Only possible if a transient vm quit while our locks were down, * in which case we don't want to save snapshot metadata. */ @@ -9045,6 +9082,13 @@ qemuDomainSnapshotCreateDiskActive(virConnectPtr conn, if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_MODIFY) < 0) return -1; + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto endjob; + } + + if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) { /* In qemu, snapshot_blkdev on a single disk will pause cpus, * but this confuses libvirt since notifications are not given @@ -9127,12 +9171,14 @@ cleanup: (persist && virDomainSaveConfig(driver->configDir, vm->newDef) < 0)) ret = -1; - if (qemuDomainObjEndJob(driver, vm) == 0) { + } + +endjob: + if (vm && (qemuDomainObjEndJob(driver, vm) == 0)) { /* Only possible if a transient vm quit while our locks were down, * in which case we don't want to save snapshot metadata. */ *vmptr = NULL; ret = -1; - } } return ret; @@ -10272,20 +10318,28 @@ static int qemuDomainMonitorCommand(virDomainPtr domain, const char *cmd, goto cleanup; } + if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_MODIFY) < 0) + goto cleanup; + + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain is not running")); + goto endjob; + } + priv = vm->privateData; qemuDomainObjTaint(driver, vm, VIR_DOMAIN_TAINT_CUSTOM_MONITOR, -1); hmp = !!(flags & VIR_DOMAIN_QEMU_MONITOR_COMMAND_HMP); - if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_MODIFY) < 0) - goto cleanup; qemuDomainObjEnterMonitorWithDriver(driver, vm); ret = qemuMonitorArbitraryCommand(priv->mon, cmd, result, hmp); qemuDomainObjExitMonitorWithDriver(driver, vm); + +endjob: if (qemuDomainObjEndJob(driver, vm) == 0) { vm = NULL; - goto cleanup; } cleanup: @@ -10522,10 +10576,19 @@ qemuDomainBlockJobImpl(virDomainPtr dom, const char *path, if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_MODIFY) < 0) goto cleanup; + + if (!virDomainObjIsActive(vm)) { + qemuReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain is not running")); + goto endjob; + } + qemuDomainObjEnterMonitorWithDriver(driver, vm); priv = vm->privateData; ret = qemuMonitorBlockJob(priv->mon, device, bandwidth, info, mode); qemuDomainObjExitMonitorWithDriver(driver, vm); + +endjob: if (qemuDomainObjEndJob(driver, vm) == 0) { vm = NULL; goto cleanup; -- 1.7.3.4

2 2

[libvirt] [PATCH] events: Propose a separate lock for event queue
by Michal Privoznik 13 Oct '11

13 Oct '11

Currently, push & pop from event queue (both server & client side) rely on lock from higher levels, e.g. on driver lock (qemu), private_data (remote), ...; This alone is not sufficient as not every function that interacts with this queue can/does lock, esp. in client where we have a different approach, "passing the buck". Therefore we need a separate lock just to protect event queue. For more info see: https://bugzilla.redhat.com/show_bug.cgi?id=743817 --- src/conf/domain_event.c | 65 +++++++++++++++++++++++++++++++++++++++++------ src/conf/domain_event.h | 1 + 2 files changed, 58 insertions(+), 8 deletions(-) diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 3189346..6cc8168 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -547,6 +547,24 @@ virDomainEventQueuePtr virDomainEventQueueNew(void) return ret; } +static void +virDomainEventStateLock(virDomainEventStatePtr state) +{ + if (!state) + return; + + virMutexLock(&state->lock); +} + +static void +virDomainEventStateUnlock(virDomainEventStatePtr state) +{ + if (!state) + return; + + virMutexUnlock(&state->lock); +} + /** * virDomainEventStateFree: * @list: virDomainEventStatePtr to free @@ -564,6 +582,8 @@ virDomainEventStateFree(virDomainEventStatePtr state) if (state->timer != -1) virEventRemoveTimeout(state->timer); + + virMutexDestroy(&state->lock); VIR_FREE(state); } @@ -590,6 +610,13 @@ virDomainEventStateNew(virEventTimeoutCallback timeout_cb, goto error; } + if (virMutexInit(&state->lock) < 0) { + virReportSystemError(errno, "%s", + _("unable to initialize state mutex")); + VIR_FREE(state); + goto error; + } + if (VIR_ALLOC(state->callbacks) < 0) { virReportOOMError(); goto error; @@ -1161,18 +1188,26 @@ void virDomainEventStateQueue(virDomainEventStatePtr state, virDomainEventPtr event) { + int count; + if (state->timer < 0) { virDomainEventFree(event); return; } + virDomainEventStateLock(state); + if (virDomainEventQueuePush(state->queue, event) < 0) { VIR_DEBUG("Error adding event to queue"); virDomainEventFree(event); } - if (state->queue->count == 1) + count = state->queue->count; + virDomainEventStateUnlock(state); + + if (count == 1) virEventUpdateTimeout(state->timer, 0); + } void @@ -1182,6 +1217,7 @@ virDomainEventStateFlush(virDomainEventStatePtr state, { virDomainEventQueue tempQueue; + virDomainEventStateLock(state); state->isDispatching = true; /* Copy the queue, so we're reentrant safe when dispatchFunc drops the @@ -1190,6 +1226,7 @@ virDomainEventStateFlush(virDomainEventStatePtr state, tempQueue.events = state->queue->events; state->queue->count = 0; state->queue->events = NULL; + virDomainEventStateUnlock(state); virEventUpdateTimeout(state->timer, -1); virDomainEventQueueDispatch(&tempQueue, @@ -1198,9 +1235,11 @@ virDomainEventStateFlush(virDomainEventStatePtr state, opaque); /* Purge any deleted callbacks */ + virDomainEventStateLock(state); virDomainEventCallbackListPurgeMarked(state->callbacks); state->isDispatching = false; + virDomainEventStateUnlock(state); } int @@ -1208,11 +1247,16 @@ virDomainEventStateDeregister(virConnectPtr conn, virDomainEventStatePtr state, virConnectDomainEventCallback callback) { + int ret; + + virDomainEventStateLock(state); if (state->isDispatching) - return virDomainEventCallbackListMarkDelete(conn, - state->callbacks, callback); + ret = virDomainEventCallbackListMarkDelete(conn, + state->callbacks, callback); else - return virDomainEventCallbackListRemove(conn, state->callbacks, callback); + ret = virDomainEventCallbackListRemove(conn, state->callbacks, callback); + virDomainEventStateUnlock(state); + return ret; } int @@ -1220,10 +1264,15 @@ virDomainEventStateDeregisterAny(virConnectPtr conn, virDomainEventStatePtr state, int callbackID) { + int ret; + + virDomainEventStateLock(state); if (state->isDispatching) - return virDomainEventCallbackListMarkDeleteID(conn, - state->callbacks, callbackID); + ret = virDomainEventCallbackListMarkDeleteID(conn, + state->callbacks, callbackID); else - return virDomainEventCallbackListRemoveID(conn, - state->callbacks, callbackID); + ret = virDomainEventCallbackListRemoveID(conn, + state->callbacks, callbackID); + virDomainEventStateUnlock(state); + return ret; } diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index b06be16..08930ed 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -61,6 +61,7 @@ struct _virDomainEventState { int timer; /* Flag if we're in process of dispatching */ bool isDispatching; + virMutex lock; }; typedef struct _virDomainEventState virDomainEventState; typedef virDomainEventState *virDomainEventStatePtr; -- 1.7.3.4

3 5

[libvirt] [PATCH v4 0/2] Allow domain reboot after core dump
by Michal Privoznik 13 Oct '11

13 Oct '11

This is the 4th (and hopefully last) version of these patches. diff to v3: -split in 2 patches -and some other Eric's suggestions taken in Michal Privoznik (2): virDomainCoreDump: Introduce VIR_DUMP_RESET flag qemu: Implement VIR_DUMP_RESET include/libvirt/libvirt.h.in | 1 + src/libvirt.c | 15 ++++++++++++++- src/qemu/qemu_driver.c | 9 ++++++++- tools/virsh.c | 3 +++ tools/virsh.pod | 4 +++- 5 files changed, 29 insertions(+), 3 deletions(-) -- 1.7.3.4

2 8

[libvirt] Possible security hole? unprivileged user can use virsh to overwrite sensitive system file
by Hong Xiang 13 Oct '11

13 Oct '11

I found there's a way for a unprivileged user to overwrite sensitive system file with virsh, here's how: 1. (as an unprivileged user) start virsh and connect to the r/w socket of libvirtd: virsh -c qemu+unix:///system?socket=/var/run/libvirt/libvirt-sock 2. start a guest, then issue 'save' or 'dump' command, giving a sensitive system file path as the <file> parameter, for example, '/etc/passwd'; 3. the sensitive system file will be overwritten; Attached is a test log. I'm using libvirt-0.8.7 on a OpenClient for RHEL 6.1. And latest libvirt code shows the same symptom. BTW, virsh expands the <file> parameter in step to an absolute path if user-provided is not, and libvirtd interprets it as a local file. IMHO it does not look quite right, especially when the virsh-to-libvirtd connection is remote. -- Thanks. Hong Xiang

3 3

[libvirt] [PATCH] qemu: Do not reattach PCI device used by other domain when shutdown
by Osier Yang 13 Oct '11

13 Oct '11

When failing on starting a domain, it tries to reattach all the PCI devices defined in the domain conf, regardless of whether the devices are still used by other domain. This will cause the devices are deleted from the list qemu_driver->activePciHostdevs, thus the devices will be thought as usable even if it's not true. And following commands nodedev-{reattach,reset} will be successful. How to reproduce: 1) Define two domains with same PCI device defined in the confs. 2) # virsh start domain1 3) # virsh start domain2 4) # virsh nodedev-reattach $pci_device You will see the device will be reattached to host successfully. As pciDeviceReattach just check if the device is still used by other domain via checking if the device is in list driver->activePciHostdevs, however, the device is deleted from the list by step 2). This patch is to prohibit the bug by: 1) Prohibit a domain starting or device attachment right at preparation period (qemuPrepareHostdevPCIDevices) if the device is in list driver->activePciHostdevs, which means it's used by other domain. 2) Introduces a new field for struct _pciDevice, (char *used_by), it will be set as the domain name at preparation period, (qemuPrepareHostdevPCIDevices). Thus we can prohibit deleting the device from driver->activePciHostdevs if it's still used by other domain when stopping the domain process. * src/pci.h (define two internal functions, pciDeviceSetUsedBy and pciDevceGetUsedBy) * src/pci.c (new field "char *used_by" for struct _pciDevice, implementations for the two new functions) * src/libvirt_private.syms (Add the two new internal functions) * src/qemu_hostdev.h (Modify the definition of functions qemuPrepareHostdevPCIDevices, and qemuDomainReAttachHostdevDevices) * src/qemu_hostdev.c (Prohibit preparation and don't delete the device from activePciHostdevs list if it's still used by other domain) * src/qemu_hotplug.c (Update function usage, as the definitions are changed) --- src/libvirt_private.syms | 2 ++ src/qemu/qemu_hostdev.c | 31 ++++++++++++++++++++++++++++--- src/qemu/qemu_hostdev.h | 2 ++ src/qemu/qemu_hotplug.c | 4 ++-- src/util/pci.c | 22 ++++++++++++++++++++++ src/util/pci.h | 3 +++ 6 files changed, 59 insertions(+), 5 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 8235ea1..a5c5e6c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -872,6 +872,7 @@ virNWFilterHashTableRemoveEntry; pciDettachDevice; pciDeviceFileIterate; pciDeviceGetManaged; +pciDeviceGetUsedBy; pciDeviceIsAssignable; pciDeviceIsVirtualFunction; pciDeviceListAdd; @@ -884,6 +885,7 @@ pciDeviceListSteal; pciDeviceNetName; pciDeviceReAttachInit; pciDeviceSetManaged; +pciDeviceSetUsedBy; pciFreeDevice; pciGetDevice; pciGetPhysicalFunction; diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 6f77717..ef9e3b7 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -101,6 +101,7 @@ cleanup: int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, + const char *name, virDomainHostdevDefPtr *hostdevs, int nhostdevs) { @@ -126,7 +127,10 @@ int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, for (i = 0; i < pciDeviceListCount(pcidevs); i++) { pciDevice *dev = pciDeviceListGet(pcidevs, i); if (!pciDeviceIsAssignable(dev, !driver->relaxedACS)) - goto reattachdevs; + goto cleanup; + + if (pciDeviceListFind(driver->activePciHostdevs, dev)) + goto cleanup; if (pciDeviceGetManaged(dev) && pciDettachDevice(dev, driver->activePciHostdevs) < 0) @@ -156,6 +160,14 @@ int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, pciDeviceListSteal(pcidevs, dev); } + /* Now set the used_by_domain of the device in driver->activePciHostdevs + * as domain name. + */ + for (i = 0; i < pciDeviceListCount(driver->activePciHostdevs); i++) { + pciDevice * dev = pciDeviceListGet(driver->activePciHostdevs, i); + pciDeviceSetUsedBy(dev, name); + } + ret = 0; goto cleanup; @@ -183,7 +195,7 @@ static int qemuPrepareHostPCIDevices(struct qemud_driver *driver, virDomainDefPtr def) { - return qemuPrepareHostdevPCIDevices(driver, def->hostdevs, def->nhostdevs); + return qemuPrepareHostdevPCIDevices(driver, def->name, def->hostdevs, def->nhostdevs); } @@ -258,11 +270,13 @@ void qemuReattachPciDevice(pciDevice *dev, struct qemud_driver *driver) void qemuDomainReAttachHostdevDevices(struct qemud_driver *driver, + const char *name, virDomainHostdevDefPtr *hostdevs, int nhostdevs) { pciDeviceList *pcidevs; int i; + const char *used_by = NULL; if (!(pcidevs = qemuGetPciHostDeviceList(hostdevs, nhostdevs))) { virErrorPtr err = virGetLastError(); @@ -277,6 +291,17 @@ void qemuDomainReAttachHostdevDevices(struct qemud_driver *driver, for (i = 0; i < pciDeviceListCount(pcidevs); i++) { pciDevice *dev = pciDeviceListGet(pcidevs, i); + pciDevice *activeDev = NULL; + + /* Never delete the dev from list driver->activePciHostdevs + * if it's used by other domain. + */ + activeDev = pciDeviceListFind(driver->activePciHostdevs, dev); + if (activeDev && + (used_by = pciDeviceGetUsedBy(activeDev)) && + STRNEQ(used_by, name)) + continue; + pciDeviceListDel(driver->activePciHostdevs, dev); } @@ -305,5 +330,5 @@ void qemuDomainReAttachHostDevices(struct qemud_driver *driver, if (!def->nhostdevs) return; - qemuDomainReAttachHostdevDevices(driver, def->hostdevs, def->nhostdevs); + qemuDomainReAttachHostdevDevices(driver, def->name, def->hostdevs, def->nhostdevs); } diff --git a/src/qemu/qemu_hostdev.h b/src/qemu/qemu_hostdev.h index 1f3d1bc..07d7de2 100644 --- a/src/qemu/qemu_hostdev.h +++ b/src/qemu/qemu_hostdev.h @@ -30,12 +30,14 @@ int qemuUpdateActivePciHostdevs(struct qemud_driver *driver, virDomainDefPtr def); int qemuPrepareHostdevPCIDevices(struct qemud_driver *driver, + const char *name, virDomainHostdevDefPtr *hostdevs, int nhostdevs); int qemuPrepareHostDevices(struct qemud_driver *driver, virDomainDefPtr def); void qemuReattachPciDevice(pciDevice *dev, struct qemud_driver *driver); void qemuDomainReAttachHostdevDevices(struct qemud_driver *driver, + const char *name, virDomainHostdevDefPtr *hostdevs, int nhostdevs); void qemuDomainReAttachHostDevices(struct qemud_driver *driver, diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 6cfe392..dc920e7 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -859,7 +859,7 @@ int qemuDomainAttachHostPciDevice(struct qemud_driver *driver, return -1; } - if (qemuPrepareHostdevPCIDevices(driver, &hostdev, 1) < 0) + if (qemuPrepareHostdevPCIDevices(driver, vm->def->name, &hostdev, 1) < 0) return -1; if (qemuCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE)) { @@ -925,7 +925,7 @@ error: hostdev->info.addr.pci.slot) < 0) VIR_WARN("Unable to release PCI address on host device"); - qemuDomainReAttachHostdevDevices(driver, &hostdev, 1); + qemuDomainReAttachHostdevDevices(driver, vm->def->name, &hostdev, 1); VIR_FREE(devstr); VIR_FREE(configfd_name); diff --git a/src/util/pci.c b/src/util/pci.c index 8d8e157..38548c7 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -62,6 +62,7 @@ struct _pciDevice { char name[PCI_ADDR_LEN]; /* domain:bus:slot.function */ char id[PCI_ID_LEN]; /* product vendor */ char *path; + char *used_by; /* The domain which uses the device */ int fd; unsigned initted; @@ -1312,6 +1313,7 @@ pciGetDevice(unsigned domain, dev->bus = bus; dev->slot = slot; dev->function = function; + dev->used_by = NULL; if (snprintf(dev->name, sizeof(dev->name), "%.4x:%.2x:%.2x.%.1x", dev->domain, dev->bus, dev->slot, @@ -1374,6 +1376,7 @@ pciFreeDevice(pciDevice *dev) VIR_DEBUG("%s %s: freeing", dev->id, dev->name); pciCloseConfig(dev); VIR_FREE(dev->path); + VIR_FREE(dev->used_by); VIR_FREE(dev); } @@ -1387,6 +1390,25 @@ unsigned pciDeviceGetManaged(pciDevice *dev) return dev->managed; } +int +pciDeviceSetUsedBy(pciDevice *dev, const char *name) +{ + dev->used_by = strdup(name); + + if (!dev->used_by) { + virReportOOMError(); + return -1; + } + + return 0; +} + +const char * +pciDeviceGetUsedBy(pciDevice *dev) +{ + return dev->used_by; +} + void pciDeviceReAttachInit(pciDevice *pci) { pci->unbind_from_stub = 1; diff --git a/src/util/pci.h b/src/util/pci.h index a1600fe..c9d8227 100644 --- a/src/util/pci.h +++ b/src/util/pci.h @@ -47,6 +47,9 @@ int pciResetDevice (pciDevice *dev, void pciDeviceSetManaged(pciDevice *dev, unsigned managed); unsigned pciDeviceGetManaged(pciDevice *dev); +int pciDeviceSetUsedBy(pciDevice *dev, + const char *used_by); +const char *pciDeviceGetUsedBy(pciDevice *dev); void pciDeviceReAttachInit(pciDevice *dev); pciDeviceList *pciDeviceListNew (void); -- 1.7.6

2 3

Re: [libvirt] [virt-tools-list] virt-manager/libvirt backwards compatibility problem?
by Eric Blake 12 Oct '11

12 Oct '11

[adding libvir-list] On 07/27/2011 10:28 AM, Whit Blauvelt wrote: > Looks like my real problem may be not incorporating a Debian/Ubuntu patch > before building 0.9.x, since netcat differs: > > https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/517478 Reading that bug report, it looks like upstream libvirt.git should be patched to add a runtime test on whether a remote nc supports the -q option, rather than blindly assuming that 'nc -q' exists on the remote side. -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

4 9

[libvirt] [PATCH 0/3] example: event-test.py
by Philipp Hahn 12 Oct '11

12 Oct '11

Some minor improvements to the event-test Python example. Philipp Hahn (3): example: Fix argument handling example: Redirect --help output to stdout/stderr example: Support debug output and loop switch examples/domain-events/events-python/event-test.py | 25 +++++++++++++------ 1 files changed, 17 insertions(+), 8 deletions(-)

2 6

[libvirt] [PATCH 0/4] Xen fixes
by Philipp Hahn 12 Oct '11

12 Oct '11

Here are several patches relevant to Xen: The first two patches fix the test-suite when building as root in a Xen-dom0 domain. The other two patches fix problems when doing "virsh edit" on Xen domains. Philipp Hahn (4): tests: Add support for skipping tests tests: Skip Xen-HVM tests for root on dom0 xen: fix PyGrub boot device order xen: Return tap2 for tap2 disks src/xenxs/xen_sxpr.c | 33 ++++++++++++----- tests/testutils.c | 4 ++ tests/xencapstest.c | 95 ++++++++++++++++++++++++++++++++++---------------- 3 files changed, 93 insertions(+), 39 deletions(-)

2 8

[libvirt] [PATCH] [libvirt-perl] Add missing $flags arguments to documentation
by Guido Günther 12 Oct '11

12 Oct '11

Hi, when looking at the DomainSnapshot docs I wondered if these also take the flags argument as the other functions so I went ahead and updated the docs after checking the source. Cheers, -- Guido --- lib/Sys/Virt/DomainSnapshot.pm | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/Sys/Virt/DomainSnapshot.pm b/lib/Sys/Virt/DomainSnapshot.pm index 1c4a008..5b7204b 100644 --- a/lib/Sys/Virt/DomainSnapshot.pm +++ b/lib/Sys/Virt/DomainSnapshot.pm @@ -60,18 +60,22 @@ sub _new { return $self; } -=item my $xml = $dom->get_xml_description() +=item my $xml = $dom->get_xml_description($flags) Returns an XML document containing a complete description of -the domain's configuration +the domain's configuration. -=item $dom->delete() +=item $dom->delete($flags) -Deletes this snapshot object & its datra +Deletes this snapshot object & its data. The optional C<$flags> parameter controls +what should be deleted via the C<Sys::Virt::DomainSnapshot::DELETE_*> +constants. -=item $dom->revert_to() +=item $dom->revert_to($flags) -Revert the domain to the state associated with this snapshot +Revert the domain to the state associated with this snapshot. The optional +C<$flags> control the state of the vm after the revert via the +C<Sys::Virt::DomainSnapshot::REVERT_*> constants. =back -- 1.7.6.3

2 2

[libvirt] build: fail to 'make distcheck'
by Wenyi Gao 12 Oct '11

12 Oct '11

Hi All, I failed to 'make distcheck' on Ubuntu 11.04 with the following information: ................................. 33 OK PASS: nwfilterschematest TEST: domainsnapshotschematest ........... 11 OK PASS: domainsnapshotschematest TEST: test_conf.sh .. 2 OK PASS: test_conf.sh PASS: cpuset TEST: daemon-conf .....!!!!!!...!!!!!!!!!!!!!!!!!!!kill: 98: No such process ! 34 FAILED FAIL: daemon-conf PASS: define-dev-segfault PASS: int-overflow PASS: libvirtd-fail PASS: libvirtd-pool PASS: read-bufsiz PASS: read-non-seekable PASS: start PASS: undefine PASS: vcpupin TEST: virsh-all ........................................ 40 ........................................ 80 ........................................ 120 ........................................ 160 ............ 172 OK PASS: virsh-all PASS: virsh-optparse PASS: virsh-schedinfo PASS: virsh-synopsis TEST: xml2sexprtest ........................................ 40 ............. 53 OK PASS: xml2sexprtest TEST: sexpr2xmltest ........................................ 40 .......... 50 OK PASS: sexpr2xmltest TEST: xmconfigtest ........................................ 40 .......................... 66 OK PASS: xmconfigtest TEST: xencapstest .......... 10 OK PASS: xencapstest TEST: reconnect SKIP: reconnect TEST: statstest SKIP: statstest TEST: qemuxml2argvtest ........................................ 40 ........................................ 80 ........................................ 120 ........................................ 160 . 161 OK PASS: qemuxml2argvtest TEST: qemuxml2xmltest ........................................ 40 ...................................... 78 OK PASS: qemuxml2xmltest TEST: qemuargv2xmltest ........................................ 40 ........................ 64 OK PASS: qemuargv2xmltest TEST: qemuhelptest ............ 12 OK PASS: qemuhelptest TEST: nwfilterxml2xmltest ................................. 33 OK PASS: nwfilterxml2xmltest TEST: openvzutilstest .. 2 OK PASS: openvzutilstest TEST: vmx2xmltest ........................................ 40 ...... 46 OK PASS: vmx2xmltest TEST: xml2vmxtest ........................................ 40 . 41 OK PASS: xml2vmxtest TEST: eventtest ............... 15 OK PASS: eventtest TEST: networkxml2xmltest ............ 12 OK PASS: networkxml2xmltest TEST: networkxml2argvtest ....... 7 OK PASS: networkxml2argvtest TEST: storagevolxml2xmltest ...... 6 OK PASS: storagevolxml2xmltest TEST: storagepoolxml2xmltest ............ 12 OK PASS: storagepoolxml2xmltest TEST: nodedevxml2xmltest ............. 13 OK PASS: nodedevxml2xmltest TEST: interfacexml2xmltest ................... 19 OK PASS: interfacexml2xmltest TEST: cputest ........................................ 40 ................. 57 OK PASS: cputest ======================================= 1 of 58 tests failed (2 tests were not run) Please report to libvir-list(a)redhat.com ======================================= Does anyone experience the problem or do I miss some packages? Thanks. Regards Wenyi Gao

3 4

[libvirt] [PATCH v3] Introduce <driver> under <filesystem> to support open-by-handle.
by Harsh Prateek Bora 12 Oct '11

12 Oct '11

VirtFS allows the user to choose between path/handle based fs driver. As of now, libvirt hardcode to use path based driver only. This patch provides a solution to allow user to choose between path/handle based fs driver. Sample: <filesystem type='mount'> <driver type='handle'/> <source dir='/folder/to/share1'/> <target dir='mount_tag1'/> </filesystem> <filesystem type='mount'> <driver type='path'/> <source dir='/folder/to/share2'/> <target dir='mount_tag2'/> </filesystem> Signed-off-by: Harsh Prateek Bora <harsh(a)linux.vnet.ibm.com> v3: - use enum for fs driver type (qemuDomainFSDriver) v2: - use 'path' instead of 'local' in xml terminology - added default enum for optional driver type --- docs/schemas/domaincommon.rng | 9 +++++++++ src/conf/domain_conf.c | 24 ++++++++++++++++++++++++ src/conf/domain_conf.h | 11 +++++++++++ src/qemu/qemu_command.c | 15 ++++++++++++++- 4 files changed, 58 insertions(+), 1 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 492a41d..3937393 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1025,6 +1025,15 @@ </choice> <optional> <ref name="address"/> + <element name="driver"> + <attribute name="type"> + <choice> + <value>path</value> + <value>handle</value> + </choice> + </attribute> + <empty/> + </element> <attribute name="accessmode"> <choice> <value>passthrough</value> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a537251..ede1f01 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -238,6 +238,11 @@ VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST, "file", "template") +VIR_ENUM_IMPL(virDomainFSDriverType, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, + "default", + "path", + "handle") + VIR_ENUM_IMPL(virDomainFSAccessMode, VIR_DOMAIN_FS_ACCESSMODE_LAST, "passthrough", "mapped", @@ -2828,6 +2833,7 @@ virDomainFSDefParseXML(xmlNodePtr node, virDomainFSDefPtr def; xmlNodePtr cur; char *type = NULL; + char *fsdriver = NULL; char *source = NULL; char *target = NULL; char *accessmode = NULL; @@ -2878,11 +2884,23 @@ virDomainFSDefParseXML(xmlNodePtr node, target = virXMLPropString(cur, "dir"); } else if (xmlStrEqual(cur->name, BAD_CAST "readonly")) { def->readonly = 1; + } else if ((fsdriver == NULL) && (xmlStrEqual(cur->name, BAD_CAST "driver"))) { + fsdriver = virXMLPropString(cur, "type"); } } cur = cur->next; } + if (fsdriver) { + if ((def->fsdriver = virDomainFSDriverTypeTypeFromString(fsdriver)) < 0) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown fs driver type '%s'"), fsdriver); + goto error; + } + } else { + def->fsdriver = VIR_DOMAIN_FS_DRIVER_TYPE_PATH; + } + if (source == NULL) { virDomainReportError(VIR_ERR_NO_SOURCE, target ? "%s" : NULL, target); @@ -2905,6 +2923,7 @@ virDomainFSDefParseXML(xmlNodePtr node, cleanup: VIR_FREE(type); + VIR_FREE(fsdriver); VIR_FREE(target); VIR_FREE(source); VIR_FREE(accessmode); @@ -9351,6 +9370,7 @@ virDomainFSDefFormat(virBufferPtr buf, { const char *type = virDomainFSTypeToString(def->type); const char *accessmode = virDomainFSAccessModeTypeToString(def->accessmode); + const char *fsdriver = virDomainFSDriverTypeTypeToString(def->fsdriver); if (!type) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, @@ -9369,6 +9389,10 @@ virDomainFSDefFormat(virBufferPtr buf, " <filesystem type='%s' accessmode='%s'>\n", type, accessmode); + if (def->fsdriver) { + virBufferAsprintf(buf, " <driver type='%s'/>\n", fsdriver); + } + if (def->src) { switch (def->type) { case VIR_DOMAIN_FS_TYPE_MOUNT: diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index e07fd2f..4f8993b 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -368,6 +368,15 @@ enum virDomainFSType { VIR_DOMAIN_FS_TYPE_LAST }; +/* Filesystem driver type */ +enum virDomainFSDriverType { + VIR_DOMAIN_FS_DRIVER_TYPE_DEFAULT = 0, + VIR_DOMAIN_FS_DRIVER_TYPE_PATH, + VIR_DOMAIN_FS_DRIVER_TYPE_HANDLE, + + VIR_DOMAIN_FS_DRIVER_TYPE_LAST +}; + /* Filesystem mount access mode */ enum virDomainFSAccessMode { VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH, @@ -381,6 +390,7 @@ typedef struct _virDomainFSDef virDomainFSDef; typedef virDomainFSDef *virDomainFSDefPtr; struct _virDomainFSDef { int type; + int fsdriver; int accessmode; char *src; char *dst; @@ -1856,6 +1866,7 @@ VIR_ENUM_DECL(virDomainController) VIR_ENUM_DECL(virDomainControllerModelSCSI) VIR_ENUM_DECL(virDomainControllerModelUSB) VIR_ENUM_DECL(virDomainFS) +VIR_ENUM_DECL(virDomainFSDriverType) VIR_ENUM_DECL(virDomainFSAccessMode) VIR_ENUM_DECL(virDomainNet) VIR_ENUM_DECL(virDomainNetBackend) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index cf99f89..b4f4bd8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -100,6 +100,12 @@ VIR_ENUM_IMPL(qemuControllerModelUSB, VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST, "vt82c686b-usb-uhci", "pci-ohci"); +VIR_ENUM_DECL(qemuDomainFSDriver) +VIR_ENUM_IMPL(qemuDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, + "local", + "local", + "handle"); + static void uname_normalize (struct utsname *ut) @@ -1811,6 +1817,7 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs, virBitmapPtr qemuCaps ATTRIBUTE_UNUSED) { virBuffer opt = VIR_BUFFER_INITIALIZER; + const char *driver = qemuDomainFSDriverTypeToString(fs->fsdriver); if (fs->type != VIR_DOMAIN_FS_TYPE_MOUNT) { qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -1818,7 +1825,13 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs, goto error; } - virBufferAddLit(&opt, "local"); + if (!driver) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Filesystem driver type not supported")); + goto error; + } + virBufferAdd(&opt, driver, -1); + if (fs->accessmode == VIR_DOMAIN_FS_ACCESSMODE_MAPPED) { virBufferAddLit(&opt, ",security_model=mapped"); } else if(fs->accessmode == VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH) { -- 1.7.1.1

3 2

[libvirt] [PATCH 0/5 v2] Improve Ceph Qemu+RBD support
by Sage Weil 12 Oct '11

12 Oct '11

The current support for qemu and Ceph RBD (rados block device) has two main deficiencies: authentication doesn't work, and it relies on environment variables (which don't work with latest upstream). This patch set addresses both those problems. The first two patches update the xml schemas and conf to add a Ceph secret type and to specify authentication information along with the rbd disk. The next two patches make some libvirt changes. We pass virConnectPtr down into the Domain{Attach,Detach} methods (needed to access secrets while building the qemu command), and add a helper that will escape arbitrary characters. The final patch replaces the current RBD qemu code and uses the new conf info to do authentication properly. (We still need to make a change there to avoid having the authentication key show up on qemu command line; I'll clean that up shortly.) Comments on this approach? Thanks! sage Changes from v1: update docs/schemas/{domain,secret}.rng Sage Weil (5): secret: add Ceph secret type storage: add authId, authDomain to virDomainDiskDef qemu: pass virConnectPtr into Domain{Attach,Detach}* buf: implement generic virBufferEscape qemu/rbd: improve rbd device specification docs/schemas/domain.rng | 6 + docs/schemas/secret.rng | 17 ++ include/libvirt/libvirt.h.in | 3 + src/conf/domain_conf.c | 43 +++- src/conf/domain_conf.h | 2 + src/conf/secret_conf.c | 45 ++++- src/conf/secret_conf.h | 1 + src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 273 +++++++++++--------- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_driver.c | 17 +- src/qemu/qemu_hotplug.c | 15 +- src/qemu/qemu_hotplug.h | 9 +- src/secret/secret_driver.c | 8 + src/util/buf.c | 33 ++- src/util/buf.h | 1 + .../qemuxml2argv-disk-drive-network-rbd.args | 6 +- .../qemuxml2argv-disk-drive-network-rbd.xml | 1 + 18 files changed, 328 insertions(+), 156 deletions(-) -- 1.7.4.1 >From 498cd06b76bbb4415a2f81f9d169f267ff99329c Mon Sep 17 00:00:00 2001 From: Sage Weil <sage(a)newdream.net> Date: Thu, 15 Sep 2011 13:47:40 -0700 Subject: [PATCH 0/5] Improve Ceph Qemu+RBD support The current support for qemu and Ceph RBD (rados block device) has two main deficiencies: authentication doesn't work, and it relies on environment variables (which don't work with latest upstream). This patch set addresses both those problems, while trying to integrate as cleanly as possible with the rest of libvirt. The first few patches make some changes to libvirt itself: adding a CEPH secret type (for Ceph/RBD authentication), adding authentication fields to the XML schema, passing the virConnectPtr into the Domain{Attach,Detach} methods (needed to access secrets while building the qemu command), a helper that will escape arbitrary characters, and finally a patch that replaces the current RBD qemu code. Comments on this approach? Thanks! sage Sage Weil (5): secret: add Ceph secret type storage: add authId, authDomain to virDomainDiskDef qemu: pass virConnectPtr into Domain{Attach,Detach}* buf: implement generic virBufferEscape qemu/rbd: improve rbd device specification include/libvirt/libvirt.h.in | 3 + src/conf/domain_conf.c | 43 +++- src/conf/domain_conf.h | 2 + src/conf/secret_conf.c | 45 ++++- src/conf/secret_conf.h | 1 + src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 273 +++++++++++--------- src/qemu/qemu_command.h | 3 +- src/qemu/qemu_driver.c | 17 +- src/qemu/qemu_hotplug.c | 15 +- src/qemu/qemu_hotplug.h | 9 +- src/secret/secret_driver.c | 8 + src/util/buf.c | 33 ++- src/util/buf.h | 1 + .../qemuxml2argv-disk-drive-network-rbd.args | 6 +- .../qemuxml2argv-disk-drive-network-rbd.xml | 1 + 16 files changed, 305 insertions(+), 156 deletions(-) -- 1.7.4.1

4 16

[libvirt] [PATCH] daemon: Always advertise libvirtd service
by Osier Yang 12 Oct '11

12 Oct '11

This is a regression introduced by new RPC codes, previously we advertise the service via ssh even if the daemon doesn't listen on TLS port (TCP is not choosed). Now the service is only advertised when it listens on TLS or TCP port. This breaks upper layer apps which intends to discover the service, such as virt-manager. --- daemon/libvirtd.c | 6 ++++++ src/rpc/virnetserver.c | 22 ++++++++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index d1bc3dd..aa58121 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -531,6 +531,12 @@ static int daemonSetupNetworking(virNetServerPtr srv, virNetTLSContextFree(ctxt); } + } else { + if (virNetServerAddService(srv, NULL, + config->mdns_adv ? + "_libvirt._tcp" : + NULL) < 0) + goto error; } #if HAVE_SASL diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index f739743..3cf36bc 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -582,12 +582,16 @@ int virNetServerAddService(virNetServerPtr srv, { virNetServerLock(srv); - if (VIR_EXPAND_N(srv->services, srv->nservices, 1) < 0) - goto no_memory; + if (svc) { + if (VIR_EXPAND_N(srv->services, srv->nservices, 1) < 0) + goto no_memory; + } #if HAVE_AVAHI if (mdnsEntryName) { - int port = virNetServerServiceGetPort(svc); + int port = 0; + if (svc) + port = virNetServerServiceGetPort(svc); if (!virNetServerMDNSAddEntry(srv->mdnsGroup, mdnsEntryName, @@ -596,12 +600,14 @@ int virNetServerAddService(virNetServerPtr srv, } #endif - srv->services[srv->nservices-1] = svc; - virNetServerServiceRef(svc); + if (svc) { + srv->services[srv->nservices-1] = svc; + virNetServerServiceRef(svc); - virNetServerServiceSetDispatcher(svc, - virNetServerDispatchNewClient, - srv); + virNetServerServiceSetDispatcher(svc, + virNetServerDispatchNewClient, + srv); + } virNetServerUnlock(srv); return 0; -- 1.7.6

2 4

Re: [libvirt] [PATCH] Make saving domain XML more robust
by lvroyce 12 Oct '11

12 Oct '11

tested-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Patch works as expected.Use setmaxmem cmd,tested cases of set mem success ,writing tmp config file failure and rename failure.old xml file reserves in case of failure so still can be used,and tmp config file cleared leaving no trash to xml folder.

1 0

[libvirt] [RFC PATCH 0/5] Summary on QEMU I/O throttling support to libvirt
by Lei Li 12 Oct '11

12 Oct '11

Today libvirt supports the cgroups blkio-controller, which handles proportional shares and throughput/iops limits on host block devices. blkio-controller does not support network file systems (NFS) or other QEMU remote block drivers (curl, Ceph/rbd, sheepdog) since they are not host block devices. QEMU I/O throttling works with all types of drive and can be applied independently to each drive attached to a guest and supports throughput/iops limits. To help add QEMU I/O throttling support to libvirt, we plan to complete it with add new API virDomainBlockIoThrottle(), new command 'blkiothrottle' and Python bindings. Notes: we are sending this series out now(even though they are not completed yet.)because we want to start the review process. These patches implemented the below features by Zhi Yong Wu: 1) Enable the blkio throttling in xml when guest is starting up. Add blkio throttling in xml as follows: <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/var/lib/libvirt/images/kvm-one.img'/> <target dev='vda' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> <iothrottle bps='100000' bps_rd='20000'.../> </disk> 2) Enable blkio throttling setting at guest running time. virsh blkiothrottle<domain> <device> [--bps<number>] [--bps_rd<number>] \ [--bps_wr<number>] [--iops<number>] [--iops_rd<number>] [--iops_wr<number>] [PATCH 1/5] Add new API virDomainBlockIoThrottle. [PATCH 2/5] Add virDomainBlockIoThrottle support to the remote driver. [PATCH 3/5] Implement virDomainBlockIoThrottle for the qemu driver. [PATCH 4/5] Enable the virDomainBlockIoThrottle API in virsh. [PATCH 5/5] Enable virDomainBlockIoThrottle in the python API. And I will address feedback and work on the missing features in few days includes: 3) The support to display the setting for block i/o throttling - HMP/QMP 4) Python binding support. 5) --current --live --config options support to unify the libvirt API. -- Lei

2 1

[libvirt] [PATCH 0/4] snapshot: optimize qemu relationship traversal
by Eric Blake 11 Oct '11

11 Oct '11

After working with ESX and VBox, I realized that a tweak to how snapshot relationships are stored would speed things up from O(n^2) to O(n). The hash table must be kept for name lookup, but the speedup comes by tracking relationships with each snapshot rather than crawling the entire hash table rebuilding those relations for every operation that needs particular relations. Eric Blake (4): snapshot: framework for more efficient relation traversal snapshot: track qemu snapshot relations snapshot: take advantage of new relations snapshot: drop dead parameters src/conf/domain_conf.c | 266 +++++++++++++++++++++++++--------------------- src/conf/domain_conf.h | 22 ++-- src/libvirt_private.syms | 3 +- src/qemu/qemu_driver.c | 84 +++++++++++---- 4 files changed, 224 insertions(+), 151 deletions(-) -- 1.7.4.4

2 17

[libvirt] [PATCH] snapshot: use correct qmp monitor command
by Eric Blake 11 Oct '11

11 Oct '11

To date, disk snapshots worked by accident, as they were always using hmp fallback due to a typo in commit e702b5b not picking up on the (intentional) difference in command names between the two monitor protocols. * src/qemu/qemu_monitor_json.c (qemuMonitorJSONDiskSnapshot): Spell QMP command correctly. Reported by Luiz Capitulino. --- How embarrassing. http://wiki.qemu.org/Features/Snapshots even called out the difference in naming. src/qemu/qemu_monitor_json.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 3d383c8..18d1c9f 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2960,7 +2960,7 @@ qemuMonitorJSONDiskSnapshot(qemuMonitorPtr mon, const char *device, virJSONValuePtr cmd; virJSONValuePtr reply = NULL; - cmd = qemuMonitorJSONMakeCommand("snapshot-blkdev-sync", + cmd = qemuMonitorJSONMakeCommand("blockdev-snapshot-sync", "s:device", device, "s:snapshot-file", file, NULL); @@ -2972,7 +2972,7 @@ qemuMonitorJSONDiskSnapshot(qemuMonitorPtr mon, const char *device, if (qemuMonitorJSONHasError(reply, "CommandNotFound") && qemuMonitorCheckHMP(mon, "snapshot_blkdev")) { - VIR_DEBUG("snapshot-blkdev-sync command not found, trying HMP"); + VIR_DEBUG("blockdev-snapshot-sync command not found, trying HMP"); ret = qemuMonitorTextDiskSnapshot(mon, device, file); goto cleanup; } -- 1.7.4.4

2 2

[libvirt] [PATCHv2 0/7] snapshot: listing children
by Eric Blake 11 Oct '11

11 Oct '11

Cleaned up the rebase goofs present throughout my v1: https://www.redhat.com/archives/libvir-list/2011-September/msg01270.html Eric Blake (7): snapshot: new virDomainSnapshotListChildrenNames API snapshot: virsh snapshot-list and children snapshot: virsh fallback for snapshot-list --tree --from snapshot: virsh fallback for snapshot-list --from children snapshot: virsh fallback for snapshot-list --descendants --from snapshot: remote protocol for snapshot children snapshot: implement snapshot children listing in qemu include/libvirt/libvirt.h.in | 27 +++++-- python/generator.py | 4 + python/libvirt-override-api.xml | 12 ++- python/libvirt-override.c | 45 +++++++++ src/conf/domain_conf.c | 51 +++++++++++ src/conf/domain_conf.h | 7 ++ src/driver.h | 12 +++ src/libvirt.c | 111 +++++++++++++++++++++++ src/libvirt_private.syms | 2 + src/libvirt_public.syms | 2 + src/qemu/qemu_driver.c | 87 ++++++++++++++++++ src/remote/remote_driver.c | 2 + src/remote/remote_protocol.x | 25 +++++- src/remote_protocol-structs | 20 ++++ tools/virsh.c | 190 ++++++++++++++++++++++++++++++++------ tools/virsh.pod | 9 ++- 16 files changed, 564 insertions(+), 42 deletions(-) -- 1.7.4.4

3 43

[libvirt] [PATCH] build: fix mingw build without sasl
by Eric Blake 11 Oct '11

11 Oct '11

Detected by autogen.sh on a cross-mingw build. * src/libvirt_private.syms (virnetsaslcontext.h): Move symbols... * src/libvirt_sasl.syms: ...to new file. * src/Makefile.am (USED_SYM_FILES) [HAVE_SASL]: Use new file. (EXTRA_DIST): Ship it. --- Pushing under the build-breaker rule. src/Makefile.am | 13 +++++++++---- src/libvirt_private.syms | 15 --------------- src/libvirt_sasl.syms | 20 ++++++++++++++++++++ 3 files changed, 29 insertions(+), 19 deletions(-) create mode 100644 src/libvirt_sasl.syms diff --git a/src/Makefile.am b/src/Makefile.am index 272dfbf..302d395 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1188,18 +1188,23 @@ if WITH_NETWORK USED_SYM_FILES += libvirt_network.syms endif +if HAVE_SASL +USED_SYM_FILES += libvirt_sasl.syms +endif + EXTRA_DIST += \ libvirt_public.syms \ libvirt_private.syms \ libvirt_driver_modules.syms \ libvirt_bridge.syms \ + libvirt_daemon.syms \ libvirt_linux.syms \ libvirt_macvtap.syms \ - libvirt_daemon.syms \ - libvirt_nwfilter.syms \ + libvirt_network.syms \ + libvirt_nwfilter.syms \ + libvirt_sasl.syms \ libvirt_vmx.syms \ - libvirt_xenxs.syms \ - libvirt_network.syms + libvirt_xenxs.syms GENERATED_SYM_FILES = libvirt.syms libvirt.def libvirt_qemu.def diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index d79f65c..caf9f59 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1178,20 +1178,6 @@ virNetMessageQueueServe; virNetMessageSaveError; -# virnetsaslcontext.h -virNetSASLContextCheckIdentity; -virNetSASLContextNewServer; -virNetSASLSessionExtKeySize; -virNetSASLSessionFree; -virNetSASLSessionGetIdentity; -virNetSASLSessionGetKeySize; -virNetSASLSessionListMechanisms; -virNetSASLSessionNewServer; -virNetSASLSessionSecProps; -virNetSASLSessionServerStart; -virNetSASLSessionServerStep; - - # virnetserver.h virNetServerAddProgram; virNetServerAddService; @@ -1232,7 +1218,6 @@ virNetServerClientSendMessage; virNetServerClientSetCloseHook; virNetServerClientSetIdentity; virNetServerClientSetPrivateData; -virNetServerClientSetSASLSession; # virnetserverprogram.h diff --git a/src/libvirt_sasl.syms b/src/libvirt_sasl.syms new file mode 100644 index 0000000..2c278c8 --- /dev/null +++ b/src/libvirt_sasl.syms @@ -0,0 +1,20 @@ +# +# SASL-specific symbols +# + +# virnetsaslcontext.h +virNetSASLContextCheckIdentity; +virNetSASLContextNewServer; +virNetSASLSessionExtKeySize; +virNetSASLSessionFree; +virNetSASLSessionGetIdentity; +virNetSASLSessionGetKeySize; +virNetSASLSessionListMechanisms; +virNetSASLSessionNewServer; +virNetSASLSessionSecProps; +virNetSASLSessionServerStart; +virNetSASLSessionServerStep; + + +# virnetserverclient.h +virNetServerClientSetSASLSession; -- 1.7.4.4

1 0

[libvirt] [PATCH] build: fix 'make rpm'
by Eric Blake 11 Oct '11

11 Oct '11

Since commit ddf3bd3, 'make rpm' failed with: RPM build errors: File not found: /home/remote/eblake/rpmbuild/BUILDROOT/libvirt-0.9.6-1.fc14.eblake1318366440.x86_64/usr/share/systemtap/tapset/libvirtd.stp * libvirt.spec.in (with_dtrace): Match installed .stp files. --- Pushing under the build-breaker rule. Still one to go before ./autobuild.sh is happy. A mingw cross-build now fails with: Creating library file: .libs/libvirt.dll.a Cannot export virNetSASLContextCheckIdentity: symbol not defined Cannot export virNetSASLContextNewServer: symbol not defined ... libvirt.spec.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 1e76452..7c63710 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -969,7 +969,8 @@ fi rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd %endif %if %{with_dtrace} -%{_datadir}/systemtap/tapset/libvirtd.stp +%{_datadir}/systemtap/tapset/libvirt_probes.stp +%{_datadir}/systemtap/tapset/libvirt_functions.stp %endif %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/ -- 1.7.4.4

1 0

[libvirt] [PATCH] build: fix 'make distcheck'
by Eric Blake 11 Oct '11

11 Oct '11

I got these distcheck failures with sanlock enabled: ERROR: files left in build directory after distclean: ./tools/virt-sanlock-cleanup ./src/locking/qemu-sanlock.conf * src/Makefile.am (DISTCLEANFILES) [HAVE_SANLOCK]: Clean built file. * tools/Makefile.am (DISTCLEANFILES): Likewise. --- Pushing under the build-breaker rule. src/Makefile.am | 1 + tools/Makefile.am | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 793f674..272dfbf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1328,6 +1328,7 @@ $(builddir)/locking/%-sanlock.conf: $(srcdir)/locking/sanlock.conf if WITH_QEMU conf_DATA += locking/qemu-sanlock.conf BUILT_SOURCES += locking/qemu-sanlock.conf +DISTCLEANFILES += locking/qemu-sanlock.conf endif else EXTRA_DIST += $(LOCK_DRIVER_SANLOCK_SOURCES) diff --git a/tools/Makefile.am b/tools/Makefile.am index 8a8be1a..c96c7d9 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -28,11 +28,14 @@ EXTRA_DIST = \ libvirt-guests.init.sh \ libvirt-guests.sysconf +DISTCLEANFILES = + bin_SCRIPTS = virt-xml-validate virt-pki-validate bin_PROGRAMS = virsh if HAVE_SANLOCK sbin_SCRIPTS = virt-sanlock-cleanup +DISTCLEANFILES += virt-sanlock-cleanup endif dist_man1_MANS = virt-xml-validate.1 virt-pki-validate.1 virsh.1 @@ -187,4 +190,4 @@ CLEANFILES = $(bin_SCRIPTS) CLEANFILES += *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s MAINTAINERCLEANFILES = $(dist_man1_MANS) -DISTCLEANFILES = $(BUILT_SOURCES) +DISTCLEANFILES += $(BUILT_SOURCES) -- 1.7.4.4

1 0

[libvirt] [PATCH] libvirt-tck: Add testcase to test snapshot functionality.
by Guido Günther 11 Oct '11

11 Oct '11

Hi, I got a bit confused how snapshotting/reverting is supposed to work now so I added some tests. O.k. to apply? This requires Sys::Virt 0.9.5. Cheers, -- Guido --- Build.PL | 2 +- perl-Sys-Virt-TCK.spec.PL | 2 +- scripts/domain/400-snapshots.t | 127 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 129 insertions(+), 2 deletions(-) create mode 100644 scripts/domain/400-snapshots.t diff --git a/Build.PL b/Build.PL index b0c53a2..0b373bf 100644 --- a/Build.PL +++ b/Build.PL @@ -85,7 +85,7 @@ my $b = $class->new( 'Test::Builder' => 0, 'Test::More' => 0, 'Sub::Uplevel' => 0, - 'Sys::Virt' => '0.2.0', + 'Sys::Virt' => '0.9.5', 'XML::Twig' => 0, 'XML::Writer' => 0, 'XML::XPath' => 0, diff --git a/perl-Sys-Virt-TCK.spec.PL b/perl-Sys-Virt-TCK.spec.PL index b6a989e..4ebbcd0 100644 --- a/perl-Sys-Virt-TCK.spec.PL +++ b/perl-Sys-Virt-TCK.spec.PL @@ -63,7 +63,7 @@ BuildRequires: perl(TAP::Harness::Archive) BuildRequires: perl(Test::Builder) BuildRequires: perl(Test::More) BuildRequires: perl(Sub::Uplevel) -BuildRequires: perl(Sys::Virt) >= 0.2.0 +BuildRequires: perl(Sys::Virt) >= 0.9.5 BuildRequires: perl(XML::Twig) BuildRequires: perl(XML::Writer) # RPM autoprovides misses these 3 diff --git a/scripts/domain/400-snapshots.t b/scripts/domain/400-snapshots.t new file mode 100644 index 0000000..4c3a636 --- /dev/null +++ b/scripts/domain/400-snapshots.t @@ -0,0 +1,127 @@ +# -*- perl -*- +# +# Copyright (C) 2011 Univention GmbH +# Author: Guido Guenther <agx(a)sigxcpu.org> +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + +=pod + +=head1 NAME + +domain/400-snapshot.t - Check snapshot operations + +=head1 DESCRIPTION + +Check if snapshots can be created and deleted. Check if a snapshot gets +associated with the right vm metadata when reverting snapshots. + +=cut + +use strict; +use warnings; + +use Test::More tests => 23; + +use Sys::Virt::TCK; +use Test::Exception; + +my $tck = Sys::Virt::TCK->new(); +my $conn = eval { $tck->setup(); }; +BAIL_OUT "failed to setup test harness: $@" if $@; +END { $tck->cleanup if $tck; } + +SKIP: { + my ($pool, $vol, $dom, $snap1, $snap2); + my $minmem = 64 * 1024; + my $maxmem = $minmem * 2; + my $snapshots = 0; + + my $poolxml = $tck->generic_pool("dir") + ->mode("0755")->as_xml; + + diag "Defining transient storage pool $poolxml"; + ok_pool(sub { $pool = $conn->define_storage_pool($poolxml) }, "define transient storage pool"); + lives_ok(sub { $pool->build(0) }, "built storage pool"); + lives_ok(sub { $pool->create }, "started storage pool"); + + my $volxml = $tck->generic_volume("tck.img", "qcow2", 1024*1024*50) + ->allocation(0)->as_xml; + ok_volume(sub { $vol = $pool->create_volume($volxml) }, "creating qcow2 volume $volxml"); + my $pathvol = xpath($vol, "string(/volume/target/path)"); + + my $gd = $tck->generic_domain("tck") + ->memory($minmem); + $gd->rmdisk; + my $domxml = $gd->disk(format => { name => "qemu", type => "qcow2" }, + type => "file", + src => $pathvol, + dst => "vda")->as_xml; + + ok_domain(sub { $dom = $conn->define_domain($domxml) }, "defined persistent domain"); + lives_ok(sub {$dom->create() }, "started domain"); + + my $currmem = int(xpath($dom, "number(/domain/currentMemory)")); + is($currmem, $minmem, "XML description has memory set to $minmem"); + + my $snap1xml = <<EOF; +<domainsnapshot> + <name>Snapshot1</name> + <description>First snapshot</description> +</domainsnapshot> +EOF + diag "Create first snapshot"; + eval { $snap1 = $dom->create_snapshot($snap1xml); }; + skip "Snapshots not implemented", 16 if $@ && err_not_implemented($@); + ok(!$@, "Snapshot created"); + die $@ if $@; + $snapshots++; + + lives_ok( sub { $dom->destroy() }, "Domain destroyed"); + lives_ok(sub { $dom->set_max_memory($maxmem) }, "Doubled memory to $maxmem"); + lives_ok(sub {$dom->create() }, "started domain"); + + $currmem = int(xpath($dom, "number(/domain/currentMemory)")); + is($currmem, $maxmem, "XML description has memory set to $maxmem"); + + my $snap2xml = <<EOF; +<domainsnapshot> + <name>Snapshot2</name> + <description>Second snapshot</description> +</domainsnapshot> +EOF + ok_domain_snapshot( sub { $snap2 = $dom->create_snapshot($snap2xml) }, "create second snapshot $snap2xml"); + $snapshots++; + is($dom->num_of_snapshots(), $snapshots, "We have $snapshots snapshots"); + + # Reverting to the same vm configuration is o.k. + lives_ok( sub { $snap2->revert_to() }, "Reverting to snapshot snapshot 2"); + + # Reverting to another vm configuration would involve killing qemu so this + # is rejected: + ok_error( sub { $snap1->revert_to() }, "Reverting to changed vm configuration not supported", Sys::Virt::Error::ERR_CONFIG_UNSUPPORTED); + + # Reverting to another vm configiguration while shut off is o.k.: + lives_ok( sub { $dom->destroy() }, "Domain destroyed"); + lives_ok( sub { $snap1->revert_to() }, "Reverting to snapshot snapshot 1 with vm shutoff"); + $currmem = int(xpath($dom, "number(/domain/currentMemory)")); + is($currmem, $minmem, "Memory is $minmem"); + + is($dom->num_of_snapshots(), $snapshots, "We have $snapshots snapshots"); + + $snap1->delete(); + $snapshots--; + is($dom->num_of_snapshots(), $snapshots, "We have $snapshots snapshots"); + + $snap2->delete(); + $snapshots--; + is($dom->num_of_snapshots(), $snapshots, "We have $snapshots snapshots"); + is($snapshots, 0, "All snapshots are gone"); +} -- 1.7.6.3

2 2

[libvirt] [PATCH] build: ship helper scripts
by Eric Blake 11 Oct '11

11 Oct '11

Otherwise, 'make rpm' fails with: GEN libvirt_qemu.def make[2]: *** No rule to make target `dtrace2systemtap.pl', needed by `libvirt_probes.stp'. Stop. * src/Makefile.am (EXTRA_DIST): Add recent script additions. --- Pushing under the build-breaker rule. src/Makefile.am | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 6451ad3..dcb4d33 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1342,9 +1342,11 @@ noinst_LTLIBRARIES += \ libvirt-net-rpc-client.la EXTRA_DIST += \ - rpc/virnetprotocol.x \ - rpc/gendispatch.pl \ - rpc/genprotocol.pl + rpc/dtrace2systemtap.pl \ + rpc/gendispatch.pl \ + rpc/genprotocol.pl \ + rpc/gensystemtap.pl \ + rpc/virnetprotocol.x VIR_NET_RPC_GENERATED = \ $(srcdir)/rpc/virnetprotocol.h \ -- 1.7.4.4

1 1

[libvirt] [PATCH] disable xenlight for non-Xen platforms
by Dan Horák 11 Oct '11

11 Oct '11

Hi, when building libvirt in Fedora/s390x I've found that xenlight needs to be explicitly disabled in the spec file. Configure properly sets the library as non-existent, but the %files section still wants to package the 3 /var/*/libvirt/libxl directories. See also https://bugzilla.redhat.com/show_bug.cgi?id=745020 With regards, Dan

2 1

[libvirt] [PATCH] build: Fix VPATH build with new probes
by Jiri Denemark 11 Oct '11

11 Oct '11

Note that make check still fails for me in VPATH build because od undefined references in libvirt_test.a which I don't really understand since src/Makefile.am contains libvirt_la_LIBADD += probes.o libvirt_test_la_LIBADD = $(libvirt_la_LIBADD) This is a sample of the erros I get: ../src/.libs/libvirt_test.a(libvirt_net_rpc_client_la-virnetclient.o): In function `virNetClientCallDispatch': /home/jirka/work/libvirt/git/upstream/src/rpc/virnetclient.c:690: undefined reference to `libvirt_rpc_client_msg_rx_semaphore' ../src/.libs/libvirt_test.a(libvirt_net_rpc_client_la-virnetclient.o): In function `virNetClientRef': /home/jirka/work/libvirt/git/upstream/src/rpc/virnetclient.c:234: undefined reference to `libvirt_rpc_client_ref_semaphore' ../src/.libs/libvirt_test.a(libvirt_net_rpc_client_la-virnetclient.o): --- daemon/Makefile.am | 2 +- tests/Makefile.am | 2 +- tools/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index e7821b2..e8c47ae 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -6,7 +6,7 @@ INCLUDES = \ -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ -I$(top_srcdir)/include -I$(top_builddir)/include \ - -I$(top_srcdir)/src \ + -I$(top_srcdir)/src -I../src \ -I$(top_srcdir)/src/util \ -I$(top_srcdir)/src/conf \ -I$(top_srcdir)/src/rpc \ diff --git a/tests/Makefile.am b/tests/Makefile.am index cbbbc6f..7b80d17 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -9,7 +9,7 @@ INCLUDES = \ -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ -I$(top_builddir)/include \ -I$(top_srcdir)/include \ - -I$(top_srcdir)/src \ + -I$(top_srcdir)/src -I../src \ -I$(top_srcdir)/src/util \ -I$(top_srcdir)/src/conf \ $(GETTEXT_CPPFLAGS) diff --git a/tools/Makefile.am b/tools/Makefile.am index 71131e2..8a8be1a 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = \ -I../include -I$(top_srcdir)/include \ -I$(top_srcdir)/gnulib/lib -I../gnulib/lib \ - -I$(top_srcdir)/src \ + -I$(top_srcdir)/src -I../src \ -I$(top_srcdir)/src/util \ -I$(top_srcdir) \ $(GETTEXT_CPPFLAGS) -- 1.7.7

2 5

[libvirt] [libvirt-glib] The input stream is owned by GVirStream, don't ref it
by Marc-André Lureau 11 Oct '11

11 Oct '11

--- libvirt-gobject/libvirt-gobject-input-stream.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-input-stream.c b/libvirt-gobject/libvirt-gobject-input-stream.c index a76d670..39459c4 100644 --- a/libvirt-gobject/libvirt-gobject-input-stream.c +++ b/libvirt-gobject/libvirt-gobject-input-stream.c @@ -80,7 +80,7 @@ static void gvir_input_stream_set_property(GObject *object, switch (prop_id) { case PROP_STREAM: - stream->priv->stream = g_value_dup_object(value); + stream->priv->stream = g_value_get_object(value); break; default: @@ -92,8 +92,8 @@ static void gvir_input_stream_finalize(GObject *object) { GVirInputStream *stream = GVIR_INPUT_STREAM(object); - if (stream->priv->stream) - g_object_unref(stream->priv->stream); + DEBUG("Finalize input stream GVirStream=%p", stream->priv->stream); + stream->priv->stream = NULL; // unowned if (G_OBJECT_CLASS(gvir_input_stream_parent_class)->finalize) (*G_OBJECT_CLASS(gvir_input_stream_parent_class)->finalize)(object); -- 1.7.6.2

2 1

Re: [libvirt] Polling for QEMU 1.0 test day
by Paolo Bonzini 11 Oct '11

11 Oct '11

On 10/11/2011 06:02 PM, Rick Vernam wrote: > On Tuesday 11 October 2011 10:45:14 Paolo Bonzini wrote: >> Hi all, please go here to cast your vote on when QEMU 1.0 test day will >> be help. >> >> http://www.doodle.com/35ae4zk7e4ndb5qq >> >> Having an "official" date will make it easier to put people in contact >> and have someone reproducing other people's failure or quickly cooking >> up a patch. Anyway, if you are very busy that day we appreciate your >> helping out before or after the chosen date. > > Will this include integration testing of the various host& guest parts that > make up spice? If you wish. :) You have a point though, I'm adding spice-devel and libvir-list to CC. Paolo

1 0

[libvirt] ALERT Virtualization Automatic Builder
by berrange＠redhat.com 11 Oct '11

11 Oct '11

Overall status: failed Start date: Tue Oct 11 2011 Start time: 11:05:02 UTC / 07:05:02 EDT Build counter: 1318331102 Build timestamp: 1318331102 URL: http://builder.virt-tools.org/index.html Module: libvirt Status: failed URL: http://builder.virt-tools.org/module-libvirt.html

3 2

[libvirt] [PATCH] Fix handling of stream EOF
by Daniel P. Berrange 11 Oct '11

11 Oct '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> Very occassionally the sequence of events from poll would result in getting a HANGUP on its own, instead of a HANGUP+READABLE at the same time. In the former case we would send back an error event to the client, but never send the empty packet to indicate EOF. --- daemon/stream.c | 40 ++++++++++++++++++++++++++++++++++++---- 1 files changed, 36 insertions(+), 4 deletions(-) diff --git a/daemon/stream.c b/daemon/stream.c index 7df9952..50f8fd4 100644 --- a/daemon/stream.c +++ b/daemon/stream.c @@ -143,7 +143,8 @@ daemonStreamEvent(virStreamPtr st, int events, void *opaque) VIR_DEBUG("st=%p events=%d EOF=%d closed=%d", st, events, stream->recvEOF, stream->closed); - if (events & VIR_STREAM_EVENT_WRITABLE) { + if (!stream->closed && + (events & VIR_STREAM_EVENT_WRITABLE)) { if (daemonStreamHandleWrite(client, stream) < 0) { daemonRemoveClientStream(client, stream); virNetServerClientClose(client); @@ -151,9 +152,9 @@ daemonStreamEvent(virStreamPtr st, int events, void *opaque) } } - if (!stream->recvEOF && - (events & (VIR_STREAM_EVENT_READABLE | VIR_STREAM_EVENT_HANGUP))) { - events = events & ~(VIR_STREAM_EVENT_READABLE | VIR_STREAM_EVENT_HANGUP); + if (!stream->closed && !stream->recvEOF && + (events & (VIR_STREAM_EVENT_READABLE))) { + events = events & ~(VIR_STREAM_EVENT_READABLE); if (daemonStreamHandleRead(client, stream) < 0) { daemonRemoveClientStream(client, stream); virNetServerClientClose(client); @@ -190,6 +191,37 @@ daemonStreamEvent(virStreamPtr st, int events, void *opaque) } } + + /* If we got HANGUP, we need to only send an empty + * packet so the client sees an EOF and cleans up + */ + if (!stream->closed && !stream->recvEOF && + (events & VIR_STREAM_EVENT_HANGUP)) { + virNetMessagePtr msg; + events &= ~(VIR_STREAM_EVENT_HANGUP); + stream->tx = 0; + stream->recvEOF = 1; + if (!(msg = virNetMessageNew(false))) { + daemonRemoveClientStream(client, stream); + virNetServerClientClose(client); + goto cleanup; + } + msg->cb = daemonStreamMessageFinished; + msg->opaque = stream; + stream->refs++; + if (virNetServerProgramSendStreamData(remoteProgram, + client, + msg, + stream->procedure, + stream->serial, + "", 0) < 0) { + virNetMessageFree(msg); + daemonRemoveClientStream(client, stream); + virNetServerClientClose(client); + goto cleanup; + } + } + if (!stream->closed && (events & (VIR_STREAM_EVENT_ERROR | VIR_STREAM_EVENT_HANGUP))) { int ret; -- 1.7.6.4

2 1

[libvirt] [PATCH] libvirt-tck: add junit output
by Guido Günther 11 Oct '11

11 Oct '11

Hi, having JUnit like XML allows for easy integration into CI tools like Jenkins. Attach patch adds this using TAP::Formatter::JUnit. Does this look reasonable? -- Guido

3 5

[libvirt] [PATCH] Fail gracefully when hashtables are NULL
by Marc-André Lureau 11 Oct '11

11 Oct '11

Instead of the message: GLib-CRITICAL **: g_hash_table_get_values: assertion `hash_table != NULL' failed --- libvirt-gobject/libvirt-gobject-connection.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 95cd878..b7c0178 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -952,11 +952,15 @@ static void gvir_domain_ref(gpointer obj, gpointer ignore G_GNUC_UNUSED) GList *gvir_connection_get_domains(GVirConnection *conn) { GVirConnectionPrivate *priv = conn->priv; - GList *domains; + GList *domains = NULL; + g_mutex_lock(priv->lock); - domains = g_hash_table_get_values(priv->domains); - g_list_foreach(domains, gvir_domain_ref, NULL); + if (priv->domains != NULL) { + domains = g_hash_table_get_values(priv->domains); + g_list_foreach(domains, gvir_domain_ref, NULL); + } g_mutex_unlock(priv->lock); + return domains; } @@ -969,11 +973,13 @@ GList *gvir_connection_get_domains(GVirConnection *conn) GList *gvir_connection_get_storage_pools(GVirConnection *conn) { GVirConnectionPrivate *priv = conn->priv; - GList *pools; + GList *pools = NULL; g_mutex_lock(priv->lock); - pools = g_hash_table_get_values(priv->pools); - g_list_foreach(pools, gvir_domain_ref, NULL); + if (priv->pools != NULL) { + pools = g_hash_table_get_values(priv->pools); + g_list_foreach(pools, gvir_domain_ref, NULL); + } g_mutex_unlock(priv->lock); return pools; -- 1.7.6.2

2 1

[libvirt] [PATCH] dissectors: Create dissector for Libvirt RPC
by Michal Privoznik 11 Oct '11

11 Oct '11

This patch creates basic dissector for Libvirt RPC. The protocol description can be found here: http://libvirt.org/internals/rpc.html Currently, only packet head dissecting is written. To fully dissect packet payloads a more effort is needed, as each function has different arguments (in general). However, this can be good stepping stone for later expansion. Ideally, a script that will generate this dissector from libvirt RPC file would be written. --- Okay, this patch obviously belongs to wireshark mailing list, but before I'll send it there, I guess we should decide if we want it there. I mean there are 2 modes/ways for wireshark dissectors: 1) Place it into wireshark repo as many others. Advantage: wireshark will be shipped with support for libvirt RPC Disadvantage: wireshark will be shipped with support for libvirt RPC In other words, if you look at wireshark releases, they are not as often as ours, so in the end, this dissector will be always one or more step behind current libvirt. But many users will be able to use it right after box open. 2) Dissector as plugin Advantage: we can update it as often as we want Disadvantage: users needs to install a plugin Personally, I prefer 2) as libvirt RPC is expanded pretty often, and I expect this dissector to be used by libvirt developer mainly, for who installing a plugin into wireshark can't be a real problem :) The table of string for labeling procedures, has been generated by hand, but I intend to write script for that. Currently, only message header is dissected, no payload. Yeah, script will generate structures for that too. More on this: http://www.wireshark.org/docs/wsdg_html_chunked/ChapterDissection.html epan/CMakeLists.txt | 1 + epan/dissectors/Makefile.common | 1 + epan/dissectors/packet-libvirt.c | 466 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 468 insertions(+), 0 deletions(-) create mode 100644 epan/dissectors/packet-libvirt.c diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 5d32e80..330cc9b 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -724,6 +724,7 @@ set(DISSECTOR_SRC dissectors/packet-ldp.c dissectors/packet-ldss.c dissectors/packet-lge_monitor.c + dissectors/packet-libvirt.c dissectors/packet-linx.c dissectors/packet-lisp-data.c dissectors/packet-lisp.c diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index 080001a..c1d4043 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -644,6 +644,7 @@ DISSECTOR_SRC = \ packet-ldp.c \ packet-ldss.c \ packet-lge_monitor.c \ + packet-libvirt.c \ packet-linx.c \ packet-lisp-data.c \ packet-lisp.c \ diff --git a/epan/dissectors/packet-libvirt.c b/epan/dissectors/packet-libvirt.c new file mode 100644 index 0000000..f3735f0 --- /dev/null +++ b/epan/dissectors/packet-libvirt.c @@ -0,0 +1,466 @@ +/* packet-libvirt.c + * Routines for libvirt RPC packet disassembly + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Author: Michal Privoznik <mprivozn(a)redhat.com> + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include <string.h> +#include <glib.h> +#include <epan/packet.h> +#include <epan/prefs.h> +#include <epan/addr_resolv.h> +#include <epan/packet.h> +#include <epan/prefs.h> +#include "packet-tcp.h" + +#define LIBVIRT_PORT 16509 +#define REMOTE_PROGRAM 0x20008086 +#define QEMU_PROGRAM 0x20008087 + +static int proto_libvirt = -1; +static int hf_libvirt_length = -1; +static int hf_libvirt_program = -1; +static int hf_libvirt_version = -1; +static int hf_libvirt_procedure = -1; +static int hf_libvirt_type = -1; +static int hf_libvirt_serial = -1; +static int hf_libvirt_status = -1; +static int hf_qemu_procedure = -1; +static gint ett_libvirt = -1; + +static const value_string program_strings[] = { + { REMOTE_PROGRAM, "REMOTE" }, + { QEMU_PROGRAM, "QEMU" }, + { 0, NULL } +}; + +static const value_string type_strings[] = { + { 0, "CALL" }, + { 1, "REPLY" }, + { 2, "MESSAGE" }, + { 3, "STREAM" }, + {-1, NULL} +}; + +static const value_string status_strings[] = { + { 0, "OK" }, + { 1, "ERROR" }, + { 2, "CONTINUE" }, + {-1, NULL} +}; + +static const value_string remote_procedure_strings [] = { + { 1, "OPEN" }, + { 2, "CLOSE" }, + { 3, "GET_TYPE" }, + { 4, "GET_VERSION" }, + { 5, "GET_MAX_VCPUS" }, + { 6, "NODE_GET_INFO" }, + { 7, "GET_CAPABILITIES" }, + { 8, "DOMAIN_ATTACH_DEVICE" }, + { 9, "DOMAIN_CREATE" }, + { 10, "DOMAIN_CREATE_XML" }, + { 11, "DOMAIN_DEFINE_XML" }, + { 12, "DOMAIN_DESTROY" }, + { 13, "DOMAIN_DETACH_DEVICE" }, + { 14, "DOMAIN_GET_XML_DESC" }, + { 15, "DOMAIN_GET_AUTOSTART" }, + { 16, "DOMAIN_GET_INFO" }, + { 17, "DOMAIN_GET_MAX_MEMORY" }, + { 18, "DOMAIN_GET_MAX_VCPUS" }, + { 19, "DOMAIN_GET_OS_TYPE" }, + { 20, "DOMAIN_GET_VCPUS" }, + { 21, "LIST_DEFINED_DOMAINS" }, + { 22, "DOMAIN_LOOKUP_BY_ID" }, + { 23, "DOMAIN_LOOKUP_BY_NAME" }, + { 24, "DOMAIN_LOOKUP_BY_UUID" }, + { 25, "NUM_OF_DEFINED_DOMAINS" }, + { 26, "DOMAIN_PIN_VCPU" }, + { 27, "DOMAIN_REBOOT" }, + { 28, "DOMAIN_RESUME" }, + { 29, "DOMAIN_SET_AUTOSTART" }, + { 30, "DOMAIN_SET_MAX_MEMORY" }, + { 31, "DOMAIN_SET_MEMORY" }, + { 32, "DOMAIN_SET_VCPUS" }, + { 33, "DOMAIN_SHUTDOWN" }, + { 34, "DOMAIN_SUSPEND" }, + { 35, "DOMAIN_UNDEFINE" }, + { 36, "LIST_DEFINED_NETWORKS" }, + { 37, "LIST_DOMAINS" }, + { 38, "LIST_NETWORKS" }, + { 39, "NETWORK_CREATE" }, + { 40, "NETWORK_CREATE_XML" }, + { 41, "NETWORK_DEFINE_XML" }, + { 42, "NETWORK_DESTROY" }, + { 43, "NETWORK_GET_XML_DESC" }, + { 44, "NETWORK_GET_AUTOSTART" }, + { 45, "NETWORK_GET_BRIDGE_NAME" }, + { 46, "NETWORK_LOOKUP_BY_NAME" }, + { 47, "NETWORK_LOOKUP_BY_UUID" }, + { 48, "NETWORK_SET_AUTOSTART" }, + { 49, "NETWORK_UNDEFINE" }, + { 50, "NUM_OF_DEFINED_NETWORKS" }, + { 51, "NUM_OF_DOMAINS" }, + { 52, "NUM_OF_NETWORKS" }, + { 53, "DOMAIN_CORE_DUMP" }, + { 54, "DOMAIN_RESTORE" }, + { 55, "DOMAIN_SAVE" }, + { 56, "DOMAIN_GET_SCHEDULER_TYPE" }, + { 57, "DOMAIN_GET_SCHEDULER_PARAMETERS" }, + { 58, "DOMAIN_SET_SCHEDULER_PARAMETERS" }, + { 59, "GET_HOSTNAME" }, + { 60, "SUPPORTS_FEATURE" }, + { 61, "DOMAIN_MIGRATE_PREPARE" }, + { 62, "DOMAIN_MIGRATE_PERFORM" }, + { 63, "DOMAIN_MIGRATE_FINISH" }, + { 64, "DOMAIN_BLOCK_STATS" }, + { 65, "DOMAIN_INTERFACE_STATS" }, + { 66, "AUTH_LIST" }, + { 67, "AUTH_SASL_INIT" }, + { 68, "AUTH_SASL_START" }, + { 69, "AUTH_SASL_STEP" }, + { 70, "AUTH_POLKIT" }, + { 71, "NUM_OF_STORAGE_POOLS" }, + { 72, "LIST_STORAGE_POOLS" }, + { 73, "NUM_OF_DEFINED_STORAGE_POOLS" }, + { 74, "LIST_DEFINED_STORAGE_POOLS" }, + { 75, "FIND_STORAGE_POOL_SOURCES" }, + { 76, "STORAGE_POOL_CREATE_XML" }, + { 77, "STORAGE_POOL_DEFINE_XML" }, + { 78, "STORAGE_POOL_CREATE" }, + { 79, "STORAGE_POOL_BUILD" }, + { 80, "STORAGE_POOL_DESTROY" }, + { 81, "STORAGE_POOL_DELETE" }, + { 82, "STORAGE_POOL_UNDEFINE" }, + { 83, "STORAGE_POOL_REFRESH" }, + { 84, "STORAGE_POOL_LOOKUP_BY_NAME" }, + { 85, "STORAGE_POOL_LOOKUP_BY_UUID" }, + { 86, "STORAGE_POOL_LOOKUP_BY_VOLUME" }, + { 87, "STORAGE_POOL_GET_INFO" }, + { 88, "STORAGE_POOL_GET_XML_DESC" }, + { 89, "STORAGE_POOL_GET_AUTOSTART" }, + { 90, "STORAGE_POOL_SET_AUTOSTART" }, + { 91, "STORAGE_POOL_NUM_OF_VOLUMES" }, + { 92, "STORAGE_POOL_LIST_VOLUMES" }, + { 93, "STORAGE_VOL_CREATE_XML" }, + { 94, "STORAGE_VOL_DELETE" }, + { 95, "STORAGE_VOL_LOOKUP_BY_NAME" }, + { 96, "STORAGE_VOL_LOOKUP_BY_KEY" }, + { 97, "STORAGE_VOL_LOOKUP_BY_PATH" }, + { 98, "STORAGE_VOL_GET_INFO" }, + { 99, "STORAGE_VOL_GET_XML_DESC" }, + { 100, "STORAGE_VOL_GET_PATH" }, + { 101, "NODE_GET_CELLS_FREE_MEMORY" }, + { 102, "NODE_GET_FREE_MEMORY" }, + { 103, "DOMAIN_BLOCK_PEEK" }, + { 104, "DOMAIN_MEMORY_PEEK" }, + { 105, "DOMAIN_EVENTS_REGISTER" }, + { 106, "DOMAIN_EVENTS_DEREGISTER" }, + { 107, "DOMAIN_EVENT_LIFECYCLE" }, + { 108, "DOMAIN_MIGRATE_PREPARE2" }, + { 109, "DOMAIN_MIGRATE_FINISH2" }, + { 110, "GET_URI" }, + { 111, "NODE_NUM_OF_DEVICES" }, + { 112, "NODE_LIST_DEVICES" }, + { 113, "NODE_DEVICE_LOOKUP_BY_NAME" }, + { 114, "NODE_DEVICE_GET_XML_DESC" }, + { 115, "NODE_DEVICE_GET_PARENT" }, + { 116, "NODE_DEVICE_NUM_OF_CAPS" }, + { 117, "NODE_DEVICE_LIST_CAPS" }, + { 118, "NODE_DEVICE_DETTACH" }, + { 119, "NODE_DEVICE_RE_ATTACH" }, + { 120, "NODE_DEVICE_RESET" }, + { 121, "DOMAIN_GET_SECURITY_LABEL" }, + { 122, "NODE_GET_SECURITY_MODEL" }, + { 123, "NODE_DEVICE_CREATE_XML" }, + { 124, "NODE_DEVICE_DESTROY" }, + { 125, "STORAGE_VOL_CREATE_XML_FROM" }, + { 126, "NUM_OF_INTERFACES" }, + { 127, "LIST_INTERFACES" }, + { 128, "INTERFACE_LOOKUP_BY_NAME" }, + { 129, "INTERFACE_LOOKUP_BY_MAC_STRING" }, + { 130, "INTERFACE_GET_XML_DESC" }, + { 131, "INTERFACE_DEFINE_XML" }, + { 132, "INTERFACE_UNDEFINE" }, + { 133, "INTERFACE_CREATE" }, + { 134, "INTERFACE_DESTROY" }, + { 135, "DOMAIN_XML_FROM_NATIVE" }, + { 136, "DOMAIN_XML_TO_NATIVE" }, + { 137, "NUM_OF_DEFINED_INTERFACES" }, + { 138, "LIST_DEFINED_INTERFACES" }, + { 139, "NUM_OF_SECRETS" }, + { 140, "LIST_SECRETS" }, + { 141, "SECRET_LOOKUP_BY_UUID" }, + { 142, "SECRET_DEFINE_XML" }, + { 143, "SECRET_GET_XML_DESC" }, + { 144, "SECRET_SET_VALUE" }, + { 145, "SECRET_GET_VALUE" }, + { 146, "SECRET_UNDEFINE" }, + { 147, "SECRET_LOOKUP_BY_USAGE" }, + { 148, "DOMAIN_MIGRATE_PREPARE_TUNNEL" }, + { 149, "IS_SECURE" }, + { 150, "DOMAIN_IS_ACTIVE" }, + { 151, "DOMAIN_IS_PERSISTENT" }, + { 152, "NETWORK_IS_ACTIVE" }, + { 153, "NETWORK_IS_PERSISTENT" }, + { 154, "STORAGE_POOL_IS_ACTIVE" }, + { 155, "STORAGE_POOL_IS_PERSISTENT" }, + { 156, "INTERFACE_IS_ACTIVE" }, + { 157, "GET_LIB_VERSION" }, + { 158, "CPU_COMPARE" }, + { 159, "DOMAIN_MEMORY_STATS" }, + { 160, "DOMAIN_ATTACH_DEVICE_FLAGS" }, + { 161, "DOMAIN_DETACH_DEVICE_FLAGS" }, + { 162, "CPU_BASELINE" }, + { 163, "DOMAIN_GET_JOB_INFO" }, + { 164, "DOMAIN_ABORT_JOB" }, + { 165, "STORAGE_VOL_WIPE" }, + { 166, "DOMAIN_MIGRATE_SET_MAX_DOWNTIME" }, + { 167, "DOMAIN_EVENTS_REGISTER_ANY" }, + { 168, "DOMAIN_EVENTS_DEREGISTER_ANY" }, + { 169, "DOMAIN_EVENT_REBOOT" }, + { 170, "DOMAIN_EVENT_RTC_CHANGE" }, + { 171, "DOMAIN_EVENT_WATCHDOG" }, + { 172, "DOMAIN_EVENT_IO_ERROR" }, + { 173, "DOMAIN_EVENT_GRAPHICS" }, + { 174, "DOMAIN_UPDATE_DEVICE_FLAGS" }, + { 175, "NWFILTER_LOOKUP_BY_NAME" }, + { 176, "NWFILTER_LOOKUP_BY_UUID" }, + { 177, "NWFILTER_GET_XML_DESC" }, + { 178, "NUM_OF_NWFILTERS" }, + { 179, "LIST_NWFILTERS" }, + { 180, "NWFILTER_DEFINE_XML" }, + { 181, "NWFILTER_UNDEFINE" }, + { 182, "DOMAIN_MANAGED_SAVE" }, + { 183, "DOMAIN_HAS_MANAGED_SAVE_IMAGE" }, + { 184, "DOMAIN_MANAGED_SAVE_REMOVE" }, + { 185, "DOMAIN_SNAPSHOT_CREATE_XML" }, + { 186, "DOMAIN_SNAPSHOT_GET_XML_DESC" }, + { 187, "DOMAIN_SNAPSHOT_NUM" }, + { 188, "DOMAIN_SNAPSHOT_LIST_NAMES" }, + { 189, "DOMAIN_SNAPSHOT_LOOKUP_BY_NAME" }, + { 190, "DOMAIN_HAS_CURRENT_SNAPSHOT" }, + { 191, "DOMAIN_SNAPSHOT_CURRENT" }, + { 192, "DOMAIN_REVERT_TO_SNAPSHOT" }, + { 193, "DOMAIN_SNAPSHOT_DELETE" }, + { 194, "DOMAIN_GET_BLOCK_INFO" }, + { 195, "DOMAIN_EVENT_IO_ERROR_REASON" }, + { 196, "DOMAIN_CREATE_WITH_FLAGS" }, + { 197, "DOMAIN_SET_MEMORY_PARAMETERS" }, + { 198, "DOMAIN_GET_MEMORY_PARAMETERS" }, + { 199, "DOMAIN_SET_VCPUS_FLAGS" }, + { 200, "DOMAIN_GET_VCPUS_FLAGS" }, + { 201, "DOMAIN_OPEN_CONSOLE" }, + { 202, "DOMAIN_IS_UPDATED" }, + { 203, "GET_SYSINFO" }, + { 204, "DOMAIN_SET_MEMORY_FLAGS" }, + { 205, "DOMAIN_SET_BLKIO_PARAMETERS" }, + { 206, "DOMAIN_GET_BLKIO_PARAMETERS" }, + { 207, "DOMAIN_MIGRATE_SET_MAX_SPEED" }, + { 208, "STORAGE_VOL_UPLOAD" }, + { 209, "STORAGE_VOL_DOWNLOAD" }, + { 210, "DOMAIN_INJECT_NMI" }, + { 211, "DOMAIN_SCREENSHOT" }, + { 212, "DOMAIN_GET_STATE" }, + { 213, "DOMAIN_MIGRATE_BEGIN3" }, + { 214, "DOMAIN_MIGRATE_PREPARE3" }, + { 215, "DOMAIN_MIGRATE_PREPARE_TUNNEL3" }, + { 216, "DOMAIN_MIGRATE_PERFORM3" }, + { 217, "DOMAIN_MIGRATE_FINISH3" }, + { 218, "DOMAIN_MIGRATE_CONFIRM3" }, + { 219, "DOMAIN_SET_SCHEDULER_PARAMETERS_FLAGS" }, + { 220, "INTERFACE_CHANGE_BEGIN" }, + { 221, "INTERFACE_CHANGE_COMMIT" }, + { 222, "INTERFACE_CHANGE_ROLLBACK" }, + { 223, "DOMAIN_GET_SCHEDULER_PARAMETERS_FLAGS" }, + { 224, "DOMAIN_EVENT_CONTROL_ERROR" }, + { 225, "DOMAIN_PIN_VCPU_FLAGS" }, + { 226, "DOMAIN_SEND_KEY" }, + { 227, "NODE_GET_CPU_STATS" }, + { 228, "NODE_GET_MEMORY_STATS" }, + { 229, "DOMAIN_GET_CONTROL_INFO" }, + { 230, "DOMAIN_GET_VCPU_PIN_INFO" }, + { 231, "DOMAIN_UNDEFINE_FLAGS" }, + { 232, "DOMAIN_SAVE_FLAGS" }, + { 233, "DOMAIN_RESTORE_FLAGS" }, + { 234, "DOMAIN_DESTROY_FLAGS" }, + { 235, "DOMAIN_SAVE_IMAGE_GET_XML_DESC" }, + { 236, "DOMAIN_SAVE_IMAGE_DEFINE_XML" }, + { 237, "DOMAIN_BLOCK_JOB_ABORT" }, + { 238, "DOMAIN_GET_BLOCK_JOB_INFO" }, + { 239, "DOMAIN_BLOCK_JOB_SET_SPEED" }, + { 240, "DOMAIN_BLOCK_PULL" }, + { 241, "DOMAIN_EVENT_BLOCK_JOB" }, + { 242, "DOMAIN_MIGRATE_GET_MAX_SPEED" }, + { 243, "DOMAIN_BLOCK_STATS_FLAGS" }, + { 244, "DOMAIN_SNAPSHOT_GET_PARENT" }, + { 245, "DOMAIN_RESET" }, + { 0, NULL} +}; + +static const value_string qemu_procedure_strings[] = { + { 1, "MONITOR_COMMAND" }, + { 2, "DOMAIN_ATTACH" }, + { 0, NULL} +}; + +static void +dissect_libvirt_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + gint offset = 0; + /* Okay, these are magic constants, but + * they are just offsets where requested + * info is to be found */ + guint32 prog = tvb_get_ntohl(tvb, 4); + guint32 proc = tvb_get_ntohl(tvb, 12); + guint32 type = tvb_get_ntohl(tvb, 16); + guint32 serial = tvb_get_ntohl(tvb, 20); + guint32 status = tvb_get_ntohl(tvb, 24); + + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Libvirt"); + col_clear(pinfo->cinfo,COL_INFO); + if (prog == REMOTE_PROGRAM) + col_add_fstr(pinfo->cinfo, COL_INFO, "Proc=%s ", val_to_str(proc, remote_procedure_strings, "%d")); + else if (prog == QEMU_PROGRAM) + col_add_fstr(pinfo->cinfo, COL_INFO, "Proc=%s ", val_to_str(proc, qemu_procedure_strings, "%d")); + else + /* unhandeld program */ + col_add_fstr(pinfo->cinfo, COL_INFO, "Proc=%u ", proc); + + col_append_fstr(pinfo->cinfo, COL_INFO, "Type=%s Status=%s Prog=%s Serial=%u", + val_to_str(type, type_strings, "%d"), + val_to_str(status, status_strings, "%d"), + val_to_str(prog, program_strings, "%x"), + serial); + + if (tree) { + proto_item *ti = NULL; + proto_tree *libvirt_tree = NULL; + + ti = proto_tree_add_item(tree, proto_libvirt, tvb, 0, -1, FALSE); + libvirt_tree = proto_item_add_subtree(ti, ett_libvirt); + proto_tree_add_item(libvirt_tree, hf_libvirt_length, tvb, offset, 4, FALSE); offset += 4; + proto_tree_add_item(libvirt_tree, hf_libvirt_program, tvb, offset, 4, FALSE); offset += 4; + proto_tree_add_item(libvirt_tree, hf_libvirt_version, tvb, offset, 4, FALSE); offset += 4; + if (prog == REMOTE_PROGRAM) + proto_tree_add_item(libvirt_tree, hf_libvirt_procedure, tvb, offset, 4, FALSE); + else if (prog == QEMU_PROGRAM) + proto_tree_add_item(libvirt_tree, hf_qemu_procedure, tvb, offset, 4, FALSE); + else + /* unhandeld program */ + proto_tree_add_none_format(libvirt_tree, -1, tvb, offset, 4, "Unknown proc: %u", proc); + offset += 4; + proto_tree_add_item(libvirt_tree, hf_libvirt_type, tvb, offset, 4, FALSE); offset += 4; + proto_tree_add_item(libvirt_tree, hf_libvirt_serial, tvb, offset, 4, FALSE); offset += 4; + proto_tree_add_item(libvirt_tree, hf_libvirt_status, tvb, offset, 4, FALSE); offset += 4; + } +} + +static guint32 get_message_len(packet_info *pinfo __attribute__((unused)), tvbuff_t *tvb, int offset) +{ + return tvb_get_ntohl(tvb, offset); +} + +static void +dissect_libvirt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + /* Another magic const - 4; simply, how much bytes + * is needed to tell the length of libvirt packet. */ + tcp_dissect_pdus(tvb, pinfo, tree, TRUE, 4, get_message_len, dissect_libvirt_message); +} + + +void +proto_register_libvirt(void) +{ + static hf_register_info hf[] = { + { &hf_libvirt_length, + { "length", "libvirt.length", + FT_UINT32, BASE_DEC, + NULL, 0x0, + NULL, HFILL} + }, + { &hf_libvirt_program, + { "program", "libvirt.program", + FT_UINT32, BASE_HEX, + VALS(program_strings), 0x0, + NULL, HFILL} + }, + { &hf_libvirt_version, + { "version", "libvirt.version", + FT_UINT32, BASE_DEC, + NULL, 0x0, + NULL, HFILL} + }, + { &hf_libvirt_procedure, + { "procedure", "libvirt.procedure", + FT_INT32, BASE_DEC, + VALS(remote_procedure_strings), 0x0, + NULL, HFILL} + }, + { &hf_libvirt_type, + { "type", "libvirt.type", + FT_INT32, BASE_DEC, + VALS(type_strings), 0x0, + NULL, HFILL} + }, + { &hf_libvirt_serial, + { "serial", "libvirt.serial", + FT_UINT32, BASE_DEC, + NULL, 0x0, + NULL, HFILL} + }, + { &hf_libvirt_status, + { "status", "libvirt.status", + FT_INT32, BASE_DEC, + VALS(status_strings), 0x0, + NULL, HFILL} + }, + { &hf_qemu_procedure, + { "procedure", "libvirt.procedure", + FT_INT32, BASE_DEC, + VALS(qemu_procedure_strings), 0x0, + NULL, HFILL} + } + }; + + static gint *ett[] = { + &ett_libvirt + }; + + proto_libvirt = proto_register_protocol ( + "Libvirt", /* name */ + "libvirt", /* short name */ + "libvirt" /* abbrev */ + ); + + proto_register_field_array(proto_libvirt, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); +} + +void +proto_reg_handoff_foo(void) +{ + static dissector_handle_t libvirt_handle; + + libvirt_handle = create_dissector_handle(dissect_libvirt, proto_libvirt); + dissector_add_uint("tcp.port", LIBVIRT_PORT, libvirt_handle); +} -- 1.7.3.4

3 3

[libvirt] [PATCH] Introduce <driver> under <filesystem> to support open-by-handle.
by Harsh Prateek Bora 11 Oct '11

11 Oct '11

VirtFS allows the user to choose between local/handle for fs driver. As of now, libvirt hardcode to use local driver only. This patch provides a solution to allow user to choose between local/handle as fs driver. Sample: <filesystem type='mount'> <driver type='handle'/> <source dir='/folder/to/share'/> <target dir='mount_tag'/> </filesystem> Signed-off-by: Harsh Prateek Bora <harsh(a)linux.vnet.ibm.com> --- docs/schemas/domaincommon.rng | 9 +++++++++ src/conf/domain_conf.c | 23 +++++++++++++++++++++++ src/conf/domain_conf.h | 10 ++++++++++ src/qemu/qemu_command.c | 7 ++++++- 4 files changed, 48 insertions(+), 1 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 492a41d..3a0cb86 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1025,6 +1025,15 @@ </choice> <optional> <ref name="address"/> + <element name="driver"> + <attribute name="type"> + <choice> + <value>local</value> + <value>handle</value> + </choice> + </attribute> + <empty/> + </element> <attribute name="accessmode"> <choice> <value>passthrough</value> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a537251..04410f2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -238,6 +238,10 @@ VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST, "file", "template") +VIR_ENUM_IMPL(virDomainFSDriverType, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, + "local", + "handle") + VIR_ENUM_IMPL(virDomainFSAccessMode, VIR_DOMAIN_FS_ACCESSMODE_LAST, "passthrough", "mapped", @@ -2828,6 +2832,7 @@ virDomainFSDefParseXML(xmlNodePtr node, virDomainFSDefPtr def; xmlNodePtr cur; char *type = NULL; + char *fsdriver = NULL; char *source = NULL; char *target = NULL; char *accessmode = NULL; @@ -2878,11 +2883,23 @@ virDomainFSDefParseXML(xmlNodePtr node, target = virXMLPropString(cur, "dir"); } else if (xmlStrEqual(cur->name, BAD_CAST "readonly")) { def->readonly = 1; + } else if ((fsdriver == NULL) && (xmlStrEqual(cur->name, BAD_CAST "driver"))) { + fsdriver = virXMLPropString(cur, "type"); } } cur = cur->next; } + if (fsdriver) { + if ((def->fsdriver = virDomainFSDriverTypeTypeFromString(fsdriver)) < 0) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown fs driver type '%s'"), fsdriver); + goto error; + } + } else { + def->fsdriver = VIR_DOMAIN_FS_DRIVER_TYPE_LOCAL; + } + if (source == NULL) { virDomainReportError(VIR_ERR_NO_SOURCE, target ? "%s" : NULL, target); @@ -2905,6 +2922,7 @@ virDomainFSDefParseXML(xmlNodePtr node, cleanup: VIR_FREE(type); + VIR_FREE(fsdriver); VIR_FREE(target); VIR_FREE(source); VIR_FREE(accessmode); @@ -9351,6 +9369,7 @@ virDomainFSDefFormat(virBufferPtr buf, { const char *type = virDomainFSTypeToString(def->type); const char *accessmode = virDomainFSAccessModeTypeToString(def->accessmode); + const char *fsdriver = virDomainFSDriverTypeTypeToString(def->fsdriver); if (!type) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, @@ -9369,6 +9388,10 @@ virDomainFSDefFormat(virBufferPtr buf, " <filesystem type='%s' accessmode='%s'>\n", type, accessmode); + if (def->fsdriver) { + virBufferAsprintf(buf, " <driver type='%s'/>\n", fsdriver); + } + if (def->src) { switch (def->type) { case VIR_DOMAIN_FS_TYPE_MOUNT: diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index e07fd2f..d42325e 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -368,6 +368,14 @@ enum virDomainFSType { VIR_DOMAIN_FS_TYPE_LAST }; +/* Filesystem driver type */ +enum virDomainFSDriverType { + VIR_DOMAIN_FS_DRIVER_TYPE_LOCAL, + VIR_DOMAIN_FS_DRIVER_TYPE_HANDLE, + + VIR_DOMAIN_FS_DRIVER_TYPE_LAST +}; + /* Filesystem mount access mode */ enum virDomainFSAccessMode { VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH, @@ -381,6 +389,7 @@ typedef struct _virDomainFSDef virDomainFSDef; typedef virDomainFSDef *virDomainFSDefPtr; struct _virDomainFSDef { int type; + int fsdriver; int accessmode; char *src; char *dst; @@ -1856,6 +1865,7 @@ VIR_ENUM_DECL(virDomainController) VIR_ENUM_DECL(virDomainControllerModelSCSI) VIR_ENUM_DECL(virDomainControllerModelUSB) VIR_ENUM_DECL(virDomainFS) +VIR_ENUM_DECL(virDomainFSDriverType) VIR_ENUM_DECL(virDomainFSAccessMode) VIR_ENUM_DECL(virDomainNet) VIR_ENUM_DECL(virDomainNetBackend) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index cf99f89..a989aa7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1818,7 +1818,12 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs, goto error; } - virBufferAddLit(&opt, "local"); + if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_LOCAL) { + virBufferAddLit(&opt, "local"); + } else if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_HANDLE) { + virBufferAddLit(&opt, "handle"); + } + if (fs->accessmode == VIR_DOMAIN_FS_ACCESSMODE_MAPPED) { virBufferAddLit(&opt, ",security_model=mapped"); } else if(fs->accessmode == VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH) { -- 1.7.1.1

3 3

[libvirt] [PATCH v2] Introduce <driver> under <filesystem> to support open-by-handle.
by Harsh Prateek Bora 11 Oct '11

11 Oct '11

VirtFS allows the user to choose between path/handle based fs driver. As of now, libvirt hardcode to use path based driver only. This patch provides a solution to allow user to choose between path/handle based fs driver. Sample: <filesystem type='mount'> <driver type='handle'/> <source dir='/folder/to/share1'/> <target dir='mount_tag1'/> </filesystem> <filesystem type='mount'> <driver type='path'/> <source dir='/folder/to/share2'/> <target dir='mount_tag2'/> </filesystem> Signed-off-by: Harsh Prateek Bora <harsh(a)linux.vnet.ibm.com> v2: - use 'path' instead of 'local' in xml terminology - added default enum for optional driver type --- docs/schemas/domaincommon.rng | 9 +++++++++ src/conf/domain_conf.c | 24 ++++++++++++++++++++++++ src/conf/domain_conf.h | 11 +++++++++++ src/qemu/qemu_command.c | 7 ++++++- 4 files changed, 50 insertions(+), 1 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 492a41d..3937393 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1025,6 +1025,15 @@ </choice> <optional> <ref name="address"/> + <element name="driver"> + <attribute name="type"> + <choice> + <value>path</value> + <value>handle</value> + </choice> + </attribute> + <empty/> + </element> <attribute name="accessmode"> <choice> <value>passthrough</value> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index a537251..ede1f01 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -238,6 +238,11 @@ VIR_ENUM_IMPL(virDomainFS, VIR_DOMAIN_FS_TYPE_LAST, "file", "template") +VIR_ENUM_IMPL(virDomainFSDriverType, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, + "default", + "path", + "handle") + VIR_ENUM_IMPL(virDomainFSAccessMode, VIR_DOMAIN_FS_ACCESSMODE_LAST, "passthrough", "mapped", @@ -2828,6 +2833,7 @@ virDomainFSDefParseXML(xmlNodePtr node, virDomainFSDefPtr def; xmlNodePtr cur; char *type = NULL; + char *fsdriver = NULL; char *source = NULL; char *target = NULL; char *accessmode = NULL; @@ -2878,11 +2884,23 @@ virDomainFSDefParseXML(xmlNodePtr node, target = virXMLPropString(cur, "dir"); } else if (xmlStrEqual(cur->name, BAD_CAST "readonly")) { def->readonly = 1; + } else if ((fsdriver == NULL) && (xmlStrEqual(cur->name, BAD_CAST "driver"))) { + fsdriver = virXMLPropString(cur, "type"); } } cur = cur->next; } + if (fsdriver) { + if ((def->fsdriver = virDomainFSDriverTypeTypeFromString(fsdriver)) < 0) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, + _("unknown fs driver type '%s'"), fsdriver); + goto error; + } + } else { + def->fsdriver = VIR_DOMAIN_FS_DRIVER_TYPE_PATH; + } + if (source == NULL) { virDomainReportError(VIR_ERR_NO_SOURCE, target ? "%s" : NULL, target); @@ -2905,6 +2923,7 @@ virDomainFSDefParseXML(xmlNodePtr node, cleanup: VIR_FREE(type); + VIR_FREE(fsdriver); VIR_FREE(target); VIR_FREE(source); VIR_FREE(accessmode); @@ -9351,6 +9370,7 @@ virDomainFSDefFormat(virBufferPtr buf, { const char *type = virDomainFSTypeToString(def->type); const char *accessmode = virDomainFSAccessModeTypeToString(def->accessmode); + const char *fsdriver = virDomainFSDriverTypeTypeToString(def->fsdriver); if (!type) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, @@ -9369,6 +9389,10 @@ virDomainFSDefFormat(virBufferPtr buf, " <filesystem type='%s' accessmode='%s'>\n", type, accessmode); + if (def->fsdriver) { + virBufferAsprintf(buf, " <driver type='%s'/>\n", fsdriver); + } + if (def->src) { switch (def->type) { case VIR_DOMAIN_FS_TYPE_MOUNT: diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index e07fd2f..4f8993b 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -368,6 +368,15 @@ enum virDomainFSType { VIR_DOMAIN_FS_TYPE_LAST }; +/* Filesystem driver type */ +enum virDomainFSDriverType { + VIR_DOMAIN_FS_DRIVER_TYPE_DEFAULT = 0, + VIR_DOMAIN_FS_DRIVER_TYPE_PATH, + VIR_DOMAIN_FS_DRIVER_TYPE_HANDLE, + + VIR_DOMAIN_FS_DRIVER_TYPE_LAST +}; + /* Filesystem mount access mode */ enum virDomainFSAccessMode { VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH, @@ -381,6 +390,7 @@ typedef struct _virDomainFSDef virDomainFSDef; typedef virDomainFSDef *virDomainFSDefPtr; struct _virDomainFSDef { int type; + int fsdriver; int accessmode; char *src; char *dst; @@ -1856,6 +1866,7 @@ VIR_ENUM_DECL(virDomainController) VIR_ENUM_DECL(virDomainControllerModelSCSI) VIR_ENUM_DECL(virDomainControllerModelUSB) VIR_ENUM_DECL(virDomainFS) +VIR_ENUM_DECL(virDomainFSDriverType) VIR_ENUM_DECL(virDomainFSAccessMode) VIR_ENUM_DECL(virDomainNet) VIR_ENUM_DECL(virDomainNetBackend) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index cf99f89..112610b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1818,7 +1818,12 @@ char *qemuBuildFSStr(virDomainFSDefPtr fs, goto error; } - virBufferAddLit(&opt, "local"); + if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_PATH) { + virBufferAddLit(&opt, "local"); + } else if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_HANDLE) { + virBufferAddLit(&opt, "handle"); + } + if (fs->accessmode == VIR_DOMAIN_FS_ACCESSMODE_MAPPED) { virBufferAddLit(&opt, ",security_model=mapped"); } else if(fs->accessmode == VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH) { -- 1.7.1.1

2 1

[libvirt] libvirt changes/certification questions
by Udayan Bapat 11 Oct '11

11 Oct '11

Hi I am new to open source development and had a question about libvirt/KVM support in the linux kernel. In general since many people are contributing to the library, are there any 'standardized regressions or certification tests' available that make sure that that the existing libvirt infrastructure does not break with new changes? More particular, how does one make sure that given kernel version is compatible with a given library drop? Thank you -- Udayan

3 2

[libvirt] target for documentation
by Jason Helfman 11 Oct '11

11 Oct '11

Hello List, I was wondering if there are any targets that are just for the documentation to build and install. I am curious about separating the documentation from the software from a building and installation point-of-view, and offering this in the port for FreeBSD. So a user that gives a certain flag will get everything but the documentation. Thanks, Jason -- Jason Helfman System Administrator experts-exchange.com http://www.experts-exchange.com/M_4830110.html E4AD 7CF1 1396 27F6 79DD 4342 5E92 AD66 8C8C FBA5

2 1

[libvirt] ALERT Virtualization Automatic Builder
by berrange＠redhat.com 11 Oct '11

11 Oct '11

Overall status: failed Start date: Mon Oct 10 2011 Start time: 19:05:02 UTC / 15:05:02 EDT Build counter: 1318273502 Build timestamp: 1318273502 URL: http://builder.virt-tools.org/index.html Module: libvirt Status: failed URL: http://builder.virt-tools.org/module-libvirt.html

3 2

[libvirt] [PATCH] docs: fix html bug
by Eric Blake 10 Oct '11

10 Oct '11

</space> doesn't exist. Introduced in commit 4bb4109f. * docs/formatdomain.html.in: Use correct end tag. --- Pushing under the trivial rule. docs/formatdomain.html.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index b15f9e2..8daffb8 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1015,7 +1015,7 @@ There is also an optional <code>rerror_policy</code> that controls behavior for read errors only. <span class="since">Since - 0.9.7</space>. If no rerror_policy is given, error_policy + 0.9.7</span>. If no rerror_policy is given, error_policy is used for both read and write errors. If rerror_policy is given, it overrides the <code>error_policy</code> for read errors. Also note that "enospace" is not a valid -- 1.7.4.4

1 0

[libvirt] [PATCH] xen_xs: Guard against set but empty kernel argument
by Guido Guenther 10 Oct '11

10 Oct '11

On xen 4.1 I observied configurations that look like: (image (hvm (kernel '') (loader '/foo/bar') )) The kernel element is there but unset. This leads to an emtpy <kernel/> element in the XML and even worse makes us skip the boot order parsing and therefore not emit a <boot device='$dev>'/> element which breaks CD booting. O.k. to apply? Cheers, -- Guido --- src/xenxs/xen_sxpr.c | 6 +++ .../sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr | 9 ++++ tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml | 41 ++++++++++++++++++++ tests/sexpr2xmltest.c | 2 + 4 files changed, 58 insertions(+), 0 deletions(-) create mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr create mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c index 72322a7..15eaf18 100644 --- a/src/xenxs/xen_sxpr.c +++ b/src/xenxs/xen_sxpr.c @@ -125,6 +125,12 @@ xenParseSxprOS(const struct sexpr *node, STREQ(def->os.kernel, def->os.loader)) { VIR_FREE(def->os.kernel); } + /* Drop kernel argument that has no value */ + if (hvm && + def->os.kernel && *def->os.kernel == '\0' && + def->os.loader) { + VIR_FREE(def->os.kernel); + } if (!def->os.kernel && hvm) { diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr new file mode 100644 index 0000000..ded668c --- /dev/null +++ b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr @@ -0,0 +1,9 @@ +(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\ +(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\ +(on_reboot 'restart')(on_crash 'restart')\ +(image (hvm (loader /usr/lib/xen/boot/hvmloader)(kernel '')\ +(device_model '/usr/lib64/xen/bin/qemu-dm')(boot d)(cdrom '/root/boot.iso')\ +(acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\ +(uname 'file:/root/foo.img')(mode 'w')))\ +(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\ +(script 'vif-bridge')(type ioemu)))) diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml new file mode 100644 index 0000000..2c1c756 --- /dev/null +++ b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml @@ -0,0 +1,41 @@ +<domain type='xen' id='3'> + <name>fvtest</name> + <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid> + <memory>409600</memory> + <currentMemory>409600</currentMemory> + <vcpu>1</vcpu> + <os> + <type>hvm</type> + <loader>/usr/lib/xen/boot/hvmloader</loader> + <boot dev='cdrom'/> + </os> + <features> + <acpi/> + </features> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>restart</on_crash> + <devices> + <emulator>/usr/lib64/xen/bin/qemu-dm</emulator> + <disk type='file' device='disk'> + <driver name='file'/> + <source file='/root/foo.img'/> + <target dev='hda' bus='ide'/> + </disk> + <disk type='file' device='cdrom'> + <driver name='file'/> + <source file='/root/boot.iso'/> + <target dev='hdc' bus='ide'/> + <readonly/> + </disk> + <interface type='bridge'> + <mac address='00:16:3e:1b:b1:47'/> + <source bridge='xenbr0'/> + <script path='vif-bridge'/> + <target dev='vif3.0'/> + </interface> + <input type='mouse' bus='ps2'/> + <graphics type='vnc' port='5903' autoport='no' keymap='ja'/> + </devices> +</domain> diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c index 26a987d..126a78c 100644 --- a/tests/sexpr2xmltest.c +++ b/tests/sexpr2xmltest.c @@ -180,6 +180,8 @@ mymain(void) DO_TEST("fv-net-ioemu", "fv-net-ioemu", 1); DO_TEST("fv-net-netfront", "fv-net-netfront", 1); + DO_TEST("fv-empty-kernel", "fv-empty-kernel", 1); + DO_TEST("boot-grub", "boot-grub", 1); virCapabilitiesFree(caps); -- 1.7.6.3

3 2

[libvirt] [PATCH 1/2] xen: add error handling to UUID parsing
by Guido Günther 10 Oct '11

10 Oct '11

otherwise a missing UUID in a domain config just shows: libxlDomainXMLFromNative:2600 : Internal Error parsing xm config failed Now we have: xenXMConfigGetUUID:186 : Internal Error config value uuid was missing O.k. to apply? -- Guido --- src/xenxs/xen_xm.c | 37 +++++++++++++++++++++++++++---------- 1 files changed, 27 insertions(+), 10 deletions(-) diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c index 03857c8..d057043 100644 --- a/src/xenxs/xen_xm.c +++ b/src/xenxs/xen_xm.c @@ -174,21 +174,38 @@ static int xenXMConfigCopyStringOpt(virConfPtr conf, /* Convenience method to grab a string UUID from the config file object */ static int xenXMConfigGetUUID(virConfPtr conf, const char *name, unsigned char *uuid) { virConfValuePtr val; - if (!uuid || !name || !conf) - return (-1); + + if (!uuid || !name || !conf) { + XENXS_ERROR(VIR_ERR_INVALID_ARG, + _("Arguments must be non null")); + return -1; + } + if (!(val = virConfGetValue(conf, name))) { - return (-1); + XENXS_ERROR(VIR_ERR_INTERNAL_ERROR, + _("config value %s was missing"), name); + return -1; } - if (val->type != VIR_CONF_STRING) - return (-1); - if (!val->str) - return (-1); + if (val->type != VIR_CONF_STRING) { + XENXS_ERROR(VIR_ERR_INTERNAL_ERROR, + _("config value %s not a string"), name); + return -1; + } + + if (!val->str) { + XENXS_ERROR(VIR_ERR_INTERNAL_ERROR, + _("%s can't be empty"), name); + return -1; + } - if (virUUIDParse(val->str, uuid) < 0) - return (-1); + if (virUUIDParse(val->str, uuid) < 0) { + XENXS_ERROR(VIR_ERR_INTERNAL_ERROR, + _("%s not parseable"), val->str); + return -1; + } - return (0); + return 0; } #define MAX_VFB 1024 -- 1.7.6.3

3 9

[libvirt] [PATCH] maint: typo fixes
by Eric Blake 10 Oct '11

10 Oct '11

I noticed a couple typos in recent commits, and fixed the remaining instances of them. * docs/internals/command.html.in: Fix spelling errors. * include/libvirt/libvirt.h.in (virConnectDomainEventCallback): Likewise. * python/libvirt-override.py (virEventAddHandle): Likewise. * src/lxc/lxc_container.c (lxcContainerChild): Likewise. * src/util/hash.c (virHashCreateFull): Likewise. * src/storage/storage_backend_logical.c (virStorageBackendLogicalMakeVol): Likewise. * src/esx/esx_driver.c (esxFormatVMXFileName): Likewise. * src/vbox/vbox_tmpl.c (vboxIIDIsEqual_v3_x): Likewise. --- Pushing under the trivial rule. docs/internals/command.html.in | 2 +- include/libvirt/libvirt.h.in | 4 ++-- python/libvirt-override.py | 4 ++-- src/esx/esx_driver.c | 2 +- src/lxc/lxc_container.c | 2 +- src/storage/storage_backend_logical.c | 4 ++-- src/util/hash.c | 2 +- src/vbox/vbox_tmpl.c | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/internals/command.html.in b/docs/internals/command.html.in index 8a194ec..7dcf462 100644 --- a/docs/internals/command.html.in +++ b/docs/internals/command.html.in @@ -445,7 +445,7 @@ <strong>Note:</strong> if the command has been daemonized this will only block & wait for the intermediate process, not the real command. <code>virCommandRun</code> will - report on any errors that have occured upon this point + report on any errors that have occurred upon this point with all previous API calls. If the command fails to run, or exits with non-zero status an error will be reported via normal libvirt error infrastructure. If a diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 07617be..1e4b2a2 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -2173,8 +2173,8 @@ typedef enum { /** * virConnectDomainEventCallback: * @conn: virConnect connection - * @dom: The domain on which the event occured - * @event: The specfic virDomainEventType which occured + * @dom: The domain on which the event occurred + * @event: The specfic virDomainEventType which occurred * @detail: event specific detail information * @opaque: opaque user data * diff --git a/python/libvirt-override.py b/python/libvirt-override.py index 98241d6..387fddf 100644 --- a/python/libvirt-override.py +++ b/python/libvirt-override.py @@ -179,8 +179,8 @@ def virEventAddHandle(fd, events, cb, opaque): Example callback prototype is: def cb(watch, # int id of the handle - fd, # int file descriptor the event occured on - events, # int bitmap of events that have occured + fd, # int file descriptor the event occurred on + events, # int bitmap of events that have occurred opaque): # opaque data passed to eventAddHandle """ cbData = {"cb" : cb, "opaque" : opaque} diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 3f26557..af30c1b 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -276,7 +276,7 @@ esxParseVMXFileName(const char *fileName, void *opaque) * * Firstly parse the datastore path. Then use the datastore name to lookup the * datastore and it's mount path. Finally concatenate the mount path, directory - * and file name to an absolute path and return it. Detect the seperator type + * and file name to an absolute path and return it. Detect the separator type * based on the mount path. */ static char * diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 69cea8e..e9891f7 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1117,7 +1117,7 @@ cleanup: VIR_FORCE_CLOSE(argv->handshakefd); if (ret == 0) { - /* this function will only return if an error occured */ + /* this function will only return if an error occurred */ ret = virCommandExec(cmd); } diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 6137278..51624a7 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -167,7 +167,7 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool, goto cleanup; } - /* Now parse the "devices" feild seperately */ + /* Now parse the "devices" field separately */ regex = strdup(regex_unit); for (i = 1; i < nextents; i++) { @@ -175,7 +175,7 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool, virReportOOMError(); goto cleanup; } - /* "," is the seperator of "devices" field */ + /* "," is the separator of "devices" field */ strcat(regex, ","); strncat(regex, regex_unit, strlen(regex_unit)); } diff --git a/src/util/hash.c b/src/util/hash.c index b5ec6af..42ccff7 100644 --- a/src/util/hash.c +++ b/src/util/hash.c @@ -120,7 +120,7 @@ virHashComputeKey(virHashTablePtr table, const void *name) * * Create a new virHashTablePtr. * - * Returns the newly created object, or NULL if an error occured. + * Returns the newly created object, or NULL if an error occurred. */ virHashTablePtr virHashCreateFull(int size, virHashDataFree dataFree, diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 8c53f1f..9b674a9 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -537,7 +537,7 @@ vboxIIDIsEqual_v3_x(vboxGlobalData *data, vboxIID_v3_x *iid1, unsigned char uuid2[VIR_UUID_BUFLEN]; /* Note: we can't directly compare the utf8 strings here - * cause the two UUID's may have seperators as space or '-' + * cause the two UUID's may have separators as space or '-' * or mixture of both and we don't want to fail here by * using direct string comparison. Here virUUIDParse() takes * care of these cases. */ -- 1.7.4.4

1 0

[libvirt] [PATCH 1/2] snapshot: sort snapshot-list --tree
by Eric Blake 10 Oct '11

10 Oct '11

Otherwise, the results are not repeatable. * tools/virsh.c (cmdSnapshotList): Print tree in predictable order. --- tools/virsh.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 9532bc3..20b3dc5 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -13209,6 +13209,8 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) if (actual < 0) goto cleanup; + qsort(&names[0], actual, sizeof(char*), namesorter); + if (tree) { char indentBuf[INDENT_BUFLEN]; char **parents = vshMalloc(ctl, sizeof(char *) * actual); @@ -13245,8 +13247,6 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) ret = true; goto cleanup; } else { - qsort(&names[0], actual, sizeof(char*), namesorter); - for (i = 0; i < actual; i++) { /* free up memory from previous iterations of the loop */ VIR_FREE(parent); -- 1.7.4.4

2 5

[libvirt] [v2] storage: Do not use comma as seperator for lvs output
by Osier Yang 10 Oct '11

10 Oct '11

* src/storage/storage_backend_logical.c: If a logical vol is created as striped. (e.g. --stripes 3), the "device" field of lvs output will have multiple fileds which are seperated by comma. Thus the RE we write in the codes will not work well anymore. E.g. (lvs output for a stripped vol, uses "#" as seperator here): test_stripes##fSLSZH-zAS2-yAIb-n4mV-Al9u-HA3V-oo9K1B#\ /dev/sdc1(10240),/dev/sdd1(0)#42949672960#4194304 The RE we use: const char *regexes[] = { "^\\s*(\\S+),(\\S*),(\\S+),(\\S+)\$(\\S+)\$,(\\S+),([0-9]+),?\\s*$" }; Also the RE doesn't match the "devices" field of striped vol properly, it contains multiple "device path" and "offset". This patch mainly does: 1) Change the seperator into "#" 2) Change the RE for "devices" field from "(\\S+)\$(\\S+)\$" into "(\\S+)". 3) Add two new options for lvs command, (segtype, stripes) 4) Extend the RE to match the value for the two new fields. 5) Parse the "devices" field seperately in virStorageBackendLogicalMakeVol, multiple "extents" info are generated if the vol is striped. The number of "extents" is equal to the stripes number of the striped vol. A incidental fix: (virStorageBackendLogicalMakeVol) Free "vol" if it's new created and there is error. Demo on striped vol with the patch applied: % virsh vol-dumpxml /dev/test_vg/vol_striped2 <volume> <name>vol_striped2</name> <key>QuWqmn-kIkZ-IATt-67rc-OWEP-1PHX-Cl2ICs</key> <source> <device path='/dev/sda5'> <extent start='79691776' end='88080384'/> </device> <device path='/dev/sda6'> <extent start='62914560' end='71303168'/> </device> </source> <capacity>8388608</capacity> <allocation>8388608</allocation> <target> <path>/dev/test_vg/vol_striped2</path> <permissions> <mode>0660</mode> <owner>0</owner> <group>6</group> <label>system_u:object_r:fixed_disk_device_t:s0</label> </permissions> </target> </volume> RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=727474 v1 - v2: v1 just simply changes the seperator into "#". --- src/storage/storage_backend_logical.c | 156 +++++++++++++++++++++++++-------- 1 files changed, 121 insertions(+), 35 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 589f486..dda68fd 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -62,13 +62,22 @@ virStorageBackendLogicalSetActive(virStoragePoolObjPtr pool, } +#define VIR_STORAGE_VOL_LOGICAL_SEGTYPE_STRIPED "striped" + static int virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool, char **const groups, void *data) { virStorageVolDefPtr vol = NULL; + bool is_new_vol = false; unsigned long long offset, size, length; + const char *regex_unit = "(\\S+)\$(\\S+)\$"; + char *regex = NULL; + regex_t *reg = NULL; + regmatch_t *vars = NULL; + char *p = NULL; + int i, err, nextents, nvars, ret = -1; /* See if we're only looking for a specific volume */ if (data != NULL) { @@ -88,19 +97,18 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool, return -1; } + is_new_vol = true; vol->type = VIR_STORAGE_VOL_BLOCK; if ((vol->name = strdup(groups[0])) == NULL) { virReportOOMError(); - virStorageVolDefFree(vol); - return -1; + goto cleanup; } if (VIR_REALLOC_N(pool->volumes.objs, pool->volumes.count + 1)) { virReportOOMError(); - virStorageVolDefFree(vol); - return -1; + goto cleanup; } pool->volumes.objs[pool->volumes.count++] = vol; } @@ -109,8 +117,7 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool, if (virAsprintf(&vol->target.path, "%s/%s", pool->def->target.path, vol->name) < 0) { virReportOOMError(); - virStorageVolDefFree(vol); - return -1; + goto cleanup; } } @@ -118,8 +125,7 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool, if (virAsprintf(&vol->backingStore.path, "%s/%s", pool->def->target.path, groups[1]) < 0) { virReportOOMError(); - virStorageVolDefFree(vol); - return -1; + goto cleanup; } vol->backingStore.format = VIR_STORAGE_POOL_LOGICAL_LVM2; @@ -128,47 +134,127 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool, if (vol->key == NULL && (vol->key = strdup(groups[2])) == NULL) { virReportOOMError(); - return -1; + goto cleanup; } if (virStorageBackendUpdateVolInfo(vol, 1) < 0) - return -1; + goto cleanup; + nextents = 1; + if (STREQ(groups[4], VIR_STORAGE_VOL_LOGICAL_SEGTYPE_STRIPED)) { + if (virStrToLong_i(groups[5], NULL, 10, &nextents) < 0) { + virStorageReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("malformed volume extent stripes value")); + goto cleanup; + } + } /* Finally fill in extents information */ if (VIR_REALLOC_N(vol->source.extents, - vol->source.nextent + 1) < 0) { + vol->source.nextent + nextents) < 0) { virReportOOMError(); - return -1; + goto cleanup; } - if ((vol->source.extents[vol->source.nextent].path = - strdup(groups[3])) == NULL) { + if (virStrToLong_ull(groups[6], NULL, 10, &length) < 0) { + virStorageReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("malformed volume extent length value")); + goto cleanup; + } + if (virStrToLong_ull(groups[7], NULL, 10, &size) < 0) { + virStorageReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("malformed volume extent size value")); + goto cleanup; + } + + /* Now parse the "devices" feild seperately */ + regex = strdup(regex_unit); + + for (i = 1; i < nextents; i++) { + if (VIR_REALLOC_N(regex, strlen(regex) + strlen(regex_unit) + 2) < 0) { + virReportOOMError(); + goto cleanup; + } + /* "," is the seperator of "devices" field */ + strcat(regex, ","); + strncat(regex, regex_unit, strlen(regex_unit)); + } + + if (VIR_ALLOC(reg) < 0) { virReportOOMError(); - return -1; + goto cleanup; } - if (virStrToLong_ull(groups[4], NULL, 10, &offset) < 0) { - virStorageReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("malformed volume extent offset value")); - return -1; + /* Each extent has a "path:offset" pair, and vars[0] will + * be the whole matched string. + */ + nvars = (nextents * 2) + 1; + if (VIR_ALLOC_N(vars, nvars) < 0) { + virReportOOMError(); + goto cleanup; } - if (virStrToLong_ull(groups[5], NULL, 10, &length) < 0) { + + err = regcomp(reg, regex, REG_EXTENDED); + if (err != 0) { + char error[100]; + regerror(err, reg, error, sizeof(error)); virStorageReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("malformed volume extent length value")); - return -1; + _("Failed to compile regex %s"), + error); + goto cleanup; } - if (virStrToLong_ull(groups[6], NULL, 10, &size) < 0) { - virStorageReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("malformed volume extent size value")); - return -1; + + if (regexec(reg, groups[3], nvars, vars, 0) != 0) { + virStorageReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("malformed volume extent devices value")); + goto cleanup; } - vol->source.extents[vol->source.nextent].start = offset * size; - vol->source.extents[vol->source.nextent].end = (offset * size) + length; - vol->source.nextent++; + p = groups[3]; - return 0; + /* vars[0] is skipped */ + for (i = 0; i < nextents; i++) { + int j, len; + const char *offset_str = NULL; + + j = (i * 2) + 1; + len = vars[j].rm_eo - vars[j].rm_so; + p[vars[j].rm_eo] = '\0'; + + if ((vol->source.extents[vol->source.nextent].path = + strndup(p + vars[j].rm_so, len)) == NULL) { + virReportOOMError(); + goto cleanup; + } + + len = vars[j + 1].rm_eo - vars[j + 1].rm_so; + if (!(offset_str = strndup(p + vars[j + 1].rm_so, len))) { + virReportOOMError(); + goto cleanup; + } + + if (virStrToLong_ull(offset_str, NULL, 10, &offset) < 0) { + virStorageReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("malformed volume extent offset value")); + goto cleanup; + } + + VIR_FREE(offset_str); + + vol->source.extents[vol->source.nextent].start = offset * size; + vol->source.extents[vol->source.nextent].end = (offset * size) + length; + vol->source.nextent++; + } + + ret = 0; + +cleanup: + VIR_FREE(regex); + VIR_FREE(reg); + VIR_FREE(vars); + if (is_new_vol && (ret == -1)) + virStorageVolDefFree(vol); + return ret; } static int @@ -193,15 +279,15 @@ virStorageBackendLogicalFindLVs(virStoragePoolObjPtr pool, * not a suitable separator (rhbz 470693). */ const char *regexes[] = { - "^\\s*(\\S+),(\\S*),(\\S+),(\\S+)\$(\\S+)\$,(\\S+),([0-9]+),?\\s*$" + "^\\s*(\\S+)#(\\S*)#(\\S+)#(\\S+)#(\\S+)#([0-9]+)#(\\S+)#([0-9]+)#?\\s*$" }; int vars[] = { - 7 + 8 }; const char *prog[] = { - LVS, "--separator", ",", "--noheadings", "--units", "b", + LVS, "--separator", "#", "--noheadings", "--units", "b", "--unbuffered", "--nosuffix", "--options", - "lv_name,origin,uuid,devices,seg_size,vg_extent_size", + "lv_name,origin,uuid,devices,segtype,stripes,seg_size,vg_extent_size", pool->def->source.name, NULL }; -- 1.7.6

2 3

[libvirt] [RFC] Adding new filesystem 'proxy' to 9p
by M. Mohan Kumar 10 Oct '11

10 Oct '11

Pass-through security model in QEMU 9p server needs root privilege to do few file operations (like chown, chmod to any mode/uid:gid). There are two issues in pass-through security model 1) TOCTTOU vulnerability: Following symbolic links in the server could provide access to files beyond 9p export path. 2) When libvirt is configured to run qemu as non-root user (for example, if qemu is configured to run as normal user 'qemu'), running file operations on pass-through security model would fail because it needs root privileges. To overcome above issues, following approach is suggested: A new filesytem type 'proxy' is introduced. Proxy FS uses chroot + socket combination for securing the vulnerability known with following symbolic links. Intention of adding a new filesystem type is to allow qemu to run in non-root mode, but doing privileged operations using socket IO. A new binary (known as proxy helper) will be provided as part of qemu. Proxy helper will chroot into 9p export path and create a socket pair or a named socket based on the command line parameter. Qemu and proxy helper will communicate using this socket. We need following changes in the libvirt code to accomodate new 'proxy' filesystem type: If qemu 9p server is configured to use 'proxy' FS, libvirt will do * Create a socket pair * invoke proxy_helper binary with one of the socket id from the pair as command line parameters to it with root privilege * invoke qemu with one of socket id from the pair as paramter to qemu virtfs after dropping to the configured user privilege. ie, libvirt will invoke proxy_helper as: proxy_helper -i <socket_fd_from_socket_pair> -p <9p-path-to-export> and qemu will be invoked with following virtfs parameter: -virtfs proxy,id=<id>,sock_fd=<socket_fd_from_socket_pair> ,path=/tmp/,security_model=prox,mount_tag=v_pass People who want to use proxy_helper without libvirt can use following interface: $ proxy_helper -s </socket/path> -p <9p-path-to-export> With following qemu fsdev parameter: -virtfs proxy,id=<id>,socket=</socket/path>,path=/tmp/, security_model=prox,mount_tag=v_pass -- Regards, M. Mohan Kumar

3 5

[libvirt] [PATCH 0/7] Update systemtap probing
by Daniel P. Berrange 10 Oct '11

10 Oct '11

When looking at the keep alive code I needed an easy way to monitor the RPC messages being sent/received. I toyed with writing a WireShark plugin, but this seemed very hard work. So instead I wrote a handy set of DTrace probes for the RPC layer At the same time I also needed to track a bug in the RPC console streams code. These probes were very convenient for diagnosing the problems there

3 17

[libvirt] Qemu/KVM is 3x slower under libvirt
by Reeted 09 Oct '11

09 Oct '11

I repost this, this time by also including the libvirt mailing list. Info on my libvirt: it's the version in Ubuntu 11.04 Natty which is 0.8.8-1ubuntu6.5 . I didn't recompile this one, while Kernel and qemu-kvm are vanilla and compiled by hand as described below. My original message follows: This is really strange. I just installed a new host with kernel 3.0.3 and Qemu-KVM 0.14.1 compiled by me. I have created the first VM. This is on LVM, virtio etc... if I run it directly from bash console, it boots in 8 seconds (it's a bare ubuntu with no graphics), while if I boot it under virsh (libvirt) it boots in 20-22 seconds. This is the time from after Grub to the login prompt, or from after Grub to the ssh-server up. I was almost able to replicate the whole libvirt command line on the bash console, and it still goes almost 3x faster when launched from bash than with virsh start vmname. The part I wasn't able to replicate is the -netdev part because I still haven't understood the semantics of it. This is my bash commandline: /opt/qemu-kvm-0.14.1/bin/qemu-system-x86_64 -M pc-0.14 -enable-kvm -m 2002 -smp 2,sockets=2,cores=1,threads=1 -name vmname1-1 -uuid ee75e28a-3bf3-78d9-3cba-65aa63973380 -nodefconfig -nodefaults -chardev socket,id=charmonitor,path=/var/lib/libvirt/qemu/vmname1-1.monitor,server,nowait -mon chardev=charmonitor,id=monitor,mode=readline -rtc base=utc -boot order=dc,menu=on -drive file=/dev/mapper/vgPtpVM-lvVM_Vmname1_d1,if=none,id=drive-virtio-disk0,boot=on,format=raw,cache=none,aio=native -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0 -drive if=none,media=cdrom,id=drive-ide0-1-0,readonly=on,format=raw,cache=none,aio=native -device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 -net nic,model=virtio -net tap,ifname=tap0,script=no,downscript=no -usb -vnc 127.0.0.1:0 -vga cirrus -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 Which was taken from libvirt's command line. The only modifications I did to the original libvirt commandline (seen with ps aux) were: - Removed -S - Network was: -netdev tap,fd=17,id=hostnet0,vhost=on,vhostfd=18 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:05:36:60,bus=pci.0,addr=0x3 Has been simplified to: -net nic,model=virtio -net tap,ifname=tap0,script=no,downscript=no and manual bridging of the tap0 interface. Firstly I had thought that this could be fault of the VNC: I have compiled qemu-kvm with no separate vnc thread. I thought that libvirt might have connected to the vnc server at all times and this could have slowed down the whole VM. But then I also tried connecting vith vncviewer to the KVM machine launched directly from bash, and the speed of it didn't change. So no, it doesn't seem to be that. BTW: is the slowdown of the VM on "no separate vnc thread" only in effect when somebody is actually connected to VNC, or always? Also, note that the time difference is not visible in dmesg once the machine has booted. So it's not a slowdown in detecting devices. Devices are always detected within the first 3 seconds, according to dmesg, at 3.6 seconds the first ext4 mount begins. It seems to be really the OS boot that is slow... it seems an hard disk performance problem. Thank you R.

4 15

[libvirt] [PATCH] qemuDomainAttach: Initialize pidfile variable
by Michal Privoznik 09 Oct '11

09 Oct '11

If parsing qemu command line fails (e.g. because of non-existing process number supplied), we jump to cleanup label where we free pidfile. Therefore it needs to be initialized. Otherwise we free random pointer. --- Pushing under trivial rule. 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 2e6f3e4..5588d93 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10179,7 +10179,7 @@ static virDomainPtr qemuDomainAttach(virConnectPtr conn, virDomainPtr dom = NULL; virDomainChrSourceDefPtr monConfig = NULL; bool monJSON = false; - char *pidfile; + char *pidfile = NULL; virCheckFlags(0, NULL); -- 1.7.3.4

1 0

[libvirt] [PATCH] qemu: silence Coverity false positive
by Eric Blake 08 Oct '11

08 Oct '11

Coverity complained that 4 out of 5 callers to virJSONValueObjectGetBoolean checked for errors. But we documented that we don't care in this case. * src/qemu/qemu_monitor_json.c (qemuMonitorJSONGetBlockInfo): Use ignore_value. --- Pushing under the trivial rule. src/qemu/qemu_monitor_json.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index c4f8360..3d383c8 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -40,6 +40,7 @@ #include "datatypes.h" #include "virterror_internal.h" #include "json.h" +#include "ignore-value.h" #define VIR_FROM_THIS VIR_FROM_QEMU @@ -1418,7 +1419,8 @@ int qemuMonitorJSONGetBlockInfo(qemuMonitorPtr mon, /* Don't check for success here, because 'tray-open' is presented iff * medium is ejected. */ - virJSONValueObjectGetBoolean(dev, "tray-open", &info->tray_open); + ignore_value(virJSONValueObjectGetBoolean(dev, "tray-open", + &info->tray_open)); break; } -- 1.7.4.4

1 0

[libvirt] [PATCH] lxc: fix logic bug
by Eric Blake 08 Oct '11

08 Oct '11

Detected by Coverity. We want to increment the size_t counter, not the pointer to the counter. * src/lxc/lxc_controller.c (lxcSetupLoopDevices): Use correct precedence. --- Pushing under the trivial rule. src/lxc/lxc_controller.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 52d382e..51488e7 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -210,7 +210,7 @@ static int lxcSetupLoopDevices(virDomainDefPtr def, size_t *nloopDevs, int **loo virReportOOMError(); goto cleanup; } - (*loopDevs)[*nloopDevs++] = fd; + (*loopDevs)[(*nloopDevs)++] = fd; } VIR_DEBUG("Setup all loop devices"); -- 1.7.4.4

1 0

[libvirt] [PATCH] virsh: Update the help information for undefine command.
by tangchen 08 Oct '11

08 Oct '11

virsh undefine command can now undefine an active guest, but the help information is still the old. This patch modifies it and make it coincident to the manpage of virsh. Signed-off-by: tangchen <tangchen(a)cn.fujitsu.com> --- tools/virsh.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 48f2b8a..c3b467e 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1897,8 +1897,10 @@ cmdDefine(vshControl *ctl, const vshCmd *cmd) * "undefine" command */ static const vshCmdInfo info_undefine[] = { - {"help", N_("undefine an inactive domain")}, - {"desc", N_("Undefine the configuration for an inactive domain.")}, + {"help", N_("Undefine a domain, active or inactive.")}, + {"desc", N_("Undefine a domain. If the domain is running, this converts \n" + " it to a transient domain, without stopping it. If the \n" + " domain is inactive, the domain configuration is removed.")}, {NULL, NULL} }; -- 1.7.3.1 -- Best Regards, Tang chen -------------------------------------------------- Tang Chen Development Dept.I Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No.6 Wenzhu Road, Nanjing, 210012, China TEL: +86+25-86630566-8527 FUJITSU INTERNAL: 7998-8527 FAX: +86+25-83317685 EMail: tangchen(a)cn.fujitsu.com -------------------------------------------------- This communication is for use by the intended recipient(s) only and may contain information that is privileged, confidential and exempt from disclosure under applicable law. If you are not an intended recipient of this communication, you are hereby notified that any dissemination, distribution or copying hereof is strictly prohibited. If you have received this communication in error, please notify me by reply e-mail, permanently delete this communication from your system, and destroy any hard copies you may have printed

2 2

[libvirt] [libvirt-tck] Fix labels in SELINUX tests
by Guido Günther 07 Oct '11

07 Oct '11

Hi, attached patch is needed to properly skip the SELinux tests if SELinux isn't enabled. Cheers, -- Guido

2 2

[libvirt] [PATCH 0/2] snapshot: allow editing disk-only snapshots
by Eric Blake 07 Oct '11

07 Oct '11

I tested that both of these patches in isolation were sufficient to fix 'virsh snapshot-current dom name' when running the same version of virsh as libvirtd (what will become 0.9.7). However, both patches are required, so that both virsh 0.9.5 and libvirtd 0.9.7, as well as virsh 0.9.7 and libvirt 0.9.5, will work (leaving only the combination of 0.9.5 in both virsh and libvirtd broken). Eric Blake (2): snapshot: let virsh edit disk snapshots snapshot: simplify redefinition of disk snapshot src/conf/domain_conf.c | 44 +++++++++++++++++++++++--------------------- tools/virsh.c | 5 +++++ 2 files changed, 28 insertions(+), 21 deletions(-) -- 1.7.4.4

2 5

[libvirt] [PATCH] snapshot: fix virsh error message typo
by Eric Blake 07 Oct '11

07 Oct '11

* tools/virsh.c (cmdSnapshotList): Spell exclusive correctly. --- Pushing under the trivial rule. tools/virsh.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 48f2b8a..62581f6 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -13133,19 +13133,19 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "parent")) { if (vshCommandOptBool(cmd, "roots")) { vshError(ctl, "%s", - _("--parent and --roots are mutually exlusive")); + _("--parent and --roots are mutually exclusive")); return false; } if (tree) { vshError(ctl, "%s", - _("--parent and --tree are mutually exlusive")); + _("--parent and --tree are mutually exclusive")); return false; } parent_filter = 1; } else if (vshCommandOptBool(cmd, "roots")) { if (tree) { vshError(ctl, "%s", - _("--roots and --tree are mutually exlusive")); + _("--roots and --tree are mutually exclusive")); return false; } flags |= VIR_DOMAIN_SNAPSHOT_LIST_ROOTS; -- 1.7.4.4

1 0

[libvirt] [libvirt-glib] API to deal with storage pool(s)
by Zeeshan Ali (Khattak) 07 Oct '11

07 Oct '11

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> Add API to fetch, list, retrieve & find storage pool(s) on a connection. --- libvirt-gobject/libvirt-gobject-connection.c | 279 ++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-connection.h | 12 +- libvirt-gobject/libvirt-gobject.sym | 6 + 3 files changed, 296 insertions(+), 1 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 69c6956..c512e79 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -43,6 +43,7 @@ struct _GVirConnectionPrivate virConnectPtr conn; GHashTable *domains; + GHashTable *pools; }; G_DEFINE_TYPE(GVirConnection, gvir_connection, G_TYPE_OBJECT); @@ -357,6 +358,11 @@ void gvir_connection_close(GVirConnection *conn) priv->domains = NULL; } + if (priv->pools) { + g_hash_table_unref(priv->pools); + priv->pools = NULL; + } + if (priv->conn) { virConnectClose(priv->conn); priv->conn = NULL; @@ -503,6 +509,148 @@ cleanup: return ret; } +/** + * gvir_connection_fetch_storage_pools: + * @conn: the connection + * @cancellable: (allow-none)(transfer none): cancellation object + */ +gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, + GCancellable *cancellable, + GError **err) +{ + GVirConnectionPrivate *priv = conn->priv; + GHashTable *pools; + gchar **inactive = NULL; + gint ninactive = 0; + gchar **active = NULL; + gint nactive = 0; + gboolean ret = FALSE; + gint i; + virConnectPtr vconn = NULL; + + g_mutex_lock(priv->lock); + if (!priv->conn) { + *err = gvir_error_new(GVIR_CONNECTION_ERROR, + 0, + "Connection is not open"); + g_mutex_unlock(priv->lock); + goto cleanup; + } + vconn = priv->conn; + /* Stop another thread closing the connection just at the minute */ + virConnectRef(vconn); + g_mutex_unlock(priv->lock); + + if (g_cancellable_set_error_if_cancelled(cancellable, err)) + goto cleanup; + + if ((nactive = virConnectNumOfStoragePools(vconn)) < 0) { + *err = gvir_error_new(GVIR_CONNECTION_ERROR, + 0, + "Unable to count pools"); + goto cleanup; + } + if (nactive) { + if (g_cancellable_set_error_if_cancelled(cancellable, err)) + goto cleanup; + + active = g_new(gchar *, nactive); + if ((nactive = virConnectListStoragePools(vconn, + active, + nactive)) < 0) { + *err = gvir_error_new(GVIR_CONNECTION_ERROR, + 0, + "Unable to list pools"); + goto cleanup; + } + } + + if (g_cancellable_set_error_if_cancelled(cancellable, err)) + goto cleanup; + + if ((ninactive = virConnectNumOfDefinedStoragePools(vconn)) < 0) { + *err = gvir_error_new(GVIR_CONNECTION_ERROR, + 0, + "Unable to count pools"); + goto cleanup; + } + + if (ninactive) { + if (g_cancellable_set_error_if_cancelled(cancellable, err)) + goto cleanup; + + inactive = g_new(gchar *, ninactive); + if ((ninactive = virConnectListDefinedStoragePools(vconn, + inactive, + ninactive)) < 0) { + *err = gvir_error_new(GVIR_CONNECTION_ERROR, + 0, + "Unable to list pools %d", ninactive); + goto cleanup; + } + } + + pools = g_hash_table_new_full(g_str_hash, + g_str_equal, + g_free, + g_object_unref); + + for (i = 0 ; i < nactive ; i++) { + if (g_cancellable_set_error_if_cancelled(cancellable, err)) + goto cleanup; + + virStoragePoolPtr vpool; + GVirStoragePool *pool; + + vpool = virStoragePoolLookupByName(vconn, active[i]); + if (!vpool) + continue; + + pool = GVIR_STORAGE_POOL(g_object_new(GVIR_TYPE_STORAGE_POOL, + "handle", vpool, + NULL)); + + g_hash_table_insert(pools, + g_strdup(gvir_storage_pool_get_uuid(pool)), + pool); + } + + for (i = 0 ; i < ninactive ; i++) { + if (g_cancellable_set_error_if_cancelled(cancellable, err)) + goto cleanup; + + virStoragePoolPtr vpool; + GVirStoragePool *pool; + + vpool = virStoragePoolLookupByName(vconn, inactive[i]); + if (!vpool) + continue; + + pool = GVIR_STORAGE_POOL(g_object_new(GVIR_TYPE_STORAGE_POOL, + "handle", vpool, + NULL)); + + g_hash_table_insert(pools, + g_strdup(gvir_storage_pool_get_uuid(pool)), + pool); + } + + g_mutex_lock(priv->lock); + if (priv->pools) + g_hash_table_unref(priv->pools); + priv->pools = pools; + virConnectClose(vconn); + g_mutex_unlock(priv->lock); + + ret = TRUE; + +cleanup: + g_free(active); + for (i = 0 ; i < ninactive ; i++) + g_free(inactive[i]); + g_free(inactive); + return ret; +} static void gvir_connection_fetch_domains_helper(GSimpleAsyncResult *res, @@ -566,6 +714,67 @@ gboolean gvir_connection_fetch_domains_finish(GVirConnection *conn, return TRUE; } +static void +gvir_connection_fetch_pools_helper(GSimpleAsyncResult *res, + GObject *object, + GCancellable *cancellable) +{ + GVirConnection *conn = GVIR_CONNECTION(object); + GError *err = NULL; + + if (!gvir_connection_fetch_storage_pools(conn, cancellable, &err)) { + g_simple_async_result_set_from_error(res, err); + g_error_free(err); + } +} + +/** + * gvir_connection_fetch_storage_pools_async: + * @conn: the connection + * @cancellable: (allow-none)(transfer none): cancellation object + * @callback: (transfer none): completion callback + * @opaque: (transfer none)(allow-none): opaque data for callback + */ +void gvir_connection_fetch_storage_pools_async(GVirConnection *conn, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer opaque) +{ + GSimpleAsyncResult *res; + + res = g_simple_async_result_new(G_OBJECT(conn), + callback, + opaque, + gvir_connection_fetch_storage_pools); + g_simple_async_result_run_in_thread(res, + gvir_connection_fetch_pools_helper, + G_PRIORITY_DEFAULT, + cancellable); + g_object_unref(res); +} + +/** + * gvir_connection_fetch_storage_pools_finish: + * @conn: the connection + * @result: (transfer none): async method result + */ +gboolean gvir_connection_fetch_storage_pools_finish(GVirConnection *conn, + GAsyncResult *result, + GError **err) +{ + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), FALSE); + g_return_val_if_fail(G_IS_ASYNC_RESULT(result), FALSE); + + if (G_IS_SIMPLE_ASYNC_RESULT(result)) { + GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT(result); + g_warn_if_fail (g_simple_async_result_get_source_tag(simple) == + gvir_connection_fetch_storage_pools); + if (g_simple_async_result_propagate_error(simple, err)) + return FALSE; + } + + return TRUE; +} const gchar *gvir_connection_get_uri(GVirConnection *conn) { @@ -595,6 +804,25 @@ GList *gvir_connection_get_domains(GVirConnection *conn) } /** + * gvir_connection_get_storage_pools: + * + * Return value: (element-type LibvirtGObject.StoragePool) (transfer full): List + * of #GVirStoragePool + */ +GList *gvir_connection_get_storage_pools(GVirConnection *conn) +{ + GVirConnectionPrivate *priv = conn->priv; + GList *pools; + + g_mutex_lock(priv->lock); + pools = g_hash_table_get_values(priv->pools); + g_list_foreach(pools, gvir_domain_ref, NULL); + g_mutex_unlock(priv->lock); + + return pools; +} + +/** * gvir_connection_get_domain: * @uuid: uuid string of the requested domain * @@ -613,6 +841,26 @@ GVirDomain *gvir_connection_get_domain(GVirConnection *conn, return dom; } +/** + * gvir_connection_get_storage_pool: + * @uuid: uuid string of the requested storage pool + * + * Return value: (transfer full): the #GVirStoragePool, or NULL + */ +GVirStoragePool *gvir_connection_get_storage_pool(GVirConnection *conn, + const gchar *uuid) +{ + GVirConnectionPrivate *priv = conn->priv; + GVirStoragePool *pool; + + g_mutex_lock(priv->lock); + pool = g_hash_table_lookup(priv->pools, uuid); + if (pool) + g_object_ref(pool); + g_mutex_unlock(priv->lock); + + return pool; +} /** * gvir_connection_find_domain_by_id: @@ -677,6 +925,37 @@ GVirDomain *gvir_connection_find_domain_by_name(GVirConnection *conn, return NULL; } +/** + * gvir_connection_find_storage_pool_by_name: + * @name: name of the requested storage pool + * + * Return value: (transfer full): the #GVirStoragePool, or NULL + */ +GVirStoragePool *gvir_connection_find_storage_pool_by_name(GVirConnection *conn, + const gchar *name) +{ + GVirConnectionPrivate *priv = conn->priv; + GHashTableIter iter; + gpointer key, value; + + g_mutex_lock(priv->lock); + g_hash_table_iter_init(&iter, priv->pools); + + while (g_hash_table_iter_next(&iter, &key, &value)) { + GVirStoragePool *pool = value; + const gchar *thisname = gvir_storage_pool_get_name(pool); + + if (strcmp(thisname, name) == 0) { + g_object_ref(pool); + g_mutex_unlock(priv->lock); + return pool; + } + } + g_mutex_unlock(priv->lock); + + return NULL; +} + static gpointer gvir_connection_handle_copy(gpointer src) { diff --git a/libvirt-gobject/libvirt-gobject-connection.h b/libvirt-gobject/libvirt-gobject-connection.h index c453bed..d05f792 100644 --- a/libvirt-gobject/libvirt-gobject-connection.h +++ b/libvirt-gobject/libvirt-gobject-connection.h @@ -141,14 +141,24 @@ GVirNodeDevice *gvir_connection_get_node_device(GVirConnection *conn, GList *gvir_connection_get_secrets(GVirConnection *conn); GVirSecret *gvir_connection_get_secret(GVirConnection *conn, const gchar *uuid); +#endif +gboolean gvir_connection_fetch_storage_pools(GVirConnection *conn, + GCancellable *cancellable, + GError **err); +void gvir_connection_fetch_storage_pools_async(GVirConnection *conn, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer opaque); +gboolean gvir_connection_fetch_storage_pools_finish(GVirConnection *conn, + GAsyncResult *result, + GError **err); GList *gvir_connection_get_storage_pools(GVirConnection *conn); GVirStoragePool *gvir_connection_get_storage_pool(GVirConnection *conn, const gchar *uuid); GVirStoragePool *gvir_connection_find_storage_pool_by_name(GVirConnection *conn, const gchar *name); -#endif GVirStream *gvir_connection_get_stream(GVirConnection *conn, gint flags); diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index eae40a2..ff2f4cf 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -14,10 +14,16 @@ LIBVIRT_GOBJECT_0.0.1 { gvir_connection_get_stream; gvir_connection_fetch_domains; + gvir_connection_fetch_storage_pools; + gvir_connection_fetch_storage_pools_async; + gvir_connection_fetch_storage_pools_finish; gvir_connection_get_domains; + gvir_connection_get_storage_pools; gvir_connection_get_domain; + gvir_connection_get_storage_pool; gvir_connection_find_domain_by_id; gvir_connection_find_domain_by_name; + gvir_connection_find_storage_pool_by_name; gvir_connection_create_domain; gvir_domain_get_type; -- 1.7.6.2

4 9

[libvirt] [PATCH] remote_driver: Avoid double free in EventControl building
by Michal Privoznik 07 Oct '11

07 Oct '11

Don't xdr_free event data as they are freed by our caller virNetClientProgramDispatch. --- src/remote/remote_driver.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 83f4f3c..2b2f41e 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -3315,7 +3315,6 @@ remoteDomainBuildEventControlError(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, return; event = virDomainEventControlErrorNewFromDom(dom); - xdr_free ((xdrproc_t) &xdr_remote_domain_event_control_error_msg, (char *) &msg); virDomainFree(dom); -- 1.7.3.4

2 2

[libvirt] [PATCH] build: fix 'make distcheck' with pdwtags installed
by Eric Blake 07 Oct '11

07 Oct '11

I am getting this failure with 'make distcheck': GEN ../../src/remote_protocol-structs /bin/sh: ../../src/remote_protocol-structs-t: Permission denied make[4]: *** [../../src/remote_protocol-structs] Error 1 since it attempts a sub-run of a VPATH 'make check' where $(srcdir) is intentionally read-only. I'm not sure which commit introduced the problem, although I suspect it was around 62dee6f when I refactored protocol struct checking to be more powerful. $(@F) is required by POSIX, and although it is not yet portable to all make implementations, we already require GNU make. * src/Makefile.am (PDWTAGS): Generate temp file into current directory, since $(srcdir) is read-only during distcheck. --- src/Makefile.am | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 738ee91..9650139 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -255,9 +255,9 @@ PDWTAGS = \ -e ' exit 8;' \ -e ' }' \ -e '}' \ - > $@-t; \ + > $(@F)-t; \ case $$? in 8) exit 0;; 0) ;; *) exit 1;; esac; \ - diff -u $@-t $@; st=$$?; rm -f $@-t; exit $$st; \ + diff -u $(@F)-t $@; st=$$?; rm -f $(@F)-t; exit $$st; \ else \ echo 'WARNING: you lack pdwtags; skipping the $@ test' >&2; \ echo 'WARNING: install the dwarves package to get pdwtags' >&2; \ -- 1.7.4.4

2 2

[libvirt] [PATCH 2/2] xenParseXM: don't dereference NULL pointer when script is empty
by Guido Günther 06 Oct '11

06 Oct '11

O.k. to apply? -- Guido --- src/xenxs/xen_xm.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c index d057043..30188e2 100644 --- a/src/xenxs/xen_xm.c +++ b/src/xenxs/xen_xm.c @@ -697,8 +697,8 @@ xenParseXM(virConfPtr conf, int xendConfigVersion, } } - if (bridge[0] || STREQ(script, "vif-bridge") || - STREQ(script, "vif-vnic")) { + if (bridge[0] || (script && (STREQ(script, "vif-bridge") || + STREQ(script, "vif-vnic")))) { net->type = VIR_DOMAIN_NET_TYPE_BRIDGE; } else { net->type = VIR_DOMAIN_NET_TYPE_ETHERNET; @@ -715,7 +715,7 @@ xenParseXM(virConfPtr conf, int xendConfigVersion, !(net->data.bridge.ipaddr = strdup(ip))) goto no_memory; } else { - if (script[0] && + if (script && script[0] && !(net->data.ethernet.script = strdup(script))) goto no_memory; if (ip[0] && -- 1.7.6.3

3 9

[libvirt] [PATCH 0/2] qemu: fix disk error_policy problems
by Laine Stump 06 Oct '11

06 Oct '11

These two patches are related to: https://bugzilla.redhat.com/show_bug.cgi?id=730909 The first removes the obvious problem of attempting to feed qemu invalid options. The second makes it possible to specify a different policy for read errors and write errors. 1/2 is written such that 2/2 will apply with minimal rewriting of existing code (that's why the qemu_command.c part may seem a bit obtuse at first).

3 10

[libvirt] [PATCH] qemu: enable multifunction for older qemu
by Eric Blake 06 Oct '11

06 Oct '11

Now that RHEL 6.2 Beta is out, it would be nice to test multifunction devices on that platform. This changes things so that the multifunction cap bit can be set in two different ways: by version comparison (needed for qemu 0.13 which lacked a -device query), and by -device query (provided by qemu.git and backported to the RHEL beta build of qemu-kvm which still claims to be a modified 0.12, and therefore needed for RHEL). * src/qemu/qemu_capabilities.c (qemuCapsParseDeviceStr): Allow second method of setting multifunction cap bit. * tests/qemuhelptest.c (mymain): Test it. * tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta: New file. * tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta-device: Likewise. --- src/qemu/qemu_capabilities.c | 2 + tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta | 230 ++++++++++++++++++++ .../qemu-kvm-0.12.1.2-rhel62-beta-device | 120 ++++++++++ tests/qemuhelptest.c | 59 +++++ 4 files changed, 411 insertions(+), 0 deletions(-) create mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta create mode 100644 tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta-device diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a653243..49be5a2 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1264,6 +1264,8 @@ qemuCapsParseDeviceStr(const char *str, virBitmapPtr flags) /* Features of given devices. */ if (strstr(str, "pci-assign.configfd")) qemuCapsSet(flags, QEMU_CAPS_PCI_CONFIGFD); + if (strstr(str, "pci-assign.multifunction")) + qemuCapsSet(flags, QEMU_CAPS_PCI_MULTIFUNCTION); if (strstr(str, "virtio-blk-pci.bootindex")) { qemuCapsSet(flags, QEMU_CAPS_BOOTINDEX); if (strstr(str, "pci-assign.bootindex")) diff --git a/tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta b/tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta new file mode 100644 index 0000000..d5927e6 --- /dev/null +++ b/tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta @@ -0,0 +1,230 @@ +QEMU PC emulator version 0.12.1 (qemu-kvm-0.12.1.2), Copyright (c) 2003-2008 Fabrice Bellard + +WARNING: Direct use of qemu-kvm from the command line is not recommended by Red Hat. +WARNING: Some command line options listed here may not be available in future releases. +WARNING: Red Hat recommends the use of libvirt as the stable management interface. + +usage: qemu [options] [disk_image] + +'disk_image' is a raw hard image image for IDE hard disk 0 + +Standard options: +-h or -help display this help and exit +-version display version information and exit +-M machine select emulated machine (-M ? for list) +-cpu cpu select CPU (-cpu ? for list) +-smp n[,maxcpus=cpus][,cores=cores][,threads=threads][,sockets=sockets] + set the number of CPUs to 'n' [default=1] + maxcpus= maximum number of total cpus, including + offline CPUs for hotplug etc. + cores= number of CPU cores on one socket + threads= number of threads on one CPU core + sockets= number of discrete sockets in the system +-numa node[,mem=size][,cpus=cpu[-cpu]][,nodeid=node] +-fda/-fdb file use 'file' as floppy disk 0/1 image +-hda/-hdb file use 'file' as IDE hard disk 0/1 image +-hdc/-hdd file use 'file' as IDE hard disk 2/3 image +-cdrom file use 'file' as IDE cdrom image (cdrom is ide1 master) +-drive [file=file][,if=type][,bus=n][,unit=m][,media=d][,index=i] + [,cyls=c,heads=h,secs=s[,trans=t]][,snapshot=on|off] + [,cache=writethrough|writeback|none|unsafe][,format=f] + [,serial=s][,addr=A][,id=name][,aio=threads|native] + [,readonly=on|off][,copy-on-read=on|off][,stream=on|off] + use 'file' as a drive image +-set group.id.arg=value + set <arg> parameter for item <id> of type <group> + i.e. -set drive.$id.file=/path/to/image +-global driver.property=value + set a global default for a driver property +-mtdblock file use 'file' as on-board Flash memory image +-sd file use 'file' as SecureDigital card image +-pflash file use 'file' as a parallel flash image +-boot [order=drives][,once=drives][,menu=on|off] + 'drives': floppy (a), hard disk (c), CD-ROM (d), network (n) +-snapshot write to temporary files instead of disk image files +-m megs set virtual RAM size to megs MB [default=128] +-k language use keyboard layout (for example 'fr' for French) +-audio-help print list of audio drivers and their options +-soundhw c1,... enable audio support + and only specified sound cards (comma separated list) + use -soundhw ? to get the list of supported cards + use -soundhw all to enable all of them +-usb enable the USB driver (will be the default soon) +-usbdevice name add the host or guest USB device 'name' +-device driver[,prop[=value][,...]] + add device (based on driver) + prop=value,... sets driver properties + use -device ? to print all possible drivers + use -device driver,? to print all possible properties +-name string1[,process=string2] set the name of the guest + string1 sets the window title and string2 the process name (on Linux) +-uuid %08x-%04x-%04x-%04x-%012x + specify machine UUID + +Display options: +-nographic disable graphical output and redirect serial I/Os to console +-spice <args> enable spice +-portrait rotate graphical output 90 deg left (only PXA LCD) +-vga [std|cirrus|vmware|qxl|xenfb|none] + select video card type +-full-screen start in full screen +-vnc display start a VNC server on display + +i386 target only: +-win2k-hack use it when installing Windows 2000 to avoid a disk full bug +-no-fd-bootchk disable boot signature checking for floppy disks +-no-acpi disable ACPI +-balloon none disable balloon device +-balloon virtio[,addr=str] + enable virtio balloon device (default) +-acpitable [sig=str][,rev=n][,oem_id=str][,oem_table_id=str][,oem_rev=n][,asl_compiler_id=str][,asl_compiler_rev=n][,data=file1[:file2]...] + ACPI table description +-smbios file=binary + Load SMBIOS entry from binary file +-smbios type=0[,vendor=str][,version=str][,date=str][,release=%d.%d] + Specify SMBIOS type 0 fields +-smbios type=1[,manufacturer=str][,product=str][,version=str][,serial=str] + [,uuid=uuid][,sku=str][,family=str] + Specify SMBIOS type 1 fields + +Network options: +-net nic[,vlan=n][,macaddr=mac][,model=type][,name=str][,addr=str][,vectors=v] + create a new Network Interface Card and connect it to VLAN 'n' +-net user[,vlan=n][,name=str][,net=addr[/mask]][,host=addr][,restrict=y|n] + [,hostname=host][,dhcpstart=addr][,dns=addr][,tftp=dir][,bootfile=f] + [,hostfwd=rule][,guestfwd=rule][,smb=dir[,smbserver=addr]] + connect the user mode network stack to VLAN 'n', configure its + DHCP server and enabled optional services +-net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile][,sndbuf=nbytes][,vnet_hdr=on|off][,vhost=on|off][,vhostfd=h][,vhostforce=on|off] + connect the host TAP network interface to VLAN 'n' and use the + network scripts 'file' (default=/etc/qemu-ifup) + and 'dfile' (default=/etc/qemu-ifdown); + use '[down]script=no' to disable script execution; + use 'fd=h' to connect to an already opened TAP interface + use 'sndbuf=nbytes' to limit the size of the send buffer (the + default is disabled 'sndbuf=0' to enable flow control set 'sndbuf=1048576') + use vnet_hdr=off to avoid enabling the IFF_VNET_HDR tap flag; use + vnet_hdr=on to make the lack of IFF_VNET_HDR support an error condition + use vhost=on to enable experimental in kernel accelerator + (only has effect for virtio guests which use MSIX) + use vhostforce=on to force vhost on for non-MSIX virtio guests + use 'vhostfd=h' to connect to an already opened vhost net device +-net socket[,vlan=n][,name=str][,fd=h][,listen=[host]:port][,connect=host:port] + connect the vlan 'n' to another VLAN using a socket connection +-net socket[,vlan=n][,name=str][,fd=h][,mcast=maddr:port] + connect the vlan 'n' to multicast maddr and port +-net dump[,vlan=n][,file=f][,len=n] + dump traffic on vlan 'n' to file 'f' (max n bytes per packet) +-net none use it alone to have zero network devices; if no -net option + is provided, the default is '-net nic -net user' +-netdev [user|tap|socket],id=str[,option][,option][,...] + +Character device options: +-chardev null,id=id +-chardev socket,id=id[,host=host],port=host[,to=to][,ipv4][,ipv6][,nodelay] + [,server][,nowait][,telnet] (tcp) +-chardev socket,id=id,path=path[,server][,nowait][,telnet] (unix) +-chardev udp,id=id[,host=host],port=port[,localaddr=localaddr] + [,localport=localport][,ipv4][,ipv6] +-chardev msmouse,id=id +-chardev vc,id=id[[,width=width][,height=height]][[,cols=cols][,rows=rows]] +-chardev file,id=id,path=path +-chardev pipe,id=id,path=path +-chardev pty,id=id +-chardev stdio,id=id +-chardev tty,id=id,path=path +-chardev parport,id=id,path=path +-chardev spicevmc,id=id,debug=debug,name=name + +Bluetooth(R) options: +-bt hci,null dumb bluetooth HCI - doesn't respond to commands +-bt hci,host[:id] + use host's HCI with the given name +-bt hci[,vlan=n] + emulate a standard HCI in virtual scatternet 'n' +-bt vhci[,vlan=n] + add host computer to virtual scatternet 'n' using VHCI +-bt device:dev[,vlan=n] + emulate a bluetooth device 'dev' in scatternet 'n' + +Linux/Multiboot boot specific: +-kernel bzImage use 'bzImage' as kernel image +-append cmdline use 'cmdline' as kernel command line +-initrd file use 'file' as initial ram disk + +Debug/Expert options: +-serial dev redirect the serial port to char device 'dev' +-parallel dev redirect the parallel port to char device 'dev' +-monitor dev redirect the monitor to char device 'dev' +-qmp dev like -monitor but opens in 'control' mode. +-mon chardev=[name][,mode=readline|control][,default] +-pidfile file write PID to 'file' +-singlestep always run in singlestep mode +-S freeze CPU at startup (use 'c' to start execution) +-gdb dev wait for gdb connection on 'dev' +-s shorthand for -gdb tcp::1234 +-d item1,... output log to /tmp/qemu.log (use -d ? for a list of log items) +-hdachs c,h,s[,t] + force hard disk 0 physical geometry and the optional BIOS + translation (t=none or lba) (usually qemu can guess them) +-L path set the directory for the BIOS, VGA BIOS and keymaps +-bios file set the filename for the BIOS +-enable-kvm enable KVM full virtualization support +-no-reboot exit instead of rebooting +-no-shutdown stop before shutdown +-loadvm [tag|id] + start right away with a saved state (loadvm in monitor) +-daemonize daemonize QEMU after initializing +-option-rom rom load a file, rom, into the option ROM space +-clock force the use of the given methods for timer alarm. + To see what timers are available use -clock ? +-rtc [base=utc|localtime|date][,clock=host|vm][,driftfix=none|slew] + set the RTC base and clock, enable drift fix for clock ticks +-icount [N|auto] + enable virtual instruction counter with 2^N clock ticks per + instruction +-watchdog i6300esb|ib700 + enable virtual hardware watchdog [default=none] +-watchdog-action reset|shutdown|poweroff|pause|debug|none + action when watchdog fires [default=reset] +-echr chr set terminal escape character instead of ctrl-a +-virtioconsole c + set virtio console +-show-cursor show cursor +-tb-size n set TB size +-incoming p prepare for incoming migration, listen on port p +-nodefaults don't create default devices. +-chroot dir Chroot to dir just before starting the VM. +-runas user Change to user id user just before starting the VM. +-nodefconfig + do not load default config files at startup +-readconfig <file> +-writeconfig <file> + read/write config file +-no-kvm disable KVM hardware virtualization +-no-kvm-irqchip disable KVM kernel mode PIC/IOAPIC/LAPIC +-no-kvm-pit disable KVM kernel mode PIT +-no-kvm-pit-reinjection disable KVM kernel mode PIT interrupt reinjection +-pcidevice host=bus:dev.func[,dma=none][,name=string] + expose a PCI device to the guest OS. + dma=none: don't perform any dma translations (default is to use an iommu) + 'string' is used in log output. +-nvram FILE provide ia64 nvram contents +-tdf enable guest time drift compensation +-kvm-shadow-memory MEGABYTES + allocate MEGABYTES for kvm mmu shadowing +-mem-path FILE provide backing storage for guest RAM +-mem-prealloc preallocate guest memory (use with -mempath) +-redhat-disable-KSM disable KSM on guest physical memory + +During emulation, the following keys are useful: +ctrl-alt-f toggle full screen +ctrl-alt-n switch to virtual console 'n' +ctrl-alt toggle mouse and keyboard grab + +When using -nographic, press 'ctrl-a h' to get some help. + +WARNING: Direct use of qemu-kvm from the command line is not recommended by Red Hat. +WARNING: Some command line options listed here may not be available in future releases. +WARNING: Red Hat recommends the use of libvirt as the stable management interface. + diff --git a/tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta-device b/tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta-device new file mode 100644 index 0000000..ee0fd78 --- /dev/null +++ b/tests/qemuhelpdata/qemu-kvm-0.12.1.2-rhel62-beta-device @@ -0,0 +1,120 @@ +name "pci-bridge", bus PCI +name "virtio-balloon-pci", bus PCI +name "virtio-serial-pci", bus PCI, alias "virtio-serial" +name "virtio-net-pci", bus PCI +name "virtio-blk-pci", bus PCI, alias "virtio-blk" +name "i82562", bus PCI +name "i82559er", bus PCI +name "i82559c", bus PCI +name "i82559b", bus PCI +name "i82559a", bus PCI +name "i82558b", bus PCI +name "i82558a", bus PCI +name "i82557c", bus PCI +name "i82557b", bus PCI +name "i82557a", bus PCI +name "i82551", bus PCI +name "i82550", bus PCI +name "pcnet", bus PCI +name "rtl8139", bus PCI +name "e1000", bus PCI, desc "Intel Gigabit Ethernet" +name "ide-drive", bus IDE +name "isa-ide", bus ISA +name "ES1370", bus PCI, desc "ENSONIQ AudioPCI ES1370" +name "AC97", bus PCI, desc "Intel 82801AA AC97 Audio" +name "intel-hda", bus PCI, desc "Intel HD Audio Controller" +name "hda-duplex", bus HDA, desc "HDA Audio Codec, duplex" +name "hda-output", bus HDA, desc "HDA Audio Codec, output-only" +name "VGA", bus PCI +name "SUNW,fdtwo", bus System +name "sysbus-fdc", bus System +name "isa-serial", bus ISA +name "cirrus-vga", bus PCI, desc "Cirrus CLGD 54xx VGA" +name "isa-parallel", bus ISA +name "sga", bus ISA, desc "Serial Graphics Adapter" +name "ich9-usb-uhci3", bus PCI +name "ich9-usb-uhci2", bus PCI +name "ich9-usb-uhci1", bus PCI +name "piix4-usb-uhci", bus PCI +name "piix3-usb-uhci", bus PCI +name "ib700", bus ISA +name "ne2k_isa", bus ISA +name "testdev", bus ISA +name "pci-assign", bus PCI, desc "pass through host pci devices to the guest" +name "qxl", bus PCI, desc "Spice QXL GPU (secondary)" +name "qxl-vga", bus PCI, desc "Spice QXL GPU (primary, vga compatible)" +name "smbus-eeprom", bus I2C +name "usb-hub", bus USB +name "usb-host", bus USB +name "usb-kbd", bus USB +name "usb-mouse", bus USB +name "usb-tablet", bus USB +name "usb-storage", bus USB +name "scsi-disk", bus SCSI, desc "virtual SCSI disk or CD-ROM (legacy)" +name "scsi-cd", bus SCSI, desc "virtual SCSI CD-ROM" +name "scsi-hd", bus SCSI, desc "virtual SCSI disk" +name "usb-ccid", bus USB, desc "CCID Rev 1.1 smartcard reader" +name "ccid-card-passthru", bus ccid-bus, desc "passthrough smartcard" +name "virtserialport", bus virtio-serial-bus +name "virtconsole", bus virtio-serial-bus +name "ich9-usb-ehci1", bus PCI +name "usb-ehci", bus PCI +name "i6300esb", bus PCI +name "ne2k_pci", bus PCI +pci-assign.host=pci-hostaddr +pci-assign.iommu=uint32 +pci-assign.bootindex=int32 +pci-assign.configfd=string +pci-assign.addr=pci-devfn +pci-assign.romfile=string +pci-assign.rombar=uint32 +pci-assign.multifunction=on/off +virtio-blk-pci.class=hex32 +virtio-blk-pci.drive=drive +virtio-blk-pci.logical_block_size=uint16 +virtio-blk-pci.physical_block_size=uint16 +virtio-blk-pci.min_io_size=uint16 +virtio-blk-pci.opt_io_size=uint32 +virtio-blk-pci.bootindex=int32 +virtio-blk-pci.discard_granularity=uint32 +virtio-blk-pci.ioeventfd=on/off +virtio-blk-pci.vectors=uint32 +virtio-blk-pci.indirect_desc=on/off +virtio-blk-pci.event_idx=on/off +virtio-blk-pci.scsi=on/off +virtio-blk-pci.addr=pci-devfn +virtio-blk-pci.romfile=string +virtio-blk-pci.rombar=uint32 +virtio-blk-pci.multifunction=on/off +virtio-net-pci.ioeventfd=on/off +virtio-net-pci.vectors=uint32 +virtio-net-pci.indirect_desc=on/off +virtio-net-pci.event_idx=on/off +virtio-net-pci.csum=on/off +virtio-net-pci.guest_csum=on/off +virtio-net-pci.gso=on/off +virtio-net-pci.guest_tso4=on/off +virtio-net-pci.guest_tso6=on/off +virtio-net-pci.guest_ecn=on/off +virtio-net-pci.guest_ufo=on/off +virtio-net-pci.host_tso4=on/off +virtio-net-pci.host_tso6=on/off +virtio-net-pci.host_ecn=on/off +virtio-net-pci.host_ufo=on/off +virtio-net-pci.mrg_rxbuf=on/off +virtio-net-pci.status=on/off +virtio-net-pci.ctrl_vq=on/off +virtio-net-pci.ctrl_rx=on/off +virtio-net-pci.ctrl_vlan=on/off +virtio-net-pci.ctrl_rx_extra=on/off +virtio-net-pci.mac=macaddr +virtio-net-pci.vlan=vlan +virtio-net-pci.netdev=netdev +virtio-net-pci.bootindex=int32 +virtio-net-pci.x-txtimer=uint32 +virtio-net-pci.x-txburst=int32 +virtio-net-pci.tx=string +virtio-net-pci.addr=pci-devfn +virtio-net-pci.romfile=string +virtio-net-pci.rombar=uint32 +virtio-net-pci.multifunction=on/off diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 8a06568..fcee41f 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -507,6 +507,65 @@ mymain(void) QEMU_CAPS_USB_HUB, QEMU_CAPS_NO_SHUTDOWN, QEMU_CAPS_PCI_ROMBAR); + DO_TEST("qemu-kvm-0.12.1.2-rhel62-beta", 12001, 1, 0, + QEMU_CAPS_VNC_COLON, + QEMU_CAPS_NO_REBOOT, + QEMU_CAPS_DRIVE, + QEMU_CAPS_NAME, + QEMU_CAPS_UUID, + QEMU_CAPS_VNET_HDR, + QEMU_CAPS_MIGRATE_QEMU_TCP, + QEMU_CAPS_MIGRATE_QEMU_EXEC, + QEMU_CAPS_DRIVE_CACHE_V2, + QEMU_CAPS_DRIVE_CACHE_UNSAFE, + QEMU_CAPS_KVM, + QEMU_CAPS_DRIVE_FORMAT, + QEMU_CAPS_DRIVE_SERIAL, + QEMU_CAPS_DRIVE_READONLY, + QEMU_CAPS_VGA, + QEMU_CAPS_0_10, + QEMU_CAPS_PCIDEVICE, + QEMU_CAPS_MEM_PATH, + QEMU_CAPS_MIGRATE_QEMU_UNIX, + QEMU_CAPS_CHARDEV, + QEMU_CAPS_ENABLE_KVM, + QEMU_CAPS_BALLOON, + QEMU_CAPS_DEVICE, + QEMU_CAPS_SMP_TOPOLOGY, + QEMU_CAPS_RTC, + QEMU_CAPS_VHOST_NET, + QEMU_CAPS_NO_KVM_PIT, + QEMU_CAPS_TDF, + QEMU_CAPS_PCI_CONFIGFD, + QEMU_CAPS_NODEFCONFIG, + QEMU_CAPS_BOOT_MENU, + QEMU_CAPS_NAME_PROCESS, + QEMU_CAPS_SMBIOS_TYPE, + QEMU_CAPS_VGA_QXL, + QEMU_CAPS_SPICE, + QEMU_CAPS_VGA_NONE, + QEMU_CAPS_MIGRATE_QEMU_FD, + QEMU_CAPS_BOOTINDEX, + QEMU_CAPS_HDA_DUPLEX, + QEMU_CAPS_DRIVE_AIO, + QEMU_CAPS_PCI_BOOTINDEX, + QEMU_CAPS_CCID_PASSTHRU, + QEMU_CAPS_CHARDEV_SPICEVMC, + QEMU_CAPS_DEVICE_QXL_VGA, + QEMU_CAPS_PCI_MULTIFUNCTION, + QEMU_CAPS_VIRTIO_IOEVENTFD, + QEMU_CAPS_SGA, + QEMU_CAPS_VIRTIO_BLK_EVENT_IDX, + QEMU_CAPS_VIRTIO_NET_EVENT_IDX, + QEMU_CAPS_VIRTIO_TX_ALG, + QEMU_CAPS_VIRTIO_IOEVENTFD, + QEMU_CAPS_PIIX3_USB_UHCI, + QEMU_CAPS_PIIX4_USB_UHCI, + QEMU_CAPS_USB_EHCI, + QEMU_CAPS_ICH9_USB_EHCI1, + QEMU_CAPS_USB_HUB, + QEMU_CAPS_NO_SHUTDOWN, + QEMU_CAPS_PCI_ROMBAR); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.7.4.4

3 3

[libvirt] [PATCH] Don't send back unknown program errors for async messages
by Daniel P. Berrange 06 Oct '11

06 Oct '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> If we send back an unknown program error for async messages, we will confuse the client because they only expect replies for method calls. Just log & drop any invalid async messages * src/rpc/virnetserver.c: Don't send error for async messages --- src/rpc/virnetserver.c | 23 +++++++++++++++++++---- src/rpc/virnetserverprogram.c | 13 ++++++++++++- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 9588077..f739743 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -134,10 +134,25 @@ static void virNetServerHandleJob(void *jobOpaque, void *opaque) srv, job->client, job->msg, job->prog); if (!job->prog) { - if (virNetServerProgramUnknownError(job->client, - job->msg, - &job->msg->header) < 0) - goto error; + /* Only send back an error for type == CALL. Other + * message types are not expecting replies, so we + * must just log it & drop them + */ + if (job->msg->header.type == VIR_NET_CALL) { + if (virNetServerProgramUnknownError(job->client, + job->msg, + &job->msg->header) < 0) + goto error; + } else { + VIR_INFO("Dropping client mesage, unknown program %d version %d type %d proc %d", + job->msg->header.prog, job->msg->header.vers, + job->msg->header.type, job->msg->header.proc); + /* Send a dummy reply to free up 'msg' & unblock client rx */ + virNetMessageClear(job->msg); + job->msg->header.type = VIR_NET_REPLY; + if (virNetServerClientSendMessage(job->client, job->msg) < 0) + goto error; + } goto cleanup; } diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index 334a0bf..47b7ded 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -314,7 +314,18 @@ int virNetServerProgramDispatch(virNetServerProgramPtr prog, return ret; error: - ret = virNetServerProgramSendReplyError(prog, client, msg, &rerr, &msg->header); + if (msg->header.type == VIR_NET_CALL) { + ret = virNetServerProgramSendReplyError(prog, client, msg, &rerr, &msg->header); + } else { + /* Send a dummy reply to free up 'msg' & unblock client rx */ + virNetMessageClear(msg); + msg->header.type = VIR_NET_REPLY; + if (virNetServerClientSendMessage(client, msg) < 0) { + ret = -1; + goto cleanup; + } + ret = 0; + } cleanup: return ret; -- 1.7.6.2

2 1

[libvirt] [PATCH] Fix deadlock when the RPC program is unknown
by Daniel P. Berrange 06 Oct '11

06 Oct '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> Commit 597fe3cee68f561a181967b59a87b4e5c5880c4c accidentally introduced a deadlock when reporting an unknown RPC program. The virNetServerDispatchNewMessage method is called with the client locked, and must therefore not attempt to send any RPC messages back to the client. Only once the incoming message is passed off to the virNetServerHandleJob worker is it safe to start sending messages back * src/rpc/virnetserver.c: Delay checking for unknown RPC program until in worker thread --- src/rpc/virnetserver.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index d71ed18..9588077 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -133,6 +133,14 @@ static void virNetServerHandleJob(void *jobOpaque, void *opaque) VIR_DEBUG("server=%p client=%p message=%p prog=%p", srv, job->client, job->msg, job->prog); + if (!job->prog) { + if (virNetServerProgramUnknownError(job->client, + job->msg, + &job->msg->header) < 0) + goto error; + goto cleanup; + } + if (virNetServerProgramDispatch(job->prog, srv, job->client, @@ -142,6 +150,8 @@ static void virNetServerHandleJob(void *jobOpaque, void *opaque) virNetServerLock(srv); virNetServerProgramFree(job->prog); virNetServerUnlock(srv); + +cleanup: virNetServerClientFree(job->client); VIR_FREE(job); return; @@ -184,18 +194,14 @@ static int virNetServerDispatchNewMessage(virNetServerClientPtr client, } } - if (!prog) { - virNetServerProgramUnknownError(client, msg, &msg->header); - goto cleanup; + if (prog) { + virNetServerProgramRef(prog); + job->prog = prog; + priority = virNetServerProgramGetPriority(prog, msg->header.proc); } - virNetServerProgramRef(prog); - job->prog = prog; - priority = virNetServerProgramGetPriority(prog, msg->header.proc); - ret = virThreadPoolSendJob(srv->workers, priority, job); -cleanup: if (ret < 0) { VIR_FREE(job); virNetServerProgramFree(prog); -- 1.7.6.2

2 1

[libvirt] [PATCH v2 00/12] Implement keepalive protocol for libvirt RPC
by Jiri Denemark 06 Oct '11

06 Oct '11

This patchset can also be found at https://gitorious.org/~jirka/libvirt/jirka-staging/commits/keepalive This allows us to detect broken connections between server and client without waiting for TCP timeout and dead deamon/client. By default a connection is considered broken after about 30 seconds of no messages received from remote party. After that period, the connection is automatically closed. The main reason for implementing this is that peer-to-peer migration can now be canceled when a connection between source and target breaks. Although this will really work only after qemu fixes migrate_cancel command so that it doesn't block when outgoing TCP buffers are full. Version 2 adds virConnectIsAlive API and uses it to detect that a connection was closed as a result of keepalive timeout. The only patch that was changed in v2 is "Add keepalive support into domain-events examples". All other patches are either new or without any change from v1. Jiri Denemark (12): Define keepalive protocol Implement common keepalive handling Introduce two public APIs for keepalive protocol Implement keepalive protocol in libvirt daemon Add support for non-blocking calls in client RPC Add support for async close of client RPC socket Implement keepalive protocol in remote driver Introduce virConnectIsAlive API Implement virConnectIsAlive in all drivers Add keepalive support into domain-events examples qemu: Add support for keepalive messages during p2p migration qemu: Cancel p2p migration when connection breaks .gitignore | 1 + daemon/libvirtd.aug | 4 + daemon/libvirtd.c | 11 + daemon/libvirtd.conf | 15 + daemon/remote.c | 38 ++ examples/domain-events/events-c/event-test.c | 13 +- examples/domain-events/events-python/event-test.py | 5 +- include/libvirt/libvirt.h.in | 6 + po/POTFILES.in | 1 + src/Makefile.am | 13 +- src/driver.h | 12 + src/esx/esx_driver.c | 18 + src/hyperv/hyperv_driver.c | 18 + src/libvirt.c | 143 ++++++ src/libvirt_internal.h | 10 +- src/libvirt_public.syms | 7 + src/libxl/libxl_driver.c | 8 + src/lxc/lxc_driver.c | 7 + src/openvz/openvz_driver.c | 7 + src/phyp/phyp_driver.c | 18 + src/qemu/libvirtd_qemu.aug | 2 + src/qemu/qemu.conf | 16 + src/qemu/qemu_conf.c | 11 + src/qemu/qemu_conf.h | 3 + src/qemu/qemu_driver.c | 6 + src/qemu/qemu_migration.c | 49 ++- src/qemu/test_libvirtd_qemu.aug | 6 + src/remote/remote_driver.c | 48 ++ src/remote/remote_protocol.x | 2 +- src/rpc/virkeepalive.c | 464 ++++++++++++++++++++ src/rpc/virkeepalive.h | 58 +++ src/rpc/virkeepaliveprotocol.x | 8 + src/rpc/virnetclient.c | 335 ++++++++++++-- src/rpc/virnetclient.h | 6 + src/rpc/virnetserver.c | 10 + src/rpc/virnetserver.h | 2 + src/rpc/virnetserverclient.c | 126 +++++- src/rpc/virnetserverclient.h | 6 + src/test/test_driver.c | 6 + src/uml/uml_driver.c | 7 + src/vbox/vbox_tmpl.c | 6 + src/vmware/vmware_driver.c | 7 + src/xen/xen_driver.c | 8 + src/xenapi/xenapi_driver.c | 12 + 44 files changed, 1483 insertions(+), 76 deletions(-) create mode 100644 src/rpc/virkeepalive.c create mode 100644 src/rpc/virkeepalive.h create mode 100644 src/rpc/virkeepaliveprotocol.x -- 1.7.6.1

3 20

[libvirt] [PATCH] Make saving domain XML more robust
by Jiri Denemark 06 Oct '11

06 Oct '11

When saving domain XML (either config or status) we just overwrite old content of the file. In case something fails during that process (e.g. disk gets full) we lose both old and new content. This patch makes the process more robust by writing the new content into a separate file and only if that succeeds the original file is atomically replaced with the new one. --- src/conf/domain_conf.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f9007ce..04c2b1c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11025,6 +11025,7 @@ int virDomainSaveXML(const char *configDir, const char *xml) { char *configFile = NULL; + char *newfile = NULL; int fd = -1, ret = -1; size_t towrite; @@ -11038,12 +11039,17 @@ int virDomainSaveXML(const char *configDir, goto cleanup; } - if ((fd = open(configFile, + if (virAsprintf(&newfile, "%s.new", configFile) < 0) { + virReportOOMError(); + goto cleanup; + } + + if ((fd = open(newfile, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR )) < 0) { virReportSystemError(errno, _("cannot create config file '%s'"), - configFile); + newfile); goto cleanup; } @@ -11053,14 +11059,21 @@ int virDomainSaveXML(const char *configDir, if (safewrite(fd, xml, towrite) < 0) { virReportSystemError(errno, _("cannot write config file '%s'"), - configFile); + newfile); goto cleanup; } if (VIR_CLOSE(fd) < 0) { virReportSystemError(errno, _("cannot save config file '%s'"), - configFile); + newfile); + goto cleanup; + } + + if (rename(newfile, configFile) < 0) { + virReportSystemError(errno, + _("cannot rename config file '%s' as '%s'"), + newfile, configFile); goto cleanup; } @@ -11068,6 +11081,10 @@ int virDomainSaveXML(const char *configDir, cleanup: VIR_FORCE_CLOSE(fd); + if (newfile) { + unlink(newfile); + VIR_FREE(newfile); + } VIR_FREE(configFile); return ret; } -- 1.7.7

2 1

[libvirt] [PATCH] init: raise default system aio limits
by Eric Blake 05 Oct '11

05 Oct '11

https://bugzilla.redhat.com/show_bug.cgi?id=740899 documents that if qemu uses aio=native for its disks, then it consumes 128 aio requests per disk. On a host with multiple guests, this can quickly run out of kernel aio requests with the default aio-max-nr of 65536. Kernel developers have confirmed that there is no up-front cost to raising this limit (a larger limit merely implies that more aio requests can be issued in parallel, which in turn will result in more kernel memory allocation if the system really does use that many requests). Since the system default limit prevents 256 disks, which is well within libvirt's current scalability, this patch installs a file to raise the limit and document it in case a system administrator has further cause to tune the limit. The install only works on platforms new enough to source /etc/sysctl.d/* alongside /etc/sysctl.conf (F14 and RHEL 6). * daemon/libvirtd.sysctl: New file. * daemon/Makefile.am (EXTRA_DIST): Ship it. (install-init, uninstall-init): Install it. * libvirt.spec.in (%files): Include it in rpm. --- So far, I've confirmed that this passes 'make distcheck' (well, once https://www.redhat.com/archives/libvir-list/2011-October/msg00074.html is applied) and 'make rpm', although I didn't actually try installing the resulting rpm nor rebooting a system to see if it takes effect. daemon/Makefile.am | 11 ++++++++--- daemon/libvirtd.sysctl | 8 ++++++++ libvirt.spec.in | 5 +++++ 3 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 daemon/libvirtd.sysctl diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 690bf85..1cf2b73 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -38,6 +38,7 @@ EXTRA_DIST = \ libvirtd.policy-1 \ libvirtd.sasl \ libvirtd.sysconf \ + libvirtd.sysctl \ libvirtd.aug \ libvirtd.logrotate.in \ libvirtd.qemu.logrotate.in \ @@ -252,16 +253,20 @@ install-logrotate: $(LOGROTATE_CONFS) if LIBVIRT_INIT_SCRIPT_RED_HAT install-init: libvirtd.init - mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d + mkdir -p $(DESTDIR)$(sysconfdir)/rc.d/init.d \ + $(DESTDIR)$(sysconfdir)/sysconfig \ + $(DESTDIR)$(sysconfdir)/sysctl.d $(INSTALL_SCRIPT) libvirtd.init \ $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd - mkdir -p $(DESTDIR)$(sysconfdir)/sysconfig $(INSTALL_DATA) $(srcdir)/libvirtd.sysconf \ $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd + $(INSTALL_DATA) $(srcdir)/libvirtd.sysctl \ + $(DESTDIR)$(sysconfdir)/sysctl.d/libvirtd uninstall-init: rm -f $(DESTDIR)$(sysconfdir)/rc.d/init.d/libvirtd \ - $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd + $(DESTDIR)$(sysconfdir)/sysconfig/libvirtd \ + $(DESTDIR)$(sysconfdir)/sysctl.d/libvirtd BUILT_SOURCES += libvirtd.init diff --git a/daemon/libvirtd.sysctl b/daemon/libvirtd.sysctl new file mode 100644 index 0000000..3c70884 --- /dev/null +++ b/daemon/libvirtd.sysctl @@ -0,0 +1,8 @@ +# The kernel allocates aio memory on demand, and this number limits the +# number of parallel aio requests; the only drawback of a larger limit is +# that a malicious guest could issue parallel requests to cause the kernel +# to set aside memory. Set this number at least as large as +# 128 * (number of virtual disks on the host) +# Libvirt uses a default of 1M requests to allow 8k disks, with at most +# 64M of kernel memory if all disks hit an aio request at the same time. +fs.aio-max-size = 1048576 diff --git a/libvirt.spec.in b/libvirt.spec.in index b87e3f6..9f5797a 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -962,6 +962,11 @@ fi %doc daemon/libvirtd.upstart %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf +%if 0%{?fedora} >= 14 || 0%{?rhel} >= 6 +%config(noreplace) %{_sysconfdir}/sysctl.d/libvirtd +%else +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysctl.d/libvirtd +%endif %if %{with_dtrace} %{_datadir}/systemtap/tapset/libvirtd.stp %endif -- 1.7.4.4

2 2

[libvirt] [PATCH] maint: fix minor issues in virterror public header
by Eric Blake 05 Oct '11

05 Oct '11

Consistent use of tabs, fewer long lines, and a typo fix. * include/libvirt/virterror.h: Fix typos, layout. --- Pushing under the trivial rule. include/libvirt/virterror.h | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index 0c98014..dfbe2bc 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -66,7 +66,8 @@ typedef enum { VIR_FROM_SECURITY = 24, /* Error from security framework */ VIR_FROM_VBOX = 25, /* Error from VirtualBox driver */ VIR_FROM_INTERFACE = 26, /* Error when operating on an interface */ - VIR_FROM_ONE = 27, /* The OpenNebula driver no longer exists. Retained for ABI/API compat only */ + VIR_FROM_ONE = 27, /* The OpenNebula driver no longer exists. + Retained for ABI/API compat only */ VIR_FROM_ESX = 28, /* Error from ESX driver */ VIR_FROM_PHYP = 29, /* Error from IBM power hypervisor */ VIR_FROM_SECRET = 30, /* Error from secret storage */ @@ -79,10 +80,10 @@ typedef enum { VIR_FROM_SYSINFO = 37, /* Error from sysinfo/SMBIOS */ VIR_FROM_STREAMS = 38, /* Error from I/O streams */ VIR_FROM_VMWARE = 39, /* Error from VMware driver */ - VIR_FROM_EVENT = 40, /* Error from event loop impl */ + VIR_FROM_EVENT = 40, /* Error from event loop impl */ VIR_FROM_LIBXL = 41, /* Error from libxenlight driver */ - VIR_FROM_LOCKING = 42, /* Error from lock manager */ - VIR_FROM_HYPERV = 43, /* Error from Hyper-V driver */ + VIR_FROM_LOCKING = 42, /* Error from lock manager */ + VIR_FROM_HYPERV = 43, /* Error from Hyper-V driver */ } virErrorDomain; @@ -232,12 +233,12 @@ typedef enum { VIR_ERR_HOOK_SCRIPT_FAILED = 70, /* a synchronous hook script failed */ VIR_ERR_INVALID_DOMAIN_SNAPSHOT = 71,/* invalid domain snapshot */ VIR_ERR_NO_DOMAIN_SNAPSHOT = 72, /* domain snapshot not found */ - VIR_ERR_INVALID_STREAM = 73, /* stream pointer not valid */ - VIR_ERR_ARGUMENT_UNSUPPORTED = 74, /* valid API use but unsupported by + VIR_ERR_INVALID_STREAM = 73, /* stream pointer not valid */ + VIR_ERR_ARGUMENT_UNSUPPORTED = 74, /* valid API use but unsupported by the given driver */ - VIR_ERR_STORAGE_PROBE_FAILED = 75, /* storage pool proble failed */ - VIR_ERR_STORAGE_POOL_BUILT = 76, /* storage pool already built */ - VIR_ERR_SNAPSHOT_REVERT_RISKY = 77, /* force was not requested for a + VIR_ERR_STORAGE_PROBE_FAILED = 75, /* storage pool probe failed */ + VIR_ERR_STORAGE_POOL_BUILT = 76, /* storage pool already built */ + VIR_ERR_SNAPSHOT_REVERT_RISKY = 77, /* force was not requested for a risky domain snapshot revert */ } virErrorNumber; -- 1.7.4.4

1 0

[libvirt] [RFC PATCHv2 0/9] DHCP snooping support for libvirt.
by David L Stevens 05 Oct '11

05 Oct '11

This series of patches adds DHCP snooping support to libvirt. This version saves leases on disk for restoration after a libvirtd restart and allows selection of different ip_learning methods by setting filter parameter "ip_learning" to one of "any" (existing IP learning code) "none" (static only addresses) or "DHCP" (DHCP Snooping). This code does not (yet) support passing lease information across a migration. A migrated guest requires a DHCP ACK (e.g., via ifdown/ifup on the guest) to send/receive traffic for DHCP-learned addresses after a migration. David L Stevens (9): support continue/return allow required ARP packets reverse sense of address matching make default chain policy "DROP" allow chain modification support addRules support variable value changing add DHCP snooping add leasefile support examples/xml/nwfilter/Makefile.am | 5 +- examples/xml/nwfilter/allow-arp.xml | 5 +- examples/xml/nwfilter/allow-arpip.xml | 3 + examples/xml/nwfilter/allow-arpmac.xml | 3 + examples/xml/nwfilter/clean-traffic.xml | 6 +- examples/xml/nwfilter/no-arp-spoofing.xml | 38 +- examples/xml/nwfilter/no-arpip-spoofing.xml | 10 + examples/xml/nwfilter/no-arpmac-spoofing.xml | 5 + examples/xml/nwfilter/no-ip-spoofing.xml | 9 +- examples/xml/nwfilter/no-mac-spoofing.xml | 10 +- examples/xml/nwfilter/no-other-l2-traffic.xml | 13 +- examples/xml/nwfilter/no-other-rarp-traffic.xml | 3 - examples/xml/nwfilter/qemu-announce-self.xml | 1 - src/Makefile.am | 2 + src/conf/nwfilter_conf.c | 12 +- src/conf/nwfilter_conf.h | 16 +- src/nwfilter/nwfilter_dhcpsnoop.c | 938 +++++++++++++++++++++++ src/nwfilter/nwfilter_dhcpsnoop.h | 36 + src/nwfilter/nwfilter_driver.c | 5 + src/nwfilter/nwfilter_ebiptables_driver.c | 225 +++++-- src/nwfilter/nwfilter_gentech_driver.c | 199 ++++- src/nwfilter/nwfilter_gentech_driver.h | 11 + 22 files changed, 1419 insertions(+), 136 deletions(-) create mode 100644 examples/xml/nwfilter/allow-arpip.xml create mode 100644 examples/xml/nwfilter/allow-arpmac.xml create mode 100644 examples/xml/nwfilter/no-arpip-spoofing.xml create mode 100644 examples/xml/nwfilter/no-arpmac-spoofing.xml delete mode 100644 examples/xml/nwfilter/no-other-rarp-traffic.xml create mode 100644 src/nwfilter/nwfilter_dhcpsnoop.c create mode 100644 src/nwfilter/nwfilter_dhcpsnoop.h -- 1.7.6.4

3 15

[libvirt] [PATCH 0/2] snapshot: add force for risky reverts
by Eric Blake 05 Oct '11

05 Oct '11

I first documented the need for force back in my RFC: https://www.redhat.com/archives/libvir-list/2011-August/msg00361.html but only now got around to implementing it. At the moment, I'm posting the code for early review. I'm still in the process of testing out multiple scenarios, and will send followup mail detailing the actual steps I took using virsh to cover the multiple scenarios. Eric Blake (2): snapshot: add REVERT_FORCE to API snapshot: enforce REVERT_FORCE on qemu include/libvirt/libvirt.h.in | 1 + include/libvirt/virterror.h | 2 + src/libvirt.c | 22 +++++++++++++++++++ src/qemu/qemu_driver.c | 47 +++++++++++++++++++++++++++++++++--------- src/util/virterror.c | 6 +++++ tools/virsh.c | 19 ++++++++++++++++- tools/virsh.pod | 17 +++++++++++++++ 7 files changed, 103 insertions(+), 11 deletions(-) -- 1.7.4.4

2 11

[libvirt] [PATCH] qemu: Don't fail virDomainGetInfo if we can't update balloon info
by Jiri Denemark 05 Oct '11

05 Oct '11

Qemu driver tries to update balloon data in virDomainGetInfo and if it can't do so because there is another monitor job running, it just reports what's known in domain def. However, if there was no job running but getting the data from qemu fails, we would fail the whole API. This doesn't make sense. Let's make the failure nonfatal. --- src/qemu/qemu_driver.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index dc34e1d..276dc06 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2071,37 +2071,42 @@ static int qemudDomainGetInfo(virDomainPtr dom, } else if (qemuDomainJobAllowed(priv, QEMU_JOB_QUERY)) { if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0) goto cleanup; if (!virDomainObjIsActive(vm)) err = 0; else { qemuDomainObjEnterMonitor(driver, vm); err = qemuMonitorGetBalloonInfo(priv->mon, &balloon); qemuDomainObjExitMonitor(driver, vm); } if (qemuDomainObjEndJob(driver, vm) == 0) { vm = NULL; goto cleanup; } - if (err < 0) - goto cleanup; - if (err == 0) + if (err < 0) { + /* We couldn't get current memory allocation but that's not + * a show stopper; we wouldn't get it if there was a job + * active either + */ + info->memory = vm->def->mem.cur_balloon; + } else if (err == 0) { /* Balloon not supported, so maxmem is always the allocation */ info->memory = vm->def->mem.max_balloon; - else + } else { info->memory = balloon; + } } else { info->memory = vm->def->mem.cur_balloon; } } else { info->memory = vm->def->mem.cur_balloon; } info->nrVirtCpu = vm->def->vcpus; ret = 0; cleanup: if (vm) virDomainObjUnlock(vm); return ret; } -- 1.7.7

2 2

[libvirt] [RFC] security_dac: don't chown iso file
by Serge E. Hallyn 05 Oct '11

05 Oct '11

isos are read-only, so libvirt doesn't need to chown them. In one of our testing setups, libvirt uses mirrorred isos. Since libvirt chowns the files, (and especially does not chown them back) the mirror refuses to update the iso. This patch prevents libvirt from chowning files. Does this seem reasonable? Signed-off-by: Serge Hallyn <serge.hallyn(a)canonical.com> --- src/security/security_dac.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/security/security_dac.c b/src/security/security_dac.c index af02236..e7db324 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -555,6 +555,8 @@ virSecurityDACSetSecurityAllLabel(virSecurityManagerPtr mgr, /* XXX fixme - we need to recursively label the entire tree :-( */ if (vm->def->disks[i]->type == VIR_DOMAIN_DISK_TYPE_DIR) continue; + if (vm->def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_CDROM) + continue; if (virSecurityDACSetSecurityImageLabel(mgr, vm, vm->def->disks[i]) < 0) -- 1.7.5.4

4 5

[libvirt] [PATCH] qemu: Fix migration with dname
by Jiri Denemark 05 Oct '11

05 Oct '11

Destination libvirtd remembers the original name in the prepare phase and clears it in the finish phase. The original name is used when comparing domain name in migration cookie. --- Notes: Originally, I wanted to transfer the new name in migration cookie but that appeared to be much more complicated and it would require adding new Confirm API since the current version does not have 'dname' parameter. src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 1 + src/qemu/qemu_migration.c | 19 ++++++++++++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d3ad192..65f721a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -231,6 +231,7 @@ static void qemuDomainObjPrivateFree(void *data) qemuDomainObjFreeJob(priv); VIR_FREE(priv->vcpupids); VIR_FREE(priv->lockState); + VIR_FREE(priv->origname); /* This should never be non-NULL if we get here, but just in case... */ if (priv->mon) { diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index cdf1375..d9f323c 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -126,6 +126,7 @@ struct _qemuDomainObjPrivate { int jobs_queued; unsigned long migMaxBandwidth; + char *origname; }; struct qemuDomainWatchdogEvent diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 1122dab..4516231 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -254,12 +254,18 @@ error: static qemuMigrationCookiePtr qemuMigrationCookieNew(virDomainObjPtr dom) { + qemuDomainObjPrivatePtr priv = dom->privateData; qemuMigrationCookiePtr mig = NULL; + const char *name; if (VIR_ALLOC(mig) < 0) goto no_memory; - if (!(mig->name = strdup(dom->def->name))) + if (priv->origname) + name = priv->origname; + else + name = dom->def->name; + if (!(mig->name = strdup(name))) goto no_memory; memcpy(mig->uuid, dom->def->uuid, VIR_UUID_BUFLEN); @@ -1064,6 +1070,7 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, unsigned long long now; qemuMigrationCookiePtr mig = NULL; bool tunnel = !!st; + char *origname = NULL; if (virTimeMs(&now) < 0) return -1; @@ -1078,7 +1085,7 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, /* Target domain name, maybe renamed. */ if (dname) { - VIR_FREE(def->name); + origname = def->name; def->name = strdup(dname); if (def->name == NULL) goto cleanup; @@ -1095,6 +1102,8 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, } def = NULL; priv = vm->privateData; + priv->origname = origname; + origname = NULL; if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, QEMU_MIGRATION_COOKIE_LOCKSTATE))) @@ -1175,6 +1184,7 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, ret = 0; cleanup: + VIR_FREE(origname); virDomainDefFree(def); VIR_FORCE_CLOSE(dataFD[0]); VIR_FORCE_CLOSE(dataFD[1]); @@ -2542,6 +2552,7 @@ qemuMigrationFinish(struct qemud_driver *driver, qemuMigrationCookiePtr mig = NULL; virErrorPtr orig_err = NULL; int cookie_flags = 0; + qemuDomainObjPrivatePtr priv = vm->privateData; VIR_DEBUG("driver=%p, dconn=%p, vm=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, flags=%lx, retcode=%d", @@ -2695,8 +2706,10 @@ endjob: } cleanup: - if (vm) + if (vm) { + VIR_FREE(priv->origname); virDomainObjUnlock(vm); + } if (event) qemuDomainEventQueue(driver, event); qemuMigrationCookieFree(mig); -- 1.7.7

3 6

[libvirt] "Connection does not support host device enumeration"
by Kaushal Shriyan 05 Oct '11

05 Oct '11

Hi, I have "20:04.0 Network controller: Sangoma Technologies Corp. A104d QUAD T1/E1 AFT card" on Host OS, Its not visible on guest OS using linux KVM application. I did open the window for guest from virt-manager on my Ubuntu Linux Desktop 11.04, shut down the guest, then select the "Details" view from the menu on that window, and click "Add Hardware" at the bottom, select "PCI Host Device" in the selections on the left, and find your device in the list of host devices on the right. Then click "Finish". Finally, start your guest up again, and the device should appear. I get "Connection does not support host device enumeration" Any clue ? libvirt-0.8.2-22.el5 version running on CentOS Linux Server version 5.6 Please let me know if you need any additional information Regards, Kaushal

3 10

[libvirt] [RFC PATCH] snapshot: better virsh handling of missing current, parent
by Eric Blake 04 Oct '11

04 Oct '11

Previously, virsh 'snapshot-parent' and 'snapshot-current' were completely silent in the case where the code conclusively proved there was no parent or current snapshot, but differed in exit status; this silence caused some confusion on whether the commands worked. Furthermore, commit d1be48f introduced a regression where snapshot-parent would leak output about an unknown function, but only on the first attempt, when talking to an older server that lacks virDomainSnapshotGetParent. This changes things to consistenly report an error message and exit with status 1 when no snapshot exists, and to avoid leaking unknown function warnings when using fallbacks. * tools/virsh.c (vshGetSnapshotParent): Alter signature, to distinguish between real error and missing parent. Don't pollute last_error on success. (cmdSnapshotParent): Adjust caller. Always output message on failure. (vshGetSnapshotParent): Adjust caller. (cmdSnapshotCurrent): Always output message on failure. --- This patch is an RFC because of backwards-compatibility concerns: Currently, snapshot-current outputs nothing but has status 0 if there is no current snapshot; but snapshot-parent outputs nothing but has status 1 if there is no parent snapshot. Either way, we have an inconsistency that needs to be fixed, and gaining consistency means breaking backwards compatibility with at least one command. Approach 1 (this patch): change snapshot-parent and snapshot-current to always output something, whether to stdout on success or to stderr on failure, with lack of a snapshot being considered a failure (where snapshot-current used to treat it as success). Approach 2 (not written) since snapshot-current existed much longer, makesnapshot-parent consistent by giving status 0 when it is silent. Preferences? (I guess mine is approach 1, by evidence of this patch). tools/virsh.c | 54 +++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 39 insertions(+), 15 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 1909dce..179cda5 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -12945,6 +12945,7 @@ cmdSnapshotCurrent(vshControl *ctl, const vshCmd *cmd) char *xml = NULL; const char *snapshotname = NULL; unsigned int flags = 0; + const char *domname; if (vshCommandOptBool(cmd, "security-info")) flags |= VIR_DOMAIN_XML_SECURE; @@ -12952,7 +12953,7 @@ cmdSnapshotCurrent(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn)) goto cleanup; - dom = vshCommandOptDomain(ctl, cmd, NULL); + dom = vshCommandOptDomain(ctl, cmd, &domname); if (dom == NULL) goto cleanup; @@ -12986,9 +12987,12 @@ cmdSnapshotCurrent(vshControl *ctl, const vshCmd *cmd) } current = virDomainHasCurrentSnapshot(dom, 0); - if (current < 0) + if (current < 0) { + goto cleanup; + } else if (!current) { + vshError(ctl, _("domain '%s' has no current snapshot"), domname); goto cleanup; - else if (current) { + } else { const char *name = NULL; if (!(snapshot = virDomainSnapshotCurrent(dom, 0))) @@ -13010,6 +13014,8 @@ cmdSnapshotCurrent(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: + if (!ret) + virshReportError(ctl); VIR_FREE(xml); if (snapshot) virDomainSnapshotFree(snapshot); @@ -13020,26 +13026,33 @@ cleanup: } /* Helper function to get the name of a snapshot's parent. Caller - * must free the result. */ -static char * -vshGetSnapshotParent(vshControl *ctl, virDomainSnapshotPtr snapshot) + * must free the result. Returns 0 on success (including when it was + * proven no parent exists), and -1 on failure with error reported + * (such as no snapshot support or domain deleted in meantime). */ +static int +vshGetSnapshotParent(vshControl *ctl, virDomainSnapshotPtr snapshot, + char **parent_name) { virDomainSnapshotPtr parent = NULL; char *xml = NULL; xmlDocPtr xmldoc = NULL; xmlXPathContextPtr ctxt = NULL; - char *parent_name = NULL; + int ret = -1; + + *parent_name = NULL; /* Try new API, since it is faster. */ if (!ctl->useSnapshotGetXML) { parent = virDomainSnapshotGetParent(snapshot, 0); if (parent) { - /* API works, and virDomainSnapshotGetName will succeed */ - parent_name = vshStrdup(ctl, virDomainSnapshotGetName(parent)); + /* API works, and virDomainSnapshotGetName will be accurate */ + *parent_name = vshStrdup(ctl, virDomainSnapshotGetName(parent)); + ret = 0; goto cleanup; } if (last_error->code == VIR_ERR_NO_DOMAIN_SNAPSHOT) { /* API works, and we found a root with no parent */ + ret = 0; goto cleanup; } /* API didn't work, fall back to XML scraping. */ @@ -13054,15 +13067,23 @@ vshGetSnapshotParent(vshControl *ctl, virDomainSnapshotPtr snapshot) if (!xmldoc) goto cleanup; - parent_name = virXPathString("string(/domainsnapshot/parent/name)", ctxt); + *parent_name = virXPathString("string(/domainsnapshot/parent/name)", ctxt); + ret = 0; cleanup: + if (ret < 0) { + virshReportError(ctl); + vshError(ctl, "%s", _("unable to determine if snapshot has parent")); + } else { + virFreeError(last_error); + last_error = NULL; + } if (parent) virDomainSnapshotFree(parent); xmlXPathFreeContext(ctxt); xmlFreeDoc(xmldoc); VIR_FREE(xml); - return parent_name; + return ret; } /* @@ -13187,13 +13208,13 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) if (snapshot) virDomainSnapshotFree(snapshot); snapshot = virDomainSnapshotLookupByName(dom, names[i], 0); - if (!snapshot) { + if (!snapshot || + vshGetSnapshotParent(ctl, snapshot, &parents[i]) < 0) { while (--i >= 0) VIR_FREE(parents[i]); VIR_FREE(parents); goto cleanup; } - parents[i] = vshGetSnapshotParent(ctl, snapshot); } for (i = 0 ; i < actual ; i++) { memset(indentBuf, '\0', sizeof indentBuf); @@ -13389,9 +13410,12 @@ cmdSnapshotParent(vshControl *ctl, const vshCmd *cmd) if (snapshot == NULL) goto cleanup; - parent = vshGetSnapshotParent(ctl, snapshot); - if (!parent) + if (vshGetSnapshotParent(ctl, snapshot, &parent) < 0) goto cleanup; + if (!parent) { + vshError(ctl, _("snapshot '%s' has no parent"), name); + goto cleanup; + } vshPrint(ctl, "%s", parent); -- 1.7.4.4

2 2

[libvirt] Deadlock when using custom handlers
by Guido Günther 04 Oct '11

04 Oct '11

Hi, virt-viewer is using it's own virEventRegisterImpl. With current libvirt this can deadlock when connection to nonexistant URIs like qemu+ssh:///unknownhost.example.com/system like: 23:47:00.338: 1526: debug : doRemoteOpen:503 : proceeding with name = qemu:///system 23:47:00.338: 1526: debug : doRemoteOpen:513 : Connecting with transport 2 23:47:00.338: 1526: debug : virCommandRunAsync:2042 : About to run LC_ALL=C LD_LIBRARY_PATH=/var/scratch/debian/libvirt/upstream/libvirt/src/.libs/ PATH=/usr/local/bin:/usr/bin:/bin:/usr/games:/home/agx/bin:/sbin:/usr/sbin:/usr/lib/git-core HOME=/home/agx USER=agx LOGNAME=agx SSH_AUTH_SOCK=/tmp/keyring-RNvlnT/ssh DISPLAY=:0 ssh pustekiste nc -U /var/run/libvirt/libvirt-sock-ro 23:47:00.339: 1526: debug : virCommandRunAsync:2058 : Command result 0, with PID 1527 23:47:00.339: 1526: debug : virNetSocketNew:115 : localAddr=(nil) remoteAddr=(nil) fd=6 errfd=8 pid=1527 23:47:00.339: 1526: debug : virNetSocketNew:173 : sock=0x8926d20 localAddrStr=(null) remoteAddrStr=(null) ** (virt-viewer:1526): DEBUG: Add handle 6 1 0x8926d20 23:47:00.339: 1526: debug : virNetClientNew:160 : client=0xb5b5f008 refs=2 23:47:00.339: 1526: debug : doRemoteOpen:640 : Trying authentication 23:47:00.339: 1526: debug : virNetMessageNew:44 : msg=0xb5b1e008 23:47:00.340: 1526: debug : virNetMessageEncodePayload:255 : Encode length as 28 23:47:00.340: 1526: debug : virNetClientIO:1035 : program=536903814 version=1 serial=0 proc=66 type=0 length=28 dispatch=(nil) 23:47:00.340: 1526: debug : virNetClientIO:1103 : We have the buck 0x8939940 0x8939940 23:47:00.350: 1526: debug : virNetClientIOEventLoop:979 : Giving up the buck due to I/O error 0x8939940 (nil) 23:47:00.350: 1526: debug : virNetClientIO:1130 : All done with our call (nil) 0x8939940 -1 23:47:00.350: 1526: debug : virNetMessageFree:57 : msg=0xb5b1e008 ** (virt-viewer:1526): DEBUG: Remove handle 1 6 <deadlock> Gdb displays the deadlock nicely: #0 0xb7710424 in __kernel_vsyscall () #1 0xb692cf02 in __lll_lock_wait () at ../nptl/sysdeps/unix/sysv/linux/i386/i686/../i486/lowlevellock.S:142 #2 0xb692839b in _L_lock_728 () from /lib/i386-linux-gnu/i686/cmov/libpthread.so.0 #3 0xb69281c1 in __pthread_mutex_lock (mutex=0x95e1c30) at pthread_mutex_lock.c:61 #4 0xb698fd07 in virMutexLock (m=0x95e1c30) at util/threads-pthread.c:85 #5 0xb6a5dd56 in virNetSocketEventFree (opaque=0x95e1c30) at rpc/virnetsocket.c:1147 #6 0x080514a1 in virt_viewer_events_remove_handle (watch=1) at virt-viewer-events.c:178 #7 0xb697264e in virEventRemoveHandle (watch=1) at util/event.c:84 #8 0xb6a608ed in virNetSocketRemoveIOCallback (sock=0x95e1c30) at rpc/virnetsocket.c:1221 #9 0xb6a57114 in virNetClientClose (client=0xb5b7e008) at rpc/virnetclient.c:280 #10 0xb6a46fc4 in doRemoteOpen (conn=0x95e1aa8, priv=0x95b1370, auth=0xbfc3b178, flags=1) at remote/remote_driver.c:705 #11 0xb6a49612 in remoteOpen (conn=0x95e1aa8, auth=0xbfc3b178, flags=1) at remote/remote_driver.c:820 #12 0xb69f70c6 in do_open (name=0x95aac10 "qemu+ssh://pustekiste:2222/system", auth=0xbfc3b178, flags=1) at libvirt.c:1054 #13 0xb69f9b88 in virConnectOpenAuth (name=0x95aac10 "qemu+ssh://pustekiste:2222/system", auth=0xbfc3b178, flags=1) at libvirt.c:1280 #14 0x080500cf in virt_viewer_start (app=0x95a1010) at virt-viewer.c:483 #15 0x08053be8 in virt_viewer_app_start (self=0x95a1010) at virt-viewer-app.c:1044 #16 0x0804f54d in main (argc=1, argv=0xbfc3b3f4) at virt-viewer-main.c:120 which is the sock->lock: virNetSocketRemoveIOCallback holds sock->lock -> virEventRemoveHandle -> impl_remove_handle -> opaque->ff -> virNetSocketEventFree want to hold sock->lock Working around this by removing the locks from virNetSocketRemoveIOCallback leads to another deadlock: #0 0xb77de424 in __kernel_vsyscall () #1 0xb69faf02 in __lll_lock_wait () at ../nptl/sysdeps/unix/sysv/linux/i386/i686/../i486/lowlevellock.S:142 #2 0xb69f639b in _L_lock_728 () from /lib/i386-linux-gnu/i686/cmov/libpthread.so.0 #3 0xb69f61c1 in __pthread_mutex_lock (mutex=0xb5c4c00c) at pthread_mutex_lock.c:61 #4 0xb6a5dd07 in virMutexLock (m=0xb5c4c00c) at util/threads-pthread.c:85 #5 0xb6b24a98 in virNetClientLock (client=0xb5c4c008) at rpc/virnetclient.c:99 #6 virNetClientFree (client=0xb5c4c008) at rpc/virnetclient.c:243 #7 0xb6b250b7 in virNetClientEventFree (opaque=0xb5c4c008) at rpc/virnetclient.c:117 #8 0xb6b2bd82 in virNetSocketEventFree (opaque=0x8aabc30) at rpc/virnetsocket.c:1156 #9 0x080514a1 in virt_viewer_events_remove_handle (watch=1) at virt-viewer-events.c:178 #10 0xb6a4064e in virEventRemoveHandle (watch=1) at util/event.c:84 #11 0xb6b2e8e5 in virNetSocketRemoveIOCallback (sock=0x8aabc30) at rpc/virnetsocket.c:1219 #12 0xb6b25114 in virNetClientClose (client=0xb5c4c008) at rpc/virnetclient.c:280 #13 0xb6b14fc4 in doRemoteOpen (conn=0x8aabaa8, priv=0x8a7b370, auth=0xbfbf1798, flags=1) at remote/remote_driver.c:705 #14 0xb6b17612 in remoteOpen (conn=0x8aabaa8, auth=0xbfbf1798, flags=1) at remote/remote_driver.c:820 #15 0xb6ac50c6 in do_open (name=0x8a74c10 "qemu+ssh://pustekiste:2222/system", auth=0xbfbf1798, flags=1) at libvirt.c:1054 #16 0xb6ac7b88 in virConnectOpenAuth (name=0x8a74c10 "qemu+ssh://pustekiste:2222/system", auth=0xbfbf1798, flags=1) at libvirt.c:1280 #17 0x080500cf in virt_viewer_start (app=0x8a6b010) at virt-viewer.c:483 #18 0x08053be8 in virt_viewer_app_start (self=0x8a6b010) at virt-viewer-app.c:1044 #19 0x0804f54d in main (argc=1, argv=0xbfbf1a14) at virt-viewer-main.c:120 which is the virNetClient lock: virNetClientClose holds client->lock -> virNetSocketRemoveIOCallback -> virEventRemoveHandle -> impl_remove_handle -> virNetSocketEventFree -> virNetClientEventFree wants the lock I didn't see a simple way to fix this but would welcome any suggestions. Cheers, -- Guido

2 6

[libvirt] [PATCH] Make LXC work with new network configuration types
by Daniel P. Berrange 04 Oct '11

04 Oct '11

From: "Daniel P. Berrange" <berrange(a)redhat.com> If using one of the new non-NAT/routed virtual network configurations, the LXC driver would not know how to setup the VETH devices. Adding in calls to setup the "actual" network configuration at VM startup and cleanup when shutting down fixes this. * src/lxc/lxc_driver.c: Setup/cleanup actual net devs --- src/lxc/lxc_driver.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index c8e6119..c475887 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -54,6 +54,7 @@ #include "fdstream.h" #include "domain_audit.h" #include "domain_nwfilter.h" +#include "network/bridge_driver.h" #define VIR_FROM_THIS VIR_FROM_LXC @@ -1042,6 +1043,8 @@ static void lxcVmCleanup(lxc_driver_t *driver, for (i = 0 ; i < vm->def->nnets ; i++) { vethInterfaceUpOrDown(vm->def->nets[i]->ifname, 0); vethDelete(vm->def->nets[i]->ifname); + + networkReleaseActualDevice(vm->def->nets[i]); } virDomainConfVMNWFilterTeardown(vm); @@ -1093,7 +1096,14 @@ static int lxcSetupInterfaces(virConnectPtr conn, char *parentVeth; char *containerVeth = NULL; - switch (def->nets[i]->type) { + /* If appropriate, grab a physical device from the configured + * network's pool of devices, or resolve bridge device name + * to the one defined in the network definition. + */ + if (networkAllocateActualDevice(def->nets[i]) < 0) + goto error_exit; + + switch (virDomainNetGetActualType(def->nets[i])) { case VIR_DOMAIN_NET_TYPE_NETWORK: { virNetworkPtr network; @@ -1110,7 +1120,7 @@ static int lxcSetupInterfaces(virConnectPtr conn, break; } case VIR_DOMAIN_NET_TYPE_BRIDGE: - bridge = def->nets[i]->data.bridge.brname; + bridge = virDomainNetGetActualBridgeName(def->nets[i]); break; case VIR_DOMAIN_NET_TYPE_USER: @@ -1183,6 +1193,10 @@ static int lxcSetupInterfaces(virConnectPtr conn, error_exit: brShutdown(brctl); + if (rc != 0) { + for (i = 0 ; i < def->nnets ; i++) + networkReleaseActualDevice(def->nets[i]); + } return rc; } -- 1.7.6.2

2 1

[libvirt] [PATCH] network: fill in bandwidth from portgroup for all forward modes
by Laine Stump 04 Oct '11

04 Oct '11

This patch is a fix for: https://bugzilla.redhat.com/show_bug.cgi?id=743176 which was discovered by Dan Berrange while making bandwidth configuration work for LXC guests. Background: Although virtportprofile data from a network portgroup is only applicable for direct mode interfaces, the code that copies bandwidth data from the portgroup was also only being executed in the case of direct mode interfaces. The result was that interfaces using traditional virtual networks (forward mode='nat|route|none'), and those using a host bridge for forwarding, would not pick up bandwidth data from a portgroup defined in the network. This patch moves that code outside the conditional, so that bandwidth information is *alway* copied from the appropriate portgroup (unless the <interface> definition itself already has bandwidth information, which would take precedence over what's in the portgroup anyway). --- src/conf/domain_conf.c | 6 +++- src/network/bridge_driver.c | 60 ++++++++++++++++++++++++++++-------------- 2 files changed, 44 insertions(+), 22 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6fb1888..ab1249b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2934,7 +2934,8 @@ virDomainActualNetDefParseXML(xmlNodePtr node, goto error; } if (actual->type != VIR_DOMAIN_NET_TYPE_BRIDGE && - actual->type != VIR_DOMAIN_NET_TYPE_DIRECT) { + actual->type != VIR_DOMAIN_NET_TYPE_DIRECT && + actual->type != VIR_DOMAIN_NET_TYPE_NETWORK) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, _("unsupported type '%s' in interface's <actual> element"), type); @@ -9406,7 +9407,8 @@ virDomainActualNetDefFormat(virBufferPtr buf, } if (def->type != VIR_DOMAIN_NET_TYPE_BRIDGE && - def->type != VIR_DOMAIN_NET_TYPE_DIRECT) { + def->type != VIR_DOMAIN_NET_TYPE_DIRECT && + def->type != VIR_DOMAIN_NET_TYPE_NETWORK) { virDomainReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected net type %s"), type); goto error; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 51023a3..445c3cb 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2753,6 +2753,7 @@ networkAllocateActualDevice(virDomainNetDefPtr iface) struct network_driver *driver = driverState; virNetworkObjPtr network; virNetworkDefPtr netdef; + virPortGroupDefPtr portgroup; int ret = -1; if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) @@ -2772,14 +2773,48 @@ networkAllocateActualDevice(virDomainNetDefPtr iface) } netdef = network->def; - if ((netdef->forwardType == VIR_NETWORK_FORWARD_BRIDGE) && - netdef->bridge) { + + /* portgroup can be present for any type of network, in particular + * for bandwidth information, so we need to check for that and + * fill it in appropriately for all forward types. + */ + portgroup = virPortGroupFindByName(netdef, iface->data.network.portgroup); + + /* If there is already interface-specific bandwidth, just use that + * (already in NetDef). Otherwise, if there is bandwidth info in + * the portgroup, fill that into the ActualDef. + */ + if (portgroup && !iface->bandwidth) { + if (!iface->data.network.actual + && (VIR_ALLOC(iface->data.network.actual) < 0)) { + virReportOOMError(); + goto cleanup; + } + + if (virBandwidthCopy(&iface->data.network.actual->bandwidth, + portgroup->bandwidth) < 0) { + goto cleanup; + } + } + + if ((netdef->forwardType == VIR_NETWORK_FORWARD_NONE) || + (netdef->forwardType == VIR_NETWORK_FORWARD_NAT) || + (netdef->forwardType == VIR_NETWORK_FORWARD_ROUTE)) { + /* for these forward types, the actual net type really *is* + *NETWORK; we just keep the info from the portgroup in + * iface->data.network.actual + */ + if (iface->data.network.actual) + iface->data.network.actual->type = VIR_DOMAIN_NET_TYPE_NETWORK; + } else if ((netdef->forwardType == VIR_NETWORK_FORWARD_BRIDGE) && + netdef->bridge) { /* <forward type='bridge'/> <bridge name='xxx'/> * is VIR_DOMAIN_NET_TYPE_BRIDGE */ - if (VIR_ALLOC(iface->data.network.actual) < 0) { + if (!iface->data.network.actual + && (VIR_ALLOC(iface->data.network.actual) < 0)) { virReportOOMError(); goto cleanup; } @@ -2796,13 +2831,13 @@ networkAllocateActualDevice(virDomainNetDefPtr iface) (netdef->forwardType == VIR_NETWORK_FORWARD_VEPA) || (netdef->forwardType == VIR_NETWORK_FORWARD_PASSTHROUGH)) { virVirtualPortProfileParamsPtr virtport = NULL; - virPortGroupDefPtr portgroup = NULL; /* <forward type='bridge|private|vepa|passthrough'> are all * VIR_DOMAIN_NET_TYPE_DIRECT. */ - if (VIR_ALLOC(iface->data.network.actual) < 0) { + if (!iface->data.network.actual + && (VIR_ALLOC(iface->data.network.actual) < 0)) { virReportOOMError(); goto cleanup; } @@ -2825,7 +2860,6 @@ networkAllocateActualDevice(virDomainNetDefPtr iface) } /* Find the most specific virtportprofile and copy it */ - portgroup = virPortGroupFindByName(netdef, iface->data.network.portgroup); if (iface->data.network.virtPortProfile) { virtport = iface->data.network.virtPortProfile; } else { @@ -2845,20 +2879,6 @@ networkAllocateActualDevice(virDomainNetDefPtr iface) *iface->data.network.actual->data.direct.virtPortProfile = *virtport; } - /* Find the most specific bandwidth config and copy it */ - if (iface->bandwidth) { - if (virBandwidthCopy(&iface->data.network.actual->bandwidth, - iface->bandwidth) < 0) { - goto cleanup; - } - } else { - if (portgroup && - virBandwidthCopy(&iface->data.network.actual->bandwidth, - portgroup->bandwidth) < 0) { - goto cleanup; - } - } - /* If there is only a single device, just return it (caller will detect * any error if exclusive use is required but could not be acquired). */ -- 1.7.3.4

2 2

[libvirt] [RFC PATCH] lxc: don't return error on GetInfo when cgroups not yet set up
by Serge E. Hallyn 04 Oct '11

04 Oct '11

Nova (openstack) calls libvirt to create a container, then periodically checks using GetInfo to see whether the container is up. If it does this too quickly, then libvirt returns an error, which in libvirt.py causes an exception to be raised, the same type as if the container was bad. This may not be the best way to handle it, but with this patch, we assume that a -ENOENT return from virCgroupForDomain means the cgroups are not yet set up, and so we return the same values for cpu and memory usage as if the domain was not active. Signed-off-by: Serge Hallyn <serge.hallyn(a)canonical.com> --- src/lxc/lxc_driver.c | 37 +++++++++++++++++++++---------------- 1 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 4b62600..a68b8e7 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -542,26 +542,31 @@ static int lxcDomainGetInfo(virDomainPtr dom, info->cpuTime = 0; info->memory = vm->def->mem.cur_balloon; } else { - if (virCgroupForDomain(driver->cgroup, vm->def->name, &cgroup, 0) != 0) { + int ret = virCgroupForDomain(driver->cgroup, vm->def->name, &cgroup, 0); + if (ret == -ENOENT) { + /* cgroups are not set up yet */ + info->cpuTime = 0; + info->memory = vm->def->mem.cur_balloon; + } else if (ret != 0) { lxcError(VIR_ERR_INTERNAL_ERROR, _("Unable to get cgroup for %s"), vm->def->name); goto cleanup; - } - - if (virCgroupGetCpuacctUsage(cgroup, &(info->cpuTime)) < 0) { - lxcError(VIR_ERR_OPERATION_FAILED, - "%s", _("Cannot read cputime for domain")); - goto cleanup; - } - if ((rc = virCgroupGetMemoryUsage(cgroup, &(info->memory))) < 0) { - lxcError(VIR_ERR_OPERATION_FAILED, - "%s", _("Cannot read memory usage for domain")); - if (rc == -ENOENT) { - /* Don't fail if we can't read memory usage due to a lack of - * kernel support */ - info->memory = 0; - } else + } else { + if (virCgroupGetCpuacctUsage(cgroup, &(info->cpuTime)) < 0) { + lxcError(VIR_ERR_OPERATION_FAILED, + "%s", _("Cannot read cputime for domain")); goto cleanup; + } + if ((rc = virCgroupGetMemoryUsage(cgroup, &(info->memory))) < 0) { + lxcError(VIR_ERR_OPERATION_FAILED, + "%s", _("Cannot read memory usage for domain")); + if (rc == -ENOENT) { + /* Don't fail if we can't read memory usage due to a lack of + * kernel support */ + info->memory = 0; + } else + goto cleanup; + } } } -- 1.7.5.4

3 10

[libvirt] question for virsh vcpupin enhancement
by KAMEZAWA Hiroyuki 04 Oct '11

04 Oct '11

Hi, Now, 'vcpupin'/virDomainPinVcpu() allows users to change vcpu placement of Guests. When using qemu, you'll see other threads than vcpus as main thread, iothread... Such threads may use some amount of cpu time.. But , IIUC, there are no interfaces to move such threads. So, if I want to add such interfaces, how should I do ? Now, I have 2 ideas. 1. Enhance vcpupin as # virsh vcpupin --vcpu -1 --cpulist xxxxx Allow specifiying '-1' to pin all non-vcpu threads. 2. Support cpuset (linux+qemu) # virsh cpusettune --cpulist xxxxxx --memlist xxxxxx Add interface to use cpuset cgroup and allow users to put the whole tasks under a cpuset. Then, all threads under qemu can be pinned && vpcupin(sched_setaffinity) can be used under cpuset. Off topic: IIUC, cpuset supports memory migration. So, if the user changes memlist dynamically, pages will be moved to proper node. This is an another future enhance, I think. Better idea is welcome. Thanks, -Kame

1 0

[libvirt] [PATCH] bridge_driver.c: Fix autoconf setting
by Neil Wilson 04 Oct '11

04 Oct '11

Code altered so that it is consistent with the associated comment. The 'autoconf' variable is forced to zero. Signed-off-by: Neil Wilson <neil(a)brightbox.co.uk> --- src/network/bridge_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 9960745..76e7178 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1566,7 +1566,7 @@ networkSetIPv6Sysctls(virNetworkObjPtr network) goto cleanup; } - if (virFileWriteStr(field, "1", 0) < 0) { + if (virFileWriteStr(field, "0", 0) < 0) { virReportSystemError(errno, _("cannot enable %s"), field); goto cleanup; -- 1.7.4.1

2 1