- Devel - libvirt List Archives

[libvirt] [php PATCH] Fix compiler warnings after int to long conversion
by Dawid Zamirski 18 Jun '14

18 Jun '14

The previous patch [1] caused compiler warnings after variable types were changed from int to long and this patch fixes this. [1] https://www.redhat.com/archives/libvir-list/2014-June/msg00835.html --- src/libvirt-php.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 224943d..6d6fa81 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -3928,7 +3928,7 @@ PHP_FUNCTION(libvirt_domain_send_pointer_event) RETURN_FALSE; } - DPRINTF("%s: x = %d, y = %d, clicked = %d, release = %d, hostname = %s...\n", PHPFUNC, pos_x, pos_y, clicked, release, hostname); + DPRINTF("%s: x = %d, y = %d, clicked = %d, release = %d, hostname = %s...\n", PHPFUNC, (int) pos_x, (int) pos_y, (int) clicked, release, hostname); ret = vnc_send_pointer_event(hostname, tmp, pos_x, pos_y, clicked, release); if (ret == 0) { DPRINTF("%s: Pointer event result is %d\n", PHPFUNC, ret); @@ -4428,7 +4428,7 @@ PHP_FUNCTION(libvirt_domain_new) numNets = i; snprintf(tmpname, sizeof(tmpname), "%s-install", name); - DPRINTF("%s: Name is '%s', memMB is %d, maxmemMB is %d\n", PHPFUNC, tmpname, memMB, maxmemMB); + DPRINTF("%s: Name is '%s', memMB is %d, maxmemMB is %d\n", PHPFUNC, tmpname, (int) memMB, (int) maxmemMB); tmp = installation_get_xml(1, conn->conn, tmpname, memMB, maxmemMB, NULL /* arch */, NULL, vcpus, iso_image, vmDisks, numDisks, vmNetworks, numNets, @@ -6272,7 +6272,7 @@ PHP_FUNCTION(libvirt_domain_snapshot_delete) GET_SNAPSHOT_FROM_ARGS("r|l",&zsnapshot, &flags); retval = virDomainSnapshotDelete(snapshot->snapshot, flags); - DPRINTF("%s: virDomainSnapshotDelete(%p, %d) returned %d\n", PHPFUNC, snapshot->snapshot, flags, retval); + DPRINTF("%s: virDomainSnapshotDelete(%p, %d) returned %d\n", PHPFUNC, snapshot->snapshot, (int) flags, retval); if (retval == -1) RETURN_FALSE; RETURN_TRUE; } @@ -6772,7 +6772,7 @@ PHP_FUNCTION(libvirt_storagevolume_delete) GET_VOLUME_FROM_ARGS("r|l",&zvolume,&flags); retval = virStorageVolDelete(volume->volume, flags); - DPRINTF("%s: virStorageVolDelete(%p, %d) returned %d\n", PHPFUNC, volume->volume, flags, retval); + DPRINTF("%s: virStorageVolDelete(%p, %d) returned %d\n", PHPFUNC, volume->volume, (int) flags, retval); if (retval != 0) { set_error_if_unset("Cannot delete storage volume" TSRMLS_CC); RETURN_FALSE; -- 1.9.3

1 0

[libvirt] [php PATCH] Use long variable type for zend_parse_parameters.
by Dawid Zamirski 18 Jun '14

18 Jun '14

This patch fixes a bug where zend_parse_parameters would segfault on certain PHP version (spotted on PHP 5.3.2 64bit) where type specifier is long "l" and variable reference is int or unsigned int. Changing the variable type from int or unsigned int to long fixes the problem for me and is a known issue [1]. This did not happen in newer PHP version (5.3.10). [1] https://bugs.php.net/bug.php?id=59289 --- src/libvirt-php.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 07ae137..224943d 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -3283,8 +3283,8 @@ PHP_FUNCTION(libvirt_domain_get_metadata) { php_libvirt_domain *domain = NULL; zval *zdomain; - int type = 0; - unsigned int flags = 0; + long type = 0; + long flags = 0; char *uri = NULL; int uri_len; char *ret = NULL; @@ -3328,8 +3328,8 @@ PHP_FUNCTION(libvirt_domain_set_metadata) char *metadata = NULL; char *key = NULL; char *uri = NULL; - int type = 0; - unsigned int flags = 0; + long type = 0; + long flags = 0; int rc; GET_DOMAIN_FROM_ARGS ("rlsssl", &zdomain, &type, &metadata, &metadata_len, &key, &key_len, &uri, &uri_len, &flags); @@ -3566,7 +3566,7 @@ PHP_FUNCTION(libvirt_domain_get_screenshot_api) { php_libvirt_domain *domain=NULL; zval *zdomain; - unsigned int screen = 0; + long screen = 0; int fd = -1; char file[] = "/tmp/libvirt-php-tmp-XXXXXX"; virStreamPtr st = NULL; @@ -3668,7 +3668,7 @@ PHP_FUNCTION(libvirt_domain_get_screenshot) int port = -1; char *hostname = NULL; int hostname_len; - int scancode = 10; + long scancode = 10; char *path; char name[1024] = { 0 }; int use_builtin = 0; @@ -3908,9 +3908,9 @@ PHP_FUNCTION(libvirt_domain_send_pointer_event) char *xml = NULL; char *hostname = NULL; int hostname_len; - int pos_x = 0; - int pos_y = 0; - int clicked = 0; + long pos_x = 0; + long pos_y = 0; + long clicked = 0; int release = 1; int ret; @@ -4352,12 +4352,12 @@ PHP_FUNCTION(libvirt_domain_new) // char *emulator; char *iso_image = NULL; int iso_image_len; - int vcpus = -1; - int memMB = -1; + long vcpus = -1; + long memMB = -1; zval *disks, *networks; tVMDisk *vmDisks = NULL; tVMNetwork *vmNetworks = NULL; - int maxmemMB = -1; + long maxmemMB = -1; HashTable *arr_hash; int numDisks, numNets, i; zval **data; // removed **zvalue @@ -4642,7 +4642,7 @@ PHP_FUNCTION(libvirt_domain_get_interface_devices) */ PHP_FUNCTION(libvirt_domain_change_vcpus) { - int numCpus, flags = 0; + long numCpus, flags = 0; php_libvirt_domain *domain=NULL; zval *zdomain; @@ -6266,7 +6266,7 @@ PHP_FUNCTION(libvirt_domain_snapshot_delete) { zval *zsnapshot; php_libvirt_snapshot *snapshot; - int flags = 0; + long flags = 0; int retval; GET_SNAPSHOT_FROM_ARGS("r|l",&zsnapshot, &flags); @@ -6766,7 +6766,7 @@ PHP_FUNCTION(libvirt_storagevolume_delete) { php_libvirt_volume *volume=NULL; zval *zvolume; - int flags = 0; + long flags = 0; int retval = 0; GET_VOLUME_FROM_ARGS("r|l",&zvolume,&flags); @@ -7057,7 +7057,7 @@ PHP_FUNCTION(libvirt_storagepool_refresh) { php_libvirt_storagepool *pool = NULL; zval *zpool; - unsigned long flags = 0; + long flags = 0; int retval; GET_STORAGEPOOL_FROM_ARGS ("r|l", &zpool, &flags); -- 1.9.3

2 1

[libvirt] [PATCH] Valid pool format type for logical volume pool should be auto and lvm2
by Shanzhi Yu 18 Jun '14

18 Jun '14

The logical volume pool supports formats auto and lvm2 Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- src/conf/storage_conf.c | 2 +- src/conf/storage_conf.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 8b6fd79..3d61273 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -77,7 +77,7 @@ VIR_ENUM_IMPL(virStoragePoolFormatDisk, VIR_ENUM_IMPL(virStoragePoolFormatLogical, VIR_STORAGE_POOL_LOGICAL_LAST, - "unknown", "lvm2") + "auto", "lvm2") VIR_ENUM_IMPL(virStorageVolFormatDisk, diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index 04d99eb..2b08ac5 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -462,7 +462,7 @@ typedef enum { VIR_ENUM_DECL(virStoragePoolFormatDisk) typedef enum { - VIR_STORAGE_POOL_LOGICAL_UNKNOWN = 0, + VIR_STORAGE_POOL_LOGICAL_AUTO = 0, VIR_STORAGE_POOL_LOGICAL_LVM2 = 1, VIR_STORAGE_POOL_LOGICAL_LAST, } virStoragePoolFormatLogical; -- 1.9.3

2 1

[libvirt] NL_RECV RETURNED WITH ERROR: NO BUFFER SPACE AVAILABLE ERROR FOR IXGBE LOAD
by vaughan 18 Jun '14

18 Jun '14

Hi experts, Release: OL7 Kernel: 3.10.0-121.el7.x86_64 Noticed below error on OL7 server, while loading Intel 10gigabit nic driver module , ixgbe in syslog -------------------------------------------------------------------- journal: nl_recv returned with error: No buffer space available ------------------------------------------------------------------- Complete syslog content for ixgbe module load : un 16 20:46:10 ca-ostest432 kernel: ixgbe: Intel(R) 10 Gigabit PCI Express Network Driver - version 3.15.1-k Jun 16 20:46:10 ca-ostest432 kernel: ixgbe: Copyright (c) 1999-2013 Intel Corporation. Jun 16 20:46:10 ca-ostest432 kvm: 1 guest now active Jun 16 20:46:10 ca-ostest432 kvm: 0 guests now active Jun 16 20:46:10 ca-ostest432 kernel: ixgbe 0000:13:00.0: Multiqueue Enabled: Rx Queue count = 16, Tx Queue count = 16 Jun 16 20:46:10 ca-ostest432 kernel: ixgbe 0000:13:00.0: (PCI Express:5.0GT/s:Width x8) 00:1b:21:c8:24:74 Jun 16 20:46:10 ca-ostest432 kernel: ixgbe 0000:13:00.0: MAC: 2, PHY: 9, SFP+: 3, PBA No: E70856-007 Jun 16 20:46:10 ca-ostest432 kernel: ixgbe 0000:13:00.0: PCI Express bandwidth of 32GT/s available Jun 16 20:46:10 ca-ostest432 kernel: ixgbe 0000:13:00.0: (Speed:5.0GT/s, Width: x8, Encoding Loss:20%) Jun 16 20:46:10 ca-ostest432 journal: nl_recv returned with error: No buffer space available Jun 16 20:46:11 ca-ostest432 journal: nl_recv returned with error: No buffer space available Jun 16 20:46:11 ca-ostest432 systemd-udevd[4939]: renamed network interface eth0 to ens2f0 Jun 16 20:46:11 ca-ostest432 kernel: ixgbe 0000:13:00.0: Intel(R) 10 Gigabit Network Connection Jun 16 20:46:11 ca-ostest432 kernel: ixgbe 0000:13:00.1: Multiqueue Enabled: Rx Queue count = 16, Tx Queue count = 16 Jun 16 20:46:11 ca-ostest432 kernel: ixgbe 0000:13:00.1: (PCI Express:5.0GT/s:Width x8) 00:1b:21:c8:24:75 Jun 16 20:46:11 ca-ostest432 kernel: ixgbe 0000:13:00.1: MAC: 2, PHY: 9, SFP+: 4, PBA No: E70856-007 Jun 16 20:46:11 ca-ostest432 kernel: ixgbe 0000:13:00.1: PCI Express bandwidth of 32GT/s available Jun 16 20:46:11 ca-ostest432 kernel: ixgbe 0000:13:00.1: (Speed:5.0GT/s, Width: x8, Encoding Loss:20%) Jun 16 20:46:11 ca-ostest432 systemd-udevd[4984]: renamed network interface eth0 to ens2f1 Jun 16 20:46:11 ca-ostest432 kernel: ixgbe 0000:13:00.1: Intel(R) 10 Gigabit Network Connection Jun 16 20:46:11 ca-ostest432 NetworkManager[1316]: <info> (ens2f0): carrier is OFF (but ignored) Jun 16 20:46:11 ca-ostest432 NetworkManager[1316]: <info> (ens2f0): new Ethernet device (driver: 'ixgbe' ifindex: 14) Jun 16 20:46:11 ca-ostest432 NetworkManager[1316]: <info> (ens2f0): exported as /org/freedesktop/NetworkManager/Devices/13 Jun 16 20:46:11 ca-ostest432 NetworkManager[1316]: <info> (ens2f0): device state change: unmanaged -> unavailable (reason 'managed') [10 20 2] Jun 16 20:46:11 ca-ostest432 journal: nl_recv returned with error: No buffer space available Jun 16 20:46:11 ca-ostest432 kernel: ixgbe 0000:13:00.0: registered PHC device on ens2f0 Jun 16 20:46:12 ca-ostest432 kernel: IPv6: ADDRCONF(NETDEV_UP): ens2f0: link is not ready Jun 16 20:46:12 ca-ostest432 NetworkManager[1316]: <info> (ens2f0): preparing device Jun 16 20:46:12 ca-ostest432 NetworkManager[1316]: <info> (ens2f1): carrier is OFF (but ignored) Jun 16 20:46:12 ca-ostest432 NetworkManager[1316]: <info> (ens2f1): new Ethernet device (driver: 'ixgbe' ifindex: 15) Jun 16 20:46:12 ca-ostest432 NetworkManager[1316]: <info> (ens2f1): exported as /org/freedesktop/NetworkManager/Devices/14 Jun 16 20:46:12 ca-ostest432 NetworkManager[1316]: <info> (ens2f1): device state change: unmanaged -> unavailable (reason 'managed') [10 20 2] Jun 16 20:46:12 ca-ostest432 journal: nl_recv returned with error: No buffer space available Jun 16 20:46:12 ca-ostest432 NetworkManager[1316]: <info> (ens2f1): preparing device Jun 16 20:46:12 ca-ostest432 NetworkManager[1316]: <info> (ens2f0): device state change: unavailable -> disconnected (reason 'none') [20 30 0] Jun 16 20:46:12 ca-ostest432 NetworkManager[1316]: <info> (ens2f1): device state change: unavailable -> disconnected (reason 'none') [20 30 0] Jun 16 20:46:12 ca-ostest432 kernel: ixgbe 0000:13:00.0 ens2f0: detected SFP+: 3 Jun 16 20:46:12 ca-ostest432 kernel: ixgbe 0000:13:00.1: registered PHC device on ens2f1 Jun 16 20:46:12 ca-ostest432 kernel: IPv6: ADDRCONF(NETDEV_UP): ens2f1: link is not ready Jun 16 20:46:12 ca-ostest432 kernel: ixgbe 0000:13:00.1 ens2f1: detected SFP+: 4 Jun 16 20:46:12 ca-ostest432 kernel: ixgbe 0000:13:00.1 ens2f1: NIC Link is Up 10 Gbps, Flow Control: RX/TX Jun 16 20:46:12 ca-ostest432 kernel: IPv6: ADDRCONF(NETDEV_CHANGE): ens2f1: link becomes ready Jun 16 20:46:12 ca-ostest432 NetworkManager[1316]: <info> (ens2f1): link connected Jun 16 20:46:12 ca-ostest432 kernel: ixgbe 0000:13:00.0 ens2f0: NIC Link is Up 10 Gbps, Flow Control: RX/TX Jun 16 20:46:12 ca-ostest432 kernel: IPv6: ADDRCONF(NETDEV_CHANGE): ens2f0: link becomes ready Jun 16 20:46:13 ca-ostest432 NetworkManager[1316]: <info> (ens2f0): link connected --------------------------------------------------------------------------------------------- Issue is not seen for other nic drivers when loaded , i.e verified with be2net ,e1000e , igb drivers , so it looks like specific to ixgbe driver module. This problem can be addressed by increasing the size of the socket receive buffer via nl_socket_set_buffer_size(). However, since reliable transmissions from kernel to user are impossible in any case, I don't know if we need to ensure enough buffer and how much it will be enough. In my test, 32768*4 bytes of receive buffer size is ok. Below is my patch. >From 4505e0001563bcef814dd2c6dc02b2d83e521867 Mon Sep 17 00:00:00 2001 From: rpm-build <rpm-build> Date: Mon, 16 Jun 2014 20:05:08 +0800 Subject: [PATCH] set nl socket buffer size to 32768*4 Signed-off-by: Vaughan Cao <vaughan.cao(a)oracle.com> --- src/util/virnetlink.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 5849ed7..cf44ad2 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -561,6 +561,15 @@ virNetlinkEventServiceStart(unsigned int protocol, unsigned int groups) goto error_server; } + if (nl_socket_set_buffer_size(srv->netlinknh, (32768*4), 0)) { + virReportSystemError(errno, "%s", + _("cannot set netlink socket buffer size to 32768*4")); + goto error_server; + } else { + virReportSystemError(0, "%s", + _("set netlink socket buffer size to 32768*4")); + } + if ((srv->eventwatch = virEventAddHandle(fd, VIR_EVENT_HANDLE_READABLE, virNetlinkEventCallback, -- 1.9.0 -- Regards, Vaughan

4 3

[libvirt] [PATCH 0/2] fix issues in vbox found by make check on RHEL6
by Pavel Hrdina 18 Jun '14

18 Jun '14

Pavel Hrdina (2): tests: fix vbox snapshot xmls vbox_snapshot_conf: fix wrong use of 'xmlSaveFormatFileEnc' src/vbox/vbox_snapshot_conf.c | 2 +- tests/vboxsnapshotxmldata/2disks-1snap.vbox | 292 +++---- tests/vboxsnapshotxmldata/2disks-2snap.vbox | 584 +++++++------- .../vboxsnapshotxmldata/2disks-3snap-brother.vbox | 292 +++---- tests/vboxsnapshotxmldata/2disks-3snap.vbox | 876 ++++++++++----------- 5 files changed, 1023 insertions(+), 1023 deletions(-) -- 1.8.5.5

2 5

[libvirt] [PATCH 0/2] virsh: man: Tweak some old docs problems
by Peter Krempa 18 Jun '14

18 Jun '14

Peter Krempa (2): virsh: man: Fix examples and docs for virsh version virsh: man: Correctly spell QEMU tools/virsh.pod | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) -- 1.9.3

2 4

[libvirt] [PATCH 00/12] Couple of host info getting improvements
by Michal Privoznik 18 Jun '14

18 Jun '14

The rationale is to fill in the gaps as described here: https://wiki.openstack.org/wiki/VirtDriverGuestCPUMemoryPlacement Note that these are targeted for 1.2.6. Michal Privoznik (12): Introduce virNodeHugeTLB Initial virsh exposure of virNodeHugeTLB nodeinfo: Implement nodeHugeTLB virpci: Introduce virPCIDeviceIsPCIExpress and friends nodedev: Introduce <pci-express/> to PCI devices virInterface: Expose link state & speed interface_backend_udev: Implement link speed & state interface_backend_netcf: Implement link speed & state virhostdev: Move IOMMU and VFIO funcs from qemu virCaps: Introduce IOMMU and VFIO capabilities Expose IOMMU and VFIO capabilities from virCaps nodedev: Export NUMA node locality for PCI devices daemon/remote.c | 54 ++++++ docs/formatcaps.html.in | 8 +- docs/formatnode.html.in | 25 +++ docs/schemas/capability.rng | 12 ++ docs/schemas/interface.rng | 27 +++ docs/schemas/nodedev.rng | 37 ++++ include/libvirt/libvirt.h.in | 26 +++ src/conf/capabilities.c | 50 ++++++ src/conf/capabilities.h | 11 ++ src/conf/interface_conf.c | 39 ++++- src/conf/interface_conf.h | 15 ++ src/conf/node_device_conf.c | 166 +++++++++++++++++- src/conf/node_device_conf.h | 32 +++- src/driver.h | 7 + src/interface/interface_backend_netcf.c | 99 +++++++++++ src/interface/interface_backend_udev.c | 19 ++ src/libvirt.c | 59 +++++++ src/libvirt_private.syms | 13 ++ src/libvirt_public.syms | 5 + src/lxc/lxc_conf.c | 3 + src/node_device/node_device_udev.c | 38 ++++ src/nodeinfo.c | 192 +++++++++++++++++++++ src/nodeinfo.h | 6 + src/parallels/parallels_driver.c | 3 + src/phyp/phyp_driver.c | 3 + src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_driver.c | 30 +++- src/qemu/qemu_hostdev.c | 93 ++-------- src/qemu/qemu_hostdev.h | 2 - src/remote/remote_driver.c | 48 ++++++ src/remote/remote_protocol.x | 19 +- src/remote_protocol-structs | 13 ++ src/uml/uml_conf.c | 3 + src/util/virhostdev.c | 73 ++++++++ src/util/virhostdev.h | 4 + src/util/virpci.c | 81 ++++++++- src/util/virpci.h | 8 + src/vbox/vbox_tmpl.c | 3 + tests/capabilityschemadata/caps-qemu-kvm.xml | 2 + tests/capabilityschemadata/caps-test.xml | 2 + tests/capabilityschemadata/caps-test2.xml | 2 + tests/capabilityschemadata/caps-test3.xml | 2 + tests/interfaceschemadata/bridge-no-address.xml | 1 + tests/interfaceschemadata/bridge.xml | 1 + tests/interfaceschemadata/ethernet-dhcp.xml | 1 + tests/nodedevschemadata/pci_1002_71c4.xml | 1 + tests/nodedevschemadata/pci_8086_10c9_sriov_pf.xml | 1 + .../pci_8086_4238_pcie_wireless.xml | 26 +++ tests/nodedevxml2xmltest.c | 1 + tests/xencapsdata/xen-i686-pae-hvm.xml | 2 + tests/xencapsdata/xen-i686-pae.xml | 2 + tests/xencapsdata/xen-i686.xml | 2 + tests/xencapsdata/xen-ia64-be-hvm.xml | 2 + tests/xencapsdata/xen-ia64-be.xml | 2 + tests/xencapsdata/xen-ia64-hvm.xml | 2 + tests/xencapsdata/xen-ia64.xml | 2 + tests/xencapsdata/xen-ppc64.xml | 2 + tests/xencapsdata/xen-x86_64-hvm.xml | 2 + tests/xencapsdata/xen-x86_64.xml | 2 + tools/virsh-host.c | 62 +++++++ tools/virsh.pod | 7 + 61 files changed, 1371 insertions(+), 87 deletions(-) create mode 100644 tests/nodedevschemadata/pci_8086_4238_pcie_wireless.xml -- 1.9.3

3 30

Re: [libvirt] [PATCH v2 4/4] libxl: Add a test suite for libxl option generator
by Ian Campbell 18 Jun '14

18 Jun '14

On Mon, 2014-06-16 at 17:11 -0600, Jim Fehlig wrote: > > This function exists in Xen 4.2 as well, in libxl.h. > > > > Any ideas on how to handle this? I'm not aware of an existing macro to > check for func 'foo' defined in header 'bar'. Is writing a custom macro > along these lines a good solution? A bad solution I tried was hacking > the test to check libxl version via libxl_get_version_info(), but that > API does not work if not running Xen. Given that it exists in everything from 4.2 onwards why do you need to check for it? >From the PoV of these tests (or any application generally) I'd have thought you wouldn't really care if you get this function from libxl.h directly or indirectly via libxl.h including _libxl_types.h. Ian.

3 3

[libvirt] [PATCH 1/1] virt-aa-helper: allow access to /dev/vhost-net if needed
by Serge Hallyn 18 Jun '14

18 Jun '14

Only allow the access if it is a KVM domain which has a NIC which wants non-userspace networking. This addresses https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1322568 Signed-off-by: Serge Hallyn <serge.hallyn(a)ubuntu.com> --- src/security/virt-aa-helper.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 1d246c7..e54f73f 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -929,7 +929,7 @@ get_files(vahControl * ctl) size_t i; char *uuid; char uuidstr[VIR_UUID_STRING_BUFLEN]; - bool needsVfio = false; + bool needsVfio = false, needsvhost = false; /* verify uuid is same as what we were given on the command line */ virUUIDFormat(ctl->def->uuid, uuidstr); @@ -1105,6 +1105,21 @@ get_files(vahControl * ctl) } } + if (ctl->def->virtType == VIR_DOMAIN_VIRT_KVM) { + for (i = 0; i < ctl->def->nnets; i++) { + virDomainNetDefPtr net = ctl->def->nets[i]; + if (net && net->model) { + if (net->driver.virtio.name == VIR_DOMAIN_NET_BACKEND_TYPE_QEMU) + continue; + if (STRNEQ(net->model, "virtio")) + continue; + } + needsvhost = true; + } + } + if (needsvhost) + virBufferAddLit(&buf, " /dev/vhost-net rw,\n"); + if (needsVfio) { virBufferAddLit(&buf, " /dev/vfio/vfio rw,\n"); virBufferAddLit(&buf, " /dev/vfio/[0-9]* rw,\n"); -- 1.9.1

2 1

[libvirt] [PATCH v3] Added example script on how to convert LXC container config
by Cédric Bosdonnat 18 Jun '14

18 Jun '14

--- Diff to v2: * Added copyright + license header * Fixed the nits Makefile.am | 3 +- configure.ac | 1 + examples/lxcconvert/Makefile.am | 18 +++++ examples/lxcconvert/virt-lxc-convert | 127 +++++++++++++++++++++++++++++++++++ 4 files changed, 148 insertions(+), 1 deletion(-) create mode 100644 examples/lxcconvert/Makefile.am create mode 100644 examples/lxcconvert/virt-lxc-convert diff --git a/Makefile.am b/Makefile.am index b961c0e..abc5a2f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,8 @@ 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 + tools/wireshark examples/dommigrate \ + examples/lxcconvert ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 368d094..710cb71 100644 --- a/configure.ac +++ b/configure.ac @@ -2742,6 +2742,7 @@ AC_CONFIG_FILES([\ examples/hellolibvirt/Makefile \ examples/systemtap/Makefile \ examples/xml/nwfilter/Makefile \ + examples/lxcconvert/Makefile \ tools/wireshark/Makefile \ tools/wireshark/src/Makefile]) AC_OUTPUT diff --git a/examples/lxcconvert/Makefile.am b/examples/lxcconvert/Makefile.am new file mode 100644 index 0000000..09cf5d9 --- /dev/null +++ b/examples/lxcconvert/Makefile.am @@ -0,0 +1,18 @@ +## 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/lxcconvert/virt-lxc-convert b/examples/lxcconvert/virt-lxc-convert new file mode 100644 index 0000000..7220153 --- /dev/null +++ b/examples/lxcconvert/virt-lxc-convert @@ -0,0 +1,127 @@ +#!/bin/sh +# lxc_native.c: LXC native configuration import +# +# 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/>. +# +# Author: Cedric Bosdonnat <cbosdonnat(a)suse.com> + +handler_cleanup() +{ + if test "$conf_dir"; then + # Remove the temporary config + rm -r "$conf_dir" + fi +} +trap handler_cleanup INT EXIT + +show_help() +{ + cat << EOF +$0 /path/to/lxc/config/file + +Wrapper around virsh domxml-from-native to ease conversion of LXC +containers configuration to libvirt domain XML. +EOF +} + +if test $# != 1; then + show_help + exit 1 +fi + +if test "$1" = "--help" || test "$1" = "-h"; then + show_help + exit $? +fi + +conf=$1 + +conf_dir=$(mktemp --tmpdir -d virt-lxc-convert-XXX) +conf_new=$conf_dir/config + +cp "$conf" "$conf_new" + +# Do we have lxc.mount, and is it pointing to a readable file? +fstab=$(sed -n '/lxc.mount[[:space:]]*=/ s/[[:space:]]*=[[:space:]]*/=/p' \ + "$conf_new" | cut -f 2 -d '=') +if test -r "$fstab"; then + sed 's/^lxc.mount[[:space:]]*=.*$//' "$conf_new" >"${conf_new}.tmp" + mv "${conf_new}.tmp" "${conf_new}" + sed 's/^$[^#]$/lxc.mount.entry = \1/' "$fstab" >>"${conf_new}" +fi + +memory=$(free | sed -n '/Mem:/s/ \+/ /gp' | cut -f 2 -d ' ') +default_tmpfs="size=$((memory/2))" + +# Do we have tmpfs without size param? +lineno=0 +while read line; do + lineno=$(expr $lineno + 1) + has_rel_size=false + case $line in + lxc.mount.entry[[:space:]]*=[[:space:]]*tmpfs[[:space:]]*) + is_tmpfs=true + ;; + *) + is_tmpfs=false + ;; + esac + + # We only care about tmpfs mount entries here + if ! $is_tmpfs; then + continue + fi + + case $line in + *size=[0-9][0-9]*%*) + has_rel_size=true + has_size=true + ;; + *size=*) + has_size=true + ;; + *) + has_size=false + ;; + esac + + # Add the default size here (50%) if no size is given + if ! $has_size; then + last_option_match="$[[:space:]]*[0-9][[:space:]]*[0-9][::space::]*$$" + sed "${lineno}s/$last_option_match/,$default_tmpfs\1/" \ + "$conf_new" >"${conf_new}.tmp" + mv "${conf_new}.tmp" "${conf_new}" + fi + + # Convert relative sizes + if $has_rel_size; then + percent=$(echo "$line" | sed 's/.*size=$[0-9][0-9]*$%.*/\1/') + size="$((memory*percent/100))" + sed "${lineno}s/size=[0-9]*%/size=${size}/" \ + "$conf_new" >"${conf_new}.tmp" + mv "${conf_new}.tmp" "${conf_new}" + fi +done < "$conf_new" + +# Do we have any memory limit set? +mem_limit=$(grep 'lxc.cgroup.memory.limit_in_bytes[[:space:]]*=' $conf_new) +if test -z "$mem_limit"; then + echo "lxc.cgroup.memory.limit_in_bytes = $memory" >> "$conf_new" +fi + +virsh -c lxc:/// domxml-from-native lxc-tools $conf_new +exit $? -- 1.8.4.5

2 1

[libvirt] [PATCH] vbox: fix a segfault when taking a snapshot
by Yohan BELLEGUIC 18 Jun '14

18 Jun '14

there is a segfault in the vbox driver when taking a snapshot in the following functions: - vboxDomainGetXMLDesc - vboxSnapshotGetReadWriteDisks - vboxSnapshotGetReadOnlyDisks The virStorageSourcePtr in virDomainDiskDef was not correctly allocated. --- src/vbox/vbox_tmpl.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 1ed2729..6365f2a 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -2872,10 +2872,12 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) { /* Allocate mem, if fails return error */ if (VIR_ALLOC_N(def->disks, def->ndisks) >= 0) { for (i = 0; i < def->ndisks; i++) { - if (VIR_ALLOC(def->disks[i]) < 0) { + virDomainDiskDefPtr disk = virDomainDiskDefNew(); + if (!disk) { error = true; break; } + def->disks[i] = disk; } } else { error = true; @@ -7175,6 +7177,10 @@ int vboxSnapshotGetReadWriteDisks(virDomainSnapshotDefPtr def, /* Allocate mem, if fails return error */ if (VIR_ALLOC_N(def->disks, def->ndisks) < 0) goto cleanup; + for (i = 0; i < def->ndisks; i++) { + if (VIR_ALLOC(def->disks[i].src) < 0) + goto cleanup; + } if (!vboxGetMaxPortSlotValues(data->vboxObj, maxPortPerInst, maxSlotPerPort)) goto cleanup; @@ -7302,11 +7308,11 @@ int vboxSnapshotGetReadWriteDisks(virDomainSnapshotDefPtr def, ret = 0; cleanup: if (ret < 0) { - for (i = 0; i < def->dom->ndisks; i++) - VIR_FREE(def->dom->disks[i]); - VIR_FREE(def->dom->disks); - def->dom->ndisks = 0; - ret = -1; + for (i = 0; i < def->ndisks; i++) { + VIR_FREE(def->disks[i].src); + } + VIR_FREE(def->disks); + def->ndisks = 0; } VBOX_RELEASE(snap); return ret; @@ -7380,8 +7386,10 @@ int vboxSnapshotGetReadOnlyDisks(virDomainSnapshotPtr snapshot, /* Allocate mem, if fails return error */ if (VIR_ALLOC_N(def->dom->disks, def->dom->ndisks) >= 0) { for (i = 0; i < def->dom->ndisks; i++) { - if (VIR_ALLOC(def->dom->disks[i]) < 0) + virDomainDiskDefPtr diskDef = virDomainDiskDefNew(); + if (!diskDef) goto cleanup; + def->dom->disks[i] = diskDef; } } else { goto cleanup; @@ -7516,7 +7524,7 @@ int vboxSnapshotGetReadOnlyDisks(virDomainSnapshotPtr snapshot, cleanup: if (ret < 0) { for (i = 0; i < def->dom->ndisks; i++) - VIR_FREE(def->dom->disks[i]); + virDomainDiskDefFree(def->dom->disks[i]); VIR_FREE(def->dom->disks); def->dom->ndisks = 0; } -- 1.7.10.4

2 1

[libvirt] [PATCH] [POC] Support cgmanager
by Serge Hallyn 17 Jun '14

17 Jun '14

I'm sending this patch mainly as an FYI. Cgmanager is a cgroup manager which accepts cgroup administration commands over dbus and allows proper delegation in the face of user namespaces. We are using it to support nested lxc containers, and so wanted to port libvirt to it as well to match dependencies. However, until we have a chance to better define cgmanager's future (if any) and relationship to systemd, I'm certainly not asking for this to be carried in libvirt upstream. With this patch, kvm vms and lxc containers work fine with cgmanager installed and cgroups (beside name=systemd) not installed system-wide. I tweaked the container startup process to have the container enter its cgroup after configuring it. Previously it was entering it as soon as it was created, then configuring it. If we pre-compute the per-controller placement then we might be able to avoid this, but requests placed with cgmanager by design are relative to your current cgroup, so this was simpler. TODO: The vircgroup test is disabled with cgmanager support TODO: Libvirt should try to move itself into the root cgroup (using MovePidAbs("/", getpid) in case a user is starting it from inside a non-init cgroup. That is not being done because I hit linker errors and I deemed it non-essential for v1. This patch is done intrusively in a "just make it work" manner, though in my defense basically the same way as the systemd one. If the feature were not rejected outright upstream, then refactoring the cgroup support to support all three (systemd, native-fs, and cgmanager) plus any others (and of course abiding the coding style), would be worthwhile. Signed-off-by: Serge Hallyn <serge.hallyn(a)ubuntu.com> --- configure.ac | 15 ++ daemon/Makefile.am | 7 +- daemon/libvirtd.c | 5 + src/Makefile.am | 10 +- src/lxc/lxc_cgroup.c | 2 +- src/lxc/lxc_controller.c | 3 + src/lxc/lxc_process.c | 28 +-- src/util/cgmanager.c | 337 +++++++++++++++++++++++++++ src/util/cgmanager.h | 51 +++++ src/util/vircgroup.c | 582 ++++++++++++++++++++++++++++++++++++++++++++++- src/util/vircgroup.h | 5 + tests/Makefile.am | 5 +- tests/vircgrouptest.c | 9 + 13 files changed, 1033 insertions(+), 26 deletions(-) create mode 100644 src/util/cgmanager.c create mode 100644 src/util/cgmanager.h diff --git a/configure.ac b/configure.ac index 368d094..66e1005 100644 --- a/configure.ac +++ b/configure.ac @@ -2214,6 +2214,20 @@ if test "${enable_oom}" = yes; then AC_DEFINE([TEST_OOM], 1, [Whether malloc OOM checking is enabled]) fi +AC_ARG_ENABLE([cgmanager], + [AC_HELP_STRING([--enable-cgmanager], [enable cgmanager support [default=auto]])], + [], [enable_cgmanager=auto]) +if test "x$enable_cgmanager" = "xauto" ; then + AC_CHECK_LIB([cgmanager],[cgmanager_create],[enable_cgmanager=yes],[enable_cgmanager=no],[-lnih -lnih-dbus -ldbus-1]) +fi +AM_CONDITIONAL([ENABLE_CGMANAGER], [test "x$enable_cgmanager" = "xyes"]) + +AM_COND_IF([ENABLE_CGMANAGER], + [PKG_CHECK_MODULES([CGMANAGER], [libcgmanager]) + PKG_CHECK_MODULES([NIH], [libnih >= 1.0.2]) + PKG_CHECK_MODULES([NIH_DBUS], [libnih-dbus >= 1.0.0]) + PKG_CHECK_MODULES([DBUS], [dbus-1 >= 1.2.16]) + ]) AC_ARG_ENABLE([test-locking], [AS_HELP_STRING([--enable-test-locking], @@ -2905,6 +2919,7 @@ AC_MSG_NOTICE([ DTrace: $with_dtrace]) AC_MSG_NOTICE([ numad: $with_numad]) AC_MSG_NOTICE([ XML Catalog: $XML_CATALOG_FILE]) AC_MSG_NOTICE([ Init script: $with_init_script]) +AC_MSG_NOTICE([ CGManager: $with_cgmanager]) AC_MSG_NOTICE([Char device locks: $with_chrdev_lock_files]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Developer Tools]) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 00221ab..3dcda97 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -104,14 +104,16 @@ libvirtd_conf_la_CFLAGS = \ $(XDR_CFLAGS) \ $(WARN_CFLAGS) $(PIE_CFLAGS) \ $(COVERAGE_CFLAGS) \ + $(CGMANAGER_CFLAGS) \ $(NULL) libvirtd_conf_la_LDFLAGS = \ $(RELRO_LDFLAGS) \ $(PIE_LDFLAGS) \ $(COVERAGE_LDFLAGS) \ $(NO_INDIRECT_LDFLAGS) \ + $(NO_INDIRECT_LDFLAGS) \ $(NULL) -libvirtd_conf_la_LIBADD = $(LIBXML_LIBS) +libvirtd_conf_la_LIBADD = $(LIBXML_LIBS) $(CGMANAGER_LIBS) man8_MANS = libvirtd.8 @@ -142,7 +144,7 @@ libvirtd_CFLAGS = \ $(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \ $(XDR_CFLAGS) $(POLKIT_CFLAGS) $(DBUS_CFLAGS) $(LIBNL_CFLAGS) \ $(WARN_CFLAGS) $(PIE_CFLAGS) \ - $(COVERAGE_CFLAGS) \ + $(COVERAGE_CFLAGS) $(CGMANAGER_CFLAGS) \ -DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" libvirtd_LDFLAGS = \ @@ -158,6 +160,7 @@ libvirtd_LDADD = \ $(SASL_LIBS) \ $(DBUS_LIBS) \ $(POLKIT_LIBS) \ + $(CGMANAGER_LIBS) \ $(LIBNL_LIBS) if WITH_DTRACE_PROBES diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 4c926b3..d5d3466 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -49,6 +49,7 @@ #include "viralloc.h" #include "virconf.h" #include "virnetlink.h" +#include "vircgroup.h" #include "virnetserver.h" #include "remote.h" #include "virhook.h" @@ -1269,6 +1270,10 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } + /* move ourselves to root cgroup if necessary */ + // XXX todo - figure out how to get the fn included + // virCgroupEscape(); + if (daemonSetupLogging(config, privileged, verbose, godaemon) < 0) { VIR_ERROR(_("Can't initialize logging")); exit(EXIT_FAILURE); diff --git a/src/Makefile.am b/src/Makefile.am index 2b9ac61..34f0c6f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -96,6 +96,7 @@ UTIL_SOURCES = \ util/virbitmap.c util/virbitmap.h \ util/virbuffer.c util/virbuffer.h \ util/vircgroup.c util/vircgroup.h util/vircgrouppriv.h \ + util/cgmanager.c util/cgmanager.h \ util/virclosecallbacks.c util/virclosecallbacks.h \ util/vircommand.c util/vircommand.h util/vircommandpriv.h \ util/virconf.c util/virconf.h \ @@ -979,11 +980,13 @@ libvirt_util_la_SOURCES = \ libvirt_util_la_CFLAGS = $(CAPNG_CFLAGS) $(YAJL_CFLAGS) $(LIBNL_CFLAGS) \ $(AM_CFLAGS) $(AUDIT_CFLAGS) $(DEVMAPPER_CFLAGS) \ $(DBUS_CFLAGS) $(LDEXP_LIBM) $(NUMACTL_CFLAGS) \ - $(SYSTEMD_DAEMON_CFLAGS) -I$(top_srcdir)/src/conf + $(SYSTEMD_DAEMON_CFLAGS) -I$(top_srcdir)/src/conf \ + $(CGMANAGER_CFLAGS) libvirt_util_la_LIBADD = $(CAPNG_LIBS) $(YAJL_LIBS) $(LIBNL_LIBS) \ $(THREAD_LIBS) $(AUDIT_LIBS) $(DEVMAPPER_LIBS) \ $(LIB_CLOCK_GETTIME) $(DBUS_LIBS) $(MSCOM_LIBS) $(LIBXML_LIBS) \ - $(SECDRIVER_LIBS) $(NUMACTL_LIBS) $(SYSTEMD_DAEMON_LIBS) + $(SECDRIVER_LIBS) $(NUMACTL_LIBS) $(SYSTEMD_DAEMON_LIBS) \ + $(CGMANAGER_LIBS) noinst_LTLIBRARIES += libvirt_conf.la @@ -1018,6 +1021,9 @@ libvirt_xenxs_la_CFLAGS = \ libvirt_xenxs_la_SOURCES = $(XENXS_SOURCES) endif WITH_XENXS +if ENABLE_CGMANAGER +AM_CFLAGS += -DHAVE_CGMANAGER +endif noinst_LTLIBRARIES += libvirt_driver.la libvirt_la_BUILT_LIBADD += libvirt_driver.la diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index 8dfdc60..f5946a1 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -479,7 +479,7 @@ virCgroupPtr virLXCCgroupCreate(virDomainDefPtr def) true, def->uuid, NULL, - getpid(), + -1, true, def->resource->partition, -1, diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index fe2a5dc..158cf17 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -2166,6 +2166,9 @@ virLXCControllerRun(virLXCControllerPtr ctrl) if (virLXCControllerSetupResourceLimits(ctrl) < 0) goto cleanup; + if (virCgroupAddTask(ctrl->cgroup, getpid()) < 0) + goto cleanup; + if (virLXCControllerSetupDevPTS(ctrl) < 0) goto cleanup; diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 0aef13a..a83c0d6 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -1263,20 +1263,6 @@ int virLXCProcessStart(virConnectPtr conn, goto cleanup; } - if (virCgroupNewDetectMachine(vm->def->name, "lxc", vm->pid, - vm->def->resource ? - vm->def->resource->partition : - NULL, - -1, &priv->cgroup) < 0) - goto error; - - if (!priv->cgroup) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("No valid cgroup for machine %s"), - vm->def->name); - goto error; - } - priv->stopReason = VIR_DOMAIN_EVENT_STOPPED_FAILED; priv->wantReboot = false; vm->def->id = vm->pid; @@ -1297,6 +1283,20 @@ int virLXCProcessStart(virConnectPtr conn, goto error; } + if (virCgroupNewDetectMachine(vm->def->name, "lxc", vm->pid, + vm->def->resource ? + vm->def->resource->partition : + NULL, + -1, &priv->cgroup) < 0) + goto error; + + if (!priv->cgroup) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("No valid cgroup for machine %s"), + vm->def->name); + goto error; + } + if (autoDestroy && virCloseCallbacksSet(driver->closeCallbacks, vm, conn, lxcProcessAutoDestroy) < 0) diff --git a/src/util/cgmanager.c b/src/util/cgmanager.c new file mode 100644 index 0000000..bbbb230 --- /dev/null +++ b/src/util/cgmanager.c @@ -0,0 +1,337 @@ +/* + * lxc: linux Container library + * + * (C) Copyright Canonical Ltd. 2013-2014 + * + * Authors: + * Serge Hallyn <serge.hallyn(a)canonical.com> + * Stéphane Graber <stephane.graber(a)canonical.com> + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifdef HAVE_CGMANAGER + +#include <config.h> + +#include <libgen.h> +#include <stdlib.h> +#include <sys/types.h> +#include <unistd.h> + +#include "virutil.h" +#include "viralloc.h" +#include "virerror.h" +#include "virlog.h" +#include "cgmanager.h" + +static NihDBusProxy *cgroup_manager = NULL; +bool cgm_running = false; + +VIR_LOG_INIT("util.cgmanager"); + +#define CGMANAGER_DBUS_SOCK "unix:path=/sys/fs/cgroup/cgmanager/sock" +bool cgm_dbus_connect(void) +{ + DBusError dbus_error; + DBusConnection *connection; + dbus_error_init(&dbus_error); + + connection = dbus_connection_open_private(CGMANAGER_DBUS_SOCK, &dbus_error); + if (!connection) { + dbus_error_free(&dbus_error); + return false; + } + + dbus_connection_set_exit_on_disconnect(connection, FALSE); + dbus_error_free(&dbus_error); + cgroup_manager = nih_dbus_proxy_new(NULL, connection, + NULL /* p2p */, + "/org/linuxcontainers/cgmanager", NULL, NULL); + dbus_connection_unref(connection); + if (!cgroup_manager) { + NihError *nerr; + nerr = nih_error_get(); + VIR_ERROR("cgmanager: Error opening proxy: %s", nerr->message); + nih_free(nerr); + return false; + } + + // force fd passing negotiation + if (cgmanager_ping_sync(NULL, cgroup_manager, 0) != 0) { + NihError *nerr; + nerr = nih_error_get(); + VIR_ERROR("cgmanager: Error pinging manager: %s", nerr->message); + nih_free(nerr); + nih_free(cgroup_manager); + cgroup_manager = NULL; + return false; + } + cgm_running = true; + return true; +} + +void cgm_dbus_disconnect(void) +{ + if (cgroup_manager) { + dbus_connection_flush(cgroup_manager->connection); + dbus_connection_close(cgroup_manager->connection); + nih_free(cgroup_manager); + cgroup_manager = NULL; + } +} + +bool cgm_create(const char *controller, const char *cgroup_path, int32_t *existed) +{ + if (cgroup_path[0] == '/') + cgroup_path++; + + if ( cgmanager_create_sync(NULL, cgroup_manager, controller, + cgroup_path, existed) != 0) { + NihError *nerr; + nerr = nih_error_get(); + VIR_ERROR("cgmanager: cgm_create for controller=%s, cgroup_path=%s failed: %s", + controller, cgroup_path, nerr->message); + nih_free(nerr); + return false; + } + + return true; +} + +bool cgm_remove(const char *controller, const char *cgroup_path, int recursive) +{ + int existed; + + if (cgroup_path[0] == '/') + cgroup_path++; + + if ( cgmanager_remove_sync(NULL, cgroup_manager, controller, + cgroup_path, recursive, &existed) != 0) { + NihError *nerr; + nerr = nih_error_get(); + VIR_ERROR("cgmanager: cgm_remove for controller=%s, cgroup_path=%s, recursive=%d failed: %s", + controller, cgroup_path, recursive, nerr->message); + nih_free(nerr); + return false; + } + + if (existed == -1) { + VIR_ERROR("cgmanager: cgm_remove failed: %s:%s did not exist", controller, cgroup_path); + return false; + } + return true; +} + +char *cgm_get(const char *controller, const char *cgroup_path, const char *key) +{ + char *result = NULL; + + if (cgroup_path[0] == '/') + cgroup_path++; + + if (cgmanager_get_value_sync(NULL, cgroup_manager, controller, cgroup_path, key, &result) != 0) { + NihError *nerr; + nerr = nih_error_get(); + VIR_ERROR("cgmanager: cgm_get for controller=%s, cgroup_path=%s failed: %s", + controller, cgroup_path, nerr->message); + nih_free(nerr); + free(result); + return NULL; + } + return result; +} + +bool cgm_set(const char *controller, const char *cgroup_path, const char *key, const char *val) +{ + if (cgroup_path[0] == '/') + cgroup_path++; + + if (cgmanager_set_value_sync(NULL, cgroup_manager, controller, cgroup_path, key, val) != 0) { + NihError *nerr; + nerr = nih_error_get(); + VIR_ERROR("cgmanager: cgm_set for controller=%s, cgroup_path=%s failed: %s", + controller, cgroup_path, nerr->message); + nih_free(nerr); + return false; + } + return true; +} + +bool cgm_chmod(const char *controller, const char *cgroup_path, int mode) +{ + nih_local char *path_dirname = NULL; + nih_local char *path_basename = NULL; + + if (cgroup_path[0] == '/') + cgroup_path++; + + path_dirname = NIH_MUST(nih_strdup(NULL, cgroup_path)); + path_basename = NIH_MUST(nih_strdup(NULL, cgroup_path)); + + if (cgmanager_chmod_sync(NULL, cgroup_manager, controller, + dirname(path_dirname), basename(path_basename), mode) != 0) { + NihError *nerr; + nerr = nih_error_get(); + VIR_ERROR("cgmanager: cgm_chmod for controller=%s, cgroup_path=%s, mode=%d failed: %s", + controller, cgroup_path, mode, nerr->message); + nih_free(nerr); + return false; + } + + return true; +} + +bool cgm_chown(const char *controller, const char *cgroup_path, int uid, int gid) +{ + if (cgroup_path[0] == '/') + cgroup_path++; + + if (cgmanager_chown_sync(NULL, cgroup_manager, controller, + cgroup_path, uid, gid) != 0) { + NihError *nerr; + nerr = nih_error_get(); + VIR_ERROR("cgmanager: cgm_chown for controller=%s, cgroup_path=%s, uid=%d, gid=%d failed: %s", + controller, cgroup_path, uid, gid, nerr->message); + nih_free(nerr); + return false; + } + + return true; +} + +bool cgm_list_children(const char *controller, const char *cgroup_path, char ***children) +{ + if (cgroup_path[0] == '/') + cgroup_path++; + + if ( cgmanager_list_children_sync(NULL, cgroup_manager, controller, + cgroup_path, children) != 0) { + NihError *nerr; + nerr = nih_error_get(); + VIR_ERROR("cgmanager: cgm_list_children for controller=%s, cgroup_path=%s failed: %s", + controller, cgroup_path, nerr->message); + nih_free(nerr); + return false; + } + + return true; +} + +/* + * caller must nih_free(pids) when done + */ +bool cgm_get_tasks(const char *controller, const char *cgroup_path, pid_t **pids, size_t *nrpids) +{ + int ret; + if (cgroup_path[0] == '/') + cgroup_path++; + + ret = cgmanager_get_tasks_sync(NULL, cgroup_manager, controller, cgroup_path, pids, nrpids); + if (ret) { + NihError *nerr; + nerr = nih_error_get(); + VIR_ERROR("cgmanager: cgm_get_tasks for controller=%s, cgroup_path=%s failed: %s", + controller, cgroup_path, nerr->message); + nih_free(nerr); + return false; + } + + return true; +} + + +/* + * caller of cgm_get_pid_cgroup must nih_free(path) if we + * returned true + */ +bool cgm_get_pid_cgroup(const char *controller, pid_t pid, char **cgpath) +{ + *cgpath = NULL; + if ( cgmanager_get_pid_cgroup_sync(NULL, cgroup_manager, controller, + pid, cgpath) != 0) { + NihError *nerr; + nerr = nih_error_get(); + nih_free(nerr); + return false; + } + + return true; +} + +/* + * caller of cgm_get_pid_cgroup_abs must nih_free(path) if we + * returned true + */ +bool cgm_get_pid_cgroup_abs(const char *controller, pid_t pid, char **cgpath) +{ + *cgpath = NULL; + if ( cgmanager_get_pid_cgroup_abs_sync(NULL, cgroup_manager, controller, + pid, cgpath) != 0) { + NihError *nerr; + nerr = nih_error_get(); + nih_free(nerr); + return false; + } + + return true; +} + +bool cgm_controller_exists(const char *controller) +{ + char *cgroup_name = NULL; + + if ( cgmanager_get_pid_cgroup_sync(NULL, cgroup_manager, controller, + getpid(), &cgroup_name) != 0) { + NihError *nerr; + nerr = nih_error_get(); + nih_free(nerr); + return false; + } + + nih_free(cgroup_name); + return true; +} + +bool cgm_enter(const char *controller, const char *cgroup_path, pid_t pid) +{ + if (cgroup_path[0] == '/') + cgroup_path++; + + if (cgmanager_move_pid_sync(NULL, cgroup_manager, controller, + cgroup_path, pid) != 0) { + NihError *nerr; + nerr = nih_error_get(); + VIR_ERROR("cgmanager: cgm_enter for controller=%s, cgroup_path=%s, pid=%d failed: %s", + controller, cgroup_path, pid, nerr->message); + nih_free(nerr); + return false; + } + return true; +} + +bool cgm_escape(const char *controller) +{ + if (cgmanager_move_pid_sync(NULL, cgroup_manager, controller, "/", + getpid()) != 0) { + NihError *nerr; + nerr = nih_error_get(); + VIR_DEBUG("cgmanager: Failed escaping to root cgroup for controller %s: %s", + controller, nerr->message); + nih_free(nerr); + } + return true; +} +#endif diff --git a/src/util/cgmanager.h b/src/util/cgmanager.h new file mode 100644 index 0000000..d7a83b5 --- /dev/null +++ b/src/util/cgmanager.h @@ -0,0 +1,51 @@ +/* + * lxc: linux Container library + * + * (C) Copyright Canonical Ltd. 2013-2014 + * + * Authors: + * Serge Hallyn <serge.hallyn(a)canonical.com> + * Stéphane Graber <stephane.graber(a)canonical.com> + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifdef HAVE_CGMANAGER + +#include <stdbool.h> +#include <nih-dbus/dbus_connection.h> +#include <cgmanager/cgmanager-client.h> +#include <nih/alloc.h> +#include <nih/error.h> +#include <nih/string.h> + +extern bool cgm_running; + +bool cgm_dbus_connect(void); +void cgm_dbus_disconnect(void); +bool cgm_create(const char *controller, const char *cgroup_path, int32_t *existed); +bool cgm_remove(const char *controller, const char *cgroup_path, int recursive); +char *cgm_get(const char *controller, const char *path, const char *key); +bool cgm_set(const char *controller, const char *cgroup_path, const char *key, const char *val); +bool cgm_chmod(const char *controller, const char *cgroup_path, int mode); +bool cgm_chown(const char *controller, const char *cgroup_path, int uid, int gid); +bool cgm_list_children(const char *controller, const char *cgroup_path, char ***children); +bool cgm_get_tasks(const char *controller, const char *cgroup_path, pid_t **pids, size_t *nrpids); +bool cgm_get_pid_cgroup(const char *controller, pid_t pid, char **cgpath); +bool cgm_get_pid_cgroup_abs(const char *controller, pid_t pid, char **cgpath); +bool cgm_controller_exists(const char *controller); +bool cgm_enter(const char *controller, const char *cgroup_path, pid_t pid); +bool cgm_escape(const char *controller); +#endif diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index c578bd0..b72455c 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -52,6 +52,7 @@ #include "virstring.h" #include "virsystemd.h" #include "virtypedparam.h" +#include "cgmanager.h" #include "nodeinfo.h" @@ -92,6 +93,13 @@ virCgroupAvailable(void) struct mntent entry; char buf[CGROUP_MAX_VAL]; +#ifdef HAVE_CGMANAGER + if (cgm_dbus_connect()) { + cgm_dbus_disconnect(); + return true; + } +#endif + if (!virFileExists("/proc/cgroups")) return false; @@ -229,6 +237,12 @@ virCgroupValidateMachineGroup(virCgroupPtr group, if (virCgroupPartitionEscape(&scopename) < 0) goto cleanup; +#ifdef HAVE_CGMANAGER + if (cgm_running) + goto good; + VIR_ERROR("cgm was NOT running"); +#endif + for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { char *tmp; @@ -266,6 +280,7 @@ virCgroupValidateMachineGroup(virCgroupPtr group, } } +good: valid = true; cleanup: @@ -295,6 +310,54 @@ virCgroupCopyMounts(virCgroupPtr group, return 0; } +#ifdef HAVE_CGMANAGER +static void cg_add_cgroup(virCgroupPtr group, const char *g) +{ + int i = virCgroupControllerTypeFromString(g); + if (i < 0) + return; + if (VIR_STRDUP(group->controllers[i].mountPoint, "/") < 0) { + VIR_WARN("Out of memory copying \"/\". Proceeding without cgroup controll %s.", g); + return; + } + group->controllers[i].linkPoint = NULL; +} + +static bool cg_get_cgroups(virCgroupPtr group) +{ + FILE *fin = NULL; + char *line = NULL; + size_t len = 0; + + if (!cgm_dbus_connect()) { + return false; + } + /* check to see if name=systemd is mounted */ + if (cgm_controller_exists("name=systemd")) + cg_add_cgroup(group, "name=systemd"); + cgm_dbus_disconnect(); + fin = fopen("/proc/cgroups", "r"); + if (fin == NULL) { + virReportSystemError(errno, "%s", + _("Unable to open /proc/cgroups")); + return false; + } + while (getline(&line, &len, fin) > 0) { + char *p; + if (line[0] == '#') + continue; + p = strchr(line, '\t'); + if (p) + *p = '\0'; + cg_add_cgroup(group, line); + } + VIR_FREE(line); + VIR_FORCE_FCLOSE(fin); + return true; +} +#else +#define cg_get_cgroups(x) (false) +#endif /* * Process /proc/mounts figuring out what controllers are @@ -308,6 +371,9 @@ virCgroupDetectMounts(virCgroupPtr group) struct mntent entry; char buf[CGROUP_MAX_VAL]; + if (cg_get_cgroups(group)) + return 0; + mounts = fopen("/proc/mounts", "r"); if (mounts == NULL) { virReportSystemError(errno, "%s", @@ -435,6 +501,55 @@ virCgroupCopyPlacement(virCgroupPtr group, } +#ifdef HAVE_CGMANAGER +static bool +cg_detect_placement(virCgroupPtr group, + pid_t pid, + const char *path) +{ + int i; + bool ret = false; + + VIR_DEBUG("cgm: Detecting placement for pid %lld path %s", + (unsigned long long)pid, path); + if (!cgm_dbus_connect()) + return false; + for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { + const char *typestr = virCgroupControllerTypeToString(i); + char *selfpath; + if (!group->controllers[i].mountPoint) + continue; + if (!cgm_get_pid_cgroup(typestr, pid == -1 ? getpid() : pid, &selfpath)) { + VIR_WARN("Failed to get cgroup path for %s", typestr); + goto out; + } + if (virAsprintf(&group->controllers[i].placement, + "%s%s%s", selfpath, + (STREQ(selfpath, "/") || + STREQ(path, "") ? "" : "/"), + path) < 0) { + VIR_WARN("Failed to save cgroup path"); + nih_free(selfpath); + goto out; + } + nih_free(selfpath); + } + ret = true; + + VIR_DEBUG("cgm: done detecting placement for pid %lld path %s", + (unsigned long long)pid, path); +out: + cgm_dbus_disconnect(); + return ret; +} +#else +static inline bool +cg_detect_placement(virCgroupPtr group, + pid_t pid, + const char *path) +{ return false; } +#endif + /* * virCgroupDetectPlacement: * @group: the group to process @@ -457,7 +572,7 @@ virCgroupCopyPlacement(virCgroupPtr group, * * It then appends @path to each detected path. */ -static int +int virCgroupDetectPlacement(virCgroupPtr group, pid_t pid, const char *path) @@ -468,6 +583,9 @@ virCgroupDetectPlacement(virCgroupPtr group, int ret = -1; char *procfile; + if (cg_detect_placement(group, pid, path)) + return 0; + VIR_DEBUG("Detecting placement for pid %lld path %s", (unsigned long long)pid, path); if (pid == -1) { @@ -597,6 +715,9 @@ virCgroupDetect(virCgroupPtr group, if (!((1 << j) & controllers)) continue; +#ifdef HAVE_CGMANAGER + if (!cgm_running) +#endif if (STREQ_NULLABLE(group->controllers[i].mountPoint, group->controllers[j].mountPoint)) { virReportSystemError(EINVAL, @@ -674,6 +795,14 @@ virCgroupSetValueStr(virCgroupPtr group, char *keypath = NULL; char *tmp = NULL; +#ifdef HAVE_CGMANAGER + if (cgm_dbus_connect()) { + ret = cgm_set(virCgroupControllerTypeToString(controller), group->path, + key, value) ? 0 : -1; + cgm_dbus_disconnect(); + return ret; + } +#endif if (virCgroupPathOfController(group, controller, key, &keypath) < 0) return -1; @@ -710,11 +839,26 @@ virCgroupGetValueStr(virCgroupPtr group, *value = NULL; + VIR_DEBUG("Get value %s", keypath); + +#ifdef HAVE_CGMANAGER + if (cgm_dbus_connect()) { + char *strval = NULL; + strval = cgm_get(virCgroupControllerTypeToString(controller), group->path, key); + cgm_dbus_disconnect(); + if (!strval) { + VIR_ERROR("failed to get %s for %s", key, group->path); + goto cleanup; + } + if (VIR_STRDUP(*value, strval) >=0 ) + ret = 0; + nih_free(strval); + return ret; + } +#endif if (virCgroupPathOfController(group, controller, key, &keypath) < 0) return -1; - VIR_DEBUG("Get value %s", keypath); - if ((rc = virFileReadAll(keypath, 1024*1024, value)) < 0) { virReportSystemError(errno, _("Unable to read from '%s'"), keypath); @@ -745,6 +889,12 @@ virCgroupSetValueU64(virCgroupPtr group, if (virAsprintf(&strval, "%llu", value) < 0) return -1; +#ifdef HAVE_CGMANAGER + if (cgm_dbus_connect()) { + ret = cgm_set(virCgroupControllerTypeToString(controller), group->path, key, strval) ? 0 : -1; + cgm_dbus_disconnect(); + } else +#endif ret = virCgroupSetValueStr(group, controller, key, strval); VIR_FREE(strval); @@ -765,6 +915,12 @@ virCgroupSetValueI64(virCgroupPtr group, if (virAsprintf(&strval, "%lld", value) < 0) return -1; +#ifdef HAVE_CGMANAGER + if (cgm_dbus_connect()) { + ret = cgm_set(virCgroupControllerTypeToString(controller), group->path, key, strval) ? 0 : -1; + cgm_dbus_disconnect(); + } else +#endif ret = virCgroupSetValueStr(group, controller, key, strval); VIR_FREE(strval); @@ -782,6 +938,16 @@ virCgroupGetValueI64(virCgroupPtr group, char *strval = NULL; int ret = -1; +#ifdef HAVE_CGMANAGER + bool usecgm = false; + if (cgm_dbus_connect()) { + strval = cgm_get(virCgroupControllerTypeToString(controller), group->path, key); + cgm_dbus_disconnect(); + usecgm = true; + if (!strval) + goto cleanup; + } else +#endif if (virCgroupGetValueStr(group, controller, key, &strval) < 0) goto cleanup; @@ -795,6 +961,11 @@ virCgroupGetValueI64(virCgroupPtr group, ret = 0; cleanup: +#ifdef HAVE_CGMANAGER + if (usecgm) + nih_free(strval); + else +#endif VIR_FREE(strval); return ret; } @@ -836,6 +1007,12 @@ virCgroupCpuSetInherit(virCgroupPtr parent, virCgroupPtr group) "cpuset.mems", }; +#ifdef HAVE_CGMANAGER + /* cgmanager will have set up inheritence for us */ + if (cgm_running) + return 0; +#endif + VIR_DEBUG("Setting up inheritance %s -> %s", parent->path, group->path); for (i = 0; i < ARRAY_CARDINALITY(inherit_values); i++) { char *value; @@ -868,6 +1045,11 @@ virCgroupSetMemoryUseHierarchy(virCgroupPtr group) unsigned long long value; const char *filename = "memory.use_hierarchy"; +#ifdef HAVE_CGMANAGER + /* cgmanager will have set up inheritence for us */ + if (cgm_running) + return 0; +#endif if (virCgroupGetValueU64(group, VIR_CGROUP_CONTROLLER_MEMORY, filename, &value) < 0) @@ -895,6 +1077,11 @@ virCgroupMakeGroup(virCgroupPtr parent, { size_t i; int ret = -1; +#ifdef HAVE_CGMANAGER + bool usecgm = false; + if (cgm_dbus_connect()) + usecgm = true; +#endif VIR_DEBUG("Make group %s", group->path); for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { @@ -913,6 +1100,15 @@ virCgroupMakeGroup(virCgroupPtr parent, continue; } +#ifdef HAVE_CGMANAGER + if (usecgm) { + int32_t existed; + if (!cgm_create(virCgroupControllerTypeToString(i), + group->path, &existed)) + goto cleanup; + continue; + } +#endif if (virCgroupPathOfController(group, i, "", &path) < 0) return -1; @@ -977,6 +1173,10 @@ virCgroupMakeGroup(virCgroupPtr parent, ret = 0; cleanup: +#ifdef HAVE_CGMANAGER + if (usecgm) + cgm_dbus_disconnect(); +#endif return ret; } @@ -1058,6 +1258,19 @@ virCgroupAddTask(virCgroupPtr group, pid_t pid) if (i == VIR_CGROUP_CONTROLLER_SYSTEMD) continue; +#ifdef HAVE_CGMANAGER + if (cgm_dbus_connect()) { + if (!cgm_enter(virCgroupControllerTypeToString(i), group->path, pid)) { + cgm_dbus_disconnect(); + VIR_ERROR("Failed to move %d to %s:%s", pid, + virCgroupControllerTypeToString(i), group->path); + goto cleanup; + } + cgm_dbus_disconnect(); + VIR_INFO("Moved %d to %s:%s", pid, + virCgroupControllerTypeToString(i), group->path); + } else +#endif if (virCgroupSetValueU64(group, i, "tasks", pid) < 0) goto cleanup; } @@ -1093,6 +1306,20 @@ virCgroupAddTaskController(virCgroupPtr group, pid_t pid, int controller) return -1; } +#ifdef HAVE_CGMANAGER + if (cgm_dbus_connect()) { + if (!cgm_enter(virCgroupControllerTypeToString(controller), group->path, pid)) { + cgm_dbus_disconnect(); + VIR_ERROR("Failed to move %d to %s:%s", pid, + virCgroupControllerTypeToString(controller), group->path); + return -1; + } + cgm_dbus_disconnect(); + VIR_INFO("Moved %d to %s:%s", pid, + virCgroupControllerTypeToString(controller), group->path); + return 0; + } else +#endif return virCgroupSetValueU64(group, controller, "tasks", (unsigned long long)pid); } @@ -1157,8 +1384,15 @@ virCgroupMoveTask(virCgroupPtr src_group, virCgroupPtr dest_group) int ret = -1; char *content = NULL; size_t i; +#ifdef HAVE_CGMANAGER + bool usecgm = false; + + if (cgm_dbus_connect()) + usecgm = true; +#endif for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { + bool firstrun = true; if (!src_group->controllers[i].mountPoint || !dest_group->controllers[i].mountPoint) continue; @@ -1172,6 +1406,35 @@ virCgroupMoveTask(virCgroupPtr src_group, virCgroupPtr dest_group) * aware that it needs to move. Therefore, we must iterate * until content is empty. */ while (1) { +#ifdef HAVE_CGMANAGER + const char *typestr = virCgroupControllerTypeToString(i); + pid_t *pids = NULL; + size_t j, nrpids; + if (usecgm) { + if (!cgm_get_tasks(typestr, src_group->path, &pids, &nrpids)) { + if (firstrun) + goto cleanup; + else + break; + } + firstrun = false; + if (nrpids) { + for (j=0; j<nrpids; j++) { + if (!cgm_enter(typestr, dest_group->path, pids[j])) { + VIR_ERROR("Failed to move pid %d from %s to %s", + pids[j], src_group->path, dest_group->path); + } + } + nih_free(pids); + VIR_INFO("Moved %d pids to %s:%s", (int) nrpids, typestr, + dest_group->path); + } else { + VIR_WARN("No pids found in %s:%s", typestr, src_group->path); + break; + } + continue; + } +#endif VIR_FREE(content); if (virCgroupGetValueStr(src_group, i, "tasks", &content) < 0) return -1; @@ -1187,6 +1450,10 @@ virCgroupMoveTask(virCgroupPtr src_group, virCgroupPtr dest_group) ret = 0; cleanup: VIR_FREE(content); +#ifdef HAVE_CGMANAGER + if (usecgm) + cgm_dbus_disconnect(); +#endif return ret; } @@ -1581,7 +1848,7 @@ virCgroupNewMachineSystemd(const char *name, } } - if (virCgroupAddTask(*group, pidleader) < 0) { + if (pidleader != -1 && virCgroupAddTask(*group, pidleader) < 0) { virErrorPtr saved = virSaveLastError(); virCgroupRemove(*group); virCgroupFree(group); @@ -1628,7 +1895,7 @@ virCgroupNewMachineManual(const char *name, group) < 0) goto cleanup; - if (virCgroupAddTask(*group, pidleader) < 0) { + if (pidleader != -1 && virCgroupAddTask(*group, pidleader) < 0) { virErrorPtr saved = virSaveLastError(); virCgroupRemove(*group); virCgroupFree(group); @@ -3200,6 +3467,12 @@ virCgroupRemove(virCgroupPtr group) int rc = 0; size_t i; char *grppath = NULL; +#ifdef HAVE_CGMANAGER + bool usecgm = false; + + if (cgm_dbus_connect()) + usecgm = true; +#endif VIR_DEBUG("Removing cgroup %s", group->path); for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { @@ -3216,6 +3489,14 @@ virCgroupRemove(virCgroupPtr group) if (STREQ(group->controllers[i].placement, "/")) continue; +#ifdef HAVE_CGMANAGER + if (usecgm) { + if (!cgm_remove(virCgroupControllerTypeToString(i), + group->path, 1)) + VIR_WARN("Error removing %s:%s", virCgroupControllerTypeToString(i), group->path); + continue; + } +#endif if (virCgroupPathOfController(group, i, NULL, @@ -3228,6 +3509,10 @@ virCgroupRemove(virCgroupPtr group) } VIR_DEBUG("Done removing cgroup %s", group->path); +#ifdef HAVE_CGMANAGER + if (usecgm) + cgm_dbus_disconnect(); +#endif return rc; } @@ -3332,6 +3617,181 @@ virCgroupPidCopy(const void *name) return (void*)name; } +#ifdef HAVE_CGMANAGER +/* + * return -1 on error, else the controller index + */ +static int cgm_get_controller_path(virCgroupPtr group, + int controller) +{ + if (controller == -1) { + size_t i; + nih_local char *path = NULL; + + for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { + /* Reject any controller in which our cgroup does + * not begin with the container name */ + VIR_DEBUG("(pid %d) Checking %d ctrl %s mntpt %s placement %s", (int) getpid(), + (int)i, virCgroupControllerTypeToString(i), + group->controllers[i].mountPoint ? group->controllers[i].mountPoint : "null", + group->controllers[i].placement ? group->controllers[i].placement : "null"); + if (group->controllers[i].mountPoint && + group->controllers[i].placement && + STRNEQ(group->controllers[i].placement, "/")) { + controller = i; + VIR_DEBUG("choosing controller %s", virCgroupControllerTypeToString(i)); + break; + } + + VIR_DEBUG("Skipping controller %s where I'm in cgroup %s", + virCgroupControllerTypeToString(i), + group->controllers[i].placement ? group->controllers[i].placement : "null"); + } + } + if (controller == -1) { + virReportSystemError(ENOSYS, "%s", + _("cgm_get_controller_path: No controllers are mounted")); + return -1; + } + + if (group->controllers[controller].mountPoint == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cgm_get_controller_path: Controller '%s' is not mounted"), + virCgroupControllerTypeToString(controller)); + return -1; + } + + if (group->controllers[controller].placement == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Controller '%s' is not enabled for group"), + virCgroupControllerTypeToString(controller)); + return -1; + } + + return controller; +} + +static int cgm_kill(virCgroupPtr group, int signum, virHashTablePtr pidhash) +{ + bool killedAny = false; + int i; + bool done = false; + const char *controller, *cgpath; + int ret = -1; + + if ((i = cgm_get_controller_path(group, -1)) < 0) { + VIR_ERROR("cgm_kill: Could not get controller path"); + return -1; + } + + controller = virCgroupControllerTypeToString(i); + cgpath = group->controllers[i].placement; + + /* PIDs may be forking as we kill them, so loop + * until there are no new PIDs found + */ + while (!done) { + size_t j, nrpids; + int32_t *pids = NULL; + unsigned long upid; + done = true; + + if (!cgm_get_tasks(controller, cgpath, &pids, &nrpids)) + goto done; + for (j = 0; j < nrpids; j++) { + upid = pids[j]; + if (virHashLookup(pidhash, (void*)upid)) + continue; + if (kill(pids[j], signum) < 0) { + if (errno != ESRCH) { + virReportSystemError(errno, + _("Failed to kill process %d"), + pids[j]); + nih_free(pids); + goto cleanup; + } + } else { + killedAny = true; + done = false; + } + ignore_value(virHashAddEntry(pidhash, (void*)upid, (void*)1)); + } + nih_free(pids); + } + + done: + ret = killedAny ? 1 : 0; + +cleanup: + + VIR_DEBUG("cgm_kill: returning %d, killedAny %d", ret, killedAny); + return ret; +} + +static int cgm_kill_recursive(virCgroupPtr group, int signum, virHashTablePtr pidhash) +{ + int i, j, ret; + bool killedAny = false; + const char *controller, *cgpath; + char **children; + virCgroupPtr subgroup = NULL; + + ret = cgm_kill(group, signum, pidhash); + if (ret < 0) + return ret; + if (ret) + killedAny = true; + + if ((i = cgm_get_controller_path(group, -1)) < 0) + return -1; + controller = virCgroupControllerTypeToString(i); + cgpath = group->controllers[i].placement; + if (!cgm_list_children(controller, cgpath, &children)) + return -1; + for (j = 0; children[j]; j++) { + if (virCgroupNew(-1, children[j], group, -1, &subgroup) < 0) + goto bad; + ret = cgm_kill_recursive(subgroup, signum, pidhash); + if (ret < 0) + goto bad; + if (ret > 0) + killedAny = true; + virCgroupFree(&subgroup); + } + + nih_free(children); + return killedAny ? 1 : 0; + +bad: + virCgroupFree(&subgroup); + nih_free(children); + return -1; +} + +static int cgm_remove_children(virCgroupPtr group) +{ + int i; + int ret = 0; + const char *controller, *cgpath; + + for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { + if (!group->controllers[i].mountPoint) + continue; + if (!group->controllers[i].placement) + continue; + if (!STRNEQ(group->controllers[i].placement, "/")) + continue; + controller = virCgroupControllerTypeToString(i), + cgpath = group->controllers[i].placement; + if (!cgm_remove(controller, cgpath, 1)) { + VIR_ERROR("Failed to remove %s:%s", controller, cgpath); + ret = -1; + } + } + + return ret; +} +#endif /* * Returns 1 if some PIDs are killed, 0 if none are killed, or -1 on error @@ -3341,6 +3801,7 @@ virCgroupKill(virCgroupPtr group, int signum) { VIR_DEBUG("group=%p path=%s signum=%d", group, group->path, signum); int ret; + /* The 'tasks' file in cgroups can contain duplicated * pids, so we use a hash to track which we've already * killed. @@ -3352,6 +3813,12 @@ virCgroupKill(virCgroupPtr group, int signum) virCgroupPidCopy, NULL); +#ifdef HAVE_CGMANAGER + if (cgm_dbus_connect()) { + ret = cgm_kill(group, signum, pids); + cgm_dbus_disconnect(); + } else +#endif ret = virCgroupKillInternal(group, signum, pids); virHashFree(pids); @@ -3442,6 +3909,7 @@ virCgroupKillRecursive(virCgroupPtr group, int signum) { int ret; VIR_DEBUG("group=%p path=%s signum=%d", group, group->path, signum); + virHashTablePtr pids = virHashCreateFull(100, NULL, virCgroupPidCode, @@ -3449,6 +3917,14 @@ virCgroupKillRecursive(virCgroupPtr group, int signum) virCgroupPidCopy, NULL); +#ifdef HAVE_CGMANAGER + if (cgm_dbus_connect()) { + ret = cgm_kill_recursive(group, signum, pids); + if (ret == 0) + ret = cgm_remove_children(group); + cgm_dbus_disconnect(); + } else +#endif ret = virCgroupKillRecursiveInternal(group, signum, pids, false); virHashFree(pids); @@ -3607,6 +4083,50 @@ virCgroupGetFreezerState(virCgroupPtr group, char **state) "freezer.state", state); } +#ifdef HAVE_CGMANAGER +static bool cgm_bind_cgsocket(const char *oldroot) +{ + int ret; + struct stat st; + char path[1024]; + + ret = snprintf(path, 1024, "%s/sys/fs/cgroup/cgmanager/sock", oldroot); + if (ret < 0 || ret >= 1024) + return false; + ret = stat(path, &st); + if (ret != 0) { + VIR_ERROR("%s/sys/fs/cgroup/cgmanager not found", oldroot); + return false; + } + + ret = stat("/sys/fs/cgroup/cgmanager", &st); + if (ret == 0) + goto do_bind; + ret = stat("/sys/fs/cgroup", &st); + if (ret != 0) + return false; + if (mount("cgroup", "/sys/fs/cgroup", "tmpfs", 0, "size=10000,mode=755") < 0) { + VIR_ERROR("Failed mounting tmpfs onto sys/fs/cgroup"); + return false; + } + if (virFileMakePath("/sys/fs/cgroup/cgmanager") < 0) { + if (mkdir("/sys/fs/cgroup/cgmanager", 0755) < 0) { + VIR_ERROR("mkdir by hand failed: %m"); + return false; + } + } + +do_bind: + sprintf(path, "%s/sys/fs/cgroup/cgmanager", oldroot); + if (mount(path, "sys/fs/cgroup/cgmanager", "none", + MS_BIND, 0) < 0) { + VIR_ERROR("Failed bind-mounting the cgmanager socket"); + return false; + } + VIR_INFO("bind-mounted the cgmanager socket"); + return true; +} +#endif int virCgroupIsolateMount(virCgroupPtr group, const char *oldroot, @@ -3617,6 +4137,11 @@ virCgroupIsolateMount(virCgroupPtr group, const char *oldroot, char *opts = NULL; char *root = NULL; +#ifdef HAVE_CGMANAGER + if (cgm_bind_cgsocket(oldroot)) + return 0; +#endif + if (!(root = virCgroupIdentifyRoot(group))) return -1; @@ -3706,6 +4231,11 @@ int virCgroupSetOwner(virCgroupPtr cgroup, size_t i; char *base = NULL, *entry = NULL; DIR *dh = NULL; +#ifdef HAVE_CGMANAGER + bool usecgm = false; + if (cgm_dbus_connect()) + usecgm = true; +#endif int direrr; for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { @@ -3717,6 +4247,19 @@ int virCgroupSetOwner(virCgroupPtr cgroup, if (!cgroup->controllers[i].mountPoint) continue; +#ifdef HAVE_CGMANAGER + if (usecgm) { + if (!cgm_chown(virCgroupControllerTypeToString(i), + cgroup->path, uid, gid)) { + VIR_ERROR("Failed to chown cgroup %s:%s to %d:%d", + virCgroupControllerTypeToString(i), cgroup->path, + uid, gid); + goto cleanup; + } + continue; + } +#endif + if (virAsprintf(&base, "%s%s", cgroup->controllers[i].mountPoint, cgroup->controllers[i].placement) < 0) goto cleanup; @@ -3766,6 +4309,10 @@ int virCgroupSetOwner(virCgroupPtr cgroup, closedir(dh); VIR_FREE(entry); VIR_FREE(base); +#ifdef HAVE_CGMANAGER + if (usecgm) + cgm_dbus_disconnect(); +#endif return ret; } @@ -3786,6 +4333,19 @@ virCgroupSupportsCpuBW(virCgroupPtr cgroup) if (!cgroup) return false; +#ifdef HAVE_CGMANAGER + if (cgm_dbus_connect()) { + char *str; + str = cgm_get(virCgroupControllerTypeToString(VIR_CGROUP_CONTROLLER_CPU), + cgroup->path, "cpu.cfs_period_us"); + cgm_dbus_disconnect(); + if (str) { + ret = true; + nih_free(str); + } + return ret; + } +#endif if (virCgroupPathOfController(cgroup, VIR_CGROUP_CONTROLLER_CPU, "cpu.cfs_period_us", &path) < 0) { virResetLastError(); @@ -3800,6 +4360,16 @@ virCgroupSupportsCpuBW(virCgroupPtr cgroup) } +void virCgroupEscape(void) { +#ifdef HAVE_CGMANAGER + int i; + if (cgm_dbus_connect()) { + for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) + cgm_escape(virCgroupControllerTypeToString(i)); + cgm_dbus_disconnect(); + } +#endif +} #else /* !VIR_CGROUP_SUPPORTED */ bool @@ -4497,4 +5067,6 @@ virCgroupSetOwner(virCgroupPtr cgroup ATTRIBUTE_UNUSED, return -1; } +void virCgroupEscape(void) { +} #endif /* !VIR_CGROUP_SUPPORTED */ diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h index 7bb46bf..da763b4 100644 --- a/src/util/vircgroup.h +++ b/src/util/vircgroup.h @@ -255,4 +255,9 @@ int virCgroupSetOwner(virCgroupPtr cgroup, gid_t gid, int controllers); +void virCgroupEscape(void); +int virCgroupDetectPlacement(virCgroupPtr group, + pid_t pid, + const char *path); + #endif /* __VIR_CGROUP_H__ */ diff --git a/tests/Makefile.am b/tests/Makefile.am index c999061..d7e2d90 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -933,8 +933,9 @@ libvirportallocatormock_la_LDFLAGS = -module -avoid-version \ -rpath /evil/libtool/hack/to/force/shared/lib/creation vircgrouptest_SOURCES = \ - vircgrouptest.c testutils.h testutils.c -vircgrouptest_LDADD = $(LDADDS) + vircgrouptest.c testutils.h testutils.c ../src/util/cgmanager.c +vircgrouptest_LDADD = $(LDADDS) $(CGMANAGER_LIBS) +vircgrouptest_CFLAGS = $(AM_CFLAGS) $(CGMANAGER_CFLAGS) -DHAVE_CGMANAGER vircgroupmock_la_SOURCES = \ vircgroupmock.c diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index 35ac0c0..3331d52 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -34,6 +34,7 @@ # include "virfile.h" # include "testutilslxc.h" # include "nodeinfo.h" +# include "cgmanager.h" # define VIR_FROM_THIS VIR_FROM_NONE @@ -758,6 +759,14 @@ mymain(void) int ret = 0; char *fakesysfsdir; +#ifdef HAVE_CGMANAGER + /* TODO make tests work with cgmanager */ + if (cgm_dbus_connect()) { + cgm_dbus_disconnect(); + return 0; + } +#endif + if (VIR_STRDUP_QUIET(fakesysfsdir, FAKESYSFSDIRTEMPLATE) < 0) { fprintf(stderr, "Out of memory\n"); abort(); -- 1.9.1

1 0

[libvirt] [PATCH v2] blockjob: use stable disk string in job event
by Eric Blake 17 Jun '14

17 Jun '14

When the block job event was first added, it was for block pull, where the active layer of the disk remains the same name. It was also in a day where we only cared about local files, and so we always had a canonical absolute file name. But two things have changed since then: we now have network disks, where determining a single absolute string does not really make sense; and we have two-phase jobs (copy and active commit) where the name of the active layer changes between the first event (ready, on the old name) and second (complete, on the pivoted name). Adam Litke reported that having an unstable string between events makes life harder for clients. Furthermore, all of our API that operate on a particular disk of a domain accept multiple strings: not only the absolute name of the active layer, but also the destination device name (such as 'vda'). As this latter name is stable, even for network sources, it serves as a better string to supply in block job events. But backwards-compatibility demands that we should not change the name handed to users unless they explicitly request it. Therefore, this patch adds a new event, BLOCK_JOB_2 (alas, I couldn't think of any nicer name), and has to double up on emitting both old-style and new-style events according to what clients have registered for (see also how IOError and IOErrorReason emits double events, but there the difference was a larger struct rather than changed meaning of one of the struct members). Unfortunately, adding a new event isn't something that can easily be broken into pieces, so the commit is rather large. * include/libvirt/libvirt.h.in (virDomainEventID): Add a new id for VIR_DOMAIN_EVENT_ID_BLOCK_JOB_2. (virConnectDomainEventBlockJobCallback): Document new semantics. * src/conf/domain_event.c (_virDomainEventBlockJob): Rename field, to ensure we catch all clients. (virDomainEventBlockJobNew): Add parameter. (virDomainEventBlockJobDispose, virDomainEventBlockJobNew) (virDomainEventBlockJobNewFromObj) (virDomainEventBlockJobNewFromDom) (virDomainEventDispatchDefaultFunc): Adjust clients. (virDomainEventBlockJob2NewFromObj) (virDomainEventBlockJob2NewFromDom): New functions. * src/conf/domain_event.h: Add new prototypes. * src/libvirt_private.syms (domain_event.h): Export new functions. * src/qemu/qemu_driver.c (qemuDomainBlockJobImpl): Generate two different events. * src/qemu/qemu_process.c (qemuProcessHandleBlockJob): Likewise. * src/remote/remote_protocol.x (remote_domain_event_block_job_msg): Adjust client. (remote_domain_event_block_job_2_msg): New struct. (REMOTE_PROC_DOMAIN_EVENT_BLOCK_JOB_2): New RPC. * src/remote/remote_driver.c (remoteDomainBuildEventBlockJobHelper): Adjust client. (remoteDomainBuildEventBlockJob2): New handler. (remoteEvents): Register new event. * daemon/remote.c (remoteRelayDomainEventBlockJob): Adjust client. (remoteRelayDomainEventBlockJob2): New handler. (domainEventCallbacks): Register new event. * tools/virsh-domain.c (vshEventCallbacks): Likewise. (vshEventBlockJobPrint): Adjust client. * src/remote_protocol-structs: Regenerate. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- v1: https://www.redhat.com/archives/libvir-list/2014-June/msg00675.html Diff from v1: add a new event type, and keep clients of the old event unchanged in what they get in their callback. daemon/remote.c | 47 +++++++++++++++++++++++++++++++++++---- include/libvirt/libvirt.h.in | 18 ++++++++++++--- src/conf/domain_event.c | 52 +++++++++++++++++++++++++++++++++----------- src/conf/domain_event.h | 15 +++++++++++-- src/libvirt_private.syms | 2 ++ src/qemu/qemu_driver.c | 8 ++++++- src/qemu/qemu_process.c | 7 ++++++ src/remote/remote_driver.c | 33 +++++++++++++++++++++++++++- src/remote/remote_protocol.x | 18 +++++++++++++-- src/remote_protocol-structs | 10 ++++++++- tools/virsh-domain.c | 7 ++++-- 11 files changed, 188 insertions(+), 29 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 34c96c9..56cf84f 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -558,7 +558,7 @@ remoteRelayDomainEventGraphics(virConnectPtr conn, static int remoteRelayDomainEventBlockJob(virConnectPtr conn, virDomainPtr dom, - const char *path, + const char *disk, int type, int status, void *opaque) @@ -571,11 +571,11 @@ remoteRelayDomainEventBlockJob(virConnectPtr conn, return -1; VIR_DEBUG("Relaying domain block job event %s %d %s %i, %i, callback %d", - dom->name, dom->id, path, type, status, callback->callbackID); + dom->name, dom->id, disk, type, status, callback->callbackID); /* build return data */ memset(&data, 0, sizeof(data)); - if (VIR_STRDUP(data.path, path) < 0) + if (VIR_STRDUP(data.disk, disk) < 0) goto error; data.type = type; data.status = status; @@ -596,7 +596,7 @@ remoteRelayDomainEventBlockJob(virConnectPtr conn, return 0; error: - VIR_FREE(data.path); + VIR_FREE(data.disk); return -1; } @@ -931,6 +931,44 @@ remoteRelayDomainEventDeviceRemoved(virConnectPtr conn, } +static int +remoteRelayDomainEventBlockJob2(virConnectPtr conn, + virDomainPtr dom, + const char *disk, + int type, + int status, + void *opaque) +{ + daemonClientEventCallbackPtr callback = opaque; + remote_domain_event_block_job_2_msg data; + + if (callback->callbackID < 0 || + !remoteRelayDomainEventCheckACL(callback->client, conn, dom)) + return -1; + + VIR_DEBUG("Relaying domain block job 2 event %s %d %s %i, %i, callback %d", + dom->name, dom->id, disk, type, status, callback->callbackID); + + /* build return data */ + memset(&data, 0, sizeof(data)); + data.callbackID = callback->callbackID; + if (VIR_STRDUP(data.disk, disk) < 0) + goto error; + data.type = type; + data.status = status; + make_nonnull_domain(&data.dom, dom); + + remoteDispatchObjectEventSend(callback->client, remoteProgram, + REMOTE_PROC_DOMAIN_EVENT_BLOCK_JOB_2, + (xdrproc_t)xdr_remote_domain_event_block_job_2_msg, &data); + + return 0; + error: + VIR_FREE(data.disk); + return -1; +} + + static virConnectDomainEventGenericCallback domainEventCallbacks[] = { VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventLifecycle), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventReboot), @@ -948,6 +986,7 @@ static virConnectDomainEventGenericCallback domainEventCallbacks[] = { VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventBalloonChange), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventPMSuspendDisk), VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventDeviceRemoved), + VIR_DOMAIN_EVENT_CALLBACK(remoteRelayDomainEventBlockJob2), }; verify(ARRAY_CARDINALITY(domainEventCallbacks) == VIR_DOMAIN_EVENT_ID_LAST); diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index dc88c40..c36fec3 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -4852,13 +4852,24 @@ typedef enum { * virConnectDomainEventBlockJobCallback: * @conn: connection object * @dom: domain on which the event occurred - * @disk: fully-qualified filename of the affected disk + * @disk: name associated with the affected disk * @type: type of block job (virDomainBlockJobType) * @status: status of the operation (virConnectDomainEventBlockJobStatus) * @opaque: application specified data * - * The callback signature to use when registering for an event of type - * VIR_DOMAIN_EVENT_ID_BLOCK_JOB with virConnectDomainEventRegisterAny() + * The string returned for @disk can be used in any of the libvirt API + * that operate on a particular disk of the domain, and depends on what + * event type was registered with virConnectDomainEventRegisterAny(). + * If the callback was registered using the older type of + * VIR_DOMAIN_EVENT_ID_BLOCK_JOB, then @disk contains the absolute file + * name of the host resource for the active layer of the disk; however, + * this name is unstable (pivoting via block copy or active block commit + * will change which file is active, giving a different name for the two + * events associated with the same job) and cannot be relied on if the + * active layer is associated with a network resource. If the callback + * was registered using the newer type of VIR_DOMAIN_EVENT_ID_BLOCK_JOB_2, + * then @disk will contain the device target shorthand (the <target + * dev='...'/> sub-element, such as "vda"). */ typedef void (*virConnectDomainEventBlockJobCallback)(virConnectPtr conn, virDomainPtr dom, @@ -5062,6 +5073,7 @@ typedef enum { VIR_DOMAIN_EVENT_ID_BALLOON_CHANGE = 13, /* virConnectDomainEventBalloonChangeCallback */ VIR_DOMAIN_EVENT_ID_PMSUSPEND_DISK = 14, /* virConnectDomainEventPMSuspendDiskCallback */ VIR_DOMAIN_EVENT_ID_DEVICE_REMOVED = 15, /* virConnectDomainEventDeviceRemovedCallback */ + VIR_DOMAIN_EVENT_ID_BLOCK_JOB_2 = 16, /* virConnectDomainEventBlockJobCallback */ #ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_EVENT_ID_LAST diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index b565732..43794d3 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -128,7 +128,7 @@ typedef virDomainEventIOError *virDomainEventIOErrorPtr; struct _virDomainEventBlockJob { virDomainEvent parent; - char *path; + char *disk; int type; int status; }; @@ -364,7 +364,7 @@ virDomainEventBlockJobDispose(void *obj) virDomainEventBlockJobPtr event = obj; VIR_DEBUG("obj=%p", event); - VIR_FREE(event->path); + VIR_FREE(event->disk); } static void @@ -775,10 +775,11 @@ virDomainEventGraphicsNewFromObj(virDomainObjPtr obj, } static virObjectEventPtr -virDomainEventBlockJobNew(int id, +virDomainEventBlockJobNew(int event, + int id, const char *name, unsigned char *uuid, - const char *path, + const char *disk, int type, int status) { @@ -788,11 +789,11 @@ virDomainEventBlockJobNew(int id, return NULL; if (!(ev = virDomainEventNew(virDomainEventBlockJobClass, - VIR_DOMAIN_EVENT_ID_BLOCK_JOB, + event, id, name, uuid))) return NULL; - if (VIR_STRDUP(ev->path, path) < 0) { + if (VIR_STRDUP(ev->disk, disk) < 0) { virObjectUnref(ev); return NULL; } @@ -804,22 +805,46 @@ virDomainEventBlockJobNew(int id, virObjectEventPtr virDomainEventBlockJobNewFromObj(virDomainObjPtr obj, - const char *path, + const char *disk, int type, int status) { - return virDomainEventBlockJobNew(obj->def->id, obj->def->name, - obj->def->uuid, path, type, status); + return virDomainEventBlockJobNew(VIR_DOMAIN_EVENT_ID_BLOCK_JOB, + obj->def->id, obj->def->name, + obj->def->uuid, disk, type, status); } virObjectEventPtr virDomainEventBlockJobNewFromDom(virDomainPtr dom, - const char *path, + const char *disk, int type, int status) { - return virDomainEventBlockJobNew(dom->id, dom->name, dom->uuid, - path, type, status); + return virDomainEventBlockJobNew(VIR_DOMAIN_EVENT_ID_BLOCK_JOB, + dom->id, dom->name, dom->uuid, + disk, type, status); +} + +virObjectEventPtr +virDomainEventBlockJob2NewFromObj(virDomainObjPtr obj, + const char *disk, + int type, + int status) +{ + return virDomainEventBlockJobNew(VIR_DOMAIN_EVENT_ID_BLOCK_JOB_2, + obj->def->id, obj->def->name, + obj->def->uuid, disk, type, status); +} + +virObjectEventPtr +virDomainEventBlockJob2NewFromDom(virDomainPtr dom, + const char *disk, + int type, + int status) +{ + return virDomainEventBlockJobNew(VIR_DOMAIN_EVENT_ID_BLOCK_JOB_2, + dom->id, dom->name, dom->uuid, + disk, type, status); } virObjectEventPtr @@ -1250,12 +1275,13 @@ virDomainEventDispatchDefaultFunc(virConnectPtr conn, goto cleanup; case VIR_DOMAIN_EVENT_ID_BLOCK_JOB: + case VIR_DOMAIN_EVENT_ID_BLOCK_JOB_2: { virDomainEventBlockJobPtr blockJobEvent; blockJobEvent = (virDomainEventBlockJobPtr)event; ((virConnectDomainEventBlockJobCallback)cb)(conn, dom, - blockJobEvent->path, + blockJobEvent->disk, blockJobEvent->type, blockJobEvent->status, cbopaque); diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index 9c41090..c7b8761 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -117,16 +117,27 @@ virDomainEventControlErrorNewFromObj(virDomainObjPtr obj); virObjectEventPtr virDomainEventBlockJobNewFromObj(virDomainObjPtr obj, - const char *path, + const char *disk, int type, int status); virObjectEventPtr virDomainEventBlockJobNewFromDom(virDomainPtr dom, - const char *path, + const char *disk, int type, int status); virObjectEventPtr +virDomainEventBlockJob2NewFromObj(virDomainObjPtr obj, + const char *disk, + int type, + int status); +virObjectEventPtr +virDomainEventBlockJob2NewFromDom(virDomainPtr dom, + const char *disk, + int type, + int status); + +virObjectEventPtr virDomainEventDiskChangeNewFromObj(virDomainObjPtr obj, const char *oldSrcPath, const char *newSrcPath, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 29a9ed1..9e25b8a 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -439,6 +439,8 @@ virDomainXMLOptionNew; # conf/domain_event.h virDomainEventBalloonChangeNewFromDom; virDomainEventBalloonChangeNewFromObj; +virDomainEventBlockJob2NewFromDom; +virDomainEventBlockJob2NewFromObj; virDomainEventBlockJobNewFromDom; virDomainEventBlockJobNewFromObj; virDomainEventControlErrorNewFromDom; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4ab5a7b..ca58d6b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15027,6 +15027,7 @@ qemuDomainBlockJobImpl(virDomainObjPtr vm, int ret = -1; bool async = false; virObjectEventPtr event = NULL; + virObjectEventPtr event2 = NULL; int idx; virDomainDiskDefPtr disk; virStorageSourcePtr baseSource = NULL; @@ -15130,11 +15131,14 @@ qemuDomainBlockJobImpl(virDomainObjPtr vm, if (mode == BLOCK_JOB_ABORT) { if (!async) { /* Older qemu that lacked async reporting also lacked - * active commit, so we can hardcode the event to pull */ + * active commit, so we can hardcode the event to pull. + * We have to generate two variants of the event. */ int type = VIR_DOMAIN_BLOCK_JOB_TYPE_PULL; int status = VIR_DOMAIN_BLOCK_JOB_CANCELED; event = virDomainEventBlockJobNewFromObj(vm, disk->src->path, type, status); + event2 = virDomainEventBlockJob2NewFromObj(vm, disk->dst, type, + status); } else if (!(flags & VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC)) { while (1) { /* Poll every 50ms */ @@ -15178,6 +15182,8 @@ qemuDomainBlockJobImpl(virDomainObjPtr vm, virObjectUnlock(vm); if (event) qemuDomainEventQueue(driver, event); + if (event2) + qemuDomainEventQueue(driver, event2); return ret; } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e4845ba..f1c0041 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1013,6 +1013,7 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon ATTRIBUTE_UNUSED, { virQEMUDriverPtr driver = opaque; virObjectEventPtr event = NULL; + virObjectEventPtr event2 = NULL; const char *path; virDomainDiskDefPtr disk; @@ -1020,8 +1021,12 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon ATTRIBUTE_UNUSED, disk = qemuProcessFindDomainDiskByAlias(vm, diskAlias); if (disk) { + /* Have to generate two variants of the event for old vs. new + * client callbacks */ path = virDomainDiskGetSource(disk); event = virDomainEventBlockJobNewFromObj(vm, path, type, status); + event2 = virDomainEventBlockJob2NewFromObj(vm, disk->dst, type, + status); /* XXX If we completed a block pull or commit, then recompute * the cached backing chain to match. Better would be storing * the chain ourselves rather than reprobing, but this @@ -1048,6 +1053,8 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon ATTRIBUTE_UNUSED, if (event) qemuDomainEventQueue(driver, event); + if (event2) + qemuDomainEventQueue(driver, event2); return 0; } diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 85fe597..8df35e2 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -321,6 +321,11 @@ remoteDomainBuildEventCallbackDeviceRemoved(virNetClientProgramPtr prog, void *evdata, void *opaque); static void +remoteDomainBuildEventBlockJob2(virNetClientProgramPtr prog, + virNetClientPtr client, + void *evdata, void *opaque); + +static void remoteNetworkBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, virNetClientPtr client ATTRIBUTE_UNUSED, void *evdata, void *opaque); @@ -467,6 +472,10 @@ static virNetClientProgramEvent remoteEvents[] = { remoteDomainBuildEventCallbackDeviceRemoved, sizeof(remote_domain_event_callback_device_removed_msg), (xdrproc_t)xdr_remote_domain_event_callback_device_removed_msg }, + { REMOTE_PROC_DOMAIN_EVENT_BLOCK_JOB_2, + remoteDomainBuildEventBlockJob2, + sizeof(remote_domain_event_block_job_2_msg), + (xdrproc_t)xdr_remote_domain_event_block_job_2_msg }, }; @@ -5023,7 +5032,7 @@ remoteDomainBuildEventBlockJobHelper(virConnectPtr conn, if (!dom) return; - event = virDomainEventBlockJobNewFromDom(dom, msg->path, msg->type, + event = virDomainEventBlockJobNewFromDom(dom, msg->disk, msg->type, msg->status); virDomainFree(dom); @@ -5048,6 +5057,28 @@ remoteDomainBuildEventCallbackBlockJob(virNetClientProgramPtr prog ATTRIBUTE_UNU remote_domain_event_callback_block_job_msg *msg = evdata; remoteDomainBuildEventBlockJobHelper(conn, &msg->msg, msg->callbackID); } +static void +remoteDomainBuildEventBlockJob2(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, + virNetClientPtr client ATTRIBUTE_UNUSED, + void *evdata, void *opaque) +{ + virConnectPtr conn = opaque; + remote_domain_event_block_job_2_msg *msg = evdata; + struct private_data *priv = conn->privateData; + virDomainPtr dom; + virObjectEventPtr event = NULL; + + dom = get_nonnull_domain(conn, msg->dom); + if (!dom) + return; + + event = virDomainEventBlockJob2NewFromDom(dom, msg->disk, msg->type, + msg->status); + + virDomainFree(dom); + + remoteEventQueue(priv, event, msg->callbackID); +} static void remoteDomainBuildEventGraphicsHelper(virConnectPtr conn, diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index ab9b83d..95a1437 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -2352,7 +2352,7 @@ struct remote_domain_event_callback_graphics_msg { struct remote_domain_event_block_job_msg { remote_nonnull_domain dom; - remote_nonnull_string path; + remote_nonnull_string disk; int type; int status; }; @@ -2948,6 +2948,14 @@ struct remote_domain_event_callback_device_removed_msg { remote_domain_event_device_removed_msg msg; }; +struct remote_domain_event_block_job_2_msg { + int callbackID; + remote_nonnull_domain dom; + remote_nonnull_string disk; + int type; + int status; +}; + struct remote_connect_get_cpu_model_names_args { remote_nonnull_string arch; int need_results; @@ -5338,5 +5346,11 @@ enum remote_procedure { * @generate: both * @acl: domain:set_time */ - REMOTE_PROC_DOMAIN_SET_TIME = 338 + REMOTE_PROC_DOMAIN_SET_TIME = 338, + + /** + * @generate: none + * @acl: none + */ + REMOTE_PROC_DOMAIN_EVENT_BLOCK_JOB_2 = 339 }; diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 5b22049..3abc076 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -1797,7 +1797,7 @@ struct remote_domain_event_callback_graphics_msg { }; struct remote_domain_event_block_job_msg { remote_nonnull_domain dom; - remote_nonnull_string path; + remote_nonnull_string disk; int type; int status; }; @@ -2413,6 +2413,13 @@ struct remote_domain_event_callback_device_removed_msg { int callbackID; remote_domain_event_device_removed_msg msg; }; +struct remote_domain_event_block_job_2_msg { + int callbackID; + remote_nonnull_domain dom; + remote_nonnull_string disk; + int type; + int status; +}; struct remote_connect_get_cpu_model_names_args { remote_nonnull_string arch; int need_results; @@ -2802,4 +2809,5 @@ enum remote_procedure { REMOTE_PROC_DOMAIN_FSTHAW = 336, REMOTE_PROC_DOMAIN_GET_TIME = 337, REMOTE_PROC_DOMAIN_SET_TIME = 338, + REMOTE_PROC_DOMAIN_EVENT_BLOCK_JOB_2 = 339, }; diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 6b3dd70..d136862 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -10921,8 +10921,9 @@ vshEventBlockJobPrint(virConnectPtr conn ATTRIBUTE_UNUSED, if (!data->loop && *data->count) return; - vshPrint(data->ctl, _("event 'block-job' for domain %s: %s for %s %s\n"), - virDomainGetName(dom), vshDomainBlockJobToString(type), + vshPrint(data->ctl, _("event '%s' for domain %s: %s for %s %s\n"), + data->cb->name, virDomainGetName(dom), + vshDomainBlockJobToString(type), disk, vshDomainBlockJobStatusToString(status)); (*data->count)++; if (!data->loop) @@ -11049,6 +11050,8 @@ static vshEventCallback vshEventCallbacks[] = { VIR_DOMAIN_EVENT_CALLBACK(vshEventPMChangePrint), }, { "device-removed", VIR_DOMAIN_EVENT_CALLBACK(vshEventDeviceRemovedPrint), }, + { "block-job-2", + VIR_DOMAIN_EVENT_CALLBACK(vshEventBlockJobPrint), }, }; verify(VIR_DOMAIN_EVENT_ID_LAST == ARRAY_CARDINALITY(vshEventCallbacks)); -- 1.9.3

2 3

[libvirt] [PATCHv2 0/2] vbox: Fix various coverity issues.
by Peter Krempa 17 Jun '14

17 Jun '14

Version 2 fixes issues pointed out by Yohan Belleguic. Peter Krempa (2): vbox: snapshot: Avoid memleak in virVBoxSnapshotConfAllChildren vbox: snapshot: Avoid memleaks in functions dealing with disk arrays src/vbox/vbox_snapshot_conf.c | 56 ++++++++++++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 14 deletions(-) -- 1.9.3

2 5

[libvirt] [PATCH 0/3] Rewrite GetBlkioParameters
by Ján Tomko 17 Jun '14

17 Jun '14

Reuse the code and make it (hoepfully) more readable. Ján Tomko (3): Split out virDomainGetBlkioParametersInternal Reuse GetBlkioParameters code for live and persistent XML Rewrite virDomainGetBlkioParametersInternal src/conf/domain_conf.c | 169 +++++++++++++++++++++ src/conf/domain_conf.h | 8 + src/libvirt_private.syms | 1 + src/lxc/lxc_driver.c | 374 +-------------------------------------------- src/qemu/qemu_driver.c | 383 +---------------------------------------------- 5 files changed, 186 insertions(+), 749 deletions(-) -- 1.8.5.5

2 6

[libvirt] [PATCH 0/3] Fix few issues pointed out by coverity
by Peter Krempa 17 Jun '14

17 Jun '14

Peter Krempa (3): uuid: Fix coverity warning of unchecked return value vbox: snapshot: Avoid memleak in virVBoxSnapshotConfAllChildren vbox: snapshot: Avoid memleaks in functions dealing with disk arrays src/vbox/vbox_snapshot_conf.c | 64 +++++++++++++++++++++++++++++++++++-------- tests/qemuxml2argvtest.c | 4 ++- 2 files changed, 55 insertions(+), 13 deletions(-) -- 1.9.3

3 7

[libvirt] fix compile with latest stable sheepdog
by Vasiliy Tolstov 17 Jun '14

17 Jun '14

Latest stable sheepdog version change command from collie to dog. Patch fixes this issue. (libvirt 1.2.5) -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru jabber: vase(a)selfip.ru

2 3

[libvirt] [libvirt-glib PATCH] Add API to get security models from host capabilities
by Cédric Bosdonnat 17 Jun '14

17 Jun '14

--- libvirt-gconfig/Makefile.am | 2 + .../libvirt-gconfig-capabilities-host.c | 51 +++++++++++++++++ .../libvirt-gconfig-capabilities-host.h | 3 + .../libvirt-gconfig-capabilities-secmodel.c | 55 ++++++++++++++++++ .../libvirt-gconfig-capabilities-secmodel.h | 66 ++++++++++++++++++++++ libvirt-gconfig/libvirt-gconfig.h | 1 + libvirt-gconfig/libvirt-gconfig.sym | 5 ++ libvirt-gconfig/tests/test-capabilities-parse.c | 14 ++++- libvirt-gconfig/tests/test-capabilities-parse.xml | 4 ++ 9 files changed, 200 insertions(+), 1 deletion(-) create mode 100644 libvirt-gconfig/libvirt-gconfig-capabilities-secmodel.c create mode 100644 libvirt-gconfig/libvirt-gconfig-capabilities-secmodel.h diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index 83d521f..50083ed 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -20,6 +20,7 @@ GCONFIG_HEADER_FILES = \ libvirt-gconfig-capabilities-guest-arch.h \ libvirt-gconfig-capabilities-guest-domain.h \ libvirt-gconfig-capabilities-guest-feature.h \ + libvirt-gconfig-capabilities-secmodel.h \ libvirt-gconfig-domain.h \ libvirt-gconfig-domain-address.h \ libvirt-gconfig-domain-address-pci.h \ @@ -107,6 +108,7 @@ GCONFIG_SOURCE_FILES = \ libvirt-gconfig-capabilities-guest-arch.c \ libvirt-gconfig-capabilities-guest-domain.c \ libvirt-gconfig-capabilities-guest-feature.c \ + libvirt-gconfig-capabilities-secmodel.c \ libvirt-gconfig-domain.c \ libvirt-gconfig-domain-address.c \ libvirt-gconfig-domain-address-pci.c \ diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-host.c b/libvirt-gconfig/libvirt-gconfig-capabilities-host.c index 6a15206..46d2bc1 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-host.c +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-host.c @@ -77,3 +77,54 @@ gvir_config_capabilities_host_get_cpu(GVirConfigCapabilitiesHost *host) return GVIR_CONFIG_CAPABILITIES_CPU(object); } + +struct GetSecModelData { + GVirConfigXmlDoc *doc; + const gchar *schema; + GList *secmodels; + GType type; +}; + +static gboolean add_secmodel(xmlNodePtr node, gpointer opaque) +{ + struct GetSecModelData* data = (struct GetSecModelData*)opaque; + GVirConfigObject *secmodel; + + if (g_strcmp0((const gchar *)node->name, "secmodel") != 0) + return TRUE; + + secmodel = gvir_config_object_new_from_tree + (data->type, + data->doc, + data->schema, + node); + if (secmodel != NULL) + data->secmodels = g_list_append(data->secmodels, secmodel); + else + g_debug("Failed to parse %s node", node->name); + + return TRUE; +} + +GList * +gvir_config_capabilities_host_get_secmodels(GVirConfigCapabilitiesHost *host) +{ + struct GetSecModelData data; + + g_return_val_if_fail(GVIR_CONFIG_IS_CAPABILITIES_HOST(host), NULL); + + data.schema = gvir_config_object_get_schema(GVIR_CONFIG_OBJECT(host)); + g_object_get(G_OBJECT(host), "doc", &data.doc, NULL); + g_return_val_if_fail(data.doc != NULL, NULL); + data.secmodels = NULL; + data.type = GVIR_CONFIG_TYPE_CAPABILITIES_SECMODEL; + + gvir_config_object_foreach_child(GVIR_CONFIG_OBJECT(host), + NULL, + add_secmodel, + &data); + + g_clear_object(&data.doc); + + return data.secmodels; +} diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-host.h b/libvirt-gconfig/libvirt-gconfig-capabilities-host.h index 34fbb4f..c3c7951 100644 --- a/libvirt-gconfig/libvirt-gconfig-capabilities-host.h +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-host.h @@ -67,6 +67,9 @@ gvir_config_capabilities_host_get_uuid(GVirConfigCapabilitiesHost *host); GVirConfigCapabilitiesCpu * gvir_config_capabilities_host_get_cpu(GVirConfigCapabilitiesHost *host); +GList * +gvir_config_capabilities_host_get_secmodels(GVirConfigCapabilitiesHost *host); + G_END_DECLS #endif /* __LIBVIRT_GCONFIG_CAPABILITIES_HOST_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-secmodel.c b/libvirt-gconfig/libvirt-gconfig-capabilities-secmodel.c new file mode 100644 index 0000000..82285cb --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-secmodel.c @@ -0,0 +1,55 @@ +/* + * libvirt-gconfig-capabilities-secmodel.c: libvirt security model capabilities + * + * 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/>. + * + * Authors: Cédric Bosdonnat <cbosdonnat(a)suse.com> + */ + +#include <config.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-private.h" + +#define GVIR_CONFIG_CAPABILITIES_SECMODEL_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_CONFIG_TYPE_CAPABILITIES_SECMODEL, GVirConfigCapabilitiesSecmodelPrivate)) + +struct _GVirConfigCapabilitiesSecmodelPrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE(GVirConfigCapabilitiesSecmodel, gvir_config_capabilities_secmodel, GVIR_CONFIG_TYPE_OBJECT); + +static void gvir_config_capabilities_secmodel_class_init(GVirConfigCapabilitiesSecmodelClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigCapabilitiesSecmodelPrivate)); +} + +static void gvir_config_capabilities_secmodel_init(GVirConfigCapabilitiesSecmodel *secmodel) +{ + g_debug("Init GVirConfigCapabilitiesSecmodel=%p", secmodel); + + secmodel->priv = GVIR_CONFIG_CAPABILITIES_SECMODEL_GET_PRIVATE(secmodel); +} + +const gchar * +gvir_config_capabilities_secmodel_get_model(GVirConfigCapabilitiesSecmodel *secmodel) +{ + return gvir_config_object_get_node_content(GVIR_CONFIG_OBJECT(secmodel), + "model"); +} diff --git a/libvirt-gconfig/libvirt-gconfig-capabilities-secmodel.h b/libvirt-gconfig/libvirt-gconfig-capabilities-secmodel.h new file mode 100644 index 0000000..01de24d --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-capabilities-secmodel.h @@ -0,0 +1,66 @@ +/* + * libvirt-gconfig-capabilities-secmodel.h: libvirt security model capabilities + * + * 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/>. + * + * Authors: Cédric Bosdonnat <cbosdonnat(a)suse.com> + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only <libvirt-gconfig/libvirt-gconfig.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_CAPABILITIES_SECMODEL_H__ +#define __LIBVIRT_GCONFIG_CAPABILITIES_SECMODEL_H__ + +G_BEGIN_DECLS + +#define GVIR_CONFIG_TYPE_CAPABILITIES_SECMODEL (gvir_config_capabilities_secmodel_get_type ()) +#define GVIR_CONFIG_CAPABILITIES_SECMODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_CONFIG_TYPE_CAPABILITIES_SECMODEL, GVirConfigCapabilitiesSecmodel)) +#define GVIR_CONFIG_CAPABILITIES_SECMODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_CONFIG_TYPE_CAPABILITIES_SECMODEL, GVirConfigCapabilitiesSecmodelClass)) +#define GVIR_CONFIG_IS_CAPABILITIES_SECMODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_CONFIG_TYPE_CAPABILITIES_SECMODEL)) +#define GVIR_CONFIG_IS_CAPABILITIES_SECMODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_CONFIG_TYPE_CAPABILITIES_SECMODEL)) +#define GVIR_CONFIG_CAPABILITIES_SECMODEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_CONFIG_TYPE_CAPABILITIES_SECMODEL, GVirConfigCapabilitiesSecmodelClass)) + +typedef struct _GVirConfigCapabilitiesSecmodel GVirConfigCapabilitiesSecmodel; +typedef struct _GVirConfigCapabilitiesSecmodelPrivate GVirConfigCapabilitiesSecmodelPrivate; +typedef struct _GVirConfigCapabilitiesSecmodelClass GVirConfigCapabilitiesSecmodelClass; + +struct _GVirConfigCapabilitiesSecmodel +{ + GVirConfigObject parent; + + GVirConfigCapabilitiesSecmodelPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigCapabilitiesSecmodelClass +{ + GVirConfigObjectClass parent_class; + + gpointer padding[20]; +}; + +GType gvir_config_capabilities_secmodel_get_type(void); + +const gchar * +gvir_config_capabilities_secmodel_get_model(GVirConfigCapabilitiesSecmodel *secmodel); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_CAPABILITIES_SECMODEL_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig.h b/libvirt-gconfig/libvirt-gconfig.h index 1582109..3400110 100644 --- a/libvirt-gconfig/libvirt-gconfig.h +++ b/libvirt-gconfig/libvirt-gconfig.h @@ -37,6 +37,7 @@ #include <libvirt-gconfig/libvirt-gconfig-capabilities-guest-domain.h> #include <libvirt-gconfig/libvirt-gconfig-capabilities-guest-feature.h> #include <libvirt-gconfig/libvirt-gconfig-capabilities-host.h> +#include <libvirt-gconfig/libvirt-gconfig-capabilities-secmodel.h> #include <libvirt-gconfig/libvirt-gconfig-domain.h> #include <libvirt-gconfig/libvirt-gconfig-domain-address.h> #include <libvirt-gconfig/libvirt-gconfig-domain-address-pci.h> diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index fc68050..6b33dbb 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -689,6 +689,11 @@ global: LIBVIRT_GCONFIG_0.1.9 { global: + gvir_config_capabilities_host_get_secmodels; + + gvir_config_capabilities_secmodel_get_model; + gvir_config_capabilities_secmodel_get_type; + gvir_config_domain_chardev_source_spiceport_get_channel; gvir_config_domain_chardev_source_spiceport_get_type; gvir_config_domain_chardev_source_spiceport_new; diff --git a/libvirt-gconfig/tests/test-capabilities-parse.c b/libvirt-gconfig/tests/test-capabilities-parse.c index 8ede160..aec81c5 100644 --- a/libvirt-gconfig/tests/test-capabilities-parse.c +++ b/libvirt-gconfig/tests/test-capabilities-parse.c @@ -35,7 +35,7 @@ static void verify_host_caps(GVirConfigCapabilitiesHost *host_caps) { GVirConfigCapabilitiesCpu *cpu_caps; GVirConfigCapabilitiesCpuTopology *topology; - GList *features, *iter; + GList *features, *iter, *secmodels; const char *str; g_assert(host_caps != NULL); @@ -60,6 +60,18 @@ static void verify_host_caps(GVirConfigCapabilitiesHost *host_caps) g_assert(gvir_config_capabilities_cpu_topology_get_threads(topology) == 2); g_object_unref(G_OBJECT(topology)); g_object_unref(G_OBJECT(cpu_caps)); + + secmodels = gvir_config_capabilities_host_get_secmodels(host_caps); + g_assert(g_list_length(secmodels) == 2); + for (iter = secmodels; iter != NULL; iter = iter->next) { + GVirConfigCapabilitiesSecmodel *secmodel; + + g_assert(iter->data != NULL); + secmodel = GVIR_CONFIG_CAPABILITIES_SECMODEL(iter->data); + g_assert(gvir_config_capabilities_secmodel_get_model(secmodel) != NULL); + g_object_unref(G_OBJECT(iter->data)); + } + g_list_free(secmodels); } static void verify_guest_caps(GVirConfigCapabilitiesGuest *guest_caps) diff --git a/libvirt-gconfig/tests/test-capabilities-parse.xml b/libvirt-gconfig/tests/test-capabilities-parse.xml index 9c76085..477e3fe 100644 --- a/libvirt-gconfig/tests/test-capabilities-parse.xml +++ b/libvirt-gconfig/tests/test-capabilities-parse.xml @@ -40,6 +40,10 @@ <model>selinux</model> <doi>0</doi> </secmodel> + <secmodel> + <model>apparmor</model> + <doi>0</doi> + </secmodel> </host> <guest> -- 1.8.4.5

4 7

[libvirt] [libvirt-sandbox PATCH v3] Only set SELinux seclabel if supported by the host.
by Cédric Bosdonnat 17 Jun '14

17 Jun '14

This code depends on new API in libvirt-gconfig to extract the secmodels handled by the host. --- Diff to v2: * Added some missing g_object_unref and _g_list_free * Moved the SELinux-specific code to a separate function libvirt-sandbox/libvirt-sandbox-builder.c | 47 +++++++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/libvirt-sandbox/libvirt-sandbox-builder.c b/libvirt-sandbox/libvirt-sandbox-builder.c index 48b3acc..65af23f 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder.c +++ b/libvirt-sandbox/libvirt-sandbox-builder.c @@ -322,12 +322,10 @@ static gboolean gvir_sandbox_builder_construct_devices(GVirSandboxBuilder *build return TRUE; } - -static gboolean gvir_sandbox_builder_construct_security(GVirSandboxBuilder *builder G_GNUC_UNUSED, - GVirSandboxConfig *config G_GNUC_UNUSED, - const gchar *statedir G_GNUC_UNUSED, - GVirConfigDomain *domain, - GError **error G_GNUC_UNUSED) +static gboolean gvir_sandbox_builder_construct_security_selinux (GVirSandboxBuilder *builder, + GVirSandboxConfig *config, + GVirConfigDomain *domain, + GError **error) { GVirConfigDomainSeclabel *sec = gvir_config_domain_seclabel_new(); const char *label = gvir_sandbox_config_get_security_label(config); @@ -360,6 +358,43 @@ static gboolean gvir_sandbox_builder_construct_security(GVirSandboxBuilder *buil return TRUE; } +static gboolean gvir_sandbox_builder_construct_security(GVirSandboxBuilder *builder, + GVirSandboxConfig *config, + const gchar *statedir G_GNUC_UNUSED, + GVirConfigDomain *domain, + GError **error) +{ + GVirConnection *connection = gvir_sandbox_builder_get_connection(builder); + GVirConfigCapabilities *configCapabilities; + GVirConfigCapabilitiesHost *hostCapabilities; + GList *secmodels, *iter; + gboolean supportsSelinux = FALSE; + + /* What security models are available on the host? */ + if (!(configCapabilities = gvir_connection_get_capabilities(connection, error))) { + return FALSE; + } + + hostCapabilities = gvir_config_capabilities_get_host(configCapabilities); + + secmodels = gvir_config_capabilities_host_get_secmodels(hostCapabilities); + for (iter = secmodels; iter != NULL; iter = iter->next) { + supportsSelinux = g_str_equal(gvir_config_capabilities_host_secmodel_get_model( + GVIR_CONFIG_CAPABILITIES_HOST_SECMODEL(iter->data)), "selinux"); + g_object_unref(iter->data); + } + + g_object_unref(configCapabilities); + g_object_unref(hostCapabilities); + g_list_free(secmodels); + + if (supportsSelinux) + return gvir_sandbox_builder_construct_security_selinux(builder, config, + domain, error); + + return TRUE; +} + static gboolean gvir_sandbox_builder_clean_post_start_default(GVirSandboxBuilder *builder G_GNUC_UNUSED, GVirSandboxConfig *config G_GNUC_UNUSED, -- 1.8.4.5

2 1

[libvirt] [PATCH] network: bridge: Avoid freeing uninitialized pointer on cleanup path
by Peter Krempa 17 Jun '14

17 Jun '14

The cleanup path in networkBuildDhcpDaemonCommandLine could cause a crash by freeing uninitialized pointer. --- src/network/bridge_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 4fc4c9a..8de7a59 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1252,7 +1252,7 @@ networkBuildDhcpDaemonCommandLine(virNetworkObjPtr network, int ret = -1; char *configfile = NULL; char *configstr = NULL; - char *leaseshelper_path; + char *leaseshelper_path = NULL; network->dnsmasqPid = -1; -- 1.9.3

1 1

[libvirt] [PATCH 0/5] fix multiple leasehelper bugs
by Peter Krempa 17 Jun '14

17 Jun '14

Found while reviewing Pavel's patch. Peter Krempa (5): util: json: Unify function header formatting util: json: Add helpers for manipulating json arrays net: leasehelper: Don't crash if DNSMASQ doesn't provide lease expiry leasehelper: Ignore corrupted lease file and rewrite it leasehelper: Refactor copying of old entries to avoid double free src/network/leaseshelper.c | 90 +++++++------ src/util/virjson.c | 316 ++++++++++++++++++++++++++++++++++----------- src/util/virjson.h | 2 + 3 files changed, 295 insertions(+), 113 deletions(-) -- 1.9.3

3 13

[libvirt] checking smtp server issue
by Jim Fehlig 17 Jun '14

17 Jun '14

I've been having problems lately with an internal MTA connecting to an external one that apparently serves the libvirt list. E.g. I recently responded to "[PATCH v2 4/4] libxl: Add a test suite for libxl option generator", which includes the xen-devel list. The response made it to xen-devel, but I received the following wrt the libvirt list The attached file had the following undeliverable recipient(s): Information about your message: Message log tag: 661753 Number of send attempts: 1 Time of initial send attempt: 06-16-14 17:11:53 Transcript of session follows: Command: EHLO victor.provo.novell.com Response: 550 TLS negotiation failure Seems like a certificate problem on the victor host. I'm trying a different smtp server for another data point in my report to internal IS&T folks. Thanks for your patience. Regards, Jim

1 0

[libvirt] [PATCH v2] Added example script on how to convert LXC container config
by Cédric Bosdonnat 16 Jun '14

16 Jun '14

--- Makefile.am | 2 +- configure.ac | 1 + examples/lxcconvert/Makefile.am | 18 ++++++ examples/lxcconvert/virt-lxc-convert | 108 +++++++++++++++++++++++++++++++++++ 4 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 examples/lxcconvert/Makefile.am create mode 100644 examples/lxcconvert/virt-lxc-convert diff --git a/Makefile.am b/Makefile.am index 9847ff0..0ef983f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -23,7 +23,7 @@ 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/lxcconvert tools/wireshark ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index 73efffa..f84d4bb 100644 --- a/configure.ac +++ b/configure.ac @@ -2699,6 +2699,7 @@ AC_CONFIG_FILES([\ examples/hellolibvirt/Makefile \ examples/systemtap/Makefile \ examples/xml/nwfilter/Makefile \ + examples/lxcconvert/Makefile \ tools/wireshark/Makefile \ tools/wireshark/src/Makefile]) AC_OUTPUT diff --git a/examples/lxcconvert/Makefile.am b/examples/lxcconvert/Makefile.am new file mode 100644 index 0000000..09cf5d9 --- /dev/null +++ b/examples/lxcconvert/Makefile.am @@ -0,0 +1,18 @@ +## 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/lxcconvert/virt-lxc-convert b/examples/lxcconvert/virt-lxc-convert new file mode 100644 index 0000000..a6c5721 --- /dev/null +++ b/examples/lxcconvert/virt-lxc-convert @@ -0,0 +1,108 @@ +#!/bin/sh + +handler_cleanup() +{ + if ! test -z "$conf_dir"; then + # Remove the temporary config + rm -r "$conf_dir" + fi +} +trap handler_cleanup INT EXIT + +show_help() +{ + cat << EOF +$0 /path/to/lxc/config/file + +Wrapper around virsh domxml-from-native to ease conversion of LXC +containers configuration to libvirt domain XML. +EOF +} + +if test $# != 1; then + show_help + exit 1 +fi + +if test "$1" = "--help" || test "$1" = "-h"; then + show_help + exit $? +fi + +conf=$1 + +conf_dir=$(mktemp --tmpdir -d virt-lxc-convert-XXX) +conf_new=$conf_dir/config + +cp "$conf" "$conf_new" + +# Do we have lxc.mount, and is it pointing to a readable file? +fstab=$(sed -n '/lxc.mount[[:space:]]*=/ s/[[:space:]]*=[[:space:]]*/=/p' \ + "$conf_new" | cut -f 2 -d '=') +if test -n "$fstab" && test -r "$fstab"; then + sed 's/^lxc.mount[[:space:]]*=.*$//' "$conf_new" >"${conf_new}.tmp" + mv "${conf_new}.tmp" "${conf_new}" + sed 's/^$[^#]$/lxc.mount.entry = \1/' "$fstab" >>"${conf_new}" +fi + +memory=$(free | sed -n '/Mem:/s/ \+/ /gp' | cut -f 2 -d ' ') +default_tmpfs="size=$((memory/2))" + +# Do we have tmpfs without size param? +lineno=0 +while read line; do + lineno=$(expr $lineno + 1) + has_rel_size=false + case $line in + lxc.mount.entry[[:space:]]*=[[:space:]]*tmpfs[[:space:]]*) + is_tmpfs=true + ;; + *) + is_tmpfs=false + ;; + esac + + # We only care about tmpfs mount entries here + if ! $is_tmpfs; then + continue + fi + + case $line in + *size=[0-9][0-9]*%*) + has_rel_size=true + has_size=true + ;; + *size=*) + has_size=true + ;; + *) + has_size=false + ;; + esac + + # Add the default size here (50%) if no size is given + if ! $has_size; then + last_option_match="$[[:space:]]*[0-9][[:space:]]*[0-9][::space::]*$$" + sed "${lineno}s/$last_option_match/,$default_tmpfs\1/" \ + "$conf_new" >"${conf_new}.tmp" + mv "${conf_new}.tmp" "${conf_new}" + fi + + # Convert relative sizes + if $has_rel_size; then + percent=$(echo "$line" | sed 's/.*size=$[0-9][0-9]*$%.*/\1/') + size="$((memory*percent/100))" + sed "${lineno}s/size=[0-9]*%/size=${size}/" \ + "$conf_new" >"${conf_new}.tmp" + mv "${conf_new}.tmp" "${conf_new}" + fi +done < "$conf_new" + +# Do we have any memory limit set? +mem_limit=$(grep 'lxc.cgroup.memory.limit_in_bytes[[:space:]]*=' $conf_new) +if test -z "$mem_limit"; then + echo "lxc.cgroup.memory.limit_in_bytes = $memory" >> "$conf_new" +fi + +virsh -c lxc:/// domxml-from-native lxc-tools $conf_new +exit $? -- 1.8.4.5

3 2

[libvirt] [PATCH] blockjob: don't remove older-style mirror XML
by Eric Blake 16 Jun '14

16 Jun '14

Commit 7c6fc39 introduced a regression in the XML produced for older clients. The argument at the time was that clients shouldn't be depending on output-only data for something that is only going to be triggered for a transient guest; but John Ferlan reported that the automated testsuite was such a client. It's better to be safe than sorry by guaranteeing back-compat cruft. Note that later patches will be using <mirror> for active block commit, but there we don't have to worry about back-compat. * src/conf/domain_conf.c (virDomainDiskDefFormat): Restore old style output when necessary. * docs/schemas/domaincommon.rng: Validate back-compat style. * docs/formatdomain.html.in: Update the documentation. * tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-old.xml: Update tests. * tests/qemuxml2argvdata/qemuxml2argv-disk-mirror.xml: Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I have to rebase my remaining active commit series on top of this, but wanted to get this out now so that John can test if this is sufficient to resolve the test failure without having to modify things in the automated tester. docs/formatdomain.html.in | 12 +++++++----- docs/schemas/domaincommon.rng | 12 ++++++++++-- src/conf/domain_conf.c | 19 +++++++++++++------ tests/qemuxml2argvdata/qemuxml2argv-disk-mirror.xml | 4 ++-- .../qemuxml2xmlout-disk-mirror-old.xml | 4 ++-- 5 files changed, 34 insertions(+), 17 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 1b6ced8..13ba541 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -1891,11 +1891,13 @@ attribute <code>ready</code> is present, then it is known the disk is ready to pivot; otherwise, the disk is probably still copying. For now, this element only valid in output; it is - ignored on input. Since 1.2.6 - (Older libvirt since 0.9.12 allowed - only mirroring to a file, with the information reported - in <code>file</code> and <code>format</code> attributes - of <code>mirror</code> rather than subelements.) + ignored on input. The <code>source</code> sub-element exists + for all two-phase jobs since 1.2.6. + Older libvirt supported only block copy to a + file, since 0.9.12; for + compatibility with older clients, such jobs include redundant + information in the attributes <code>file</code> + and <code>format</code> in the <code>mirror</code> element. </dd> <dt><code>target</code></dt> <dd>The <code>target</code> element controls the bus / device diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 6cc922c..33d0308 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -4176,7 +4176,7 @@ <define name='diskMirror'> <element name='mirror'> <choice> - <group> + <group>  <attribute name='file'> <ref name='absFilePath'/> </attribute> @@ -4185,8 +4185,16 @@ <ref name='storageFormat'/> </attribute> </optional> + <optional> + <interleave> + <ref name='diskSourceFile'/> + <optional> + <ref name="diskFormat"/> + </optional> + </interleave> + </optional> </group> - <group> + <group>  <interleave> <ref name="diskSource"/> <optional> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index be81dbe..4114289 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15187,19 +15187,26 @@ virDomainDiskDefFormat(virBufferPtr buf, /* For now, mirroring is currently output-only: we only output it * for live domains, therefore we ignore it on input except for - * the internal parse on libvirtd restart. We only output the - * new style similar to backingStore, even though the parser - * code still accepts old style across libvirtd upgrades. */ + * the internal parse on libvirtd restart. We prefer to output + * the new style similar to backingStore, but for back-compat on + * blockcopy files we also have to output old style attributes. + * The parser accepts either style across libvirtd upgrades. */ if (def->mirror && !(flags & VIR_DOMAIN_XML_INACTIVE)) { + const char *formatStr = NULL; + + if (def->mirror->format) + formatStr = virStorageFileFormatTypeToString(def->mirror->format); virBufferAsprintf(buf, "<mirror type='%s'", virStorageTypeToString(def->mirror->type)); + if (def->mirror->type == VIR_STORAGE_TYPE_FILE) { + virBufferEscapeString(buf, " file='%s'", def->mirror->path); + virBufferEscapeString(buf, " format='%s'", formatStr); + } if (def->mirroring) virBufferAddLit(buf, " ready='yes'"); virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); - if (def->mirror->format) - virBufferEscapeString(buf, "<format type='%s'/>\n", - virStorageFileFormatTypeToString(def->mirror->format)); + virBufferEscapeString(buf, "<format type='%s'/>\n", formatStr); if (virDomainDiskSourceFormat(buf, def->mirror, 0, 0) < 0) return -1; virBufferAdjustIndent(buf, -2); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-mirror.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-mirror.xml index a937d0a..72b03c9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-mirror.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-mirror.xml @@ -17,7 +17,7 @@ <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <backingStore/> - <mirror type='file' ready='yes'> + <mirror type='file' file='/dev/HostVG/QEMUGuest1Copy' ready='yes'> <source file='/dev/HostVG/QEMUGuest1Copy'/> </mirror> <target dev='hda' bus='ide'/> @@ -33,7 +33,7 @@ <disk type='file' device='disk'> <source file='/tmp/data.img'/> <backingStore/> - <mirror type='file'> + <mirror type='file' file='/tmp/copy.img' format='qcow2'> <format type='qcow2'/> <source file='/tmp/copy.img'/> </mirror> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-old.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-old.xml index a937d0a..72b03c9 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-old.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-old.xml @@ -17,7 +17,7 @@ <disk type='block' device='disk'> <source dev='/dev/HostVG/QEMUGuest1'/> <backingStore/> - <mirror type='file' ready='yes'> + <mirror type='file' file='/dev/HostVG/QEMUGuest1Copy' ready='yes'> <source file='/dev/HostVG/QEMUGuest1Copy'/> </mirror> <target dev='hda' bus='ide'/> @@ -33,7 +33,7 @@ <disk type='file' device='disk'> <source file='/tmp/data.img'/> <backingStore/> - <mirror type='file'> + <mirror type='file' file='/tmp/copy.img' format='qcow2'> <format type='qcow2'/> <source file='/tmp/copy.img'/> </mirror> -- 1.9.3

2 2

[libvirt] [PATCH] blockjob: use stable disk string in job event
by Eric Blake 16 Jun '14

16 Jun '14

When the block job event was first added, it was for block pull, where the active layer of the disk remains the same name. It was also in a day where we only cared about local files, and so we always had a canonical absolute file name. But two things have changed since then: we now have network disks, where determining a single absolute string does not really make sense; and we have two-phase jobs (copy and active commit) where the name of the active layer changes between the first event (ready, on the old name) and second (complete, on the pivoted name). Adam Litke reported that having an unstable string between events makes life harder for clients. Furthermore, all of our API that operate on a particular disk of a domain accept multiple strings: not only the absolute name of the active layer, but also the destination device name (such as 'vda'). As this latter name is stable, even for network sources, it serves as a better string to supply in block job events. * include/libvirt/libvirt.h.in (virConnectDomainEventBlockJobCallback): Document altered semantics. * src/conf/domain_event.c (_virDomainEventBlockJob): Rename field, to ensure we catch all clients. (virDomainEventBlockJobDispose, virDomainEventBlockJobNew) (virDomainEventBlockJobNewFromObj) (virDomainEventBlockJobNewFromDom) (virDomainEventDispatchDefaultFunc): Adjust clients. * src/conf/domain_event.h: Likewise. * src/qemu/qemu_driver.c (qemuDomainBlockJobImpl): Likewise. * src/qemu/qemu_process.c (qemuProcessHandleBlockJob): Likewise. * src/remote/remote_protocol.x (remote_domain_event_block_job_msg): Likewise. * src/remote/remote_driver.c (remoteDomainBuildEventBlockJobHelper): Likewise. * daemon/remote.c (remoteRelayDomainEventBlockJob): Likewise. * src/remote_protocol-structs: Regenerate. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- If you think backward compatibility of old clients that expected and operated on an absolute name is too important to break, I'm open to suggestions on alternatives how to preserve that. We don't have a flag argument during event registration, or I would have used it. Otherwise, I hope this change is okay as-is. daemon/remote.c | 8 ++++---- include/libvirt/libvirt.h.in | 11 ++++++++++- src/conf/domain_event.c | 18 +++++++++--------- src/conf/domain_event.h | 4 ++-- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_process.c | 4 +--- src/remote/remote_driver.c | 2 +- src/remote/remote_protocol.x | 2 +- src/remote_protocol-structs | 2 +- 9 files changed, 30 insertions(+), 23 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 34c96c9..ee1bbbc 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -558,7 +558,7 @@ remoteRelayDomainEventGraphics(virConnectPtr conn, static int remoteRelayDomainEventBlockJob(virConnectPtr conn, virDomainPtr dom, - const char *path, + const char *disk, int type, int status, void *opaque) @@ -571,11 +571,11 @@ remoteRelayDomainEventBlockJob(virConnectPtr conn, return -1; VIR_DEBUG("Relaying domain block job event %s %d %s %i, %i, callback %d", - dom->name, dom->id, path, type, status, callback->callbackID); + dom->name, dom->id, disk, type, status, callback->callbackID); /* build return data */ memset(&data, 0, sizeof(data)); - if (VIR_STRDUP(data.path, path) < 0) + if (VIR_STRDUP(data.disk, disk) < 0) goto error; data.type = type; data.status = status; @@ -596,7 +596,7 @@ remoteRelayDomainEventBlockJob(virConnectPtr conn, return 0; error: - VIR_FREE(data.path); + VIR_FREE(data.disk); return -1; } diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index dc88c40..a983046 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -4852,11 +4852,20 @@ typedef enum { * virConnectDomainEventBlockJobCallback: * @conn: connection object * @dom: domain on which the event occurred - * @disk: fully-qualified filename of the affected disk + * @disk: name associated with the affected disk * @type: type of block job (virDomainBlockJobType) * @status: status of the operation (virConnectDomainEventBlockJobStatus) * @opaque: application specified data * + * The string returned for @disk can be used in any of the libvirt API + * that operate on a particular disk of the domain. In older versions + * of libvirt, this string was the fully-qualified filename of the + * active layer of the disk; but as some events can change which file + * is the active layer, and because network protocols do not + * necessarily have a canonical filename, libvirt 1.2.6 and newer + * instead use the device target shorthand (the <target dev='...'/> + * sub-element, such as "vda"). + * * The callback signature to use when registering for an event of type * VIR_DOMAIN_EVENT_ID_BLOCK_JOB with virConnectDomainEventRegisterAny() */ diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index b565732..a2d59fd 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -128,7 +128,7 @@ typedef virDomainEventIOError *virDomainEventIOErrorPtr; struct _virDomainEventBlockJob { virDomainEvent parent; - char *path; + char *disk; int type; int status; }; @@ -364,7 +364,7 @@ virDomainEventBlockJobDispose(void *obj) virDomainEventBlockJobPtr event = obj; VIR_DEBUG("obj=%p", event); - VIR_FREE(event->path); + VIR_FREE(event->disk); } static void @@ -778,7 +778,7 @@ static virObjectEventPtr virDomainEventBlockJobNew(int id, const char *name, unsigned char *uuid, - const char *path, + const char *disk, int type, int status) { @@ -792,7 +792,7 @@ virDomainEventBlockJobNew(int id, id, name, uuid))) return NULL; - if (VIR_STRDUP(ev->path, path) < 0) { + if (VIR_STRDUP(ev->disk, disk) < 0) { virObjectUnref(ev); return NULL; } @@ -804,22 +804,22 @@ virDomainEventBlockJobNew(int id, virObjectEventPtr virDomainEventBlockJobNewFromObj(virDomainObjPtr obj, - const char *path, + const char *disk, int type, int status) { return virDomainEventBlockJobNew(obj->def->id, obj->def->name, - obj->def->uuid, path, type, status); + obj->def->uuid, disk, type, status); } virObjectEventPtr virDomainEventBlockJobNewFromDom(virDomainPtr dom, - const char *path, + const char *disk, int type, int status) { return virDomainEventBlockJobNew(dom->id, dom->name, dom->uuid, - path, type, status); + disk, type, status); } virObjectEventPtr @@ -1255,7 +1255,7 @@ virDomainEventDispatchDefaultFunc(virConnectPtr conn, blockJobEvent = (virDomainEventBlockJobPtr)event; ((virConnectDomainEventBlockJobCallback)cb)(conn, dom, - blockJobEvent->path, + blockJobEvent->disk, blockJobEvent->type, blockJobEvent->status, cbopaque); diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index 9c41090..e107cc4 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -117,12 +117,12 @@ virDomainEventControlErrorNewFromObj(virDomainObjPtr obj); virObjectEventPtr virDomainEventBlockJobNewFromObj(virDomainObjPtr obj, - const char *path, + const char *disk, int type, int status); virObjectEventPtr virDomainEventBlockJobNewFromDom(virDomainPtr dom, - const char *path, + const char *disk, int type, int status); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b4bf561..c866557 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15135,7 +15135,7 @@ qemuDomainBlockJobImpl(virDomainObjPtr vm, * active commit, so we can hardcode the event to pull */ int type = VIR_DOMAIN_BLOCK_JOB_TYPE_PULL; int status = VIR_DOMAIN_BLOCK_JOB_CANCELED; - event = virDomainEventBlockJobNewFromObj(vm, disk->src->path, type, + event = virDomainEventBlockJobNewFromObj(vm, disk->dst, type, status); } else if (!(flags & VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC)) { while (1) { diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e4845ba..68cfd4c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1013,15 +1013,13 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon ATTRIBUTE_UNUSED, { virQEMUDriverPtr driver = opaque; virObjectEventPtr event = NULL; - const char *path; virDomainDiskDefPtr disk; virObjectLock(vm); disk = qemuProcessFindDomainDiskByAlias(vm, diskAlias); if (disk) { - path = virDomainDiskGetSource(disk); - event = virDomainEventBlockJobNewFromObj(vm, path, type, status); + event = virDomainEventBlockJobNewFromObj(vm, disk->dst, type, status); /* XXX If we completed a block pull or commit, then recompute * the cached backing chain to match. Better would be storing * the chain ourselves rather than reprobing, but this diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 85fe597..8a83a41 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5023,7 +5023,7 @@ remoteDomainBuildEventBlockJobHelper(virConnectPtr conn, if (!dom) return; - event = virDomainEventBlockJobNewFromDom(dom, msg->path, msg->type, + event = virDomainEventBlockJobNewFromDom(dom, msg->disk, msg->type, msg->status); virDomainFree(dom); diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 1f9d583..e9a23cf 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -2352,7 +2352,7 @@ struct remote_domain_event_callback_graphics_msg { struct remote_domain_event_block_job_msg { remote_nonnull_domain dom; - remote_nonnull_string path; + remote_nonnull_string disk; int type; int status; }; diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 5b22049..9904f3d 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -1797,7 +1797,7 @@ struct remote_domain_event_callback_graphics_msg { }; struct remote_domain_event_block_job_msg { remote_nonnull_domain dom; - remote_nonnull_string path; + remote_nonnull_string disk; int type; int status; }; -- 1.9.3

4 5

[libvirt] [PATCH] blockjob: avoid compiler uncertainty in info sizing
by Eric Blake 16 Jun '14

16 Jun '14

We have a policy of avoiding enum types in structs in our public API, because it is possible for a client to choose compiler options that can change the in-memory ABI of that struct based on whether the enum value occupies an int or a minimal size. But we missed this for virDomainBlockJobInfo. We got lucky on little-endian machines - if the enum fits minimal size (a char), we still end up padding to the next long before the next field; but on big-endian, a client interpreting the enum as a char would always see 0 when the server supplies contents as an int. While at it, I noticed that the web page lacked documentation: http://libvirt.org/html/libvirt-libvirt.html#virDomainBlockJobType not only for the recently added active commit, but also for all the other job types. * include/libvirt/libvirt.h.in (virDomainBlockJobInfo): Enforce particular sizing. (virDomainBlockJobType): Document recent addition. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- include/libvirt/libvirt.h.in | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 127de11..dc88c40 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -2501,19 +2501,26 @@ int virDomainUpdateDeviceFlags(virDomainPtr domain, /** * virDomainBlockJobType: * - * VIR_DOMAIN_BLOCK_JOB_TYPE_PULL: Block Pull (virDomainBlockPull, or - * virDomainBlockRebase without flags), job ends on completion - * VIR_DOMAIN_BLOCK_JOB_TYPE_COPY: Block Copy (virDomainBlockRebase with - * flags), job exists as long as mirroring is active - * VIR_DOMAIN_BLOCK_JOB_TYPE_COMMIT: Block Commit (virDomainBlockCommit), - * job ends on completion + * Describes various possible block jobs. */ typedef enum { - VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN = 0, + VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN = 0, /* Placeholder */ + VIR_DOMAIN_BLOCK_JOB_TYPE_PULL = 1, + /* Block Pull (virDomainBlockPull, or virDomainBlockRebase without + * flags), job ends on completion */ + VIR_DOMAIN_BLOCK_JOB_TYPE_COPY = 2, + /* Block Copy (virDomainBlockRebase with flags), job exists as + * long as mirroring is active */ + VIR_DOMAIN_BLOCK_JOB_TYPE_COMMIT = 3, + /* Block Commit (virDomainBlockCommit without flags), job ends on + * completion */ + VIR_DOMAIN_BLOCK_JOB_TYPE_ACTIVE_COMMIT = 4, + /* Active Block Commit (virDomainBlockCommit with flags), job + * exists as long as sync is active */ #ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_BLOCK_JOB_TYPE_LAST @@ -2537,7 +2544,7 @@ typedef unsigned long long virDomainBlockJobCursor; typedef struct _virDomainBlockJobInfo virDomainBlockJobInfo; struct _virDomainBlockJobInfo { - virDomainBlockJobType type; + int type; /* virDomainBlockJobType */ unsigned long bandwidth; /* * The following fields provide an indication of block job progress. @cur -- 1.9.3

3 3

Re: [libvirt] [Qemu-devel] [PATCH v4 04/29] NUMA: convert -numa option to use OptsVisitor
by Eduardo Habkost 16 Jun '14

16 Jun '14

On Mon, Jun 09, 2014 at 06:25:09PM +0800, Hu Tao wrote: > From: Wanlong Gao <gaowanlong(a)cn.fujitsu.com> > > Signed-off-by: Wanlong Gao <gaowanlong(a)cn.fujitsu.com> > Signed-off-by: Igor Mammedov <imammedo(a)redhat.com> > Tested-by: Eduardo Habkost <ehabkost(a)redhat.com> > Reviewed-by: Eduardo Habkost <ehabkost(a)redhat.com> > Signed-off-by: Paolo Bonzini <pbonzini(a)redhat.com> > Signed-off-by: Hu Tao <hutao(a)cn.fujitsu.com> So, this is when the ability to use multiple "cpus" ranges on -numa is finally enabled, right? Is there some capability probing mechanism that can be used by management to detect the new feature? -- Eduardo

3 6

[libvirt] [PATCH] Increase the size of REMOTE_MIGRATE_COOKIE_MAX to REMOTE_STRING_MAX
by Shivaprasad G Bhat 16 Jun '14

16 Jun '14

During guest migration, if the domain xml is bigger than 16384 which is easily possible for a guest with good number of disks, message encode fails for xdr_remote_domain_migrate_perform3_ret(). So, Increase the COOKIE_MAX to STRING_MAX value. Signed-off-by: Shivaprasad G Bhat <shivaprasadbhat(a)gmail.com> --- src/remote/remote_protocol.x | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 1f9d583..ab9b83d 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -86,7 +86,7 @@ const REMOTE_VCPUINFO_MAX = 16384; const REMOTE_CPUMAPS_MAX = 8388608; /* Upper limit on migrate cookie. */ -const REMOTE_MIGRATE_COOKIE_MAX = 16384; +const REMOTE_MIGRATE_COOKIE_MAX = 4194304; /* Upper limit on lists of networks. */ const REMOTE_NETWORK_LIST_MAX = 16384;

4 3

[libvirt] [PATCH v2 00/10] active commit to backing file
by Eric Blake 16 Jun '14

16 Jun '14

This enables active commit (collapsing a temporary qcow2 wrapper file back into the permanent backing file), when the destination is a regular file or block device. Further plans for this work before 1.2.6 is released: figure out how to add a qemu capability probe (qemu 2.0 supports active commit but did a lousy job of advertising it, and I found a corner case bug in it that won't be fixed until 2.1), and integrate with Peter's work to allow active commit into a network backing file. Earlier posts related to this series: https://www.redhat.com/archives/libvir-list/2014-May/msg00564.html https://www.redhat.com/archives/libvir-list/2014-May/msg00723.html There are definitely some merge conflicts to still work out (both Peter and I are adding a new flag to virDomainBlockCommit, so it is touching some of the same code). I can rebase again on top of Peter's pending patches, if needed. I also think the switch from nested struct to pointer for a disk definition's source will make it easier for Benoit's desire to implement quorums. Eric Blake (10): conf: store snapshot source as pointer, for easier manipulation conf: consolidate disk def allocation conf: store disk source as pointer, for easier manipulation conf: store mirroring information in virStorageSource conf: alter disk mirror xml output blockcommit: document semantics of committing active layer virsh: expose new active commit controls blockcommit: update error messages related to block jobs blockcommit: track job type in xml blockcommit: turn on active commit docs/formatdomain.html.in | 25 +- docs/schemas/domaincommon.rng | 35 +- include/libvirt/libvirt.h.in | 12 +- src/conf/domain_conf.c | 275 ++++++++----- src/conf/domain_conf.h | 7 +- src/conf/snapshot_conf.c | 56 +-- src/conf/snapshot_conf.h | 2 +- src/libvirt.c | 55 ++- src/libvirt_private.syms | 1 + src/lxc/lxc_controller.c | 8 +- src/lxc/lxc_driver.c | 8 +- src/parallels/parallels_driver.c | 2 +- src/qemu/qemu_command.c | 290 ++++++------- src/qemu/qemu_conf.c | 88 ++-- src/qemu/qemu_domain.c | 22 +- src/qemu/qemu_driver.c | 451 ++++++++++++--------- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_migration.c | 4 +- src/qemu/qemu_process.c | 39 +- src/security/security_selinux.c | 4 +- src/vbox/vbox_tmpl.c | 6 +- src/vmx/vmx.c | 2 +- src/xenxs/xen_sxpr.c | 8 +- src/xenxs/xen_xm.c | 4 +- .../qemuxml2argv-disk-active-commit.xml | 37 ++ .../qemuxml2argv-disk-mirror-old.xml | 47 +++ .../qemuxml2argvdata/qemuxml2argv-disk-mirror.xml | 9 +- .../qemuxml2xmlout-disk-mirror-old-inactive.xml | 41 ++ .../qemuxml2xmlout-disk-mirror-old.xml | 52 +++ tests/qemuxml2xmltest.c | 2 + tests/securityselinuxlabeltest.c | 6 +- tools/virsh-domain.c | 57 ++- tools/virsh.pod | 27 +- 33 files changed, 1072 insertions(+), 612 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-active-commit.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-mirror-old.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-old-inactive.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-mirror-old.xml -- 1.9.3

2 26

[libvirt] [PATCH 0/4] catch bogus 'blockcommit --base=a --top=a'
by Eric Blake 16 Jun '14

16 Jun '14

This patch series was first hinted at here: https://www.redhat.com/archives/libvir-list/2014-June/msg00589.html It fixes a minor bug that has existed since blockcommit was first added, where we had an off-by-one that caused us to generate different error messages in some cases where a user was passing an impossible request to blockcommit (basically, we tried to filter bogus cases up front to give a nice message, but missed one case that resulted in reporting a different message from qemu instead). I apologize in advance for the conflicts this creates with Peter's pending series, but think that the testsuite is both more legible and more thorough with the changes added in this series. It's split into several patches to make review easier. And can I just add that it is annoying dealing with gcc's: virstoragetest.c:1076:1: error: the frame size of 6608 bytes is larger than 4096 bytes [-Werror=frame-larger-than=] (although I agree with the need for keeping that warning) Eric Blake (4): storage: add alias for less typing storage: renumber lookup tests storage: better tests of lookup blockcommit: require base below top src/qemu/qemu_driver.c | 3 +- src/util/virstoragefile.c | 33 +++++---- tests/virstoragetest.c | 184 ++++++++++++++++++++++++++++------------------ 3 files changed, 135 insertions(+), 85 deletions(-) -- 1.9.3

2 9

[libvirt] [PATCH] qemu: snapshot: Don't mark all block disks for metadata reuse
by Peter Krempa 16 Jun '14

16 Jun '14

For block devices used as snapshot source the new snapshot code would set the reuse flag. This inhibits to take snapshot without specially preparing the block image before taking the snapshot. Fortunately this is not a regression as only the new way of specifying snapshot source is affected. For the followin snapshot XML: <domainsnapshot> <disks> <disk name='vda' type='block'> <driver type='qcow2'/> <source dev="/dev/andariel/testsnap" /> </disk> </disks> </domainsnapshot> You'd get: error: internal error: unable to execute QEMU command 'transaction': Image is not in qcow2 format After this patch the snapshot is created successfully. --- src/qemu/qemu_driver.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7bf2020..7ac7aa2 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12885,13 +12885,11 @@ qemuDomainSnapshotCreateSingleDiskActive(virQEMUDriverPtr driver, switch ((virStorageType)snap->src->type) { case VIR_STORAGE_TYPE_BLOCK: - reuse = true; - /* fallthrough */ case VIR_STORAGE_TYPE_FILE: /* create the stub file and set selinux labels; manipulate disk in * place, in a way that can be reverted on failure. */ - if (!reuse) { + if (!reuse && snap->src->type != VIR_STORAGE_TYPE_BLOCK) { fd = qemuOpenFile(driver, vm, source, O_WRONLY | O_TRUNC | O_CREAT, &need_unlink, NULL); if (fd < 0) -- 1.9.3

2 2

[libvirt] [PATCH v2 0/2] Expose PCI Express capabilities
by Michal Privoznik 16 Jun '14

16 Jun '14

diff to v1: -Matin's review suggestions worked in -I've found that (testing this on my new HW) that some PCI-Express devices doesn't have to necessarily export link info. That's why I'm inventing this virPCIDeviceHasPCIExpressLink() which tells us if that's the case. So for a PCI Express device without link info exposed, the XML will simply contain <pci-express/>. Michal Privoznik (2): virpci: Introduce virPCIDeviceIsPCIExpress and friends nodedev: Introduce <pci-express/> to PCI devices docs/formatnode.html.in | 19 +++ docs/schemas/nodedev.rng | 26 ++++ src/conf/node_device_conf.c | 138 ++++++++++++++++++++- src/conf/node_device_conf.h | 33 ++++- src/libvirt_private.syms | 3 + src/node_device/node_device_udev.c | 34 +++++ src/util/virpci.c | 96 +++++++++++++- src/util/virpci.h | 8 ++ .../pci_8086_0c0c_snd_hda_intel.xml | 16 +++ .../pci_8086_4238_pcie_wireless.xml | 26 ++++ tests/nodedevxml2xmltest.c | 2 + 11 files changed, 397 insertions(+), 4 deletions(-) create mode 100644 tests/nodedevschemadata/pci_8086_0c0c_snd_hda_intel.xml create mode 100644 tests/nodedevschemadata/pci_8086_4238_pcie_wireless.xml -- 1.8.5.5

2 4

[libvirt] [PATCH] virsh: Parse "--mode readonly, shareable" in virsh attach-disk.
by Dongsheng Yang 16 Jun '14

16 Jun '14

We can not attach a disk with mode of both readonly and shareable. Before: # virsh attach-disk --domain jeos --source attach.img --target vdb --persistent --mode readonly --mode shareable error: option --mode already seen # virsh attach-disk --domain jeos --source attach.img --target vdb --persistent --mode readonly --shareable error: option --mode already seen # virsh attach-disk --domain jeos --source attach.img --target vdb --persistent --mode readonly,shareable error: No support for readonly,shareable in command 'attach-disk' After: # virsh attach-disk --domain jeos --source attach.img --target vdb --persistent --mode readonly,shareable Disk attached successfully Signed-off-by: Dongsheng Yang <yangds.fnst(a)cn.fujitsu.com> --- tools/virsh-domain.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 6b3dd70..62a9824 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -515,6 +515,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) bool config = vshCommandOptBool(cmd, "config"); bool live = vshCommandOptBool(cmd, "live"); bool persistent = vshCommandOptBool(cmd, "persistent"); + char **modes = NULL, **tmp; VSH_EXCLUSIVE_OPTIONS_VAR(persistent, current); @@ -553,12 +554,9 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - if (mode) { - if (STRNEQ(mode, "readonly") && STRNEQ(mode, "shareable")) { - vshError(ctl, _("No support for %s in command 'attach-disk'"), - mode); - goto cleanup; - } + if (mode && !(modes = virStringSplit(mode, ",", 0))) { + vshError(ctl, "%s", _("Cannot parse mode string")); + goto cleanup; } if (wwn && !virValidateWWN(wwn)) @@ -591,8 +589,19 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) virBufferAsprintf(&buf, "<source %s='%s'/>\n", isFile ? "file" : "dev", source); virBufferAsprintf(&buf, "<target dev='%s'/>\n", target); - if (mode) - virBufferAsprintf(&buf, "<%s/>\n", mode); + + tmp = modes; + while (tmp && *tmp) { + mode = *tmp; + if (STREQ(mode, "readonly") || STREQ(mode, "shareable")) { + virBufferAsprintf(&buf, "<%s/>\n", mode); + } else { + vshError(ctl, _("Unknown mode %s value, expecting " + "'readonly', 'shareable'"), mode); + goto cleanup; + } + tmp++; + } if (serial) virBufferAsprintf(&buf, "<serial>%s</serial>\n", serial); -- 1.8.3.1

2 1

[libvirt] [PATCH] leaseshelper: fix another creash
by Pavel Hrdina 16 Jun '14

16 Jun '14

We create a 'lease_new' when we are adding new lease entry, then later in the code we add the 'lease_new' into a 'leases_array_new' which leades into the creash because we double free the 'lease_new'. To prevent the double free we set the 'lease_new' to NULL after successful append into the 'leases_array_new'. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/network/leaseshelper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index 69081c3..bf1842b 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -331,6 +331,7 @@ main(int argc, char **argv) _("failed to create json")); goto cleanup; } + lease_new = NULL; } if (!(leases_str = virJSONValueToString(leases_array_new, true))) { -- 1.8.5.5

2 3

[libvirt] [libvirt-sandbox PATCH v2] Only set SELinux seclabel if supported by the host.
by Cédric Bosdonnat 16 Jun '14

16 Jun '14

This code depends on new API in libvirt-gconfig to extract the secmodels handled by the host. --- Diff to v1: * Adapted the naming change from libvirt-gconfig libvirt-sandbox/libvirt-sandbox-builder.c | 68 ++++++++++++++++++++----------- 1 file changed, 45 insertions(+), 23 deletions(-) diff --git a/libvirt-sandbox/libvirt-sandbox-builder.c b/libvirt-sandbox/libvirt-sandbox-builder.c index 48b3acc..327f144 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder.c +++ b/libvirt-sandbox/libvirt-sandbox-builder.c @@ -323,38 +323,60 @@ static gboolean gvir_sandbox_builder_construct_devices(GVirSandboxBuilder *build } -static gboolean gvir_sandbox_builder_construct_security(GVirSandboxBuilder *builder G_GNUC_UNUSED, +static gboolean gvir_sandbox_builder_construct_security(GVirSandboxBuilder *builder, GVirSandboxConfig *config G_GNUC_UNUSED, const gchar *statedir G_GNUC_UNUSED, GVirConfigDomain *domain, - GError **error G_GNUC_UNUSED) + GError **error) { GVirConfigDomainSeclabel *sec = gvir_config_domain_seclabel_new(); const char *label = gvir_sandbox_config_get_security_label(config); + GVirConnection *connection = gvir_sandbox_builder_get_connection(builder); + GVirConfigCapabilities *configCapabilities; + GVirConfigCapabilitiesHost *hostCapabilities; + GList *secmodels, *iter; + gboolean supportsSelinux = FALSE; + + /* What security models are available on the host? */ + if (!(configCapabilities = gvir_connection_get_capabilities(connection, error))) { + g_object_unref(sec); + return FALSE; + } + + hostCapabilities = gvir_config_capabilities_get_host(configCapabilities); - gvir_config_domain_seclabel_set_model(sec, "selinux"); - if (gvir_sandbox_config_get_security_dynamic(config)) { - gvir_config_domain_seclabel_set_type(sec, - GVIR_CONFIG_DOMAIN_SECLABEL_DYNAMIC); - if (label) - gvir_config_domain_seclabel_set_baselabel(sec, label); - else if (gvir_config_domain_get_virt_type(domain) == - GVIR_CONFIG_DOMAIN_VIRT_LXC) - gvir_config_domain_seclabel_set_baselabel(sec, "system_u:system_r:svirt_lxc_net_t:s0"); - else if (gvir_config_domain_get_virt_type(domain) == - GVIR_CONFIG_DOMAIN_VIRT_QEMU) - gvir_config_domain_seclabel_set_baselabel(sec, "system_u:system_r:svirt_tcg_t:s0"); - else if (gvir_config_domain_get_virt_type(domain) == - GVIR_CONFIG_DOMAIN_VIRT_KVM) - gvir_config_domain_seclabel_set_baselabel(sec, "system_u:system_r:svirt_t:s0"); - } else { - gvir_config_domain_seclabel_set_type(sec, - GVIR_CONFIG_DOMAIN_SECLABEL_STATIC); - if (label) - gvir_config_domain_seclabel_set_label(sec, label); + secmodels = gvir_config_capabilities_host_get_secmodels(hostCapabilities); + for (iter = secmodels; iter != NULL; iter = iter->next) { + supportsSelinux = g_str_equal(gvir_config_capabilities_host_secmodel_get_model( + GVIR_CONFIG_CAPABILITIES_HOST_SECMODEL(iter->data)), "selinux"); + g_object_unref(iter->data); } - gvir_config_domain_set_seclabel(domain, sec); + if (supportsSelinux) { + gvir_config_domain_seclabel_set_model(sec, "selinux"); + if (gvir_sandbox_config_get_security_dynamic(config)) { + gvir_config_domain_seclabel_set_type(sec, + GVIR_CONFIG_DOMAIN_SECLABEL_DYNAMIC); + if (label) + gvir_config_domain_seclabel_set_baselabel(sec, label); + else if (gvir_config_domain_get_virt_type(domain) == + GVIR_CONFIG_DOMAIN_VIRT_LXC) + gvir_config_domain_seclabel_set_baselabel(sec, "system_u:system_r:svirt_lxc_net_t:s0"); + else if (gvir_config_domain_get_virt_type(domain) == + GVIR_CONFIG_DOMAIN_VIRT_QEMU) + gvir_config_domain_seclabel_set_baselabel(sec, "system_u:system_r:svirt_tcg_t:s0"); + else if (gvir_config_domain_get_virt_type(domain) == + GVIR_CONFIG_DOMAIN_VIRT_KVM) + gvir_config_domain_seclabel_set_baselabel(sec, "system_u:system_r:svirt_t:s0"); + } else { + gvir_config_domain_seclabel_set_type(sec, + GVIR_CONFIG_DOMAIN_SECLABEL_STATIC); + if (label) + gvir_config_domain_seclabel_set_label(sec, label); + } + + gvir_config_domain_set_seclabel(domain, sec); + } g_object_unref(sec); return TRUE; -- 1.8.4.5

3 2

[libvirt] [PATCH 0/5] Expose host's huge pages capability
by Michal Privoznik 16 Jun '14

16 Jun '14

*** BLURB HERE *** Michal Privoznik (5): virnuma: Introduce huge pages helpers virCaps: expose huge page info Introduce virNodeGetFreePages virsh: Expose virNodeGetFreePages qemu: Implement virNodeGetFreePages daemon/remote.c | 52 ++++++++++ docs/schemas/capability.rng | 21 ++++ include/libvirt/libvirt.h.in | 7 ++ src/conf/capabilities.c | 25 ++++- src/conf/capabilities.h | 15 ++- src/driver.h | 10 ++ src/libvirt.c | 95 +++++++++++++++++ src/libvirt_private.syms | 2 + src/libvirt_public.syms | 4 + src/libxl/libxl_conf.c | 1 + src/nodeinfo.c | 41 +++++++- src/qemu/qemu_capabilities.c | 29 +++++- src/qemu/qemu_driver.c | 43 ++++++++ src/remote/remote_driver.c | 50 +++++++++ src/remote/remote_protocol.x | 20 +++- src/remote_protocol-structs | 16 +++ src/test/test_driver.c | 2 +- src/util/virnuma.c | 242 +++++++++++++++++++++++++++++++++++++++++++ src/util/virnuma.h | 10 ++ src/xen/xend_internal.c | 1 + tests/vircaps2xmltest.c | 3 +- tests/vircapstest.c | 1 + tools/virsh-host.c | 167 +++++++++++++++++++++++++++++ tools/virsh.pod | 8 ++ 24 files changed, 856 insertions(+), 9 deletions(-) -- 1.8.5.5

3 15

[libvirt] [PATCH v3] QEMU: parse '-device vfio-pci' and '-device pci-assign'
by Olivia Yin 16 Jun '14

16 Jun '14

Signed-off-by: Olivia Yin <Hong-Hua.Yin(a)freescale.com> Signed-off-by: Laine Stump <laine(a)laine.org> Modify the existing function qemuParseCommandLinePCI(), which works with -pcidevice, to support for "-device pci-assign" and "-device pci-assign". Change test cases 'hostdev-vfio' and 'hostdev-pci-address-device' to validate the new function. The case related to QEMU_CAPS_HOST_PCI_MULTIDOMAIN which uses 'host=domain:bus:slot.func' is not supported yet. --- src/qemu/qemu_command.c | 50 +++++++++++++++++++--- tests/qemuargv2xmltest.c | 3 +- .../qemuxml2argv-hostdev-pci-address-device.xml | 6 +++ .../qemuxml2argvdata/qemuxml2argv-hostdev-vfio.xml | 1 + 4 files changed, 53 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index e1d7e1b..3a4bc61 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10193,7 +10193,8 @@ qemuParseCommandLineNet(virDomainXMLOptionPtr xmlopt, * Tries to parse a QEMU PCI device */ static virDomainHostdevDefPtr -qemuParseCommandLinePCI(const char *val) +qemuParseCommandLinePCI(const char *val, + virDomainHostdevSubsysPCIBackendType backend) { int bus = 0, slot = 0, func = 0; const char *start; @@ -10222,10 +10223,20 @@ qemuParseCommandLinePCI(const char *val) goto error; } start = end + 1; - if (virStrToLong_i(start, NULL, 16, &func) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot extract PCI device function '%s'"), val); - goto error; + + if (backend) { + if (virStrToLong_i(start, &end, 16, &func) < 0 || *end != ',') { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot extract PCI device function '%s'"), val); + goto error; + } else + def->source.subsys.u.pci.backend = backend; + } else { + if (virStrToLong_i(start, NULL, 16, &func) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot extract PCI device function '%s'"), val); + goto error; + } } def->mode = VIR_DOMAIN_HOSTDEV_MODE_SUBSYS; @@ -11347,7 +11358,34 @@ qemuParseCommandLine(virCapsPtr qemuCaps, } else if (STREQ(arg, "-pcidevice")) { virDomainHostdevDefPtr hostdev; WANT_VALUE(); - if (!(hostdev = qemuParseCommandLinePCI(val))) + if (!(hostdev = qemuParseCommandLinePCI(val, + VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT))) + goto error; + if (VIR_APPEND_ELEMENT(def->hostdevs, def->nhostdevs, hostdev) < 0) { + virDomainHostdevDefFree(hostdev); + goto error; + } + } else if (STREQ(arg, "-device") && progargv[i+1] && + STRPREFIX(progargv[i+1], "vfio-pci")) { + const char *start; + virDomainHostdevDefPtr hostdev; + WANT_VALUE(); + start = val + strlen("vfio-pci,"); + if (!(hostdev = qemuParseCommandLinePCI(start, + VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO))) + goto error; + if (VIR_APPEND_ELEMENT(def->hostdevs, def->nhostdevs, hostdev) < 0) { + virDomainHostdevDefFree(hostdev); + goto error; + } + } else if (STREQ(arg, "-device") && progargv[i+1] && + STRPREFIX(progargv[i+1], "pci-assign")) { + const char *start; + virDomainHostdevDefPtr hostdev; + WANT_VALUE(); + start = val + strlen("pci-assign,"); + if (!(hostdev = qemuParseCommandLinePCI(start, + VIR_DOMAIN_HOSTDEV_PCI_BACKEND_KVM))) goto error; if (VIR_APPEND_ELEMENT(def->hostdevs, def->nhostdevs, hostdev) < 0) { virDomainHostdevDefFree(hostdev); diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 2cbbe3d..80188be 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -274,8 +274,9 @@ mymain(void) DO_TEST("watchdog"); DO_TEST("hostdev-usb-address"); - DO_TEST("hostdev-pci-address"); + DO_TEST("hostdev-pci-address-device"); + DO_TEST("hostdev-vfio"); DO_TEST("smp"); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.xml index b29ef58..b9a221a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.xml @@ -15,10 +15,16 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> <hostdev mode='subsystem' type='pci' managed='yes'> + <driver name='kvm'/> <source> <address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/> </source> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.xml index 8daa53a..b99f798 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.xml @@ -15,6 +15,7 @@ <devices> <emulator>/usr/bin/qemu</emulator> <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> <source dev='/dev/HostVG/QEMUGuest2'/> <target dev='hda' bus='ide'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> -- 1.8.5

2 1

[libvirt] [PATCH] bhyve: silent destroy command errors on cleanup
by Roman Bogorodskiy 13 Jun '14

13 Jun '14

When virBhyveProcessStart() fails, it tries to unload a guest that could have been already loaded using bhyveload(8) to make sure not to leave it hanging in memory. However, we could fail before loading a VM into memory, so 'bhyvectl --destroy' command will fail and print an error message that looks confusing to users. So ignore errors when running this in cleanup. --- src/bhyve/bhyve_process.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index b8db076..36c2c21 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -189,12 +189,13 @@ virBhyveProcessStart(virConnectPtr conn, cleanup: if (ret < 0) { + int exitstatus = -1; virCommandPtr destroy_cmd; if ((destroy_cmd = virBhyveProcessBuildDestroyCmd(driver, vm->def)) != NULL) { virCommandSetOutputFD(load_cmd, &logfd); virCommandSetErrorFD(load_cmd, &logfd); - ignore_value(virCommandRun(destroy_cmd, NULL)); + ignore_value(virCommandRun(destroy_cmd, &exitstatus)); virCommandFree(destroy_cmd); } -- 1.9.0

2 2

[libvirt] [PATCH 0/2] bhyve: fix crashes when running without networking
by Roman Bogorodskiy 13 Jun '14

13 Jun '14

Craig Rodrigues reported a problem on freebsd-virtualization list when libvirtd with bhyve driver crashes when the bridge does not exist [1]. 1: http://docs.freebsd.org/cgi/getmsg.cgi?fetch=1431191+0+current/freebsd-virt… These two patches addresses the problem. Roman Bogorodskiy (2): bhyve: fix crash in bhyveBuildNetArgStr bhyve: do not cleanup unallocated networks on fail src/bhyve/bhyve_command.c | 3 +-- src/bhyve/bhyve_process.c | 10 ++++++---- 2 files changed, 7 insertions(+), 6 deletions(-) -- 1.9.0

2 6

[libvirt] [PATCH] storage: report VIR_ERR_NO_STORAGE_VOL when the file doesn't exist
by Giuseppe Scrivano 13 Jun '14

13 Jun '14

Report VIR_ERR_NO_STORAGE_VOL instead of a system error when lstat fails because the file doesn't exist. Fixes this problem in virt-install: https://bugzilla.redhat.com/show_bug.cgi?id=1108922 Signed-off-by: Giuseppe Scrivano <gscrivan(a)redhat.com> --- src/storage/storage_backend.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 380ca58..b38af52 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1305,9 +1305,15 @@ virStorageBackendVolOpen(const char *path, struct stat *sb, bool noerror = (flags & VIR_STORAGE_VOL_OPEN_NOERROR); if (lstat(path, sb) < 0) { - if (errno == ENOENT && noerror) { - VIR_WARN("ignoring missing file '%s'", path); - return -2; + if (errno == ENOENT) { + if (noerror) { + VIR_WARN("ignoring missing file '%s'", path); + return -2; + } + virReportError(VIR_ERR_NO_STORAGE_VOL, + _("no storage vol with matching path '%s'"), + path); + return -1; } virReportSystemError(errno, _("cannot stat file '%s'"), -- 1.9.3

2 2

[libvirt] [PATCH v6] bhyve: implement PCI address allocation
by Roman Bogorodskiy 13 Jun '14

13 Jun '14

Changes from v4: - Qemu-related part of sharing the common code is complete and pushed, so patch lives on its own now - virBhyveProcessBuildBhyveCmd() modified to loop over disks and nets and call bhyveBuildDiskArgStr() and bhyveBuildNetArgStr() for an individual device to make the latter more readable - Fix double assing / double semicolon typo - Fix spelling in virReportError() for disks - Make bhyveAssignDevicePCISlots() assign nets before disks to reproduce the old behaviour when one net and one disk were supported - Make persistentAddrs of _bhyveDomainObjPrivate bool. Changes from v5: - Call bhyveDomainAssignAddresses() in virBhyveProcessStart() in order not to break domains defined in the earlier versions of libvirtd that did no address assignment - Call bhyveDomainAssignAddresses() in bhyveDomainCreateXML() Roman Bogorodskiy (1): bhyve: implement PCI address allocation po/POTFILES.in | 1 + src/Makefile.am | 4 + src/bhyve/bhyve_command.c | 112 +++++++------ src/bhyve/bhyve_device.c | 174 +++++++++++++++++++++ src/bhyve/bhyve_device.h | 38 +++++ src/bhyve/bhyve_domain.c | 75 +++++++++ src/bhyve/bhyve_domain.h | 39 +++++ src/bhyve/bhyve_driver.c | 12 +- .../bhyvexml2argvdata/bhyvexml2argv-acpiapic.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml | 2 + tests/bhyvexml2argvdata/bhyvexml2argv-base.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-base.xml | 2 + tests/bhyvexml2argvdata/bhyvexml2argv-console.args | 4 +- tests/bhyvexml2argvdata/bhyvexml2argv-console.xml | 2 + .../bhyvexml2argv-disk-virtio.args | 2 +- .../bhyvexml2argv-disk-virtio.xml | 2 + tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml | 2 + tests/bhyvexml2argvdata/bhyvexml2argv-serial.args | 4 +- tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml | 2 + 20 files changed, 416 insertions(+), 67 deletions(-) create mode 100644 src/bhyve/bhyve_device.c create mode 100644 src/bhyve/bhyve_device.h create mode 100644 src/bhyve/bhyve_domain.c create mode 100644 src/bhyve/bhyve_domain.h -- 1.9.0 Roman Bogorodskiy (1): bhyve: implement PCI address allocation po/POTFILES.in | 1 + src/Makefile.am | 4 + src/bhyve/bhyve_command.c | 112 +++++++------ src/bhyve/bhyve_device.c | 174 +++++++++++++++++++++ src/bhyve/bhyve_device.h | 38 +++++ src/bhyve/bhyve_domain.c | 75 +++++++++ src/bhyve/bhyve_domain.h | 39 +++++ src/bhyve/bhyve_driver.c | 15 +- src/bhyve/bhyve_process.c | 4 + .../bhyvexml2argvdata/bhyvexml2argv-acpiapic.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml | 2 + tests/bhyvexml2argvdata/bhyvexml2argv-base.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-base.xml | 2 + tests/bhyvexml2argvdata/bhyvexml2argv-console.args | 4 +- tests/bhyvexml2argvdata/bhyvexml2argv-console.xml | 2 + .../bhyvexml2argv-disk-virtio.args | 2 +- .../bhyvexml2argv-disk-virtio.xml | 2 + tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args | 2 +- tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.xml | 2 + tests/bhyvexml2argvdata/bhyvexml2argv-serial.args | 4 +- tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml | 2 + 21 files changed, 423 insertions(+), 67 deletions(-) create mode 100644 src/bhyve/bhyve_device.c create mode 100644 src/bhyve/bhyve_device.h create mode 100644 src/bhyve/bhyve_domain.c create mode 100644 src/bhyve/bhyve_domain.h -- 1.9.0

2 3

[libvirt] [RFC PATCH 0/5] Refactor storage file metadata operations when dealing with snapshots.
by Peter Krempa 13 Jun '14

13 Jun '14

Now that we track storage source as a pointer we might use this. Note that this is currently work in progress as I've didn't check all code paths and whether it's safe to modify the backing chains as I did. Peter Krempa (5): storage: encryption: Add deep copy function for storage encryption util: seclabel: Add deep copy function for device labels util: storagefile: Introduce helper to free storage source perms util: storagefile: Add deep copy for struct virStorageSource qemu: snapshot: Improve approach to deal with snapshot metadata src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 108 +++++--------------------- src/util/virseclabel.c | 22 ++++++ src/util/virseclabel.h | 5 +- src/util/virstorageencryption.c | 39 ++++++++++ src/util/virstorageencryption.h | 2 + src/util/virstoragefile.c | 166 +++++++++++++++++++++++++++++++++++++++- src/util/virstoragefile.h | 2 + 8 files changed, 251 insertions(+), 94 deletions(-) -- 1.9.3

2 12

[libvirt] [PATCH] virNetDevGetLinkInfo: Don't report link speed if NIC's not up
by Michal Privoznik 13 Jun '14

13 Jun '14

The kernel's more broken than one would think. Various drivers report various (usually spurious) values if the interface is in other state than 'up' . While on some we experience -EINVAL when read()-ing the speed sysfs file, with other drivers we might get anything from 0 to UINT_MAX. If that's the case it's better to not report link speed. Well, the interface is not up anyway. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virnetdev.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 6f3a202..a551f98 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1875,6 +1875,16 @@ virNetDevGetLinkInfo(const char *ifname, lnk->state = tmp_state; + /* Shortcut to avoid some kernel issues. If link is not up several drivers + * report several misleading values. While igb reports 65535, realtek goes + * with 10. To avoid muddying XML with insane values, don't report link + * speed if that's the case. */ + if (lnk->state != VIR_INTERFACE_STATE_UP) { + lnk->speed = 0; + ret = 0; + goto cleanup; + } + VIR_FREE(path); VIR_FREE(buf); @@ -1901,11 +1911,7 @@ virNetDevGetLinkInfo(const char *ifname, goto cleanup; } - /* Workaround broken kernel API. If the link is unplugged then - * depending on the NIC driver, link speed can be reported as -1. - * However, the value is printed out as unsigned integer instead of - * signed one. Terrifying but true. */ - lnk->speed = (int) tmp_speed == -1 ? 0 : tmp_speed; + lnk->speed = tmp_speed; ret = 0; cleanup: -- 1.8.5.5

2 2

[libvirt] storage conf: Add key-value options to storage pools
by Wido den Hollander 13 Jun '14

13 Jun '14

This series of patches adds the ability to pass down options to the storage pool drivers. In the case of NFS users can specify mount options and in the case of RBD users can specify options for librados to influence some behavior. All options and values are checked on input validity to prevent injection of malicious commands. -- Wido den Hollander

4 7

[libvirt] [PATCH] virNetDevGetLinkInfo: Don't report link speed if NIC's down
by Michal Privoznik 13 Jun '14

13 Jun '14

The kernel's more broken than one would think. Various drivers report various (usually spurious) values if the interface is down. While on some we experience -EINVAL when read()-ing the speed sysfs file, with other drivers we might get anything from 0 to UINT_MAX. If that's the case it's better to not report link speed. Well, the interface is down anyway. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virnetdev.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 6f3a202..80ef572 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1843,7 +1843,7 @@ virNetDevGetLinkInfo(const char *ifname, char *buf = NULL; char *tmp; int tmp_state; - unsigned int tmp_speed; + unsigned int tmp_speed; /* virInterfaceState */ if (virNetDevSysfsFile(&path, ifname, "operstate") < 0) goto cleanup; @@ -1875,6 +1875,16 @@ virNetDevGetLinkInfo(const char *ifname, lnk->state = tmp_state; + /* Shortcut to avoid some kernel issues. If link is down (and possibly in + * other states too) several drivers report several values. While igb + * reports 65535, realtek goes with 10. To avoid muddying XML with insane + * values, don't report link speed */ + if (lnk->state == VIR_INTERFACE_STATE_DOWN) { + lnk->speed = 0; + ret = 0; + goto cleanup; + } + VIR_FREE(path); VIR_FREE(buf); @@ -1884,6 +1894,7 @@ virNetDevGetLinkInfo(const char *ifname, if (virFileReadAll(path, 1024, &buf) < 0) { /* Some devices doesn't report speed, in which case we get EINVAL */ if (errno == EINVAL) { + lnk->speed = 0; ret = 0; goto cleanup; } -- 1.8.5.5

4 8

[libvirt] [PATCHv4 00/21] block pull/commit on gluster volumes with relative backing
by Peter Krempa 13 Jun '14

13 Jun '14

Peter Krempa (21): security: Don't skip labelling for network disks util: string: Add helper to free non-NULL terminated string arrays util: storagefile: Introduce universal function to canonicalize paths storage: gluster: Add backend to return unique storage file path util: storage: Add helper to resolve relative path difference tests: virstoragetest: Remove "expBackingStore" field tests: virstoragetest: Fix output when hitting errors storage: Store relative path only for relatively backed storage tests: virstoragetest: Remove now unused pathAbs util: storage: Remove now redundant backingRelative from virStorageSource tests: virstoragetest: Don't test relative start of backing chains tests: virstoragetest: Remove unneeded relative test plumbing storage: Don't canonicalize paths unnecessarily storage: Don't store parent directory of an image explicitly qemu: caps: Add capability for change-backing-file command qemu: monitor: Add argument for specifying backing name for block commit qemu: monitor: Add support for backing name specification for block-stream lib: Introduce flag VIR_DOMAIN_BLOCK_COMMIT_RELATIVE lib: Introduce flag VIR_DOMAIN_BLOCK_REBASE_RELATIVE qemu: Add support for networked disks for block commit qemu: Add support for networked disks for block pull/block rebase include/libvirt/libvirt.h.in | 6 + src/libvirt.c | 10 + src/libvirt_private.syms | 3 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 85 ++++++- src/qemu/qemu_migration.c | 6 +- src/qemu/qemu_monitor.c | 21 +- src/qemu/qemu_monitor.h | 4 +- src/qemu/qemu_monitor_json.c | 17 ++ src/qemu/qemu_monitor_json.h | 2 + src/security/security_dac.c | 3 - src/security/security_selinux.c | 3 - src/storage/storage_backend_gluster.c | 80 ++++++ src/storage/storage_driver.c | 15 +- src/util/virstoragefile.c | 392 +++++++++++++++++++++++------ src/util/virstoragefile.h | 20 +- src/util/virstring.c | 20 ++ src/util/virstring.h | 1 + tests/qemumonitorjsontest.c | 2 +- tests/virstoragetest.c | 450 +++++++++++++++++++++------------- tools/virsh-domain.c | 29 ++- tools/virsh.pod | 10 +- 23 files changed, 883 insertions(+), 299 deletions(-) -- 1.9.3

2 25

[libvirt] [PATCH RFC 0/3] allow setting video ram size for graphics
by Wangrui (K) 13 Jun '14

13 Jun '14

https://bugzilla.redhat.com/show_bug.cgi?id=1076098 Zeng Junliang (3): For vga/cirrus/vmvga/qxl device, qemu supports commandline parameter "vgamem_mb" to specifie the size of the framebuffer portion of the "ram" region. As the vram attribute in libvirt is only valid for qxl device in KVM/QEMU to specifie the total size of the "vram" region, we expect a new attribute in libvirt. The following patches introduce "vgamem" attribute to make vgamem_mb configurable in libvirt xml. qemu: Introduce vgamem attribute for video model tests: modify test case related to vgamem attribute docs: add description for vgamem attribute docs/formatdomain.html.in | 24 +++++-- docs/schemas/domaincommon.rng | 5 ++ src/conf/domain_conf.c | 44 +++++++++++- src/conf/domain_conf.h | 3 +- src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 79 +++++++++++++++------- .../domain-parallels-ct-simple.xml | 2 +- .../domain-parallels-vm-simple.xml | 2 +- ...qemuhotplug-console-compat-2+console-virtio.xml | 2 +- .../qemuxml2argv-console-compat-2.xml | 2 +- .../qemuxml2argv-controller-order.xml | 2 +- .../qemuxml2argv-graphics-listen-network.xml | 2 +- .../qemuxml2argv-graphics-listen-network2.xml | 2 +- .../qemuxml2argv-graphics-sdl-fullscreen.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml | 2 +- ...emuxml2argv-graphics-spice-agent-file-xfer.args | 5 +- ...qemuxml2argv-graphics-spice-agent-file-xfer.xml | 4 +- .../qemuxml2argv-graphics-spice-agentmouse.xml | 2 +- .../qemuxml2argv-graphics-spice-compression.args | 4 +- .../qemuxml2argv-graphics-spice-compression.xml | 4 +- .../qemuxml2argv-graphics-spice-listen-network.xml | 4 +- .../qemuxml2argv-graphics-spice-qxl-vga.args | 3 +- .../qemuxml2argv-graphics-spice-qxl-vga.xml | 4 +- .../qemuxml2argv-graphics-spice-sasl.args | 3 +- .../qemuxml2argv-graphics-spice-sasl.xml | 2 +- .../qemuxml2argv-graphics-spice-timeout.xml | 2 +- .../qemuxml2argv-graphics-spice.args | 5 +- .../qemuxml2argv-graphics-spice.xml | 4 +- .../qemuxml2argv-graphics-vnc-policy.xml | 2 +- .../qemuxml2argv-graphics-vnc-sasl.xml | 2 +- .../qemuxml2argv-graphics-vnc-socket.xml | 2 +- .../qemuxml2argv-graphics-vnc-tls.xml | 2 +- .../qemuxml2argv-graphics-vnc-websocket.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml | 2 +- .../qemuxml2argv-net-bandwidth.xml | 2 +- .../qemuxml2argv-pci-autoadd-addr.xml | 2 +- .../qemuxml2argv-pci-autoadd-idx.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-pci-bridge.xml | 2 +- .../qemuxml2argv-pcihole64-q35.args | 3 +- .../qemuxml2argv-pcihole64-q35.xml | 2 +- .../qemuxml2argvdata/qemuxml2argv-pseries-disk.xml | 2 +- tests/qemuxml2argvdata/qemuxml2argv-q35.args | 3 +- tests/qemuxml2argvdata/qemuxml2argv-q35.xml | 2 +- .../qemuxml2argv-serial-spiceport.args | 3 +- .../qemuxml2argv-serial-spiceport.xml | 2 +- .../qemuxml2argv-video-device-pciaddr-default.args | 9 ++- .../qemuxml2argv-video-device-pciaddr-default.xml | 6 +- .../qemuxml2xmlout-graphics-listen-network2.xml | 2 +- .../qemuxml2xmlout-graphics-spice-timeout.xml | 2 +- .../qemuxml2xmlout-pci-autoadd-addr.xml | 2 +- .../qemuxml2xmlout-pci-autoadd-idx.xml | 2 +- tests/qemuxml2xmloutdata/qemuxml2xmlout-q35.xml | 2 +- tests/xml2vmxdata/xml2vmx-esx-in-the-wild-6.xml | 2 +- tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml | 2 +- tests/xml2vmxdata/xml2vmx-svga.xml | 2 +- tests/xml2vmxdata/xml2vmx-ws-in-the-wild-1.xml | 2 +- tests/xml2vmxdata/xml2vmx-ws-in-the-wild-2.xml | 2 +- 57 files changed, 197 insertions(+), 95 deletions(-) -- 1.7.12.4

2 2

[libvirt] [PATCH v2 0/4] Expose link state & speed
by Michal Privoznik 13 Jun '14

13 Jun '14

While the 1/4 was ACKed, I'm sending int for completeness. And I've made a tiny change: the link speed is no longer unsigned long but unsigned int instead. That'll do too and it consumes less memory. Michal Privoznik (4): virInterface: Expose link state & speed virnetdev: Introduce virNetDevGetLinkInfo interface_backend_udev: Implement link speed & state node_device: Expose link state & speed docs/formatnode.html.in | 6 ++ docs/schemas/basictypes.rng | 25 ++++++ docs/schemas/interface.rng | 1 + docs/schemas/nodedev.rng | 1 + src/Makefile.am | 4 +- src/conf/device_conf.c | 62 ++++++++++++++ src/conf/device_conf.h | 27 +++++- src/conf/interface_conf.c | 11 ++- src/conf/interface_conf.h | 2 + src/conf/node_device_conf.c | 7 +- src/conf/node_device_conf.h | 2 + src/interface/interface_backend_udev.c | 5 ++ src/libvirt_private.syms | 5 ++ src/node_device/node_device_driver.c | 11 ++- src/node_device/node_device_udev.c | 5 ++ src/util/virnetdev.c | 104 ++++++++++++++++++++++++ src/util/virnetdev.h | 6 ++ tests/interfaceschemadata/bridge-no-address.xml | 1 + tests/interfaceschemadata/bridge.xml | 1 + tests/interfaceschemadata/ethernet-dhcp.xml | 1 + 20 files changed, 280 insertions(+), 7 deletions(-) -- 2.0.0

5 25

Re: [libvirt] [PATCH] libxl: fix domxml-to-native wrong output for qcow2 format
by Bamvor Jian Zhang 13 Jun '14

13 Jun '14

>>>Jim Fehlig wrote: > Bamvor Jian Zhang<bjzhang(a)suse.com> wrote: >> e.g. for these following disk configuration in libvirt. >> <disk type='file' device='disk'> > > For Xen, using <driver name='qemu' .../> (which means qdisk) is only > supported by the libxl driver. The old xm/xend stack does not support qdisk. > >> <driver name='qemu' type='qcow2'/> >> <source file='/var/lib/xen/images/001/disk0.qcow2'/> >> <target dev='hdc'/> >> >> without this patch, it will be >> "qemu:/var/lib/xen/images/001/disk0.qcow2,hdc,w" > > Yeah, that won't work with xend or libxl :) . > >> but it should be(if with this patch) >> "qcow2:/var/lib/xen/images/001/disk0.qcow2,hdc,w" >> >> Signed-off-by: Bamvor Jian Zhang <bjzhang(a)suse.com> >> --- >> src/xenxs/xen_xm.c | 5 ++++- >> 1 file changed, 4 insertions(+), 1 deletion(-) >> >> diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c >> index b2db97d..29835b4 100644 >> --- a/src/xenxs/xen_xm.c >> +++ b/src/xenxs/xen_xm.c >> @@ -1209,7 +1209,10 @@ xenFormatXMDisk(virConfValuePtr list, >> type = "aio"; >> else >> type = virStorageFileFormatTypeToString(format); >> - virBufferAsprintf(&buf, "%s:", driver); >> + if (!STREQ(type, "qcow2")) >> + virBufferAsprintf(&buf, "%s:", driver); >> + else >> + virBufferAsprintf(&buf, "%s:", type); > > But this only handles the specific case of <driver name='qemu' > type='qcow2'/>. > With <driver name='qemu' type='raw'/>, I get > > "qemu:/path/to/disk,hdc,w" > > Unfortunately, this is a case where we are trying to use the xm config > parser to parse something that is xl-specific. With <driver > name='qemu'.../>, > the corresponding xl disk config would look something like > > disk = ['backendtype=qdisk,/var/lib/xen/images/001/disk0.qcow2,hdc,w'] > > With the type also specified, e.g. <driver name='qemu' type='qcow2'/>, the > xl > disk config would be > > disk = > ['backendtype=qdisk,format=qcow2,/var/lib/xen/images/001/disk0.qcow2,hdc,w'] > > As I see it, the options are > > 1. start working on a xen-xl parser > 2. map 'qemu' to 'tap' > > We'll eventually need 1 anyhow. I haven't looked to see how much work that > would be. Certainly a lot of the xm parsing code could be used since xm > config is a subset of xl config. understand. the main difference between xl and xm format is disk and network. and it worth to do it. > > Option 2 is really a no-op in the libxl stack, where qdisk is used in place > of tap anyhow. One could argue that mapping qemu to tap isn't too insane in > the xm/xend stack either, since much of the blktap userspace code was > originally based on qemu. > > The below patch works for me. Can you give it a try? I'd like to hear wha > others think about taking the easy way out with option 2. the following patch works for me. regards bamvor > > Regards, > Jim > > > From 92c476cbe47009c43ebb4a3076a17347c8eea238 Mon Sep 17 00:00:00 2001 > From: Jim Fehlig <jfehlig(a)suse.com> > Date: Thu, 12 Jun 2014 15:28:48 -0600 > Subject: [PATCH] libxl: fix domxml-to-native with qemu disk driver > > Disk config containing <driver name='qemu'.../> is converted to > the native config containg "qemu:/path/to/disk", which is not > understood by xm or xl. > > This patch maps 'qemu' to 'tap'. In xl, tap is mapped to the qemu > backend (aka qdisk), making this change essentially a no-op. In > the xm stack, one could argue that mapping qemu to tap isn't too > insane, since much of the blktap userspace code was originally > based on qemu. > > While at it, noticed that 'driver' wasn't being honored in > xenFormatXMDisk, so change the logic a bit to honor a > user-specified driver. > > Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> > --- > src/xenxs/xen_xm.c | 29 ++++++++++++++++++++--------- > 1 file changed, 20 insertions(+), 9 deletions(-) > > diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c > index b2db97d..ebd525b 100644 > --- a/src/xenxs/xen_xm.c > +++ b/src/xenxs/xen_xm.c > @@ -1201,17 +1201,28 @@ xenFormatXMDisk(virConfValuePtr list, > int format = virDomainDiskGetFormat(disk); > const char *driver = virDomainDiskGetDriver(disk); > > - if (src) { > - if (format) { > - const char *type; > + /* > + * In pre-libxl Xen, 'tap' provided the qemu driver functionality. > + * In libxl Xen, qemu (aka qdisk) is in fact used. For backwards > + * compatibility, tap == qdisk in libxl Xen, so it is safe to use > + * 'tap' in libxl tool. > + */ > + if (STREQ(driver, "qemu")) > + driver = "tap"; > > - if (format == VIR_STORAGE_FILE_RAW) > - type = "aio"; > - else > - type = virStorageFileFormatTypeToString(format); > + if (src) { > + if (driver) { > virBufferAsprintf(&buf, "%s:", driver); > - if (STREQ(driver, "tap")) > - virBufferAsprintf(&buf, "%s:", type); > + if (format) { > + const char *type; > + > + if (format == VIR_STORAGE_FILE_RAW) > + type = "aio"; > + else > + type = virStorageFileFormatTypeToString(format); > + if (STREQ(driver, "tap")) > + virBufferAsprintf(&buf, "%s:", type); > + } > } else { > switch (virDomainDiskGetType(disk)) { > case VIR_STORAGE_TYPE_FILE: > -- 1.8.4.5

1 0

[libvirt] libvirt issue
by Zvi Dubitzky 13 Jun '14

13 Jun '14

Hi I am looking for libvirt user mailing list (Red Hat ) but could not find one . So I am using this list (or maybe someone can direct me to such a list). The problem: using libvirt under openstack I encounter a problem when launching a VM with multiple partitions (2 G image) While a single partition can be launched successfully . We are using in libvirtd.conf log_level=1 and log_outputs="1:file:/var/log/libvirt/libvirtd.log" we can see that in /var/log/libvirt/libvirtd.log appear the following error message : 2014-06-11 14:47:26.166+0000: 12971: error : qemuMonitorIO:614 : internal error End of file from monitor ( file attached below) >From the internet we could not figure out a solution to the problem The host has enough resources and the XML of the VM is : The libvirt version is: 0.10.2 The qemu-kvm version: 0.12.1.2 Any idea what is causing this error and how to overcome ? Thx Zvi Dubitzky Email:dubi@il.ibm.com

2 1