- Devel - libvirt List Archives

[libvirt] DNS for IPv6 addresses?
by Yaniv Kaul 12 Jan '16

12 Jan '16

Is there a way to define DNS for IPv6 addresses? Something like: <dns forwardPlainNames="yes"> <host ip="192.168.200.4"> <hostname>lago_basic_suite_3_6_storage-iscsi</hostname> </host> </dns> Only for IPv6? I reckon I can't just use an IPv6 address in the 'IP' attribute? TIA, Y.

2 1

[libvirt] [PATCH 0/5] logging fixes
by Laine Stump 11 Jan '16

11 Jan '16

These are all related to excessive, misleading, or missing info in logs when trying to debug problems with SR-IOV network devices. Patch 2 does change the logging to eliminate an error message when no error has occurred (or prevent overwriting a prior error if a DISASSOCIATE is happening as part of the cleanup after said prior error), but there is a change to behavior in patch 2 that could have unintended bad consequences, which is why I've Cc'ed Christian at Cisco and Stefan and Shivaprasad at IBM, in hopes that they (or someone they can contact at their respective organizations) can look at the change and report back if it will cause a problem. The change in question (again, in 2/5) is that we would previously always return a status of 0 (PORT_VDP_RESPONSE_SUCCESS) from virNetDevVPortProfileGetStatus if instanceId was NULL; that is *always* the case for both ASSOCIATE and DISASSOCIATE for 802.1Qbg, and is true for all DISASSOCIATE commands for 802.1Qbh. With the change in Patch 2/5, we now will now set status to the actual IFLA_PORT_RESPONSE from the response message, which seems to be correct behavior, but could have bad side effects if there is a previously undiscovered bug at the other end of the communication. Laine Stump (5): util: report the MAC address that couldn't be set util: don't log error in virNetDevVPortProfileGetStatus if instanceId is NULL util: improve error reporting in virNetDevVPortProfileGetStatus util: reduce debug log in virPCIGetVirtualFunctions() docs: update to properly reflect meaning of fields in log filter daemon/libvirtd.conf | 14 ++++++--- docs/logging.html.in | 15 ++++++---- src/util/virnetdev.c | 23 +++++++++----- src/util/virnetdevvportprofile.c | 65 ++++++++++++++++++++++++++++++++-------- src/util/virpci.c | 37 ++++++----------------- src/util/virpci.h | 4 +-- 6 files changed, 98 insertions(+), 60 deletions(-) -- 2.5.0

4 11

[libvirt] [PATCH] qemu: use enum when setting PCI "multi" value, not 0 or 1
by Laine Stump 11 Jan '16

11 Jan '16

From: root <root(a)vhost2.laine.org> No functional change. --- This was suggested by jferlan in an earlier review. src/qemu/qemu_command.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 936a43e..3c9caea 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1,7 +1,7 @@ /* * qemu_command.c: QEMU command generation * - * Copyright (C) 2006-2015 Red Hat, Inc. + * Copyright (C) 2006-2016 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -2142,12 +2142,12 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def, memset(&tmp_addr, 0, sizeof(tmp_addr)); tmp_addr.slot = 0x1F; tmp_addr.function = 0; - tmp_addr.multi = 1; + tmp_addr.multi = VIR_TRISTATE_SWITCH_ON; if (virDomainPCIAddressReserveAddr(addrs, &tmp_addr, flags, false, false) < 0) goto cleanup; tmp_addr.function = 3; - tmp_addr.multi = 0; + tmp_addr.multi = VIR_TRISTATE_SWITCH_ABSENT; if (virDomainPCIAddressReserveAddr(addrs, &tmp_addr, flags, false, false) < 0) goto cleanup; @@ -2623,7 +2623,7 @@ qemuAssignDevicePCISlots(virDomainDefPtr def, addrs->lastaddr = addr; addrs->lastaddr.function = 0; - addrs->lastaddr.multi = 0; + addrs->lastaddr.multi = VIR_TRISTATE_SWITCH_ABSENT; } /* Finally we can reserve the slot+function */ if (virDomainPCIAddressReserveAddr(addrs, &addr, flags, -- 2.5.0

2 1

[libvirt] [PATCH 0/5] auto-add USB2 controller set for Q35
by Laine Stump 11 Jan '16

11 Jan '16

For just about every other machinetype, libvirt automatically adds a USB controller if there is no controller (including "type='none'") specified in the config. It doesn't do this for the Q35 machinetype, because Q35 hardware would have a USB2 controller, USB2 controllers come in sets of multiple devices, and the code that auto-adds the USB controller was really setup to just add a single controller. Expanding that to adding a set of related controllers was beyond the amount of time I had when putting in the initial Q35 support, so I left it "for later", and then forgot about it until someone reminded me in the hall at KVM Forum this summer. I find the practice of auto-adding devices that aren't required for operation of the virtual machine to be a bit odd, but this does make the Q35 machinetype more consistent with all the others, and it is still possible to force no USB controllers by specifying: <controller type='usb' model='none'/> Since the USB controllers on a real Q35 machine are on bus 0 slot 0x1D, there is also a patch here to attempt to use that address for the first set of USB controllers (and 0x1A for the 2nd set). Finally, patch 1 is a bugfix for a problem that hadn't been noticed before, because nobody had tried to connect a USB controller to a pcie-root-port (which has a single slot that is numbered 0). Laine Stump (5): qemu: don't assume slot 0 is unused/reserved. qemu: prefer 00:1D.x and 00:1A.x for USB2 controllers on Q35 conf: add virDomainDefAddController() qemu: define virDomainDevAddUSBController() qemu: auto-add a USB2 controller set for Q35 machines src/conf/domain_conf.c | 104 +++++++++++++++++---- src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 57 ++++++++++- src/qemu/qemu_domain.c | 14 ++- .../qemuxml2argv-q35-usb2-multi.args | 40 ++++++++ .../qemuxml2argv-q35-usb2-multi.xml | 47 ++++++++++ .../qemuxml2argv-q35-usb2-reorder.args | 40 ++++++++ .../qemuxml2argv-q35-usb2-reorder.xml | 47 ++++++++++ tests/qemuxml2argvdata/qemuxml2argv-q35-usb2.args | 30 ++++++ tests/qemuxml2argvdata/qemuxml2argv-q35-usb2.xml | 39 ++++++++ tests/qemuxml2argvdata/qemuxml2argv-q35.args | 5 + tests/qemuxml2argvtest.c | 22 +++++ .../qemuxml2xmlout-q35-usb2-multi.xml | 66 +++++++++++++ .../qemuxml2xmlout-q35-usb2-reorder.xml | 66 +++++++++++++ .../qemuxml2xmloutdata/qemuxml2xmlout-q35-usb2.xml | 46 +++++++++ tests/qemuxml2xmltest.c | 3 + 17 files changed, 606 insertions(+), 23 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-multi.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-multi.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-reorder.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-reorder.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-usb2.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-usb2.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-usb2-multi.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-usb2-reorder.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-q35-usb2.xml -- 2.4.3

2 14

[libvirt] [PATCH 1/2] cgroup: fix including sys/mount.h for OpenBSD
by Roman Bogorodskiy 11 Jan '16

11 Jan '16

From: Jasper Lievisse Adriaanse <jasper(a)openbsd.org> Include sys/param.h along with sys/mount.h to fix compilation on OpenBSD. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- src/util/vircgroup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index e39c4d1..e8e0875 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -27,7 +27,8 @@ #if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R # include <mntent.h> #endif -#if defined HAVE_SYS_MOUNT_H +#if defined HAVE_SYS_PARAM_H && defined HAVE_SYS_MOUNT_H +# include <sys/param.h> # include <sys/mount.h> #endif #include <fcntl.h> -- 2.4.6

2 7

[libvirt] [PATCH v2 1/3] cgroup: don't include sys/mount.h if not needed
by Roman Bogorodskiy 11 Jan '16

11 Jan '16

From: Jasper Lievisse Adriaanse <jasper(a)openbsd.org> As cgroup implementation only works on Linux, it does not make much sense to include sys/mount.h if other requirements are not met, such as HAVE_MNTENT_H and HAVE_GETMNTENT_R. Also, it fixes build on OpenBSD that requires to include sys/param.h along with sys/mount.h. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- src/util/vircgroup.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index e39c4d1..78f519c 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -24,10 +24,9 @@ #include <config.h> #include <stdio.h> -#if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R +#if defined HAVE_MNTENT_H && defined HAVE_SYS_MOUNT_H \ + && defined HAVE_GETMNTENT_R # include <mntent.h> -#endif -#if defined HAVE_SYS_MOUNT_H # include <sys/mount.h> #endif #include <fcntl.h> -- 2.4.6

3 6

[libvirt] [PATCH] vmx: Adapt to emptyBackingString for cdrom-image
by Michal Privoznik 11 Jan '16

11 Jan '16

https://bugzilla.redhat.com/show_bug.cgi?id=1266088 We are missing this value for cdrom-image device. Honestly, I have no idea whether it can happen for other disk devices too. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/vmx/vmx.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 568b2c7..baf27de 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2317,6 +2317,16 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con */ goto ignore; } + } else if (STREQ(fileName, "emptyBackingString")) { + if (deviceType && STRCASENEQ(deviceType, "cdrom-image")) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Expecting VMX entry '%s' to be 'cdrom-image' " + "but found '%s'"), deviceType_name, deviceType); + goto cleanup; + } + + virDomainDiskSetType(*def, VIR_STORAGE_TYPE_FILE); + ignore_value(virDomainDiskSetSource(*def, NULL)); } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid or not yet handled value '%s' " -- 2.4.10

3 2

[libvirt] [PATCH 0/5] Couple of wireshark fixes
by Michal Privoznik 11 Jan '16

11 Jan '16

Well, I've just updated wireshark on my system and encountered couple of compile errors while building libvirt. Here are the fixes. Fortunately, none of them requires us to increase the version number of wireshark that's required. However, I'd like to discuss how are we going to handle this. I mean, at wireshark they don't seem so committed to API stability as we are. Therefore this patch set. In the long term I don't see us adapting to every single API change, or do I? Although I am not sure what are our options here. Michal Privoznik (5): wireshark: s/proto_tree_add_text/proto_tree_add_item/ wireshark: s/ep_alloc/wmem_alloc/ wireshark: s/tvb_length/tvb_captured_length/ wireshark: Replace WIRESHARK_COMPAT with actual version comparison wireshark: Fix header of get_message_len() tools/wireshark/src/packet-libvirt.c | 27 ++++++++++++++------------- tools/wireshark/util/genxdrstub.pl | 7 +++++-- 2 files changed, 19 insertions(+), 15 deletions(-) -- 2.4.10

2 6

[libvirt] [PATCH 0/3] several cgroups/cpuset fixes
by Henning Schild 11 Jan '16

11 Jan '16

Hi, i already explained some of the cgroup problems in some detail so i will not do that again. https://www.redhat.com/archives/libvir-list/2015-October/msg00876.html I managed to solve some of the problems in the current codebase, and am now sharing the patches. But they are really just half of what i had to change to get libvirt to behave in a system with isolated cpus. Other changes/hacks i am not sending here because they do not work for the general case: - create machine.slice before starting libvirtd (smaller than root) ... and hope it wont grow - disabling cpuset.cpus inheritance in libvirtd - allowing only xml with fully specified cputune - set machine cpuset to (vcpupins | emulatorpin) I am not sure how useful the individual fixes are, i am sending them as concrete examples for the problems i described earlier. And i am hoping that will start a discussion. Henning Henning Schild (3): util: cgroups do not implicitly add task to new machine cgroup qemu: do not put a task into machine cgroup qemu cgroups: move new threads to new cgroup after cpuset is set up src/lxc/lxc_cgroup.c | 6 ++++++ src/qemu/qemu_cgroup.c | 23 ++++++++++++++--------- src/util/vircgroup.c | 22 ---------------------- 3 files changed, 20 insertions(+), 31 deletions(-) -- 2.4.10

2 23

[libvirt] [PATCH v3 0/5] Don't blindly connect to qemu-ga
by Michal Privoznik 11 Jan '16

11 Jan '16

diff to v2: - completely reworked, new approach Michal Privoznik (5): qemu: Set virtio channel state sooner qemu: Rename qemuProcessReconnectRefreshChannelVirtioState qemu: change qemuFindAgentConfig return type qemu: Introduce QEMU_CAPS_VSERPORT_CHANGE qemu: Connect to guest agent iff needed src/qemu/qemu_agent.c | 2 +- src/qemu/qemu_agent.h | 2 +- src/qemu/qemu_capabilities.c | 3 +++ src/qemu/qemu_capabilities.h | 3 +++ src/qemu/qemu_domain.c | 11 ++++------ src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_driver.c | 33 ++++++++++++++++++++++------ src/qemu/qemu_migration.c | 20 +++++++++++++++++ src/qemu/qemu_process.c | 21 +++++++++++++----- src/qemu/qemu_process.h | 3 +++ tests/qemucapabilitiesdata/caps_2.1.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 1 + 14 files changed, 81 insertions(+), 23 deletions(-) -- 2.4.10

3 7

[libvirt] [libvirt-php] libvirt_domain_create_xml allow passing flags
by Vasiliy Tolstov 11 Jan '16

11 Jan '16

libvirt_domain_create_xml miss ability to pass flags when create domain, fixing it. Signed-off-by: Vasiliy Tolstov <v.tolstov(a)selfip.ru> --- src/libvirt-php.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index f3b3f9f..39199da 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -1274,6 +1274,14 @@ PHP_MINIT_FUNCTION(libvirt) REGISTER_LONG_CONSTANT("VIR_SNAPSHOT_REVERT_PAUSED", VIR_DOMAIN_SNAPSHOT_REVERT_PAUSED, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("VIR_SNAPSHOT_REVERT_FORCE", VIR_DOMAIN_SNAPSHOT_REVERT_FORCE, CONST_CS | CONST_PERSISTENT); + /* Create flags */ + REGISTER_LONG_CONSTANT("VIR_DOMAIN_NONE", VIR_DOMAIN_NONE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("VIR_DOMAIN_START_PAUSED", VIR_DOMAIN_START_PAUSED, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("VIR_DOMAIN_START_AUTODESTROY", VIR_DOMAIN_START_AUTODESTROY, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("VIR_DOMAIN_START_BYPASS_CACHE", VIR_DOMAIN_START_BYPASS_CACHE, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("VIR_DOMAIN_START_FORCE_BOOT", VIR_DOMAIN_START_FORCE_BOOT, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT("VIR_DOMAIN_START_VALIDATE", VIR_DOMAIN_START_VALIDATE, CONST_CS | CONST_PERSISTENT); + /* Memory constants */ REGISTER_LONG_CONSTANT("VIR_MEMORY_VIRTUAL", 1, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("VIR_MEMORY_PHYSICAL", 2, CONST_CS | CONST_PERSISTENT); @@ -5911,10 +5919,11 @@ PHP_FUNCTION(libvirt_domain_create_xml) virDomainPtr domain=NULL; char *xml; int xml_len; + long flags=0; - GET_CONNECTION_FROM_ARGS("rs",&zconn,&xml,&xml_len); + GET_CONNECTION_FROM_ARGS("rs|l",&zconn,&xml,&xml_len,&flags); - domain=virDomainCreateXML(conn->conn,xml,0); + domain=virDomainCreateXML(conn->conn,xml,flags); DPRINTF("%s: virDomainCreateXML(%p, <xml>, 0) returned %p\n", PHPFUNC, conn->conn, domain); if (domain==NULL) RETURN_FALSE; -- 2.6.4

2 2

[libvirt] [PATCH v2 0/2] Couple of RO/RW connection fixes
by Michal Privoznik 11 Jan '16

11 Jan '16

diff to v1: - After some discussion with Daniel, allow virDomainInterfaceAddresses on RO only if it does not end up talking to guest agent. - Also fix virDomainGetTime Michal Privoznik (2): virDomainInterfaceAddresses: Allow API on RO connection too virDomainGetTime: Deny on RO connections src/libvirt-domain.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.4.10

2 4

[libvirt] [PATCH] virDomainInterfaceAddresses: Allow API on RO connection too
by Michal Privoznik 11 Jan '16

11 Jan '16

This API does not change domain state. It's merely like virDomainGetXMLDesc() - and we don't reject RO connections there. There's no reason to reject them here. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/libvirt-domain.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 677a9ad..e5af933 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -11546,7 +11546,6 @@ virDomainInterfaceAddresses(virDomainPtr dom, *ifaces = NULL; virCheckDomainReturn(dom, -1); virCheckNonNullArgGoto(ifaces, error); - virCheckReadOnlyGoto(dom->conn->flags, error); if (dom->conn->driver->domainInterfaceAddresses) { int ret; -- 2.4.10

2 4

[libvirt] [PATCH 00/21] Support NBD for tunnelled migration
by Pavel Boldin 11 Jan '16

11 Jan '16

The provided patchset implements NBD disk migration over a tunnelled connection provided by libvirt. The migration source instructs QEMU to NBD mirror drives into the provided UNIX socket. These connections and all the data are then tunnelled to the destination using newly introduced RPC call. The migration destination implements a driver method that connects the tunnelled stream to the QEMU's NBD destination. The detailed scheme is the following: PREPARE 1. Migration destination starts QEMU's NBD server listening on a UNIX socket using the `nbd-server-add` monitor command and tells NBD to accept listed disks via code added to qemuMigrationStartNBDServer that calls introduced qemuMonitorNBDServerStartUnix monitor function. PERFORM 2. Migration source creates a UNIX socket that is later used as NBDs destination in `drive-mirror` monitor command. This is implemented as a call to virNetSocketNewListenUnix from doTunnelMigrate. 3. Source starts IOThread that polls on the UNIX socket, accepting every incoming QEMU connection. This is done by adding a new pollfd in the poll(2) call in qemuMigrationIOFunc that calls introduced qemuNBDTunnelAcceptAndPipe function. 4. The qemuNBDTunnelAcceptAndPipe function accepts the connection and creates two virStream's. One is `local` that is later associated with just accepted connection using virFDStreamOpen. Second is `remote` that is later tunnelled to the remote destination stream. The `local` stream is converted to a virFDStreamDrv stream using the virFDStreamOpen call on the fd returned by accept(2). The `remote` stream is associated with a stream on the destination in the way similar to used by PrepareTunnel3* function. That is, the virDomainMigrateOpenTunnel function called on the destination connection object. The virDomainMigrateOpenTunnel calls remote driver's handler remoteDomainMigrateOpenTunnel that makes DOMAIN_MIGRATE_OPEN_TUNNEL call to the destination host. The code in remoteDomainMigrateOpenTunnel ties passed virStream object to a virStream on the destination host via remoteStreamDrv driver. The remote driver handles stream's IO by tunnelling data through the RPC connection. The qemuNBDTunnelAcceptAndPipe at last assigns both streams the same event callback qemuMigrationPipeEvent. Its job is to track statuses of the streams doing IO whenever it is necessary. 5. Source starts the drive mirroring using the qemuMigrationDriveMirror func. The function instructs QEMU to mirror drives to the UNIX socket that thread listens on. Since it is necessary for the mirror driving to get into the 'synchronized' state, where writes go to both destinations simultaneously, before continuing VM migration, the thread serving the connections must be started earlier. 6. When the connection to a UNIX socket on the migration source is made the DOMAIN_MIGRATE_OPEN_TUNNEL proc is called on the migration destination. The handler of this code calls virDomainMigrateOpenTunnel which calls qemuMigrationOpenNBDTunnel by the means of qemuDomainMigrateOpenTunnel. The qemuMigrationOpenNBDTunnel connects the stream linked to a source's stream to the NBD's UNIX socket on the migration destination side. 7. The rest of the disk migration occurs semimagically: virStream* APIs tunnel data in both directions. This is done by qemuMigrationPipeEvent event callback set for both streams. The order of the patches is roughly the following: * First, the RPC machinery and remote driver's virDrvDomainMigrateOpenTunnel implementation are added. * Then, the source-side of the protocol is implemented: code listening on a UNIX socket is added, DriveMirror is enhanced to instruct QEMU to `drive-mirror` here and starting IOThread driving the tunneling sooner. * After that, the destination-side of the protocol is implemented: the qemuMonitorNBDServerStartUnix added and qemuMigrationStartNBDServer enhanced to call it. The qemuDomainMigrateOpenTunnel is implemented along with qemuMigrationOpenNBDTunnel that does the real job. * Finally, the code blocking NBD migration for tunnelled migration is removed. Pavel Boldin (21): rpc: add DOMAIN_MIGRATE_OPEN_TUNNEL proc driver: add virDrvDomainMigrateOpenTunnel remote_driver: introduce virRemoteClientNew remote_driver: add remoteDomainMigrateOpenTunnel domain: add virDomainMigrateOpenTunnel domain: add virDomainMigrateTunnelFlags remote: impl remoteDispatchDomainMigrateOpenTunnel qemu: migration: src: add nbd tunnel socket data qemu: migration: src: nbdtunnel unix socket qemu: migration: src: qemu `drive-mirror` to UNIX qemu: migration: src: qemuSock for running thread qemu: migration: src: add NBD unixSock to iothread qemu: migration: src: qemuNBDTunnelAcceptAndPipe qemu: migration: src: stream piping qemu: monitor: add qemuMonitorNBDServerStartUnix qemu: migration: dest: nbd-server to UNIX sock qemu: migration: dest: qemuMigrationOpenTunnel qemu: driver: add qemuDomainMigrateOpenTunnel qemu: migration: dest: qemuMigrationOpenNBDTunnel qemu: migration: allow NBD tunneling migration apparmor: fix tunnelmigrate permissions daemon/remote.c | 50 ++++ docs/apibuild.py | 1 + docs/hvsupport.pl | 1 + include/libvirt/libvirt-domain.h | 3 + src/driver-hypervisor.h | 8 + src/libvirt-domain.c | 43 ++++ src/libvirt_internal.h | 6 + src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 24 ++ src/qemu/qemu_migration.c | 495 +++++++++++++++++++++++++++++++++------ src/qemu/qemu_migration.h | 6 + src/qemu/qemu_monitor.c | 12 + src/qemu/qemu_monitor.h | 2 + src/qemu/qemu_monitor_json.c | 35 +++ src/qemu/qemu_monitor_json.h | 2 + src/remote/remote_driver.c | 91 +++++-- src/remote/remote_protocol.x | 19 +- src/remote_protocol-structs | 8 + src/security/virt-aa-helper.c | 4 +- 19 files changed, 719 insertions(+), 92 deletions(-) -- 1.9.1

4 34

[libvirt] [PATCH 0/3] virsh: Implement and document --timeout everywhere
by Andrea Bolognani 11 Jan '16

11 Jan '16

Jirka added a new --timestamp option to 'virsh event'[1], so I went ahead and updated the 'net-event' and 'qemu-monitor-event' virsh commands to support it as well. I've also updated the man page so that the new option is properly documented. Cheers. [1] https://www.redhat.com/archives/libvir-list/2015-December/msg00806.html Andrea Bolognani (3): virsh: Add timestamps to QEMU monitor events virsh: Add timestamps to network events virsh: Document the --timestamp option tools/virsh-domain.c | 22 ++++++++++++++++++++-- tools/virsh-network.c | 24 ++++++++++++++++++++++-- tools/virsh.pod | 15 +++++++++++++-- 3 files changed, 55 insertions(+), 6 deletions(-) -- 2.5.0

2 5

[libvirt] [PATCH 0/2] Fix crashing libvirt after my commit
by Martin Kletzander 11 Jan '16

11 Jan '16

The commit was clearing the socket path even when parsing status XML. This series should fix that. Martin Kletzander (2): Provide parse flags to PostParse functions Don't clear libvirt-internal paths when parsing status XML src/bhyve/bhyve_domain.c | 2 ++ src/conf/domain_conf.c | 15 ++++++++++----- src/conf/domain_conf.h | 2 ++ src/libxl/libxl_domain.c | 2 ++ src/lxc/lxc_domain.c | 2 ++ src/openvz/openvz_driver.c | 2 ++ src/phyp/phyp_driver.c | 2 ++ src/qemu/qemu_domain.c | 7 +++++-- src/uml/uml_driver.c | 2 ++ src/vbox/vbox_common.c | 2 ++ src/vmware/vmware_driver.c | 2 ++ src/vmx/vmx.c | 2 ++ src/vz/vz_driver.c | 2 ++ src/xen/xen_driver.c | 2 ++ src/xenapi/xenapi_driver.c | 2 ++ 15 files changed, 41 insertions(+), 7 deletions(-) -- 2.7.0

2 3

[libvirt] Plans for next release
by Daniel Veillard 11 Jan '16

11 Jan '16

So we should push 1.3.1 by the middle of this month (with 1.3.2 for end of Feb as decided when we planned 1.3.0) which means we should enter freeze soon. I am suggesting to start the freeze in Tuesday, with rc2 on Thursday and having the release by next week-end, if anybody has an issue with this, raise your voice before Tuesday :-) Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

2 1

[libvirt] [PATCH 0/4] qemu: Support disable_s3/s4 for -M q35
by Cole Robinson 11 Jan '16

11 Jan '16

q35/ICH9 uses a different qemu option for disabling s3/s4 support. Probe for it and wire it up. Cole Robinson (4): qemu: capabilities: s/Pixx/Piix/g qemu: caps: Rename CAPS_DISABLE_S[34] to CAPS_PIIX_DISABLE_S[34] qemu: caps: check for q35/ICH9 disable S3/S4 qemu: command: wire up usage of q35/ich9 disable s3/s4 src/qemu/qemu_capabilities.c | 19 +++-- src/qemu/qemu_capabilities.h | 6 +- src/qemu/qemu_command.c | 32 ++++++-- tests/qemucapabilitiesdata/caps_1.2.2-1.replies | 23 ++++-- tests/qemucapabilitiesdata/caps_1.3.1-1.replies | 22 ++++-- tests/qemucapabilitiesdata/caps_1.4.2-1.replies | 23 ++++-- tests/qemucapabilitiesdata/caps_1.5.3-1.replies | 22 ++++-- tests/qemucapabilitiesdata/caps_1.6.0-1.replies | 22 ++++-- tests/qemucapabilitiesdata/caps_1.6.50-1.replies | 22 ++++-- tests/qemucapabilitiesdata/caps_2.1.1-1.replies | 22 ++++-- tests/qemucapabilitiesdata/caps_2.4.0-1.caps | 2 + tests/qemucapabilitiesdata/caps_2.4.0-1.replies | 92 ++++++++++++++++++++-- tests/qemucapabilitiesdata/caps_2.5.0-1.caps | 2 + tests/qemucapabilitiesdata/caps_2.5.0-1.replies | 92 ++++++++++++++++++++-- tests/qemucapabilitiesdata/caps_2.6.0-1.caps | 2 + tests/qemucapabilitiesdata/caps_2.6.0-1.replies | 92 ++++++++++++++++++++-- .../qemuxml2argv-q35-pm-disable-fallback.args | 23 ++++++ .../qemuxml2argv-q35-pm-disable-fallback.xml | 18 +++++ .../qemuxml2argv-q35-pm-disable.args | 23 ++++++ .../qemuxml2argv-q35-pm-disable.xml | 18 +++++ tests/qemuxml2argvtest.c | 17 +++- 21 files changed, 507 insertions(+), 87 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable-fallback.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable-fallback.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable.xml -- 2.5.0

2 10

[libvirt] [PATCH v2] libvirtd: Increase NL buffer size for lots of interface
by Leno Hou 11 Jan '16

11 Jan '16

1. When switching CPUs to offline/online in a system more than 128 cpus 2. When using virsh to destroy domain in a system with more interface All of above happens nl_recv returned with error: No buffer space available. This patch sets the socket buffer size to 128K and turns on message peeking for nl_recv,as this would solve this problem totally and permanetly. Signed-off-by: Leno Hou <houqy(a)linux.vnet.ibm.com> Cc: Wenyi Gao <wenyi(a)linux.vnet.ibm.com> CC: Laine Stump <laine(a)laine.org> CC: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virnetlink.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 679b48e..2f2691c 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -65,10 +65,12 @@ struct virNetlinkEventHandle { # ifdef HAVE_LIBNL1 # define virNetlinkAlloc nl_handle_alloc +# define virSocketSetBufferSize nl_set_buffer_size # define virNetlinkFree nl_handle_destroy typedef struct nl_handle virNetlinkHandle; # else # define virNetlinkAlloc nl_socket_alloc +# define virSocketSetBufferSize nl_socket_buffer_size # define virNetlinkFree nl_socket_free typedef struct nl_sock virNetlinkHandle; # endif @@ -696,6 +698,14 @@ virNetlinkEventServiceStart(unsigned int protocol, unsigned int groups) goto error_server; } + if (virSocketSetBufferSize(srv->netlinknh, 131702, 0) < 0) { + virReportSystemError(errno, + "%s",_("cannot set netlink socket buffer size to 128k")); + goto error_server; + } + + nl_socket_enable_msg_peek(srv->netlinknh); + if ((srv->eventwatch = virEventAddHandle(fd, VIR_EVENT_HANDLE_READABLE, virNetlinkEventCallback, -- 1.9.1

1 1

[libvirt] [PATCH v1] libvirtd: Increase NL buffer size for lots of interface
by Leno Hou 11 Jan '16

11 Jan '16

1. When switching CPUs to offline/online in a system more than 128 cpus 2. When using virsh to destroy domain in a system with more interface All of above happens nl_recv returned with error: No buffer space available. This patch set socket buffer size to 128K and turn on message peeking for nl_recv, as this would solve this problem totally and permanetly. LTC-Bugzilla: #133359 #125768 Signed-off-by: Leno Hou <houqy(a)linux.vnet.ibm.com> Cc: Wenyi Gao <wenyi(a)linux.vnet.ibm.com> --- src/util/virnetlink.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 679b48e..c8c9fe0 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -696,6 +696,14 @@ virNetlinkEventServiceStart(unsigned int protocol, unsigned int groups) goto error_server; } + if (nl_socket_set_buffer_size(srv->netlinknh, 131702, 0) < 0) { + virReportSystemError(errno, + "%s",_("cannot set netlink socket buffer size to 128k")); + goto error_server; + } + + nl_socket_enable_msg_peek(srv->netlinknh); + if ((srv->eventwatch = virEventAddHandle(fd, VIR_EVENT_HANDLE_READABLE, virNetlinkEventCallback, -- 1.9.1

3 6

[libvirt] [PATCH] Unify int types handling in protocol files
by Roman Bogorodskiy 10 Jan '16

10 Jan '16

From: Jasper Lievisse Adriaanse <jasper(a)openbsd.org> Some of the protocol files already include handing of the missing int types such as xdr_uint64_t, some don't. To fix it everywhere, move out of the appropriate defines to internal.h and include it whenever needed. Signed-off-by: Roman Bogorodskiy <bogorodskiy(a)gmail.com> --- src/admin/admin_protocol.x | 2 ++ src/internal.h | 19 +++++++++++++++++++ src/lxc/lxc_monitor_protocol.x | 19 +------------------ src/remote/remote_protocol.x | 19 ------------------- src/rpc/virnetprotocol.x | 19 ------------------- 5 files changed, 22 insertions(+), 56 deletions(-) diff --git a/src/admin/admin_protocol.x b/src/admin/admin_protocol.x index 878983d..2b25d9a 100644 --- a/src/admin/admin_protocol.x +++ b/src/admin/admin_protocol.x @@ -22,6 +22,8 @@ * Author: Martin Kletzander <mkletzan(a)redhat.com> */ +%#include "internal.h" + /*----- Data types. -----*/ /* Length of long, but not unbounded, strings. diff --git a/src/internal.h b/src/internal.h index db26fb0..037332d 100644 --- a/src/internal.h +++ b/src/internal.h @@ -517,4 +517,23 @@ enum { EXIT_ENOENT = 127, /* Could not find program to exec */ }; +/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t + * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32 + */ +# ifdef HAVE_XDR_U_INT64_T +# define xdr_uint64_t xdr_u_int64_t +# endif +# ifndef IXDR_PUT_INT32 +# define IXDR_PUT_INT32 IXDR_PUT_LONG +# endif +# ifndef IXDR_GET_INT32 +# define IXDR_GET_INT32 IXDR_GET_LONG +# endif +# ifndef IXDR_PUT_U_INT32 +# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG +# endif +# ifndef IXDR_GET_U_INT32 +# define IXDR_GET_U_INT32 IXDR_GET_U_LONG +# endif + #endif /* __VIR_INTERNAL_H__ */ diff --git a/src/lxc/lxc_monitor_protocol.x b/src/lxc/lxc_monitor_protocol.x index 205d7c2..f4dae2e 100644 --- a/src/lxc/lxc_monitor_protocol.x +++ b/src/lxc/lxc_monitor_protocol.x @@ -4,24 +4,7 @@ * the libvirt_lxc helper program. */ -/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t - * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32 - */ -%#ifdef HAVE_XDR_U_INT64_T -%# define xdr_uint64_t xdr_u_int64_t -%#endif -%#ifndef IXDR_PUT_INT32 -%# define IXDR_PUT_INT32 IXDR_PUT_LONG -%#endif -%#ifndef IXDR_GET_INT32 -%# define IXDR_GET_INT32 IXDR_GET_LONG -%#endif -%#ifndef IXDR_PUT_U_INT32 -%# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG -%#endif -%#ifndef IXDR_GET_U_INT32 -%# define IXDR_GET_U_INT32 IXDR_GET_U_LONG -%#endif +%#include "internal.h" enum virLXCMonitorExitStatus { VIR_LXC_MONITOR_EXIT_STATUS_ERROR, diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 80f4a8b..89268c0 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -40,25 +40,6 @@ %#include "internal.h" %#include <arpa/inet.h> -/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t - * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32 - */ -%#ifdef HAVE_XDR_U_INT64_T -%# define xdr_uint64_t xdr_u_int64_t -%#endif -%#ifndef IXDR_PUT_INT32 -%# define IXDR_PUT_INT32 IXDR_PUT_LONG -%#endif -%#ifndef IXDR_GET_INT32 -%# define IXDR_GET_INT32 IXDR_GET_LONG -%#endif -%#ifndef IXDR_PUT_U_INT32 -%# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG -%#endif -%#ifndef IXDR_GET_U_INT32 -%# define IXDR_GET_U_INT32 IXDR_GET_U_LONG -%#endif - /*----- Data types. -----*/ /* Length of long, but not unbounded, strings. diff --git a/src/rpc/virnetprotocol.x b/src/rpc/virnetprotocol.x index 7b6f753..d61a7ab 100644 --- a/src/rpc/virnetprotocol.x +++ b/src/rpc/virnetprotocol.x @@ -23,25 +23,6 @@ %#include "internal.h" %#include <arpa/inet.h> -/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t - * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32 - */ -%#ifdef HAVE_XDR_U_INT64_T -%# define xdr_uint64_t xdr_u_int64_t -%#endif -%#ifndef IXDR_PUT_INT32 -%# define IXDR_PUT_INT32 IXDR_PUT_LONG -%#endif -%#ifndef IXDR_GET_INT32 -%# define IXDR_GET_INT32 IXDR_GET_LONG -%#endif -%#ifndef IXDR_PUT_U_INT32 -%# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG -%#endif -%#ifndef IXDR_GET_U_INT32 -%# define IXDR_GET_U_INT32 IXDR_GET_U_LONG -%#endif - /*----- Data types. -----*/ /* Initial message size. -- 2.4.6

2 3

[libvirt] [PATCH] examples: Use one top level makefile
by Cole Robinson 10 Jan '16

10 Jan '16

Using one Makefile per example subdirectory essentially serializes 'make' calls. Convert to one example/Makefile that builds and distributes all the subdir files. This reduces example/ rebuild time from about 5.8 seconds to 1.5 seconds on my machine. One slight difference is that we no longer ship Makefile.am with the examples in the rpm. This was virtually useless anyways since the Makefile was very specific to libvirt infrastructure, so wasn't generically reusable anyways. Tested with 'make distcheck' and 'make rpm' --- Makefile.am | 13 +----- configure.ac | 16 +------ examples/Makefile.am | 89 ++++++++++++++++++++++++++++++++++++++ examples/apparmor/Makefile.am | 43 ------------------ examples/dominfo/Makefile.am | 25 ----------- examples/dommigrate/Makefile.am | 5 --- examples/domsuspend/Makefile.am | 27 ------------ examples/domsuspend/suspend.c | 2 + examples/domtop/Makefile.am | 29 ------------- examples/hellolibvirt/Makefile.am | 21 --------- examples/lxcconvert/Makefile.am | 18 -------- examples/object-events/Makefile.am | 24 ---------- examples/openauth/Makefile.am | 21 --------- examples/polkit/Makefile.am | 17 -------- examples/rename/Makefile.am | 24 ---------- examples/systemtap/Makefile.am | 19 -------- examples/xml/nwfilter/Makefile.am | 54 ----------------------- libvirt.spec.in | 6 +-- 18 files changed, 97 insertions(+), 356 deletions(-) create mode 100644 examples/Makefile.am delete mode 100644 examples/apparmor/Makefile.am delete mode 100644 examples/dominfo/Makefile.am delete mode 100644 examples/dommigrate/Makefile.am delete mode 100644 examples/domsuspend/Makefile.am delete mode 100644 examples/domtop/Makefile.am delete mode 100644 examples/hellolibvirt/Makefile.am delete mode 100644 examples/lxcconvert/Makefile.am delete mode 100644 examples/object-events/Makefile.am delete mode 100644 examples/openauth/Makefile.am delete mode 100644 examples/polkit/Makefile.am delete mode 100644 examples/rename/Makefile.am delete mode 100644 examples/systemtap/Makefile.am delete mode 100644 examples/xml/nwfilter/Makefile.am diff --git a/Makefile.am b/Makefile.am index 6f217bc..708d051 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,18 +20,10 @@ LCOV = lcov GENHTML = genhtml SUBDIRS = . gnulib/lib include src daemon tools docs gnulib/tests \ - tests po examples/object-events examples/hellolibvirt \ - examples/dominfo examples/domsuspend examples/apparmor \ - examples/xml/nwfilter examples/openauth examples/systemtap \ - tools/wireshark examples/dommigrate examples/polkit \ - examples/lxcconvert examples/domtop examples/rename + tests po examples tools/wireshark ACLOCAL_AMFLAGS = -I m4 -XML_EXAMPLES = \ - $(patsubst $(srcdir)/%,%,$(wildcard $(addprefix $(srcdir)/examples/xml/, \ - test/*.xml storage/*.xml))) - EXTRA_DIST = \ config-post.h \ ChangeLog-old \ @@ -46,8 +38,7 @@ EXTRA_DIST = \ autogen.sh \ cfg.mk \ run.in \ - AUTHORS.in \ - $(XML_EXAMPLES) + AUTHORS.in pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libvirt.pc libvirt-qemu.pc libvirt-lxc.pc diff --git a/configure.ac b/configure.ac index a566f5b..a46f9b3 100644 --- a/configure.ac +++ b/configure.ac @@ -2810,21 +2810,9 @@ AC_CONFIG_FILES([\ po/Makefile.in \ include/libvirt/Makefile include/libvirt/libvirt-common.h \ daemon/Makefile \ - tools/Makefile \ + examples/Makefile \ tests/Makefile \ - examples/apparmor/Makefile \ - examples/object-events/Makefile \ - examples/domsuspend/Makefile \ - examples/dominfo/Makefile \ - examples/dommigrate/Makefile \ - examples/domtop/Makefile \ - examples/openauth/Makefile \ - examples/hellolibvirt/Makefile \ - examples/rename/Makefile \ - examples/systemtap/Makefile \ - examples/xml/nwfilter/Makefile \ - examples/lxcconvert/Makefile \ - examples/polkit/Makefile \ + tools/Makefile \ tools/wireshark/Makefile \ tools/wireshark/src/Makefile]) AC_OUTPUT diff --git a/examples/Makefile.am b/examples/Makefile.am new file mode 100644 index 0000000..50fc011 --- /dev/null +++ b/examples/Makefile.am @@ -0,0 +1,89 @@ +## Process this file with automake to produce Makefile.in + +## Copyright (C) 2005-2016 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 +## License as published by the Free Software Foundation; either +## version 2.1 of the License, or (at your option) any later version. +## +## This library is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## Lesser General Public License for more details. +## +## You should have received a copy of the GNU Lesser General Public +## License along with this library. If not, see +## <http://www.gnu.org/licenses/>. + +FILTERS = $(wildcard xml/nwfilter/*.xml) + +EXTRA_DIST = \ + apparmor/TEMPLATE.qemu \ + apparmor/TEMPLATE.lxc \ + apparmor/libvirt-qemu \ + apparmor/libvirt-lxc \ + apparmor/usr.lib.libvirt.virt-aa-helper \ + apparmor/usr.sbin.libvirtd \ + lxcconvert/virt-lxc-convert \ + polkit/libvirt-acl.rules \ + systemtap/events.stp \ + systemtap/rpc-monitor.stp \ + $(FILTERS) \ + $(wildcard xml/storage/*.xml) \ + $(wildcard xml/test/*.xml) + + +INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir) \ + -I$(top_builddir)/gnulib/lib -I$(top_srcdir)/gnulib/lib +LDADD = $(STATIC_BINARIES) $(WARN_CFLAGS) $(COVERAGE_LDFLAGS) \ + $(top_builddir)/src/libvirt.la $(top_builddir)/gnulib/lib/libgnu.la + +noinst_PROGRAMS=dominfo/info1 dommigrate/dommigrate domsuspend/suspend \ + domtop/domtop hellolibvirt/hellolibvirt object-events/event-test \ + openauth/openauth rename/rename + +dominfo_info1_SOURCES = dominfo/info1.c +dommigrate_dommigrate_SOURCES = dommigrate/dommigrate.c +domsuspend_suspend_SOURCES = domsuspend/suspend.c +domtop_domtop_SOURCES = domtop/domtop.c +hellolibvirt_hellolibvirt_SOURCES = hellolibvirt/hellolibvirt.c +object_events_event_test_SOURCES = object-events/event-test.c +openauth_openauth_SOURCES = openauth/openauth.c +rename_rename_SOURCES = rename/rename.c + +if WITH_APPARMOR_PROFILES +apparmordir = $(sysconfdir)/apparmor.d/ +apparmor_DATA = \ + apparmor/usr.lib.libvirt.virt-aa-helper \ + apparmor/usr.sbin.libvirtd \ + $(NULL) + +abstractionsdir = $(apparmordir)/abstractions +abstractions_DATA = \ + apparmor/libvirt-qemu \ + apparmor/libvirt-lxc \ + $(NULL) + +templatesdir = $(apparmordir)/libvirt +templates_DATA = \ + apparmor/TEMPLATE.qemu \ + apparmor/TEMPLATE.lxc \ + $(NULL) +endif WITH_APPARMOR_PROFILES + +if WITH_NWFILTER +NWFILTER_DIR = "$(DESTDIR)$(sysconfdir)/libvirt/nwfilter" + +install-data-local: + $(MKDIR_P) "$(NWFILTER_DIR)" + for f in $(FILTERS); do \ + $(INSTALL_DATA) $$f "$(NWFILTER_DIR)"; \ + done + +uninstall-local:: + for f in $(FILTERS); do \ + rm -f "$(NWFILTER_DIR)/`basename $$f`"; \ + done + -test -z $(shell ls $(NWFILTER_DIR)) || rmdir $(NWFILTER_DIR) +endif WITH_NWFILTER diff --git a/examples/apparmor/Makefile.am b/examples/apparmor/Makefile.am deleted file mode 100644 index 7a20e16..0000000 --- a/examples/apparmor/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ -## Copyright (C) 2005-2011, 2013 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 -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## <http://www.gnu.org/licenses/>. - -EXTRA_DIST= \ - TEMPLATE.qemu \ - TEMPLATE.lxc \ - libvirt-qemu \ - libvirt-lxc \ - usr.lib.libvirt.virt-aa-helper \ - usr.sbin.libvirtd - -if WITH_APPARMOR_PROFILES -apparmordir = $(sysconfdir)/apparmor.d/ -apparmor_DATA = \ - usr.lib.libvirt.virt-aa-helper \ - usr.sbin.libvirtd \ - $(NULL) - -abstractionsdir = $(apparmordir)/abstractions -abstractions_DATA = \ - libvirt-qemu \ - libvirt-lxc \ - $(NULL) - -templatesdir = $(apparmordir)/libvirt -templates_DATA = \ - TEMPLATE.qemu \ - TEMPLATE.lxc \ - $(NULL) -endif WITH_APPARMOR_PROFILES diff --git a/examples/dominfo/Makefile.am b/examples/dominfo/Makefile.am deleted file mode 100644 index 4a30c77..0000000 --- a/examples/dominfo/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -## Copyright (C) 2005-2013 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 -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## <http://www.gnu.org/licenses/>. - -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -LDADDS = $(STATIC_BINARIES) $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la \ - $(COVERAGE_LDFLAGS) - -noinst_PROGRAMS=info1 - -info1_SOURCES=info1.c -info1_LDFLAGS= -info1_LDADD= $(LDADDS) diff --git a/examples/dommigrate/Makefile.am b/examples/dommigrate/Makefile.am deleted file mode 100644 index db271bb..0000000 --- a/examples/dommigrate/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir) -noinst_PROGRAMS = dommigrate -dommigrate_CFLAGS = $(WARN_CFLAGS) -dommigrate_SOURCES = dommigrate.c -dommigrate_LDADD = $(top_builddir)/src/libvirt.la diff --git a/examples/domsuspend/Makefile.am b/examples/domsuspend/Makefile.am deleted file mode 100644 index b8e65f2..0000000 --- a/examples/domsuspend/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -## Process this file with automake to produce Makefile.in - -## Copyright (C) 2013 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 -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## <http://www.gnu.org/licenses/>. - -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -LDADDS = $(STATIC_BINARIES) $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la \ - $(COVERAGE_LDFLAGS) - -noinst_PROGRAMS=suspend - -suspend_SOURCES=suspend.c -suspend_LDFLAGS= -suspend_LDADD= $(LDADDS) diff --git a/examples/domsuspend/suspend.c b/examples/domsuspend/suspend.c index b1c49ec..11f7302 100644 --- a/examples/domsuspend/suspend.c +++ b/examples/domsuspend/suspend.c @@ -21,6 +21,8 @@ * Author: Michal Privoznik <mprivozn(a)redhat.com> */ +#include <config.h> + #include <errno.h> #include <getopt.h> #include <libvirt/libvirt.h> diff --git a/examples/domtop/Makefile.am b/examples/domtop/Makefile.am deleted file mode 100644 index dbebb46..0000000 --- a/examples/domtop/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -## Process this file with automake to produce Makefile.in - -## Copyright (C) 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 -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## <http://www.gnu.org/licenses/>. - -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ - -I$(top_builddir)/gnulib/lib -I$(top_srcdir)/gnulib/lib \ - -I$(top_srcdir) -LDADDS = $(STATIC_BINARIES) $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la \ - $(top_builddir)/gnulib/lib/libgnu.la $(COVERAGE_LDFLAGS) - -noinst_PROGRAMS=domtop - -domtop_SOURCES=domtop.c -domtop_LDFLAGS= -domtop_LDADD= $(LDADDS) diff --git a/examples/hellolibvirt/Makefile.am b/examples/hellolibvirt/Makefile.am deleted file mode 100644 index 55ea972..0000000 --- a/examples/hellolibvirt/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -## Copyright (C) 2005-2013 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 -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## <http://www.gnu.org/licenses/>. - -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir) -noinst_PROGRAMS = hellolibvirt -hellolibvirt_CFLAGS = $(WARN_CFLAGS) -hellolibvirt_SOURCES = hellolibvirt.c -hellolibvirt_LDADD = $(top_builddir)/src/libvirt.la diff --git a/examples/lxcconvert/Makefile.am b/examples/lxcconvert/Makefile.am deleted file mode 100644 index 09cf5d9..0000000 --- a/examples/lxcconvert/Makefile.am +++ /dev/null @@ -1,18 +0,0 @@ -## Copyright (C) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. -## -## This library is free software; you can redistribute it and/or -## modify it under the terms of the GNU Lesser General Public -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## <http://www.gnu.org/licenses/>. - -EXTRA_DIST= \ - virt-lxc-convert diff --git a/examples/object-events/Makefile.am b/examples/object-events/Makefile.am deleted file mode 100644 index 86500a0..0000000 --- a/examples/object-events/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -## Copyright (C) 2005-2011, 2013 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 -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## <http://www.gnu.org/licenses/>. - -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ - -I$(top_builddir)/gnulib/lib -I$(top_srcdir)/gnulib/lib \ - -I$(top_srcdir) -noinst_PROGRAMS = event-test -event_test_CFLAGS = $(WARN_CFLAGS) -event_test_SOURCES = event-test.c -event_test_LDADD = $(top_builddir)/src/libvirt.la \ - $(top_builddir)/gnulib/lib/libgnu.la diff --git a/examples/openauth/Makefile.am b/examples/openauth/Makefile.am deleted file mode 100644 index 7bb8604..0000000 --- a/examples/openauth/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -## Copyright (C) 2005-2013 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 -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## <http://www.gnu.org/licenses/>. - -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(top_srcdir) -noinst_PROGRAMS = openauth -openauth_CFLAGS = $(WARN_CFLAGS) -openauth_SOURCES = openauth.c -openauth_LDADD = $(top_builddir)/src/libvirt.la diff --git a/examples/polkit/Makefile.am b/examples/polkit/Makefile.am deleted file mode 100644 index 4d213e8..0000000 --- a/examples/polkit/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -## Copyright (C) 2015 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 -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## <http://www.gnu.org/licenses/>. - -EXTRA_DIST = libvirt-acl.rules diff --git a/examples/rename/Makefile.am b/examples/rename/Makefile.am deleted file mode 100644 index 1b3484c..0000000 --- a/examples/rename/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -## Copyright (C) 2005-2013 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 -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## <http://www.gnu.org/licenses/>. - -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -LDADDS = $(STATIC_BINARIES) $(WARN_CFLAGS) $(top_builddir)/src/libvirt.la \ - $(COVERAGE_LDFLAGS) - -noinst_PROGRAMS=rename - -rename_SOURCES=rename.c -rename_LDADD= $(LDADDS) diff --git a/examples/systemtap/Makefile.am b/examples/systemtap/Makefile.am deleted file mode 100644 index 3938b9c..0000000 --- a/examples/systemtap/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -## Copyright (C) 2005-2011, 2013 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 -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## <http://www.gnu.org/licenses/>. - -EXTRA_DIST = \ - events.stp \ - rpc-monitor.stp diff --git a/examples/xml/nwfilter/Makefile.am b/examples/xml/nwfilter/Makefile.am deleted file mode 100644 index ec1e7ee..0000000 --- a/examples/xml/nwfilter/Makefile.am +++ /dev/null @@ -1,54 +0,0 @@ -## Copyright (C) 2005-2011, 2013 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 -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library. If not, see -## <http://www.gnu.org/licenses/>. - -FILTERS = \ - allow-arp.xml \ - allow-dhcp-server.xml \ - allow-dhcp.xml \ - allow-incoming-ipv4.xml \ - allow-ipv4.xml \ - clean-traffic.xml \ - no-arp-spoofing.xml \ - no-arp-ip-spoofing.xml \ - no-arp-mac-spoofing.xml \ - no-ip-multicast.xml \ - no-ip-spoofing.xml \ - no-mac-broadcast.xml \ - no-mac-spoofing.xml \ - no-other-l2-traffic.xml \ - no-other-rarp-traffic.xml \ - qemu-announce-self.xml \ - qemu-announce-self-rarp.xml - -EXTRA_DIST=$(FILTERS) - -confdir = $(sysconfdir)/libvirt - -NWFILTER_DIR = "$(DESTDIR)$(sysconfdir)/libvirt/nwfilter" - -if WITH_NWFILTER -install-data-local: - $(MKDIR_P) "$(NWFILTER_DIR)" - for f in $(FILTERS); do \ - $(INSTALL_DATA) $(srcdir)/$$f "$(NWFILTER_DIR)"; \ - done - -uninstall-local:: - for f in $(FILTERS); do \ - rm -f "$(NWFILTER_DIR)/$$f"; \ - done - -test -z $(shell ls $(NWFILTER_DIR)) || rmdir $(NWFILTER_DIR) -endif WITH_NWFILTER diff --git a/libvirt.spec.in b/libvirt.spec.in index 3afef66..9962513 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1547,10 +1547,8 @@ rm -fr %{buildroot} # on RHEL 5, thus we need to expand it here. make install DESTDIR=%{?buildroot} SYSTEMD_UNIT_DIR=%{_unitdir} -for i in object-events dominfo domsuspend hellolibvirt openauth xml/nwfilter systemtap dommigrate domtop rename -do - (cd examples/$i ; make clean ; rm -rf .deps .libs Makefile Makefile.in) -done +make -C examples distclean + rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.la -- 2.5.0

2 2

[libvirt] [PATCH] cfg.mk: Drop period after filename for indent failures
by Cole Robinson 09 Jan '16

09 Jan '16

The period makes it more difficult to copy/paste the errant filename for manual fixup --- Pushed as trivial cfg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cfg.mk b/cfg.mk index cf3f36c..b009b28 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1095,7 +1095,7 @@ test-wrap-argv: res=$$? ; \ rm $${file}-t ; \ test $$res == 0 || { \ - echo "$(ME): Incorrect line wrapping in $$file." 1>&2; \ + echo "$(ME): Incorrect line wrapping in $$file" 1>&2; \ echo "$(ME): Use test-wrap-argv.pl to wrap test data files" 1>&2; \ exit 1; } \ done -- 2.5.0

1 0

[libvirt] [PATCH 0/2] Couple of coverity fixes
by Michal Privoznik 09 Jan '16

09 Jan '16

I went through coverity report and found these. Michal Privoznik (2): virDomainMigrateUnmanagedParams: Don't blindly dereference @dconnuri virt-host-validate-common: Print warning on missing IOMMU src/libvirt-domain.c | 2 +- src/qemu/qemu_migration.c | 2 +- tools/virt-host-validate-common.c | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) -- 2.4.10

2 3

[libvirt] [PATCH] qemu: Fix crash when defining XML with bogus emulator
by Cole Robinson 09 Jan '16

09 Jan '16

We weren't checking for failure of qemuCaps lookup --- src/qemu/qemu_domain.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 00c780d..97534c0 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -1247,7 +1247,9 @@ qemuDomainDefPostParse(virDomainDefPtr def, !(def->emulator = virDomainDefGetDefaultEmulator(def, caps))) return ret; - qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, def->emulator); + if (!(qemuCaps = virQEMUCapsCacheLookup(driver->qemuCapsCache, + def->emulator))) + goto cleanup; if (qemuDomainDefAddDefaultDevices(def, qemuCaps) < 0) goto cleanup; -- 2.5.0

2 2