- Devel - libvirt List Archives

[libvirt] [PATCH] virNetServerNewPostExecRestart: Initialize @max_anonymous_clients
by Michal Privoznik 18 Mar '14

18 Mar '14

Coverity spotted a use of possibly undefined variable. If a server is restarting as an result of update, the JSON file that keeps current value of some variables will not contain the new variables. This is the case of @max_anonymous_clients too. We are correctly querying if there's "max_anonymous_clients" in the JSON, however, we are not setting a sane default if there's none. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/rpc/virnetserver.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index dfa3565..33a0346 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -494,12 +494,15 @@ virNetServerPtr virNetServerNewPostExecRestart(virJSONValuePtr object, _("Missing max_clients data in JSON document")); goto error; } - if (virJSONValueObjectHasKey(object, "max_anonymous_clients") && - virJSONValueObjectGetNumberUint(object, "max_anonymous_clients", - &max_anonymous_clients) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Malformed max_anonymous_clients data in JSON document")); - goto error; + if (virJSONValueObjectHasKey(object, "max_anonymous_clients")) { + if (virJSONValueObjectGetNumberUint(object, "max_anonymous_clients", + &max_anonymous_clients) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Malformed max_anonymous_clients data in JSON document")); + goto error; + } + } else { + max_anonymous_clients = max_clients; } if (virJSONValueObjectGetNumberUint(object, "keepaliveInterval", &keepaliveInterval) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", -- 1.9.0

2 1

[libvirt] [PATCH libvirt-python 1/2] setPyVirTypedParameter: Copy full field name
by Michal Privoznik 18 Mar '14

18 Mar '14

In the setPyVirTypedParameter we try to produce virTypedParameter array from a pyhthon dictionary. However, when copying field name into item in returned array, we use strncpy() as the field name is fixed length array. To determine its size we use sizeof() but mistakenly dereference it resulting in sizeof(char) which equals to 1 byte. Moreover, there's no need for using sizeof() when we have a global macro to tell us the length of the field name: VIR_TYPED_PARAM_FIELD_LENGTH. And since array is allocated using VIR_ALLOC() we are sure the memory is initially filled with zeros. Hence, there's no need to terminate string we've just copied into field name with '\0' character. It's there for sure too as we copy up to field length - 1. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- libvirt-override.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libvirt-override.c b/libvirt-override.c index 83369fc..3765a43 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -197,8 +197,7 @@ setPyVirTypedParameter(PyObject *info, goto cleanup; } - strncpy(temp->field, keystr, sizeof(*temp->field) - 1); - temp->field[sizeof(*temp->field) - 1] = '\0'; + strncpy(temp->field, keystr, VIR_TYPED_PARAM_FIELD_LENGTH - 1); temp->type = params[i].type; VIR_FREE(keystr); -- 1.9.0

2 3

[libvirt] [PATCH] Fix memory leak in virDomainChrSourceDefClear()
by Nehal J Wani 18 Mar '14

18 Mar '14

While running qemuxml2xmltest, it was found that valgrind pointed out the following memory leak: ==21905== 26 bytes in 1 blocks are definitely lost in loss record 23 of 69 ==21905== at 0x4A069EE: malloc (vg_replace_malloc.c:270) ==21905== by 0x3E782A754D: xmlStrndup (in /usr/lib64/libxml2.so.2.7.6) ==21905== by 0x4CD986D: virDomainChrSourceDefParseXML (domain_conf.c:7233) ==21905== by 0x4CE4199: virDomainChrDefParseXML (domain_conf.c:7512) ==21905== by 0x4CFAF3F: virDomainDefParseXML (domain_conf.c:12303) ==21905== by 0x4CFB46E: virDomainDefParseNode (domain_conf.c:13031) ==21905== by 0x4CFB5E9: virDomainDefParse (domain_conf.c:12973) ==21905== by 0x41E9D8: testCompareXMLToXMLFiles (qemuxml2xmltest.c:40) ==21905== by 0x41EBAA: testCompareXMLToXMLHelper (qemuxml2xmltest.c:93) ==21905== by 0x421D21: virtTestRun (testutils.c:199) ==21905== by 0x41FCE9: mymain.part.0 (qemuxml2xmltest.c:244) ==21905== by 0x42249D: virtTestMain (testutils.c:782) ==21905== ... and 7 more --- The leaks were specific to the tests: DO_TEST("serial-spiceport"); DO_TEST("serial-spiceport-nospice"); src/conf/domain_conf.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 92b1324..f633db7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1495,6 +1495,10 @@ virDomainChrSourceDefClear(virDomainChrSourceDefPtr def) case VIR_DOMAIN_CHR_TYPE_UNIX: VIR_FREE(def->data.nix.path); break; + + case VIR_DOMAIN_CHR_TYPE_SPICEPORT: + VIR_FREE(def->data.spiceport.channel); + break; } } -- 1.7.1

2 1

[libvirt] Python setInterfaceParameters function broken
by Brian Rak 18 Mar '14

18 Mar '14

I've been trying to use domain.setInterfaceParameters, and I'm finding it's throwing the mysterious error: libvirt.libvirtError: argument unsupported: parameter '' not supported Enabling debug mode in libvirt reveals this: 2014-03-17 18:41:33.780+0000: 16927: debug : virDomainSetInterfaceParameters:8001 : dom=0x7f2ecc0009b0, (VM: name=SRVID8736, uuid=5121c1d6-19aa-4494-b6a7-09af270f24da), device=vnet0, params=0x7f2ecc0011f0, nparams=6, flags=0 2014-03-17 18:41:33.780+0000: 16927: debug : virDomainSetInterfaceParameters:8002 : params[""]=(uint)0 2014-03-17 18:41:33.780+0000: 16927: debug : virDomainSetInterfaceParameters:8002 : params[""]=(uint)64000 2014-03-17 18:41:33.780+0000: 16927: debug : virDomainSetInterfaceParameters:8002 : params[""]=(uint)10 2014-03-17 18:41:33.780+0000: 16927: debug : virDomainSetInterfaceParameters:8002 : params[""]=(uint)64000 2014-03-17 18:41:33.780+0000: 16927: debug : virDomainSetInterfaceParameters:8002 : params[""]=(uint)0 2014-03-17 18:41:33.780+0000: 16927: debug : virDomainSetInterfaceParameters:8002 : params[""]=(uint)0 (irreverent lines trimmed) Which ultimately led me to setPyVirTypedParameter lines 200-202. These don't seem to work properly. I added some debugging: strncpy(temp->field, keystr, sizeof(*temp->field) - 1); temp->field[sizeof(*temp->field) - 1] = '\0'; DEBUG("current key name in: %s, out: %s field size: %i\n", keystr, temp->field, sizeof(*temp->field) - 1); temp->type = params[i].type; which was displaying: current key name in: outbound.peak, out: field size: 0 current key name in: inbound.peak, out: field size: 0 current key name in: inbound.burst, out: field size: 0 current key name in: inbound.average, out: field size: 0 current key name in: outbound.average, out: field size: 0 current key name in: outbound.burst, out: field size: 0 I am not good enough in C to determine what exactly the correct fix is here. It seems like nothing that used this function could have ever worked. My trivial patch was: --- a/python27-libvirt/libvirt-python-1.2.2/libvirt-override.c +++ b/python27-libvirt/libvirt-python-1.2.2/libvirt-override.c @@ -197,8 +197,8 @@ setPyVirTypedParameter(PyObject *info, goto cleanup; } - strncpy(temp->field, keystr, sizeof(*temp->field) - 1); - temp->field[sizeof(*temp->field) - 1] = '\0'; + strncpy(temp->field, keystr, VIR_TYPED_PARAM_FIELD_LENGTH - 1); + temp->field[VIR_TYPED_PARAM_FIELD_LENGTH - 1] = '\0'; temp->type = params[i].type; VIR_FREE(keystr); I am not sure if this is the best approach here. This change definitely fixes the issue, and allows setInterfaceParameters to actually execute successfully. I am not comfortable enough with my understanding of the issue to actually submit this as a patch though. Is this something that someone else can take a look at or fix? My trivial test script that was showing the issue: import libvirt conn = libvirt.open(None) if conn == None: print 'Failed to connect'; sys.exit(1) for id in conn.listDomainsID(): dom = conn.lookupByID(id) if dom == None: continue params = dom.interfaceParameters('vnet0', 0) print params dom.setInterfaceParameters('vnet0', params, 0)

2 1

[libvirt] [PATCH v2 0/3] Add keepalive support in virsh
by Martin Kletzander 18 Mar '14

18 Mar '14

This series adds client keepalive support into virsh. This was previously almost done by Guannan around 2 years ago, but not finished. Martin Kletzander (3): virsh: Add keepalive in new vshConnect function virsh: Prohibit virConnectOpen* functions in virsh [DO_NOT_APPLY_UPSTREAM] virsh: add connection monitoring into vshWatchJob cfg.mk | 8 ++++- tests/virsh-optparse | 4 +-- tools/virsh-domain.c | 21 +++++++++---- tools/virsh.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++----- tools/virsh.h | 7 +++++ tools/virsh.pod | 12 ++++++++ 6 files changed, 118 insertions(+), 17 deletions(-) -- 1.9.0

2 7

[libvirt] [PATCH v2] Fix memory leak in virDomainSnapshotDiskDefClear()
by Nehal J Wani 17 Mar '14

17 Mar '14

While running domainsnapshotxml2xmltest, it was found that valgrind pointed out the following memory leak: ==32176== 42 (32 direct, 10 indirect) bytes in 1 blocks are definitely lost in loss record 42 of 66 ==32176== at 0x4A069EE: malloc (vg_replace_malloc.c:270) ==32176== by 0x4A06B62: realloc (vg_replace_malloc.c:662) ==32176== by 0x4C65A07: virReallocN (viralloc.c:243) ==32176== by 0x4C65B2E: virExpandN (viralloc.c:292) ==32176== by 0x4C65E30: virInsertElementsN (viralloc.c:434) ==32176== by 0x4CD71F3: virDomainDiskSourceDefParse (domain_conf.c:5078) ==32176== by 0x4CF6EF4: virDomainSnapshotDefParseNode (snapshot_conf.c:151) ==32176== by 0x4CF7314: virDomainSnapshotDefParseString (snapshot_conf.c:410) ==32176== by 0x41FB8D: testCompareXMLToXMLHelper (domainsnapshotxml2xmltest.c:100) ==32176== by 0x420FD1: virtTestRun (testutils.c:199) ==32176== by 0x41F859: mymain (domainsnapshotxml2xmltest.c:222) ==32176== by 0x42174D: virtTestMain (testutils.c:782) ==32176== ... and one more. --- v2: Updated based on Ján Tomko's and Peter Krempa's comments. v1: https://www.redhat.com/archives/libvir-list/2014-February/msg01409.html src/conf/snapshot_conf.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index d70d176..546e5b3 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -82,6 +82,9 @@ virDomainSnapshotDiskDefClear(virDomainSnapshotDiskDefPtr disk) { VIR_FREE(disk->name); VIR_FREE(disk->file); + while (disk->nhosts) + virDomainDiskHostDefClear(&disk->hosts[--disk->nhosts]); + VIR_FREE(disk->hosts); } void virDomainSnapshotDefFree(virDomainSnapshotDefPtr def) -- 1.7.1

2 1

[libvirt] [PATCH 0/7] POC: Saner firewall integration
by Daniel P. Berrange 17 Mar '14

17 Mar '14

We currently have three areas of code which deal with firewall changes. The bridge driver's iptables usage, the QEMU driver's ebtables usage for mac filters and the nwfilter code. These all directly invoke the iptables/ebtables commands or in the case of nwfilter invoke horrible generated shell scripts. The latter in particular has always been an unpleasant design choice, but it has been made much worse by support for firewalld. We are now invoking firewall-cmd just in order to make a DBus method call to firewalld which then invokes the real *tables commands. This has a notable performance impact. This proof of concept series introduces a new virFirewallPtr object for encapsulating all firewall changes. It provides a transactional API for making firewall changes, so the caller can define a set of rules which must either all succeed or all fail, along with a set of rules to perform rollback upon fail. It will either execute *tables commands directly or will call the DBus method for firewalld directly. The upshot is that it will become possible to unit test all the firewall code much more easily, instead of having to rely on integration testing that we currently have for nwfilter. We will also have much improved performance by avoiding the firewall-cmd tool and easier to understand code too. In this series I've only done the core infrastructure and the conversion of viriptables + virebtables source files. The work on nwfilter is a bigger job that I'm still working on. Daniel P. Berrange (7): Introduce a new set of helper macros for mocking symbols Create a re-usable DBus LD_PRELOAD mock library Switch systemd test to use generic dbus mock Add ability to register callback for virCommand dry run Introduce an object for managing firewall rulesets Convert bridge driver over to use new firewall APIs Convert ebtables code over to use firewall APIs include/libvirt/virterror.h | 1 + po/POTFILES.in | 1 + src/Makefile.am | 2 + src/libvirt_private.syms | 13 + src/network/bridge_driver_linux.c | 669 ++++++++++++++++---------------------- src/util/vircommand.c | 47 ++- src/util/vircommand.h | 12 +- src/util/virebtables.c | 187 +++-------- src/util/virerror.c | 1 + src/util/virfirewall.c | 653 +++++++++++++++++++++++++++++++++++++ src/util/virfirewall.h | 93 ++++++ src/util/virfirewallpriv.h | 45 +++ src/util/viriptables.c | 634 ++++++++++++++++-------------------- src/util/viriptables.h | 114 ++++--- tests/Makefile.am | 30 +- tests/testutils.c | 18 +- tests/virfirewalltest.c | 619 +++++++++++++++++++++++++++++++++++ tests/virkmodtest.c | 8 +- tests/virmock.h | 298 +++++++++++++++++ tests/virmockdbus.c | 64 ++++ tests/virnetdevbandwidthtest.c | 3 +- tests/virsystemdmock.c | 139 -------- tests/virsystemdtest.c | 89 ++++- 23 files changed, 2626 insertions(+), 1114 deletions(-) create mode 100644 src/util/virfirewall.c create mode 100644 src/util/virfirewall.h create mode 100644 src/util/virfirewallpriv.h create mode 100644 tests/virfirewalltest.c create mode 100644 tests/virmock.h create mode 100644 tests/virmockdbus.c delete mode 100644 tests/virsystemdmock.c -- 1.8.5.3

4 12

[libvirt] [PATCH] bhyve: allow to destroy only active domains
by Roman Bogorodskiy 17 Mar '14

17 Mar '14

Add a check that domain is active before attempting to destroy it. --- src/bhyve/bhyve_driver.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 9dbb299..60d49de 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -567,6 +567,12 @@ bhyveDomainDestroy(virDomainPtr dom) if (virDomainDestroyEnsureACL(dom->conn, vm->def) < 0) goto cleanup; + if (!virDomainObjIsActive(vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("Domain is not running")); + goto cleanup; + } + ret = virBhyveProcessStop(privconn, vm, VIR_DOMAIN_SHUTOFF_DESTROYED); cleanup: -- 1.8.4.2

2 2

[libvirt] [PATCH 0/7 v2] Remove overhead of disabled logging calls
by Daniel P. Berrange 17 Mar '14

17 Mar '14

A v2 of https://www.redhat.com/archives/libvir-list/2014-March/msg00124.html Looking at the performance of the libvirtd event loop when used with libvirt sandbox and apps which do lots of I/O I discovered that a huge amount of time was being spent in our logging APIs making the event loop quite poor at dealing with frequently firing poll events for small data sizes. To track this down I created the following short demo program which simulates a libvirtd event loop thread, watching 500 FDs (eg 500 QEMU or LXC console or monitor FDs). In the test no logging outputs are enabled, so ideally the log overhead would be near zero. Running the demo for 51200 iterations initially took 1 minute 40 seconds. oprofile traces show that in this test run the logging APIs were totally dominant in CPU time, over the work done in the event loop. Note the demo program's FD handler doesn't actually do any work, so this is showing the worst case behaviour, but it is none-the-less a good illustration of the loggin overhead. After refactoring the logging code, the overhead of logging calls when no outputs are enabled is reduced to a single function call which does 2 integer comparisons without any mutex locks. The demo program now completes in 3.3 seconds. IOW, 97% of the original CPU time for the demo was consumed by the logging APIs ! The main feature we loose in this series is the global logging buffer. This ring buffer currently collects all log mesages regardless of log filter settings, and dumps them to stderr upon crash of libvirtd. As the amount of logging code in libvirt has grown, the signal/noise ratio of data in the global log buffer has gone down significantly. Whenever libvirtd crashes, my first reaction to ask the reporter to reproduce with a specifically tailored set of log filters set. Thus, IMHO, the global log buffer is no longer a compelling enough feature to justify its significant performance overhead. Rather than remove it entirely though, I've changed it in two parts. The first patch removes the overhead of it, but leaves a more tailored verson of it still present. This removes the contribution it makes to performance overheads. The last patch, which is not performance relevant, simply deletes the rest of the global log buffer entirely. I'm mostly ambivalent on whether to apply patch 7 or not. IMHO the global log buffer is mostly useless once patch 1 is applied, but if people think it is worth keeping it, patch 7 can be dropped and I won't mind. The demo program used is $ cat demo.c #include <libvirt/libvirt.h> #include <unistd.h> #include <stdio.h> static void ignore(int handle, int fd, int events, void *opaque) { // nada } #define STEPS (1024 * 5) #define ITERATIONS (STEPS * 10) #define NFILES 500 int main(int argc, char **argv) { int fds[NFILES][2]; int i; virEventRegisterDefaultImpl(); for (i = 0 ; i < NFILES ; i++) { char c = '0'; if (pipe(fds[i]) < 0) { perror("pipe"); return -1; } if (write(fds[i][1], &c, 1) < 0) return -1; virEventAddHandle(fds[i][0], VIR_EVENT_HANDLE_READABLE, ignore, NULL, NULL); } for (i = 0 ; i < ITERATIONS ; i++) { if (!(i % STEPS)) fprintf(stderr, "."); virEventRunDefaultImpl(); } return 0; } Simply compile & run it with no args $ gcc -Wall `pkg-config --cflags --libs libvirt` -o demo demo.c $ time ./demo .......... real 1m39.981s user 1m34.894s sys 0m4.851s Now make it use the newly compiled libvirt version $ export LD_LIBRARY_PATH=`pwd`/src/.libs $ time ./demo .......... real 0m3.316s user 0m2.896s sys 0m0.412s 97% execution time removed ! Daniel P. Berrange (7): Reduce performance overhead of the global log buffer Refactor code that skips logging of error messages Move dtrace probe macros into separate header file Turn virLogSource into a struct instead of an enum Add virLogSource variables to all source files Switch to filtering based on log source name instead of filename Remove global log buffer feature entirely cfg.mk | 3 + daemon/libvirtd-config.c | 5 +- daemon/libvirtd-config.h | 1 - daemon/libvirtd.c | 5 +- daemon/libvirtd.conf | 10 +- daemon/libvirtd.h | 1 - daemon/remote.c | 3 + daemon/stream.c | 2 + docs/apibuild.py | 30 +++ docs/logging.html.in | 10 - src/access/viraccessdriverpolkit.c | 3 + src/access/viraccessmanager.c | 3 + src/bhyve/bhyve_command.c | 2 + src/bhyve/bhyve_driver.c | 2 + src/bhyve/bhyve_process.c | 2 + src/conf/domain_audit.c | 2 + src/conf/domain_conf.c | 2 + src/conf/domain_event.c | 1 + src/conf/network_event.c | 2 + src/conf/nwfilter_params.c | 2 + src/conf/object_event.c | 2 + src/conf/secret_conf.c | 2 + src/conf/snapshot_conf.c | 2 + src/conf/storage_conf.c | 1 - src/conf/virchrdev.c | 2 + src/cpu/cpu.c | 2 + src/cpu/cpu_powerpc.c | 2 + src/cpu/cpu_x86.c | 2 + src/datatypes.c | 2 + src/driver.c | 2 + src/esx/esx_device_monitor.c | 1 - src/esx/esx_driver.c | 2 + src/esx/esx_interface_driver.c | 2 - src/esx/esx_network_driver.c | 2 - src/esx/esx_nwfilter_driver.c | 2 - src/esx/esx_secret_driver.c | 2 - src/esx/esx_storage_backend_iscsi.c | 2 - src/esx/esx_storage_backend_vmfs.c | 2 + src/esx/esx_util.c | 2 +- src/esx/esx_vi.c | 2 +- src/esx/esx_vi_methods.c | 1 - src/esx/esx_vi_types.c | 2 +- src/fdstream.c | 2 + src/hyperv/hyperv_device_monitor.c | 2 - src/hyperv/hyperv_driver.c | 3 +- src/hyperv/hyperv_interface_driver.c | 2 - src/hyperv/hyperv_network_driver.c | 2 - src/hyperv/hyperv_nwfilter_driver.c | 2 - src/hyperv/hyperv_secret_driver.c | 2 - src/hyperv/hyperv_storage_driver.c | 2 - src/hyperv/hyperv_util.c | 2 +- src/hyperv/hyperv_wmi.c | 2 - src/interface/interface_backend_netcf.c | 2 + src/internal.h | 72 ------ src/libvirt-lxc.c | 2 + src/libvirt-qemu.c | 2 + src/libvirt.c | 2 + src/libvirt_private.syms | 2 - src/libxl/libxl_conf.c | 2 + src/libxl/libxl_domain.c | 1 + src/libxl/libxl_driver.c | 2 + src/locking/domain_lock.c | 2 + src/locking/lock_daemon.c | 4 +- src/locking/lock_daemon_config.c | 4 +- src/locking/lock_daemon_config.h | 1 - src/locking/lock_daemon_dispatch.c | 5 +- src/locking/lock_driver_lockd.c | 2 + src/locking/lock_driver_nop.c | 2 + src/locking/lock_driver_sanlock.c | 2 + src/locking/lock_manager.c | 2 + src/locking/virtlockd.conf | 10 +- src/lxc/lxc_cgroup.c | 2 + src/lxc/lxc_conf.c | 2 + src/lxc/lxc_container.c | 2 + src/lxc/lxc_controller.c | 2 + src/lxc/lxc_domain.c | 2 + src/lxc/lxc_driver.c | 1 + src/lxc/lxc_fuse.c | 1 - src/lxc/lxc_hostdev.c | 2 + src/lxc/lxc_monitor.c | 2 + src/lxc/lxc_native.c | 1 + src/lxc/lxc_process.c | 2 + src/network/bridge_driver.c | 2 + src/network/bridge_driver_linux.c | 3 + src/network/bridge_driver_platform.h | 1 - src/node_device/node_device_driver.c | 2 - src/node_device/node_device_hal.c | 2 + src/node_device/node_device_linux_sysfs.c | 2 + src/node_device/node_device_udev.c | 4 +- src/nodeinfo.c | 1 - src/nwfilter/nwfilter_dhcpsnoop.c | 2 + src/nwfilter/nwfilter_driver.c | 2 + src/nwfilter/nwfilter_ebiptables_driver.c | 2 + src/nwfilter/nwfilter_gentech_driver.c | 1 + src/nwfilter/nwfilter_learnipaddr.c | 2 + src/openvz/openvz_driver.c | 2 + src/parallels/parallels_driver.c | 2 + src/phyp/phyp_driver.c | 3 + src/qemu/qemu_agent.c | 2 + src/qemu/qemu_bridge_filter.c | 1 - src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_cgroup.c | 2 + src/qemu/qemu_command.c | 2 + src/qemu/qemu_conf.c | 2 + src/qemu/qemu_domain.c | 2 + src/qemu/qemu_driver.c | 2 + src/qemu/qemu_hostdev.c | 2 + src/qemu/qemu_hotplug.c | 3 + src/qemu/qemu_migration.c | 2 + src/qemu/qemu_monitor.c | 3 + src/qemu/qemu_monitor_json.c | 3 + src/qemu/qemu_monitor_text.c | 3 + src/qemu/qemu_process.c | 2 + src/remote/remote_driver.c | 2 + src/rpc/virkeepalive.c | 3 + src/rpc/virnetclient.c | 3 + src/rpc/virnetclientprogram.c | 2 + src/rpc/virnetclientstream.c | 2 + src/rpc/virnetmessage.c | 2 + src/rpc/virnetsaslcontext.c | 2 + src/rpc/virnetserver.c | 47 +--- src/rpc/virnetserverclient.c | 3 + src/rpc/virnetservermdns.c | 2 + src/rpc/virnetserverprogram.c | 2 + src/rpc/virnetsocket.c | 2 + src/rpc/virnetsshsession.c | 2 + src/rpc/virnettlscontext.c | 3 + src/secret/secret_driver.c | 2 + src/security/security_apparmor.c | 3 + src/security/security_dac.c | 3 + src/security/security_driver.c | 2 + src/security/security_manager.c | 1 + src/security/security_selinux.c | 2 + src/storage/storage_backend.c | 2 + src/storage/storage_backend_disk.c | 2 + src/storage/storage_backend_fs.c | 2 + src/storage/storage_backend_gluster.c | 2 + src/storage/storage_backend_iscsi.c | 2 + src/storage/storage_backend_logical.c | 2 + src/storage/storage_backend_mpath.c | 2 + src/storage/storage_backend_rbd.c | 2 + src/storage/storage_backend_scsi.c | 2 + src/storage/storage_backend_sheepdog.c | 1 - src/storage/storage_driver.c | 2 + src/test/test_driver.c | 2 + src/uml/uml_conf.c | 1 + src/uml/uml_driver.c | 2 + src/util/viralloc.c | 2 + src/util/virarch.c | 2 + src/util/viraudit.c | 9 +- src/util/viraudit.h | 10 +- src/util/virauth.c | 2 + src/util/virauthconfig.c | 1 + src/util/vircgroup.c | 2 + src/util/virclosecallbacks.c | 2 + src/util/vircommand.c | 2 + src/util/virconf.c | 2 + src/util/virdbus.c | 2 + src/util/virdnsmasq.c | 3 + src/util/virebtables.c | 2 + src/util/virerror.c | 19 +- src/util/virevent.c | 2 + src/util/vireventpoll.c | 3 + src/util/virfile.c | 2 + src/util/virhash.c | 2 + src/util/virhook.c | 2 + src/util/viridentity.c | 1 + src/util/viriptables.c | 2 + src/util/virjson.c | 1 + src/util/virkeyfile.c | 2 + src/util/virlockspace.c | 2 + src/util/virlog.c | 381 +++++------------------------- src/util/virlog.h | 49 ++-- src/util/virnetdev.c | 2 + src/util/virnetdevmacvlan.c | 1 + src/util/virnetdevtap.c | 2 + src/util/virnetdevveth.c | 2 + src/util/virnetdevvportprofile.c | 2 + src/util/virnetlink.c | 2 + src/util/virnodesuspend.c | 2 + src/util/virnuma.c | 2 + src/util/virobject.c | 3 + src/util/virpci.c | 2 + src/util/virpidfile.c | 2 + src/util/virprobe.h | 100 ++++++++ src/util/virprocess.c | 2 + src/util/virrandom.c | 2 + src/util/virscsi.c | 1 - src/util/virstoragefile.c | 2 + src/util/virstring.c | 2 + src/util/virsysinfo.c | 1 - src/util/virsystemd.c | 1 + src/util/virusb.c | 2 + src/util/virutil.c | 2 + src/util/viruuid.c | 2 + src/vbox/vbox_MSCOMGlue.c | 2 + src/vbox/vbox_XPCOMCGlue.c | 1 + src/vbox/vbox_driver.c | 1 + src/vbox/vbox_tmpl.c | 3 + src/vmx/vmx.c | 2 + src/xen/xen_driver.c | 3 + src/xen/xen_hypervisor.c | 2 + src/xen/xen_inotify.c | 2 + src/xen/xend_internal.c | 2 + src/xen/xm_internal.c | 2 + src/xen/xs_internal.c | 2 + src/xenapi/xenapi_utils.c | 2 + src/xenxs/xen_sxpr.c | 2 + tests/domainconftest.c | 2 + tests/eventtest.c | 2 + tests/fdstreamtest.c | 2 + tests/libvirtdconftest.c | 2 + tests/qemumonitortestutils.c | 2 + tests/securityselinuxlabeltest.c | 2 + tests/securityselinuxtest.c | 2 + tests/sockettest.c | 2 + tests/testutils.c | 4 +- tests/virauthconfigtest.c | 2 + tests/vircgrouptest.c | 2 + tests/virdbustest.c | 2 + tests/virdrivermoduletest.c | 2 + tests/virhashtest.c | 2 + tests/viridentitytest.c | 1 + tests/virkeycodetest.c | 1 + tests/virkeyfiletest.c | 1 + tests/virlockspacetest.c | 2 + tests/virnetmessagetest.c | 2 + tests/virnetsockettest.c | 2 + tests/virnettlscontexttest.c | 2 + tests/virnettlshelpers.c | 2 + tests/virnettlssessiontest.c | 2 + tests/virportallocatortest.c | 1 + tests/virstoragetest.c | 2 + tests/virstringtest.c | 2 + tests/virsystemdtest.c | 2 + tests/virtimetest.c | 2 + tests/viruritest.c | 2 + tools/virsh-console.c | 2 + 238 files changed, 655 insertions(+), 554 deletions(-) create mode 100644 src/util/virprobe.h -- 1.8.5.3

2 14

[libvirt] [PATCH] bhyve: add console support through nmdm device
by Roman Bogorodskiy 17 Mar '14

17 Mar '14

Some additional info on nmdm devices that probably doesn't fit commit message. Man page: http://www.freebsd.org/cgi/man.cgi?query=nmdm&sektion=4 To use this device, we pass device name like '/dev/nmdmNA' to bhyve. Device is created automatically when bhyve accesses it. The pair device name is always '/dev/nmdmNB' which is used to provide console support. Even though this patch doesn't directly depend on virFDStreamOpenPTY() addition patch: https://www.redhat.com/archives/libvir-list/2014-March/msg00582.html it's not much useful without it because of mangled console output. Roman Bogorodskiy (1): bhyve: add console support through nmdm device src/bhyve/bhyve_command.c | 34 ++++++++++++++++++++++ src/bhyve/bhyve_driver.c | 69 ++++++++++++++++++++++++++++++++++++++++++++ src/conf/domain_audit.c | 1 + src/conf/domain_conf.c | 12 +++++++- src/conf/domain_conf.h | 1 + src/qemu/qemu_monitor_json.c | 1 + 6 files changed, 117 insertions(+), 1 deletion(-) -- 1.8.4.2

2 3

[libvirt] [PATCH 1/2] bhyve: add support for virtio block devices
by Roman Bogorodskiy 17 Mar '14

17 Mar '14

--- src/bhyve/bhyve_command.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index b9df6d0..2ec97fc 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -216,6 +216,7 @@ static int bhyveBuildDiskArgStr(const virDomainDef *def, virCommandPtr cmd) { virDomainDiskDefPtr disk; + const char *bus_type; if (def->ndisks != 1) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -225,7 +226,14 @@ bhyveBuildDiskArgStr(const virDomainDef *def, virCommandPtr cmd) disk = def->disks[0]; - if (disk->bus != VIR_DOMAIN_DISK_BUS_SATA) { + switch (disk->bus) { + case VIR_DOMAIN_DISK_BUS_SATA: + bus_type = "ahci-hd"; + break; + case VIR_DOMAIN_DISK_BUS_VIRTIO: + bus_type = "virtio-blk"; + break; + default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("unsupported disk bus type")); return -1; @@ -244,7 +252,7 @@ bhyveBuildDiskArgStr(const virDomainDef *def, virCommandPtr cmd) } virCommandAddArg(cmd, "-s"); - virCommandAddArgFormat(cmd, "2:0,ahci-hd,%s", disk->src); + virCommandAddArgFormat(cmd, "2:0,%s,%s", bus_type, disk->src); return 0; } -- 1.8.4.2

2 5

[libvirt] [PATCH] Enforce attribute check of the virRegister functions
by Pavel Hrdina 17 Mar '14

17 Mar '14

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/driver.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/driver.h b/src/driver.h index fbfaac4..d106d59 100644 --- a/src/driver.h +++ b/src/driver.h @@ -2132,15 +2132,15 @@ struct _virNWFilterDriver { * TODO: also need ways to (des)activate a given driver * lookup based on the URI given in a virConnectOpen(ReadOnly) */ -int virRegisterDriver(virDriverPtr); -int virRegisterNetworkDriver(virNetworkDriverPtr); -int virRegisterInterfaceDriver(virInterfaceDriverPtr); -int virRegisterStorageDriver(virStorageDriverPtr); -int virRegisterNodeDeviceDriver(virNodeDeviceDriverPtr); -int virRegisterSecretDriver(virSecretDriverPtr); -int virRegisterNWFilterDriver(virNWFilterDriverPtr); +int virRegisterDriver(virDriverPtr) ATTRIBUTE_RETURN_CHECK; +int virRegisterNetworkDriver(virNetworkDriverPtr) ATTRIBUTE_RETURN_CHECK; +int virRegisterInterfaceDriver(virInterfaceDriverPtr) ATTRIBUTE_RETURN_CHECK; +int virRegisterStorageDriver(virStorageDriverPtr) ATTRIBUTE_RETURN_CHECK; +int virRegisterNodeDeviceDriver(virNodeDeviceDriverPtr) ATTRIBUTE_RETURN_CHECK; +int virRegisterSecretDriver(virSecretDriverPtr) ATTRIBUTE_RETURN_CHECK; +int virRegisterNWFilterDriver(virNWFilterDriverPtr) ATTRIBUTE_RETURN_CHECK; # ifdef WITH_LIBVIRTD -int virRegisterStateDriver(virStateDriverPtr); +int virRegisterStateDriver(virStateDriverPtr) ATTRIBUTE_RETURN_CHECK; # endif void virDriverModuleInitialize(const char *defmoddir); void *virDriverLoadModule(const char *name); -- 1.8.3.1

2 2

[libvirt] [PATCH v3 0/2] Introduce max_anonymous_clients
by Michal Privoznik 17 Mar '14

17 Mar '14

https://bugzilla.redhat.com/show_bug.cgi?id=981729 So far we can limit how many clients are connected, how many are waiting in accept() line but we could not control the count of accepted but not authenticated yet. diff to v2: -Dan's suggestions worked in Michal Privoznik (2): virNetServer: Introduce unauth clients counter daemon: Introduce max_anonymous_clients daemon/libvirtd-config.c | 4 +- daemon/libvirtd-config.h | 1 + daemon/libvirtd.aug | 1 + daemon/libvirtd.c | 1 + daemon/libvirtd.conf | 6 ++- daemon/remote.c | 21 +++++---- daemon/test_libvirtd.aug.in | 3 +- src/locking/lock_daemon.c | 2 +- src/lxc/lxc_controller.c | 2 +- src/rpc/virnetserver.c | 108 ++++++++++++++++++++++++++++++++++++++++---- src/rpc/virnetserver.h | 4 ++ 11 files changed, 130 insertions(+), 23 deletions(-) -- 1.9.0

2 7

[libvirt] [PATCH] bhyve: implement nodeGetInfo()
by Roman Bogorodskiy 17 Mar '14

17 Mar '14

Add bhyveNodeGetInfo() which is a simple wrapper around nodeGetInfo() from src/nodeinfo.c. --- src/bhyve/bhyve_driver.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 9dbb299..cb790de 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -601,6 +601,16 @@ bhyveNodeGetMemoryStats(virConnectPtr conn, } static int +bhyveNodeGetInfo(virConnectPtr conn, + virNodeInfoPtr nodeinfo) +{ + if (virNodeGetInfoEnsureACL(conn) < 0) + return -1; + + return nodeGetInfo(nodeinfo); +} + +static int bhyveStateCleanup(void) { VIR_DEBUG("bhyve state cleanup"); @@ -703,6 +713,7 @@ static virDriver bhyveDriver = { .domainIsPersistent = bhyveDomainIsPersistent, /* 1.2.2 */ .nodeGetCPUStats = bhyveNodeGetCPUStats, /* 1.2.2 */ .nodeGetMemoryStats = bhyveNodeGetMemoryStats, /* 1.2.2 */ + .nodeGetInfo = bhyveNodeGetInfo, /* 1.2.3 */ }; -- 1.8.4.2

2 2

[libvirt] [PATCH] Add parameter to wait for lock in file locking APIs
by Nehal J Wani 17 Mar '14

17 Mar '14

Our current pidfile acquire APis (virPidFileAcquire) simply return -1 upon failure to acquire a lock. This patch adds a parameter 'bool waitForLock' which instructs the APIs if we want to make it block and wait for the lock or not. --- Based on Daniel's comments on: https://www.redhat.com/archives/libvir-list/2014-March/msg00841.html daemon/libvirtd.c | 2 +- src/locking/lock_daemon.c | 4 ++-- src/util/virfile.c | 14 +++++++++----- src/util/virfile.h | 2 +- src/util/virlockspace.c | 6 +++--- src/util/virpidfile.c | 6 ++++-- src/util/virpidfile.h | 2 ++ 7 files changed, 22 insertions(+), 14 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index a471b3b..27c4fff 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -1369,7 +1369,7 @@ int main(int argc, char **argv) { umask(old_umask); /* Try to claim the pidfile, exiting if we can't */ - if ((pid_file_fd = virPidFileAcquirePath(pid_file, getpid())) < 0) { + if ((pid_file_fd = virPidFileAcquirePath(pid_file, false, getpid())) < 0) { ret = VIR_DAEMON_ERR_PIDFILE; goto cleanup; } diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index e047751..7dc4292 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -1020,7 +1020,7 @@ virLockDaemonPostExecRestart(const char *state_file, /* Re-claim PID file now as we will not be daemonizing */ if (pid_file && - (*pid_file_fd = virPidFileAcquirePath(pid_file, getpid())) < 0) + (*pid_file_fd = virPidFileAcquirePath(pid_file, false, getpid())) < 0) goto cleanup; if (!(lockDaemon = virLockDaemonNewPostExecRestart(object, privileged))) @@ -1382,7 +1382,7 @@ int main(int argc, char **argv) { } /* If we have a pidfile set, claim it now, exiting if already taken */ - if ((pid_file_fd = virPidFileAcquirePath(pid_file, getpid())) < 0) { + if ((pid_file_fd = virPidFileAcquirePath(pid_file, false, getpid())) < 0) { ret = VIR_LOCK_DAEMON_ERR_PIDFILE; goto cleanup; } diff --git a/src/util/virfile.c b/src/util/virfile.c index 6da564b..a4a4827 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -339,13 +339,14 @@ virFileWrapperFdFree(virFileWrapperFdPtr wfd) * @shared: type of lock to acquire * @start: byte offset to start lock * @len: length of lock (0 to acquire entire remaining file from @start) + * @waitForLock: wait for previously held lock or not * * Attempt to acquire a lock on the file @fd. If @shared * is true, then a shared lock will be acquired, * otherwise an exclusive lock will be acquired. If * the lock cannot be acquired, an error will be - * returned. This will not wait to acquire the lock if - * another process already holds it. + * returned. If @waitForLock is true, this will wait + * for the lock if another process has already acquired it. * * The lock will be released when @fd is closed. The lock * will also be released if *any* other open file descriptor @@ -356,7 +357,7 @@ virFileWrapperFdFree(virFileWrapperFdPtr wfd) * * Returns 0 on success, or -errno otherwise */ -int virFileLock(int fd, bool shared, off_t start, off_t len) +int virFileLock(int fd, bool shared, off_t start, off_t len, bool waitForLock) { struct flock fl = { .l_type = shared ? F_RDLCK : F_WRLCK, @@ -365,7 +366,9 @@ int virFileLock(int fd, bool shared, off_t start, off_t len) .l_len = len, }; - if (fcntl(fd, F_SETLK, &fl) < 0) + int cmd = waitForLock ? F_SETLKW : F_SETLK; + + if (fcntl(fd, cmd, &fl) < 0) return -errno; return 0; @@ -402,7 +405,8 @@ int virFileUnlock(int fd, off_t start, off_t len) int virFileLock(int fd ATTRIBUTE_UNUSED, bool shared ATTRIBUTE_UNUSED, off_t start ATTRIBUTE_UNUSED, - off_t len ATTRIBUTE_UNUSED) + off_t len ATTRIBUTE_UNUSED, + bool waitForLock ATTRIBUTE_UNUSED) { return -ENOSYS; } diff --git a/src/util/virfile.h b/src/util/virfile.h index 20baf6f..302b74f 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -97,7 +97,7 @@ int virFileWrapperFdClose(virFileWrapperFdPtr dfd); void virFileWrapperFdFree(virFileWrapperFdPtr dfd); -int virFileLock(int fd, bool shared, off_t start, off_t len); +int virFileLock(int fd, bool shared, off_t start, off_t len, bool waitForLock); int virFileUnlock(int fd, off_t start, off_t len); typedef int (*virFileRewriteFunc)(int fd, void *opaque); diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index 90a39bb..a187e1e 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -82,7 +82,7 @@ static void virLockSpaceResourceFree(virLockSpaceResourcePtr res) if (res->flags & VIR_LOCK_SPACE_ACQUIRE_SHARED) { /* We must upgrade to an exclusive lock to ensure * no one else still has it before trying to delete */ - if (virFileLock(res->fd, false, 0, 1) < 0) { + if (virFileLock(res->fd, false, 0, 1, false) < 0) { VIR_DEBUG("Could not upgrade shared lease to exclusive, not deleting"); } else { if (unlink(res->path) < 0 && @@ -155,7 +155,7 @@ virLockSpaceResourceNew(virLockSpacePtr lockspace, goto error; } - if (virFileLock(res->fd, shared, 0, 1) < 0) { + if (virFileLock(res->fd, shared, 0, 1, false) < 0) { if (errno == EACCES || errno == EAGAIN) { virReportError(VIR_ERR_RESOURCE_BUSY, _("Lockspace resource '%s' is locked"), @@ -202,7 +202,7 @@ virLockSpaceResourceNew(virLockSpacePtr lockspace, goto error; } - if (virFileLock(res->fd, shared, 0, 1) < 0) { + if (virFileLock(res->fd, shared, 0, 1, false) < 0) { if (errno == EACCES || errno == EAGAIN) { virReportError(VIR_ERR_RESOURCE_BUSY, _("Lockspace resource '%s' is locked"), diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index 298d57c..28db24c 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -372,6 +372,7 @@ cleanup: } int virPidFileAcquirePath(const char *path, + bool waitForLock, pid_t pid) { int fd = -1; @@ -405,7 +406,7 @@ int virPidFileAcquirePath(const char *path, return -1; } - if (virFileLock(fd, false, 0, 1) < 0) { + if (virFileLock(fd, false, 0, 1, waitForLock) < 0) { virReportSystemError(errno, _("Failed to acquire pid file '%s'"), path); @@ -448,6 +449,7 @@ int virPidFileAcquirePath(const char *path, int virPidFileAcquire(const char *dir, const char *name, + bool waitForLock, pid_t pid) { int rc = 0; @@ -463,7 +465,7 @@ int virPidFileAcquire(const char *dir, goto cleanup; } - rc = virPidFileAcquirePath(pidfile, pid); + rc = virPidFileAcquirePath(pidfile, waitForLock, pid); cleanup: VIR_FREE(pidfile); diff --git a/src/util/virpidfile.h b/src/util/virpidfile.h index 3194a89..2720206 100644 --- a/src/util/virpidfile.h +++ b/src/util/virpidfile.h @@ -56,9 +56,11 @@ int virPidFileDelete(const char *dir, int virPidFileAcquirePath(const char *path, + bool waitForLock, pid_t pid) ATTRIBUTE_RETURN_CHECK; int virPidFileAcquire(const char *dir, const char *name, + bool waitForLock, pid_t pid) ATTRIBUTE_RETURN_CHECK; int virPidFileReleasePath(const char *path, -- 1.7.1

3 2

[libvirt] get information about weighted instances
by sahid 17 Mar '14

17 Mar '14

Greetings, There is a new field I would like to add in the return of the command "vcpuinfo" to get the current "cpu shares" of a domain. The aim is to help managing weighted instances. Avoiding to look at the domain xml to compare instances. VCPU: 0 CPU: 3 State: running CPU time: 4811.3s CPU Affinity: yyyy CPU Shares: 2048 I would like to know if this solution make sens for the community? and if yes I could be work on it. The real aim at the end of this is to add the ability to weight instances in real time, like we can do with the command "vcpupin". Does it makes sense? Best, Sahid.

2 1

[libvirt] [PATCH] Fix mistakes in checking return values
by Daniel P. Berrange 17 Mar '14

17 Mar '14

Thre was a syntax error in checking virRegisterStateDriver in the remote driver, and bogus checking of a void return type of virDomainConfNWFilterRegister in nwfilter. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/nwfilter/nwfilter_driver.c | 3 +-- src/remote/remote_driver.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) Pushed as a build break fix. diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 228794d..8ce2b7d 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -720,7 +720,6 @@ int nwfilterRegister(void) { return -1; if (virRegisterStateDriver(&stateDriver) < 0) return -1; - if (virDomainConfNWFilterRegister(&domainNWFilterDriver) < 0) - return -1; + virDomainConfNWFilterRegister(&domainNWFilterDriver); return 0; } diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index c9711bb..e85f34d 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -7840,7 +7840,7 @@ remoteRegister(void) if (virRegisterNWFilterDriver(&nwfilter_driver) < 0) return -1; #ifdef WITH_LIBVIRTD - if (virRegisterStateDriver(&state_driver) == -1) < 0) + if (virRegisterStateDriver(&state_driver) < 0) return -1; #endif -- 1.8.5.3

1 0

[libvirt] [PATCH] spec: move some dirs into appropriate subpackages
by Michael Chapman 17 Mar '14

17 Mar '14

This commit moves a few directories into more appropriate subpackages. In a few cases a directory is owned by two subpackages, however this is OK as long as the permissions and ownership for the directory are consistent between them. - %{_sysconfdir}/libvirt/qemu/ Used by the qemu and network drivers. When building with separate driver modules, this directory is only owned by l-d-d-network. l-d-d-qemu has a hard dependency on l-d-d-network, which means this directory is created with the correct permissions and ownership, however it's clearer if both subpackages own the directory independently. - %{_sysconfdir}/libvirt/nwfilter/ Used by the nwfilter driver only. This directory is currently always owned by libvirt-daemon. This commit moves it into l-d-d-nwfilter when building with separate driver modules. - %{_localstatedir}/run/libvirt/network/ Used by the network and nwfilter drivers. When building without separate driver modules, this directory is should be owned by libvirt-daemon only if either of these drivers are enabled. When building with separate driver modules, this directory should be owned by l-d-d-nwfilter in addition to l-d-d-network. - %{_datadir}/libvirt/networks/ and %{_datadir}/libvirt/networks/default.xml Used only by the %post scriptlet in libvirt-daemon-config-network. Signed-off-by: Michael Chapman <mike(a)very.puzzling.org> --- libvirt.spec.in | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 014fe5d..ac71db0 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1837,10 +1837,6 @@ exit 0 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/ - %if %{with_nwfilter} -%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/ - %endif - %if %{with_systemd} %{_unitdir}/libvirtd.service %{_unitdir}/virtlockd.service @@ -1903,16 +1899,21 @@ exit 0 %{_mandir}/man8/virtlockd.8* %if ! %{with_driver_modules} - %if %{with_network} + %if %{with_network} || %{with_qemu} %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ + %endif + %if %{with_network} || %{with_nwfilter} +%ghost %dir %{_localstatedir}/run/libvirt/network/ + %endif + %if %{with_network} %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart -%dir %{_datadir}/libvirt/networks/ -%{_datadir}/libvirt/networks/default.xml -%ghost %dir %{_localstatedir}/run/libvirt/network/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/ %endif + %if %{with_nwfilter} +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/ + %endif %if %{with_storage_disk} %attr(0755, root, root) %{_libexecdir}/libvirt_parthelper %endif @@ -1958,6 +1959,8 @@ exit 0 %if %{with_network} %files daemon-config-network %defattr(-, root, root) +%dir %{_datadir}/libvirt/networks/ +%{_datadir}/libvirt/networks/default.xml %endif %if %{with_nwfilter} @@ -1979,8 +1982,6 @@ exit 0 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart -%dir %{_datadir}/libvirt/networks/ -%{_datadir}/libvirt/networks/default.xml %ghost %dir %{_localstatedir}/run/libvirt/network/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/ @@ -1996,6 +1997,8 @@ exit 0 %if %{with_nwfilter} %files daemon-driver-nwfilter %defattr(-, root, root) +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/ +%ghost %dir %{_localstatedir}/run/libvirt/network/ %{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so %endif @@ -2015,6 +2018,7 @@ exit 0 %if %{with_qemu} %files daemon-driver-qemu %defattr(-, root, root) +%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf %config(noreplace) %{_sysconfdir}/libvirt/qemu-lockd.conf -- 1.8.5.3

2 1

[libvirt] [PATCH 1/1] Fix issue found by coverity and cleanup
by Pavel Hrdina 17 Mar '14

17 Mar '14

Coverity found an issue in lxc_driver and uml_driver that we don't check the return value of register functions. I've also updated all other places and unify the way we check the return value. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/bhyve/bhyve_driver.c | 6 ++++-- src/interface/interface_backend_netcf.c | 3 ++- src/lxc/lxc_driver.c | 6 ++++-- src/network/bridge_driver.c | 3 ++- src/nwfilter/nwfilter_driver.c | 9 ++++++--- src/qemu/qemu_driver.c | 6 ++++-- src/remote/remote_driver.c | 24 ++++++++++++++++-------- src/secret/secret_driver.c | 6 ++++-- src/storage/storage_driver.c | 3 ++- src/uml/uml_driver.c | 6 ++++-- 10 files changed, 48 insertions(+), 24 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 9dbb299..f1ed510 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -715,7 +715,9 @@ static virStateDriver bhyveStateDriver = { int bhyveRegister(void) { - virRegisterDriver(&bhyveDriver); - virRegisterStateDriver(&bhyveStateDriver); + if (virRegisterDriver(&bhyveDriver) < 0) + return -1; + if (virRegisterStateDriver(&bhyveStateDriver) < 0) + return -1; return 0; } diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index b4c1fe9..98ce83b 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -1194,6 +1194,7 @@ int netcfIfaceRegister(void) { _("failed to register netcf interface driver")); return -1; } - virRegisterStateDriver(&interfaceStateDriver); + if (virRegisterStateDriver(&interfaceStateDriver) < 0) + return -1; return 0; } diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 0ab1ba2..27c27d8 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -5767,7 +5767,9 @@ static virStateDriver lxcStateDriver = { int lxcRegister(void) { - virRegisterDriver(&lxcDriver); - virRegisterStateDriver(&lxcStateDriver); + if (virRegisterDriver(&lxcDriver) < 0) + return -1; + if (virRegisterStateDriver(&lxcStateDriver) < 0) + return -1; return 0; } diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index c797f8f..181541e 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3232,7 +3232,8 @@ static virStateDriver networkStateDriver = { int networkRegister(void) { if (virRegisterNetworkDriver(&networkDriver) < 0) return -1; - virRegisterStateDriver(&networkStateDriver); + if (virRegisterStateDriver(&networkStateDriver) < 0) + return -1; return 0; } diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 2e89d07..228794d 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -716,8 +716,11 @@ static virDomainConfNWFilterDriver domainNWFilterDriver = { int nwfilterRegister(void) { - virRegisterNWFilterDriver(&nwfilterDriver); - virRegisterStateDriver(&stateDriver); - virDomainConfNWFilterRegister(&domainNWFilterDriver); + if (virRegisterNWFilterDriver(&nwfilterDriver) < 0) + return -1; + if (virRegisterStateDriver(&stateDriver) < 0) + return -1; + if (virDomainConfNWFilterRegister(&domainNWFilterDriver) < 0) + return -1; return 0; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 89f443f..fc382a5 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16796,7 +16796,9 @@ static virStateDriver qemuStateDriver = { }; int qemuRegister(void) { - virRegisterDriver(&qemuDriver); - virRegisterStateDriver(&qemuStateDriver); + if (virRegisterDriver(&qemuDriver) < 0) + return -1; + if (virRegisterStateDriver(&qemuStateDriver) < 0) + return -1; return 0; } diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 955465a..c9711bb 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -7825,15 +7825,23 @@ remoteRegister(void) { remoteDriver = &remote_driver; - if (virRegisterDriver(&remote_driver) == -1) return -1; - if (virRegisterNetworkDriver(&network_driver) == -1) return -1; - if (virRegisterInterfaceDriver(&interface_driver) == -1) return -1; - if (virRegisterStorageDriver(&storage_driver) == -1) return -1; - if (virRegisterNodeDeviceDriver(&node_device_driver) == -1) return -1; - if (virRegisterSecretDriver(&secret_driver) == -1) return -1; - if (virRegisterNWFilterDriver(&nwfilter_driver) == -1) return -1; + if (virRegisterDriver(&remote_driver) < 0) + return -1; + if (virRegisterNetworkDriver(&network_driver) < 0) + return -1; + if (virRegisterInterfaceDriver(&interface_driver) < 0) + return -1; + if (virRegisterStorageDriver(&storage_driver) < 0) + return -1; + if (virRegisterNodeDeviceDriver(&node_device_driver) < 0) + return -1; + if (virRegisterSecretDriver(&secret_driver) < 0) + return -1; + if (virRegisterNWFilterDriver(&nwfilter_driver) < 0) + return -1; #ifdef WITH_LIBVIRTD - if (virRegisterStateDriver(&state_driver) == -1) return -1; + if (virRegisterStateDriver(&state_driver) == -1) < 0) + return -1; #endif return 0; diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 9f7f946..5cb6391 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -1194,7 +1194,9 @@ static virStateDriver stateDriver = { int secretRegister(void) { - virRegisterSecretDriver(&secretDriver); - virRegisterStateDriver(&stateDriver); + if (virRegisterSecretDriver(&secretDriver) < 0) + return -1; + if (virRegisterStateDriver(&stateDriver) < 0) + return -1; return 0; } diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 7dbff6c..466ceba 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -2696,7 +2696,8 @@ int storageRegister(void) { if (virRegisterStorageDriver(&storageDriver) < 0) return -1; - virRegisterStateDriver(&stateDriver); + if (virRegisterStateDriver(&stateDriver) < 0) + return -1; return 0; } diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 3496e52..8ddf181 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -2909,7 +2909,9 @@ static virStateDriver umlStateDriver = { }; int umlRegister(void) { - virRegisterDriver(&umlDriver); - virRegisterStateDriver(&umlStateDriver); + if (virRegisterDriver(&umlDriver) < 0) + return -1; + if (virRegisterStateDriver(&umlStateDriver) < 0) + return -1; return 0; } -- 1.8.3.1

2 3

Re: [libvirt] Zombie process after open libvirt connection
by Carlos Rodrigues 17 Mar '14

17 Mar '14

The zimbie processes is from perl. What is your perl and libvirt version? Em 17/03/2014 12:37, Michal Privoznik <mprivozn(a)redhat.com> escreveu: > > On 17.03.2014 12:13, Carlos Rodrigues wrote: > > Hell Michal, > > > > Thank you for your answer, but this doesn't fix my problem. > > > > Run your fixed script and we get the same behavior: > > > > $ perl test-chldhandle-bug-fixed.pl > > init... pid=29713 > > while... > > fork 1 > > end... pid=29716 > > receive chld > > fork 2 > > end... pid=29717 > > receive chld > > 2014-03-17 11:10:37.234+0000: 29713: info : libvirt version: 1.0.5.7, package: 2.fc19 (Fedora Project, 2013-11-17-23:21:57, buildvm-18.phx2.fedoraproject.org) > > 2014-03-17 11:10:37.234+0000: 29713: warning : virNetTLSContextCheckCertificate:1099 : Certificate check failed Certificate [session] owner does not match the hostname 10.10.4.249 > > connection open > > fork 3 > > end... pid=29827 > > fork 4 > > end... pid=29930 > > go next... > > > > > > I'm not a perl expert, but I don't think it's a libvirt bug anyhow. > Moreover, I don't see any zombies: > > $ perl test-chldhandle-bug-fixed.pl & sleep 5 && echo && ps axf | grep > perl && echo > [1] 11239 > init... pid=11239 > while... > fork 1 > end... pid=11241 > receive chld > fork 2 > end... pid=11242 > receive chld > connection open > > 11239 pts/18 S 0:00 | \_ perl test-chldhandle-bug-fixed.pl > 11245 pts/18 S+ 0:00 | \_ grep --colour=auto perl > > fork 3 > end... pid=11246 > receive chld > fork 4 > end... pid=11247 > receive chld > go next... > > btw: with older version I'm seeing this: > > 11399 pts/18 S 0:00 | \_ perl test-chldhandle-bug.pl > 11401 pts/18 Z 0:00 | | \_ [perl] <defunct> > 11402 pts/18 Z 0:00 | | \_ [perl] <defunct> > 11405 pts/18 S+ 0:00 | \_ grep --colour=auto perl > > What zombies are you seeing? Perl ones or libvirt or ..,? > > Michal

1 0

[libvirt] RFC: viridentitytest Failure on CentOS 6.5?
by Nehal J Wani 17 Mar '14

17 Mar '14

I followed the following steps to build a clean development version of libvirt from source. Can't seem to understand what is wrong. (Entire buildLog has been attached): ➜ /tmp cat /etc/issue CentOS release 6.5 (Final) Kernel \r on an \m ➜ /tmp sestatus SELinux status: enabled SELinuxfs mount: /selinux Current mode: enforcing Mode from config file: enforcing Policy version: 24 Policy from config file: targeted ➜ /tmp git clone git://libvirt.org/libvirt.git Initialized empty Git repository in /tmp/libvirt/.git/ remote: Counting objects: 138935, done. remote: Compressing objects: 100% (21143/21143), done. remote: Total 138935 (delta 117282), reused 138935 (delta 117282) Receiving objects: 100% (138935/138935), 137.72 MiB | 559 KiB/s, done. Resolving deltas: 100% (117282/117282), done. ➜ /tmp cd libvirt ➜ libvirt git:(master) ./autogen.sh --system Running ./configure with --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib64 .. .. Now type 'make' to compile libvirt. ➜ libvirt git:(master) make .. .. make[1]: Leaving directory `/tmp/libvirt' ➜ libvirt git:(master) ✗ cd tests ➜ tests git:(master) ✗ ./viridentitytest /tmp/libvirt/tests/.libs/libsecurityselinuxhelper.so: No such file or directory ➜ tests git:(master) ✗ -- Nehal J Wani

1 0

[libvirt] [PATCH] virlog: add log lock in virLogSetDefaultPriority
by Wangrui (K) 17 Mar '14

17 Mar '14

When the global variable virLogDefaultPriority is modified, it will be better to have a lock. Signed-off-by: Zhou Yimin <zhouyimin(a)huawei.com> --- src/util/virlog.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/util/virlog.c b/src/util/virlog.c index 68af0f3..ba370e2 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -498,7 +498,10 @@ virLogSetDefaultPriority(virLogPriority priority) if (virLogInitialize() < 0) return -1; + virLogLock(); virLogDefaultPriority = priority; + virLogUnlock(); + return 0; } -- 1.7.12.4

3 2

[libvirt] [PATCH] Avoid warning message from libxl driver on non-Xen kernels
by Daniel P. Berrange 17 Mar '14

17 Mar '14

The libxl driver reads /proc/xen/capabilities to see if it is on a Dom0 kernel. If that file does not even exist though, an error is logged. Check for the file existance before trying to read its contents to avoid the log message. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/libxl/libxl_driver.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index ae7342a..445a61a 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -970,6 +970,10 @@ libxlDriverShouldLoad(bool privileged) return ret; } + if (!virFileExists("/proc/xen/capabilities")) { + VIR_INFO("Disabling driver as /proc/xen/capabilities does not exist"); + return false; + } /* * Don't load if not running on a Xen control domain (dom0). It is not * sufficient to check for the file to exist as any guest can mount -- 1.8.5.3

3 2

[libvirt] [PATCH] Fix leak of iterator in nwfilter instantiate code
by Daniel P. Berrange 17 Mar '14

17 Mar '14

The ebiptablesCreateRuleInstanceIterate creates a virNWFilterVarCombIterPtr instance and iterates over it. Unfortunately in doing so, it discards the original pointer. At the end of the method it will thus effectively do virNWFilterVarCombIterFree(NULL), which means it will leak the iterator. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/nwfilter/nwfilter_ebiptables_driver.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 57c0476..9dbd3ff 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -2865,14 +2865,14 @@ ebiptablesCreateRuleInstanceIterate( virNWFilterRuleInstPtr res) { int rc = 0; - virNWFilterVarCombIterPtr vciter; + virNWFilterVarCombIterPtr vciter, tmp; /* rule->vars holds all the variables names that this rule will access. * iterate over all combinations of the variables' values and instantiate * the filtering rule with each combination. */ - vciter = virNWFilterVarCombIterCreate(vars, - rule->varAccess, rule->nVarAccess); + tmp = vciter = virNWFilterVarCombIterCreate(vars, + rule->varAccess, rule->nVarAccess); if (!vciter) return -1; @@ -2881,12 +2881,12 @@ ebiptablesCreateRuleInstanceIterate( nwfilter, rule, ifname, - vciter, + tmp, res); if (rc < 0) break; - vciter = virNWFilterVarCombIterNext(vciter); - } while (vciter != NULL); + tmp = virNWFilterVarCombIterNext(tmp); + } while (tmp != NULL); virNWFilterVarCombIterFree(vciter); -- 1.8.5.3

2 3

[libvirt] [PATCH v5 0/3] support dumping guest memory in compressed format
by qiaonuohan＠cn.fujitsu.com 17 Mar '14

17 Mar '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 v4 to v5: 1. modify some restriction check Changes from v3 to v4: 1. dropping patch "add dump_memory_format in qemu.conf" 2. fix to follow some conventions 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 (3): add new virDomainCoreDumpWithFormat API add qemu support to virDomainCoreDumpWithFormat API allow "virsh dump --memory-only" specify dump format include/libvirt/libvirt.h.in | 31 ++++++++++++++ src/driver.h | 7 ++++ src/libvirt.c | 97 ++++++++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 5 +++ src/qemu/qemu_driver.c | 49 ++++++++++++++++++---- 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/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 15 ++++++- src/remote_protocol-structs | 7 ++++ src/test/test_driver.c | 20 +++++++-- tests/qemumonitorjsontest.c | 2 +- tools/virsh-domain.c | 45 +++++++++++++++++++- 15 files changed, 275 insertions(+), 21 deletions(-) -- 1.8.5.3

4 22