- Devel - libvirt List Archives

[libvirt] [v2] storage-pool: API to get/set autostart flag
by Zeeshan Ali (Khattak) 03 Jun '15

03 Jun '15

Add binding for virStoragePoolGetAutostart & virStoragePoolSetAutostart. --- libvirt-gobject/libvirt-gobject-storage-pool.c | 51 ++++++++++++++++++++++++++ libvirt-gobject/libvirt-gobject-storage-pool.h | 5 +++ libvirt-gobject/libvirt-gobject.sym | 6 +++ 3 files changed, 62 insertions(+) diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.c b/libvirt-gobject/libvirt-gobject-storage-pool.c index f3eac0d..7f26b1b 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.c +++ b/libvirt-gobject/libvirt-gobject-storage-pool.c @@ -1048,6 +1048,57 @@ gboolean gvir_storage_pool_delete (GVirStoragePool *pool, return TRUE; } +/** + * gvir_storage_pool_get_autostart: + * @pool: the storage pool + * @err: return location for any #GError + * + * Return value: #True if autostart is enabled, #False otherwise. + */ +gboolean gvir_storage_pool_get_autostart(GVirStoragePool *pool, + GError **err) +{ + int ret; + + g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + + if (virStoragePoolGetAutostart(pool->priv->handle, &ret)) { + gvir_set_error_literal(err, GVIR_STORAGE_POOL_ERROR, + 0, + "Failed to get autostart flag from storage pool"); + } + + return !!ret; +} + +/** + * gvir_storage_pool_set_autostart: + * @pool: the storage pool + * @autostart: Whether or not to autostart + * @err: return location for any #GError + * + * Sets whether or not storage pool @pool is started automatically on boot. + * + * Return value: #TRUE on success, #FALSE otherwise. + */ +gboolean gvir_storage_pool_set_autostart(GVirStoragePool *pool, + gboolean autostart, + GError **err) +{ + g_return_val_if_fail(GVIR_IS_STORAGE_POOL(pool), FALSE); + g_return_val_if_fail(err == NULL || *err == NULL, FALSE); + + if (virStoragePoolSetAutostart(pool->priv->handle, autostart)) { + gvir_set_error_literal(err, GVIR_STORAGE_POOL_ERROR, + 0, + "Failed to set autostart flag on storage pool"); + return FALSE; + } + + return TRUE; +} + static void gvir_storage_pool_delete_helper(GSimpleAsyncResult *res, GObject *object, diff --git a/libvirt-gobject/libvirt-gobject-storage-pool.h b/libvirt-gobject/libvirt-gobject-storage-pool.h index f8529f0..f7f879c 100644 --- a/libvirt-gobject/libvirt-gobject-storage-pool.h +++ b/libvirt-gobject/libvirt-gobject-storage-pool.h @@ -166,6 +166,11 @@ void gvir_storage_pool_delete_async (GVirStoragePool *pool, gboolean gvir_storage_pool_delete_finish(GVirStoragePool *pool, GAsyncResult *result, GError **err); +gboolean gvir_storage_pool_get_autostart(GVirStoragePool *pool, + GError **err); +gboolean gvir_storage_pool_set_autostart(GVirStoragePool *pool, + gboolean autostart, + GError **err); G_END_DECLS diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 927cad9..dcda675 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -265,4 +265,10 @@ LIBVIRT_GOBJECT_0.2.0 { gvir_domain_open_graphics_fd; } LIBVIRT_GOBJECT_0.1.9; +LIBVIRT_GOBJECT_0.2.1 { + global: + gvir_storage_pool_get_autostart; + gvir_storage_pool_set_autostart; +} LIBVIRT_GOBJECT_0.2.0; + # .... define new API here using predicted next version number .... -- 2.4.2

1 1

[libvirt] [PATCH v2] check if console/channel PTY is null before attempting to open
by Shivaprasad G Bhat 03 Jun '15

03 Jun '15

Console/channel devices have their pty devices assigned when the emulator is actually started. If time is spent in guest preparation, someone attempts to open the console/channel, the libvirt crashes in virChrdevLockFilePath(). The patch attempts to fix the crash by adding a check before attempting to open. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/conf/virchrdev.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c index 5f28f29..701b326 100644 --- a/src/conf/virchrdev.c +++ b/src/conf/virchrdev.c @@ -350,6 +350,11 @@ int virChrdevOpen(virChrdevsPtr devs, switch (source->type) { case VIR_DOMAIN_CHR_TYPE_PTY: path = source->data.file.path; + if (!path) { + virReportError(VIR_ERR_OPERATION_FAILED, "%s", + _("PTY device is not yet assigned")); + return -1; + } break; case VIR_DOMAIN_CHR_TYPE_UNIX: path = source->data.nix.path;

2 1

[libvirt] [PATCH 0/2] lxc: allow using 802.11 wireless interfaces in LXC domains
by Lubomir Rintel 03 Jun '15

03 Jun '15

Hi, I'm using libvirt-lxc with mac80211_hwsim to construct virtual wireless network for NetworkManager testing. Currently, I have to move the interfaces to the domains manually, as sharing wan 802.11 wireless link with a LXC namespace does not work: <hostdev mode='capabilities' type='net'> <source><interface>wlan0</interface></source> </hostdev> The wireless links can only be associated to namespaces by moving the underlying PHY instead of the network interface. I'm following up with patches that fix the problem for me; please take a look. Thank you Lubo

2 7

[libvirt] [PATCH] util: Clear output broadcast address before filling it in
by Martin Kletzander 03 Jun '15

03 Jun '15

Since commit 55ace7c4789c8a7408139460f4b639cee00e5125, the sockettest fails without VIR_TEST_DEBUG set. The problem is found by test number 42 (co-incidence?), which tests range '192.168.122.1' - '192.168.122.255' in network '192.168.122.0/24'. That is supposed to fail because the end address is equal to the broadcast address. When comparing these two in 'virSocketAddrEqual(end, &broadcast)', there is a check for sin_addr as well as for sin_port. That port, however, is different when we do not enable test debugging. With the testing enabled, the port is 0 (correctly initialized), but without that it has a random number there. And that's because the structure is not initialized anywhere. By zeroing the structure before filling in the info, we make sure we return only the address and not any information that was not requested. And the test work once again. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: Pushed as a build-breaker. src/util/virsocketaddr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 34f2af31b2e7..81539b3730d4 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -505,6 +505,8 @@ virSocketAddrBroadcast(const virSocketAddr *addr, const virSocketAddr *netmask, virSocketAddrPtr broadcast) { + memset(broadcast, 0, sizeof(*broadcast)); + if ((addr->data.stor.ss_family != AF_INET) || (netmask->data.stor.ss_family != AF_INET)) { broadcast->data.stor.ss_family = AF_UNSPEC; -- 2.4.2

2 1

[libvirt] [PATCH] util: process: Refactor and fix virProcessSetAffinity
by Peter Krempa 03 Jun '15

03 Jun '15

Refactor the function to return the bitmap instead of an integer and the inner workings so that they make more sense. This patch also fixes possible segfault on old systems that was introduced by commit: commit f1a43a8e4139b028257ef4ed05a81cfb5f8a8741 Author: Hu Tao <hutao(a)cn.fujitsu.com> Date: Fri Sep 14 15:46:59 2012 +0800 use virBitmap to store cpu affinity info --- Pushed after review on the libvirt-security list. src/qemu/qemu_driver.c | 5 +-- src/util/virprocess.c | 102 ++++++++++++++++++++++--------------------------- src/util/virprocess.h | 4 +- 3 files changed, 48 insertions(+), 63 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f32b87e..63001b1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1457,8 +1457,7 @@ qemuDomainHelperGetVcpus(virDomainObjPtr vm, virVcpuInfoPtr info, int maxinfo, unsigned char *cpumap = VIR_GET_CPUMAP(cpumaps, maplen, v); virBitmapPtr map = NULL; - if (virProcessGetAffinity(priv->vcpupids[v], - &map, hostcpus) < 0) + if (!(map = virProcessGetAffinity(priv->vcpupids[v]))) return -1; virBitmapToDataBuf(map, cpumap, maplen); @@ -5727,7 +5726,7 @@ qemuDomainGetIOThreadsLive(virQEMUDriverPtr driver, goto endjob; info_ret[i]->iothread_id = iothreads[i]->iothread_id; - if (virProcessGetAffinity(iothreads[i]->thread_id, &map, hostcpus) < 0) + if (!(map = virProcessGetAffinity(iothreads[i]->thread_id))) goto endjob; if (virBitmapToData(map, &info_ret[i]->cpumap, diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 501569f..a38cb75 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -468,71 +468,60 @@ int virProcessSetAffinity(pid_t pid, virBitmapPtr map) return 0; } -int virProcessGetAffinity(pid_t pid, - virBitmapPtr *map, - int maxcpu) +virBitmapPtr +virProcessGetAffinity(pid_t pid) { size_t i; -# ifdef CPU_ALLOC - /* New method dynamically allocates cpu mask, allowing unlimted cpus */ - int numcpus = 1024; - size_t masklen; cpu_set_t *mask; + size_t masklen; + virBitmapPtr ret = NULL; - /* Not only may the statically allocated cpu_set_t be too small, - * but there is no way to ask the kernel what size is large enough. - * So you have no option but to pick a size, try, catch EINVAL, - * enlarge, and re-try. - * - * http://lkml.org/lkml/2009/7/28/620 - */ - realloc: - masklen = CPU_ALLOC_SIZE(numcpus); - mask = CPU_ALLOC(numcpus); +# ifdef CPU_ALLOC + /* 262144 cpus ought to be enough for anyone */ + masklen = CPU_ALLOC_SIZE(1024 << 8); + mask = CPU_ALLOC(1024 << 8); if (!mask) { virReportOOMError(); - return -1; + return NULL; } CPU_ZERO_S(masklen, mask); +# else + if (VIR_ALLOC(mask) < 0) + return NULL; + + masklen = sizeof(*mask); + CPU_ZERO(mask); +# endif + if (sched_getaffinity(pid, masklen, mask) < 0) { - CPU_FREE(mask); - if (errno == EINVAL && - numcpus < (1024 << 8)) { /* 262144 cpus ought to be enough for anyone */ - numcpus = numcpus << 2; - goto realloc; - } virReportSystemError(errno, _("cannot get CPU affinity of process %d"), pid); - return -1; + goto cleanup; } - *map = virBitmapNew(maxcpu); - if (!*map) - return -1; + if (!(ret = virBitmapNew(masklen * 8))) + goto cleanup; - for (i = 0; i < maxcpu; i++) + for (i = 0; i < masklen * 8; i++) { +# ifdef CPU_ALLOC if (CPU_ISSET_S(i, masklen, mask)) - ignore_value(virBitmapSetBit(*map, i)); - CPU_FREE(mask); + ignore_value(virBitmapSetBit(ret, i)); # else - /* Legacy method uses a fixed size cpu mask, only allows up to 1024 cpus */ - cpu_set_t mask; - - CPU_ZERO(&mask); - if (sched_getaffinity(pid, sizeof(mask), &mask) < 0) { - virReportSystemError(errno, - _("cannot get CPU affinity of process %d"), pid); - return -1; + if (CPU_ISSET(i, mask)) + ignore_value(virBitmapSetBit(ret, i)); +# endif } - for (i = 0; i < maxcpu; i++) - if (CPU_ISSET(i, &mask)) - ignore_value(virBitmapSetBit(*map, i)); + cleanup: +# ifdef CPU_ALLOC + CPU_FREE(mask); +# else + VIR_FREE(mask); # endif - return 0; + return ret; } #elif defined(HAVE_BSD_CPU_AFFINITY) @@ -562,29 +551,29 @@ int virProcessSetAffinity(pid_t pid, return 0; } -int virProcessGetAffinity(pid_t pid, - virBitmapPtr *map, - int maxcpu) +virBitmapPtr +virProcessGetAffinity(pid_t pid) { size_t i; cpuset_t mask; - - if (!(*map = virBitmapNew(maxcpu))) - return -1; + virBitmapPtr ret = NULL; CPU_ZERO(&mask); if (cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, pid, sizeof(mask), &mask) != 0) { virReportSystemError(errno, _("cannot get CPU affinity of process %d"), pid); - return -1; + return NULL; } - for (i = 0; i < maxcpu; i++) + if (!(*map = virBitmapNew(sizeof(mask) * 8))) + return NULL; + + for (i = 0; i < sizeof(mask) * 8; i++) if (CPU_ISSET(i, &mask)) - ignore_value(virBitmapSetBit(*map, i)); + ignore_value(virBitmapSetBit(ret, i)); - return 0; + return ret; } #else /* HAVE_SCHED_GETAFFINITY */ @@ -597,13 +586,12 @@ int virProcessSetAffinity(pid_t pid ATTRIBUTE_UNUSED, return -1; } -int virProcessGetAffinity(pid_t pid ATTRIBUTE_UNUSED, - virBitmapPtr *map ATTRIBUTE_UNUSED, - int maxcpu ATTRIBUTE_UNUSED) +virBitmapPtr +virProcessGetAffinity(pid_t pid ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Process CPU affinity is not supported on this platform")); - return -1; + return NULL; } #endif /* HAVE_SCHED_GETAFFINITY */ diff --git a/src/util/virprocess.h b/src/util/virprocess.h index c812882..1b98493 100644 --- a/src/util/virprocess.h +++ b/src/util/virprocess.h @@ -58,9 +58,7 @@ int virProcessKillPainfully(pid_t pid, bool force); int virProcessSetAffinity(pid_t pid, virBitmapPtr map); -int virProcessGetAffinity(pid_t pid, - virBitmapPtr *map, - int maxcpu); +virBitmapPtr virProcessGetAffinity(pid_t pid); int virProcessGetStartTime(pid_t pid, unsigned long long *timestamp); -- 2.4.1

1 0

[libvirt] [PATCH] virsh: Fix Ctrl-C behavior when watching a job
by Jiri Denemark 03 Jun '15

03 Jun '15

When watching a job (save, managedsave, dump, migrate) virsh spawns a thread to call the appropriate API and waits for the result while watching for interruption signals (SIGINT, Ctrl-C on the terminal). Whenever such signal is caught, virsh calls virDomainAbortJob, stops waiting for the job, and returns the result of virDomainAbortJob. This is wrong because the job might have finished in the meantime or it might have been cancelled by someone else and virsh would just report the failure to abort the job. However, we are not interested in the virDomainAbortJob's result at all, we need to keep waiting for the main job to finish and report its result instead. https://bugzilla.redhat.com/show_bug.cgi?id=1131755 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tools/virsh-domain.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index fc4d1fc..044b088 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -4234,12 +4234,9 @@ vshWatchJob(vshControl *ctl, if (ret > 0) { if (pollfd[1].revents & POLLIN && saferead(STDIN_FILENO, &retchar, sizeof(retchar)) > 0) { - if (vshTTYIsInterruptCharacter(ctl, retchar)) { + if (vshTTYIsInterruptCharacter(ctl, retchar)) virDomainAbortJob(dom); - goto cleanup; - } else { - continue; - } + continue; } if (pollfd[0].revents & POLLIN && @@ -4259,9 +4256,8 @@ vshWatchJob(vshControl *ctl, if (intCaught) { virDomainAbortJob(dom); intCaught = 0; - } else { - continue; } + continue; } goto cleanup; } -- 2.4.1

2 2

[libvirt] [PATCH 0/8 v3] parallels: add vz driver
by Maxim Nestratov 03 Jun '15

03 Jun '15

v2-v3 change: * Patch "parallels: set virtType depending on driver name" reworked. Implemented ability to set virtType depending on driver name. v1-v2 change: * Only "parallels: accept vz as a driver uri and name" patch is changed. Fixed ability to connect to 'parallels' driver and deal with 'Paralells' domain virt type. Maxim Nestratov (8): parallels: introduce vz driver constant and string parallels: use newly introduced VIR_DOMAIN_VIRT_VZ parallels: add new guest capabilities assigned to vz driver parallels: accept vz as a driver uri and name parallels: add a new vz connection driver and hypervisor structures parallels: increment the number of connection drivers parallels: recommend to connect to vz:///system when connection fails parallels: set virtType depending on driver name src/conf/domain_conf.c | 19 ++++++++---- src/conf/domain_conf.h | 1 + src/libvirt.c | 2 +- src/parallels/parallels_driver.c | 63 +++++++++++++++++++++++++++++++++++---- src/parallels/parallels_network.c | 3 +- src/parallels/parallels_sdk.c | 6 +++- src/parallels/parallels_storage.c | 3 +- src/parallels/parallels_utils.h | 1 + 8 files changed, 82 insertions(+), 16 deletions(-) -- 2.1.0

3 10

[libvirt] [PATCH] conf:audit: fix no audit log when start a vm with iothread
by Luyao Huang 03 Jun '15

03 Jun '15

Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/conf/domain_audit.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index 4ea10d2..1900039 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -885,6 +885,8 @@ virDomainAuditStart(virDomainObjPtr vm, const char *reason, bool success) virDomainAuditMemory(vm, 0, vm->def->mem.cur_balloon, "start", true); virDomainAuditVcpu(vm, 0, vm->def->vcpus, "start", true); + if (vm->def->iothreads) + virDomainAuditIOThread(vm, 0, vm->def->iothreads, "start", true); virDomainAuditLifecycle(vm, "start", reason, success); } -- 1.8.3.1

3 2

[libvirt] [PATCH] qemu: fix forget pass the return value to variable @ret
by Luyao Huang 03 Jun '15

03 Jun '15

If we do not pass the return value from qemuDomainRemoveRNGDevice() function to variable @ret, qemuDomainRemoveDevice() functiuon will always fail when recive rng device unplug event from qemu monitor. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 170768b..f596730 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3271,7 +3271,7 @@ qemuDomainRemoveDevice(virQEMUDriverPtr driver, ret = qemuDomainRemoveChrDevice(driver, vm, dev->data.chr); break; case VIR_DOMAIN_DEVICE_RNG: - qemuDomainRemoveRNGDevice(driver, vm, dev->data.rng); + ret = qemuDomainRemoveRNGDevice(driver, vm, dev->data.rng); break; case VIR_DOMAIN_DEVICE_MEMORY: -- 1.8.3.1

3 2

[libvirt] [PATCH] qemu: fix wrong call addressrelease function when attach RNG device success
by Luyao Huang 03 Jun '15

03 Jun '15

Add a return value check to avoid the wrong address release. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 170768b..f70e3d8 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1695,7 +1695,7 @@ qemuDomainAttachRNGDevice(virQEMUDriverPtr driver, audit: virDomainAuditRNG(vm, NULL, rng, "attach", ret == 0); cleanup: - if (vm) + if (ret < 0 && vm) qemuDomainReleaseDeviceAddress(vm, &rng->info, NULL); VIR_FREE(charAlias); VIR_FREE(objAlias); -- 1.8.3.1

3 2

[libvirt] [PATCHv2] Always add 'console' matching the 'serial' device
by Ján Tomko 02 Jun '15

02 Jun '15

We have been formatting the first serial device also as a console device, but only if there were no other consoles. If there is a <serial> device present in the XML, but no serial <console>, or if there isn't any <console> at all but the domain definition hasn't gone through a parse->format->parse round-trip, the <console> device would not be formatted. Change the code to always add the stub device for the first serial device. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1089914 --- src/conf/domain_conf.c | 23 +++++++++++++ .../qemuxml2argv-console-compat2.xml | 35 ++++++++++++++++++++ .../qemuxml2xmlout-console-compat2.xml | 38 ++++++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 4 files changed, 97 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-console-compat2.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat2.xml diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6e57425..ec8f9fa 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3587,6 +3587,25 @@ virDomainDefPostParseInternal(virDomainDefPtr def, def->consoles[0]->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE; def->consoles[0]->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL; } + } else if (def->os.type == VIR_DOMAIN_OSTYPE_HVM && def->nserials > 0 && + def->serials[0]->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL && + def->serials[0]->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA) { + /* Create a stub console to match the serial port. + * console[0] either does not exist + * or has a different type than SERIAL or NONE. + */ + virDomainChrDefPtr chr; + if (VIR_ALLOC(chr) < 0) + return -1; + + if (VIR_INSERT_ELEMENT(def->consoles, + 0, + def->nconsoles, + chr) < 0) + return -1; + + def->consoles[0]->deviceType = VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE; + def->consoles[0]->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL; } if (virDomainDefRejectDuplicateControllers(def) < 0) @@ -21588,6 +21607,10 @@ virDomainDefFormatInternal(virDomainDefPtr def, if (virDomainChrDefFormat(buf, &console, flags) < 0) goto error; } + /* The back-compat console device stub is added when parsing the domain XML + * and handled above, this is for formatting definitions created via other + * means. + */ if (def->os.type == VIR_DOMAIN_OSTYPE_HVM && def->nconsoles == 0 && def->nserials > 0) { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat2.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat2.xml new file mode 100644 index 0000000..ded204a --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat2.xml @@ -0,0 +1,35 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <controller type='virtio-serial' index='0'/> + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty'> + <target type='virtio' port='0'/> + </console> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat2.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat2.xml new file mode 100644 index 0000000..636e984 --- /dev/null +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat2.xml @@ -0,0 +1,38 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <driver name='qemu' type='raw'/> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <controller type='virtio-serial' index='0'/> + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> + <console type='pty'> + <target type='virtio' port='0'/> + </console> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 53bcc9f..d405e71 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -472,6 +472,7 @@ mymain(void) DO_TEST("serial-spiceport-nospice"); DO_TEST("parallel-tcp"); DO_TEST("console-compat"); + DO_TEST_DIFFERENT("console-compat2"); DO_TEST("console-virtio-many"); DO_TEST("channel-guestfwd"); DO_TEST("channel-virtio"); -- 2.3.6

2 1

[libvirt] [PATCH] build: silence ar warnings on rawhide
by Eric Blake 02 Jun '15

02 Jun '15

Newer binutils 'ar' has added an option 'D' for deterministic builds, and at least on rawhide, this option is enabled by default. But it conflicts with the 'u' optimization where the linker only modifies libraries based on file timestamps, but can result in different library ordering based on which files were touched last. Thus, it results in some noisy compilation, for every CCLD line: CCLD libvirt_driver_qemu_impl.la ar: `u' modifier ignored since `D' is the default (see `U') Upstream automake has decided that defaulting ARFLAGS to 'cru' is no longer beneficial, and that switching the default to 'cr' will both silence the noise and not penalize modern build systems. https://lists.gnu.org/archive/html/automake-patches/2015-06/msg00000.html But rather than wait for newer automake to propagate to all systems that already have newer binutils, we might as well just use the new default ourselves, even on older platforms. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- This is bugging me even more now that Fedora 22 also suffers from the same issue (we've been ignoring it in rawhide for several months now). While it seems trivial, I'd like a review before pushing. configure.ac | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac index 0da3ae8..abf4436 100644 --- a/configure.ac +++ b/configure.ac @@ -25,6 +25,10 @@ AC_CONFIG_MACRO_DIR([m4]) dnl Make automake keep quiet about wildcards & other GNUmake-isms; also keep dnl quiet about the fact that we intentionally cater to automake 1.9 AM_INIT_AUTOMAKE([-Wno-portability -Wno-obsolete tar-ustar subdir-objects]) +dnl older automake's default of ARFLAGS=cru is noisy on newer binutils; +dnl we don't really need the 'u' even in older toolchains. Then there is +dnl older libtool, which spelled it AR_FLAGS +m4_divert_text([DEFAULTS], [: "${ARFLAGS=cr} ${AR_FLAGS=cr}"]) # Maintainer note - comment this line out if you plan to rerun # GNULIB_POSIXCHECK testing to see if libvirt should be using more modules. -- 2.4.2

2 2

[libvirt] [PATCH v4 0/6] virsh: Further improve handling of integer options
by Andrea Bolognani 02 Jun '15

02 Jun '15

As suggested by Michal: now that we have a generic error message for failures related to the parsing of integer options, it makes sense to perform the corresponding check in a single spot instead of replicating it every time vshCommandOpt*() is used. Andrea Bolognani (6): tests: Add a bunch of new tests to virsh-optparse virsh: Use standard error messages in vshCommandOptTimeoutToMs() virsh: Improve vshCommandOptTimeoutToMs() virsh: Make vshCommandOptScaledInt() use vshCommandOpt() virsh: Pass vshControl to all vshCommandOpt*() calls virsh: Move error messages inside vshCommandOpt*() functions tests/vcpupin | 4 +- tests/virsh-optparse | 179 ++++++++++++++++++++++++++++++ tools/virsh-domain-monitor.c | 17 +-- tools/virsh-domain.c | 226 ++++++++++++-------------------------- tools/virsh-host.c | 67 +++--------- tools/virsh-interface.c | 6 +- tools/virsh-network.c | 10 +- tools/virsh-nodedev.c | 4 +- tools/virsh-snapshot.c | 2 +- tools/virsh-volume.c | 26 +---- tools/virsh.c | 252 ++++++++++++++++++++++++++----------------- tools/virsh.h | 66 ++++++------ 12 files changed, 461 insertions(+), 398 deletions(-) -- 2.1.0

2 8

[libvirt] Repository with Parallels SDK sources moved
by Sergey Bronnikov 02 Jun '15

02 Jun '15

Hello, repository with Parallels SDK has been moved from https://github.com/CloudServer/parallels-sdk to https://src.openvz.org/projects/OVZ/repos/libprlsdk/browse. Please update GIT settings. -- OpenVZ survey http://goo.gl/forms/orYmy0SjFB

1 0

[libvirt] [PATCH 0/2] Report errors in virNodeCountThreadSiblings
by Ján Tomko 02 Jun '15

02 Jun '15

https://bugzilla.redhat.com/show_bug.cgi?id=1207849 Ján Tomko (2): Report errors in virNodeCountThreadSiblings Simplify virNodeCountThreadSiblings src/nodeinfo.c | 34 +++++++--------------------------- 1 file changed, 7 insertions(+), 27 deletions(-) -- 2.3.6

3 4

[libvirt] [PATCH v2 0/2] storage: Fix error when deleting non-existent volumes
by Erik Skultety 02 Jun '15

02 Jun '15

Erik Skultety (2): storage: Don't update volume objs list before we successfully create one storage: RBD: do not return error when deleting non-existent volume src/storage/storage_backend_rbd.c | 6 +++--- src/storage/storage_driver.c | 31 +++++++++++++------------------ 2 files changed, 16 insertions(+), 21 deletions(-) -- 1.9.3

2 6

[libvirt] Bug 1227257
by 王松波 02 Jun '15

02 Jun '15

I report a bug [Bug 1227257] . In the environment libvirt-1.2.16.tar.gz + qemu-img version 2.1.2 + ceph version 0.94.1. libvirt pool will become inactive after one client does vol.delete and the other does pool.refresh in the same pool simultaneously. The reason is that rbd_list and rbd_open are not wrapped in an atomic operation, but two seperate operations. For example, two clients are operating in the same pool at the same time. One client does rbd_list, and got 10 rbd images, meanwhile, the other client deletes one of the rbd image. In this situation, when the first client does next operation, such as rbd_open , the command may fail, because the rbd image has been removed. I write a testcase in python to reproduce this problem as follow(also have put it in the attachment): ################################## import libvirt import sys import time import sys #coding:utf-8 QEMU_URL = 'qemu:///system' VOL_TEMPLATE=''' <volume> <name>{vol}</name> <key>{pool}/{vol}</key> <source> </source> <capacity unit='MB'>{cap_size}</capacity> <allocation unit='MB'>{alloc_size}</allocation> <target> <path>rbd:{pool}/{vol}</path> <format type='unknown'/> <permissions> <mode>00</mode> <owner>0</owner> <group>0</group> </permissions> </target> </volume>''' def create_vol(pool_name, vol_name, cap_size, alloc_size): conn = libvirt.open(QEMU_URL) if conn == None: print 'Failed to open connection to the hypervisor' sys.exit(1) try: pool = conn.storagePoolLookupByName(pool_name) pool.refresh() template = VOL_TEMPLATE.format(pool=pool_name, vol=vol_name, cap_size=cap_size, alloc_size=alloc_size) pool.createXML(template, 0) except: print 'Failed to open pool' sys.exit(1) finally: if conn is not None: conn.close() def destroy_vol(pool_name, vol_name): conn = libvirt.open(QEMU_URL) if conn == None: sys.exit(1) pool = conn.storagePoolLookupByName(pool_name) pool.refresh(0) vol = pool.storageVolLookupByName(vol_name) if vol is not None: vol.delete(0) if conn is not None: conn.close() if sys.argv[2] == 'create': for i in range(1, 20): volname = 'pool-down-test-%s-%d' % (sys.argv[1], i) print 'create %s' % volname create_vol('capacity', volname, '500', '500') elif sys.argv[2] == 'destroy': for i in range(1, 20): volname = 'pool-down-test-%s-%d' % (sys.argv[1], i) print 'destroy %s' % volname destroy_vol('capacity', volname) else: print 'Usage: python vol-test.py clientId OPER' print ' ' print 'where clientId : a num/string used to distinguish different client' print ' OPER : create/destroy' Patch for this is as fllow: diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index ae4bcb3..24fbc84 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -266,6 +266,46 @@ static int virStorageBackendRBDCloseRADOSConn(virStorageBackendRBDStatePtr ptr) return ret; } +static int volStorageBackendRBDVolIsExist(char *volname, virStorageBackendRBDStatePtr ptr) +{ + int ret = -1; + char *name, *names = NULL; + size_t max_size = 1024; + int len = -1; + + while (true) { + if (VIR_ALLOC_N(names, max_size) < 0) + goto cleanup; + + len = rbd_list(ptr->ioctx, names, &max_size); + if (len >= 0) + break; + if (len != -ERANGE) { + VIR_WARN("%s", _("A problem occurred while listing RBD images")); + goto cleanup; + } + VIR_FREE(names); + } + + for (name = names; name < names + max_size;) { + + if (STREQ(name, "")) + break; + + name += strlen(name) + 1; + if (STREQ(volname, name)) { + VIR_ERROR("RBD images '%s' is exist, but cannot open it", volname); + ret = -2; + break; + } + } + ret = 0; + +cleanup: + VIR_FREE(names); + return ret; +} + static int volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr vol, virStoragePoolObjPtr pool, virStorageBackendRBDStatePtr ptr) @@ -276,8 +316,15 @@ static int volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr vol, r = rbd_open(ptr->ioctx, vol->name, &image, NULL); if (r < 0) { - virReportSystemError(-r, _("failed to open the RBD image '%s'"), - vol->name); + VIR_DEBUG("failed to open RBD image '%s', check if it was still exist in its pool",\ + vol->name); + if (volStorageBackendRBDVolIsExist(vol->name, ptr) == 0) { + VIR_DEBUG("vol '%s' may be removed by the other rbd client", vol->name); + ret = 0; + } else { + virReportSystemError(-r, _("failed to open the RBD image '%s'"), + vol->name); + } return ret; }

2 1

[libvirt] [PATCH v3 0/5] virsh: Further improve handling of integer options
by Andrea Bolognani 02 Jun '15

02 Jun '15

As suggested by Michal: now that we have a generic error message for failures related to the parsing of integer options, it makes sense to perform the corresponding check in a single spot instead of replicating it every time vshCommandOpt*() is used. Andrea Bolognani (5): virsh: Use standard error message in vshCommandOptTimeoutToMs(). virsh: Improve vshCommandOptTimeoutToMs(). virsh: Make vshCommandOptScaledInt() use vshCommandOpt(). virsh: Pass vshControl to all vshCommandOpt*() calls. virsh: Move error messages inside vshCommandOpt*() functions. tests/vcpupin | 4 +- tools/virsh-domain-monitor.c | 17 +-- tools/virsh-domain.c | 226 ++++++++++++--------------------------- tools/virsh-host.c | 67 +++--------- tools/virsh-interface.c | 6 +- tools/virsh-network.c | 10 +- tools/virsh-nodedev.c | 4 +- tools/virsh-snapshot.c | 2 +- tools/virsh-volume.c | 26 +---- tools/virsh.c | 248 +++++++++++++++++++++++++------------------ tools/virsh.h | 66 ++++++------ 11 files changed, 278 insertions(+), 398 deletions(-) -- 2.1.0

2 11

[libvirt] [PATCH] nwfilter: Fix sscanf off-by-one error in virNWFilterSnoopLeaseFileLoad
by Erik Skultety 02 Jun '15

02 Jun '15

We allocate 16 bytes for IPv4 address and 55 bytes for interface key, therefore we should read up to 15/54 bytes and let the last byte reserved for terminating null byte in sscanf. https://bugzilla.redhat.com/show_bug.cgi?id=1226400 --- src/nwfilter/nwfilter_dhcpsnoop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index 6da8983..f331e22 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -1958,8 +1958,8 @@ virNWFilterSnoopLeaseFileLoad(void) break; } ln++; - /* key len 55 = "VMUUID"+'-'+"MAC" */ - if (sscanf(line, "%u %55s %16s %16s", &ipl.timeout, + /* key len 54 = "VMUUID"+'-'+"MAC" */ + if (sscanf(line, "%u %54s %15s %15s", &ipl.timeout, ifkey, ipstr, srvstr) < 4) { virReportError(VIR_ERR_INTERNAL_ERROR, _("virNWFilterSnoopLeaseFileLoad lease file " -- 1.9.3

2 3

[libvirt] [PATCH] qemu: fix unsuitable error report when get memory stats
by Wang Yufei 02 Jun '15

02 Jun '15

From: Zhang Bo <oscar.zhangbo(a)huawei.com> when we run the command 'virsh dommemstat xxx', althrough memballoon's model is set 'none' in vm's XML, it still reports an error in libvirtd.log. error : qemuMonitorFindBalloonObjectPath:1042 : internal error: Cannot determine balloon device path Apparently, if we don't set memballoon, we don't need to set balloon device path. Signed-off-by: Wang Yufei <james.wangyufei(a)huawei.com> Signed-off-by: Zhang Bo <oscar.zhangbo(a)huawei.com> --- .gnulib | 2 +- src/qemu/qemu_monitor.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gnulib b/.gnulib index 875ec93..106a386 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 875ec93e1501d2d2a8bab1b64fa66b8ceb51dc67 +Subproject commit 106a3866d01f9dd57ab4f10dbeb0d5a8db73a9f7 diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index f959b74..c72702d 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1711,7 +1711,9 @@ qemuMonitorGetMemoryStats(qemuMonitorPtr mon, QEMU_CHECK_MONITOR(mon); if (mon->json) { - ignore_value(qemuMonitorFindBalloonObjectPath(mon, "/")); + if (mon->vm->def->memballoon && + mon->vm->def->memballoon->model != VIR_DOMAIN_MEMBALLOON_MODEL_NONE) + ignore_value(qemuMonitorFindBalloonObjectPath(mon, "/")); mon->ballooninit = true; return qemuMonitorJSONGetMemoryStats(mon, mon->balloonpath, stats, nr_stats); -- 1.7.12.4

2 4

[libvirt] [PATCH] util: process: @pid in virProcessSetAffinity's BSD impl is not unused
by Peter Krempa 02 Jun '15

02 Jun '15

--- Pushed as trivial. src/util/virprocess.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 7a79970..501569f 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -537,7 +537,7 @@ int virProcessGetAffinity(pid_t pid, #elif defined(HAVE_BSD_CPU_AFFINITY) -int virProcessSetAffinity(pid_t pid ATTRIBUTE_UNUSED, +int virProcessSetAffinity(pid_t pid, virBitmapPtr map) { size_t i; -- 2.4.1

1 0

[libvirt] [libvirt-test-api][PATCH] fix imperfect cleanup cause the case will always fail
by Luyao Huang 02 Jun '15

02 Jun '15

Remove call undefined function. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- repos/virconn/connection_getMemoryParameters.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/repos/virconn/connection_getMemoryParameters.py b/repos/virconn/connection_getMemoryParameters.py index 9b88fc3..d110b35 100644 --- a/repos/virconn/connection_getMemoryParameters.py +++ b/repos/virconn/connection_getMemoryParameters.py @@ -16,7 +16,6 @@ node_memory = ['full_scans', 'sleep_millisecs'] SYSFS_MEMORY_SHARED_PATH = '/sys/kernel/mm/ksm/' -LIBVIRT_API_PATH = '/usr/share/libvirt/api/libvirt-api.xml' flags=0 def check_memory_parameter(libvirt_dict, parameter_name): @@ -47,9 +46,6 @@ def connection_getMemoryParameters(params): logger.info("get connection to libvirtd") - if utils.check_flags('getMemoryParameters', LIBVIRT_API_PATH) == 1: - return 1 - param_dict=conn.getMemoryParameters() for n in node_memory: -- 1.8.3.1

2 1

[libvirt] [PATCH] maint: update to latest gnulib
by Eric Blake 02 Jun '15

02 Jun '15

Incorporates fixes for cross-compiling to mingw on rawhide, where gcc 5.1 changes detection of how to properly determine PRIdMAX. * .gnulib: Update to latest, for mingw. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I've missed the freeze for rc1, but confirmed that this update is rather minimal and should only affect mingw (in particular, it will fix cross-compilation failure under rawhide with gcc 5.1). As such, I won't push without review, but I also argue that the changeset is small enough that it should be safe if we agree to take it before rc2. * .gnulib 875ec93...c26527c (5): > stdio: limit __gnu_printf__ witness to gcc 4.4+ > error: use correct printf attributes on mingw > update from texinfo > inttypes: force correct mingw PRIdMAX even without <stdio.h> > stdio: fix probe on mingw under gcc 5.1 .gnulib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gnulib b/.gnulib index 875ec93..c26527c 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 875ec93e1501d2d2a8bab1b64fa66b8ceb51dc67 +Subproject commit c26527cebbbf42ed1dbc50df0074861e0ebe33dc -- 2.1.0

1 1

[libvirt] [PATCH] test: fix IP address range failure test
by Laine Stump 01 Jun '15

01 Jun '15

This was revealed when I made a cut-paste mistake in an upgrade to virSocketAddrGetRange(), leading to failure to check for the end address being outside of the defined network, but a negative test case that should have caught the error instead returned success. The problem was that testRange in sockettest.c was written so that when it expected a failure, even an "unexpected success" would be considered as an "expected failure" because of the way the check in testRange was done. testRange had this: if (gotsize < 0 || gotsize != size) { return pass ? -1 : 0; } else { return pass ? 0 : -1; } but all the tests that expected a failure give "-1" as the expected size. So in a case where we expect a failure, we would have pass == false and size == -1. If virSocketAddrGetRange() was incorrectly *successful* (returned some positive number), then "gotsize != size" would be, e.g. "276 != -1", so we would take the if clause and, since pass == false, we would return 0 (success i.e. expected failure). The solution is that in the case where we expect failure, we should just ignore size - virSocketAddrGetRange() must return -1 in order for us to report "expected failure == success". --- Here's the email where jferlan points out the typo and asks about the apparent lack of a proper negative test case: https://www.redhat.com/archives/libvir-list/2015-May/msg01166.html tests/sockettest.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/sockettest.c b/tests/sockettest.c index 84170d5..292edb6 100644 --- a/tests/sockettest.c +++ b/tests/sockettest.c @@ -103,10 +103,12 @@ testRange(const char *saddrstr, const char *eaddrstr, int gotsize = virSocketAddrGetRange(&saddr, &eaddr, &netaddr, prefix); VIR_DEBUG("Size want %d vs got %d", size, gotsize); - if (gotsize < 0 || gotsize != size) { - return pass ? -1 : 0; + if (pass) { + /* fail if virSocketAddrGetRange returns failure, or unexpected size */ + return (gotsize < 0 || gotsize != size) ? -1 : 0; } else { - return pass ? 0 : -1; + /* succeed if virSocketAddrGetRange fails, otherwise fail. */ + return gotsize < 0 ? 0 : -1; } } -- 2.1.0

2 1

[libvirt] [PATCH] spec: fixes for recently introduced libxl conf files
by Jim Fehlig 01 Jun '15

01 Jun '15

Commit 198cc1d3 introduced libxl-lockd and libxl-sanlock config files but forgot to add them to the spec file. Follow-up commit 62b18d98 added the files to daemon-driver-libxl, but missed adding them to the daemon package when configuring libvirt --without-driver-modules. In addition, commit 62b18d98 added libxl-sanlock to daemon-driver-libxl, but it should be included in lock-sanlock when libvirt is configured --with-sanlock. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Given the problems I've caused with the original commit 198cc1d3, I'm reluctant to push this as a build-breaker without another set of eyes reviewing it. libvirt.spec.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index f95e31f..0c343d6 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -2007,6 +2007,7 @@ exit 0 %endif %if %{with_libxl} %config(noreplace) %{_sysconfdir}/libvirt/libxl.conf +%config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/ %ghost %dir %{_localstatedir}/run/libvirt/libxl/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/ @@ -2130,7 +2131,6 @@ exit 0 %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/libvirt/libxl.conf %config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf -%config(noreplace) %{_sysconfdir}/libvirt/libxl-sanlock.conf %{_datadir}/augeas/lenses/libvirtd_libxl.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/ @@ -2183,6 +2183,9 @@ exit 0 %if %{with_qemu} %config(noreplace) %{_sysconfdir}/libvirt/qemu-sanlock.conf %endif + %if %{with_libxl} +%config(noreplace) %{_sysconfdir}/libvirt/libxl-sanlock.conf + %endif %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/sanlock.so %{_datadir}/augeas/lenses/libvirt_sanlock.aug %{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug -- 1.8.4.5

3 6