- Devel - libvirt List Archives

[libvirt] [PATCH] storage: Fix regression in storagePoolUpdateAllState
by Erik Skultety 08 Jul '15

08 Jul '15

Commit 2a31c5f0 introduced support for storage pool state XMLs, however it also introduced a regression: if (!virstoragePoolObjIsActive(pool)) { virStoragePoolObjUnlock(pool); continue; } The idea behind this was that since we've got state XMLs and the pool wasn't marked as active by autostart routine (if the autostart flag had been set earlier), the pool is inactive and we can leave it be and continue with other pools. However, filesystem type pools like fs,dir, possibly netfs are supposed to be active if the filesystem is mounted on the host. And this is exactly where the regression occurs, e.g. pool type 'dir' which has been previously destroyed and marked as !autostart gets filtered out by the condition above. The resolution should be simply to remove the condition completely, all pools will get their 'active' flag updated by check callback and if they do not support such callback, the logic doesn't change and such pools will be inactive by default (e.g. RBD, even if a state XML exists). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1238610 --- src/storage/storage_driver.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index e600514..d3cdbc5 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -142,11 +142,6 @@ storagePoolUpdateAllState(void) virStoragePoolObjPtr pool = driver->pools.objs[i]; virStoragePoolObjLock(pool); - if (!virStoragePoolObjIsActive(pool)) { - virStoragePoolObjUnlock(pool); - continue; - } - storagePoolUpdateState(pool); virStoragePoolObjUnlock(pool); } -- 1.9.3

2 2

[libvirt] [PATCH 0/3] bitmap: Fix regression when getting iothread info
by Peter Krempa 08 Jul '15

08 Jul '15

Peter Krempa (3): vz: Remove dead code from vzDomainGetVcpus vz: Use virBitmapToDataBuf instead of virBitmapToData in vzDomainGetVcpus util: bitmap: Don't alloc overly large binary bitmaps src/util/virbitmap.c | 7 +++++-- src/vz/vz_driver.c | 24 ++++-------------------- 2 files changed, 9 insertions(+), 22 deletions(-) -- 2.4.5

2 5

[libvirt] [PATCH] qemu: move the guest status check before agent config and status check
by Luyao Huang 08 Jul '15

08 Jul '15

When use setvcpus command with --guest option to a offline vm, we will get error: # virsh setvcpus test3 1 --guest error: Guest agent is not responding: QEMU guest agent is not connected However guest is not running, agent status could not be connected. In this case, report domain is not running will be better than agent is not connected. Move the guest status check more early to output error to point out guest status is not right. Also from the logic, a running vm is a basic requirement to use agent, we cannot use agent if vm is not running. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_domain.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f9bf32c..814fb2c 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -3084,6 +3084,13 @@ qemuDomainAgentAvailable(virDomainObjPtr vm, } return false; } + if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_RUNNING) { + if (reportError) { + virReportError(VIR_ERR_OPERATION_INVALID, "%s", + _("domain is not running")); + } + return false; + } if (!priv->agent) { if (qemuFindAgentConfig(vm->def)) { if (reportError) { @@ -3099,13 +3106,6 @@ qemuDomainAgentAvailable(virDomainObjPtr vm, return false; } } - if (virDomainObjGetState(vm, NULL) != VIR_DOMAIN_RUNNING) { - if (reportError) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("domain is not running")); - } - return false; - } return true; } -- 1.8.3.1

3 2

[libvirt] [PATCH] qemu: remove deadcode in qemuDomain{HelperGetVcpus|GetIOThreadsLive}
by Luyao Huang 08 Jul '15

08 Jul '15

We set hostcpus but not use them. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_driver.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7a04e67..3f002b3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1418,13 +1418,9 @@ static int qemuDomainHelperGetVcpus(virDomainObjPtr vm, virVcpuInfoPtr info, int maxinfo, unsigned char *cpumaps, int maplen) { - int hostcpus; size_t i, v; qemuDomainObjPrivatePtr priv = vm->privateData; - if ((hostcpus = nodeGetCPUCount()) < 0) - return -1; - if (priv->vcpupids == NULL) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("cpu affinity is not supported")); @@ -5579,7 +5575,6 @@ qemuDomainGetIOThreadsLive(virQEMUDriverPtr driver, qemuMonitorIOThreadInfoPtr *iothreads = NULL; virDomainIOThreadInfoPtr *info_ret = NULL; int niothreads = 0; - int hostcpus; size_t i; int ret = -1; @@ -5612,9 +5607,6 @@ qemuDomainGetIOThreadsLive(virQEMUDriverPtr driver, goto endjob; } - if ((hostcpus = nodeGetCPUCount()) < 0) - goto endjob; - if (VIR_ALLOC_N(info_ret, niothreads) < 0) goto endjob; -- 1.8.3.1

3 2

[libvirt] [PATCH] rpc: ensure daemon is spawn even if dead socket exists
by Daniel P. Berrange 08 Jul '15

08 Jul '15

The auto-spawn code would originally attempt to spawn the daemon for both ENOENT and ECONNREFUSED errors from connect(). The various refactorings eventually lost this so we only spawn the daemon on ENOENT. The result is if the daemon exits uncleanly, so that the socket is left in the filesystem, we will never be able to auto-spawn the daemon again. --- src/rpc/virnetsocket.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 3d75081..106d09a 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -681,7 +681,8 @@ int virNetSocketNewConnectUNIX(const char *path, while (retries && connect(fd, &remoteAddr.data.sa, remoteAddr.len) < 0) { - if (!(spawnDaemon && errno == ENOENT)) { + if (!(spawnDaemon && (errno == ENOENT || + errno == ECONNREFUSED))) { virReportSystemError(errno, _("Failed to connect socket to '%s'"), path); goto cleanup; -- 2.4.3

2 1

[libvirt] [glib v2 0/2] misc gconfig fixes
by Cédric Bosdonnat 08 Jul '15

08 Jul '15

Hi all, Here is a version fixing two bugs I introduced. Diff to v1: * takes into account teuf's comments. Cédric Bosdonnat (2): Don't overwrite filesystem type when writing format Dsitribute the whole tests/xml folder libvirt-gconfig/libvirt-gconfig-domain-filesys.c | 4 ++-- tests/Makefile.am | 14 +------------- tests/test-gconfig.c | 2 +- tests/xml/gconfig-domain-device-filesys.xml | 2 +- 4 files changed, 5 insertions(+), 17 deletions(-) -- 2.1.4

2 3

[libvirt] [glib] Don't overwrite filesystem type when writing format
by Cédric Bosdonnat 07 Jul '15

07 Jul '15

When setting filesystem driver format first and type, only the type remained and vice-versa. --- libvirt-gconfig/libvirt-gconfig-domain-filesys.c | 8 ++++++-- tests/test-gconfig.c | 2 +- tests/xml/gconfig-domain-device-filesys.xml | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-filesys.c b/libvirt-gconfig/libvirt-gconfig-domain-filesys.c index 9b73af5..4e33d5f 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-filesys.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-filesys.c @@ -125,7 +125,9 @@ void gvir_config_domain_filesys_set_driver_type(GVirConfigDomainFilesys *filesys GVirConfigObject *node; g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_FILESYS(filesys)); - node = gvir_config_object_replace_child(GVIR_CONFIG_OBJECT(filesys), "driver"); + node = gvir_config_object_get_child(GVIR_CONFIG_OBJECT(filesys), "driver"); + if (!node) + node = gvir_config_object_add_child(GVIR_CONFIG_OBJECT(filesys), "driver"); g_return_if_fail(GVIR_CONFIG_IS_OBJECT(node)); if (type != GVIR_CONFIG_DOMAIN_FILESYS_DRIVER_DEFAULT) gvir_config_object_set_attribute_with_type( @@ -143,7 +145,9 @@ void gvir_config_domain_filesys_set_driver_format(GVirConfigDomainFilesys *files GVirConfigObject *node; g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_FILESYS(filesys)); - node = gvir_config_object_replace_child(GVIR_CONFIG_OBJECT(filesys), "driver"); + node = gvir_config_object_get_child(GVIR_CONFIG_OBJECT(filesys), "driver"); + if (!node) + node = gvir_config_object_add_child(GVIR_CONFIG_OBJECT(filesys), "driver"); g_return_if_fail(GVIR_CONFIG_IS_OBJECT(node)); gvir_config_object_set_attribute_with_type( diff --git a/tests/test-gconfig.c b/tests/test-gconfig.c index bd2daa6..0eec53e 100644 --- a/tests/test-gconfig.c +++ b/tests/test-gconfig.c @@ -368,7 +368,7 @@ static void test_domain_device_filesystem(void) fs = gvir_config_domain_filesys_new(); gvir_config_domain_filesys_set_type(fs, GVIR_CONFIG_DOMAIN_FILESYS_FILE); gvir_config_domain_filesys_set_access_type(fs, GVIR_CONFIG_DOMAIN_FILESYS_ACCESS_MAPPED); - gvir_config_domain_filesys_set_driver_type(fs, GVIR_CONFIG_DOMAIN_FILESYS_DRIVER_DEFAULT); + gvir_config_domain_filesys_set_driver_type(fs, GVIR_CONFIG_DOMAIN_FILESYS_DRIVER_NBD); gvir_config_domain_filesys_set_driver_format(fs, GVIR_CONFIG_DOMAIN_DISK_FORMAT_QCOW2); gvir_config_domain_filesys_set_source(fs, "/path/to/source"); gvir_config_domain_filesys_set_target(fs, "/path/to/target1"); diff --git a/tests/xml/gconfig-domain-device-filesys.xml b/tests/xml/gconfig-domain-device-filesys.xml index 30152d2..a831c02 100644 --- a/tests/xml/gconfig-domain-device-filesys.xml +++ b/tests/xml/gconfig-domain-device-filesys.xml @@ -1,7 +1,7 @@ <domain> <devices> <filesystem type="file" accessmode="mapped"> - <driver format="qcow2"/> + <driver type="nbd" format="qcow2"/> <source file="/path/to/source"/> <target dir="/path/to/target1"/> <readonly/> -- 2.1.4

3 3

[libvirt] [glib] Add filesys xml file to distribution
by Cédric Bosdonnat 07 Jul '15

07 Jul '15

Tests can't succeed from the distribution tarball: the new gconfig-domain-device-filesys.xml file wasn't included. --- tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 63865e8..c8bb4c7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -23,6 +23,7 @@ EXTRA_DIST += \ xml/gconfig-domain-device-channel.xml \ xml/gconfig-domain-device-console.xml \ xml/gconfig-domain-device-disk.xml \ + xml/gconfig-domain-device-filesys.xml \ xml/gconfig-domain-device-graphics.xml \ xml/gconfig-domain-device-input.xml \ xml/gconfig-domain-device-network.xml \ -- 2.1.4

2 1

[libvirt] [PATCH v2 0/1] vz: assign static IPs and default gateways for network adapter
by Mikhail Feoktistov 07 Jul '15

07 Jul '15

fix "avoid_if_before_free" warnings for VIR_FREE calls fix "found diagnostic without %" warnings for virReportError calls use virAsprintf instead of virBufferAsprintf set default gateway only if static ip is present write inet family to log in case of unsupported gateway Mikhail Feoktistov (1): vz: assign static IPs and default gateways for network adapter

2 2

[libvirt] [PATCH RESEND] Added support for portable-rpcgen from portablexdr library
by Pavel Fedin 07 Jul '15

07 Jul '15

This patch allows to build libvirt natively under MinGW/MSYS using portablexdr library. An updated version of portablexdr with fixed bugs is available as part of MSYS2 project. Signed-off-by: Pavel Fedin <p.fedin(a)samsung.com> --- configure.ac | 2 +- src/lxc/lxc_monitor_protocol.x | 2 +- src/rpc/genprotocol.pl | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index aed0934..547a405 100644 --- a/configure.ac +++ b/configure.ac @@ -397,7 +397,7 @@ AM_CONDITIONAL([HAVE_LIBTASN1], [test "x$ac_cv_header_libtasn1_h" = "xyes"]) AC_CHECK_LIB([intl],[gettext],[]) dnl Do we have rpcgen? -AC_PATH_PROG([RPCGEN], [rpcgen], [no]) +AC_PATH_PROGS([RPCGEN], [rpcgen portable-rpcgen], [no]) AM_CONDITIONAL([HAVE_RPCGEN], [test "x$ac_cv_path_RPCGEN" != "xno"]) dnl Is this GLIBC's buggy rpcgen? AM_CONDITIONAL([HAVE_GLIBC_RPCGEN], diff --git a/src/lxc/lxc_monitor_protocol.x b/src/lxc/lxc_monitor_protocol.x index 3b66af5..205d7c2 100644 --- a/src/lxc/lxc_monitor_protocol.x +++ b/src/lxc/lxc_monitor_protocol.x @@ -30,7 +30,7 @@ enum virLXCMonitorExitStatus { }; struct virLXCMonitorExitEventMsg { - enum virLXCMonitorExitStatus status; + virLXCMonitorExitStatus status; }; struct virLXCMonitorInitEventMsg { diff --git a/src/rpc/genprotocol.pl b/src/rpc/genprotocol.pl index 6e6d6d4..1ac2507 100755 --- a/src/rpc/genprotocol.pl +++ b/src/rpc/genprotocol.pl @@ -38,7 +38,10 @@ my $target = shift; unlink $target; -open RPCGEN, "-|", $rpcgen, $mode, $xdrdef +if ($rpcgen =~ /portable-rpcgen/) { + $rpcgen = "$rpcgen -o -"; +} +open RPCGEN, "-|", "$rpcgen $mode $xdrdef" or die "cannot run $rpcgen $mode $xdrdef: $!"; open TARGET, ">$target" or die "cannot create $target: $!"; -- 1.9.5.msysgit.0 -- libvir-list mailing list libvir-list(a)redhat.com https://www.redhat.com/mailman/listinfo/libvir-list

2 4