- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Rewrite LOOKUP_PTYS macro into a function
by Jiri Denemark 05 Apr '11

05 Apr '11

The macro is huge and gives us nothing but headache when maintaining it. --- The reason for this patch is not that I'm going to modify anything in the code. It's that I was working in the area and noticed this huge macro. src/qemu/qemu_process.c | 102 ++++++++++++++++++++++++++++------------------- 1 files changed, 61 insertions(+), 41 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 90fcea0..53a42a5 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -895,51 +895,71 @@ qemuProcessExtractTTYPath(const char *haystack, } static int +qemuProcessLookupPTYs(virDomainChrDefPtr *devices, + int count, + const char *prefix, + virHashTablePtr paths) +{ + int i; + + for (i = 0 ; i < count ; i++) { + virDomainChrDefPtr chr = devices[i]; + if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) { + char id[16]; + const char *path; + + if (snprintf(id, sizeof(id), "%s%d", prefix, i) >= sizeof(id)) + return -1; + + path = (const char *) virHashLookup(paths, id); + if (path == NULL) { + if (chr->source.data.file.path == NULL) { + /* neither the log output nor 'info chardev' had a + * pty path for this chardev, report an error + */ + qemuReportError(VIR_ERR_INTERNAL_ERROR, + _("no assigned pty for device %s"), id); + return -1; + } else { + /* 'info chardev' had no pty path for this chardev, + * but the log output had, so we're fine + */ + continue; + } + } + + VIR_FREE(chr->source.data.file.path); + chr->source.data.file.path = strdup(path); + + if (chr->source.data.file.path == NULL) { + virReportOOMError(); + return -1; + } + } + } + + return 0; +} + +static int qemuProcessFindCharDevicePTYsMonitor(virDomainObjPtr vm, virHashTablePtr paths) { - int i; + if (qemuProcessLookupPTYs(vm->def->serials, vm->def->nserials, + "serial", paths) < 0) + return -1; + + if (qemuProcessLookupPTYs(vm->def->parallels, vm->def->nparallels, + "parallel", paths) < 0) + return -1; -#define LOOKUP_PTYS(array, arraylen, idprefix) \ - for (i = 0 ; i < (arraylen) ; i++) { \ - virDomainChrDefPtr chr = (array)[i]; \ - if (chr->source.type == VIR_DOMAIN_CHR_TYPE_PTY) { \ - char id[16]; \ - \ - if (snprintf(id, sizeof(id), idprefix "%i", i) >= sizeof(id)) \ - return -1; \ - \ - const char *path = (const char *) virHashLookup(paths, id); \ - if (path == NULL) { \ - if (chr->source.data.file.path == NULL) { \ - /* neither the log output nor 'info chardev' had a */ \ - /* pty path for this chardev, report an error */ \ - qemuReportError(VIR_ERR_INTERNAL_ERROR, \ - _("no assigned pty for device %s"), id); \ - return -1; \ - } else { \ - /* 'info chardev' had no pty path for this chardev, */\ - /* but the log output had, so we're fine */ \ - continue; \ - } \ - } \ - \ - VIR_FREE(chr->source.data.file.path); \ - chr->source.data.file.path = strdup(path); \ - \ - if (chr->source.data.file.path == NULL) { \ - virReportOOMError(); \ - return -1; \ - } \ - } \ - } - - LOOKUP_PTYS(vm->def->serials, vm->def->nserials, "serial"); - LOOKUP_PTYS(vm->def->parallels, vm->def->nparallels, "parallel"); - LOOKUP_PTYS(vm->def->channels, vm->def->nchannels, "channel"); - if (vm->def->console) - LOOKUP_PTYS(&vm->def->console, 1, "console"); -#undef LOOKUP_PTYS + if (qemuProcessLookupPTYs(vm->def->channels, vm->def->nchannels, + "channel", paths) < 0) + return -1; + + if (vm->def->console && + qemuProcessLookupPTYs(&vm->def->console, 1, "console", paths) < 0) + return -1; return 0; } -- 1.7.4.1

2 2

[libvirt] [PATCH 0/6] Switch to use gnulib's manywarnings
by Daniel P. Berrange 05 Apr '11

05 Apr '11

A second version of http://www.redhat.com/archives/libvir-list/2011-April/msg00060.html In this version: - Move acinclude.m4 into m4/ - Don't blacklist -W, only use -Wno-sign-compare - Fix some issues allowing further warnings to be turned on - Increase max stack size to 65700 bytes to make test suite compile. Test suite to be fixed later :-)

2 16

[libvirt] [PATCH 00/20] Remove large stack allocations
by Matthias Bolte 05 Apr '11

05 Apr '11

This is meant for post-0.9.0. The series removes many large stack allocations from the code base and makes it compile with -Wframe-larger-than=2500. This was inspired by Dan's patch for using gnulib's manywarnings & warnings modules [1]. Where he mentioned that currently -Wframe-larger-than=20480 is required. This series doesn't address stack usage in the test suite. [1] https://www.redhat.com/archives/libvir-list/2011-April/msg00060.html Matthias

2 42

[libvirt] [PATCH] virsh: Increase device-detach intelligence
by Michal Privoznik 05 Apr '11

05 Apr '11

Up to now users have to give a full XML description on input when device-detaching. If they omited something it lead to unclear error messages (like generated MAC wasn't found, etc.). With this patch users can specify only those information which specify one device sufficiently precise. Remaining information is completed from domain. --- tools/virsh.c | 260 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 245 insertions(+), 15 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 50ca50f..95d27f7 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -8702,6 +8702,224 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) return TRUE; } +/** + * Check if n1 is superset of n2, meaning n1 contains all elements and + * attributes as n2 at lest. Including children. + * @n1 first node + * @n2 second node + * return 1 in case n1 covers n2, 0 otherwise. + */ +static int +vshNodeIsSuperset(xmlNodePtr n1, xmlNodePtr n2) { + xmlNodePtr child1, child2; + xmlAttrPtr attr1, attr2; + int found; + + if (!n1 && !n2) + return 1; + + if (!n1 || !n2) + return 0; + + if (!xmlStrEqual(n1->name, n2->name)) + return 0; + + attr2 = n2->properties; + while (attr2) { + if (attr2->type == XML_ATTRIBUTE_NODE) { + attr1 = n1->properties; + found = 0; + while (attr1) { + if (xmlStrEqual(attr1->name, attr2->name)) { + found = 1; + break; + } + attr1 = attr1->next; + } + if (!found) + return 0; + if (!xmlStrEqual(BAD_CAST virXMLPropString(n1, (const char *) attr1->name), + BAD_CAST virXMLPropString(n2, (const char *) attr2->name))) + return 0; + } + attr2 = attr2->next; + } + + child2 = n2->children; + while (child2) { + if (child2->type == XML_ELEMENT_NODE) { + child1 = n1->children; + found = 0; + while (child1) { + if (child1->type == XML_ELEMENT_NODE && + xmlStrEqual(child1->name, child2->name)) { + found = 1; + break; + } + child1 = child1->next; + } + if (!found) + return 0; + if (!vshNodeIsSuperset(child1, child2)) + return 0; + } + child2 = child2->next; + } + + return 1; +} + +/** + * To given domain and (probably incomplete) device XML specification try to + * find such device in domain and complete missing parts. This is however + * possible when given device XML is sufficiently precise so it addresses only + * one device. + * @ctl vshControl for error messages printing + * @dom domain + * @oldXML device XML before + * @newXML and after completion + * Returns -2 when no such device exists in domain, -3 when given XML selects many + * (is too ambiguous), 0 in case of success. Otherwise returns -1. @newXML + * is touched only in case of success. + */ +static int +vshCompleteXMLFromDomain(vshControl *ctl, virDomainPtr dom, char *oldXML, + char **newXML) { + int funcRet = -1; + char *domXML = NULL; + xmlDocPtr domDoc = NULL, devDoc = NULL; + xmlNodePtr node = NULL; + xmlXPathContextPtr domCtxt = NULL, devCtxt = NULL; + xmlNodePtr *devices = NULL; + xmlSaveCtxtPtr sctxt = NULL; + int devices_size; + char *xpath; + xmlBufferPtr buf = NULL; + + if (!(domXML = virDomainGetXMLDesc(dom, 0))) { + vshError(ctl, _("couldn't get XML description of domain %s"), + virDomainGetName(dom)); + goto error; + } + + if (!(domDoc = xmlReadDoc(BAD_CAST domXML, "domain.xml", NULL, + XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NOERROR | XML_PARSE_NOWARNING))) { + vshError(ctl, "%s", _("could not parse domain XML")); + goto error; + } + + if (!(devDoc = xmlReadDoc(BAD_CAST oldXML, "device.xml", NULL, + XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NOERROR | XML_PARSE_NOWARNING))) { + vshError(ctl, "%s", _("could not parse device XML")); + goto error; + } + + node = xmlDocGetRootElement(domDoc); + if (!node) { + vshError(ctl, "%s", _("failed to get domain root element")); + goto error; + } + + domCtxt = xmlXPathNewContext(domDoc); + if (!domCtxt) { + vshError(ctl, "%s", _("failed to create context")); + goto error; + } + domCtxt->node = node; + + node = xmlDocGetRootElement(devDoc); + if (!node) { + vshError(ctl, "%s", _("failed to get device root element")); + goto error; + } + + devCtxt = xmlXPathNewContext(devDoc); + if (!devCtxt) { + vshError(ctl, "%s", _("failed to create context")); + goto error; + } + devCtxt->node = node; + + buf = xmlBufferCreate(); + if (!buf) { + vshError(ctl, "%s", _("out of memory")); + goto error; + } + + xmlBufferCat(buf, BAD_CAST "/domain/devices/"); + xmlBufferCat(buf, node->name); + xpath = (char *) xmlBufferContent(buf); + /* we get all possible devices */ + devices_size = virXPathNodeSet(xpath, domCtxt, &devices); + xmlBufferEmpty(buf); + + if (devices_size < 0) { + /* error */ + vshError(ctl, "%s", _("error when selecting nodes")); + goto error; + } else if (devices_size < 1) { + /* no such device */ + funcRet = -2; + goto error; + } + + /* and refine */ + int i = 0; + while (i < devices_size) { + if (!vshNodeIsSuperset(devices[i], node)) { + if (devices_size == 1) { + VIR_FREE(devices); + devices_size = 0; + } else { + memmove(devices + i, devices + i + 1, + sizeof(*devices) * (devices_size-i-1)); + devices_size--; + if (VIR_REALLOC_N(devices, devices_size) < 0) { + /* ignore, harmless */ + } + } + } else { + i++; + } + } + + if (!devices_size) { + /* no such device */ + funcRet = -2; + goto error; + } else if (devices_size > 1) { + /* ambiguous */ + funcRet = -3; + goto error; + } + + if (newXML) { + sctxt = xmlSaveToBuffer(buf, NULL, 0); + if (!sctxt) { + vshError(ctl, "%s", _("failed to create document saving context")); + goto error; + } + + xmlSaveTree(sctxt, devices[0]); + xmlSaveClose(sctxt); + *newXML = (char *) xmlBufferContent(buf); + buf->content = NULL; + } + + funcRet = 0; + +error: + xmlBufferFree(buf); + VIR_FREE(devices); + xmlXPathFreeContext(devCtxt); + xmlXPathFreeContext(domCtxt); + xmlFreeDoc(devDoc); + xmlFreeDoc(domDoc); + VIR_FREE(domXML); + return funcRet; +} /* * "detach-device" command @@ -8724,7 +8942,7 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; const char *from = NULL; - char *buffer; + char *buffer = NULL, *new_buffer = NULL; int ret = TRUE; unsigned int flags; @@ -8734,37 +8952,49 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return FALSE; - if (vshCommandOptString(cmd, "file", &from) <= 0) { - virDomainFree(dom); - return FALSE; - } + if (vshCommandOptString(cmd, "file", &from) <= 0) + goto error; if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) { virshReportError(ctl); - virDomainFree(dom); - return FALSE; + goto error; + } + + ret = vshCompleteXMLFromDomain(ctl, dom, buffer, &new_buffer); + if (ret < 0) { + if (ret == -2) { + vshError(ctl, _("no such device in %s"), virDomainGetName(dom)); + } else if (ret == -3) { + vshError(ctl, "%s", _("given XML selects too many devices. " + "Please, be more specific")); + } + ret = FALSE; + goto error; } if (vshCommandOptBool(cmd, "persistent")) { flags = VIR_DOMAIN_DEVICE_MODIFY_CONFIG; if (virDomainIsActive(dom) == 1) flags |= VIR_DOMAIN_DEVICE_MODIFY_LIVE; - ret = virDomainDetachDeviceFlags(dom, buffer, flags); + ret = virDomainDetachDeviceFlags(dom, new_buffer, flags); } else { - ret = virDomainDetachDevice(dom, buffer); + ret = virDomainDetachDevice(dom, new_buffer); } - VIR_FREE(buffer); if (ret < 0) { vshError(ctl, _("Failed to detach device from %s"), from); - virDomainFree(dom); - return FALSE; - } else { - vshPrint(ctl, "%s", _("Device detached successfully\n")); + ret = FALSE; + goto error; } + vshPrint(ctl, "%s", _("Device detached successfully\n")); + ret = TRUE; + +error: + VIR_FREE(new_buffer); + VIR_FREE(buffer); virDomainFree(dom); - return TRUE; + return ret; } -- 1.7.4

3 2

[libvirt] [PATCH] vmx: Use case-insensitive compare functions for all content
by Matthias Bolte 05 Apr '11

05 Apr '11

--- src/vmx/vmx.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 9f4d5fb..9a482ef 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -730,7 +730,7 @@ virVMXGetConfigLong(virConfPtr conf, const char *name, long long *number, } } - if (STREQ(value->str, "unlimited")) { + if (STRCASEEQ(value->str, "unlimited")) { *number = -1; } else if (virStrToLong_ll(value->str, NULL, 10, number) < 0) { VMX_ERROR(VIR_ERR_INTERNAL_ERROR, @@ -1385,7 +1385,7 @@ virVMXParseConfig(virVMXContext *ctx, virCapsPtr caps, const char *vmx) goto cleanup; } - if (sched_cpu_affinity != NULL && STRNEQ(sched_cpu_affinity, "all")) { + if (sched_cpu_affinity != NULL && STRCASENEQ(sched_cpu_affinity, "all")) { const char *current = sched_cpu_affinity; int number, count = 0; @@ -2107,7 +2107,7 @@ virVMXParseDisk(virVMXContext *ctx, virCapsPtr caps, virConfPtr conf, goto cleanup; } } else if (virFileHasSuffix(fileName, ".iso") || - STREQ(deviceType, "atapi-cdrom")) { + STRCASEEQ(deviceType, "atapi-cdrom")) { /* * This function was called in order to parse a harddisk device, * but .iso files and 'atapi-cdrom' devices are for CDROM devices @@ -2146,7 +2146,7 @@ virVMXParseDisk(virVMXContext *ctx, virCapsPtr caps, virConfPtr conf, * handle it. */ goto ignore; - } else if (STREQ(deviceType, "atapi-cdrom")) { + } else if (STRCASEEQ(deviceType, "atapi-cdrom")) { (*def)->type = VIR_DOMAIN_DISK_TYPE_BLOCK; (*def)->src = fileName; @@ -2174,7 +2174,7 @@ virVMXParseDisk(virVMXContext *ctx, virCapsPtr caps, virConfPtr conf, if ((*def)->src == NULL) { goto cleanup; } - } else if (fileType != NULL && STREQ(fileType, "device")) { + } else if (fileType != NULL && STRCASEEQ(fileType, "device")) { (*def)->type = VIR_DOMAIN_DISK_TYPE_BLOCK; (*def)->src = fileName; -- 1.7.0.4

2 2

[libvirt] [PATCH] vmx: Support persistent CPU shares
by Matthias Bolte 05 Apr '11

05 Apr '11

--- src/vmx/vmx.c | 43 ++++++++++++++++++++++ tests/vmx2xmldata/vmx2xml-case-insensitive-1.vmx | 2 +- tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml | 3 ++ tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml | 3 ++ tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.vmx | 2 +- tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml | 3 ++ tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml | 3 ++ tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml | 3 ++ tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx | 1 + tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.xml | 3 ++ tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx | 1 + tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.xml | 3 ++ tests/xml2vmxdata/xml2vmx-esx-in-the-wild-5.vmx | 1 + tests/xml2vmxdata/xml2vmx-esx-in-the-wild-5.xml | 3 ++ 14 files changed, 72 insertions(+), 2 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 9a482ef..b0d3218 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -55,6 +55,8 @@ def->mem.cur_balloon = <value kilobyte> <=> sched.mem.max = "<value megabyt def->mem.min_guarantee = <value kilobyte> <=> sched.mem.minsize = "<value megabyte>" # defaults to 0 def->maxvcpus = <value> <=> numvcpus = "<value>" # must be 1 or a multiple of 2, defaults to 1 def->cpumask = <uint list> <=> sched.cpu.affinity = "<uint list>" +def->cputune.shares = <value> <=> sched.cpu.shares = "<value>" # with handling for special values + # "high", "normal", "low" @@ -1200,6 +1202,7 @@ virVMXParseConfig(virVMXContext *ctx, virCapsPtr caps, const char *vmx) long long sched_mem_minsize = 0; long long numvcpus = 0; char *sched_cpu_affinity = NULL; + char *sched_cpu_shares = NULL; char *guestOS = NULL; bool smbios_reflecthost = false; int controller; @@ -1449,6 +1452,30 @@ virVMXParseConfig(virVMXContext *ctx, virCapsPtr caps, const char *vmx) } } + /* vmx:sched.cpu.shares -> def:cputune.shares */ + if (virVMXGetConfigString(conf, "sched.cpu.shares", &sched_cpu_shares, + true) < 0) { + goto cleanup; + } + + if (sched_cpu_shares != NULL) { + /* See http://www.vmware.com/support/developer/vc-sdk/visdk41pubs/ApiReference/vim… */ + if (STRCASEEQ(sched_cpu_shares, "low")) { + def->cputune.shares = def->vcpus * 500; + } else if (STRCASEEQ(sched_cpu_shares, "normal")) { + def->cputune.shares = def->vcpus * 1000; + } else if (STRCASEEQ(sched_cpu_shares, "high")) { + def->cputune.shares = def->vcpus * 2000; + } else if (virStrToLong_ul(sched_cpu_shares, NULL, 10, + &def->cputune.shares) < 0) { + VMX_ERROR(VIR_ERR_INTERNAL_ERROR, + _("Expecting VMX entry 'sched.cpu.shares' to be an " + "unsigned integer or 'low', 'normal' or 'high' but " + "found '%s'"), sched_cpu_shares); + goto cleanup; + } + } + /* def:lifecycle */ def->onReboot = VIR_DOMAIN_LIFECYCLE_RESTART; def->onPoweroff = VIR_DOMAIN_LIFECYCLE_DESTROY; @@ -1715,6 +1742,7 @@ virVMXParseConfig(virVMXContext *ctx, virCapsPtr caps, const char *vmx) virConfFree(conf); VIR_FREE(encoding); VIR_FREE(sched_cpu_affinity); + VIR_FREE(sched_cpu_shares); VIR_FREE(guestOS); return def; @@ -2998,6 +3026,21 @@ virVMXFormatConfig(virVMXContext *ctx, virCapsPtr caps, virDomainDefPtr def, virBufferAddLit(&buffer, "\"\n"); } + /* def:cputune.shares -> vmx:sched.cpu.shares */ + if (def->cputune.shares > 0) { + /* See http://www.vmware.com/support/developer/vc-sdk/visdk41pubs/ApiReference/vim… */ + if (def->cputune.shares == def->vcpus * 500) { + virBufferAddLit(&buffer, "sched.cpu.shares = \"low\"\n"); + } else if (def->cputune.shares == def->vcpus * 1000) { + virBufferAddLit(&buffer, "sched.cpu.shares = \"normal\"\n"); + } else if (def->cputune.shares == def->vcpus * 2000) { + virBufferAddLit(&buffer, "sched.cpu.shares = \"high\"\n"); + } else { + virBufferVSprintf(&buffer, "sched.cpu.shares = \"%lu\"\n", + def->cputune.shares); + } + } + /* def:graphics */ for (i = 0; i < def->ngraphics; ++i) { switch (def->graphics[i]->type) { diff --git a/tests/vmx2xmldata/vmx2xml-case-insensitive-1.vmx b/tests/vmx2xmldata/vmx2xml-case-insensitive-1.vmx index bd36cf8..8641c5c 100644 --- a/tests/vmx2xmldata/vmx2xml-case-insensitive-1.vmx +++ b/tests/vmx2xmldata/vmx2xml-case-insensitive-1.vmx @@ -35,7 +35,7 @@ UUID.BIOS = "50 11 5E 16 9B DC 49 D7-F1 71 53 C4 D7 F9 17 10" SNAPSHOT.ACTION = "KEEP" SCHED.CPU.MIN = "0" SCHED.CPU.UNITS = "MHZ" -SCHED.CPU.SHARES = "NORMAL" +SCHED.CPU.SHARES = "4223" SCHED.MEM.MINSIZE = "0" SCHED.MEM.SHARES = "NORMAL" TOOLSCRIPTS.AFTERPOWERON = "TRUE" diff --git a/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml b/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml index 7a5ff5b..ef6edd8 100644 --- a/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml +++ b/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml @@ -4,6 +4,9 @@ <memory>1048576</memory> <currentMemory>1048576</currentMemory> <vcpu>1</vcpu> + <cputune> + <shares>4223</shares> + </cputune> <os> <type arch='i686'>hvm</type> </os> diff --git a/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml b/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml index 18d6461..02771b9 100644 --- a/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml +++ b/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml @@ -4,6 +4,9 @@ <memory>1048576</memory> <currentMemory>1048576</currentMemory> <vcpu>1</vcpu> + <cputune> + <shares>1000</shares> + </cputune> <os> <type arch='i686'>hvm</type> </os> diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.vmx b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.vmx index 4392062..78741ae 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.vmx +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.vmx @@ -36,7 +36,7 @@ uuid.bios = "50 11 5e 16 9b dc 49 d7-f1 71 53 c4 d7 f9 17 10" snapshot.action = "keep" sched.cpu.min = "0" sched.cpu.units = "mhz" -sched.cpu.shares = "normal" +sched.cpu.shares = "low" sched.mem.minsize = "0" sched.mem.shares = "normal" toolScripts.afterPowerOn = "true" diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml index 5e67e74..e8f9307 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml @@ -4,6 +4,9 @@ <memory>1048576</memory> <currentMemory>1048576</currentMemory> <vcpu>1</vcpu> + <cputune> + <shares>500</shares> + </cputune> <os> <type arch='i686'>hvm</type> </os> diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml index 419df51..2824d66 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml @@ -4,6 +4,9 @@ <memory>524288</memory> <currentMemory>524288</currentMemory> <vcpu>1</vcpu> + <cputune> + <shares>1000</shares> + </cputune> <os> <type arch='i686'>hvm</type> </os> diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml index 0040163..6f0a9d1 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml @@ -8,6 +8,9 @@ <min_guarantee>262144</min_guarantee> </memtune> <vcpu>2</vcpu> + <cputune> + <shares>2000</shares> + </cputune> <os> <type arch='x86_64'>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx index e72ca80..9059197 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx +++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.vmx @@ -6,6 +6,7 @@ uuid.bios = "50 11 5e 16 9b dc 49 d7-f1 71 53 c4 d7 f9 17 10" displayName = "Fedora11" memsize = "1024" numvcpus = "1" +sched.cpu.shares = "low" scsi0.present = "true" scsi0.virtualDev = "lsilogic" scsi0:0.present = "true" diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.xml b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.xml index 3f4ff88..ea59778 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.xml +++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.xml @@ -4,6 +4,9 @@ <memory>1048576</memory> <currentMemory>1048576</currentMemory> <vcpu>1</vcpu> + <cputune> + <shares>500</shares> + </cputune> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx index 627fcfb..504997f 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx +++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.vmx @@ -6,6 +6,7 @@ uuid.bios = "56 4d 9b ef ac d9 b4 e0-c8 f0 ae a8 b9 10 35 15" displayName = "virtMonServ1" memsize = "512" numvcpus = "1" +sched.cpu.shares = "normal" scsi0.present = "true" scsi0.virtualDev = "lsilogic" scsi0:0.present = "true" diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.xml b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.xml index 078753a..443aacd 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.xml +++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.xml @@ -4,6 +4,9 @@ <memory>524288</memory> <currentMemory>524288</currentMemory> <vcpu>1</vcpu> + <cputune> + <shares>1000</shares> + </cputune> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-5.vmx b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-5.vmx index cc2485f..2e3b856 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-5.vmx +++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-5.vmx @@ -8,6 +8,7 @@ annotation = "Centos 5.5 64bit Server" memsize = "2048" sched.mem.minsize = "256" numvcpus = "2" +sched.cpu.shares = "normal" scsi0.present = "true" scsi0.virtualDev = "lsilogic" scsi0:0.present = "true" diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-5.xml b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-5.xml index d55bf6b..f28c15e 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-5.xml +++ b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-5.xml @@ -8,6 +8,9 @@ <min_guarantee>262144</min_guarantee> </memtune> <vcpu>2</vcpu> + <cputune> + <shares>2000</shares> + </cputune> <os> <type arch='x86_64'>hvm</type> </os> -- 1.7.0.4

3 4

[libvirt] [PATCH] Add autostart support to libxl driver
by Markus Groß 05 Apr '11

05 Apr '11

This patch is rebased against the patchset from here: https://www.redhat.com/archives/libvir-list/2011-March/msg01260.html The domainSetAutostart function is nearly identical to the one from qemu. --- src/libxl/libxl_driver.c | 137 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 131 insertions(+), 6 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 3409340..9d882ba 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -176,6 +176,29 @@ libxlDomainObjUnref(void *data) ignore_value(virDomainObjUnref(vm)); } +static void +libxlAutostartDomain(void *payload, const void *name ATTRIBUTE_UNUSED, + void *opaque) +{ + libxlDriverPrivatePtr driver = opaque; + virDomainObjPtr vm = payload; + virErrorPtr err; + + virDomainObjLock(vm); + virResetLastError(); + + if (vm->autostart && !virDomainObjIsActive(vm) && + libxlVmStart(driver, vm, false) < 0) { + err = virGetLastError(); + VIR_ERROR(_("Failed to autostart VM '%s': %s"), + vm->def->name, + err ? err->message : _("unknown error")); + } + + if (vm) + virDomainObjUnlock(vm); +} + /* * Cleanup function for domain that has reached shutoff state. * @@ -703,9 +726,10 @@ libxlStartup(int privileged) { 0, NULL, NULL) < 0) goto error; - libxlDriverUnlock(libxl_driver); + virHashForEach(libxl_driver->domains.objs, libxlAutostartDomain, + libxl_driver); - /* TODO: autostart domains */ + libxlDriverUnlock(libxl_driver); return 0; @@ -731,9 +755,11 @@ libxlReload(void) libxl_driver->configDir, libxl_driver->autostartDir, 0, NULL, libxl_driver); - libxlDriverUnlock(libxl_driver); - /* TODO: autostart domains */ + virHashForEach(libxl_driver->domains.objs, libxlAutostartDomain, + libxl_driver); + + libxlDriverUnlock(libxl_driver); return 0; } @@ -2102,6 +2128,105 @@ libxlDomainEventDeregister(virConnectPtr conn, return ret; } +static int +libxlDomainGetAutostart(virDomainPtr dom, int *autostart) +{ + libxlDriverPrivatePtr driver = dom->conn->privateData; + virDomainObjPtr vm; + int ret = -1; + + libxlDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + libxlDriverUnlock(driver); + + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + libxlError(VIR_ERR_NO_DOMAIN, + _("No domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + *autostart = vm->autostart; + ret = 0; + +cleanup: + if (vm) + virDomainObjUnlock(vm); + return ret; +} + +static int +libxlDomainSetAutostart(virDomainPtr dom, int autostart) +{ + libxlDriverPrivatePtr driver = dom->conn->privateData; + virDomainObjPtr vm; + char *configFile = NULL, *autostartLink = NULL; + int ret = -1; + + libxlDriverLock(driver); + vm = virDomainFindByUUID(&driver->domains, dom->uuid); + + if (!vm) { + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(dom->uuid, uuidstr); + libxlError(VIR_ERR_NO_DOMAIN, + _("No domain with matching uuid '%s'"), uuidstr); + goto cleanup; + } + + if (!vm->persistent) { + libxlError(VIR_ERR_OPERATION_INVALID, + "%s", _("cannot set autostart for transient domain")); + goto cleanup; + } + + autostart = (autostart != 0); + + if (vm->autostart != autostart) { + if (!(configFile = virDomainConfigFile(driver->configDir, vm->def->name))) + goto cleanup; + if (!(autostartLink = virDomainConfigFile(driver->autostartDir, vm->def->name))) + goto cleanup; + + if (autostart) { + int err; + + if ((err = virFileMakePath(driver->autostartDir))) { + virReportSystemError(err, + _("cannot create autostart directory %s"), + driver->autostartDir); + goto cleanup; + } + + if (symlink(configFile, autostartLink) < 0) { + virReportSystemError(errno, + _("Failed to create symlink '%s to '%s'"), + autostartLink, configFile); + goto cleanup; + } + } else { + if (unlink(autostartLink) < 0 && errno != ENOENT && errno != ENOTDIR) { + virReportSystemError(errno, + _("Failed to delete symlink '%s'"), + autostartLink); + goto cleanup; + } + } + + vm->autostart = autostart; + } + ret = 0; + +cleanup: + VIR_FREE(configFile); + VIR_FREE(autostartLink); + if (vm) + virDomainObjUnlock(vm); + libxlDriverUnlock(driver); + return ret; +} + static char * libxlDomainGetSchedulerType(virDomainPtr dom, int *nparams) { @@ -2304,8 +2429,8 @@ static virDriver libxlDriver = { NULL, /* domainDetachDevice */ NULL, /* domainDetachDeviceFlags */ NULL, /* domainUpdateDeviceFlags */ - NULL, /* domainGetAutostart */ - NULL, /* domainSetAutostart */ + libxlDomainGetAutostart, /* domainGetAutostart */ + libxlDomainSetAutostart, /* domainSetAutostart */ libxlDomainGetSchedulerType,/* domainGetSchedulerType */ NULL, /* domainGetSchedulerParameters */ NULL, /* domainSetSchedulerParameters */ -- 1.7.4.1

3 2

[libvirt] [PATCH 0/6] Add virNodeGetCpuTime() API
by Minoru Usui 05 Apr '11

05 Apr '11

Hi, everyone. I wrote new API called virNodeGetCpuTime(). It returns cumulative cpu time of the node from /proc/stat since node boots up. Previous discussion is here. http://www.mail-archive.com/libvir-list@redhat.com/msg32552.html Minoru Usui (6): [1/6] virNodeGetCpuTime: Expose new API [2/6] virNodeGetCpuTime: Define internal driver API [3/6] virNodeGetCpuTime: Implement public API [4/6] virNodeGetCpuTime: Implement remote protocol [5/6] virNodeGetCpuTime: Implement virsh support [6/6] virNodeGetCpuTime: Implement linux support daemon/remote.c | 23 ++++++++++++ daemon/remote_dispatch_prototypes.h | 8 ++++ daemon/remote_dispatch_ret.h | 1 + daemon/remote_dispatch_table.h | 5 +++ include/libvirt/libvirt.h.in | 26 ++++++++++++++ src/driver.h | 4 ++ src/esx/esx_driver.c | 1 + src/libvirt.c | 38 ++++++++++++++++++++ src/libvirt_private.syms | 1 + src/libvirt_public.syms | 1 + src/libxl/libxl_driver.c | 1 + src/lxc/lxc_driver.c | 1 + src/nodeinfo.c | 60 +++++++++++++++++++++++++++++++ src/nodeinfo.h | 2 +- src/openvz/openvz_driver.c | 1 + src/phyp/phyp_driver.c | 1 + src/qemu/qemu_driver.c | 1 + src/remote/remote_driver.c | 27 ++++++++++++++ src/remote/remote_protocol.c | 15 ++++++++ src/remote/remote_protocol.h | 11 ++++++ src/remote/remote_protocol.x | 10 +++++- src/remote_protocol-structs | 6 +++ src/test/test_driver.c | 1 + src/uml/uml_driver.c | 1 + src/vbox/vbox_tmpl.c | 1 + src/vmware/vmware_driver.c | 1 + src/xen/xen_driver.c | 1 + src/xenapi/xenapi_driver.c | 1 + tools/virsh.c | 66 +++++++++++++++++++++++++++++++++++ tools/virsh.pod | 6 +++ 30 files changed, 320 insertions(+), 2 deletions(-) -- Minoru Usui <usui(a)mxm.nes.nec.co.jp>

4 13

[libvirt] [PATCH] qemu: Don't fail driver startup with ancient qemu
by Jiri Denemark 04 Apr '11

04 Apr '11

Failure to extract version info (e.g., because qemu binary is so ancient that it doesn't even support -help) shouldn't be considered fatal since we only need it to detect whether qemu supports bootindex option. --- src/qemu/qemu_capabilities.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index f86e7f5..6d2a3f6 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -554,9 +554,10 @@ qemuCapsInitGuest(virCapsPtr caps, !virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0)) goto error; - if (qemuCapsExtractVersionInfo(binary, info->arch, NULL, &qemuCaps) < 0 || - (qemuCapsGet(qemuCaps, QEMU_CAPS_BOOTINDEX) && - !virCapabilitiesAddGuestFeature(guest, "deviceboot", 1, 0))) + if (qemuCapsExtractVersionInfo(binary, info->arch, + NULL, &qemuCaps) == 0 && + qemuCapsGet(qemuCaps, QEMU_CAPS_BOOTINDEX) && + !virCapabilitiesAddGuestFeature(guest, "deviceboot", 1, 0)) goto error; if (hvm) { -- 1.7.4.1

3 4

[libvirt] [PATCH 00/12] v3: New internal infrastructure for RPC
by Daniel P. Berrange 04 Apr '11

04 Apr '11

This is an update of the series posted http://www.redhat.com/archives/libvir-list/2011-March/msg00686.html Since that time - Include the missing first patch and missing last patch - Incorporate review feedback for first 3 patches. - Fix copyright year and free-functions on all other patches

2 22

[libvirt] [PATCH] build: detect potentential uninitialized variables
by Eric Blake 04 Apr '11

04 Apr '11

Even with -Wuninitialized (which is part of autobuild.sh --enable-compile-warnings=error), gcc does NOT catch this use of an uninitialized variable: { if (cond) goto error; int a = 1; error: printf("%d", a); } which prints 0 (if the stack was previously wiped) if cond was true. Clang will catch it, but we dont' use clang as often. Using gcc -Wjump-misses-init gives false positives: { if (cond) goto error; int a = 1; return a; error: return 0; } Here, a was never used in the scope of the error block, so declaring it after goto is technically fine (and clang agrees); however, given that our HACKING already documents a preference to C89 decl-before-statement, the false positive warning is enough of a prod to comply with HACKING. [Personally, I'd _really_ rather use C99 decl-after-statement to minimize scope, but until gcc can efficiently and reliably catch scoping and uninitialized usage bugs, I'll settle with the compromise of enforcing a coding standard that rejects false positives.] * acinclude.m4 (LIBVIRT_COMPILE_WARNINGS): Add -Wjump-misses-init. * src/util/util.c (__virExec): Adjust offenders. * src/conf/domain_conf.c (virDomainTimerDefParseXML): Likewise. * src/remote/remote_driver.c (doRemoteOpen): Likewise. * src/phyp/phyp_driver.c (phypGetLparNAME, phypGetLparProfile) (phypGetVIOSFreeSCSIAdapter, phypVolumeGetKey) (phypGetStoragePoolDevice) (phypVolumeGetPhysicalVolumeByStoragePool) (phypVolumeGetPath): Likewise. * src/vbox/vbox_tmpl.c (vboxNetworkUndefineDestroy) (vboxNetworkCreate, vboxNetworkDumpXML) (vboxNetworkDefineCreateXML): Likewise. * src/xenapi/xenapi_driver.c (getCapsObject) (xenapiDomainDumpXML): Likewise. * src/xenapi/xenapi_utils.c (createVMRecordFromXml): Likewise. * src/security/security_selinux.c (SELinuxGenNewContext): Likewise. * src/qemu/qemu_command.c (qemuBuildCommandLine): Likewise. * src/qemu/qemu_hotplug.c (qemuDomainChangeEjectableMedia): Likewise. * src/qemu/qemu_process.c (qemuProcessWaitForMonitor): Likewise. * src/qemu/qemu_monitor_text.c (qemuMonitorTextGetPtyPaths): Likewise. * src/qemu/qemu_driver.c (qemudDomainShutdown) (qemudDomainBlockStats, qemudDomainMemoryPeek): Likewise. * src/storage/storage_backend_iscsi.c (virStorageBackendCreateIfaceIQN): Likewise. * src/node_device/node_device_udev.c (udevProcessPCI): Likewise. --- acinclude.m4 | 1 + src/conf/domain_conf.c | 6 ++++-- src/node_device/node_device_udev.c | 3 ++- src/phyp/phyp_driver.c | 24 ++++++++++++++++-------- src/qemu/qemu_command.c | 6 ++++-- src/qemu/qemu_driver.c | 9 ++++++--- src/qemu/qemu_hotplug.c | 4 ++-- src/qemu/qemu_monitor_text.c | 2 +- src/qemu/qemu_process.c | 3 ++- src/remote/remote_driver.c | 12 +++++++----- src/security/security_selinux.c | 3 ++- src/storage/storage_backend_iscsi.c | 25 ++++++++++++------------- src/util/util.c | 3 ++- src/vbox/vbox_tmpl.c | 28 ++++++++++++++-------------- src/xenapi/xenapi_driver.c | 24 ++++++++++++++---------- src/xenapi/xenapi_utils.c | 10 ++++++---- 16 files changed, 95 insertions(+), 68 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 838ec46..22eb7af 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -49,6 +49,7 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ try_compiler_flags="$try_compiler_flags -Wredundant-decls" try_compiler_flags="$try_compiler_flags -Wno-sign-compare" try_compiler_flags="$try_compiler_flags -Wlogical-op" + try_compiler_flags="$try_compiler_flags -Wjump-misses-init" try_compiler_flags="$try_compiler_flags $common_flags" if test "$enable_compile_warnings" = "error" ; then try_compiler_flags="$try_compiler_flags -Werror" diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b6aaf33..90a1317 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3557,6 +3557,8 @@ virDomainTimerDefParseXML(const xmlNodePtr node, virDomainTimerDefPtr def; xmlNodePtr oldnode = ctxt->node; + xmlNodePtr catchup; + int ret; if (VIR_ALLOC(def) < 0) { virReportOOMError(); @@ -3610,7 +3612,7 @@ virDomainTimerDefParseXML(const xmlNodePtr node, } } - int ret = virXPathULong("string(./frequency)", ctxt, &def->frequency); + ret = virXPathULong("string(./frequency)", ctxt, &def->frequency); if (ret == -1) { def->frequency = 0; } else if (ret < 0) { @@ -3629,7 +3631,7 @@ virDomainTimerDefParseXML(const xmlNodePtr node, } } - xmlNodePtr catchup = virXPathNode("./catchup", ctxt); + catchup = virXPathNode("./catchup", ctxt); if (catchup != NULL) { ret = virXPathULong("string(./catchup/@threshold)", ctxt, &def->catchup.threshold); diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 44df16e..372f1d1 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -415,6 +415,7 @@ static int udevProcessPCI(struct udev_device *device, const char *syspath = NULL; union _virNodeDevCapData *data = &def->caps->data; int ret = -1; + char *p; syspath = udev_device_get_syspath(device); @@ -425,7 +426,7 @@ static int udevProcessPCI(struct udev_device *device, goto out; } - char *p = strrchr(syspath, '/'); + p = strrchr(syspath, '/'); if ((p == NULL) || (udevStrToLong_ui(p+1, &p, diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 51f9ff6..b17d90b 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -1337,6 +1337,7 @@ phypGetLparNAME(LIBSSH2_SESSION * session, const char *managed_system, char *ret = NULL; int exit_status = 0; virBuffer buf = VIR_BUFFER_INITIALIZER; + char *char_ptr; virBufferAddLit(&buf, "lssyscfg -r lpar"); if (system_type == HMC) @@ -1354,7 +1355,7 @@ phypGetLparNAME(LIBSSH2_SESSION * session, const char *managed_system, if (exit_status < 0 || ret == NULL) goto err; - char *char_ptr = strchr(ret, '\n'); + char_ptr = strchr(ret, '\n'); if (char_ptr) *char_ptr = '\0'; @@ -1675,6 +1676,7 @@ phypGetLparProfile(virConnectPtr conn, int lpar_id) char *cmd = NULL; char *ret = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; + char *char_ptr; virBufferAddLit(&buf, "lssyscfg"); if (system_type == HMC) @@ -1694,7 +1696,7 @@ phypGetLparProfile(virConnectPtr conn, int lpar_id) if (exit_status < 0 || ret == NULL) goto err; - char *char_ptr = strchr(ret, '\n'); + char_ptr = strchr(ret, '\n'); if (char_ptr) *char_ptr = '\0'; @@ -1892,6 +1894,7 @@ phypGetVIOSFreeSCSIAdapter(virConnectPtr conn) char *cmd = NULL; char *ret = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; + char *char_ptr; if (system_type == HMC) virBufferVSprintf(&buf, "viosvrcmd -m %s --id %d -c '", @@ -1916,7 +1919,7 @@ phypGetVIOSFreeSCSIAdapter(virConnectPtr conn) if (exit_status < 0 || ret == NULL) goto err; - char *char_ptr = strchr(ret, '\n'); + char_ptr = strchr(ret, '\n'); if (char_ptr) *char_ptr = '\0'; @@ -2154,6 +2157,7 @@ phypVolumeGetKey(virConnectPtr conn, char *key, const char *name) char *cmd = NULL; char *ret = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; + char *char_ptr; if (system_type == HMC) virBufferVSprintf(&buf, "viosvrcmd -m %s --id %d -c '", @@ -2178,7 +2182,7 @@ phypVolumeGetKey(virConnectPtr conn, char *key, const char *name) if (exit_status < 0 || ret == NULL) goto err; - char *char_ptr = strchr(ret, '\n'); + char_ptr = strchr(ret, '\n'); if (char_ptr) *char_ptr = '\0'; @@ -2209,6 +2213,7 @@ phypGetStoragePoolDevice(virConnectPtr conn, char *name) char *cmd = NULL; char *ret = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; + char *char_ptr; if (system_type == HMC) virBufferVSprintf(&buf, "viosvrcmd -m %s --id %d -c '", @@ -2233,7 +2238,7 @@ phypGetStoragePoolDevice(virConnectPtr conn, char *name) if (exit_status < 0 || ret == NULL) goto err; - char *char_ptr = strchr(ret, '\n'); + char_ptr = strchr(ret, '\n'); if (char_ptr) *char_ptr = '\0'; @@ -2474,6 +2479,7 @@ phypVolumeGetPhysicalVolumeByStoragePool(virStorageVolPtr vol, char *sp) char *cmd = NULL; char *ret = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; + char *char_ptr; if (system_type == HMC) virBufferVSprintf(&buf, "viosvrcmd -m %s --id %d -c '", @@ -2498,7 +2504,7 @@ phypVolumeGetPhysicalVolumeByStoragePool(virStorageVolPtr vol, char *sp) if (exit_status < 0 || ret == NULL) goto err; - char *char_ptr = strchr(ret, '\n'); + char_ptr = strchr(ret, '\n'); if (char_ptr) *char_ptr = '\0'; @@ -2723,6 +2729,8 @@ phypVolumeGetPath(virStorageVolPtr vol) char *sp = NULL; char *path = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; + char *char_ptr; + char *pv; if (system_type == HMC) virBufferVSprintf(&buf, "viosvrcmd -m %s --id %d -c '", @@ -2748,12 +2756,12 @@ phypVolumeGetPath(virStorageVolPtr vol) if (exit_status < 0 || sp == NULL) goto err; - char *char_ptr = strchr(sp, '\n'); + char_ptr = strchr(sp, '\n'); if (char_ptr) *char_ptr = '\0'; - char *pv = phypVolumeGetPhysicalVolumeByStoragePool(vol, sp); + pv = phypVolumeGetPhysicalVolumeByStoragePool(vol, sp); if (pv) { if (virAsprintf(&path, "/%s/%s/%s", pv, sp, vol->name) < 0) { diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 3138943..3d25ba4 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3727,6 +3727,8 @@ qemuBuildCommandLine(virConnectPtr conn, for (i = 0 ; i < def->nchannels ; i++) { virDomainChrDefPtr channel = def->channels[i]; char *devstr; + char *addr; + int port; switch(channel->targetType) { case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD: @@ -3745,10 +3747,10 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArg(cmd, devstr); VIR_FREE(devstr); - char *addr = virSocketFormatAddr(channel->target.addr); + addr = virSocketFormatAddr(channel->target.addr); if (!addr) goto error; - int port = virSocketGetPort(channel->target.addr); + port = virSocketGetPort(channel->target.addr); virCommandAddArg(cmd, "-netdev"); virCommandAddArgFormat(cmd, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5aa715e..48fe266 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1426,6 +1426,7 @@ static int qemudDomainShutdown(virDomainPtr dom) { struct qemud_driver *driver = dom->conn->privateData; virDomainObjPtr vm; int ret = -1; + qemuDomainObjPrivatePtr priv; qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); @@ -1448,7 +1449,7 @@ static int qemudDomainShutdown(virDomainPtr dom) { goto endjob; } - qemuDomainObjPrivatePtr priv = vm->privateData; + priv = vm->privateData; qemuDomainObjEnterMonitor(vm); ret = qemuMonitorSystemPowerdown(priv->mon); qemuDomainObjExitMonitor(vm); @@ -4748,6 +4749,7 @@ qemudDomainBlockStats (virDomainPtr dom, int i, ret = -1; virDomainObjPtr vm; virDomainDiskDefPtr disk = NULL; + qemuDomainObjPrivatePtr priv; qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); @@ -4788,7 +4790,7 @@ qemudDomainBlockStats (virDomainPtr dom, goto endjob; } - qemuDomainObjPrivatePtr priv = vm->privateData; + priv = vm->privateData; qemuDomainObjEnterMonitor(vm); ret = qemuMonitorGetBlockStatsInfo(priv->mon, disk->info.alias, @@ -4995,6 +4997,7 @@ qemudDomainMemoryPeek (virDomainPtr dom, virDomainObjPtr vm; char *tmp = NULL; int fd = -1, ret = -1; + qemuDomainObjPrivatePtr priv; qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); @@ -5035,7 +5038,7 @@ qemudDomainMemoryPeek (virDomainPtr dom, goto endjob; } - qemuDomainObjPrivatePtr priv = vm->privateData; + priv = vm->privateData; qemuDomainObjEnterMonitor(vm); if (flags == VIR_MEMORY_VIRTUAL) { if (qemuMonitorSaveVirtualMemory(priv->mon, offset, size, tmp) < 0) { diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 9082515..b03f774 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -51,8 +51,8 @@ int qemuDomainChangeEjectableMedia(struct qemud_driver *driver, int i; int ret; char *driveAlias = NULL; + qemuDomainObjPrivatePtr priv; - origdisk = NULL; for (i = 0 ; i < vm->def->ndisks ; i++) { if (vm->def->disks[i]->bus == disk->bus && STREQ(vm->def->disks[i]->dst, disk->dst)) { @@ -90,7 +90,7 @@ int qemuDomainChangeEjectableMedia(struct qemud_driver *driver, if (!(driveAlias = qemuDeviceDriveHostAlias(origdisk, qemuCaps))) goto error; - qemuDomainObjPrivatePtr priv = vm->privateData; + priv = vm->privateData; qemuDomainObjEnterMonitorWithDriver(driver, vm); if (disk->src) { const char *format = NULL; diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 168c60f..53781c8 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -1873,7 +1873,7 @@ int qemuMonitorTextGetPtyPaths(qemuMonitorPtr mon, if (qemuMonitorHMPCommand(mon, "info chardev", &reply) < 0) { qemuReportError(VIR_ERR_OPERATION_FAILED, "%s", _("failed to retrieve chardev info in qemu with 'info chardev'")); - goto cleanup; + return -1; } char *pos; /* The current start of searching */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 2fc2b6c..870d942 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1017,6 +1017,7 @@ qemuProcessWaitForMonitor(struct qemud_driver* driver, int logfd; int ret = -1; virHashTablePtr paths = NULL; + qemuDomainObjPrivatePtr priv; if ((logfd = qemuProcessLogReadFD(driver->logDir, vm->def->name, pos)) < 0) return -1; @@ -1039,7 +1040,7 @@ qemuProcessWaitForMonitor(struct qemud_driver* driver, if (paths == NULL) goto cleanup; - qemuDomainObjPrivatePtr priv = vm->privateData; + priv = vm->privateData; qemuDomainObjEnterMonitorWithDriver(driver, vm); ret = qemuMonitorGetPtyPaths(priv->mon, paths); qemuDomainObjExitMonitorWithDriver(driver, vm); diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index bf94e70..166968a 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -869,12 +869,14 @@ doRemoteOpen (virConnectPtr conn, goto failed; /* Finally we can call the remote side's open function. */ - remote_open_args args = { &name, flags }; + { + remote_open_args args = { &name, flags }; - if (call (conn, priv, REMOTE_CALL_IN_OPEN, REMOTE_PROC_OPEN, - (xdrproc_t) xdr_remote_open_args, (char *) &args, - (xdrproc_t) xdr_void, (char *) NULL) == -1) - goto failed; + if (call (conn, priv, REMOTE_CALL_IN_OPEN, REMOTE_PROC_OPEN, + (xdrproc_t) xdr_remote_open_args, (char *) &args, + (xdrproc_t) xdr_void, (char *) NULL) == -1) + goto failed; + } /* Now try and find out what URI the daemon used */ if (conn->uri == NULL) { diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 587b3b5..d870616 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -95,8 +95,9 @@ SELinuxGenNewContext(const char *oldcontext, const char *mcs) { char *newcontext = NULL; char *scontext = strdup(oldcontext); + context_t con; if (!scontext) goto err; - context_t con = context_new(scontext); + con = context_new(scontext); if (!con) goto err; context_range_set(con, mcs); newcontext = strdup(context_str(con)); diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index 6eff5f5..f554537 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -1,7 +1,7 @@ /* * storage_backend_iscsi.c: storage backend for iSCSI handling * - * Copyright (C) 2007-2008, 2010 Red Hat, Inc. + * Copyright (C) 2007-2008, 2010-2011 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -269,6 +269,15 @@ virStorageBackendCreateIfaceIQN(const char *initiatoriqn, { int ret = -1, exitstatus = -1; char temp_ifacename[32]; + const char *const cmdargv1[] = { + ISCSIADM, "--mode", "iface", "--interface", + temp_ifacename, "--op", "new", NULL + }; + const char *const cmdargv2[] = { + ISCSIADM, "--mode", "iface", "--interface", temp_ifacename, + "--op", "update", "--name", "iface.initiatorname", "--value", + initiatoriqn, NULL + }; if (virRandomInitialize(time(NULL) ^ getpid()) == -1) { virStorageReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -277,12 +286,8 @@ virStorageBackendCreateIfaceIQN(const char *initiatoriqn, goto out; } - snprintf(temp_ifacename, sizeof(temp_ifacename), "libvirt-iface-%08x", virRandom(1024 * 1024 * 1024)); - - const char *const cmdargv1[] = { - ISCSIADM, "--mode", "iface", "--interface", - &temp_ifacename[0], "--op", "new", NULL - }; + snprintf(temp_ifacename, sizeof(temp_ifacename), "libvirt-iface-%08x", + virRandom(1024 * 1024 * 1024)); VIR_DEBUG("Attempting to create interface '%s' with IQN '%s'", &temp_ifacename[0], initiatoriqn); @@ -298,12 +303,6 @@ virStorageBackendCreateIfaceIQN(const char *initiatoriqn, goto out; } - const char *const cmdargv2[] = { - ISCSIADM, "--mode", "iface", "--interface", &temp_ifacename[0], - "--op", "update", "--name", "iface.initiatorname", "--value", - initiatoriqn, NULL - }; - /* Note that we ignore the exitstatus. Older versions of iscsiadm tools * returned an exit status of > 0, even if they succeeded. We will just * rely on whether iface file got updated properly. */ diff --git a/src/util/util.c b/src/util/util.c index 43794b1..7384517 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -467,6 +467,7 @@ __virExec(const char *const*argv, int childerr = -1; int tmpfd; const char *binary = NULL; + int forkRet; if (argv[0][0] != '/') { if (!(binary = virFindFileInPath(argv[0]))) { @@ -544,7 +545,7 @@ __virExec(const char *const*argv, childerr = null; } - int forkRet = virFork(&pid); + forkRet = virFork(&pid); if (pid < 0) { goto cleanup; diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 8bd27dd..0fbfba5 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -7186,12 +7186,15 @@ static virNetworkPtr vboxNetworkDefineCreateXML(virConnectPtr conn, const char * } } #else /* VBOX_API_VERSION != 2002 */ - IProgress *progress = NULL; - host->vtbl->CreateHostOnlyNetworkInterface(host, &networkInterface, &progress); + { + IProgress *progress = NULL; + host->vtbl->CreateHostOnlyNetworkInterface(host, &networkInterface, + &progress); - if (progress) { - progress->vtbl->WaitForCompletion(progress, -1); - VBOX_RELEASE(progress); + if (progress) { + progress->vtbl->WaitForCompletion(progress, -1); + VBOX_RELEASE(progress); + } } #endif /* VBOX_API_VERSION != 2002 */ @@ -7342,6 +7345,8 @@ static virNetworkPtr vboxNetworkDefineXML(virConnectPtr conn, const char *xml) { static int vboxNetworkUndefineDestroy(virNetworkPtr network, bool removeinterface) { VBOX_OBJECT_HOST_CHECK(network->conn, int, -1); char *networkNameUtf8 = NULL; + PRUnichar *networkInterfaceNameUtf16 = NULL; + IHostNetworkInterface *networkInterface = NULL; /* Current limitation of the function for VirtualBox 2.2.* is * that you can't delete the default hostonly adaptor namely: @@ -7356,9 +7361,6 @@ static int vboxNetworkUndefineDestroy(virNetworkPtr network, bool removeinterfac goto cleanup; } - PRUnichar *networkInterfaceNameUtf16 = NULL; - IHostNetworkInterface *networkInterface = NULL; - VBOX_UTF8_TO_UTF16(network->name, &networkInterfaceNameUtf16); host->vtbl->FindHostNetworkInterfaceByName(host, networkInterfaceNameUtf16, &networkInterface); @@ -7433,6 +7435,8 @@ static int vboxNetworkUndefine(virNetworkPtr network) { static int vboxNetworkCreate(virNetworkPtr network) { VBOX_OBJECT_HOST_CHECK(network->conn, int, -1); char *networkNameUtf8 = NULL; + PRUnichar *networkInterfaceNameUtf16 = NULL; + IHostNetworkInterface *networkInterface = NULL; /* Current limitation of the function for VirtualBox 2.2.* is * that the default hostonly network "vboxnet0" is always active @@ -7446,9 +7450,6 @@ static int vboxNetworkCreate(virNetworkPtr network) { goto cleanup; } - PRUnichar *networkInterfaceNameUtf16 = NULL; - IHostNetworkInterface *networkInterface = NULL; - VBOX_UTF8_TO_UTF16(network->name, &networkInterfaceNameUtf16); host->vtbl->FindHostNetworkInterfaceByName(host, networkInterfaceNameUtf16, &networkInterface); @@ -7509,6 +7510,8 @@ static char *vboxNetworkDumpXML(virNetworkPtr network, int flags ATTRIBUTE_UNUSE virNetworkDefPtr def = NULL; virNetworkIpDefPtr ipdef = NULL; char *networkNameUtf8 = NULL; + PRUnichar *networkInterfaceNameUtf16 = NULL; + IHostNetworkInterface *networkInterface = NULL; if (VIR_ALLOC(def) < 0) { virReportOOMError(); @@ -7526,9 +7529,6 @@ static char *vboxNetworkDumpXML(virNetworkPtr network, int flags ATTRIBUTE_UNUSE goto cleanup; } - PRUnichar *networkInterfaceNameUtf16 = NULL; - IHostNetworkInterface *networkInterface = NULL; - VBOX_UTF8_TO_UTF16(network->name, &networkInterfaceNameUtf16); host->vtbl->FindHostNetworkInterfaceByName(host, networkInterfaceNameUtf16, &networkInterface); diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 27206a0..60b23c7 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -56,21 +56,24 @@ static virCapsPtr getCapsObject (void) { + virCapsGuestPtr guest1, guest2; + virCapsGuestDomainPtr domain1, domain2; virCapsPtr caps = virCapabilitiesNew("x86_64", 0, 0); + if (!caps) { virReportOOMError(); return NULL; } - virCapsGuestPtr guest1 = virCapabilitiesAddGuest(caps, "hvm", "x86_64", 0, "", "", 0, NULL); + guest1 = virCapabilitiesAddGuest(caps, "hvm", "x86_64", 0, "", "", 0, NULL); if (!guest1) goto error_cleanup; - virCapsGuestDomainPtr domain1 = virCapabilitiesAddGuestDomain(guest1, "xen", "", "", 0, NULL); + domain1 = virCapabilitiesAddGuestDomain(guest1, "xen", "", "", 0, NULL); if (!domain1) goto error_cleanup; - virCapsGuestPtr guest2 = virCapabilitiesAddGuest(caps, "xen", "x86_64", 0, "", "", 0, NULL); + guest2 = virCapabilitiesAddGuest(caps, "xen", "x86_64", 0, "", "", 0, NULL); if (!guest2) goto error_cleanup; - virCapsGuestDomainPtr domain2 = virCapabilitiesAddGuestDomain(guest2, "xen", "", "", 0, NULL); + domain2 = virCapabilitiesAddGuestDomain(guest2, "xen", "", "", 0, NULL); if (!domain2) goto error_cleanup; @@ -1234,6 +1237,12 @@ xenapiDomainDumpXML (virDomainPtr dom, int flags ATTRIBUTE_UNUSED) xen_string_string_map *result=NULL; xen_session *session = ((struct _xenapiPrivate *)(dom->conn->privateData))->session; virDomainDefPtr defPtr = NULL; + char *boot_policy = NULL; + unsigned long memory=0; + int64_t dynamic_mem=0; + char *val = NULL; + struct xen_vif_set *vif_set = NULL; + char *xml; if (!xen_vm_get_by_name_label(session, &vms, dom->name)) return NULL; if (vms->size != 1) { @@ -1253,7 +1262,6 @@ xenapiDomainDumpXML (virDomainPtr dom, int flags ATTRIBUTE_UNUSED) memcpy(defPtr->uuid, dom->uuid, VIR_UUID_BUFLEN); if (!(defPtr->name = strdup(dom->name))) goto error_cleanup; - char *boot_policy = NULL; xen_vm_get_hvm_boot_policy(session, &boot_policy, vm); if (STREQ(boot_policy,"BIOS order")) { if (!(defPtr->os.type = strdup("hvm"))) { @@ -1318,7 +1326,6 @@ xenapiDomainDumpXML (virDomainPtr dom, int flags ATTRIBUTE_UNUSED) if (!(defPtr->os.bootloader = strdup("pygrub"))) goto error_cleanup; } - char *val = NULL; xen_vm_get_pv_bootloader_args(session, &val, vm); if (STRNEQ(val, "")) { if (!(defPtr->os.bootloaderArgs = strdup(val))) { @@ -1327,10 +1334,8 @@ xenapiDomainDumpXML (virDomainPtr dom, int flags ATTRIBUTE_UNUSED) } VIR_FREE(val); } - unsigned long memory=0; memory = xenapiDomainGetMaxMemory(dom); defPtr->mem.max_balloon = memory; - int64_t dynamic_mem=0; if (xen_vm_get_memory_dynamic_max(session, &dynamic_mem, vm)) { defPtr->mem.cur_balloon = (unsigned long) (dynamic_mem / 1024); } else { @@ -1365,7 +1370,6 @@ xenapiDomainDumpXML (virDomainPtr dom, int flags ATTRIBUTE_UNUSED) } xen_string_string_map_free(result); } - struct xen_vif_set *vif_set = NULL; xen_vm_get_vifs(session, &vif_set, vm); if (vif_set) { int i; @@ -1403,7 +1407,7 @@ xenapiDomainDumpXML (virDomainPtr dom, int flags ATTRIBUTE_UNUSED) xen_vif_set_free(vif_set); } if (vms) xen_vm_set_free(vms); - char *xml = virDomainDefFormat(defPtr, 0); + xml = virDomainDefFormat(defPtr, 0); virDomainDefFree(defPtr); return xml; diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c index 2ec5f9e..f50610a 100644 --- a/src/xenapi/xenapi_utils.c +++ b/src/xenapi/xenapi_utils.c @@ -1,5 +1,6 @@ /* * xenapi_utils.c: Xen API driver -- utils parts. + * Copyright (C) 2011 Red Hat, Inc. * Copyright (C) 2009, 2010 Citrix Ltd. * * This library is free software; you can redistribute it and/or @@ -462,6 +463,11 @@ createVMRecordFromXml (virConnectPtr conn, virDomainDefPtr def, xen_vm_record **record, xen_vm *vm) { char uuidStr[VIR_UUID_STRING_BUFLEN]; + xen_string_string_map *strings = NULL; + int device_number = 0; + char *bridge = NULL, *mac = NULL; + int i; + *record = xen_vm_record_alloc(); if (!((*record)->name_label = strdup(def->name))) goto error_cleanup; @@ -521,7 +527,6 @@ createVMRecordFromXml (virConnectPtr conn, virDomainDefPtr def, if (def->onCrash) (*record)->actions_after_crash = actionCrashLibvirt2XenapiEnum(def->onCrash); - xen_string_string_map *strings = NULL; if (def->features) { if (def->features & (1 << VIR_DOMAIN_FEATURE_ACPI)) allocStringMap(&strings, (char *)"acpi", (char *)"true"); @@ -546,9 +551,6 @@ createVMRecordFromXml (virConnectPtr conn, virDomainDefPtr def, return -1; } - int device_number = 0; - char *bridge = NULL, *mac = NULL; - int i; for (i = 0; i < def->nnets; i++) { if (def->nets[i]->type == VIR_DOMAIN_NET_TYPE_BRIDGE) { if (def->nets[i]->data.bridge.brname) -- 1.7.4

2 2

[libvirt] [PATCH v2] Improve SCSI volume key generation
by Daniel P. Berrange 04 Apr '11

04 Apr '11

An update of patch 10 from: http://www.redhat.com/archives/libvir-list/2010-November/msg00555.html The SCSI volumes get a better 'key' field based on the fully qualified volume path. All SCSI volumes have a unique serial available in hardware which can be obtained by sending a suitable SCSI command. Call out to udev's 'scsi_id' command to fetch this value In v2: - Only use scsi_id if HAVE_UDEV is defined. This ensures use only on udev >= 145 and thus avoids problem of different semantics on RHEL-5 vintage udev - Use virCommandPtr instead of virExec - Use VIR_FDOPEN instead of fdopen * src/storage/storage_backend_scsi.c: Improve volume key field value stability and uniqueness --- src/storage/storage_backend_scsi.c | 65 +++++++++++++++++++++++++++++++++-- 1 files changed, 61 insertions(+), 4 deletions(-) diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index d880d65..ed91703 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -33,6 +33,7 @@ #include "memory.h" #include "logging.h" #include "files.h" +#include "command.h" #define VIR_FROM_THIS VIR_FROM_STORAGE @@ -160,6 +161,65 @@ cleanup: return ret; } + +static char * +virStorageBackendSCSISerial(const char *dev) +{ + char *serial = NULL; +#ifdef HAVE_UDEV + int fd = -1; + FILE *list = NULL; + char line[1024]; + virCommandPtr cmd = virCommandNewArgList( + "/lib/udev/scsi_id", + "--replace-whitespace", + "--whitelisted", + "--device", dev, + NULL + ); + + /* Run the program and capture its output */ + virCommandSetOutputFD(cmd, &fd); + if (virCommandRunAsync(cmd, NULL) < 0) + goto cleanup; + + if ((list = VIR_FDOPEN(fd, "r")) == NULL) { + virStorageReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("cannot read fd")); + goto cleanup; + } + + if (fgets(line, sizeof(line), list)) { + char *nl = strchr(line, '\n'); + if (nl) + *nl = '\0'; + VIR_ERROR("GOT ID %s\n", line); + serial = strdup(line); + } else { + VIR_ERROR("NO ID %s\n", dev); + serial = strdup(dev); + } + + if (!serial) { + virReportOOMError(); + goto cleanup; + } + +cleanup: + if (list) + fclose(list); + else + VIR_FORCE_CLOSE(fd); + + virCommandFree(cmd); +#else + if (!(serial = strdup(dev))) + virReportOOMError(); +#endif + return serial; +} + + static int virStorageBackendSCSINewLun(virStoragePoolObjPtr pool, uint32_t host ATTRIBUTE_UNUSED, @@ -233,10 +293,7 @@ virStorageBackendSCSINewLun(virStoragePoolObjPtr pool, goto free_vol; } - /* XXX should use logical unit's UUID instead */ - vol->key = strdup(vol->target.path); - if (vol->key == NULL) { - virReportOOMError(); + if (!(vol->key = virStorageBackendSCSISerial(vol->target.path))) { retval = -1; goto free_vol; } -- 1.7.4

2 1

[libvirt] [PATCH] Use gnulib's manywarnings & warnings modules
by Daniel P. Berrange 04 Apr '11

04 Apr '11

Remove custom code for checking compiler warnings, using gl_WARN_ADD instead. Don't list all flags ourselves, use gnulib's gl_MANYWARN_ALL_GCC to get all possible GCC flags, then turn off the ones we don't want yet. This patch alone doesn't buy us much. What we want is some more followup patches, which remove entries from the 'dontwarn' list, fixing up the corresponding code problems. We also need to fix our stack usage in many places so we can lower the ridiculous size of -Wframe-larger-than=20480 * acinclude.m4: Rewrite to use gl_WARN_ADD and gl_MANYWARN_ALL_GCC * bootstrap.conf: Add warnings & manywarnings * configure.ac: Switch to gl_WARN_ADD * m4/compiler-flags.m4: Obsoleted by gl_WARN_ADD --- acinclude.m4 | 153 ++++++++++++++++++++++++++------------------------ bootstrap.conf | 2 + configure.ac | 15 +++-- m4/compiler-flags.m4 | 48 ---------------- 4 files changed, 91 insertions(+), 127 deletions(-) delete mode 100644 m4/compiler-flags.m4 diff --git a/acinclude.m4 b/acinclude.m4 index 838ec46..63bfec7 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,11 +1,6 @@ dnl -dnl Taken from gnome-common/macros2/gnome-compiler-flags.m4 -dnl -dnl We've added: -dnl -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -dnl We've removed -dnl CFLAGS="$realsave_CFLAGS" -dnl to avoid clobbering user-specified CFLAGS +dnl Enable all known GCC compiler warnings, except for those +dnl we can't yet cope with dnl AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ dnl ****************************** @@ -13,90 +8,102 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ dnl ****************************** AC_ARG_ENABLE(compile-warnings, - [AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], + [AC_HELP_STRING([--enable-compile-warnings=@<:@no/yes/error@:>@], [Turn on compiler warnings])],, - [enable_compile_warnings="m4_default([$1],[maximum])"]) - - warnCFLAGS= - - common_flags= - common_flags="$common_flags -Wp,-D_FORTIFY_SOURCE=2" - common_flags="$common_flags -fexceptions" - common_flags="$common_flags -fasynchronous-unwind-tables" - common_flags="$common_flags -fdiagnostics-show-option" + [enable_compile_warnings="m4_default([$1],[yes])"]) case "$enable_compile_warnings" in no) try_compiler_flags="" ;; - minimum) - try_compiler_flags="-Wall -Wformat -Wformat-security $common_flags" - ;; - yes) - try_compiler_flags="-Wall -Wformat -Wformat-security -Wmissing-prototypes $common_flags" - ;; - maximum|error) - try_compiler_flags="-Wall -Wformat -Wformat-security" - try_compiler_flags="$try_compiler_flags -Wmissing-prototypes" - try_compiler_flags="$try_compiler_flags -Wnested-externs " - try_compiler_flags="$try_compiler_flags -Wpointer-arith" - try_compiler_flags="$try_compiler_flags -Wextra -Wshadow" - try_compiler_flags="$try_compiler_flags -Wcast-align" - try_compiler_flags="$try_compiler_flags -Wwrite-strings" - try_compiler_flags="$try_compiler_flags -Waggregate-return" - try_compiler_flags="$try_compiler_flags -Wstrict-prototypes" - try_compiler_flags="$try_compiler_flags -Winline" - try_compiler_flags="$try_compiler_flags -Wredundant-decls" - try_compiler_flags="$try_compiler_flags -Wno-sign-compare" - try_compiler_flags="$try_compiler_flags -Wlogical-op" - try_compiler_flags="$try_compiler_flags $common_flags" - if test "$enable_compile_warnings" = "error" ; then - try_compiler_flags="$try_compiler_flags -Werror" - fi + yes|minimum|maximum|error) + + # List of warnings that are not relevant / wanted + dontwarn="$dontwarn -Wc++-compat" # Don't care about C++ compiler compat + dontwarn="$dontwarn -Wtraditional" # Don't care about ancient C standard compat + dontwarn="$dontwarn -Wtraditional-conversion" # Don't care about ancient C standard compat + dontwarn="$dontwarn -Wsystem-headers" # Ignore warnings in /usr/include + dontwarn="$dontwarn -Wpadded" # Happy for compiler to add struct padding + dontwarn="$dontwarn -Wunreachable-code" # GCC very confused with -O2 + dontwarn="$dontwarn -Wconversion" # Too many to deal with + dontwarn="$dontwarn -Wsign-conversion" # Too many to deal with + dontwarn="$dontwarn -Wvla" # GNULIB gettext.h violates + dontwarn="$dontwarn -Wundef" # Many GNULIB violations + dontwarn="$dontwarn -Wcast-qual" # Need to allow bad cast for execve() + dontwarn="$dontwarn -Wlong-long" # We need to use long long in many places + + # We might fundamentally need some of these disabled forever, but ideally + # we'd turn many of them on + dontwarn="$dontwarn -Wformat-nonliteral" + dontwarn="$dontwarn -Wswitch-default" + dontwarn="$dontwarn -Wswitch-enum" + dontwarn="$dontwarn -Wstrict-overflow" + dontwarn="$dontwarn -Wfloat-equal" + dontwarn="$dontwarn -Wdeclaration-after-statement" + dontwarn="$dontwarn -Wunsafe-loop-optimizations" + dontwarn="$dontwarn -Wcast-qual" + dontwarn="$dontwarn -Wconversion" + dontwarn="$dontwarn -Wsign-conversion" + dontwarn="$dontwarn -Wold-style-definition" + dontwarn="$dontwarn -Wmissing-noreturn" + dontwarn="$dontwarn -Wpacked" + dontwarn="$dontwarn -Wunused-macros" + dontwarn="$dontwarn -W" + dontwarn="$dontwarn -Woverlength-strings" + dontwarn="$dontwarn -Wmissing-format-attribute" + dontwarn="$dontwarn -Wstack-protector" + + # Get all possible GCC warnings + gl_MANYWARN_ALL_GCC([maybewarn]) + + # Remove the ones we don't want, blacklisted earlier + gl_MANYWARN_COMPLEMENT([wantwarn], [$maybewarn], [$dontwarn]) + + # Check for $CC support of each warning + for w in $wantwarn; do + gl_WARN_ADD([$w]) + done + + # This should be < 256 really, but with PATH_MAX everywhere + # we have doom, even with 4096. In fact we have some functions + # with several PATH_MAX sized variables :-( We should kill off + # all PATH_MAX usage and then lower this limit + gl_WARN_ADD([-Wframe-larger-than=20480]) + dnl gl_WARN_ADD([-Wframe-larger-than=4096]) + dnl gl_WARN_ADD([-Wframe-larger-than=256]) + + # Extra special flags + gl_WARN_ADD([-Wp,-D_FORTIFY_SOURCE=2]) + dnl Fedora only uses -fstack-protector, but doesn't seem to + dnl be great overhead in adding -fstack-protector-all instead + dnl gl_WARN_ADD([-fstack-protector]) + gl_WARN_ADD([-fstack-protector-all]) + gl_WARN_ADD([--param=ssp-buffer-size=4]) + gl_WARN_ADD([-fexceptions]) + gl_WARN_ADD([-fasynchronous-unwind-tables]) + gl_WARN_ADD([-fdiagnostics-show-option]) + + if test "$enable_compile_warnings" = "error" + then + gl_WARN_ADD([-Werror]) + fi ;; *) AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) ;; esac - COMPILER_FLAGS= - for option in $try_compiler_flags; do - gl_COMPILER_FLAGS($option) - done - unset option - unset try_compiler_flags - - AC_ARG_ENABLE(iso-c, - AC_HELP_STRING([--enable-iso-c], - [Try to warn if code is not ISO C ]),, - [enable_iso_c=no]) - - AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) - complCFLAGS= - if test "x$enable_iso_c" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -ansi" ;; - esac - case " $CFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCFLAGS) - - WARN_CFLAGS="$COMPILER_FLAGS $complCFLAGS" WARN_LDFLAGS=$WARN_CFLAGS AC_SUBST([WARN_CFLAGS]) AC_SUBST([WARN_LDFLAGS]) dnl Needed to keep compile quiet on python 2.4 - COMPILER_FLAGS= - gl_COMPILER_FLAGS(-Wno-redundant-decls) - WARN_PYTHON_CFLAGS=$COMPILER_FLAGS + save_WARN_CFLAGS=$WARN_CFLAGS + WARN_CFLAGS= + gl_WARN_ADD(-Wno-redundant-decls) + WARN_PYTHON_CFLAGS=$WARN_CFLAGS AC_SUBST(WARN_PYTHON_CFLAGS) + WARN_CFLAGS=$save_WARN_CFLAGS ]) diff --git a/bootstrap.conf b/bootstrap.conf index 733c354..e8cdf76 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -45,6 +45,7 @@ ignore-value inet_pton ioctl maintainer-makefile +manywarnings mkstemp mkstemps mktempd @@ -80,6 +81,7 @@ timegm uname useless-if-before-free usleep +warnings vasprintf verify vc-list-files diff --git a/configure.ac b/configure.ac index 2378d9a..0b9855b 100644 --- a/configure.ac +++ b/configure.ac @@ -1970,12 +1970,14 @@ AC_ARG_ENABLE([test-coverage], enable_coverage=$enableval if test "${enable_coverage}" = yes; then - COMPILER_FLAGS= - gl_COMPILER_FLAGS(-fprofile-arcs) - gl_COMPILER_FLAGS(-ftest-coverage) - AC_SUBST([COVERAGE_CFLAGS], [$COMPILER_FLAGS]) - AC_SUBST([COVERAGE_LDFLAGS], [$COMPILER_FLAGS]) - COMPILER_FLAGS= + save_WARN_CFLAGS=$WARN_CFLAGS + WARN_CFLAGS= + gl_WARN_ADD(-fprofile-arcs) + gl_WARN_ADD(-ftest-coverage) + COVERAGE_FLAGS=$WARN_CFLAGS + AC_SUBST([COVERAGE_CFLAGS], [$COVERAGE_FLAGS]) + AC_SUBST([COVERAGE_LDFLAGS], [$COVERAGE_FLAGS]) + WARN_CFLAGS=$save_WARN_CFLAGS fi AC_ARG_ENABLE([test-oom], @@ -2538,6 +2540,7 @@ AC_MSG_NOTICE([Miscellaneous]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([ Debug: $enable_debug]) AC_MSG_NOTICE([ Warnings: $enable_compile_warnings]) +AC_MSG_NOTICE([Warning Flags: $WARN_CFLAGS]) AC_MSG_NOTICE([ Readline: $lv_use_readline]) AC_MSG_NOTICE([ Python: $with_python]) AC_MSG_NOTICE([ DTrace: $with_dtrace]) diff --git a/m4/compiler-flags.m4 b/m4/compiler-flags.m4 deleted file mode 100644 index 6db4816..0000000 --- a/m4/compiler-flags.m4 +++ /dev/null @@ -1,48 +0,0 @@ -# serial 4 -# Find valid warning flags for the C Compiler. -*-Autoconf-*- -# -# Copyright (C) 2010 Red Hat, Inc. -# Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc. -# -# 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 - -# Written by Jesse Thilo. - -AC_DEFUN([gl_COMPILER_FLAGS], - [AC_MSG_CHECKING(whether compiler accepts $1) - ac_save_CFLAGS="$CFLAGS" - dnl Some flags are dependant, so we set all previously checked - dnl flags when testing. Except for -Werror which we have to - dnl check on its own, because some of our compiler flags cause - dnl warnings from the autoconf test program! - if test "$1" = "-Werror" ; then - CFLAGS="$CFLAGS $1" - else - CFLAGS="$CFLAGS $COMPILER_FLAGS $1" - fi - AC_TRY_LINK([], [], has_option=yes, has_option=no,) - echo 'int x;' >conftest.c - $CC $CFLAGS -c conftest.c 2>conftest.err - ret=$? - if test $ret != 0 || test -s conftest.err || test $has_option = "no"; then - AC_MSG_RESULT(no) - else - AC_MSG_RESULT(yes) - COMPILER_FLAGS="$COMPILER_FLAGS $1" - fi - CFLAGS="$ac_save_CFLAGS" - rm -f conftest* - ]) -- 1.7.4

2 2

[libvirt] Release of libvirt-0.9.0
by Daniel Veillard 04 Apr '11

04 Apr '11

As scheduled, libvirt 0.9.0 was tagged and pushed today, it's available from FTP at: ftp://libvirt.org/libvirt/ This is a large release w.r.t. the amount of features and changes, and well worth bumping the middle version number. We are also getting closer to a 1.0.0 release ! Features: - Support cputune cpu usage tuning (Osier Yang and Nikunj A. Dadhania) - Add public APIs for storage volume upload/download (Daniel P. Berrange) - Add public API for setting migration speed on the fly (Daniel P. Berrange) - Add libxenlight driver (Jim Fehlig and Markus Groß) - qemu: support migration to fd (Eric Blake) - libvirt: add virDomain{Get,Set}BlkioParameters (Gui Jianfeng) - setmem: introduce a new libvirt API (virDomainSetMemoryFlags) (Taku Izumi) - Expose event loop implementation as a public API (Daniel P. Berrange) - Dump the debug buffer to libvirtd.log on fatal signal (Daniel Veillard) - Audit support (Eric Blake) Documentation: - fix typo (Eric Blake) - correct invalid xml (Eric Blake) - virsh: Fix documentation for memtune command (Jiri Denemark) - Fix several formatting mistakes in doc (Michal Privoznik) - mention C89 syntax preferences (Eric Blake) - document recent hook additions (Eric Blake) - Update on the goal page (Daniel Veillard) - Document first release with spice and qxl (Cole Robinson) - Add schema definition for imagelabel (Osier Yang) - update virGetVersion description (Tiziano Mueller) - Improve logging documentation including the debug buffer (Daniel Veillard) - update windows page for initial libvirt 0.8.8 installer (Justin Clift) - formatdomain.html.in: Fix spelling PIC->PCI (Philipp Hahn) - fix missing </p> (Eric Blake) - documenting the 802.1Qbg parameters of a 'direct' interface (Gerhard Stenzel) - silence warnings about generated API docs (Eric Blake) - document <driver name='vhost'/> for interfaces (Eric Blake) - correct range of default NAT subnet (Eric Blake) - formatdomain: Add release info for disk <driver> attributes (Cole Robinson) - Fix spelling mistake: seek (Philipp Hahn) - maint: fix grammar in error message (Eric Blake) Portability: - virsh: fix mingw failure on creating nonblocking pipe (Eric Blake) - Remove iohelper on Win32 since it is not required (Daniel P. Berrange) - Fix domain events C example on Win32 (Daniel P. Berrange) - build: fix compilation on mingw (Eric Blake) - util: use SCM_RIGHTS in virFileOperation when needed (Eric Blake) - Don't use INT64_MAX in libvirt.h because it requires stdint.h (Matthias Bolte) - libvirtd: Remove indirect linking (Guido Günther) - build: avoid compiler warning on cygwin (Eric Blake) - build: fix build on cygwin (Eric Blake) - build: fix building error when building without libvirtd (Wen Congyang) - virsh: Remove indirect link against libxml2 (Guido Günther) - Fix build on cygwin (Daniel Veillard) - Add check for kill() to fix build of cgroups on win32 (Daniel P. Berrange) - build: fix broken mingw cross-compilation (Eric Blake) Bug fixes: - fix memory leak in qemuProcessHandleGraphics() (Wen Congyang) - do not lock vm while allocating memory (Wen Congyang) - Fix libxl driver startup (Daniel Veillard) - qemu: Ignore libvirt debug messages in qemu log (Jiri Denemark) - qemu: Fix improper logic of qemuCgroupSetup (Osier Yang) - free tmp after unlinking it (Wen Congyang) - qemu: Fix media eject with qemu-0.12.* (Jiri Denemark) - check whether qemuMonitorJSONHMP() failed (Wen Congyang) - do not send monitor command after monitor meet error (Wen Congyang) - qemu: unlock qemu driver before return from domain save (Hu Tao) - qemu: fix regression with fd labeling on migration (Eric Blake) - Ignore return value of virDomainObjUnref (Markus Groß) - Fix infinite loop in daemon if client quits with multiple streams open (Daniel P. Berrange) - qemu: fix regression that hangs on save failure (Eric Blake) - qemu: fix restoring a compressed save image (Eric Blake) - util: allow clearing cloexec bit (Eric Blake) - logging: always NUL-terminate circular buffer (Eric Blake) - tests: don't alter state in $HOME (Eric Blake) - qemu: don't restore state label twice (Eric Blake) - Fix syntax error in configure.ac (Osier Yang) - remote: Don't leak gnutls session on negotiation error (Matthias Bolte) - hooks: fix regression in previous patch (Eric Blake) - Add missing { for qemudDomainInterfaceStats (Philipp Hahn) - daemon: Avoid resetting errors before they are reported (Jiri Denemark) - fix the check of the output of monitor command 'device_add' (Wen Congyang) - Make error reporting in libvirtd thread safe (Jiri Denemark) - update domain status forcibly even if attach a device failed (Wen Congyang) - util: Fix return value for virJSONValueFromString if it fails (Osier Yang) - Initialization error of qemuCgroupData in Qemu host usb hotplug (Wen Congyang) - build: fix missing initializer (Eric Blake) - Fix uninitialized variable & error reporting in LXC veth setup (Daniel P. Berrange) - udev: fix regression with qemu:///session (Eric Blake) - logging: fix off-by-one bug (Eric Blake) - do not report OOM error when prepareCall() failed (Wen Congyang) - Don't return an error on failure to create blkio controller (Hu Tao) - qemu: respect locking rules (Eric Blake) - openvz: fix a simple bug in openvzListDefinedDomains() (Jean-Baptiste Rouault) - Fix delayed event delivery when SASL is active (Daniel P. Berrange) - qemu: Fix copy&paste error messages in text monitor (Jiri Denemark) - do not unref obj in qemuDomainObjExitMonitor* (Wen Congyang) - qemu: check driver name while attaching disk (Wen Congyang) - remote: Add missing virCondDestroy calls (Matthias Bolte) - build: improve rpm generation for distro backports (Eric Blake) - storage: Fix a problem which will cause libvirtd crashed (Osier Yang) - Fix misc bugs in virCommandPtr (Daniel P. Berrange) - libvirt: fix a simple bug in virDomainSetMemoryFlags() (Taku Izumi) - qemu: Check the unsigned integer overflow (Osier Yang) - audit: eliminate potential null pointer deref when auditing macvtap devices (Laine Stump) - network driver: don't send default route to clients on isolated networks (Laine Stump) - virsh: Free stream when shutdown console (Osier Yang) - Add missing checks for read only connections (Guido Günther) - qemu: fix -global argument usage (Eric Blake) - Make sure we reset the umask on the error path (Guido Günther) - qemu: Stop guest CPUs before creating a snapshot (Jiri Denemark) - qemu: Escape snapshot name passed to {save,load,del}vm (Jiri Denemark) - qemu: Fix warnings in event handlers (Jiri Denemark) - storage: Update qemu-img flag checking (Osier Yang) - Make sure the rundir is accessible by the user (Guido Günther) - Fix a wrong error message thrown to user (Hu Tao) - unlock eventLoop before calling callback function (Wen Congyang) - fixes for several memory leaks (Phil Petty) - Fix a counter bug in the log buffer (Daniel Veillard) - qemu: avoid corruption of domain hashtable and misuse of freed domains (Laine Stump) - qemu: Add missing lock of virDomainObj before calling virDomainUnref (Laine Stump) - esx: Escape password for XML (Matthias Bolte) - util: correct retry path in virFileOperation (Eric Blake) - util: Allow removing hash entries in virHashForEach (Jiri Denemark) - qemu: avoid double close on domain restore (Eric Blake) - Fix port value parsing for serial and parallel ports (Michal Novotny) - Fix off-by-1 in virFileAbsPath. (Daniel P. Berrange) - security: avoid memory leak (Eric Blake) - protect the scsi controller to be deleted when it is in use (Wen Congyang) - virsh: freecell --all getting wrong NUMA nodes count (Michal Privoznik) - remove duplicated call to reportOOMError (Christophe Fergeau) Improvements: - Make check_fc_host() and check_vport_capable() usable as rvalues (Guido Günther) - maint: avoid locale-sensitivity in string case comparisons (Eric Blake) - extend logging to record configuration-related changes (Naoya Horiguchi) - Add libvirt_iohelper to spec file (Daniel Veillard) - cputune: New tests for cputune XML (Osier Yang) - cputune: Support cputune for xend driver (Osier Yang) - cputune: Support cputune for lxc driver (Osier Yang) - cputune: Support cputune for qemu driver (Osier Yang) - cputune: Implementations of parsing and formating cputune xml (Osier Yang) - cputune: Add data structures presenting cputune XML (Osier Yang) - cputune: Add document for cputune XML (Osier Yang) - cputune: Add XML schema for cputune xml (Osier Yang) - qemu: improve error message on failed fd transfer (Eric Blake) - maint: ignore new built file (Eric Blake) - Add domainSuspend/Resume to libxl driver (Markus Groß) - Add domainGetOSType to libxl driver (Markus Groß) - Add domainGetSchedulerType to libxl driver (Markus Groß) - Implements domainXMLTo/FromNative in libxl driver (Markus Groß) - Add vcpu functions to libxl driver (Markus Groß) - List authors in copyright headers (Markus Groß) - Add event callbacks to libxl driver (Markus Groß) - Remote protocol support for storage vol upload/download APIs (Daniel P. Berrange) - Support volume data upload/download APIs in storage driver (Daniel P. Berrange) - Add vol-upload and vol-download commands to virsh (Daniel P. Berrange) - Enhance the streams helper to support plain file I/O (Daniel P. Berrange) - Update event loop example programs to demonstrate best practice (Daniel P. Berrange) - qemu: support fd: migration with compression (Eric Blake) - qemu: skip granting access during fd migration (Eric Blake) - qemu: consolidate migration to file code (Eric Blake) - qemu: use common API for reading difficult files (Eric Blake) - qemu, storage: improve type safety (Eric Blake) - util: adjust indentation in previous patch (Eric Blake) - util: rename virFileOperation to virFileOpenAs (Eric Blake) - storage: simplify fd handling (Eric Blake) - qemu: simplify domain save fd handling (Eric Blake) - qemu: allow simple domain save to use fd: protocol (Eric Blake) - Update of localisations, switch to transifex (Daniel Veillard) - build: shorten libxenlight summary for consistent alignment (Eric Blake) - command: add virCommandAbort for cleanup paths (Eric Blake) - command: don't mix RunAsync and daemons (Eric Blake) - command: properly diagnose process exit via signal (Eric Blake) - Add memory functions to libxl driver (Markus Groß) - build: enforce reference count checking (Eric Blake) - maint: prohibit access(,X_OK) (Eric Blake) - Get cpu time and current memory balloon from libxl (Markus Groß) - build: nuke all .x-sc* files, and fix VPATH syntax-check (Eric Blake) - command: reject pidfile on non-daemon (Eric Blake) - rpm: add missing dependencies (Eric Blake) - rpm: separate runtime and build requirements (Eric Blake) - qemu: simplify monitor callbacks (Eric Blake) - 8021Qbh: use preassociate-rr during the migration prepare stage (Roopa Prabhu) - Wire up virDomainMigrateSetSpeed into QEMU driver (Daniel P. Berrange) - Wire up virDomainMigrateSetSpeed for the remote RPC driver (Daniel P. Berrange) - maint: update authors (Eric Blake) - Disable libxl build in RPM on Fedora < 16 (Daniel P. Berrange) - qemu: fallback to HMP drive_add/drive_del (Hu Tao) - qemu: Only use HMP passthrough if it is supported (Jiri Denemark) - qemu: Detect support for HMP passthrough (Jiri Denemark) - qemu: add two hook script events "prepare" and "release" (Thibault Vincent) - qemu: simplify interface fd handling in monitor (Eric Blake) - qemu: simplify PCI configfd handling in monitor (Eric Blake) - qemu: simplify monitor fd error handling (Eric Blake) - util: guarantee sane errno in virFileIsExecutable (Eric Blake) - Don't build libxenlight driver for Xen 4.0 (Jim Fehlig) - network driver: log error and abort network startup when radvd isn't found (Laine Stump) - build: translate changes in previous patch (Eric Blake) - Ensure binary is resolved wrt $PATH in virExec (Daniel P. Berrange) - util: Forbid calling hash APIs from iterator callback (Jiri Denemark) - Avoid taking lock in libvirt debug dump (Daniel Veillard) - unlock the monitor when unwatching the monitor (Wen Congyang) - Add vim configuration that makes vim auto-indent code (Hu Tao) - virsh: fix memtune's help message for swap_hard_limit (Nikunj A. Dadhania) - Add PCI sysfs reset access (Alex Williamson) - Support Xen sysctl v8, domctl v7 (Jim Fehlig) - macvtap: log an error if on failure to connect to netlink socket (Laine Stump) - qemu: improve efficiency of dd during snapshots (Eric Blake) - virsh: allow empty string arguments (Eric Blake) - qemu: Fallback to HMP when cpu_set QMP command is not found (Wen Congyang) - Change message for VIR_FROM_RPC error domain (Daniel P. Berrange) - Add compat function for geteuid() (Daniel P. Berrange) - Add virSetBlocking() to allow O_NONBLOCK to be toggle on or off (Daniel P. Berrange) - qemu: use more appropriate error (Eric Blake) - Make LXC container startup/shutdown/I/O more robust (Daniel P. Berrange) - Allow to dynamically set the size of the debug buffer (Daniel Veillard) - qemu: consolidate duplicated monitor migration code (Eric Blake) - qemu: use lighter-weight fd:n on incoming tunneled migration (Eric Blake) - Fix performance problem of virStorageVolCreateXMLFrom() (Minoru Usui) - libvirt-guests: avoid globbing when splitting $URIS (Eric Blake) - libvirt-guest.init: quoting variables (Philipp Hahn) - virsh: Insert error messages to avoid a quiet abortion of commands (Michal Privoznik) - python: Use hardcoded python path in libvirt.py (Jiri Denemark) - virsh: Allow starting domains by UUID (Jiri Denemark) - network driver: Use a separate dhcp leases file for each network (Laine Stump) - network driver: Start dnsmasq even if no dhcp ranges/hosts are specified. (Laine Stump) - libvirt-guest.init: handle domain name with spaces (Philipp Hahn) - domain.rng vs. formatdomain.html#elementsUSB (Philipp Hahn) - Ignore backing file errors in FS storage pool (Philipp Hahn) - remote-protocol: implement new BlkioParameters API (Gui Jianfeng) - virsh: Adding blkiotune command to virsh tool (Gui Jianfeng) - qemu: implement new BlkioParameters API (Gui Jianfeng) - libvirt: implements virDomain{Get,Set}BlkioParameters (Gui Jianfeng) - setmem: add the new options to "virsh setmem" command (Taku Izumi) - setmem: implement the remote protocol to address the new API (Taku Izumi) - setmem: implement the code to address the new API in the qemu driver (Taku Izumi) - audit: audit use of /dev/net/tun, /dev/tapN, /dev/vhost-net (Eric Blake) - qemu: don't request cgroup ACL access for /dev/net/tun (Eric Blake) - qemu: support vhost in attach-interface (Eric Blake) - qemu: Refactor qemuDomainSnapshotCreateXML (Jiri Denemark) - qemu: Fallback to HMP for snapshot commands (Jiri Denemark) - qemu: Setup infrastructure for HMP passthrough (Jiri Denemark) - qemu: Replace deprecated option of qemu-img (Osier Yang) - audit: also audit cgroup ACL permissions (Eric Blake) - cgroup: allow fine-tuning of device ACL permissions (Eric Blake) - audit: rename remaining qemu audit functions (Eric Blake) - audit: also audit cgroup controller path (Eric Blake) - audit: split cgroup audit types to allow more information (Eric Blake) - audit: tweak audit messages to match conventions (Eric Blake) - Don't overwrite virRun error messages (Cole Robinson) - virsh: Change option parsing functions to return tri-state information (Michal Privoznik) - virsh: change vshCommandOptString return type and fix const-correctness (Michal Privoznik) - support to detach USB disk (Wen Congyang) - rename qemuDomainDetachSCSIDiskDevice to qemuDomainDetachDiskDevice (Wen Congyang) - qemu_hotplug: Reword error if spice password change not available (Cole Robinson) - Move event code out of the daemon/ into src/util/ (Daniel P. Berrange) - Convert daemon/virsh over to use primary event APIs, rather than impl (Daniel P. Berrange) - Cleaning up some of the logging code (Daniel Veillard) - qemu: Support vram for video of qxl type (Osier Yang) - Add an an internal API for emergency dump of debug buffer (Daniel Veillard) - Add logrotate support for libvirtd.log (Daniel Veillard) - Change default log policy to libvirtd.log instead of syslog (Daniel Veillard) - Force all logs to go to the round robbin memory buffer (Daniel Veillard) - AUTHORS: adjust to preferred spelling (KAMEZAWA Hiroyuki) - Pass virSecurityManagerPtr to virSecurityDAC{Set, Restore}ChardevCallback (Soren Hansen) - maint: update to latest gnulib (Eric Blake) - Attempt to improve an error message (Daniel P. Berrange) - add additional event debug points (Daniel P. Berrange) - qemu: only request sound cgroup ACL when required (Eric Blake) - Add support for multiple serial ports into the Xen driver (Michal Novotny) - Add APIs for killing off processes inside a cgroup (Daniel P. Berrange) - Allow hash tables to use generic pointers as keys (Daniel P. Berrange) - Remove deallocator parameter from hash functions (Daniel P. Berrange) - Make commandtest more robust wrt its execution environment (Daniel P. Berrange) - audit: audit qemu pci and usb device passthrough (Eric Blake) - audit: audit qemu memory and vcpu adjusments (Eric Blake) - audit: add qemu hooks for auditing cgroup events (Eric Blake) - audit: prepare qemu for listing vm in cgroup audits (Eric Blake) - cgroup: determine when skipping non-devices (Eric Blake) - virExec: avoid uninitialized memory usage (Eric Blake) - Allow 32-on-64 execution for LXC guests (Daniel P. Berrange) - Put <stdbool.h> into internal.h so it is available everywhere (Daniel P. Berrange) - qemu: Switch over command line capabilities to virBitmap (Jiri Denemark) - qemu: Rename qemud\?CmdFlags to qemuCaps (Jiri Denemark) - qemu: Use helper functions for handling cmd line capabilities (Jiri Denemark) - qemu: Rename QEMUD_CMD_FLAG_* to QEMU_CAPS_* (Jiri Denemark) - util: Add API for converting virBitmap into printable string (Jiri Denemark) - util: Use unsigned long as a base type for virBitmap (Jiri Denemark) - Expose name + UUID to LXC containers via env variables (Daniel P. Berrange) - Fix discard of expected errors (Daniel P. Berrange) - Fix group/mode for /dev/pts inside LXC container (Daniel P. Berrange) - 802.1Qbh: Delay IFF_UP'ing interface until migration final stage (Roopa Prabhu) - storage: make debug log more useful (Osier Yang) - virsh: replace vshPrint with vshPrintExtra for snapshot list Otherwise extra information will be printed even if "--quiet" is specified. (Osier Yang) - check device-mapper when building with mpath or disk storage driver (Wen Congyang) - build: add dependency on gnutls-utils (Eric Blake) - Renamed functions in xenxs (Markus Groß) - Moved XM formatting functions to xenxs (Markus Groß) - Moved XM parsing functions to xenxs (Markus Groß) - Moved SEXPR formatting functions to xenxs (Markus Groß) - Moved SEXPR parsing functions to xenxs (Markus Groß) - Moved some SEXPR functions from xen-unified (Markus Groß) - Moved SEXPR unit to utils (Markus Groß) - virt-*-validate.in: quote all variable references (Dan Kenigsberg) - virt-pki-validate: behave when CERTTOOL is missing (Dan Kenigsberg) - autobuild.sh: use VPATH build (Eric Blake) - maint: fix 'make dist' in VPATH build (Eric Blake) - build: don't require pod2man for tarball builds (Eric Blake) - hash: make virHashFree more free-like (Eric Blake) - build: Fix API docs generation in VPATH build (Jiri Denemark) - Remove all object hashtable caches from virConnectPtr (Daniel P. Berrange) - nwfilter: enable rejection of packets (Stefan Berger) - Drop empty argument from dnsmasq call (Guido Günther) - esx: Ignore malformed host UUID from BIOS (Matthias Bolte) - build: speed up non-maintainer builds (Eric Blake) - build: recompute symbols after changing configure options (Eric Blake) - Requires gettext for client package (Osier Yang) - Do not add drive 'boot=on' param when a kernel is specified (Jim Fehlig) - factor common code in virHashAddEntry and virHashUpdateEntry (Christophe Fergeau) - add hash table rebalancing in virHashUpdateEntry (Christophe Fergeau) - hash: modernize debug code (Eric Blake) - build: improve 'make install' for VPATH builds (Eric Blake) - check more error info about whether drive_add failed (Wen Congyang) - logging: make VIR_ERROR and friends preserve errno (Eric Blake) - maint: avoid 'make syntax-check' from tarball (Eric Blake) - Give each virtual network bridge its own fixed MAC address (Laine Stump) - Allow brAddTap to create a tap device that is down (Laine Stump) - Add txmode attribute to interface XML for virtio backend (Laine Stump) - Restructure domain struct interface "driver" data for easier expansion (Laine Stump) - build: Fix VPATH build (Jiri Denemark) - storage: Allow to delete device mapper disk partition (Osier Yang) Cleanups: - The next release is 0.9.0 not 0.8.9 (Daniel Veillard) - maint: use space, not tab, in remote_protocol-structs (Eric Blake) - Remove the Open Nebula driver (Daniel P. Berrange) - domain_conf: drop unused ref-count in snapshot object (Eric Blake) - Update the set of maintainers for the project (Daniel Veillard) - Make virDomainObjParseNode() static (Hu Tao) - maint: make spacing in .sh files easier (Eric Blake) - network driver: Fix indentation from previous commit (Laine Stump) - qemu: Rename qemuMonitorCommandWithHandler as qemuMonitorText* (Jiri Denemark) - qemu: Rename qemuMonitorCommand{,WithFd} as qemuMonitorHMP* (Jiri Denemark) - maint: avoid long lines in more tests (Eric Blake) - maint: kill all remaining uses of old DEBUG macro (Eric Blake) - maint: Expand tabs in python code (Jiri Denemark) - remove space between function name and ( (Christophe Fergeau) - don't check for NULL before calling virHashFree (Christophe Fergeau) - remove no longer needed calls to virReportOOMError (Christophe Fergeau) - Move all the QEMU migration code to a new file (Daniel P. Berrange) - Split all QEMU process mangement code into separate file (Daniel P. Berrange) Thanks to everybody who helped one way or another for this release ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] FYI, "Unable to create cgroup for ..."
by Jim Meyering 04 Apr '11

04 Apr '11

In case someone else encounters this... Today none of my VMs would start on F15: # virsh create rawhide.xml error: Failed to create domain from rawhide.xml error: Unable to create cgroup for rawhide: No such file or directory Luckily, I noticed that Rich Jones had the same problem a week ago and he found that restarting libvirtd was enough to solve the problem: # service libvirtd restart That did it for me, too.

2 2

[libvirt] Entering 0.9.0 freeze week, RC1 version to test
by Daniel Veillard 04 Apr '11

04 Apr '11

Okay, I pushed new localization updates around and generated a first release candidate build for 0.9.0 at: ftp://libvirt.org/libvirt/libvirt-0.9.0-rc1.tar.gz I will regenerate a rc2 as soon as Eric pending patch queue and outgoing fd patches are in as I think they should really make 0.9.0 There may be more infrastrcucture patches from Dan too, I'm unsure and as usual pushing bug fixes are okay too, thanks for giving it a try, it seems to work fine here at least for basic tasks, Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

7 19

[libvirt] [libvirt-php] Fixed set_error when argument is NULL
by Lyre 04 Apr '11

04 Apr '11

Avoid freeing a NULL pointer --- src/libvirt-php.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 6a76f45..66b1de9 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -237,12 +237,16 @@ PHP_MINFO_FUNCTION(libvirt) */ void set_error(char *msg TSRMLS_DC) { - if (msg == NULL) { + if (LIBVIRT_G (last_error) != NULL) + { efree(LIBVIRT_G (last_error)); + } + + if (msg == NULL) { + LIBVIRT_G (last_error) = NULL; return; } php_error_docref(NULL TSRMLS_CC, E_WARNING,"%s",msg); - if (LIBVIRT_G (last_error)!=NULL) efree(LIBVIRT_G (last_error)); LIBVIRT_G (last_error)=estrndup(msg,strlen(msg)); } -- 1.7.3.4 �

2 1

[libvirt] [PATCH 0/4] RFC: vcpupin: configure inactive domains' CPU affinity setting
by Taku Izumi 04 Apr '11

04 Apr '11

Hi all, This patchset enables us to configure inactive domains' CPU affinity setting. The basic technique is the same as that of "virsh setmem" command. => http://www.redhat.com/archives/libvir-list/2011-March/msg00013.html *[PATCH 1/4] vcpupin: inroduce a new libvir API (virDomainPinVcpuFlags) *[PATCH 2/4] vcpupin: implement the code to address the new API in the qemu driver *[PATCH 3/4] vcpupin: implement the remote protocol to address the new API *[PATCH 4/4] vcpupin: add the new options to "virsh vcpupin" command Best regards, Taku Izumi

4 13

[libvirt] [RFC PATCH] build: detect doc build errors
by Eric Blake 04 Apr '11

04 Apr '11

I'm still stumped by xsltproc complaining about   not being a valid XML entity, hence the (hackish) exemption in docs/Makefile.am that adds --html for a couple of .html.in files. But for the remaining files, this does make input validation stricter, and caught several bugs. Hence, this is an RFC (either we live with my hack that caught all the issues in the prior patch, or someone with more xsltproc knowledge than me will step in and teach it how to resolve html entities while processing the documents as xml instead of html). * docs/Makefile.am (maintainer-clean-local): Remove generated docs in VPATH build. (%.html.tmp): Don't use looser --html; our input should be strict xhtml. HACK - use --html when entities like   are involved. (html/index.html): Exit on formatting problems. (rebuild): Run full doc build on request. --- docs/Makefile.am | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index db4bc59..2d1afe4 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -123,7 +123,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in echo "Generating $@"; \ $(MKDIR_P) "$(builddir)/internals"; \ name=`echo $@ | sed -e 's/.tmp//'`; \ - $(XSLTPROC) --stringparam pagename $$name --nonet --html \ + $(XSLTPROC) --stringparam pagename $$name --nonet \ $(top_srcdir)/docs/subsite.xsl $< > $@ \ || { rm $@ && exit 1; }; fi @@ -131,7 +131,8 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in @if [ -x $(XSLTPROC) ] ; then \ echo "Generating $@"; \ name=`echo $@ | sed -e 's/.tmp//'`; \ - $(XSLTPROC) --stringparam pagename $$name --nonet --html \ + $(XSLTPROC) --stringparam pagename $$name --nonet \ + $$(grep -qE '&(nbsp|uuml|mdash);' $< && printf %s --html) \ $(top_srcdir)/docs/site.xsl $< > $@ \ || { rm $@ && exit 1; }; fi @@ -147,21 +148,22 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in - -@if [ -x $(XSLTPROC) ] ; then \ + @if [ -x $(XSLTPROC) ] ; then \ echo "Rebuilding the HTML pages from the XML API" ; \ $(XSLTPROC) --nonet -o $(srcdir)/ \ $(srcdir)/newapi.xsl $(srcdir)/libvirt-api.xml ; fi - -@if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \ - if $(XMLCATALOG) '$(XML_CATALOG_FILE)' "-//W3C//DTD XHTML 1.0 Strict//EN" \ - > /dev/null ; then \ + @if test -x $(XMLLINT) && test -x $(XMLCATALOG) ; then \ + if $(XMLCATALOG) '$(XML_CATALOG_FILE)' \ + "-//W3C//DTD XHTML 1.0 Strict//EN" > /dev/null ; then \ echo "Validating the resulting XHTML pages" ; \ SGML_CATALOG_FILES='$(XML_CATALOG_FILE)' \ - $(XMLLINT) --catalogs --nonet --valid --noout $(srcdir)/html/*.html ; \ + $(XMLLINT) --catalogs --nonet --valid --noout $(srcdir)/html/*.html \ + || { rm $(srcdir)/$@ && exit 1; }; \ else echo "missing XHTML1 DTD" ; fi ; fi $(addprefix $(srcdir)/,$(devhelphtml)): $(srcdir)/libvirt-api.xml $(devhelpxsl) -@echo Rebuilding devhelp files - -@if [ -x $(XSLTPROC) ] ; then \ + @if [ -x $(XSLTPROC) ] ; then \ $(XSLTPROC) --nonet -o $(srcdir)/devhelp/ \ $(top_srcdir)/docs/devhelp/devhelp.xsl $(srcdir)/libvirt-api.xml ; fi @@ -183,9 +185,11 @@ clean-local: rm -f *~ *.bak *.hierarchy *.signals *-unused.txt *.html maintainer-clean-local: clean-local - rm -rf $(srcdir)/libvirt-api.xml $(srcdir)/libvirt-refs.xml todo.html.in + rm -rf $(srcdir)/libvirt-api.xml $(srcdir)/libvirt-refs.xml \ + todo.html.in $(srcdir)/*.html $(srcdir)/devhelp/*.html \ + $(srcdir)/html/*.html $(srcdir)/internals/*.html -rebuild: api all +rebuild: maintainer-clean-local api all install-data-local: $(mkinstalldirs) $(DESTDIR)$(HTML_DIR) -- 1.7.4

2 1

[libvirt] [PATCH] fix memory leak in qemuProcessHandleGraphics()
by Wen Congyang 03 Apr '11

03 Apr '11

If strdup("x509dname") or strdup("saslUsername") success, but strdup(x509dname) or strdup(saslUsername) failed, subject->nidentity is not the num elements of subject->identities, and we will leak some memory. --- src/qemu/qemu_process.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e74e0f1..0d2ccdc 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -544,18 +544,18 @@ qemuProcessHandleGraphics(qemuMonitorPtr mon ATTRIBUTE_UNUSED, if (x509dname) { if (VIR_REALLOC_N(subject->identities, subject->nidentity+1) < 0) goto no_memory; - if (!(subject->identities[subject->nidentity].type = strdup("x509dname")) || - !(subject->identities[subject->nidentity].name = strdup(x509dname))) - goto no_memory; subject->nidentity++; + if (!(subject->identities[subject->nidentity-1].type = strdup("x509dname")) || + !(subject->identities[subject->nidentity-1].name = strdup(x509dname))) + goto no_memory; } if (saslUsername) { if (VIR_REALLOC_N(subject->identities, subject->nidentity+1) < 0) goto no_memory; - if (!(subject->identities[subject->nidentity].type = strdup("saslUsername")) || - !(subject->identities[subject->nidentity].name = strdup(saslUsername))) - goto no_memory; subject->nidentity++; + if (!(subject->identities[subject->nidentity-1].type = strdup("saslUsername")) || + !(subject->identities[subject->nidentity-1].name = strdup(saslUsername))) + goto no_memory; } virDomainObjLock(vm); -- 1.7.1

3 2

[libvirt] [PATCH] do not lock vm while allocating memory
by Wen Congyang 03 Apr '11

03 Apr '11

There is no need to lock vm while allocating memory. If allocating memory failed, we forgot to unlock vm. --- src/qemu/qemu_process.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e31e1b4..e74e0f1 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -525,8 +525,6 @@ qemuProcessHandleGraphics(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainEventGraphicsSubjectPtr subject = NULL; int i; - virDomainObjLock(vm); - if (VIR_ALLOC(localAddr) < 0) goto no_memory; localAddr->family = localFamily; @@ -560,6 +558,7 @@ qemuProcessHandleGraphics(qemuMonitorPtr mon ATTRIBUTE_UNUSED, subject->nidentity++; } + virDomainObjLock(vm); event = virDomainEventGraphicsNewFromObj(vm, phase, localAddr, remoteAddr, authScheme, subject); virDomainObjUnlock(vm); -- 1.7.1

3 2

[libvirt] mingw: virsh event loop failure in current git
by Matthias Bolte 02 Apr '11

02 Apr '11

Commit 2ed6cc7bec41dd344d41ea1531f6760c93099128 "Expose event loop implementation as a public API" turned a failure to initialize the default event loop into a fatal error in virsh on Windows. Before that commit such a failure was ignored. virEventRegisterDefaultImpl calls virEventPollInit that calls virSetNonBlock that calls ioctl that is replaced by gnulib and calls ioctlsocket. ioctlsocket fails because the given FD is a pipe but ioctlsocket expects a socket. A version that works on pipes on Windows looks like this. Although the pipe is actually not a named pipe the call to SetNamedPipeHandleState doesn't fail at least. int virSetPipeNonBlock(int fd) { DWORD mode = PIPE_NOWAIT; HANDLE handle = _get_osfhandle(fd) BOOL result = SetNamedPipeHandleState(handle, &mode, NULL, NULL); return result ? 0 : -1; } So, is the event loop stuff supposed to work on Windows at all and we should get it fixed? Or do we just put an #ifndef WIN32 around virEventRegisterDefaultImpl in virsh, because the only event loop user in virsh is the console command that is disabled on Windows anyway? Matthias

5 7

[libvirt] [PATCH] Fix several formatting mistakes in doc
by Michal Privoznik 02 Apr '11

02 Apr '11

--- docs/formatdomain.html.in | 2 +- docs/hooks.html.in | 6 +++--- src/libvirt.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 8b50814..438cbf0 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -353,7 +353,7 @@ <dd> The optional <code>vcpupin</code> element specifies which of host physical CPUS the domain VCPU will be pinned to. If this is ommited, each VCPU pinned to all the physical CPUS by default. It contains two - required attributes, the attribute <code>vcpu</vcpu> specifies vcpu id, + required attributes, the attribute <code>vcpu</code> specifies vcpu id, and the attribute <code>cpuset</code> is same as attribute <code>cpuset</code> of element <code>vcpu</code>. NB, Only qemu driver supports</dd> <dt><code>shares</code></dt> diff --git a/docs/hooks.html.in b/docs/hooks.html.in index eec7a6a..890359e 100644 --- a/docs/hooks.html.in +++ b/docs/hooks.html.in @@ -105,16 +105,16 @@ is not started. The first location, <span class="since">since 0.9.0</span>, is before libvirt performs any resource labeling, and the hook can allocate resources not managed by - libvirt such as DRBD or missing bridges. This is called as:</br> + libvirt such as DRBD or missing bridges. This is called as:<br/> <pre>/etc/libvirt/hooks/qemu guest_name prepare begin -</pre> The second location, available <span class="since">Since 0.8.0</span>, occurs after libvirt has finished labeling - all resources, but has not yet started the guest, called as:</br> + all resources, but has not yet started the guest, called as:<br/> <pre>/etc/libvirt/hooks/qemu guest_name start begin -</pre></li> <li>When a QEMU guest is stopped, the qemu hook script is called in two locations, to match the startup. First, <span class="since">since 0.8.0</span>, the hook is - called before libvirt restores any labels:</br> + called before libvirt restores any labels:<br/> <pre>/etc/libvirt/hooks/qemu guest_name stopped end -</pre> Then, after libvirt has released all resources, the hook is called again, <span class="since">since 0.9.0</span>, to allow diff --git a/src/libvirt.c b/src/libvirt.c index 9bdb4c8..8be18d4 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -2852,7 +2852,7 @@ error: } /* - * virDomainSetMemoryFlags + * virDomainSetMemoryFlags: * @domain: a domain object or NULL * @memory: the memory size in kilobytes * @flags: an OR'ed set of virDomainMemoryModFlags -- 1.7.4

4 13

[libvirt] [PATCH] docs: fix typo
by Eric Blake 01 Apr '11

01 Apr '11

* docs/formatdomain.html.in: Fix KVM name. --- 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 6c624ab..574fee5 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -314,7 +314,7 @@ <dt><code>memtune</code></dt> <dd> The optional <code>memtune</code> element provides details regarding the memory tunable parameters for the domain. If this is - omitted, it defaults to the OS provided defaults. For QEMU/KVMi, the + omitted, it defaults to the OS provided defaults. For QEMU/KVM, the parameters are applied to the QEMU process as a whole. Thus, when counting them, one needs to add up guest RAM, guest video RAM, and some memory overhead of QEMU itself. The last piece is hard to -- 1.7.4

1 0

[libvirt] [PATCH] docs: correct invalid xml
by Eric Blake 01 Apr '11

01 Apr '11

* docs/internals.html.in: Fix xml errors. * docs/formatstorageencryption.html.in: Likewise. * docs/drvesx.html.in: Likewise. * docs/archnetwork.html.in: Likewise. * docs/logging.html.in: Likewise. * docs/drvvmware.html.in: Likewise. * docs/api.html.in: Likewise. * docs/formatnwfilter.html.in: Likewise. * docs/formatdomain.html.in: Likewise. * docs/windows.html.in: Likewise. --- Tightening up xsltproc found all of these. I'm pushing under the trivial rule. docs/api.html.in | 11 ++-- docs/archnetwork.html.in | 2 +- docs/drvesx.html.in | 10 ++-- docs/drvvmware.html.in | 4 +- docs/formatdomain.html.in | 18 +++--- docs/formatnwfilter.html.in | 96 +++++++++++++++++----------------- docs/formatstorageencryption.html.in | 2 +- docs/internals.html.in | 4 +- docs/logging.html.in | 4 +- docs/windows.html.in | 12 ++-- 10 files changed, 83 insertions(+), 80 deletions(-) diff --git a/docs/api.html.in b/docs/api.html.in index e8bbeed..384eb77 100644 --- a/docs/api.html.in +++ b/docs/api.html.in @@ -4,7 +4,7 @@ <h1>The libvirt API concepts</h1> <p> This page describes the main principles and architecture choices - behind the definition of the libvirt API: + behind the definition of the libvirt API:</p> <ul id="toc"></ul> @@ -22,7 +22,7 @@ possible to use both KVM and LinuxContainers on the same node). A NULL name will default to a preselected hypervisor but it's probably not a wise thing to do in most cases. See the <a href="uri.html">connection - URI</a> page for a full descriptions of the values allowed.<p> + URI</a> page for a full descriptions of the values allowed.</p> <p> Once the application obtained a <code class='docref'>virConnectPtr</code> connection to the hypervisor it can then use it to manage domains and related resources @@ -61,7 +61,7 @@ <code>defined</code> in which case they are inactive but there is a permanent definition available in the system for them. Based on this thay can be activated dynamically in order to be used.</p> - <p> Most kind of object can also be named in various ways:<p> + <p> Most kind of object can also be named in various ways:</p> <ul> <li>by their <code>name</code>, an user friendly identifier but whose unicity cannot be garanteed between two nodes.</li> @@ -82,7 +82,7 @@ <p> For each first class object you will find apis for the following actions:</p> <ul> - <li><b>Lookup</b>:...LookupByName, + <li><b>Lookup</b>:...LookupByName,</li> <li><b>Enumeration</b>:virConnectList... and virConnectNumOf...: those are used to enumerate a set of object available to an given hypervisor connection like: @@ -108,7 +108,8 @@ <li><b>Destruction</b>: ... </li> </ul> <p> For more in-depth details of the storage related APIs see - <a href="storage.html">the storage management page</a>, + <a href="storage.html">the storage management page</a>. + </p> <h2><a name="Driver">The libvirt drivers</a></h2> <p></p> <p class="image"> diff --git a/docs/archnetwork.html.in b/docs/archnetwork.html.in index 57b8f3d..c7ca4ca 100644 --- a/docs/archnetwork.html.in +++ b/docs/archnetwork.html.in @@ -32,7 +32,7 @@ </li> <li><strong>Guest C</strong>. The only network interface is connected to a virtual network <code>VLAN 2</code>. It has no direct connectivity - to a physical LAN, relying on <code>Guest B</codE> to route traffic + to a physical LAN, relying on <code>Guest B</code> to route traffic on its behalf. </li> </ul> diff --git a/docs/drvesx.html.in b/docs/drvesx.html.in index a0f87c1..613cd07 100644 --- a/docs/drvesx.html.in +++ b/docs/drvesx.html.in @@ -74,7 +74,7 @@ vpx://example-vcenter.com/dc1/cluster1/example-esx.com </pre> - <h4><a name="extraparams">Extra parameters</h4> + <h4><a name="extraparams">Extra parameters</a></h4> <p> Extra parameters can be added to a URI as part of the query string (the part following <code>?</code>). A single parameter is formed by a @@ -308,7 +308,7 @@ error: invalid argument in libvirt was built without the 'esx' driver There are several specialties in the domain XML config for ESX domains. </p> - <h3><a name="restrictions">Restrictions</h3> + <h3><a name="restrictions">Restrictions</a></h3> <p> There are some restrictions for some values of the domain XML config. The driver will complain if this restrictions are violated. @@ -328,7 +328,7 @@ error: invalid argument in libvirt was built without the 'esx' driver </ul> - <h3><a name="datastore">Datastore references</h3> + <h3><a name="datastore">Datastore references</a></h3> <p> Storage is managed in datastores. VMware uses a special path format to reference files in a datastore. Basically, the datastore name is put @@ -347,7 +347,7 @@ error: invalid argument in libvirt was built without the 'esx' driver </p> - <h3><a name="macaddresses">MAC addresses</h3> + <h3><a name="macaddresses">MAC addresses</a></h3> <p> VMware has registered two MAC address prefixes for domains: <code>00:0c:29</code> and <code>00:50:56</code>. These prefixes are @@ -408,7 +408,7 @@ ethernet0.checkMACAddress = "false" </pre> - <h3><a name="hardware">Available hardware</h3> + <h3><a name="hardware">Available hardware</a></h3> <p> VMware ESX supports different models of SCSI controllers and network cards. diff --git a/docs/drvvmware.html.in b/docs/drvvmware.html.in index 0ef6044..44814d3 100644 --- a/docs/drvvmware.html.in +++ b/docs/drvvmware.html.in @@ -8,7 +8,9 @@ </p> <p> This driver uses the "vmrun" utility which is distributed with the VMware VIX API. - You can download the VIX API from <a href="http://www.vmware.com/support/developer/vix-api/">here</a>. + You can download the VIX API + from <a href="http://www.vmware.com/support/developer/vix-api/">here</a>. + </p> <h2>Connections to VMware driver</h2> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 5523fc7..6c624ab 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1277,7 +1277,7 @@ <p> Provides direct attachment of the virtual machine's NIC to the given physial interface of the host. - <span class="since">Since 0.7.7 (QEMU and KVM only)</span><br> + <span class="since">Since 0.7.7 (QEMU and KVM only)</span><br/> This setup requires the Linux macvtap driver to be available. <span class="since">(Since Linux 2.6.34.)</span> One of the modes 'vepa' @@ -1299,7 +1299,7 @@ originate from are directly delivered to the target macvtap device. Both origin and destination devices need to be in bridge mode for direct delivery. If either one of them is in <code>vepa</code> mode, - a VEPA capable bridge is required. + a VEPA capable bridge is required.</dd> <dt><code>private</code></dt> <dd>All packets are sent to the external bridge and will only be delivered to a target VM on the same host if they are sent through an @@ -1488,23 +1488,23 @@ qemu-kvm -net nic,model=? /dev/null The <code>txmode</code> attribute specifies how to handle transmission of packets when the transmit buffer is full. The value can be either 'iothread' or 'timer'. - <span class="since">Since 0.8.8 (QEMU and KVM only)</span><br><br> + <span class="since">Since 0.8.8 (QEMU and KVM only)</span><br/><br/> If set to 'iothread', packet tx is all done in an iothread in the bottom half of the driver (this option translates into adding "tx=bh" to the qemu commandline -device virtio-net-pci - option).<br><br> + option).<br/><br/> If set to 'timer', tx work is done in qemu, and if there is more tx data than can be sent at the present time, a timer is set before qemu moves on to do other things; when the timer - fires, another attempt is made to send more data.<br><br> + fires, another attempt is made to send more data.<br/><br/> The resulting difference, according to the qemu developer who added the option is: "bh makes tx more asynchronous and reduces latency, but potentially causes more processor bandwidth contention since the cpu doing the tx isn't necessarily the - cpu where the guest generated the packets."<br><br> + cpu where the guest generated the packets."<br/><br/> <b>In general you should leave this option alone, unless you are very certain you know what you are doing.</b> @@ -1628,8 +1628,8 @@ qemu-kvm -net nic,model=? /dev/null in clear text. The <code>keymap</code> attribute specifies the keymap to use. It is possible to set a limit on the validity of the password be giving an timestamp <code>passwdValidTo='2010-04-09T15:51:00'</code> - assumed to be in UTC. NB, this may not be supported by all hypervisors.<br> - <br> + assumed to be in UTC. NB, this may not be supported by all hypervisors.<br/> + <br/> Rather than using listen/port, QEMU supports a <code>socket</code> attribute for listening on a unix domain socket path. <span class="since">Since 0.8.8</span> @@ -2103,7 +2103,7 @@ qemu-kvm -net nic,model=? /dev/null Alternatively you can use <code>telnet</code> instead of <code>raw</code> TCP. <span class="since">Since 0.8.5</span> you can also use <code>telnets</code> (secure telnet) and <code>tls</code>. - <p> + </p> <pre> ... diff --git a/docs/formatnwfilter.html.in b/docs/formatnwfilter.html.in index 8840856..eb3c72b 100644 --- a/docs/formatnwfilter.html.in +++ b/docs/formatnwfilter.html.in @@ -25,18 +25,18 @@ cannot be circumvented from within the virtual machine, it makes them mandatory from the point of view of a virtual machine user. - <br><br> + <br/><br/> The network filter subsystem allows each virtual machine's network traffic filtering rules to be configured individually on a per interface basis. The rules are applied on the host when the virtual machine is started and can be modified while the virtual machine is running. The latter can be achieved by modifying the XML description of a network filter. - <br><br> + <br/><br/> Multiple virtual machines can make use of the same generic network filter. When such a filter is modified, the network traffic filtering rules of all running virtual machines that reference this filter are updated. - <br><br> + <br/><br/> Network filtering support is available <span class="since">since 0.8.1 (Qemu, KVM)</span> </p> @@ -79,7 +79,7 @@ other filters can be used, a <i>tree</i> of filters can be built. The <code>clean-traffic</code> filter can be viewed using the command <code>virsh nwfilter-dumpxml clean-traffic</code>. - <br><br> + <br/><br/> As previously mentioned, a single network filter can be referenced by multiple virtual machines. Since interfaces will typically have individual parameters associated with their respective traffic @@ -108,7 +108,7 @@ 10.0.0.1 and enforce that the traffic from this interface will always be using 10.0.0.1 as the source IP address, which is one of the purposes of this particular filter. - <br><br> + <br/><br/> </p> <h3><a name="nwfconceptsvars">Usage of variables in filters</a></h3> @@ -117,7 +117,7 @@ Two variables names have so far been reserved for usage by the network traffic filtering subsystem: <code>MAC</code> and <code>IP</code>. - <br><br> + <br/><br/> <code>MAC</code> is the MAC address of the network interface. A filtering rule that references this variable will automatically be instantiated with the MAC address of the @@ -125,7 +125,7 @@ the MAC parameter. Even though it is possible to specify the MAC parameter similar to the IP parameter above, it is discouraged since libvirt knows what MAC address an interface will be using. - <br><br> + <br/><br/> The parameter <code>IP</code> represents the IP address that the operating system inside the virtual machine is expected to use on the given interface. The <code>IP</code> parameter @@ -136,7 +136,7 @@ For current limitations on IP address detection, consult the <a href="#nwflimits">section on limitations</a> on how to use this feature and what to expect when using it. - <br><br> + <br/><br/> The following is the XML description of the network filer <code>no-arp-spoofing</code>. It serves as an example for a network filter XML referencing the <code>MAC</code> and @@ -205,7 +205,7 @@ filters may be referenced multiple times in a filter tree but references between filters must not introduce loops (directed acyclic graph). - <br><br> + <br/><br/> The following shows the XML of the <code>clean-traffic</code> network filter referencing several other filters. </p> @@ -226,7 +226,7 @@ needs to be provided inside a <code>filter</code> node. This node must have the attribute <code>filter</code> whose value contains the name of the filter to be referenced. - <br><br> + <br/><br/> New network filters can be defined at any time and may contain references to network filters that are not known to libvirt, yet. However, once a virtual machine @@ -282,7 +282,7 @@ <li> statematch -- optional; possible values are '0' or 'false' to turn the underlying connection state matching off; default is 'true' - <br> + <br/> Also read the section on <a href="#nwfelemsRulesAdv">advanced configuration</a> topics. </li> @@ -294,7 +294,7 @@ traffic of type <code>ip</code> is also associated with the chain 'ipv4' then that filter's rules will be ordered relative to the priority 500 of the shown rule. - <br><br> + <br/><br/> A rule may contain a single rule for filtering of traffic. The above example shows that traffic of type <code>ip</code> is to be filtered. @@ -325,7 +325,7 @@ <li>STRING: A string</li> </ul> <p> - <br><br> + <br/><br/> Every attribute except for those of type IP_MASK or IPV6_MASK can be negated using the <code>match</code> attribute with value <code>no</code>. Multiple negated attributes @@ -349,14 +349,14 @@ the protocol property attribute1 does not match value1 AND the protocol property attribute2 does not match value2 AND the protocol property attribute3 matches value3. - <br><br> + <br/><br/> </p> <h5><a name="nwfelemsRulesProtoMAC">MAC (Ethernet)</a></h5> <p> Protocol ID: <code>mac</code> - <br> + <br/> Note: Rules of this type should go into the <code>root</code> chain. </p> <table class="top_table"> @@ -408,7 +408,7 @@ <h5><a name="nwfelemsRulesProtoARP">ARP/RARP</a></h5> <p> Protocol ID: <code>arp</code> or <code>rarp</code> - <br> + <br/> Note: Rules of this type should either go into the <code>root</code> or <code>arp/rarp</code> chain. </p> @@ -483,7 +483,7 @@ Valid strings for the <code>Opcode</code> field are: Request, Reply, Request_Reverse, Reply_Reverse, DRARP_Request, DRARP_Reply, DRARP_Error, InARP_Request, ARP_NAK - <br><br> + <br/><br/> </p> <h5><a name="nwfelemsRulesProtoIP">IPv4</a></h5> @@ -572,7 +572,7 @@ <p> Valid strings for <code>protocol</code> are: tcp, udp, udplite, esp, ah, icmp, igmp, sctp - <br><br> + <br/><br/> </p> @@ -662,13 +662,13 @@ <p> Valid strings for <code>protocol</code> are: tcp, udp, udplite, esp, ah, icmpv6, sctp - <br><br> + <br/><br/> </p> <h5><a name="nwfelemsRulesProtoTCP-ipv4">TCP/UDP/SCTP</a></h5> <p> Protocol ID: <code>tcp</code>, <code>udp</code>, <code>sctp</code> - <br> + <br/> Note: The chain parameter is ignored for this type of traffic and should either be omitted or set to <code>root</code>. </p> @@ -757,14 +757,14 @@ </tr> </table> <p> - <br><br> + <br/><br/> </p> <h5><a name="nwfelemsRulesProtoICMP">ICMP</a></h5> <p> Protocol ID: <code>icmp</code> - <br> + <br/> Note: The chain parameter is ignored for this type of traffic and should either be omitted or set to <code>root</code>. </p> @@ -857,13 +857,13 @@ </tr> </table> <p> - <br><br> + <br/><br/> </p> <h5><a name="nwfelemsRulesProtoMisc">IGMP, ESP, AH, UDPLITE, 'ALL'</a></h5> <p> Protocol ID: <code>igmp</code>, <code>esp</code>, <code>ah</code>, <code>udplite</code>, <code>all</code> - <br> + <br/> Note: The chain parameter is ignored for this type of traffic and should either be omitted or set to <code>root</code>. </p> @@ -946,14 +946,14 @@ </tr> </table> <p> - <br><br> + <br/><br/> </p> <h5><a name="nwfelemsRulesProtoTCP-ipv6">TCP/UDP/SCTP over IPV6</a></h5> <p> Protocol ID: <code>tcp-ipv6</code>, <code>udp-ipv6</code>, <code>sctp-ipv6</code> - <br> + <br/> Note: The chain parameter is ignored for this type of traffic and should either be omitted or set to <code>root</code>. </p> @@ -1042,14 +1042,14 @@ </tr> </table> <p> - <br><br> + <br/><br/> </p> <h5><a name="nwfelemsRulesProtoICMPv6">ICMPv6</a></h5> <p> Protocol ID: <code>icmpv6</code> - <br> + <br/> Note: The chain parameter is ignored for this type of traffic and should either be omitted or set to <code>root</code>. </p> @@ -1128,13 +1128,13 @@ </tr> </table> <p> - <br><br> + <br/><br/> </p> <h5><a name="nwfelemsRulesProtoMiscv6">IGMP, ESP, AH, UDPLITE, 'ALL' over IPv6</a></h5> <p> Protocol ID: <code>igmp-ipv6</code>, <code>esp-ipv6</code>, <code>ah-ipv6</code>, <code>udplite-ipv6</code>, <code>all-ipv6</code> - <br> + <br/> Note: The chain parameter is ignored for this type of traffic and should either be omitted or set to <code>root</code>. </p> @@ -1202,7 +1202,7 @@ </tr> </table> <p> - <br><br> + <br/><br/> </p> <h3><a name="nwfelemsRulesAdv">Advanced Filter Configuration Topics</a></h3> @@ -1227,7 +1227,7 @@ port 80 on an attacker site, then the attacker will not be able to initiate a connection from TCP port 80 back towards the VM. By default the connection state match that enables connection tracking - and then enforcement of directionality of traffic is turned on. <br> + and then enforcement of directionality of traffic is turned on. <br/> The following shows an example XML fragement where this feature has been turned off for incoming connections to TCP port 12345. </p> @@ -1277,14 +1277,14 @@ </pre> <p> Note that the rule for the limit has to logically appear - before the rule for accepting the traffic.<br> + before the rule for accepting the traffic.<br/> An additional rule for letting DNS traffic to port 22 go out the VM has been added to avoid ssh sessions not getting established for reasons related to DNS lookup failures by the ssh daemon. Leaving this rule out may otherwise lead to fun-filled debugging joy (symptom: ssh client seems to hang while trying to connect). - <br><br> + <br/><br/> Lot of care must be taken with timeouts related to tracking of traffic. An ICMP ping that the user may have terminated inside the VM may have a long @@ -1299,7 +1299,7 @@ <p> sets the ICMP connection tracking timeout to 3 seconds. The effect of this is that once one ping is terminated, another - one can start after 3 seconds.<br> + one can start after 3 seconds.<br/> Further, we want to point out that a client that for whatever reason has not properly closed a TCP connection may cause a connection to be held open for a longer period of time, @@ -1323,7 +1323,7 @@ with life-cycle support for network filters. All commands related to the network filtering subsystem start with the prefix <code>nwfilter</code>. The following commands are available: - <p> + </p> <ul> <li>nwfilter-list : list UUIDs and names of all network filters</li> <li>nwfilter-define : define a new network filter or update an existing one</li> @@ -1398,7 +1398,7 @@ the protocols very well that you want to be filtering on so that no further traffic than what you want can pass and that in fact the traffic you want to allow does pass. - <br><br> + <br/><br/> The network filtering subsystem is currently only available on Linux hosts and only works for Qemu and KVM type of virtual machines. On Linux @@ -1412,19 +1412,19 @@ <li>arp, rarp</li> <li>ip</li> <li>ipv6</li> - </uL> + </ul> <p> All other protocols over IPv4 are supported using iptables, those over IPv6 are implemented using ip6tables. - <br><br> + <br/><br/> On a Linux host, all traffic filtering instantiated by libvirt's network filter subsystem first passes through the filtering support implemented by ebtables and only then through iptables or ip6tables filters. If a filter tree has rules with the protocols <code>mac</code>, <code>arp</code>, <code>rarp</code>, <code>ip</code>, or <code>ipv6</code> ebtables rules will automatically be instantiated. - <br> + <br/> The role of the <code>chain</code> attribute in the network filter XML is that internally a new user-defined ebtables table is created that then for example receives all <code>arp</code> traffic coming @@ -1435,7 +1435,7 @@ placed into filters specifying this chain. This type of branching into user-defined tables is only supported with filtering on the ebtables layer. - <br> + <br/> As an example, it is possible to filter on UDP traffic by source and destination ports using the <code>ip</code> protocol filter and specifying attributes for the @@ -1467,7 +1467,7 @@ The requirement to prevent spoofing is fulfilled by the existing <code>clean-traffic</code> network filter, thus we will reference this filter from our custom filter. - <br> + <br/> To enable traffic for TCP ports 22 and 80 we will add 2 rules to enable this type of traffic. To allow the VM to send ping traffic we will add a rule for ICMP traffic. For simplicity reasons @@ -1523,7 +1523,7 @@ per-interface basis and the rules are evaluated based on the knowledge about which (tap) interface has sent or will receive the packet rather than what their source or destination IP address may be. - <br><br> + <br/><br/> An XML fragment for a possible network interface description inside the domain XML of the <code>test</code> VM could then look like this: </p> @@ -1568,7 +1568,7 @@ <li>allows the VM to send ping traffic from an interface but not let the VM be pinged on the interface</li> <li>allows the VM to do DNS lookups (UDP towards port 53)</li> - <li>enable an ftp server (in active mode) to be run inside the VM + <li>enable an ftp server (in active mode) to be run inside the VM</li> </ul> <p> The additional requirement of allowing an ftp server to be run inside @@ -1577,7 +1577,7 @@ outgoing tcp connection originating from the VM's TCP port 20 back to the ftp client (ftp active mode). There are several ways of how this filter can be written and we present 2 solutions. - <br><br> + <br/><br/> The 1st solution makes use of the <code>state</code> attribute of the TCP protocol that gives us a hook into the connection tracking framework of the Linux host. For the VM-initiated ftp data connection @@ -1752,13 +1752,13 @@ to be using. Different IP addresses in use by multiple interfaces of a VM (one IP address each) will be independently detected. - <br><br> + <br/><br/> Once a VM's IP address has been detected, its IP network traffic may be locked to that address, if for example IP address spoofing is prevented by one of its filters. In that case the user of the VM will not be able to change the IP address on the interface inside the VM, which would be considered IP address spoofing. - <br><br> + <br/><br/> In case a VM is resumed after suspension or migrated, IP address detection will be restarted. </p> @@ -1776,7 +1776,7 @@ outside the scope of libvirt to ensure that referenced filters on the source system are equivalent to those on the target system and vice versa. - <br><br> + <br/><br/> Migration must occur between libvirt insallations of version 0.8.1 or later in order not to lose the network traffic filters associated with an interface. diff --git a/docs/formatstorageencryption.html.in b/docs/formatstorageencryption.html.in index 0e5dcee..9557a22 100644 --- a/docs/formatstorageencryption.html.in +++ b/docs/formatstorageencryption.html.in @@ -30,7 +30,7 @@ by the particular volume format and driver, automatically generate a secret value at the time of volume creation, and store it using the specified <code>uuid</code>. - <p> + </p> <h3><a name="StorageEncryptionDefault">"default" format</a></h3> <p> <code><encryption type="default"/></code> can be specified only diff --git a/docs/internals.html.in b/docs/internals.html.in index 6fa2de3..5689998 100644 --- a/docs/internals.html.in +++ b/docs/internals.html.in @@ -9,9 +9,9 @@ </p> <ul> - <li>Introduction to basic rules and guidelines for <a href="hacking.html">hacking<a> + <li>Introduction to basic rules and guidelines for <a href="hacking.html">hacking</a> on libvirt code</li> - <li>Guide to adding <a href="api_extension.html">public APIs<a></li> + <li>Guide to adding <a href="api_extension.html">public APIs</a></li> <li>Approach for <a href="internals/command.html">spawning commands</a> from libvirt driver code</li> </ul> diff --git a/docs/logging.html.in b/docs/logging.html.in index 44171de..ebacdac 100644 --- a/docs/logging.html.in +++ b/docs/logging.html.in @@ -82,7 +82,7 @@ <a name="log_daemon">Logging in the daemon</a> </h3> <p>Similarly the daemon logging behaviour can be tuned using 3 config - variables, stored in the configuration file: + variables, stored in the configuration file:</p> <ul> <li>log_level: accepts the following values: <ul> @@ -128,7 +128,7 @@ <p>Multiple filters can be defined in a single string, they just need to be separated by spaces, e.g: <code>"3:remote 4:event"</code> to only get warning or errors from the remote layer and only errors from the event - layer.<p> + layer.</p> <p>If you specify a log priority in a filter that is below the default log priority level, messages that match that filter will still be logged, while others will not. In order to see those messages, you must also have diff --git a/docs/windows.html.in b/docs/windows.html.in index 4011cc3..8e0af7c 100644 --- a/docs/windows.html.in +++ b/docs/windows.html.in @@ -30,7 +30,7 @@ and untested Python bindings. </p> - <h3><a name="caveats">Caveats</h3> + <h3><a name="caveats">Caveats</a></h3> <ul> <li> @@ -47,7 +47,7 @@ </li> </ul> - <h3><a name="knowninstallerprobs">Existing problems with this installer we know about</a> + <h3><a name="knowninstallerprobs">Existing problems with this installer we know about</a></h3> <p> These are problems we know about, and need to be fixed in subsequent @@ -72,7 +72,7 @@ </ul> - <h2><a name="conntypes">Connection types</h2> + <h2><a name="conntypes">Connection types</a></h2> <p> These connection types are known to work: @@ -114,7 +114,7 @@ be used in security sensitive environments.</b> </p> - <h2><a name="esx">Connecting to VMware ESX/vSphere</h2> + <h2><a name="esx">Connecting to VMware ESX/vSphere</a></h2> <p> Details on the capabilities, certificates, and connection string @@ -124,7 +124,7 @@ <a href="http://libvirt.org/drvesx.html">http://libvirt.org/drvesx.html</a> - <h2><a name="tlscerts">TLS Certificates</h2> + <h2><a name="tlscerts">TLS Certificates</a></h2> <p> TLS certificates need to have been created and placed in the correct @@ -184,7 +184,7 @@ <li>C:\Users\someuser\AppData\Roaming\libvirt\pki\libvirt\private\clientkey.pem</li> </ul> - <h2><a name="feedback">Feedback</h2> + <h2><a name="feedback">Feedback</a></h2> <p> Feedback and suggestions on changes to make and what else to include -- 1.7.4

1 0

[libvirt] [PATCH] nwfilters: support for TCP flags evaluation
by Stefan Berger 01 Apr '11

01 Apr '11

This patch adds support for the evaluation of TCP flags in nwfilters. It adds documentation to the web page and extends the tests as well. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- docs/formatnwfilter.html.in | 10 ++ docs/schemas/nwfilter.rng | 16 ++++ src/conf/nwfilter_conf.c | 115 +++++++++++++++++++++++++++--- src/conf/nwfilter_conf.h | 9 ++ src/libvirt_private.syms | 1 src/nwfilter/nwfilter_ebiptables_driver.c | 9 ++ tests/nwfilterxml2xmlin/tcp-test.xml | 12 +++ tests/nwfilterxml2xmlout/tcp-test.xml | 12 +++ 8 files changed, 174 insertions(+), 10 deletions(-) Index: libvirt-acl/src/conf/nwfilter_conf.c =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.c +++ libvirt-acl/src/conf/nwfilter_conf.c @@ -5,7 +5,8 @@ * Copyright (C) 2006-2011 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * - * Copyright (C) 2010 IBM Corporation + * Copyright (C) 2010-2011 IBM Corporation + * Copyright (C) 2010-2011 Stefan Berger * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -726,17 +727,23 @@ printStringItems(virBufferPtr buf, const int32_t flags, const char *sep) { unsigned int i, c = 0; - int32_t last_attr = 0; + int32_t mask = 0x1; - for (i = 0; int_map[i].val; i++) { - if (last_attr != int_map[i].attr && - flags & int_map[i].attr) { - if (c >= 1) - virBufferVSprintf(buf, "%s", sep); - virBufferVSprintf(buf, "%s", int_map[i].val); - c++; + while (mask) { + if ((mask & flags)) { + for (i = 0; int_map[i].val; i++) { + if (mask == int_map[i].attr) { + if (c >= 1) + virBufferVSprintf(buf, "%s", sep); + virBufferVSprintf(buf, "%s", int_map[i].val); + c++; + } + } + flags ^= mask; + if (!flags) + break; } - last_attr = int_map[i].attr; + mask <<= 1; } return 0; @@ -799,6 +806,87 @@ stateFormatter(virBufferPtr buf, } + +static const struct int_map tcpFlags[] = { + INTMAP_ENTRY(0x1 , "FIN"), + INTMAP_ENTRY(0x2 , "SYN"), + INTMAP_ENTRY(0x4 , "RST"), + INTMAP_ENTRY(0x8 , "PSH"), + INTMAP_ENTRY(0x10, "ACK"), + INTMAP_ENTRY(0x20, "URG"), + INTMAP_ENTRY(0x3F, "ALL"), + INTMAP_ENTRY(0x0 , "NONE"), + INTMAP_ENTRY_LAST +}; + + +static bool +tcpFlagsValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, union data *val, + virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + nwItemDesc *item) +{ + bool rc = false; + char *s_mask = val->c; + char *sep = strchr(val->c, '/'); + char *s_flags; + int32_t mask = 0, flags = 0; + + if (!sep) + return false; + + s_flags = sep + 1; + + *sep = '\0'; + + if (!parseStringItems(tcpFlags, s_mask , &mask , ',') && + !parseStringItems(tcpFlags, s_flags, &flags, ',')) { + item->u.tcpFlags.mask = mask & 0x3f; + item->u.tcpFlags.flags = flags & 0x3f; + rc = true; + } + + *sep = '/'; + + return rc; +} + + +static void +printTCPFlags(virBufferPtr buf, uint8_t flags) +{ + if (flags == 0) + virBufferAddLit(buf, "NONE"); + else if (flags == 0x3f) + virBufferAddLit(buf, "ALL"); + else + printStringItems(buf, tcpFlags, flags, ","); +} + + +void +virNWFilterPrintTCPFlags(virBufferPtr buf, + uint8_t mask, char sep, uint8_t flags) +{ + printTCPFlags(buf, mask); + virBufferAddChar(buf, sep); + printTCPFlags(buf, flags); +} + + +static bool +tcpFlagsFormatter(virBufferPtr buf, + virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + nwItemDesc *item) +{ + virNWFilterPrintTCPFlags(buf, + item->u.tcpFlags.mask, + '/', + item->u.tcpFlags.flags); + + return true; +} + + #define COMMON_MAC_PROPS(STRUCT) \ {\ .name = SRCMACADDR,\ @@ -1104,6 +1192,13 @@ static const virXMLAttr2Struct tcpAttrib .datatype = DATATYPE_UINT8 | DATATYPE_UINT8_HEX, .dataIdx = offsetof(virNWFilterRuleDef, p.tcpHdrFilter.dataTCPOption), }, + { + .name = "flags", + .datatype = DATATYPE_STRING, + .dataIdx = offsetof(virNWFilterRuleDef, p.tcpHdrFilter.dataTCPFlags), + .validator = tcpFlagsValidator, + .formatter = tcpFlagsFormatter, + }, COMMENT_PROP_IPHDR(tcpHdrFilter), { .name = NULL, Index: libvirt-acl/src/conf/nwfilter_conf.h =================================================================== --- libvirt-acl.orig/src/conf/nwfilter_conf.h +++ libvirt-acl/src/conf/nwfilter_conf.h @@ -122,6 +122,10 @@ struct _nwItemDesc { uint16_t u16; char protocolID[10]; char *string; + struct { + uint8_t mask; + uint8_t flags; + } tcpFlags; } u; }; @@ -242,6 +246,7 @@ struct _tcpHdrFilterDef { ipHdrDataDef ipHdr; portDataDef portData; nwItemDesc dataTCPOption; + nwItemDesc dataTCPFlags; }; @@ -667,6 +672,10 @@ void virNWFilterCallbackDriversLock(void void virNWFilterCallbackDriversUnlock(void); +void virNWFilterPrintTCPFlags(virBufferPtr buf, uint8_t mask, + char sep, uint8_t flags); + + VIR_ENUM_DECL(virNWFilterRuleAction); VIR_ENUM_DECL(virNWFilterRuleDirection); VIR_ENUM_DECL(virNWFilterRuleProtocol); Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -1204,6 +1204,15 @@ _iptablesCreateRuleInstance(int directio &prefix)) goto err_exit; + if (HAS_ENTRY_ITEM(&rule->p.tcpHdrFilter.dataTCPFlags)) { + virBufferVSprintf(&buf, " %s --tcp-flags ", + ENTRY_GET_NEG_SIGN(&rule->p.tcpHdrFilter.dataTCPFlags)); + virNWFilterPrintTCPFlags(&buf, + rule->p.tcpHdrFilter.dataTCPFlags.u.tcpFlags.mask, + ' ', + rule->p.tcpHdrFilter.dataTCPFlags.u.tcpFlags.flags); + } + if (iptablesHandlePortData(&buf, vars, &rule->p.tcpHdrFilter.portData, Index: libvirt-acl/docs/schemas/nwfilter.rng =================================================================== --- libvirt-acl.orig/docs/schemas/nwfilter.rng +++ libvirt-acl/docs/schemas/nwfilter.rng @@ -81,6 +81,7 @@ <ref name="common-port-attributes"/> <ref name="common-ip-attributes-p1"/> <ref name="common-ip-attributes-p2"/> + <ref name="tcp-attributes"/> <ref name="comment-attribute"/> </element> </zeroOrMore> @@ -184,6 +185,7 @@ <ref name="common-port-attributes"/> <ref name="common-ipv6-attributes-p1"/> <ref name="common-ipv6-attributes-p2"/> + <ref name="tcp-attributes"/> <ref name="comment-attribute"/> </element> </zeroOrMore> @@ -606,6 +608,14 @@ </optional> </define> + <define name="tcp-attributes"> + <optional> + <attribute name="flags"> + <ref name="tcpflags-type"/> + </attribute> + </optional> + </define> +  <define name="UUID"> @@ -872,4 +882,10 @@ <param name="pattern">((NEW|ESTABLISHED|RELATED|INVALID)(,(NEW|ESTABLISHED|RELATED|INVALID))*|NONE)</param> </data> </define> + + <define name='tcpflags-type'> + <data type="string"> + <param name="pattern">((SYN|ACK|URG|PSH|FIN|RST)(,(SYN|ACK|URG|PSH|FIN|RST))*|ALL|NONE)/((SYN|ACK|URG|PSH|FIN|RST)(,(SYN|ACK|URG|PSH|FIN|RST))*|ALL|NONE)</param> + </data> + </define> </grammar> Index: libvirt-acl/docs/formatnwfilter.html.in =================================================================== --- libvirt-acl.orig/docs/formatnwfilter.html.in +++ libvirt-acl/docs/formatnwfilter.html.in @@ -755,6 +755,11 @@ <td>STRING</td> <td>comma separated list of NEW,ESTABLISHED,RELATED,INVALID or NONE</td> </tr> + <tr> + <td>flags <span class="since">(Since 0.9.0)</span></td> + <td>STRING</td> + <td>TCP-only: format of mask/flags with mask and flags each being a comma separated list of SYN,ACK,URG,PSH,FIN,RST or NONE or ALL</td> + </tr> </table> <p> <br><br> @@ -1040,6 +1045,11 @@ <td>STRING</td> <td>comma separated list of NEW,ESTABLISHED,RELATED,INVALID or NONE</td> </tr> + <tr> + <td>flags <span class="since">(Since 0.8.5)</span></td> + <td>STRING</td> + <td>format of mask/flags with mask and flags each being a comma separated list of SYN,ACK,URG,PSH,FIN,RST or NONE or ALL</td> + </tr> </table> <p> <br><br> Index: libvirt-acl/src/libvirt_private.syms =================================================================== --- libvirt-acl.orig/src/libvirt_private.syms +++ libvirt-acl/src/libvirt_private.syms @@ -683,6 +683,7 @@ virNWFilterObjRemove; virNWFilterObjSaveDef; virNWFilterObjUnlock; virNWFilterPrintStateMatchFlags; +virNWFilterPrintTCPFlags; virNWFilterRegisterCallbackDriver; virNWFilterRuleActionTypeToString; virNWFilterRuleProtocolTypeToString; Index: libvirt-acl/tests/nwfilterxml2xmlin/tcp-test.xml =================================================================== --- libvirt-acl.orig/tests/nwfilterxml2xmlin/tcp-test.xml +++ libvirt-acl/tests/nwfilterxml2xmlin/tcp-test.xml @@ -19,4 +19,16 @@ srcportstart='255' srcportend='256' dstportstart='65535' dstportend='65536'/> </rule> + <rule action='accept' direction='in'> + <tcp state='NONE' flags='SYN/ALL'/> + </rule> + <rule action='accept' direction='in'> + <tcp state='NONE' flags='SYN/SYN,ACK'/> + </rule> + <rule action='accept' direction='in'> + <tcp state='NONE' flags='RST/NONE'/> + </rule> + <rule action='accept' direction='in'> + <tcp state='NONE' flags='PSH/'/> + </rule> </filter> Index: libvirt-acl/tests/nwfilterxml2xmlout/tcp-test.xml =================================================================== --- libvirt-acl.orig/tests/nwfilterxml2xmlout/tcp-test.xml +++ libvirt-acl/tests/nwfilterxml2xmlout/tcp-test.xml @@ -9,4 +9,16 @@ <rule action='accept' direction='in' priority='500' statematch='false'> <tcp srcmacaddr='01:02:03:04:05:06' srcipaddr='10.1.2.3' srcipmask='32' dscp='63' srcportstart='255' srcportend='256' dstportstart='65535'/> </rule> + <rule action='accept' direction='in' priority='500'> + <tcp state='NONE' flags='SYN/ALL'/> + </rule> + <rule action='accept' direction='in' priority='500'> + <tcp state='NONE' flags='SYN/SYN,ACK'/> + </rule> + <rule action='accept' direction='in' priority='500'> + <tcp state='NONE' flags='RST/NONE'/> + </rule> + <rule action='accept' direction='in' priority='500'> + <tcp state='NONE' flags='PSH/NONE'/> + </rule> </filter>

2 2

[libvirt] How many functions that can't be used within libvirt
by SanitYey o 01 Apr '11

01 Apr '11

Hello, I've tested some functions of libvirt don't work. Could some people give me a reasonable explanation about these functions? Why do these function don't work? Or if there is anything wrong of my understanding. 1.virsh # migrate 1 xen+ssh://root@172.16.201.183/Password: error: POST operation failed: xend_post: error from xen daemon: (xend.err "can't connect: (-2, 'Name or service not known')") 2.virsh # dommemstat 5error: Failed to get memory statistics for domain 5error: this function is not supported by the hypervisor: virDomainMemoryStats 3.virsh # dump 5 fileerror: Failed to core dump domain 5 to fileerror: POST operation failed: xend_post: error from xen daemon: (xend.err 'Too many values for live') 4.virsh # iface-list error: Failed to list active interfaceserror: this function is not supported by the hypervisor: virConnectNumOfInterfaces 5.virsh # vncdisplay 5:1 virsh # vncdisplay 41:0 6.virsh # snapshot-create 42 snapshot.xml error: Failed to create snapshot snapshot.xml for domain 42 7.NWFILTER functions Thank you very much!

2 1

[libvirt] [PATCH 0/7] Add support for taking screenshots
by Michal Privoznik 01 Apr '11

01 Apr '11

This patch series implements screenshots taking feature, which is accessible via new virDomainScreenshot API and 'screenshot' command in virsh. By now, 'flags' argument is not used, but can be later when specifying say image output format, etc. Talking of - output is hypervisor specific. QEMU output images in PPM, VirtualBox in PNG. Michal Privoznik (7): screenshot: Defining the public API screenshot: Defining the internal API screenshot: Implementing the public API screenshot: Implementing the remote protocol screenshot: Expose the new API in virsh qemu: Implement the driver methods vbox: Implement the driver methods daemon/remote.c | 26 +++++++++ daemon/remote_dispatch_args.h | 1 + daemon/remote_dispatch_prototypes.h | 8 +++ daemon/remote_dispatch_table.h | 5 ++ include/libvirt/libvirt.h.in | 7 ++ src/driver.h | 5 ++ src/esx/esx_driver.c | 1 + src/libvirt.c | 77 +++++++++++++++++++++++++ src/libvirt_public.syms | 1 + src/libxl/libxl_driver.c | 1 + src/lxc/lxc_driver.c | 1 + src/openvz/openvz_driver.c | 1 + src/phyp/phyp_driver.c | 1 + src/qemu/qemu_driver.c | 106 +++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 20 +++++++ src/qemu/qemu_monitor.h | 3 + src/qemu/qemu_monitor_json.c | 23 ++++++++ src/qemu/qemu_monitor_json.h | 4 + src/qemu/qemu_monitor_text.c | 31 ++++++++++ src/qemu/qemu_monitor_text.h | 2 + src/remote/remote_driver.c | 26 +++++++++ src/remote/remote_protocol.c | 13 ++++ src/remote/remote_protocol.h | 10 +++ src/remote/remote_protocol.x | 9 +++- src/remote_protocol-structs | 5 ++ src/test/test_driver.c | 1 + src/uml/uml_driver.c | 1 + src/vbox/vbox_tmpl.c | 97 ++++++++++++++++++++++++++++++++ src/vmware/vmware_driver.c | 1 + src/xen/xen_driver.c | 1 + src/xen/xen_driver.h | 1 + src/xen/xen_hypervisor.c | 1 + src/xen/xen_inotify.c | 1 + src/xen/xend_internal.c | 1 + src/xen/xm_internal.c | 1 + src/xen/xs_internal.c | 1 + src/xenapi/xenapi_driver.c | 1 + tools/virsh.c | 49 ++++++++++++++++ tools/virsh.pod | 4 + 39 files changed, 547 insertions(+), 1 deletions(-) -- 1.7.4

3 9

[libvirt] [PATCH] virsh: fix mingw failure on creating nonblocking pipe
by Eric Blake 01 Apr '11

01 Apr '11

* .gnulib: Update to latest, for nonblocking module. * bootstrap.conf (gnulib_modules): Add nonblocking. * src/util/util.c (virSetBlocking): Defer to gnulib. --- Matthias, does this work for you on your mingw build? So far, I have only tested that it cross-compiles, and that the new gnulib module passes its self-test when run in isolation on mingw. .gnulib | 2 +- bootstrap.conf | 1 + src/util/util.c | 22 ++-------------------- 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/.gnulib b/.gnulib index 790645d..dec3475 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 790645d837f8084991421107fba639b110d58335 +Subproject commit dec3475763be252103922a887920012eeb32dc26 diff --git a/bootstrap.conf b/bootstrap.conf index 733c354..ca0c3de 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -49,6 +49,7 @@ mkstemp mkstemps mktempd netdb +nonblocking perror physmem pipe-posix diff --git a/src/util/util.c b/src/util/util.c index 035036b..e54b02b 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -77,6 +77,7 @@ #include "verify.h" #include "files.h" #include "command.h" +#include "nonblocking.h" #ifndef NSIG # define NSIG 32 @@ -246,26 +247,7 @@ virArgvToString(const char *const *argv) } int virSetBlocking(int fd, bool blocking) { -#ifndef WIN32 - int flags; - if ((flags = fcntl(fd, F_GETFL)) < 0) - return -1; - if (blocking) - flags &= ~O_NONBLOCK; - else - flags |= O_NONBLOCK; - if ((fcntl(fd, F_SETFL, flags)) < 0) - return -1; -#else - unsigned long flag = blocking ? 0 : 1; - - /* This is actually Gnulib's replacement rpl_ioctl function. - * We can't call ioctlsocket directly in any case. - */ - if (ioctl (fd, FIONBIO, (void *) &flag) == -1) - return -1; -#endif - return 0; + return set_nonblocking_flag (fd, blocking); } int virSetNonBlock(int fd) { -- 1.7.4

2 3

[libvirt] [libvirt-php] Remove strip from installation
by Lyre 01 Apr '11

01 Apr '11

Make it able to generate debuginfo package. --- configure.ac | 1 - src/Makefile.am | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 8149349..5ebe416 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,6 @@ AC_LANG([C]) AC_PROG_INSTALL AC_PROG_SED AC_PROG_AWK -AC_CHECK_TOOL([STRIP], [strip]) AC_CHECK_TOOL([ECHO], [echo]) AC_CHECK_TOOL([RM], [rm]) diff --git a/src/Makefile.am b/src/Makefile.am index edb5df4..76ebee6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,7 +13,7 @@ build: $(ECHO) "Extension compiled as $(PACKAGE).so" install-exec-local: - $(INSTALL) -m 644 -D --strip $(PACKAGE).so $(DESTDIR)$(PHPEDIR)/$(PACKAGE).so + $(INSTALL) -m 644 -D $(PACKAGE).so $(DESTDIR)$(PHPEDIR)/$(PACKAGE).so $(INSTALL) -m 755 -d $(DESTDIR)$(PHPCDIR) $(ECHO) "extension=$(PACKAGE).so" > $(DESTDIR)$(PHPCDIR)/libvirt-php.ini -- 1.7.3.4 �

3 4

[libvirt] [PATCH] Fix libxl driver startup
by Daniel Veillard 01 Apr '11

01 Apr '11

When you happen to have a libvirtd binary compiled with the libxenlight driver (say you have installed xen-4.1 libraries) but not running a xen enabled system, then libvirtd fails to start. The cause is that libxlStartup() returns -1 when failing to initialize the library, and this propagates to virStateInitialize() which consider this a failure. We should only exit libxlStartup with an error code if something like an allocation error occurs, not if the driver failed to initialize. Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

2 2

[libvirt] [PATCH] virsh: Fix documentation for memtune command
by Jiri Denemark 01 Apr '11

01 Apr '11

Commit 78ba748ef14c520ff1c4af2b5b0a44586ac49c8c claims to fix documentation for swap_hard_limit virsh memtune option but it only fixes documentation in formatdomain.html and libvirt.h. This patch completes the task by fixing "virsh help memtune" output and memtune section of virsh man page. --- tools/virsh.c | 2 +- tools/virsh.pod | 29 +++++++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index faeaf47..8816812 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -3201,7 +3201,7 @@ static const vshCmdOptDef opts_memtune[] = { {"soft-limit", VSH_OT_INT, VSH_OFLAG_NONE, N_("Memory during contention in kilobytes")}, {"swap-hard-limit", VSH_OT_INT, VSH_OFLAG_NONE, - N_("Max swap in kilobytes")}, + N_("Max memory plus swap in kilobytes")}, {"min-guarantee", VSH_OT_INT, VSH_OFLAG_NONE, N_("Min guaranteed memory in kilobytes")}, {NULL, 0, 0, NULL} diff --git a/tools/virsh.pod b/tools/virsh.pod index e882261..ca9e401 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -611,12 +611,37 @@ use the virsh B<edit> command instead to update its XML <memory> element. =item B<memtune> I<domain-id> optional I<--hard-limit> B<kilobytes> optional I<--soft-limit> B<kilobytes> optional I<--swap-hard-limit> -B<kilobytes> -I<--min-guarantee> B<kilobytes> +B<kilobytes> optional I<--min-guarantee> B<kilobytes> Allows you to display or set the domain memory parameters. Without flags, the current settings are displayed; with a flag, the appropriate limit is adjusted if supported by the hypervisor. LXC and -QEMU/KVM supports I<--hard-limit>, I<--soft-limit>, and I<--swap-hard-limit>. +QEMU/KVM support I<--hard-limit>, I<--soft-limit>, and I<--swap-hard-limit>. + +=over 4 + +=item I<--hard-limit> + +The maximum memory the guest can use. The units for this value are kilobytes +(i.e. blocks of 1024 bytes). + +=item I<--soft-limit> + +The memory limit to enforce during memory contention. The units for this value +are kilobytes (i.e. blocks of 1024 bytes). + +=item I<--swap-hard-limit> + +The maximum memory plus swap the guest can use. The units for this value are +kilobytes (i.e. blocks of 1024 bytes). This has to be more than hard-limit +value provided. + +=item I<--min-guarantee> + +The guaranteed minimum memory allocation for the guest. The units for this +value are kilobytes (i.e. blocks of 1024 bytes). + +=back =item B<blkiotune> I<domain-id> optional I<--weight> B<weight> -- 1.7.4.1

3 5

[libvirt] [PATCHv8 0/4] libvirt/qemu - persistent modification of inactive domans.
by KAMEZAWA Hiroyuki 01 Apr '11

01 Apr '11

Hi, this is v8. This one implements a new method for rollback in domain changes in patch 2/4. And I dropped "verify new device is.." patch which was 4/4 in v7. Then, totarl numbers of patches are not changed. I'll add NIC support when this patch goes. 1/4 ..... a base patch for all devices. (not changed much) 2/4 ..... copy-sync-undo for synchronized update of domain definition. 3/4 ..... allow persistent addtion of disks to invalid domain. 4/4 ..... address conflic check. Thanks, -Kame

2 10

[libvirt] Libvirt potentially in GSoC 2011 through CERN
by Justin Clift 01 Apr '11

01 Apr '11

Hi all, Just came across this interesting Google Summer of Code 2011 potential at CERN, where they specifically mention libvirt improvements in more than one project: http://cernvm.cern.ch/portal/gsoc11 Nifty eh? :) Regards and best wishes, Justin Clift

1 0

[libvirt] [PATCH v2] qemu: Ignore libvirt debug messages in qemu log
by Jiri Denemark 01 Apr '11

01 Apr '11

qemu driver uses a 4K buffer for reading qemu log file. This is enough when only qemu's output is present in the log file. However, when debugging messages are turned on, intermediate libvirt process fills the log with a bunch of debugging messages before it executes qemu binary. In such a case the buffer may become too small. However, we are not really interested in libvirt messages so they can be filtered out from the buffer. --- Notes: Version 2: - add a comment to virLogFormatString() that this new code relies on the log message format - temporarily replace '\n' with '\0' to provide a bound for strstr() src/qemu/qemu_process.c | 50 +++++++++++++++++++++++++++++++++++++--------- src/util/logging.c | 8 +++++++ 2 files changed, 48 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e31e1b4..2fc2b6c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -762,11 +762,23 @@ qemuProcessReadLogOutput(virDomainObjPtr vm, { int retries = (timeout*10); int got = 0; + char *debug = NULL; + int ret = -1; + char *filter_next = buf; + buf[0] = '\0'; + /* This relies on log message format generated by virLogFormatString() and + * might need to be modified when message format changes. */ + if (virAsprintf(&debug, ": %d: debug : ", vm->pid) < 0) { + virReportOOMError(); + return -1; + } + while (retries) { - ssize_t func_ret, ret; + ssize_t func_ret, bytes; int isdead = 0; + char *eol; func_ret = func(vm, buf, fd); @@ -775,32 +787,47 @@ qemuProcessReadLogOutput(virDomainObjPtr vm, /* Any failures should be detected before we read the log, so we * always have something useful to report on failure. */ - ret = saferead(fd, buf+got, buflen-got-1); - if (ret < 0) { + bytes = saferead(fd, buf+got, buflen-got-1); + if (bytes < 0) { virReportSystemError(errno, _("Failure while reading %s log output"), what); - return -1; + goto cleanup; } - got += ret; + got += bytes; buf[got] = '\0'; + + /* Filter out debug messages from intermediate libvirt process */ + while ((eol = strchr(filter_next, '\n'))) { + *eol = '\0'; + if (strstr(filter_next, debug)) { + memmove(filter_next, eol + 1, got - (eol - buf)); + got -= eol + 1 - filter_next; + } else { + filter_next = eol + 1; + *eol = '\n'; + } + } + if (got == buflen-1) { qemuReportError(VIR_ERR_INTERNAL_ERROR, _("Out of space while reading %s log output: %s"), what, buf); - return -1; + goto cleanup; } if (isdead) { qemuReportError(VIR_ERR_INTERNAL_ERROR, _("Process exited while reading %s log output: %s"), what, buf); - return -1; + goto cleanup; } - if (func_ret <= 0) - return func_ret; + if (func_ret <= 0) { + ret = func_ret; + goto cleanup; + } usleep(100*1000); retries--; @@ -809,7 +836,10 @@ qemuProcessReadLogOutput(virDomainObjPtr vm, qemuReportError(VIR_ERR_INTERNAL_ERROR, _("Timed out while reading %s log output: %s"), what, buf); - return -1; + +cleanup: + VIR_FREE(debug); + return ret; } diff --git a/src/util/logging.c b/src/util/logging.c index 48c0cfd..9d18752 100644 --- a/src/util/logging.c +++ b/src/util/logging.c @@ -660,6 +660,14 @@ virLogFormatString(char **msg, const char *str) { int ret; + + /* + * Be careful when changing the following log message formatting, we rely + * on it when stripping libvirt debug messages from qemu log files. So when + * changing this, you might also need to change the code there. + * virLogFormatString() function name is mentioned there so it's sufficient + * to just grep for it to find the right place. + */ if ((funcname != NULL)) { ret = virAsprintf(msg, "%02d:%02d:%02d.%03d: %d: %s : %s:%lld : %s\n", time_info->tm_hour, time_info->tm_min, -- 1.7.4.1

2 2

[libvirt] [PATCH] qemu: Fix improper logic of qemuCgroupSetup
by Osier Yang 01 Apr '11

01 Apr '11

It throws errors as long as the cgroup controller is not available, regardless of whether we really want to use it to do setup or not, which is not what we want, fixing it with throwing error when need to use the controller. And change "VIR_WARN" to "qemuReportError" for memory controller incidentally. --- src/qemu/qemu_cgroup.c | 78 +++++++++++++++++++++++++---------------------- 1 files changed, 41 insertions(+), 37 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 8cf45da..7e88a67 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -294,8 +294,8 @@ int qemuSetupCgroup(struct qemud_driver *driver, } } - if (qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_BLKIO)) { - if (vm->def->blkio.weight != 0) { + if (vm->def->blkio.weight != 0) { + if (qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_BLKIO)) { rc = virCgroupSetBlkioWeight(cgroup, vm->def->blkio.weight); if(rc != 0) { virReportSystemError(-rc, @@ -303,48 +303,52 @@ int qemuSetupCgroup(struct qemud_driver *driver, vm->def->name); goto cleanup; } + } else { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Block I/O tuning is not available on this host")); } - } else { - qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Block I/O tuning is not available on this host")); } - if ((rc = qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_MEMORY))) { - if (vm->def->mem.hard_limit != 0) { - rc = virCgroupSetMemoryHardLimit(cgroup, vm->def->mem.hard_limit); - if (rc != 0) { - virReportSystemError(-rc, - _("Unable to set memory hard limit for domain %s"), - vm->def->name); - goto cleanup; + if (vm->def->mem.hard_limit != 0 || + vm->def->mem.soft_limit != 0 || + vm->def->mem.swap_hard_limit != 0) { + if ((rc = qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_MEMORY))) { + if (vm->def->mem.hard_limit != 0) { + rc = virCgroupSetMemoryHardLimit(cgroup, vm->def->mem.hard_limit); + if (rc != 0) { + virReportSystemError(-rc, + _("Unable to set memory hard limit for domain %s"), + vm->def->name); + goto cleanup; + } } - } - if (vm->def->mem.soft_limit != 0) { - rc = virCgroupSetMemorySoftLimit(cgroup, vm->def->mem.soft_limit); - if (rc != 0) { - virReportSystemError(-rc, - _("Unable to set memory soft limit for domain %s"), - vm->def->name); - goto cleanup; + if (vm->def->mem.soft_limit != 0) { + rc = virCgroupSetMemorySoftLimit(cgroup, vm->def->mem.soft_limit); + if (rc != 0) { + virReportSystemError(-rc, + _("Unable to set memory soft limit for domain %s"), + vm->def->name); + goto cleanup; + } } - } - if (vm->def->mem.swap_hard_limit != 0) { - rc = virCgroupSetMemSwapHardLimit(cgroup, vm->def->mem.swap_hard_limit); - if (rc != 0) { - virReportSystemError(-rc, - _("Unable to set swap hard limit for domain %s"), - vm->def->name); - goto cleanup; + if (vm->def->mem.swap_hard_limit != 0) { + rc = virCgroupSetMemSwapHardLimit(cgroup, vm->def->mem.swap_hard_limit); + if (rc != 0) { + virReportSystemError(-rc, + _("Unable to set swap hard limit for domain %s"), + vm->def->name); + goto cleanup; + } } + } else { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Memory tuning is not available on this host")); } - } else { - VIR_WARN("Memory cgroup is disabled in qemu configuration file: %s", - vm->def->name); } - if (qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPU)) { - if (vm->def->cputune.shares != 0) { + if (vm->def->cputune.shares != 0) { + if (qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_CPU)) { rc = virCgroupSetCpuShares(cgroup, vm->def->cputune.shares); if(rc != 0) { virReportSystemError(-rc, @@ -352,10 +356,10 @@ int qemuSetupCgroup(struct qemud_driver *driver, vm->def->name); goto cleanup; } + } else { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("CPU tuning is not available on this host")); } - } else { - qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("CPU tuning is not available on this host")); } done: -- 1.7.4

2 2

[libvirt] [PATCH] free tmp after unlinking it
by Wen Congyang 01 Apr '11

01 Apr '11

--- 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 dd12dc8..5aa715e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5065,9 +5065,9 @@ endjob: vm = NULL; cleanup: - VIR_FREE(tmp); VIR_FORCE_CLOSE(fd); unlink (tmp); + VIR_FREE(tmp); if (vm) virDomainObjUnlock(vm); return ret; -- 1.7.1

3 4

[libvirt] What about Trusted Virtual Domains???
by Paolo Smiraglia 31 Mar '11

31 Mar '11

Hi guys... I need an opinion from the Libvirt community about the development of a new possible Libvirt feature: the Trusted Virtual Domains (TVD). Conceptually, a TVD can be compared to a mix of Virtual Private Network (VPN) and Virtual LAN (VLAN). My idea is to define a new Libvirt entity called "tvd" which contains the information about domains and hosts belonging to the same TVD. Below is showed a possible XML definition of tvd entity: <tvd name='tvd1.mycloud' uuid='...'> <host ip='10.0.0.1' hostname='node1.example.com'> <domain name='guest1' uuid='...' /> <domain name='guest27' uuid='...' /> </host> <host ip='10.0.0.2' hostname='node2.example.com'> <domain name='guest12' uuid='...' /> <domain name='guest2' uuid='...' /> </host> </tvd> With the informations contained in the tvd XML definition, Libvirt may be able to automatically setup, for example, an IPSec tunnel between node1.example.com and node2.example.com, and VLAN between guest1, guest2,guest12 and guest27. In my opinion, this feature may be really useful in a cloud computing scenario. And you? What about it? It is a crazy idea? ;-) Thanks in advance for the replies! Bests, PAOLO -- PAOLO SMIRAGLIA http://portale.isf.polito.it/paolo-smiraglia

2 2

[libvirt] [PATCH] Make check_fc_host() and check_vport_capable() usable as rvalues
by Guido Günther 31 Mar '11

31 Mar '11

This is needed on non linux ports using HAL in gather_scsi_host_cap. Noticed while porting to kfreebsd. O.k. to apply? -- Guido --- src/node_device/node_device_driver.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h index 4721be4..e583c2b 100644 --- a/src/node_device/node_device_driver.h +++ b/src/node_device/node_device_driver.h @@ -78,8 +78,8 @@ int read_wwn_linux(int host, const char *file, char **wwn); # else /* __linux__ */ -# define check_fc_host(d) -# define check_vport_capable(d) +# define check_fc_host(d) (-1) +# define check_vport_capable(d) (-1) # define get_physical_function(sysfs_path, d) # define get_virtual_functions(sysfs_path, d) # define read_wwn(host, file, wwn) -- 1.7.4.1

2 1

[libvirt] RFC: have libvirt track cgroup objects
by Eric Blake 31 Mar '11

31 Mar '11

Currently, all qemu domains are created in their own cgroup, but that cgroup is a direct child of libvirt. So cgroup tunings are all-or-one; there is no way to group multiple VMs to share a particular resource without infringing on other VMs. Just as we can currently track interface, nwfilter, and storage pool objects as independent xml entities in parallel with domains, it would be nice to expose a new object, virCgroup. All virCgroup and virDomain objects would have an optional parent virCgroup object, and anything without such a parent defaults to the global libvirt cgroup as the parent. Recent tuning parameters like <memtune>, <blkiotune> that apply to domains would also apply to a virCgroup XML representation. That way, you can create a hierarchy of cgroups, such as: libvirt |+cgroup1 | |+vm1 | \+vm2 \+vm3 where a <memtune> of cgroup1 is memory that is shared between vm1 and vm2 (possibly with overcommit, if it is anticipated that both vms will not simultaneously be using the max memory), which maps nicely to the fact that cgroups are already hierarchical to the kernel. I'm not quite sure how this would affect migration, but it would probably be similar to how <interface> or <nwfilter> setups affect migration (that is, if a domain refers to a particular host <interface>, then that interface object better be present with similar characteristics on both source and destination of the migration). I'm throwing this out for general thoughts, based on an IRC conversation (and not necessarily because I plan on implementing it any time soon). -- Eric Blake eblake(a)redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org

2 1

[libvirt] [RFC PATCH V1 0/5] Add TPM support to Qemu
by Stefan Berger 31 Mar '11

31 Mar '11

The following series of patches add support for TPM to the libvirt's parser and Qemu driver. Since the underlying support in Qemu and SeaBIOS are not in repositories yet, I am posting them as RFCs for now. If you have feedback, please let me know. Regards, Stefan

1 5

[libvirt] virsh sechedinfo/memtune with libvirt-0.8.8
by Zvi Dubitzky 31 Mar '11

31 Mar '11

Sorry . I have'nt got an answer from the user's list . I have fedora14 installed with its standard libvirt-0.8.3. I can start VM using .xml files and also run: virsh schedinfo. the cgroup CPU controller is mounted and active . In fact I have the path to the Virtual machine : /dev/cgroup/cpu/libvirt/qemu/<vm name > I now upgraded to libvirt-0.8.8 from a tar ball ( configure , make , make install) . I rebooted , new libvirtd started . virsh is working ok (I can create a vm) except for the commands : schedinfo and memtune that e.g. say upon ' virsh schedinfo <vm name>' Scheduler : Unknown error: Requested operation is not valid: cgroup CPU controller is not mounted But the CPU controller is mounted because I have the path : /dev/cgroup/cpu/libvirt/qemu/ . What I am missing is the <vm_name> group which is not generated despite that the VM was generated ok by virsh create and I can access it. Any idea what is missing ? Zvi Dubitzky Email:dubi@il.ibm.com

3 3

[libvirt] TPM support in libvirt
by Stefan Berger 31 Mar '11

31 Mar '11

Hello! I'd like to start a discussion and get some feedback on support for TPM (Trusted Platform Module) management in libvirt. I have been posting patches to the Qemu and SeaBIOS mailing lists that will provide the ground work for TPM support in Qemu, though I anticipate that it will take a while until the code goes into those repositories. So everything I am saying related to command lines etc. can still change. Nevertheless, the next obvious layer for support is libvirt. Well, and I do have patches... First some background: the TPM is a crypto device built into many modern laptops and desktops. It's a chip connected to the motherboard and has firmware for running the TPM specifications. I would say it has a full processor on its own to run this firmware. It also has some very limited space for persistent storage to permanently store for example the owner's password (that he can establish with the TPM), store private keys and it also has some area for NVRAM spaces where the user can put any data into it he wants to. So now, on the qemu command line the TPM support (currently) looks as follows: ... -tpm ? displays: Supported TPM types (choose only one): builtin Qemu's built-in TPM; requires 63kb of block storage I use this for reading the size of the necessary (QCoW2) blockstorage from it, 63kb. To start a VM with TPM support: ... -tpm type=builtin,path=/tmp/tpmstate.bin The above indicates the type of TPM to use. Currently there is only one type available, which is the 'builtin' one. It also provides a path to persistent storage, here /tmp/tpmstate.bin. The persistent storage file is actually a Qcow2 file so we can properly support snapshotting of the image and the TPM and go back to different states. Obviously we are now adding another 'disk' to the VM, so that the TPM can store its own persistent data. Now a user has to make sure to always keep his image file and this TPM 'disk' together, particularly once he stores vital keys in the TPM. So now for modeling this in libvirt I thought of this XML here for a user-provided Qcow2 image: <tpm type='built-in'> <storage file='/tmp/tpmstate.bin'/> </tpm> In this case the user would create the above QCoW2 /tmp/tmpstate.bin at the appropriate size (63kb). This XML here is for a libvirt-created QCoW2 image: <tpm type='built-in'> <storage/> </tpm> This then causes libvirt to create a QCoW2 image of 63kb size (reads the 63kb from .. tpm ?) once the VM is about to start and produces for example this command line: -tpm type=builtin,path=/var/lib/libvirt/tpm/a4d7cd22-da89-3094-6212-079a48a309a1.bin The UUID then corresponds to the UUID of the VM. Since only one TPM per VM is supported, this should work just fine. Now to support an encrypted QCoW2 image, the following XML could be used: <tpm type='built-in'> <storage> <encryption format='qcow'> <secret type='passphrase' uuid='13ea49f7-2553-7308-5168-e337ade36232'/> </encryption> </storage> </tpm> Here the user has created a 'secret' and passes that secret's UUID into the XML above. So this is similar to how storage is dealt with with the difference that no path to the storage is provided and also internally no comparisons for storage paths are being made. I did also not want to force the user to create storage spaces (volumes) on his own, but let libvirt handle this implicitly for the TPM (use qemu-img to create the QCoW2). Also, multiple VMs' TPMs could share the same secret. Please let me know of any comments regarding this. I'll post the patches as RFC later on. Regards, Stefan

2 2

[libvirt] [PATCH] Fix domain events C example on Win32
by Daniel P. Berrange 31 Mar '11

31 Mar '11

printf on Win32 does not neccessarily support %lld and we don't have GNULIBs wrapper for printf(). Switch to use asprintf() for which we do have a gnulib wrapper with %lld support * examples/domain-events/events-c/event-test.c: Fix formatting of %lld on Win32 * cfg.mk: Don't require use of virAsprintf since this is an example app for out of tree users to follow --- cfg.mk | 2 +- examples/domain-events/events-c/event-test.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cfg.mk b/cfg.mk index ac419f7..0440425 100644 --- a/cfg.mk +++ b/cfg.mk @@ -564,7 +564,7 @@ exclude_file_name_regexp--sc_prohibit_always_true_header_tests = \ (^docs|^python/(libvirt-override|typewrappers)\.c$$) exclude_file_name_regexp--sc_prohibit_asprintf = \ - ^(bootstrap.conf$$|po/|src/util/util\.c$$) + ^(bootstrap.conf$$|po/|src/util/util\.c$$|examples/domain-events/events-c/event-test\.c$$) exclude_file_name_regexp--sc_prohibit_close = \ (\.py$$|^docs/|(src/util/files\.c|src/libvirt\.c)$$) diff --git a/examples/domain-events/events-c/event-test.c b/examples/domain-events/events-c/event-test.c index 7d05dd8..44e94ec 100644 --- a/examples/domain-events/events-c/event-test.c +++ b/examples/domain-events/events-c/event-test.c @@ -169,8 +169,14 @@ static int myDomainEventRTCChangeCallback(virConnectPtr conn ATTRIBUTE_UNUSED, long long offset, void *opaque ATTRIBUTE_UNUSED) { - printf("%s EVENT: Domain %s(%d) rtc change %lld\n", __func__, virDomainGetName(dom), - virDomainGetID(dom), offset); + char *str = NULL; + /* HACK: use asprintf since we have gnulib's wrapper for %lld on Win32 + * but don't have a printf() replacement with %lld */ + if (asprintf(&str, "%s EVENT: Domain %s(%d) rtc change %lld\n", __func__, virDomainGetName(dom), + virDomainGetID(dom), offset) < 0) + return 0; + + printf("%s", str); return 0; } -- 1.7.4

2 2

[libvirt] [PATCH] maint: avoid locale-sensitivity in string case comparisons
by Eric Blake 31 Mar '11

31 Mar '11

strcase{cmp/str} have the drawback of being sensitive to the global locale; this is unacceptable in a library setting. Prefer a hard-coded C locale alternative for all but virsh, which is user facing and where the global locale isn't changing externally. * .gnulib: Update to latest, for c-strcasestr change. * bootstrap.conf (gnulib_modules): Drop strcasestr, add c-strcase and c-strcasestr. * cfg.mk (sc_avoid_strcase): New rule. (exclude_file_name_regexp--sc_avoid_strcase): New exception. * src/internal.h (STRCASEEQ, STRCASENEQ, STRCASEEQLEN) (STRCASENEQLEN): Adjust offenders. * src/qemu/qemu_monitor_text.c (qemuMonitorTextEjectMedia): Likewise. * tools/virsh.c (namesorter): Document exception. --- Inspired by today's earlier patch that started using strcasester. This also goes along with our policy of no ctype, just c-ctype. .gnulib | 2 +- bootstrap.conf | 3 ++- cfg.mk | 7 +++++++ src/internal.h | 10 ++++++---- src/qemu/qemu_monitor_text.c | 3 ++- tools/virsh.c | 1 + 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.gnulib b/.gnulib index 422ab2e..790645d 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 422ab2e0d70ed348e2fd0a82558be38e5859011a +Subproject commit 790645d837f8084991421107fba639b110d58335 diff --git a/bootstrap.conf b/bootstrap.conf index 6e10828..733c354 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -22,6 +22,8 @@ gnulib_modules=' areadlink base64 c-ctype +c-strcase +c-strcasestr canonicalize-lgpl chown close @@ -63,7 +65,6 @@ sigpipe snprintf socket stpcpy -strcasestr strchrnul strndup strerror diff --git a/cfg.mk b/cfg.mk index ac419f7..f802cee 100644 --- a/cfg.mk +++ b/cfg.mk @@ -349,6 +349,11 @@ sc_avoid_ctype_macros: halt="don't use ctype macros (use c-ctype.h)" \ $(_sc_search_regexp) +sc_avoid_strcase: + @prohibit='\bstrn?case(cmp|str) *\(' \ + halt="don't use raw strcase functions (use c-strcase instead)" \ + $(_sc_search_regexp) + sc_prohibit_virBufferAdd_with_string_literal: @prohibit='\<virBufferAdd *\([^,]+, *"[^"]' \ halt='use virBufferAddLit, not virBufferAdd, with a string literal' \ @@ -547,6 +552,8 @@ _makefile_at_at_check_exceptions = ' && !/(SCHEMA|SYSCONF)DIR/' syntax-check: $(top_srcdir)/HACKING # List all syntax-check exemptions: +exclude_file_name_regexp--sc_avoid_strcase = ^tools/virsh\.c$$ + _src1=libvirt|fdstream|qemu/qemu_monitor|util/(command|util)|xen/xend_internal exclude_file_name_regexp--sc_avoid_write = \ ^(src/($(_src1))|daemon/libvirtd|tools/console)\.c$$ diff --git a/src/internal.h b/src/internal.h index be97801..2afbd8d 100644 --- a/src/internal.h +++ b/src/internal.h @@ -44,6 +44,8 @@ # include "libvirt_internal.h" +# include "c-strcase.h" + /* On architectures which lack these limits, define them (ie. Cygwin). * Note that the libvirt code should be robust enough to handle the * case where actual value is longer than these limits (eg. by setting @@ -64,13 +66,13 @@ /* String equality tests, suggested by Jim Meyering. */ # define STREQ(a,b) (strcmp(a,b) == 0) -# define STRCASEEQ(a,b) (strcasecmp(a,b) == 0) +# define STRCASEEQ(a,b) (c_strcasecmp(a,b) == 0) # define STRNEQ(a,b) (strcmp(a,b) != 0) -# define STRCASENEQ(a,b) (strcasecmp(a,b) != 0) +# define STRCASENEQ(a,b) (c_strcasecmp(a,b) != 0) # define STREQLEN(a,b,n) (strncmp(a,b,n) == 0) -# define STRCASEEQLEN(a,b,n) (strncasecmp(a,b,n) == 0) +# define STRCASEEQLEN(a,b,n) (c_strncasecmp(a,b,n) == 0) # define STRNEQLEN(a,b,n) (strncmp(a,b,n) != 0) -# define STRCASENEQLEN(a,b,n) (strncasecmp(a,b,n) != 0) +# define STRCASENEQLEN(a,b,n) (c_strncasecmp(a,b,n) != 0) # define STRPREFIX(a,b) (strncmp(a,b,strlen(b)) == 0) # define STRSKIP(a,b) (STRPREFIX(a,b) ? (a) + strlen(b) : NULL) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index e0e3292..168c60f 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -33,6 +33,7 @@ #include "qemu_monitor_text.h" #include "qemu_command.h" #include "c-ctype.h" +#include "c-strcasestr.h" #include "memory.h" #include "logging.h" #include "driver.h" @@ -934,7 +935,7 @@ int qemuMonitorTextEjectMedia(qemuMonitorPtr mon, /* If the command failed qemu prints: * device not found, device is locked ... * No message is printed on success it seems */ - if (strcasestr(reply, "device ")) { + if (c_strcasestr(reply, "device ")) { qemuReportError(VIR_ERR_OPERATION_FAILED, _("could not eject media on %s: %s"), devname, reply); goto cleanup; diff --git a/tools/virsh.c b/tools/virsh.c index faeaf47..3c759b9 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -432,6 +432,7 @@ static int namesorter(const void *a, const void *b) { const char **sa = (const char**)a; const char **sb = (const char**)b; + /* User visible sort, so we want locale-specific case comparison. */ return strcasecmp(*sa, *sb); } -- 1.7.4

2 2

[libvirt] [RFC] Add flag for virsh undefine to remove/wipe the disk devices
by Osier Yang 31 Mar '11

31 Mar '11

Hi, All I'm thinking to introduce a new flag (something like --remove-disks, --wipe-disks) for "virsh undefine", so that the user can choose whether to remove/wipe the disk devices or not, have seen this requirement in many places, @libvirt-users, public #virt, and also we have a bug of this function. So, IMHO this is a reasonable requirement, following is the rough thoughts: 1) General idea. As we don't have a API which can get all the disk devices of a domain, perhaps need to write functions to parse domain xml to extract the disks' path (this is annoyed, but seems don't other way), and then lookup them by storage volume API (virStorageVolLookupByPath), and then can remove or wipe the volume by (virStorageVolDelete/virStorageVolWipe). And for the disk path which doesn't belong to any storage pool, simply remove it by "unlink()"? 2) Which type of devices can not be removed/wiped. * Can't delete/wipe ISCSI/SCSI vol. * Vol doesn't exists (which will throw an warning when do virStorageVolLookupByPath). * Have no write permission on the parent directory of the disk path. * Can't delete/wipe the disk device which is passthrough'ed from host, (e.g. /dev/sr0 as a CDROM device for guest) * The storage pool which the disk device belongs to as a vol is marked as "share" * The storage pool which the disk device belongs as a vol is readonly * can't delete disk device of network type. * Any others? For these situations, we need to do checking and throw straightforward warnings to tell user why it can't be removed/wiped. Any idea is welcomed. Thanks. CC'ed Eric, as I saw you talked about this somewhere. (#virt?), :-) Regards Osier

6 13

[libvirt] [libvirt-php][PATCH] Fix virConnectClose failed issue on list_domains
by warp.kawada＠gmail.com 31 Mar '11

31 Mar '11

This patch for libvirt-php Pre-4.2 version. I checked with libvirt 0.8.8 version. I fixed irConnectClose failed issue on list_domains. And web example codes updated for 0.8.8 API. This issue is: $domains = libvirt_list_domains($conn); PHP Warning: main(): virConnectClose failed with 1 on destructor: (null) And if ssh connect to remote host then some netcat processes remain on remote host. # ps axu|grep libvirt|grep 'nc -U' apache 27867 0.0 0.0 7332 368 ? Ss 12:09 0:00 nc -U /var/run/libvirt/libvirt-sock apache 27871 0.0 0.0 7332 372 ? Ss 12:09 0:00 nc -U /var/run/libvirt/libvirt-sock apache 27875 0.0 0.0 7332 368 ? Ss 12:09 0:00 nc -U /var/run/libvirt/libvirt-sock Thanks for libvirt-php. Regards, == Yukihiro Kawada diff --git a/examples/libvirt.php b/examples/libvirt.php index 10e7e38..8a54acd 100644 --- a/examples/libvirt.php +++ b/examples/libvirt.php @@ -22,7 +22,7 @@ } function get_hostname() { - return libvirt_get_hostname($this->conn); + return libvirt_connect_get_hostname($this->conn); } function get_domain_object($nameRes) { @@ -178,30 +178,23 @@ } function get_uri() { - return libvirt_get_uri($this->conn); + return libvirt_connect_get_uri($this->conn); } function get_domain_count() { - $ac = libvirt_get_active_domain_count($this->conn); - $ic = libvirt_get_inactive_domain_count($this->conn); - $tc = libvirt_get_domain_count($this->conn); - - return array( - 'active' => $ac, - 'inactive' => $ic, - 'total' => $tc - ); + return libvirt_domain_get_counts($this->conn); } function get_domains() { $domNames = array(); $doms = libvirt_list_domains($this->conn); - foreach ($doms as $dom) { - $tmp = libvirt_domain_get_uuid_string($dom); - $domNames[$tmp] = libvirt_domain_get_name($dom); + foreach ($doms as $nam) { + $dom = libvirt_domain_lookup_by_name($this->conn, $nam); + $tmp = libvirt_domain_get_uuid_string($dom); + $domNames[$tmp] = $nam; } - + unset($doms); ksort($domNames); return $domNames; } @@ -316,7 +309,7 @@ $ret = array(); if ($name != false) { - $dom=libvirt_domain_lookup_by_name($this->conn, $name); + $dom = libvirt_domain_lookup_by_name($this->conn, $name); if (!$dom) return false; diff --git a/src/libvirt-php.cb/src/libvirt-php.c index 5e77994..f5a927b 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -3467,7 +3467,7 @@ PHP_FUNCTION(libvirt_list_domains) int *ids; char **names; const char *name; - int i; + int i, rv; virDomainPtr domain=NULL; GET_CONNECTION_FROM_ARGS("r",&zconn); @@ -3490,6 +3490,12 @@ PHP_FUNCTION(libvirt_list_domains) } efree(ids); + rv = virDomainFree (domain); // Y.Kawada + if (rv != 0) { + php_error_docref(NULL TSRMLS_CC, E_WARNING,"virDomainFree failed with %i on list_domain: %s", rv, LIBVIRT_G (last_error)); + } + domain = NULL; + expectedcount=virConnectNumOfDefinedDomains (conn->conn); names=emalloc(expectedcount*sizeof(char *)); count=virConnectListDefinedDomains (conn->conn,names ,expectedcount);

3 2

[libvirt] daily report
by Wen Congyang 31 Mar '11

31 Mar '11

- discuss the bug of libvirt that will cause libvirtd crashed.

1 1

[libvirt] Can't get connection to libvirt if one of the guests' monitor is occupied by other app
by Osier Yang 31 Mar '11

31 Mar '11

Hi, As $subject, e.g. the monitor is being used by netcat. Is it expected? Should we only skip to reconnect the domain monitor which is being locked by other app with a timeout specified on "qemuMonitorOpenUnix" (it blocks when trying to connect to the unix socket)? so that it can get a connection, and could manage other domains. How to produce: 1) # service libvirtd stop 2) # nc -U /var/lib/libvirt/qemu/$guest.monitor 3) # virsh (hangs forever if nc process is not killed) Regards Osier

2 1

[libvirt] [PATCH] qemu: Ignore libvirt debug messages in qemu log
by Jiri Denemark 31 Mar '11

31 Mar '11

qemu driver uses a 4K buffer for reading qemu log file. This is enough when only qemu's output is present in the log file. However, when debugging messages are turned on, intermediate libvirt process fills the log with a bunch of debugging messages before it executes qemu binary. In such a case the buffer may become too small. However, we are not really interested in libvirt messages so they can be filtered out from the buffer. --- src/qemu/qemu_process.c | 47 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 37 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e31e1b4..bc117a4 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -762,11 +762,21 @@ qemuProcessReadLogOutput(virDomainObjPtr vm, { int retries = (timeout*10); int got = 0; + char *debug = NULL; + int ret = -1; + char *filter_next = buf; + buf[0] = '\0'; + if (virAsprintf(&debug, ": %d: debug : ", vm->pid) < 0) { + virReportOOMError(); + return -1; + } + while (retries) { - ssize_t func_ret, ret; + ssize_t func_ret, bytes; int isdead = 0; + char *eol; func_ret = func(vm, buf, fd); @@ -775,32 +785,46 @@ qemuProcessReadLogOutput(virDomainObjPtr vm, /* Any failures should be detected before we read the log, so we * always have something useful to report on failure. */ - ret = saferead(fd, buf+got, buflen-got-1); - if (ret < 0) { + bytes = saferead(fd, buf+got, buflen-got-1); + if (bytes < 0) { virReportSystemError(errno, _("Failure while reading %s log output"), what); - return -1; + goto cleanup; } - got += ret; + got += bytes; buf[got] = '\0'; + + /* Filter out debug messages from intermediate libvirt process */ + while ((eol = strchr(filter_next, '\n'))) { + char *p = strstr(filter_next, debug); + if (p && p < eol) { + memmove(filter_next, eol + 1, got - (eol - buf)); + got -= eol + 1 - filter_next; + } else { + filter_next = eol + 1; + } + } + if (got == buflen-1) { qemuReportError(VIR_ERR_INTERNAL_ERROR, _("Out of space while reading %s log output: %s"), what, buf); - return -1; + goto cleanup; } if (isdead) { qemuReportError(VIR_ERR_INTERNAL_ERROR, _("Process exited while reading %s log output: %s"), what, buf); - return -1; + goto cleanup; } - if (func_ret <= 0) - return func_ret; + if (func_ret <= 0) { + ret = func_ret; + goto cleanup; + } usleep(100*1000); retries--; @@ -809,7 +833,10 @@ qemuProcessReadLogOutput(virDomainObjPtr vm, qemuReportError(VIR_ERR_INTERNAL_ERROR, _("Timed out while reading %s log output: %s"), what, buf); - return -1; + +cleanup: + VIR_FREE(debug); + return ret; } -- 1.7.4.1

2 2