- Devel - libvirt List Archives

[libvirt] [PATCH] util: Remove ATTRIBUTE_NONNULL from virClassNew()
by John Ferlan 22 Jan '13

22 Jan '13

When compiling with Coverity, the STATIC_ANALYSIS was set to true which triggered the ATTRIBUTE_NONNULL check from src/internal.h. Since virClassNew now expects to be called with NULL under a special condition, this check is no longer valid. --- src/util/virobject.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/util/virobject.h b/src/util/virobject.h index bb72a25..f58a950 100644 --- a/src/util/virobject.h +++ b/src/util/virobject.h @@ -54,8 +54,7 @@ virClassPtr virClassForObjectLockable(void); virClassPtr virClassNew(virClassPtr parent, const char *name, size_t objectSize, - virObjectDisposeCallback dispose) - ATTRIBUTE_NONNULL(1); + virObjectDisposeCallback dispose); const char *virClassName(virClassPtr klass) ATTRIBUTE_NONNULL(1); -- 1.7.11.7

2 1

[libvirt] [PATCH v2] qemu: Support ram bar size for qxl devices
by Alon Levy 22 Jan '13

22 Jan '13

Adds a "ram" attribute globally to the video.model element, that changes the resulting qemu command line only if video.type == "qxl". <video> <model type='qxl' ram='65536' vram='65536' heads='1'/> </video> That attribute gets a default value of 64*1024. The schema is unchanged for other video element types. The resulting qemu command line change is the addition of -global qxl-vga.ram_size=<ram>*1024 or -global qxl.ram_size=<ram>*1024 For the main and secondary qxl devices respectively. The default for the qxl ram bar is 64*1024 kilobytes (the same as the default qxl vram bar size). --- changes from v1: renamed attribute to ram (Eric Blake) fixes as given by Eric Blake Did not add any of the suggestions that Gerd made, I think it can be done in a separate patch and there was no discussion on it yet. docs/formatdomain.html.in | 5 +- docs/schemas/domaincommon.rng | 36 +++++++++----- src/conf/domain_conf.c | 19 +++++++- src/conf/domain_conf.h | 3 +- src/qemu/qemu_command.c | 57 +++++++++++++++------- .../qemuxml2argv-graphics-spice-compression.args | 2 +- .../qemuxml2argv-graphics-spice-compression.xml | 4 +- .../qemuxml2argv-graphics-spice-qxl-vga.args | 3 +- .../qemuxml2argv-graphics-spice-qxl-vga.xml | 4 +- .../qemuxml2argv-graphics-spice.args | 3 +- .../qemuxml2argv-graphics-spice.xml | 4 +- .../qemuxml2argv-video-device-pciaddr-default.args | 6 +-- 12 files changed, 102 insertions(+), 44 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index bb0b199..370de99 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3565,7 +3565,10 @@ qemu-kvm -net nic,model=? /dev/null video device in domain xml is the primary one, but the optional attribute <code>primary</code> (<span class="since">since 1.0.2</span>) with value 'yes' can be used to mark the primary in cases of mutiple - video device. The non-primary must be type of "qxl". + video device. The non-primary must be type of "qxl". The optional + attribute <code>ram</code> is allowed for "qxl" type only and specify + the size of the primary bar, while <code>vram</code> specifies the + secondary bar size. If "ram" is not supplied a default value is used. </dd> <dt><code>model</code></dt> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 67ae864..6aca97a 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2251,22 +2251,34 @@ </define>  <define name="video"> <element name="video"> <optional> - <element name="model"> - <attribute name="type"> - <choice> - <value>vga</value> - <value>cirrus</value> - <value>vmvga</value> - <value>xen</value> - <value>vbox</value> - <value>qxl</value> - </choice> - </attribute> + <element name="model"> + <choice> + <attribute name="type"> + <choice> + <value>vga</value> + <value>cirrus</value> + <value>vmvga</value> + <value>xen</value> + <value>vbox</value> + </choice> + </attribute> + <group> + <attribute name="type"> + <value>qxl</value> + </attribute> + <optional> + <attribute name="ram"> + <ref name="unsignedInt"/> + </attribute> + </optional> + </group> + </choice> <optional> <attribute name="vram"> <ref name="unsignedInt"/> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 13c14e9..e490093 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7391,6 +7391,7 @@ virDomainVideoDefParseXML(const xmlNodePtr node, char *type = NULL; char *heads = NULL; char *vram = NULL; + char *ram = NULL; char *primary = NULL; if (VIR_ALLOC(def) < 0) { @@ -7401,9 +7402,10 @@ virDomainVideoDefParseXML(const xmlNodePtr node, cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { - if (!type && !vram && !heads && + if (!type && !vram && !ram && !heads && xmlStrEqual(cur->name, BAD_CAST "model")) { type = virXMLPropString(cur, "type"); + ram = virXMLPropString(cur, "ram"); vram = virXMLPropString(cur, "vram"); heads = virXMLPropString(cur, "heads"); @@ -7431,6 +7433,18 @@ virDomainVideoDefParseXML(const xmlNodePtr node, } } + if (ram) { + if (virStrToLong_ui(ram, NULL, 10, &def->ram) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse video ram '%s'"), ram); + goto error; + } + } else { + if (def->type == VIR_DOMAIN_VIDEO_TYPE_QXL) { + def->ram = virDomainVideoDefaultRAM(dom, def->type); + } + } + if (vram) { if (virStrToLong_ui(vram, NULL, 10, &def->vram) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -7455,6 +7469,7 @@ virDomainVideoDefParseXML(const xmlNodePtr node, goto error; VIR_FREE(type); + VIR_FREE(ram); VIR_FREE(vram); VIR_FREE(heads); @@ -13383,6 +13398,8 @@ virDomainVideoDefFormat(virBufferPtr buf, virBufferAddLit(buf, " <video>\n"); virBufferAsprintf(buf, " <model type='%s'", model); + if (def->ram) + virBufferAsprintf(buf, " ram='%u'", def->ram); if (def->vram) virBufferAsprintf(buf, " vram='%u'", def->vram); if (def->heads) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index ce36003..af9a4bb 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1157,7 +1157,8 @@ struct _virDomainVideoAccelDef { struct _virDomainVideoDef { int type; - unsigned int vram; + unsigned int ram; /* kilobytes */ + unsigned int vram; /* kilobytes */ unsigned int heads; bool primary; virDomainVideoAccelDefPtr accel; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 981c692..712b54e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3558,11 +3558,20 @@ qemuBuildDeviceVideoStr(virDomainVideoDefPtr video, if (video->type == VIR_DOMAIN_VIDEO_TYPE_QXL) { if (video->vram > (UINT_MAX / 1024)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_OVERFLOW, _("value for 'vram' must be less than '%u'"), UINT_MAX / 1024); goto error; } + if (video->ram > (UINT_MAX / 1024)) { + virReportError(VIR_ERR_OVERFLOW, + _("value for 'ram' must be less than '%u'"), + UINT_MAX / 1024); + goto error; + } + + /* QEMU accepts bytes for ram_size. */ + virBufferAsprintf(&buf, ",ram_size=%u", video->ram * 1024); /* QEMU accepts bytes for vram_size. */ virBufferAsprintf(&buf, ",vram_size=%u", video->vram * 1024); @@ -6568,24 +6577,36 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArgList(cmd, "-vga", vgastr, NULL); - if (def->videos[0]->type == VIR_DOMAIN_VIDEO_TYPE_QXL) { - if (def->videos[0]->vram && - qemuCapsGet(caps, QEMU_CAPS_DEVICE)) { - if (def->videos[0]->vram > (UINT_MAX / 1024)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("value for 'vram' must be less than '%u'"), - UINT_MAX / 1024); - goto error; - } + if (def->videos[0]->type == VIR_DOMAIN_VIDEO_TYPE_QXL && + (def->videos[0]->vram || def->videos[0]->ram) && + qemuCapsGet(caps, QEMU_CAPS_DEVICE)) { + const char *dev = (qemuCapsGet(caps, QEMU_CAPS_DEVICE_QXL_VGA) + ? "qxl-vga" : "qxl"); + int ram = def->videos[0]->ram; + int vram = def->videos[0]->vram; + + if (vram > (UINT_MAX / 1024)) { + virReportError(VIR_ERR_OVERFLOW, + _("value for 'vram' must be less than '%u'"), + UINT_MAX / 1024); + goto error; + } + if (ram > (UINT_MAX / 1024)) { + virReportError(VIR_ERR_OVERFLOW, + _("value for 'ram' must be less than '%u'"), + UINT_MAX / 1024); + goto error; + } + if (ram) { virCommandAddArg(cmd, "-global"); - - if (qemuCapsGet(caps, QEMU_CAPS_DEVICE_QXL_VGA)) - virCommandAddArgFormat(cmd, "qxl-vga.vram_size=%u", - def->videos[0]->vram * 1024); - else - virCommandAddArgFormat(cmd, "qxl.vram_size=%u", - def->videos[0]->vram * 1024); + virCommandAddArgFormat(cmd, "%s.ram_size=%u", + dev, ram * 1024); + } + if (vram) { + virCommandAddArg(cmd, "-global"); + virCommandAddArgFormat(cmd, "%s.vram_size=%u", + dev, vram * 1024); } } } @@ -9247,6 +9268,8 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps, else vid->type = video; vid->vram = virDomainVideoDefaultRAM(def, vid->type); + vid->ram = vid->type == VIR_DOMAIN_VIDEO_TYPE_QXL ? + virDomainVideoDefaultRAM(def, vid->type) : 0; vid->heads = 1; if (VIR_REALLOC_N(def->videos, def->nvideos+1) < 0) { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args index 5c5912b..2f537df 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args @@ -5,5 +5,5 @@ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ x509-dir=/etc/pki/libvirt-spice,\ image-compression=auto_glz,jpeg-wan-compression=auto,zlib-glz-wan-compression=auto,\ playback-compression=on,streaming-video=filter -vga \ -qxl -global qxl.vram_size=18874368 -device qxl,id=video1,vram_size=33554432,bus=pci.0,addr=0x4 \ +qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368 -device qxl,id=video1,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml index 52eb5b9..a8c4ad8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml @@ -31,10 +31,10 @@ <streaming mode='filter'/> </graphics> <video> - <model type='qxl' vram='18432' heads='1'/> + <model type='qxl' ram='65536' vram='18432' heads='1'/> </video> <video> - <model type='qxl' vram='32768' heads='1'/> + <model type='qxl' ram='65536' vram='32768' heads='1'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args index 3954c03..ef499e6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args @@ -3,5 +3,6 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ /dev/HostVG/QEMUGuest1 -spice port=5903,tls-port=5904,addr=127.0.0.1,\ x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs -vga \ -qxl -global qxl-vga.vram_size=33554432 -device qxl,id=video1,vram_size=67108864,bus=pci.0,addr=0x4 \ +qxl -global qxl-vga.ram_size=67108864 -global qxl-vga.vram_size=33554432 \ +-device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml index 49cb8cc..563d371 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml @@ -28,10 +28,10 @@ <channel name='inputs' mode='insecure'/> </graphics> <video> - <model type='qxl' vram='32768' heads='1'/> + <model type='qxl' ram='65536' vram='32768' heads='1'/> </video> <video> - <model type='qxl' vram='65536' heads='1'/> + <model type='qxl' ram='65536' vram='65536' heads='1'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args index 854e723..d7cfae0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args @@ -5,5 +5,6 @@ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ x509-dir=/etc/pki/libvirt-spice,tls-channel=default,tls-channel=main,plaintext-channel=inputs,\ image-compression=auto_glz,jpeg-wan-compression=auto,zlib-glz-wan-compression=auto,\ playback-compression=on,streaming-video=filter,disable-copy-paste -vga \ -qxl -global qxl.vram_size=18874368 -device qxl,id=video1,vram_size=33554432,bus=pci.0,addr=0x4 \ +qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368 \ +-device qxl,id=video1,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml index d4939a4..9a36660 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml @@ -34,10 +34,10 @@ <clipboard copypaste='no'/> </graphics> <video> - <model type='qxl' vram='18432' heads='1'/> + <model type='qxl' ram='65536' vram='18432' heads='1'/> </video> <video> - <model type='qxl' vram='32768' heads='1'/> + <model type='qxl' ram='65536' vram='32768' heads='1'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args b/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args index 9ce852f..4abd7c2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args @@ -3,7 +3,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ -usb \ -hda /var/lib/libvirt/images/QEMUGuest1 -vnc 127.0.0.1:-5900 \ --device qxl-vga,id=video0,vram_size=67108864,bus=pci.0,addr=0x3 \ --device qxl,id=video1,vram_size=67108864,bus=pci.0,addr=0x4 \ --device qxl,id=video2,vram_size=67108864,bus=pci.0,addr=0x5 \ +-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x3 \ +-device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \ +-device qxl,id=video2,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x5 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 -- 1.8.0.1

2 1

[libvirt] [PATCH] virsh-domain: Refactor error paths for cmdCPUStats
by Peter Krempa 22 Jan '13

22 Jan '13

This patch fixes the following issues in the cpu-stats virsh command: 1) Renames label failed_params to no_memory to match coding style 2) Uses proper typed parameter cleanup in error paths to avoid leaks 3) Adds a ret variable and simplifies error labels 4) Changes error message to a slightly more descriptive one and gets rid of the newline at the end: Before: $ virsh cpu-stats tr error: Failed to virDomainGetCPUStats() error: Requested operation is not valid: domain is not running After: $ tools/virsh cpu-stats tr error: Failed to retrieve CPU statistics for domain 'tr' error: Requested operation is not valid: domain is not running --- tools/virsh-domain.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index f4b6622..026dac1 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6109,9 +6109,10 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; virTypedParameterPtr params = NULL; - int i, j, pos, max_id, cpu = -1, show_count = -1, nparams; + int i, j, pos, max_id, cpu = -1, show_count = -1, nparams = 0; bool show_total = false, show_per_cpu = false; unsigned int flags = 0; + bool ret = false; if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; @@ -6151,7 +6152,7 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd) } if (VIR_ALLOC_N(params, nparams * MIN(show_count, 128)) < 0) - goto failed_params; + goto no_memory; while (show_count) { int ncpus = MIN(show_count, 128); @@ -6199,8 +6200,8 @@ do_show_total: goto cleanup; } - if (VIR_ALLOC_N(params, nparams)) - goto failed_params; + if (VIR_ALLOC_N(params, nparams) < 0) + goto no_memory; /* passing start_cpu == -1 gives us domain's total status */ if ((nparams = virDomainGetCPUStats(dom, params, nparams, -1, 1, flags)) < 0) @@ -6222,22 +6223,22 @@ do_show_total: VIR_FREE(s); } } - virTypedParamsFree(params, nparams); + + ret = true; cleanup: + virTypedParamsFree(params, nparams); virDomainFree(dom); - return true; + return ret; -failed_params: +no_memory: virReportOOMError(); - virDomainFree(dom); - return false; + goto cleanup; failed_stats: - vshError(ctl, _("Failed to virDomainGetCPUStats()\n")); - VIR_FREE(params); - virDomainFree(dom); - return false; + vshError(ctl, _("Failed to retrieve CPU statistics for domain '%s'"), + virDomainGetName(dom)); + goto cleanup; } /* -- 1.8.1.1

2 2

[libvirt] [PATCH 0/5] Add additional data to the NUMA topology information
by Peter Krempa 22 Jan '13

22 Jan '13

See patch 2/5 for explaination. Peter Krempa (5): schema: Make the cpuset type reusable across schema files schemas: Add schemas for more CPU topology information in the caps XML conf: Split out NUMA topology formatting to simplify access to data capabilities: Switch CPU data in NUMA topology to a struct capabilities: Add additional data to the NUMA topology info docs/schemas/basictypes.rng | 6 ++++ docs/schemas/capability.rng | 11 ++++++ docs/schemas/domaincommon.rng | 5 --- src/conf/capabilities.c | 80 ++++++++++++++++++++++++++++--------------- src/conf/capabilities.h | 14 ++++++-- src/nodeinfo.c | 75 +++++++++++++++++++++++++++++++++------- src/qemu/qemu_process.c | 2 +- src/test/test_driver.c | 18 ++++++++-- src/xen/xend_internal.c | 27 +++++++++------ 9 files changed, 176 insertions(+), 62 deletions(-) -- 1.8.1.1

3 19

[libvirt] [PATCH 00/14] Resolve more Coverity issues
by John Ferlan 22 Jan '13

22 Jan '13

I got answer from someone on the Coverity boards regarding a false positive related to how VIR_FREE() was operating when passed an address of an address to some memory, see my note from last week: https://www.redhat.com/archives/libvir-list/2013-January/msg01353.html Essentially the issue is the "?:" construct in the VIR_FREE() macro and Coverity taking the "else" condition as a possible path even though it technically couldn't happen ((1) ? xxx : yyy). The suggestion made was to remove the "?:", but since this only happens in the static analysis case I used the existing STATIC_ANALYSIS build directive. This change resolved about 100 false positives. In doing this, Coverity uncovered a few more uninitialized variables prior to VIR_FREE calls and a couple of instances where VIR_FREE was being called on already free'd memory plus one instance where a pointer to free'd memory was being returned (in qemumonitortestutils.c). John Ferlan (14): viralloc: Adjust definition of VIR_FREE() for Coverity conf: Need to initialize variables before VIR_FREE virnetserver: Need to initialize 'sigdata' virnetsockettest: Need to initialize 'path' virnetdev: Need to initialize 'pciConfigAddr' commandtest: Need to initialize 'errbuf' virfile: Need to initialize 'looppath' lxc: Need to initialize 'dst' virsh: Need to intialize 'str' storage: Need to initialize 'zerobuf' interface: Need to initialize 'ifaces_list' security: Need to initialize 'sens' virkeepalive: Remove erroneous VIR_FREE(msg) tests: Need to initialize 'test' properly on error path src/conf/domain_audit.c | 4 ++-- src/interface/interface_backend_udev.c | 2 +- src/lxc/lxc_driver.c | 4 ++-- src/rpc/virkeepalive.c | 1 - src/rpc/virnetserver.c | 2 +- src/security/security_selinux.c | 2 +- src/storage/storage_backend.c | 2 +- src/util/viralloc.h | 11 ++++++++++- src/util/virfile.c | 2 +- src/util/virnetdev.c | 2 +- tests/commandtest.c | 2 +- tests/qemumonitortestutils.c | 1 + tests/virnetsockettest.c | 4 ++-- tools/virsh.c | 2 +- 14 files changed, 25 insertions(+), 16 deletions(-) -- 1.7.11.7

3 30

[libvirt] [PATCH 0/2] Resending Resolve RESOURCE_LEAK issues found by Coverity
by John Ferlan 22 Jan '13

22 Jan '13

This were initially part of the following series: https://www.redhat.com/archives/libvir-list/2013-January/msg00529.html Specifically https://www.redhat.com/archives/libvir-list/2013-January/msg00537.html https://www.redhat.com/archives/libvir-list/2013-January/msg00541.html Rather than bury them under a reply - I'll just pop them out again John Ferlan (2): uml: Avoid resource leak of event in umlInofityEvent parallels: Resolve some resource leaks src/parallels/parallels_driver.c | 30 +++++++++++++++++++----------- src/uml/uml_driver.c | 6 ++++-- 2 files changed, 23 insertions(+), 13 deletions(-) -- 1.7.11.7

3 6

[libvirt] [PATCH] fix typos in comments for VIR_DOMAIN_PROCESS_SIGNAL_{PWR, SYS}
by Claudio Bley 22 Jan '13

22 Jan '13

Signed-off-by: Claudio Bley <cbley(a)av-test.de> --- Pushing under trivial rule. include/libvirt/libvirt.h.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 8eb4a59..a634b37 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -3133,8 +3133,8 @@ typedef enum { VIR_DOMAIN_PROCESS_SIGNAL_WINCH = 28, /* Not in POSIX (SIGWINCH on Linux) */ VIR_DOMAIN_PROCESS_SIGNAL_POLL = 29, /* SIGPOLL (also known as SIGIO on Linux) */ - VIR_DOMAIN_PROCESS_SIGNAL_PWR = 30, /* Not in POSIX (SIGPWR on Linux */ - VIR_DOMAIN_PROCESS_SIGNAL_SYS = 31, /* SIGSYS (also known as SIGUNUSED on Linux ) */ + VIR_DOMAIN_PROCESS_SIGNAL_PWR = 30, /* Not in POSIX (SIGPWR on Linux) */ + VIR_DOMAIN_PROCESS_SIGNAL_SYS = 31, /* SIGSYS (also known as SIGUNUSED on Linux) */ VIR_DOMAIN_PROCESS_SIGNAL_RT0 = 32, /* SIGRTMIN */ VIR_DOMAIN_PROCESS_SIGNAL_RT1 = 33, /* SIGRTMIN + 1 */ VIR_DOMAIN_PROCESS_SIGNAL_RT2 = 34, /* SIGRTMIN + 2 */ -- 1.7.9.5

1 0

[libvirt] [PATCH] move comments after enum members for virDomainMemoryStatTags
by Claudio Bley 22 Jan '13

22 Jan '13

Signed-off-by: Claudio Bley <cbley(a)av-test.de> --- In the same vein as https://www.redhat.com/archives/libvir-list/2013-January/msg00522.html this change moves comments after the corresponding member it is intended for. Alas, this looks a bit ugly now. I'd love to see alternative solutions. include/libvirt/libvirt.h.in | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 8eb4a59..9d86249 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1103,10 +1103,11 @@ typedef virDomainInterfaceStatsStruct *virDomainInterfaceStatsPtr; * Memory Statistics Tags: */ typedef enum { - /* The total amount of data read from swap space (in kB). */ VIR_DOMAIN_MEMORY_STAT_SWAP_IN = 0, - /* The total amount of memory written out to swap space (in kB). */ + /* The total amount of data read from swap space (in kB). */ + VIR_DOMAIN_MEMORY_STAT_SWAP_OUT = 1, + /* The total amount of memory written out to swap space (in kB). */ /* * Page faults occur when a process makes a valid access to virtual memory @@ -1117,33 +1118,33 @@ typedef enum { VIR_DOMAIN_MEMORY_STAT_MAJOR_FAULT = 2, VIR_DOMAIN_MEMORY_STAT_MINOR_FAULT = 3, + VIR_DOMAIN_MEMORY_STAT_UNUSED = 4, /* * The amount of memory left completely unused by the system. Memory that * is available but used for reclaimable caches should NOT be reported as * free. This value is expressed in kB. */ - VIR_DOMAIN_MEMORY_STAT_UNUSED = 4, + VIR_DOMAIN_MEMORY_STAT_AVAILABLE = 5, /* * The total amount of usable memory as seen by the domain. This value * may be less than the amount of memory assigned to the domain if a * balloon driver is in use or if the guest OS does not initialize all * assigned pages. This value is expressed in kB. */ - VIR_DOMAIN_MEMORY_STAT_AVAILABLE = 5, - /* Current balloon value (in KB). */ VIR_DOMAIN_MEMORY_STAT_ACTUAL_BALLOON = 6, + /* Current balloon value (in KB). */ + VIR_DOMAIN_MEMORY_STAT_RSS = 7, /* Resident Set Size of the process running the domain. This value * is in kB */ - VIR_DOMAIN_MEMORY_STAT_RSS = 7, + VIR_DOMAIN_MEMORY_STAT_NR = 8, /* * The number of statistics supported by this version of the interface. * To add new statistics, add them to the enum and increase this value. */ - VIR_DOMAIN_MEMORY_STAT_NR = 8, #ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_MEMORY_STAT_LAST = VIR_DOMAIN_MEMORY_STAT_NR -- 1.7.9.5

1 0

[libvirt] [PATCH] qemu: Forbid snapshot names starting with '.'
by Peter Krempa 22 Jan '13

22 Jan '13

Forbid the names to match the loading procedure of snapshots. --- src/qemu/qemu_driver.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3a54228..8286334 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -11348,13 +11348,23 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, goto cleanup; /* reject snapshot names containing slashes as snapshot definitions are - * saved in files containing the name */ - if (!(flags & VIR_DOMAIN_SNAPSHOT_CREATE_NO_METADATA) && - strchr(def->name, '/')) { - virReportError(VIR_ERR_XML_DETAIL, - _("invalid snapshot name '%s': name can't contain '/'"), - def->name); - goto cleanup; + * saved in files containing the name and names starting with dots */ + if (!(flags & VIR_DOMAIN_SNAPSHOT_CREATE_NO_METADATA)) { + if (strchr(def->name, '/')) { + virReportError(VIR_ERR_XML_DETAIL, + _("invalid snapshot name '%s': " + "name can't contain '/'"), + def->name); + goto cleanup; + } + + if (def->name[0] == '.') { + virReportError(VIR_ERR_XML_DETAIL, + _("invalid snapshot name '%s': " + "name can't start with '.'"), + def->name); + goto cleanup; + } } /* reject the VIR_DOMAIN_SNAPSHOT_CREATE_LIVE flag where not supported */ -- 1.8.1.1

2 2

[libvirt] [PATCH] qemu_agent: Ignore expected EOFs
by Michal Privoznik 22 Jan '13

22 Jan '13

https://bugzilla.redhat.com/show_bug.cgi?id=892079 One of my previous patches (f2a4e5f176c408) tried to fix crashing libvirtd on domain detroy. However, we need to copy pattern from qemuProcessHandleMonitorEOF() instead of decrementing reference counter. The rationale for this is, if qemu process is dying due to domain being destroyed, we obtain EOF on both the monitor and agent sockets. However, if the exit is expected, qemuProcessStop is called, which cleans both agent and monitor sockets up. We want qemuAgentClose() to be called iff the EOF is not expected, so we don't leak an FD and memory. --- src/qemu/qemu_process.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 2f08215..b212752 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -133,8 +133,15 @@ qemuProcessHandleAgentEOF(qemuAgentPtr agent, virObjectLock(vm); priv = vm->privateData; - if (priv->agent == agent && - !virObjectUnref(priv->agent)) + + if (priv->beingDestroyed) { + VIR_DEBUG("Domain is being destroyed, agent EOF is expected"); + virObjectUnlock(vm); + qemuDriverUnlock(driver); + return; + } + + if (priv->agent == agent) priv->agent = NULL; virObjectUnlock(vm); -- 1.8.0.2

2 1