- Devel - libvirt List Archives

[libvirt] [PATCH 00/10] tools: remove vshStrdup (glib chronicles)
by Ján Tomko 20 Oct '19

20 Oct '19

Ján Tomko (10): tools: cmdDomblkinfoGet: reindent parameters virsh: use g_strdup in cmdDomblkinfoGet virsh: use g_strdup in virshDomainGetEditMetadata virsh: getSignalNumber: rename variables virsh: getSignalNumber: use g_autofree virsh: getSignalNumber: use g_strdup tools: vshCommandArgvGetArg: one parameter per line tools: vshCommandArgvGetArg: prefer g_strdup tools: prefer g_strdup to vshStrdup tools: delete vshStrdup tools/virsh-checkpoint.c | 4 +-- tools/virsh-domain-monitor.c | 27 ++++++++++---------- tools/virsh-domain.c | 38 ++++++++++++---------------- tools/virsh-nodedev.c | 5 ++-- tools/virsh-pool.c | 30 +++++++++++----------- tools/virsh-snapshot.c | 6 ++--- tools/virsh-volume.c | 11 ++++----- tools/virsh.c | 9 +++---- tools/virt-admin.c | 6 ++--- tools/vsh.c | 48 ++++++++++++++---------------------- tools/vsh.h | 4 --- 11 files changed, 81 insertions(+), 107 deletions(-) -- 2.21.0

3 14

[libvirt] [PATCH 0/2] Couple of g_strdup_printf() fixes
by Michal Privoznik 18 Oct '19

18 Oct '19

*** BLURB HERE *** Michal Prívozník (2): virstring: Reimplement g_strdup_printf() and g_strdup_vprintf() m4: Don't suggest attribute malloc m4/virt-compile-warnings.m4 | 1 + src/libvirt_private.syms | 2 ++ src/util/virstring.c | 29 +++++++++++++++++++++++++++++ src/util/virstring.h | 11 +++++++++++ 4 files changed, 43 insertions(+) -- 2.21.0

4 6

[libvirt] [PATCH] gitdm/companies: add 'ibm' file
by Daniel Henrique Barboza 18 Oct '19

18 Oct '19

Some people from IBM does not use 'ibm.com' domain emails. CC: jcfaracco(a)gmail.com Suggested-by: Leonardo Augusto Guimarães Garcia <lagarcia(a)br.ibm.com> Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- Julio, I didn't add you in this list because I am not sure about the nature of your contributions to Libvirt. Let me know if you want your email to be added here as well. docs/gitdm/companies/ibm | 6 ++++++ docs/gitdm/companies/others | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 docs/gitdm/companies/ibm diff --git a/docs/gitdm/companies/ibm b/docs/gitdm/companies/ibm new file mode 100644 index 0000000000..ce0315df66 --- /dev/null +++ b/docs/gitdm/companies/ibm @@ -0,0 +1,6 @@ +ibm.com + +# These IBM employees used their personal email address when contributing +# to libvirt and we don't have the corresponding @ibm.com address on file. + +danielhb413(a)gmail.com diff --git a/docs/gitdm/companies/others b/docs/gitdm/companies/others index db2c0061bd..99dc1ab31e 100644 --- a/docs/gitdm/companies/others +++ b/docs/gitdm/companies/others @@ -35,7 +35,6 @@ hitachi.com Hitachi hoster-ok.com hoster-ok.com hp.com HP huawei.com Huawei -ibm.com IBM inktank.com Inktank Storage intel.com Intel intellilink.co.jp NTT DATA INTELLILINK -- 2.21.0

2 1

[libvirt] [PATCH] build: fix substitution of RUNSTATEDIR in man pages
by Daniel P. Berrangé 18 Oct '19

18 Oct '19

When RUNSTATEDIR was introduced commit d29c917ef470a25149d1f3787ec494d006549f27 Author: Daniel P. Berrangé <berrange(a)redhat.com> Date: Tue Aug 20 16:05:12 2019 +0100 src: honour the RUNSTATEDIR variable in all code The makefile rules for man pages were accidentally not updated for the new variablle name. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/Makefile.am | 2 +- src/locking/Makefile.inc.am | 2 +- src/logging/Makefile.inc.am | 2 +- src/remote/Makefile.inc.am | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 937f5216da..a7c1ad0861 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -725,7 +725,7 @@ endif WITH_LIBVIRTD %.8: %.8.in $(top_srcdir)/configure.ac $(AM_V_GEN)sed \ -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \ - -e 's|[@]localstatedir[@]|$(localstatedir)|g' \ + -e 's|[@]runstatedir[@]|$(runstatedir)|g' \ < $< > $@-t && \ mv $@-t $@ diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index eccf7c3a4d..a0822f77d4 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -280,7 +280,7 @@ virtlockd.8.in: locking/virtlockd.pod if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ sed \ -e 's|SYSCONFDIR|\@sysconfdir\@|g' \ - -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \ + -e 's|RUNSTATEDIR|\@runstatedir\@|g' \ < $@-t1 > $@-t2 && \ rm -f $@-t1 && \ mv $@-t2 $@ diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am index 74e94636a6..6eda40275c 100644 --- a/src/logging/Makefile.inc.am +++ b/src/logging/Makefile.inc.am @@ -118,7 +118,7 @@ virtlogd.8.in: logging/virtlogd.pod if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ sed \ -e 's|SYSCONFDIR|\@sysconfdir\@|g' \ - -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \ + -e 's|RUNSTATEDIR|\@runstatedir\@|g' \ < $@-t1 > $@-t2 && \ rm -f $@-t1 && \ mv $@-t2 $@ diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 071d19d26a..0f4f1ae8d5 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -455,7 +455,7 @@ libvirtd.8.in: remote/libvirtd.pod if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ sed \ -e 's|SYSCONFDIR|\@sysconfdir\@|g' \ - -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \ + -e 's|RUNSTATEDIR|\@runstatedir\@|g' \ < $@-t1 > $@-t2 && \ rm -f $@-t1 && \ mv $@-t2 $@ -- 2.21.0

3 2

[libvirt] [PATCH] Apparmor: Support Xen scripts in libexec
by Jim Fehlig 18 Oct '19

18 Oct '19

Upstream Xen has traditionally installed various hotplug and utility scripts in /etc/xen/scripts/. openSUSE is slowly moving all distribution provided configuration files and scripts from /etc to /usr. In the case of the Xen scripts provided under /etc/xen/scripts/, they will be moving to /usr/lib/xen/scripts/. Adjust the libvirtd Apparmor profile to allow executing scripts from this location. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- If this is deemed too distro-specific I'm happy to maintain a downstream patch. src/security/apparmor/usr.sbin.libvirtd | 1 + 1 file changed, 1 insertion(+) diff --git a/src/security/apparmor/usr.sbin.libvirtd b/src/security/apparmor/usr.sbin.libvirtd index 29f9936ad9..b0d23c80f3 100644 --- a/src/security/apparmor/usr.sbin.libvirtd +++ b/src/security/apparmor/usr.sbin.libvirtd @@ -104,6 +104,7 @@ profile libvirtd /usr/sbin/libvirtd flags=(attach_disconnected) { /usr/{lib,lib64}/libvirt/libvirt_iohelper ix, /etc/libvirt/hooks/** rmix, /etc/xen/scripts/** rmix, + /usr/{lib,lib64}/xen/scripts/** rmix, # allow changing to our UUID-based named profiles change_profile -> @{LIBVIRT}-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*-[0-9a-f]*, -- 2.23.0

2 3

[libvirt] [PATCH] util: add stdlib.h include for abort() prototype
by Daniel P. Berrangé 18 Oct '19

18 Oct '19

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- Pushed as a build fix for Mingw src/util/glibcompat.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/util/glibcompat.c b/src/util/glibcompat.c index 25dedf0ed5..3f830840cf 100644 --- a/src/util/glibcompat.c +++ b/src/util/glibcompat.c @@ -18,6 +18,8 @@ #include <config.h> +#include <stdlib.h> + #include "glibcompat.h" #undef g_strdup_printf -- 2.21.0

1 0

[libvirt] [PULL v3 00/19] Bitmaps patches
by John Snow 18 Oct '19

18 Oct '19

The following changes since commit f22f553efffd083ff624be116726f843a39f1148: Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20191013' into staging (2019-10-17 16:48:56 +0100) are available in the Git repository at: https://github.com/jnsnow/qemu.git tags/bitmaps-pull-request for you to fetch changes up to 3264ffced3d087bbe72d759639ef84fd5bd924cc: dirty-bitmaps: remove deprecated autoload parameter (2019-10-17 17:53:28 -0400) ---------------------------------------------------------------- pull request ---------------------------------------------------------------- John Snow (2): MAINTAINERS: Add Vladimir as a reviewer for bitmaps dirty-bitmaps: remove deprecated autoload parameter Vladimir Sementsov-Ogievskiy (17): util/hbitmap: strict hbitmap_reset block: move bdrv_can_store_new_dirty_bitmap to block/dirty-bitmap.c block/dirty-bitmap: return int from bdrv_remove_persistent_dirty_bitmap block/qcow2: proper locking on bitmap add/remove paths block/dirty-bitmap: drop meta block/dirty-bitmap: add bs link block/dirty-bitmap: drop BdrvDirtyBitmap.mutex block/dirty-bitmap: refactor bdrv_dirty_bitmap_next block: switch reopen queue from QSIMPLEQ to QTAILQ block: reverse order for reopen commits iotests: add test-case to 165 to test reopening qcow2 bitmaps to RW block/qcow2-bitmap: get rid of bdrv_has_changed_persistent_bitmaps block/qcow2-bitmap: drop qcow2_reopen_bitmaps_rw_hint() block/qcow2-bitmap: do not remove bitmaps on reopen-ro iotests: add test 260 to check bitmap life after snapshot + commit block/qcow2-bitmap: fix and improve qcow2_reopen_bitmaps_rw qcow2-bitmap: move bitmap reopen-rw code to qcow2_reopen_commit qemu-deprecated.texi | 20 ++- qapi/block-core.json | 6 +- block/qcow2.h | 19 +-- include/block/block.h | 2 +- include/block/block_int.h | 20 +-- include/block/dirty-bitmap.h | 34 ++-- include/qemu/hbitmap.h | 5 + block.c | 79 +++------ block/backup.c | 8 +- block/block-copy.c | 2 +- block/dirty-bitmap.c | 290 +++++++++++++++++++-------------- block/mirror.c | 4 +- block/qcow2-bitmap.c | 212 +++++++++++++++--------- block/qcow2.c | 22 ++- blockdev.c | 40 ++--- migration/block-dirty-bitmap.c | 11 +- migration/block.c | 4 +- tests/test-hbitmap.c | 2 +- util/hbitmap.c | 4 + MAINTAINERS | 3 +- tests/qemu-iotests/165 | 57 ++++++- tests/qemu-iotests/165.out | 4 +- tests/qemu-iotests/260 | 89 ++++++++++ tests/qemu-iotests/260.out | 52 ++++++ tests/qemu-iotests/group | 1 + 25 files changed, 623 insertions(+), 367 deletions(-) create mode 100755 tests/qemu-iotests/260 create mode 100644 tests/qemu-iotests/260.out -- 2.21.0

2 20

[libvirt] [PATCH 2/2] libvirt-rust Fix Stream::send
by Linus Färnstrand 18 Oct '19

18 Oct '19

* Handle the -2 error case * Allow sending arbitrary byte array, not just UTF-8 strings * Fix FFI declaration, takes size_t, not c_uint * Return usize to be more idiomatic (type used for slice indexing) Signed-off-by: Linus Färnstrand <faern(a)faern.net> --- src/stream.rs | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/stream.rs b/src/stream.rs index af6c8ec..2ca5d0b 100644 --- a/src/stream.rs +++ b/src/stream.rs @@ -34,7 +34,7 @@ pub mod sys { extern "C" { fn virStreamSend(c: sys::virStreamPtr, data: *const libc::c_char, - nbytes: libc::c_uint) + nbytes: libc::size_t) -> libc::c_int; fn virStreamRecv(c: sys::virStreamPtr, data: *mut libc::c_char, @@ -105,16 +105,15 @@ impl Stream { } } - pub fn send(&self, data: &str) -> Result<u32, Error> { - unsafe { - let ret = virStreamSend(self.as_ptr(), - string_to_c_chars!(data), - data.len() as libc::c_uint); - if ret == -1 { - return Err(Error::new()); - } - return Ok(ret as u32); - } + pub fn send(&self, data: &[u8]) -> Result<usize, Error> { + let ret = unsafe { + virStreamSend( + self.as_ptr(), + data.as_ptr() as *mut libc::c_char, + data.len() + ) + }; + usize::try_from(ret).map_err(|_| Error::new()) } pub fn recv(&self, buf: &mut [u8]) -> Result<usize, Error> { -- 2.21.0

3 3

[libvirt] [PATCH] conf: Fix memory leak caused by missing VIR_FREE for video resolution.
by jcfaracco＠gmail.com 18 Oct '19

18 Oct '19

From: Julio Faracco <jcfaracco(a)gmail.com> Commit 72862797 introduced resolution settings for QEMU video drivers. It includes a new structure inside video definition. So, the code needs to clear pointer allocation for that structure into clear function virDomainVideoDefClear(). This commit adds this missing VIR_FREE(). Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/conf/domain_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 88e93f6fb8..696a01043e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2850,6 +2850,7 @@ virDomainVideoDefClear(virDomainVideoDefPtr def) if (def->accel) VIR_FREE(def->accel->rendernode); VIR_FREE(def->accel); + VIR_FREE(def->res); VIR_FREE(def->virtio); if (def->driver) VIR_FREE(def->driver->vhost_user_binary); -- 2.20.1

2 1

[libvirt] [PATCH v3] glibcompat: Reimplement g_strdup_printf() and g_strdup_vprintf()
by Michal Privoznik 18 Oct '19

18 Oct '19

These functions don't really abort() on OOM. The fix was merged upstream, but not in the minimal version we require. Provide our own implementation which can be removed once we bump the minimal version. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Diff to v3: - fixed infinite recursion src/internal.h | 1 + src/libvirt_private.syms | 5 ++++ src/util/Makefile.inc.am | 2 ++ src/util/glibcompat.c | 51 ++++++++++++++++++++++++++++++++++++++++ src/util/glibcompat.h | 31 ++++++++++++++++++++++++ 5 files changed, 90 insertions(+) create mode 100644 src/util/glibcompat.c create mode 100644 src/util/glibcompat.h diff --git a/src/internal.h b/src/internal.h index fb17b87baa..5b0a2335f5 100644 --- a/src/internal.h +++ b/src/internal.h @@ -64,6 +64,7 @@ #include "libvirt/virterror.h" #include "c-strcase.h" +#include "glibcompat.h" /* Merely casting to (void) is not sufficient since the * introduction of the "warn_unused_result" attribute diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 0da02bb8bd..206295bef0 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1485,6 +1485,11 @@ virSecurityManagerTransactionStart; virSecurityManagerVerify; +# util/glibcompat.h +vir_g_strdup_printf; +vir_g_strdup_vprintf; + + # util/viralloc.h virAlloc; virAllocN; diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am index 705b93c93c..d8c8e61c4b 100644 --- a/src/util/Makefile.inc.am +++ b/src/util/Makefile.inc.am @@ -3,6 +3,8 @@ # These files are not related to driver APIs. Simply generic # helper APIs for various purposes UTIL_SOURCES = \ + util/glibcompat.c \ + util/glibcompat.h \ util/viralloc.c \ util/viralloc.h \ util/virarch.c \ diff --git a/src/util/glibcompat.c b/src/util/glibcompat.c new file mode 100644 index 0000000000..5c50153efe --- /dev/null +++ b/src/util/glibcompat.c @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2019 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#include <config.h> + +#include "glibcompat.h" + +#undef g_strdup_printf +#undef g_strdup_vprintf + +/* Due to a bug in glib, g_strdup_printf() nor g_strdup_vprintf() + * abort on OOM. It's fixed in glib's upstream. Provide our own + * implementation until the fix get's distributed. */ +char * +vir_g_strdup_printf(const char *msg, ...) +{ + va_list args; + char *ret; + va_start(args, msg); + ret = g_strdup_vprintf(msg, args); + if (!ret) + abort(); + va_end(args); + return ret; +} + + +char * +vir_g_strdup_vprintf(const char *msg, va_list args) +{ + char *ret; + ret = g_strdup_vprintf(msg, args); + if (!ret) + abort(); + return ret; +} diff --git a/src/util/glibcompat.h b/src/util/glibcompat.h new file mode 100644 index 0000000000..9c5fef09bf --- /dev/null +++ b/src/util/glibcompat.h @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2019 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#pragma once + +#include <glib.h> + +char *vir_g_strdup_printf(const char *msg, ...) + G_GNUC_PRINTF(1, 2); +char *vir_g_strdup_vprintf(const char *msg, va_list args) + G_GNUC_PRINTF(1, 0); + +#if !GLIB_CHECK_VERSION(2, 64, 0) +# define g_strdup_printf vir_g_strdup_printf +# define g_strdup_vprintf vir_g_strdup_vprintf +#endif -- 2.21.0

3 2