- Devel - libvirt List Archives

[libvirt] [PATCH v2] Makefile: Fix parallel build after Xen-xl parser introduction
by Michal Privoznik 07 Jan '15

07 Jan '15

Well, the parallel build doesn't work as there are not dependencies set correctly. When running 'make -j' I see this error: make[2]: Entering directory '/home/zippy/work/libvirt/libvirt.git/src' GEN util/virkeymaps.h GEN locking/lock_protocol.h make[2]: *** No rule to make target 'xenconfig/xen_xl_disk.h', needed by 'all'. Stop. make[2]: *** Waiting for unfinished jobs.... GEN lxc/lxc_controller_dispatch.h The fix is to correctly set dependencies by letting make know that .c and .h are to be generated from .l. Moreover, the section is moved closer to the other section which uses it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- This is reworked version of my first patch. The difference is that I'm using a stamp this time. src/Makefile.am | 46 +++++++++++++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index c6d736e..e00ff63 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1000,23 +1000,6 @@ CPU_SOURCES = \ VMX_SOURCES = \ vmx/vmx.c vmx/vmx.h -AM_LFLAGS = -Pxl_disk_ --header-file=../$*.h -LEX_OUTPUT_ROOT = lex.xl_disk_ -BUILT_SOURCES += xenconfig/xen_xl_disk.c xenconfig/xen_xl_disk.h -# Generated header file is not implicitly added to dist -EXTRA_DIST += xenconfig/xen_xl_disk.h -CLEANFILES += xenconfig/xen_xl_disk.h xenconfig/xen_xl_disk.c - -XENXLDISKPARSER_SOURCES = xenconfig/xen_xl_disk.l - -XENCONFIG_SOURCES = \ - xenconfig/xenxs_private.h \ - xenconfig/xen_common.c xenconfig/xen_common.h \ - xenconfig/xen_sxpr.c xenconfig/xen_sxpr.h \ - xenconfig/xen_xm.c xenconfig/xen_xm.h \ - xenconfig/xen_xl.c xenconfig/xen_xl.h \ - xenconfig/xen_xl_disk.h - pkgdata_DATA = cpu/cpu_map.xml EXTRA_DIST += $(pkgdata_DATA) @@ -1070,6 +1053,33 @@ libvirt_vmx_la_SOURCES = $(VMX_SOURCES) endif WITH_VMX if WITH_XENCONFIG + +XENXLDISKPARSER_GENERATED_STAMP = .xen_xl_disk.stamp + +$(XENXLDISKPARSER_GENERATED): $(XENXLDISKPARSER_GENERATED_STAMP) + +$(XENXLDISKPARSER_GENERATED_STAMP): $(XENXLDISKPARSER_SOURCES) + $(AM_V_GEN) $(SHELL) $(YLWRAP) $< lex.xl_disk_.c xenconfig/xen_xl_disk.c \ + -- $(LEXCOMPILE) && touch $@ + +AM_LFLAGS = -Pxl_disk_ --header-file=../$*.h +XENXLDISKPARSER_GENERATED = xenconfig/xen_xl_disk.c xenconfig/xen_xl_disk.h + +BUILT_SOURCES += $(XENXLDISKPARSER_GENERATED) +EXTRA_DIST += $(XENXLDISKPARSER_GENERATED) $(XENXLDISKPARSER_GENERATED_STAMP) +MAINTAINERCLEANFILES += $(XENXLDISKPARSER_GENERATED) \ + $(XENXLDISKPARSER_GENERATED_STAMP) + +XENXLDISKPARSER_SOURCES = xenconfig/xen_xl_disk.l + +XENCONFIG_SOURCES = \ + xenconfig/xenxs_private.h \ + xenconfig/xen_common.c xenconfig/xen_common.h \ + xenconfig/xen_sxpr.c xenconfig/xen_sxpr.h \ + xenconfig/xen_xm.c xenconfig/xen_xm.h \ + xenconfig/xen_xl.c xenconfig/xen_xl.h \ + xenconfig/xen_xl_disk_i.h + # Flex generated XL disk parser needs to be compiled without WARN_FLAGS # Add the generated object to its own library to control CFLAGS noinst_LTLIBRARIES += libvirt_xenxldiskparser.la @@ -1077,6 +1087,8 @@ libvirt_xenxldiskparser_la_CFLAGS = \ -I$(top_srcdir)/src/conf $(AM_CFLAGS) -Wno-unused-parameter libvirt_xenxldiskparser_la_SOURCES = \ $(XENXLDISKPARSER_SOURCES) +libvirt_xenxldiskparser_la_DEPENDENCIES = \ + $(XENXLDISKPARSER_GENERATED) noinst_LTLIBRARIES += libvirt_xenconfig.la libvirt_la_BUILT_LIBADD += libvirt_xenconfig.la -- 2.0.5

4 3

[libvirt] [PATCHv5 00/18] LXC IP configuration feature
by Cédric Bosdonnat 06 Jan '15

06 Jan '15

Hi all, It's time for offering presents, so I'm sending you my updated patch series for IP configuration in LXC containers. The changes with v4 include: * Replacing the <gateway> element by a <route> one. * Addressing the comments you guys made I didn't forbid the use of iproute2 / ifconfig in containers if built without libnl, as I'm not sure about the possible consequences. Could it introduce regressions for some use cases/distros? Cédric Bosdonnat (18): Forgot to cleanup ifname_guest* in domain network def parsing virNetDevSetIPv4Address: libnl implementation Renamed virNetDevSetIPv4Address to virNetDevSetIPAddress virNetDevAddRoute: implementation using netlink virNetDevClearIPv4Address: netlink implementation Renamed virNetDevClearIPv4Address to virNetDevClearIPAddress Domain conf: allow more than one IP address for net devices IP doc LXC: set IP addresses to veth devices in the container lxc conf2xml: convert IP addresses Allow network capabilities hostdev to configure IP addresses lxc conf2xml: convert ip addresses for hostdev NICs Domain network devices can now have a <route> element lxc conf2xml: convert lxc.network.ipv[46].gateway LXC: use the new net devices routes definition LXC: honour network devices link state Openvz --ipadd can be provided multiple times Report error if a driver can't handle multiple IP addresses docs/formatdomain.html.in | 46 +++ docs/schemas/domaincommon.rng | 75 ++++- src/conf/domain_conf.c | 320 ++++++++++++++++++-- src/conf/domain_conf.h | 29 +- src/libvirt_private.syms | 6 +- src/lxc/lxc_container.c | 56 +++- src/lxc/lxc_native.c | 202 +++++++++---- src/network/bridge_driver.c | 4 +- src/openvz/openvz_conf.c | 2 +- src/openvz/openvz_driver.c | 11 +- src/qemu/qemu_driver.c | 26 +- src/qemu/qemu_hotplug.c | 5 +- src/uml/uml_conf.c | 2 +- src/util/virnetdev.c | 332 ++++++++++++++++++--- src/util/virnetdev.h | 14 +- src/util/virnetlink.c | 38 +++ src/util/virnetlink.h | 2 + src/util/virsocketaddr.h | 4 + src/vbox/vbox_common.c | 16 +- src/xenconfig/xen_common.c | 29 +- src/xenconfig/xen_sxpr.c | 26 +- .../lxcconf2xmldata/lxcconf2xml-physnetwork.config | 4 + tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml | 4 + tests/lxcconf2xmldata/lxcconf2xml-simple.config | 4 + tests/lxcconf2xmldata/lxcconf2xml-simple.xml | 4 + tests/lxcxml2xmldata/lxc-hostdev.xml | 4 + tests/lxcxml2xmldata/lxc-idmap.xml | 4 + tests/openvzutilstest.c | 2 +- tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml | 2 +- tests/sexpr2xmldata/sexpr2xml-net-routed.xml | 2 +- 30 files changed, 1107 insertions(+), 168 deletions(-) -- 2.1.2

5 40

[libvirt] [PATCH] docs: Document some -boot option limitations on UEFI
by Michal Privoznik 06 Jan '15

06 Jan '15

It was brought to my attention that some -boot options may not work with UEFI. For instance, rebootTimeout is very SeaBIOS specific,splash logo is not implemented yet on OVMF, and so on. We should document this limitation at least. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- docs/formatdomain.html.in | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 499879e..a35316e 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -174,6 +174,18 @@ elements are mutually exclusive. <span class="since">Since 0.1.3, per-device boot since 0.8.8</span> </dd> + </dl> + <p>Up till here the BIOS/UEFI configuration knobs are generic enough to + be implemented by majority (if not all) firmwares out there. However, + from now on not every single setting makes sense to all firmwares. For + instance, <code>rebootTimeout</code> doesn't make sense for UEFI, + <code>useserial</code> might not be usable with a BIOS firmware that + doesn't produce any output onto serial line, etc. Moreover, firmwares + don't usually export their capabilities for libvirt (or users) to check. + And the set of their capabilities can change with every new release. + Hence users are advised to try the settings they use before relying on + them in production.</p> + <dl> <dt><code>bootmenu</code></dt> <dd> Whether or not to enable an interactive boot menu prompt on guest startup. The <code>enable</code> attribute can be either "yes" or "no". -- 2.0.5

2 1

[libvirt] [PATCHv2] qemu: fix tc old rules will be cleaned if set tc new rules fail
by Luyao Huang 06 Jan '15

06 Jan '15

https://bugzilla.redhat.com/show_bug.cgi?id=1177723 If tc cmd failed (maybe value too large) when we use virDomainSetInterfaceParameters , the old rules will be clean. Restore the old rules if tc failed. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- v1 make a big mistake that i used a old libvirt src/qemu/qemu_driver.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 73a825d..650e0dd 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -10494,8 +10494,12 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom, sizeof(*newBandwidth->out)); } - if (virNetDevBandwidthSet(net->ifname, newBandwidth, false) < 0) + if (virNetDevBandwidthSet(net->ifname, newBandwidth, false) < 0) { + ignore_value(virNetDevBandwidthSet(net->ifname, + net->bandwidth, + false)); goto endjob; + } virNetDevBandwidthFree(net->bandwidth); if (newBandwidth->in || newBandwidth->out) { -- 1.8.3.1

2 1

[libvirt] [PATCH] qemu: fix miss goto cleanup in qemuDomainAttachNetDevice
by Luyao Huang 06 Jan '15

06 Jan '15

This place have a wrong logic, maybe forget goto cleanup. Also fix some small things. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- I am not sure i am right, but hotplug a net do not a address may cause a issue. src/qemu/qemu_hotplug.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 5d0d8e0..bfe1bd0 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -924,7 +924,7 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, /* Set device online immediately */ if (qemuInterfaceStartDevice(net) < 0) - goto cleanup; + goto cleanup; /* Set Bandwidth */ if (virNetDevSupportBandwidth(actualType) && @@ -952,7 +952,8 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, goto cleanup; } else if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VIRTIO_S390)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio-s390 net device cannot be hotplugged.")); + _("virtio-s390 net device cannot be hotplugged.")); + goto cleanup; } else if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DEVICE) && virDomainPCIAddressEnsureAddr(priv->pciaddrs, &net->info) < 0) { goto cleanup; -- 1.8.3.1

2 1

[libvirt] [PATCH] virnetlink: fix build on non-Linux
by Eric Blake 06 Jan '15

06 Jan '15

Commit 4dc04d3a added virNetlinkGetErrorCode, but forgot to provide a fallback, which kills the build on mingw (among others): CCLD libvirt.la Cannot export virNetlinkGetErrorCode: symbol not defined collect2: error: ld returned 1 exit status * src/util/virnetlink.c (virNetlinkGetErrorCode): Provide fallback. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. src/util/virnetlink.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 1a2b7a1..d52f66a 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2014 Red Hat, Inc. + * Copyright (C) 2010-2015 Red Hat, Inc. * Copyright (C) 2010-2012 IBM Corporation * * This library is free software; you can redistribute it and/or @@ -276,7 +276,9 @@ int virNetlinkCommand(struct nl_msg *nl_msg, return ret; } -int virNetlinkGetErrorCode(struct nlmsghdr *resp, unsigned int recvbuflen) + +int +virNetlinkGetErrorCode(struct nlmsghdr *resp, unsigned int recvbuflen) { struct nlmsgerr *err; int result = 0; @@ -314,6 +316,7 @@ int virNetlinkGetErrorCode(struct nlmsghdr *resp, unsigned int recvbuflen) return -EINVAL; } + static void virNetlinkEventServerLock(virNetlinkEventSrvPrivatePtr driver) { @@ -872,4 +875,13 @@ int virNetlinkEventRemoveClient(int watch ATTRIBUTE_UNUSED, return -1; } + +int +virNetlinkGetErrorCode(struct nlmsghdr *resp ATTRIBUTE_UNUSED, + unsigned int recvbuflen ATTRIBUTE_UNUSED) +{ + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); + return -EINVAL; +} + #endif /* __linux__ */ -- 2.1.0

2 1

[libvirt] [PATCH RFC] LXC: don't RO mount /proc, /sys when user namespce enabled
by Chen Hanxiao 06 Jan '15

06 Jan '15

If we enabled user ns and provided a uid/gid map, we do not need to mount /proc, /sys as readonly. Leave it to kernel for protection. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 1b9e2f2..3b5845a 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -983,6 +983,12 @@ static int lxcContainerMountBasicFS(bool userns_enabled, goto cleanup; } + /* don't readonly mount when userns is enabled */ + if (userns_enabled) { + VIR_FREE(mnt_src); + continue; + } + if (bindOverReadonly && mount(mnt_src, mnt->dst, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY, NULL) < 0) { -- 1.9.3

5 5

[libvirt] [PATCH] networkGetDHCPLeases: Remove unnecessary error reporting
by Nehal J Wani 06 Jan '15

06 Jan '15

Lack of a lease (whether mac is given or not) is a normal expected scenario. There is no need to raise an error. Signed-off-by: Nehal J Wani <nehaljw.kkd1(a)gmail.com> --- src/network/bridge_driver.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 29222d0..6a49a23 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3654,12 +3654,6 @@ networkGetDHCPLeases(virNetworkPtr network, VIR_FREE(lease); } - if (need_results && mac && !leases_ret) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("no lease with matching MAC address: %s"), mac); - goto error; - } - if (leases_ret) { /* NULL terminated array */ ignore_value(VIR_REALLOC_N(leases_ret, nleases + 1)); -- 2.1.0

3 2

[libvirt] [PATCH] qemu: use a wrong name for guest panic status
by Luyao Huang 06 Jan '15

06 Jan '15

https://bugzilla.redhat.com/show_bug.cgi?id=1178652 We will get a warning when we have a guest in paused status(casue by kernel panic) and restart libvirtd, warning message like this: Qemu reported unknown VM status: 'guest-panicked' and this seems because we set a wrong status name in qemu_monitor.c, and from qemu qapi-schema.json file we know this status should named 'guest-panicked'. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 100bbd0..57a13ab 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -127,7 +127,7 @@ VIR_ENUM_IMPL(qemuMonitorVMStatus, QEMU_MONITOR_VM_STATUS_LAST, "debug", "inmigrate", "internal-error", "io-error", "paused", "postmigrate", "prelaunch", "finish-migrate", "restore-vm", - "running", "save-vm", "shutdown", "watchdog", "guest-panic") + "running", "save-vm", "shutdown", "watchdog", "guest-panicked") typedef enum { QEMU_MONITOR_BLOCK_IO_STATUS_OK, -- 1.8.3.1

2 1

[libvirt] [PATCH] Makefile: Fix parallel build after Xen-xl parser introduction
by Michal Privoznik 06 Jan '15

06 Jan '15

Well, the parallel build doesn't work as there are not dependencies set correctly. When running 'make -j' I see this error: make[2]: Entering directory '/home/zippy/work/libvirt/libvirt.git/src' GEN util/virkeymaps.h GEN locking/lock_protocol.h make[2]: *** No rule to make target 'xenconfig/xen_xl_disk.h', needed by 'all'. Stop. make[2]: *** Waiting for unfinished jobs.... GEN lxc/lxc_controller_dispatch.h The fix is to correctly set dependencies by letting make know that .c and .h are to be generated from .l. Moreover, the section is moved closer to the other section which uses it. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- I'm not fully satisfied with this patch yet. I mean, for some reason it creates 'src/.h' file, but hey - it makes parallel build work again. Any brighter idea appreciated. src/Makefile.am | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index c6d736e..7619cf0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1000,23 +1000,6 @@ CPU_SOURCES = \ VMX_SOURCES = \ vmx/vmx.c vmx/vmx.h -AM_LFLAGS = -Pxl_disk_ --header-file=../$*.h -LEX_OUTPUT_ROOT = lex.xl_disk_ -BUILT_SOURCES += xenconfig/xen_xl_disk.c xenconfig/xen_xl_disk.h -# Generated header file is not implicitly added to dist -EXTRA_DIST += xenconfig/xen_xl_disk.h -CLEANFILES += xenconfig/xen_xl_disk.h xenconfig/xen_xl_disk.c - -XENXLDISKPARSER_SOURCES = xenconfig/xen_xl_disk.l - -XENCONFIG_SOURCES = \ - xenconfig/xenxs_private.h \ - xenconfig/xen_common.c xenconfig/xen_common.h \ - xenconfig/xen_sxpr.c xenconfig/xen_sxpr.h \ - xenconfig/xen_xm.c xenconfig/xen_xm.h \ - xenconfig/xen_xl.c xenconfig/xen_xl.h \ - xenconfig/xen_xl_disk.h - pkgdata_DATA = cpu/cpu_map.xml EXTRA_DIST += $(pkgdata_DATA) @@ -1078,6 +1061,25 @@ libvirt_xenxldiskparser_la_CFLAGS = \ libvirt_xenxldiskparser_la_SOURCES = \ $(XENXLDISKPARSER_SOURCES) +AM_LFLAGS = -Pxl_disk_ --header-file=../$*.h +XENXLDISKPARSER_GENERATED = xenconfig/xen_xl_disk.c xenconfig/xen_xl_disk.h +BUILT_SOURCES += $(XENXLDISKPARSER_GENERATED) +EXTRA_DIST += $(XENXLDISKPARSER_GENERATED) +MAINTAINERCLEANFILES += $(XENXLDISKPARSER_GENERATED) + +XENXLDISKPARSER_SOURCES = xenconfig/xen_xl_disk.l + +$(XENXLDISKPARSER_GENERATED): $(XENXLDISKPARSER_SOURCES) + $(SHELL) $(YLWRAP) $< lex.xl_disk_.c $@ -- $(LEXCOMPILE) + +XENCONFIG_SOURCES = \ + xenconfig/xenxs_private.h \ + xenconfig/xen_common.c xenconfig/xen_common.h \ + xenconfig/xen_sxpr.c xenconfig/xen_sxpr.h \ + xenconfig/xen_xm.c xenconfig/xen_xm.h \ + xenconfig/xen_xl.c xenconfig/xen_xl.h \ + xenconfig/xen_xl_disk_i.h + noinst_LTLIBRARIES += libvirt_xenconfig.la libvirt_la_BUILT_LIBADD += libvirt_xenconfig.la libvirt_xenconfig_la_CFLAGS = \ -- 2.0.5

4 3