- Devel - libvirt List Archives

[libvirt] [PATCH] m4/virt-loader-nvram: use quotation for list of loader:nvram pairs
by Pavel Hrdina 22 Dec '16

22 Dec '16

The bug was introduced by commit 08c2d1480b. The string must be quoted because it is used as function argument. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under build breaker rule. m4/virt-loader-nvram.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/virt-loader-nvram.m4 b/m4/virt-loader-nvram.m4 index e57ba829f4..e3e8b82825 100644 --- a/m4/virt-loader-nvram.m4 +++ b/m4/virt-loader-nvram.m4 @@ -31,7 +31,7 @@ AC_DEFUN([LIBVIRT_CHECK_LOADER_NVRAM], [ if test $(expr $l % 2) -ne 0 ; then AC_MSG_ERROR([Malformed --with-loader-nvram argument]) fi - AC_DEFINE_UNQUOTED([DEFAULT_LOADER_NVRAM], [$with_loader_nvram], + AC_DEFINE_UNQUOTED([DEFAULT_LOADER_NVRAM], ["$with_loader_nvram"], [List of loader:nvram pairs]) fi ]) -- 2.11.0

1 0

[libvirt] [PATCH] Allow virtio-console on PPC64
by Shivaprasad G Bhat 22 Dec '16

22 Dec '16

virQEMUCapsSupportsChardev existing checks returns true for spapr-vty alone. Instead verify spapr-vty validity and let the logic to return true for other device types so that virtio-console passes. The non-pseries machines dont have spapr-vio-bus. So, the function always returned false for them before. Fixes - https://bugzilla.redhat.com/show_bug.cgi?id=1257813 Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_capabilities.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6eee85d..784496b 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4286,9 +4286,12 @@ virQEMUCapsSupportsChardev(const virDomainDef *def, return false; if ((def->os.arch == VIR_ARCH_PPC) || ARCH_IS_PPC64(def->os.arch)) { + if (!qemuDomainMachineIsPSeries(def)) + return false; /* only pseries need -device spapr-vty with -chardev */ - return (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && - chr->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO); + if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && + chr->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_SPAPRVIO) + return false; } if ((def->os.arch != VIR_ARCH_ARMV7L) && (def->os.arch != VIR_ARCH_AARCH64))

2 1

[libvirt] [PATCH] NEWS: Fix indentation
by Andrea Bolognani 22 Dec '16

22 Dec '16

--- Pushed as trivial. docs/news.html.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/news.html.in b/docs/news.html.in index 5a34674..22611db 100644 --- a/docs/news.html.in +++ b/docs/news.html.in @@ -46,11 +46,11 @@ </li> <li><strong>Bug fixes</strong> <ul> - <li>qemu: Correct GetBlockInfo values<br/> - For an active domain, correct the physical value provided for - a raw sparse file backed storage and the allocation value provided - for a qcow2 file backed storage that hasn't yet been opened on - the domain + <li>qemu: Correct GetBlockInfo values<br/> + For an active domain, correct the physical value provided for + a raw sparse file backed storage and the allocation value provided + for a qcow2 file backed storage that hasn't yet been opened on + the domain </li> </ul> </li> -- 2.7.4

1 0

[libvirt] [PATCH 0/5] vz: fix some CT disk representation cases and its statistics
by Maxim Nestratov 22 Dec '16

22 Dec '16

Maxim Nestratov (5): vz: report "scsi" bus for disks when nothing was set explixitly vz: don't query boot devices information for VZ, set boot from disk always vz: don't add implicit devices for CTs vz: report disks either as disks or filesystems depending on original xml vz: get disks statistics for CTs src/vz/vz_driver.c | 10 ++++- src/vz/vz_sdk.c | 127 +++++++++++++++++++++++++++++++++++++++++++---------- src/vz/vz_sdk.h | 2 +- 3 files changed, 112 insertions(+), 27 deletions(-) -- 2.4.11

2 14

[libvirt] [PATCH 0/2] qemu: migration: show disks stats for nbd migration
by Nikolay Shirokovskiy 22 Dec '16

22 Dec '16

Current migration stats will show something like [1] when in the process of mirroring of non shared disks. This gives very little info on the migration progress. Likewise completed stats miss disks mirroring info. This patch provides disks stats in the said phase like in [2] so user can now understand what's going on. However data stats miss memory stats, so data total and remaining will change when memory migration starts. AFAIU disks stats were available before the nbd based migration becomes the default. So this patch returns disks stats back at some level. Patch 1 is just a little cleanup. Removed code uses qemuMigrationFetchJobStatus so the patch 1 helps analysis of the patch 2. [1] Job type: Unbounded Time elapsed: 4964 ms [2] Job type: Unbounded Time elapsed: 4964 ms Data processed: 146.000 MiB Data remaining: 854.000 MiB Data total: 1000.000 MiB File processed: 146.000 MiB File remaining: 854.000 MiB File total: 1000.000 MiB Nikolay Shirokovskiy (2): qemu: clean out unused migrate to unix qemu: migration: show disks stats for nbd migration docs/news.html.in | 4 ++ src/qemu/qemu_driver.c | 5 +- src/qemu/qemu_migration.c | 128 +++++++++++++++++++++++++++++----------------- src/qemu/qemu_migration.h | 3 +- src/qemu/qemu_monitor.c | 24 --------- src/qemu/qemu_monitor.h | 4 -- 6 files changed, 90 insertions(+), 78 deletions(-) -- 1.8.3.1

2 4

[libvirt] connecting to qemu domain monitor socket outside of libvirt/virsh
by Jason Miesionczek 22 Dec '16

22 Dec '16

Hi, So I see that when i have a qemu vm running, that i created via libvirt, there is a socket here: /var/lib/libvirt/qemu/domain-<name>/monitor.sock I am trying to connect to this socket via cli or a completely separate C/C++ application to be able to control the VM, but I can't seem to get it to work. Does anyone know if/how this is possible? I've tried 'nc', 'socat', and based on the qemu libvirt code, 'socket'/'connect', but nothing seems to work. Also, is it possible through libvirt, when creating a qemu VM, one can specify to enable the QMP socket? Thanks in advance, Jason

3 3

[libvirt] [PATCH v2 0/1] storage: vstorage support
by Olga Krishtal 22 Dec '16

22 Dec '16

The patch supports pool and volume managment using Vistuozzo Storage (vstorage) as a backend. To define pool use: virsh -c qemu+unix:///system pool-define-as --name VZ --type vstorage --source-name vz7-vzstorage --target /vzstorage_pool The resulting XML: <pool type='vstorage'> <name>VZ</name> <uuid>5f45665b-66fa-4b18-84d1-248774cff3a1</uuid> <capacity unit='bytes'>107374182400</capacity> <allocation unit='bytes'>1441144832</allocation> <available unit='bytes'>105933037568</available> <source> <name>vz7-vzstorage</name> </source> <target> <path>/vzstorage_pool</path> <permissions> <mode>0700</mode> <owner>0</owner> <group>0</group> </permissions> </target> </pool> For the vstorage pool the only obligatory parameter, which stores cluster name, is --source-name. v2: - maximum code reusage - fixed name issue - we use vstorage - simplified findPoolSources Olga Krishtal (1): storage: vz storage pool support configure.ac | 28 ++++++++++ docs/schemas/storagepool.rng | 13 +++++ include/libvirt/libvirt-storage.h | 1 + src/conf/storage_conf.c | 16 +++++- src/conf/storage_conf.h | 4 +- src/storage/storage_backend.c | 3 + src/storage/storage_backend_fs.c | 114 ++++++++++++++++++++++++++++++++++++-- src/storage/storage_backend_fs.h | 3 + src/storage/storage_driver.c | 2 + tools/virsh-pool.c | 2 + tools/virsh.c | 3 + 11 files changed, 181 insertions(+), 8 deletions(-) -- 1.8.3.1

4 20

[libvirt] [PATCH 00/89] configure cleanup and improvements
by Pavel Hrdina 22 Dec '16

22 Dec '16

Few bug fixes found along the way. Introduces new macro helpers to unify the configure.ac and m4 files. Moves libraries and drivers checks to its own files to clean the configure.ac. Pavel Hrdina (89): m4/virt-netcf: fix bug where we overwrite LIBS configure: fix wireshark dissector configure output configure: move external programs check to its own file m4/virt: create result macros for the remaining virt check m4/virt: use LIBVIRT_RESULT macro instead of AC_MSG_NOTICE m4/virt-lib: introduce LIBVIRT_ARG_WITH(_ALT) macro m4/virt-lib: introduce LIBVIRT_ARG_ENABLE macro configure: use LIBVIRT_ARG_WITH(_ALT) macros configure: use LIBVIRT_ARG_ENABLE macro m4/virt-lib: move LIBVIRT_ARG_WITH out of LIBVIRT_CHECK_(LIB|LIB_ALT|PKG) m4/virt: introduce LIBVIRT_ARG_* macros for all library checks m4/virt-lib: add new parameter to override default fail action configure: move libxml check to its own file m4/virt-libxml: use only pkg-config to check for libxml2 m4/virt-libxml: use LIBVIRT_CHECK_PKG configure: move dlopen check to its own file configure: move with-driver-modules check to its own file configure: move firewalld check to its own file configure: move polkit check to its own file configure: move pthread check it its own file configure: move atomic check to its onw file configure: move XDR check to its own file configure: move libpcap check to its own file m4/virt-libpcap: remove unreasonable dependency on QEMU m4/virt-libpcap: error out if asked for libpcap but it was not found configure: move macvtap check to its own file configure: move virtualport check to its own file configure: move libnl check to its own file configure: move windows common check to its own file configure: move Cygwin check to its own file configure: move MinGW check to its own file configure: move windows symbols check to its own file configure: move windres check to its own file configure: move version script check to one place configure: move nwfilter check to its own file configure: move pm-utils check to its own file configure: move devmapper check to its own file m4/virt-devmapper: use LIBVIRT_CHECK_(PKG|LIB) configure: move libparted check to its own file m4/virt-parted: use LIBVIRT_CHECK_PKG configure: group all library checks together configure: move DTrace check to its own file configure: move numad check to its own file configure: move sysctl config check to its own file configure: move chrdev lock files check to its own file configure: move loader/nvram check to its own file configure: move default editor check to its own file configure: move TLS priority check to its own file configure: move xml catalog file check to its own file configure: move debug check to its own file configure: group all Miscellaneous check together configure: move OpenVZ driver check to its own file configure: move VMware driver check to its own file configure: move QEMU driver check to its own file configure: move qemu privileges check to qemu driver file configure: move qemu bridge helper check to qemu driver file configure: move LXC driver check to its own file configure: move XEN driver check to its own file configure: move libxl driver check to its own file m4/virt-libxl: use LIBVIRT_CHECK_(PKG|LIB) macros m4/virt-libxl: properly check for required libxl version m4/virt-libxl: cleanup storing CFLAGS and LIBS variables configure: move XenAPI driver check to its own file m4/virt-driver-xenapi: use LIBVIRT_CHECK_LIB macro configure: move PHYP driver check to its own file configure: move test driver check to its own file configure: move remote driver check to its own file configure: move vbox driver check to its own file configure: move ESX driver check to its own file configure: move Hyper-V driver check to its own file configure: move libvirtd driver check to its own file configure: move network driver check to its own file configure: move interface driver check to its own file configure: move parallels version definition to m4/virt-driver-vz configure: group all virtualization drivers together configure: move SELinux secdriver check into its own file configure: move AppArmor secdriver check to its own file configure: move storage dir check to its own file configure: move storage fs check to its own file configure: move storage LVM check to its own file configure: move storage iSCSI check to its own file configure: move storage SCSI check to its own file configure: move storage mpath check to its own file configure: move storage disk check to its own file configure: move storage RBD check to its own file configure: move storage Sheepdog check to its own file configure: move storage Gluster check to its own file configure: move storage ZFS check to its own file configure: group all storage driver check together config-post.h | 4 +- configure.ac | 2340 ++++++----------------------------------- m4/virt-apparmor.m4 | 11 +- m4/virt-atomic.m4 | 77 ++ m4/virt-attr.m4 | 4 + m4/virt-audit.m4 | 4 + m4/virt-avahi.m4 | 4 + m4/virt-blkid.m4 | 4 + m4/virt-capng.m4 | 4 + m4/virt-chrdev-lock-files.m4 | 52 + m4/virt-compile-warnings.m4 | 20 +- m4/virt-curl.m4 | 4 + m4/virt-dbus.m4 | 4 + m4/virt-debug.m4 | 33 + m4/virt-default-editor.m4 | 32 + m4/virt-devmapper.m4 | 31 + m4/virt-dlopen.m4 | 45 + m4/virt-driver-bhyve.m4 | 11 +- m4/virt-driver-esx.m4 | 57 + m4/virt-driver-hyperv.m4 | 47 + m4/virt-driver-interface.m4 | 49 + m4/virt-driver-libvirtd.m4 | 33 + m4/virt-driver-libxl.m4 | 97 ++ m4/virt-driver-lxc.m4 | 74 ++ m4/virt-driver-modules.m4 | 58 + m4/virt-driver-network.m4 | 51 + m4/virt-driver-openvz.m4 | 42 + m4/virt-driver-phyp.m4 | 48 + m4/virt-driver-qemu.m4 | 68 ++ m4/virt-driver-remote.m4 | 33 + m4/virt-driver-test.m4 | 33 + m4/virt-driver-uml.m4 | 11 +- m4/virt-driver-vbox.m4 | 44 + m4/virt-driver-vmware.m4 | 33 + m4/virt-driver-vz.m4 | 11 +- m4/virt-driver-xen.m4 | 126 +++ m4/virt-driver-xenapi.m4 | 48 + m4/virt-dtrace.m4 | 45 + m4/virt-external-programs.m4 | 95 ++ m4/virt-firewalld.m4 | 43 + m4/virt-fuse.m4 | 4 + m4/virt-gluster.m4 | 4 + m4/virt-gnutls.m4 | 4 + m4/virt-hal.m4 | 4 + m4/virt-host-validate.m4 | 13 +- m4/virt-init-script.m4 | 12 +- m4/virt-lib.m4 | 179 +++- m4/virt-libnl.m4 | 81 ++ m4/virt-libpcap.m4 | 62 ++ m4/virt-libssh.m4 | 4 + m4/virt-libxml.m4 | 50 + m4/virt-loader-nvram.m4 | 41 + m4/virt-login-shell.m4 | 14 +- m4/virt-macvtap.m4 | 56 + m4/virt-netcf.m4 | 6 +- m4/virt-nss.m4 | 11 +- m4/virt-numactl.m4 | 4 + m4/virt-numad.m4 | 58 + m4/virt-nwfilter.m4 | 32 + m4/virt-openwsman.m4 | 4 + m4/virt-parted.m4 | 38 + m4/virt-pciaccess.m4 | 4 + m4/virt-pm-utils.m4 | 45 + m4/virt-polkit.m4 | 107 ++ m4/virt-pthread.m4 | 56 + m4/virt-readline.m4 | 4 + m4/virt-sanlock.m4 | 4 + m4/virt-sasl.m4 | 4 + m4/virt-secdriver-apparmor.m4 | 50 + m4/virt-secdriver-selinux.m4 | 63 ++ m4/virt-selinux.m4 | 11 +- m4/virt-ssh2.m4 | 4 + m4/virt-storage-dir.m4 | 33 + m4/virt-storage-disk.m4 | 58 + m4/virt-storage-fs.m4 | 89 ++ m4/virt-storage-gluster.m4 | 43 + m4/virt-storage-iscsi.m4 | 50 + m4/virt-storage-lvm.m4 | 90 ++ m4/virt-storage-mpath.m4 | 53 + m4/virt-storage-rbd.m4 | 49 + m4/virt-storage-scsi.m4 | 36 + m4/virt-storage-sheepdog.m4 | 56 + m4/virt-storage-zfs.m4 | 56 + m4/virt-sysctl.m4 | 43 + m4/virt-tls-priority.m4 | 33 + m4/virt-udev.m4 | 4 + m4/virt-virtualport.m4 | 65 ++ m4/virt-win-common.m4 | 44 + m4/virt-win-cygwin.m4 | 32 + m4/virt-win-mingw.m4 | 28 + m4/virt-win-symbols.m4 | 40 + m4/virt-win-windres.m4 | 34 + m4/virt-wireshark.m4 | 12 +- m4/virt-xdr.m4 | 60 ++ m4/virt-xml-catalog.m4 | 33 + m4/virt-yajl.m4 | 4 + src/Makefile.am | 10 +- src/util/virutil.c | 4 +- 98 files changed, 3776 insertions(+), 2146 deletions(-) create mode 100644 m4/virt-atomic.m4 create mode 100644 m4/virt-chrdev-lock-files.m4 create mode 100644 m4/virt-debug.m4 create mode 100644 m4/virt-default-editor.m4 create mode 100644 m4/virt-devmapper.m4 create mode 100644 m4/virt-dlopen.m4 create mode 100644 m4/virt-driver-esx.m4 create mode 100644 m4/virt-driver-hyperv.m4 create mode 100644 m4/virt-driver-interface.m4 create mode 100644 m4/virt-driver-libvirtd.m4 create mode 100644 m4/virt-driver-libxl.m4 create mode 100644 m4/virt-driver-lxc.m4 create mode 100644 m4/virt-driver-modules.m4 create mode 100644 m4/virt-driver-network.m4 create mode 100644 m4/virt-driver-openvz.m4 create mode 100644 m4/virt-driver-phyp.m4 create mode 100644 m4/virt-driver-qemu.m4 create mode 100644 m4/virt-driver-remote.m4 create mode 100644 m4/virt-driver-test.m4 create mode 100644 m4/virt-driver-vbox.m4 create mode 100644 m4/virt-driver-vmware.m4 create mode 100644 m4/virt-driver-xen.m4 create mode 100644 m4/virt-driver-xenapi.m4 create mode 100644 m4/virt-dtrace.m4 create mode 100644 m4/virt-external-programs.m4 create mode 100644 m4/virt-firewalld.m4 create mode 100644 m4/virt-libnl.m4 create mode 100644 m4/virt-libpcap.m4 create mode 100644 m4/virt-libxml.m4 create mode 100644 m4/virt-loader-nvram.m4 create mode 100644 m4/virt-macvtap.m4 create mode 100644 m4/virt-numad.m4 create mode 100644 m4/virt-nwfilter.m4 create mode 100644 m4/virt-parted.m4 create mode 100644 m4/virt-pm-utils.m4 create mode 100644 m4/virt-polkit.m4 create mode 100644 m4/virt-pthread.m4 create mode 100644 m4/virt-secdriver-apparmor.m4 create mode 100644 m4/virt-secdriver-selinux.m4 create mode 100644 m4/virt-storage-dir.m4 create mode 100644 m4/virt-storage-disk.m4 create mode 100644 m4/virt-storage-fs.m4 create mode 100644 m4/virt-storage-gluster.m4 create mode 100644 m4/virt-storage-iscsi.m4 create mode 100644 m4/virt-storage-lvm.m4 create mode 100644 m4/virt-storage-mpath.m4 create mode 100644 m4/virt-storage-rbd.m4 create mode 100644 m4/virt-storage-scsi.m4 create mode 100644 m4/virt-storage-sheepdog.m4 create mode 100644 m4/virt-storage-zfs.m4 create mode 100644 m4/virt-sysctl.m4 create mode 100644 m4/virt-tls-priority.m4 create mode 100644 m4/virt-virtualport.m4 create mode 100644 m4/virt-win-common.m4 create mode 100644 m4/virt-win-cygwin.m4 create mode 100644 m4/virt-win-mingw.m4 create mode 100644 m4/virt-win-symbols.m4 create mode 100644 m4/virt-win-windres.m4 create mode 100644 m4/virt-xdr.m4 create mode 100644 m4/virt-xml-catalog.m4 -- 2.11.0

2 191

[libvirt] [PATCH go] Add support for virStorageVolGetInfoFlags & associated constants
by Daniel P. Berrange 22 Dec '16

22 Dec '16

Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- storage_volume.go | 24 ++++++++++++++++++++++++ storage_volume_compat.go | 47 +++++++++++++++++++++++++++++++++++++++++++++++ storage_volume_compat.h | 15 +++++++++++++++ 3 files changed, 86 insertions(+) create mode 100644 storage_volume_compat.go Pushed as a build fix diff --git a/storage_volume.go b/storage_volume.go index 80b74fa..317a1dd 100644 --- a/storage_volume.go +++ b/storage_volume.go @@ -94,6 +94,13 @@ const ( STORAGE_XML_INACTIVE = StorageXMLFlags(C.VIR_STORAGE_XML_INACTIVE) ) +type StorageVolInfoFlags int + +const ( + STORAGE_VOL_USE_ALLOCATION = StorageVolInfoFlags(C.VIR_STORAGE_VOL_USE_ALLOCATION) + STORAGE_VOL_GET_PHYSICAL = StorageVolInfoFlags(C.VIR_STORAGE_VOL_GET_PHYSICAL) +) + type StorageVol struct { ptr C.virStorageVolPtr } @@ -133,6 +140,23 @@ func (v *StorageVol) GetInfo() (*StorageVolInfo, error) { }, nil } +func (v *StorageVol) GetInfoFlags(flags StorageVolInfoFlags) (*StorageVolInfo, error) { + if C.LIBVIR_VERSION_NUMBER < 3000000 { + return nil, GetNotImplementedError() + } + + var cinfo C.virStorageVolInfo + result := C.virStorageVolGetInfoFlagsCompat(v.ptr, &cinfo, C.uint(flags)) + if result == -1 { + return nil, GetLastError() + } + return &StorageVolInfo{ + Type: StorageVolType(cinfo._type), + Capacity: uint64(cinfo.capacity), + Allocation: uint64(cinfo.allocation), + }, nil +} + func (v *StorageVol) GetKey() (string, error) { key := C.virStorageVolGetKey(v.ptr) if key == nil { diff --git a/storage_volume_compat.go b/storage_volume_compat.go new file mode 100644 index 0000000..46f0e0b --- /dev/null +++ b/storage_volume_compat.go @@ -0,0 +1,47 @@ +/* + * This file is part of the libvirt-go project + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * Copyright (c) 2013 Alex Zorin + * Copyright (C) 2016 Red Hat, Inc. + * + */ + +package libvirt + +/* +#cgo pkg-config: libvirt +#include <libvirt/libvirt.h> +#include <assert.h> +#include "storage_volume_compat.h" + +int virStorageVolGetInfoFlagsCompat(virStorageVolPtr vol, + virStorageVolInfoPtr info, + unsigned int flags) +{ +#if LIBVIR_VERSION_NUMBER < 3000000 + assert(0); // Caller should have checked version +#else + return virStorageVolGetInfoFlags(vol, info, flags); +#endif +} + +*/ +import "C" diff --git a/storage_volume_compat.h b/storage_volume_compat.h index 2c07445..53e83fe 100644 --- a/storage_volume_compat.h +++ b/storage_volume_compat.h @@ -27,6 +27,21 @@ #ifndef LIBVIRT_GO_STORAGE_VOLUME_COMPAT_H__ #define LIBVIRT_GO_STORAGE_VOLUME_COMPAT_H__ +/* 3.0.0 */ + +int virStorageVolGetInfoFlagsCompat(virStorageVolPtr vol, + virStorageVolInfoPtr info, + unsigned int flags); + +#ifndef VIR_STORAGE_VOL_USE_ALLOCATION +#define VIR_STORAGE_VOL_USE_ALLOCATION 0 +#endif + +#ifndef VIR_STORAGE_VOL_GET_PHYSICAL +#define VIR_STORAGE_VOL_GET_PHYSICAL 1 << 0 +#endif + + /* 1.2.13 */ #ifndef VIR_STORAGE_VOL_CREATE_REFLINK -- 2.9.3

1 0

[libvirt] [PATCH] Add virStorageVolGetInfoFlags & associated constants
by Daniel P. Berrange 22 Dec '16

22 Dec '16

Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Changes | 1 + Virt.xs | 16 ++++++++++++---- lib/Sys/Virt/StorageVol.pm | 16 ++++++++++++++-- 3 files changed, 27 insertions(+), 6 deletions(-) Pushed as a build fix diff --git a/Changes b/Changes index 48ac221..672b566 100644 --- a/Changes +++ b/Changes @@ -9,6 +9,7 @@ Revision history for perl module Sys::Virt - Add PERF_PARAM_STALLED_CYCLES_FRONTEND constant - Add PERF_PARAM_STALLED_CYCLES_BACKEND constant - Add PERF_PARAM_REF_CPU_CYCLES constant + - Add virStorageVolGetInfoFlags & associated constants 2.5.0 2016-12-05 diff --git a/Virt.xs b/Virt.xs index d694eff..1eb94a8 100644 --- a/Virt.xs +++ b/Virt.xs @@ -1,6 +1,6 @@ /* -*- c -*- * - * Copyright (C) 2006-2014 Red Hat + * Copyright (C) 2006-2016 Red Hat * Copyright (C) 2006-2014 Daniel P. Berrange * * This program is free software; You can redistribute it and/or modify @@ -6630,13 +6630,19 @@ wipe_pattern(vol, algorithm, flags=0) HV * -get_info(vol) +get_info(vol, flags=0) virStorageVolPtr vol; + unsigned int flags; PREINIT: virStorageVolInfo info; CODE: - if (virStorageVolGetInfo(vol, &info) < 0) - _croak_error(); + if (flags != 0) { + if (virStorageVolGetInfoFlags(vol, &info, flags) < 0) + _croak_error(); + } else { + if (virStorageVolGetInfo(vol, &info) < 0) + _croak_error(); + } RETVAL = (HV *)sv_2mortal((SV*)newHV()); (void)hv_store (RETVAL, "type", 4, newSViv(info.type), 0); @@ -8701,6 +8707,8 @@ BOOT: REGISTER_CONSTANT(VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA, CREATE_PREALLOC_METADATA); REGISTER_CONSTANT(VIR_STORAGE_VOL_CREATE_REFLINK, CREATE_REFLINK); + REGISTER_CONSTANT(VIR_STORAGE_VOL_USE_ALLOCATION, USE_ALLOCATION); + REGISTER_CONSTANT(VIR_STORAGE_VOL_GET_PHYSICAL, GET_PHYSICAL); stash = gv_stashpv( "Sys::Virt::Secret", TRUE ); REGISTER_CONSTANT(VIR_SECRET_USAGE_TYPE_NONE, USAGE_TYPE_NONE); diff --git a/lib/Sys/Virt/StorageVol.pm b/lib/Sys/Virt/StorageVol.pm index d293bfa..42f10e8 100644 --- a/lib/Sys/Virt/StorageVol.pm +++ b/lib/Sys/Virt/StorageVol.pm @@ -118,7 +118,7 @@ to erase data, and should be one of the WIPE ALGORITHM CONSTANTS listed later. The C<flags> parameter is currently unused and defaults to zero. -=item my $info = $vol->get_info() +=item my $info = $vol->get_info($flags = 0) Retrieve live information about the storage volume. The returned C<$info> hash reference contains three keys. C<type> indicates whether @@ -127,7 +127,19 @@ logical size of the volume. C<allocation> provides the current physical usage of the volume. The allocation may be less than the capacity for sparse, or grow-on-demand volumes. The allocation may also be larger than the capacity, if there is a metadata overhead -for the volume format. +for the volume format. C<$flags> may take one of the values + +=over 4 + +=item Sys::Virt::StorageVol::USE_ALLOCATION + +Return the current allocation in allocation + +=item Sys::Virt::StorageVol::GET_PHYSICAL + +Return the physical size in allocation + +=back =item $vol->download($st, $offset, $length); -- 2.9.3

1 0