[libvirt] [PATCH 00/89] configure cleanup and improvements
by Pavel Hrdina
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
8 years, 3 months
[libvirt] [PATCH go] Add support for virStorageVolGetInfoFlags & associated constants
by Daniel P. Berrange
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
8 years, 3 months
[libvirt] [PATCH] Add virStorageVolGetInfoFlags & associated constants
by Daniel P. Berrange
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
8 years, 3 months
[libvirt] [PATCH] Add override impl for virStorageVolGetInfoFlags
by Daniel P. Berrange
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
generator.py | 1 +
libvirt-override-api.xml | 6 ++++++
libvirt-override.c | 43 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 50 insertions(+)
Pushed as a build fix patch
diff --git a/generator.py b/generator.py
index 2c3b667..afb1d34 100755
--- a/generator.py
+++ b/generator.py
@@ -455,6 +455,7 @@ skip_impl = (
'virStoragePoolLookupByUUID',
'virStoragePoolGetInfo',
'virStorageVolGetInfo',
+ 'virStorageVolGetInfoFlags',
'virStoragePoolGetAutostart',
'virStoragePoolListVolumes',
'virDomainBlockPeek',
diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml
index 50250bc..c96e83e 100644
--- a/libvirt-override-api.xml
+++ b/libvirt-override-api.xml
@@ -410,6 +410,12 @@
<return type='char *' info='the list of information or None in case of error'/>
<arg name='vol' type='virStorageVolPtr' info='a storage vol object'/>
</function>
+ <function name='virStorageVolGetInfoFlags' file='python'>
+ <info>Extract information about a storage volume. Note that if the connection used to get the domain is limited only a partial set of the information can be extracted.</info>
+ <return type='char *' info='the list of information or None in case of error'/>
+ <arg name='vol' type='virStorageVolPtr' info='a storage vol object'/>
+ <arg name='flags' type='unsigned int' info='bitwise-OR of virStorageVolInfoFlags'/>
+ </function>
<function name='virNodeListDevices' file='python'>
<info>list the node devices</info>
<arg name='conn' type='virConnectPtr' info='pointer to the hypervisor connection'/>
diff --git a/libvirt-override.c b/libvirt-override.c
index be299d4..db14244 100644
--- a/libvirt-override.c
+++ b/libvirt-override.c
@@ -3681,6 +3681,46 @@ libvirt_virStorageVolGetInfo(PyObject *self ATTRIBUTE_UNUSED,
return NULL;
}
+#if LIBVIR_CHECK_VERSION(3, 0, 0)
+static PyObject *
+libvirt_virStorageVolGetInfoFlags(PyObject *self ATTRIBUTE_UNUSED,
+ PyObject *args)
+{
+ PyObject *py_retval;
+ int c_retval;
+ virStorageVolPtr pool;
+ PyObject *pyobj_pool;
+ virStorageVolInfo info;
+ unsigned int flags;
+
+ if (!PyArg_ParseTuple(args, (char *)"OI:virStorageVolGetInfoFlags", &pyobj_pool, &flags))
+ return NULL;
+ pool = (virStorageVolPtr) PyvirStorageVol_Get(pyobj_pool);
+
+ LIBVIRT_BEGIN_ALLOW_THREADS;
+ c_retval = virStorageVolGetInfoFlags(pool, &info, flags);
+ LIBVIRT_END_ALLOW_THREADS;
+ if (c_retval < 0)
+ return VIR_PY_NONE;
+
+ if ((py_retval = PyList_New(3)) == NULL)
+ return NULL;
+
+ VIR_PY_LIST_SET_GOTO(py_retval, 0,
+ libvirt_intWrap((int) info.type), error);
+ VIR_PY_LIST_SET_GOTO(py_retval, 1,
+ libvirt_ulonglongWrap(info.capacity), error);
+ VIR_PY_LIST_SET_GOTO(py_retval, 2,
+ libvirt_ulonglongWrap(info.allocation), error);
+
+ return py_retval;
+
+ error:
+ Py_DECREF(py_retval);
+ return NULL;
+}
+#endif
+
static PyObject *
libvirt_virStoragePoolGetUUID(PyObject *self ATTRIBUTE_UNUSED,
PyObject *args)
@@ -9203,6 +9243,9 @@ static PyMethodDef libvirtMethods[] = {
#endif /* LIBVIR_CHECK_VERSION(0, 10, 2) */
{(char *) "virStoragePoolGetInfo", libvirt_virStoragePoolGetInfo, METH_VARARGS, NULL},
{(char *) "virStorageVolGetInfo", libvirt_virStorageVolGetInfo, METH_VARARGS, NULL},
+#if LIBVIR_CHECK_VERSION(3, 0, 0)
+ {(char *) "virStorageVolGetInfoFlags", libvirt_virStorageVolGetInfoFlags, METH_VARARGS, NULL},
+#endif /* LIBVIR_CHECK_VERSION(3, 0, 0) */
{(char *) "virStoragePoolGetUUID", libvirt_virStoragePoolGetUUID, METH_VARARGS, NULL},
{(char *) "virStoragePoolGetUUIDString", libvirt_virStoragePoolGetUUIDString, METH_VARARGS, NULL},
{(char *) "virStoragePoolLookupByUUID", libvirt_virStoragePoolLookupByUUID, METH_VARARGS, NULL},
--
2.9.3
8 years, 3 months
[libvirt] [RFC] add option to bring new qemu binary/pending conf changes on reboot
by Nikolay Shirokovskiy
Hi, all.
I'm trying to reword the long pending RFC [1]. We interested in next usecase.
Administrator update qemu binary/make domain configuration changes that
transparent to the guest. This changes are not applied until domain shutdown/started
by domain user. Sometimes user just reboots domain and these changes as they
transparent can be applied too and this is a good opportunity to apply changes.
For example new qemu binary have some optimizations and administrator would
like to use these optimizations and don't want to force user to restart, waiting
for user reboot is considered good enough.
To support this use case we can add 'recreate' option to on_reboot/on_shutdown event.
[1] https://www.redhat.com/archives/libvir-list/2016-June/msg02259.html
8 years, 3 months
[libvirt] [PATCH] Remove bogus \o escape in regex
by Daniel P. Berrange
One of the regexes has a bogus \o instead of plain 'o'. Somehow
this magically worked on all versions of python, until 3.6 came
along and complained
Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com>
---
generator.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Pushed as a trival fix / python 3.6 build fix
diff --git a/generator.py b/generator.py
index 730e456..2c3b667 100755
--- a/generator.py
+++ b/generator.py
@@ -1091,7 +1091,7 @@ def is_integral_type (name):
return not re.search ("^(unsigned)? ?(int|long)$", name) is None
def is_optional_arg(info):
- return re.search("^\(?\optional\)?", info) is not None
+ return re.search("^\(?optional\)?", info) is not None
# Functions returning lists which need special rules to check for errors
# and raise exceptions.
functions_list_exception_test = {
--
2.9.3
8 years, 3 months
[libvirt] [PATCH v3] qemu: report block job errors from qemu to the user
by Nikolay Shirokovskiy
So that you can see nice report on migration:
"error: operation failed: migration of disk sda failed: No space left on device"
diff from v2:
1. split into 2 patches
2. change formal documentation where it is present accordingly
3. add variable initialization for safety
Nikolay Shirokovskiy (2):
qemu: prepare blockjob complete event error usage
qemu: report drive mirror errors on migration
src/qemu/qemu_blockjob.c | 14 ++++++++++--
src/qemu/qemu_blockjob.h | 3 ++-
src/qemu/qemu_domain.c | 1 +
src/qemu/qemu_domain.h | 1 +
src/qemu/qemu_driver.c | 4 ++--
src/qemu/qemu_migration.c | 54 +++++++++++++++++++++++++++++++-------------
src/qemu/qemu_monitor.c | 5 ++--
src/qemu/qemu_monitor.h | 4 +++-
src/qemu/qemu_monitor_json.c | 4 +++-
src/qemu/qemu_process.c | 4 ++++
10 files changed, 69 insertions(+), 25 deletions(-)
--
1.8.3.1
8 years, 3 months
[libvirt] [PATCH] apparmor: pass attach_disconnected
by Guido Günther
to cure
+ virsh lxc-enter-namespace --noseclabel <container> <cmd>
libvirt: error : Expected at least one file descriptor
error: internal error: Child process (2714) unexpected exit status 125
caused by
apparmor="DENIED" operation="open" info="Failed name lookup - disconnected path" error=-13 profile="/usr/sbin/libvirtd" name="" pid=1422 comm="libvirtd" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
---
Thanks to intrigeri for the suggestion!
examples/apparmor/usr.sbin.libvirtd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/apparmor/usr.sbin.libvirtd b/examples/apparmor/usr.sbin.libvirtd
index 48651b28f..b7e47f5c3 100644
--- a/examples/apparmor/usr.sbin.libvirtd
+++ b/examples/apparmor/usr.sbin.libvirtd
@@ -2,7 +2,7 @@
#include <tunables/global>
@{LIBVIRT}="libvirt"
-/usr/sbin/libvirtd {
+/usr/sbin/libvirtd flags=(attach_disconnected) {
#include <abstractions/base>
#include <abstractions/dbus>
--
2.11.0
8 years, 3 months
