[libvirt PATCH] meson: Fix libvirtd|virtproxyd socket prefixes
by Erik Skultety
For the daemons in question the correct socket prefix is "libvirt-",
not "libvirtd-".
Fixes: dd4f2c73ad7f9fc0eae5325d5bf5786afd3a467e
Signed-off-by: Erik Skultety <eskultet(a)redhat.com>
---
src/remote/meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/remote/meson.build b/src/remote/meson.build
index 25712c943b..5983238a0a 100644
--- a/src/remote/meson.build
+++ b/src/remote/meson.build
@@ -184,7 +184,7 @@ if conf.has('WITH_REMOTE')
'service': 'libvirtd',
'service_in': files('libvirtd.service.in'),
'name': 'Libvirt',
- 'sockprefix': 'libvirtd',
+ 'sockprefix': 'libvirt',
'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ],
}
@@ -218,7 +218,7 @@ if conf.has('WITH_REMOTE')
'service': 'virtproxyd',
'service_in': files('virtproxyd.service.in'),
'name': 'Libvirt proxy',
- 'sockprefix': 'libvirtd',
+ 'sockprefix': 'libvirt',
'sockets': [ 'main', 'ro', 'admin', 'tcp', 'tls' ],
'deps': libvirtd_socket_conflicts,
}
--
2.26.2
4 years, 3 months
[libvirt PATCH] meson: Fix "numaclt" typo
by Erik Skultety
Signed-off-by: Erik Skultety <eskultet(a)redhat.com>
---
Pushed as trivial.
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 48b937d6bb..ad269640ba 100644
--- a/meson.build
+++ b/meson.build
@@ -2419,7 +2419,7 @@ libs_summary = {
'netcf': netcf_dep.found(),
'NLS': have_gnu_gettext_tools,
'nss': conf.has('WITH_NSS'),
- 'numaclt': numactl_dep.found(),
+ 'numactl': numactl_dep.found(),
'openwsman': openwsman_dep.found(),
'pciaccess': pciaccess_dep.found(),
'pm_utils': conf.has('WITH_PM_UTILS'),
--
2.26.2
4 years, 3 months
[libvirt PATCH v2] port libvirt to Meson build system
by Pavel Hrdina
The second time around I will not post the complete series as it doesn't
make that much sense. Instead I'll post a diff between the two series to
provide the changes between these series together with links to both
versions pushed to gitlab repository.
Patches for v2 are available from my gitlab repository:
git clone -b meson https://gitlab.com/phrdina/libvirt.git
and link to gitlab pipeline:
https://gitlab.com/phrdina/libvirt/-/pipelines/172042918
Patches for v1 are available from different branch 'meson-v1' in the
same repository. You can get the attached diff by running:
git diff meson-v1 meson
During review we discovered some areas that should be improved once the
meson rewrite is merged into libvirt master:
- As of June 2020 we can drop library check for yal2 and use pkg-confg
only check because openSUSE Leap 42.3 is no longer supported by
libvirt and latest SLES 15 was released on 2018-07-16.
- It was suggested to drop README file which is just a link to
README.rst and with meson no longer required as it was with autotools.
- There is a warning while building libvirt:
../tests/qemuxml2xmltest.c: In function ‘mymain’:
../tests/qemuxml2xmltest.c:132:1: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without
132 | mymain(void)
| ^~~~~~
- Review discovered that with meson we no longer link with
libnl-route-3. Meson links only with libraries that are actually
required and we never used any symbol from this library so it can
be dropped.
- During review it was pointed out that we can refactor how meson
generates html files by removing meson-html-gen.py and moving the
logic directly to meson.
- There was a question why we install augeas test files so we should
figure out if we need to install them or it can be dropped.
Here is the list of main changes done in v2, I will not list all of them
as it can be easily checked in the diff:
- I've reordered and changed the patches to not break git bisect. Now
patch 'meson: remove automake specific directives' doesn't remove
BUILD_SOURCES because that would break running 'autogen.sh'.
Patch 'meson: m4: drop not relevant m4 files' was renamed to
'meson: drop remaining m4 helper files' and moved at the end of the
series as it would again break running 'autogen.sh'.
Patch 'meson: tests: remove '.libs' from all relevant paths' was moved
in the middle of the series before adding 'src' directory into meson
because it would break running 'make check'.
To not break git bisect we agreed that meson will fail with error
until the whole rewrite is done and we will have a temporary option
'force_incomplete_build' that will skip the error and force to run
meson setup.
I've added a new patch 'meson: add driver_remote option only into meson_options.txt'
to break circular dependency between driver_remote and libssh,
libssh2, sasl and xdr options to make
meson build -Dforce_incomplete_build work properly.
- We started running tests on FreeBSD which discovered an issue with
meson build. Meson defines _FILE_OFFSET_BITS=64 all the time so I had
to introduce a patch that handles this issue:
'meson: tests: virmockstathelpers: replace check for _FILE_OFFSET_BITS'
- All scripts except for meson-python.sh wrapper which sets environment
variables were converted from shell to python.
- Removed autoconf options debug_logs, default_editor and test_suite as
we will not convert them to meson.
- Introduced git_werror meson option to copy the behavior of --werror
option from autotools. It's not the same as with autotools but it is
a close compromise.
- Fixed virt-aa-helper-test which had hard-coded path to compiled
virt-aa-helper binary and that failed with meson.
- Correctly replace all SYSCONFDIR and RUNSTATEDIR in man pages files.
- Changed the way how we run syntax-check. Instead of having single
target it is now part of meson test with suite label 'syntax-checl'.
We will not define sytax-check tests if building from tarball, only
if we are building from git. We use git to get list of files.
- Fixed all issues discovered during review with linking binaries,
missing docs and cpu_map files, typos, etc.
- Meson cross compile configuration files were moved to libvirt-ci.
Pavel
4 years, 3 months
[libvirt PATCH] qemu: capabilities: add missing comma
by Ján Tomko
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
Fixes: bab9257a649386a908069ba890a23f2a5ff5b131
---
Pushed as trivial.
src/qemu/qemu_capabilities.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 589f2eda58..ff6ba8c9e9 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -596,7 +596,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
"intel-iommu.aw-bits",
"spapr-tpm-proxy",
"numa.hmat",
- "blockdev-hostdev-scsi"
+ "blockdev-hostdev-scsi",
);
--
2.26.2
4 years, 3 months
[PATCH v3 0/2] qemu: support shmem device migration
by Wang Xin
Shmem device support property role with 'master'(master=on) or
'peer'(master=off, default mode), which controls to copy the
shared memory on migration to the destination host or not. see
https://git.qemu.org/?p=qemu.git;a=blob_plain;f=docs/system/ivshmem.rst;h...
The 1st patch add attribute 'role', it based on Martin's old patch
https://www.redhat.com/archives/libvir-list/2016-September/msg00536.html
The 2nd patch remove shmem name check in migraiton, which
allows user change shared memory path on destination host.
v3 -> v2:
1. Correct description of shmem ���role��� attribute. If there is any
mistake in the description, please show me. Sorry for my poor
English :)
2. Remove the inappropriate suggestion in migration log.
3. allow shmem name change in migration, instead add a new
'mem-path' attribute.
v2 -> v1:
Fix ivshmem testcases failure.
Wang Xin (2):
qemu: add support for shmem-{plain, doorbell} role
conf: allow shmem name change in migration
docs/formatdomain.html.in | 13 ++++++-
docs/schemas/domaincommon.rng | 8 ++++
src/conf/domain_conf.c | 37 +++++++++++++++++--
src/conf/domain_conf.h | 10 +++++
src/libvirt_private.syms | 2 +
src/qemu/qemu_command.c | 17 ++++++++-
src/qemu/qemu_migration.c | 20 ++++++++--
.../qemuhotplug-ivshmem-plain-detach.xml | 2 +-
.../qemuhotplug-ivshmem-plain.xml | 2 +-
...qemuhotplug-base-live+ivshmem-doorbell.xml | 2 +-
.../qemuhotplug-base-live+ivshmem-plain.xml | 2 +-
.../shmem-plain-doorbell.args | 6 ++-
.../qemuxml2argvdata/shmem-plain-doorbell.xml | 4 +-
.../shmem-plain-doorbell.xml | 4 +-
tests/qemuxml2xmltest.c | 3 +-
15 files changed, 110 insertions(+), 22 deletions(-)
--
2.23.0
4 years, 3 months
[libvirt PATCH] util: virlog.h: fix macro indentation
by Ján Tomko
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
Pushed as trivial.
src/util/virlog.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/util/virlog.h b/src/util/virlog.h
index 716fb9a378..37870e514c 100644
--- a/src/util/virlog.h
+++ b/src/util/virlog.h
@@ -27,10 +27,10 @@
#ifdef PACKAGER_VERSION
# ifdef PACKAGER
# define VIR_LOG_VERSION_STRING \
- "libvirt version: " VERSION ", package: " PACKAGER_VERSION " (" PACKAGER ")"
+ "libvirt version: " VERSION ", package: " PACKAGER_VERSION " (" PACKAGER ")"
# else
# define VIR_LOG_VERSION_STRING \
- "libvirt version: " VERSION ", package: " PACKAGER_VERSION
+ "libvirt version: " VERSION ", package: " PACKAGER_VERSION
# endif
#else
# define VIR_LOG_VERSION_STRING \
@@ -88,7 +88,7 @@ struct _virLogSource {
virLogMessage(src, VIR_LOG_ERROR, filename, linenr, funcname, NULL, __VA_ARGS__)
#define VIR_DEBUG(...) \
- VIR_DEBUG_INT(&virLogSelf, __FILE__, __LINE__, __func__, __VA_ARGS__)
+ VIR_DEBUG_INT(&virLogSelf, __FILE__, __LINE__, __func__, __VA_ARGS__)
#define VIR_INFO(...) \
VIR_INFO_INT(&virLogSelf, __FILE__, __LINE__, __func__, __VA_ARGS__)
#define VIR_WARN(...) \
--
2.26.2
4 years, 3 months
[libvirt PATCH] util: cgroup: remove unused opts in virCgroupV2BindMount
by Ján Tomko
In virCgroupV2BindMount there is an unused variable containing
what seem to be tmpfs mount options.
Delete it. Unlike with cgroups v1, we do not create a tmpfs
here.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/util/vircgroupv2.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c
index 80f596542c..bf6b4a298c 100644
--- a/src/util/vircgroupv2.c
+++ b/src/util/vircgroupv2.c
@@ -548,9 +548,8 @@ virCgroupV2KillRecursive(virCgroupPtr group,
static int
virCgroupV2BindMount(virCgroupPtr group,
const char *oldroot,
- const char *mountopts)
+ const char *mountopts G_GNUC_UNUSED)
{
- g_autofree char *opts = NULL;
g_autofree char *src = NULL;
VIR_DEBUG("Mounting cgroups at '%s'", group->unified.mountPoint);
@@ -561,8 +560,6 @@ virCgroupV2BindMount(virCgroupPtr group,
return -1;
}
- opts = g_strdup_printf("mode=755,size=65536%s", mountopts);
-
src = g_strdup_printf("%s%s", oldroot, group->unified.mountPoint);
if (mount(src, group->unified.mountPoint, "none", MS_BIND, NULL) < 0) {
--
2.26.2
4 years, 3 months
