- Devel - libvirt List Archives

[libvirt] virsh can't support VM offline blockcommit
by 陈明 13 Oct '15

13 Oct '15

Hi everyone! I use the libvirt(version: 1.2.2) and QEMU(version: 2.2.1) to test qemu snapshot features: I tried virsh blockcommit when VM offline, the virsh blockcommit failed: the error messase as below: * error: Requested operation is not valid: domain is not running* when I start the VM, the virsh blockcommit work fine! my question is : we need virsh support blockcommit when VM offline。how do？ we test qemu snapshot as follows： we need create snapshot of the cycle，and by virsh blockcommit merge snapshot chain，but whenVM offline， the virsh blockcommit will fail， someone suggest me：when VM offline，may use qemu-img commit to submit snapshot turn，but qemu-img can't modify snapshot chain backing relation，it need we use qemu-img rebase amend snapshot‘s backingfile，* the main question* is when we use qemu-img rebase modify snapshot's backingfile, if someone start the VM, it will may lead to VM filesystem readonly。 we should how to solve the question? thanks!

1 0

[libvirt] [PATCH v2] virt-host-validate: check for IOMMU support
by Daniel P. Berrange 12 Oct '15

12 Oct '15

This looks for existance of DMAR (Intel) and IVRS (AMD) files under /sys/firmware/acpi/tables/, as a sign that the platform has IOMMU present & enabled in the BIOS. If these are present and /sys/kernel/iommu_groups does not contain any entries this is taken as a sign that the kernel has not enabled the IOMMU currently. If no ACPI tables are found we can't distinguish between disabled in BIOS and not present in the hardware, so we have to give the user a generic hint. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Changed in v2: - Completely refactor the check to remove false positives and cope with iommu being enabled by default - Add AMD support tools/virt-host-validate-common.c | 64 +++++++++++++++++++++++++++++++++++++++ tools/virt-host-validate-common.h | 3 ++ tools/virt-host-validate-qemu.c | 6 ++++ 3 files changed, 73 insertions(+) diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c index a88fc56..38128b1 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -26,6 +26,7 @@ #include <stdio.h> #include <unistd.h> #include <sys/utsname.h> +#include <sys/stat.h> #include <mntent.h> #include "virutil.h" @@ -341,3 +342,66 @@ int virHostValidateCGroupController(const char *hvname, return -1; return 0; } + +int virHostValidateIOMMU(const char *hvname, + virHostValidateLevel level) +{ + struct stat sb; + const char *bootarg = NULL; + bool isAMD = false, isIntel = false; + + if (virHostValidateHasCPUFlag("vmx")) + isIntel = true; + else if (virHostValidateHasCPUFlag("svm")) + isAMD = true; + else + /* XXX PPC/ARM/etc support */ + return 0; + + virHostMsgCheck(hvname, "%s", _("for device assignment IOMMU support")); + + if (isIntel) { + if (access("/sys/firmware/acpi/tables/DMAR", F_OK) == 0) { + virHostMsgPass(); + bootarg = "intel_iommu=on"; + } else { + virHostMsgFail(level, + "No ACPI DMAR table found, IOMMU either " + "disabled in BIOS or not supported by this " + "hardware platform"); + return -1; + } + } else if (isAMD) { + if (access("/sys/firmware/acpi/tables/IVRS", F_OK) == 0) { + virHostMsgPass(); + bootarg = "iommu=pt iommu=1"; + } else { + virHostMsgFail(level, + "No ACPI IVRS table found, IOMMU either " + "disabled in BIOS or not supported by this " + "hardware platform"); + return -1; + } + } else { + virHostMsgFail(level, + "Unknown if this platform has IOMMU support"); + return -1; + } + + + /* We can only check on newer kernels with iommu groups & vfio */ + if (stat("/sys/kernel/iommu_groups", &sb) < 0) + return 0; + + if (!S_ISDIR(sb.st_mode)) + return 0; + + virHostMsgCheck(hvname, "%s", _("if IOMMU is enabled by kernel")); + if (sb.st_nlink <= 2) { + virHostMsgFail(level, + "IOMMU appears to be disabled in kernel. " + "Add %s to kernel cmdline arguments", bootarg); + return -1; + } + return 0; +} diff --git a/tools/virt-host-validate-common.h b/tools/virt-host-validate-common.h index 1547e22..d4c4759 100644 --- a/tools/virt-host-validate-common.h +++ b/tools/virt-host-validate-common.h @@ -70,4 +70,7 @@ extern int virHostValidateCGroupController(const char *hvname, virHostValidateLevel level, const char *config_name); +extern int virHostValidateIOMMU(const char *hvname, + virHostValidateLevel level); + #endif /* __VIRT_HOST_VALIDATE_COMMON_H__ */ diff --git a/tools/virt-host-validate-qemu.c b/tools/virt-host-validate-qemu.c index b0ae293..044df65 100644 --- a/tools/virt-host-validate-qemu.c +++ b/tools/virt-host-validate-qemu.c @@ -20,6 +20,8 @@ */ #include <config.h> +#include <unistd.h> + #include "virt-host-validate-qemu.h" #include "virt-host-validate-common.h" @@ -87,5 +89,9 @@ int virHostValidateQEMU(void) "BLK_CGROUP") < 0) ret = -1; + if (virHostValidateIOMMU("QEMU", + VIR_HOST_VALIDATE_WARN) < 0) + ret = -1; + return ret; } -- 2.4.3

1 1

[libvirt] [PATCH] virt-host-validate: disable mntent code on Win32
by Daniel P. Berrange 12 Oct '15

12 Oct '15

Win32 does not have support for mntent.h header, so the method which uses this must be stubbed out. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- Pushed as a build fix for Mingw tools/virt-host-validate-common.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c index a88fc56..dd41fd4 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -26,7 +26,9 @@ #include <stdio.h> #include <unistd.h> #include <sys/utsname.h> -#include <mntent.h> +#ifdef HAVE_MNTENT_H +# include <mntent.h> +#endif /* HAVE_MNTENT_H */ #include "virutil.h" #include "viralloc.h" @@ -287,6 +289,7 @@ static int virHostValidateCGroupSupport(const char *hvname, return -1; } +#ifdef HAVE_MNTENT_H static int virHostValidateCGroupMount(const char *hvname, const char *cg_name, virHostValidateLevel level) @@ -324,6 +327,16 @@ static int virHostValidateCGroupMount(const char *hvname, cg_name, cg_name); return -1; } +#else /* ! HAVE_MNTENT_H */ +static int virHostValidateCGroupMount(const char *hvname, + const char *cg_name, + virHostValidateLevel level) +{ + virHostMsgCheck(hvname, "for cgroup '%s' controller mount-point", cg_name); + virHostMsgFail(level, "%s", "This platform does not support cgroups"); + return -1; +} +#endif /* ! HAVE_MNTENT_H */ int virHostValidateCGroupController(const char *hvname, const char *cg_name, -- 2.4.3

2 1

[libvirt] [PATCH v2] storage: Fix incorrect format for <disk> <auth> XML
by John Ferlan 12 Oct '15

12 Oct '15

https://bugzilla.redhat.com/show_bug.cgi?id=1256999 After creating a copy of the 'authdef' in a pool -> disk translation, unconditionally clear the 'authType' in the resulting disk auth def structure since that's used for a storage pool and not a disk. This ensures virStorageAuthDefFormat will properly format the <auth> XML for a <disk> (e.g. it won't have a <auth type='%s'.../>). Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/storage/storage_driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index ddf4405..0a7ebcc 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -3199,6 +3199,8 @@ virStorageTranslateDiskSourcePoolAuth(virDomainDiskDefPtr def, def->src->auth = virStorageAuthDefCopy(source->auth); if (!def->src->auth) goto cleanup; + /* A <disk> doesn't use <auth type='%s', so clear that out for the disk */ + def->src->auth->authType = VIR_STORAGE_AUTH_TYPE_NONE; ret = 0; cleanup: -- 2.1.0

2 1

[libvirt] [PATCH v4 0/12] migration: support all toURI and proto combos
by Nikolay Shirokovskiy 12 Oct '15

12 Oct '15

Current implementation of 'toURI' migration interfaces does not support all combinations of interface versions and protocol versions. For example 'toURI2' with p2p flag will not migrate if driver supports only v3params proto. This is not convinient as drivers that starts to support migration have to manually support older versions of protocol. I guess this should be done in one place, namely here. Another issue is that there are a lot of code duplication in implementation of toURI interfaces and it is not obvious from code how are they related. This implementation uses extensible parameters as intermediate parameters representation. This is possible as interfaces are done backward compatible in terms of parameters and later versions supports all parameters of former versions. = Changes from version 3 * fix spellings * make error messages more specific as suggested * in 'migration: refactor: introduce params version of unmanaged': fix conversion for null values of explicit string params into virTypedParameterPtr. * squash 'migration: reuse parameters check in toURI2 and toURI3' into 'migration: introduce parameter checking function' * 'migration: refactor: one return in forURI family functions' is dropped as suggested src/libvirt-domain.c | 509 +++++++++++++++++++++++--------------------------- 1 files changed, 237 insertions(+), 272 deletions(-)

2 18

[libvirt] [PATCH 0/4] Add more host validation checks
by Daniel P. Berrange 12 Oct '15

12 Oct '15

This extends the virt-host-validate command todo a bunch more checks. Probably the most interesting is the last one which checks for Intel IOMMU needed todo PCI assignment with KVM. It is pretty crude, so further suggestions welcome. I don't want to grep dmesg as suggested in [1] since dmesg can be purged by the time we look at it. What kmods should we look for for VT-D too ? [1] http://www.linux-kvm.org/page/How_to_assign_devices_with_VT-d_in_KVM Daniel P. Berrange (4): virt-host-validate.c: check for kernel namespaces virt-host-validate: distinguish exists vs accessible for devices virt-host-validate: check for required cgroups virt-host-validate: check for intel_iommu=on cmdline flag tools/virt-host-validate-common.c | 209 +++++++++++++++++++++++++++++++++++--- tools/virt-host-validate-common.h | 31 +++++- tools/virt-host-validate-lxc.c | 60 +++++++++++ tools/virt-host-validate-qemu.c | 66 ++++++++++-- 4 files changed, 338 insertions(+), 28 deletions(-) -- 2.4.3

3 12

[libvirt] [PATCH 0/2] improve the error in 2 function
by Luyao Huang 12 Oct '15

12 Oct '15

*** BLURB HERE *** Luyao Huang (2): util: split the virNumaGetHugePageInfoPath into separate function util: Produce friendlier error message to user src/util/virnuma.c | 54 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 24 deletions(-) -- 1.8.3.1

3 10

[libvirt] virsh can't support VM offline blockcommit
by 陈明 12 Oct '15

12 Oct '15

Hi everyone! I use the libvirt(version: 1.2.2) and QEMU(version: 2.2.1) to test qemu snapshot features: I tried virsh blockcommit when VM offline, the virsh blockcommit failed: the error messase as below: * error: Requested operation is not valid: domain is not running* when I start the VM, the virsh blockcommit work fine! my question is : we need virsh support blockcommit when VM offline。how do？ we test qemu snapshot as follows： we need create snapshot of the cycle，and by virsh blockcommit merge snapshot chain，but whenVM offline， the virsh blockcommit will fail， someone suggest me：when VM offline，may use qemu-img commit to submit snapshot turn，but qemu-img can't modify snapshot chain backing relation，it need we use qemu-img rebase amend snapshot‘s backingfile，* the main question* is when we use qemu-img rebase modify snapshot's backingfile, if someone start the VM, it will may lead to VM filesystem readonly。 we should how to solve the question? thanks!

1 0

[libvirt] virsh can't support VM offline blockcommit
by justlibvirt 10 Oct '15

10 Oct '15

Hi everyone! I use the libvirt(version: 1.2.2) and QEMU(version: 2.2.1) to test qemu snapshot features: I tried virsh blockcommit when VM offline, the virsh blockcommit failed: the error messase as below: error: Requested operation is not valid: domain is not running when I start the VM, the virsh blockcommit work fine! my question is : we need virsh support blockcommit when VM offline。how do？ we test qemu snapshot as follows： we need create snapshot of the cycle，and by virsh blockcommit merge snapshot chain，but whenVM offline， the virsh blockcommit will fail， someone suggest me：when VM offline，may use qemu-img commit to submit snapshot turn，but qemu-img can't modify snapshot chain backing relation，it need we use qemu-img rebase amend snapshot‘s backingfile， the main question is when we use qemu-img rebase modify snapshot's backingfile, if someone start the VM, it will may lead to VM filesystem readonly。 we shoule solve the question? thanks!

1 0

[libvirt] [PATCH] src: Include $(builddir)/util in the header search path
by Andrea Bolognani 09 Oct '15

09 Oct '15

Since a9fe620372144db, we are generating virkeymaps.h at build time; however, we are not including $(builddir)/util in the header search path, so when doing a VPATH build the compiler is unable to locate the file. make[2]: Entering directory `/home/jenkins/libvirt/systems/libvirt-fedora-20/build/src' GEN util/virkeymaps.h ... CC util/libvirt_util_la-virkeycode.lo CC util/libvirt_util_la-virkeyfile.lo CC util/libvirt_util_la-virlockspace.lo CC util/libvirt_util_la-virlog.lo ../../src/util/virkeycode.c:27:24: fatal error: virkeymaps.h: No such file or directory #include "virkeymaps.h" ^ compilation terminated. --- Tested by * running 'git clean -xdf' in the source directory * running './autogen.sh' * running 'make distclean' * making sure src/util/virkeymaps.h did not exist * moving to an empty build directory * running '../libvirt/configure' * running 'make check' * running 'make distcheck' This is another take on the problem Michal's trying to solve with https://www.redhat.com/archives/libvir-list/2015-October/msg00254.html The commit message is "inspired" by his ;) src/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile.am b/src/Makefile.am index e4660eb..01e816a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,6 +31,7 @@ INCLUDES = -I../gnulib/lib \ -I../include \ -I$(top_srcdir)/include \ -I$(srcdir)/util \ + -I$(builddir)/util \ -DIN_LIBVIRT \ -Dabs_topbuilddir="\"$(abs_topbuilddir)\"" \ -Dabs_topsrcdir="\"$(abs_topsrcdir)\"" \ -- 2.4.3

4 7

[libvirt] [PATCH] src: Remove $(builddir) usage
by Andrea Bolognani 09 Oct '15

09 Oct '15

Commit 4e8032272f1704f7 used $(builddir) in the header search path to fix a build issue; however, $(builddir) is not defined by old autoconf versions such as the one available in CentOS 5, resulting in the following error: cc1: error: /util: No such file or directory make[3]: *** [libvirt_driver_la-fdstream.lo] Error 1 Since $(builddir) is defined to always be '.', just use that value directly instead. --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 01e816a..d5dd9fb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,7 +31,7 @@ INCLUDES = -I../gnulib/lib \ -I../include \ -I$(top_srcdir)/include \ -I$(srcdir)/util \ - -I$(builddir)/util \ + -I./util \ -DIN_LIBVIRT \ -Dabs_topbuilddir="\"$(abs_topbuilddir)\"" \ -Dabs_topsrcdir="\"$(abs_topsrcdir)\"" \ -- 2.4.3

2 2

[libvirt] [PATCH] virJSONValueArraySize: return ssize_t
by Michal Privoznik 09 Oct '15

09 Oct '15

The internal representation of a JSON array counts the items in size_t. However, for some reason, when asking for the count it's reported as int. Firstly, we need the function to return a signed type as it's returning -1 on an error. But, not every system has integer the same size as size_t. Therefore, lets return ssize_t. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/locking/lock_daemon.c | 2 +- src/network/bridge_driver.c | 2 +- src/qemu/qemu_agent.c | 12 ++++++------ src/qemu/qemu_monitor_json.c | 28 ++++++++++++++-------------- src/rpc/virnetserver.c | 2 +- src/rpc/virnetserverservice.c | 2 +- src/util/virjson.c | 2 +- src/util/virjson.h | 2 +- src/util/virlockspace.c | 4 ++-- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index bf87af1..55fc0c3 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -184,7 +184,7 @@ virLockDaemonNewPostExecRestart(virJSONValuePtr object, bool privileged) virJSONValuePtr lockspaces; virNetServerPtr srv; size_t i; - int n; + ssize_t n; if (VIR_ALLOC(lockd) < 0) return NULL; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index c343e5b..cd9a51e 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3599,7 +3599,7 @@ networkGetDHCPLeases(virNetworkPtr network, size_t i, j; size_t nleases = 0; int rv = -1; - int size = 0; + ssize_t size = 0; int custom_lease_file_len = 0; bool need_results = !!leases; long long currtime = 0; diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 7021a7a..5735ed8 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1461,7 +1461,7 @@ qemuAgentGetVCPUs(qemuAgentPtr mon, virJSONValuePtr cmd; virJSONValuePtr reply = NULL; virJSONValuePtr data = NULL; - int ndata; + ssize_t ndata; if (!(cmd = qemuAgentMakeCommand("guest-get-vcpus", NULL))) return -1; @@ -1767,7 +1767,7 @@ qemuAgentGetFSInfo(qemuAgentPtr mon, virDomainFSInfoPtr **info, { size_t i, j, k; int ret = -1; - int ndata = 0, ndisk; + ssize_t ndata = 0, ndisk; char **alias; virJSONValuePtr cmd; virJSONValuePtr reply = NULL; @@ -1810,7 +1810,7 @@ qemuAgentGetFSInfo(qemuAgentPtr mon, virDomainFSInfoPtr **info, if (!entry) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("array element '%zd' of '%d' missing in " + _("array element '%zd' of '%zd' missing in " "guest-get-fsinfo return data"), i, ndata); goto cleanup; @@ -1871,7 +1871,7 @@ qemuAgentGetFSInfo(qemuAgentPtr mon, virDomainFSInfoPtr **info, if (!disk) { virReportError(VIR_ERR_INTERNAL_ERROR, - _("array element '%zd' of '%d' missing in " + _("array element '%zd' of '%zd' missing in " "guest-get-fsinfo 'disk' data"), j, ndisk); goto cleanup; @@ -1954,7 +1954,7 @@ qemuAgentGetInterfaces(qemuAgentPtr mon, { int ret = -1; size_t i, j; - int size = -1; + ssize_t size = -1; virJSONValuePtr cmd = NULL; virJSONValuePtr reply = NULL; virJSONValuePtr ret_array = NULL; @@ -1994,7 +1994,7 @@ qemuAgentGetInterfaces(qemuAgentPtr mon, virJSONValuePtr tmp_iface = virJSONValueArrayGet(ret_array, i); virJSONValuePtr ip_addr_arr = NULL; const char *hwaddr, *ifname_s, *name = NULL; - int ip_addr_arr_size; + ssize_t ip_addr_arr_size; virDomainInterfacePtr iface = NULL; /* Shouldn't happen but doesn't hurt to check neither */ diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index df0c82a..b39b29b 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -1265,7 +1265,7 @@ qemuMonitorJSONExtractCPUInfo(virJSONValuePtr reply, int ret = -1; size_t i; int *threads = NULL; - int ncpus; + ssize_t ncpus; if (!(data = virJSONValueObjectGetArray(reply, "return"))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -3061,7 +3061,7 @@ qemuMonitorJSONQueryRxFilterParse(virJSONValuePtr msg, int ret = -1; const char *tmp; virJSONValuePtr returnArray, entry, table, element; - int nTable; + ssize_t nTable; size_t i; virNetDevRxFilterPtr fil = virNetDevRxFilterNew(); @@ -4090,7 +4090,7 @@ qemuMonitorJSONGetAllBlockJobInfo(qemuMonitorPtr mon) virJSONValuePtr cmd = NULL; virJSONValuePtr reply = NULL; virJSONValuePtr data; - int nr_results; + ssize_t nr_results; size_t i; virHashTablePtr blockJobs = NULL; @@ -4597,7 +4597,7 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; qemuMonitorMachineInfoPtr *infolist = NULL; - int n = 0; + ssize_t n = 0; size_t i; *machines = NULL; @@ -4777,7 +4777,7 @@ int qemuMonitorJSONGetCommands(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; char **commandlist = NULL; - int n = 0; + ssize_t n = 0; size_t i; *commands = NULL; @@ -4845,7 +4845,7 @@ int qemuMonitorJSONGetEvents(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; char **eventlist = NULL; - int n = 0; + ssize_t n = 0; size_t i; *events = NULL; @@ -4922,7 +4922,7 @@ qemuMonitorJSONGetCommandLineOptionParameters(qemuMonitorPtr mon, virJSONValuePtr data = NULL; virJSONValuePtr array = NULL; char **paramlist = NULL; - int n = 0; + ssize_t n = 0; size_t i; *params = NULL; @@ -5093,7 +5093,7 @@ int qemuMonitorJSONGetObjectTypes(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; char **typelist = NULL; - int n = 0; + ssize_t n = 0; size_t i; *types = NULL; @@ -5162,7 +5162,7 @@ int qemuMonitorJSONGetObjectListPaths(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; qemuMonitorJSONListPathPtr *pathlist = NULL; - int n = 0; + ssize_t n = 0; size_t i; *paths = NULL; @@ -5408,7 +5408,7 @@ int qemuMonitorJSONGetObjectProps(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; char **proplist = NULL; - int n = 0; + ssize_t n = 0; size_t i; *props = NULL; @@ -5527,7 +5527,7 @@ qemuMonitorJSONGetMigrationCapabilities(qemuMonitorPtr mon, virJSONValuePtr caps; char **list = NULL; size_t i; - int n; + ssize_t n; *capabilities = NULL; @@ -5804,7 +5804,7 @@ qemuMonitorJSONGetStringArray(qemuMonitorPtr mon, const char *qmpCmd, virJSONValuePtr reply = NULL; virJSONValuePtr data; char **list = NULL; - int n = 0; + ssize_t n = 0; size_t i; *array = NULL; @@ -6167,7 +6167,7 @@ qemuMonitorJSONGetCPUx86Data(qemuMonitorPtr mon, virCPUx86Data *x86Data = NULL; virCPUx86CPUID cpuid; size_t i; - int n; + ssize_t n; int ret = -1; /* look up if the property exists before asking */ @@ -6330,7 +6330,7 @@ qemuMonitorJSONGetIOThreads(qemuMonitorPtr mon, virJSONValuePtr reply = NULL; virJSONValuePtr data; qemuMonitorIOThreadInfoPtr *infolist = NULL; - int n = 0; + ssize_t n = 0; size_t i; *iothreads = NULL; diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 80b5588..547e52e 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -369,7 +369,7 @@ virNetServerPtr virNetServerNewPostExecRestart(virJSONValuePtr object, virJSONValuePtr clients; virJSONValuePtr services; size_t i; - int n; + ssize_t n; unsigned int min_workers; unsigned int max_workers; unsigned int priority_workers; diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c index 3b35fc0..1ef0636 100644 --- a/src/rpc/virnetserverservice.c +++ b/src/rpc/virnetserverservice.c @@ -328,7 +328,7 @@ virNetServerServicePtr virNetServerServiceNewPostExecRestart(virJSONValuePtr obj virNetServerServicePtr svc; virJSONValuePtr socks; size_t i; - int n; + ssize_t n; unsigned int max; if (virNetServerServiceInitialize() < 0) diff --git a/src/util/virjson.c b/src/util/virjson.c index c123943..ae6362b 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -864,7 +864,7 @@ virJSONValueIsArray(virJSONValuePtr array) } -int +ssize_t virJSONValueArraySize(const virJSONValue *array) { if (array->type != VIR_JSON_TYPE_ARRAY) diff --git a/src/util/virjson.h b/src/util/virjson.h index a7df6e5..66ed48a 100644 --- a/src/util/virjson.h +++ b/src/util/virjson.h @@ -114,7 +114,7 @@ virJSONValuePtr virJSONValueObjectGetByType(virJSONValuePtr object, const char *key, virJSONType type); bool virJSONValueIsArray(virJSONValuePtr array); -int virJSONValueArraySize(const virJSONValue *array); +ssize_t virJSONValueArraySize(const virJSONValue *array); virJSONValuePtr virJSONValueArrayGet(virJSONValuePtr object, unsigned int element); virJSONValuePtr virJSONValueArraySteal(virJSONValuePtr object, unsigned int element); diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index 2366a74..7aa0f1d 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -293,7 +293,7 @@ virLockSpacePtr virLockSpaceNewPostExecRestart(virJSONValuePtr object) { virLockSpacePtr lockspace; virJSONValuePtr resources; - int n; + ssize_t n; size_t i; VIR_DEBUG("object=%p", object); @@ -336,7 +336,7 @@ virLockSpacePtr virLockSpaceNewPostExecRestart(virJSONValuePtr object) const char *tmp; virJSONValuePtr owners; size_t j; - int m; + ssize_t m; if (VIR_ALLOC(res) < 0) goto error; -- 2.4.9

2 1

[libvirt] Cannot dump core: error: Requested operation is not valid: domain is marked for auto destroy
by Richard W.M. Jones 09 Oct '15

09 Oct '15

I wonder if there's a reason why it is not possible to dump the core of a KVM domain which is set to autodestroy. $ virsh dump guestfs-4xe592eyqq4rfnk9 /tmp/guestfs-4xe592eyqq4rfnk9.core error: Failed to core dump domain guestfs-4xe592eyqq4rfnk9 to /tmp/guestfs-4xe592eyqq4rfnk9.core error: Requested operation is not valid: domain is marked for auto destroy All libguestfs domains have the autodestroy flag, but I am trying to debug one which is crashing in the guest (RHBZ#1269779) and having the ability to dump it would be very helpful. I added the following patch to libvirt, which allowed me to dump the domain with no apparent ill effects. (The patch is a bit of a hack, and I did not check it very closely, so it's probably not suitable for going upstream). Rich. >From ffb899e436c15974b0f42b1cbd8337701c3a05d1 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" <rjones(a)redhat.com> Date: Thu, 8 Oct 2015 11:11:10 +0100 Subject: [PATCH] qemu: Don't prevent core dump of auto-destroy domain. --- src/qemu/qemu_driver.c | 8 ++++---- src/qemu/qemu_migration.c | 16 +++++++++------- src/qemu/qemu_migration.h | 2 +- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8cd5ee3..c3778de 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3184,7 +3184,7 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, virDomainPtr dom, if (!(caps = virQEMUDriverGetCapabilities(driver, false))) goto cleanup; - if (!qemuMigrationIsAllowed(driver, vm, false, 0)) + if (!qemuMigrationIsAllowed(driver, vm, false, false, 0)) goto cleanup; if (qemuDomainObjBeginAsyncJob(driver, vm, QEMU_ASYNC_JOB_SAVE) < 0) @@ -3616,7 +3616,7 @@ doCoreDump(virQEMUDriverPtr driver, goto cleanup; } - if (!qemuMigrationIsAllowed(driver, vm, false, 0)) + if (!qemuMigrationIsAllowed(driver, vm, false, true, 0)) goto cleanup; ret = qemuMigrationToFile(driver, vm, fd, 0, path, @@ -13690,7 +13690,7 @@ qemuDomainSnapshotCreateActiveInternal(virConnectPtr conn, bool resume = false; int ret = -1; - if (!qemuMigrationIsAllowed(driver, vm, false, 0)) + if (!qemuMigrationIsAllowed(driver, vm, false, false, 0)) goto cleanup; if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) { @@ -14505,7 +14505,7 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, /* do the memory snapshot if necessary */ if (memory) { /* check if migration is possible */ - if (!qemuMigrationIsAllowed(driver, vm, false, 0)) + if (!qemuMigrationIsAllowed(driver, vm, false, false, 0)) goto cleanup; /* allow the migration job to be cancelled or the domain to be paused */ diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index d0f1e46..19031f9 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2201,7 +2201,7 @@ qemuMigrationIsAllowedHostdev(const virDomainDef *def) bool qemuMigrationIsAllowed(virQEMUDriverPtr driver, virDomainObjPtr vm, - bool remote, + bool remote, bool coreDump, unsigned int flags) { int nsnapshots; @@ -2235,10 +2235,12 @@ qemuMigrationIsAllowed(virQEMUDriverPtr driver, /* following checks don't make sense for offline migration */ if (!(flags & VIR_MIGRATE_OFFLINE)) { - if (qemuProcessAutoDestroyActive(driver, vm)) { - virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("domain is marked for auto destroy")); - return false; + if (!coreDump) { + if (qemuProcessAutoDestroyActive(driver, vm)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is marked for auto destroy")); + return false; + } } @@ -2987,7 +2989,7 @@ qemuMigrationBeginPhase(virQEMUDriverPtr driver, if (priv->job.asyncJob == QEMU_ASYNC_JOB_MIGRATION_OUT) qemuMigrationJobSetPhase(driver, vm, QEMU_MIGRATION_PHASE_BEGIN3); - if (!qemuMigrationIsAllowed(driver, vm, true, flags)) + if (!qemuMigrationIsAllowed(driver, vm, true, false, flags)) goto cleanup; if (!(flags & VIR_MIGRATE_UNSAFE) && @@ -5347,7 +5349,7 @@ qemuMigrationPerformJob(virQEMUDriverPtr driver, goto endjob; } - if (!qemuMigrationIsAllowed(driver, vm, true, flags)) + if (!qemuMigrationIsAllowed(driver, vm, true, false, flags)) goto endjob; if (!(flags & VIR_MIGRATE_UNSAFE) && diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 8175f4b..cc4d25d 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -174,7 +174,7 @@ int qemuMigrationConfirm(virConnectPtr conn, int cancelled); bool qemuMigrationIsAllowed(virQEMUDriverPtr driver, virDomainObjPtr vm, - bool remote, unsigned int flags); + bool remote, bool coreDump, unsigned int flags); int qemuMigrationToFile(virQEMUDriverPtr driver, virDomainObjPtr vm, int fd, off_t offset, const char *path, -- 2.5.3 -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into KVM guests. http://libguestfs.org/virt-v2v

3 4

[libvirt] [libvirt-test-API] [PATCH] fix some typo
by Shanzhi Yu 09 Oct '15

09 Oct '15

Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- repos/domain/fsinfo.py | 2 +- repos/domain/install_linux_check.py | 2 +- repos/domain/install_linux_net.py | 2 +- repos/interface/define.py | 2 +- repos/interface/undefine.py | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/repos/domain/fsinfo.py b/repos/domain/fsinfo.py index e6d1bf0..d4614f5 100644 --- a/repos/domain/fsinfo.py +++ b/repos/domain/fsinfo.py @@ -81,7 +81,7 @@ def fsinfo(params): return 1 fsinfo = vm.fsInfo() - logger.info("get geust filesystem information") + logger.info("get guest filesystem information") mac = get_guest_mac(vm) if not mac: diff --git a/repos/domain/install_linux_check.py b/repos/domain/install_linux_check.py index ab1e7db..bb3cc2a 100644 --- a/repos/domain/install_linux_check.py +++ b/repos/domain/install_linux_check.py @@ -99,7 +99,7 @@ def install_linux_check(params): Test_Result = 1 return Test_Result - # Check whether vcpu equals the value set in geust config xml + # Check whether vcpu equals the value set in guest config xml logger.info("check point3: check cpu number in guest equals to \ the value set in domain config xml") vcpunum_expect = int(utils.get_num_vcpus(domain_name)) diff --git a/repos/domain/install_linux_net.py b/repos/domain/install_linux_net.py index 4367d97..7173294 100644 --- a/repos/domain/install_linux_net.py +++ b/repos/domain/install_linux_net.py @@ -239,7 +239,7 @@ def install_linux_net(params): logger.info("booting guest vm off harddisk failed") return 1 else: - logger.info("geust is booting up") + logger.info("guest is booting up") else: interval = 0 while(interval < 3600): diff --git a/repos/interface/define.py b/repos/interface/define.py index 18ba71b..e0dbcf4 100644 --- a/repos/interface/define.py +++ b/repos/interface/define.py @@ -42,7 +42,7 @@ def define(params): try: conn.interfaceDefineXML(xmlstr, 0) if check_define_interface(ifacename): - logger.info("define a interface form xml is successful") + logger.info("define a interface from xml is successful") else: logger.error("fail to check define interface") return 1 diff --git a/repos/interface/undefine.py b/repos/interface/undefine.py index f9b2d74..8b250de 100644 --- a/repos/interface/undefine.py +++ b/repos/interface/undefine.py @@ -39,14 +39,14 @@ def undefine(params): try: ifaceobj.undefine() if check_undefine_interface(ifacename): - logger.info("undefine a interface form xml is successful") + logger.info("undefine a interface is successful") else: logger.error("fail to check undefine interface") return 1 except libvirtError, e: logger.error("API error message: %s, error code is %s" \ % (e.message, e.get_error_code())) - logger.error("fail to undefine a interface from xml") + logger.error("fail to undefine a interface") return 1 return 0 -- 1.8.3.1

2 1

[libvirt] [libvirt-test-API] [PATCH] fix two error in script pin_iothread.py and connection_getAllDomainStats.py
by Shanzhi Yu 09 Oct '15

09 Oct '15

Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- repos/domain/pin_iothread.py | 2 +- repos/virconn/connection_getAllDomainStats.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/repos/domain/pin_iothread.py b/repos/domain/pin_iothread.py index 28ee2c4..d2d812f 100644 --- a/repos/domain/pin_iothread.py +++ b/repos/domain/pin_iothread.py @@ -116,7 +116,7 @@ def pin_iothread(params): if not find_iothreadid_fromxml(vm, 1, 1): logger.info("add iothread %d to running guest" % 1) - vm.addIOThread(i, libvirt.VIR_DOMAIN_AFFECT_LIVE) + vm.addIOThread(1, libvirt.VIR_DOMAIN_AFFECT_LIVE) vm.pinIOThread(1, tu_cpu, libvirt.VIR_DOMAIN_AFFECT_LIVE) cpuset = find_iothreadpin_fromxml(vm, 1, 1) diff --git a/repos/virconn/connection_getAllDomainStats.py b/repos/virconn/connection_getAllDomainStats.py index d95004f..3362444 100644 --- a/repos/virconn/connection_getAllDomainStats.py +++ b/repos/virconn/connection_getAllDomainStats.py @@ -164,7 +164,7 @@ def check_each_vcpu(logger,dom_name,dom_active,dom_eles): if not vcpu_cur: for i in range(0,vcpu_max): vcpu_pre = "vcpu."+ str(i) + "." - logger.debug("Checking %sstate: %d" \ + logger.debug("Checking %sstate: %s" \ %(vcpu_pre, dom_eles.get(vcpu_pre + "state"))) if not compare_value(logger,vcpu_stat, \ dom_eles.get(vcpu_pre + "state")): @@ -172,7 +172,7 @@ def check_each_vcpu(logger,dom_name,dom_active,dom_eles): elif int(vcpu_cur.nodeValue) <= vcpu_max: for i in range(0,int(vcpu_cur.nodeValue)): vcpu_pre = "vcpu."+ str(i) + "." - logger.debug("Checking %sstate: %d" \ + logger.debug("Checking %sstate: %s" \ %(vcpu_pre, dom_eles.get(vcpu_pre + "state"))) if not compare_value(logger,vcpu_stat, \ dom_eles.get(vcpu_pre + "state")): -- 1.8.3.1

2 1

[libvirt] [libvirt-test-API] [PATCH] Add two cases for API interfaceAddresses and make small changes to global.cfg
by Shanzhi Yu 09 Oct '15

09 Oct '15

Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- cases/linux_domain.conf | 12 +++++++ global.cfg | 8 +++-- repos/domain/get_guest_network_info.py | 66 ++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 repos/domain/get_guest_network_info.py diff --git a/cases/linux_domain.conf b/cases/linux_domain.conf index 8440c61..5b216f9 100644 --- a/cases/linux_domain.conf +++ b/cases/linux_domain.conf @@ -66,6 +66,18 @@ domain:set_guest_time flags sync +domain:get_guest_network_info + guestname + $defaultname + flags + lease + +domain:get_guest_network_info + guestname + $defaultname + flags + agent + virconn:connection_getAllDomainStats stats state|cpu|balloon|vcpu|interface|block diff --git a/global.cfg b/global.cfg index 56677a5..1b72119 100644 --- a/global.cfg +++ b/global.cfg @@ -44,6 +44,8 @@ rhel6u1_i386 = http:// rhel6u1_x86_64 = http:// rhel6u2_i386 = http:// rhel6u2_x86_64 = http:// +rhel7u1_x86_64 = http:// +rhel7u2_x86_64 = http:// fedora12_i386 = http:// fedora12_x86_64 = http:// win2008_i386 = http:// @@ -70,6 +72,8 @@ rhel6_i386_http_ks = http:// rhel6_x86_64_http_ks = http:// rhel6u2_i386_http_ks = http:// rhel6u2_x86_64_http_ks = kickstart.cfg +rhel7u1_x86_64_http_ks = http:// +rhel7u2_x86_64_http_ks = http:// fedora12_i386_http_ks = http:// fedora12_x86_64_http_ks = http:// @@ -97,7 +101,7 @@ sourcepath = /media/share # also exercise DNS resolution # [other] -wget_url = http:// +wget_url = http://libvirt.org/index.html # # The variables section is a set of variables used by the @@ -127,7 +131,7 @@ defaulthv = kvm defaultname = libvirt_test_api # default os version to use for installing a new guest # the value of it is the first part of 'rhel6u2_x86_64' in [guest] section above -defaultos = rhel6u2 +defaultos = rhel7u2 # default architecture to use for installing a new guest defaultarch = x86_64 # default the number of vcpu to use for defining or installing a guest diff --git a/repos/domain/get_guest_network_info.py b/repos/domain/get_guest_network_info.py new file mode 100644 index 0000000..35bba3b --- /dev/null +++ b/repos/domain/get_guest_network_info.py @@ -0,0 +1,66 @@ +#!/usr/bin/python + +import libvirt +from libvirt import libvirtError +from src import sharedmod + +required_params = ('guestname', 'flags',) +optional_params = {} + +def check_guest_status(domobj): + """check guest current status + """ + state = domobj.info()[0] + if state == libvirt.VIR_DOMAIN_SHUTOFF or \ + state == libvirt.VIR_DOMAIN_SHUTDOWN: + return False + else: + return True + +def get_guest_network_info(params): + """get guest network interface info + """ + + logger = params['logger'] + guestname = params['guestname'] + flags = params['flags'] + + conn = sharedmod.libvirtobj['conn'] + + domobj = conn.lookupByName(guestname) + + flags = params['flags'] + logger.info("The flags are %s" % flags) + flags_string = flags.split("|") + flags = 0 + + for flag in flags_string: + if flag == 'lease': + flags |= libvirt.VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE + elif flag == 'agent': + flags |= libvirt.VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT + else: + logger.error("unknow flags") + return 1 + + logger.info("the given flags is %d" % flags) + + # Check domain status + if check_guest_status(domobj): + logger.info("Guest is running") + else: + logger.error("Guest is shut off status") + return 1 + + try: + info = domobj.interfaceAddresses(flags) + logger.info("get guest interface info") + + except libvirtError, e: + logger.error("API error message: %s, error code is %s" \ + % (e.message, e.get_error_code())) + return 1 + + return 0 + + -- 1.8.3.1

2 1

[libvirt] [PATCH tck 0/6] Update TCK for current libvirt/qemu environments
by Mike Latimer 08 Oct '15

08 Oct '15

Hi, TCK needs some changes in order to better handle current libvirt/qemu environments. This patch series contains patches to address most (not all*) of the issues I've been encountering: - IP addresses can no longer be retrieved from default.leases - NUMA flags AFFECT_LIVE and AFFECT_CONFIG are mutually exclusive - cow format is no longer supported by qemu - dnsmasq spawns a child process with the same process name and params In addition to the above fixes, additional delays improve the reliability of the nwfilter and hotplugging tests. Thanks, Mike * I'll post another series shortly, dealing with issues in 121-block-info.t. Mike Latimer (6): Retrieve ip address from arp instead of leases nwfilter startup and shutdown delay NUMA flags are exclusive Remove cow format tests Delay before hotplugging Handle dnsmasq child processes lib/Sys/Virt/TCK/NetworkHelpers.pm | 8 ++++---- scripts/domain/200-disk-hotplug.t | 1 + scripts/domain/202-numa-set-parameters.t | 14 +++++++++----- scripts/domain/210-nic-hotplug.t | 1 + scripts/domain/215-nic-hotplug-many.t | 1 + scripts/networks/networkxml2hostout/tck-testnet-1.dat | 2 +- scripts/networks/networkxml2hostout/tck-testnet-2.dat | 2 +- scripts/networks/networkxml2hostout/tck-testnet-3.dat | 2 +- scripts/nwfilter/100-ping-still-working.t | 4 ++-- scripts/nwfilter/210-no-mac-spoofing.t | 4 ++-- scripts/nwfilter/220-no-ip-spoofing.t | 15 ++++++++++++--- scripts/nwfilter/230-no-mac-broadcast.t | 4 ++-- scripts/nwfilter/240-no-arp-spoofing.t | 4 ++-- scripts/storage/100-create-vol-dir.t | 19 +------------------ scripts/storage/200-clone-vol-dir.t | 4 ++-- 15 files changed, 42 insertions(+), 43 deletions(-) -- 1.8.4.5

3 16

[libvirt] [PATCH] src: Generate virkeymaps.h into the correct directory
by Michal Privoznik 08 Oct '15

08 Oct '15

So after a9fe620372144db we are generating virkeymaps.h all the time during build. This is good. However, when doing a VPATH build, we are not generating it into the correct directory, since there's $(srcdir) prefix missing to the path to the file: make[2]: Entering directory `/home/jenkins/libvirt/systems/libvirt-fedora-20/build/src' GEN util/virkeymaps.h ... CC util/libvirt_util_la-virkeycode.lo CC util/libvirt_util_la-virkeyfile.lo CC util/libvirt_util_la-virlockspace.lo CC util/libvirt_util_la-virlog.lo ../../src/util/virkeycode.c:27:24: fatal error: virkeymaps.h: No such file or directory #include "virkeymaps.h" ^ compilation terminated. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Even though this would qualify as build breaker, I'm sending it for review. src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index e4660eb..0bf28cf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -177,10 +177,10 @@ EXTRA_DIST += $(srcdir)/util/keymaps.csv $(srcdir)/util/virkeycode-mapgen.py BUILT_SOURCES += util/virkeymaps.h MAINTAINERCLEANFILES += util/virkeymaps.h -util/virkeymaps.h: $(srcdir)/util/keymaps.csv \ +$(srcdir)/util/virkeymaps.h: $(srcdir)/util/keymaps.csv \ $(srcdir)/util/virkeycode-mapgen.py $(AM_V_GEN)$(PYTHON) $(srcdir)/util/virkeycode-mapgen.py \ - <$(srcdir)/util/keymaps.csv >util/virkeymaps.h + <$(srcdir)/util/keymaps.csv >$(srcdir)/util/virkeymaps.h # Internal generic driver infrastructure NODE_INFO_SOURCES = nodeinfo.h nodeinfo.c nodeinfopriv.h -- 2.4.9

3 2

[libvirt] [PATCH v2 0/4] Be tolerant to relabel errors for session mode
by Michal Privoznik 08 Oct '15

08 Oct '15

This is a reworked version of my previous patch: https://www.redhat.com/archives/libvir-list/2015-July/msg00576.html Michal Privoznik (4): virSecuritySELinuxSetSecurityAllLabel: drop useless virFileIsSharedFSType security_selinux: Replace SELinuxSCSICallbackData with proper struct virSecurityManager: Track if running as privileged security_selinux: Take @privileged into account src/lxc/lxc_controller.c | 2 +- src/lxc/lxc_driver.c | 3 +- src/qemu/qemu_driver.c | 7 +- src/security/security_manager.c | 29 ++++++-- src/security/security_manager.h | 5 +- src/security/security_selinux.c | 147 ++++++++++++++++++++++++--------------- tests/qemuhotplugtest.c | 2 +- tests/seclabeltest.c | 2 +- tests/securityselinuxlabeltest.c | 2 +- tests/securityselinuxtest.c | 2 +- 10 files changed, 127 insertions(+), 74 deletions(-) -- 2.4.6

3 6

[libvirt] [PATCH] vz: cleanup
by Maxim Nestratov 08 Oct '15

08 Oct '15

From: Maxim Nestratov <mnestratov(a)virtuozzo.com> Remove unused definitions, functions and structure fields. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/vz/vz_driver.c | 1 - src/vz/vz_utils.c | 67 ---------------------------------------------------- src/vz/vz_utils.h | 20 --------------- 3 files changed, 0 insertions(+), 88 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index d0b4692..15dc70f 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -262,7 +262,6 @@ vzOpenDefault(virConnectPtr conn) error: virObjectUnref(privconn->domains); virObjectUnref(privconn->caps); - virStoragePoolObjListFree(&privconn->pools); virObjectEventStateFree(privconn->domainEventState); prlsdkDisconnect(privconn); prlsdkDeinit(); diff --git a/src/vz/vz_utils.c b/src/vz/vz_utils.c index 08b7f5a..894f7dd 100644 --- a/src/vz/vz_utils.c +++ b/src/vz/vz_utils.c @@ -115,33 +115,6 @@ vzDoCmdRun(char **outbuf, const char *binary, va_list list) } /* - * Run command and parse its JSON output, return - * pointer to virJSONValue or NULL in case of error. - */ -virJSONValuePtr -vzParseOutput(const char *binary, ...) -{ - char *outbuf; - virJSONValuePtr jobj = NULL; - va_list list; - int ret; - - va_start(list, binary); - ret = vzDoCmdRun(&outbuf, binary, list); - va_end(list); - if (ret) - return NULL; - - jobj = virJSONValueFromString(outbuf); - if (!jobj) - virReportError(VIR_ERR_INTERNAL_ERROR, - _("invalid output from prlctl: %s"), outbuf); - - VIR_FREE(outbuf); - return jobj; -} - -/* * Run command and return its output, pointer to * buffer or NULL in case of error. Caller os responsible * for freeing the buffer. @@ -161,43 +134,3 @@ vzGetOutput(const char *binary, ...) return outbuf; } - -/* - * Run prlctl command and check for errors - * - * Return value is 0 in case of success, else - -1 - */ -int -vzCmdRun(const char *binary, ...) -{ - int ret; - va_list list; - - va_start(list, binary); - ret = vzDoCmdRun(NULL, binary, list); - va_end(list); - - return ret; -} - -/* - * Return new file path in malloced string created by - * concatenating first and second function arguments. - */ -char * -vzAddFileExt(const char *path, const char *ext) -{ - char *new_path = NULL; - size_t len = strlen(path) + strlen(ext) + 1; - - if (VIR_ALLOC_N(new_path, len) < 0) - return NULL; - - if (!virStrcpy(new_path, path, len)) { - VIR_FREE(new_path); - return NULL; - } - strcat(new_path, ext); - - return new_path; -} diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h index 77f49f0..84cf08f 100644 --- a/src/vz/vz_utils.h +++ b/src/vz/vz_utils.h @@ -27,11 +27,8 @@ # include "driver.h" # include "conf/domain_conf.h" -# include "conf/storage_conf.h" # include "conf/domain_event.h" -# include "conf/network_conf.h" # include "virthread.h" -# include "virjson.h" # define vzParseError() \ virReportErrorHelper(VIR_FROM_TEST, VIR_ERR_OPERATION_FAILED, __FILE__, \ @@ -50,11 +47,6 @@ # define PARALLELS_DOMAIN_ROUTED_NETWORK_NAME "Routed" # define PARALLELS_DOMAIN_BRIDGED_NETWORK_NAME "Bridged" -# define PARALLELS_REQUIRED_HOSTONLY_NETWORK "Host-Only" -# define PARALLELS_HOSTONLY_NETWORK_TYPE "host-only" -# define PARALLELS_REQUIRED_BRIDGED_NETWORK "Bridged" -# define PARALLELS_BRIDGED_NETWORK_TYPE "bridged" - struct _vzConn { virMutex lock; @@ -62,12 +54,9 @@ struct _vzConn { virDomainObjListPtr domains; PRL_HANDLE server; - virStoragePoolObjList pools; - virNetworkObjListPtr networks; virCapsPtr caps; virDomainXMLOptionPtr xmlopt; virObjectEventStatePtr domainEventState; - virStorageDriverStatePtr storageState; const char *drivername; }; @@ -97,19 +86,10 @@ typedef struct vzDomObj *vzDomObjPtr; virDomainObjPtr vzDomObjFromDomain(virDomainPtr domain); virDomainObjPtr vzDomObjFromDomainRef(virDomainPtr domain); -virJSONValuePtr vzParseOutput(const char *binary, ...) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL; char * vzGetOutput(const char *binary, ...) ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL; -int vzCmdRun(const char *binary, ...) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL; -char * vzAddFileExt(const char *path, const char *ext); void vzDriverLock(vzConnPtr driver); void vzDriverUnlock(vzConnPtr driver); -virStorageVolPtr vzStorageVolLookupByPathLocked(virConnectPtr conn, - const char *path); -int vzStorageVolDefRemove(virStoragePoolObjPtr privpool, - virStorageVolDefPtr privvol); # define PARALLELS_BLOCK_STATS_FOREACH(OP) \ OP(rd_req, VIR_DOMAIN_BLOCK_STATS_READ_REQ, "read_requests") \ -- 1.7.1

2 1

[libvirt] [PATCH] AUTHORS: Add myself to the list of committers
by Andrea Bolognani 08 Oct '15

08 Oct '15

--- Ján insisted so much. Pushed as trivial. AUTHORS.in | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.in b/AUTHORS.in index 7e4359f..d385fbc 100644 --- a/AUTHORS.in +++ b/AUTHORS.in @@ -8,6 +8,7 @@ Daniel Veillard <veillard(a)redhat.com> or <daniel(a)veillard.com> The primary maintainers and people with commit access rights: Alex Jia <ajia(a)redhat.com> +Andrea Bolognani <abologna(a)redhat.com> Cédric Bosdonnat <cbosdonnat(a)suse.com> Christophe Fergeau <cfergeau(a)redhat.com> Claudio Bley <claudio.bley(a)gmail.com> -- 2.4.3

1 0

[libvirt] [PATCH tck 0/3] Account for blockstats changes in 121-block-info.t
by Mike Latimer 08 Oct '15

08 Oct '15

Hi, Due to libvirt commit 0282ca45, 121-block-info.t fails as the allocation size returned by block-info is now zero. While addressing this, a few aspects of the test were also cleaned up. The changes are not extensive, but it made more sense to submit them in a series. Thanks, Mike Mike Latimer (3): Rename volume1 variables Reorder and add qcow tests Disk allocation should be zero scripts/domain/121-block-info.t | 65 +++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 28 deletions(-) -- 1.8.4.5

2 6

[libvirt] [sandbox] virt-sandbox-image: separate templates from the different sources
by Cédric Bosdonnat 08 Oct '15

08 Oct '15

Put templates files in a folder for the corresponding source to avoid potential name conflicts. --- libvirt-sandbox/image/cli.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/libvirt-sandbox/image/cli.py b/libvirt-sandbox/image/cli.py index d449a7b..9b9c00b 100755 --- a/libvirt-sandbox/image/cli.py +++ b/libvirt-sandbox/image/cli.py @@ -64,17 +64,21 @@ def debug(msg): def info(msg): sys.stdout.write(msg) +def get_template_dir(args): + tmpl = template.Template.from_uri(args.template) + return "%s/%s" % (args.template_dir, tmpl.source) + def delete(args): tmpl = template.Template.from_uri(args.template) source = tmpl.get_source_impl() source.delete_template(template=tmpl, - templatedir=args.template_dir) + templatedir=get_template_dir(args)) def create(args): tmpl = template.Template.from_uri(args.template) source = tmpl.get_source_impl() source.create_template(template=tmpl, - templatedir=args.template_dir, + templatedir=get_template_dir(args), connect=args.connect) def run(args): @@ -83,9 +87,10 @@ def run(args): tmpl = template.Template.from_uri(args.template) source = tmpl.get_source_impl() + template_dir = get_template_dir(args) # Create the template image if needed - if not source.has_template(tmpl, args.template_dir): + if not source.has_template(tmpl, template_dir): create(args) name = args.name @@ -94,11 +99,11 @@ def run(args): name = tmpl.path[1:] + ":" + randomid diskfile = source.get_disk(template=tmpl, - templatedir=args.template_dir, + templatedir=template_dir, imagedir=args.image_dir, sandboxname=name) - commandToRun = source.get_command(tmpl, args.template_dir, args.args) + commandToRun = source.get_command(tmpl, template_dir, args.args) if len(commandToRun) == 0: commandToRun = ["/bin/sh"] cmd = ['virt-sandbox', '--name', name] @@ -112,7 +117,7 @@ def run(args): params.append('-N') params.append(networkArgs) - allEnvs = source.get_env(tmpl, args.template_dir) + allEnvs = source.get_env(tmpl, template_dir) envArgs = args.env if envArgs is not None: allEnvs = allEnvs + envArgs @@ -128,7 +133,7 @@ def run(args): cmd = cmd + params + ['--'] + commandToRun subprocess.call(cmd) os.unlink(diskfile) - source.post_run(tmpl, args.template_dir, name) + source.post_run(tmpl, template_dir, name) def requires_template(parser): parser.add_argument("template", -- 2.1.4

2 1

Re: [libvirt] [PATCH v2] Close the source fd if the destination qemu exits during tunnelled migration
by John Ferlan 08 Oct '15

08 Oct '15

On 09/29/2015 10:06 AM, Shivaprasad bhat wrote: [...] >> Perhaps I should clarify my query-migrate has no timeout comment... It >> seems based on what I've read so far, the 'query-migrate' command >> started successfully, because if it hadn't we would have received a >> failure (as shown below). Thus libvirt has sent the command via the >> monitor and is waiting for a response (e.g. the virCondWait after the >> qemuMonitorSend in the trace below). The response isn't coming because >> either "A" qemu didn't send it back or "B" libvirt missed it - that >> should be determinable. >> >> There's a way to turn on debugging so the monitor dialog can be seen - >> via changes to /etc/libvirt/libvirtd.conf. I use : >> >> log_level = 1 >> log_filters="3:remote 4:event 3:json 3:rpc" >> log_outputs="1:file:/var/log/libvirt/libvirtd.log" >> >> But you may need to remove the "3:json" in order to see the dialog since >> that where it "feels like" the issue might be. Then start libvirtd in >> the debugger again. Once it's hung - you should be able to scan (eg, >> edit) the libvirtd.log file and search for the "query-migrate" command >> being sent and then follow the copious output looking for the presence >> of a returned command. If there is none, then something in qemu isn't >> returning the failure correctly and it would need to be fixed there I >> would think as opposed to throwing down the big hammer of closing the fd. > > Had a chance to run with your log settings. The query-migrate doesn't seem to > have a corresponding "return" in the logs. So as you say, there may be > a qemu bug > that is not returning a response when the fd is still open(as libvirt > didnt close it) but > no read actually happening there. I felt qemu can't sense the failure as the fd > is open, so posted this patch. Though, the qemu should return with the > current state > of migration as it sees instead of not returning at all. Hope we are > on the same page. > > Thanks, > Shivaprasad > Meant to respond yesterday but got wrapped up in other things. OK - so at least now it makes a bit more sense why purely adding a stream_abort didn't work - we're not getting a reply from the monitor. So there's perhaps 3 ways to "resolve" this issue (that come to my mind) 1. As you've done with the close() in the error path of qemuMigrationIOFunc when the virStream{Send|Finish} fails. Although this does feel like a work-around, I suppose since the tunnel is a libvirt created thing and qemu isn't aware of it, then it feels reasonable. Although that does make me wonder how qemu could be hung up. What would something like a "virsh qemu-monitor-command $dom '{"execute":"query-migrate"}' return when the source is hung? Or does it hang too? 2. Adding some sort of "timeout" logic in qemuMonitorSend (e.g. virCondWaitUntil instead of virCondWait) to handle when a command doesn't get a response. Not sure this is right either since it's not clear to me there is a "time" that "all" commands are guaranteed to be run in/by, especially async ones. 3. Dig into qemu to figure out why it's not returning anything for a migrate-status request. Currently a bit beyond what I've done, but I believe would require attaching into the running qemu process to see if there was some thread "stuck" somewhere "waiting" on something that won't return because the stream closed. Hopefully Jiri (or perhaps Daniel) could provide some other insights. John

2 1

[libvirt] [PATCH 0/4] storage: Add a 'created' boolean for buildVol[From]
by John Ferlan 08 Oct '15

08 Oct '15

In the review of a recent series dealing with a needing to refresh a pool prior to adding a new volume: http://www.redhat.com/archives/libvir-list/2015-October/msg00109.html it was noted that there would be a small timing window possible between the check and the actual volume creation attempt. Michal noted that we could add a 'created' type flag in order to "know" whether the libvirt API's created the volume or not during their buildVol API. As these things usually do, this also morphed into also needing the same boolean for the buildVolFrom API. So that's what this series does... Ok mostly, patch 1 doesn't have anything to do with this, but I saw the anomaly why working my way through the code. John Ferlan (4): storage: Perform some cleanup of calls storage: Add created to virFileOpenAs storage: Add created to virDirCreate storage: Add checks for buildVol create file src/libxl/libxl_domain.c | 3 ++- src/libxl/libxl_driver.c | 3 ++- src/qemu/qemu_driver.c | 7 +++++-- src/qemu/qemu_process.c | 6 +++--- src/storage/storage_backend.c | 28 ++++++++++++++++------------ src/storage/storage_backend.h | 3 +++ src/storage/storage_backend_disk.c | 3 ++- src/storage/storage_backend_fs.c | 22 +++++++++++++++++----- src/storage/storage_backend_logical.c | 3 ++- src/storage/storage_backend_rbd.c | 2 ++ src/storage/storage_backend_sheepdog.c | 2 ++ src/storage/storage_driver.c | 16 +++++++++++----- src/util/virfile.c | 23 ++++++++++++++++++----- src/util/virfile.h | 4 ++-- src/util/virstoragefile.c | 3 ++- 15 files changed, 89 insertions(+), 39 deletions(-) -- 2.1.0

2 10