- 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