- Devel - libvirt List Archives

[libvirt] [PATCH] news: Allow xml validation for snapshot creation
by Han Han 31 Jul '19

31 Jul '19

Signed-off-by: Han Han <hhan(a)redhat.com> --- docs/news.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 1134309ec2..6d90ea8389 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -76,6 +76,16 @@ </change> </section> <section title="Improvements"> + <change> + <summary> + qemu: Allow to validate xml for snapshot creation + </summary> + <description> + Add flag <code>VIR_DOMAIN_SNAPSHOT_CREATE_VALIDATE</code> to validate + snapshot input xml. For virsh, users can use it as <code>virsh + snapshot-create --validate</code>. + </description> + </change> </section> <section title="Bug fixes"> </section> -- 2.20.1

1 0

[libvirt] [PATCH] build: bump min required gcc to 4.8
by Daniel P. Berrangé 30 Jul '19

30 Jul '19

The previous bump to 4.4 was done in: commit 24241c236e5e0b0b51a33ba539b40f5429a0df0e Author: Daniel P. Berrange <berrange(a)redhat.com> Date: Wed Jul 5 10:35:32 2017 +0100 Require use of GCC 4.4 or CLang compilers with 4.4 picked due to RHEL-6. Since we dropped RHEL-6, the next oldest distros are RHEL-7 (4.8.5) or Debian Jessie (4.9.2). Thus we pick 4.8 as the new min. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- config-post.h | 6 ++-- m4/virt-compile-warnings.m4 | 71 ++----------------------------------- src/internal.h | 44 +++++++---------------- src/util/virbuffer.c | 3 -- src/util/virstring.c | 3 -- src/util/virsysinfo.c | 4 --- 6 files changed, 19 insertions(+), 112 deletions(-) diff --git a/config-post.h b/config-post.h index 093f84a7ce..f928e19273 100644 --- a/config-post.h +++ b/config-post.h @@ -71,7 +71,7 @@ #endif /* LIBVIRT_NSS */ #ifndef __GNUC__ -# error "Libvirt requires GCC >= 4.4, or CLang" +# error "Libvirt requires GCC >= 4.8, or CLang" #endif /* @@ -86,6 +86,6 @@ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) #endif -#if !(__GNUC_PREREQ(4, 4) || defined(__clang__)) -# error "Libvirt requires GCC >= 4.4, or CLang" +#if !(__GNUC_PREREQ(4, 8) || defined(__clang__)) +# error "Libvirt requires GCC >= 4.8, or CLang" #endif diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4 index fc185aef38..f9460e82ba 100644 --- a/m4/virt-compile-warnings.m4 +++ b/m4/virt-compile-warnings.m4 @@ -68,61 +68,8 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ # Source: https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html dontwarn="$dontwarn -Wdisabled-optimization" - # gcc 4.2 treats attribute(format) as an implicit attribute(nonnull), - # which triggers spurious warnings for our usage - AC_CACHE_CHECK([whether the C compiler's -Wformat allows NULL strings], - [lv_cv_gcc_wformat_null_works], [ - save_CFLAGS=$CFLAGS - CFLAGS='-Wunknown-pragmas -Werror -Wformat' - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <stddef.h> - static __attribute__ ((__format__ (__printf__, 1, 2))) int - foo (const char *fmt, ...) { return !fmt; } - ]], [[ - return foo(NULL); - ]])], - [lv_cv_gcc_wformat_null_works=yes], - [lv_cv_gcc_wformat_null_works=no]) - CFLAGS=$save_CFLAGS]) - - # Gnulib uses '#pragma GCC diagnostic push' to silence some - # warnings, but older gcc doesn't support this. - AC_CACHE_CHECK([whether pragma GCC diagnostic push works], - [lv_cv_gcc_pragma_push_works], [ - save_CFLAGS=$CFLAGS - CFLAGS='-Wunknown-pragmas -Werror' - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #pragma GCC diagnostic push - #pragma GCC diagnostic pop - ]])], - [lv_cv_gcc_pragma_push_works=yes], - [lv_cv_gcc_pragma_push_works=no]) - CFLAGS=$save_CFLAGS]) - if test $lv_cv_gcc_pragma_push_works = no; then - dontwarn="$dontwarn -Wmissing-prototypes" - dontwarn="$dontwarn -Wmissing-declarations" - dontwarn="$dontwarn -Wcast-align" - else - AC_DEFINE_UNQUOTED([WORKING_PRAGMA_PUSH], 1, - [Define to 1 if gcc supports pragma push/pop]) - fi - - dnl Check whether strchr(s, char variable) causes a bogus compile - dnl warning, which is the case with GCC < 4.6 on some glibc - AC_CACHE_CHECK([whether the C compiler's -Wlogical-op gives bogus warnings], - [lv_cv_gcc_wlogical_op_broken], [ - save_CFLAGS="$CFLAGS" - CFLAGS="-O2 -Wlogical-op -Werror" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include <string.h> - ]], [[ - const char *haystack; - char needle; - return strchr(haystack, needle) == haystack;]])], - [lv_cv_gcc_wlogical_op_broken=no], - [lv_cv_gcc_wlogical_op_broken=yes]) - CFLAGS="$save_CFLAGS"]) - + # Broken in 6.0 and later + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69602 AC_CACHE_CHECK([whether gcc gives bogus warnings for -Wlogical-op], [lv_cv_gcc_wlogical_op_equal_expr_broken], [ save_CFLAGS="$CFLAGS" @@ -188,14 +135,8 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ wantwarn="$wantwarn -Wswitch-enum" # GNULIB turns on -Wformat=2 which implies -Wformat-nonliteral, - # so we need to manually re-exclude it. Also, older gcc 4.2 - # added an implied ATTRIBUTE_NONNULL on any parameter marked - # ATTRIBUTE_FMT_PRINT, which causes -Wformat failure on our - # intentional use of virReportError(code, NULL). + # so we need to manually re-exclude it. wantwarn="$wantwarn -Wno-format-nonliteral" - if test $lv_cv_gcc_wformat_null_works = no; then - wantwarn="$wantwarn -Wno-format" - fi # -Wformat enables this by default, and we should keep it, # but need to rewrite various areas of code first @@ -283,12 +224,6 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[ #endif ]) - if test "$gl_cv_warn_c__Wlogical_op" = yes && - test "$lv_cv_gcc_wlogical_op_broken" = yes; then - AC_DEFINE_UNQUOTED([BROKEN_GCC_WLOGICALOP_STRCHR], 1, - [Define to 1 if gcc -Wlogical-op reports false positives on strchr]) - fi - if test "$gl_cv_warn_c__Wlogical_op" = yes && test "$lv_cv_gcc_wlogical_op_equal_expr_broken" = yes; then AC_DEFINE_UNQUOTED([BROKEN_GCC_WLOGICALOP_EQUAL_EXPR], 1, diff --git a/src/internal.h b/src/internal.h index f718895460..adc1e3f496 100644 --- a/src/internal.h +++ b/src/internal.h @@ -185,54 +185,36 @@ # endif #endif -#if WORKING_PRAGMA_PUSH -# define VIR_WARNINGS_NO_CAST_ALIGN \ +#define VIR_WARNINGS_NO_CAST_ALIGN \ _Pragma ("GCC diagnostic push") \ _Pragma ("GCC diagnostic ignored \"-Wcast-align\"") -# define VIR_WARNINGS_NO_DEPRECATED \ +#define VIR_WARNINGS_NO_DEPRECATED \ _Pragma ("GCC diagnostic push") \ _Pragma ("GCC diagnostic ignored \"-Wdeprecated-declarations\"") -# if HAVE_SUGGEST_ATTRIBUTE_FORMAT -# define VIR_WARNINGS_NO_PRINTF \ +#if HAVE_SUGGEST_ATTRIBUTE_FORMAT +# define VIR_WARNINGS_NO_PRINTF \ _Pragma ("GCC diagnostic push") \ _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=format\"") -# else -# define VIR_WARNINGS_NO_PRINTF \ +#else +# define VIR_WARNINGS_NO_PRINTF \ _Pragma ("GCC diagnostic push") -# endif +#endif /* Workaround bogus GCC 6.0 for logical 'or' equal expression warnings. * (GCC bz 69602) */ -# if BROKEN_GCC_WLOGICALOP_EQUAL_EXPR -# define VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR \ +#if BROKEN_GCC_WLOGICALOP_EQUAL_EXPR +# define VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR \ _Pragma ("GCC diagnostic push") \ _Pragma ("GCC diagnostic ignored \"-Wlogical-op\"") -# else -# define VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR \ - _Pragma ("GCC diagnostic push") -# endif - -# define VIR_WARNINGS_RESET \ - _Pragma ("GCC diagnostic pop") #else -# define VIR_WARNINGS_NO_CAST_ALIGN -# define VIR_WARNINGS_NO_DEPRECATED -# define VIR_WARNINGS_NO_PRINTF -# define VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR -# define VIR_WARNINGS_RESET -#endif - -/* Workaround bogus GCC < 4.6 that produces false -Wlogical-op warnings for - * strchr(). Those old GCCs don't support push/pop. */ -#if BROKEN_GCC_WLOGICALOP_STRCHR -# define VIR_WARNINGS_NO_WLOGICALOP_STRCHR \ - _Pragma ("GCC diagnostic ignored \"-Wlogical-op\"") -#else -# define VIR_WARNINGS_NO_WLOGICALOP_STRCHR +# define VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR \ + _Pragma ("GCC diagnostic push") #endif +#define VIR_WARNINGS_RESET \ + _Pragma ("GCC diagnostic pop") /* * Use this when passing possibly-NULL strings to printf-a-likes. diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c index ac03b15a61..12b33f8bd6 100644 --- a/src/util/virbuffer.c +++ b/src/util/virbuffer.c @@ -421,9 +421,6 @@ virBufferVasprintf(virBufferPtr buf, const char *format, va_list argptr) } -VIR_WARNINGS_NO_WLOGICALOP_STRCHR - - /** * virBufferEscapeString: * @buf: the buffer to append to diff --git a/src/util/virstring.c b/src/util/virstring.c index 95bd7d225e..bd269e98fe 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -1350,9 +1350,6 @@ virStringHasControlChars(const char *str) } -VIR_WARNINGS_NO_WLOGICALOP_STRCHR - - /** * virStringStripControlChars: * @str: the string to strip diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 5be5e5133d..af26e0bab9 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -478,10 +478,6 @@ virSysinfoReadARM(void) return NULL; } - - -VIR_WARNINGS_NO_WLOGICALOP_STRCHR - static char * virSysinfoParseS390Delimited(const char *base, const char *name, char **value, char delim1, char delim2) -- 2.21.0

2 1

[libvirt] [PATCH] test_driver: implement virDomainMemoryStats
by Ilias Stamatis 30 Jul '19

30 Jul '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index fcb80c9e47..55976eedf1 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -6845,6 +6845,57 @@ testDomainManagedSaveRemove(virDomainPtr dom, unsigned int flags) return 0; } + +static int +testDomainMemoryStats(virDomainPtr dom, + virDomainMemoryStatPtr stats, + unsigned int nr_stats, + unsigned int flags) +{ + virDomainObjPtr vm; + int ret = -1; + + virCheckFlags(0, -1); + + if (!(vm = testDomObjFromDomain(dom))) + return -1; + + if (virDomainObjCheckActive(vm) < 0) + goto cleanup; + + ret = 0; + +#define STATS_SET_PARAM(name, value) \ + if (ret < nr_stats) { \ + stats[ret].tag = name; \ + stats[ret].val = value; \ + ret++; \ + } + + if (virDomainDefHasMemballoon(vm->def)) { + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_ACTUAL_BALLOON, 1024000); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_SWAP_IN, 0); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_SWAP_OUT, 0); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_MAJOR_FAULT, 0); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_MINOR_FAULT, 0); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_UNUSED, 791584); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_AVAILABLE, 977816); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_USABLE, 726244); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_LAST_UPDATE, 627319920); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_DISK_CACHES, 164964); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_HUGETLB_PGALLOC, 0); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_HUGETLB_PGFAIL, 0); + STATS_SET_PARAM(VIR_DOMAIN_MEMORY_STAT_RSS, 1131076); + } + +#undef STATS_SET_PARAM + + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + static int testDomainMemoryPeek(virDomainPtr dom, unsigned long long start, @@ -7799,6 +7850,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainManagedSave = testDomainManagedSave, /* 1.1.4 */ .domainHasManagedSaveImage = testDomainHasManagedSaveImage, /* 1.1.4 */ .domainManagedSaveRemove = testDomainManagedSaveRemove, /* 1.1.4 */ + .domainMemoryStats = testDomainMemoryStats, /* 5.6.0 */ .domainMemoryPeek = testDomainMemoryPeek, /* 5.4.0 */ .domainSnapshotNum = testDomainSnapshotNum, /* 1.1.4 */ -- 2.22.0

2 3

[libvirt] [PATCH] cpu: Drop CPUID definition for hv-spinlocks
by Jiri Denemark 30 Jul '19

30 Jul '19

hv-spinlocks is not a CPUID feature and should not be checked as such. While starting a domain with hv-spinlocks enabled, we would report a warning about unsupported hyperv spinlocks feature even though it was set properly. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/cpu/cpu_x86.c | 3 --- src/qemu/qemu_process.c | 5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 387c365512..b58eb2c9d8 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -84,8 +84,6 @@ KVM_FEATURE_DEF(VIR_CPU_x86_HV_STIMER, 0x40000003, 0x00000008); KVM_FEATURE_DEF(VIR_CPU_x86_HV_RELAXED, 0x40000003, 0x00000020); -KVM_FEATURE_DEF(VIR_CPU_x86_HV_SPINLOCKS, - 0x40000003, 0x00000022); KVM_FEATURE_DEF(VIR_CPU_x86_HV_VAPIC, 0x40000003, 0x00000030); KVM_FEATURE_DEF(VIR_CPU_x86_HV_VPINDEX, @@ -110,7 +108,6 @@ static virCPUx86Feature x86_kvm_features[] = KVM_FEATURE(VIR_CPU_x86_HV_SYNIC), KVM_FEATURE(VIR_CPU_x86_HV_STIMER), KVM_FEATURE(VIR_CPU_x86_HV_RELAXED), - KVM_FEATURE(VIR_CPU_x86_HV_SPINLOCKS), KVM_FEATURE(VIR_CPU_x86_HV_VAPIC), KVM_FEATURE(VIR_CPU_x86_HV_VPINDEX), KVM_FEATURE(VIR_CPU_x86_HV_RESET), diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 0ee97e2296..0ba04b48e6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4098,7 +4098,8 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def, for (i = 0; i < VIR_DOMAIN_HYPERV_LAST; i++) { /* always supported string property */ - if (i == VIR_DOMAIN_HYPERV_VENDOR_ID) + if (i == VIR_DOMAIN_HYPERV_VENDOR_ID || + i == VIR_DOMAIN_HYPERV_SPINLOCKS) continue; if (def->hyperv_features[i] != VIR_TRISTATE_SWITCH_ON) @@ -4119,7 +4120,6 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def, switch ((virDomainHyperv) i) { case VIR_DOMAIN_HYPERV_RELAXED: case VIR_DOMAIN_HYPERV_VAPIC: - case VIR_DOMAIN_HYPERV_SPINLOCKS: VIR_WARN("host doesn't support hyperv '%s' feature", virDomainHypervTypeToString(i)); break; @@ -4140,6 +4140,7 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def, return -1; /* coverity[dead_error_begin] */ + case VIR_DOMAIN_HYPERV_SPINLOCKS: case VIR_DOMAIN_HYPERV_VENDOR_ID: case VIR_DOMAIN_HYPERV_LAST: break; -- 2.22.0

2 1

[libvirt] UID/GID during kvm/qemu migrate
by Stephan von Krawczynski 30 Jul '19

30 Jul '19

Hello, is there some immanent code in libvirt that forces UID/GID of the libvirt standard user to be the same on two boxes migrating qemu vms against each other? The migration itself uses root obviously (password is requested). But if a vm xml does not contain any definition regarding UID/GID what else could prevent this from working? I believe I ran into such a problem trying to migrate and ending up in an error, a vm still working on original host but its fs (netfs pool (nfs/raw)) being switched to read-only... -- Regards, Stephan

2 4

[libvirt] [PATCH v2 0/8] Add support for Direct Mode for Hyper-V Synthetic timers
by Vitaly Kuznetsov 30 Jul '19

30 Jul '19

Changes since v1: - Rebase - Add Ján's R-b tags. - Hardcode 'direct' as the only stimer feature to avoid over-engineering [Ján Tomko] - Split 'conf' patch into three [Ján Tomko] - Minor fixes [Ján Tomko] QEMU-4.1 will bring us Direct Mode for Hyper-V Synthetic timers support, we need to support it in libvirt too. As this is not a new enlightenment but rather an enhancement of an existing one ('stimer'), support it in <stimer state='on'> <direct state='on'/> </stimer> form. Backwards compatibility is (hopefully) preserved. Vitaly Kuznetsov (8): docs: formatdomain: add stimer flag to the example xml docs: formatdomain: fix 'SynIC' spelling docs: formatdomain: move 'msrs' out of Hyper-V Enlightenments cpu_x86: add Edx to KVM_FEATURE_DEF() conf: change the way how Hyper-V features are printed out conf: add support for Direct Mode for Hyper-V Synthetic timers qemu: add support for Direct Mode for Hyper-V Synthetic timers news: mention Direct Mode for Hyper-V Synthetic timers support docs/formatdomain.html.in | 13 +++-- docs/news.xml | 9 ++++ docs/schemas/domaincommon.rng | 16 +++++- src/conf/domain_conf.c | 77 ++++++++++++++++++++++++++--- src/conf/domain_conf.h | 1 + src/cpu/cpu_x86.c | 35 +++++++------ src/cpu/cpu_x86_data.h | 2 + src/qemu/qemu_command.c | 12 +++-- src/qemu/qemu_process.c | 20 +++++++- tests/qemuxml2argvdata/hyperv.args | 4 +- tests/qemuxml2argvdata/hyperv.xml | 4 +- tests/qemuxml2xmloutdata/hyperv.xml | 4 +- 12 files changed, 158 insertions(+), 39 deletions(-) -- 2.20.1

2 9

[libvirt] [PATCH 00/41] Split the libvirtd daemon into per-driver daemons
by Daniel P. Berrangé 30 Jul '19

30 Jul '19

This is what all the driver refactoring I've done has been about enabling. We gain new daemons for each driver, for the primary virt drivers: virtlibxld virtlxcd virtqemud virtvboxd virtvzd And again for the secondary drivers virtinterfaced virtnetworkd virtnodedevd virtnwfilterd virtsecretd virtstoraged Finally to support IP connectivity, and also the legacy lbivirtd UNIX domain socket (for the old libvirt remote driver SSH tunnelling): virtproxyd The the sake of facilitating upgrades, the existing libvirtd still exists and works the same way it always has. You either run libvirtd, or you run the per-driver daemons, never both. The remote driver will look to see whether libvirtd is running to figure out whether to connect to libvirtd or the new per-driver daemons. When auto-spawning daemons for nonroot users, we default to spawning the per-driver daemons. This can be controlled with a UR parameter "?mode=direct|legacy|auto", where 'direct' means per-driver and 'legacy' means libvirtd (or indirect via virtproxyd if that's running). Changed in v2: - Added systemd unit files for service & sockets, ensuring conflicts with libvirtd - Fixed proxy to actually handle probing of URIs (still not quite perfect) - Renamed virtlibxld to virtxend as "xen" is the user facing name of the URI - Lazy loading of secondary drivers, so connecting to virtqemud does't auto-spawn all secondary driver daemons, until a relevant API is actually invoked - Actually generated config files / augeas files per daemon - Abort daemon startup if driver fails to load - Many other fixes Still a few things to do.... Important: - Tweak virtxend to not start unless on a xen host - Identity forwarding so that when connecting to virtproxyd the apps identity is sent onto virtqemud. Without this, virtqemud would see the client as "root" and so polkit would allow all access. Opps Nice to have - MAYBE make it possible to disable build of libvirtd, or of the per-driver daemons so downstream vendors can decide which to ship. Alternatively they can just not include the binary in the package file list ? - Tuning of the daemon defaults for worker threads to better suit the fact that we have per-driver daemons - More work on RPM packaging to allow install of per-driver daemosn without pulling in libvirtd too - Hopefully not much else. Daniel P. Berrangé (41): build: make augeas-gentest.pl write to stdout build: create all augeas test files in same dir as their source build: collapse rules adding augeas tests to CLEANFILES build: use a common rule for checking augeas test data files build: centralize rule for handling generated config files remote: stop trying to print help as giant blocks of text remote: conditionalize socket names in libvirtd daemon remote: conditionalize daemon name in libvirtd daemon remote: conditionalize driver loading in libvirtd daemon remote: conditionalize IP socket usage in libvirtd daemon remote: conditionalize IP socket config in libvirtd.conf remote: conditionalize IP socket config in augeas definitions remote: refactor & rename variables for building libvirtd remote: don't hardcode /etc in the systemd units remote: reduce duplication in systemd unit file make rules into one remote: conditionalize systemd socket unit files remote: refactor how list of systemd unit files is built remote: in per-driver daemons ensure that state initialize succeeds remote: introduce virtproxyd daemon to handle IP connectivity secret: introduce virtsecretd daemon network: introduce virtnetworkd daemon interface: introduce virtinterfaced daemon storage: introduce virtstoraged daemon nodedev: introduce virtnodedevd daemon nwfilter: introduce virtnwfilterd daemon libxl: introduce virtxend daemon qemu: introduce virtqemud daemon lxc: introduce virtlxcd daemon vbox: introduce virtvboxd daemon bhyve: introduce virtbhyved daemon vz: introduce virtvzd daemon admin: add ability to connect to the per-driver daemon sockets remote: get rid of bogus ATTRIBUTE_UNUSED annotation client param remote: change generated methods to not directly access connection remote: change hand written methods to not directly access connection remote: open secondary drivers via remote driver if needed remote: handle autoprobing of driver within virtproxyd remote: use enum helpers for parsing remote driver transport remote: refactor the code for choosing the UNIX socket path remote: switch to connect to per-driver daemons by default libvirt: correctly print out URI returned from probing .gitignore | 62 +- build-aux/augeas-gentest.pl | 22 +- libvirt.spec.in | 91 ++ m4/virt-driver-remote.m4 | 15 + src/Makefile.am | 26 +- src/admin/admin_server_dispatch.c | 9 + src/bhyve/Makefile.inc.am | 55 +- src/bhyve/bhyve_driver.c | 10 +- src/driver-state.h | 8 +- src/driver.h | 2 + src/interface/Makefile.inc.am | 62 + src/interface/interface_backend_netcf.c | 8 +- src/interface/interface_backend_udev.c | 4 +- src/interface/virtinterfaced.service.in | 24 + src/libvirt-admin.c | 32 +- src/libvirt.c | 42 +- src/libvirt_internal.h | 1 + src/libxl/Makefile.inc.am | 79 +- src/libxl/libxl_driver.c | 10 +- src/libxl/virtxend.service.in | 24 + src/locking/Makefile.inc.am | 76 +- src/logging/Makefile.inc.am | 22 +- src/lxc/Makefile.inc.am | 77 +- src/lxc/lxc_driver.c | 12 +- src/lxc/virtlxcd.service.in | 24 + src/network/Makefile.inc.am | 61 + src/network/bridge_driver.c | 4 +- src/network/virtnetworkd.service.in | 24 + src/node_device/Makefile.inc.am | 62 + src/node_device/node_device_hal.c | 12 +- src/node_device/node_device_udev.c | 8 +- src/node_device/virtnodedevd.service.in | 24 + src/nwfilter/Makefile.inc.am | 62 + src/nwfilter/nwfilter_driver.c | 12 +- src/nwfilter/virtnwfilterd.service.in | 24 + src/qemu/Makefile.inc.am | 76 +- src/qemu/qemu_driver.c | 8 +- src/qemu/virtqemud.service.in | 24 + src/remote/Makefile.inc.am | 281 ++-- src/remote/libvirtd-admin.socket.in | 15 +- src/remote/libvirtd-ro.socket.in | 15 +- src/remote/libvirtd-tcp.socket.in | 13 +- src/remote/libvirtd-tls.socket.in | 13 +- src/remote/{libvirtd.aug => libvirtd.aug.in} | 26 +- .../{libvirtd.conf => libvirtd.conf.in} | 42 +- src/remote/libvirtd.service.in | 2 +- src/remote/libvirtd.socket.in | 11 +- src/remote/remote_daemon.c | 291 ++-- src/remote/remote_daemon.h | 13 + src/remote/remote_daemon_config.c | 47 +- src/remote/remote_daemon_config.h | 9 +- src/remote/remote_daemon_dispatch.c | 1205 +++++++++-------- src/remote/remote_driver.c | 396 ++++-- src/remote/remote_driver.h | 4 - src/remote/test_libvirtd.aug.in | 16 +- src/remote/virtproxyd.service.in | 24 + src/rpc/gendispatch.pl | 96 +- src/secret/Makefile.inc.am | 62 + src/secret/secret_driver.c | 8 +- src/secret/virtsecretd.service.in | 24 + src/storage/Makefile.inc.am | 61 + src/storage/storage_driver.c | 8 +- src/storage/virtstoraged.service.in | 24 + src/vbox/Makefile.inc.am | 62 + src/vbox/virtvboxd.service.in | 24 + src/vz/Makefile.inc.am | 62 + src/vz/virtvzd.service.in | 24 + src/vz/vz_driver.c | 14 +- 68 files changed, 2832 insertions(+), 1258 deletions(-) create mode 100644 src/interface/virtinterfaced.service.in create mode 100644 src/libxl/virtxend.service.in create mode 100644 src/lxc/virtlxcd.service.in create mode 100644 src/network/virtnetworkd.service.in create mode 100644 src/node_device/virtnodedevd.service.in create mode 100644 src/nwfilter/virtnwfilterd.service.in create mode 100644 src/qemu/virtqemud.service.in rename src/remote/{libvirtd.aug => libvirtd.aug.in} (89%) rename src/remote/{libvirtd.conf => libvirtd.conf.in} (95%) create mode 100644 src/remote/virtproxyd.service.in create mode 100644 src/secret/virtsecretd.service.in create mode 100644 src/storage/virtstoraged.service.in create mode 100644 src/vbox/virtvboxd.service.in create mode 100644 src/vz/virtvzd.service.in -- 2.21.0

3 108

[libvirt] [python PATCH v7] Add virDomainCheckpoint APIs
by Eric Blake 29 Jul '19

29 Jul '19

Copies heavily from existing virDomainSnapshot handling, regarding what special cases the generator has to be taught and what overrides need to be written. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Python counterparts to my incremental backup patches. An earlier version was already reviewed by Dan; the main diff here is the addition of virDomainSnapshotCreateXML2 handling. HACKING | 2 + MANIFEST.in | 1 + generator.py | 37 ++++++++-- libvirt-override-api.xml | 12 ++++ libvirt-override-virDomain.py | 13 ++++ libvirt-override-virDomainCheckpoint.py | 19 +++++ libvirt-override.c | 96 +++++++++++++++++++++++++ sanitytest.py | 11 +-- typewrappers.c | 13 ++++ typewrappers.h | 10 +++ 10 files changed, 206 insertions(+), 8 deletions(-) create mode 100644 libvirt-override-virDomainCheckpoint.py diff --git a/HACKING b/HACKING index 6eeb9e6..39e7cd3 100644 --- a/HACKING +++ b/HACKING @@ -28,6 +28,8 @@ hand written source files the virConnect class - libvirt-override-virDomain.py - high level overrides in the virDomain class + - libvirt-override-virDomainCheckpoint.py - high level overrides in + the virDomainCheckpoint class - libvirt-override-virDomainSnapshot.py - high level overrides in the virDomainSnapshot class - libvirt-override-virStoragePool.py - high level overrides in diff --git a/MANIFEST.in b/MANIFEST.in index b6788f4..5d2f559 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -23,6 +23,7 @@ include libvirt-override.c include libvirt-override.py include libvirt-override-virConnect.py include libvirt-override-virDomain.py +include libvirt-override-virDomainCheckpoint.py include libvirt-override-virDomainSnapshot.py include libvirt-override-virStoragePool.py include libvirt-override-virStream.py diff --git a/generator.py b/generator.py index ffa3ce5..a16f9b1 100755 --- a/generator.py +++ b/generator.py @@ -35,6 +35,7 @@ libvirt_headers = [ "libvirt", "libvirt-common", "libvirt-domain", + "libvirt-domain-checkpoint", "libvirt-domain-snapshot", "libvirt-event", "libvirt-host", @@ -364,6 +365,10 @@ py_types = { 'virStream *': ('O', "virStream", "virStreamPtr", "virStreamPtr"), 'const virStream *': ('O', "virStream", "virStreamPtr", "virStreamPtr"), + 'virDomainCheckpointPtr': ('O', "virDomainCheckpoint", "virDomainCheckpointPtr", "virDomainCheckpointPtr"), + 'virDomainCheckpoint *': ('O', "virDomainCheckpoint", "virDomainCheckpointPtr", "virDomainCheckpointPtr"), + 'const virDomainCheckpoint *': ('O', "virDomainCheckpoint", "virDomainCheckpointPtr", "virDomainCheckpointPtr"), + 'virDomainSnapshotPtr': ('O', "virDomainSnapshot", "virDomainSnapshotPtr", "virDomainSnapshotPtr"), 'virDomainSnapshot *': ('O', "virDomainSnapshot", "virDomainSnapshotPtr", "virDomainSnapshotPtr"), 'const virDomainSnapshot *': ('O', "virDomainSnapshot", "virDomainSnapshotPtr", "virDomainSnapshotPtr"), @@ -536,6 +541,8 @@ skip_function = ( 'virSaveLastError', # We have our own python error wrapper 'virFreeError', # Only needed if we use virSaveLastError 'virConnectListAllDomains', # overridden in virConnect.py + 'virDomainListAllCheckpoints', # overridden in virDomain.py + 'virDomainCheckpointListAllChildren', # overridden in virDomainCheckpoint.py 'virDomainListAllSnapshots', # overridden in virDomain.py 'virDomainSnapshotListAllChildren', # overridden in virDomainSnapshot.py 'virConnectListAllStoragePools', # overridden in virConnect.py @@ -582,6 +589,7 @@ skip_function = ( "virStoragePoolRef", "virStorageVolRef", "virStreamRef", + "virDomainCheckpointRef", "virDomainSnapshotRef", # This functions shouldn't be called via the bindings (and even the docs @@ -594,6 +602,8 @@ skip_function = ( "virNWFilterGetConnect", "virStoragePoolGetConnect", "virStorageVolGetConnect", + "virDomainCheckpointGetConnect", + "virDomainCheckpointGetDomain", "virDomainSnapshotGetConnect", "virDomainSnapshotGetDomain", @@ -1023,6 +1033,8 @@ classes_type = { "virStream *": ("._o", "virStream(self, _obj=%s)", "virStream"), "virConnectPtr": ("._o", "virConnect(_obj=%s)", "virConnect"), "virConnect *": ("._o", "virConnect(_obj=%s)", "virConnect"), + "virDomainCheckpointPtr": ("._o", "virDomainCheckpoint(self,_obj=%s)", "virDomainCheckpoint"), + "virDomainCheckpoint *": ("._o", "virDomainCheckpoint(self, _obj=%s)", "virDomainCheckpoint"), "virDomainSnapshotPtr": ("._o", "virDomainSnapshot(self,_obj=%s)", "virDomainSnapshot"), "virDomainSnapshot *": ("._o", "virDomainSnapshot(self, _obj=%s)", "virDomainSnapshot"), } @@ -1031,7 +1043,7 @@ primary_classes = ["virDomain", "virNetwork", "virInterface", "virStoragePool", "virStorageVol", "virConnect", "virNodeDevice", "virSecret", "virNWFilter", "virNWFilterBinding", - "virStream", "virDomainSnapshot"] + "virStream", "virDomainCheckpoint", "virDomainSnapshot"] classes_destructors = { "virDomain": "virDomainFree", @@ -1043,6 +1055,7 @@ classes_destructors = { "virSecret": "virSecretFree", "virNWFilter": "virNWFilterFree", "virNWFilterBinding": "virNWFilterBindingFree", + "virDomainCheckpoint": "virDomainCheckpointFree", "virDomainSnapshot": "virDomainSnapshotFree", # We hand-craft __del__ for this one #"virStream": "virStreamFree", @@ -1053,6 +1066,7 @@ class_skip_connect_impl = { } class_domain_impl = { + "virDomainCheckpoint": True, "virDomainSnapshot": True, } @@ -1171,6 +1185,18 @@ def nameFixup(name, classe, type, file): elif name[0:12] == "virDomainGet": func = name[12:] func = func[0:1].lower() + func[1:] + elif name[0:31] == "virDomainCheckpointLookupByName": + func = name[9:] + func = func[0:1].lower() + func[1:] + elif name[0:28] == "virDomainCheckpointCreateXML": + func = name[9:] + func = func[0:1].lower() + func[1:] + elif name[0:26] == "virDomainCheckpointCurrent": + func = name[9:] + func = func[0:1].lower() + func[1:] + elif name[0:19] == "virDomainCheckpoint": + func = name[19:] + func = func[0:1].lower() + func[1:] elif name[0:29] == "virDomainSnapshotLookupByName": func = name[9:] func = func[0:1].lower() + func[1:] @@ -1183,6 +1209,9 @@ def nameFixup(name, classe, type, file): elif name[0:20] == "virDomainSnapshotNum": func = name[9:] func = func[0:1].lower() + func[1:] + elif name[0:27] == "virDomainSnapshotCreateXML2": + func = name[9:] + func = func[0:1].lower() + func[1:] elif name[0:26] == "virDomainSnapshotCreateXML": func = name[9:] func = func[0:1].lower() + func[1:] @@ -1501,7 +1530,7 @@ def buildWrappers(module): "virStorageVol", "virNodeDevice", "virSecret","virStream", "virNWFilter", "virNWFilterBinding" ]: classes.write(" def __init__(self, conn, _obj=None):\n") - elif classname in [ 'virDomainSnapshot' ]: + elif classname in [ "virDomainCheckpoint", "virDomainSnapshot" ]: classes.write(" def __init__(self, dom, _obj=None):\n") else: classes.write(" def __init__(self, _obj=None):\n") @@ -1513,7 +1542,7 @@ def buildWrappers(module): classes.write(" self._conn = conn\n" + \ " if not isinstance(conn, virConnect):\n" + \ " self._conn = conn._conn\n") - elif classname in [ "virDomainSnapshot" ]: + elif classname in [ "virDomainCheckpoint", "virDomainSnapshot" ]: classes.write(" self._dom = dom\n") classes.write(" self._conn = dom.connect()\n") classes.write(" if type(_obj).__name__ not in [\"PyCapsule\", \"PyCObject\"]:\n") @@ -1641,7 +1670,7 @@ def buildWrappers(module): classes.write( " if ret is None:raise libvirtError('%s() failed', vol=self)\n" % (name)) - elif classname == "virDomainSnapshot": + elif classname in [ "virDomainCheckpoint", "virDomainSnapshot"]: classes.write( " if ret is None:raise libvirtError('%s() failed', dom=self._dom)\n" % (name)) diff --git a/libvirt-override-api.xml b/libvirt-override-api.xml index 7f578e0..1edf0c5 100644 --- a/libvirt-override-api.xml +++ b/libvirt-override-api.xml @@ -576,6 +576,18 @@ <arg name='flags' type='unsigned int' info='flags'/> <return type='int' info="0 on success, -1 on error"/> </function> + <function name='virDomainListAllCheckpoints' file='python'> + <info>returns the list of checkpoints for the given domain</info> + <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> + <arg name='flags' type='unsigned int' info='flags'/> + <return type='char *' info='the list of checkpoints or None in case of error'/> + </function> + <function name='virDomainCheckpointListAllChildren' file='python'> + <info>collect the list of child checkpoint names for the given checkpoint</info> + <arg name='checkpoint' type='virDomainCheckpointPtr' info='pointer to the checkpoint'/> + <arg name='flags' type='unsigned int' info='flags'/> + <return type='char *' info='the list of checkpoints or None in case of error'/> + </function> <function name='virDomainGetBlockJobInfo' file='python'> <info>Get progress information for a block job</info> <arg name='dom' type='virDomainPtr' info='pointer to the domain'/> diff --git a/libvirt-override-virDomain.py b/libvirt-override-virDomain.py index 7c417b8..7ce34f1 100644 --- a/libvirt-override-virDomain.py +++ b/libvirt-override-virDomain.py @@ -11,6 +11,19 @@ return retlist + def listAllCheckpoints(self, flags=0): + """List all checkpoints and returns a list of checkpoint objects""" + ret = libvirtmod.virDomainListAllCheckpoints(self._o, flags) + if ret is None: + raise libvirtError("virDomainListAllCheckpoints() failed", conn=self) + + retlist = list() + for chkptr in ret: + retlist.append(virDomainCheckpoint(self, _obj=chkptr)) + + return retlist + + def createWithFiles(self, files, flags=0): """Launch a defined domain. If the call succeeds the domain moves from the defined to the running domains pools. diff --git a/libvirt-override-virDomainCheckpoint.py b/libvirt-override-virDomainCheckpoint.py new file mode 100644 index 0000000..371b0fd --- /dev/null +++ b/libvirt-override-virDomainCheckpoint.py @@ -0,0 +1,19 @@ + def getConnect(self): + """Get the connection that owns the domain that a checkpoint was created for""" + return self.connect() + + def getDomain(self): + """Get the domain that a checkpoint was created for""" + return self.domain() + + def listAllChildren(self, flags=0): + """List all child checkpoints and returns a list of checkpoint objects""" + ret = libvirtmod.virDomainCheckpointListAllChildren(self._o, flags) + if ret is None: + raise libvirtError("virDomainCheckpointListAllChildren() failed", conn=self) + + retlist = list() + for chkptr in ret: + retlist.append(virDomainCheckpoint(self, _obj=chkptr)) + + return retlist diff --git a/libvirt-override.c b/libvirt-override.c index c5e2908..777f533 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -2325,6 +2325,98 @@ libvirt_virConnectListDefinedDomains(PyObject *self ATTRIBUTE_UNUSED, goto cleanup; } +#if LIBVIR_CHECK_VERSION(5, 1, 0) +static PyObject * +libvirt_virDomainListAllCheckpoints(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *py_retval = NULL; + virDomainCheckpointPtr *chks = NULL; + int c_retval; + ssize_t i; + virDomainPtr dom; + PyObject *pyobj_dom; + unsigned int flags; + + if (!PyArg_ParseTuple(args, (char *)"OI:virDomainListAllCheckpoints", + &pyobj_dom, &flags)) + return NULL; + dom = (virDomainPtr) PyvirDomain_Get(pyobj_dom); + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainListAllCheckpoints(dom, &chks, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (c_retval < 0) + return VIR_PY_NONE; + + if (!(py_retval = PyList_New(c_retval))) + goto cleanup; + + for (i = 0; i < c_retval; i++) { + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_virDomainCheckpointPtrWrap(chks[i]), error); + chks[i] = NULL; + } + + cleanup: + for (i = 0; i < c_retval; i++) + if (chks[i]) + virDomainCheckpointFree(chks[i]); + VIR_FREE(chks); + return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; +} + +static PyObject * +libvirt_virDomainCheckpointListAllChildren(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) +{ + PyObject *py_retval = NULL; + virDomainCheckpointPtr *chks = NULL; + int c_retval; + ssize_t i; + virDomainCheckpointPtr parent; + PyObject *pyobj_parent; + unsigned int flags; + + if (!PyArg_ParseTuple(args, (char *)"OI:virDomainCheckpointListAllChildren", + &pyobj_parent, &flags)) + return NULL; + parent = (virDomainCheckpointPtr) PyvirDomainCheckpoint_Get(pyobj_parent); + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainCheckpointListAllChildren(parent, &chks, flags); + LIBVIRT_END_ALLOW_THREADS; + + if (c_retval < 0) + return VIR_PY_NONE; + + if (!(py_retval = PyList_New(c_retval))) + goto cleanup; + + for (i = 0; i < c_retval; i++) { + VIR_PY_LIST_SET_GOTO(py_retval, i, + libvirt_virDomainCheckpointPtrWrap(chks[i]), error); + chks[i] = NULL; + } + + cleanup: + for (i = 0; i < c_retval; i++) + if (chks[i]) + virDomainCheckpointFree(chks[i]); + VIR_FREE(chks); + return py_retval; + + error: + Py_CLEAR(py_retval); + goto cleanup; +} +#endif /* LIBVIR_CHECK_VERSION(5, 1, 0) */ + static PyObject * libvirt_virDomainSnapshotListNames(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) @@ -10100,6 +10192,10 @@ static PyMethodDef libvirtMethods[] = { #if LIBVIR_CHECK_VERSION(1, 0, 3) {(char *) "virDomainGetJobStats", libvirt_virDomainGetJobStats, METH_VARARGS, NULL}, #endif /* LIBVIR_CHECK_VERSION(1, 0, 3) */ +#if LIBVIR_CHECK_VERSION(5, 1, 0) + {(char *) "virDomainListAllCheckpoints", libvirt_virDomainListAllCheckpoints, METH_VARARGS, NULL}, + {(char *) "virDomainCheckpointListAllChildren", libvirt_virDomainCheckpointListAllChildren, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(5, 1, 0) */ {(char *) "virDomainSnapshotListNames", libvirt_virDomainSnapshotListNames, METH_VARARGS, NULL}, #if LIBVIR_CHECK_VERSION(0, 9, 13) {(char *) "virDomainListAllSnapshots", libvirt_virDomainListAllSnapshots, METH_VARARGS, NULL}, diff --git a/sanitytest.py b/sanitytest.py index 68dde6b..b044231 100644 --- a/sanitytest.py +++ b/sanitytest.py @@ -249,13 +249,13 @@ for name in sorted(basicklassmap): # Remove 'Get' prefix from most APIs, except those in virConnect # and virDomainSnapshot namespaces which stupidly used a different # convention which we now can't fix without breaking API - if func[0:3] == "Get" and klass not in ["virConnect", "virDomainSnapshot", "libvirt"]: + if func[0:3] == "Get" and klass not in ["virConnect", "virDomainCheckpoint", "virDomainSnapshot", "libvirt"]: if func not in ["GetCPUStats", "GetTime"]: func = func[3:] # The object creation and lookup APIs all have to get re-mapped # into the parent class - if func in ["CreateXML", "CreateLinux", "CreateXMLWithFiles", + if func in ["CreateXML", "CreateXML2", "CreateLinux", "CreateXMLWithFiles", "DefineXML", "CreateXMLFrom", "LookupByUUID", "LookupByUUIDString", "LookupByVolume" "LookupByName", "LookupByID", "LookupByName", "LookupByKey", "LookupByPath", @@ -266,7 +266,7 @@ for name in sorted(basicklassmap): if klass != "virDomain": func = klass[3:] + func - if klass == "virDomainSnapshot": + if klass in [ "virDomainCheckpoint", "virDomainSnapshot"]: klass = "virDomain" func = func[6:] elif klass == "virStorageVol" and func in ["StorageVolCreateXMLFrom", "StorageVolCreateXML"]: @@ -297,10 +297,13 @@ for name in sorted(basicklassmap): if func[0:6] == "Change": klass = "virConnect" - # Need to special case the snapshot APIs + # Need to special case the checkpoint and snapshot APIs if klass == "virDomainSnapshot" and func in ["Current", "ListNames", "Num"]: klass = "virDomain" func = "snapshot" + func + elif klass == "virDomainCheckpoint" and func == "Current": + klass = "virDomain" + func = "checkpoint" + func # Names should start with lowercase letter... func = func[0:1].lower() + func[1:] diff --git a/typewrappers.c b/typewrappers.c index 9ba14b4..cd7a70b 100644 --- a/typewrappers.c +++ b/typewrappers.c @@ -568,6 +568,19 @@ libvirt_virStreamPtrWrap(virStreamPtr node) return ret; } +PyObject * +libvirt_virDomainCheckpointPtrWrap(virDomainCheckpointPtr node) +{ + PyObject *ret; + + if (node == NULL) { + return VIR_PY_NONE; + } + + ret = libvirt_buildPyObject(node, "virDomainCheckpointPtr", NULL); + return ret; +} + PyObject * libvirt_virDomainSnapshotPtrWrap(virDomainSnapshotPtr node) { diff --git a/typewrappers.h b/typewrappers.h index 4423774..198397b 100644 --- a/typewrappers.h +++ b/typewrappers.h @@ -128,6 +128,15 @@ typedef struct { } PyvirStream_Object; +#define PyvirDomainCheckpoint_Get(v) (((v) == Py_None) ? NULL : \ + (((PyvirDomainCheckpoint_Object *)(v))->obj)) + +typedef struct { + PyObject_HEAD + virDomainCheckpointPtr obj; +} PyvirDomainCheckpoint_Object; + + #define PyvirDomainSnapshot_Get(v) (((v) == Py_None) ? NULL : \ (((PyvirDomainSnapshot_Object *)(v))->obj)) @@ -204,6 +213,7 @@ PyObject * libvirt_virSecretPtrWrap(virSecretPtr node); PyObject * libvirt_virNWFilterPtrWrap(virNWFilterPtr node); PyObject * libvirt_virNWFilterBindingPtrWrap(virNWFilterBindingPtr node); PyObject * libvirt_virStreamPtrWrap(virStreamPtr node); +PyObject * libvirt_virDomainCheckpointPtrWrap(virDomainCheckpointPtr node); PyObject * libvirt_virDomainSnapshotPtrWrap(virDomainSnapshotPtr node); -- 2.20.1

2 2

[libvirt] [PATCH] build: Fix checkpoint_conf on mingw
by Eric Blake 29 Jul '19

29 Jul '19

CI flagged a failing mingw build, due to: In file included from ../../src/conf/checkpoint_conf.c:24: ../gnulib/lib/configmake.h:8:17: error: expected identifier or '(' before string constant 8 | #define DATADIR "/usr/i686-w64-mingw32/sys-root/mingw/share" | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ As previously learned in commits bd205a90 and 976abdf6, gnulib's configmake.h header does #define DATADIR "string...", while mingw's <winsock2.h> expects to declare a type named DATADIR. As long as the mingw system header is included first before configmake.h, the two uses do not conflict, but until gnulib is patched to make configmake.h automatically work around the issue, our immediate fix is the workaround of rearranging our include order to insure no conflict. Copy the paradigm used in domain_conf.c of using <unistd.h> to trigger the indirect inclusion of <winsock2.h> on mingw. Fixes: 1a4df34a Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule src/conf/checkpoint_conf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index 5f4c275dd8..5ce4cc4853 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -21,6 +21,8 @@ #include <config.h> +#include <unistd.h> + #include "configmake.h" #include "internal.h" #include "virbitmap.h" -- 2.20.1

1 0

[libvirt] [PATCH] util: Fix comment for virGetEnvAllowSUID()
by Andrea Bolognani 29 Jul '19

29 Jul '19

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- Pushed as trivial. src/util/virutil.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index 019009be8c..84ccc1a546 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -1738,7 +1738,7 @@ const char *virGetEnvBlockSUID(const char *name) /** - * virGetEnvBlockSUID: + * virGetEnvAllowSUID: * @name: the environment variable name * * Obtain an environment variable which is safe to -- 2.21.0

1 0

[libvirt] [PATCH v10 00/19] Checkpoint APIs (incremental backup saga)
by Eric Blake 29 Jul '19

29 Jul '19

This is a subset of v10 of incremental backup, fixing Peter's review comments from v9 (and even some from v8 that I had missed earlier). There's still a lot more rebasing churn to resolve in the backup portion of the series before I can post a full backup-v10 label. There's still a decision to make: do we want this series in 5.6 (possibly with the addition of just patch 2/10 at [1] to introduce the backup API to make it possible for downstream to backport features without bumping .so)? This series has checkpoint support for test and qemu drivers, and I think is probably clean enough to finally satisfy everything Peter has been pointing out; but while the backup API itself seems reasonable, the qemu implementation will likely miss 5.6 (as that half of the v9 posting was further behind, and still has a lot of rebase churn to resolve). Or do we delay the checkpoint API to 5.7, to only go in with backup API? There's also still an outstanding question of whether the backup API needs a tweak to use 'const char *' instead of 'int' for the job identifier, given that Peter has a proposal for overhauling the representation of libvirt jobs. [1] https://www.redhat.com/archives/libvir-list/2019-July/msg00330.html Here's a comparison of these patches to v9: - rebase on top of master - use more VIR_AUTOFREE and friends (but probably still missed some spots where it would be worthwhile) - split several patches - add in a new patch to ensure the node names are learned at domain startup (but I didn't play enough with hotplug to see if that also has problems); necessary in order to... - get rid of detecting node names in checkpoint code - completely got rid of the notion of a current checkpoint in the public API (the internal code still has one, but solely to track which checkpoint becomes the parent of a new one to maintain a linear chain; when loading checkpoints on libvirtd restart, there should be at most one leaf node which becomes the internal current node) - improved code for handling partial checkpoints (the code now correctly handles: c1: disks A, B; c2: disks B, C; c3: disks A, B) 001/19:[down] 'snapshot: Don't leak moment obj list metaroot to callers' 002/19:[down] 'snapshot: Saner error message for duplicate create' 003/19:[down] 'snapshot: Documentation and comment improvements' 004/19:[down] 'backup: qemu: Detect node names at domain startup' 005/19:[0101] [FC] 'backup: Document new XML for checkpoints' 006/19:[0031] [FC] 'backup: Introduce virDomainCheckpoint APIs' 007/19:[0051] [FC] 'backup: Document nuances between different state capture APIs' 008/19:[0189] [FC] 'backup: Parse and output checkpoint XML' 009/19:[0066] [FC] 'backup: Allow for lists of checkpoint objects' 010/19:[----] [--] 'backup: Add new domain:checkpoint access control' 011/19:[----] [--] 'backup: Implement checkpoint APIs for remote driver' 012/19:[0161] [FC] 'backup: Implement virsh support for checkpoints' 013/19:[0047] [FC] 'backup: test: Implement metadata tracking for checkpoint APIs' 014/19:[0044] [FC] 'backup: Add virsh-checkpoints test' 015/19:[down] 'backup: qemu: Add directory for tracking checkpoints' 016/19:[0193] [FC] 'backup: qemu: Implement metadata tracking for checkpoint APIs' 017/19:[down] 'backup: qemu: Add helper API for looking up node name' 018/19:[0119] [FC] 'backup: Wire up qemu checkpoint commands over QMP' 019/19:[down] 'backup: Prevent snapshots and checkpoints at same time' Eric Blake (19): snapshot: Don't leak moment obj list metaroot to callers snapshot: Saner error message for duplicate create snapshot: Documentation and comment improvements backup: qemu: Detect node names at domain startup backup: Document new XML for checkpoints backup: Introduce virDomainCheckpoint APIs backup: Document nuances between different state capture APIs backup: Parse and output checkpoint XML backup: Allow for lists of checkpoint objects backup: Add new domain:checkpoint access control backup: Implement checkpoint APIs for remote driver backup: Implement virsh support for checkpoints backup: test: Implement metadata tracking for checkpoint APIs backup: Add virsh-checkpoints test backup: qemu: Add directory for tracking checkpoints backup: qemu: Implement metadata tracking for checkpoint APIs backup: qemu: Add helper API for looking up node name backup: Wire up qemu checkpoint commands over QMP backup: Prevent snapshots and checkpoints at same time include/libvirt/libvirt-domain-checkpoint.h | 137 ++ include/libvirt/libvirt-domain.h | 6 + include/libvirt/libvirt.h | 5 +- src/access/viraccessperm.h | 6 + src/conf/checkpoint_conf.h | 91 ++ src/conf/domain_conf.h | 2 + src/conf/virconftypes.h | 9 + src/conf/virdomaincheckpointobjlist.h | 72 + src/conf/virdomainmomentobjlist.h | 10 +- src/conf/virdomainobjlist.h | 7 +- src/conf/virdomainsnapshotobjlist.h | 2 + src/driver-hypervisor.h | 38 + src/qemu/qemu_conf.h | 2 + src/qemu/qemu_domain.h | 18 + tools/virsh-checkpoint.h | 26 + tools/virsh-completer.h | 4 + tools/virsh-util.h | 3 + tools/virsh.h | 1 + docs/Makefile.am | 3 + docs/apibuild.py | 2 + docs/docs.html.in | 4 +- docs/format.html.in | 1 + docs/formatcheckpoint.html.in | 196 +++ docs/formatsnapshot.html.in | 14 +- docs/index.html.in | 3 +- docs/kbase.html.in | 5 + docs/kbase/domainstatecapture.html.in | 303 +++++ docs/schemas/domaincheckpoint.rng | 94 ++ libvirt.spec.in | 2 + mingw-libvirt.spec.in | 4 + po/POTFILES | 3 + src/Makefile.am | 2 + src/access/viraccessperm.c | 3 +- src/conf/Makefile.inc.am | 4 + src/conf/checkpoint_conf.c | 597 +++++++++ src/conf/domain_conf.c | 6 + src/conf/virdomaincheckpointobjlist.c | 243 ++++ src/conf/virdomainmomentobjlist.c | 55 +- src/conf/virdomainobjlist.c | 11 + src/conf/virdomainsnapshotobjlist.c | 9 + src/libvirt-domain-checkpoint.c | 567 ++++++++ src/libvirt-domain.c | 19 +- src/libvirt_private.syms | 29 +- src/libvirt_public.syms | 16 + src/qemu/qemu_conf.c | 5 + src/qemu/qemu_domain.c | 190 +++ src/qemu/qemu_driver.c | 731 ++++++++++- src/qemu/qemu_process.c | 5 + src/remote/remote_daemon_dispatch.c | 20 + src/remote/remote_driver.c | 24 +- src/remote/remote_protocol.x | 123 +- src/remote_protocol-structs | 69 + src/rpc/gendispatch.pl | 32 +- src/test/test_driver.c | 386 +++++- tests/Makefile.am | 12 +- .../disk-default.xml | 7 + .../disk-invalid.xml | 8 + tests/qemudomaincheckpointxml2xmlin/empty.xml | 1 + .../name-invalid.xml | 4 + .../qemudomaincheckpointxml2xmlin/sample.xml | 7 + tests/qemudomaincheckpointxml2xmlin/size.xml | 4 + .../disk-default.xml | 11 + .../qemudomaincheckpointxml2xmlout/empty.xml | 7 + .../internal-active-invalid.xml | 53 + .../internal-inactive-invalid.xml | 53 + .../redefine.xml | 63 + .../qemudomaincheckpointxml2xmlout/sample.xml | 12 + tests/qemudomaincheckpointxml2xmlout/size.xml | 11 + tests/qemudomaincheckpointxml2xmltest.c | 213 +++ tests/virschematest.c | 2 + tests/virsh-checkpoint | 174 +++ tests/virsh-snapshot | 15 +- tools/Makefile.am | 1 + tools/virsh-checkpoint.c | 1153 +++++++++++++++++ tools/virsh-completer.c | 51 + tools/virsh-domain-monitor.c | 23 + tools/virsh-domain.c | 7 + tools/virsh-util.c | 11 + tools/virsh.c | 2 + tools/virsh.pod | 201 ++- 80 files changed, 6262 insertions(+), 63 deletions(-) create mode 100644 include/libvirt/libvirt-domain-checkpoint.h create mode 100644 src/conf/checkpoint_conf.h create mode 100644 src/conf/virdomaincheckpointobjlist.h create mode 100644 tools/virsh-checkpoint.h create mode 100644 docs/formatcheckpoint.html.in create mode 100644 docs/kbase/domainstatecapture.html.in create mode 100644 docs/schemas/domaincheckpoint.rng create mode 100644 src/conf/checkpoint_conf.c create mode 100644 src/conf/virdomaincheckpointobjlist.c create mode 100644 src/libvirt-domain-checkpoint.c create mode 100644 tests/qemudomaincheckpointxml2xmlin/disk-default.xml create mode 100644 tests/qemudomaincheckpointxml2xmlin/disk-invalid.xml create mode 100644 tests/qemudomaincheckpointxml2xmlin/empty.xml create mode 100644 tests/qemudomaincheckpointxml2xmlin/name-invalid.xml create mode 100644 tests/qemudomaincheckpointxml2xmlin/sample.xml create mode 100644 tests/qemudomaincheckpointxml2xmlin/size.xml create mode 100644 tests/qemudomaincheckpointxml2xmlout/disk-default.xml create mode 100644 tests/qemudomaincheckpointxml2xmlout/empty.xml create mode 100644 tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml create mode 100644 tests/qemudomaincheckpointxml2xmlout/internal-inactive-invalid.xml create mode 100644 tests/qemudomaincheckpointxml2xmlout/redefine.xml create mode 100644 tests/qemudomaincheckpointxml2xmlout/sample.xml create mode 100644 tests/qemudomaincheckpointxml2xmlout/size.xml create mode 100644 tests/qemudomaincheckpointxml2xmltest.c create mode 100755 tests/virsh-checkpoint create mode 100644 tools/virsh-checkpoint.c -- 2.20.1

3 47

[libvirt] [PATCH] commandtest: Remove commandhelper.log in test27
by Michal Privoznik 29 Jul '19

29 Jul '19

The recently added test27 spawns commandhelper. This is fine, except, one of the things that commandhelper does is it records arguments it was spawn with into commandhelper.log. Other test cases then use checkoutput() to compare the arguments against the expected ones and also unlink() the log file. However, test27() is not doing that and thus it leaves the file behind. This breaks distcheck. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Another approach would be to explicitly just unlink() the file somewhere in the cleanup label. But I figured, comparing the args and unlinking the file afterwards is more robust check IMO. tests/commanddata/test27.log | 20 ++++++++++++++++++++ tests/commandtest.c | 3 +++ 2 files changed, 23 insertions(+) create mode 100644 tests/commanddata/test27.log diff --git a/tests/commanddata/test27.log b/tests/commanddata/test27.log new file mode 100644 index 0000000000..40b2627c07 --- /dev/null +++ b/tests/commanddata/test27.log @@ -0,0 +1,20 @@ +ARG:--readfd +ARG:5 +ARG:--readfd +ARG:7 +ENV:DISPLAY=:0.0 +ENV:HOME=/home/test +ENV:HOSTNAME=test +ENV:LANG=C +ENV:LOGNAME=test +ENV:PATH=/usr/bin:/bin +ENV:TMPDIR=/tmp +ENV:USER=test +FD:0 +FD:1 +FD:2 +FD:5 +FD:7 +DAEMON:no +CWD:/tmp +UMASK:0022 diff --git a/tests/commandtest.c b/tests/commandtest.c index dfd15a2079..d7ab588969 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -1231,6 +1231,9 @@ static int test27(const void *unused ATTRIBUTE_UNUSED) goto cleanup; } + if (checkoutput("test27", NULL) < 0) + goto cleanup; + ret = 0; cleanup: -- 2.21.0

2 1

[libvirt] [PATCH v2 0/2] test_driver: implement virDomainGetCPUStats
by Ilias Stamatis 29 Jul '19

29 Jul '19

Changes since v1: * Removed failing test cases * Total CPUTIME now is the sum of the individual CPUs Ilias Stamatis (2): tests: virsh-optparse: remove no longer valid cpu-stats test cases test_driver: implement virDomainGetCPUStats src/test/test_driver.c | 132 +++++++++++++++++++++++++++++++++++++++++ tests/virsh-optparse | 20 ------- 2 files changed, 132 insertions(+), 20 deletions(-) -- 2.22.0

2 6

[libvirt] Some windows hyperv features cannot be enabled after the patch 63acb7bfd56f117309e4fcaf438639d4d7bc7dcb
by Changlimin 29 Jul '19

29 Jul '19

When using with QEMU v4.1.0-rc0<http://10.114.102.26/cgit/qemu/tag/?h=v4.1.0-rc0> or newer, the patch https://libvirt.org/git/?p=libvirt.git;a=commit;h=63acb7bfd56f117309e4fcaf4… cause some windows hyperv features cannot be enabled. # virsh start win10 error: Failed to start domain win10 error: unsupported configuration: host doesn't support hyperv 'vpindex' feature <features> <hyperv> <relaxed state='on'/> <vapic state='on'/> <spinlocks state='on' retries='4096'/> <vpindex state='on'/> <runtime state='on'/> <synic state='on'/> <reset state='on'/> <frequencies state='on'/> <reenlightenment state='on'/> <tlbflush state='on'/> <ipi state='on'/> <evmcs state='on'/> </hyperv>

2 1

[libvirt] [PATCH 0/5] Fix hyperv and kvm features with QEMU 4.1
by Jiri Denemark 29 Jul '19

29 Jul '19

Originally the names of the hyperv and kvm CPU features were only used internally for looking up their CPUID bits. But with QEMU 4.1 we check which features were enabled or disabled by a freshly started QEMU process using their names rather than their CPUID bits (mostly because of MSR features). Thus we need to change our made up internal names into the actual names used by QEMU. Otherwise libvirt would mistakenly report the features as unavailable and refuse to start any domain using them with QEMU 4.1. Reported-by: Vitaly Kuznetsov <vkuznets(a)redhat.com> Jiri Denemark (5): qemu: Fix hyperv features with QEMU 4.1 qemu: Prefer dashes for hyperv features cpu: Drop KVM_ from hyperv feature macros cpu: Drop unused KVM features qemu: Fix KVM features with QEMU 4.1 src/cpu/cpu_x86.c | 77 +++++++------------ src/cpu/cpu_x86_data.h | 38 ++++----- src/qemu/qemu_command.c | 19 +++-- src/qemu/qemu_process.c | 2 +- .../clock-timer-hyperv-rtc.args | 2 +- tests/qemuxml2argvdata/hyperv-panic.args | 2 +- tests/qemuxml2argvdata/hyperv.args | 4 +- tests/qemuxml2argvdata/panic-double.args | 2 +- 8 files changed, 61 insertions(+), 85 deletions(-) -- 2.22.0

3 7

[libvirt] [PATCH 0/6] Add support for Direct Mode for Hyper-V Synthetic timers
by Vitaly Kuznetsov 29 Jul '19

29 Jul '19

QEMU-4.1 will bring us Direct Mode for Hyper-V Synthetic timers support, we need to support it in libvirt too. As this is not a new enlightenment but rather an enhancement of an existing one ('stimer'), support it in <stimer state='on'> <direct state='on'/> </stimer> form. Backwards compatibility is (hopefully) preserved. Because of an existing imcompatibility between libvirt-5.5+ and QEMU-4.1-git (see https://www.redhat.com/archives/libvir-list/2019-July/msg01435.html) I had to backport hv-stimer-direct to QEMU-4.0 to test this. If someone wants to do it too here is a list of QEMU patches needed: 128531d9e1 i386/kvm: add support for Direct Mode for Hyper-V synthetic timers 8caba36db5 i386/kvm: hv-evmcs requires hv-vapic bd59fbdf4f i386/kvm: hv-tlbflush/ipi require hv-vpindex c686193072 i386/kvm: hv-stimer requires hv-time and hv-synic e48ddcc6ce i386/kvm: implement 'hv-passthrough' mode fb19f72b77 i386/kvm: document existing Hyper-V enlightenments 2344d22e50 i386/kvm: move Hyper-V CPUID filling to hyperv_handle_properties() 6760bd2002 i386/kvm: add support for KVM_GET_SUPPORTED_HV_CPUID 2d384d7c83 i386/kvm: convert hyperv enlightenments properties from bools to bits Vitaly Kuznetsov (6): docs: formatdomain: add synic flag to the example xml docs: formatdomain: fix 'SynIC' spelling docs: formatdomain: move 'msrs' out of Hyper-V Enlightenments conf: add support for Direct Mode for Hyper-V Synthetic timers qemu: add support for Direct Mode for Hyper-V Synthetic timers news: mention Direct Mode for Hyper-V Synthetic timers support docs/formatdomain.html.in | 13 ++- docs/news.xml | 9 ++ docs/schemas/domaincommon.rng | 16 +++- src/conf/domain_conf.c | 138 +++++++++++++++++++++++++--- src/conf/domain_conf.h | 8 ++ src/cpu/cpu_x86.c | 51 +++++----- src/cpu/cpu_x86_data.h | 2 + src/libvirt_private.syms | 2 + src/qemu/qemu_command.c | 22 ++++- src/qemu/qemu_process.c | 39 +++++++- tests/qemuxml2argvdata/hyperv.args | 4 +- tests/qemuxml2argvdata/hyperv.xml | 4 +- tests/qemuxml2xmloutdata/hyperv.xml | 4 +- 13 files changed, 263 insertions(+), 49 deletions(-) -- 2.20.1

2 12

[libvirt] [PATCH] qemumonitorjsontest: Don't leak 'query-jobs' info
by Michal Privoznik 29 Jul '19

29 Jul '19

The returned array of qemuMonitorJobInfo structs must be freed. 164 (16 direct, 148 indirect) bytes in 1 blocks are definitely lost in loss record 64 of 84 at 0x4A3568B: realloc (vg_replace_malloc.c:826) by 0x4D888BD: virReallocN (viralloc.c:244) by 0x4D889B3: virExpandN (viralloc.c:293) by 0x4D88C87: virInsertElementsN (viralloc.c:435) by 0x214004: qemuMonitorJSONGetJobInfo (qemu_monitor_json.c:9185) by 0x148B3F: testQueryJobs (qemumonitorjsontest.c:2979) by 0x14C192: virTestRun (testutils.c:174) by 0x14BF36: mymain (qemumonitorjsontest.c:3286) by 0x14E256: virTestMain (testutils.c:1096) by 0x14BFD9: main (qemumonitorjsontest.c:3298) Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/qemumonitorjsontest.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index bf89f49aca..522ff5a3d5 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -2996,6 +2996,9 @@ testQueryJobs(const void *opaque) ret = 0; cleanup: + for (i = 0; i < njobs; i++) + qemuMonitorJobInfoFree(jobs[i]); + VIR_FREE(jobs); qemuMonitorTestFree(test); return ret; } -- 2.21.0

2 1

[libvirt] UID/GID during kvm/qemu migrate
by Stephan von Krawczynski 29 Jul '19

29 Jul '19

Hello, is there some immanent code in libvirt that forces UID/GID of the libvirt standard user to be the same on two boxes migrating qemu vms against each other? The migration itself uses root obviously (password is requested). But if a vm xml does not contain any definition regarding UID/GID what else could prevent this from working? I believe I ran into such a problem trying to migrate and ending up in an error, a vm still working on original host but its fs (netfs pool (nfs/raw)) being switched to read-only... -- Regards, Stephan

1 0

[libvirt] [PATCH 0/9] qemu: Support block pull/commit jobs with blockdev (blockdev-add saga)
by Peter Krempa 29 Jul '19

29 Jul '19

One of the final chapters of the saga. At the end we finally support first blockjobs with blockdev. This series depends on some of the previous postings so for convenience it can be fetched at: git fetch https://gitlab.com/pipo.sk/libvirt.git blockjobs-send-partial The above branch also contains patches which enable blockdev support, which is ideal for testing. Peter Krempa (9): qemu: blockjob: Use proper value when setting disk's READY state tests: qemustatusxml: Add few disks with backing chains for blockdev job testing qemu: blockjob: Document qemuBlockJobRegister qemu: blockjob: Register disk->mirror with a job only when required qemu: blockjob: Split out update of persistent XML disk's source on mirror jobs qemu: blockjob: Esure that persistent definition source does not copy irrelevant data qemu: blockjob: Ensure that config disk source is identical when modifying it qemu: Add -blockdev support for block pull job qemu: Add -blockdev support for block commit job src/qemu/qemu_blockjob.c | 525 +++++++++++++++++- src/qemu/qemu_blockjob.h | 40 ++ src/qemu/qemu_domain.c | 123 +++- src/qemu/qemu_driver.c | 83 ++- .../blockjob-blockdev-in.xml | 285 +++++++++- 5 files changed, 1001 insertions(+), 55 deletions(-) -- 2.21.0

3 21

[libvirt] virsh command to list CPU, Memory and Storage of all the running VM's
by Kaushal Shriyan 29 Jul '19

29 Jul '19

Hi, Is there a way to find out total CPU's, Memory and Storage of all the running VM's using virsh command? For example virsh list --all list out all VM's 11 dockerregistry01 running 12 gitlab running Any help will be highly appreciated. Thanks in Advance. Best Regards, Kaushal

2 1

[libvirt] [PATCH] conf: Remove unnecessary declaration in virDomainCheckpointDefParse
by John Ferlan 28 Jul '19

28 Jul '19

The @creation variable wasn't used - caused a Travis build failure. Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- Pushing under the trivial and build break rules. src/conf/checkpoint_conf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index 30c6d2e717..5f4c275dd8 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -133,7 +133,6 @@ virDomainCheckpointDefParse(xmlXPathContextPtr ctxt, int n; char *tmp; VIR_AUTOFREE(xmlNodePtr *) nodes = NULL; - VIR_AUTOFREE(char *)creation = NULL; VIR_AUTOUNREF(virDomainCheckpointDefPtr) def = NULL; if (!(def = virDomainCheckpointDefNew())) -- 2.20.1

1 0

[libvirt] [PATCH] tpm: Run swtpm_setup with less parameters on incoming migration
by Stefan Berger 27 Jul '19

27 Jul '19

In case of an incoming migration we do not need to run swtpm_setup with all the parameters but only want to get the benefit of it creating a TPM state file for us that we can then label with an SELinux label. The actual state will be overwritten by the in- coming state. So we have to pass an indicator for incomingMigration all the way to the command line parameter generation for swtpm_setup. Signed-off-by: Stefan Berger <stefanb(a)linux.ibm.com> --- src/qemu/qemu_extdevice.c | 5 ++-- src/qemu/qemu_extdevice.h | 3 ++- src/qemu/qemu_process.c | 2 +- src/qemu/qemu_tpm.c | 49 +++++++++++++++++++++++++-------------- src/qemu/qemu_tpm.h | 3 ++- 5 files changed, 40 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c index e576bca165..af52466421 100644 --- a/src/qemu/qemu_extdevice.c +++ b/src/qemu/qemu_extdevice.c @@ -128,7 +128,8 @@ qemuExtDevicesCleanupHost(virQEMUDriverPtr driver, int qemuExtDevicesStart(virQEMUDriverPtr driver, virDomainObjPtr vm, - qemuDomainLogContextPtr logCtxt) + qemuDomainLogContextPtr logCtxt, + bool incomingMigration) { int ret = 0; @@ -136,7 +137,7 @@ qemuExtDevicesStart(virQEMUDriverPtr driver, return -1; if (vm->def->tpm) - ret = qemuExtTPMStart(driver, vm, logCtxt); + ret = qemuExtTPMStart(driver, vm, logCtxt, incomingMigration); return ret; } diff --git a/src/qemu/qemu_extdevice.h b/src/qemu/qemu_extdevice.h index bbdb9a1cc2..5a53c79f38 100644 --- a/src/qemu/qemu_extdevice.h +++ b/src/qemu/qemu_extdevice.h @@ -40,7 +40,8 @@ void qemuExtDevicesCleanupHost(virQEMUDriverPtr driver, int qemuExtDevicesStart(virQEMUDriverPtr driver, virDomainObjPtr vm, - qemuDomainLogContextPtr logCtxt) + qemuDomainLogContextPtr logCtxt, + bool incomingMigration) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 75205bc121..fae18824ba 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6774,7 +6774,7 @@ qemuProcessLaunch(virConnectPtr conn, if (qemuProcessGenID(vm, flags) < 0) goto cleanup; - if (qemuExtDevicesStart(driver, vm, logCtxt) < 0) + if (qemuExtDevicesStart(driver, vm, logCtxt, incoming != NULL) < 0) goto cleanup; VIR_DEBUG("Building emulator command line"); diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 77ef601f74..4174aa4c62 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -453,6 +453,7 @@ qemuTPMSetupEncryption(const unsigned char *secretuuid, * for the user given by userid or 'tss' * @tpmversion: The version of the TPM, either a TPM 1.2 or TPM 2 * @encryption: pointer to virStorageEncryption holding secret + * @incomingMigration: whether we have an incoming migration * * Setup the external swtpm by creating endorsement key and * certificates for it. @@ -466,7 +467,8 @@ qemuTPMEmulatorRunSetup(const char *storagepath, gid_t swtpm_group, const char *logfile, const virDomainTPMVersion tpmversion, - const unsigned char *secretuuid) + const unsigned char *secretuuid, + bool incomingMigration) { virCommandPtr cmd = NULL; int exitstatus; @@ -525,16 +527,23 @@ qemuTPMEmulatorRunSetup(const char *storagepath, pwdfile_fd = -1; } - virCommandAddArgList(cmd, - "--tpm-state", storagepath, - "--vmid", vmid, - "--logfile", logfile, - "--createek", - "--create-ek-cert", - "--create-platform-cert", - "--lock-nvram", - "--not-overwrite", - NULL); + if (!incomingMigration) { + virCommandAddArgList(cmd, + "--tpm-state", storagepath, + "--vmid", vmid, + "--logfile", logfile, + "--createek", + "--create-ek-cert", + "--create-platform-cert", + "--lock-nvram", + "--not-overwrite", + NULL); + } else { + virCommandAddArgList(cmd, + "--tpm-state", storagepath, + "--overwrite", + NULL); + } virCommandClearCaps(cmd); @@ -568,6 +577,7 @@ qemuTPMEmulatorRunSetup(const char *storagepath, * @swtpmStateDir: the directory where swtpm writes the pid file and creates the * Unix socket * @shortName: the short name of the VM + * @incomingMigration: whether we have an incoming migration * * Create the virCommand use for starting the emulator * Do some initializations on the way, such as creation of storage @@ -581,7 +591,8 @@ qemuTPMEmulatorBuildCommand(virDomainTPMDefPtr tpm, uid_t swtpm_user, gid_t swtpm_group, const char *swtpmStateDir, - const char *shortName) + const char *shortName, + bool incomingMigration) { virCommandPtr cmd = NULL; bool created = false; @@ -605,7 +616,7 @@ qemuTPMEmulatorBuildCommand(virDomainTPMDefPtr tpm, qemuTPMEmulatorRunSetup(tpm->data.emulator.storagepath, vmname, vmuuid, privileged, swtpm_user, swtpm_group, tpm->data.emulator.logfile, tpm->version, - secretuuid) < 0) + secretuuid, incomingMigration) < 0) goto error; unlink(tpm->data.emulator.source.data.nix.path); @@ -814,6 +825,7 @@ qemuExtTPMCleanupHost(virDomainDefPtr def) * @driver: QEMU driver * @vm: the domain object * @logCtxt: log context + * @incomingMigration: whether we have an incoming migration * * Start the external TPM Emulator: * - have the command line built @@ -822,7 +834,8 @@ qemuExtTPMCleanupHost(virDomainDefPtr def) static int qemuExtTPMStartEmulator(virQEMUDriverPtr driver, virDomainObjPtr vm, - qemuDomainLogContextPtr logCtxt) + qemuDomainLogContextPtr logCtxt, + bool incomingMigration) { int ret = -1; virCommandPtr cmd = NULL; @@ -846,7 +859,8 @@ qemuExtTPMStartEmulator(virQEMUDriverPtr driver, driver->privileged, cfg->swtpm_user, cfg->swtpm_group, - cfg->swtpmStateDir, shortName))) + cfg->swtpmStateDir, shortName, + incomingMigration))) goto cleanup; if (qemuExtDeviceLogCommand(logCtxt, cmd, "TPM Emulator") < 0) @@ -903,14 +917,15 @@ qemuExtTPMStartEmulator(virQEMUDriverPtr driver, int qemuExtTPMStart(virQEMUDriverPtr driver, virDomainObjPtr vm, - qemuDomainLogContextPtr logCtxt) + qemuDomainLogContextPtr logCtxt, + bool incomingMigration) { int ret = 0; virDomainTPMDefPtr tpm = vm->def->tpm; switch (tpm->type) { case VIR_DOMAIN_TPM_TYPE_EMULATOR: - ret = qemuExtTPMStartEmulator(driver, vm, logCtxt); + ret = qemuExtTPMStartEmulator(driver, vm, logCtxt, incomingMigration); break; case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: case VIR_DOMAIN_TPM_TYPE_LAST: diff --git a/src/qemu/qemu_tpm.h b/src/qemu/qemu_tpm.h index 74c9924d68..5f454d3580 100644 --- a/src/qemu/qemu_tpm.h +++ b/src/qemu/qemu_tpm.h @@ -37,7 +37,8 @@ void qemuExtTPMCleanupHost(virDomainDefPtr def) int qemuExtTPMStart(virQEMUDriverPtr driver, virDomainObjPtr vm, - qemuDomainLogContextPtr logCtxt) + qemuDomainLogContextPtr logCtxt, + bool incomingMigration) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; -- 2.21.0

2 1

[libvirt] [PATCH v2 0/2] tpm2: Properly handle a removed logfile
by Stefan Berger 26 Jul '19

26 Jul '19

If the swtpm's logfile was removed by the user, we get an error 'no transaction is set' from the security manager (DAC) since the labeling of the file failed the transaction in the commit() phase. In the failure case we will try to remove the label then in the error path and run into another commit() error and overwrite a more useful error message. So in this case we just call the transaction abort function. We also create an empty log file now since swtpm doesn't seem to be able to create one itself. Stefan v1->v2: - Added R-b's Stefan Berger (2): tpm: Set transationStarted to false if commit failed tpm: Create empty log file if file was removed src/qemu/qemu_security.c | 3 ++- src/qemu/qemu_tpm.c | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) -- 2.21.0

1 2

[libvirt] [PATCH v2 0/4] Cleanups on vTPM encryption patches
by Stefan Berger 26 Jul '19

26 Jul '19

This series of patches cleans up the Coverity issues reported by John. Stefan v1->v2: fixed patch 3 Stefan Berger (4): tpm: Fix memory leak and use existing variable instead tests: Call virCommandFree() in cleanup section utils: Remove ATTRIBUTE_NONNULL(1) from virCommandSetSendBuffer conf: Remove ATTRIBUTE_NONNULL(2) from virDomainCheckDeviceChanges() src/conf/domain_conf.h | 3 +-- src/qemu/qemu_tpm.c | 4 ++-- src/util/vircommand.c | 3 ++- src/util/vircommand.h | 2 +- tests/commandtest.c | 3 +-- 5 files changed, 7 insertions(+), 8 deletions(-) -- 2.20.1

1 4

[libvirt] [PATCH] backup: Fix tests/virsh-snapshot
by Eric Blake 26 Jul '19

26 Jul '19

Creating an 'exp' output file, but never comparing it against the actual output, does no one any good. :) Fixes: 280a2b41e Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. tests/virsh-snapshot | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/virsh-snapshot b/tests/virsh-snapshot index b23d949f62..1034140cde 100755 --- a/tests/virsh-snapshot +++ b/tests/virsh-snapshot @@ -207,6 +207,8 @@ Descendants: 0 Metadata: yes EOF +sed '1,/^virsh #/d; /virsh #/d' < out > out.cooked || fail=1 +compare exp out.cooked || fail=1 cat <<EOF > exp || fail=1 error: invalid argument: parent s3 for moment s2 not found -- 2.20.1

1 0

[libvirt] [PATCH 0/2] tpm2: Properly handle a removed logfile
by Stefan Berger 26 Jul '19

26 Jul '19

If the swtpm's logfile was removed by the user, we get an error 'no transaction is set' from the security manager (DAC) since the labeling of the file failed the transaction in the commit() phase. In the failure case we will try to remove the label then in the error path and run into another commit() error and overwrite a more useful error message. So in this case we just call the transaction abort function. We also create an empty log file now since swtpm doesn't seem to be able to create one itself. Stefan Stefan Berger (2): tpm: Set transationStarted to false if commit failed tpm: Create empty log file if file was removed src/qemu/qemu_security.c | 6 ++++-- src/qemu/qemu_tpm.c | 8 ++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) -- 2.21.0

2 4

[libvirt] [PATCH 0/4] Cleanups on vTPM encrytion patches
by Stefan Berger 26 Jul '19

26 Jul '19

This series of patches cleans up the Coverity issues reported by John. Stefan Stefan Berger (4): tpm: Fix memory leak and use existing variable instead tests: Call virCommandFree() in cleanup section utils: Remove ATTRIBUTE_NONNULL(1) from virCommandSetSendBuffer conf: Remove ATTRIBUTE_NONNULL(2) from virDomainCheckDeviceChanges() src/conf/domain_conf.h | 3 +-- src/qemu/qemu_tpm.c | 4 ++-- src/util/vircommand.h | 2 +- tests/commandtest.c | 3 +-- 4 files changed, 5 insertions(+), 7 deletions(-) -- 2.20.1

3 7

[libvirt] [PATCH v7 00/19] Add support for vTPM state encryption
by Stefan Berger 26 Jul '19

26 Jul '19

This series of patches addresses the RFE in BZ 172830: https://bugzilla.redhat.com/show_bug.cgi?id=1728030 This series of patches adds support for vTPM state encryption by passing the read-end of a pipe's file descriptor to 'swtpm_setup' and 'swtpm' where they can read a passphrase from and derive a key from that passphrase. The TPM's domain XML looks to enable state encryption looks like this: <tpm model='tpm-tis'> <backend type='emulator' version='1.2'> <encryption secret='2c9ceaba-c6ef-4f38-86fd-6e3adb2df5cd'/> </backend> </tpm> The vTPM secret holding the passphrase looks like this: <secret ephemeral='no' private='yes'> <uuid>2c9ceaba-c6ef-4f38-86fd-6e3adb2df5cd</uuid> <description>vTPM passphrase example</description> <usage type='vtpm'> <name>vtpm_example</name> </usage> </secret> The swtpm v0.2 is needed that supports the command line option --print-capabilities returning a JSON object that identifies features added since v0.1. One such features is the possibility to pass a passphrase via a file descriptor. The patches do some refactoring of existing code on the way. Stefan v1->v2: - Added Marc-André's R-bs - Addressed comments - Added patches to extend virCommand to be able to write contents of multiple buffers to file descriptors for a spawned process to read from v2->v3: - Fixed some pointer issues following conversion to use VIR_AUTOFREE v3->v4: - Added test case for virCommandSetSendBuffer() to commantest.c - Addressed other issues raised by Marc-André v4->v5: - Simplified encryption node in TPM's domain XML and adapted everything that depends on this; dropped some patches and removed some R-bs for non-trivial stuff - Not limiting write size for fd's with O_NONBLOCK set v5->v6: - Addressed comments on v5 v6->v7: - Stubbed out virCommandSetSendBuffer if F_SETFL is not defined. Also having 'the other' occurrence of F_SETFL cause an error if F_SETFL is not defined. Stefan Berger (19): secret: Add support for usage type vTPM, extend schema and test case tests: Add already existing test case tpm-emulator-tpm2 conf: Extend TPM XML parser with encryption support tests: Add test for TPM XML encryption parser and formatter tests: Add tests for QEMU command line generation with encrypted TPM tpm: Move qemuTPMEmulatorInit to virTPMEmulatorInit in virtpm.c tpm: Refactor virTPMEmulatorInit to use loop tpm: Check whether previously found executables were updated tpm: Parse the capabilities supported by swtpm and swtpm_setup utils: Implement function to pass a buffer to send via a fd to virCommand utils: Convert pollfd array to be allocated utils: Mark inpipe as non-blocking utils: Extend virCommandProcessIO to include the send buffers tests: Extend command test to transfer large data to process on multiple fds tpm: Use fd to pass password to swtpm_setup and swtpm tpm: Pass migration key passphrase via fd to swtpm tpm: Check TPM XML device configuration changes after edit docs: Extend Secret XML documentation with vtpm usage type docs: Extend TPM docs with new encryption element docs/formatdomain.html.in | 12 + docs/formatsecret.html.in | 61 +++- docs/schemas/domaincommon.rng | 11 + docs/schemas/secret.rng | 10 + include/libvirt/libvirt-secret.h | 1 + include/libvirt/virterror.h | 2 + src/conf/domain_conf.c | 87 ++++- src/conf/domain_conf.h | 6 + src/conf/secret_conf.c | 13 + src/libvirt_private.syms | 10 + src/qemu/qemu_driver.c | 28 ++ src/qemu/qemu_extdevice.c | 2 +- src/qemu/qemu_extdevice.h | 3 + src/qemu/qemu_tpm.c | 211 ++++++++----- src/util/vircommand.c | 171 +++++++++- src/util/vircommand.h | 5 + src/util/virerror.c | 2 + src/util/virsecret.c | 2 +- src/util/virtpm.c | 298 +++++++++++++++++- src/util/virtpm.h | 23 ++ tests/commandhelper.c | 70 +++- tests/commandtest.c | 113 +++++++ .../tpm-emulator-tpm2-enc.x86_64-latest.args | 35 ++ .../tpm-emulator-tpm2-enc.xml | 32 ++ tests/qemuxml2argvtest.c | 1 + .../tpm-emulator-tpm2-enc.xml | 36 +++ tests/qemuxml2xmltest.c | 2 + tests/secretxml2xmlin/usage-vtpm.xml | 7 + tests/secretxml2xmltest.c | 1 + 29 files changed, 1168 insertions(+), 87 deletions(-) create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.xml create mode 100644 tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.xml create mode 100644 tests/secretxml2xmlin/usage-vtpm.xml -- 2.20.1

4 26

[libvirt] [PATCH] test_driver: implement virDomainGetCPUStats
by Ilias Stamatis 26 Jul '19

26 Jul '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 131 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index fcb80c9e47..2907c043cb 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3258,6 +3258,136 @@ static int testDomainSetMetadata(virDomainPtr dom, return ret; } + +static int +testDomainGetDomainTotalCpuStats(virTypedParameterPtr params, + int nparams) +{ + if (nparams == 0) /* return supported number of params */ + return 3; + + if (virTypedParameterAssign(&params[0], VIR_DOMAIN_CPU_STATS_CPUTIME, + VIR_TYPED_PARAM_ULLONG, 77102913900) < 0) + return -1; + + if (nparams > 1 && + virTypedParameterAssign(&params[1], + VIR_DOMAIN_CPU_STATS_USERTIME, + VIR_TYPED_PARAM_ULLONG, 45650000000) < 0) + return -1; + + if (nparams > 2 && + virTypedParameterAssign(&params[2], + VIR_DOMAIN_CPU_STATS_SYSTEMTIME, + VIR_TYPED_PARAM_ULLONG, 11390000000) < 0) + return -1; + + if (nparams > 3) + nparams = 3; + + return nparams; +} + + +static int +testDomainGetPercpuStats(virTypedParameterPtr params, + unsigned int nparams, + int start_cpu, + unsigned int ncpus, + int total_cpus) +{ + size_t i; + int need_cpus; + int param_idx; + int ret = -1; + + /* return the number of supported params */ + if (nparams == 0 && ncpus != 0) + return 2; + + /* return total number of cpus */ + if (ncpus == 0) { + ret = total_cpus; + goto cleanup; + } + + if (start_cpu >= total_cpus) { + virReportError(VIR_ERR_INVALID_ARG, + _("start_cpu %d larger than maximum of %d"), + start_cpu, total_cpus - 1); + goto cleanup; + } + + /* return percpu cputime in index 0 */ + param_idx = 0; + + /* number of cpus to compute */ + need_cpus = MIN(total_cpus, start_cpu + ncpus); + + for (i = 0; i < need_cpus; i++) { + if (i < start_cpu) + continue; + int idx = (i - start_cpu) * nparams + param_idx; + if (virTypedParameterAssign(&params[idx], + VIR_DOMAIN_CPU_STATS_CPUTIME, + VIR_TYPED_PARAM_ULLONG, + 202542145062 + 10 * i) < 0) + goto cleanup; + } + + /* return percpu vcputime in index 1 */ + param_idx = 1; + + if (param_idx < nparams) { + for (i = start_cpu; i < need_cpus; i++) { + int idx = (i - start_cpu) * nparams + param_idx; + if (virTypedParameterAssign(&params[idx], + VIR_DOMAIN_CPU_STATS_VCPUTIME, + VIR_TYPED_PARAM_ULLONG, + 26254023765 + 10 * i) < 0) + goto cleanup; + } + param_idx++; + } + + ret = param_idx; + cleanup: + return ret; +} + + +static int +testDomainGetCPUStats(virDomainPtr dom, + virTypedParameterPtr params, + unsigned int nparams, + int start_cpu, + unsigned int ncpus, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + testDriverPtr privconn = dom->conn->privateData; + int ret = -1; + + virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1); + + if (!(vm = testDomObjFromDomain(dom))) + return -1; + + if (virDomainObjCheckActive(vm) < 0) + goto cleanup; + + if (start_cpu == -1) + ret = testDomainGetDomainTotalCpuStats(params, nparams); + else + ret = testDomainGetPercpuStats(params, nparams, start_cpu, ncpus, + privconn->nodeInfo.cores); + + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + static int testDomainSendProcessSignal(virDomainPtr dom, long long pid_value, @@ -7794,6 +7924,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainSendKey = testDomainSendKey, /* 5.5.0 */ .domainGetMetadata = testDomainGetMetadata, /* 1.1.3 */ .domainSetMetadata = testDomainSetMetadata, /* 1.1.3 */ + .domainGetCPUStats = testDomainGetCPUStats, /* 5.6.0 */ .domainSendProcessSignal = testDomainSendProcessSignal, /* 5.5.0 */ .connectGetCPUModelNames = testConnectGetCPUModelNames, /* 1.1.3 */ .domainManagedSave = testDomainManagedSave, /* 1.1.4 */ -- 2.22.0

3 4

[libvirt] [PATCH 0/2] test_driver: implement emulator pinning APIs
by Ilias Stamatis 26 Jul '19

26 Jul '19

Ilias Stamatis (2): test_driver: implement virDomainGetEmulatorPinInfo test_driver: implement virDomainPinEmulator src/test/test_driver.c | 92 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) -- 2.22.0

2 3

[libvirt] [PATCH 0/4] test_driver: implement IOThread related APIs
by Ilias Stamatis 26 Jul '19

26 Jul '19

Ilias Stamatis (4): test_driver: implement virDomainAddIOThread test_driver: implement virDomainDelIOThread test_driver: implement virDomainPinIOThread test_driver: implement virDomainGetIOThreadInfo src/test/test_driver.c | 248 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 248 insertions(+) -- 2.22.0

2 13

[libvirt] [PATCH v6 00/19] Add support for vTPM state encryption
by Stefan Berger 25 Jul '19

25 Jul '19

This series of patches addresses the RFE in BZ 172830: https://bugzilla.redhat.com/show_bug.cgi?id=1728030 This series of patches adds support for vTPM state encryption by passing the read-end of a pipe's file descriptor to 'swtpm_setup' and 'swtpm' where they can read a passphrase from and derive a key from that passphrase. The TPM's domain XML looks to enable state encryption looks like this: <tpm model='tpm-tis'> <backend type='emulator' version='1.2'> <encryption secret='2c9ceaba-c6ef-4f38-86fd-6e3adb2df5cd'/> </backend> </tpm> The vTPM secret holding the passphrase looks like this: <secret ephemeral='no' private='yes'> <uuid>2c9ceaba-c6ef-4f38-86fd-6e3adb2df5cd</uuid> <description>vTPM passphrase example</description> <usage type='vtpm'> <name>vtpm_example</name> </usage> </secret> The swtpm v0.2 is needed that supports the command line option --print-capabilities returning a JSON object that identifies features added since v0.1. One such features is the possibility to pass a passphrase via a file descriptor. The patches do some refactoring of existing code on the way. Stefan v1->v2: - Added Marc-André's R-bs - Addressed comments - Added patches to extend virCommand to be able to write contents of multiple buffers to file descriptors for a spawned process to read from v2->v3: - Fixed some pointer issues following conversion to use VIR_AUTOFREE v3->v4: - Added test case for virCommandSetSendBuffer() to commantest.c - Addressed other issues raised by Marc-André v4->v5: - Simplified encryption node in TPM's domain XML and adapted everything that depends on this; dropped some patches and removed some R-bs for non-trivial stuff - Not limiting write size for fd's with O_NONBLOCK set v5->v6: - Addressed comments on v5 Stefan Berger (19): secret: Add support for usage type vTPM, extend schema and test case tests: Add already existing test case tpm-emulator-tpm2 conf: Extend TPM XML parser with encryption support tests: Add test for TPM XML encryption parser and formatter tests: Add tests for QEMU command line generation with encrypted TPM tpm: Move qemuTPMEmulatorInit to virTPMEmulatorInit in virtpm.c tpm: Refactor virTPMEmulatorInit to use loop tpm: Check whether previously found executables were updated tpm: Parse the capabilities supported by swtpm and swtpm_setup utils: Implement function to pass a buffer to send via a fd to virCommand utils: Convert pollfd array to be allocated utils: Mark inpipe as non-blocking utils: Extend virCommandProcessIO to include the send buffers tests: Extend command test to transfer large data to process on multiple fds tpm: Use fd to pass password to swtpm_setup and swtpm tpm: Pass migration key passphrase via fd to swtpm tpm: Check TPM XML device configuration changes after edit docs: Extend Secret XML documentation with vtpm usage type docs: Extend TPM docs with new encryption element docs/formatdomain.html.in | 12 + docs/formatsecret.html.in | 61 +++- docs/schemas/domaincommon.rng | 11 + docs/schemas/secret.rng | 10 + include/libvirt/libvirt-secret.h | 1 + include/libvirt/virterror.h | 2 + src/conf/domain_conf.c | 87 ++++- src/conf/domain_conf.h | 6 + src/conf/secret_conf.c | 13 + src/libvirt_private.syms | 10 + src/qemu/qemu_driver.c | 28 ++ src/qemu/qemu_extdevice.c | 2 +- src/qemu/qemu_extdevice.h | 3 + src/qemu/qemu_tpm.c | 211 ++++++++----- src/util/vircommand.c | 148 ++++++++- src/util/vircommand.h | 5 + src/util/virerror.c | 2 + src/util/virsecret.c | 2 +- src/util/virtpm.c | 298 +++++++++++++++++- src/util/virtpm.h | 23 ++ tests/commandhelper.c | 70 +++- tests/commandtest.c | 113 +++++++ .../tpm-emulator-tpm2-enc.x86_64-latest.args | 35 ++ .../tpm-emulator-tpm2-enc.xml | 32 ++ tests/qemuxml2argvtest.c | 1 + .../tpm-emulator-tpm2-enc.xml | 36 +++ tests/qemuxml2xmltest.c | 2 + tests/secretxml2xmlin/usage-vtpm.xml | 7 + tests/secretxml2xmltest.c | 1 + 29 files changed, 1145 insertions(+), 87 deletions(-) create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.xml create mode 100644 tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.xml create mode 100644 tests/secretxml2xmlin/usage-vtpm.xml -- 2.20.1

3 21

[libvirt] [PATCH v3] qapi: add dirty-bitmaps to query-named-block-nodes result
by John Snow 25 Jul '19

25 Jul '19

From: Vladimir Sementsov-Ogievskiy <vsementsov(a)virtuozzo.com> Let's add a possibility to query dirty-bitmaps not only on root nodes. It is useful when dealing both with snapshots and incremental backups. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov(a)virtuozzo.com> [Added deprecation information. --js] Signed-off-by: John Snow <jsnow(a)redhat.com> --- block/qapi.c | 5 +++++ qapi/block-core.json | 6 +++++- qemu-deprecated.texi | 12 ++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/block/qapi.c b/block/qapi.c index 917435f022..15f1030264 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -79,6 +79,11 @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk, info->backing_file = g_strdup(bs->backing_file); } + if (!QLIST_EMPTY(&bs->dirty_bitmaps)) { + info->has_dirty_bitmaps = true; + info->dirty_bitmaps = bdrv_query_dirty_bitmaps(bs); + } + info->detect_zeroes = bs->detect_zeroes; if (blk && blk_get_public(blk)->throttle_group_member.throttle_state) { diff --git a/qapi/block-core.json b/qapi/block-core.json index 0d43d4f37c..9210ae233d 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -360,6 +360,9 @@ # @write_threshold: configured write threshold for the device. # 0 if disabled. (Since 2.3) # +# @dirty-bitmaps: dirty bitmaps information (only present if node +# has one or more dirty bitmaps) (Since 4.2) +# # Since: 0.14.0 # ## @@ -378,7 +381,7 @@ '*bps_wr_max_length': 'int', '*iops_max_length': 'int', '*iops_rd_max_length': 'int', '*iops_wr_max_length': 'int', '*iops_size': 'int', '*group': 'str', 'cache': 'BlockdevCacheInfo', - 'write_threshold': 'int' } } + 'write_threshold': 'int', '*dirty-bitmaps': ['BlockDirtyInfo'] } } ## # @BlockDeviceIoStatus: @@ -656,6 +659,7 @@ # # @dirty-bitmaps: dirty bitmaps information (only present if the # driver has one or more dirty bitmaps) (Since 2.0) +# Deprecated in 4.2; see BlockDirtyInfo instead. # # @io-status: @BlockDeviceIoStatus. Only present if the device # supports it and the VM is configured to stop on errors diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index c90b08d553..6374b66546 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -134,6 +134,18 @@ The ``status'' field of the ``BlockDirtyInfo'' structure, returned by the query-block command is deprecated. Two new boolean fields, ``recording'' and ``busy'' effectively replace it. +@subsection query-block result field dirty-bitmaps (Since 4.2) + +The ``dirty-bitmaps`` field of the ``BlockInfo`` structure, returned by +the query-block command is itself now deprecated. The ``dirty-bitmaps`` +field of the ``BlockDeviceInfo`` struct should be used instead, which is the +type of the ``inserted`` field in query-block replies, as well as the +type of array items in query-named-block-nodes. + +Since the ``dirty-bitmaps`` field is optionally present in both the old and +new locations, clients must use introspection to learn where to anticipate +the field if/when it does appear in command output. + @subsection query-cpus (since 2.12.0) The ``query-cpus'' command is replaced by the ``query-cpus-fast'' command. -- 2.21.0

4 12

[libvirt] [PATCH] README: fix license typo
by Jim Fehlig 25 Jul '19

25 Jul '19

The README contains a reference to GPL 2.1, which does not exist. COPYING contains 2.0 so change the README to follow. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1271843cb1..4d1e86259d 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ License The libvirt C API is distributed under the terms of GNU Lesser General Public License, version 2.1 (or later). Some parts of the code that are not part of the C library may have the more restrictive GNU General -Public License, version 2.1 (or later). See the files `COPYING.LESSER` +Public License, version 2.0 (or later). See the files `COPYING.LESSER` and `COPYING` for full license terms & conditions. -- 2.22.0

3 2

[libvirt] [PATCH v5 00/20] Add support for vTPM state encryption
by Stefan Berger 25 Jul '19

25 Jul '19

This series of patches addresses the RFE in BZ 172830: https://bugzilla.redhat.com/show_bug.cgi?id=1728030 This series of patches adds support for vTPM state encryption by passing the read-end of a pipe's file descriptor to 'swtpm_setup' and 'swtpm' where they can read a passphrase from and derive a key from that passphrase. The TPM's domain XML looks to enable state encryption looks like this: <tpm model='tpm-tis'> <backend type='emulator' version='1.2'> <encryption secret='2c9ceaba-c6ef-4f38-86fd-6e3adb2df5cd'/> </backend> </tpm> The vTPM secret holding the passphrase looks like this: <secret ephemeral='no' private='yes'> <uuid>2c9ceaba-c6ef-4f38-86fd-6e3adb2df5cd</uuid> <description>vTPM passphrase example</description> <usage type='vtpm'> <name>vtpm_example</name> </usage> </secret> The swtpm v0.2 (upcoming) is needed that supports the command line option --print-capabilities returning a JSON object that identifies features added since v0.1. One such features is the possibility to pass a passphrase via a file descriptor. The patches do some refactoring of existing code on the way. Stefan v1->v2: - Added Marc-André's R-bs - Addressed comments - Added patches to extend virCommand to be able to write contents of multiple buffers to file descriptors for a spawned process to read from v2->v3: - Fixed some pointer issues following conversion to use VIR_AUTOFREE v3->v4: - Added test case for virCommandSetSendBuffer() to commantest.c - Addressed other issues raised by Marc-André v4->v5: - Simplified encryption node in TPM's domain XML and adapted everything that depends on this; dropped some patches and removed some R-bs for non-trivial stuff - Not limiting write size for fd's with O_NONBLOCK set Stefan Berger (20): secret: Add support for usage type vTPM, extend schema and test case tests: Add already existing test case tpm-emulator-tpm2 conf: Extend TPM XML parser with encryption support schema: Extend the TPM XML schema with support for encryption tests: Add test for TPM XML encryption parser and formatter tests: Add tests for QEMU command line generation with encrypted TPM tpm: Move qemuTPMEmulatorInit to virTPMEmulatorInit in virtpm.c tpm: Refactor virTPMEmulatorInit to use loop tpm: Check whether previously found executables were updated tpm: Parse the capabilities supported by swtpm and swtpm_setup utils: Implement function to pass a buffer to send via a fd to virCommand utils: Convert pollfd array to be allocated utils: Mark inpipe as non-blocking utils: Extend virCommandProcessIO to include the send buffers tests: Extend command test to transfer large data to process on multiple fds tpm: Use fd to pass password to swtpm_setup and swtpm tpm: Pass migration key passphrase via fd to swtpm tpm: Check TPM XML device configuration changes after edit docs: Extend Secret XML documentation with vtpm usage type docs: Extend TPM docs with new encryption element docs/formatdomain.html.in | 12 + docs/formatsecret.html.in | 61 +++- docs/schemas/domaincommon.rng | 11 + docs/schemas/secret.rng | 10 + include/libvirt/libvirt-secret.h | 1 + src/conf/domain_conf.c | 87 +++++- src/conf/domain_conf.h | 6 + src/conf/secret_conf.c | 13 + src/libvirt_private.syms | 10 + src/qemu/qemu_driver.c | 28 ++ src/qemu/qemu_extdevice.c | 2 +- src/qemu/qemu_extdevice.h | 3 + src/qemu/qemu_tpm.c | 204 ++++++++------ src/util/vircommand.c | 148 +++++++++- src/util/vircommand.h | 5 + src/util/virsecret.c | 2 +- src/util/virtpm.c | 261 ++++++++++++++++++ src/util/virtpm.h | 23 ++ tests/commandhelper.c | 70 ++++- tests/commandtest.c | 113 ++++++++ .../tpm-emulator-tpm2-enc.x86_64-latest.args | 35 +++ .../tpm-emulator-tpm2-enc.xml | 32 +++ tests/qemuxml2argvtest.c | 1 + .../tpm-emulator-tpm2-enc.xml | 36 +++ tests/qemuxml2xmltest.c | 2 + tests/secretxml2xmlin/usage-vtpm.xml | 7 + tests/secretxml2xmltest.c | 1 + 27 files changed, 1095 insertions(+), 89 deletions(-) create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.xml create mode 100644 tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.xml create mode 100644 tests/secretxml2xmlin/usage-vtpm.xml -- 2.20.1

3 43

[libvirt] [PATCH 0/3] domain_conf related trivial cleanups
by Ján Tomko 25 Jul '19

25 Jul '19

Ján Tomko (3): virsh: clean up includes conf: remove outdated comment conf: remove reference to VIR_DOMAIN_RNG_BACKEND_POOL src/conf/domain_conf.h | 2 -- tools/virsh.c | 3 --- tools/vsh.c | 3 --- 3 files changed, 8 deletions(-) -- 2.19.2

2 6

[libvirt] [RFC] New domain job control and stat APIs
by Peter Krempa 25 Jul '19

25 Jul '19

Currently we don't have a consolidated approach for managing asynchronous long-running domain jobs. Historically there were long-running jobs which interlocked with each other and thus there was only one such job possible at given time (migration, save, restore, dump) These jobs have a not very flexible set of APIs: virDomainGetJobInfo, virDomainGetJobStats, virDomainAbortJob. These don't really allow selecting which job to terminate since there's only one, thus if we wanted to add different kinds of jobs which not necessarily interlock but are able to run in parallel we had to introduce another set of APIs. This resulted into creation of block job APIs: virDomainBlockJobAbort, virDomainGetBlockJobInfo These allow parallel jobs (discriminated by disk to which the job belongs) but are not universal and nor allow parallel jobs on a single disk. Similarly blockjobs can also become detached from the disk e.g. if the guest unplugs the disk fronted. That way the job would linger in a limbo and would not be controllable. (This is certainly a possibility with -blockdev). With -blockdev we also get a potentially long-running blockdev-create job which is not bound to any disk as part of kicking of a snapshot or block copy job. This one might also get stuck and in the current state is not really controllable. Additionally the upcomming block-backup job will be a combination of the above. It's a job which spans multiple disks (thus not really a block job in libvirt terminology) but not a domain job either as there can be potentially more than one block backup job. The proposal for block-backup introduces it's own single-purpose set of APIs for managing the backup job only, but abuses the block job and domain job events to distribute the async state updates. With this series I want to introduce a set of APIs for managing the jobs which are designed to be universal enough and a new event so that noting will try to retrofit onto existing infrastructure. An example of the job XML would be: <job type='block-commit-active' state='ready'> <config> <disk>vda</disk> <top>vda[1]</top> <base>vda[5]</base> </config> <stats> <current>12345</current> <end>12345</current> </stats> </job> but this will be mostly a topic for the second part of this excercise after we discuss the APIs. The new infrastructure will also allow adding a flag for all the existing APIs which kick-off a job so that the job will persist even after it finishes. This will also properly implement the statistics for a finished migration and similar. Obviously we will need to take special care when wiring up these so that the old APIs work for old situations and also the events are reported correctly. The initial idea would be to implement the stats XML both for the domain jobs (migration, dump) and blockjobs to simplify the job for mgmt apps so that they won't have to infer whether the given job type is already reported in the new API. Additionally we can also implement flags for the XML getter API that will skip the stats gathering as that may require monitor interactions. Also one possibility would be to return an abbreviated XML in the listing API. --- include/libvirt/libvirt-domain.h | 91 +++++++++++++++++++++++++++++++ src/libvirt-domain.c | 94 ++++++++++++++++++++++++++++++++ 2 files changed, 185 insertions(+) diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 2dbd74d4f3..dac77771be 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -4485,6 +4485,28 @@ typedef void (*virConnectDomainEventBlockThresholdCallback)(virConnectPtr conn, unsigned long long excess, void *opaque); +/** + * virConnectDomainEventJobStateCallback: + * @conn: connection object + * @dom: domain on which the event occurred + * @jobname: name of job which changed state + * @jobtype: type of the job + * @newstate: the new state the job entered + * @opaque: application specified data + * + * The callback occurs when a long running domain job (see virDomainJobList) + * changes state. + * + * The callback signature to use when registering for an event of type + * VIR_DOMAIN_EVENT_ID_JOB_STATE with virConnectDomainEventRegisterAny() + */ +typedef void (*virConnectDomainEventJobStateCallback)(virConnectPtr conn, + virDomainPtr dom, + const char *jobname, + virDomainJobType jobtype, + virDomainJobState newstate, + void *opaque); + /** * VIR_DOMAIN_EVENT_CALLBACK: * @@ -4527,6 +4549,7 @@ typedef enum { VIR_DOMAIN_EVENT_ID_DEVICE_REMOVAL_FAILED = 22, /* virConnectDomainEventDeviceRemovalFailedCallback */ VIR_DOMAIN_EVENT_ID_METADATA_CHANGE = 23, /* virConnectDomainEventMetadataChangeCallback */ VIR_DOMAIN_EVENT_ID_BLOCK_THRESHOLD = 24, /* virConnectDomainEventBlockThresholdCallback */ + VIR_DOMAIN_EVENT_ID_JOB_STATE = 25, /* virConnectDomainEventJobStateCallback */ # ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_EVENT_ID_LAST @@ -4896,4 +4919,72 @@ int virDomainGetLaunchSecurityInfo(virDomainPtr domain, int *nparams, unsigned int flags); +typedef enum { + VIR_DOMAIN_JOB_TYPE_NONE = 0, + VIR_DOMAIN_JOB_TYPE_MIGRATION = 1, + VIR_DOMAIN_JOB_TYPE_BLOCK_PULL = 2, + [...] + +# ifdef VIR_ENUM_SENTINELS + VIR_DOMAIN_JOB_TYPE_LAST +# endif +} virDomainJobType; + + +typedef enum { + VIR_DOMAIN_JOB_STATE_NONE = 0, /* unknown job state */ + VIR_DOMAIN_JOB_STATE_RUNNING = 1, /* job is currently running */ + VIR_DOMAIN_JOB_STATE_READY = 2, /* job reached a synchronized state and may be finalized */ + VIR_DOMAIN_JOB_STATE_FAILED = 3, /* job has failed */ + VIR_DOMAIN_JOB_STATE_COMPLETED = 4, /* job has completed successfully */ + VIR_DOMAIN_JOB_STATE_ABORTED = 5, /* job has been aborted */ + [...] + +# ifdef VIR_ENUM_SENTINELS + VIR_DOMAIN_JOB_STATE_LAST +# endif +} virDomainJobState; + + +typedef struct _virDomainJob virDomainJob; +typedef virDomainJob *virDomainJobPtr; +struct _virDomainJob { + char *name; + virDomainJobType type; + virDomainJobState state; + + /* possibly overkill? - currently empty*/ + virTypedParameterPtr data; + size_t ndata; +}; + + +void virDomainJobFree(virDomainJobPtr job); + +int virDomainJobList(virDomainPtr domain, + virDomainJobPtr **jobs, + unsigned int flags); + +int virDomainJobGetXMLDesc(virDomainPtr domain, + const char *jobname, + unsigned int flags); + +typedef enum { + VIR_DOMAIN_JOB_CONTROL_OPERATION_NONE = 0, + VIR_DOMAIN_JOB_CONTROL_OPERATION_ABORT = 1, + VIR_DOMAIN_JOB_CONTROL_OPERATION_FINALIZE = 2, + VIR_DOMAIN_JOB_CONTROL_OPERATION_PAUSE = 3, + VIR_DOMAIN_JOB_CONTROL_OPERATION_RESUME = 4, + VIR_DOMAIN_JOB_CONTROL_OPERATION_DISMISS = 5, + +# ifdef VIR_ENUM_SENTINELS + VIR_DOMAIN_JOB_CONTROL_OPERATION_LAST +# endif +} virDomainJobControlOperation; + +int virDomainJobControl(virDomainPtr domain, + const char *jobname, + virDomainJobControlOperation op, + unsigned int flags); + #endif /* LIBVIRT_DOMAIN_H */ diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 3d12e7c125..aa5571818f 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -12362,3 +12362,97 @@ int virDomainGetLaunchSecurityInfo(virDomainPtr domain, virDispatchError(domain->conn); return -1; } + + +/** + * virDomainJobFree: + * @job: pointer to virDomainJob object + * + * Frees the memory associated with @job. + */ +void +virDomainJobFree(virDomainJobPtr job) +{ + [...] +} + + +/** + * virDomainJobList: + * @domain: pointer to a domain + * @jobs: Pointer to a variable to store the array containing job description + * objects or NULL if the list is not required. + * @flags: optional flags (currently unused, callers should always pass 0) + * + * Collects a list of background jobs associated with @domain and returns it in + * an allocated array of virDomainJobPtr structs. The jobs include migration jobs + * block jobs and any other possibly long running asynchronous operation. + * + * The caller is responsible for freeing the members of the returned @jobs array + * using virDomainJobFree and the whole array using free(); + * + * Returns the number of jobs running on @domain on success (optionally filling + * @jobs if non-NULL) or -1 on error (value of @jobs is set to NULL). + */ +int +virDomainJobList(virDomainPtr domain, + virDomainJobPtr **jobs, + unsigned int flags) +{ + [...] +} + + +/** + * virDomainJobGetXMLDesc: + * @domain: pointer to a domain + * @jobname: name of the domain job to operate on + * @flags: optional flags (currently unused, callers should always pass 0) + * + * Returns a string containing an UTF-8 encoded XML document describing the + * configuration, state and progress of domain job @jobname. Please refer to the + * job XML documentation for information on the format of the returned document. + * + * In case of error NULL is returned. Caller is responsible for free()-ing the + * returned string. + */ +char * +virDomainJobGetXMLDesc(virDomainPtr domain, + const char *jobname, + unsigned int flags) +{ + [...] +} + + +/** + * virDomainJobControl: + * @domain: pointer to a domain + * @jobname: name of the domain job to operate on + * @op: operation to perform on @jobname + * @flags: optional flags (currently unused, callers should always pass 0) + * + * Requests change of state of @jobname. Note that it depends on the type of + * @jobname whether @op is supported. + * + * VIR_DOMAIN_JOB_CONTROL_OPERATION_FINALIZE are supported only with + * VIR_DOMAIN_JOB_TYPE_BLOCK_COPY and VIR_DOMAIN_JOB_TYPE_BLOCK_COMMIT_ACTIVE. + * + * VIR_DOMAIN_JOB_CONTROL_OPERATION_PAUSE and VIR_DOMAIN_JOB_CONTROL_OPERATION_RESUME + * are supported only with VIR_DOMAIN_JOB_TYPE_BLOCK_* type jobs. + * + * The request to change state is asynchronous and callers should install an + * event callback for VIR_DOMAIN_EVENT_ID_JOB_STATE if they wish to be notified + * when the state change occured. (Note that the callback may fire before this + * API returns). + * + * Returns 0 on success or -1 on error. + */ +int +virDomainJobControl(virDomainPtr domain, + const char *jobname, + virDomainJobControlOperations op, + unsigned int flags) +{ + [...] +} -- 2.21.0

4 5

[libvirt] [BUG] Hyper-V Enlightenments are broken in 5.5.0+
by Vitaly Kuznetsov 25 Jul '19

25 Jul '19

Hi, when some Hyper-V enlightenments are added to the domain configuration, e.g. <features> ... <hyperv> .. <vpindex state='on'/> </hyperv> ... I'm observing the following: # virsh create /etc/libvirt/qemu/win2k16.xml error: Failed to create domain from /etc/libvirt/qemu/win2k16.xml error: unsupported configuration: host doesn't support hyperv 'vpindex' feature the feature is, of course, supported in KVM/QEMU. I've bisected the problem to the particular commit: commit 63acb7bfd56f117309e4fcaf438639d4d7bc7dcb Author: Jiri Denemark <jdenemar(a)redhat.com> Date: Mon Jun 17 23:38:46 2019 +0200 qemu_process: Prefer generic qemuMonitorGetGuestCPU Any ideas? -- Vitaly

2 4

[libvirt] [PATCH] qemu: Translate features in virQEMUCapsGetCPUFeatures
by Jiri Denemark 25 Jul '19

25 Jul '19

Starting with QEMU 4.1 qemuMonitorCPUModelInfo structure in virQEMUCaps stores only canonical feature names which may differ from the name used by libvirt. We need translate these canonical names into libvirt names for further consumption. This fixes a bug in qemuConnectBaselineHypervisorCPU which would remove all features for which libvirt's spelling differs from the QEMU's preferred name. For example, the following result of qemuConnectBaselineHypervisorCPU on my host with QEMU 4.1 is wrong: <cpu mode='custom' match='exact'> <model fallback='forbid'>Skylake-Client</model> <vendor>Intel</vendor> <feature policy='require' name='ss'/> <feature policy='require' name='vmx'/> <feature policy='require' name='hypervisor'/> <feature policy='require' name='clflushopt'/> <feature policy='require' name='umip'/> <feature policy='require' name='arch-capabilities'/> <feature policy='require' name='xsaves'/> <feature policy='require' name='pdpe1gb'/> <feature policy='require' name='invtsc'/> <feature policy='disable' name='pclmuldq'/> <feature policy='disable' name='lahf_lm'/> </cpu> The 'pclmuldq' and 'lahf_lm' should not be disabled in the baseline CPU as they are supported by QEMU on this host. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_capabilities.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 65192469da..2388f145af 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2598,7 +2598,8 @@ virQEMUCapsGetCPUFeatures(virQEMUCapsPtr qemuCaps, if (migratable && prop->migratable == VIR_TRISTATE_BOOL_NO) continue; - if (VIR_STRDUP(list[n++], prop->name) < 0) + if (VIR_STRDUP(list[n++], + virQEMUCapsCPUFeatureFromQEMU(qemuCaps, prop->name)) < 0) goto cleanup; } -- 2.22.0

2 1

[libvirt] [PATCH 0/3] Fix the CI builds after commit 6ac402c456a
by Erik Skultety 25 Jul '19

25 Jul '19

This series fixes the following failed CI builds: https://travis-ci.org/libvirt/libvirt/builds/563146026 https://ci.centos.org/view/libvirt/job/libvirt-check/537/ Successful build after these patches: https://travis-ci.org/eskultety/libvirt/builds/563439369 Erik Skultety (3): util: cgroup: Add missing parameter @maxthreads to virCgroupNewMachine test_driver: Fix testDomainSetMemoryFlags' behaviour on config change tests: optparse: Use --config with the setmaxmem command src/test/test_driver.c | 5 +++-- src/util/vircgroup.c | 1 + tests/virsh-optparse | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) -- 2.21.0

3 8

[libvirt] [PATCH 0/7] qemu: Various blockdev-related fixes (blockdev-add saga)
by Peter Krempa 25 Jul '19

25 Jul '19

Peter Krempa (7): qemu: command: Fix function name in comment qemu: Add possibility to prepare top image only for attachment via blockdev qemu: block: Add helper for generating snapshot transaction for -blockdev qemu: Use virStorageSourceIsEmpty in qemuDomainBlockCommit qemu: block: Use simple backing stores string format if possible qemu: snapshot: Initialize data for inactive config of snapshot earlier qemu: blockjob: Reset 'synchronous' block job handling flag prior to flushing events src/qemu/qemu_block.c | 108 ++++++++++++++---- src/qemu/qemu_block.h | 9 ++ src/qemu/qemu_blockjob.c | 2 +- src/qemu/qemu_command.c | 51 +++++++-- src/qemu/qemu_command.h | 3 + src/qemu/qemu_driver.c | 34 +++--- .../imagecreate/qcow2-backing-raw-nbd.json | 2 +- 7 files changed, 158 insertions(+), 51 deletions(-) -- 2.21.0

2 14

[libvirt] [PATCH v2 0/3] test_driver: re-implement testDomainSetMemoryFlags
by Ilias Stamatis 24 Jul '19

24 Jul '19

Ilias Stamatis (3): test_driver: consider flags in testDomainSetMemoryFlags test_driver: testDomainSetMemory should forward the call with VIR_DOMAIN_AFFECT_LIVE test_driver: testDomainSetMaxMemory should simply forward the call src/test/test_driver.c | 75 +++++++++++++++++++++++++++++------------- 1 file changed, 52 insertions(+), 23 deletions(-) -- 2.22.0

2 7

[libvirt] [PATCH v2 0/2] test_driver: implement virDomainSetNumaParameters
by Ilias Stamatis 24 Jul '19

24 Jul '19

Change since v1: * virDomainObjGetOneDefState is used instead of virDomainObjGetOneDef I send these 2 patches together, since testConnectSupportsFeature needs to be implemented in order for testDomainSetNumaParameters to support string parameters. Ilias Stamatis (2): test_driver: implement virConnectSupportsFeature test_driver: implement virDomainSetNumaParameters src/test/test_driver.c | 111 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) mode change 100644 => 100755 src/test/test_driver.c -- 2.22.0

2 3

[libvirt] [PATCH v2] implement virDomainSetInterfaceParameters
by Ilias Stamatis 24 Jul '19

24 Jul '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 106 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 7cf92e78a7..fce38acc17 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3108,6 +3108,111 @@ testDomainGetNumaParameters(virDomainPtr dom, } +static int +testDomainSetInterfaceParameters(virDomainPtr dom, + const char *device, + virTypedParameterPtr params, + int nparams, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + virDomainDefPtr def; + virDomainNetDefPtr net = NULL; + virNetDevBandwidthPtr bandwidth = NULL; + bool inboundSpecified = false; + bool outboundSpecified = false; + size_t i; + int ret = -1; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG, -1); + + if (virTypedParamsValidate(params, nparams, + VIR_DOMAIN_BANDWIDTH_IN_AVERAGE, + VIR_TYPED_PARAM_UINT, + VIR_DOMAIN_BANDWIDTH_IN_PEAK, + VIR_TYPED_PARAM_UINT, + VIR_DOMAIN_BANDWIDTH_IN_BURST, + VIR_TYPED_PARAM_UINT, + VIR_DOMAIN_BANDWIDTH_IN_FLOOR, + VIR_TYPED_PARAM_UINT, + VIR_DOMAIN_BANDWIDTH_OUT_AVERAGE, + VIR_TYPED_PARAM_UINT, + VIR_DOMAIN_BANDWIDTH_OUT_PEAK, + VIR_TYPED_PARAM_UINT, + VIR_DOMAIN_BANDWIDTH_OUT_BURST, + VIR_TYPED_PARAM_UINT, + NULL) < 0) + return -1; + + if (!(vm = testDomObjFromDomain(dom))) + return -1; + + if (!(def = virDomainObjGetOneDef(vm, flags))) + goto cleanup; + + if (!(net = virDomainNetFind(def, device))) + goto cleanup; + + if ((VIR_ALLOC(bandwidth) < 0) || + (VIR_ALLOC(bandwidth->in) < 0) || + (VIR_ALLOC(bandwidth->out) < 0)) + goto cleanup; + + for (i = 0; i < nparams; i++) { + virTypedParameterPtr param = &params[i]; + + if (STREQ(param->field, VIR_DOMAIN_BANDWIDTH_IN_AVERAGE)) { + bandwidth->in->average = param->value.ui; + inboundSpecified = true; + } else if (STREQ(param->field, VIR_DOMAIN_BANDWIDTH_IN_PEAK)) { + bandwidth->in->peak = param->value.ui; + } else if (STREQ(param->field, VIR_DOMAIN_BANDWIDTH_IN_BURST)) { + bandwidth->in->burst = param->value.ui; + } else if (STREQ(param->field, VIR_DOMAIN_BANDWIDTH_IN_FLOOR)) { + bandwidth->in->floor = param->value.ui; + inboundSpecified = true; + } else if (STREQ(param->field, VIR_DOMAIN_BANDWIDTH_OUT_AVERAGE)) { + bandwidth->out->average = param->value.ui; + outboundSpecified = true; + } else if (STREQ(param->field, VIR_DOMAIN_BANDWIDTH_OUT_PEAK)) { + bandwidth->out->peak = param->value.ui; + } else if (STREQ(param->field, VIR_DOMAIN_BANDWIDTH_OUT_BURST)) { + bandwidth->out->burst = param->value.ui; + } + } + + /* average or floor are mandatory, peak and burst are optional */ + if (!bandwidth->in->average && !bandwidth->in->floor) + VIR_FREE(bandwidth->in); + if (!bandwidth->out->average) + VIR_FREE(bandwidth->out); + + if (!net->bandwidth) { + VIR_STEAL_PTR(net->bandwidth, bandwidth); + } else { + if (bandwidth->in) { + VIR_FREE(net->bandwidth->in); + VIR_STEAL_PTR(net->bandwidth->in, bandwidth->in); + } else if (inboundSpecified) { + VIR_FREE(net->bandwidth->in); + } + if (bandwidth->out) { + VIR_FREE(net->bandwidth->out); + VIR_STEAL_PTR(net->bandwidth->out, bandwidth->out); + } else if (outboundSpecified) { + VIR_FREE(net->bandwidth->out); + } + } + + ret = 0; + cleanup: + virNetDevBandwidthFree(bandwidth); + virDomainObjEndAPI(&vm); + return ret; +} + + static int testDomainGetInterfaceParameters(virDomainPtr dom, const char *device, @@ -7813,6 +7918,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainSetMemoryParameters = testDomainSetMemoryParameters, /* 5.6.0 */ .domainGetMemoryParameters = testDomainGetMemoryParameters, /* 5.6.0 */ .domainGetNumaParameters = testDomainGetNumaParameters, /* 5.6.0 */ + .domainSetInterfaceParameters = testDomainSetInterfaceParameters, /* 5.6.0 */ .domainGetInterfaceParameters = testDomainGetInterfaceParameters, /* 5.6.0 */ .connectListDefinedDomains = testConnectListDefinedDomains, /* 0.1.11 */ .connectNumOfDefinedDomains = testConnectNumOfDefinedDomains, /* 0.1.11 */ -- 2.22.0

2 1

[libvirt] [PATCH] test_driver: implement virDomainInjectNMI
by Ilias Stamatis 24 Jul '19

24 Jul '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 2e33a9dd55..90e1ede7c4 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -6716,6 +6716,29 @@ testDomainScreenshot(virDomainPtr dom ATTRIBUTE_UNUSED, } +static int +testDomainInjectNMI(virDomainPtr domain, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + int ret = -1; + + virCheckFlags(0, -1); + + if (!(vm = testDomObjFromDomain(domain))) + return -1; + + if (virDomainObjCheckActive(vm) < 0) + goto cleanup; + + /* do nothing */ + ret = 0; + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + static int testDomainSendKey(virDomainPtr domain, unsigned int codeset, @@ -7792,6 +7815,7 @@ static virHypervisorDriver testHypervisorDriver = { .nodeGetCPUMap = testNodeGetCPUMap, /* 1.0.0 */ .domainRename = testDomainRename, /* 4.1.0 */ .domainScreenshot = testDomainScreenshot, /* 1.0.5 */ + .domainInjectNMI = testDomainInjectNMI, /* 5.6.0 */ .domainSendKey = testDomainSendKey, /* 5.5.0 */ .domainGetMetadata = testDomainGetMetadata, /* 1.1.3 */ .domainSetMetadata = testDomainSetMetadata, /* 1.1.3 */ -- 2.22.0

2 1

Re: [libvirt] Problem with version 5.5.x
by Raghav Gururajan 24 Jul '19

24 Jul '19

> Unfortunately no, this will require one more fix. I managed to > reproduce it on my gentoo testing machine. Glad that you were able to reproduce. > No need for the debug logs, I've tracked down the issue and working on > a fix, thanks for reporting it. That's great to hear. Thank you for working on this right away. :) Pavel, could you let me know when you have patched it upstream?. So that I can notify the libvirt package maintainer of my distro to upgrade the package in the repository. Thanks! Regards, RG.

1 0

[libvirt] Problem with version 5.5.x
by Raghav Gururajan 24 Jul '19

24 Jul '19

Hello Folks! The distro I use (Guix System) has updated it's libvirt version from 5.4.x to 5.5.x, few days ago. After the update, there is this following error: "libvirt.libvirtError: Unable to read from '/sys/fs/cgroup/unified/machine/cgroup.controllers': No such file or directory". It appears that libvirt is searching "/sys/fs/cgroup/unified/machine/cgroup.controllers" path, instead of "/sys/fs/cgroup/unified/cgroup.controllers" path; as the directory "machine" does not actually exist. The libvirt was working just fine before the update. So it seems like a critical bug with version 5.5.x that needs to be patched ASAP. Thank you! Regards, RG.

3 3

[libvirt] [PATCH] implement virDomainSetInterfaceParameters
by Ilias Stamatis 24 Jul '19

24 Jul '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 97 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 7dd448bb20..fd57c8c572 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -2945,6 +2945,102 @@ testDomainGetNumaParameters(virDomainPtr dom, } +static int +testDomainSetInterfaceParameters(virDomainPtr dom, + const char *device, + virTypedParameterPtr params, + int nparams, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + virDomainDefPtr def; + virDomainNetDefPtr net = NULL; + virNetDevBandwidthPtr bandwidth = NULL; + size_t i; + int ret = -1; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG, -1); + + if (virTypedParamsValidate(params, nparams, + VIR_DOMAIN_BANDWIDTH_IN_AVERAGE, + VIR_TYPED_PARAM_UINT, + VIR_DOMAIN_BANDWIDTH_IN_PEAK, + VIR_TYPED_PARAM_UINT, + VIR_DOMAIN_BANDWIDTH_IN_BURST, + VIR_TYPED_PARAM_UINT, + VIR_DOMAIN_BANDWIDTH_IN_FLOOR, + VIR_TYPED_PARAM_UINT, + VIR_DOMAIN_BANDWIDTH_OUT_AVERAGE, + VIR_TYPED_PARAM_UINT, + VIR_DOMAIN_BANDWIDTH_OUT_PEAK, + VIR_TYPED_PARAM_UINT, + VIR_DOMAIN_BANDWIDTH_OUT_BURST, + VIR_TYPED_PARAM_UINT, + NULL) < 0) + return -1; + + if (!(vm = testDomObjFromDomain(dom))) + return -1; + + if (!(def = virDomainObjGetOneDef(vm, flags))) + goto cleanup; + + if (!(net = virDomainNetFind(def, device))) + goto cleanup; + + if ((VIR_ALLOC(bandwidth) < 0) || + (VIR_ALLOC(bandwidth->in) < 0) || + (VIR_ALLOC(bandwidth->out) < 0)) + goto cleanup; + + for (i = 0; i < nparams; i++) { + virTypedParameterPtr param = &params[i]; + + if (STREQ(param->field, VIR_DOMAIN_BANDWIDTH_IN_AVERAGE)) { + bandwidth->in->average = param->value.ui; + } else if (STREQ(param->field, VIR_DOMAIN_BANDWIDTH_IN_PEAK)) { + bandwidth->in->peak = param->value.ui; + } else if (STREQ(param->field, VIR_DOMAIN_BANDWIDTH_IN_BURST)) { + bandwidth->in->burst = param->value.ui; + } else if (STREQ(param->field, VIR_DOMAIN_BANDWIDTH_IN_FLOOR)) { + bandwidth->in->floor = param->value.ui; + } else if (STREQ(param->field, VIR_DOMAIN_BANDWIDTH_OUT_AVERAGE)) { + bandwidth->out->average = param->value.ui; + } else if (STREQ(param->field, VIR_DOMAIN_BANDWIDTH_OUT_PEAK)) { + bandwidth->out->peak = param->value.ui; + } else if (STREQ(param->field, VIR_DOMAIN_BANDWIDTH_OUT_BURST)) { + bandwidth->out->burst = param->value.ui; + } + } + + /* average or floor are mandatory, peak and burst are optional */ + if (!bandwidth->in->average && !bandwidth->in->floor) + VIR_FREE(bandwidth->in); + if (!bandwidth->out->average) + VIR_FREE(bandwidth->out); + + if (!net->bandwidth) { + VIR_STEAL_PTR(net->bandwidth, bandwidth); + } else { + if (bandwidth->in) { + VIR_FREE(net->bandwidth->in); + VIR_STEAL_PTR(net->bandwidth->in, bandwidth->in); + } + if (bandwidth->out) { + VIR_FREE(net->bandwidth->out); + VIR_STEAL_PTR(net->bandwidth->out, bandwidth->out); + } + } + + ret = 0; + cleanup: + virNetDevBandwidthFree(bandwidth); + virDomainObjEndAPI(&vm); + return ret; +} + + static int testDomainGetInterfaceParameters(virDomainPtr dom, const char *device, @@ -7617,6 +7713,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainGetXMLDesc = testDomainGetXMLDesc, /* 0.1.4 */ .domainGetMemoryParameters = testDomainGetMemoryParameters, /* 5.6.0 */ .domainGetNumaParameters = testDomainGetNumaParameters, /* 5.6.0 */ + .domainSetInterfaceParameters = testDomainSetInterfaceParameters, /* 5.6.0 */ .domainGetInterfaceParameters = testDomainGetInterfaceParameters, /* 5.6.0 */ .connectListDefinedDomains = testConnectListDefinedDomains, /* 0.1.11 */ .connectNumOfDefinedDomains = testConnectNumOfDefinedDomains, /* 0.1.11 */ -- 2.22.0

2 3

[libvirt] [PATCH] test_driver: implement virDomainSetMemoryStatsPeriod
by Ilias Stamatis 24 Jul '19

24 Jul '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index c10344f6cd..b6394fad2b 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -2469,6 +2469,40 @@ static int testDomainSetMaxMemory(virDomainPtr domain, return 0; } + +static int testDomainSetMemoryStatsPeriod(virDomainPtr dom, + int period, + unsigned int flags) +{ + virDomainObjPtr vm; + virDomainDefPtr def; + int ret = -1; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG, -1); + + if (!(vm = testDomObjFromDomain(dom))) + goto cleanup; + + if (!(def = virDomainObjGetOneDef(vm, flags))) + goto cleanup; + + if (!virDomainDefHasMemballoon(def)) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("No memory balloon device configured, " + "can not set the collection period")); + goto cleanup; + } + + def->memballoon->period = period; + + ret = 0; + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + static int testDomainSetMemoryFlags(virDomainPtr domain, unsigned long memory, unsigned int flags) @@ -7619,6 +7653,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainGetMaxMemory = testDomainGetMaxMemory, /* 0.1.4 */ .domainSetMaxMemory = testDomainSetMaxMemory, /* 0.1.1 */ .domainSetMemory = testDomainSetMemory, /* 0.1.4 */ + .domainSetMemoryStatsPeriod = testDomainSetMemoryStatsPeriod, /* 5.6.0 */ .domainSetMemoryFlags = testDomainSetMemoryFlags, /* 5.6.0 */ .domainGetHostname = testDomainGetHostname, /* 5.5.0 */ .domainGetInfo = testDomainGetInfo, /* 0.1.1 */ -- 2.22.0

2 1

[libvirt] [PATCH Rust 1/4] connect: cleanup around Connect::open_auth()'s method
by Sahid Orentino Ferdjaoui 24 Jul '19

24 Jul '19

In this refactor we avoid to enclose all the code with unsafe tags and just use it when necessary. Also we add annotations to explain why it's safe to use. The integrations tests related are also been reviewed to avoid using panic. Signed-off-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui(a)canonical.com> --- src/connect.rs | 91 ++++++++++++++++++++++----------------- tests/integration_qemu.rs | 16 +++---- 2 files changed, 56 insertions(+), 51 deletions(-) diff --git a/src/connect.rs b/src/connect.rs index 0fa8551..108224d 100644 --- a/src/connect.rs +++ b/src/connect.rs @@ -240,6 +240,41 @@ extern "C" { -> *mut libc::c_char; } +extern "C" fn connectCallback(ccreds: sys::virConnectCredentialPtr, + ncred: libc::c_uint, + cbdata: *mut libc::c_void) + -> libc::c_int { + let callback: ConnectAuthCallback = unsafe { + // Safe because connectCallback is private and only used by + // Connect::open_auth(). In open_auth() we transmute the + // callback allocate in *void. + mem::transmute(cbdata) + }; + let mut rcreds: Vec<ConnectCredential> = Vec::new(); + for i in 0..ncred as isize { + unsafe { + // Safe because ccreds is allocated. + let c = ConnectCredential::from_ptr(ccreds.offset(i)); + rcreds.push(c); + } + } + callback(&mut rcreds); + for i in 0..ncred as isize { + if rcreds[i as usize].result.is_some() { + if let Some(ref result) = rcreds[i as usize].result { + unsafe { + // Safe because ccreds is allocated and the result + // is comming from Rust calls. + (*ccreds.offset(i)).resultlen = result.len() as libc::c_uint; + (*ccreds.offset(i)).result = string_to_mut_c_chars!(result.clone()); + } + } + } + } + 0 +} + + pub type ConnectFlags = self::libc::c_uint; pub const VIR_CONNECT_RO: ConnectFlags = 1 << 0; pub const VIR_CONNECT_NO_ALIASES: ConnectFlags = 1 << 1; @@ -412,39 +447,6 @@ impl ConnectAuth { callback: callback, } } - - fn to_cstruct(&mut self) -> sys::virConnectAuth { - unsafe extern "C" fn wrapper(ccreds: sys::virConnectCredentialPtr, - ncred: libc::c_uint, - cbdata: *mut libc::c_void) - -> libc::c_int { - let callback: ConnectAuthCallback = mem::transmute(cbdata); - let mut rcreds: Vec<ConnectCredential> = Vec::new(); - for i in 0..ncred as isize { - let c = ConnectCredential::from_ptr(ccreds.offset(i)); - rcreds.push(c); - } - callback(&mut rcreds); - for i in 0..ncred as isize { - if rcreds[i as usize].result.is_some() { - if let Some(ref result) = rcreds[i as usize].result { - (*ccreds.offset(i)).resultlen = result.len() as libc::c_uint; - (*ccreds.offset(i)).result = string_to_mut_c_chars!(result.clone()); - } - } - } - 0 - } - - unsafe { - sys::virConnectAuth { - credtype: &mut self.creds[0], - ncredtype: self.creds.len() as u32, - cb: wrapper, - cbdata: mem::transmute(self.callback), - } - } - } } /// Provides APIs for the management of hosts. @@ -554,14 +556,23 @@ impl Connect { auth: &mut ConnectAuth, flags: ConnectFlags) -> Result<Connect, Error> { - unsafe { - let mut cauth = auth.to_cstruct(); - let c = virConnectOpenAuth(string_to_c_chars!(uri), &mut cauth, flags as libc::c_uint); - if c.is_null() { - return Err(Error::new()); - } - return Ok(Connect::new(c)); + let mut cauth = unsafe { + // Safe because Rust forces to allocate all attributes of + // the struct ConnectAuth. + sys::virConnectAuth { + credtype: &mut auth.creds[0], + ncredtype: auth.creds.len() as libc::c_uint, + cb: connectCallback, + cbdata: mem::transmute(auth.callback), + } + }; + let c = unsafe { + virConnectOpenAuth(string_to_c_chars!(uri), &mut cauth, flags as libc::c_uint) + }; + if c.is_null() { + return Err(Error::new()); } + return Ok(Connect::new(c)); } diff --git a/tests/integration_qemu.rs b/tests/integration_qemu.rs index 49e07c4..79aa2bd 100644 --- a/tests/integration_qemu.rs +++ b/tests/integration_qemu.rs @@ -108,14 +108,9 @@ fn test_connection_with_auth() { let mut auth = ConnectAuth::new(vec![::virt::connect::VIR_CRED_AUTHNAME, ::virt::connect::VIR_CRED_PASSPHRASE], callback); - match Connect::open_auth("test+tcp://127.0.0.1/default", &mut auth, 0) { - Ok(c) => common::close(c), - Err(e) => { - panic!("open_auth did not work: code {}, message: {}", - e.code, - e.message) - } - } + let c = Connect::open_auth("test+tcp://127.0.0.1/default", &mut auth, 0); + assert_eq!(true, c.is_ok()); + common::close(c.unwrap()); } @@ -141,9 +136,8 @@ fn test_connection_with_auth_wrong() { let mut auth = ConnectAuth::new(vec![::virt::connect::VIR_CRED_AUTHNAME, ::virt::connect::VIR_CRED_PASSPHRASE], callback); - if Connect::open_auth("test+tcp://127.0.0.1/default", &mut auth, 0).is_ok() { - panic!("open_auth did not work: code {}, message:"); - } + let c = Connect::open_auth("test+tcp://127.0.0.1/default", &mut auth, 0); + assert_eq!(false, c.is_ok()); } #[test] -- 2.17.1

2 6

[libvirt] [PATCH 0/2] test_driver: implement virDomainSetNumaParameters
by Ilias Stamatis 24 Jul '19

24 Jul '19

I send these 2 patches together, since testConnectSupportsFeature needs to be implemented in order for testDomainSetNumaParameters to support string parameters. Ilias Stamatis (2): test_driver: implement virConnectSupportsFeature test_driver: implement virDomainSetNumaParameters src/test/test_driver.c | 111 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) mode change 100644 => 100755 src/test/test_driver.c -- 2.22.0

2 3

[libvirt] [PATCH RESEND] qemu: Add support for overriding max threads per process limit
by Jim Fehlig 24 Jul '19

24 Jul '19

Some VM configurations may result in a large number of threads created by the associated qemu process which can exceed the system default limit. The maximum number of threads allowed per process is controlled by the pids cgroup controller and is set to 16k when creating VMs with systemd's machined service. The maximum number of threads per process is recorded in the pids.max file under the machine's pids controller cgroup hierarchy, e.g. $cgrp-mnt/pids/machine.slice/machine-qemu\\x2d1\\x2dtest.scope/pids.max Maximum threads per process is controlled with the TasksMax property of the systemd scope for the machine. This patch adds an option to qemu.conf which can be used to override the maximum number of threads allowed per qemu process. If the value of option is greater than zero, it will be set in the TasksMax property of the machine's scope after creating the machine. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Rebase and resend of https://www.redhat.com/archives/libvir-list/2019-June/msg00185.html src/lxc/lxc_cgroup.c | 1 + src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 10 ++++++++++ src/qemu/qemu_cgroup.c | 1 + src/qemu/qemu_conf.c | 2 ++ src/qemu/qemu_conf.h | 1 + src/qemu/test_libvirtd_qemu.aug.in | 1 + src/util/vircgroup.c | 6 +++++- src/util/vircgroup.h | 1 + src/util/virsystemd.c | 24 +++++++++++++++++++++++- src/util/virsystemd.h | 3 ++- tests/virsystemdtest.c | 12 ++++++------ 12 files changed, 54 insertions(+), 9 deletions(-) diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index d93a19d684..76014f3bfd 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -455,6 +455,7 @@ virCgroupPtr virLXCCgroupCreate(virDomainDefPtr def, nnicindexes, nicindexes, def->resource->partition, -1, + 0, &cgroup) < 0) goto cleanup; diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index eea9094d39..2a99a0c55f 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -95,6 +95,7 @@ module Libvirtd_qemu = | limits_entry "max_core" | bool_entry "dump_guest_core" | str_entry "stdio_handler" + | int_entry "max_threads_per_process" let device_entry = bool_entry "mac_filter" | bool_entry "relaxed_acs_check" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index fd2ed9dc21..8cabeccacb 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -613,6 +613,16 @@ #max_processes = 0 #max_files = 0 +# If max_threads_per_process is set to a positive integer, libvirt +# will use it to set the maximum number of threads that can be +# created by a qemu process. Some VM configurations can result in +# qemu processes with tens of thousands of threads. systemd-based +# systems typically limit the number of threads per process to +# 16k. max_threads_per_process can be used to override default +# limits in the host OS. +# +#max_threads_per_process = 0 + # If max_core is set to a non-zero integer, then QEMU will be # permitted to create core dumps when it crashes, provided its # RAM size is smaller than the limit set. diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 19ca60905a..ecd96efb0a 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -929,6 +929,7 @@ qemuInitCgroup(virDomainObjPtr vm, nnicindexes, nicindexes, vm->def->resource->partition, cfg->cgroupControllers, + cfg->maxThreadsPerProc, &priv->cgroup) < 0) { if (virCgroupNewIgnoreError()) goto done; diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index e0195dac29..71d0464c0d 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -670,6 +670,8 @@ virQEMUDriverConfigLoadProcessEntry(virQEMUDriverConfigPtr cfg, return -1; if (virConfGetValueUInt(conf, "max_files", &cfg->maxFiles) < 0) return -1; + if (virConfGetValueUInt(conf, "max_threads_per_process", &cfg->maxThreadsPerProc) < 0) + return -1; if (virConfGetValueType(conf, "max_core") == VIR_CONF_STRING) { if (virConfGetValueString(conf, "max_core", &corestr) < 0) diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 2229b76e89..d8e3bfe87c 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -162,6 +162,7 @@ struct _virQEMUDriverConfig { unsigned int maxProcesses; unsigned int maxFiles; + unsigned int maxThreadsPerProc; unsigned long long maxCore; bool dumpGuestCore; diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 388ba24b8b..b3b44d42d9 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -76,6 +76,7 @@ module Test_libvirtd_qemu = { "set_process_name" = "1" } { "max_processes" = "0" } { "max_files" = "0" } +{ "max_threads_per_process" = "0" } { "max_core" = "unlimited" } { "dump_guest_core" = "1" } { "mac_filter" = "1" } diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index f7afc2964d..9daf62795e 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -1118,6 +1118,7 @@ virCgroupNewMachineSystemd(const char *name, int *nicindexes, const char *partition, int controllers, + unsigned int maxthreads, virCgroupPtr *group) { int rv; @@ -1134,7 +1135,8 @@ virCgroupNewMachineSystemd(const char *name, isContainer, nnicindexes, nicindexes, - partition)) < 0) + partition, + maxthreads)) < 0) return rv; if (controllers != -1) @@ -1246,6 +1248,7 @@ virCgroupNewMachine(const char *name, int *nicindexes, const char *partition, int controllers, + unsigned int maxthreads, virCgroupPtr *group) { int rv; @@ -1262,6 +1265,7 @@ virCgroupNewMachine(const char *name, nicindexes, partition, controllers, + maxthreads, group)) == 0) return 0; diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h index 2f68fdb685..3eefe78787 100644 --- a/src/util/vircgroup.h +++ b/src/util/vircgroup.h @@ -98,6 +98,7 @@ int virCgroupNewMachine(const char *name, int *nicindexes, const char *partition, int controllers, + unsigned int maxthreads, virCgroupPtr *group) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index f6c5adc5ef..1cb8874403 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -252,12 +252,14 @@ int virSystemdCreateMachine(const char *name, bool iscontainer, size_t nnicindexes, int *nicindexes, - const char *partition) + const char *partition, + unsigned int maxthreads) { int ret; DBusConnection *conn; char *creatorname = NULL; char *slicename = NULL; + char *scopename = NULL; static int hasCreateWithNetwork = 1; if ((ret = virSystemdHasMachined()) < 0) @@ -403,11 +405,31 @@ int virSystemdCreateMachine(const char *name, goto cleanup; } + if (maxthreads > 0) { + if (!(scopename = virSystemdMakeScopeName(name, drivername, false))) + goto cleanup; + + if (virDBusCallMethod(conn, + NULL, + NULL, + "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", + "org.freedesktop.systemd1.Manager", + "SetUnitProperties", + "sba(sv)", + scopename, + true, + 1, + "TasksMax", "t", (uint64_t)maxthreads) < 0) + goto cleanup; + } + ret = 0; cleanup: VIR_FREE(creatorname); VIR_FREE(slicename); + VIR_FREE(scopename); return ret; } diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h index 5d56c78835..96626f8fff 100644 --- a/src/util/virsystemd.h +++ b/src/util/virsystemd.h @@ -50,7 +50,8 @@ int virSystemdCreateMachine(const char *name, bool iscontainer, size_t nnicindexes, int *nicindexes, - const char *partition); + const char *partition, + unsigned int maxthreads); int virSystemdTerminateMachine(const char *name); diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 7aaa8f97fa..340b038095 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -175,7 +175,7 @@ static int testCreateContainer(const void *opaque ATTRIBUTE_UNUSED) 123, true, 0, NULL, - "highpriority.slice") < 0) { + "highpriority.slice", 0) < 0) { fprintf(stderr, "%s", "Failed to create LXC machine\n"); return -1; } @@ -208,7 +208,7 @@ static int testCreateMachine(const void *opaque ATTRIBUTE_UNUSED) 123, false, 0, NULL, - NULL) < 0) { + NULL, 0) < 0) { fprintf(stderr, "%s", "Failed to create KVM machine\n"); return -1; } @@ -245,7 +245,7 @@ static int testCreateNoSystemd(const void *opaque ATTRIBUTE_UNUSED) 123, false, 0, NULL, - NULL)) == 0) { + NULL, 0)) == 0) { unsetenv("FAIL_NO_SERVICE"); fprintf(stderr, "%s", "Unexpected create machine success\n"); return -1; @@ -279,7 +279,7 @@ static int testCreateSystemdNotRunning(const void *opaque ATTRIBUTE_UNUSED) 123, false, 0, NULL, - NULL)) == 0) { + NULL, 0)) == 0) { unsetenv("FAIL_NOT_REGISTERED"); fprintf(stderr, "%s", "Unexpected create machine success\n"); return -1; @@ -313,7 +313,7 @@ static int testCreateBadSystemd(const void *opaque ATTRIBUTE_UNUSED) 123, false, 0, NULL, - NULL)) == 0) { + NULL, 0)) == 0) { unsetenv("FAIL_BAD_SERVICE"); fprintf(stderr, "%s", "Unexpected create machine success\n"); return -1; @@ -348,7 +348,7 @@ static int testCreateNetwork(const void *opaque ATTRIBUTE_UNUSED) 123, true, nnicindexes, nicindexes, - "highpriority.slice") < 0) { + "highpriority.slice", 0) < 0) { fprintf(stderr, "%s", "Failed to create LXC machine\n"); return -1; } -- 2.22.0

2 1

[libvirt] [PATCH 0/3] cgroups v2 fixes
by Pavel Hrdina 24 Jul '19

24 Jul '19

Pavel Hrdina (3): vircgroup: fix cgroups v2 controllers detection vircgroupv2: store enabled controllers vircgroupv2: remove ATTRIBUTE_UNUSED for used attribute src/util/vircgroup.c | 2 +- src/util/vircgroupbackend.h | 3 ++- src/util/vircgroupv1.c | 3 ++- src/util/vircgroupv2.c | 36 ++++++++++++++++++++++++------------ 4 files changed, 29 insertions(+), 15 deletions(-) -- 2.21.0

2 4

[libvirt] [PATCH v9 00/13] Checkpoint APIs (incremental backup saga)
by Eric Blake 24 Jul '19

24 Jul '19

This is a subset of v9 of incremental backup, fixing most of the review comments that Peter gave on v8.5. The qemu portions in patch 11 and 12 could probably still use some cleanups to address feedback in v8 and v8.5; and I also intend to post a followup series for the backup APIs on Monday to form the full backup-v9 tag. Here's a comparison of these patches to v8.5: - rebase on top of master, and on top of my series '[0/8] more snapshot improvements': https://www.redhat.com/archives/libvir-list/2019-July/msg00224.html - add interlock error between snapshots and checkpoints: until we finish the design of how those two will interact, it's easier to ensure we don't let the user get into a weird state that we will then be stuck with supporting down the road - avoid some technical debt; Peter pointed out several places to improve, and I've done a lot of those (there's probably still more that can be done, but at least 1-10 feel more polished) - Rework the notion of a current checkpoint. We are stuck with a domain having a single current snapshot, and my implementation for qemu happens to use a single current checkpoint, but Peter pointed out that other hypervisors might have multiple current snapshots. As such, I deleted the API virDomainSnapshotCurrent (which could only report just one) and instead replaced it with new filter flags for virDomainListAllSnapshots - With a current checkpoint being exposed in the XML, there were lots of simplifications to virsh (no longer possible to change which checkpoint is current by abuse of redefine) - With current checkpoint in the public XML, there is no longer a need for a PARSE_INTERNAL or FORMAT_INTERNAL flag - Add testsuite coverage of the test_driver checkpoint implementation (which in turn allowed me to fine-tune several of the other patches based on what it turned up) (see patch 10) - Fix several typos/grammars/copy-paste leftovers - defer virDomainCheckpointIsCurrent to a later patch (see patch 13); we may decide we don't need the API and that parsing XML frrom virDomainCheckpointGetXMLDesc is sufficient 001/13:[0068] [FC] 'backup: Document new XML for checkpoints' 002/13:[0186] [FC] 'backup: Introduce virDomainCheckpoint APIs' 003/13:[0021] [FC] 'backup: Document nuances between different state capture APIs' 004/13:[0099] [FC] 'backup: Parse and output checkpoint XML' 005/13:[0070] [FC] 'backup: Allow for lists of checkpoint objects' 006/13:[----] [--] 'backup: Add new domain:checkpoint access control' 007/13:[0072] [FC] 'backup: Implement checkpoint APIs for remote driver' 008/13:[0527] [FC] 'backup: Implement virsh support for checkpoints' 009/13:[0097] [FC] 'backup: test: Implement metadata tracking for checkpoint APIs' 010/13:[down] 'backup: Add virsh-checkpoints test' 011/13:[0132] [FC] 'backup: qemu: Implement metadata tracking for checkpoint APIs' 012/13:[----] [-C] 'backup: Wire up qemu checkpoint commands over QMP' 013/13:[down] 'backup: Add virDomainCheckpointIsCurrent API' Eric Blake (13): backup: Document new XML for checkpoints backup: Introduce virDomainCheckpoint APIs backup: Document nuances between different state capture APIs backup: Parse and output checkpoint XML backup: Allow for lists of checkpoint objects backup: Add new domain:checkpoint access control backup: Implement checkpoint APIs for remote driver backup: Implement virsh support for checkpoints backup: test: Implement metadata tracking for checkpoint APIs backup: Add virsh-checkpoints test backup: qemu: Implement metadata tracking for checkpoint APIs backup: Wire up qemu checkpoint commands over QMP backup: Add virDomainCheckpointIsCurrent API include/libvirt/libvirt-domain-checkpoint.h | 147 ++ include/libvirt/libvirt-domain.h | 6 + include/libvirt/libvirt.h | 5 +- src/access/viraccessperm.h | 6 + src/conf/checkpoint_conf.h | 93 ++ src/conf/domain_conf.h | 2 + src/conf/virconftypes.h | 9 + src/conf/virdomaincheckpointobjlist.h | 74 + src/conf/virdomainmomentobjlist.h | 5 +- src/conf/virdomainobjlist.h | 7 +- src/driver-hypervisor.h | 43 + src/qemu/qemu_block.h | 3 + src/qemu/qemu_conf.h | 2 + src/qemu/qemu_domain.h | 15 + tools/virsh-checkpoint.h | 26 + tools/virsh-completer.h | 4 + tools/virsh-util.h | 3 + tools/virsh.h | 1 + docs/Makefile.am | 3 + docs/apibuild.py | 2 + docs/docs.html.in | 9 +- docs/domainstatecapture.html.in | 314 +++++ docs/format.html.in | 1 + docs/formatcheckpoint.html.in | 220 +++ docs/formatsnapshot.html.in | 6 +- docs/index.html.in | 3 +- docs/schemas/domaincheckpoint.rng | 95 ++ libvirt.spec.in | 2 + mingw-libvirt.spec.in | 4 + po/POTFILES | 3 + src/Makefile.am | 2 + src/access/viraccessperm.c | 3 +- src/conf/Makefile.inc.am | 4 + src/conf/checkpoint_conf.c | 630 +++++++++ src/conf/domain_conf.c | 6 + src/conf/virdomaincheckpointobjlist.c | 232 ++++ src/conf/virdomainmomentobjlist.c | 2 +- src/conf/virdomainobjlist.c | 11 + src/libvirt-domain-checkpoint.c | 624 +++++++++ src/libvirt-domain.c | 19 +- src/libvirt_private.syms | 26 + src/libvirt_public.syms | 17 + src/qemu/qemu_block.c | 12 + src/qemu/qemu_conf.c | 5 + src/qemu/qemu_domain.c | 182 +++ src/qemu/qemu_driver.c | 787 +++++++++++ src/remote/remote_daemon_dispatch.c | 20 + src/remote/remote_driver.c | 25 +- src/remote/remote_protocol.x | 139 +- src/remote_protocol-structs | 77 ++ src/rpc/gendispatch.pl | 32 +- src/test/test_driver.c | 415 ++++++ tests/Makefile.am | 12 +- tests/qemudomaincheckpointxml2xmlin/empty.xml | 1 + .../qemudomaincheckpointxml2xmlin/sample.xml | 7 + tests/qemudomaincheckpointxml2xmlin/size.xml | 4 + .../qemudomaincheckpointxml2xmlout/empty.xml | 8 + .../internal-active-invalid.xml | 53 + .../internal-inactive-invalid.xml | 53 + .../redefine.xml | 64 + .../qemudomaincheckpointxml2xmlout/sample.xml | 13 + tests/qemudomaincheckpointxml2xmlout/size.xml | 12 + tests/qemudomaincheckpointxml2xmltest.c | 213 +++ tests/virschematest.c | 2 + tests/virsh-checkpoint | 181 +++ tests/virsh-snapshot | 12 +- tools/Makefile.am | 1 + tools/virsh-checkpoint.c | 1215 +++++++++++++++++ tools/virsh-completer.c | 51 + tools/virsh-domain-monitor.c | 23 + tools/virsh-domain.c | 7 + tools/virsh-util.c | 11 + tools/virsh.c | 2 + tools/virsh.pod | 221 ++- 74 files changed, 6508 insertions(+), 41 deletions(-) create mode 100644 include/libvirt/libvirt-domain-checkpoint.h create mode 100644 src/conf/checkpoint_conf.h create mode 100644 src/conf/virdomaincheckpointobjlist.h create mode 100644 tools/virsh-checkpoint.h create mode 100644 docs/domainstatecapture.html.in create mode 100644 docs/formatcheckpoint.html.in create mode 100644 docs/schemas/domaincheckpoint.rng create mode 100644 src/conf/checkpoint_conf.c create mode 100644 src/conf/virdomaincheckpointobjlist.c create mode 100644 src/libvirt-domain-checkpoint.c create mode 100644 tests/qemudomaincheckpointxml2xmlin/empty.xml create mode 100644 tests/qemudomaincheckpointxml2xmlin/sample.xml create mode 100644 tests/qemudomaincheckpointxml2xmlin/size.xml create mode 100644 tests/qemudomaincheckpointxml2xmlout/empty.xml create mode 100644 tests/qemudomaincheckpointxml2xmlout/internal-active-invalid.xml create mode 100644 tests/qemudomaincheckpointxml2xmlout/internal-inactive-invalid.xml create mode 100644 tests/qemudomaincheckpointxml2xmlout/redefine.xml create mode 100644 tests/qemudomaincheckpointxml2xmlout/sample.xml create mode 100644 tests/qemudomaincheckpointxml2xmlout/size.xml create mode 100644 tests/qemudomaincheckpointxml2xmltest.c create mode 100755 tests/virsh-checkpoint create mode 100644 tools/virsh-checkpoint.c -- 2.20.1

3 30

[libvirt] [PATCH 0/4] Couple of recent things from Coverity
by John Ferlan 23 Jul '19

23 Jul '19

Some patches from recent changes for things Coverity has complained about John Ferlan (4): qemu: Remove unnecessary check in qemuMonitorJSONGetJobInfoOne test: Return early in testQueryJobs util: Avoid possible error in virCommandMassClose tests: Avoid possible error in testExecRestart src/qemu/qemu_monitor_json.c | 3 --- src/util/vircommand.c | 2 +- tests/qemumonitorjsontest.c | 3 +++ tests/virnetdaemontest.c | 9 +++++---- 4 files changed, 9 insertions(+), 8 deletions(-) -- 2.20.1

2 7

[libvirt] [dockerfiles PATCH 0/4] Add libosinfo Dockerfiles
by Fabiano Fidêncio 23 Jul '19

23 Jul '19

This patch series aims to add libosinfo Dockerfiles to this project, so those containers can be used by libosinfo projects' gitlab CI. Please, take a look at each patch for more context of what has been done. Fabiano Fidêncio (4): refresh: Fix typo: ingores -> ignored refresh: Learn how to deal with the project's name refresh: Add libosinfo project Add Dockerfiles for libosinfo project buildenv-libosinfo-centos-7.Dockerfile | 44 +++++++++++++ ...bosinfo-debian-10-cross-aarch64.Dockerfile | 65 +++++++++++++++++++ ...ibosinfo-debian-10-cross-armv6l.Dockerfile | 65 +++++++++++++++++++ ...ibosinfo-debian-10-cross-armv7l.Dockerfile | 65 +++++++++++++++++++ ...-libosinfo-debian-10-cross-i686.Dockerfile | 65 +++++++++++++++++++ ...-libosinfo-debian-10-cross-mips.Dockerfile | 65 +++++++++++++++++++ ...osinfo-debian-10-cross-mips64el.Dockerfile | 65 +++++++++++++++++++ ...ibosinfo-debian-10-cross-mipsel.Dockerfile | 65 +++++++++++++++++++ ...bosinfo-debian-10-cross-ppc64le.Dockerfile | 65 +++++++++++++++++++ ...libosinfo-debian-10-cross-s390x.Dockerfile | 65 +++++++++++++++++++ buildenv-libosinfo-debian-10.Dockerfile | 51 +++++++++++++++ ...ibosinfo-debian-9-cross-aarch64.Dockerfile | 65 +++++++++++++++++++ ...libosinfo-debian-9-cross-armv6l.Dockerfile | 65 +++++++++++++++++++ ...libosinfo-debian-9-cross-armv7l.Dockerfile | 65 +++++++++++++++++++ ...v-libosinfo-debian-9-cross-mips.Dockerfile | 65 +++++++++++++++++++ ...bosinfo-debian-9-cross-mips64el.Dockerfile | 65 +++++++++++++++++++ ...libosinfo-debian-9-cross-mipsel.Dockerfile | 65 +++++++++++++++++++ ...ibosinfo-debian-9-cross-ppc64le.Dockerfile | 65 +++++++++++++++++++ ...-libosinfo-debian-9-cross-s390x.Dockerfile | 65 +++++++++++++++++++ buildenv-libosinfo-debian-9.Dockerfile | 51 +++++++++++++++ ...osinfo-debian-sid-cross-aarch64.Dockerfile | 65 +++++++++++++++++++ ...bosinfo-debian-sid-cross-armv6l.Dockerfile | 65 +++++++++++++++++++ ...bosinfo-debian-sid-cross-armv7l.Dockerfile | 65 +++++++++++++++++++ ...libosinfo-debian-sid-cross-i686.Dockerfile | 65 +++++++++++++++++++ ...libosinfo-debian-sid-cross-mips.Dockerfile | 65 +++++++++++++++++++ ...sinfo-debian-sid-cross-mips64el.Dockerfile | 65 +++++++++++++++++++ ...bosinfo-debian-sid-cross-mipsel.Dockerfile | 65 +++++++++++++++++++ ...osinfo-debian-sid-cross-ppc64le.Dockerfile | 65 +++++++++++++++++++ ...ibosinfo-debian-sid-cross-s390x.Dockerfile | 65 +++++++++++++++++++ buildenv-libosinfo-debian-sid.Dockerfile | 51 +++++++++++++++ buildenv-libosinfo-fedora-29.Dockerfile | 50 ++++++++++++++ buildenv-libosinfo-fedora-30.Dockerfile | 50 ++++++++++++++ buildenv-libosinfo-fedora-rawhide.Dockerfile | 64 ++++++++++++++++++ buildenv-libosinfo-ubuntu-16.Dockerfile | 51 +++++++++++++++ buildenv-libosinfo-ubuntu-18.Dockerfile | 51 +++++++++++++++ ...le => buildenv-libvirt-centos-7.Dockerfile | 0 ...libvirt-debian-10-cross-aarch64.Dockerfile | 0 ...-libvirt-debian-10-cross-armv6l.Dockerfile | 0 ...-libvirt-debian-10-cross-armv7l.Dockerfile | 0 ...nv-libvirt-debian-10-cross-i686.Dockerfile | 0 ...nv-libvirt-debian-10-cross-mips.Dockerfile | 0 ...ibvirt-debian-10-cross-mips64el.Dockerfile | 0 ...-libvirt-debian-10-cross-mipsel.Dockerfile | 0 ...libvirt-debian-10-cross-ppc64le.Dockerfile | 0 ...v-libvirt-debian-10-cross-s390x.Dockerfile | 0 ...e => buildenv-libvirt-debian-10.Dockerfile | 0 ...-libvirt-debian-9-cross-aarch64.Dockerfile | 0 ...v-libvirt-debian-9-cross-armv6l.Dockerfile | 0 ...v-libvirt-debian-9-cross-armv7l.Dockerfile | 0 ...env-libvirt-debian-9-cross-mips.Dockerfile | 0 ...libvirt-debian-9-cross-mips64el.Dockerfile | 0 ...v-libvirt-debian-9-cross-mipsel.Dockerfile | 0 ...-libvirt-debian-9-cross-ppc64le.Dockerfile | 0 ...nv-libvirt-debian-9-cross-s390x.Dockerfile | 0 ...le => buildenv-libvirt-debian-9.Dockerfile | 0 ...ibvirt-debian-sid-cross-aarch64.Dockerfile | 0 ...libvirt-debian-sid-cross-armv6l.Dockerfile | 0 ...libvirt-debian-sid-cross-armv7l.Dockerfile | 0 ...v-libvirt-debian-sid-cross-i686.Dockerfile | 0 ...v-libvirt-debian-sid-cross-mips.Dockerfile | 0 ...bvirt-debian-sid-cross-mips64el.Dockerfile | 0 ...libvirt-debian-sid-cross-mipsel.Dockerfile | 0 ...ibvirt-debian-sid-cross-ppc64le.Dockerfile | 0 ...-libvirt-debian-sid-cross-s390x.Dockerfile | 0 ... => buildenv-libvirt-debian-sid.Dockerfile | 0 ...e => buildenv-libvirt-fedora-29.Dockerfile | 0 ...e => buildenv-libvirt-fedora-30.Dockerfile | 0 ...buildenv-libvirt-fedora-rawhide.Dockerfile | 0 ...e => buildenv-libvirt-ubuntu-16.Dockerfile | 0 ...e => buildenv-libvirt-ubuntu-18.Dockerfile | 0 refresh | 60 +++++++++++++---- 71 files changed, 2201 insertions(+), 12 deletions(-) create mode 100644 buildenv-libosinfo-centos-7.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-aarch64.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-armv6l.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-armv7l.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-i686.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-mips.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-mips64el.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-mipsel.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-ppc64le.Dockerfile create mode 100644 buildenv-libosinfo-debian-10-cross-s390x.Dockerfile create mode 100644 buildenv-libosinfo-debian-10.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-aarch64.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-armv6l.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-armv7l.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-mips.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-mips64el.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-mipsel.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-ppc64le.Dockerfile create mode 100644 buildenv-libosinfo-debian-9-cross-s390x.Dockerfile create mode 100644 buildenv-libosinfo-debian-9.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-aarch64.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-armv6l.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-armv7l.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-i686.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-mips.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-mips64el.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-mipsel.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-ppc64le.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid-cross-s390x.Dockerfile create mode 100644 buildenv-libosinfo-debian-sid.Dockerfile create mode 100644 buildenv-libosinfo-fedora-29.Dockerfile create mode 100644 buildenv-libosinfo-fedora-30.Dockerfile create mode 100644 buildenv-libosinfo-fedora-rawhide.Dockerfile create mode 100644 buildenv-libosinfo-ubuntu-16.Dockerfile create mode 100644 buildenv-libosinfo-ubuntu-18.Dockerfile rename buildenv-centos-7.Dockerfile => buildenv-libvirt-centos-7.Dockerfile (100%) rename buildenv-debian-10-cross-aarch64.Dockerfile => buildenv-libvirt-debian-10-cross-aarch64.Dockerfile (100%) rename buildenv-debian-10-cross-armv6l.Dockerfile => buildenv-libvirt-debian-10-cross-armv6l.Dockerfile (100%) rename buildenv-debian-10-cross-armv7l.Dockerfile => buildenv-libvirt-debian-10-cross-armv7l.Dockerfile (100%) rename buildenv-debian-10-cross-i686.Dockerfile => buildenv-libvirt-debian-10-cross-i686.Dockerfile (100%) rename buildenv-debian-10-cross-mips.Dockerfile => buildenv-libvirt-debian-10-cross-mips.Dockerfile (100%) rename buildenv-debian-10-cross-mips64el.Dockerfile => buildenv-libvirt-debian-10-cross-mips64el.Dockerfile (100%) rename buildenv-debian-10-cross-mipsel.Dockerfile => buildenv-libvirt-debian-10-cross-mipsel.Dockerfile (100%) rename buildenv-debian-10-cross-ppc64le.Dockerfile => buildenv-libvirt-debian-10-cross-ppc64le.Dockerfile (100%) rename buildenv-debian-10-cross-s390x.Dockerfile => buildenv-libvirt-debian-10-cross-s390x.Dockerfile (100%) rename buildenv-debian-10.Dockerfile => buildenv-libvirt-debian-10.Dockerfile (100%) rename buildenv-debian-9-cross-aarch64.Dockerfile => buildenv-libvirt-debian-9-cross-aarch64.Dockerfile (100%) rename buildenv-debian-9-cross-armv6l.Dockerfile => buildenv-libvirt-debian-9-cross-armv6l.Dockerfile (100%) rename buildenv-debian-9-cross-armv7l.Dockerfile => buildenv-libvirt-debian-9-cross-armv7l.Dockerfile (100%) rename buildenv-debian-9-cross-mips.Dockerfile => buildenv-libvirt-debian-9-cross-mips.Dockerfile (100%) rename buildenv-debian-9-cross-mips64el.Dockerfile => buildenv-libvirt-debian-9-cross-mips64el.Dockerfile (100%) rename buildenv-debian-9-cross-mipsel.Dockerfile => buildenv-libvirt-debian-9-cross-mipsel.Dockerfile (100%) rename buildenv-debian-9-cross-ppc64le.Dockerfile => buildenv-libvirt-debian-9-cross-ppc64le.Dockerfile (100%) rename buildenv-debian-9-cross-s390x.Dockerfile => buildenv-libvirt-debian-9-cross-s390x.Dockerfile (100%) rename buildenv-debian-9.Dockerfile => buildenv-libvirt-debian-9.Dockerfile (100%) rename buildenv-debian-sid-cross-aarch64.Dockerfile => buildenv-libvirt-debian-sid-cross-aarch64.Dockerfile (100%) rename buildenv-debian-sid-cross-armv6l.Dockerfile => buildenv-libvirt-debian-sid-cross-armv6l.Dockerfile (100%) rename buildenv-debian-sid-cross-armv7l.Dockerfile => buildenv-libvirt-debian-sid-cross-armv7l.Dockerfile (100%) rename buildenv-debian-sid-cross-i686.Dockerfile => buildenv-libvirt-debian-sid-cross-i686.Dockerfile (100%) rename buildenv-debian-sid-cross-mips.Dockerfile => buildenv-libvirt-debian-sid-cross-mips.Dockerfile (100%) rename buildenv-debian-sid-cross-mips64el.Dockerfile => buildenv-libvirt-debian-sid-cross-mips64el.Dockerfile (100%) rename buildenv-debian-sid-cross-mipsel.Dockerfile => buildenv-libvirt-debian-sid-cross-mipsel.Dockerfile (100%) rename buildenv-debian-sid-cross-ppc64le.Dockerfile => buildenv-libvirt-debian-sid-cross-ppc64le.Dockerfile (100%) rename buildenv-debian-sid-cross-s390x.Dockerfile => buildenv-libvirt-debian-sid-cross-s390x.Dockerfile (100%) rename buildenv-debian-sid.Dockerfile => buildenv-libvirt-debian-sid.Dockerfile (100%) rename buildenv-fedora-29.Dockerfile => buildenv-libvirt-fedora-29.Dockerfile (100%) rename buildenv-fedora-30.Dockerfile => buildenv-libvirt-fedora-30.Dockerfile (100%) rename buildenv-fedora-rawhide.Dockerfile => buildenv-libvirt-fedora-rawhide.Dockerfile (100%) rename buildenv-ubuntu-16.Dockerfile => buildenv-libvirt-ubuntu-16.Dockerfile (100%) rename buildenv-ubuntu-18.Dockerfile => buildenv-libvirt-ubuntu-18.Dockerfile (100%) -- 2.21.0

1 4

[libvirt] [PATCH 0/8] qemu: blockdevize qemuDomainGetBlockJobInfo and qemuDomainBlockJobAbort (blockdev-add saga)
by Peter Krempa 23 Jul '19

23 Jul '19

In the effort to use blockdev we need a few tweaks for the support APIs. Peter Krempa (8): qemu: driver: blockdevize qemuDomainGetBlockJobInfo qemu: Make checks in qemuDomainBlockPivot depend on data of the job qemu: blockjob: Add block job states for abort and pivot operations qemu: Use QEMU_BLOCKJOB_STATE_PIVOTING/ABORTING in qemuDomainBlockJobAbort qemu: driver: Report error if pivoting fails in qemuDomainBlockJobAbort qemu: driver: Blockdevize qemuDomainBlockJobAbort/Pivot qemu: Remove stale comment outlining how to extend qemuDomainBlockPivot qemu: driver: Remove semi-stale comment about asynchronous job abort src/qemu/qemu_blockjob.c | 13 +++++- src/qemu/qemu_blockjob.h | 2 + src/qemu/qemu_driver.c | 88 ++++++++++++++++++++++++++-------------- src/qemu/qemu_monitor.c | 2 +- 4 files changed, 72 insertions(+), 33 deletions(-) -- 2.21.0

2 17

[libvirt] [PATCH] build: bump min libxml2 to 2.9.1
by Daniel P. Berrangé 22 Jul '19

22 Jul '19

The various distros have the following libxml2 vesions: CentOS 7: 2.9.1 Debian Stretch: 2.9.4 FreeBSD Ports: 2.9.9 Ubuntu 16.04 LTS: 2.9.3 Based on this sampling, we can reasonably bump libxml2 min version to 2.9.1 The 'query_raw' struct field was added in version 2.6.28, so can be assumed to exist. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- m4/virt-libxml.m4 | 18 ++---------------- src/util/viruri.c | 9 --------- tests/viruritest.c | 8 -------- 3 files changed, 2 insertions(+), 33 deletions(-) diff --git a/m4/virt-libxml.m4 b/m4/virt-libxml.m4 index 65012d506a..9aefbdc3f1 100644 --- a/m4/virt-libxml.m4 +++ b/m4/virt-libxml.m4 @@ -18,31 +18,17 @@ dnl <http://www.gnu.org/licenses/>. dnl AC_DEFUN([LIBVIRT_ARG_LIBXML], [ - LIBVIRT_ARG_WITH([LIBXML], [libxml-2.0 (>= 2.6.0) location], [check]) + LIBVIRT_ARG_WITH([LIBXML], [libxml-2.0 (>= 2.9.1) location], [check]) ]) AC_DEFUN([LIBVIRT_CHECK_LIBXML], [ - LIBXML_REQUIRED="2.6.0" + LIBXML_REQUIRED="2.9.1" LIBVIRT_CHECK_PKG([LIBXML], [libxml-2.0], [$LIBXML_REQUIRED]) if test "$with_libxml" = "no" ; then AC_MSG_ERROR([libxml2 >= $LIBXML_REQUIRED is required for libvirt]) fi - - dnl xmlURI structure has query_raw? - old_CFLAGS="$CFLAGS" - old_LIBS="$LIBS" - CFLAGS="$CFLAGS $LIBXML_CFLAGS" - LIBS="$LIBS $LIBXML_LIBS" - - AC_CHECK_MEMBER([struct _xmlURI.query_raw], - [AC_DEFINE([HAVE_XMLURI_QUERY_RAW], [1], - [Have query_raw field in libxml2 xmlURI structure])], - [], [#include <libxml/uri.h>]) - - CFLAGS="$old_CFLAGS" - LIBS="$old_LIBS" ]) AC_DEFUN([LIBVIRT_RESULT_LIBXML], [ diff --git a/src/util/viruri.c b/src/util/viruri.c index 8e45a447b9..a43fe2afd4 100644 --- a/src/util/viruri.c +++ b/src/util/viruri.c @@ -183,13 +183,8 @@ virURIParse(const char *uri) ret->port = xmluri->port; if (VIR_STRDUP(ret->path, xmluri->path) < 0) goto error; -#ifdef HAVE_XMLURI_QUERY_RAW if (VIR_STRDUP(ret->query, xmluri->query_raw) < 0) goto error; -#else - if (VIR_STRDUP(ret->query, xmluri->query) < 0) - goto error; -#endif if (VIR_STRDUP(ret->fragment, xmluri->fragment) < 0) goto error; if (VIR_STRDUP(ret->user, xmluri->user) < 0) @@ -237,11 +232,7 @@ virURIFormat(virURIPtr uri) xmluri.server = uri->server; xmluri.port = uri->port; xmluri.path = uri->path; -#ifdef HAVE_XMLURI_QUERY_RAW xmluri.query_raw = uri->query; -#else - xmluri.query = uri->query; -#endif xmluri.fragment = uri->fragment; xmluri.user = uri->user; diff --git a/tests/viruritest.c b/tests/viruritest.c index c09e5323bc..d419711135 100644 --- a/tests/viruritest.c +++ b/tests/viruritest.c @@ -196,23 +196,19 @@ mymain(void) { (char*)"foo", (char*)"two", false }, { NULL, NULL, false }, }; -#ifdef HAVE_XMLURI_QUERY_RAW virURIParam params3[] = { { (char*)"foo", (char*)"&one", false }, { (char*)"bar", (char*)"&two", false }, { NULL, NULL, false }, }; -#endif virURIParam params4[] = { { (char*)"foo", (char*)"", false }, { NULL, NULL, false }, }; -#ifdef HAVE_XMLURI_QUERY_RAW virURIParam params5[] = { { (char*)"foo", (char*)"one two", false }, { NULL, NULL, false }, }; -#endif virURIParam params6[] = { { (char*)"foo", (char*)"one", false }, { NULL, NULL, false }, @@ -222,16 +218,12 @@ mymain(void) TEST_PARAMS("foo=one&foo=two", "", params2); TEST_PARAMS("foo=one&&foo=two", "foo=one&foo=two", params2); TEST_PARAMS("foo=one;foo=two", "foo=one&foo=two", params2); -#ifdef HAVE_XMLURI_QUERY_RAW TEST_PARAMS("foo=%26one&bar=%26two", "", params3); -#endif TEST_PARAMS("foo", "foo=", params4); TEST_PARAMS("foo=", "", params4); TEST_PARAMS("foo=&", "foo=", params4); TEST_PARAMS("foo=&&", "foo=", params4); -#ifdef HAVE_XMLURI_QUERY_RAW TEST_PARAMS("foo=one%20two", "", params5); -#endif TEST_PARAMS("=bogus&foo=one", "foo=one", params6); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; -- 2.21.0

2 1

[libvirt] [PATCH] virfile: adds quobyte as a shared fs
by Silvan Kaiser 22 Jul '19

22 Jul '19

Adds detection of a Quobyte shared file system for live migration. Signed-off-by: Silvan Kaiser <silvan(a)quobyte.com> --- src/util/virfile.c | 13 ++++++++++++- src/util/virfile.h | 1 + tests/virfiledata/mounts3.txt | 1 + tests/virfilemock.c | 3 +++ tests/virfiletest.c | 1 + 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/util/virfile.c b/src/util/virfile.c index f7415cf633..a46b8792f6 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -3434,6 +3434,9 @@ int virFilePrintf(FILE *fp, const char *msg, ...) # ifndef GPFS_SUPER_MAGIC # define GPFS_SUPER_MAGIC 0x47504653 # endif +# ifndef QB_MAGIC +# define QB_MAGIC 0x51626d6e +# endif # define PROC_MOUNTS "/proc/mounts" @@ -3490,6 +3493,10 @@ virFileIsSharedFixFUSE(const char *path, VIR_DEBUG("Found gluster FUSE mountpoint=%s for path=%s. " "Fixing shared FS type", mntDir, canonPath); *f_type = GFS2_MAGIC; + } else if (STREQ_NULLABLE(mntType, "fuse.quobyte")) { + VIR_DEBUG("Found Quobyte FUSE mountpoint=%s for path=%s. " + "Fixing shared FS type", mntDir, canonPath); + *f_type = QB_MAGIC; } ret = 0; @@ -3582,6 +3589,9 @@ virFileIsSharedFSType(const char *path, if ((fstypes & VIR_FILE_SHFS_GPFS) && (f_type == GPFS_SUPER_MAGIC)) return 1; + if ((fstypes & VIR_FILE_SHFS_QB) && + (f_type == QB_MAGIC)) + return 1; return 0; } @@ -3771,7 +3781,8 @@ int virFileIsSharedFS(const char *path) VIR_FILE_SHFS_SMB | VIR_FILE_SHFS_CIFS | VIR_FILE_SHFS_CEPH | - VIR_FILE_SHFS_GPFS); + VIR_FILE_SHFS_GPFS| + VIR_FILE_SHFS_QB); } diff --git a/src/util/virfile.h b/src/util/virfile.h index 641960e2ca..e06855ea86 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -212,6 +212,7 @@ enum { VIR_FILE_SHFS_CIFS = (1 << 5), VIR_FILE_SHFS_CEPH = (1 << 6), VIR_FILE_SHFS_GPFS = (1 << 7), + VIR_FILE_SHFS_QB = (1 << 8), }; int virFileIsSharedFSType(const char *path, int fstypes) ATTRIBUTE_NONNULL(1); diff --git a/tests/virfiledata/mounts3.txt b/tests/virfiledata/mounts3.txt index 4377e5d471..b91804a4e4 100644 --- a/tests/virfiledata/mounts3.txt +++ b/tests/virfiledata/mounts3.txt @@ -36,3 +36,4 @@ root@host:/tmp/mkdir /gluster/sshfs fuse.sshfs rw 0 0 192.168.0.1:/ceph/data /ceph ceph rw,noatime,name=cephfs,secret=<hidden>,acl,wsize=16777216 0 0 192.168.0.1,192.168.0.2,192.168.0.3:/ceph/data2 /ceph/multi ceph rw,noatime,name=cephfs,secret=<hidden>,acl,wsize=16777216 0 0 gpfs_data /gpfs/data gpfs rw,relatime 0 0 +quobyte(a)192.168.0.1/data /quobyte fuse.quobyte rw,nosuid,nodev,noatime,user_id=0,group_id=0,allow_other 0 0 diff --git a/tests/virfilemock.c b/tests/virfilemock.c index 106032f857..54c57d417b 100644 --- a/tests/virfilemock.c +++ b/tests/virfilemock.c @@ -92,6 +92,9 @@ setmntent(const char *filename, const char *type) #ifndef GPFS_SUPER_MAGIC # define GPFS_SUPER_MAGIC 0x47504653 #endif +# ifndef QB_MAGIC +# define QB_MAGIC 0x51626d6e +# endif static int diff --git a/tests/virfiletest.c b/tests/virfiletest.c index e2bd4953ed..aa4c3435e5 100644 --- a/tests/virfiletest.c +++ b/tests/virfiletest.c @@ -458,6 +458,7 @@ mymain(void) DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/ceph/file", true); DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/ceph/multi/file", true); DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/gpfs/data", true); + DO_TEST_FILE_IS_SHARED_FS_TYPE("mounts3.txt", "/quobyte", true); return ret != 0 ? EXIT_FAILURE : EXIT_SUCCESS; } -- 2.16.5

3 4

[libvirt] [PATCH] virsh migrate: Properly check for --parallel-connections
by Jiri Denemark 19 Jul '19

19 Jul '19

Ever since --parallel-connections option for virsh migrate was introduced we did not properly check the return value of vshCommandOptInt. We would set VIR_MIGRATE_PARAM_PARALLEL_CONNECTIONS parameter even if vshCommandOptInt returned 0 (which means --parallel-connections was not specified) when another int option which was checked earlier was specified with a nonzero value. Specifically, running virsh migrate with either --auto-converge-increment, --auto-converge-initial, --comp-mt-dthreads, --comp-mt-threads, or --comp-mt-level would set VIR_MIGRATE_PARAM_PARALLEL_CONNECTIONS parameter and if --parallel option was not used, libvirt would complain error: invalid argument: Turn parallel migration on to tune it even though --parallel-connections option was not used at all. https://bugzilla.redhat.com/show_bug.cgi?id=1726643 Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- tools/virsh-domain.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 828ae30789..2ad73959ec 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -10785,13 +10785,14 @@ doMigrate(void *opaque) goto save_error; } - if (vshCommandOptInt(ctl, cmd, "parallel-connections", &intOpt) < 0) + if ((rv = vshCommandOptInt(ctl, cmd, "parallel-connections", &intOpt)) < 0) { goto out; - if (intOpt && - virTypedParamsAddInt(&params, &nparams, &maxparams, - VIR_MIGRATE_PARAM_PARALLEL_CONNECTIONS, - intOpt) < 0) - goto save_error; + } else if (rv > 0) { + if (virTypedParamsAddInt(&params, &nparams, &maxparams, + VIR_MIGRATE_PARAM_PARALLEL_CONNECTIONS, + intOpt) < 0) + goto save_error; + } if (vshCommandOptBool(cmd, "live")) flags |= VIR_MIGRATE_LIVE; -- 2.22.0

2 1

[libvirt] [PATCH] util: change the return value of virCgroupRemove if failed
by Wang Yechao 19 Jul '19

19 Jul '19

virCgroupRemove return -1 when removing cgroup failed. But there are retry code to remove cgroup in QemuProcessStop: retry: if ((ret = qemuRemoveCgroup(vm)) < 0) { if (ret == -EBUSY && (retries++ < 5)) { usleep(200*1000); goto retry; } VIR_WARN("Failed to remove cgroup for %s", vm->def->name); } The return value of qemuRemoveCgroup will never be equal to "-EBUSY", so change the return value of virCgroupRemove if failed. Signed-off-by: Wang Yechao <wang.yechao255(a)zte.com.cn> --- src/util/vircgroup.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 268e401..260ed2d 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -2399,11 +2399,13 @@ int virCgroupRemove(virCgroupPtr group) { size_t i; + int ret = 0; for (i = 0; i < VIR_CGROUP_BACKEND_TYPE_LAST; i++) { - if (group->backends[i] && - group->backends[i]->remove(group) < 0) { - return -1; + if (group->backends[i]) + ret = group->backends[i]->remove(group); + if (ret < 0) + return ret; } } -- 1.8.3.1

2 1

[libvirt] [PATCH 0/3] qemu: Fix handling of block job data in event handlers (blockdev-add saga fixes)
by Peter Krempa 19 Jul '19

19 Jul '19

Some of the refactors which allowed carrying more data with blockjobs created a race condition when a too-quick job would actually delete the data. This is a problem for legacy block jobs only. Peter Krempa (3): qemu: process: Don't use qemuBlockJobStartupFinalize in qemuProcessHandleBlockJob qemu: driver: Don't use qemuBlockJobStartupFinalize in processBlockJobEvent qemu: driver: Add debug message when we conjure block job data object src/qemu/qemu_driver.c | 4 ++-- src/qemu/qemu_process.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) -- 2.21.0

2 4

[libvirt] [RFC PATCH 0/6] Split domain_conf.h
by Ján Tomko 19 Jul '19

19 Jul '19

Currently, domain_conf.{c,h} is a giant pile of functions somewhat related to the domain definition. Try to change that by splitting out the type declarations, XML parsing and XML formatting from the header file. Ján Tomko (6): conf: move virNetworkPortDefPtr declaration to virconftypes.h virsh: clean up includes conf: introduce virdomaintypes.h conf: introduce domain_parse.h conf: introduce domain_format.h maint: include virdomaintypes.h instead of domain_conf.h src/access/viraccessdriver.h | 2 +- src/access/viraccessmanager.h | 2 +- src/conf/Makefile.inc.am | 3 + src/conf/domain_conf.h | 3023 +-------------------- src/conf/domain_format.h | 89 + src/conf/domain_parse.h | 321 +++ src/conf/virchrdev.h | 2 +- src/conf/virconftypes.h | 3 + src/conf/virdomaintypes.h | 2692 ++++++++++++++++++ src/conf/virnetworkportdef.h | 4 +- src/esx/esx_private.h | 2 +- src/interface/interface_backend_udev.c | 2 +- src/libxl/libxl_capabilities.c | 2 +- src/libxl/libxl_domain.h | 2 +- src/locking/domain_lock.h | 2 +- src/locking/lock_driver.h | 2 +- src/locking/sanlock_helper.c | 2 +- src/lxc/lxc_cgroup.h | 2 +- src/lxc/lxc_conf.h | 2 +- src/lxc/lxc_hostdev.h | 2 +- src/lxc/lxc_monitor.h | 2 +- src/lxc/lxc_native.c | 2 +- src/lxc/lxc_native.h | 2 +- src/network/bridge_driver.h | 2 +- src/nwfilter/nwfilter_dhcpsnoop.c | 2 +- src/nwfilter/nwfilter_driver.c | 2 +- src/nwfilter/nwfilter_ebiptables_driver.c | 2 +- src/nwfilter/nwfilter_gentech_driver.c | 2 +- src/nwfilter/nwfilter_learnipaddr.c | 2 +- src/qemu/qemu_alias.h | 2 +- src/qemu/qemu_blockjob.c | 2 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_cgroup.h | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_command.h | 2 +- src/qemu/qemu_conf.h | 2 +- src/qemu/qemu_domain.h | 2 +- src/qemu/qemu_domain_address.h | 2 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_firmware.h | 2 +- src/qemu/qemu_hostdev.h | 2 +- src/qemu/qemu_hotplug.h | 2 +- src/qemu/qemu_interface.h | 2 +- src/qemu/qemu_monitor.h | 2 +- src/qemu/qemu_processpriv.h | 2 +- src/qemu/qemu_security.h | 2 +- src/qemu/qemu_tpm.c | 2 +- src/remote/remote_daemon_dispatch.c | 2 +- src/security/security_manager.h | 2 +- src/security/virt-aa-helper.c | 2 +- src/storage/storage_driver.h | 2 +- src/test/test_driver.c | 2 +- src/vbox/vbox_driver.c | 2 +- src/vbox/vbox_network.c | 2 +- src/vbox/vbox_storage.c | 2 +- src/vbox/vbox_tmpl.c | 2 +- src/vz/vz_utils.h | 2 +- src/xenapi/xenapi_driver.c | 2 +- src/xenapi/xenapi_utils.c | 2 +- src/xenapi/xenapi_utils.h | 2 +- src/xenconfig/xen_common.h | 2 +- src/xenconfig/xen_xl.c | 2 +- src/xenconfig/xen_xl.h | 2 +- src/xenconfig/xen_xm.h | 2 +- tests/domainconftest.c | 2 +- tests/qemumemlocktest.c | 2 +- tests/qemumonitortestutils.h | 2 +- tests/qemusecuritytest.c | 2 +- tests/testutilslxc.c | 2 +- tests/testutilsqemu.h | 2 +- tests/testutilsxen.c | 2 +- tools/virsh-domain.c | 2 +- tools/virsh.c | 3 - tools/vsh.c | 3 - 74 files changed, 3177 insertions(+), 3094 deletions(-) create mode 100644 src/conf/domain_format.h create mode 100644 src/conf/domain_parse.h create mode 100644 src/conf/virdomaintypes.h -- 2.19.2

2 7

[libvirt] [PATCH v1 0/3] misc virhostdevs cleanups
by Daniel Henrique Barboza 19 Jul '19

19 Jul '19

These are cleanups that I made together with an attempt to enable parcial PCI Multifunction assignment with managed=true. That work will be scrapped after discussions with Laine in [1], but these cleanups kind of make sense on their own, so here they are. [1] https://www.redhat.com/archives/libvir-list/2019-July/msg01175.html Daniel Henrique Barboza (3): virhostdev: introduce virHostdevResetAllPCIDevices virhostdev: introduce virHostdevReattachAllPCIDevices virhostdev: remove virHostdevReattachPCIDevice src/util/virhostdev.c | 151 +++++++++++++++++------------------------- src/util/virpci.c | 29 +++++++- 2 files changed, 86 insertions(+), 94 deletions(-) -- 2.21.0

2 8

[libvirt] [PATCH] news: mention new bochs display device
by Jonathon Jongsma 19 Jul '19

19 Jul '19

Signed-off-by: Jonathon Jongsma <jjongsma(a)redhat.com> --- docs/news.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/news.xml b/docs/news.xml index 07d4575a65..1134309ec2 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -54,6 +54,15 @@ <libvirt> <release version="v5.6.0" date="unreleased"> <section title="New features"> + <change> + <summary> + qemu: Introduce a new video model of type 'bochs' + </summary> + <description> + Introduce a new video model type that supports the + <code>bochs-display</code> device that was added in qemu version 3.0. + </description> + </change> </section> <section title="Removed features"> <change> -- 2.21.0

2 1

[libvirt] [PATCH] util: Fix broken MinGW builds caused by commit 9bc01ad8
by Erik Skultety 19 Jul '19

19 Jul '19

virPCIGetSysfsFile is conditionally compiled only on Linux platforms. Signed-off-by: Erik Skultety <eskultet(a)redhat.com> --- Pushed under the build breaker rule. src/util/virpci.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/util/virpci.c b/src/util/virpci.c index 75e8daadd5..ae3a0fa886 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -3099,6 +3099,14 @@ virPCIGetVirtualFunctionIndex(const char *pf_sysfs_device_link ATTRIBUTE_UNUSED, } +int +virPCIGetSysfsFile(char *virPCIDeviceName ATTRIBUTE_UNUSED, + char **pci_sysfs_device_link ATTRIBUTE_UNUSED) +{ + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); + return -1; +} + int virPCIDeviceAddressGetSysfsFile(virPCIDeviceAddressPtr dev ATTRIBUTE_UNUSED, char **pci_sysfs_device_link ATTRIBUTE_UNUSED) -- 2.20.1

3 7

[libvirt] [PATCH 00/14] Split and enhancement of virsh completer
by Michal Privoznik 19 Jul '19

19 Jul '19

Having all completers inside one file is not good. Let's split it the same way we have other files split (e.g. src/libvirt-*.c) and then add one completer to demonstrate where new completers should be added. Michal Prívozník (14): tools: s/Nodedev/NodeDevice/ tools: Expose virshCommaStringListComplete() tools: Separate domain related completers into a file tools: Separate storage pool related completers into a file tools: Separate storage volume related completers into a file tools: Separate interface related completers into a file tools: Separate network related completers into a file tools: Separate nodedev related completers into a file tools: Separate nwfilter related completers into a file tools: Separate secret related completers into a file tools: Separate snapshot related completers into a file tools: Separate host related completers into a file virsh-completer: Drop needless #include virsh: Introduce virshPoolTypeCompleter tools/Makefile.am | 10 + tools/virsh-completer-domain.c | 314 ++++++++++ tools/virsh-completer-domain.h | 55 ++ tools/virsh-completer-host.c | 148 +++++ tools/virsh-completer-host.h | 31 + tools/virsh-completer-interface.c | 67 ++ tools/virsh-completer-interface.h | 27 + tools/virsh-completer-network.c | 145 +++++ tools/virsh-completer-network.h | 35 ++ tools/virsh-completer-nodedev.c | 117 ++++ tools/virsh-completer-nodedev.h | 35 ++ tools/virsh-completer-nwfilter.c | 105 ++++ tools/virsh-completer-nwfilter.h | 31 + tools/virsh-completer-pool.c | 120 ++++ tools/virsh-completer-pool.h | 35 ++ tools/virsh-completer-secret.c | 91 +++ tools/virsh-completer-secret.h | 31 + tools/virsh-completer-snapshot.c | 73 +++ tools/virsh-completer-snapshot.h | 27 + tools/virsh-completer-volume.c | 73 +++ tools/virsh-completer-volume.h | 28 + tools/virsh-completer.c | 977 +----------------------------- tools/virsh-completer.h | 114 +--- tools/virsh-nodedev.c | 16 +- tools/virsh-nodedev.h | 6 +- tools/virsh-pool.c | 1 + 26 files changed, 1624 insertions(+), 1088 deletions(-) create mode 100644 tools/virsh-completer-domain.c create mode 100644 tools/virsh-completer-domain.h create mode 100644 tools/virsh-completer-host.c create mode 100644 tools/virsh-completer-host.h create mode 100644 tools/virsh-completer-interface.c create mode 100644 tools/virsh-completer-interface.h create mode 100644 tools/virsh-completer-network.c create mode 100644 tools/virsh-completer-network.h create mode 100644 tools/virsh-completer-nodedev.c create mode 100644 tools/virsh-completer-nodedev.h create mode 100644 tools/virsh-completer-nwfilter.c create mode 100644 tools/virsh-completer-nwfilter.h create mode 100644 tools/virsh-completer-pool.c create mode 100644 tools/virsh-completer-pool.h create mode 100644 tools/virsh-completer-secret.c create mode 100644 tools/virsh-completer-secret.h create mode 100644 tools/virsh-completer-snapshot.c create mode 100644 tools/virsh-completer-snapshot.h create mode 100644 tools/virsh-completer-volume.c create mode 100644 tools/virsh-completer-volume.h -- 2.21.0

1 14

[libvirt] [PATCH] virpci: Drop duplicate function
by Michal Privoznik 19 Jul '19

19 Jul '19

We have two functions: virPCIDeviceAddressIsEqual() defined only on Linux and virPCIDeviceAddressEqual() defined everywhere. And both of them do the same. Drop the former in favour of the latter. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/util/virpci.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/util/virpci.c b/src/util/virpci.c index ae3a0fa886..6dc0a2711c 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -2590,19 +2590,6 @@ virZPCIDeviceAddressIsEmpty(const virZPCIDeviceAddress *addr) #ifdef __linux__ -/* - * returns true if equal - */ -static bool -virPCIDeviceAddressIsEqual(virPCIDeviceAddressPtr bdf1, - virPCIDeviceAddressPtr bdf2) -{ - return ((bdf1->domain == bdf2->domain) && - (bdf1->bus == bdf2->bus) && - (bdf1->slot == bdf2->slot) && - (bdf1->function == bdf2->function)); -} - virPCIDeviceAddressPtr virPCIGetDeviceAddressFromSysfsLink(const char *device_link) { @@ -2787,7 +2774,7 @@ virPCIGetVirtualFunctionIndex(const char *pf_sysfs_device_link, } for (i = 0; i < num_virt_fns; i++) { - if (virPCIDeviceAddressIsEqual(vf_bdf, virt_fns[i])) { + if (virPCIDeviceAddressEqual(vf_bdf, virt_fns[i])) { *vf_index = i; ret = 0; break; -- 2.21.0

2 1

[libvirt] [PATCH] qemu: blockjob: Adjust ATTRIBUTE_NONNULL statements for qemuBlockJobDiskNew
by Peter Krempa 19 Jul '19

19 Jul '19

Commit 5ff46aaa7f added a new parameter but neglected to fix the NONNULL declarations. Reported-by: Julio Faracco <jcfaracco(a)gmail.com> Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/qemu/qemu_blockjob.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Pushed under the trivial rule. diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h index d07ab75c8b..b0d17963fd 100644 --- a/src/qemu/qemu_blockjob.h +++ b/src/qemu/qemu_blockjob.h @@ -106,7 +106,7 @@ qemuBlockJobDiskNew(virDomainObjPtr vm, virDomainDiskDefPtr disk, qemuBlockJobType type, const char *jobname) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4); qemuBlockJobDataPtr qemuBlockJobDiskGetJob(virDomainDiskDefPtr disk) -- 2.21.0

1 0

[libvirt] [PATCH 00/25] qemu: Properly track blockjobs (blockdev-add saga)
by Peter Krempa 19 Jul '19

19 Jul '19

This series requires few patches I've posted, namely: https://www.redhat.com/archives/libvir-list/2019-July/msg00669.html https://www.redhat.com/archives/libvir-list/2019-June/msg01133.html which were not yet pushed upstream. For convenience you can fetch the patches including deps by: git fetch https://github.com/pipo/libvirt.git job-tracking-send Further patches will build on top of this to add metadata for individual jobs for supporting blockdev and will be posted later as they require some cleanups. Peter Krempa (25): qemu: domain: Repurpose and export helper for saving domain status XML qemu: domain: Add helper for saving config XML qemu: blockjob: Use VIR_AUTOUNREF in qemuBlockJobDataNew qemu: blockjob: Separate and unify block job (un)registration qemu: domain: Add global table of blockjobs qemu: blockjob: Register new and running blockjobs in the global table qemu: blockjob: Add string convertors for blockjob type and state enums qemu: blockjob: Export functions for allocating and registering job data qemu: blockjob: Add flag for invalid block job data qemu: domain: Store blockjob data in the status XML qemu: blockjob: Save status XML when modifying job state qemu: driver: Remove unnecessary saving of status XML tests: qemustatusxml2xml: Add test case for block job tracking qemu: blockjob: Add 'concluded' state for a block job qemu: process: Don't trigger BLOCK_JOB* events with -blockdev qemu: blockjob: Add helper to convert monitor job status to internal state qemu: Add handler for job state change event qemu: blockjob: Add modern block job event handler qemu: process: Refresh -blockdev based blockjobs on reconnect to qemu conf: export virDomainDiskBackingStoreParse conf: export virDomainDiskBackingStoreFormat qemu: blockjob: Track orphaned backing chains in blockjob status XML qemu: Detect managed persistent reservations in block job orphan chains qemu: blockjob: Unplug inherited storage chains when concluding blockjob qemu: hotplug: Transfer ownership of backing chain to block job on disk unplug src/conf/domain_conf.c | 4 +- src/conf/domain_conf.h | 13 + src/libvirt_private.syms | 2 + src/qemu/qemu_blockjob.c | 465 ++++++++++++++++-- src/qemu/qemu_blockjob.h | 40 +- src/qemu/qemu_domain.c | 327 +++++++++++- src/qemu/qemu_domain.h | 9 + src/qemu/qemu_driver.c | 64 +-- src/qemu/qemu_hotplug.c | 19 +- src/qemu/qemu_migration.c | 6 +- src/qemu/qemu_process.c | 89 +++- .../blockjob-blockdev-in.xml | 403 +++++++++++++++ .../blockjob-blockdev-out.xml | 1 + tests/qemuxml2xmltest.c | 2 + 14 files changed, 1349 insertions(+), 95 deletions(-) create mode 100644 tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml create mode 120000 tests/qemustatusxml2xmldata/blockjob-blockdev-out.xml -- 2.21.0

3 54

[libvirt] [PATCH] remote: increase daemon shutdown timer to 2 minutes
by Daniel P. Berrangé 18 Jul '19

18 Jul '19

Shutting down the daemon after 30 seconds of being idle is a little bit too aggressive. Especially when using 'virsh' in single-shot mode, as opposed to interactive shell mode, it would not be unusual to have more than 30 seconds between commands. This will lead to the daemon shutting down and starting up between a series of commands. Increasing the shutdown timer to 2 minutes will make it less likely that the daemon will shutdown while the user is in the middle of a series of commands. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/remote/libvirtd.service.in | 2 +- src/rpc/virnetsocket.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in index 2e51429e7a..3ddf0e229b 100644 --- a/src/remote/libvirtd.service.in +++ b/src/remote/libvirtd.service.in @@ -25,7 +25,7 @@ EnvironmentFile=-/etc/sysconfig/libvirtd # VMs can be performed. We don't want it to stick around if # unused though, so we set a timeout. The socket activation # then ensures it gets started again if anything needs it -ExecStart=@sbindir@/libvirtd --timeout 30 $LIBVIRTD_ARGS +ExecStart=@sbindir@/libvirtd --timeout 120 $LIBVIRTD_ARGS ExecReload=/bin/kill -HUP $MAINPID KillMode=process Restart=on-failure diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 34a9947eb3..3282bc0817 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -137,7 +137,7 @@ static int virNetSocketForkDaemon(const char *binary) { int ret; virCommandPtr cmd = virCommandNewArgList(binary, - "--timeout=30", + "--timeout=120", NULL); virCommandAddEnvPassCommon(cmd); -- 2.21.0

2 1

[libvirt] [RFC] handling hostdev save/load net config for non SR-IOV devices
by Daniel Henrique Barboza 18 Jul '19

18 Jul '19

Hi, I have a PoC that enables partial coldplug assignment of multifunction PCI devices with managed mode. At this moment, Libvirt can't handle this scenario - the code will detach only the hostdevs from the XML, when in fact the whole IOMMU needs to be detached. This can be verified by the fact that Libvirt handles the unmanaged scenario well, as long as the user detaches the whole IOMMU beforehand. I have played with 2 approaches. The one I am planning to contribute back is a change inside virHostdevGetPCIHostDeviceList(), that adds the extra PCI devices for detach/re-attach in case a PCI Multifunction device in managed mode is presented in the XML. Now, there's a catch. Inside both virHostdevPreparePCIDevices() and virHostdevReAttachPCIDevices() there are code to save/restore the network configuration for SR-IOV devices. These functions iterates in the hostdevs list, instead of the pcidevs list I'm changing. The final result, given that the current conditions used for SR-IOV matches the conditions for multifunction PCI devices as well, is that not all virtual functions will get their network configuration saved/restored. For example, a guest that uses 3 of 4 functions of a PCI MultiFunction card, let's say functions 0,1 and 3. The code will handle the detach of all the IOMMU, including the function 2 that isn't declared in the XML. However, since function 2 isn't a hostdev, its network config will not be restored after the VM shutdown. Now comes the question: how much effort should be spent into making the network config of all the functions be restored? Is this a blocker for the whole code to be accepted or, given it is proper documented somewhere, it can be done later on? Thanks, DHB

3 6

[libvirt] [PATCH] network: Link with libxml2
by Michal Privoznik 18 Jul '19

18 Jul '19

Since fb9f6ce6253 we are including a libxml header file in the network driver but never link with it. This hasn't caused an immediate problem because in the end the network driver links with libvirt.la. But apparently, it's causing a build issue on old Ubuntu. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial & build breaker rules. src/network/Makefile.inc.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am index 52270049d5..23cf39b6f4 100644 --- a/src/network/Makefile.inc.am +++ b/src/network/Makefile.inc.am @@ -47,7 +47,7 @@ libvirt_driver_network_impl_la_CFLAGS = \ $(AM_CFLAGS) \ $(NULL) libvirt_driver_network_impl_la_SOURCES = $(NETWORK_DRIVER_SOURCES) -libvirt_driver_network_impl_la_LIBADD = $(DBUS_LIBS) +libvirt_driver_network_impl_la_LIBADD = $(DBUS_LIBS) $(LIBXML_LIBS) libexec_PROGRAMS += libvirt_leaseshelper libvirt_leaseshelper_SOURCES = $(NETWORK_LEASES_HELPER_SOURCES) -- 2.21.0

1 0

[libvirt] [PATCH] logging: pass binary name not logfile name when enabling logging
by Daniel P. Berrangé 18 Jul '19

18 Jul '19

Instead of having each caller pass in the desired logfile name, pass in the binary name instead. The logging code can then just derive a logfile name by appending ".log". Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/locking/lock_daemon.c | 2 +- src/logging/log_daemon.c | 2 +- src/remote/remote_daemon.c | 2 +- src/util/virlog.c | 20 ++++++++++---------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index bc2fb4a7fb..7cdcd61722 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -532,7 +532,7 @@ virLockDaemonSetupLogging(virLockDaemonConfigPtr config, /* Define the default output. This is only applied if there was no setting * from either the config or the environment. */ - if (virLogSetDefaultOutput("virtlockd.log", godaemon, privileged) < 0) + if (virLogSetDefaultOutput("virtlockd", godaemon, privileged) < 0) return -1; if (virLogGetNbOutputs() == 0) diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 014596b280..c8de7aa687 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -467,7 +467,7 @@ virLogDaemonSetupLogging(virLogDaemonConfigPtr config, /* Define the default output. This is only applied if there was no setting * from either the config or the environment. */ - if (virLogSetDefaultOutput("virtlogd.log", godaemon, privileged) < 0) + if (virLogSetDefaultOutput("virtlogd", godaemon, privileged) < 0) return -1; if (virLogGetNbOutputs() == 0) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index fdc9e4333a..ffdd3b84ad 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -610,7 +610,7 @@ daemonSetupLogging(struct daemonConfig *config, /* Define the default output. This is only applied if there was no setting * from either the config or the environment. */ - if (virLogSetDefaultOutput("libvirtd.log", godaemon, privileged) < 0) + if (virLogSetDefaultOutput("libvirtd", godaemon, privileged) < 0) return -1; if (virLogGetNbOutputs() == 0) diff --git a/src/util/virlog.c b/src/util/virlog.c index 248ce19902..da433878df 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -175,7 +175,7 @@ virLogSetDefaultOutputToJournald(void) static int -virLogSetDefaultOutputToFile(const char *filename, bool privileged) +virLogSetDefaultOutputToFile(const char *binary, bool privileged) { int ret = -1; char *logdir = NULL; @@ -183,8 +183,8 @@ virLogSetDefaultOutputToFile(const char *filename, bool privileged) if (privileged) { if (virAsprintf(&virLogDefaultOutput, - "%d:file:%s/log/libvirt/%s", virLogDefaultPriority, - LOCALSTATEDIR, filename) < 0) + "%d:file:%s/log/libvirt/%s.log", virLogDefaultPriority, + LOCALSTATEDIR, binary) < 0) goto cleanup; } else { if (!(logdir = virGetUserCacheDirectory())) @@ -197,8 +197,8 @@ virLogSetDefaultOutputToFile(const char *filename, bool privileged) } umask(old_umask); - if (virAsprintf(&virLogDefaultOutput, "%d:file:%s/%s", - virLogDefaultPriority, logdir, filename) < 0) + if (virAsprintf(&virLogDefaultOutput, "%d:file:%s/%s.log", + virLogDefaultPriority, logdir, binary) < 0) goto cleanup; } @@ -211,19 +211,19 @@ virLogSetDefaultOutputToFile(const char *filename, bool privileged) /* * virLogSetDefaultOutput: - * @filename: the file that the output should be redirected to (only needed - * when @godaemon equals true + * @binary: the binary for which logging is performed. The log file name + * will be derived from the binary name, with ".log" appended. * @godaemon: whether we're running daemonized * @privileged: whether we're running with root privileges or not (session) * * Decides on what the default output (journald, file, stderr) should be - * according to @filename, @godaemon, @privileged. This function should be run + * according to @binary, @godaemon, @privileged. This function should be run * exactly once at daemon startup, so no locks are used. * * Returns 0 on success, -1 in case of a failure. */ int -virLogSetDefaultOutput(const char *filename, bool godaemon, bool privileged) +virLogSetDefaultOutput(const char *binary, bool godaemon, bool privileged) { bool have_journald = access("/run/systemd/journal/socket", W_OK) >= 0; @@ -237,7 +237,7 @@ virLogSetDefaultOutput(const char *filename, bool godaemon, bool privileged) return virLogSetDefaultOutputToStderr(); } - return virLogSetDefaultOutputToFile(filename, privileged); + return virLogSetDefaultOutputToFile(binary, privileged); } -- 2.21.0

2 3

[libvirt] [PATCH 0/5] network: xmlns dnsmasq option passthrough
by Cole Robinson 18 Jul '19

18 Jul '19

There's several unresolved RFEs for the <network> bridge driver that are essentially requests to add XML wrappers for underlying dnsmasq options. This series adds a dnsmasq xmlns namespace for <network> XML that allows passing option strings directly to the generated dnsmasq config file. It will allow motivated users to work around libvirt until those types of RFEs are properly implemented. Cole Robinson (5): conf: Add virNetworkXMLOption conf: Add network xmlopt argument conf: Add virNetworkXMLNamespace network: wire up dnsmasq option xmlns docs: formatnetwork: Document xmlns:dnsmasq docs/formatnetwork.html.in | 22 +++ docs/schemas/network.rng | 11 ++ src/conf/domain_conf.c | 2 +- src/conf/network_conf.c | 91 +++++++-- src/conf/network_conf.h | 51 ++++- src/conf/virnetworkobj.c | 50 +++-- src/conf/virnetworkobj.h | 13 +- src/esx/esx_network_driver.c | 4 +- src/libvirt_private.syms | 1 + src/network/bridge_driver.c | 182 ++++++++++++++++-- src/network/bridge_driver.h | 12 ++ src/network/bridge_driver_platform.h | 2 + src/qemu/qemu_process.c | 2 +- src/test/test_driver.c | 11 +- src/vbox/vbox_network.c | 4 +- tests/Makefile.am | 14 +- .../networkxml2confdata/dnsmasq-options.conf | 18 ++ tests/networkxml2confdata/dnsmasq-options.xml | 15 ++ tests/networkxml2conftest.c | 8 +- tests/networkxml2firewalltest.c | 2 +- tests/networkxml2xmlin/dnsmasq-options.xml | 15 ++ tests/networkxml2xmlout/dnsmasq-options.xml | 17 ++ tests/networkxml2xmltest.c | 11 +- tests/networkxml2xmlupdatetest.c | 4 +- 24 files changed, 478 insertions(+), 84 deletions(-) create mode 100644 tests/networkxml2confdata/dnsmasq-options.conf create mode 100644 tests/networkxml2confdata/dnsmasq-options.xml create mode 100644 tests/networkxml2xmlin/dnsmasq-options.xml create mode 100644 tests/networkxml2xmlout/dnsmasq-options.xml -- 2.21.0

4 11

[libvirt] [PATCH 0/2] util: Fix memleak after (legacy) blockjob (blockdev-add saga spin-off)
by Peter Krempa 18 Jul '19

18 Jul '19

While verifying that legacy block jobs are not broken I've found a memleak. Peter Krempa (2): util: storage: Clean up label use in virStorageFileGetMetadataInternal util: storage: Don't leak metadata on repeated calls of virStorageFileGetMetadata src/util/virstoragefile.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) -- 2.21.0

3 4

[libvirt] [PATCH 0/2] tools: Introduce virshNodedevCapabilityNameCompleter
by Michal Privoznik 18 Jul '19

18 Jul '19

Yet again, couple of patches I have on my local branch for the feature I'm working on and which can go separately. Michal Prívozník (2): virsh-completer: Separate comma list construction into a function tools: Introduce virshNodedevCapabilityNameCompleter tools/virsh-completer.c | 147 ++++++++++++++++++++++++++++------------ tools/virsh-completer.h | 4 ++ tools/virsh-nodedev.c | 1 + 3 files changed, 109 insertions(+), 43 deletions(-) -- 2.21.0

4 10

[libvirt] [PATCH] util: command: Ignore bitmap errors when enumerating file descriptors to close
by Peter Krempa 18 Jul '19

18 Jul '19

virCommandMassCloseGetFDsLinux fails when running libvird on valgrind with the following message: libvirt: error : internal error: unable to set FD as open: 1024 This is because valgrind opens few file descriptors beyond the limit: 65701125 lr-x------. 1 root root 64 Jul 18 14:48 1024 -> /home/pipo/build/libvirt/gcc/src/.libs/libvirtd 65701126 lrwx------. 1 root root 64 Jul 18 14:48 1025 -> '/tmp/valgrind_proc_3849_cmdline_186612e3 (deleted)' 65701127 lrwx------. 1 root root 64 Jul 18 14:48 1026 -> '/tmp/valgrind_proc_3849_auxv_186612e3 (deleted)' 65701128 lrwx------. 1 root root 64 Jul 18 14:48 1027 -> /dev/pts/11 65701129 lr-x------. 1 root root 64 Jul 18 14:48 1028 -> 'pipe:[65689522]' 65701130 l-wx------. 1 root root 64 Jul 18 14:48 1029 -> 'pipe:[65689522]' 65701131 lr-x------. 1 root root 64 Jul 18 14:48 1030 -> /tmp/vgdb-pipe-from-vgdb-to-3849-by-root-on-angien Ignore bitmap errors in this case since we'd leak those FD's anyways in the previous scenario. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- src/util/vircommand.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 5141611ca4..4501c96bbf 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -446,12 +446,7 @@ virCommandMassCloseGetFDsLinux(virCommandPtr cmd ATTRIBUTE_UNUSED, goto cleanup; } - if (virBitmapSetBit(fds, fd) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unable to set FD as open: %d"), - fd); - goto cleanup; - } + ignore_value(virBitmapSetBit(fds, fd)); } if (rc < 0) -- 2.21.0

2 1

[libvirt] [PATCH] libvirt_private.syms: Properly expose virPCI* function from virpci.h
by Michal Privoznik 18 Jul '19

18 Jul '19

There are couple of functions that are meant to be exposed but are missing syms file adjustment. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. src/libvirt_private.syms | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 9640e91eaa..1d9eb17a86 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -2614,6 +2614,7 @@ virObjectUnref; # util/virpci.h virPCIDeviceAddressAsString; virPCIDeviceAddressEqual; +virPCIDeviceAddressFree; virPCIDeviceAddressGetIOMMUGroupAddresses; virPCIDeviceAddressGetIOMMUGroupNum; virPCIDeviceAddressGetSysfsFile; @@ -2625,6 +2626,7 @@ virPCIDeviceCopy; virPCIDeviceDetach; virPCIDeviceFileIterate; virPCIDeviceFree; +virPCIDeviceGetAddress; virPCIDeviceGetConfigPath; virPCIDeviceGetDriverPathAndName; virPCIDeviceGetIOMMUGroupDev; @@ -2664,11 +2666,14 @@ virPCIDeviceSetUsedBy; virPCIDeviceUnbind; virPCIDeviceWaitForCleanup; virPCIEDeviceInfoFree; +virPCIELinkSpeedTypeFromString; +virPCIELinkSpeedTypeToString; virPCIGetDeviceAddressFromSysfsLink; virPCIGetHeaderType; virPCIGetMdevTypes; virPCIGetNetName; virPCIGetPhysicalFunction; +virPCIGetSysfsFile; virPCIGetVirtualFunctionIndex; virPCIGetVirtualFunctionInfo; virPCIGetVirtualFunctions; -- 2.21.0

1 0

[libvirt] [dockerfiles PATCH 0/3] Add libosinfo-related projects
by Andrea Bolognani 18 Jul '19

18 Jul '19

See patch 2/3 for more information. Andrea Bolognani (3): refresh: Store projects in a more convenient format refresh: Add libosinfo-related projects Refresh after adding libosinfo-related projects buildenv-centos-7.Dockerfile | 11 +++++++++ buildenv-debian-10-cross-aarch64.Dockerfile | 15 ++++++++++++ buildenv-debian-10-cross-armv6l.Dockerfile | 15 ++++++++++++ buildenv-debian-10-cross-armv7l.Dockerfile | 15 ++++++++++++ buildenv-debian-10-cross-i686.Dockerfile | 15 ++++++++++++ buildenv-debian-10-cross-mips.Dockerfile | 15 ++++++++++++ buildenv-debian-10-cross-mips64el.Dockerfile | 15 ++++++++++++ buildenv-debian-10-cross-mipsel.Dockerfile | 15 ++++++++++++ buildenv-debian-10-cross-ppc64le.Dockerfile | 15 ++++++++++++ buildenv-debian-10-cross-s390x.Dockerfile | 15 ++++++++++++ buildenv-debian-10.Dockerfile | 15 ++++++++++++ buildenv-debian-9-cross-aarch64.Dockerfile | 15 ++++++++++++ buildenv-debian-9-cross-armv6l.Dockerfile | 15 ++++++++++++ buildenv-debian-9-cross-armv7l.Dockerfile | 15 ++++++++++++ buildenv-debian-9-cross-mips.Dockerfile | 15 ++++++++++++ buildenv-debian-9-cross-mips64el.Dockerfile | 15 ++++++++++++ buildenv-debian-9-cross-mipsel.Dockerfile | 15 ++++++++++++ buildenv-debian-9-cross-ppc64le.Dockerfile | 15 ++++++++++++ buildenv-debian-9-cross-s390x.Dockerfile | 15 ++++++++++++ buildenv-debian-9.Dockerfile | 15 ++++++++++++ buildenv-debian-sid-cross-aarch64.Dockerfile | 15 ++++++++++++ buildenv-debian-sid-cross-armv6l.Dockerfile | 15 ++++++++++++ buildenv-debian-sid-cross-armv7l.Dockerfile | 15 ++++++++++++ buildenv-debian-sid-cross-i686.Dockerfile | 15 ++++++++++++ buildenv-debian-sid-cross-mips.Dockerfile | 15 ++++++++++++ buildenv-debian-sid-cross-mips64el.Dockerfile | 15 ++++++++++++ buildenv-debian-sid-cross-mipsel.Dockerfile | 15 ++++++++++++ buildenv-debian-sid-cross-ppc64le.Dockerfile | 15 ++++++++++++ buildenv-debian-sid-cross-s390x.Dockerfile | 15 ++++++++++++ buildenv-debian-sid.Dockerfile | 15 ++++++++++++ buildenv-fedora-29.Dockerfile | 15 ++++++++++++ buildenv-fedora-30.Dockerfile | 15 ++++++++++++ buildenv-fedora-rawhide.Dockerfile | 24 +++++++++++++++++++ buildenv-ubuntu-16.Dockerfile | 15 ++++++++++++ buildenv-ubuntu-18.Dockerfile | 15 ++++++++++++ refresh | 17 +++++++++---- 36 files changed, 543 insertions(+), 4 deletions(-) -- 2.21.0

3 8

[libvirt] [PATCH 0/2] virSecurityManagerMetadataLock: Skip over duplicate paths
by Michal Privoznik 18 Jul '19

18 Jul '19

See 2/2 for explanation. Michal Prívozník (2): virSecurityManagerMetadataLock: Expand the comment on deadlocks virSecurityManagerMetadataLock: Skip over duplicate paths src/security/security_manager.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) -- 2.21.0

3 7

[libvirt] [dockerfiles PATCH] Add git-publish configuration file
by Andrea Bolognani 18 Jul '19

18 Jul '19

Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- .gitpublish | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .gitpublish diff --git a/.gitpublish b/.gitpublish new file mode 100644 index 0000000..a56a6d0 --- /dev/null +++ b/.gitpublish @@ -0,0 +1,4 @@ +[gitpublishprofile "default"] +base = master +to = libvir-list(a)redhat.com +prefix = dockerfiles PATCH -- 2.20.1

1 1

[libvirt] [PATCH 1/1] Revert "Revert "qemu: Temporary disable owner remembering""
by Daniel Henrique Barboza 18 Jul '19

18 Jul '19

After this commit, QEMU domains with PCI hostdevs running with managed=true started to fail to launch with the following error: error : virProcessRunInFork:1170 : internal error: child reported (status=125): unable to open /dev/vfio/1: Device or resource busy One way to avoid this issue is to disable this new feature in qemu.conf, setting remember_owner=0. However, given that this feature is enabled by default and it is breaking domains that were running before it, it is best to revert the change until it is fixed for this scenario as well. This reverts commit 8695793d726e37e31498f9fcbf0bce0adc56dc91. Signed-off-by: Daniel Henrique Barboza <danielhb413(a)gmail.com> --- docs/news.xml | 13 ------------- src/qemu/libvirtd_qemu.aug | 1 - src/qemu/qemu.conf | 5 ----- src/qemu/qemu_conf.c | 4 ---- src/qemu/test_libvirtd_qemu.aug.in | 1 - 5 files changed, 24 deletions(-) diff --git a/docs/news.xml b/docs/news.xml index 07d4575a65..8931f74bb9 100644 --- a/docs/news.xml +++ b/docs/news.xml @@ -25,19 +25,6 @@ <section title="New features"> </section> <section title="Improvements"> - <change> - <summary> - Remember original owners and SELinux labels of files - </summary> - <description> - When a domain is starting up libvirt changes DAC and - SELinux labels so that domain can access it. However, - it never remembered the original labels and therefore - the file was returned back to <code>root:root</code>. - With this release, the original labels are remembered - and restored properly. - </description> - </change> </section> <section title="Bug fixes"> </section> diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index eea9094d39..6821cc4a29 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -72,7 +72,6 @@ module Libvirtd_qemu = | str_entry "user" | str_entry "group" | bool_entry "dynamic_ownership" - | bool_entry "remember_owner" | str_array_entry "cgroup_controllers" | str_array_entry "cgroup_device_acl" | int_entry "seccomp_sandbox" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index fd2ed9dc21..1969b3f0a1 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -456,11 +456,6 @@ # Set to 0 to disable file ownership changes. #dynamic_ownership = 1 -# Whether libvirt should remember and restore the original -# ownership over files it is relabeling. Defaults to 1, set -# to 0 to disable the feature. -#remember_owner = 1 - # What cgroup controllers to make use of with QEMU guests # # - 'cpu' - use for scheduler tunables diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index e0195dac29..8312f99f80 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -125,7 +125,6 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->group = (gid_t)-1; } cfg->dynamicOwnership = privileged; - cfg->rememberOwner = privileged; cfg->cgroupControllers = -1; /* -1 == auto-detect */ @@ -891,9 +890,6 @@ virQEMUDriverConfigLoadSecurityEntry(virQEMUDriverConfigPtr cfg, if (virConfGetValueBool(conf, "dynamic_ownership", &cfg->dynamicOwnership) < 0) return -1; - if (virConfGetValueBool(conf, "remember_owner", &cfg->rememberOwner) < 0) - return -1; - if (virConfGetValueStringList(conf, "cgroup_controllers", false, &controllers) < 0) return -1; diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 388ba24b8b..50b728ad22 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -44,7 +44,6 @@ module Test_libvirtd_qemu = { "user" = "root" } { "group" = "root" } { "dynamic_ownership" = "1" } -{ "remember_owner" = "1" } { "cgroup_controllers" { "1" = "cpu" } { "2" = "devices" } -- 2.21.0

2 3

[libvirt] [PATCH] util: Fix uninitalized variable to avoid garbage value.
by Julio Faracco 18 Jul '19

18 Jul '19

This commit is similar with 596aa144. It fixes an uninitialized variable to avoid garbage value. This case, it uses time 't' 0 if an error occurs with virTimeMillisNowRaw. Signed-off-by: Julio Faracco <jcfaracco(a)gmail.com> --- src/util/virtime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virtime.c b/src/util/virtime.c index d1187726ee..86993e4e8d 100644 --- a/src/util/virtime.c +++ b/src/util/virtime.c @@ -422,7 +422,7 @@ virTimeBackOffStart(virTimeBackOffVar *var, bool virTimeBackOffWait(virTimeBackOffVar *var) { - unsigned long long t, next; + unsigned long long next, t = 0; ignore_value(virTimeMillisNowRaw(&t)); -- 2.20.1

2 1

[libvirt] [jenkins-ci PATCH v2 00/20] quayadmin: Introduce Quay API client
by Andrea Bolognani 18 Jul '19

18 Jul '19

Changes from [v1]: * add Dan's R-b to the patch importing the initial implementation; * don't break quiet mode for show-repo, and make sure it works for all other show-* commands as well; * fix typos. [v1] https://www.redhat.com/archives/libvir-list/2019-July/msg01018.html Andrea Bolognani (20): quayadmin: Import initial implementation quayadmin: Fix argument parsing for delete-repo quayadmin: Tweak quiet logic quayadmin: Tweak show-repo output format quayadmin: Tweak list-repos output format quayadmin: Build endpoint, params and payload separately quayadmin: Implement debug mode quayadmin: Remove clientid and clientsecret quayadmin: Introduce configuration object quayadmin: Read configuration from file quayadmin: Add support for the PUT method quayadmin: Add list-triggers command quayadmin: Add show-trigger command quayadmin: Add activate-trigger command quayadmin: Add list-builds command quayadmin: Add show-build command quayadmin: Add list-tags command quayadmin: Add show-tag command quayadmin: Add create-tag command quayadmin: Add delete-tag command guests/quayadmin | 585 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 585 insertions(+) create mode 100755 guests/quayadmin -- 2.21.0

2 40

[libvirt] [PATCH 0/2] docs: news: add per-release links
by Ján Tomko 17 Jul '19

17 Jul '19

Ján Tomko (2): docs: news: remove sed sorcery docs: news: add per-release links docs/Makefile.am | 8 +------- docs/news-html.xsl | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 14 deletions(-) -- 2.20.1

4 8

[libvirt] [PATCH 0/7] docs: assorted cleanups (virtio-fs epopee)
by Ján Tomko 17 Jul '19

17 Jul '19

Got a bit lost while navigating around the <filesystem> element documentation. Ján Tomko (7): docs: link to networkportformat.html in format.html docs: drvqemu: fix a typo docs: drvqemu: remove relative time reference docs: formatdomain: remove stray nbsp docs: formatdomain: tsc is supported by QEMU docs: formatdomain: remove "Since" references older than 1.1.1 docs: remove "Since" references older than 1.1.1 docs/drvnodedev.html.in | 8 +- docs/drvqemu.html.in | 15 +- docs/format.html.in | 1 + docs/formatcaps.html.in | 22 ++- docs/formatdomain.html.in | 340 +++++++++++++------------------------- docs/storage.html.in | 5 - 6 files changed, 138 insertions(+), 253 deletions(-) -- 2.20.1

2 10

[libvirt] [PATCH 0/2] qemu: blockjob: Tweak config saving in legacy block job handling (blockdev-add saga)
by Peter Krempa 17 Jul '19

17 Jul '19

This is based on quite a lot of patches that were ACK'd but I didn't push them yet, so feel free to fetch this at: git fetch https://gitlab.com/pipo.sk/libvirt.git legacy-job-refactor Peter Krempa (2): qemu: blockjob: Save config only in qemuBlockJobEventProcessLegacyCompleted qemu: blockjob: Update new job state earlier in qemuBlockJobEventProcessLegacy src/qemu/qemu_blockjob.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) -- 2.21.0

2 4

[libvirt] [jenkins-ci PATCH 00/20] quayadmin: Introduce Quay API client
by Andrea Bolognani 17 Jul '19

17 Jul '19

Dan started building this a while ago, and I finally managed to find some time to take it from a PoC to something that's actually useful for our day to day operations. There's still plenty of work to be done for sure, but it's already at the point where I can at least partially script the process of refreshing container images, which is something that up until now had to be done slowly and painfully through the Web interface. I will probably spend some more time on it in a couple of weeks, after I've used it to refresh images right before the 5.6.0 release and inevitably spotted a bunch of issues while doing so O:-) Andrea Bolognani (20): quayadmin: Import initial implementation quayadmin: Fix argument parsing for delete-repo quayadmin: Fix quiet mode for show-repo quayadmin: Tweak show-repo output format quayadmin: Tweak list-repos output format quayadmin: Build endpoint, params and payload separately quayadmin: Implement debug mode quayadmin: Remove clientid and clientsecret quayamdin: Introduce configuration object quayadmin: Read configuration from file quayadmin: Add support for the PUT method quayadmin: Add list-triggers command quayadmin: Add show-trigger command quayadmin: Add activate-trigger command quayadmin: Add list-builds command quayadmin: Add show-build command quayadmin: Add list-tags command quayadmin: Add show-tag command quayadmin: Add create-tag command quayadmin: Add delete-tag command guests/quayadmin | 563 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 563 insertions(+) create mode 100755 guests/quayadmin -- 2.21.0

3 29

[libvirt] [PATCH 00/29] Split the libvirtd daemon into per-driver daemons
by Daniel P. Berrangé 17 Jul '19

17 Jul '19

This is what all the driver refactoring I've done has been about enabling. We gain new daemons for each driver, for the primary virt drivers: virtlibxld virtlxcd virtqemud virtvboxd virtvzd And again for the secondary drivers virtinterfaced virtnetworkd virtnodedevd virtnwfilterd virtsecretd virtstoraged Finally to support IP connectivity, and also the legacy lbivirtd UNIX domain socket (for the old libvirt remote driver SSH tunnelling): virtproxyd The the sake of facilitating upgrades, the existing libvirtd still exists and works the same way it always has. You either run libvirtd, or you run the per-driver daemons, never both. The remote driver will look to see whether libvirtd is running to figure out whether to connect to libvirtd or the new per-driver daemons. When auto-spawning daemons for nonroot users, we default to spawning the per-driver daemons. This can be controlled with a UR parameter "?mode=direct|legacy|auto", where 'direct' means per-driver and 'legacy' means libvirtd (or indirect via virtproxyd if that's running). Still todo - Add systemd unit files for the new daemons - Make it possible to disable build of libvirtd, or of the per-driver daemons so downstream vendors can decide which to ship - Tuning of the daemon defaults for worker threads to better suit the fact that we have per-driver daemons - More work on RPM packaging to allow install of per-driver daemosn without pulling in libvirtd too - A bunch of stuff that doesn't occurr to me right now - Identify & fix more bugs I've created here Daniel P. Berrangé (29): rpc: add API for checking whether an auth scheme is in use on a server remote: simplify libvirtd code for deciding if SASL auth is needed logging: pass binary name not logfile name when enabling logging remote: conditionalize socket names in libvirtd daemon remote: conditionalize daemon name in libvirtd daemon remote: conditionalize driver loading in libvirtd daemon remote: conditionalize IP socket usage in libvirtd daemon remote: conditionalize IP socket config in libvirtd.conf remote: conditionalize IP socket config in augeas definitions remote: refactor & rename variables for building libvirtd secret: introduce virtsecretd daemon network: introduce virtnetworkd daemon interface: introduce virtinterfaced daemon storage: introduce virtstoraged daemon nodedev: introduce virtnodedevd daemon nwfilter: introduce virtnwfilterd daemon libxl: introduce virtlibxld daemon qemu: introduce virtqemud daemon lxc: introduce virtlxcd daemon vbox: introduce virtvboxd daemon bhyve: introduce virtbhyved daemon vz: introduce virtvzd daemon remote: introduce virtproxyd daemon to handle IP connectivity remote: open secondary drivers via remote driver if needed remote: use enum helpers for parsing remote driver transport remote: refactor the code for choosing the UNIX socket path remote: switch to connect to per-driver daemons by default all: don't wait for driver lock during startup interface: fix driver name in state directory path .gitignore | 12 + build-aux/augeas-gentest.pl | 2 +- libvirt.spec.in | 10 + src/bhyve/Makefile.inc.am | 14 + src/bhyve/bhyve_driver.c | 2 +- src/driver.h | 2 + src/interface/Makefile.inc.am | 14 + src/interface/interface_backend_netcf.c | 6 +- src/interface/interface_backend_udev.c | 6 +- src/libvirt.c | 24 ++ src/libvirt_remote.syms | 1 + src/libxl/Makefile.inc.am | 14 + src/libxl/libxl_driver.c | 2 +- src/locking/lock_daemon.c | 2 +- src/logging/log_daemon.c | 2 +- src/lxc/Makefile.inc.am | 15 + src/lxc/lxc_driver.c | 2 +- src/network/Makefile.inc.am | 14 + src/network/leaseshelper.c | 2 +- src/node_device/Makefile.inc.am | 14 + src/node_device/node_device_hal.c | 2 +- src/node_device/node_device_udev.c | 2 +- src/nwfilter/Makefile.inc.am | 14 + src/nwfilter/nwfilter_driver.c | 2 +- src/qemu/Makefile.inc.am | 14 + src/qemu/qemu_driver.c | 2 +- src/remote/Makefile.inc.am | 153 ++++--- src/remote/{libvirtd.aug => libvirtd.aug.in} | 24 +- .../{libvirtd.conf => libvirtd.conf.in} | 42 +- src/remote/remote_daemon.c | 221 +++++++--- src/remote/remote_daemon_config.c | 41 +- src/remote/remote_daemon_config.h | 9 +- src/remote/remote_daemon_dispatch.c | 82 +++- src/remote/remote_driver.c | 391 ++++++++++++------ src/remote/remote_driver.h | 4 - src/remote/test_libvirtd.aug.in | 16 +- src/rpc/virnetserver.c | 17 + src/rpc/virnetserver.h | 3 + src/secret/Makefile.inc.am | 14 + src/secret/secret_driver.c | 2 +- src/storage/Makefile.inc.am | 14 + src/util/virlog.c | 20 +- src/vbox/Makefile.inc.am | 14 + src/vz/Makefile.inc.am | 14 + src/vz/vz_driver.c | 2 +- 45 files changed, 938 insertions(+), 341 deletions(-) rename src/remote/{libvirtd.aug => libvirtd.aug.in} (88%) rename src/remote/{libvirtd.conf => libvirtd.conf.in} (95%) -- 2.21.0

6 43

[libvirt] [PATCH 0/9] qemu: refactor fsdev formatting (virtio-fs epopee)
by Ján Tomko 16 Jul '19

16 Jul '19

Ján Tomko (9): tests: qemu: minimize fs9p.xml qemu: add CAPS_LATEST tests for 9pfs qemu: address: remove useless comment qemu: command: rename qemuBuildFSDevCommandLine qemu: command: re-introduce qemuBuildFSDevCommandLine qemu: command: use VIR_AUTOFREE in qemuBuildFSDevCommandLine qemu: introduce qemuDomainDeviceDefValidateFS qemu: command: use VIR_AUTOCLEAN in qemuBuildFS* qemu: command: remove qemuDomainFSDriver src/qemu/qemu_command.c | 111 ++++++------------ src/qemu/qemu_domain.c | 46 +++++++- src/qemu/qemu_domain_address.c | 3 +- .../fs9p-ccw.s390x-latest.args | 44 +++++++ tests/qemuxml2argvdata/fs9p.args | 6 +- .../qemuxml2argvdata/fs9p.x86_64-latest.args | 41 +++++++ tests/qemuxml2argvdata/fs9p.xml | 9 +- tests/qemuxml2argvtest.c | 2 + 8 files changed, 175 insertions(+), 87 deletions(-) create mode 100644 tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/fs9p.x86_64-latest.args -- 2.19.2

2 11

[libvirt] [PATCH v2 0/4] Optimize mass closing of FDs on child spwaning
by Michal Privoznik 16 Jul '19

16 Jul '19

v2 of: https://www.redhat.com/archives/libvir-list/2019-July/msg00089.html diff to v1: - Added a test for stats parsing, - Added big fat warning as requested by Eric that malloc() in between fork() and exec() is okay with glibc (I guess we don't care about other libc-s like musl or uclibc). Michal Prívozník (4): virNetDevOpenvswitchInterfaceStats: Optimize for speed test: Introduce virnetdevopenvswitchtest vircommand: Separate mass FD closing into a function virCommand: use procfs to learn opened FDs src/libvirt_private.syms | 1 + src/util/vircommand.c | 122 +++++++++++++++--- src/util/virnetdevopenvswitch.c | 136 +++++++++++++++------ src/util/virnetdevopenvswitch.h | 4 + tests/Makefile.am | 13 +- tests/virnetdevopenvswitchdata/stats1.json | 1 + tests/virnetdevopenvswitchdata/stats2.json | 1 + tests/virnetdevopenvswitchtest.c | 101 +++++++++++++++ 8 files changed, 321 insertions(+), 58 deletions(-) create mode 100644 tests/virnetdevopenvswitchdata/stats1.json create mode 100644 tests/virnetdevopenvswitchdata/stats2.json create mode 100644 tests/virnetdevopenvswitchtest.c -- 2.21.0

2 7

[libvirt] [PATCH v2] qapi: add dirty-bitmaps to query-named-block-nodes result
by John Snow 16 Jul '19

16 Jul '19

From: Vladimir Sementsov-Ogievskiy <vsementsov(a)virtuozzo.com> Let's add a possibility to query dirty-bitmaps not only on root nodes. It is useful when dealing both with snapshots and incremental backups. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov(a)virtuozzo.com> [Added deprecation and feature flag information. --js] Signed-off-by: John Snow <jsnow(a)redhat.com> --- block/qapi.c | 5 +++++ qapi/block-core.json | 14 +++++++++++++- qemu-deprecated.texi | 12 ++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/block/qapi.c b/block/qapi.c index 917435f022..15f1030264 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -79,6 +79,11 @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk, info->backing_file = g_strdup(bs->backing_file); } + if (!QLIST_EMPTY(&bs->dirty_bitmaps)) { + info->has_dirty_bitmaps = true; + info->dirty_bitmaps = bdrv_query_dirty_bitmaps(bs); + } + info->detect_zeroes = bs->detect_zeroes; if (blk && blk_get_public(blk)->throttle_group_member.throttle_state) { diff --git a/qapi/block-core.json b/qapi/block-core.json index 0d43d4f37c..0d67dd245c 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -360,6 +360,16 @@ # @write_threshold: configured write threshold for the device. # 0 if disabled. (Since 2.3) # +# @dirty-bitmaps: dirty bitmaps information (only present if node +# has one or more dirty bitmaps) (Since 4.2) +# +# Features: +# @node-dirty-bitmaps: Signals the capability to return dirty bitmap information +# per-node instead of per-drive. If this flag is present, +# dirty-bitmaps should not be read from the BlockInfo +# structure, the top-level data for query-block. +# (Since 4.2) +# # Since: 0.14.0 # ## @@ -378,7 +388,8 @@ '*bps_wr_max_length': 'int', '*iops_max_length': 'int', '*iops_rd_max_length': 'int', '*iops_wr_max_length': 'int', '*iops_size': 'int', '*group': 'str', 'cache': 'BlockdevCacheInfo', - 'write_threshold': 'int' } } + 'write_threshold': 'int', '*dirty-bitmaps': ['BlockDirtyInfo'] }, + 'features': [ { 'name': 'node-dirty-bitmaps' } ] } ## # @BlockDeviceIoStatus: @@ -656,6 +667,7 @@ # # @dirty-bitmaps: dirty bitmaps information (only present if the # driver has one or more dirty bitmaps) (Since 2.0) +# Deprecated in 4.2; see BlockDirtyInfo instead. # # @io-status: @BlockDeviceIoStatus. Only present if the device # supports it and the VM is configured to stop on errors diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index c90b08d553..bc4e5ac1d7 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -134,6 +134,18 @@ The ``status'' field of the ``BlockDirtyInfo'' structure, returned by the query-block command is deprecated. Two new boolean fields, ``recording'' and ``busy'' effectively replace it. +@subsection query-block result field dirty-bitmaps (Since 4.2) + +The ``dirty-bitmaps`` field of the ``BlockInfo`` structure, returned by +the query-block command is itself now deprecated. The ``dirty-bitmaps`` +field of the ``BlockDeviceInfo`` struct should be used instead, which is the +type of the ``inserted`` field in query-block replies, as well as the +type of array items in query-named-block-nodes. + +In the absence of bitmaps on either structure, management APIs may use the +presence of the ``node-dirty-bitmaps`` feature flag on the ``BlockDeviceInfo`` +structure to know where to anticipate bitmap data when present. + @subsection query-cpus (since 2.12.0) The ``query-cpus'' command is replaced by the ``query-cpus-fast'' command. -- 2.21.0

1 0

[libvirt] [PATCH 0/3] Optimize mass closing of FDs on child spwaning
by Michal Privoznik 15 Jul '19

15 Jul '19

If the limit for max opened files is way bigger than the default (1024), say 3 orders bigger then spawning a child through virCommand can be expensive because we iterate over ALL FDs within the limit and close them. There's no need to that since we can learn the list of opened FDs from /proc/self/fd/. Michal Prívozník (3): virNetDevOpenvswitchInterfaceStats: Optimize for speed vircommand: Separate mass FD closing into a function virCommand: use procfs to learn opened FDs src/util/vircommand.c | 114 +++++++++++++++++++++++++++----- src/util/virnetdevopenvswitch.c | 111 ++++++++++++++++++++----------- 2 files changed, 170 insertions(+), 55 deletions(-) -- 2.21.0

7 20

[libvirt] [PATCH] tests: don't assume "localhost" only resolves to 1/2 IPs
by Daniel P. Berrangé 15 Jul '19

15 Jul '19

On Debian derived distros "localhost" can resolve to the normal "127.0.0.1" and "::1", but it can also resolve to "127.0.1.1" Rewrite the code so that it doesn't assume a fixed number of IPs. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- tests/virsystemdtest.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index cd031914ab..dd87caeebf 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -548,22 +548,21 @@ testActivation(bool useNames) size_t nsockIP; int ret = -1; size_t i; - const char *names2 = "demo-unix.socket:demo-ip.socket"; - const char *names3 = "demo-unix.socket:demo-ip.socket:demo-ip.socket"; char nfdstr[INT_BUFSIZE_BOUND(size_t)]; char pidstr[INT_BUFSIZE_BOUND(pid_t)]; virSystemdActivationMap map[2]; int *fds = NULL; size_t nfds = 0; VIR_AUTOPTR(virSystemdActivation) act = NULL; + virBuffer names = VIR_BUFFER_INITIALIZER; + + virBufferAddLit(&names, "demo-unix.socket"); if (testActivationCreateFDs(&sockUNIX, &sockIP, &nsockIP) < 0) return -1; - if (nsockIP != 1 && nsockIP != 2) { - fprintf(stderr, "Got %zu IP sockets but expected only 1 or 2\n", nsockIP); - goto cleanup; - } + for (i = 0; i < nsockIP; i++) + virBufferAddLit(&names, ":demo-ip.socket"); snprintf(nfdstr, sizeof(nfdstr), "%zu", 1 + nsockIP); snprintf(pidstr, sizeof(pidstr), "%lld", (long long)getpid()); @@ -571,8 +570,11 @@ testActivation(bool useNames) setenv("LISTEN_FDS", nfdstr, 1); setenv("LISTEN_PID", pidstr, 1); + if (virBufferError(&names)) + goto cleanup; + if (useNames) - setenv("LISTEN_FDNAMES", nsockIP == 1 ? names2 : names3, 1); + setenv("LISTEN_FDNAMES", virBufferCurrentContent(&names), 1); else unsetenv("LISTEN_FDNAMES"); @@ -627,6 +629,7 @@ testActivation(bool useNames) ret = 0; cleanup: + virBufferFreeAndReset(&names); virObjectUnref(sockUNIX); for (i = 0; i < nsockIP; i++) virObjectUnref(sockIP[i]); -- 2.21.0

2 1

[libvirt] [libvirt-php PATCH 0/2] Add binding for virDomainInterfaceAddresses
by Dawid Zamirski 15 Jul '19

15 Jul '19

Hello, The following two patches add a new bingding for virDomainInterfaceAddresses. While working on it I have found that the PHP7 version of the VIRT_ARRAY_INIT macro was causing segfaults which I have fixed in the first patch wheread the actual implementation of the binding is in the second one. Details are included in the commit messages of each patch. Regards, Dawid Dawid Zamirski (2): Fix PHP7 VIRT_ARRAY_INIT macro implementation. Add binding for virDomainInterfaceAddresses. src/libvirt-domain.c | 55 ++++++++++++++++++++++++++++++++++++++++++++ src/libvirt-domain.h | 2 ++ src/libvirt-php.c | 9 ++++++++ src/util.h | 7 +++--- 4 files changed, 70 insertions(+), 3 deletions(-) -- 2.21.0

2 5

[libvirt] [PATCH] test_driver: implement virDomainSetMemoryParameters
by Ilias Stamatis 15 Jul '19

15 Jul '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 85 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index c14603e3af..2f4f94968b 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -2861,6 +2861,90 @@ static char *testDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) virTypedParameterAssign(&params[index], name, type, value) < 0) \ goto cleanup + +static int +testDomainSetMemoryParameters(virDomainPtr dom, + virTypedParameterPtr params, + int nparams, + unsigned int flags) +{ + virDomainObjPtr vm = NULL; + virDomainDefPtr def = NULL; + unsigned long long swap_hard_limit = 0; + unsigned long long hard_limit = 0; + unsigned long long soft_limit = 0; + bool set_swap_hard_limit = false; + bool set_hard_limit = false; + bool set_soft_limit = false; + int rc; + int ret = -1; + + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG, -1); + + if (virTypedParamsValidate(params, nparams, + VIR_DOMAIN_MEMORY_HARD_LIMIT, + VIR_TYPED_PARAM_ULLONG, + VIR_DOMAIN_MEMORY_SOFT_LIMIT, + VIR_TYPED_PARAM_ULLONG, + VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT, + VIR_TYPED_PARAM_ULLONG, + NULL) < 0) + return -1; + + if (!(vm = testDomObjFromDomain(dom))) + return -1; + + if (!(def = virDomainObjGetOneDef(vm, flags))) + goto cleanup; + +#define VIR_GET_LIMIT_PARAMETER(PARAM, VALUE) \ + if ((rc = virTypedParamsGetULLong(params, nparams, PARAM, &VALUE)) < 0) \ + goto cleanup; \ + \ + if (rc == 1) \ + set_ ## VALUE = true; + + VIR_GET_LIMIT_PARAMETER(VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT, swap_hard_limit) + VIR_GET_LIMIT_PARAMETER(VIR_DOMAIN_MEMORY_HARD_LIMIT, hard_limit) + VIR_GET_LIMIT_PARAMETER(VIR_DOMAIN_MEMORY_SOFT_LIMIT, soft_limit) + +#undef VIR_GET_LIMIT_PARAMETER + + if (set_swap_hard_limit || set_hard_limit) { + unsigned long long mem_limit = vm->def->mem.hard_limit; + unsigned long long swap_limit = vm->def->mem.swap_hard_limit; + + if (set_swap_hard_limit) + swap_limit = swap_hard_limit; + + if (set_hard_limit) + mem_limit = hard_limit; + + if (mem_limit > swap_limit) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("memory hard_limit tunable value must be lower " + "than or equal to swap_hard_limit")); + goto cleanup; + } + } + + if (set_soft_limit) + def->mem.soft_limit = soft_limit; + + if (set_hard_limit) + def->mem.hard_limit = hard_limit; + + if (set_swap_hard_limit) + def->mem.swap_hard_limit = swap_hard_limit; + + ret = 0; + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + static int testDomainGetMemoryParameters(virDomainPtr dom, virTypedParameterPtr params, @@ -7615,6 +7699,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainGetVcpuPinInfo = testDomainGetVcpuPinInfo, /* 1.2.18 */ .domainGetMaxVcpus = testDomainGetMaxVcpus, /* 0.7.3 */ .domainGetXMLDesc = testDomainGetXMLDesc, /* 0.1.4 */ + .domainSetMemoryParameters = testDomainSetMemoryParameters, /* 5.6.0 */ .domainGetMemoryParameters = testDomainGetMemoryParameters, /* 5.6.0 */ .domainGetNumaParameters = testDomainGetNumaParameters, /* 5.6.0 */ .domainGetInterfaceParameters = testDomainGetInterfaceParameters, /* 5.6.0 */ -- 2.22.0

2 1

[libvirt] [PATCH] test_driver: implement virDomainSetUserPassword
by Ilias Stamatis 15 Jul '19

15 Jul '19

Signed-off-by: Ilias Stamatis <stamatis.iliass(a)gmail.com> --- src/test/test_driver.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 49d7030d21..891a398a92 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -2602,6 +2602,31 @@ testDomainSetVcpusFlags(virDomainPtr domain, unsigned int nrCpus, return ret; } + +static int +testDomainSetUserPassword(virDomainPtr dom, + const char *user ATTRIBUTE_UNUSED, + const char *password ATTRIBUTE_UNUSED, + unsigned int flags) +{ + int ret = -1; + virDomainObjPtr vm; + + virCheckFlags(VIR_DOMAIN_PASSWORD_ENCRYPTED, -1); + + if (!(vm = testDomObjFromDomain(dom))) + return -1; + + if (virDomainObjCheckActive(vm) < 0) + goto cleanup; + + ret = 0; + cleanup: + virDomainObjEndAPI(&vm); + return ret; +} + + static int testDomainSetVcpus(virDomainPtr domain, unsigned int nrCpus) { @@ -7628,6 +7653,7 @@ static virHypervisorDriver testHypervisorDriver = { .domainSaveImageGetXMLDesc = testDomainSaveImageGetXMLDesc, /* 5.5.0 */ .domainCoreDump = testDomainCoreDump, /* 0.3.2 */ .domainCoreDumpWithFormat = testDomainCoreDumpWithFormat, /* 1.2.3 */ + .domainSetUserPassword = testDomainSetUserPassword, /* 5.6.0 */ .domainSetVcpus = testDomainSetVcpus, /* 0.1.4 */ .domainSetVcpusFlags = testDomainSetVcpusFlags, /* 0.8.5 */ .domainGetVcpusFlags = testDomainGetVcpusFlags, /* 0.8.5 */ -- 2.22.0

2 1

[libvirt] [PATCH] all: don't wait for driver lock during startup
by Daniel P. Berrangé 15 Jul '19

15 Jul '19

When the drivers acquire their pidfile lock we don't want to wait if the lock is already held. We need the driver to immediately report error, causing the daemon to exit. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/bhyve/bhyve_driver.c | 2 +- src/interface/interface_backend_netcf.c | 2 +- src/interface/interface_backend_udev.c | 2 +- src/libxl/libxl_driver.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/network/leaseshelper.c | 2 +- src/node_device/node_device_hal.c | 2 +- src/node_device/node_device_udev.c | 2 +- src/nwfilter/nwfilter_driver.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/secret/secret_driver.c | 2 +- src/vz/vz_driver.c | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index cfcf4e1fba..5387ac5570 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1280,7 +1280,7 @@ bhyveStateInitialize(bool privileged, } if ((bhyve_driver->lockFD = - virPidFileAcquire(BHYVE_STATE_DIR, "driver", true, getpid())) < 0) + virPidFileAcquire(BHYVE_STATE_DIR, "driver", false, getpid())) < 0) goto cleanup; if (virDomainObjListLoadAllConfigs(bhyve_driver->domains, diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index 868e49c56e..f575768c4c 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -120,7 +120,7 @@ netcfStateInitialize(bool privileged, } if ((driver->lockFD = - virPidFileAcquire(driver->stateDir, "driver", true, getpid())) < 0) + virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0) goto error; /* open netcf */ diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index fcd7f1c04a..2feaeb95b7 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -1199,7 +1199,7 @@ udevStateInitialize(bool privileged, } if ((driver->lockFD = - virPidFileAcquire(driver->stateDir, "driver", true, getpid())) < 0) + virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0) goto cleanup; driver->udev = udev_new(); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index a99c7471bb..492028c487 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -747,7 +747,7 @@ libxlStateInitialize(bool privileged, } if ((libxl_driver->lockFD = - virPidFileAcquire(cfg->stateDir, "driver", true, getpid())) < 0) + virPidFileAcquire(cfg->stateDir, "driver", false, getpid())) < 0) goto error; if (!(libxl_driver->lockManager = diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 3982c24f34..d0b6703101 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1607,7 +1607,7 @@ static int lxcStateInitialize(bool privileged, } if ((lxc_driver->lockFD = - virPidFileAcquire(cfg->stateDir, "driver", true, getpid())) < 0) + virPidFileAcquire(cfg->stateDir, "driver", false, getpid())) < 0) goto cleanup; /* Get all the running persistent or transient configs first */ diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index 89d9a003e2..2a10fbf33a 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -164,7 +164,7 @@ main(int argc, char **argv) goto cleanup; /* Try to claim the pidfile, exiting if we can't */ - if ((pid_file_fd = virPidFileAcquirePath(pid_file, true, getpid())) < 0) + if ((pid_file_fd = virPidFileAcquirePath(pid_file, false, getpid())) < 0) goto cleanup; /* Since interfaces can be hot plugged, we need to make sure that the diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 1920f4566e..1f3f867599 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -637,7 +637,7 @@ nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED, } if ((driver->lockFD = - virPidFileAcquire(driver->stateDir, "driver", true, getpid())) < 0) + virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0) goto failure; if (!(driver->devs = virNodeDeviceObjListNew())) diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index d883462948..8bc63c506c 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -1848,7 +1848,7 @@ nodeStateInitialize(bool privileged, } if ((driver->lockFD = - virPidFileAcquire(driver->stateDir, "driver", true, getpid())) < 0) + virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0) goto cleanup; if (!(driver->devs = virNodeDeviceObjListNew()) || diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 43561241f6..530e4f5872 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -215,7 +215,7 @@ nwfilterStateInitialize(bool privileged, } if ((driver->lockFD = - virPidFileAcquire(driver->stateDir, "driver", true, getpid())) < 0) + virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0) goto error; if (virNWFilterIPAddrMapInit() < 0) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fc0d12c335..d3a144aabd 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -677,7 +677,7 @@ qemuStateInitialize(bool privileged, } if ((qemu_driver->lockFD = - virPidFileAcquire(cfg->stateDir, "driver", true, getpid())) < 0) + virPidFileAcquire(cfg->stateDir, "driver", false, getpid())) < 0) goto error; qemu_driver->qemuImgBinary = virFindFileInPath("qemu-img"); diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 9344948db4..0af2bcef96 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -504,7 +504,7 @@ secretStateInitialize(bool privileged, } if ((driver->lockFD = - virPidFileAcquire(driver->stateDir, "driver", true, getpid())) < 0) + virPidFileAcquire(driver->stateDir, "driver", false, getpid())) < 0) goto error; if (!(driver->secrets = virSecretObjListNew())) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 75430fb0d9..f5d05a7f43 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -4129,7 +4129,7 @@ vzStateInitialize(bool privileged, } if ((vz_driver_lock_fd = - virPidFileAcquire(VZ_STATEDIR, "driver", true, getpid())) < 0) + virPidFileAcquire(VZ_STATEDIR, "driver", false, getpid())) < 0) return -1; if (prlsdkInit() < 0) { -- 2.21.0

2 1

[libvirt] [PATCH] interface: fix driver name in state directory path
by Daniel P. Berrangé 15 Jul '19

15 Jul '19

Typo meant we use 'nodedev' instead of 'interface'. This doesn't hurt libvirtd because if a process tries to acquire a lock it already holds it will succeed. It fails when nodedev & interface drivers are in separate daemons though. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com> --- src/interface/interface_backend_netcf.c | 4 ++-- src/interface/interface_backend_udev.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index f575768c4c..0000587cee 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -102,14 +102,14 @@ netcfStateInitialize(bool privileged, if (privileged) { if (virAsprintf(&driver->stateDir, - "%s/run/libvirt/nodedev", LOCALSTATEDIR) < 0) + "%s/run/libvirt/interface", LOCALSTATEDIR) < 0) goto error; } else { VIR_AUTOFREE(char *) rundir = NULL; if (!(rundir = virGetUserRuntimeDirectory())) goto error; - if (virAsprintf(&driver->stateDir, "%s/nodedev/run", rundir) < 0) + if (virAsprintf(&driver->stateDir, "%s/interface/run", rundir) < 0) goto error; } diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index 2feaeb95b7..fea5108dbc 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -1181,14 +1181,14 @@ udevStateInitialize(bool privileged, if (privileged) { if (virAsprintf(&driver->stateDir, - "%s/run/libvirt/nodedev", LOCALSTATEDIR) < 0) + "%s/run/libvirt/interface", LOCALSTATEDIR) < 0) goto cleanup; } else { VIR_AUTOFREE(char *) rundir = NULL; if (!(rundir = virGetUserRuntimeDirectory())) goto cleanup; - if (virAsprintf(&driver->stateDir, "%s/nodedev/run", rundir) < 0) + if (virAsprintf(&driver->stateDir, "%s/interface/run", rundir) < 0) goto cleanup; } -- 2.21.0

2 1