- Devel - libvirt List Archives

[PATCH v2 0/2] rpc: avoid crash when system time jump back
by BiaoxiangYe 10 Feb '21

10 Feb '21

From: BiaoXiang Ye <yebiaoxiang(a)huawei.com> Using monotonic timer instead of detecting a jump backwards as suggested by Jano and Daniel, thanks for suggestions. BiaoXiang Ye (2): rpc: avoid crash when system time jump back rpc: introduce macro MILLISECONDS_PER_SECOND src/rpc/virkeepalive.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) -- 2.23.0

3 4

[libvirt PATCH] schemas: Add support for maximum CPU mode
by Jiri Denemark 10 Feb '21

10 Feb '21

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- docs/schemas/cputypes.rng | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/schemas/cputypes.rng b/docs/schemas/cputypes.rng index f66bc62ba7..77c8fa783b 100644 --- a/docs/schemas/cputypes.rng +++ b/docs/schemas/cputypes.rng @@ -9,6 +9,7 @@ <value>custom</value> <value>host-model</value> <value>host-passthrough</value> + <value>maximum</value> </choice> </attribute> </define> -- 2.30.0

3 2

[PATCH] build: Remove unused 'conflicts' key from virt_daemon_unit
by Jim Fehlig 10 Feb '21

10 Feb '21

The 'conflict' key in a virt_daemon_unit dictionary is not used when generating systemd service and socket files. The comment associated with the key claims the default is 'true', and a few build files needlessly set it to 'true' when defining their virt_daemon_unit. Remove the 'conflict' key and its use in the affect build files. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/interface/meson.build | 1 - src/libxl/meson.build | 1 - src/lxc/meson.build | 1 - src/meson.build | 1 - src/network/meson.build | 1 - src/node_device/meson.build | 1 - src/nwfilter/meson.build | 1 - src/qemu/meson.build | 1 - src/secret/meson.build | 1 - src/storage/meson.build | 1 - src/vbox/meson.build | 1 - src/vz/meson.build | 1 - 12 files changed, 12 deletions(-) diff --git a/src/interface/meson.build b/src/interface/meson.build index 1092c5a267..2d4e30362c 100644 --- a/src/interface/meson.build +++ b/src/interface/meson.build @@ -48,7 +48,6 @@ if conf.has('WITH_INTERFACE') 'name': 'Libvirt interface', 'sockprefix': 'virtinterfaced', 'sockets': [ 'main', 'ro', 'admin' ], - 'conflicts': true, } openrc_init_files += { diff --git a/src/libxl/meson.build b/src/libxl/meson.build index 783af6c667..9793899106 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -71,7 +71,6 @@ if conf.has('WITH_LIBXL') 'sockprefix': 'virtxend', 'sockets': [ 'main', 'ro', 'admin' ], 'deps': 'ConditionPathExists=/proc/xen/capabilities', - 'conflicts': true, } openrc_init_files += { diff --git a/src/lxc/meson.build b/src/lxc/meson.build index f8e2a8852a..ad5c659dba 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -168,7 +168,6 @@ if conf.has('WITH_LXC') 'name': 'Libvirt lxc', 'sockprefix': 'virtlxcd', 'sockets': [ 'main', 'ro', 'admin' ], - 'conflicts': true, } openrc_init_files += { diff --git a/src/meson.build b/src/meson.build index 74d932a32c..f13b85b74e 100644 --- a/src/meson.build +++ b/src/meson.build @@ -201,7 +201,6 @@ guest_unit_files = [] # * sockets - array of additional sockets (optional, default [ 'main', 'ro', 'admin' ]) # * socket_$name_in - additional socket source files (optional, default remote/libvirtd.socket.in ) # * deps - socket dependencies (optional, default '') -# * conflicts - if the service conflicts with libvirtd (optional, true) virt_daemon_units = [] # openrc_init_files diff --git a/src/network/meson.build b/src/network/meson.build index 3ec598c3f9..d6fb624bb7 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -65,7 +65,6 @@ if conf.has('WITH_NETWORK') 'name': 'Libvirt network', 'sockprefix': 'virtnetworkd', 'sockets': [ 'main', 'ro', 'admin' ], - 'conflicts': true, } openrc_init_files += { diff --git a/src/node_device/meson.build b/src/node_device/meson.build index c4e4c3906b..15f9c3ad29 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build @@ -56,7 +56,6 @@ if conf.has('WITH_NODE_DEVICES') 'name': 'Libvirt nodedev', 'sockprefix': 'virtnodedevd', 'sockets': [ 'main', 'ro', 'admin' ], - 'conflicts': true, } openrc_init_files += { diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build index 715282ee77..a21e575925 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -54,7 +54,6 @@ if conf.has('WITH_NWFILTER') 'name': 'Libvirt nwfilter', 'sockprefix': 'virtnwfilterd', 'sockets': [ 'main', 'ro', 'admin' ], - 'conflicts': true, } openrc_init_files += { diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 08c1d20087..3898d23877 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -158,7 +158,6 @@ if conf.has('WITH_QEMU') 'name': 'Libvirt qemu', 'sockprefix': 'virtqemud', 'sockets': [ 'main', 'ro', 'admin' ], - 'conflicts': true, } openrc_init_files += { diff --git a/src/secret/meson.build b/src/secret/meson.build index d576d3218e..a487055cde 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build @@ -37,7 +37,6 @@ if conf.has('WITH_SECRETS') 'name': 'Libvirt secret', 'sockprefix': 'virtsecretd', 'sockets': [ 'main', 'ro', 'admin' ], - 'conflicts': true, } openrc_init_files += { diff --git a/src/storage/meson.build b/src/storage/meson.build index 153ff6f846..915ae46f61 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -119,7 +119,6 @@ if conf.has('WITH_STORAGE') 'name': 'Libvirt storage', 'sockprefix': 'virtstoraged', 'sockets': [ 'main', 'ro', 'admin' ], - 'conflicts': true, } openrc_init_files += { diff --git a/src/vbox/meson.build b/src/vbox/meson.build index 3e608fa101..df0cfb40e8 100644 --- a/src/vbox/meson.build +++ b/src/vbox/meson.build @@ -62,7 +62,6 @@ if conf.has('WITH_VBOX') 'name': 'Libvirt vbox', 'sockprefix': 'virtvboxd', 'sockets': [ 'main', 'ro', 'admin' ], - 'conflicts': true, } openrc_init_files += { diff --git a/src/vz/meson.build b/src/vz/meson.build index 2859dc7979..14f7280f66 100644 --- a/src/vz/meson.build +++ b/src/vz/meson.build @@ -52,7 +52,6 @@ if conf.has('WITH_VZ') 'name': 'Libvirt vz', 'sockprefix': 'virtvzd', 'sockets': [ 'main', 'ro', 'admin' ], - 'conflicts': true, } openrc_init_files += { -- 2.29.2

2 1

[libvirt PATCH 0/5] qemu: support "max" CPU model
by Daniel P. Berrangé 10 Feb '21

10 Feb '21

QEMU has supported a "max" CPU model for many releases now, but somehow we never got it wired up into libvirt. "max" is useful for applications which don't care about live migration and just want the best CPU model possible. Normally "host" would be used but this only works for KVM. "max" is identical to "host" for KVM, while for TCG it exposes every feature TCG implements. This "max" model will be a natural choice for something like libguestfs and probably other apps too. In libvirt we enable it with <cpu mode="maximum"/> Daniel P. Berrangé (5): conf: define a new "maximum" CPU mode conf: add reporting of "maximum" CPU mode in domain caps cpu: wire up support for maximum CPU mode qemu: probe for "-cpu max" support qemu: wire up support for maximum CPU model docs/formatdomain.rst | 24 +++++++++++++++++ docs/formatdomaincaps.html.in | 6 +++++ docs/schemas/domaincaps.rng | 13 +++++++++ src/conf/cpu_conf.c | 13 ++++++--- src/conf/cpu_conf.h | 1 + src/conf/domain_capabilities.c | 15 +++++++++++ src/conf/domain_capabilities.h | 2 ++ src/cpu/cpu.c | 4 ++- src/cpu/cpu_ppc64.c | 10 +++++-- src/cpu/cpu_x86.c | 3 ++- src/qemu/qemu_capabilities.c | 27 +++++++++++++++++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 9 +++++-- src/qemu/qemu_domain.c | 10 ++++--- src/qemu/qemu_driver.c | 2 ++ src/qemu/qemu_process.c | 8 +++--- src/qemu/qemu_validate.c | 14 ++++++++-- tests/domaincapsdata/bhyve_basic.x86_64.xml | 1 + tests/domaincapsdata/bhyve_fbuf.x86_64.xml | 1 + tests/domaincapsdata/bhyve_uefi.x86_64.xml | 1 + tests/domaincapsdata/empty.xml | 1 + tests/domaincapsdata/libxl-xenfv.xml | 1 + tests/domaincapsdata/libxl-xenpv.xml | 1 + .../domaincapsdata/qemu_1.5.3-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_1.5.3-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_1.5.3.x86_64.xml | 1 + .../domaincapsdata/qemu_1.6.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_1.6.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_1.6.0.x86_64.xml | 1 + .../domaincapsdata/qemu_1.7.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_1.7.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_1.7.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.1.1-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.1.1-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.1.1.x86_64.xml | 1 + .../domaincapsdata/qemu_2.10.0-q35.x86_64.xml | 6 +++++ .../domaincapsdata/qemu_2.10.0-tcg.x86_64.xml | 6 +++++ .../qemu_2.10.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.10.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.10.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_2.10.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.10.0.x86_64.xml | 6 +++++ .../domaincapsdata/qemu_2.11.0-q35.x86_64.xml | 6 +++++ .../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 6 +++++ tests/domaincapsdata/qemu_2.11.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.11.0.x86_64.xml | 6 +++++ .../domaincapsdata/qemu_2.12.0-q35.x86_64.xml | 6 +++++ .../domaincapsdata/qemu_2.12.0-tcg.x86_64.xml | 6 +++++ .../qemu_2.12.0-virt.aarch64.xml | 6 +++++ tests/domaincapsdata/qemu_2.12.0.aarch64.xml | 6 +++++ tests/domaincapsdata/qemu_2.12.0.ppc64.xml | 6 +++++ tests/domaincapsdata/qemu_2.12.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.12.0.x86_64.xml | 6 +++++ .../domaincapsdata/qemu_2.4.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.4.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.4.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.5.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.5.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.5.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.6.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.6.0-tcg.x86_64.xml | 1 + .../qemu_2.6.0-virt.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.6.0.aarch64.xml | 1 + tests/domaincapsdata/qemu_2.6.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_2.6.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.7.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.7.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.7.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.7.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.8.0-q35.x86_64.xml | 1 + .../domaincapsdata/qemu_2.8.0-tcg.x86_64.xml | 1 + tests/domaincapsdata/qemu_2.8.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.8.0.x86_64.xml | 1 + .../domaincapsdata/qemu_2.9.0-q35.x86_64.xml | 6 +++++ .../domaincapsdata/qemu_2.9.0-tcg.x86_64.xml | 6 +++++ tests/domaincapsdata/qemu_2.9.0.ppc64.xml | 1 + tests/domaincapsdata/qemu_2.9.0.s390x.xml | 1 + tests/domaincapsdata/qemu_2.9.0.x86_64.xml | 6 +++++ .../domaincapsdata/qemu_3.0.0-q35.x86_64.xml | 6 +++++ .../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml | 6 +++++ tests/domaincapsdata/qemu_3.0.0.ppc64.xml | 6 +++++ tests/domaincapsdata/qemu_3.0.0.s390x.xml | 1 + tests/domaincapsdata/qemu_3.0.0.x86_64.xml | 6 +++++ .../domaincapsdata/qemu_3.1.0-q35.x86_64.xml | 6 +++++ .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 6 +++++ tests/domaincapsdata/qemu_3.1.0.ppc64.xml | 6 +++++ tests/domaincapsdata/qemu_3.1.0.x86_64.xml | 6 +++++ .../domaincapsdata/qemu_4.0.0-q35.x86_64.xml | 6 +++++ .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 6 +++++ .../qemu_4.0.0-virt.aarch64.xml | 6 +++++ tests/domaincapsdata/qemu_4.0.0.aarch64.xml | 6 +++++ tests/domaincapsdata/qemu_4.0.0.ppc64.xml | 6 +++++ tests/domaincapsdata/qemu_4.0.0.s390x.xml | 6 +++++ tests/domaincapsdata/qemu_4.0.0.x86_64.xml | 6 +++++ .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 6 +++++ .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 6 +++++ tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 6 +++++ .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml | 6 +++++ .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml | 6 +++++ .../qemu_4.2.0-virt.aarch64.xml | 6 +++++ tests/domaincapsdata/qemu_4.2.0.aarch64.xml | 6 +++++ tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 6 +++++ tests/domaincapsdata/qemu_4.2.0.s390x.xml | 6 +++++ tests/domaincapsdata/qemu_4.2.0.x86_64.xml | 6 +++++ .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml | 6 +++++ .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml | 6 +++++ .../qemu_5.0.0-virt.aarch64.xml | 6 +++++ tests/domaincapsdata/qemu_5.0.0.aarch64.xml | 6 +++++ tests/domaincapsdata/qemu_5.0.0.ppc64.xml | 6 +++++ tests/domaincapsdata/qemu_5.0.0.x86_64.xml | 6 +++++ .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml | 6 +++++ .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml | 6 +++++ tests/domaincapsdata/qemu_5.1.0.sparc.xml | 1 + tests/domaincapsdata/qemu_5.1.0.x86_64.xml | 6 +++++ .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml | 6 +++++ .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml | 6 +++++ .../qemu_5.2.0-virt.aarch64.xml | 6 +++++ tests/domaincapsdata/qemu_5.2.0.aarch64.xml | 6 +++++ tests/domaincapsdata/qemu_5.2.0.ppc64.xml | 6 +++++ tests/domaincapsdata/qemu_5.2.0.s390x.xml | 6 +++++ tests/domaincapsdata/qemu_5.2.0.x86_64.xml | 6 +++++ .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml | 6 +++++ .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml | 6 +++++ tests/domaincapsdata/qemu_6.0.0.x86_64.xml | 6 +++++ .../caps_2.10.0.x86_64.xml | 1 + .../caps_2.11.0.x86_64.xml | 1 + .../caps_2.12.0.aarch64.xml | 1 + .../caps_2.12.0.ppc64.xml | 1 + .../caps_2.12.0.x86_64.xml | 1 + .../caps_2.9.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 + .../caps_3.0.0.x86_64.xml | 1 + .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 + .../caps_3.1.0.x86_64.xml | 1 + .../caps_4.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 + .../caps_4.0.0.x86_64.xml | 1 + .../caps_4.1.0.x86_64.xml | 1 + .../caps_4.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 + .../caps_4.2.0.x86_64.xml | 1 + .../caps_5.0.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + .../caps_5.0.0.x86_64.xml | 1 + .../caps_5.1.0.x86_64.xml | 1 + .../caps_5.2.0.aarch64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 + .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 + .../caps_5.2.0.x86_64.xml | 1 + .../caps_6.0.0.x86_64.xml | 1 + .../cpu-cache-passthrough3.err | 2 +- 153 files changed, 575 insertions(+), 19 deletions(-) -- 2.29.2

3 21

[PATCH 00/12] vsh: Improve completer code
by Michal Privoznik 10 Feb '21

10 Feb '21

There is no functional change to completion. No user visible change, nor to a developer who writes a completer callback. Some code deduplication and code cleanup and adapting code to 2021. Michal Prívozník (12): lib: Substitute some STREQLEN with STRPREFIX vsh: Don't put VSH_OT_ALIAS onto list of completions vsh: Use g_auto(GStrv) to free string list returned by completer callback vsh: Accept NULL @list in vshCompleterFilter() vsh: Prefer g_strdup_printf() over g_snprintf() in vshReadlineOptionsGenerator() vsh: Use g_auto() for string lists returned in readline command/options generators vsh: Rewrite opt->type check in vshReadlineParse() vsh: Deduplicate filtering in vshReadlineOptionsGenerator() vsh: Deduplicate filtering in vshReadlineCommandGenerator() vsh: Simplify condition for calling completer callback vsh: Rework vshReadlineCommandGenerator() vsh: Drop unused @text arg from readline generators src/libxl/xen_xl.c | 2 +- src/util/vircgroupv2.c | 10 +-- tools/vsh.c | 152 ++++++++++++++++------------------------- 3 files changed, 63 insertions(+), 101 deletions(-) -- 2.26.2

2 17

[PATCH] virStorageSourceClear: Unref @vhostuser
by Michal Privoznik 10 Feb '21

10 Feb '21

The @vhostuser member of virStorageSource structure is allocated during parsing in virDomainDiskSourceVHostUserParse() but never freed leading to a memleak. Since the member is an object it has to be unrefed instead of g_free()-d. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/storage_source_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/storage_source_conf.c b/src/conf/storage_source_conf.c index 7706bbd8da..67c3aedefb 100644 --- a/src/conf/storage_source_conf.c +++ b/src/conf/storage_source_conf.c @@ -1125,6 +1125,7 @@ virStorageSourceClear(virStorageSourcePtr def) virStorageEncryptionFree(def->encryption); virStoragePRDefFree(def->pr); virStorageSourceNVMeDefFree(def->nvme); + virObjectUnref(def->vhostuser); virStorageSourceSeclabelsClear(def); virStoragePermsFree(def->perms); VIR_FREE(def->timestamps); -- 2.26.2

2 1

[libvirt PATCH] tests: Only mock $INODE64 symbols on x86_64 macOS
by Andrea Bolognani 10 Feb '21

10 Feb '21

The version of macOS running on Apple Silicon doesn't need to concern itself with backwards compatibility with 32-bit applications, and so it could jettison all the symbol aliasing shenanigans involved. https://gitlab.com/libvirt/libvirt/-/issues/121 Signed-off-by: Andrea Bolognani <abologna(a)redhat.com> --- tests/virfilewrapper.c | 2 +- tests/virmockstathelpers.c | 4 ++-- tests/virpcimock.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/virfilewrapper.c b/tests/virfilewrapper.c index ca2356b5c9..1369cfb766 100644 --- a/tests/virfilewrapper.c +++ b/tests/virfilewrapper.c @@ -56,7 +56,7 @@ static void init_syms(void) VIR_MOCK_REAL_INIT(access); VIR_MOCK_REAL_INIT(mkdir); VIR_MOCK_REAL_INIT(open); -# ifdef __APPLE__ +# if defined(__APPLE__) && defined(__x86_64__) VIR_MOCK_REAL_INIT_ALIASED(opendir, "opendir$INODE64"); # else VIR_MOCK_REAL_INIT(opendir); diff --git a/tests/virmockstathelpers.c b/tests/virmockstathelpers.c index 830dfe1085..9344345baa 100644 --- a/tests/virmockstathelpers.c +++ b/tests/virmockstathelpers.c @@ -161,7 +161,7 @@ static void virMockStatInit(void) debug = getenv("VIR_MOCK_STAT_DEBUG"); #ifdef MOCK_STAT -# ifdef __APPLE__ +# if defined(__APPLE__) && defined(__x86_64__) VIR_MOCK_REAL_INIT_ALIASED(stat, "stat$INODE64"); # else VIR_MOCK_REAL_INIT(stat); @@ -181,7 +181,7 @@ static void virMockStatInit(void) fdebug("real __xstat64 %p\n", real___xstat64); #endif #ifdef MOCK_LSTAT -# ifdef __APPLE__ +# if defined(__APPLE__) && defined(__x86_64__) VIR_MOCK_REAL_INIT_ALIASED(lstat, "lstat$INODE64"); # else VIR_MOCK_REAL_INIT(lstat); diff --git a/tests/virpcimock.c b/tests/virpcimock.c index f6280fc8b5..d1c6220c57 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -936,7 +936,7 @@ init_syms(void) VIR_MOCK_REAL_INIT(__open_2); # endif /* ! __GLIBC__ */ VIR_MOCK_REAL_INIT(close); -# ifdef __APPLE__ +# if defined(__APPLE__) && defined(__x86_64__) VIR_MOCK_REAL_INIT_ALIASED(opendir, "opendir$INODE64"); # else VIR_MOCK_REAL_INIT(opendir); -- 2.26.2

2 1

tpm-tis device for ARM virt
by Jim Fehlig 10 Feb '21

10 Feb '21

Hi All, I received a private bug report that starting a VM with swtpm device fails with qemu-system-aarch64. The VM config has <tpm model='tpm-tis'> <backend type='emulator' version='2.0'/> </tpm> QEMU reports the following error error: internal error: process exited while connecting to monitor: 2021-02-07T05:15:35.378927Z qemu-system-aarch64: -device tpm-tis,tpmdev=tpm-tpm0,id=tpm0: 'tpm-tis' is not a valid device model name Indeed it appears the device name is 'tpm-tis-device' [1][2] for ARM virt. The similar yet different device naming between x86 and ARM is unfortunate. IIUC, the devices are the same between the architectures, i.e. they both emulate a TPM device conforming to the TIS spec. If so, adding a 'tpm-tis-device' to virDomainTPMModel seems redundant. I assume the naming difference should be handled internally, e.g. something like the below patch to qemuBuildTPMDevStr? I can send a proper patch if this is an acceptable approach. Regards, Jim [1] https://qemu.readthedocs.io/en/latest/specs/tpm.html [2] https://github.com/qemu/qemu/commit/c294ac327ca99342b90bd3a83d2cef9b447afaa7 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 92036d26c0..5154611ccd 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9198,6 +9198,9 @@ qemuBuildTPMDevStr(const virDomainDef *def, g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; const char *model = virDomainTPMModelTypeToString(tpm->model); + if (tpm->model == VIR_DOMAIN_TPM_MODEL_TIS && def->os.arch == VIR_ARCH_AARCH64) + model = "tpm-tis-device"; + virBufferAsprintf(&buf, "%s,tpmdev=tpm-%s,id=%s", model, tpm->info.alias, tpm->info.alias);

2 2

[PATCH] Rework qemuMigrationDstPrecreateDisk()
by Yi Li 09 Feb '21

09 Feb '21

'conn' vairable which are used only inside the func. Let's declare inside the func body to make that obvious. Use g_autofree to allow removal of 'cleanup:' and the 'ret' variable. Signed-off-by: Yi Li <yili(a)winhong.com> --- src/qemu/qemu_migration.c | 68 +++++++++++++++------------------------ 1 file changed, 26 insertions(+), 42 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index f44d31c971..6bb0677f86 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -169,15 +169,15 @@ qemuMigrationSrcRestoreDomainState(virQEMUDriverPtr driver, virDomainObjPtr vm) static int -qemuMigrationDstPrecreateDisk(virConnectPtr *conn, - virDomainDiskDefPtr disk, +qemuMigrationDstPrecreateDisk(virDomainDiskDefPtr disk, unsigned long long capacity) { - int ret = -1; - virStoragePoolPtr pool = NULL; - virStorageVolPtr vol = NULL; - char *volName = NULL, *basePath = NULL; - char *volStr = NULL; + g_autoptr(virConnect) conn = NULL; + g_autoptr(virStoragePool) pool = NULL; + g_autoptr(virStorageVol) vol = NULL; + char *volName = NULL; + g_autofree char *basePath = NULL; + g_autofree char *volStr = NULL; g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER; const char *format = NULL; unsigned int flags = 0; @@ -198,32 +198,28 @@ qemuMigrationDstPrecreateDisk(virConnectPtr *conn, virReportError(VIR_ERR_INVALID_ARG, _("malformed disk path: %s"), disk->src->path); - goto cleanup; + return -1; } *volName = '\0'; volName++; - if (!*conn) { - if (!(*conn = virGetConnectStorage())) - goto cleanup; - } + if (!(conn = virGetConnectStorage())) + return -1; - if (!(pool = virStoragePoolLookupByTargetPath(*conn, basePath))) - goto cleanup; + if (!(pool = virStoragePoolLookupByTargetPath(conn, basePath))) + return -1; format = virStorageFileFormatTypeToString(disk->src->format); if (disk->src->format == VIR_STORAGE_FILE_QCOW2) flags |= VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA; break; case VIR_STORAGE_TYPE_VOLUME: - if (!*conn) { - if (!(*conn = virGetConnectStorage())) - goto cleanup; - } + if (!(conn = virGetConnectStorage())) + return -1; - if (!(pool = virStoragePoolLookupByName(*conn, disk->src->srcpool->pool))) - goto cleanup; + if (!(pool = virStoragePoolLookupByName(conn, disk->src->srcpool->pool))) + return -1; format = virStorageFileFormatTypeToString(disk->src->format); volName = disk->src->srcpool->volume; if (disk->src->format == VIR_STORAGE_FILE_QCOW2) @@ -245,13 +241,13 @@ qemuMigrationDstPrecreateDisk(virConnectPtr *conn, _("cannot precreate storage for disk type '%s'"), virStorageTypeToString(disk->src->type)); goto cleanup; + return -1; } if ((vol = virStorageVolLookupByName(pool, volName))) { VIR_DEBUG("Skipping creation of already existing volume of name '%s'", volName); - ret = 0; - goto cleanup; + return 0; } virBufferAddLit(&buf, "<volume>\n"); @@ -269,19 +265,13 @@ qemuMigrationDstPrecreateDisk(virConnectPtr *conn, if (!(volStr = virBufferContentAndReset(&buf))) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("unable to create volume XML")); - goto cleanup; + return -1; } if (!(vol = virStorageVolCreateXML(pool, volStr, flags))) - goto cleanup; + return -1; - ret = 0; - cleanup: - VIR_FREE(basePath); - VIR_FREE(volStr); - virObjectUnref(vol); - virObjectUnref(pool); - return ret; + return 0; } static bool @@ -313,9 +303,7 @@ qemuMigrationDstPrecreateStorage(virDomainObjPtr vm, const char **migrate_disks, bool incremental) { - int ret = -1; size_t i = 0; - virConnectPtr conn = NULL; if (!nbd || !nbd->ndisks) return 0; @@ -332,7 +320,7 @@ qemuMigrationDstPrecreateStorage(virDomainObjPtr vm, virReportError(VIR_ERR_INTERNAL_ERROR, _("unable to find disk by target: %s"), nbd->disks[i].target); - goto cleanup; + return -1; } if (disk->src->type == VIR_STORAGE_TYPE_NVME) { @@ -352,20 +340,16 @@ qemuMigrationDstPrecreateStorage(virDomainObjPtr vm, virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("pre-creation of storage targets for incremental " "storage migration is not supported")); - goto cleanup; + return -1; } VIR_DEBUG("Proceeding with disk source %s", NULLSTR(diskSrcPath)); - if (qemuMigrationDstPrecreateDisk(&conn, - disk, nbd->disks[i].capacity) < 0) - goto cleanup; + if (qemuMigrationDstPrecreateDisk(disk, nbd->disks[i].capacity) < 0) + return -1; } - ret = 0; - cleanup: - virObjectUnref(conn); - return ret; + return 0; } -- 2.25.3

2 1

[PATCH] build: Fix generation of virtproxyd socket files
by Jim Fehlig 09 Feb '21

09 Feb '21

The various virtproxyd socket files are generated with invalid syntax, e.g. from virtproxyd.socket [Unit] Description=Libvirt proxy local socket Before=virtproxyd.service libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket libvirtd-tcp.socket libvirtd-tls.socket Note the missing 'Conflicts=' in the last line. Fix it by prepending 'Conflicts=' to libvirtd_socket_conflicts when adding virtproxyd to virt_daemon_units. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/remote/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/meson.build b/src/remote/meson.build index 9ad2f6ab1c..0a188268b5 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -230,7 +230,7 @@ if conf.has('WITH_REMOTE') 'name': 'Libvirt proxy', 'sockprefix': 'libvirt', 'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ], - 'deps': libvirtd_socket_conflicts, + 'deps': 'Conflicts=' + libvirtd_socket_conflicts, } openrc_init_files += { -- 2.29.2

2 1