- Devel - libvirt List Archives

[libvirt] [PATCH] Remove QEMU_CAPS_MACHINE_USB_OPT from ComputeCmdFlags
by Ján Tomko 18 Apr '14

18 Apr '14

The version check is for >1.3.0, but ComputeCmdFlags is only called for QEMU older than 1.2.0. --- src/qemu/qemu_capabilities.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 381b3ec..5814c7c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1143,10 +1143,6 @@ virQEMUCapsComputeCmdFlags(const char *help, if (strstr(help, "-machine")) virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_OPT); - /* USB option is supported v1.3.0 onwards */ - if (qemuCaps->version >= 1003000) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_USB_OPT); - /* * Handling of -incoming arg with varying features * -incoming tcp (kvm >= 79, qemu >= 0.10.0) -- 1.8.3.2

2 1

[libvirt] [PATCH] Fix Memory Leak in virStorageFileGetMetadataRecurse()
by Nehal J Wani 18 Apr '14

18 Apr '14

While running virstoragetest, valgrind pointed out the following memory leak: ==8142== 2 bytes in 1 blocks are definitely lost in loss record 1 of 92 ==8142== at 0x4A069EE: malloc (vg_replace_malloc.c:270) ==8142== by 0x4E7B53E: mdir_name (dirname-lgpl.c:78) ==8142== by 0x4CBE2B0: virStorageFileGetMetadataInternal (virstoragefile.c:595) ==8142== by 0x4CBE651: virStorageFileGetMetadataFromFDInternal (virstoragefile.c:1086) ==8142== by 0x4CBEEB4: virStorageFileGetMetadataRecurse (virstoragefile.c:1175) ==8142== by 0x4CBF1DE: virStorageFileGetMetadata (virstoragefile.c:1270) ==8142== by 0x4028AD: testStorageChain (virstoragetest.c:275) ==8142== by 0x407B91: virtTestRun (testutils.c:201) ==8142== by 0x4039D7: mymain (virstoragetest.c:534) ==8142== by 0x40830D: virtTestMain (testutils.c:789) ==8142== by 0x3E6CE1ED1C: (below main) (libc-start.c:226) ...62 times --- src/util/virstoragefile.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index ea80c1d..73cfef0 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1213,6 +1213,7 @@ virStorageFileGetMetadataRecurse(const char *path, const char *canonPath, meta->backingMeta = backing; } } + VIR_FREE(backingDirectory); return ret; } -- 1.7.1

2 1

[libvirt] [PATCH] docs: document that vfio is default for hostdev networks too
by Laine Stump 17 Apr '14

17 Apr '14

When the default was changed from kvm to vfio, the documentation for hostdev and interface was changed, but the documentation in <network> was forgotten. --- docs/formatnetwork.html.in | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index fc56b42..aeafbd9 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -282,16 +282,19 @@ definition. Since 0.10.0 - To use VFIO device assignment rather than - traditional/legacy KVM device assignment (VFIO is a new - method of device assignment that is compatible with UEFI - Secure Boot), a <forward type='hostdev'> interface - can have an optional <code>driver</code> sub-element - with a <code>name</code> attribute set to "vfio". To use - legacy KVM device assignment you can - set <code>name</code> to "kvm" (or simply omit the - <driver> element, since "kvm" is currently the - default). + To force use of a particular type of device assignment, + a <forward type='hostdev'> interface can have an + optional <code>driver</code> sub-element with + a <code>name</code> attribute set to either "vfio" (VFIO + is a new method of device assignment that is compatible + with UEFI Secure Boot) or "kvm" (the legacy device + assignment handled directly by the KVM kernel + module). The default is "vfio" on systems where the VFIO + driver is available and loaded, and "kvm" on older + systems, or those where the VFIO driver hasn't been + loaded. When specified, device assignment will fail if + the requested method of device assignment isn't + available on the host. Since 1.0.5 (QEMU and KVM only, requires kernel 3.6 or newer) -- 1.9.0

2 1

[libvirt] qemu: Unlock the NWFilter update lock by leaving via the cleanup label
by Stefan Berger 17 Apr '14

17 Apr '14

Fix a locking problem by leaving the function via the cleanup label. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: libvirt-acl/src/qemu/qemu_driver.c =================================================================== --- libvirt-acl.orig/src/qemu/qemu_driver.c +++ libvirt-acl/src/qemu/qemu_driver.c @@ -6140,7 +6140,7 @@ qemuDomainCreateWithFlags(virDomainPtr d virNWFilterReadLockFilterUpdates(); if (!(vm = qemuDomObjFromDomain(dom))) - return -1; + goto cleanup; if (virDomainCreateWithFlagsEnsureACL(dom->conn, vm->def) < 0) goto cleanup;

2 2

[libvirt] what are the differences among disk cache attribute
by longguang.yue 17 Apr '14

17 Apr '14

hi,all there are "default", "none", "writethrough", "writeback", "directsync", "unsafe" cache options 1. could you explain what is default and none? exactly what it does and not does? 2. what is the difference between unsafe and (default or none)? 3. after a long time of running , it seems that vms will slow down? do you know why? cache hit rate goes down or kernel takes time to flush cache? thanks

1 0

[libvirt] [PATCH 0/2] specify migration URI on setting file
by Chen Fan 17 Apr '14

17 Apr '14

Hi all, Current virsh migrate command require specfying migration URI with command option. 1) If user specifies --migrateuri on virsh migrate command, then the command transfers the data to specified host. 2) If --migrateuri is not specified, the command transfers the data to host whose name is resolved by DNS or /etc/hosts. But we would like to specify it on setting file like file libvirt.conf of libvirt host. the motivation is: If user would like to increase their system's resource, and user add one more NIC for each host. (One is for management LAN, another is for data LAN). in this case, user would like to use "data LAN" for transfer migrate data. Then, user can specify the NIC address for data LAN by migrateuri. Though the migrateuri is usually stable, user must specify migrateuri every migrate time. So, setting file for migrateuri is desirable. in addition, if there are more KVM host, to change the migrateuri will be too troublesome for user. Chen Fan (2): move virConnectGetConfigFile() to virconf.h add default migrate uri in definition file daemon/remote.c | 11 +++++++- src/driver.h | 1 + src/libvirt.c | 66 ++++++++------------------------------------ src/libvirt.conf | 7 +++++ src/libvirt_internal.h | 1 + src/libvirt_private.syms | 2 +- src/qemu/qemu_driver.c | 37 +++++++++++++++++++++++-- src/remote/remote_driver.c | 13 +++++++++ src/remote/remote_protocol.x | 1 + src/util/virconf.c | 54 ++++++++++++++++++++++++++++++++++++ src/util/virconf.h | 1 + 11 files changed, 134 insertions(+), 60 deletions(-) -- 1.8.1.4

4 8

[libvirt] [RFC PATCH] conf: Output disk backing store details in domain XML
by Jiri Denemark 16 Apr '14

16 Apr '14

The XML for quite a complicated backing chain is shown below: <disk type='network' device='disk'> <driver name='qemu' type='qcow2'/> <source protocol='nbd' name='bar'> <host transport='unix' socket='/var/run/nbdsock'/> </source> <backingStore type='block' index='1'> <format type='qcow2'/> <source dev='/dev/HostVG/QEMUGuest1'/> <backingStore type='file' index='2'> <format type='qcow2'/> <source file='/tmp/image2.qcow'/> <backingStore type='file' index='3'> <format type='qcow2'/> <source file='/tmp/image3.qcow'/> <backingStore type='file' index='4'> <format type='qcow2'/> <source file='/tmp/image4.qcow'/> <backingStore type='file' index='5'> <format type='qcow2'/> <source file='/tmp/image5.qcow'/> <backingStore type='file' index='6'> <format type='raw'/> <source file='/tmp/Fedora-17-x86_64-Live-KDE.iso'/> <backingStore/> </backingStore> </backingStore> </backingStore> </backingStore> </backingStore> </backingStore> <target dev='vdb' bus='virtio'/> </disk> Various disk types and formats can be mixed in one chain. The <backingStore/> empty element marks the end of the backing chain and it is there mostly for future support of parsing the chain provided by a user. If it's missing, we are supposed to probe for the rest of the chain ourselves, otherwise complete chain was provided by the user. The index attributes of backingStore elements can be used to unambiguously identify a specific part of the image chain. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- docs/schemas/domaincommon.rng | 48 ++++++++++++++-- tests/domainschemadata/backing-chains.xml | 94 +++++++++++++++++++++++++++++++ 2 files changed, 136 insertions(+), 6 deletions(-) create mode 100644 tests/domainschemadata/backing-chains.xml diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index d2235e1..4249ed5 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1196,10 +1196,51 @@ <optional> <ref name="snapshot"/> </optional> - <ref name="diskSource"/> + <interleave> + <ref name="diskSource"/> + <ref name="storageSourceExtra"/> + <ref name="diskBackingChain"/> + </interleave> + </element> + </define> + + <define name="diskBackingChain"> + <choice> + <ref name="diskBackingStore"/> + <ref name="diskBackingStoreLast"/> + </choice> + </define> + + <define name="diskBackingStore"> + <element name="backingStore"> + <attribute name="index"> + <ref name="positiveInteger"/> + </attribute> + <interleave> + <ref name="diskSource"/> + <ref name="diskBackingChain"/> + <ref name="diskFormat"/> + </interleave> + </element> + </define> + + <define name="diskFormat"> + <element name="format"> + <attribute name="type"> + <ref name="storageFormat"/> + </attribute> + <empty/> </element> </define> + <define name="diskBackingStoreLast"> + <optional> + <element name="backingStore"> + <empty/> + </element> + </optional> + </define> + <define name="diskSource"> <choice> <ref name="diskSourceFile"/> @@ -1232,7 +1273,6 @@ </optional> </element> </optional> - <ref name='storageSourceExtra'/> </interleave> </define> @@ -1256,7 +1296,6 @@ </optional> </element> </optional> - <ref name='storageSourceExtra'/> </interleave> </define> @@ -1276,7 +1315,6 @@ <empty/> </element> </optional> - <ref name='storageSourceExtra'/> </interleave> </define> @@ -1340,7 +1378,6 @@ </zeroOrMore> <empty/> </element> - <ref name='storageSourceExtra'/> </interleave> </define> @@ -1373,7 +1410,6 @@ </optional> </element> </optional> - <ref name='storageSourceExtra'/> </interleave> </define> diff --git a/tests/domainschemadata/backing-chains.xml b/tests/domainschemadata/backing-chains.xml new file mode 100644 index 0000000..b0bdd06 --- /dev/null +++ b/tests/domainschemadata/backing-chains.xml @@ -0,0 +1,94 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='network' device='disk'> + <driver name='qemu' type='qcow2'/> + <source protocol='gluster' name='Volume2/Image'> + <host transport='unix' socket='/path/to/sock'/> + </source> + <backingStore type='file' index='1'> + <format type='qcow2'/> + <source file='/tmp/missing-backing-store.qcow'/> + </backingStore> + <target dev='vda' bus='virtio'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='qcow2'/> + <source protocol='nbd' name='bar'> + <host transport='unix' socket='/var/run/nbdsock'/> + </source> + <backingStore type='block' index='1'> + <format type='qcow2'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <backingStore type='file' index='2'> + <format type='qcow2'/> + <source file='/tmp/image2.qcow'/> + <backingStore type='file' index='3'> + <format type='qcow2'/> + <source file='/tmp/image3.qcow'/> + <backingStore type='file' index='4'> + <format type='qcow2'/> + <source file='/tmp/image4.qcow'/> + <backingStore type='file' index='5'> + <source file='/tmp/image5.qcow'/> + <format type='qcow2'/> + <backingStore type='file' index='6'> + <format type='raw'/> + <source file='/tmp/Fedora-17-x86_64-Live-KDE.iso'/> + <backingStore/> + </backingStore> + </backingStore> + </backingStore> + </backingStore> + </backingStore> + </backingStore> + <target dev='vdb' bus='virtio'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='raw'/> + <backingStore/> + <source protocol='gluster' name='Volume1/Image'> + <host name='example.org' port='6000'/> + </source> + <target dev='vdc' bus='virtio'/> + </disk> + <disk type='network' device='disk'> + <driver name='qemu' type='qcow2'/> + <auth username='myname'> + <secret type='ceph' usage='mycluster_myname'/> + </auth> + <source protocol='rbd' name='pool/image'> + <host name='mon1.example.org' port='6321'/> + <host name='mon2.example.org' port='6322'/> + <host name='mon3.example.org' port='6322'/> + </source> + <backingStore type='file' index='1'> + <source file='/tmp/image.qcow'/> + <backingStore/> + <format type='qcow2'/> + </backingStore> + <target dev='vdd' bus='virtio'/> + </disk> + <disk type='block' device='disk'> + <driver name='qemu' type='qcow2'/> + <source dev='/dev/HostVG/QEMUGuest11'/> + <target dev='vde' bus='ide'/> + </disk> + <controller type='usb' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <memballoon model='virtio'/> + </devices> +</domain> -- 1.9.2

1 0

[libvirt] [PATCH] storageVolCreateXMLFrom: Allow multiple accesses to origvol
by Michal Privoznik 16 Apr '14

16 Apr '14

When creating a new volume, it is possible to copy data into it from another already existing volume (referred to as @origvol). Obviously, the read-only access to @origvol is required, which is thread safe (probably not performance-wise though). However, with current code both @newvol and @origvol are marked as building for the time of copying data from the @origvol to @newvol. The rationale behind is to disallow some operations on both @origvol and @newvol, e.g. vol-wipe, vol-delete, vol-download. While it makes sense to not allow such operations on partly copied mirror, but it doesn't make sense to disallow the operations on the source (@origvol). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/storage/storage_driver.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 2cb8347..a3f398f 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1912,7 +1912,6 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, /* Drop the pool lock during volume allocation */ pool->asyncjobs++; - origvol->building = 1; newvol->building = 1; virStoragePoolObjUnlock(pool); @@ -1929,7 +1928,6 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, virStoragePoolObjLock(origpool); storageDriverUnlock(driver); - origvol->building = 0; newvol->building = 0; allocation = newvol->target.allocation; pool->asyncjobs--; -- 1.9.0

2 2

[libvirt] [PATCH] Shorten the udevadm settle timeout for refresh/start pool cases
by John Ferlan 16 Apr '14

16 Apr '14

https://bugzilla.redhat.com/show_bug.cgi?id=789766 This patch addresses a possible misperception that libvirt is hung during pool startup/refresh as well as virt-manager startup as it needs to start/refresh storage pools found. The problem is that the 'udevadm settle' command will wait for a default of two minutes prior to returning a failure. For code paths such as pool starts or refreshes the timeout doesn't necessarily cause failures - it may just not find anything. Additionally, since no error message or any other indication is proviced, blame is placed up libvirt for the problem; however, use of debug tools shows libvirt waiting in udevadm. NB: This timeout may be longer for iSCSI and SCSI pools since both seem to run through settle paths twice under certain conditions. Based on feedback described here: http://lists.freedesktop.org/archives/systemd-devel/2013-July/011845.html this timeout is part of the architecture of udevadm settle. Although the two minute timeout expires, the code doesn't check status. Callers can decide to continue regardless of whether settle is still handling events. For paths waiting for something specific, failure will be inevitable; however, for paths such as perhaps pool refreshes waiting for "anything" to be present within the directory space udevadm manages having a shorter timeout may allow them to gather some data quicker/sooner. It's always possible to refresh the data again at some later point. For paths that are waiting for something specific, such as finding a node device, creating a backing disk volume, or removing a logical volume waiting longer for settle to work through its events will be more important. So given this, I modified the calls to virFileWaitForDevices() pass a boolean 'quiesce' indicating whether the caller should wait for the default timeout or to wait a shorter time. I chose 5 seconds for the shorter time, although there was no real logic/reason for it. Additionally, for either case use VIR_WARN to indicate that the command to settle the database returned a failure. --- Note that I did try to use a timeout value of 0 which as I was reading things would somehow indicate that something needed to be flushed; however, for the veth issue described here: http://lists.freedesktop.org/archives/systemd-devel/2013-July/011829.html the return value of a udevadm settle --timeout 0 was always 0; whereas, if using --timeout 1 (or more) the return value was 1. Callers to virFileWaitForDevices() and my reasoning/logic behind why I chose to wait for quiesce or not... node_device_driver -> Is trying to find node devices - wait long time storage_backend_*.c: (virStorageBackend*() APIs) disk: DiskRefreshPool -> Will read directory path - wait short time disk: DiskCreateVol -> Requires new disk to be present - wait long time iscsi: ISCSIGetHostNumber -> called by ISCSIFindLUs which is called by RefreshPool before opening path and scanning for devices - wait short time logical: LogicalRefreshPool -> Runs /usr/sbin/vgs to get report of volume groups - wait short time logical: LogicalDeleteVol -> Requires synchronization prior to deletion of logical volume - wait long time mpath: MpathRefreshPool -> Use DM_DEVICE_LIST to get list of devices - wait short time scsi: SCSIFindLUs -> called by SCSIRefreshPool and ISCSIFindLUs (not sure why) prior to opening path and scanning for available devices - wait short time scsi: createVport -> called by SCSIStartPool after the port is managed - there's no search for any devices and nothing depends on or checks if the port was created (although next call in sequence would be to refresh the pool, which would wait again) - wait short time Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/node_device/node_device_driver.c | 4 ++-- src/storage/storage_backend_disk.c | 4 ++-- src/storage/storage_backend_iscsi.c | 2 +- src/storage/storage_backend_logical.c | 4 ++-- src/storage/storage_backend_mpath.c | 2 +- src/storage/storage_backend_scsi.c | 4 ++-- src/util/virfile.h | 2 +- src/util/virutil.c | 45 +++++++++++++++++++++++++++-------- 8 files changed, 46 insertions(+), 21 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 6906463..fda4104 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -458,7 +458,7 @@ get_time(time_t *t) * possible for udev not to realize that it has work to do before we * get here. We thus keep trying to find the new device we just * created for up to LINUX_NEW_DEVICE_WAIT_TIME. Note that udev's - * default settle time is 180 seconds, so once udev realizes that it + * default settle time is 120 seconds, so once udev realizes that it * has work to do, it might take that long for the udev wait to * return. Thus the total maximum time for this function to return is * the udev settle time plus LINUX_NEW_DEVICE_WAIT_TIME. @@ -485,7 +485,7 @@ find_new_device(virConnectPtr conn, const char *wwnn, const char *wwpn) while ((now - start) < LINUX_NEW_DEVICE_WAIT_TIME) { - virFileWaitForDevices(); + virFileWaitForDevices(true); dev = nodeDeviceLookupSCSIHostByWWN(conn, wwnn, wwpn, 0); diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 9cebcca..8678a24 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -323,7 +323,7 @@ virStorageBackendDiskRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, VIR_FREE(pool->def->source.devices[0].freeExtents); pool->def->source.devices[0].nfreeExtent = 0; - virFileWaitForDevices(); + virFileWaitForDevices(false); if (!virFileExists(pool->def->source.devices[0].path)) { virReportError(VIR_ERR_INVALID_ARG, @@ -660,7 +660,7 @@ virStorageBackendDiskCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED, goto cleanup; /* wait for device node to show up */ - virFileWaitForDevices(); + virFileWaitForDevices(true); /* Blow away free extent info, as we're about to re-populate it */ VIR_FREE(pool->def->source.devices[0].freeExtents); diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index 881159b..5680bcb 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -96,7 +96,7 @@ virStorageBackendISCSIGetHostNumber(const char *sysfs_path, VIR_DEBUG("Finding host number from '%s'", sysfs_path); - virFileWaitForDevices(); + virFileWaitForDevices(false); sysdir = opendir(sysfs_path); diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index ed3a012..868fdce 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -586,7 +586,7 @@ virStorageBackendLogicalRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, virCommandPtr cmd = NULL; int ret = -1; - virFileWaitForDevices(); + virFileWaitForDevices(false); /* Get list of all logical volumes */ if (virStorageBackendLogicalFindLVs(pool, NULL) < 0) @@ -689,7 +689,7 @@ virStorageBackendLogicalDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED, virCheckFlags(0, -1); - virFileWaitForDevices(); + virFileWaitForDevices(true); lvchange_cmd = virCommandNewArgList(LVCHANGE, "-aln", vol->target.path, NULL); lvremove_cmd = virCommandNewArgList(LVREMOVE, "-f", vol->target.path, NULL); diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c index f0ed189..216863b 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -274,7 +274,7 @@ virStorageBackendMpathRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED, pool->def->allocation = pool->def->capacity = pool->def->available = 0; - virFileWaitForDevices(); + virFileWaitForDevices(false); virStorageBackendGetMaps(pool); diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index c448d7f..7335433 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -430,7 +430,7 @@ virStorageBackendSCSIFindLUs(virStoragePoolObjPtr pool, VIR_DEBUG("Discovering LUs on host %u", scanhost); - virFileWaitForDevices(); + virFileWaitForDevices(false); devicedir = opendir(device_path); @@ -591,7 +591,7 @@ createVport(virStoragePoolSourceAdapter adapter) adapter.data.fchost.wwnn, VPORT_CREATE) < 0) return -1; - virFileWaitForDevices(); + virFileWaitForDevices(false); return 0; } diff --git a/src/util/virfile.h b/src/util/virfile.h index 46ef781..63d3f05 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -253,7 +253,7 @@ int virFileOpenTty(int *ttymaster, char *virFileFindMountPoint(const char *type); -void virFileWaitForDevices(void); +void virFileWaitForDevices(bool quiesce); /* NB: this should be combined with virFileBuildPath */ # define virBuildPath(path, ...) \ diff --git a/src/util/virutil.c b/src/util/virutil.c index 9be1590..030e5ec 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1447,29 +1447,54 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups, #if defined(UDEVADM) || defined(UDEVSETTLE) -void virFileWaitForDevices(void) +void virFileWaitForDevices(bool quiesce) { # ifdef UDEVADM - const char *const settleprog[] = { UDEVADM, "settle", NULL }; + const char *const settleprog = UDEVADM; # else - const char *const settleprog[] = { UDEVSETTLE, NULL }; + const char *const settleprog = UDEVSETTLE; # endif - int exitstatus; + int exitstatus = 0; + virCommandPtr settlecmd = NULL; - if (access(settleprog[0], X_OK) != 0) + if (access(settleprog, X_OK) != 0) return; + /* In less critical paths, rather than possibly wait for a two + * minute timeout for settle to just return failure because of + * some issue in the udevadm database, let's wait for 5 seconds. + * If there's an issue with the udevadm database, the timeout + * will cause a non zero return which we can check and issue a + * warning message. + */ + settlecmd = virCommandNew(settleprog); +# ifdef UDEVADM + virCommandAddArg(settlecmd, "settle"); +# endif + if (!quiesce) { + virCommandAddArg(settlecmd, "--timeout"); + virCommandAddArg(settlecmd, "5"); + } + /* - * NOTE: we ignore errors here; this is just to make sure that any device + * NOTE: we mostly ignore errors; this is just to make sure that any device * nodes that are being created finish before we try to scan them. - * If this fails for any reason, we still have the backup of polling for - * 5 seconds for device nodes. */ - if (virRun(settleprog, &exitstatus) < 0) + if (virCommandRun(settlecmd, &exitstatus) < 0) {} + + if (exitstatus) { + char *cmd_str = virCommandToString(settlecmd); + VIR_WARN("Timed out running '%s' indicating a possible issue " + "with udev event queue.", + cmd_str ? cmd_str : settleprog); + VIR_FREE(cmd_str); + } + + virCommandFree(settlecmd); } #else -void virFileWaitForDevices(void) +void virFileWaitForDevices(bool quiesce ATTRIBUTE_UNUSED) {} #endif -- 1.9.0

3 4

[libvirt] [PATCH v2] storage: netfs: Handle backend errors
by John Ferlan 16 Apr '14

16 Apr '14

Commit id '18642d10' caused a virt-test regression for NFS backend storage error path checks when running the command: 'virsh find-storage-pool-sources-as netfs Unknown ' when the host did not have Gluster installed. Prior to the commit, the test would fail with the error: error: internal error: Child process (/usr/sbin/showmount --no-headers --exports Unknown) unexpected exit status 1: clnt_create: RPC: Unknown host After the commit, the error would be ignored, the call would succeed, and an empty list of pool sources returned. This was tucked into the commit message as an expected outcome. When the target host does not have a GLUSTER_CLI this is a regression over the previous release. Furthermore, even if Gluster CLI was present, but had a failure to get devices, the API would return a failure even if the NFS backend had found devices. Modify the logic to return failure when the NFS backend check fails and there's no GLUSTER_CLI or when both backend checks fail. If either returns success and GLUSTER_CLI is defined, then fetch and return a list of source devices even if it's empty Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_backend_fs.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index be963d4..fa5eba1 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -234,9 +234,11 @@ virStorageBackendFileSystemNetFindPoolSourcesFunc(char **const groups, } -static void +static int virStorageBackendFileSystemNetFindNFSPoolSources(virNetfsDiscoverState *state) { + int ret = -1; + /* * # showmount --no-headers -e HOSTNAME * /tmp * @@ -263,9 +265,13 @@ virStorageBackendFileSystemNetFindNFSPoolSources(virNetfsDiscoverState *state) if (virCommandRunRegex(cmd, 1, regexes, vars, virStorageBackendFileSystemNetFindPoolSourcesFunc, state, NULL) < 0) - virResetLastError(); + goto cleanup; + ret = 0; + + cleanup: virCommandFree(cmd); + return ret; } @@ -285,6 +291,7 @@ virStorageBackendFileSystemNetFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSE virStoragePoolSourcePtr source = NULL; char *ret = NULL; size_t i; + int retNFS = -1, retGluster = -1; virCheckFlags(0, NULL); @@ -306,11 +313,16 @@ virStorageBackendFileSystemNetFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSE state.host = source->hosts[0].name; - virStorageBackendFileSystemNetFindNFSPoolSources(&state); + retNFS = virStorageBackendFileSystemNetFindNFSPoolSources(&state); - if (virStorageBackendFindGlusterPoolSources(state.host, +# ifdef GLUSTER_CLI + retGluster = + virStorageBackendFindGlusterPoolSources(state.host, VIR_STORAGE_POOL_NETFS_GLUSTERFS, - &state.list) < 0) + &state.list); +# endif + /* If both fail, then we won't return an empty list - return an error */ + if (retNFS < 0 && retGluster < 0) goto cleanup; if (!(ret = virStoragePoolSourceListFormat(&state.list))) -- 1.9.0

2 2

[libvirt] [PATCH 0/5] network: fix active status & usage of inactive networks
by Laine Stump 16 Apr '14

16 Apr '14

All 5 of these patches are required to address https://bugzilla.redhat.com/show_bug.cgi?id=880483 The reported problem is that an interface using a currently-inactive macvtap/hostdev network can be attached to a domain (addressed by 5/5). In order to make fixing that problem less of a problem, the automatic inactivation of all macvtap/hostdev networks any time libvirtd is restart must be addressed, and that is done in 1/5-4/5. Part of fixing the latter problem is changing the network driver to use /var/run for its status XML rather than /var/lib (2/5), which causes problems during upgrade (addressed in 3/5) and in a more limited sense downgrade (see the comments in 3/5 for why I haven't addressed those problems)

3 17

[libvirt] how to use libvirt hook scripts to modify domain xml while its start
by cokabug 16 Apr '14

16 Apr '14

i want add sound card to domain xml when guest start,after google,i found libvirt provide hook function. i follow the instruction to make a python,and boot a guest,but after use "virsh edit" its still dont have sound card config /etc/libvirt/hooks/qemu: #!/usr/bin/python import sys import re import os hooklog = '/tmp/hook.log' log = open(hooklog, 'w') stdinxml = sys.stdin.readlines() if sys.argv[2] == 'start': log.write("hook start,domain name: %s \n" % sys.argv[1]) maxslot=-1 for line in stdinxml: slotm = re.search("slot='(?P<slotnum>0x[0-9a-fA-F]{2})'", line) if slotm: slotnum = int(slotm.group('slotnum'),0) if slotnum > maxslot: maxslot = slotnum if '</devices>' in line: log.write("insert sound card config \n") slotnum = maxslot + 1 line = " <sound model='ich6'>\n" line = line + " <address type='pci' domain='0x0000' bus='0x00' slot='0x%0.2X' function='0x0'/>\n" % slotnum line = line + " </sound>\n" line = line + " </devices>\n" stdoutxml = ''.join(line) sys.stdout.write(stdoutxml) tail -f /tmp/hook.log: hook start,domain name: instance-00000222 insert sound card config tail /var/log/libvirt/libvirtd.log: 2014-04-16 07:13:39.159+0000: 52199: warning : qemuDomainObjTaint:1377 : Domain id=81 name='instance-00000222' uuid=974d62b7-f316-4f20-a91c-d11cb85980fe is tainted: high-privileges in these log,hook script seems to executed,but not effective. can anyone tell me where is wrong?

2 2

[libvirt] minimal configure flags to buid libvirt library to compile ruby bindings
by Vasiliy Tolstov 16 Apr '14

16 Apr '14

Hello. I need to compile libvirt with minimal options to pack it via omnibus to chef (need to build libvirt ruby gem). Can somebody explains me what options i need? Does i need remote support or no? -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru jabber: vase(a)selfip.ru

1 0

[libvirt] VNC sharePolicy not working as expected
by Kekane, Abhishek 16 Apr '14

16 Apr '14

Hi All, Greetings!!! We are using KVM hypervisor driver for running OpenStack IaaS. Couple of months back we have reported one security issue [1] in OS. Basically we want to limit on the number of vnc client connections that can be opened by users for a given VM. >From libvirt 1.0.6 version onwards share policy feature is supported to control the way consoles are accessed by the user. Presently it is possible to configure share policy for vnc in 3 different ways:- 1. allow-exclusive, allows clients to ask for exclusive access by dropping other connections 2. force-share, This is the default value, It allows multiple clients to connect to the console in parallel sharing the same session 3. ignore, welcomes every connection unconditionally In openstack nova for libvirt driver I am able to configure the sharePolicy value to graphics element of domain's xml. <graphics type="vnc" autoport="yes" keymap="en-us" listen="127.0.0.1" sharePolicy="force-shared"> <listen type='address' address='127.0.0.1'/> </graphics> <graphics type="vnc" autoport="yes" keymap="en-us" listen="127.0.0.1" sharePolicy="allow-exclusive"> <listen type='address' address='127.0.0.1'/> </graphics> <graphics type="vnc" autoport="yes" keymap="en-us" listen="127.0.0.1" sharePolicy="ignore"> <listen type='address' address='127.0.0.1'/> </graphics> But while testing I am not able to get expected results for allow-exclusive and ignore sharePolicy. For allow-exclusive sharePolicy previous connections are not getting dropped and console contents are getting shared among all open consoles. For ignore sharePolicy also contents are getting shared among all open consoles. I am using libvirt version 1.1.1 and qemu version is 1.5.0. We want to restrict only single authorized user to connect to the console dropping previously connected users automatically by using allow-exclusive sharePolicy. Please let me know what else is required to get this worked successfully. [1] : https://bugs.launchpad.net/nova/+bug/1227575 Thanks, Abhishek ______________________________________________________________________ Disclaimer:This email and any attachments are sent in strictest confidence for the sole use of the addressee and may contain legally privileged, confidential, and proprietary data. If you are not the intended recipient, please advise the sender by replying promptly to this email and then delete and destroy this email and any attachments without any further use, copying or forwarding

3 2

[libvirt] libvirt Hyper-v 2012 r2 fix
by vikhyath reddy 16 Apr '14

16 Apr '14

Hello everyone, Thanks for libvirt. I did see on the libvirt page that hyper-v 2008 is supported (which it does). So I tried running it on Hyper-v 2012 r2 but virsh fails to connect by an error that says *"error: internal error: SOAP fault during enumeration: code 's:Sender', subcode 'n:CannotProcessFilter', reason 'The data source could not process the filter. The filter might be missing or it might be invalid. Change the filter and try the request again. ', detail '500The specified class does not exist in the given namespace. HRESULT 0x8033801a0052150858778HRESULTThe specified class does not exist in the given namespace. ' "* Upon looking into the Hyper-v 2012 r2 server event logs, I found that this is going on [ Source: WMI-Activity Event ID: 5898 Microsoft-Windows-WMI-Activity/Operational ] *Id = {62D480B2-58EF-0000-E580-D462EF58CF01}; ClientMachine = VIKHYPERV; User = VIKHYPERV\Administrator; ClientProcessId = 884;Component = Unknown; Operation = Start IWbemServices::ExecQuery - root\virtualization : select * from Msvm_ComputerSystem whereDescription = "Microsoft Hosting Computer System" ; ResultCode = 0x80041010; PossibleCause = Unknown* Note that* Msvm_ComputerSystem *is missing in the namespace *root\virtualization. *Upon further investigation, I found that the new namespace where *Msvm_ComputerSystem *is located is at root\virtualization\*v2* Is (it possible?) there some way I can know where in the source code, libvirt is specifying the namespace so that I can try patching it up and see if it fixes things? Thanks for all your help, Vik.

2 2

[libvirt] why doesn't libvirt let qemu autostart live-migrated VMs?
by Chris Friesen 15 Apr '14

15 Apr '14

Hi, I've been digging through the libvirt code and something that struck me was that it appears that when using qemu libvirt will migrate the instance with autostart disabled, then sit on the source host periodically polling for migration completion, then once the host detects that migration is completed it will tell the destination to start up the VM. Why don't we let the destination autostart the VM once migration is complete? Chris

2 3

[libvirt] RFC: Exposing backing chains in <domain> XML
by Eric Blake 15 Apr '14

15 Apr '14

tl;dr: I am working on a series of patches to expose backing chain information in <domain> XML. Comments are welcome, to make sure my XML design is on the right track. Purpose ======= Among other things, this will help us support Peter's proposal of enhancing the block-pull and block-commit actions to specify a destination by relative depth in the backing chain (where "vda[0]" represents the active image, "vda[1]" represents the backing file of the active image, and so on). It will also help debug situations where libvirt and qemu disagree on what constitutes a backing chain, and therefore causes sVirt labeling discrepancies or prohibits block-pull/block-commit actions. For example, given the chain "base <- mid <- top", if top forgot the backing_fmt attribute, and /etc/libvirt/qemu.conf allow_disk_format_probing=0 (which it is by default for security resasons), libvirt treats 'mid' as a raw file and refuses to acknowledge that 'base' is part of the chain, while qemu would happily treat mid as qcow2 and therefore use 'base' if permissions allow it to. I have helped debug this scenario several times on IRC or in bugzilla reports. This feature is being driven in part by https://bugzilla.redhat.com/show_bug.cgi?id=1069407 Existing design =============== Note that libvirt can already expose backing file details (but only one layer; it is not recursive) when using virStorageVolGetXMLDesc(); for example: # virsh vol-dumpxml --pool gluster img3 <volume type='network'> <name>img3</name> <key>vol1/img3</key> ... <target> <path>gluster://localhost/vol1/img3</path> <format type='qcow2'/> ... </target> <backingStore> <path>gluster://localhost/vol1/img2</path> <format type='qcow2'/> <permissions> <mode>00</mode> <owner>0</owner> <group>0</group> </permissions> </backingStore> </volume> In the current volume representation, if a <backingStore> element is present, it gives the <path> to the backing file. But this representation is a bit limited: it is rather hard-coded to the assumption that there is only one backing file, and does not do a good job when the backing image is not in the same storage pool as the volume it is describing. Some of the enhancements I'm proposing for <domain> should also be applied to the information output by <volume> XML, which means I have to be careful that the design I'm proposing will mesh well with the storage xml to maximize code reuse. The volume approach is a bit painful to users trying to track the backing chain of a disk tied to a <domain> because it necessitates creating a storage pool and making multiple calls to follow the chain, so we need to expose the backing chain directly in the <disk> element of a domain, and recursively show the entire chain. Furthermore, there are some formats that require multiple resources: for example, both qemu 2.0's new quorum driver and HyperV VHDX images can have multiple backing files, and where these files can in turn have more backing images. Thus, any proper representation of disk resources needs to show a full tree of relationships. Thankfully, circular references in backing files would form an invalid image (all known virtual disk image formats require a DAG of relationships). With existing API, we still have not fully implemented 'virsh snapshot-delete' of external snapshots. So our current advice is for people to manually use qemu-img to alter backing chains, then update libvirt to match. Once libvirt starts tracking backing chains, it becomes all the more important to provide two new actions in libvirt: we need a validation mode (check that what is recorded on disk matches what is recorded in XML and flag an error if they differ) and a correction mode (ignore what is recorded in XML and regenerate it to match what is actually on disk). Proposal ======== For each <disk> of a domain, I will be adding a new <backingStore> element. The element is optional on input, which allows libvirt to continue to understand input from older versions, but will always be present on output, to show what libvirt is tracking as the backing chain. For a file with no backing store (including raw file format), the usage is simple: <disk type='file' device='disk'> <driver name='qemu' type='raw'/> <source file='/path/to/somewhere'/> <backingStore/> <target dev='vda' bus='virtio'/> </disk> The new explicit <backingStore/> makes it clear that there is no backing chain. A backing chain of 3 files (base <- mid <- top) in the local file system: <disk type='file' device='disk'> <driver name='qemu' type='qcow2'/> <source file='/var/lib/libvirt/images/top.qcow2'/> <backingStore type='file'> <driver name='qemu' type='qcow2'/> <source file='/var/lib/libvirt/images/mid.qcow2'/> <backingStore type='file'> <driver name='qemu' type='qcow2'/> <source file='/var/lib/libvirt/images/base.qcow2'/> <backingStore/> </backingStore> </backingStore> <target dev='vda' bus='virtio'/> </disk> Note that this is intentionally nested, so that for file formats that support more than one backing resource, it can list parallel <backingStore> as siblings to describe those related resources (thus leaving the door open to expose a qemu quorum as a <disk type='quorum'> with no direct <source> but instead with three <backingStore> sibling elements for each member of the quorum, and where each member of the quorum can further have its own backing chain). Design wise, the <backingStore> element is either completely empty (end-of-chain), or has a mandatory type='...' attribute that mirrors the same type attribute of a <disk>. Then, within the backingStore element, there is a <source> or other appropriate sub-elements similar to what <disk> already uses for describing a single host resource. So, for an example, here would be the output for a 2-element chain on gluster: <disk type='network' device='disk'> <driver name='qemu' type='qcow2'/> <source protocol='gluster' name='vol1/img2'> <host name='red'/> </source> <backingStore type='network'> <driver name='qemu' type='qcow2'/> <source protocol='gluster' name='vol1/img1'> <host name='red'/> </source> <backingStore/> </backingStore> <target dev='vdb' bus='virtio'/> </disk> Or again, but this time using volume references to a storage pool (assuming 'glusterVol1' is the storage pool wrapping gluster://red/vol1): <disk type='volume' device='disk'> <driver name='qemu' type='qcow2'/> <source pool='glusterVol1' volume='img2'/> <backingStore type='volume'> <driver name='qemu' type='qcow2'/> <source pool='glusterVol1' volume='img1'/> <backingStore/> </backingStore> <target dev='vdb' bus='virtio'/> </disk> As can be seen, this design heavily reuses existing <disk type='...'> handling, which should make it easier to reuse blocks of code both in libvirt to handle the backing chains, and in clients when processing backing chains to hand to libvirt up front or in inspecting the dumpxml results. Management apps like vdsm that use transient domains should start supplying <backingStore> elements to fully describe chains. Implementation ============== The following APIs will be affected: defining domain XML (whether via define for persistent domains, or create for transient domains): parse the new element. If the element is already present, default to trusting the backing chain in that element instead of reading from the disk files. If the element is absent, read the disk files and populate the element. It is probably also worth adding a flag to trigger validation mode: read the disk files to ensure they match the xml, and refuse the operation if there is a mismatch (as for updating xml to match reality, the simplest is to edit the XML and delete the <backingStore> element then try the define again, so I don't see the need for a flag for that action). I may also need to figure out if it is worth tainting a domain any time where libvirt detects that the XML backing chain vs. the disk file read backing chain have diverged. Note that defining domain XML includes loading from saved state or from incoming migration. dumping domain XML: always output the new element, by default without consulting disk files. By tracking the chain in memory ever since the guest is defined, it should already be available for output. I'm debating whether we need a flag (similar to virsh dumpxml --update-cpu) that can force libvirt to re-read the disk files at the time of the dump and regenerate the chain to match reality of any changes made behind libvirt's back. creating external snapshots: the <domainsnapshot> XMl will continue to be the picture of the domain prior to the creation of the snapshot (but this picture will now include any <backingStore> elements already present in the chain), but after the snapshot is taken, the <domain> XML will also be modified to record the updated chain (the old disk source is now the <backingStore> of the new disk source). deleting external snapshots is not yet implemented, but the implementation will have to shrink the backingStore chain to match reality. block-pull (block-rebase in pull mode), block-commit: at the completion of the pull, the <backingStore> needs to be updated to reflect the new shorter state of the chain block-copy (block-rebase in copy mode): the operation starts out by creating a mirror, but during the first phase, the mirror is not usable as an accurate copy of what the guest sees. Right now we fudge by saying that block copy can only be done on transient domains; but even with that, we still track a <mirror> element in the <disk> XML to track that a block copy is underway (so that the operation survives a libvirtd restart). The <mirror> element will now need to be taught a <backingStore>, particularly if the user passes in a pre-existing file to be reused as the copy destination. Then, when the second phase is complete and the mirroring is ended, the <disk> will need another update to select which side of the backing chain is now in force virsh domblklist: should be taught a new flag to show the backing chain in a tree format, since the command already exists to extract <disk> information from a domain into a nicer human format sVirt security labeling: right now, we are read the disk files to both label and remove labels on a backing chain - obviously, once the chain is tracked natively as part of the <disk>, we should be labeling without having to read disk files storage volumes - investigate how much of the backing chain code can be reused in enhancing storage volume xml output anything else you can think of in the code base that will be impacted? -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

4 17

[libvirt] [java] [PATCH 1/2] GetNodeCpuStat binding
by Pasquale.phate867＠gmail.com 15 Apr '14

15 Apr '14

From: Pasquale Di Rienzo <phate867(a)gmail.com> -Added the getNodeCpuStat binding to Libvirt class -Added virNodeCPUStats and CPUStat classes to support this binding -Added the method getCPUStats to Connect class --- AUTHORS | 1 + src/main/java/org/libvirt/CPUStat.java | 57 ++++++++++++++++++++++ src/main/java/org/libvirt/Connect.java | 53 ++++++++++++++++++++ src/main/java/org/libvirt/jna/Libvirt.java | 5 ++ src/main/java/org/libvirt/jna/virNodeCPUStats.java | 19 ++++++++ 5 files changed, 135 insertions(+) create mode 100644 src/main/java/org/libvirt/CPUStat.java create mode 100644 src/main/java/org/libvirt/jna/virNodeCPUStats.java diff --git a/AUTHORS b/AUTHORS index 07809bf..77139e5 100644 --- a/AUTHORS +++ b/AUTHORS @@ -16,3 +16,4 @@ Andrea Sansottera <andrea.sansottera(a)gmail.com> Stefan Majer <stefan.majer(a)gmail.com> Wido den Hollander <wido(a)widodh.nl> Eric Blake <eblake(a)redhat.com> +Pasquale Di Rienzo <phate867(a)gmail.com> diff --git a/src/main/java/org/libvirt/CPUStat.java b/src/main/java/org/libvirt/CPUStat.java new file mode 100644 index 0000000..527049c --- /dev/null +++ b/src/main/java/org/libvirt/CPUStat.java @@ -0,0 +1,57 @@ +package org.libvirt; + +import java.nio.charset.Charset; +import org.libvirt.jna.virNodeCPUStats; +import org.libvirt.jna.virTypedParameter; + +/** + * This class holds a cpu time. + * The tag attribute is a string of either "kernel","user","idle","iowait" + * while the value attribute is the actual time value + * @author Pasquale Di Rienzo + * + */ +public class CPUStat { + public String tag; + public long value; + + private String createStringFromBytes(byte[] b){ + Charset ch = Charset.forName("UTF-8"); + int i = 0; + while ((i<b.length) && (b[i]!=0)) + i++; + + return new String(b,0,i,ch); + } + + public CPUStat(virNodeCPUStats stat){ + tag = createStringFromBytes(stat.field); + value = stat.value.longValue(); + } + + public CPUStat(virTypedParameter stat){ + tag = createStringFromBytes(stat.field); + value = stat.value.l; + } + + public String getTag() { + return tag; + } + + public long getValue() { + return value; + } + + public void setTag(String tag) { + this.tag = tag; + } + + public void setValue(long val) { + this.value = val; + } + + @Override + public String toString() { + return String.format("tag:%s%nval:%d%n", tag, value); + } +} diff --git a/src/main/java/org/libvirt/Connect.java b/src/main/java/org/libvirt/Connect.java index fedc60e..d8a4ce2 100644 --- a/src/main/java/org/libvirt/Connect.java +++ b/src/main/java/org/libvirt/Connect.java @@ -2,6 +2,8 @@ package org.libvirt; import java.util.UUID; +import org.libvirt.CPUStat; +import org.libvirt.LibvirtException; import org.libvirt.jna.ConnectionPointer; import org.libvirt.jna.DevicePointer; import org.libvirt.jna.DomainPointer; @@ -14,6 +16,7 @@ import org.libvirt.jna.StoragePoolPointer; import org.libvirt.jna.StorageVolPointer; import org.libvirt.jna.StreamPointer; import org.libvirt.jna.virConnectAuth; +import org.libvirt.jna.virNodeCPUStats; import org.libvirt.jna.virNodeInfo; import static org.libvirt.Library.libvirt; @@ -23,6 +26,7 @@ import static org.libvirt.ErrorHandler.processErrorIfZero; import com.sun.jna.Memory; import com.sun.jna.NativeLong; import com.sun.jna.Pointer; +import com.sun.jna.ptr.IntByReference; import com.sun.jna.ptr.LongByReference; /** @@ -207,6 +211,55 @@ public class Connect { } return processError(success); } + + /** + * This function returns statistics about the cpu, that is the time + * each cpu is spending in kernel time, user time, io time and idle time. + * Each CPUStat object refers to a particular time. + * + * Note that not all these stats are granted to be retrieved. + * + * @param the number of the cpu you want to retrieve stats from. + * passing -1 will make this function retrieve a mean value + * from all cpus the system has. + * + * @param some flags + * @return a cpustat object for each cpu + * @throws LibvirtException + */ + public CPUStat[] getCPUStats(int cpuNumber,long flags) throws LibvirtException{ + CPUStat[] stats = null; + + IntByReference nParams = new IntByReference(); + + //according to libvirt reference you call this function once passing + //null as param paramether to get the actual stats (kernel,user,io,idle) number into the + //nParams reference. Generally this number would be 4, but some systems + //may not give all 4 times, so it is always good to call it. + int result = libvirt.virNodeGetCPUStats( + VCP, cpuNumber, null, nParams, flags); + + processError(result); + + if(result == 0){//dunno if this check is actually needed + + //this time we create an array to fit the number of paramethers + virNodeCPUStats[] params = new virNodeCPUStats[nParams.getValue()]; + //and we pass it to the function + result = libvirt.virNodeGetCPUStats(VCP, cpuNumber , params, nParams, flags); + processError(result); + + //finally we parse the result in an user friendly class which does + //not expose libvirt's internal paramethers + if(result >= 0){ + stats = new CPUStat[params.length]; + for(int i=0;i<params.length;i++) + stats[i] = new CPUStat(params[i]); + } + } + + return stats; + } /** * Compares the given CPU description with the host CPU diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 0e4c9fc..658299f 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -1,5 +1,8 @@ package org.libvirt.jna; +import org.libvirt.jna.ConnectionPointer; +import org.libvirt.jna.virNodeCPUStats; + import com.sun.jna.Callback; import com.sun.jna.Library; import com.sun.jna.Native; @@ -267,6 +270,8 @@ public interface Libvirt extends Library { int virNetworkUndefine(NetworkPointer virConnectPtr); // Node functions + int virNodeGetCPUStats(ConnectionPointer virConnectPtr, int cpuNum, + virNodeCPUStats[] stats,IntByReference nparams, long flags); int virNodeGetInfo(ConnectionPointer virConnectPtr, virNodeInfo virNodeInfo); int virNodeGetCellsFreeMemory(ConnectionPointer virConnectPtr, LongByReference freeMems, int startCell, int maxCells); diff --git a/src/main/java/org/libvirt/jna/virNodeCPUStats.java b/src/main/java/org/libvirt/jna/virNodeCPUStats.java new file mode 100644 index 0000000..a8f2dca --- /dev/null +++ b/src/main/java/org/libvirt/jna/virNodeCPUStats.java @@ -0,0 +1,19 @@ +package org.libvirt.jna; + +import java.util.Arrays; +import java.util.List; + +import com.sun.jna.NativeLong; +import com.sun.jna.Structure; + +public class virNodeCPUStats extends Structure{ + public byte[] field = new byte[80]; + public NativeLong value ; + + private static final List fields = Arrays.asList( "field", "value"); + + @Override + protected List getFieldOrder() { + return fields; + } +} -- 1.8.3.2

1 1

[libvirt] [PATCH] nodeinfo: Make sure we always reset errno before calling readdir
by Natanael Copa 15 Apr '14

15 Apr '14

We must always reset errno to 0 even if we do 'continue'. This fixes runtime with musl libc which will set errno on sscanf. Signed-off-by: Natanael Copa <ncopa(a)alpinelinux.org> --- src/nodeinfo.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 53ba716..8d3214e 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -452,8 +452,7 @@ virNodeParseNode(const char *node, /* enumerate sockets in the node */ CPU_ZERO(&sock_map); - errno = 0; - while ((cpudirent = readdir(cpudir))) { + for (errno = 0; (cpudirent = readdir(cpudir)); errno = 0) { if (sscanf(cpudirent->d_name, "cpu%u", &cpu) != 1) continue; @@ -470,8 +469,6 @@ virNodeParseNode(const char *node, if (sock > sock_max) sock_max = sock; - - errno = 0; } if (errno) { @@ -490,8 +487,7 @@ virNodeParseNode(const char *node, /* iterate over all CPU's in the node */ rewinddir(cpudir); - errno = 0; - while ((cpudirent = readdir(cpudir))) { + for (errno = 0; (cpudirent = readdir(cpudir)); errno = 0) { if (sscanf(cpudirent->d_name, "cpu%u", &cpu) != 1) continue; @@ -530,8 +526,6 @@ virNodeParseNode(const char *node, if (siblings > *threads) *threads = siblings; - - errno = 0; } if (errno) { @@ -672,8 +666,7 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, goto fallback; } - errno = 0; - while ((nodedirent = readdir(nodedir))) { + for (errno = 0; (nodedirent = readdir(nodedir)); errno = 0) { if (sscanf(nodedirent->d_name, "node%u", &node) != 1) continue; @@ -699,8 +692,6 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, if (threads > nodeinfo->threads) nodeinfo->threads = threads; - - errno = 0; } if (errno) { -- 1.9.1

3 10

[libvirt] [PATCH tck] 202-numa-set-parameters.t: use AFFECT_CONFIG when changing nodeset
by Mike Latimer 15 Apr '14

15 Apr '14

The 202-numa-set-parameters.t test sets NUMA_NODESET using AFFECT_LIVE on a running domain, destroys and starts the domain, then verifies the NUMA_NODESET setting. As AFFECT_LIVE does not write the setting to the domain xml file, the new nodeset setting is lost when the domain is destroyed and the test fails. This patch adds AFFECT_CONFIG to set_numa_parameters, so both the live environment and the xml file are updated with the new setting. An additional test was also added, before the domain is destroyed, to ensure the nodeset change is seen on the live domain. --- scripts/domain/202-numa-set-parameters.t | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/domain/202-numa-set-parameters.t b/scripts/domain/202-numa-set-parameters.t index 886a979..f5ed871 100644 --- a/scripts/domain/202-numa-set-parameters.t +++ b/scripts/domain/202-numa-set-parameters.t @@ -28,7 +28,7 @@ after the API call to set NUMA parameters for a domain. use strict; use warnings; -use Test::More tests => 12; +use Test::More tests => 13; use Sys::Virt::TCK; use Test::Exception; @@ -57,8 +57,12 @@ my %params = ( Sys::Virt::Domain::NUMA_NODESET => '0', ); -diag "Set numa parameters, affects live config"; -lives_ok(sub {$dom->set_numa_parameters(\%params, Sys::Virt::Domain::AFFECT_LIVE)}, "set_numa_parameters"); +diag "Set numa parameters, affects live and config"; +lives_ok(sub {$dom->set_numa_parameters(\%params, Sys::Virt::Domain::AFFECT_LIVE | Sys::Virt::Domain::AFFECT_CONFIG)}, "set_numa_parameters"); + +diag "Get numa parameters"; +my $params = $dom->get_numa_parameters(Sys::Virt::Domain::AFFECT_LIVE); +ok($params->{Sys::Virt::Domain::NUMA_NODESET} eq '0', 'Check nodeset'); diag "Destroy the domain"; $dom->destroy; @@ -68,7 +72,7 @@ $dom->create; ok($dom->get_id > 0, "running domain with ID > 0"); diag "Get numa parameters"; -my $params = $dom->get_numa_parameters(Sys::Virt::Domain::AFFECT_LIVE); +$params = $dom->get_numa_parameters(Sys::Virt::Domain::AFFECT_LIVE); ok($params->{Sys::Virt::Domain::NUMA_NODESET} eq '0', 'Check nodeset'); diag "Destroy the domain"; -- 1.8.4.5

2 1

[libvirt] [PATCH tck] 220-no-ip-spoofing.t: Don't use a static netmask
by Mike Latimer 15 Apr '14

15 Apr '14

For environments not using a /24 netmask, this test can end up in a hung state. This patch reads the netmask from the nic and uses it later when ip addresses are changed and restored. --- scripts/nwfilter/220-no-ip-spoofing.t | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/nwfilter/220-no-ip-spoofing.t b/scripts/nwfilter/220-no-ip-spoofing.t index 5e8e0d7..3a0213d 100644 --- a/scripts/nwfilter/220-no-ip-spoofing.t +++ b/scripts/nwfilter/220-no-ip-spoofing.t @@ -79,19 +79,20 @@ $ssh->login("root", $tck->root_password()); diag "preparing ip spoof"; my $cmdfile = <<EOF; echo "DEV=`ip link | head -3 | tail -1 | awk '{print \\\$2}' | sed -e 's/://'` +MASK=`ip addr show \\\$DEV | grep 'inet ' | awk '{print \\\$2}' | sed -e 's/.*\\///;q'` /sbin/ip addr show \\\$DEV /sbin/ip link set \\\$DEV down /sbin/ip addr flush dev \\\$DEV -/sbin/ip addr add 192.168.122.183/24 dev \\\$DEV +/sbin/ip addr add 192.168.122.183/\\\$MASK dev \\\$DEV /sbin/ip link set \\\$DEV up /sbin/ip addr show \\\$DEV /bin/sleep 1 /bin/ping -c 1 192.168.122.1 /sbin/ip link set \\\$DEV down /sbin/ip addr flush dev \\\$DEV -/sbin/ip addr add ${guestip}/24 dev \\\$DEV +/sbin/ip addr add ${guestip}/\\\$MASK dev \\\$DEV /sbin/ip link set \\\$DEV up -/sbin/ip link \\\$DEV" > /test.sh +/sbin/ip addr show \\\$DEV" > /test.sh EOF diag $cmdfile; my ($stdout, $stderr, $exit) = $ssh->cmd($cmdfile); -- 1.8.4.5

2 1

[libvirt] [PATCH tck] 210-no-mac-spoofing.t: Catch network is unreachable error
by Mike Latimer 15 Apr '14

15 Apr '14

Some environments (openSUSE 13.1) can report the network is unreachable during this test. Trap that condition as well. --- scripts/nwfilter/210-no-mac-spoofing.t | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/nwfilter/210-no-mac-spoofing.t b/scripts/nwfilter/210-no-mac-spoofing.t index d7c57e6..7e80216 100644 --- a/scripts/nwfilter/210-no-mac-spoofing.t +++ b/scripts/nwfilter/210-no-mac-spoofing.t @@ -92,7 +92,7 @@ echo "DEV=`ip link | head -3 | tail -1 | awk '{print \\\$2}' | sed -e 's/://'` /sbin/ip link set \\\$DEV address ${macfalse} /sbin/ip link set \\\$DEV up /sbin/ip addr show dev \\\$DEV -/bin/ping -c 10 ${gateway} +/bin/ping -c 10 ${gateway} 2>&1 /sbin/ip link set \\\$DEV down /sbin/ip link set \\\$DEV address ${mac} /sbin/ip link set \\\$DEV up @@ -119,7 +119,7 @@ diag $exit; diag $stdout; diag $stderr; diag $exit; -ok($stdout =~ "100% packet loss", "packet loss expected"); +ok($stdout =~ /100% packet loss|Network is unreachable/, "packet loss expected"); shutdown_vm_gracefully($dom); -- 1.8.4.5

2 1

[libvirt] [PATCH tck] 110-static-relabel-yes.t: Only 5 tests in 110-static-relabel
by Mike Latimer 15 Apr '14

15 Apr '14

Trivial, but there are only 5 tests in 110-static-relabel-yes.t. --- scripts/selinux/110-static-relabel-yes.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/selinux/110-static-relabel-yes.t b/scripts/selinux/110-static-relabel-yes.t index f558cc9..76781ca 100644 --- a/scripts/selinux/110-static-relabel-yes.t +++ b/scripts/selinux/110-static-relabel-yes.t @@ -28,7 +28,7 @@ and files can be relabelled use strict; use warnings; -use Test::More tests => 6; +use Test::More tests => 5; use Sys::Virt::TCK; use Sys::Virt::TCK::SELinux; -- 1.8.4.5

2 1

[libvirt] [PATCH tck] 300-vsitype.t: Skip after $tck is defined
by Mike Latimer 15 Apr '14

15 Apr '14

With $tck added to the skip conditional, the entire codeblock has to be after $tck is defined. Also, $tck->cleanup should be added to the skip conditions. --- scripts/nwfilter/300-vsitype.t | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/scripts/nwfilter/300-vsitype.t b/scripts/nwfilter/300-vsitype.t index 1de67d1..430618f 100644 --- a/scripts/nwfilter/300-vsitype.t +++ b/scripts/nwfilter/300-vsitype.t @@ -28,14 +28,6 @@ use warnings; use Test::More; -if ( ! -e '/usr/sbin/lldptool' ) { - eval "use Test::More skip_all => \"lldptool is not available\";"; -} elsif (!$tck->get_host_network_device()) { - eval "use Test::More skip_all => \"no host net device configured\";"; -} else { - eval "use Test::More tests => 4"; -} - use Sys::Virt::TCK; use Sys::Virt::TCK::NetworkHelpers; use Test::Exception; @@ -49,6 +41,16 @@ END { $tck->cleanup if $tck; } +if ( ! -e '/usr/sbin/lldptool' ) { + $tck->cleanup if $tck; + eval "use Test::More skip_all => \"lldptool is not available\";"; +} elsif (!$tck->get_host_network_device()) { + $tck->cleanup if $tck; + eval "use Test::More skip_all => \"no host net device configured\";"; +} else { + eval "use Test::More tests => 4"; +} + # create first domain and start it my $xml = $tck->generic_domain(name => "tck", fullos => 1, netmode => "vepa")->as_xml(); -- 1.8.4.5

2 1

[libvirt] [java] [PATCH] GetNodeCpuStat binding
by phate867＠gmail.com 15 Apr '14

15 Apr '14

From: Pasquale Di Rienzo <phate867(a)gmail.com> -Added the getNodeCpuStat binding to Libvirt class -Added virNodeCPUStats and CPUStat classes to support this binding -Added the method getCPUStats to Connect class --- AUTHORS | 1 + src/main/java/org/libvirt/CPUStat.java | 57 ++++++++++++++++++++++ src/main/java/org/libvirt/Connect.java | 53 ++++++++++++++++++++ src/main/java/org/libvirt/jna/Libvirt.java | 5 ++ src/main/java/org/libvirt/jna/virNodeCPUStats.java | 19 ++++++++ 5 files changed, 135 insertions(+) create mode 100644 src/main/java/org/libvirt/CPUStat.java create mode 100644 src/main/java/org/libvirt/jna/virNodeCPUStats.java diff --git a/AUTHORS b/AUTHORS index 07809bf..77139e5 100644 --- a/AUTHORS +++ b/AUTHORS @@ -16,3 +16,4 @@ Andrea Sansottera <andrea.sansottera(a)gmail.com> Stefan Majer <stefan.majer(a)gmail.com> Wido den Hollander <wido(a)widodh.nl> Eric Blake <eblake(a)redhat.com> +Pasquale Di Rienzo <phate867(a)gmail.com> diff --git a/src/main/java/org/libvirt/CPUStat.java b/src/main/java/org/libvirt/CPUStat.java new file mode 100644 index 0000000..527049c --- /dev/null +++ b/src/main/java/org/libvirt/CPUStat.java @@ -0,0 +1,57 @@ +package org.libvirt; + +import java.nio.charset.Charset; +import org.libvirt.jna.virNodeCPUStats; +import org.libvirt.jna.virTypedParameter; + +/** + * This class holds a cpu time. + * The tag attribute is a string of either "kernel","user","idle","iowait" + * while the value attribute is the actual time value + * @author Pasquale Di Rienzo + * + */ +public class CPUStat { + public String tag; + public long value; + + private String createStringFromBytes(byte[] b){ + Charset ch = Charset.forName("UTF-8"); + int i = 0; + while ((i<b.length) && (b[i]!=0)) + i++; + + return new String(b,0,i,ch); + } + + public CPUStat(virNodeCPUStats stat){ + tag = createStringFromBytes(stat.field); + value = stat.value.longValue(); + } + + public CPUStat(virTypedParameter stat){ + tag = createStringFromBytes(stat.field); + value = stat.value.l; + } + + public String getTag() { + return tag; + } + + public long getValue() { + return value; + } + + public void setTag(String tag) { + this.tag = tag; + } + + public void setValue(long val) { + this.value = val; + } + + @Override + public String toString() { + return String.format("tag:%s%nval:%d%n", tag, value); + } +} diff --git a/src/main/java/org/libvirt/Connect.java b/src/main/java/org/libvirt/Connect.java index fedc60e..d8a4ce2 100644 --- a/src/main/java/org/libvirt/Connect.java +++ b/src/main/java/org/libvirt/Connect.java @@ -2,6 +2,8 @@ package org.libvirt; import java.util.UUID; +import org.libvirt.CPUStat; +import org.libvirt.LibvirtException; import org.libvirt.jna.ConnectionPointer; import org.libvirt.jna.DevicePointer; import org.libvirt.jna.DomainPointer; @@ -14,6 +16,7 @@ import org.libvirt.jna.StoragePoolPointer; import org.libvirt.jna.StorageVolPointer; import org.libvirt.jna.StreamPointer; import org.libvirt.jna.virConnectAuth; +import org.libvirt.jna.virNodeCPUStats; import org.libvirt.jna.virNodeInfo; import static org.libvirt.Library.libvirt; @@ -23,6 +26,7 @@ import static org.libvirt.ErrorHandler.processErrorIfZero; import com.sun.jna.Memory; import com.sun.jna.NativeLong; import com.sun.jna.Pointer; +import com.sun.jna.ptr.IntByReference; import com.sun.jna.ptr.LongByReference; /** @@ -207,6 +211,55 @@ public class Connect { } return processError(success); } + + /** + * This function returns statistics about the cpu, that is the time + * each cpu is spending in kernel time, user time, io time and idle time. + * Each CPUStat object refers to a particular time. + * + * Note that not all these stats are granted to be retrieved. + * + * @param the number of the cpu you want to retrieve stats from. + * passing -1 will make this function retrieve a mean value + * from all cpus the system has. + * + * @param some flags + * @return a cpustat object for each cpu + * @throws LibvirtException + */ + public CPUStat[] getCPUStats(int cpuNumber,long flags) throws LibvirtException{ + CPUStat[] stats = null; + + IntByReference nParams = new IntByReference(); + + //according to libvirt reference you call this function once passing + //null as param paramether to get the actual stats (kernel,user,io,idle) number into the + //nParams reference. Generally this number would be 4, but some systems + //may not give all 4 times, so it is always good to call it. + int result = libvirt.virNodeGetCPUStats( + VCP, cpuNumber, null, nParams, flags); + + processError(result); + + if(result == 0){//dunno if this check is actually needed + + //this time we create an array to fit the number of paramethers + virNodeCPUStats[] params = new virNodeCPUStats[nParams.getValue()]; + //and we pass it to the function + result = libvirt.virNodeGetCPUStats(VCP, cpuNumber , params, nParams, flags); + processError(result); + + //finally we parse the result in an user friendly class which does + //not expose libvirt's internal paramethers + if(result >= 0){ + stats = new CPUStat[params.length]; + for(int i=0;i<params.length;i++) + stats[i] = new CPUStat(params[i]); + } + } + + return stats; + } /** * Compares the given CPU description with the host CPU diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 0e4c9fc..658299f 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -1,5 +1,8 @@ package org.libvirt.jna; +import org.libvirt.jna.ConnectionPointer; +import org.libvirt.jna.virNodeCPUStats; + import com.sun.jna.Callback; import com.sun.jna.Library; import com.sun.jna.Native; @@ -267,6 +270,8 @@ public interface Libvirt extends Library { int virNetworkUndefine(NetworkPointer virConnectPtr); // Node functions + int virNodeGetCPUStats(ConnectionPointer virConnectPtr, int cpuNum, + virNodeCPUStats[] stats,IntByReference nparams, long flags); int virNodeGetInfo(ConnectionPointer virConnectPtr, virNodeInfo virNodeInfo); int virNodeGetCellsFreeMemory(ConnectionPointer virConnectPtr, LongByReference freeMems, int startCell, int maxCells); diff --git a/src/main/java/org/libvirt/jna/virNodeCPUStats.java b/src/main/java/org/libvirt/jna/virNodeCPUStats.java new file mode 100644 index 0000000..a8f2dca --- /dev/null +++ b/src/main/java/org/libvirt/jna/virNodeCPUStats.java @@ -0,0 +1,19 @@ +package org.libvirt.jna; + +import java.util.Arrays; +import java.util.List; + +import com.sun.jna.NativeLong; +import com.sun.jna.Structure; + +public class virNodeCPUStats extends Structure{ + public byte[] field = new byte[80]; + public NativeLong value ; + + private static final List fields = Arrays.asList( "field", "value"); + + @Override + protected List getFieldOrder() { + return fields; + } +} -- 1.8.3.2

3 4

[libvirt] [PATCH] storage: netfs: Handle backend errors
by John Ferlan 15 Apr '14

15 Apr '14

Commit id '18642d10' caused a virt-test regression for NFS backend storage error path checks when running the command: 'virsh find-storage-pool-sources-as netfs Unknown ' when the host did not have Gluster installed. Prior to the commit, the test would fail with the error: error: internal error: Child process (/usr/sbin/showmount --no-headers --exports Unknown) unexpected exit status 1: clnt_create: RPC: Unknown host After the commit, the error would be ignored, the call would succeed, and an empty list of pool sources returned. This was tucked into the commit message as an expected outcome. When the target host does not have a GLUSTER_CLI this is a regression over the previous release. Furthermore, even if Gluster CLI was present, but had a failure to get devices, the API would return a failure even if the NFS backend had found devices. Add code to handle the error conditions. - If NFS fails - If there is no Gluster CLI, then jump to cleanup/failure. - If there is a Gluster CLI, then message the NFS failure and continue with the Gluster checks. - If Gluster fails - If NFS had failed, then jump to cleanup/failure. - Message the Gluster failure and continue on. - If only one fails, fetch and return a list of source devices even if it's empty Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_backend.c | 14 +++++++++++++ src/storage/storage_backend.h | 1 + src/storage/storage_backend_fs.c | 43 +++++++++++++++++++++++++++++++++++----- 3 files changed, 53 insertions(+), 5 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index b56fefe..4d73902 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1643,6 +1643,13 @@ virStorageBackendStablePath(virStoragePoolObjPtr pool, } #ifdef GLUSTER_CLI +bool +virStorageBackendHaveGlusterCLI(void) +{ + return true; +} + + int virStorageBackendFindGlusterPoolSources(const char *host, int pooltype, @@ -1721,6 +1728,13 @@ virStorageBackendFindGlusterPoolSources(const char *host, return ret; } #else /* #ifdef GLUSTER_CLI */ +bool +virStorageBackendHaveGlusterCLI(void) +{ + return false; +} + + int virStorageBackendFindGlusterPoolSources(const char *host ATTRIBUTE_UNUSED, int pooltype ATTRIBUTE_UNUSED, diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h index 4f95000..41eed97 100644 --- a/src/storage/storage_backend.h +++ b/src/storage/storage_backend.h @@ -87,6 +87,7 @@ int virStorageBackendFindFSImageTool(char **tool); virStorageBackendBuildVolFrom virStorageBackendFSImageToolTypeToFunc(int tool_type); +bool virStorageBackendHaveGlusterCLI(void); int virStorageBackendFindGlusterPoolSources(const char *host, int pooltype, virStoragePoolSourceListPtr list); diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 4e4a7ae..f3d4a6d 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -238,9 +238,11 @@ virStorageBackendFileSystemNetFindPoolSourcesFunc(char **const groups, } -static void +static int virStorageBackendFileSystemNetFindNFSPoolSources(virNetfsDiscoverState *state) { + int ret = -1; + /* * # showmount --no-headers -e HOSTNAME * /tmp * @@ -267,9 +269,13 @@ virStorageBackendFileSystemNetFindNFSPoolSources(virNetfsDiscoverState *state) if (virCommandRunRegex(cmd, 1, regexes, vars, virStorageBackendFileSystemNetFindPoolSourcesFunc, state, NULL) < 0) - virResetLastError(); + goto cleanup; + ret = 0; + + cleanup: virCommandFree(cmd); + return ret; } @@ -289,6 +295,7 @@ virStorageBackendFileSystemNetFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSE virStoragePoolSourcePtr source = NULL; char *ret = NULL; size_t i; + bool failNFS = false; virCheckFlags(0, NULL); @@ -310,12 +317,38 @@ virStorageBackendFileSystemNetFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSE state.host = source->hosts[0].name; - virStorageBackendFileSystemNetFindNFSPoolSources(&state); + if (virStorageBackendFileSystemNetFindNFSPoolSources(&state) < 0) { + virErrorPtr err; + /* If no Gluster CLI, then force error right here */ + if (!virStorageBackendHaveGlusterCLI()) + goto cleanup; + + /* If we have a Gluster CLI, then message the error, clean it out, + * and move onto the Gluster code + */ + err = virGetLastError(); + VIR_ERROR(_("Failed to get NFS pool sources: '%s'"), + err != NULL ? err->message: _("unknown error")); + virResetLastError(); + failNFS = true; + } if (virStorageBackendFindGlusterPoolSources(state.host, VIR_STORAGE_POOL_NETFS_GLUSTERFS, - &state.list) < 0) - goto cleanup; + &state.list) < 0) { + virErrorPtr err; + /* If NFS failed as well, then force the error right here */ + if (failNFS) + goto cleanup; + + /* Otherwise, NFS passed, so we message the Gluster error, clean + * it out, and generate the source list (even if it's empty) + */ + err = virGetLastError(); + VIR_ERROR(_("Failed to get Gluster pool sources: '%s'"), + err != NULL ? err->message: _("unknown error")); + virResetLastError(); + } if (!(ret = virStoragePoolSourceListFormat(&state.list))) goto cleanup; -- 1.9.0

2 3

[libvirt] [PATCH] Fix virsystemdtest without SYSTEMD_DAEMON
by Ján Tomko 15 Apr '14

15 Apr '14

Commit 4897698 fixed the build without dbus by only building the virSystemdPMSupportTarget with SYSTEMD_DAEMON. Introduce a virDBusMessageUnref wrapper for dbus_message_unref to let virsystemd.c build without dbus, while still allowing virsystemdtest to run without SYSTEM_DAEMON. --- src/util/virdbus.c | 9 +++++++++ src/util/virdbus.h | 1 + src/util/virsystemd.c | 11 +---------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/util/virdbus.c b/src/util/virdbus.c index 0cd3858..4217aea 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -1614,6 +1614,11 @@ int virDBusIsServiceRegistered(const char *name) return ret; } +void virDBusMessageUnref(DBusMessage *msg) +{ + dbus_message_unref(msg); +} + #else /* ! WITH_DBUS */ void virDBusSetSharedBus(bool shared ATTRIBUTE_UNUSED) { @@ -1751,4 +1756,8 @@ int virDBusIsServiceRegistered(const char *name ATTRIBUTE_UNUSED) return -2; } +void virDBusMessageUnref(DBusMessage *msg ATTRIBUTE_UNUSED) +{ + /* nothing */ +} #endif /* ! WITH_DBUS */ diff --git a/src/util/virdbus.h b/src/util/virdbus.h index 0f21821..a4987b8 100644 --- a/src/util/virdbus.h +++ b/src/util/virdbus.h @@ -74,6 +74,7 @@ int virDBusCall(DBusConnection *conn, DBusError *error); int virDBusMessageRead(DBusMessage *msg, const char *types, ...); +void virDBusMessageUnref(DBusMessage *msg); int virDBusIsServiceEnabled(const char *name); int virDBusIsServiceRegistered(const char *name); diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index e67956f..ad15a18 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -326,7 +326,6 @@ virSystemdNotifyStartup(void) #endif } -#ifdef WITH_SYSTEMD_DAEMON static int virSystemdPMSupportTarget(const char *methodName, bool *result) { @@ -365,19 +364,11 @@ virSystemdPMSupportTarget(const char *methodName, bool *result) ret = 0; cleanup: - dbus_message_unref(message); + virDBusMessageUnref(message); VIR_FREE(response); return ret; } -#else /* ! WITH_SYSTEMD_DAEMON */ -static int -virSystemdPMSupportTarget(const char *methodName ATTRIBUTE_UNUSED, - bool *result ATTRIBUTE_UNUSED) -{ - return -2; -} -#endif /* ! WITH_SYSTEMD_DAEMON */ int virSystemdCanSuspend(bool *result) { -- 1.8.3.2

2 2

[libvirt] Java Bindings ConnectAuthDefault callback never called
by Sergio Rodriguez de Guzman 14 Apr '14

14 Apr '14

I'm following the instructions mentioned in the list some years ago about using a subclass of ConnectAuth using ConnectAuthDefault as a sample: "You could create your own subclass of ConnectAuth, and override the method:" public abstract int callback(Credential[] cred); What I'm doing is just "copying" ConnectAuthDefault to ConnectAuthAlternate and using exactly the same code. The thing is that the callback defined in that class never fires: ConnectAuth defaultAuth = new ConnectAuthAlternate(); try{ conn = new Connect("qemu+ssh://student@10.164.1.21/system", defaultAuth, 0); } catch (LibvirtException e){ System.out.println("exception caught:"+e); System.out.println(e.getError()); } It works as expected, asks for the user password and connects successfully but it never reaches the callback defined in ConnectAuthAlternate (aka ConnectAuthDefault): @Override public int callback(Credential[] cred) { BufferedReader in = new BufferedReader(new InputStreamReader(System.in)); [...] I'm using libvirt-java 0.5.1, JNA 4.1 and the current libvirt version that comes with ubuntu 13.10: 1.1.1-0ubuntu8.5 Could you give some light about this?. Sergio.

1 0

[libvirt] [PATCH 0/6] RelaxNG improvements for virStorageSource
by Eric Blake 14 Apr '14

14 Apr '14

Part of extending the domain XML to show an entire backing chain is splitting the RelaxNG definitions so that the portion related to a single source within the chain can easily be reused. I'm still debating about the way to handle storage volumes using <format type='qcow2'/> vs. domain disks using <driver name='qcow2' type='qcow2'/>. The majority of the <driver> attributes are associated with the one disk device presented to the guest, rather than attributes for a file in the chain. So I'm thinking of having domain disks add a new <format> element; where we output the format under both elements but accept either spelling for new input (back-compat reasons require that we always provide the old spelling). Eric Blake (6): conf: create common storage RNG grammar file conf: better <disk> interleaving in schema conf: tighten <domainsnapshot> schema conf: split <disk> schema into more pieces conf: move storage source details to common RNG file conf: move <auth> and <encryption> to disk source docs/schemas/Makefile.am | 5 +- docs/schemas/domain.rng | 15 +- docs/schemas/domaincommon.rng | 268 ++---------------- docs/schemas/domainsnapshot.rng | 85 +++--- docs/schemas/storagecommon.rng | 312 +++++++++++++++++++++ docs/schemas/storageencryption.rng | 33 --- docs/schemas/storagefilefeatures.rng | 24 -- docs/schemas/storagevol.rng | 3 +- .../qemuxml2argv-disk-drive-discard.xml | 8 +- .../qemuxml2argv-disk-source-pool.xml | 12 +- .../qemuxml2xmlout-disk-drive-discard.xml | 37 +++ .../qemuxml2xmlout-disk-source-pool.xml | 44 +++ tests/qemuxml2xmltest.c | 4 +- 13 files changed, 477 insertions(+), 373 deletions(-) create mode 100644 docs/schemas/storagecommon.rng delete mode 100644 docs/schemas/storageencryption.rng delete mode 100644 docs/schemas/storagefilefeatures.rng create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-discard.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool.xml -- 1.9.0

2 9

[libvirt] [PATCHv2] virsh: Make vshCommandOpt* report error
by Michal Privoznik 14 Apr '14

14 Apr '14

Currently, the virsh code is plenty of the following pattern: if (vshCommandOptUInt(..) < 0) { vshError(...); goto cleanup; } It doesn't make much sense to repeat the code everywhere. Moreover, some functions from the family already report error some of them don't. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/vcpupin | 2 +- tools/virsh-domain-monitor.c | 7 +-- tools/virsh-domain.c | 102 +++++++++++++++---------------------------- tools/virsh-host.c | 25 +++-------- tools/virsh-interface.c | 4 +- tools/virsh-network.c | 4 +- tools/virsh-volume.c | 16 ++----- tools/virsh.c | 99 +++++++++++++++++++++++++++++++---------- tools/virsh.h | 24 +++++----- 9 files changed, 140 insertions(+), 143 deletions(-) diff --git a/tests/vcpupin b/tests/vcpupin index f1fb038..638f62b 100755 --- a/tests/vcpupin +++ b/tests/vcpupin @@ -34,7 +34,7 @@ fail=0 $abs_top_builddir/tools/virsh --connect test:///default vcpupin test a 0,1 > out 2>&1 test $? = 1 || fail=1 cat <<\EOF > exp || fail=1 -error: vcpupin: Invalid or missing vCPU number. +error: Unable to parse integer parameter to --vcpu EOF compare exp out || fail=1 diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 18d551a..0da4f91 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -324,12 +324,9 @@ cmdDomMemStat(vshControl *ctl, const vshCmd *cmd) /* Providing a period will adjust the balloon driver collection period. * This is not really an unsigned long, but it */ - if ((rv = vshCommandOptInt(cmd, "period", &period)) < 0) { - vshError(ctl, "%s", - _("Unable to parse integer parameter.")); + if ((rv = vshCommandOptInt(ctl, cmd, "period", &period)) < 0) { goto cleanup; - } - if (rv > 0) { + } else if (rv > 0) { if (period < 0) { vshError(ctl, _("Invalid collection period value '%d'"), period); goto cleanup; diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 73414f8..821ed62 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1119,8 +1119,8 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "device", &disk) < 0) goto cleanup; - if ((rv = vshCommandOptULongLong(cmd, "total-bytes-sec", &value)) < 0) { - goto interror; + if ((rv = vshCommandOptULongLong(ctl, cmd, "total-bytes-sec", &value)) < 0) { + goto cleanup; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC, @@ -1128,8 +1128,8 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(cmd, "read-bytes-sec", &value)) < 0) { - goto interror; + if ((rv = vshCommandOptULongLong(ctl, cmd, "read-bytes-sec", &value)) < 0) { + goto cleanup; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC, @@ -1137,8 +1137,8 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(cmd, "write-bytes-sec", &value)) < 0) { - goto interror; + if ((rv = vshCommandOptULongLong(ctl, cmd, "write-bytes-sec", &value)) < 0) { + goto cleanup; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC, @@ -1146,8 +1146,8 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(cmd, "total-iops-sec", &value)) < 0) { - goto interror; + if ((rv = vshCommandOptULongLong(ctl, cmd, "total-iops-sec", &value)) < 0) { + goto cleanup; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC, @@ -1155,8 +1155,8 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(cmd, "read-iops-sec", &value)) < 0) { - goto interror; + if ((rv = vshCommandOptULongLong(ctl, cmd, "read-iops-sec", &value)) < 0) { + goto cleanup; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC, @@ -1164,8 +1164,8 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rv = vshCommandOptULongLong(cmd, "write-iops-sec", &value)) < 0) { - goto interror; + if ((rv = vshCommandOptULongLong(ctl, cmd, "write-iops-sec", &value)) < 0) { + goto cleanup; } else if (rv > 0) { if (virTypedParamsAddULLong(&params, &nparams, &maxparams, VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC, @@ -1216,10 +1216,6 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) error: vshError(ctl, "%s", _("Unable to change block I/O throttle")); goto cleanup; - - interror: - vshError(ctl, "%s", _("Unable to parse integer parameter")); - goto cleanup; } /* @@ -1315,8 +1311,7 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; - if ((rv = vshCommandOptInt(cmd, "weight", &weight)) < 0) { - vshError(ctl, "%s", _("Unable to parse integer parameter")); + if ((rv = vshCommandOptInt(ctl, cmd, "weight", &weight)) < 0) { goto cleanup; } else if (rv > 0) { if (weight <= 0) { @@ -1457,10 +1452,8 @@ blockJobImpl(vshControl *ctl, const vshCmd *cmd, if (vshCommandOptStringReq(ctl, cmd, "path", &path) < 0) goto cleanup; - if (vshCommandOptUL(cmd, "bandwidth", &bandwidth) < 0) { - vshError(ctl, "%s", _("bandwidth must be a number")); + if (vshCommandOptUL(ctl, cmd, "bandwidth", &bandwidth) < 0) goto cleanup; - } switch ((vshCmdBlockJobMode) mode) { case VSH_CMD_BLOCK_JOB_ABORT: @@ -2215,10 +2208,8 @@ cmdBlockResize(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "path", (const char **) &path) < 0) return false; - if (vshCommandOptScaledInt(cmd, "size", &size, 1024, ULLONG_MAX) < 0) { - vshError(ctl, "%s", _("Unable to parse integer")); + if (vshCommandOptScaledInt(ctl, cmd, "size", &size, 1024, ULLONG_MAX) < 0) return false; - } /* Prefer the older interface of KiB. */ if (size % 1024 == 0) @@ -2805,10 +2796,8 @@ cmdDomPMSuspend(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return false; - if (vshCommandOptULongLong(cmd, "duration", &duration) < 0) { - vshError(ctl, _("Invalid duration argument")); + if (vshCommandOptULongLong(ctl, cmd, "duration", &duration) < 0) goto cleanup; - } if (vshCommandOptStringReq(ctl, cmd, "target", &target) < 0) goto cleanup; @@ -4709,10 +4698,8 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "file", (const char **) &file) < 0) return false; - if (vshCommandOptUInt(cmd, "screen", &screen) < 0) { - vshError(ctl, "%s", _("invalid screen ID")); + if (vshCommandOptUInt(ctl, cmd, "screen", &screen) < 0) return false; - } if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return false; @@ -5819,9 +5806,7 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) query = !cpulist; /* In query mode, "vcpu" is optional */ - if (vshCommandOptInt(cmd, "vcpu", &vcpu) < !query) { - vshError(ctl, "%s", - _("vcpupin: Invalid or missing vCPU number.")); + if (vshCommandOptInt(ctl, cmd, "vcpu", &vcpu) < !query) { virDomainFree(dom); return false; } @@ -6063,7 +6048,7 @@ static bool cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom; - int count = 0; + unsigned int count = 0; bool ret = false; bool maximum = vshCommandOptBool(cmd, "maximum"); bool config = vshCommandOptBool(cmd, "config"); @@ -6089,10 +6074,8 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptInt(cmd, "count", &count) < 0 || count <= 0) { - vshError(ctl, "%s", _("Invalid number of virtual CPUs")); + if (vshCommandOptUInt(ctl, cmd, "count", &count) < 0) goto cleanup; - } if (flags == -1) { if (virDomainSetVcpus(dom, count) != 0) @@ -6384,8 +6367,7 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd) show_total = vshCommandOptBool(cmd, "total"); - if ((rv = vshCommandOptInt(cmd, "start", &cpu)) < 0) { - vshError(ctl, "%s", _("Unable to parse integer parameter for start")); + if ((rv = vshCommandOptInt(ctl, cmd, "start", &cpu)) < 0) { goto cleanup; } else if (rv > 0) { if (cpu < 0) { @@ -6395,9 +6377,7 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd) show_per_cpu = true; } - if ((rv = vshCommandOptInt(cmd, "count", &show_count)) < 0) { - vshError(ctl, "%s", - _("Unable to parse integer parameter for CPUs to show")); + if ((rv = vshCommandOptInt(ctl, cmd, "count", &show_count)) < 0) { goto cleanup; } else if (rv > 0) { if (show_count < 0) { @@ -7157,10 +7137,8 @@ cmdSendKey(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptString(cmd, "codeset", &codeset_option) <= 0) codeset_option = "linux"; - if (vshCommandOptUInt(cmd, "holdtime", &holdtime) < 0) { - vshError(ctl, _("invalid value of --holdtime")); + if (vshCommandOptUInt(ctl, cmd, "holdtime", &holdtime) < 0) goto cleanup; - } codeset = virKeycodeSetTypeFromString(codeset_option); if (codeset < 0) { @@ -7384,8 +7362,7 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) max = 1024ull * ULONG_MAX; else max = ULONG_MAX; - if (vshCommandOptScaledInt(cmd, "size", &bytes, 1024, max) < 0) { - vshError(ctl, "%s", _("memory size has to be a number")); + if (vshCommandOptScaledInt(ctl, cmd, "size", &bytes, 1024, max) < 0) { virDomainFree(dom); return false; } @@ -7481,8 +7458,7 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd) max = 1024ull * ULONG_MAX; else max = ULONG_MAX; - if (vshCommandOptScaledInt(cmd, "size", &bytes, 1024, max) < 0) { - vshError(ctl, "%s", _("memory size has to be a number")); + if (vshCommandOptScaledInt(ctl, cmd, "size", &bytes, 1024, max) < 0) { virDomainFree(dom); return false; } @@ -8123,9 +8099,11 @@ cmdQemuAttach(vshControl *ctl, const vshCmd *cmd) bool ret = false; unsigned int flags = 0; unsigned int pid_value; /* API uses unsigned int, not pid_t */ + int rv; - if (vshCommandOptUInt(cmd, "pid", &pid_value) <= 0) { - vshError(ctl, "%s", _("missing pid value")); + if ((rv = vshCommandOptUInt(ctl, cmd, "pid", &pid_value)) <= 0) { + if (rv == 0) + vshError(ctl, "%s", _("missing pid value")); goto cleanup; } @@ -8220,9 +8198,8 @@ cmdQemuAgentCommand(vshControl *ctl, const vshCmd *cmd) } guest_agent_cmd = virBufferContentAndReset(&buf); - judge = vshCommandOptInt(cmd, "timeout", &timeout); + judge = vshCommandOptInt(ctl, cmd, "timeout", &timeout); if (judge < 0) { - vshError(ctl, "%s", _("timeout number has to be a number")); goto cleanup; } else if (judge > 0) { judge = 1; @@ -9089,17 +9066,14 @@ static bool cmdMigrateSetMaxDowntime(vshControl *ctl, const vshCmd *cmd) { virDomainPtr dom = NULL; - long long downtime = 0; + unsigned long long downtime = 0; bool ret = false; if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptLongLong(cmd, "downtime", &downtime) < 0 || - downtime < 1) { - vshError(ctl, "%s", _("migrate: Invalid downtime")); + if (vshCommandOptULongLong(ctl, cmd, "downtime", &downtime) < 0) goto done; - } if (virDomainMigrateSetMaxDowntime(dom, downtime, 0)) goto done; @@ -9152,9 +9126,7 @@ cmdMigrateCompCache(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; - rc = vshCommandOptULongLong(cmd, "size", &size); - if (rc < 0) { - vshError(ctl, "%s", _("Unable to parse size parameter")); + if ((rc = vshCommandOptULongLong(ctl, cmd, "size", &size)) < 0) { goto cleanup; } else if (rc != 0) { if (virDomainMigrateSetCompressionCache(dom, size, 0) < 0) @@ -9211,10 +9183,8 @@ cmdMigrateSetMaxSpeed(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return false; - if (vshCommandOptUL(cmd, "bandwidth", &bandwidth) < 0) { - vshError(ctl, "%s", _("migrate: Invalid bandwidth")); + if (vshCommandOptUL(ctl, cmd, "bandwidth", &bandwidth) < 0) goto done; - } if (virDomainMigrateSetMaxSpeed(dom, bandwidth, 0) < 0) goto done; @@ -11371,10 +11341,8 @@ cmdDomFSTrim(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) return ret; - if (vshCommandOptULongLong(cmd, "minimum", &minimum) < 0) { - vshError(ctl, _("Unable to parse integer parameter minimum")); + if (vshCommandOptULongLong(ctl, cmd, "minimum", &minimum) < 0) goto cleanup; - } if (vshCommandOptStringReq(ctl, cmd, "mountpoint", &mountPoint) < 0) goto cleanup; diff --git a/tools/virsh-host.c b/tools/virsh-host.c index cac6086..61be4c0 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -111,10 +111,8 @@ cmdFreecell(vshControl *ctl, const vshCmd *cmd) VSH_EXCLUSIVE_OPTIONS_VAR(all, cellno); - if (cellno && vshCommandOptInt(cmd, "cellno", &cell) < 0) { - vshError(ctl, "%s", _("cell number has to be a number")); + if (cellno && vshCommandOptInt(ctl, cmd, "cellno", &cell) < 0) return false; - } if (all) { if (!(cap_xml = virConnectGetCapabilities(ctl->conn))) { @@ -372,10 +370,8 @@ cmdNodeCpuStats(vshControl *ctl, const vshCmd *cmd) unsigned long long cpu_stats[VSH_CPU_LAST] = { 0 }; bool present[VSH_CPU_LAST] = { false }; - if (vshCommandOptInt(cmd, "cpu", &cpuNum) < 0) { - vshError(ctl, "%s", _("Invalid value of cpuNum")); + if (vshCommandOptInt(ctl, cmd, "cpu", &cpuNum) < 0) return false; - } if (virNodeGetCPUStats(ctl->conn, cpuNum, NULL, &nparams, 0) != 0) { vshError(ctl, "%s", @@ -481,10 +477,8 @@ cmdNodeMemStats(vshControl *ctl, const vshCmd *cmd) virNodeMemoryStatsPtr params = NULL; bool ret = false; - if (vshCommandOptInt(cmd, "cell", &cellNum) < 0) { - vshError(ctl, "%s", _("Invalid value of cellNum")); + if (vshCommandOptInt(ctl, cmd, "cell", &cellNum) < 0) return false; - } /* get the number of memory parameters */ if (virNodeGetMemoryStats(ctl->conn, cellNum, NULL, &nparams, 0) != 0) { @@ -555,10 +549,8 @@ cmdNodeSuspend(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "target", &target) < 0) return false; - if (vshCommandOptLongLong(cmd, "duration", &duration) < 0) { - vshError(ctl, _("Invalid duration argument")); + if (vshCommandOptLongLong(ctl, cmd, "duration", &duration) < 0) return false; - } if (STREQ(target, "mem")) suspendTarget = VIR_NODE_SUSPEND_TARGET_MEM; @@ -862,8 +854,7 @@ cmdNodeMemoryTune(vshControl *ctl, const vshCmd *cmd) int rc = -1; size_t i; - if ((rc = vshCommandOptUInt(cmd, "shm-pages-to-scan", &value)) < 0) { - vshError(ctl, "%s", _("invalid shm-pages-to-scan number")); + if ((rc = vshCommandOptUInt(ctl, cmd, "shm-pages-to-scan", &value)) < 0) { goto cleanup; } else if (rc > 0) { if (virTypedParamsAddUInt(&params, &nparams, &maxparams, @@ -872,8 +863,7 @@ cmdNodeMemoryTune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rc = vshCommandOptUInt(cmd, "shm-sleep-millisecs", &value)) < 0) { - vshError(ctl, "%s", _("invalid shm-sleep-millisecs number")); + if ((rc = vshCommandOptUInt(ctl, cmd, "shm-sleep-millisecs", &value)) < 0) { goto cleanup; } else if (rc > 0) { if (virTypedParamsAddUInt(&params, &nparams, &maxparams, @@ -882,8 +872,7 @@ cmdNodeMemoryTune(vshControl *ctl, const vshCmd *cmd) goto save_error; } - if ((rc = vshCommandOptUInt(cmd, "shm-merge-across-nodes", &value)) < 0) { - vshError(ctl, "%s", _("invalid shm-merge-across-nodes number")); + if ((rc = vshCommandOptUInt(ctl, cmd, "shm-merge-across-nodes", &value)) < 0) { goto cleanup; } else if (rc > 0) { if (virTypedParamsAddUInt(&params, &nparams, &maxparams, diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index d4ec854..4dfd4ae 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -844,10 +844,8 @@ cmdInterfaceBridge(vshControl *ctl, const vshCmd *cmd) /* use "no-stp" because we want "stp" to default true */ stp = !vshCommandOptBool(cmd, "no-stp"); - if (vshCommandOptUInt(cmd, "delay", &delay) < 0) { - vshError(ctl, "%s", _("Unable to parse delay parameter")); + if (vshCommandOptUInt(ctl, cmd, "delay", &delay) < 0) goto cleanup; - } nostart = vshCommandOptBool(cmd, "no-start"); diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 4b0df62..1f42b0d 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -943,10 +943,8 @@ cmdNetworkUpdate(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - if (vshCommandOptInt(cmd, "parent-index", &parentIndex) < 0) { - vshError(ctl, "%s", _("malformed parent-index argument")); + if (vshCommandOptInt(ctl, cmd, "parent-index", &parentIndex) < 0) goto cleanup; - } /* The goal is to have a full xml element in the "xml" * string. This is provided in the --xml option, either directly diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 55bf6f0..24a2b14 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -658,15 +658,11 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd) const char *name = NULL; unsigned long long offset = 0, length = 0; - if (vshCommandOptULongLong(cmd, "offset", &offset) < 0) { - vshError(ctl, _("Unable to parse integer")); + if (vshCommandOptULongLong(ctl, cmd, "offset", &offset) < 0) return false; - } - if (vshCommandOptULongLong(cmd, "length", &length) < 0) { - vshError(ctl, _("Unable to parse integer")); + if (vshCommandOptULongLong(ctl, cmd, "length", &length) < 0) return false; - } if (!(vol = vshCommandOptVol(ctl, cmd, "vol", "pool", &name))) { return false; @@ -768,15 +764,11 @@ cmdVolDownload(vshControl *ctl, const vshCmd *cmd) unsigned long long offset = 0, length = 0; bool created = false; - if (vshCommandOptULongLong(cmd, "offset", &offset) < 0) { - vshError(ctl, _("Unable to parse integer")); + if (vshCommandOptULongLong(ctl, cmd, "offset", &offset) < 0) return false; - } - if (vshCommandOptULongLong(cmd, "length", &length) < 0) { - vshError(ctl, _("Unable to parse integer")); + if (vshCommandOptULongLong(ctl, cmd, "length", &length) < 0) return false; - } if (!(vol = vshCommandOptVol(ctl, cmd, "vol", "pool", &name))) return false; diff --git a/tools/virsh.c b/tools/virsh.c index 28af3c3..b2edea3 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1469,6 +1469,7 @@ vshCommandOpt(const vshCmd *cmd, const char *name, vshCmdOpt **opt, /** * vshCommandOptInt: + * @ctl virsh control structure * @cmd command reference * @name option name * @value result @@ -1480,7 +1481,10 @@ vshCommandOpt(const vshCmd *cmd, const char *name, vshCmdOpt **opt, * <0 in all other cases (@value untouched) */ int -vshCommandOptInt(const vshCmd *cmd, const char *name, int *value) +vshCommandOptInt(vshControl *ctl, + const vshCmd *cmd, + const char *name, + int *value) { vshCmdOpt *arg; int ret; @@ -1489,14 +1493,19 @@ vshCommandOptInt(const vshCmd *cmd, const char *name, int *value) if (ret <= 0) return ret; - if (virStrToLong_i(arg->data, NULL, 10, value) < 0) + if (virStrToLong_i(arg->data, NULL, 10, value) < 0) { + vshError(ctl, + _("Unable to parse integer parameter to --%s"), + name); return -1; + } return 1; } /** * vshCommandOptUInt: + * @ctl virsh control structure * @cmd command reference * @name option name * @value result @@ -1505,7 +1514,10 @@ vshCommandOptInt(const vshCmd *cmd, const char *name, int *value) * See vshCommandOptInt() */ int -vshCommandOptUInt(const vshCmd *cmd, const char *name, unsigned int *value) +vshCommandOptUInt(vshControl *ctl, + const vshCmd *cmd, + const char *name, + unsigned int *value) { vshCmdOpt *arg; int ret; @@ -1514,14 +1526,19 @@ vshCommandOptUInt(const vshCmd *cmd, const char *name, unsigned int *value) if (ret <= 0) return ret; - if (virStrToLong_ui(arg->data, NULL, 10, value) < 0) + if (virStrToLong_ui(arg->data, NULL, 10, value) < 0) { + vshError(ctl, + _("Unable to parse integer parameter to --%s"), + name); return -1; + } return 1; } /* * vshCommandOptUL: + * @ctl virsh control structure * @cmd command reference * @name option name * @value result @@ -1530,7 +1547,10 @@ vshCommandOptUInt(const vshCmd *cmd, const char *name, unsigned int *value) * See vshCommandOptInt() */ int -vshCommandOptUL(const vshCmd *cmd, const char *name, unsigned long *value) +vshCommandOptUL(vshControl *ctl, + const vshCmd *cmd, + const char *name, + unsigned long *value) { vshCmdOpt *arg; int ret; @@ -1539,8 +1559,12 @@ vshCommandOptUL(const vshCmd *cmd, const char *name, unsigned long *value) if (ret <= 0) return ret; - if (virStrToLong_ul(arg->data, NULL, 10, value) < 0) + if (virStrToLong_ul(arg->data, NULL, 10, value) < 0) { + vshError(ctl, + _("Unable to parse integer parameter to --%s"), + name); return -1; + } return 1; } @@ -1620,6 +1644,7 @@ vshCommandOptStringReq(vshControl *ctl, /** * vshCommandOptLongLong: + * @ctl virsh control structure * @cmd command reference * @name option name * @value result @@ -1628,7 +1653,9 @@ vshCommandOptStringReq(vshControl *ctl, * See vshCommandOptInt() */ int -vshCommandOptLongLong(const vshCmd *cmd, const char *name, +vshCommandOptLongLong(vshControl *ctl, + const vshCmd *cmd, + const char *name, long long *value) { vshCmdOpt *arg; @@ -1638,13 +1665,18 @@ vshCommandOptLongLong(const vshCmd *cmd, const char *name, if (ret <= 0) return ret; - if (virStrToLong_ll(arg->data, NULL, 10, value) < 0) + if (virStrToLong_ll(arg->data, NULL, 10, value) < 0) { + vshError(ctl, + _("Unable to parse integer parameter to --%s"), + name); return -1; + } return 1; } /** * vshCommandOptULongLong: + * @ctl virsh control structure * @cmd command reference * @name option name * @value result @@ -1653,7 +1685,9 @@ vshCommandOptLongLong(const vshCmd *cmd, const char *name, * See vshCommandOptInt() */ int -vshCommandOptULongLong(const vshCmd *cmd, const char *name, +vshCommandOptULongLong(vshControl *ctl, + const vshCmd *cmd, + const char *name, unsigned long long *value) { vshCmdOpt *arg; @@ -1663,14 +1697,19 @@ vshCommandOptULongLong(const vshCmd *cmd, const char *name, if (ret <= 0) return ret; - if (virStrToLong_ull(arg->data, NULL, 10, value) < 0) + if (virStrToLong_ull(arg->data, NULL, 10, value) < 0) { + vshError(ctl, + _("Unable to parse integer parameter to --%s"), + name); return -1; + } return 1; } /** * vshCommandOptScaledInt: + * @ctl virsh control structure * @cmd command reference * @name option name * @value result @@ -1681,8 +1720,11 @@ vshCommandOptULongLong(const vshCmd *cmd, const char *name, * See vshCommandOptInt() */ int -vshCommandOptScaledInt(const vshCmd *cmd, const char *name, - unsigned long long *value, int scale, +vshCommandOptScaledInt(vshControl *ctl, + const vshCmd *cmd, + const char *name, + unsigned long long *value, + int scale, unsigned long long max) { const char *str; @@ -1692,9 +1734,18 @@ vshCommandOptScaledInt(const vshCmd *cmd, const char *name, ret = vshCommandOptString(cmd, name, &str); if (ret <= 0) return ret; - if (virStrToLong_ull(str, &end, 10, value) < 0 || - virScaleInteger(value, end, scale, max) < 0) + if (virStrToLong_ull(str, &end, 10, value) < 0) { + vshError(ctl, + _("Unable to parse integer parameter to --%s"), + name); return -1; + } + + if (virScaleInteger(value, end, scale, max) < 0) { + vshError(ctl, "%s", + _("value falls out of range")); + return -1; + } return 1; } @@ -1771,20 +1822,22 @@ vshCmdHasOption(vshControl *ctl, const vshCmd *cmd, const char *optname) int vshCommandOptTimeoutToMs(vshControl *ctl, const vshCmd *cmd, int *timeout) { - int rv = vshCommandOptInt(cmd, "timeout", timeout); + int rv = vshCommandOptInt(ctl, cmd, "timeout", timeout); - if (rv < 0 || (rv > 0 && *timeout < 1)) { + if (rv <= 0) + return rv; + + if (*timeout < 1) { vshError(ctl, "%s", _("invalid timeout")); return -1; } - if (rv > 0) { - /* Ensure that we can multiply by 1000 without overflowing. */ - if (*timeout > INT_MAX / 1000) { - vshError(ctl, "%s", _("timeout is too big")); - return -1; - } - *timeout *= 1000; + + /* Ensure that we can multiply by 1000 without overflowing. */ + if (*timeout > INT_MAX / 1000) { + vshError(ctl, "%s", _("timeout is too big")); + return -1; } + *timeout *= 1000; return rv; } diff --git a/tools/virsh.h b/tools/virsh.h index 3e0251b..b217206 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -168,7 +168,7 @@ struct _vshCmdInfo { struct _vshCmdOptDef { const char *name; /* the name of option, or NULL for list end */ vshCmdOptType type; /* option type */ - unsigned int flags; /* flags */ + unsigned int flags; /* bitwise OR of VSH_OFLAG_**/ const char *help; /* non-NULL help string; or for VSH_OT_ALIAS * the name of a later public option */ vshCompleter completer; /* option completer */ @@ -280,13 +280,14 @@ bool vshCmddefHelp(vshControl *ctl, const char *name); const vshCmdGrp *vshCmdGrpSearch(const char *grpname); bool vshCmdGrpHelp(vshControl *ctl, const char *name); -int vshCommandOptInt(const vshCmd *cmd, const char *name, int *value) +int vshCommandOptInt(vshControl *ctl, const vshCmd *cmd, + const char *name, int *value) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; -int vshCommandOptUInt(const vshCmd *cmd, const char *name, - unsigned int *value) +int vshCommandOptUInt(vshControl *ctl, const vshCmd *cmd, + const char *name, unsigned int *value) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; -int vshCommandOptUL(const vshCmd *cmd, const char *name, - unsigned long *value) +int vshCommandOptUL(vshControl *ctl, const vshCmd *cmd, + const char *name, unsigned long *value) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; int vshCommandOptString(const vshCmd *cmd, const char *name, const char **value) @@ -295,13 +296,14 @@ int vshCommandOptStringReq(vshControl *ctl, const vshCmd *cmd, const char *name, const char **value) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; -int vshCommandOptLongLong(const vshCmd *cmd, const char *name, - long long *value) +int vshCommandOptLongLong(vshControl *ctl, const vshCmd *cmd, + const char *name, long long *value) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; -int vshCommandOptULongLong(const vshCmd *cmd, const char *name, - unsigned long long *value) +int vshCommandOptULongLong(vshControl *ctl, const vshCmd *cmd, + const char *name, unsigned long long *value) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; -int vshCommandOptScaledInt(const vshCmd *cmd, const char *name, +int vshCommandOptScaledInt(vshControl *ctl, + const vshCmd *cmd, const char *name, unsigned long long *value, int scale, unsigned long long max) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; -- 1.9.0

2 1

[libvirt] [PATCH] build: Don't use code with dbus_message_unref when built without dbus
by Martin Kletzander 14 Apr '14

14 Apr '14

In order to do that, virNodeSuspendSupportsTargetPMUtils() and virSystemdPMSupportTarget() are created even when pm-utils and dbus are compiled out, respectively, but in that case returning -2 meaning "unavailable" (this return code was already used for unavailability before). Error is reported in virNodeSuspendSupportsTarget() only if both functions returned -2, otherwise the error (or success) is properly propagated up the stack. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: v1: https://www.redhat.com/archives/libvir-list/2014-April/msg00550.html This is a build-breaker if building --without-dbus due to dbus_message_unref being called unconditionally. However, I'm not pushing it as such. I haven't followed the suggestion of return codes -1, 0 and 1 because there is already a -2 used for unavailability and these return codes are used in other parts of the code for similar reasons as well (e.g. storage driver). src/util/virnodesuspend.c | 22 ++++++++++++++++++---- src/util/virsystemd.c | 11 ++++++++++- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index 59b84ef..60b86ee 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -1,6 +1,7 @@ /* * virnodesuspend.c: Support for suspending a node (host machine) * + * Copyright (C) 2014 Red Hat, Inc. * Copyright (C) 2011 Srivatsa S. Bhat <srivatsa.bhat(a)linux.vnet.ibm.com> * * This library is free software; you can redistribute it and/or @@ -267,7 +268,14 @@ virNodeSuspendSupportsTargetPMUtils(unsigned int target, bool *supported) virCommandFree(cmd); return ret; } -#endif +#else /* ! WITH_PM_UTILS */ +static int +virNodeSuspendSupportsTargetPMUtils(unsigned int target ATTRIBUTE_UNUSED, + bool *supported ATTRIBUTE_UNUSED) +{ + return -2; +} +#endif /* ! WITH_PM_UTILS */ static int virNodeSuspendSupportsTargetSystemd(unsigned int target, bool *supported) @@ -313,10 +321,16 @@ virNodeSuspendSupportsTarget(unsigned int target, bool *supported) int ret; ret = virNodeSuspendSupportsTargetSystemd(target, supported); -#ifdef WITH_PM_UTILS - if (ret < 0) + + /* If just unavailable, try other options */ + if (ret == -2) ret = virNodeSuspendSupportsTargetPMUtils(target, supported); -#endif + + /* If still unavailable, then report error */ + if (ret == -2) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Cannot probe for supported suspend types")); + } return ret; } diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index e9ca564..e67956f 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -1,7 +1,7 @@ /* * virsystemd.c: helpers for using systemd APIs * - * Copyright (C) 2013 Red Hat, Inc. + * Copyright (C) 2013, 2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -326,6 +326,7 @@ virSystemdNotifyStartup(void) #endif } +#ifdef WITH_SYSTEMD_DAEMON static int virSystemdPMSupportTarget(const char *methodName, bool *result) { @@ -369,6 +370,14 @@ virSystemdPMSupportTarget(const char *methodName, bool *result) return ret; } +#else /* ! WITH_SYSTEMD_DAEMON */ +static int +virSystemdPMSupportTarget(const char *methodName ATTRIBUTE_UNUSED, + bool *result ATTRIBUTE_UNUSED) +{ + return -2; +} +#endif /* ! WITH_SYSTEMD_DAEMON */ int virSystemdCanSuspend(bool *result) { -- 1.9.2

2 1

[libvirt] [PATCH] build: Embed dbus_message_unref in virdbus
by Martin Kletzander 14 Apr '14

14 Apr '14

Adding dbus_message_unref() into virDBusMessageDecodeArgs() makes sure that the message gets unref'd, thus making one more pure dbus call not necessary. Even though we are calling a lot of dbus_* functions outside virdbus (which should be fixed in the future IMHO), this patch fixes only this one instance because it merely aims to fix a build-breaker caused by improperly included dbus.h. The message printed when failing (using --without-dbus) is: util/virsystemd.c: In function 'virSystemdPMSupportTarget': util/virsystemd.c:367:5: error: implicit declaration of function 'dbus_message_unref' [-Werror=implicit-function-declaration] dbus_message_unref(message); ^ Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: I checked that we're not unreffing the message twice anywhere, but I wanted to check there is no crash if we do unref it twice. While trying whether double unreffing the message breaks anything, I saw that dbus_message_unref() has a refcount and it cleans structure when the refcount reaches 0, the cleansing means it sets it to -1 as well. OK, so it doesn't break anything, but the allocated structure is still not free()'d. I ran virsystemdtest under valgrind and saw that the message is really not free()'d. But here comes the best part; out of 6 test functions, only 3 of them are causing a leak and adding VIR_FREE(msg) to any test function other than the last one (which gets rid of one leak out of three) causes a segfault. I though dbus has it's own memory management or whatever, but looking at the backtrace, the crash happens when we are allocating DBusMessageIter *newiter one function later than the VIR_FREE(msg) is done (and msg is local to that function, btw). Even though this has nothing to do with the patch sent, I'd appreciate any explanation from anyone more dbus-knowledgeable than me (most probably anyone). src/util/virdbus.c | 1 + src/util/virsystemd.c | 3 +-- tests/virdbustest.c | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/util/virdbus.c b/src/util/virdbus.c index 0cd3858..aef1d34 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -1112,6 +1112,7 @@ int virDBusMessageDecodeArgs(DBusMessage* msg, } ret = virDBusMessageIterDecode(&iter, types, args); + dbus_message_unref(msg); cleanup: return ret; diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index e9ca564..9f67ac0 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -1,7 +1,7 @@ /* * virsystemd.c: helpers for using systemd APIs * - * Copyright (C) 2013 Red Hat, Inc. + * Copyright (C) 2013, 2014 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -364,7 +364,6 @@ virSystemdPMSupportTarget(const char *methodName, bool *result) ret = 0; cleanup: - dbus_message_unref(message); VIR_FREE(response); return ret; diff --git a/tests/virdbustest.c b/tests/virdbustest.c index a798fbe..50578d9 100644 --- a/tests/virdbustest.c +++ b/tests/virdbustest.c @@ -121,7 +121,6 @@ static int testMessageSimple(const void *args ATTRIBUTE_UNUSED) VIR_FREE(out_string); VIR_FREE(out_signature); VIR_FREE(out_objectpath); - dbus_message_unref(msg); return ret; } @@ -171,7 +170,6 @@ static int testMessageVariant(const void *args ATTRIBUTE_UNUSED) cleanup: VIR_FREE(out_str1); VIR_FREE(out_str2); - dbus_message_unref(msg); return ret; } @@ -224,7 +222,6 @@ static int testMessageArray(const void *args ATTRIBUTE_UNUSED) cleanup: VIR_FREE(out_str1); VIR_FREE(out_str2); - dbus_message_unref(msg); return ret; } @@ -322,7 +319,6 @@ static int testMessageArrayRef(const void *args ATTRIBUTE_UNUSED) for (i = 0; i < out_nstrv2; i++) VIR_FREE(out_strv2[i]); VIR_FREE(out_strv2); - dbus_message_unref(msg); return ret; } @@ -397,7 +393,6 @@ static int testMessageStruct(const void *args ATTRIBUTE_UNUSED) VIR_FREE(out_string); VIR_FREE(out_signature); VIR_FREE(out_objectpath); - dbus_message_unref(msg); return ret; } @@ -467,7 +462,6 @@ static int testMessageDict(const void *args ATTRIBUTE_UNUSED) VIR_FREE(out_key1); VIR_FREE(out_key2); VIR_FREE(out_key3); - dbus_message_unref(msg); return ret; } -- 1.9.2

2 6

[libvirt] [PATCH] qemu: Avoid overflow when setting migration speed
by Jiri Denemark 14 Apr '14

14 Apr '14

When passing migration bandwidth to QEMU, we multiply it by 1024 * 1024 to convert the speed to B/s and the result still needs to fit in int64_t. https://bugzilla.redhat.com/show_bug.cgi?id=1083483 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_monitor.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 5a5a59b..912bea1 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2047,6 +2047,13 @@ int qemuMonitorSetMigrationSpeed(qemuMonitorPtr mon, return -1; } + if (bandwidth > QEMU_DOMAIN_MIG_BANDWIDTH_MAX) { + virReportError(VIR_ERR_OVERFLOW, + _("bandwidth must be less than %llu"), + QEMU_DOMAIN_MIG_BANDWIDTH_MAX + 1ULL); + return -1; + } + if (mon->json) ret = qemuMonitorJSONSetMigrationSpeed(mon, bandwidth); else -- 1.9.2

2 2

[libvirt] [PATCH] RFC: bhyve: implement PCI address allocation
by Roman Bogorodskiy 14 Apr '14

14 Apr '14

Hi, This is the first attempt to implement PCI address allocation for the bhyve driver. This patch is by no means a complete version and the idea of this is to understand if I'm moving in a right direction. This code is based on the one from QEMU driver. Even though bhyve currently has no support for PCI bridges, it should be possible to add that support without major rewrites when this feature will be available in bhyve. So, currently we have the following. For a domain like that: https://gist.github.com/novel/10569989#file-domainin-xml The processed domain looks this way: https://gist.github.com/novel/10569989#file-domainout-xml and the command is: https://gist.github.com/novel/10569989#file-cmd Please let me know if it's uncomfortable to follow gist links; I didn't put domain xml inline as it's pretty lengthy. Open questions are: * What's the best way to deal with the 0:0,hostbridge device, should it be explicitly added to the domain definition? * How to handle lpc device, that's required for console. From bhyve point of view it looks like this: -s 31,lpc -l com1,ttydev That is, LPC PCI-ISA bridge on PCI slot and com1 port on that bridge. Things that need to be fixed in that patch, but are obvious: * Fix 'make check' which fails for obvious reasons of new addresses in domain xml * As we support more than one disk device, respect boot order Roman Bogorodskiy (1): bhyve: implement PCI address allocation po/POTFILES.in | 1 + src/Makefile.am | 4 + src/bhyve/bhyve_command.c | 128 +++++++++++----------- src/bhyve/bhyve_device.c | 272 ++++++++++++++++++++++++++++++++++++++++++++++ src/bhyve/bhyve_device.h | 41 +++++++ src/bhyve/bhyve_domain.c | 75 +++++++++++++ src/bhyve/bhyve_domain.h | 41 +++++++ src/bhyve/bhyve_driver.c | 9 +- 8 files changed, 503 insertions(+), 68 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] [PATCH 0/2] bhyve: implement connectDomainXMLToNative
by Roman Bogorodskiy 14 Apr '14

14 Apr '14

One thing I'm wondering about. Bhyve has two step domain startup: 1. bhyveload 2. bhyve This implementation prints out only 'bhyve' command. Should it also print bhyveload command and if yes, how should it look for a user, something like 'bhyveload ... ; bhyve ...' ? Roman Bogorodskiy (2): bhyve: improve bhyve_command.c testability bhyve: implement connectDomainXMLToNative src/bhyve/bhyve_command.c | 85 +++++++++++++++++++++++++---------------------- src/bhyve/bhyve_command.h | 8 +++-- src/bhyve/bhyve_driver.c | 45 +++++++++++++++++++++++++ src/bhyve/bhyve_process.c | 10 +++--- tests/bhyvexml2argvtest.c | 2 +- 5 files changed, 103 insertions(+), 47 deletions(-) -- 1.9.0

2 4

[libvirt] [PATCH] virsh: Make secret's usage can be modified if the usage isn't used
by liyang 14 Apr '14

14 Apr '14

From: Li Yang <liyang.fnst(a)cn.fujitsu.com> When a secret's usage is specified, for example: <secret ephemeral='no' private='no'> <uuid>540c56d1-f4b3-5031-b76d-33e99e9b5c64</uuid> <usage type='volume'> <volume>/tmp/test</volume> </usage> </secret> If another volume '/tmp/test1' isn't used, the current secret's usage can bo modified to '/tmp/test1'. If '/tmp/test1' has been used for another secret, error message will be outputed. Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> --- src/secret/secret_driver.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 4123e6e..78fd054 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -781,6 +781,7 @@ secretDefineXML(virConnectPtr conn, const char *xml, virSecretDriverStatePtr driver = conn->secretPrivateData; virSecretPtr ret = NULL; virSecretEntryPtr secret; + virSecretEntryPtr new_secret; virSecretDefPtr backup = NULL; virSecretDefPtr new_attrs; @@ -804,7 +805,7 @@ secretDefineXML(virConnectPtr conn, const char *xml, char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(secret->def->uuid, uuidstr); virReportError(VIR_ERR_INTERNAL_ERROR, - _("a secret with UUID %s already defined for use with %s"), + _("a secret with UUID %s is already defined for use with %s"), uuidstr, usageID); goto cleanup; } @@ -819,12 +820,15 @@ secretDefineXML(virConnectPtr conn, const char *xml, const char *newUsageID = secretUsageIDForDef(new_attrs); const char *oldUsageID = secretUsageIDForDef(secret->def); if (STRNEQ(oldUsageID, newUsageID)) { - char uuidstr[VIR_UUID_STRING_BUFLEN]; - virUUIDFormat(secret->def->uuid, uuidstr); - virReportError(VIR_ERR_INTERNAL_ERROR, - _("a secret with UUID %s is already defined for use with %s"), - uuidstr, oldUsageID); - goto cleanup; + new_secret = secretFindByUsage(driver, new_attrs->usage_type, newUsageID); + if (new_secret){ + char uuidstr[VIR_UUID_STRING_BUFLEN]; + virUUIDFormat(new_secret->def->uuid, uuidstr); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("a secret with UUID %s is already defined for use with %s"), + uuidstr, newUsageID); + goto cleanup; + } } if (secret->def->private && !new_attrs->private) { -- 1.7.1

1 0

[libvirt] [PATCH 0/6] another virstoragefile cleanup
by Eric Blake 12 Apr '14

12 Apr '14

Today's cleanup: add tests for backing chain lookups, and remove another redundant field. Eric Blake (6): conf: test backing chain lookup util: new virFileRelLinkPointsTo function conf: report error on chain lookup failure conf: drop redundant parameter to chain lookup conf: tweak chain lookup internals conf: delete internal directory field src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 13 +-- src/util/virfile.c | 26 +++++- src/util/virfile.h | 3 + src/util/virstoragefile.c | 96 +++++++++++------------ src/util/virstoragefile.h | 2 - src/xen/xm_internal.c | 11 ++- tests/virstoragetest.c | 196 +++++++++++++++++++++++++++++++++++++++------- 8 files changed, 251 insertions(+), 97 deletions(-) -- 1.9.0

2 19

[libvirt] [PATCH v5] Introduce --without-pm-utils to get rid of pm-is-supported dependency
by Cédric Bosdonnat 11 Apr '14

11 Apr '14

This uses the dbus api of systemd to check the power management capabilities of the node. --- Difference with v4: * Removed left-over debug bits * Rebased * Cleaned up the spurious white space change configure.ac | 22 +++++++++ libvirt.spec.in | 9 ++++ src/libvirt_private.syms | 3 ++ src/util/virnodesuspend.c | 75 ++++++++++++++++++++++------ src/util/virsystemd.c | 59 ++++++++++++++++++++++ src/util/virsystemd.h | 6 +++ tests/virsystemdtest.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 279 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index 52c50df..ea85851 100644 --- a/configure.ac +++ b/configure.ac @@ -563,6 +563,10 @@ AC_ARG_WITH([chrdev-lock-files], [location for UUCP style lock files for character devices (use auto for default paths on some platforms) @<:@default=auto@:>@])]) m4_divert_text([DEFAULTS], [with_chrdev_lock_files=auto]) +AC_ARG_WITH([pm-utils], + [AS_HELP_STRING([--with-pm-utils], + [use pm-utils for power management @<:@default=yes@:>@])]) +m4_divert_text([DEFAULTS], [with_pm_utils=check]) dnl dnl in case someone want to build static binaries @@ -1621,6 +1625,23 @@ fi AM_CONDITIONAL([WITH_PHYP],[test "$with_phyp" = "yes"]) +dnl +dnl Should we build with pm-utils support? +dnl +if test "$with_pm_utils" = "check"; then + with_pm_utils=yes + if test "$with_dbus" = "yes"; then + if test "$init_systemd" = "yes"; then + with_pm_utils=no + fi + fi +fi + +if test "$with_pm_utils" = "yes"; then + AC_DEFINE_UNQUOTED([WITH_PM_UTILS], 1, [whether to use pm-utils]) +fi +AM_CONDITIONAL([WITH_PM_UTILS], [test "$with_pm_utils" = "yes"]) + dnl virsh libraries VIRSH_LIBS="$VIRSH_LIBS $READLINE_LIBS" AC_SUBST([VIRSH_LIBS]) @@ -2853,6 +2874,7 @@ AC_MSG_NOTICE([ rbd: $LIBRBD_LIBS]) else AC_MSG_NOTICE([ rbd: no]) fi +AC_MSG_NOTICE([pm-utils: $with_pm_utils]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Test suite]) diff --git a/libvirt.spec.in b/libvirt.spec.in index 8e83fb3..b61ef8d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -132,6 +132,7 @@ %define with_libssh2 0%{!?_without_libssh2:0} %define with_wireshark 0%{!?_without_wireshark:0} %define with_systemd_daemon 0%{!?_without_systemd_daemon:0} +%define with_pm_utils 1 # Non-server/HV driver defaults which are always enabled %define with_sasl 0%{!?_without_sasl:1} @@ -182,6 +183,7 @@ %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 %define with_systemd 1 %define with_systemd_daemon 1 + %define with_pm_utils 0 %endif # Fedora 18 / RHEL-7 are first where firewalld support is enabled @@ -1138,8 +1140,10 @@ Requires: nc Requires: gettext # Needed by virt-pki-validate script. Requires: gnutls-utils +%if %{with_pm_utils} # Needed for probing the power management features of the host. Requires: pm-utils +%{endif} %if %{with_sasl} Requires: cyrus-sasl # Not technically required, but makes 'out-of-box' config @@ -1395,6 +1399,10 @@ driver %define _without_systemd_daemon --without-systemd-daemon %endif +%if ! %{with_pm_utils} + %define _without_pm_utils --without-pm-utils +%endif + %define when %(date +"%%F-%%T") %define where %(hostname) %define who %{?packager}%{!?packager:Unknown} @@ -1471,6 +1479,7 @@ rm -f po/stamp-po %{?_with_firewalld} \ %{?_without_wireshark} \ %{?_without_systemd_daemon} \ + %{?_without_pm_utils} \ %{with_packager} \ %{with_packager_version} \ --with-qemu-user=%{qemu_user} \ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index cd43335..6e807c4 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1888,6 +1888,9 @@ virSysinfoSetup; # util/virsystemd.h +virSystemdCanHibernate; +virSystemdCanHybridSleep; +virSystemdCanSuspend; virSystemdCreateMachine; virSystemdMakeMachineName; virSystemdMakeScopeName; diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index 08c47aa..70ede2a 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -22,6 +22,7 @@ #include <config.h> #include "virnodesuspend.h" +# include "virsystemd.h" #include "vircommand.h" #include "virthread.h" #include "datatypes.h" @@ -228,23 +229,9 @@ int nodeSuspendForDuration(unsigned int target, return ret; } - -/** - * virNodeSuspendSupportsTarget: - * @target: The power management target to check whether it is supported - * by the host. Values could be: - * VIR_NODE_SUSPEND_TARGET_MEM - * VIR_NODE_SUSPEND_TARGET_DISK - * VIR_NODE_SUSPEND_TARGET_HYBRID - * @supported: set to true if supported, false otherwise - * - * Run the script 'pm-is-supported' (from the pm-utils package) - * to find out if @target is supported by the host. - * - * Returns 0 if the query was successful, -1 on failure. - */ +#ifdef WITH_PM_UTILS static int -virNodeSuspendSupportsTarget(unsigned int target, bool *supported) +virNodeSuspendSupportsTargetPMUtils(unsigned int target, bool *supported) { virCommandPtr cmd; int status; @@ -280,6 +267,62 @@ virNodeSuspendSupportsTarget(unsigned int target, bool *supported) virCommandFree(cmd); return ret; } +#endif + +static int +virNodeSuspendSupportsTargetSystemd(unsigned int target, bool *supported) +{ + int ret = -1; + + if (virNodeSuspendInitialize() < 0) + return -1; + + *supported = false; + + switch (target) { + case VIR_NODE_SUSPEND_TARGET_MEM: + ret = virSystemdCanSuspend(supported); + break; + case VIR_NODE_SUSPEND_TARGET_DISK: + ret = virSystemdCanHibernate(supported); + break; + case VIR_NODE_SUSPEND_TARGET_HYBRID: + ret = virSystemdCanHybridSleep(supported); + break; + default: + return ret; + } + + return ret; +} + +/** + * virNodeSuspendSupportsTarget: + * @target: The power management target to check whether it is supported + * by the host. Values could be: + * VIR_NODE_SUSPEND_TARGET_MEM + * VIR_NODE_SUSPEND_TARGET_DISK + * VIR_NODE_SUSPEND_TARGET_HYBRID + * @supported: set to true if supported, false otherwise + * + * Run the script 'pm-is-supported' (from the pm-utils package) + * to find out if @target is supported by the host. + * + * Returns 0 if the query was successful, -1 on failure. + */ +static int +virNodeSuspendSupportsTarget(unsigned int target, bool *supported) +{ + int ret; + + ret = virNodeSuspendSupportsTargetSystemd(target, supported); +#ifdef WITH_PM_UTILS + if (ret < 0) + ret = virNodeSuspendSupportsTargetPMUtils(target, supported); +#endif + + return ret; +} /** * virNodeSuspendGetTargetMask: diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 93b3f9c..e9ca564 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -325,3 +325,62 @@ virSystemdNotifyStartup(void) sd_notify(0, "READY=1"); #endif } + +static int +virSystemdPMSupportTarget(const char *methodName, bool *result) +{ + int ret; + DBusConnection *conn; + DBusMessage *message = NULL; + char *response; + + ret = virDBusIsServiceEnabled("org.freedesktop.login1"); + if (ret < 0) + return ret; + + if ((ret = virDBusIsServiceRegistered("org.freedesktop.login1")) < 0) + return ret; + + if (!(conn = virDBusGetSystemBus())) + return -1; + + ret = -1; + + if (virDBusCallMethod(conn, + &message, + NULL, + "org.freedesktop.login1", + "/org/freedesktop/login1", + "org.freedesktop.login1.Manager", + methodName, + NULL) < 0) + return ret; + + if ((ret = virDBusMessageRead(message, "s", &response)) < 0) + goto cleanup; + + *result = STREQ("yes", response) || STREQ("challenge", response); + + ret = 0; + + cleanup: + dbus_message_unref(message); + VIR_FREE(response); + + return ret; +} + +int virSystemdCanSuspend(bool *result) +{ + return virSystemdPMSupportTarget("CanSuspend", result); +} + +int virSystemdCanHibernate(bool *result) +{ + return virSystemdPMSupportTarget("CanHibernate", result); +} + +int virSystemdCanHybridSleep(bool *result) +{ + return virSystemdPMSupportTarget("CanHybridSleep", result); +} diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h index 7fed456..491c9b7 100644 --- a/src/util/virsystemd.h +++ b/src/util/virsystemd.h @@ -48,4 +48,10 @@ int virSystemdTerminateMachine(const char *name, void virSystemdNotifyStartup(void); +int virSystemdCanSuspend(bool *result); + +int virSystemdCanHibernate(bool *result); + +int virSystemdCanHybridSleep(bool *result); + #endif /* __VIR_SYSTEMD_H__ */ diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 2b014cc..86d717f 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -55,10 +55,21 @@ VIR_MOCK_IMPL_RET_ARGS(dbus_connection_send_with_reply_and_block, } else { reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); } + } else if (STREQ(service, "org.freedesktop.login1")) { + char *supported = getenv("RESULT_SUPPORT"); + DBusMessageIter iter; + reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); + dbus_message_iter_init_append(reply, &iter); + + if (!dbus_message_iter_append_basic(&iter, + DBUS_TYPE_STRING, + &supported)) + goto error; } else if (STREQ(service, "org.freedesktop.DBus") && STREQ(member, "ListActivatableNames")) { const char *svc1 = "org.foo.bar.wizz"; const char *svc2 = "org.freedesktop.machine1"; + const char *svc3 = "org.freedesktop.login1"; DBusMessageIter iter; DBusMessageIter sub; reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); @@ -75,11 +86,17 @@ VIR_MOCK_IMPL_RET_ARGS(dbus_connection_send_with_reply_and_block, DBUS_TYPE_STRING, &svc2)) goto error; + if (!getenv("FAIL_NO_SERVICE") && + !dbus_message_iter_append_basic(&sub, + DBUS_TYPE_STRING, + &svc3)) + goto error; dbus_message_iter_close_container(&iter, &sub); } else if (STREQ(service, "org.freedesktop.DBus") && STREQ(member, "ListNames")) { const char *svc1 = "org.foo.bar.wizz"; const char *svc2 = "org.freedesktop.systemd1"; + const char *svc3 = "org.freedesktop.login1"; DBusMessageIter iter; DBusMessageIter sub; reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); @@ -96,6 +113,11 @@ VIR_MOCK_IMPL_RET_ARGS(dbus_connection_send_with_reply_and_block, DBUS_TYPE_STRING, &svc2)) goto error; + if ((!getenv("FAIL_NO_SERVICE") && !getenv("FAIL_NOT_REGISTERED")) && + !dbus_message_iter_append_basic(&sub, + DBUS_TYPE_STRING, + &svc3)) + goto error; dbus_message_iter_close_container(&iter, &sub); } else { reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); @@ -313,6 +335,86 @@ testScopeName(const void *opaque) return ret; } +typedef int (*virSystemdCanHelper)(bool * result); +struct testPMSupportData { + virSystemdCanHelper tested; +}; + +static int testPMSupportHelper(const void *opaque) +{ + int rv; + bool result; + size_t i; + const char *results[4] = {"yes", "no", "na", "challenge"}; + int expected[4] = {1, 0, 0, 1}; + const struct testPMSupportData *data = opaque; + + for (i = 0; i < 4; i++) { + setenv("RESULT_SUPPORT", results[i], 1); + if ((rv = data->tested(&result)) < 0) { + fprintf(stderr, "%s", "Unexpected canSuspend error\n"); + return -1; + } + + if (result != expected[i]) { + fprintf(stderr, "Unexpected result for answer '%s'\n", results[i]); + goto error; + } + unsetenv("RESULT_SUPPORT"); + } + + return 0; +error: + unsetenv("RESULT_SUPPORT"); + return -1; +} + +static int testPMSupportHelperNoSystemd(const void *opaque) +{ + int rv; + bool result; + const struct testPMSupportData *data = opaque; + + setenv("FAIL_NO_SERVICE", "1", 1); + + if ((rv = data->tested(&result)) == 0) { + unsetenv("FAIL_NO_SERVICE"); + fprintf(stderr, "%s", "Unexpected canSuspend success\n"); + return -1; + } + unsetenv("FAIL_NO_SERVICE"); + + if (rv != -2) { + fprintf(stderr, "%s", "Unexpected canSuspend error\n"); + return -1; + } + + return 0; +} + +static int testPMSupportSystemdNotRunning(const void *opaque) +{ + int rv; + bool result; + const struct testPMSupportData *data = opaque; + + setenv("FAIL_NOT_REGISTERED", "1", 1); + + if ((rv = data->tested(&result)) == 0) { + unsetenv("FAIL_NOT_REGISTERED"); + fprintf(stderr, "%s", "Unexpected canSuspend success\n"); + return -1; + } + unsetenv("FAIL_NOT_REGISTERED"); + + if (rv != -2) { + fprintf(stderr, "%s", "Unexpected canSuspend error\n"); + return -1; + } + + return 0; +} + static int mymain(void) { @@ -351,6 +453,25 @@ mymain(void) TEST_SCOPE("demo", "/machine/eng-dept/testing!stuff", "machine-eng\\x2ddept-testing\\x21stuff-lxc\\x2ddemo.scope"); +# define TESTS_PM_SUPPORT_HELPER(name, function) \ + do { \ + struct testPMSupportData data = { \ + function \ + }; \ + if (virtTestRun("Test " name " ", testPMSupportHelper, &data) < 0) \ + ret = -1; \ + if (virtTestRun("Test " name " no systemd ", \ + testPMSupportHelperNoSystemd, &data) < 0) \ + ret = -1; \ + if (virtTestRun("Test systemd " name " not running ", \ + testPMSupportSystemdNotRunning, &data) < 0) \ + ret = -1; \ + } while (0) + + TESTS_PM_SUPPORT_HELPER("canSuspend", &virSystemdCanSuspend); + TESTS_PM_SUPPORT_HELPER("canHibernate", &virSystemdCanHibernate); + TESTS_PM_SUPPORT_HELPER("canHybridSleep", &virSystemdCanHybridSleep); + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.8.4.5

2 1

[libvirt] [PATCH] tests: drop dead code from argv2xml and xml2xml
by Eric Blake 11 Apr '14

11 Apr '14

Noticed while tweaking the RelaxNG grammar for <disk> elements. * tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-static-vcpu-no-numatune.xml: * tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml: Drop unused files. * tests/qemuargv2xmltest.c (testInfo, DO_TEST_FULL): Drop unused field. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. tests/qemuargv2xmltest.c | 16 +++++------ .../qemuxml2xmlout-disk-cdrom-empty.xml | 32 ---------------------- ...emuxml2xmlout-numad-static-vcpu-no-numatune.xml | 29 -------------------- 3 files changed, 7 insertions(+), 70 deletions(-) delete mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml delete mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-static-vcpu-no-numatune.xml diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 4cc3749..0fc9fcb 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -95,7 +95,6 @@ static int testCompareXMLToArgvFiles(const char *xml, struct testInfo { const char *name; unsigned long long extraFlags; - const char *migrateFrom; }; static int @@ -137,16 +136,16 @@ mymain(void) if (!(driver.xmlopt = virQEMUDriverCreateXMLConf(&driver))) return EXIT_FAILURE; -# define DO_TEST_FULL(name, extraFlags, migrateFrom) \ +# define DO_TEST_FULL(name, extraFlags) \ do { \ - const struct testInfo info = { name, extraFlags, migrateFrom }; \ + const struct testInfo info = { name, extraFlags }; \ if (virtTestRun("QEMU ARGV-2-XML " name, \ testCompareXMLToArgvHelper, &info) < 0) \ ret = -1; \ } while (0) # define DO_TEST(name) \ - DO_TEST_FULL(name, 0, NULL) + DO_TEST_FULL(name, 0) setenv("PATH", "/bin", 1); setenv("USER", "test", 1); @@ -264,12 +263,11 @@ mymain(void) DO_TEST("nosharepages"); - DO_TEST_FULL("restore-v1", 0, "stdio"); - DO_TEST_FULL("restore-v2", 0, "stdio"); - DO_TEST_FULL("restore-v2", 0, "exec:cat"); - DO_TEST_FULL("migrate", 0, "tcp:10.0.0.1:5000"); + DO_TEST("restore-v1"); + DO_TEST("restore-v2"); + DO_TEST("migrate"); - DO_TEST_FULL("qemu-ns-no-env", 1, NULL); + DO_TEST_FULL("qemu-ns-no-env", 1); virObjectUnref(driver.config); virObjectUnref(driver.caps); diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml deleted file mode 100644 index 2c5a81a..0000000 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml +++ /dev/null @@ -1,32 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219100</memory> - <currentMemory unit='KiB'>219100</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu</emulator> - <disk type='block' device='disk'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <disk type='file' device='cdrom'> - <target dev='hdc' bus='ide'/> - <source startupPolicy='optional'/> - <readonly/> - <address type='drive' controller='0' bus='1' target='0' unit='0'/> - </disk> - <controller type='usb' index='0'/> - <controller type='ide' index='0'/> - <memballoon model='virtio'/> - </devices> -</domain> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-static-vcpu-no-numatune.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-static-vcpu-no-numatune.xml deleted file mode 100644 index 71c1497..0000000 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-numad-static-vcpu-no-numatune.xml +++ /dev/null @@ -1,29 +0,0 @@ -<domain type='qemu'> - <name>QEMUGuest1</name> - <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory unit='KiB'>219136</memory> - <currentMemory unit='KiB'>219136</currentMemory> - <vcpu placement='static'>2</vcpu> - <os> - <type arch='i686' machine='pc'>hvm</type> - <boot dev='hd'/> - </os> - <cpu> - <topology sockets='2' cores='1' threads='1'/> - </cpu> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/bin/qemu</emulator> - <disk type='block' device='disk'> - <source dev='/dev/HostVG/QEMUGuest1'/> - <target dev='hda' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='0'/> - </disk> - <controller type='ide' index='0'/> - <controller type='usb' index='0'/> - <memballoon model='virtio'/> - </devices> -</domain> -- 1.9.0

1 0

[libvirt] [PATCH 0/2] bhyve: enhance domain management
by Wojciech Macek 11 Apr '14

11 Apr '14

Two small changes: 1. Inside domainDestroy, forget about domain if it is not persistent. 2. Add domainCreateXML call Wojciech Macek (2): bhyve: fix domain management bhyve: domainCreateXML src/bhyve/bhyve_driver.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 2 deletions(-) -- 1.9.0

3 7

[libvirt] API calls to get interfaces and block devices
by Ruben Kerkhof 11 Apr '14

11 Apr '14

Hi all, I have a few python scripts which use the libvirt api to get interface and block device statistics. What has been bugging me for a while now that is that there’s no high level api to get a list of all interfaces or block devices for a vm. The list can be retrieved from the xml with a bit of Xpath magic, but this seems to me to break the nice abstraction layer libvirt provides. Ideally, I don’t have to do anything with xml, and add dependencies on xml parsers to my code. I’ve seen examples of code doing this, for example the collectd libvirt plugin, but there must be many others. Can I kindly ask for such an API? Unfortunately I don’t have the skills to code this up myself. Kind regards, Ruben Kerkhof

3 6

[libvirt] [PATCH] virsh: Add one blank line after output of dompmsuspend/dompmwakeup
by Shanzhi Yu 11 Apr '14

11 Apr '14

There should be include one blank line after result of dompmsuspend and dompmwakeup --- tools/virsh-domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 73414f8..3aca1e7 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -2830,7 +2830,7 @@ cmdDomPMSuspend(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - vshPrint(ctl, _("Domain %s successfully suspended"), + vshPrint(ctl, _("Domain %s successfully suspended\n"), virDomainGetName(dom)); ret = true; @@ -2881,7 +2881,7 @@ cmdDomPMWakeup(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - vshPrint(ctl, _("Domain %s successfully woken up"), + vshPrint(ctl, _("Domain %s successfully woken up\n"), virDomainGetName(dom)); ret = true; -- 1.8.3.1

2 1

[libvirt] maint: backport of 736e017e and friends
by Martin Kletzander 11 Apr '14

11 Apr '14

I wanted to back-port 736e017e as requested in Bug 1058149 [1], because it fixes a crash. However, it requires 5b3492fa and e9d09fe1 to be back-ported as well, so I wanted to confirm it's still OK when it's not a simple two-liner or similar (and combined with the low probability of the crash to happen). What's the stand on this? Martin [1] https://bugzilla.redhat.com/show_bug.cgi?id=1058149

4 4

[libvirt] [PATCH] cpu: Properly check input parameters
by Jiri Denemark 11 Apr '14

11 Apr '14

Most of the APIs in CPU driver do not expect to get NULL for input parameters. Let's mark them with ATTRIBUTE_NONNULL and also check for some members of virCPUDef when the APIs expect them have some specific values. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu/cpu.c | 48 +++++++++++++++++++++++++++++++++++++----------- src/cpu/cpu.h | 36 ++++++++++++++++++++++++------------ 2 files changed, 61 insertions(+), 23 deletions(-) diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index 9cd2300..528e1a7 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -108,12 +108,6 @@ cpuCompareXML(virCPUDefPtr host, if (cpu == NULL) goto cleanup; - if (!cpu->model) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("no CPU model specified")); - goto cleanup; - } - ret = cpuCompare(host, cpu); cleanup: @@ -146,6 +140,12 @@ cpuCompare(virCPUDefPtr host, VIR_DEBUG("host=%p, cpu=%p", host, cpu); + if (!cpu->model) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("no guest CPU model specified")); + return VIR_CPU_COMPARE_ERROR; + } + if ((driver = cpuGetSubDriver(host->arch)) == NULL) return VIR_CPU_COMPARE_ERROR; @@ -203,14 +203,15 @@ cpuDecode(virCPUDefPtr cpu, } if (models == NULL && nmodels != 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("nonzero nmodels doesn't match with NULL models")); + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("nonzero nmodels doesn't match with NULL models")); return -1; } - if (cpu == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("invalid CPU definition")); + if (cpu->type > VIR_CPU_TYPE_GUEST || + cpu->mode != VIR_CPU_MODE_CUSTOM) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("invalid CPU definition stub")); return -1; } @@ -264,6 +265,12 @@ cpuEncode(virArch arch, virArchToString(arch), cpu, forced, required, optional, disabled, forbidden, vendor); + if (!cpu->model) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("no guest CPU model specified")); + return -1; + } + if ((driver = cpuGetSubDriver(arch)) == NULL) return -1; @@ -367,6 +374,12 @@ cpuGuestData(virCPUDefPtr host, VIR_DEBUG("host=%p, guest=%p, data=%p, msg=%p", host, guest, data, msg); + if (!guest->model) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("no guest CPU model specified")); + return VIR_CPU_COMPARE_ERROR; + } + if ((driver = cpuGetSubDriver(host->arch)) == NULL) return VIR_CPU_COMPARE_ERROR; @@ -529,6 +542,19 @@ cpuBaseline(virCPUDefPtr *cpus, return NULL; } + for (i = 0; i < ncpus; i++) { + if (!cpus[i]) { + virReportError(VIR_ERR_INVALID_ARG, + _("invalid CPU definition at index %zu"), i); + return NULL; + } + if (!cpus[i]->model) { + virReportError(VIR_ERR_INVALID_ARG, + _("no CPU model specified at index %zu"), i); + return NULL; + } + } + if (models == NULL && nmodels != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nonzero nmodels doesn't match with NULL models")); diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index 27169fe..e9f2713 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -119,18 +119,21 @@ struct cpuArchDriver { extern virCPUCompareResult cpuCompareXML(virCPUDefPtr host, - const char *xml); + const char *xml) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); extern virCPUCompareResult cpuCompare (virCPUDefPtr host, - virCPUDefPtr cpu); + virCPUDefPtr cpu) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); extern int cpuDecode (virCPUDefPtr cpu, const virCPUData *data, const char **models, unsigned int nmodels, - const char *preferred); + const char *preferred) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); extern int cpuEncode (virArch arch, @@ -140,7 +143,8 @@ cpuEncode (virArch arch, virCPUDataPtr *optional, virCPUDataPtr *disabled, virCPUDataPtr *forbidden, - virCPUDataPtr *vendor); + virCPUDataPtr *vendor) + ATTRIBUTE_NONNULL(2); extern void cpuDataFree (virCPUDataPtr data); @@ -152,7 +156,8 @@ extern virCPUCompareResult cpuGuestData(virCPUDefPtr host, virCPUDefPtr guest, virCPUDataPtr *data, - char **msg); + char **msg) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); extern char * cpuBaselineXML(const char **xmlCPUs, @@ -166,30 +171,37 @@ cpuBaseline (virCPUDefPtr *cpus, unsigned int ncpus, const char **models, unsigned int nmodels, - unsigned int flags); + unsigned int flags) + ATTRIBUTE_NONNULL(1); extern int cpuUpdate (virCPUDefPtr guest, - const virCPUDef *host); + const virCPUDef *host) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); extern int cpuHasFeature(const virCPUData *data, - const char *feature); + const char *feature) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); bool cpuModelIsAllowed(const char *model, const char **models, - unsigned int nmodels); + unsigned int nmodels) + ATTRIBUTE_NONNULL(1); extern int -cpuGetModels(const char *arch, char ***models); +cpuGetModels(const char *arch, char ***models) + ATTRIBUTE_NONNULL(1); /* cpuDataFormat and cpuDataParse are implemented for unit tests only and * have no real-life usage */ -char *cpuDataFormat(const virCPUData *data); +char *cpuDataFormat(const virCPUData *data) + ATTRIBUTE_NONNULL(1); virCPUDataPtr cpuDataParse(virArch arch, - const char *xmlStr); + const char *xmlStr) + ATTRIBUTE_NONNULL(2); #endif /* __VIR_CPU_H__ */ -- 1.9.1

2 2

[libvirt] [PATCH] cpu: Add documentation for CPU driver APIs
by Jiri Denemark 11 Apr '14

11 Apr '14

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu/cpu.c | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index e91f5bb..9cd2300 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -77,6 +77,19 @@ cpuGetSubDriver(virArch arch) } +/** + * cpuCompareXML: + * + * @host: host CPU definition + * @xml: XML description of either guest or host CPU to be compared with @host + * + * Compares the CPU described by @xml with @host CPU. + * + * Returns VIR_CPU_COMPARE_ERROR on error, VIR_CPU_COMPARE_INCOMPATIBLE when + * the two CPUs are incompatible, VIR_CPU_COMPARE_IDENTICAL when the two CPUs + * are identical, VIR_CPU_COMPARE_SUPERSET when the @xml CPU is a superset of + * the @host CPU. + */ virCPUCompareResult cpuCompareXML(virCPUDefPtr host, const char *xml) @@ -112,6 +125,19 @@ cpuCompareXML(virCPUDefPtr host, } +/** + * cpuCompare: + * + * @host: host CPU definition + * @cpu: either guest or host CPU to be compared with @host + * + * Compares the CPU described by @cpu with @host CPU. + * + * Returns VIR_CPU_COMPARE_ERROR on error, VIR_CPU_COMPARE_INCOMPATIBLE when + * the two CPUs are incompatible, VIR_CPU_COMPARE_IDENTICAL when the two CPUs + * are identical, VIR_CPU_COMPARE_SUPERSET when the @cpu CPU is a superset of + * the @host CPU. + */ virCPUCompareResult cpuCompare(virCPUDefPtr host, virCPUDefPtr cpu) @@ -134,6 +160,31 @@ cpuCompare(virCPUDefPtr host, } +/** + * cpuDecode: + * + * @cpu: CPU definition stub to be filled in + * @data: internal CPU data to be decoded into @cpu definition + * @models: list of CPU models that can be considered when decoding @data + * @nmodels: number of CPU models in @models + * @preferred: CPU models that should be used if possible + * + * Decodes internal CPU data into a CPU definition consisting of a CPU model + * and a list of CPU features. The @cpu model stub is supposed to have arch, + * type, match and fallback members set, this function will add the rest. If + * @models list is NULL, all models supported by libvirt will be considered + * when decoding the data. In general, this function will select the model + * closest to the CPU specified by @data unless @preferred is non-NULL, in + * which case the @preferred model will be used as long as it is compatible + * with @data. + * + * For VIR_ARCH_I686 and VIR_ARCH_X86_64 architectures this means the computed + * CPU definition will have the shortest possible list of additional features. + * When @preferred is non-NULL, the @preferred model will be used even if + * other models would result in a shorter list of additional features. + * + * Returns 0 on success, -1 on error. + */ int cpuDecode(virCPUDefPtr cpu, const virCPUData *data, @@ -177,6 +228,25 @@ cpuDecode(virCPUDefPtr cpu, } +/** + * cpuEncode: + * + * @arch: CPU architecture + * @cpu: CPU definition to be encoded into internal CPU driver representation + * @forced: where to store CPU data corresponding to forced features + * @required: where to store CPU data corresponding to required features + * @optional: where to store CPU data corresponding to optional features + * @disabled: where to store CPU data corresponding to disabled features + * @forbidden: where to store CPU data corresponding to forbidden features + * @vendor: where to store CPU data corresponding to CPU vendor + * + * Encode CPU definition from @cpu into internal CPU driver representation. + * Any of @forced, @required, @optional, @disabled, @forbidden and @vendor + * arguments can be NULL in case the caller is not interested in the + * corresponding data. + * + * Returns 0 on success, -1 on error. + */ int cpuEncode(virArch arch, const virCPUDef *cpu, @@ -209,6 +279,15 @@ cpuEncode(virArch arch, } +/** + * cpuDataFree: + * + * @data: CPU data structure to be freed + * + * Free internal CPU data. + * + * Returns nothing. + */ void cpuDataFree(virCPUDataPtr data) { @@ -233,6 +312,13 @@ cpuDataFree(virCPUDataPtr data) } +/** + * cpuNodeData: + * + * @arch: CPU architecture + * + * Returns CPU data for host CPU or NULL on error. + */ virCPUDataPtr cpuNodeData(virArch arch) { @@ -254,6 +340,23 @@ cpuNodeData(virArch arch) } +/** + * cpuGuestData: + * + * @host: host CPU definition + * @guest: guest CPU definition + * @data: computed guest CPU data + * @msg: error message describing why the @guest and @host CPUs are considered + * incompatible + * + * Computes guest CPU data for the @guest CPU definition when run on the @host + * CPU. + * + * Returns VIR_CPU_COMPARE_ERROR on error, VIR_CPU_COMPARE_INCOMPATIBLE when + * the two CPUs are incompatible (@msg will describe the incompatibility), + * VIR_CPU_COMPARE_IDENTICAL when the two CPUs are identical, + * VIR_CPU_COMPARE_SUPERSET when the @guest CPU is a superset of the @host CPU. + */ virCPUCompareResult cpuGuestData(virCPUDefPtr host, virCPUDefPtr guest, @@ -278,6 +381,27 @@ cpuGuestData(virCPUDefPtr host, } +/** + * cpuBaselineXML: + * + * @xmlCPUs: list of host CPU XML descriptions + * @ncpus: number of CPUs in @xmlCPUs + * @models: list of CPU models that can be considered for the baseline CPU + * @nmodels: number of CPU models in @models + * @flags: bitwise-OR of virConnectBaselineCPUFlags + * + * Computes the most feature-rich CPU which is compatible with all given + * host CPUs. If @models array is NULL, all models supported by libvirt will + * be considered when computing the baseline CPU model, otherwise the baseline + * CPU model will be one of the provided CPU @models. + * + * If @flags includes VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES then libvirt + * will explicitly list all CPU features that are part of the host CPU, + * without this flag features that are part of the CPU model will not be + * listed. + * + * Returns XML description of the baseline CPU or NULL on error. + */ char * cpuBaselineXML(const char **xmlCPUs, unsigned int ncpus, @@ -353,6 +477,27 @@ cpuBaselineXML(const char **xmlCPUs, } +/** + * cpuBaseline: + * + * @cpus: list of host CPU definitions + * @ncpus: number of CPUs in @cpus + * @models: list of CPU models that can be considered for the baseline CPU + * @nmodels: number of CPU models in @models + * @flags: bitwise-OR of virConnectBaselineCPUFlags + * + * Computes the most feature-rich CPU which is compatible with all given + * host CPUs. If @models array is NULL, all models supported by libvirt will + * be considered when computing the baseline CPU model, otherwise the baseline + * CPU model will be one of the provided CPU @models. + * + * If @flags includes VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES then libvirt + * will explicitly list all CPU features that are part of the host CPU, + * without this flag features that are part of the CPU model will not be + * listed. + * + * Returns baseline CPU definition or NULL on error. + */ virCPUDefPtr cpuBaseline(virCPUDefPtr *cpus, unsigned int ncpus, @@ -404,6 +549,20 @@ cpuBaseline(virCPUDefPtr *cpus, } +/** + * cpuUpdate: + * + * @guest: guest CPU definition + * @host: host CPU definition + * + * Updates @guest CPU definition according to @host CPU. This is required to + * support guest CPU definition which are relative to host CPU, such as CPUs + * with VIR_CPU_MODE_CUSTOM and optional features or VIR_CPU_MATCH_MINIMUM, or + * CPUs with non-custom mode (VIR_CPU_MODE_HOST_MODEL, + * VIR_CPU_MODE_HOST_PASSTHROUGH). + * + * Returns 0 on success, -1 on error. + */ int cpuUpdate(virCPUDefPtr guest, const virCPUDef *host) @@ -425,6 +584,18 @@ cpuUpdate(virCPUDefPtr guest, return driver->update(guest, host); } + +/** + * cpuHasFeature: + * + * @data: internal CPU representation + * @feature: feature to be checked for + * + * Checks whether @feature is supported by the CPU described by @data. + * + * Returns 1 if the feature is supported, 0 if it's not supported, or + * -1 on error. + */ int cpuHasFeature(const virCPUData *data, const char *feature) @@ -446,6 +617,16 @@ cpuHasFeature(const virCPUData *data, return driver->hasFeature(data, feature); } + +/** + * cpuDataFormat: + * + * @data: internal CPU representation + * + * Formats @data into XML for test purposes. + * + * Returns string representation of the XML describing @data or NULL on error. + */ char * cpuDataFormat(const virCPUData *data) { @@ -466,6 +647,17 @@ cpuDataFormat(const virCPUData *data) return driver->dataFormat(data); } + +/** + * cpuDataParse: + * + * @arch: CPU architecture + * @xmlStr: XML string produced by cpuDataFormat + * + * Parses XML representation of virCPUData structure for test purposes. + * + * Returns internal CPU data structure parsed from the XML or NULL on error. + */ virCPUDataPtr cpuDataParse(virArch arch, const char *xmlStr) @@ -541,6 +733,16 @@ cpuGetArchModels(const char *arch, struct cpuGetModelsData *data) } +/** + * cpuGetModels: + * + * @archName: CPU architecture string + * @models: where to store the list of supported models + * + * Fetches all CPU models supported by libvirt on @archName. + * + * Returns number of supported CPU models or -1 on error. + */ int cpuGetModels(const char *archName, char ***models) { -- 1.9.1

2 2

[libvirt] [PATCH] tests: Fix systemd test with --without-driver-modules
by Jiri Denemark 11 Apr '14

11 Apr '14

Every test that makes use of virmock.h (only virsystemdtest as of now) needs to be linked with -export-dynamic to make sure the LD_PRELOADed mock library can access it's wrap_* symbols. Normally, DRIVER_MODULE_LDFLAGS variable contains -export-dynamic but when --without-driver-modules configure option is used, DRIVER_MODULE_LDFLAGS is empty. This patch turns on -export-dynamic for all tests unconditionally regardless on --without-driver-modules. This fixes virsystemdtest and all future users of virmock.h. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tests/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index c5346d1..1e63b86 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -43,6 +43,9 @@ AM_CFLAGS = \ $(COVERAGE_CFLAGS) \ $(WARN_CFLAGS) +AM_LDFLAGS = \ + -export-dynamic + if WITH_DRIVER_MODULES INCLUDES += \ -DTEST_DRIVER_DIR=\"$(top_builddir)/src/.libs\" @@ -921,7 +924,6 @@ virsystemdtest_SOURCES = \ virsystemdtest.c testutils.h testutils.c virsystemdtest_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) virsystemdtest_LDADD = $(LDADDS) -virsystemdtest_LDFLAGS = $(DRIVER_MODULE_LDFLAGS) else ! WITH_DBUS EXTRA_DIST += virdbustest.c virmockdbus.c virsystemdtest.c -- 1.9.2

2 2

[libvirt] [PATCH] virsh: Add a white line into secret-get-value output
by liyang 11 Apr '14

11 Apr '14

From: Li Yang <liyang.fnst(a)cn.fujitsu.com> Commonly there is a whilt line at the end of the virsh command output, for example: [root@localhost /]# virsh list --name --all virt-tests-vm1 [root@localhost /]# For now the output of secret-get-value like this: [root@localhost /]# virsh secret-get-value b7811f0f-7fcb-d6b0-c12c-2d8807814b33 00111111001111110011111100111111 [root@localhost /] So modify the codes, make output like this: [root@localhost /]# virsh secret-get-value b7811f0f-7fcb-d6b0-c12c-2d8807814b33 00111111001111110011111100111111 [root@localhost /] Signed-off-by: Li Yang <liyang.fnst(a)cn.fujitsu.com> --- tools/virsh-secret.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index b5acfda..784fd3f 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -284,7 +284,7 @@ cmdSecretGetValue(vshControl *ctl, const vshCmd *cmd) vshError(ctl, "%s", _("Failed to allocate memory")); goto cleanup; } - vshPrint(ctl, "%s", base64); + vshPrint(ctl, "%s\n", base64); memset(base64, 0, strlen(base64)); VIR_FREE(base64); ret = true; -- 1.7.1

1 0

[libvirt] [PATCH] storage: add check for invalid volume name
by Jincheng Miao 11 Apr '14

11 Apr '14

If volume name is a path, storageVolCreateXML appends that name to the specified pool path, that will taint other pools. Adding the volume check is better for sanity. Signed-off-by: Jincheng Miao <jmiao(a)redhat.com> --- src/storage/storage_driver.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 2cb8347..c3b807f 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -49,6 +49,7 @@ #include "configmake.h" #include "virstring.h" #include "viraccessapicheck.h" +#include "dirname.h" #define VIR_FROM_THIS VIR_FROM_STORAGE @@ -1864,6 +1865,14 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, goto cleanup; } + /* Make sure the volume name is not a path */ + if (last_component(newvol->name) != newvol->name) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("storage volume name '%s' is a path"), + newvol->name); + goto cleanup; + } + /* Is there ever a valid case for this? */ if (newvol->target.capacity < origvol->target.capacity) newvol->target.capacity = origvol->target.capacity; -- 1.8.3.1

2 2

[libvirt] [PATCH v4] Introduce --without-pm-utils to get rid of pm-is-supported dependency
by Cédric Bosdonnat 11 Apr '14

11 Apr '14

This uses the dbus api of systemd to check the power management capabilities of the node. --- Diff with v3: * Added unit tests vir virSystemdCan* helpers * Make the default for with-pm-utils depending on dbus and systemd detection * Changed the implementation of the helpers to return true for 'yes' and 'challenge' responses, we shouldn't get a 'no' given libvirtd runs as privileged user... but who knows. configure.ac | 24 +++++++++++ libvirt.spec.in | 9 +++++ src/libvirt_private.syms | 3 ++ src/util/virnodesuspend.c | 75 ++++++++++++++++++++++++++-------- src/util/virsystemd.c | 59 +++++++++++++++++++++++++++ src/util/virsystemd.h | 6 +++ tests/virsystemdmock.c | 22 ++++++++++ tests/virsystemdtest.c | 100 +++++++++++++++++++++++++++++++++++++++++++++- 8 files changed, 281 insertions(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac index 73efffa..34e5ec2 100644 --- a/configure.ac +++ b/configure.ac @@ -563,6 +563,10 @@ AC_ARG_WITH([chrdev-lock-files], [location for UUCP style lock files for character devices (use auto for default paths on some platforms) @<:@default=auto@:>@])]) m4_divert_text([DEFAULTS], [with_chrdev_lock_files=auto]) +AC_ARG_WITH([pm-utils], + [AS_HELP_STRING([--with-pm-utils], + [use pm-utils for power management @<:@default=yes@:>@])]) +m4_divert_text([DEFAULTS], [with_pm_utils=check]) dnl dnl in case someone want to build static binaries @@ -1621,6 +1625,25 @@ fi AM_CONDITIONAL([WITH_PHYP],[test "$with_phyp" = "yes"]) +dnl +dnl Should we build with pm-utils support? +dnl +set -x +if test "$with_pm_utils" = "check"; then + with_pm_utils=yes + if test "$with_dbus" = "yes"; then + if test "$init_systemd" = "yes"; then + with_pm_utils=no + fi + fi +fi + +if test "$with_pm_utils" = "yes"; then + AC_DEFINE_UNQUOTED([WITH_PM_UTILS], 1, [whether to use pm-utils]) +fi +AM_CONDITIONAL([WITH_PM_UTILS], [test "$with_pm_utils" = "yes"]) +set +x + dnl virsh libraries VIRSH_LIBS="$VIRSH_LIBS $READLINE_LIBS" AC_SUBST([VIRSH_LIBS]) @@ -2845,6 +2868,7 @@ AC_MSG_NOTICE([ rbd: $LIBRBD_LIBS]) else AC_MSG_NOTICE([ rbd: no]) fi +AC_MSG_NOTICE([pm-utils: $with_pm_utils]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Test suite]) diff --git a/libvirt.spec.in b/libvirt.spec.in index eab9b23..5c20955 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -132,6 +132,7 @@ %define with_libssh2 0%{!?_without_libssh2:0} %define with_wireshark 0%{!?_without_wireshark:0} %define with_systemd_daemon 0%{!?_without_systemd_daemon:0} +%define with_pm_utils 1 # Non-server/HV driver defaults which are always enabled %define with_sasl 0%{!?_without_sasl:1} @@ -182,6 +183,7 @@ %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 %define with_systemd 1 %define with_systemd_daemon 1 + %define with_pm_utils 0 %endif # Fedora 18 / RHEL-7 are first where firewalld support is enabled @@ -1138,8 +1140,10 @@ Requires: nc Requires: gettext # Needed by virt-pki-validate script. Requires: gnutls-utils +%if %{with_pm_utils} # Needed for probing the power management features of the host. Requires: pm-utils +%{endif} %if %{with_sasl} Requires: cyrus-sasl # Not technically required, but makes 'out-of-box' config @@ -1395,6 +1399,10 @@ driver %define _without_systemd_daemon --without-systemd-daemon %endif +%if ! %{with_pm_utils} + %define _without_pm_utils --without-pm-utils +%endif + %define when %(date +"%%F-%%T") %define where %(hostname) %define who %{?packager}%{!?packager:Unknown} @@ -1471,6 +1479,7 @@ rm -f po/stamp-po %{?_with_firewalld} \ %{?_without_wireshark} \ %{?_without_systemd_daemon} \ + %{?_without_pm_utils} \ %{with_packager} \ %{with_packager_version} \ --with-qemu-user=%{qemu_user} \ diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 38fbf63..ce51bdf 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1879,6 +1879,9 @@ virSysinfoSetup; # util/virsystemd.h +virSystemdCanHibernate; +virSystemdCanHybridSleep; +virSystemdCanSuspend; virSystemdCreateMachine; virSystemdMakeMachineName; virSystemdMakeScopeName; diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index 8088931..b1eddff 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -22,6 +22,7 @@ #include <config.h> #include "virnodesuspend.h" +# include "virsystemd.h" #include "vircommand.h" #include "virthread.h" #include "datatypes.h" @@ -245,23 +246,9 @@ int nodeSuspendForDuration(unsigned int target, return ret; } - -/** - * virNodeSuspendSupportsTarget: - * @target: The power management target to check whether it is supported - * by the host. Values could be: - * VIR_NODE_SUSPEND_TARGET_MEM - * VIR_NODE_SUSPEND_TARGET_DISK - * VIR_NODE_SUSPEND_TARGET_HYBRID - * @supported: set to true if supported, false otherwise - * - * Run the script 'pm-is-supported' (from the pm-utils package) - * to find out if @target is supported by the host. - * - * Returns 0 if the query was successful, -1 on failure. - */ +#ifdef WITH_PM_UTILS static int -virNodeSuspendSupportsTarget(unsigned int target, bool *supported) +virNodeSuspendSupportsTargetPMUtils(unsigned int target, bool *supported) { virCommandPtr cmd; int status; @@ -300,6 +287,62 @@ virNodeSuspendSupportsTarget(unsigned int target, bool *supported) virCommandFree(cmd); return ret; } +#endif + +static int +virNodeSuspendSupportsTargetSystemd(unsigned int target, bool *supported) +{ + int ret = -1; + + if (virNodeSuspendInitialize() < 0) + return -1; + + *supported = false; + + switch (target) { + case VIR_NODE_SUSPEND_TARGET_MEM: + ret = virSystemdCanSuspend(supported); + break; + case VIR_NODE_SUSPEND_TARGET_DISK: + ret = virSystemdCanHibernate(supported); + break; + case VIR_NODE_SUSPEND_TARGET_HYBRID: + ret = virSystemdCanHybridSleep(supported); + break; + default: + return ret; + } + + return ret; +} + +/** + * virNodeSuspendSupportsTarget: + * @target: The power management target to check whether it is supported + * by the host. Values could be: + * VIR_NODE_SUSPEND_TARGET_MEM + * VIR_NODE_SUSPEND_TARGET_DISK + * VIR_NODE_SUSPEND_TARGET_HYBRID + * @supported: set to true if supported, false otherwise + * + * Run the script 'pm-is-supported' (from the pm-utils package) + * to find out if @target is supported by the host. + * + * Returns 0 if the query was successful, -1 on failure. + */ +static int +virNodeSuspendSupportsTarget(unsigned int target, bool *supported) +{ + int ret; + + ret = virNodeSuspendSupportsTargetSystemd(target, supported); +#ifdef WITH_PM_UTILS + if (ret < 0) + ret = virNodeSuspendSupportsTargetPMUtils(target, supported); +#endif + + return ret; +} /** * virNodeSuspendGetTargetMask: diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 93b3f9c..e9ca564 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -325,3 +325,62 @@ virSystemdNotifyStartup(void) sd_notify(0, "READY=1"); #endif } + +static int +virSystemdPMSupportTarget(const char *methodName, bool *result) +{ + int ret; + DBusConnection *conn; + DBusMessage *message = NULL; + char *response; + + ret = virDBusIsServiceEnabled("org.freedesktop.login1"); + if (ret < 0) + return ret; + + if ((ret = virDBusIsServiceRegistered("org.freedesktop.login1")) < 0) + return ret; + + if (!(conn = virDBusGetSystemBus())) + return -1; + + ret = -1; + + if (virDBusCallMethod(conn, + &message, + NULL, + "org.freedesktop.login1", + "/org/freedesktop/login1", + "org.freedesktop.login1.Manager", + methodName, + NULL) < 0) + return ret; + + if ((ret = virDBusMessageRead(message, "s", &response)) < 0) + goto cleanup; + + *result = STREQ("yes", response) || STREQ("challenge", response); + + ret = 0; + + cleanup: + dbus_message_unref(message); + VIR_FREE(response); + + return ret; +} + +int virSystemdCanSuspend(bool *result) +{ + return virSystemdPMSupportTarget("CanSuspend", result); +} + +int virSystemdCanHibernate(bool *result) +{ + return virSystemdPMSupportTarget("CanHibernate", result); +} + +int virSystemdCanHybridSleep(bool *result) +{ + return virSystemdPMSupportTarget("CanHybridSleep", result); +} diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h index 7fed456..491c9b7 100644 --- a/src/util/virsystemd.h +++ b/src/util/virsystemd.h @@ -48,4 +48,10 @@ int virSystemdTerminateMachine(const char *name, void virSystemdNotifyStartup(void); +int virSystemdCanSuspend(bool *result); + +int virSystemdCanHibernate(bool *result); + +int virSystemdCanHybridSleep(bool *result); + #endif /* __VIR_SYSTEMD_H__ */ diff --git a/tests/virsystemdmock.c b/tests/virsystemdmock.c index 23167db..cc385ec 100644 --- a/tests/virsystemdmock.c +++ b/tests/virsystemdmock.c @@ -76,10 +76,21 @@ DBusMessage *dbus_connection_send_with_reply_and_block(DBusConnection *connectio } else { reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); } + } else if (STREQ(service, "org.freedesktop.login1")) { + char *supported = getenv("RESULT_SUPPORT"); + DBusMessageIter iter; + reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); + dbus_message_iter_init_append(reply, &iter); + + if (!dbus_message_iter_append_basic(&iter, + DBUS_TYPE_STRING, + &supported)) + goto error; } else if (STREQ(service, "org.freedesktop.DBus") && STREQ(member, "ListActivatableNames")) { const char *svc1 = "org.foo.bar.wizz"; const char *svc2 = "org.freedesktop.machine1"; + const char *svc3 = "org.freedesktop.login1"; DBusMessageIter iter, sub; reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); dbus_message_iter_init_append(reply, &iter); @@ -95,11 +106,17 @@ DBusMessage *dbus_connection_send_with_reply_and_block(DBusConnection *connectio DBUS_TYPE_STRING, &svc2)) goto error; + if (!getenv("FAIL_NO_SERVICE") && + !dbus_message_iter_append_basic(&sub, + DBUS_TYPE_STRING, + &svc3)) + goto error; dbus_message_iter_close_container(&iter, &sub); } else if (STREQ(service, "org.freedesktop.DBus") && STREQ(member, "ListNames")) { const char *svc1 = "org.foo.bar.wizz"; const char *svc2 = "org.freedesktop.systemd1"; + const char *svc3 = "org.freedesktop.login1"; DBusMessageIter iter, sub; reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); dbus_message_iter_init_append(reply, &iter); @@ -115,6 +132,11 @@ DBusMessage *dbus_connection_send_with_reply_and_block(DBusConnection *connectio DBUS_TYPE_STRING, &svc2)) goto error; + if ((!getenv("FAIL_NO_SERVICE") && !getenv("FAIL_NOT_REGISTERED")) && + !dbus_message_iter_append_basic(&sub, + DBUS_TYPE_STRING, + &svc3)) + goto error; dbus_message_iter_close_container(&iter, &sub); } else { reply = dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN); diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 4fc5137..a9583e7 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -205,7 +205,6 @@ static int testCreateBadSystemd(const void *opaque ATTRIBUTE_UNUSED) return 0; } - struct testScopeData { const char *name; const char *partition; @@ -237,6 +236,86 @@ testScopeName(const void *opaque) return ret; } +typedef int (*virSystemdCanHelper)(bool * result); +struct testPMSupportData { + virSystemdCanHelper tested; +}; + +static int testPMSupportHelper(const void *opaque) +{ + int rv; + bool result; + size_t i; + const char *results[4] = {"yes", "no", "na", "challenge"}; + int expected[4] = {1, 0, 0, 1}; + const struct testPMSupportData *data = opaque; + + for (i = 0; i < 4; i++) { + setenv("RESULT_SUPPORT", results[i], 1); + if ((rv = data->tested(&result)) < 0) { + fprintf(stderr, "%s", "Unexpected canSuspend error\n"); + return -1; + } + + if (result != expected[i]) { + fprintf(stderr, "Unexpected result for answer '%s'\n", results[i]); + goto error; + } + unsetenv("RESULT_SUPPORT"); + } + + return 0; +error: + unsetenv("RESULT_SUPPORT"); + return -1; +} + +static int testPMSupportHelperNoSystemd(const void *opaque) +{ + int rv; + bool result; + const struct testPMSupportData *data = opaque; + + setenv("FAIL_NO_SERVICE", "1", 1); + + if ((rv = data->tested(&result)) == 0) { + unsetenv("FAIL_NO_SERVICE"); + fprintf(stderr, "%s", "Unexpected canSuspend success\n"); + return -1; + } + unsetenv("FAIL_NO_SERVICE"); + + if (rv != -2) { + fprintf(stderr, "%s", "Unexpected canSuspend error\n"); + return -1; + } + + return 0; +} + +static int testPMSupportSystemdNotRunning(const void *opaque) +{ + int rv; + bool result; + const struct testPMSupportData *data = opaque; + + setenv("FAIL_NOT_REGISTERED", "1", 1); + + if ((rv = data->tested(&result)) == 0) { + unsetenv("FAIL_NOT_REGISTERED"); + fprintf(stderr, "%s", "Unexpected canSuspend success\n"); + return -1; + } + unsetenv("FAIL_NOT_REGISTERED"); + + if (rv != -2) { + fprintf(stderr, "%s", "Unexpected canSuspend error\n"); + return -1; + } + + return 0; +} + static int mymain(void) { @@ -275,6 +354,25 @@ mymain(void) TEST_SCOPE("demo", "/machine/eng-dept/testing!stuff", "machine-eng\\x2ddept-testing\\x21stuff-lxc\\x2ddemo.scope"); +# define TESTS_PM_SUPPORT_HELPER(name, function) \ + do { \ + struct testPMSupportData data = { \ + function \ + }; \ + if (virtTestRun("Test " name " ", testPMSupportHelper, &data) < 0) \ + ret = -1; \ + if (virtTestRun("Test " name " no systemd ", \ + testPMSupportHelperNoSystemd, &data) < 0) \ + ret = -1; \ + if (virtTestRun("Test systemd " name " not running ", \ + testPMSupportSystemdNotRunning, &data) < 0) \ + ret = -1; \ + } while (0) + + TESTS_PM_SUPPORT_HELPER("canSuspend", &virSystemdCanSuspend); + TESTS_PM_SUPPORT_HELPER("canHibernate", &virSystemdCanHibernate); + TESTS_PM_SUPPORT_HELPER("canHybridSleep", &virSystemdCanHybridSleep); + return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.8.4.5

3 2

[libvirt] [PATCH v2 1/1] Enable QEMU_CAPS_PCI_MULTIBUS capability for QEMU2.0 forward on PPC64.
by Li Zhang 11 Apr '14

11 Apr '14

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> For QEMU2.0 forward version on PPC64, it supports PCI multibus. Currently, libvirt still disables it which causes an error "Bus 'pci' not found". Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/qemu/qemu_capabilities.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 381b3ec..812bbe0 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2813,13 +2813,16 @@ virQEMUCapsInitHelp(virQEMUCapsPtr qemuCaps, uid_t runUid, gid_t runGid) false) < 0) goto cleanup; - /* Currently only x86_64 and i686 support PCI-multibus. */ - if (qemuCaps->arch == VIR_ARCH_X86_64 || - qemuCaps->arch == VIR_ARCH_I686) { + /* Currently only x86_64, i686 and PPC64 support PCI-multibus. */ + if ((qemuCaps->arch == VIR_ARCH_PPC64 && + qemuCaps->version >= 2000000) || + ARCH_IS_X86(qemuCaps->arch)) { virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS); - } else { - /* -no-acpi is not supported on other archs - * even if qemu reports it in -help */ + } + + /* -no-acpi is not supported on non-X86 archs + * even if qemu reports it in -help */ + if (!ARCH_IS_X86(qemuCaps->arch)) { virQEMUCapsClear(qemuCaps, QEMU_CAPS_NO_ACPI); } @@ -2940,11 +2943,14 @@ virQEMUCapsInitArchQMPBasic(virQEMUCapsPtr qemuCaps, } /* - * Currently only x86_64 and i686 support PCI-multibus, - * -no-acpi and -no-kvm-pit-reinjection. + * Currently only x86_64, i686 and PPC64 support PCI-multibus, + * Moreover, the first two arches support -no-acpi and + * -no-kvm-pit-reinjection. */ - if (qemuCaps->arch == VIR_ARCH_X86_64 || - qemuCaps->arch == VIR_ARCH_I686) { + if (qemuCaps->arch == VIR_ARCH_PPC64 && + qemuCaps->version >= 2000000) { + virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS); + } else if (ARCH_IS_X86(qemuCaps->arch)) { virQEMUCapsSet(qemuCaps, QEMU_CAPS_PCI_MULTIBUS); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_KVM_PIT); -- 1.8.2.1

3 4