- Devel - libvirt List Archives

[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 05 Apr '11

05 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 05 Apr '11

05 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