- Devel - libvirt List Archives

[libvirt] [PATCH] virDomainBlockStats(Flags): Produce saner error message on empty disk path
by Michal Privoznik 28 Feb '14

28 Feb '14

As of 0bd2ccdec an empty disk path for virDomainBlockStats (or the one with Flags) is allowed meaning "get me overall summarized statistics". However, running 'virsh domblkstat $dom' throws a misleading error: # ./tools/virsh domblkstat dom error: Failed to get block stats dom error: invalid argument: invalid path: while after this commit # virsh domblkstat dom error: Operation not supported: summary statistics are not supported yet Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_driver.c | 12 ++++++++++++ src/test/test_driver.c | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c9a865e..e04a328 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9434,6 +9434,12 @@ qemuDomainBlockStats(virDomainPtr dom, virDomainDiskDefPtr disk = NULL; qemuDomainObjPrivatePtr priv; + if (!*path) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("summary statistics are not supported yet")); + return ret; + } + if (!(vm = qemuDomObjFromDomain(dom))) goto cleanup; @@ -9507,6 +9513,12 @@ qemuDomainBlockStatsFlags(virDomainPtr dom, virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1); + if (!*path) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("summary statistics are not supported yet")); + return ret; + } + /* We don't return strings, and thus trivially support this flag. */ flags &= ~VIR_TYPED_PARAM_STRING_OKAY; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index b724f82..6806ffd 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3362,6 +3362,12 @@ static int testDomainBlockStats(virDomainPtr domain, unsigned long long statbase; int ret = -1; + if (!*path) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("summary statistics are not supported yet")); + return ret; + } + testDriverLock(privconn); privdom = virDomainObjListFindByName(privconn->domains, domain->name); -- 1.9.0

2 1

[libvirt] [PATCH] virDomainGetCPUStats: fix boundary value problem of start_cpu
by Jincheng Miao 28 Feb '14

28 Feb '14

This API has boundary value problem, if start_cpu is equal to the number of cpus, no error infomation will be reported. This is because the confused meaning of variable max_id, so change the comparision and rename the variable max_id to total_num. Signed-off-by: Jincheng Miao <jmiao(a)redhat.com> --- src/qemu/qemu_driver.c | 18 +++++++++--------- src/util/vircgroup.c | 18 +++++++++--------- tools/virsh-domain.c | 12 ++++++------ 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c9a865e..54b8e5b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15983,7 +15983,7 @@ qemuDomainGetPercpuStats(virDomainObjPtr vm, { int rv = -1; size_t i; - int id, max_id; + int id, total_num; char *pos; char *buf = NULL; unsigned long long *sum_cpu_time = NULL; @@ -15999,19 +15999,19 @@ qemuDomainGetPercpuStats(virDomainObjPtr vm, return QEMU_NB_PER_CPU_STAT_PARAM; /* To parse account file, we need to know how many cpus are present. */ - max_id = nodeGetCPUCount(); - if (max_id < 0) + total_num = nodeGetCPUCount(); + if (total_num < 0) return rv; - if (ncpus == 0) { /* returns max cpu ID */ - rv = max_id; + if (ncpus == 0) { /* returns total number of cpu */ + rv = total_num; goto cleanup; } - if (start_cpu > max_id) { + if (start_cpu > total_num - 1) { virReportError(VIR_ERR_INVALID_ARG, _("start_cpu %d larger than maximum of %d"), - start_cpu, max_id); + start_cpu, total_num - 1); goto cleanup; } @@ -16024,8 +16024,8 @@ qemuDomainGetPercpuStats(virDomainObjPtr vm, param_idx = 0; /* number of cpus to compute */ - if (start_cpu >= max_id - ncpus) - id = max_id - 1; + if (start_cpu + ncpus >= total_num) + id = total_num - 1; else id = start_cpu + ncpus - 1; diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 0f04b4d..2af06af 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -2836,7 +2836,7 @@ virCgroupGetPercpuStats(virCgroupPtr group, { int rv = -1; size_t i; - int id, max_id; + int id, total_num; char *pos; char *buf = NULL; virTypedParameterPtr ent; @@ -2848,19 +2848,19 @@ virCgroupGetPercpuStats(virCgroupPtr group, return CGROUP_NB_PER_CPU_STAT_PARAM; /* To parse account file, we need to know how many cpus are present. */ - max_id = nodeGetCPUCount(); - if (max_id < 0) + total_num = nodeGetCPUCount(); + if (total_num < 0) return rv; - if (ncpus == 0) { /* returns max cpu ID */ - rv = max_id; + if (ncpus == 0) { /* returns total number of cpu */ + rv = total_num; goto cleanup; } - if (start_cpu > max_id) { + if (start_cpu > total_num - 1) { virReportError(VIR_ERR_INVALID_ARG, _("start_cpu %d larger than maximum of %d"), - start_cpu, max_id); + start_cpu, total_num - 1); goto cleanup; } @@ -2873,8 +2873,8 @@ virCgroupGetPercpuStats(virCgroupPtr group, param_idx = 0; /* number of cpus to compute */ - if (start_cpu >= max_id - ncpus) - id = max_id - 1; + if (start_cpu + ncpus >= total_num) + id = total_num - 1; else id = start_cpu + ncpus - 1; diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 3e73340..0ead80f 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6331,7 +6331,7 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; virTypedParameterPtr params = NULL; - int pos, max_id, cpu = 0, show_count = -1, nparams = 0; + int pos, total_num, cpu = 0, show_count = -1, nparams = 0; size_t i, j; bool show_total = false, show_per_cpu = false; unsigned int flags = 0; @@ -6376,12 +6376,12 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd) goto do_show_total; /* get number of cpus on the node */ - if ((max_id = virDomainGetCPUStats(dom, NULL, 0, 0, 0, flags)) < 0) + if ((total_num = virDomainGetCPUStats(dom, NULL, 0, 0, 0, flags)) < 0) goto failed_stats; - if (show_count < 0 || show_count > max_id) { - if (show_count > max_id) - vshPrint(ctl, _("Only %d CPUs available to show\n"), max_id); - show_count = max_id; + if (show_count < 0 || show_count > total_num) { + if (show_count > total_num) + vshPrint(ctl, _("Only %d CPUs available to show\n"), total_num); + show_count = total_num; } /* get percpu information */ -- 1.8.5.3

2 3

[libvirt] [PATCH] tests: avoid littering /tmp
by Eric Blake 28 Feb '14

28 Feb '14

Running 'make -C tests check TESTS=qemuagenttest' left a directory /tmp/libvirt_XXXXXX/ behind. The culprit was failure to cleanup when short-circuiting an expensive test. * tests/qemuagenttest.c (testQemuAgentTimeout): Free resources when skipping expensive test. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. tests/qemuagenttest.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index 7a49b0b..b5bcbe3 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013 Red Hat, Inc. + * Copyright (C) 2013, 2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -538,8 +538,10 @@ testQemuAgentTimeout(const void *data) if (!test) return -1; - if (virTestGetExpensive() == 0) - return EXIT_AM_SKIP; + if (virTestGetExpensive() == 0) { + ret = EXIT_AM_SKIP; + goto cleanup; + } if (qemuMonitorTestAddHandler(test, qemuAgentTimeoutTestMonitorHandler, NULL, NULL) < 0) -- 1.8.5.3

1 0

[libvirt] [PATCH 0/4] qemu: export disk snapshot capability
by Francesco Romani 28 Feb '14

28 Feb '14

This patch series extend the QEMU capabilities XML to report if the underlying QEMU binary supports, or not, the live disk snapshotting. Without this patch series, the only way to know if QEMU has this support is to actually request a disk snapshot and to see what happens. The change is split in four patches: * patch #1 actually adds the new element in the QEMU capabilities XML. formatcaps.html.in wasn't very detailed about the actual XML format, so I've not updated it. Anyone feel free to point out what should be added, and I'll comply. The new element has the form <disksnapshot default='value' toggle='off'> because I'd like to convey two informations: - disk snapshot is supposed to be here, and it is (default='on') - disk snapshot is supposed to be here, and is NOT (default='off') Put in a different way, I tried to help the client as much as possible. I'm not particolary fond of this format, and I'm really open to alternatives here. Perhaps a simpler <disksnapshot/> element can convey the same meaning? Suggestions welcome. * patches #2, #3 Are trivial and they provide the ground for the last patch which add a new unit tests. They are just dependencies for it. I tried to make them less invasive as possible. * patch #4 add a new unit test, aiming to test not only this new feature but also the whole XML capabilities test. I was under the impression that this kind of test do not really fit into existing one, so I added a new one. Suggestions about possible improvements for this test are welcome Francesco Romani (4): qemu: export disk snapshot support in capabilities qemu: add function to fill capabilities cache qemu: export the virQEMUCapsInitGuest function. qemu: add unit tests for the capabilities xml .gitignore | 1 + docs/schemas/capability.rng | 6 + src/qemu/qemu_capabilities.c | 40 +++- src/qemu/qemu_capabilities.h | 4 + tests/Makefile.am | 10 +- tests/qemucaps2xmldata/all_1.6.0-1.caps | 142 ++++++++++++++ tests/qemucaps2xmldata/all_1.6.0-1.xml | 51 +++++ tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps | 141 +++++++++++++ tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml | 51 +++++ tests/qemucaps2xmltest.c | 217 +++++++++++++++++++++ 10 files changed, 655 insertions(+), 8 deletions(-) create mode 100644 tests/qemucaps2xmldata/all_1.6.0-1.caps create mode 100644 tests/qemucaps2xmldata/all_1.6.0-1.xml create mode 100644 tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.caps create mode 100644 tests/qemucaps2xmldata/nodisksnapshot_1.6.0-1.xml create mode 100644 tests/qemucaps2xmltest.c -- 1.8.4.2

2 14

[libvirt] [PATCH v3 0/4] support dumping guest memory in compressed format
by qiaonuohan 28 Feb '14

28 Feb '14

dumping guest's memroy is introduced without compression supported, and this is a freature regression of 'virsh dump --memory-only'. This patchset is used to add support in libvirt side to make qemu dump guest's memory in kdump-compressed format and please refer the following address to see implementation of the qemu side, the lastest version of qemu side is v9(ready for being queued). http://lists.nongnu.org/archive/html/qemu-devel/2014-02/msg03016.html ChangLog: Changes from v2 to v3: 1. address Jiri Denemark's comment about adding a new public API instead of changing an old one. Changes from v1 to v2: 1. address Daniel P. Berrange's comment about using a new parameter to replace flags like VIR_DUMP_COMPRESS_ZLIB. qiaonuohan (4): add new virDomainMemoryDump API wire up qemu agent to virDomainMemoryDump API allow "virsh dump --memory-only" specify dump format add dump_memory_format in qemu.conf include/libvirt/libvirt.h.in | 21 +++++++++ src/access/viraccessperm.c | 2 +- src/access/viraccessperm.h | 6 +++ src/driver.h | 7 +++ src/libvirt.c | 95 ++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 5 ++ src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 13 +++++- src/qemu/qemu_conf.c | 3 ++ src/qemu/qemu_conf.h | 2 + src/qemu/qemu_driver.c | 73 +++++++++++++++++++++++++---- src/qemu/qemu_monitor.c | 7 +-- src/qemu/qemu_monitor.h | 3 +- src/qemu/qemu_monitor_json.c | 4 +- src/qemu/qemu_monitor_json.h | 3 +- src/qemu/test_libvirtd_qemu.aug.in | 1 + src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 15 +++++- src/remote_protocol-structs | 7 +++ src/test/test_driver.c | 17 ++++++- tests/qemumonitorjsontest.c | 2 +- tools/virsh-domain.c | 55 +++++++++++++++++++++- 22 files changed, 319 insertions(+), 24 deletions(-) -- 1.8.5.3

3 11

[libvirt] [PATCH 0/2] Add virusbtest
by Ján Tomko 27 Feb '14

27 Feb '14

Test src/util/virusb.c. Ján Tomko (2): Add tests for virUSBDeviceFind functions Add a test for virUSBDeviceList functions .gitignore | 1 + cfg.mk | 3 +- tests/Makefile.am | 12 + tests/virusbtest.c | 343 +++++++++++++++++++++ .../sys_bus_usb/devices/1-1.5.3.1/devnum | 1 + .../sys_bus_usb/devices/1-1.5.3.1/idProduct | 1 + .../sys_bus_usb/devices/1-1.5.3.1/idVendor | 1 + .../sys_bus_usb/devices/1-1.5.3.1/serial | 1 + .../sys_bus_usb/devices/1-1.5.3.3/devnum | 1 + .../sys_bus_usb/devices/1-1.5.3.3/idProduct | 1 + .../sys_bus_usb/devices/1-1.5.3.3/idVendor | 1 + .../sys_bus_usb/devices/1-1.5.3.3/serial | 1 + .../sys_bus_usb/devices/1-1.5.3/devnum | 1 + .../sys_bus_usb/devices/1-1.5.3/idProduct | 1 + .../sys_bus_usb/devices/1-1.5.3/idVendor | 1 + .../sys_bus_usb/devices/1-1.5.3/serial | 1 + .../sys_bus_usb/devices/1-1.5.4/devnum | 1 + .../sys_bus_usb/devices/1-1.5.4/idProduct | 1 + .../sys_bus_usb/devices/1-1.5.4/idVendor | 1 + .../sys_bus_usb/devices/1-1.5.4/serial | 1 + .../sys_bus_usb/devices/1-1.5.5/devnum | 1 + .../sys_bus_usb/devices/1-1.5.5/idProduct | 1 + .../sys_bus_usb/devices/1-1.5.5/idVendor | 1 + .../sys_bus_usb/devices/1-1.5.5/serial | 1 + .../sys_bus_usb/devices/1-1.5.6/devnum | 1 + .../sys_bus_usb/devices/1-1.5.6/idProduct | 1 + .../sys_bus_usb/devices/1-1.5.6/idVendor | 1 + .../sys_bus_usb/devices/1-1.5.6/serial | 1 + .../sys_bus_usb/devices/1-1.5/devnum | 1 + .../sys_bus_usb/devices/1-1.5/idProduct | 1 + .../sys_bus_usb/devices/1-1.5/idVendor | 1 + .../sys_bus_usb/devices/1-1.5/serial | 1 + .../sys_bus_usb/devices/1-1.6/devnum | 1 + .../sys_bus_usb/devices/1-1.6/idProduct | 1 + .../sys_bus_usb/devices/1-1.6/idVendor | 1 + .../sys_bus_usb/devices/1-1.6/serial | 1 + .../virusbtestdata/sys_bus_usb/devices/1-1/devnum | 1 + .../sys_bus_usb/devices/1-1/idProduct | 1 + .../sys_bus_usb/devices/1-1/idVendor | 1 + .../virusbtestdata/sys_bus_usb/devices/1-1/serial | 1 + .../sys_bus_usb/devices/2-1.2/devnum | 1 + .../sys_bus_usb/devices/2-1.2/idProduct | 1 + .../sys_bus_usb/devices/2-1.2/idVendor | 1 + .../sys_bus_usb/devices/2-1.2/serial | 1 + .../virusbtestdata/sys_bus_usb/devices/2-1/devnum | 1 + .../sys_bus_usb/devices/2-1/idProduct | 1 + .../sys_bus_usb/devices/2-1/idVendor | 1 + .../virusbtestdata/sys_bus_usb/devices/2-1/serial | 1 + .../virusbtestdata/sys_bus_usb/devices/usb1/devnum | 1 + .../sys_bus_usb/devices/usb1/idProduct | 1 + .../sys_bus_usb/devices/usb1/idVendor | 1 + .../virusbtestdata/sys_bus_usb/devices/usb1/serial | 1 + .../virusbtestdata/sys_bus_usb/devices/usb2/devnum | 1 + .../sys_bus_usb/devices/usb2/idProduct | 1 + .../sys_bus_usb/devices/usb2/idVendor | 1 + .../virusbtestdata/sys_bus_usb/devices/usb2/serial | 1 + .../virusbtestdata/sys_bus_usb/devices/usb3/devnum | 1 + .../sys_bus_usb/devices/usb3/idProduct | 1 + .../sys_bus_usb/devices/usb3/idVendor | 1 + .../virusbtestdata/sys_bus_usb/devices/usb3/serial | 1 + .../virusbtestdata/sys_bus_usb/devices/usb4/devnum | 1 + .../sys_bus_usb/devices/usb4/idProduct | 1 + .../sys_bus_usb/devices/usb4/idVendor | 1 + .../virusbtestdata/sys_bus_usb/devices/usb4/serial | 1 + 64 files changed, 418 insertions(+), 1 deletion(-) create mode 100644 tests/virusbtest.c create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.1/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.1/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.1/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.1/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.3/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.3/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.3/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3.3/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.3/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.4/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.4/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.4/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.4/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.5/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.5/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.5/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.5/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.6/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.6/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.6/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5.6/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.5/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.6/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.6/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.6/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1.6/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/1-1/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/2-1.2/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/2-1.2/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/2-1.2/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/2-1.2/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/2-1/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/2-1/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/2-1/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/2-1/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb1/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb1/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb1/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb1/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb2/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb2/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb2/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb2/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb3/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb3/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb3/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb3/serial create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb4/devnum create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb4/idProduct create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb4/idVendor create mode 100644 tests/virusbtestdata/sys_bus_usb/devices/usb4/serial -- 1.8.3.2

2 6

[libvirt] [PATCH] sanlock: Truncate domain names longer than SANLK_NAME_LEN
by Jiri Denemark 27 Feb '14

27 Feb '14

Libvirt uses a domain name to fill in owner_name in sanlock_options in virLockManagerSanlockAcquire. Unfortunately, owner_name is limited to SANLK_NAME_LEN characters (including trailing '\0'), which means domains with longer names fail to start when sanlock is enabled. However, we can truncate the name when setting owner_name as explained by sanlock's author: Setting sanlk_options or the owner_name is unnecessary, and has very little to no benefit. If you do provide something in owner_name, it can be anything, sanlock doesn't care or use it. If you run the command "sanlock status", the output will display a list of clients connected to the sanlock daemon. This client list is displayed as "pid owner_name" if the client has provided an owner_name via sanlk_options. This debugging output is the only usage of owner_name, so its only benefit is to potentially provide a more human friendly output for debugging purposes. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/locking/lock_driver_sanlock.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 958d39a..f11f3c6 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -81,7 +81,7 @@ static virLockManagerSanlockDriver *driver = NULL; struct _virLockManagerSanlockPrivate { const char *vm_uri; - char vm_name[SANLK_NAME_LEN]; + char *vm_name; unsigned char vm_uuid[VIR_UUID_BUFLEN]; unsigned int vm_id; unsigned int vm_pid; @@ -474,12 +474,8 @@ static int virLockManagerSanlockNew(virLockManagerPtr lock, if (STREQ(param->key, "uuid")) { memcpy(priv->vm_uuid, param->value.uuid, 16); } else if (STREQ(param->key, "name")) { - if (!virStrcpy(priv->vm_name, param->value.str, SANLK_NAME_LEN)) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Domain name '%s' exceeded %d characters"), - param->value.str, SANLK_NAME_LEN); + if (VIR_STRDUP(priv->vm_name, param->value.str) < 0) goto error; - } } else if (STREQ(param->key, "pid")) { priv->vm_pid = param->value.ui; } else if (STREQ(param->key, "id")) { @@ -505,6 +501,7 @@ static void virLockManagerSanlockFree(virLockManagerPtr lock) if (!priv) return; + VIR_FREE(priv->vm_name); for (i = 0; i < priv->res_count; i++) VIR_FREE(priv->res_args[i]); VIR_FREE(priv); @@ -909,12 +906,10 @@ static int virLockManagerSanlockAcquire(virLockManagerPtr lock, if (VIR_ALLOC(opt) < 0) return -1; - if (!virStrcpy(opt->owner_name, priv->vm_name, SANLK_NAME_LEN)) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Domain name '%s' exceeded %d characters"), - priv->vm_name, SANLK_NAME_LEN); - goto error; - } + /* sanlock doesn't use owner_name for anything, so it's safe to take just + * the first SANLK_NAME_LEN - 1 characters from vm_name */ + ignore_value(virStrncpy(opt->owner_name, priv->vm_name, + SANLK_NAME_LEN - 1, SANLK_NAME_LEN)); if (state && STRNEQ(state, "")) { if ((rv = sanlock_state_to_args((char *)state, -- 1.9.0

3 3

[libvirt] [PATCH] build: skip virportallocatortest on cygwin
by Eric Blake 27 Feb '14

27 Feb '14

Cygwin supports <dlfcn.h> and even has limited LD_PRELOAD capabilities; but because it does not use ELF binaries it cannot support RTLD_NEXT lookups. CC libvirportallocatormock_la-virportallocatortest.lo virportallocatortest.c: In function 'init_syms': virportallocatortest.c:47:24: error: 'RTLD_NEXT' undeclared (first use in this function) realsocket = dlsym(RTLD_NEXT, "socket"); * tests/virportallocatortest.c: Also require RTLD_NEXT. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. tests/virportallocatortest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/virportallocatortest.c b/tests/virportallocatortest.c index 34843e3..5a93dad 100644 --- a/tests/virportallocatortest.c +++ b/tests/virportallocatortest.c @@ -23,7 +23,7 @@ #include "virfile.h" #include "testutils.h" -#if HAVE_DLFCN_H +#if HAVE_DLFCN_H && defined(RTLD_NEXT) # ifdef MOCK_HELPER # include "internal.h" -- 1.8.5.3

1 0

[libvirt] [PATCH] build: ignore cygwin toolchain droppings
by Eric Blake 27 Feb '14

27 Feb '14

The cygwin compiler automatically creates a '*.exe.manifest' companion file for any .exe file that contains a substring that would otherwise cause newer Windows to pester users about needing admin rights (such as "update", "instal", "setup"...). This means that compilation on cygwin left behind tests/networkxml2xmlupdatetest.exe.manifest. * .gitignore: Ignore manifest files. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 69c81df..1b063e1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ *.a *.cov *.exe +*.exe.manifest *.gcda *.gcno *.gcov -- 1.8.5.3

1 0

[libvirt] [PATCH] Fix minor typo (unkown)
by Yuri Chornoivan 27 Feb '14

27 Feb '14

Hi, Sorry for not using git mailing capabilities (my mail service does not work well with git). Thanks for reviewing this patch. Best regards, Yuri

2 1