- Devel - libvirt List Archives

[libvirt] [PATCH 1/2] LXC: hostdev: introduce lxcContainerSetupHostdevCapsMakePath
by Gao feng 11 Jul '13

11 Jul '13

This helper function is used to create parent directroy for the hostdev which will be added to the container. if the parent directory of this hostdev doesn't exist, the mknod of the hostdev will fail. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 17 +++++++++++++++++ src/lxc/lxc_container.h | 2 ++ 2 files changed, 19 insertions(+) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index c8420db..b954107 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1544,6 +1544,23 @@ cleanup: } +int lxcContainerSetupHostdevCapsMakePath(char *dev) +{ + int ret = 0; + char *dir = NULL; + + if ((dir = strrchr(dev, '/'))) { + *dir = '\0'; + if ((virFileMakePath(dev) < 0) && (errno != EEXIST)) + ret = -1; + + *dir = '/'; + } + + return ret; +} + + static int lxcContainerSetupHostdevCapsStorage(virDomainDefPtr vmDef ATTRIBUTE_UNUSED, virDomainHostdevDefPtr def ATTRIBUTE_UNUSED, virSecurityManagerPtr securityDriver ATTRIBUTE_UNUSED) diff --git a/src/lxc/lxc_container.h b/src/lxc/lxc_container.h index ada72f7..f168703 100644 --- a/src/lxc/lxc_container.h +++ b/src/lxc/lxc_container.h @@ -63,6 +63,8 @@ int lxcContainerStart(virDomainDefPtr def, int lxcContainerAvailable(int features); +int lxcContainerSetupHostdevCapsMakePath(char *dev); + virArch lxcContainerGetAlt32bitArch(virArch arch); #endif /* LXC_CONTAINER_H */ -- 1.8.3.1

3 4

[libvirt] [PATCH 0/3] Fix hotplug error messages
by Michal Privoznik 11 Jul '13

11 Jul '13

https://bugzilla.redhat.com/show_bug.cgi?id=982304 The problem is virDomainDeviceDefParse's incompleteness. When doing a hot(un-)plug or update, the passed XML snippet is parsed. However, if virDomainDeviceDefParse doesn't recognize the device (due its implementation incompleteness) an error is returned: error: XML error: unknown device type and the control doesn't even reach the check for supported devices for current operation, where much more correct error message would be printed out: error: Operation not supported: persistent detach of device 'memballoon' is not supported Michar Privoznik (3): conf: Extend virDomainDeviceDefParse handled types conf: Rework virDomainDeviceDefParse qemu: Fix hot (un-)plug error codes and messages src/conf/domain_conf.c | 111 ++++++++++++++++++++++++++++++++++--------------- src/qemu/qemu_driver.c | 42 ++++++++++--------- 2 files changed, 101 insertions(+), 52 deletions(-) -- 1.8.1.5

2 6

[libvirt] [PATCH] Reject duplicate disk targets
by Martin Kletzander 11 Jul '13

11 Jul '13

We never check for disks with duplicate targets connected to the same controller/bus/etc. That means we go ahead, create the same IDs for them and pass them to qemu, which subsequently fails to start. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=968899 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/conf/domain_conf.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3398d8b..01720e1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2629,6 +2629,45 @@ virDomainDeviceInfoIterate(virDomainDefPtr def, static int +virDomainDefRejectDuplicateDiskTargets(virDomainDefPtr def) +{ + char *disk_id = NULL; + int ret = -1; + size_t i = 0; + virHashTablePtr targets = NULL; + + if (!(targets = virHashCreate(def->ndisks, NULL))) + goto cleanup; + + for (i = 0; i < def->ndisks; i++) { + virDomainDiskDefPtr disk = def->disks[i]; + + if (virAsprintf(&disk_id, "%d%s%d%d%d%d", + disk->bus, + NULLSTR(disk->dst), + disk->info.addr.drive.controller, + disk->info.addr.drive.bus, + disk->info.addr.drive.target, + disk->info.addr.drive.unit) < 0) + goto cleanup; + + if (virHashAddEntry(targets, disk_id, NULL) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Multiple disks with same address and target ('%s')"), + def->disks[i]->dst); + VIR_FREE(disk_id); + goto cleanup; + } + VIR_FREE(disk_id); + } + + ret = 0; + cleanup: + virHashFree(targets); + return ret; +} + +static int virDomainDefRejectDuplicateControllers(virDomainDefPtr def) { int max_idx[VIR_DOMAIN_CONTROLLER_TYPE_LAST]; @@ -2762,7 +2801,8 @@ virDomainDefPostParseInternal(virDomainDefPtr def, } } - if (virDomainDefRejectDuplicateControllers(def) < 0) + if (virDomainDefRejectDuplicateControllers(def) < 0 || + virDomainDefRejectDuplicateDiskTargets(def) < 0) return -1; return 0; } -- 1.8.3.2

2 6

[libvirt] [PATCH] LXC: remove some incorrect setting ATTRIBUTE_UNUSED
by Gao feng 11 Jul '13

11 Jul '13

these parameters shouldn't be marked as ATTRIBUTE_UNUSED. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 257cf93..543e0d1 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1449,9 +1449,9 @@ static int lxcContainerSetupAllDisks(virDomainDefPtr vmDef, } -static int lxcContainerSetupHostdevSubsysUSB(virDomainDefPtr vmDef ATTRIBUTE_UNUSED, - virDomainHostdevDefPtr def ATTRIBUTE_UNUSED, - virSecurityManagerPtr securityDriver ATTRIBUTE_UNUSED) +static int lxcContainerSetupHostdevSubsysUSB(virDomainDefPtr vmDef, + virDomainHostdevDefPtr def, + virSecurityManagerPtr securityDriver) { int ret = -1; char *src = NULL; @@ -1541,9 +1541,9 @@ cleanup: } -static int lxcContainerSetupHostdevCapsStorage(virDomainDefPtr vmDef ATTRIBUTE_UNUSED, - virDomainHostdevDefPtr def ATTRIBUTE_UNUSED, - virSecurityManagerPtr securityDriver ATTRIBUTE_UNUSED) +static int lxcContainerSetupHostdevCapsStorage(virDomainDefPtr vmDef, + virDomainHostdevDefPtr def, + virSecurityManagerPtr securityDriver) { char *src = NULL; int ret = -1; @@ -1603,9 +1603,9 @@ cleanup: } -static int lxcContainerSetupHostdevCapsMisc(virDomainDefPtr vmDef ATTRIBUTE_UNUSED, - virDomainHostdevDefPtr def ATTRIBUTE_UNUSED, - virSecurityManagerPtr securityDriver ATTRIBUTE_UNUSED) +static int lxcContainerSetupHostdevCapsMisc(virDomainDefPtr vmDef, + virDomainHostdevDefPtr def, + virSecurityManagerPtr securityDriver) { char *src = NULL; int ret = -1; @@ -1873,9 +1873,9 @@ static int lxcContainerResolveSymlinks(virDomainDefPtr vmDef) * It removes some capabilities that could be dangerous to * host system, since they are not currently "containerized" */ -static int lxcContainerDropCapabilities(bool keepReboot ATTRIBUTE_UNUSED) -{ #if WITH_CAPNG +static int lxcContainerDropCapabilities(bool keepReboot) +{ int ret; capng_get_caps_process(); @@ -1907,11 +1907,15 @@ static int lxcContainerDropCapabilities(bool keepReboot ATTRIBUTE_UNUSED) * container it is fine for SECURE_NOROOT / SECURE_NO_SETUID_FIXUP to * be unmasked - they can never escape the bounding set. */ + return 0; +} #else +static int lxcContainerDropCapabilities(bool keepReboot ATTRIBUTE_UNUSED) +{ VIR_WARN("libcap-ng support not compiled in, unable to clear capabilities"); -#endif return 0; } +#endif /** -- 1.8.3.1

2 1

[libvirt] [PATCH] storage: return -1 when fs pool can't be mounted
by Ján Tomko 11 Jul '13

11 Jul '13

Don't reuse the return value of virStorageBackendFileSystemIsMounted. If it's 0, we'd return it even if the mount command failed. Also, don't report another error if it's -1, since one has already been reported. Introduced by 258e06c. https://bugzilla.redhat.com/show_bug.cgi?id=981251 --- src/storage/storage_backend_fs.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 8b40f55..d305b06 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -355,6 +355,7 @@ virStorageBackendFileSystemMount(virStoragePoolObjPtr pool) { pool->def->source.format == VIR_STORAGE_POOL_NETFS_GLUSTERFS); virCommandPtr cmd = NULL; int ret = -1; + int rc; if (pool->def->type == VIR_STORAGE_POOL_NETFS) { if (pool->def->source.nhost != 1) { @@ -381,10 +382,12 @@ virStorageBackendFileSystemMount(virStoragePoolObjPtr pool) { } /* Short-circuit if already mounted */ - if ((ret = virStorageBackendFileSystemIsMounted(pool)) != 0) { - virReportError(VIR_ERR_OPERATION_INVALID, - _("Target '%s' is already mounted"), - pool->def->target.path); + if ((rc = virStorageBackendFileSystemIsMounted(pool)) != 0) { + if (rc == 1) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("Target '%s' is already mounted"), + pool->def->target.path); + } return -1; } -- 1.8.1.5

2 2

[libvirt] [PATCH] qemu: Slightly increase memory limit
by Jiri Denemark 11 Jul '13

11 Jul '13

For low-memory domains (roughly under 400MB) our automatic memory limit computation comes up with a limit that's too low. This is because the 0.5 multiplication does not add enough for such small values. Let's increase the constant part of the computation to fix this. --- src/qemu/qemu_domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 28b8ee4..c38c86e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2197,7 +2197,7 @@ qemuDomainMemoryLimit(virDomainDefPtr def) * limit' has been chosen: * (1 + k) * (domain memory + total video memory) + (32MB for * cache per each disk) + F - * where k = 0.5 and F = 200MB. The cache for disks is important as + * where k = 0.5 and F = 400MB. The cache for disks is important as * kernel cache on the host side counts into the RSS limit. * Moreover, VFIO requires some amount for IO space. Alex Williamson * suggested adding 1GiB for IO space just to be safe (some finer @@ -2212,7 +2212,7 @@ qemuDomainMemoryLimit(virDomainDefPtr def) mem += def->videos[i]->vram; mem *= 1.5; mem += def->ndisks * 32768; - mem += 204800; + mem += 409600; for (i = 0; i < def->nhostdevs; i++) { virDomainHostdevDefPtr hostdev = def->hostdevs[i]; -- 1.8.2.1

2 2

[libvirt] [PATCH] util: use VIR_(APPEND|DELETE)_ELEMENT for pci/usb device lists
by Laine Stump 11 Jul '13

11 Jul '13

Eliminate memmove() by using VIR_*_ELEMENT API instead. In both pci and usb cases, the count that held the size of the list was unsigned int so it had to be changed to size_t. --- This is an alternate fix to the same problem fixed by https://www.redhat.com/archives/libvir-list/2013-July/msg00324.html (an off by one bug in the conditional in virUSBDeviceListSteal()). This version fixes it by converting from open coded memmoves to using VIR_(INSERT|DELETE)_ELEMENT. src/util/virpci.c | 18 +++--------------- src/util/virusb.c | 26 +++++++------------------- 2 files changed, 10 insertions(+), 34 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index e42f6fa..b715122 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -80,7 +80,7 @@ struct _virPCIDevice { struct _virPCIDeviceList { virObjectLockable parent; - unsigned int count; + size_t count; virPCIDevicePtr *devs; }; @@ -1670,11 +1670,9 @@ virPCIDeviceListAdd(virPCIDeviceListPtr list, return -1; } - if (VIR_REALLOC_N(list->devs, list->count+1) < 0) + if (VIR_APPEND_ELEMENT(list->devs, list->count, dev, true) < 0) return -1; - list->devs[list->count++] = dev; - return 0; } @@ -1723,17 +1721,7 @@ virPCIDeviceListStealIndex(virPCIDeviceListPtr list, return NULL; ret = list->devs[idx]; - - if (idx != --list->count) { - memmove(&list->devs[idx], - &list->devs[idx + 1], - sizeof(*list->devs) * (list->count - idx)); - } - - if (VIR_REALLOC_N(list->devs, list->count) < 0) { - ; /* not fatal */ - } - + VIR_DELETE_ELEMENT(list->devs, idx, list->count); return ret; } diff --git a/src/util/virusb.c b/src/util/virusb.c index 3bcb07c..103c301 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -60,7 +60,7 @@ struct _virUSBDevice { struct _virUSBDeviceList { virObjectLockable parent; - unsigned int count; + size_t count; virUSBDevicePtr *devs; }; @@ -451,11 +451,9 @@ virUSBDeviceListAdd(virUSBDeviceListPtr list, return -1; } - if (VIR_REALLOC_N(list->devs, list->count+1) < 0) + if (VIR_APPEND_ELEMENT(list->devs, list->count, dev, true) < 0) return -1; - list->devs[list->count++] = dev; - return 0; } @@ -484,22 +482,12 @@ virUSBDeviceListSteal(virUSBDeviceListPtr list, int i; for (i = 0; i < list->count; i++) { - if (list->devs[i]->bus != dev->bus || - list->devs[i]->dev != dev->dev) - continue; - - ret = list->devs[i]; - - if (i != list->count--) - memmove(&list->devs[i], - &list->devs[i+1], - sizeof(*list->devs) * (list->count - i)); - - if (VIR_REALLOC_N(list->devs, list->count) < 0) { - ; /* not fatal */ + if (list->devs[i]->bus == dev->bus && + list->devs[i]->dev == dev->dev) { + ret = list->devs[i]; + VIR_DELETE_ELEMENT(list->devs, i, list->count); + break; } - - break; } return ret; } -- 1.7.11.7

2 2

[libvirt] [PATCH 00/32] Santize iterator variable names & data types
by Daniel P. Berrange 11 Jul '13

11 Jul '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The libvirt code has a mixture of data types used for the common 'i', 'j', 'k' variable names, int, unsigned int & size_t. Change them all to use 'size_t'. In the few cases which actually required the use of a signed variable, either the use of the unsigned values was eliminated or the variables were renamed to 'idx' to better describe their use. At the same time any loop variables name 'ii', 'jj', 'kk' were changed to their more normal names 'i', 'j', 'k'. New syntax-check rules prevent regressions in these conversions. Daniel P. Berrange (32): Convert 'int i' to 'size_t i' in daemon/ files Convert 'int i' to 'size_t i' in src/conf/ files Convert 'int i' to 'size_t i' in src/util/ files Convert 'int i' to 'size_t i' in tests/ files Convert 'int i' to 'size_t i' in tools/ files Convert 'int i' to 'size_t i' in src/{xen,xenapi,xenxs} files Convert 'int i' to 'size_t i' in src/{esx,vmx,vmware} files Convert 'int i' to 'size_t i' in src/storage/ files Convert 'int i' to 'size_t i' in src/vbox/ files Convert 'int i' to 'size_t i' in src/uml/ files Convert 'int i' to 'size_t i' in src/test/ files Convert 'int i' to 'size_t i' in src/security files Convert 'int i' to 'size_t i' in src/secret/ files Convert 'int i' to 'size_t i' in src/rpc/ files Convert 'int i' to 'size_t i' in src/remote/ files Convert 'int i' to 'size_t i' in src/qemu files Convert 'int i' to 'size_t i' in src/phyp/ files Convert 'int i' to 'size_t i' in src/parallels/ files Convert 'int i' to 'size_t i' in src/openvz/ files Convert 'int i' to 'size_t i' in src/nwfilter/ files Convert 'int i' to 'size_t i' in src/node_device/ files Convert 'int i' to 'size_t i' in src/lxc/ files Convert 'int i' to 'size_t i' in src/locking/ files Convert 'int i' to 'size_t i' in src/libxl/ files Convert 'int i' to 'size_t i' in src/network/ files Convert 'int i' to 'size_t i' in src/interface/ files Convert 'int i' to 'size_t i' in src/hyperv/ files Convert 'int i' to 'size_t i' in src/cpu/ files Convert 'int i' to 'size_t i' in src/ files Convert 'int i' to 'size_t i' in python/ files Convert 'int i' to 'size_t i' in examples/ files Prevent use of 'int' data type & 'ii', 'jj', 'kk' var names for loops cfg.mk | 14 ++ daemon/libvirtd-config.c | 5 +- daemon/remote.c | 55 ++--- examples/domain-events/events-c/event-test.c | 2 +- examples/domsuspend/suspend.c | 14 +- examples/openauth/openauth.c | 2 +- python/libvirt-lxc-override.c | 2 +- python/libvirt-override.c | 111 ++++++---- src/conf/capabilities.c | 32 +-- src/conf/cpu_conf.c | 18 +- src/conf/domain_audit.c | 4 +- src/conf/domain_conf.c | 266 +++++++++++----------- src/conf/domain_conf.h | 12 +- src/conf/domain_event.c | 24 +- src/conf/domain_nwfilter.c | 2 +- src/conf/interface_conf.c | 73 +++--- src/conf/netdev_vlan_conf.c | 19 +- src/conf/network_conf.c | 319 ++++++++++++++------------- src/conf/node_device_conf.c | 27 ++- src/conf/nwfilter_conf.c | 43 ++-- src/conf/nwfilter_params.c | 26 ++- src/conf/snapshot_conf.c | 21 +- src/conf/storage_conf.c | 42 ++-- src/conf/storage_encryption_conf.c | 3 +- src/cpu/cpu.c | 22 +- src/cpu/cpu_generic.c | 6 +- src/cpu/cpu_powerpc.c | 2 +- src/cpu/cpu_x86.c | 26 +-- src/esx/esx_driver.c | 10 +- src/esx/esx_interface_driver.c | 2 +- src/esx/esx_network_driver.c | 4 +- src/esx/esx_storage_backend_iscsi.c | 4 +- src/esx/esx_storage_backend_vmfs.c | 4 +- src/esx/esx_storage_driver.c | 10 +- src/esx/esx_util.c | 2 +- src/esx/esx_vi.c | 18 +- src/fdstream.c | 2 +- src/hyperv/hyperv_driver.c | 4 +- src/hyperv/hyperv_util.c | 2 +- src/interface/interface_backend_netcf.c | 6 +- src/interface/interface_backend_udev.c | 4 +- src/libvirt-lxc.c | 2 +- src/libvirt.c | 40 ++-- src/libxl/libxl_conf.c | 12 +- src/libxl/libxl_driver.c | 34 +-- src/locking/domain_lock.c | 6 +- src/locking/lock_driver.h | 2 +- src/locking/lock_driver_lockd.c | 6 +- src/locking/lock_driver_sanlock.c | 10 +- src/locking/lock_manager.c | 4 +- src/lxc/lxc_cgroup.c | 3 +- src/lxc/lxc_container.c | 6 +- src/lxc/lxc_controller.c | 3 +- src/lxc/lxc_driver.c | 44 ++-- src/lxc/lxc_process.c | 2 +- src/network/bridge_driver.c | 281 +++++++++++------------ src/node_device/node_device_driver.c | 6 +- src/node_device/node_device_hal.c | 9 +- src/nodeinfo.c | 24 +- src/nwfilter/nwfilter_driver.c | 5 +- src/nwfilter/nwfilter_ebiptables_driver.c | 4 +- src/nwfilter/nwfilter_gentech_driver.c | 21 +- src/openvz/openvz_driver.c | 10 +- src/parallels/parallels_driver.c | 15 +- src/parallels/parallels_network.c | 3 +- src/parallels/parallels_storage.c | 8 +- src/phyp/phyp_driver.c | 26 +-- src/qemu/qemu_agent.c | 9 +- src/qemu/qemu_capabilities.c | 7 +- src/qemu/qemu_cgroup.c | 12 +- src/qemu/qemu_command.c | 104 ++++----- src/qemu/qemu_conf.c | 2 +- src/qemu/qemu_domain.c | 34 +-- src/qemu/qemu_driver.c | 120 +++++----- src/qemu/qemu_hostdev.c | 26 ++- src/qemu/qemu_hotplug.c | 54 ++--- src/qemu/qemu_migration.c | 25 ++- src/qemu/qemu_monitor.c | 13 +- src/qemu/qemu_monitor_json.c | 31 +-- src/qemu/qemu_monitor_text.c | 6 +- src/qemu/qemu_process.c | 48 ++-- src/remote/remote_driver.c | 64 +++--- src/rpc/gendispatch.pl | 7 +- src/rpc/virnetclient.c | 2 +- src/rpc/virnetclientprogram.c | 2 +- src/rpc/virnetserver.c | 10 +- src/rpc/virnetserverservice.c | 10 +- src/rpc/virnetsocket.c | 2 +- src/rpc/virnetsshsession.c | 10 +- src/rpc/virnettlscontext.c | 7 +- src/secret/secret_driver.c | 6 +- src/security/security_dac.c | 4 +- src/security/security_driver.c | 2 +- src/security/security_selinux.c | 4 +- src/security/virt-aa-helper.c | 4 +- src/storage/storage_backend.c | 8 +- src/storage/storage_backend_disk.c | 6 +- src/storage/storage_backend_fs.c | 2 +- src/storage/storage_backend_iscsi.c | 2 +- src/storage/storage_backend_logical.c | 10 +- src/storage/storage_backend_rbd.c | 4 +- src/storage/storage_driver.c | 19 +- src/test/test_driver.c | 50 +++-- src/uml/uml_conf.c | 6 +- src/uml/uml_driver.c | 9 +- src/util/virbitmap.c | 13 +- src/util/vircgroup.c | 32 +-- src/util/vircommand.c | 10 +- src/util/virdnsmasq.c | 16 +- src/util/virebtables.c | 8 +- src/util/vireventpoll.c | 28 +-- src/util/virhook.c | 3 +- src/util/virjson.c | 12 +- src/util/virkeycode.c | 4 +- src/util/virlog.c | 30 +-- src/util/virlog.h | 2 +- src/util/virmacaddr.c | 2 +- src/util/virnetdevmacvlan.c | 2 +- src/util/virnetdevopenvswitch.c | 2 +- src/util/virnetdevtap.c | 4 +- src/util/virnetdevvportprofile.c | 2 +- src/util/virnetlink.c | 14 +- src/util/virnuma.c | 13 +- src/util/virpci.c | 14 +- src/util/virportallocator.c | 8 +- src/util/virprocess.c | 7 +- src/util/virscsi.c | 6 +- src/util/virsocketaddr.c | 28 +-- src/util/virstoragefile.c | 7 +- src/util/virstring.c | 3 +- src/util/virsysinfo.c | 6 +- src/util/virthreadwin32.c | 6 +- src/util/virthreadwin32.h | 2 +- src/util/virtypedparam.c | 10 +- src/util/viruri.c | 2 +- src/util/virusb.c | 6 +- src/util/virutil.c | 29 +-- src/util/viruuid.c | 7 +- src/vbox/vbox_XPCOMCGlue.c | 6 +- src/vbox/vbox_tmpl.c | 159 ++++++------- src/vmware/vmware_conf.c | 4 +- src/vmx/vmx.c | 24 +- src/xen/block_stats.c | 4 +- src/xen/xen_driver.c | 4 +- src/xen/xen_hypervisor.c | 14 +- src/xen/xen_inotify.c | 4 +- src/xen/xend_internal.c | 12 +- src/xen/xm_internal.c | 5 +- src/xen/xs_internal.c | 27 ++- src/xenapi/xenapi_driver.c | 30 ++- src/xenapi/xenapi_utils.c | 14 +- src/xenxs/xen_sxpr.c | 10 +- src/xenxs/xen_xm.c | 6 +- tests/commandhelper.c | 4 +- tests/cputest.c | 6 +- tests/esxutilstest.c | 9 +- tests/eventtest.c | 14 +- tests/nodeinfotest.c | 2 +- tests/openvzutilstest.c | 2 +- tests/qemuhelptest.c | 6 +- tests/qemumonitorjsontest.c | 6 +- tests/qemumonitortest.c | 4 +- tests/ssh.c | 2 +- tests/testutils.c | 13 +- tests/utiltest.c | 16 +- tests/viratomictest.c | 4 +- tests/virbitmaptest.c | 9 +- tests/vircgrouptest.c | 2 +- tests/virhashtest.c | 12 +- tests/virnetsockettest.c | 2 +- tests/virstoragetest.c | 2 +- tools/virsh-domain-monitor.c | 17 +- tools/virsh-domain.c | 41 ++-- tools/virsh-host.c | 8 +- tools/virsh-interface.c | 6 +- tools/virsh-network.c | 6 +- tools/virsh-nodedev.c | 8 +- tools/virsh-nwfilter.c | 6 +- tools/virsh-pool.c | 7 +- tools/virsh-secret.c | 6 +- tools/virsh-snapshot.c | 12 +- tools/virsh-volume.c | 6 +- tools/virsh.c | 15 +- 183 files changed, 1854 insertions(+), 1651 deletions(-) -- 1.8.1.4

6 94

[libvirt] [PATCH v2] storage: silently ignore missing files on pool refresh
by Ján Tomko 11 Jul '13

11 Jul '13

From: Wei Zhou <w.zhou(a)leaseweb.com> Make virStorageBackendVolOpenCheckMode return -2 instead of -1 if volume file is missing. https://bugzilla.redhat.com/show_bug.cgi?id=977706 Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- src/storage/storage_backend.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index e2527c9..a24e452 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1084,7 +1084,7 @@ virStorageBackendForType(int type) * Allows caller to silently ignore files with improper mode * * Returns -1 on error, -2 if file mode is unexpected or the - * volume is a dangling symbolic link. + * volume is a dangling symbolic link or file is missing. */ int virStorageBackendVolOpenCheckMode(const char *path, unsigned int flags) @@ -1094,10 +1094,10 @@ virStorageBackendVolOpenCheckMode(const char *path, unsigned int flags) char *base = last_component(path); if (lstat(path, &sb) < 0) { - virReportSystemError(errno, - _("cannot stat file '%s'"), - path); - return -1; + char ebuf[1024]; + VIR_WARN(_("cannot stat file '%s': %s"), path, + virStrerror(errno, ebuf, sizeof(ebuf))); + return -2; } if (S_ISFIFO(sb.st_mode)) { -- 1.8.1.5

1 0

[libvirt] [PATCH 0/8] Re-enable memballoon driver statistics reporting
by John Ferlan 10 Jul '13

10 Jul '13

https://bugzilla.redhat.com/show_bug.cgi?id=904160 The following patches will provide the support and functionality in order to re-enable getting domain memory statistics from the balloon driver based on the upstream QEMU patch: https://lists.gnu.org/archive/html/qemu-devel/2013-01/msg04835.html Statistics gathering requires usage of the QEMU QObject model, specifically the qom-list command to find the path to the balloon driver and the qom-get/ qom-set commands in order to get/set properties on the object. A future possible extension would be to allow 'virsh qemuobject [--list|--get|--put]' where the --list would list a single path and the get/set would allow viewing/adjusting a specific object path property. The QObject model requires setting properties after the domain (and device) has been started. For the balloon driver, in order to enable collection the property "guest-stats-polling-interval" is used. Since the QObject model has been in place for a while and the balloon driver has been part of that, the capability to gather statistics is only discernible if the property is found. Once found, the property can be changed at any time after startup in order to exend/shorted the collection interval or disable the collection by setting the property back to 0 (zero). Setting the property back does not reset already generated statistics. If statistics haven't been generated at all they are initialized to -1. Thus if values are set at -1, they will not be stored in the output. The only possible visual cue to determine that statistics are disabled is if the polling interval property was 0 (zero). Since it wasn't clear whether adjusting the dommemstats output to provide that visual cue, I left that as a future possible exercise - although it is possible to add it to this patch set where the output would be extended to indicate the current collection interval period or that collection is currently disabled, eg one new row "period #". The collection period interval is saved in a new memballoon stats field as 'period'. This is saved in the xml as "<stats period='10'/>". The capability to dynamically set the period once the domain has started is controlled by a new '--period <value>' option to the dommemstats command. The command was extended to support the --live, --current, and --config options. The implementation uses the existing virDomainSetMemoryFlags with a new 'VIR_DOMAIN_MEM_PERIOD' flag that the qemuDomainSetMemoryFlags() will handle. This was methodology was chosen in preference to generating (a) new driver function(s) to just handle the get/set of the collection period. John Ferlan (8): Add qemuMonitorGetObjectListPaths() method for QMP qom-list command Add qemuMonitorGetObjectProperty() method for QMP qom-get command Add qemuMonitorSetObjectProperty() method for QMP qom-set command Add 'period' for Memballoon statistics gathering capability Determine whether to start balloon memory stats gathering. Add capability to fetch balloon stats If available fetch the balloon driver memory stats Allow balloon driver collection to be adjusted dynamically docs/formatdomain.html.in | 14 ++ docs/schemas/domaincommon.rng | 7 + include/libvirt/libvirt.h.in | 1 + src/conf/domain_conf.c | 27 +++- src/conf/domain_conf.h | 1 + src/libvirt.c | 8 +- src/qemu/qemu_domain.c | 1 + src/qemu/qemu_domain.h | 2 + src/qemu/qemu_driver.c | 61 +++++++- src/qemu/qemu_monitor.c | 79 +++++++++++ src/qemu/qemu_monitor.h | 57 ++++++++ src/qemu/qemu_monitor_json.c | 317 ++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor_json.h | 18 +++ src/qemu/qemu_process.c | 164 +++++++++++++++++++++- tests/qemumonitorjsontest.c | 184 ++++++++++++++++++++++++ tools/virsh-domain-monitor.c | 70 +++++++++- 16 files changed, 1000 insertions(+), 11 deletions(-) -- 1.8.1.4

4 27