- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: fix one reboot scenario
by Maxim Nestratov 11 Nov '16

11 Nov '16

Both qemuDomainReboot and qemuDomainShutdownFlags do the following if they were called to reboot: 1. use agent and call qemuAgentShutdown 2. then if the above function doesn't succeed, try qemuMonitorSystemPowerdown When the first step is called, it resets fakeReboot flag, while the second one, opposite to that, sets it. Thus, in case we tried to use agent to reboot a guest and failed for some reason, we end up with fakeReboot flag set. After that, as qemuMonitorSystemPowerdown function was called, libvirt is notified with POWERDOWN. The problem is that there is no callback routine set for it. The lack of monitor event reaction leads to incorrect logic and guest doesn't restart or reboot correctly. The patch simply sets domainPowerdown monitor callback to qemuProcessHandleShutdown as powerdown event processing is actually equal to shutdown. Signed-off-by: Maxim Nestratov <mnestratov(a)virtuozzo.com> --- src/qemu/qemu_process.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 04b25fe..0de9fa5 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1630,6 +1630,7 @@ static qemuMonitorCallbacks monitorCallbacks = { .diskSecretLookup = qemuProcessFindVolumeQcowPassphrase, .domainEvent = qemuProcessHandleEvent, .domainShutdown = qemuProcessHandleShutdown, + .domainPowerdown = qemuProcessHandleShutdown, .domainStop = qemuProcessHandleStop, .domainResume = qemuProcessHandleResume, .domainReset = qemuProcessHandleReset, -- 2.4.11

2 3

[libvirt] [PATCH] qemu: Remove erroneously placed comments for numerical ordering
by John Ferlan 11 Nov '16

11 Nov '16

Commit id '74bbb8c2ec' seems to have mismerged a bit - adding 240 comments out of place. Just clean that up. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushed as trivial src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5a3004d..ad98d68 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -351,8 +351,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST, "ivshmem-doorbell", /* 240 */ "query-qmp-schema", - - "gluster.debug_level", /* 240 */ + "gluster.debug_level", ); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 02014c0..9163572 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -386,8 +386,6 @@ typedef enum { /* 240 */ QEMU_CAPS_DEVICE_IVSHMEM_DOORBELL, /* -device ivshmem-doorbell */ QEMU_CAPS_QUERY_QMP_SCHEMA, /* query-qmp-schema command */ - - /* 240 */ QEMU_CAPS_GLUSTER_DEBUG_LEVEL, /* -drive gluster.debug_level={0..9} */ QEMU_CAPS_LAST /* this must always be the last item */ -- 2.7.4

2 1

[libvirt] [PATCH] qemu: Make sure shmem memory is shared
by Martin Kletzander 10 Nov '16

10 Nov '16

Even though using /dev/shm/asdf as the backend, we still need to make the mapping shared. The original patch forgot to add that parameter. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1392031 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_command.c | 1 + tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.args | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index caa80e74c26a..d3f99d34c67f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8565,6 +8565,7 @@ qemuBuildShmemBackendMemProps(virDomainShmemDefPtr shmem) virJSONValueObjectCreate(&ret, "s:mem-path", mem_path, "U:size", shmem->size, + "b:share", true, NULL); VIR_FREE(mem_path); diff --git a/tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.args b/tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.args index 7abc7f8c4be5..688b7c7f63e2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-shmem-plain-doorbell.args @@ -18,13 +18,13 @@ QEMU_AUDIO_DRV=none \ -boot c \ -usb \ -object memory-backend-file,id=shmmem-shmem0,mem-path=/dev/shm/shmem0,\ -size=4194304 \ +size=4194304,share=yes \ -device ivshmem-plain,id=shmem0,memdev=shmmem-shmem0,bus=pci.0,addr=0x3 \ -object memory-backend-file,id=shmmem-shmem1,mem-path=/dev/shm/shmem1,\ -size=134217728 \ +size=134217728,share=yes \ -device ivshmem-plain,id=shmem1,memdev=shmmem-shmem1,bus=pci.0,addr=0x5 \ -object memory-backend-file,id=shmmem-shmem2,mem-path=/dev/shm/shmem2,\ -size=268435456 \ +size=268435456,share=yes \ -device ivshmem-plain,id=shmem2,memdev=shmmem-shmem2,bus=pci.0,addr=0x4 \ -device ivshmem-doorbell,id=shmem3,chardev=charshmem3,ioeventfd=on,bus=pci.0,\ addr=0x6 \ -- 2.10.2

3 2

[libvirt] [PATCH 0/2 v2] List only online cpus for vcpupin/emulatorpin when vcpu placement static
by Nitesh Konkar 10 Nov '16

10 Nov '16

Currently when the vcpu placement is static and cpuset is not specified, CPU Affinity shows 0.. CPUMAX. This patchset will result in display of only online CPU's under CPU Affinity on linux. Nitesh Konkar (2): conf: List only online cpus for virsh vcpupin conf: List only online cpus for virsh emulatorpin src/conf/domain_conf.c | 8 +++++++- src/qemu/qemu_driver.c | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) -- 2.1.0

2 3

[libvirt] [PATCH] qemu_capabilities: fix build with for old gcc
by Pavel Hrdina 10 Nov '16

10 Nov '16

../../src/qemu/qemu_capabilities.c:3757: error: declaration of 'basename' shadows a global declaration [-Wshadow] Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- Pushed under build-breaker rule. Sigh, I've just noticed the $subject. src/qemu/qemu_capabilities.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ab1fc09..5a3004d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3754,7 +3754,7 @@ virQEMUCapsQMPSchemaObjectGetType(const char *field, static virJSONValuePtr -virQEMUCapsQMPSchemaTraverse(const char *basename, +virQEMUCapsQMPSchemaTraverse(const char *baseName, char **query, virHashTablePtr schema) { @@ -3762,7 +3762,7 @@ virQEMUCapsQMPSchemaTraverse(const char *basename, const char *metatype; do { - if (!(base = virHashLookup(schema, basename))) + if (!(base = virHashLookup(schema, baseName))) return NULL; if (!*query) @@ -3773,25 +3773,25 @@ virQEMUCapsQMPSchemaTraverse(const char *basename, /* flatten arrays by default */ if (STREQ(metatype, "array")) { - if (!(basename = virJSONValueObjectGetString(base, "element-type"))) + if (!(baseName = virJSONValueObjectGetString(base, "element-type"))) return NULL; continue; } else if (STREQ(metatype, "object")) { if (**query == '+') - basename = virQEMUCapsQMPSchemaObjectGetType("variants", + baseName = virQEMUCapsQMPSchemaObjectGetType("variants", *query + 1, "case", base); else - basename = virQEMUCapsQMPSchemaObjectGetType("members", + baseName = virQEMUCapsQMPSchemaObjectGetType("members", *query, "name", base); - if (!basename) + if (!baseName) return NULL; } else if (STREQ(metatype, "command") || STREQ(metatype, "event")) { - if (!(basename = virJSONValueObjectGetString(base, *query))) + if (!(baseName = virJSONValueObjectGetString(base, *query))) return NULL; } else { /* alternates, basic types and enums can't be entered */ -- 2.10.2

1 0

[libvirt] [PATCH] xen: remove legacy hack for RHEL-5 Xen
by Daniel P. Berrange 10 Nov '16

10 Nov '16

We dropped support for RHEL-5 vintage Xen a while ago, but forgot to remove some of the hacks for it. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- configure.ac | 8 -------- src/xen/xen_hypervisor.c | 6 +----- src/xen/xm_internal.c | 9 ++------- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/configure.ac b/configure.ac index 9e26b8c..b4292ba 100644 --- a/configure.ac +++ b/configure.ac @@ -634,14 +634,6 @@ fi AM_CONDITIONAL([WITH_SYSCTL], test "$with_sysctl" = "yes") AC_MSG_RESULT($with_sysctl) -dnl RHEL-5 has a peculiar version of Xen, which requires some special casing -AC_ARG_WITH([rhel5-api], - [AS_HELP_STRING([--with-rhel5-api=@<:@ARG@:>@], - [build for the RHEL-5 API @<:@default=no@:>@])]) -if test x"$with_rhel5_api" = x"yes"; then - AC_DEFINE([WITH_RHEL5_API], [1], [whether building for the RHEL-5 API]) -fi - AC_PATH_PROG([IP_PATH], [ip], /sbin/ip, [/usr/sbin:$PATH]) AC_DEFINE_UNQUOTED([IP_PATH], "$IP_PATH", [path to ip binary]) diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 79b25b3..0177f83 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -120,11 +120,7 @@ typedef privcmd_hypercall_t hypercall_t; # define __HYPERVISOR_domctl 36 #endif -#ifdef WITH_RHEL5_API -# define SYS_IFACE_MIN_VERS_NUMA 3 -#else -# define SYS_IFACE_MIN_VERS_NUMA 4 -#endif +#define SYS_IFACE_MIN_VERS_NUMA 4 static int xen_ioctl_hypercall_cmd; static struct xenHypervisorVersions hv_versions = { diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index 10c9097..fba814a 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -55,13 +55,8 @@ VIR_LOG_INIT("xen.xm_internal"); -#ifdef WITH_RHEL5_API -# define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 0 -# define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 2 -#else -# define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 3 -# define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 3 -#endif +#define XEND_CONFIG_MAX_VERS_NET_TYPE_IOEMU 3 +#define XEND_CONFIG_MIN_VERS_PVFB_NEWCONF 3 /* The true Xen limit varies but so far is always way less than 1024, which is the Linux kernel limit according -- 2.9.3

2 1

[libvirt] [PATCH] configure: remove fallback check for parted
by Daniel P. Berrange 10 Nov '16

10 Nov '16

Since we no longer support building on RHEL-5, we can drop the non-pkg-config based check for parted. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- configure.ac | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/configure.ac b/configure.ac index b4292ba..3ff4c42 100644 --- a/configure.ac +++ b/configure.ac @@ -1869,18 +1869,6 @@ if test "$with_storage_disk" = "yes" || PKG_CHECK_MODULES([LIBPARTED], [libparted >= $PARTED_REQUIRED], [], [PARTED_FOUND=no]) fi - if test "$PARTED_FOUND" = "no"; then - # RHEL-5 vintage parted is missing pkg-config files - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - PARTED_FOUND=yes - AC_CHECK_HEADER([parted/parted.h],,[PARTED_FOUND=no]) - AC_CHECK_LIB([uuid], [uuid_generate],,[PARTED_FOUND=no]) - AC_CHECK_LIB([parted], [ped_device_read],,[PARTED_FOUND=no]) - LIBPARTED_LIBS="-luuid -lparted" - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - fi if test "$with_storage_disk" = "yes" && test "$PARTED_FOUND" != "yes"; then -- 2.9.3

2 1

[libvirt] [PATCH] lxc.conf: s/QEMU/LXC
by Michal Privoznik 10 Nov '16

10 Nov '16

There's one copy paste error where a comment mentions QEMU instead of LXC driver. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/lxc/lxc.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lxc/lxc.conf b/src/lxc/lxc.conf index 8df4601..318a536 100644 --- a/src/lxc/lxc.conf +++ b/src/lxc/lxc.conf @@ -15,7 +15,7 @@ # The default security driver is SELinux. If SELinux is disabled # on the host, then the security driver will automatically disable -# itself. If you wish to disable QEMU SELinux security driver while +# itself. If you wish to disable LXC SELinux security driver while # leaving SELinux enabled for the host in general, then set this # to 'none' instead. # -- 2.8.4

2 1

[libvirt] [PATCH] qemu: Fix double free when live-attaching shmem
by Martin Kletzander 10 Nov '16

10 Nov '16

Function qemuDomainAttachShmemDevice() steals the device data if the hotplug was successful, but the condition checked for unsuccessful execution otherwise. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 38c841420e32..a82e58b29f29 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7615,7 +7615,7 @@ qemuDomainAttachDeviceLive(virDomainObjPtr vm, case VIR_DOMAIN_DEVICE_SHMEM: ret = qemuDomainAttachShmemDevice(driver, vm, dev->data.shmem); - if (ret < 0) { + if (!ret) { alias = dev->data.shmem->info.alias; dev->data.shmem = NULL; } -- 2.10.2

3 3

[libvirt] [PATCH] test driver: Deny some operations on inactive domains
by Michal Privoznik 09 Nov '16

09 Nov '16

Some operations like reboot, save, coreDump, blockStats, ifaceStats make sense iff domain is running. While it is technically possible for our test driver to return success regardless of domain state, we should copy constraints from other drivers and thus deny these operations over inactive domains. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/test/test_driver.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index c5e1a45..236874f 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1867,6 +1867,12 @@ static int testDomainReboot(virDomainPtr domain, if (!(privdom = testDomObjFromDomain(domain))) goto cleanup; + if (!virDomainObjIsActive(privdom)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto cleanup; + } + virDomainObjSetState(privdom, VIR_DOMAIN_SHUTDOWN, VIR_DOMAIN_SHUTDOWN_USER); @@ -1987,6 +1993,12 @@ testDomainSaveFlags(virDomainPtr domain, const char *path, if (!(privdom = testDomObjFromDomain(domain))) goto cleanup; + if (!virDomainObjIsActive(privdom)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto cleanup; + } + xml = virDomainDefFormat(privdom->def, privconn->caps, VIR_DOMAIN_DEF_FORMAT_SECURE); @@ -2185,6 +2197,12 @@ static int testDomainCoreDumpWithFormat(virDomainPtr domain, if (!(privdom = testDomObjFromDomain(domain))) goto cleanup; + if (!virDomainObjIsActive(privdom)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto cleanup; + } + if ((fd = open(to, O_CREAT|O_TRUNC|O_WRONLY, S_IRUSR|S_IWUSR)) < 0) { virReportSystemError(errno, _("domain '%s' coredump: failed to open %s"), @@ -3064,6 +3082,12 @@ static int testDomainBlockStats(virDomainPtr domain, if (!(privdom = testDomObjFromDomain(domain))) return ret; + if (!virDomainObjIsActive(privdom)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto error; + } + if (virDomainDiskIndexByName(privdom->def, path, false) < 0) { virReportError(VIR_ERR_INVALID_ARG, _("invalid path: %s"), path); @@ -3103,6 +3127,12 @@ static int testDomainInterfaceStats(virDomainPtr domain, if (!(privdom = testDomObjFromDomain(domain))) return -1; + if (!virDomainObjIsActive(privdom)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("domain is not running")); + goto error; + } + for (i = 0; i < privdom->def->nnets; i++) { if (privdom->def->nets[i]->ifname && STREQ(privdom->def->nets[i]->ifname, path)) { -- 2.8.4

2 1