- Devel - libvirt List Archives

[libvirt] [PATCH] Add '<nat>' element to '<forward>' network schemas
by Ján Tomko 05 Sep '13

05 Sep '13

Commits 905629f4 and 1716e7a6 have added support for specifying an IPv4 range and a port range to be used by NAT: <forward mode='nat'> <nat> <address start='10.20.30.40' end='10.20.30.44'/> <port start='60000' end='65432'/> </nat> </forward> https://bugzilla.redhat.com/show_bug.cgi?id=1004364 --- docs/schemas/network.rng | 26 +++++++++++++++++++++ docs/schemas/networkcommon.rng | 7 ++++++ .../nat-network-forward-nat-address.xml | 26 +++++++++++++++++++++ .../nat-network-forward-nat-address.xml | 27 ++++++++++++++++++++++ tests/networkxml2xmltest.c | 1 + 5 files changed, 87 insertions(+) create mode 100644 tests/networkxml2xmlin/nat-network-forward-nat-address.xml create mode 100644 tests/networkxml2xmlout/nat-network-forward-nat-address.xml diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index ab183f1..d7edb09 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -160,6 +160,32 @@ <empty/> </element> </optional> + <optional> + <element name='nat'> + <interleave> + <optional> + <element name='address'> + <attribute name='start'> + <ref name='ipv4Addr'/> + </attribute> + <attribute name='end'> + <ref name='ipv4Addr'/> + </attribute> + </element> + </optional> + <optional> + <element name='port'> + <attribute name='start'> + <ref name='port'/> + </attribute> + <attribute name='end'> + <ref name='port'/> + </attribute> + </element> + </optional> + </interleave> + </element> + </optional> </interleave> </element> </optional> diff --git a/docs/schemas/networkcommon.rng b/docs/schemas/networkcommon.rng index e60f1fc..e26b7f3 100644 --- a/docs/schemas/networkcommon.rng +++ b/docs/schemas/networkcommon.rng @@ -217,4 +217,11 @@ </oneOrMore> </element> </define> + + <define name='port'> + <data type='integer'> + <param name='minInclusive'>1</param> + <param name='maxInclusive'>65535</param> + </data> + </define> </grammar> diff --git a/tests/networkxml2xmlin/nat-network-forward-nat-address.xml b/tests/networkxml2xmlin/nat-network-forward-nat-address.xml new file mode 100644 index 0000000..403d058 --- /dev/null +++ b/tests/networkxml2xmlin/nat-network-forward-nat-address.xml @@ -0,0 +1,26 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <bridge name="virbr0"/> + <forward mode="nat" dev="eth1"> + <nat> + <address start='10.20.30.40' end='10.20.30.44'/> + <port start='60000' end='65432'/> + </nat> + </forward> + <ip address="192.168.122.1" netmask="255.255.255.0"> + <dhcp> + <range start="192.168.122.2" end="192.168.122.254"/> + <host mac="00:16:3e:77:e2:ed" name="a.example.com" ip="192.168.122.10"/> + <host mac="00:16:3e:3e:a9:1a" name="b.example.com" ip="192.168.122.11"/> + </dhcp> + </ip> + <ip family="ipv4" address="192.168.123.1" netmask="255.255.255.0"> + </ip> + <ip family="ipv6" address="2001:db8:ac10:fe01::1" prefix="64"> + </ip> + <ip family="ipv6" address="2001:db8:ac10:fd01::1" prefix="64"> + </ip> + <ip family="ipv4" address="10.24.10.1"> + </ip> +</network> diff --git a/tests/networkxml2xmlout/nat-network-forward-nat-address.xml b/tests/networkxml2xmlout/nat-network-forward-nat-address.xml new file mode 100644 index 0000000..faeba24 --- /dev/null +++ b/tests/networkxml2xmlout/nat-network-forward-nat-address.xml @@ -0,0 +1,27 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9b</uuid> + <forward dev='eth1' mode='nat'> + <nat> + <address start='10.20.30.40' end='10.20.30.44'/> + <port start='60000' end='65432'/> + </nat> + <interface dev='eth1'/> + </forward> + <bridge name='virbr0' stp='on' delay='0'/> + <ip address='192.168.122.1' netmask='255.255.255.0'> + <dhcp> + <range start='192.168.122.2' end='192.168.122.254'/> + <host mac='00:16:3e:77:e2:ed' name='a.example.com' ip='192.168.122.10'/> + <host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/> + </dhcp> + </ip> + <ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'> + </ip> + <ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'> + </ip> + <ip family='ipv4' address='10.24.10.1'> + </ip> +</network> diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index 675a862..d04039d 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -108,6 +108,7 @@ mymain(void) DO_TEST("nat-network-dns-srv-record-minimal"); DO_TEST("nat-network-dns-hosts"); DO_TEST("nat-network-dns-forward-plain"); + DO_TEST("nat-network-forward-nat-address"); DO_TEST("8021Qbh-net"); DO_TEST("direct-net"); DO_TEST("host-bridge-net"); -- 1.8.1.5

2 2

[libvirt] [PATCH] Fix a typo in network XML docs
by Ján Tomko 05 Sep '13

05 Sep '13

--- Pushed as trivial. docs/formatnetwork.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index e1482db..36c381a 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -155,7 +155,7 @@ </forward> ...</pre> <p> - An singe IPv4 address can be set by setting + A single IPv4 address can be set by setting <code>start</code> and <code>end</code> attributes to the same value. </p> -- 1.8.1.5

1 0

[libvirt] [PATCH] Change 'shortforward' to bool.
by Ján Tomko 05 Sep '13

05 Sep '13

--- Pushed as trivial. src/conf/network_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index d54f2aa..654919e 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2552,7 +2552,7 @@ virNetworkDefFormatInternal(virBufferPtr buf, unsigned char *uuid; char uuidstr[VIR_UUID_STRING_BUFLEN]; size_t i; - int shortforward; + bool shortforward; virBufferAddLit(buf, "<network"); if (!(flags & VIR_NETWORK_XML_INACTIVE) && (def->connections > 0)) { -- 1.8.1.5

1 0

[libvirt] [PATCH] LXC: Don't mount securityfs when user namespace enabled
by Gao feng 05 Sep '13

05 Sep '13

Right now, securityfs is disallowed to be mounted in un init user namespace, we should avoid to mount securityfs in the container which enables user namespace. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 8abaea0..c41ab40 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -750,7 +750,7 @@ err: } -static int lxcContainerMountBasicFS(void) +static int lxcContainerMountBasicFS(bool userns_enabled) { const struct { const char *src; @@ -801,6 +801,9 @@ static int lxcContainerMountBasicFS(void) continue; #endif + if (STREQ(mnts[i].src, "securityfs") && userns_enabled) + continue; + if (virFileMakePath(mnts[i].dst) < 0) { virReportSystemError(errno, _("Failed to mkdir %s"), @@ -1530,7 +1533,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef, goto cleanup; /* Mounts the core /proc, /sys, etc filesystems */ - if (lxcContainerMountBasicFS() < 0) + if (lxcContainerMountBasicFS(vmDef->idmap.nuidmap) < 0) goto cleanup; /* Mounts /proc/meminfo etc sysinfo */ -- 1.8.3.1

2 1

[libvirt] [PATCH] [RFC] docs: Add OpenStack into references
by Martin Kletzander 05 Sep '13

05 Sep '13

diff --git a/docs/apps.html.in b/docs/apps.html.in index 46e5dca..9f22df8 100644 --- a/docs/apps.html.in +++ b/docs/apps.html.in @@ -244,6 +244,15 @@ integrates libvirt for VM monitoring, live migration, and life-cycle management. </dd> + + <dt><a href="http://www.openstack.org">OpenStack</a></dt> + <dd> + OpenStack is a "cloud operating system" usable for both public + and private clouds. Its various parts take care of compute, + storage and networking resources and iterface with the user + using a dashboard. Compute part uses libvirt to manage VM + life-cycle, monitoring and so on. + </dd> </dl> <h2><a name="libraries">Libraries</a></h2> -- 1.8.3.2

4 5

[libvirt] [PATCH] conf: Don't deref NULL actual network in virDomainNetGetActualHostdev()
by Peter Krempa 05 Sep '13

05 Sep '13

In commit 991270db99690 I've used virDomainNetGetActualHostdev() to get the actual hostdev from a network when removing the network from the list to avoid leaving the hostdev in the list. I didn't notice that this function doesn't check if the actual network is allocated and dereferences it. This crashes the daemon when cleaning up a domain object in early startup phases when the actual network definition isn't allocated. When the actual definition isn't present, the hostdev that might correspond to it won't be present anyways so it's safe to return NULL. Thanks to Cole Robinson for noticing this problem. --- src/conf/domain_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cef4cf9..276c6ba 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17875,6 +17875,7 @@ virDomainNetGetActualHostdev(virDomainNetDefPtr iface) if (iface->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) return &iface->data.hostdev.def; if (iface->type == VIR_DOMAIN_NET_TYPE_NETWORK && + iface->data.network.actual && iface->data.network.actual->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) { return &iface->data.network.actual->data.hostdev.def; } -- 1.8.3.2

2 2

[libvirt] [PATCH] libxl: Unconditionally call virSysinfoRead() on driver init
by Jim Fehlig 05 Sep '13

05 Sep '13

No need to check if priviledged when reading hostsysinfo, since that check was already done in libxlDriverShouldLoad(). The libxl driver fails to load if not priviledged. Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- src/libxl/libxl_driver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 426167c..e2a6d44 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -873,8 +873,7 @@ libxlStateInitialize(bool privileged, } /* read the host sysinfo */ - if (privileged) - libxl_driver->hostsysinfo = virSysinfoRead(); + libxl_driver->hostsysinfo = virSysinfoRead(); libxl_driver->domainEventState = virDomainEventStateNew(); if (!libxl_driver->domainEventState) -- 1.8.1.4

2 2

[libvirt] [PATCH] virsh: fix build on mingw, which lacks termios stuff
by Eric Blake 05 Sep '13

05 Sep '13

Recent patches to fix handling of Ctrl-C when interacting with ssh are not portable to mingw, which lacks termios handling. The simplest solution is to just compile that code out, and if someone ever appears that has a serious interest in getting virsh fully functional even with ssh connections, they can provide patches at that time. * tools/virsh.h (_vshControl): Make termattr conditional. * tools/virsh.c (vshTTYIsInterruptCharacter) (vshTTYDisableInterrupt, vshTTYRestore, cfmakeraw, vshTTYMakeRaw) (main): Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule, for ./autobuild.sh tools/virsh.c | 25 ++++++++++++++++++------- tools/virsh.h | 2 ++ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 37e9716..bf2fbf8 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2213,20 +2213,23 @@ vshPrintExtra(vshControl *ctl, const char *format, ...) bool -vshTTYIsInterruptCharacter(vshControl *ctl, - const char chr) +vshTTYIsInterruptCharacter(vshControl *ctl ATTRIBUTE_UNUSED, + const char chr ATTRIBUTE_UNUSED) { +#ifndef WIN32 if (ctl->istty && ctl->termattr.c_cc[VINTR] == chr) return true; +#endif return false; } int -vshTTYDisableInterrupt(vshControl *ctl) +vshTTYDisableInterrupt(vshControl *ctl ATTRIBUTE_UNUSED) { +#ifndef WIN32 struct termios termset = ctl->termattr; if (!ctl->istty) @@ -2241,25 +2244,28 @@ vshTTYDisableInterrupt(vshControl *ctl) if (tcsetattr(STDIN_FILENO, TCSANOW, &termset) < 0) return -1; +#endif return 0; } int -vshTTYRestore(vshControl *ctl) +vshTTYRestore(vshControl *ctl ATTRIBUTE_UNUSED) { +#ifndef WIN32 if (!ctl->istty) return 0; if (tcsetattr(STDIN_FILENO, TCSAFLUSH, &ctl->termattr) < 0) return -1; +#endif return 0; } -#ifndef HAVE_CFMAKERAW +#if !defined(WIN32) && !defined(HAVE_CFMAKERAW) /* provide fallback in case cfmakeraw isn't available */ static void cfmakeraw(struct termios *attr) @@ -2271,12 +2277,14 @@ cfmakeraw(struct termios *attr) attr->c_cflag &= ~(CSIZE | PARENB); attr->c_cflag |= CS8; } -#endif /* !HAVE_CFMAKERAW */ +#endif /* !WIN32 && !HAVE_CFMAKERAW */ int -vshTTYMakeRaw(vshControl *ctl, bool report_errors) +vshTTYMakeRaw(vshControl *ctl ATTRIBUTE_UNUSED, + bool report_errors ATTRIBUTE_UNUSED) { +#ifndef WIN32 struct termios rawattr = ctl->termattr; char ebuf[1024]; @@ -2297,6 +2305,7 @@ vshTTYMakeRaw(vshControl *ctl, bool report_errors) virStrerror(errno, ebuf, sizeof(ebuf))); return -1; } +#endif return 0; } @@ -3249,8 +3258,10 @@ main(int argc, char **argv) if (isatty(STDIN_FILENO)) { ctl->istty = true; +#ifndef WIN32 if (tcgetattr(STDIN_FILENO, &ctl->termattr) < 0) ctl->istty = false; +#endif } if (virMutexInit(&ctl->lock) < 0) { diff --git a/tools/virsh.h b/tools/virsh.h index 8afe13f..b5e2715 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -242,7 +242,9 @@ struct _vshControl { const char *escapeChar; /* String representation of console escape character */ +# ifndef WIN32 struct termios termattr; /* settings of the tty terminal */ +# endif bool istty; /* is the terminal a tty */ }; -- 1.8.3.1

1 0

[libvirt] [PATCH 0/3] Fix and clean up multiple issues in virsh console handling
by Peter Krempa 05 Sep '13

05 Sep '13

This series has to be applied on top of "virsh: Handle interrupting of jobs manually". Peter Krempa (3): tools: rename console.[ch] to virsh-console.[ch] and fix coding style virsh: Rename vshMakeStdinRaw to vshTTYMakeRaw and move it to virsh.c virsh-console: Avoid using signal() in multithreaded application cfg.mk | 2 +- po/POTFILES.in | 2 +- tools/Makefile.am | 2 +- tools/{console.c => virsh-console.c} | 153 +++++++++++++++-------------------- tools/{console.h => virsh-console.h} | 11 ++- tools/virsh-domain.c | 4 +- tools/virsh.c | 50 +++++++++++- tools/virsh.h | 1 + 8 files changed, 123 insertions(+), 102 deletions(-) rename tools/{console.c => virsh-console.c} (76%) rename tools/{console.h => virsh-console.h} (81%) -- 1.8.3.2

4 10

[libvirt] [PATCH 00/12] Various libxl driver improvements
by Jim Fehlig 05 Sep '13

05 Sep '13

This series contains several improvements for the libxl driver. Patches 1 and 2 are primarily code movement, putting code in files that are more consistent with other drivers. Patches 3 through 12 improve locking of the libxlDriverPrivate struct, similar to the work done in the QEMU and LXC drivers Obviously post-1.1.2 material, but would be nice to get it in soon thereafter for testing throughout the 1.1.3 cycle... Jim Fehlig (12): libxl: Move detection of autoballoon to libxl_conf libxl: Introduce libxl_domain.[ch] libxl: Earlier detection of not running on Xen libxl: Add libxl_version_info to libxlDriverPrivate libxl: libxl: Use per-domain ctx in libxlMakeDomCreateInfo libxl: User per-domain ctx in libxlDomainGetInfo libxl: Introduce libxlDriverConfig object libxl: Use atomic ops for driver->nactive libxl: Add comments to libxlDriverPrivate fields libxl: Move driver lock/unlock to libxl_conf libxl: Remove unnecessary driver locking libxl: Add libxlDomObjFromDomain po/POTFILES.in | 1 + src/Makefile.am | 1 + src/libxl/libxl_conf.c | 149 +++++- src/libxl/libxl_conf.h | 87 +-- src/libxl/libxl_domain.c | 469 ++++++++++++++++ src/libxl/libxl_domain.h | 61 +++ src/libxl/libxl_driver.c | 1329 ++++++++++------------------------------------ 7 files changed, 1010 insertions(+), 1087 deletions(-) create mode 100644 src/libxl/libxl_domain.c create mode 100644 src/libxl/libxl_domain.h -- 1.8.1.4

5 49