[libvirt] [dbus PATCH 00/15] Build system fixes, cleanups and tweaks
by Andrea Bolognani
It all started when I got
tests/Makefile.am:17: warning: source file '$(top_srcdir)/src/util.c' is in a subdirectory,
tests/Makefile.am:17: but option 'subdir-objects' is disabled
automake: warning: possible forward-incompatibility.
automake: At least a source file is in a subdirectory, but the 'subdir-objects'
automake: automake option hasn't been enabled. For now, the corresponding output
automake: object file(s) will be placed in the top-level directory. However,
automake: this behaviour will change in future Automake versions: they will
automake: unconditionally cause object files to be placed in the same subdirectory
automake: of the corresponding sources.
automake: You are advised to start using 'subdir-objects' option throughout your
automake: project, to avoid future incompatibilities.
when running autogen.sh and decided to investigate; before
I realized it, I was already deep down the rabbit hole and
falling towards Wonderland at an increasingly concerning
speed.
Andrea Bolognani (15):
gitignore: Fix man page pattern
gitignore: Fix aclocal.m4 pattern
tests: Don't distribute compiled binaries
src: Fix typo in PIE_LDFLAGS
src: Remove empty CLEANFILES
src: Don't list source files in EXTRA_DIST
tests: Move includes to AM_CPPFLAGS
src: Make CFLAGS and LDFLAGS global
configure: Enable libtool
src: Build libutil.la separately
configure: Enable subdir-objects
configure: Enable -Wno-obsolete and tar-pax
configure: Use xz for release archives
data: Rename some variables to *_in_files
autotools: Use consistent style
.gitignore | 15 ++++++++--
Makefile.am | 12 ++++++--
configure.ac | 3 +-
data/Makefile.am | 40 +++++++++++++++++--------
docs/Makefile.am | 16 +++++++---
libvirt-dbus.spec.in | 2 +-
src/Makefile.am | 70 ++++++++++++++++++++++++++------------------
tests/Makefile.am | 36 ++++++++++++++++-------
8 files changed, 130 insertions(+), 64 deletions(-)
--
2.17.1
6 years, 5 months
[libvirt] [PATCH] qemuDomainDeviceDefValidateNetwork: Check for range only if IP prefix set
by Michal Privoznik
The @prefix attribute to <ip/> element for interface type user is
optional. Therefore, if left out it has value of zero in which
case we should not check whether it falls into <4, 27> range.
Otherwise we fail parsing domain XML for no good reason.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/qemu/qemu_domain.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index afd572fc5e..c1798edf41 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -4373,7 +4373,8 @@ qemuDomainDeviceDefValidateNetwork(const virDomainNetDef *net)
}
hasIPv4 = true;
- if (ip->prefix < 4 || ip->prefix > 27) {
+ if (ip->prefix > 0 &&
+ (ip->prefix < 4 || ip->prefix > 27)) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("invalid prefix, must be in range of 4-27"));
return -1;
--
2.16.4
6 years, 5 months