- Devel - libvirt List Archives

[libvirt] Announce: Nuxis 1.3.0 and 2.0.0
by Nuno Fernandes 18 Sep '13

18 Sep '13

Hello, Nuxis is an integrated solution for virtualization management. Some of its features are centralized management of nodes/physical machines and virtual machines, management of virtual networks, storage management, ISO management, monitoring and statistics charts, backup/restore of appliance configurations, import from and export to other virtualization systems using the OVF format, access control, support for multiple operating systems on 32-bit and 64-bit architectures, including Linux and Windows, paravirtualized hardware acceleration drivers, live migrate, PXE boot, Web management, storage management with LVM, and more. We are pleased to announce major version 2.0.0. It's now based on 64-bit CentOS6 with the xen4centos repository. There are many bugfixes and a few enhancements: - physical volume resizing - triggering a warning message when one snapshot is out of free space - implementation of Storage iSCSI configuration and support. - Libvirt has been updated to 0.10.2.7, Xen to 4.2.3, and the kernel to 3.4.61. For more information please check http://freecode.com/projects/etvm and homepage http://www.nuxis.com. As always the code is at github https://github.com/eurotux/ETVA. We have a users mailling list at http://mailman.nuxis.com/pipermail/nuxis-users/ Best regards, Nuno Fernandes

1 0

[libvirt] [PATCH 0/2] Add support for device blkio iops and bps throttle
by hzguanqiang＠gmail.com 18 Sep '13

18 Sep '13

From: Guan Qiang <hzguanqiang(a)corp.netease.com> The patches add support for setting/getting blkio read/write bps/iops throttle per-device with blkio cgroup. Guan Qiang (2): blkiotune: add support for device iops and bps throttle blkiotune: add virsh support for blkiotune.throttle.iops/bps docs/formatdomain.html.in | 8 + docs/schemas/domaincommon.rng | 28 +- include/libvirt/libvirt.h.in | 40 ++ src/conf/domain_conf.c | 115 +++- src/conf/domain_conf.h | 16 +- src/libvirt_private.syms | 4 +- src/lxc/lxc_cgroup.c | 9 +- src/qemu/qemu_cgroup.c | 10 +- src/qemu/qemu_driver.c | 579 ++++++++++++++++++-- src/util/vircgroup.c | 79 ++- src/util/vircgroup.h | 8 +- .../qemuxml2argv-blkiotune-device.xml | 4 + tools/virsh-domain.c | 64 +++ tools/virsh.pod | 32 +- 14 files changed, 883 insertions(+), 113 deletions(-) -- 1.7.9.5

3 2

[libvirt] [RFC] Add iommu group commands
by Li Zhang 18 Sep '13

18 Sep '13

Hi, Currently, we need to assign the iommu group to guests manually. It needs to know the groups information. I think we can add some iommu group commands to provide users groups information. I can think of these commands as the following: #virsh group-list <--active> * list all the groups in the system with VFIO * --active: list the active groups which have been used by guests. #virsh group-devs <groupnum> * list the devices in the group. *If groupnum is not specified, it will list every groups' devices. # virsh group-dumpxml <groupnum> * dump the group's xml configuration. dumxml file for example: <iommuGroup number='1'> <address domain='0x0001' bus='0x40' slot='0x00' function='0x0'/> <address domain='0x0001' bus='0x40' slot='0x00' function='0x1'/> </iommuGroup> This information can also be got by #nodedev-dumpxml <device> But users still can't know all the groups and the devices in the group directly. Any suggestions? I want to add iommu symbol to the commands name, but it's too long. Thanks Li Zhang

2 2

[libvirt] [PATCH] virsh-domain: Remove unnecessary check and tune code in cmdDesc()
by Hongwei Bi 18 Sep '13

18 Sep '13

Since there is a check on buf through virBufferError(), it is not necessary to check desc again. --- tools/virsh-domain.c | 62 +++++++++++++++++++++---------------------------- 1 files changed, 27 insertions(+), 35 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e47877b..a8a0105 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6724,45 +6724,37 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) } desc = virBufferContentAndReset(&buf); - if (edit || desc) { - if (!desc) { - desc = vshGetDomainDescription(ctl, dom, title, - config?VIR_DOMAIN_XML_INACTIVE:0); - if (!desc) - goto cleanup; - } - - if (edit) { - /* Create and open the temporary file. */ - if (!(tmp = vshEditWriteToTempFile(ctl, desc))) - goto cleanup; + if (edit) { + /* Create and open the temporary file. */ + if (!(tmp = vshEditWriteToTempFile(ctl, desc))) + goto cleanup; - /* Start the editor. */ - if (vshEditFile(ctl, tmp) == -1) - goto cleanup; + /* Start the editor. */ + if (vshEditFile(ctl, tmp) == -1) + goto cleanup; - /* Read back the edited file. */ - if (!(desc_edited = vshEditReadBackFile(ctl, tmp))) - goto cleanup; + /* Read back the edited file. */ + if (!(desc_edited = vshEditReadBackFile(ctl, tmp))) + goto cleanup; - /* strip a possible newline at the end of file; some - * editors enforce a newline, this makes editing the title - * more convenient */ - if (title && - (tmpstr = strrchr(desc_edited, '\n')) && - *(tmpstr+1) == '\0') - *tmpstr = '\0'; - - /* Compare original XML with edited. Has it changed at all? */ - if (STREQ(desc, desc_edited)) { - vshPrint(ctl, _("Domain description not changed.\n")); - ret = true; - goto cleanup; - } + /* strip a possible newline at the end of file; some + * editors enforce a newline, this makes editing the title + * more convenient */ + if (title && + (tmpstr = strrchr(desc_edited, '\n')) && + *(tmpstr+1) == '\0') + *tmpstr = '\0'; + + /* Compare original XML with edited. Has it changed at all? */ + if (STREQ(desc, desc_edited)) { + vshPrint(ctl, _("Domain description not changed.\n")); + ret = true; + goto cleanup; + } - VIR_FREE(desc); - desc = desc_edited; - desc_edited = NULL; + VIR_FREE(desc); + desc = desc_edited; + desc_edited = NULL; } if (virDomainSetMetadata(dom, type, desc, NULL, NULL, flags) < 0) { -- 1.7.1

2 2

[libvirt] [PATCHv3] Add forwarder attribute to <dns /> element.
by Diego Woitasen 18 Sep '13

18 Sep '13

Useful to set custom forwarders instead of using the contents of /etc/resolv.conf. It helps me to setup dnsmasq as local nameserver to resolv VM domain names from domain 0, when domain option is used. Signed-off-by: Diego Woitasen <diego.woitasen(a)vhgroup.net> --- docs/formatnetwork.html.in | 8 ++++ docs/schemas/network.rng | 5 +++ src/conf/network_conf.c | 43 ++++++++++++++++++++-- src/conf/network_conf.h | 2 + src/network/bridge_driver.c | 8 ++++ .../nat-network-dns-forwarders.conf | 16 ++++++++ .../nat-network-dns-forwarders.xml | 12 ++++++ tests/networkxml2conftest.c | 1 + 8 files changed, 92 insertions(+), 3 deletions(-) create mode 100644 tests/networkxml2confdata/nat-network-dns-forwarders.conf create mode 100644 tests/networkxml2confdata/nat-network-dns-forwarders.xml diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index e1482db..9fdc3cf 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -631,6 +631,8 @@ <domain name="example.com"/> <dns> <txt name="example" value="example value" /> + <forwarder addr="8.8.8.8"/> + <forwarder addr="8.8.4.4"/> <srv service='name' protocol='tcp' domain='test-domain-name' target='.' port='1024' priority='10' weight='10'/> <host ip='192.168.122.2'> <hostname>myhost</hostname> @@ -685,6 +687,12 @@ Currently supported sub-elements of <code><dns></code> are: <dl> + <dt><code>forwarder</code></dt> + <dd>A <code>dns</code> element can have 0 or more <code>forwarder</code> elements. + Each forwarder element defines an IP address to be used as forwarder + in DNS server configuration. The addr attribute is required and defines the + IP address of every forwarder. <span class="since">Since N/A</span> + </dd> <dt><code>txt</code></dt> <dd>A <code>dns</code> element can have 0 or more <code>txt</code> elements. Each txt element defines a DNS TXT record and has two attributes, both diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index ab183f1..95db5c2 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -217,6 +217,11 @@ </attribute> </optional> <zeroOrMore> + <element name="forwarder"> + <attribute name="addr"><ref name="ipAddr"/></attribute> + </element> + </zeroOrMore> + <zeroOrMore> <element name="txt"> <attribute name="name"><ref name="dnsName"/></attribute> <attribute name="value"><text/></attribute> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index d54f2aa..c9b90e7 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -175,6 +175,11 @@ virNetworkDNSSrvDefClear(virNetworkDNSSrvDefPtr def) static void virNetworkDNSDefClear(virNetworkDNSDefPtr def) { + if (def->forwarders) { + while (def->nfwds) + VIR_FREE(def->forwarders[--def->nfwds]); + VIR_FREE(def->forwarders); + } if (def->txts) { while (def->ntxts) virNetworkDNSTxtDefClear(&def->txts[--def->ntxts]); @@ -1037,8 +1042,9 @@ virNetworkDNSDefParseXML(const char *networkName, xmlNodePtr *hostNodes = NULL; xmlNodePtr *srvNodes = NULL; xmlNodePtr *txtNodes = NULL; + xmlNodePtr *fwdNodes = NULL; char *forwardPlainNames = NULL; - int nhosts, nsrvs, ntxts; + int nfwds, nhosts, nsrvs, ntxts; size_t i; int ret = -1; xmlNodePtr save = ctxt->node; @@ -1058,6 +1064,30 @@ virNetworkDNSDefParseXML(const char *networkName, } } + nfwds = virXPathNodeSet("./forwarder", ctxt, &fwdNodes); + if (nfwds < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("invalid <forwarder> element found in <dns> of network %s"), + networkName); + goto cleanup; + } + if (nfwds > 0) { + if (VIR_ALLOC_N(def->forwarders, nfwds) < 0) + goto cleanup; + + for (i = 0; i < nfwds; i++) { + def->forwarders[i] = virXMLPropString(fwdNodes[i], "addr"); + if (virSocketAddrParse(NULL, def->forwarders[i], AF_UNSPEC) < 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid forwarder IP address '%s' " + "in network '%s'"), + def->forwarders[i], networkName); + goto cleanup; + } + def->nfwds++; + } + } + nhosts = virXPathNodeSet("./host", ctxt, &hostNodes); if (nhosts < 0) { virReportError(VIR_ERR_XML_ERROR, @@ -1121,6 +1151,7 @@ virNetworkDNSDefParseXML(const char *networkName, ret = 0; cleanup: VIR_FREE(forwardPlainNames); + VIR_FREE(fwdNodes); VIR_FREE(hostNodes); VIR_FREE(srvNodes); VIR_FREE(txtNodes); @@ -2267,13 +2298,14 @@ virNetworkDNSDefFormat(virBufferPtr buf, int result = 0; size_t i, j; - if (!(def->forwardPlainNames || def->nhosts || def->nsrvs || def->ntxts)) + if (!(def->forwardPlainNames || def->forwarders || def->nhosts || + def->nsrvs || def->ntxts)) goto out; virBufferAddLit(buf, "<dns"); if (def->forwardPlainNames) { virBufferAddLit(buf, " forwardPlainNames='yes'"); - if (!(def->nhosts || def->nsrvs || def->ntxts)) { + if (!(def->forwarders || def->nhosts || def->nsrvs || def->ntxts)) { virBufferAddLit(buf, "/>\n"); goto out; } @@ -2282,6 +2314,11 @@ virNetworkDNSDefFormat(virBufferPtr buf, virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); + for (i = 0; i < def->nfwds; i++) { + virBufferAsprintf(buf, "<forwarders addr='%s' />\n", + def->forwarders[i]); + } + for (i = 0; i < def->ntxts; i++) { virBufferAsprintf(buf, "<txt name='%s' value='%s'/>\n", def->txts[i].name, diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index c28bfae..b425986 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -122,6 +122,8 @@ struct _virNetworkDNSDef { virNetworkDNSHostDefPtr hosts; size_t nsrvs; virNetworkDNSSrvDefPtr srvs; + size_t nfwds; + char **forwarders; }; typedef struct _virNetworkIpDef virNetworkIpDef; diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 3a8be90..a2cfb35 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -708,6 +708,14 @@ networkDnsmasqConfContents(virNetworkObjPtr network, if (!network->def->dns.forwardPlainNames) virBufferAddLit(&configbuf, "domain-needed\n"); + if (network->def->dns.forwarders) { + virBufferAddLit(&configbuf, "no-resolv\n"); + for (i=0; i < network->def->dns.nfwds; i++) { + virBufferAsprintf(&configbuf, "server=%s\n", + network->def->dns.forwarders[i]); + } + } + if (network->def->domain) { virBufferAsprintf(&configbuf, "domain=%s\n" diff --git a/tests/networkxml2confdata/nat-network-dns-forwarders.conf b/tests/networkxml2confdata/nat-network-dns-forwarders.conf new file mode 100644 index 0000000..ebca289 --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-forwarders.conf @@ -0,0 +1,16 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made using: +## virsh net-edit default +## or other application using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +domain-needed +no-resolv +server=8.8.8.8 +server=8.8.4.4 +local=// +except-interface=lo +bind-dynamic +interface=virbr0 +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/nat-network-dns-forwarders.xml b/tests/networkxml2confdata/nat-network-dns-forwarders.xml new file mode 100644 index 0000000..eebec97 --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-forwarders.xml @@ -0,0 +1,12 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid> + <forward dev='eth0' mode='nat'/> + <bridge name='virbr0' stp='on' delay='0' /> + <dns> + <forwarder addr='8.8.8.8' /> + <forwarder addr='8.8.4.4' /> + </dns> + <ip address='192.168.122.1' netmask='255.255.255.0'> + </ip> +</network> diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index 5825af3..ad50e88 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -145,6 +145,7 @@ mymain(void) DO_TEST("nat-network-dns-srv-record", full); DO_TEST("nat-network-dns-hosts", full); DO_TEST("nat-network-dns-forward-plain", full); + DO_TEST("nat-network-dns-forwarders", full); DO_TEST("dhcp6-network", dhcpv6); DO_TEST("dhcp6-nat-network", dhcpv6); DO_TEST("dhcp6host-routed-network", dhcpv6); -- 1.8.1.2

2 1

Re: [libvirt] Mass rebuild report for August 29 2013
by Eric Blake 17 Sep '13

17 Sep '13

On 08/29/2013 11:38 AM, Erik van Pienbroek wrote: > > This mass rebuild was done using winpthreads instead of the old > pthreads-w32 implementation. In Fedora itself winpthreads isn't > used by default yet, but it will be introduced in Fedora 20 once > all build failures which are caused by it are resolved (if this > takes too long the introduction of winpthreads in Fedora will > have to be postponed until Fedora 21 which is scheduled for > release in Q2 2014). The gcc package is still being built without > --enable-threads=posix (thus support for C++11 std::thread > is not enabled yet) > >> mingw-libvirt-1.1.1-1 >> Package owner: berrange >> Time to build: 6 minutes, 39 seconds >> Build logs: http://build1.vanpienbroek.nl/fedora-mingw-rebuild/20130829/mingw-libvirt-1… > > > Also caused by winpthreads: > > CCLD libvirt.la > ./.libs/libvirt_driver_remote.a(libvirt_net_rpc_client_la-virnetclient.o): In function `virNetClientIOEventLoop': > /builddir/build/BUILD/libvirt-1.1.1/build_win32/src/../../src/rpc/virnetclient.c:1517: undefined reference to `pthread_sigmask' > /builddir/build/BUILD/libvirt-1.1.1/build_win32/src/../../src/rpc/virnetclient.c:1524: undefined reference to `pthread_sigmask' > /builddir/build/BUILD/libvirt-1.1.1/build_win32/src/../../src/rpc/virnetclient.c:1524: undefined reference to `pthread_sigmask' > ./.libs/libvirt_driver_remote.a(libvirt_net_rpc_client_la-virnetclient.o): In function `virNetClientSetTLSSession': > /builddir/build/BUILD/libvirt-1.1.1/build_win32/src/../../src/rpc/virnetclient.c:785: undefined reference to `pthread_sigmask' > /builddir/build/BUILD/libvirt-1.1.1/build_win32/src/../../src/rpc/virnetclient.c:792: undefined reference to `pthread_sigmask' > ./.libs/libvirt_driver_remote.a(libvirt_net_rpc_client_la-virnetclient.o):/builddir/build/BUILD/libvirt-1.1.1/build_win32/src/../../src/rpc/virnetclient.c:809: more undefined references to `pthread_sigmask' follow > collect2: error: ld returned 1 exit status Hmm. The libvirt build for mingw explicitly wants to avoid pthread_*, and use native threading instead (at least we wanted to explicitly avoid the old pthreads-w32, and since we already have native thread support, we might as well use it instead of dragging in winpthreads). Probably a case of our configure checks not detecting the right situation once winpthreads are turned on. I'll see if we can get this fixed up for libvirt 1.1.2 (due real soon now), or if it will have to wait for 1.1.3 (a month out, but probably still in time to make it into F20). Is there an easy environment to set up (such as rawhide + a repo) for testing a mingw cross-build with winpthreads? -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 3

[libvirt] [PATCH] build: hoist system-specific checks before library checks
by Eric Blake 17 Sep '13

17 Sep '13

Commit f92c7e3 fixed a regression for native builds, but introduced a regression for cross-compilation builds; in particular, ./autobuild.sh on a Fedora system with mingw cross-compiler fails with: checking for qemu-kvm... /usr/bin/qemu-kvm checking for yajl_parse_complete in -lyajl... no checking for yajl_tree_parse in -lyajl... no configure: error: You must install the libyajl library & headers to compile libvirt Since we default $with_qemu to 'yes' rather than 'check', and then flip that default based on platform-specific checks, those platform specifics need to come prior to any library checks that depend on the value of $with_qemu. * configure.ac: Ensure system defaults are sane before checking for things that make decisions based on system default. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I'm tempted to push this under the build-breaker rule, so that I can get a successful ./autobuild.sh run. configure.ac | 85 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 44 insertions(+), 41 deletions(-) diff --git a/configure.ac b/configure.ac index 39b5fd5..69a01ae 100644 --- a/configure.ac +++ b/configure.ac @@ -160,6 +160,50 @@ VERSION_SCRIPT_FLAGS=-Wl,--version-script= VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," AC_MSG_RESULT([$VERSION_SCRIPT_FLAGS]) +dnl Specify if we rely on ifconfig instead of iproute2 (e.g. in case +dnl we're working on BSD) +want_ifconfig=no + +dnl Make some notes about which OS we're compiling for, as the lxc and qemu +dnl drivers require linux headers, and storage_mpath, dtrace, and nwfilter +dnl are also linux specific. The "network" and storage_fs drivers are known +dnl to not work on MacOS X presently, so we also make a note if compiling +dnl for that + +with_linux=no with_osx=no with_freebsd=no +case $host in + *-*-linux*) with_linux=yes ;; + *-*-darwin*) with_osx=yes ;; + *-*-freebsd*) with_freebsd=yes ;; +esac + +if test $with_linux = no; then + if test "x$with_lxc" != xyes + then + with_lxc=no + fi + with_dtrace=no +fi + +if test $with_freebsd = yes; then + want_ifconfig=yes + + with_firewalld=no +fi + +if test $with_osx = yes; then + with_qemu=no +fi + +AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" = "yes"]) +AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" = "yes"]) + +if test "$with_libvirtd" = "no" ; then + with_qemu=no +fi + +# Check for compiler and library settings. + LIBVIRT_COMPILE_WARNINGS LIBVIRT_COMPILE_PIE LIBVIRT_LINKER_RELRO @@ -391,44 +435,6 @@ if test "$prefix" = "/usr" && test "$sysconfdir" = '${prefix}/etc' ; then sysconfdir='/etc' fi -dnl Specify if we rely on ifconfig instead of iproute2 (e.g. in case -dnl we're working on BSD) -want_ifconfig=no - -dnl Make some notes about which OS we're compiling for, as the lxc and qemu -dnl drivers require linux headers, and storage_mpath, dtrace, and nwfilter -dnl are also linux specific. The "network" and storage_fs drivers are known -dnl to not work on MacOS X presently, so we also make a note if compiling -dnl for that - -with_linux=no with_osx=no with_freebsd=no -case $host in - *-*-linux*) with_linux=yes ;; - *-*-darwin*) with_osx=yes ;; - *-*-freebsd*) with_freebsd=yes ;; -esac - -if test $with_linux = no; then - if test "x$with_lxc" != xyes - then - with_lxc=no - fi - with_dtrace=no -fi - -if test $with_freebsd = yes; then - want_ifconfig=yes - - with_firewalld=no -fi - -if test $with_osx = yes; then - with_qemu=no -fi - -AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" = "yes"]) -AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" = "yes"]) - dnl Allow to build without Xen, QEMU/KVM, test or remote driver AC_ARG_WITH([xen], [AS_HELP_STRING([--with-xen], @@ -721,9 +727,6 @@ if test "x$with_vbox" = "xyes"; then fi AM_CONDITIONAL([WITH_VBOX], [test "$with_vbox" = "yes"]) -if test "$with_libvirtd" = "no" ; then - with_qemu=no -fi if test "$with_qemu" = "yes" ; then AC_DEFINE_UNQUOTED([WITH_QEMU], 1, [whether QEMU driver is enabled]) fi -- 1.8.3.1

1 1

[libvirt] [PATCH] build: skip ld_preload tests on non-Linux systems
by Eric Blake 17 Sep '13

17 Sep '13

A cross build to mingw fails with: CC virsystemdtest-virsystemdtest.o ../../tests/virsystemdtest.c: In function 'testCreateNoSystemd': ../../tests/virsystemdtest.c:97:9: error: implicit declaration of function 'unsetenv' [-Werror=implicit-function-declaration] unsetenv("FAIL_NO_SERVICE"); ^ ../../tests/virsystemdtest.c:97:9: error: nested extern declaration of 'unsetenv' [-Werror=nested-externs] We could cop out and pull in the gnulib unsetenv module. But when you stop and think about it, this test requires LD_PRELOAD to work, and systemd is a Linux-only concept anyways, both of which mean the test could never work on mingw in the first place. Simpler is to just fix the test to behave like our other LD_PRELOAD tests. * tests/virsystemdtest.c: Provide non-Linux implementation. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the build-breaker rule. tests/virsystemdtest.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 7dc7520..e68b3ac 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -20,13 +20,16 @@ #include <config.h> -#include <stdlib.h> - -#include "virsystemd.h" -#include "virlog.h" #include "testutils.h" -#define VIR_FROM_THIS VIR_FROM_NONE +#ifdef __linux__ + +# include <stdlib.h> + +# include "virsystemd.h" +# include "virlog.h" + +# define VIR_FROM_THIS VIR_FROM_NONE static int testCreateContainer(const void *opaque ATTRIBUTE_UNUSED) { @@ -188,7 +191,7 @@ mymain(void) if (virtTestRun("Test create bad systemd ", 1, testCreateBadSystemd, NULL) < 0) ret = -1; -#define TEST_SCOPE(name, partition, unitname) \ +# define TEST_SCOPE(name, partition, unitname) \ do { \ struct testScopeData data = { \ name, partition, unitname \ @@ -209,3 +212,11 @@ mymain(void) } VIRT_TEST_MAIN_PRELOAD(mymain, abs_builddir "/.libs/virsystemdmock.so") + +#else +int +main(void) +{ + return EXIT_AM_SKIP; +} +#endif -- 1.8.3.1

1 0

Re: [libvirt] openvswitch vlan support when not a forwarded network
by Ajith Antony 17 Sep '13

17 Sep '13

Thank you Laine, for your prompt reply. Adding the dev list to broaden the audience. On Mon, Sep 16, 2013 at 9:21 AM, Laine Stump <laine(a)laine.org> wrote: On 09/16/2013 07:32 AM, Ajith Antony wrote: >> Hi, I'm not sure what the best way to pursue this is, but since it >> appears you authored the relevant code, you could advise of a good >> next step. > > Kind of. I think I wrote code for hostdev networks, but the original was > (if I remember correctly) written by Kyle Mestery with support only for > openvswitch. > >> I'm trying to use libvirt to set up openvswitch vlans, but ran into a >> problem where the libvirt code is precluding using vlans if the >> network is not "Forwarded."[1] I don't think there is any technical >> reason not to support vlans for non-forwarded networks. I verified >> this by manually adding vlan tags to the ephemeral ports created by >> the libvirt network definition. The tags worked as expected. >> [1] http://libvirt.org/git/?p=libvirt.git;a=blob;f=src/network/bridge_driver.c;… > > You're misunderstanding the intent (at least) of that if condition. The > way that you configure a libvirt network to use openvswitch is with the > following: > > <forward mode='bridge'/> > <virtualport type='openvswitch'> > <some other stuff I forget/> > </virtualport> > > That condition is only checking if: > > vlanAllowed = ((def->forward.type == VIR_NETWORK_FORWARD_BRIDGE && > > > 1) forward mode is 'bridge' (this doesn't necessarily mean that anything > will be forwarded beyond the bridge that the guest's network device is > connected to, only that it is connected to a bridge, i.e. as far as > libvirt is concerned any forwarding that *is* done will be L2 > forwarding. The specifics of how that happens are left up to the bridge.) Yes, I think this the test that interests me. The key fact in my scenario is that I'm not preconfiguring a bridge. I wouldn't be able to set the forward mode as 'bridge' unless I already prepared a bridge. I recongize that if I prepared a bridge that I could add more portgroups to it with thier unique vlan tags and not expect anything to actually cross the physical interface. I think this is what is is reccomended among the blogs when one searches for "openvswitch fake bridge." > You'll need to post a copy of your network config for me to understand > for sure, but I'm guessing that you're missing one of the two items in > your config, possibly indicating that you've misunderstood how to > configure a libvirt network that uses an openvswitch bridge. > > So can you send a copy of your network XML? The network that I'm trying to define is described as the following. Note there there is no <forward> element as I'm not expcting there to be a *real* bridge and I don't expect that I need to preconfigre explicit bridges. I expect an ephemeral virtual bridge to be created. <network> <name>ajith-net1</name> <virtualport type='openvswitch'/> <portgroup name='client_lan'> <vlan> <tag id='1'/> </vlan> </portgroup> <portgroup name='client_wan'> <vlan> <tag id='2'/> </vlan> </portgroup> </network> When I include the VLAN tags I get the error: error: unsupported configuration: <vlan> element specified for network ajith-net1, whose type doesn't support vlan configuration When I omit the VLAN tags as follows I am able to create the network: <network> <name>ajith-net1</name> <virtualport type='openvswitch'/> <portgroup name='client_lan'> </portgroup> <portgroup name='client_wan'> </portgroup> </network> In my domain configs I specify the network like so: <interface type='network'> <source network='ajith-net1' portgroup='client_lan'/> <virtualport type='openvswitch'/> <model type='virtio'/> </interface> The resulting ephemeral bridge(virbr1) looks like the following when my network(w/o vlans) and two domains are started. I don't know if the portgroup was meaningful, but it was accepted in the definition: $ sudo ovs-vsctl show <...> Bridge "virbr1" Port "vnet23" Interface "vnet23" Port "vnet25" Interface "vnet25" Port "virbr1" Interface "virbr1" type: internal Port "virbr1-nic" Interface "virbr1-nic" ovs_version: "1.9.3" My goal is assign unique vlan tags to the two portgroups. While the network and the domains are started, I can manually add tags to the ports: $ sudo ovs-vsctl set port vnet25 tag=2 $ sudo ovs-vsctl set port vnet23 tag=1 $ sudo ovs-vsctl show Bridge "virbr1" Port "vnet23" tag: 1 Interface "vnet23" Port "vnet25" tag: 2 Interface "vnet25" Port "virbr1" Interface "virbr1" type: internal Port "virbr1-nic" Interface "virbr1-nic" ovs_version: "1.9.3" This configuration behaves exactly as I want. I'm interested to learn how to prepare this without the manual step of tagging the ports outside of the libvirt operations. Ultimately my goal is to prepare isolated test environments that consist of several VM's attached to a similar qty of vlans. I intend to create many of these environments per host. I also recongnize that instead of portgroups, I could use separate networks altogether. From an administrative standpoint, I'd prefer to have one "network" per test environment, with several portgroups, instead of *many* networks. FWIW, I'm doing something similar on ESX, where I create a "vSwitch" and then create several "portgroups", each with its own vlan tag. These vSwitches are not attached to any physical interfaces. (My esx work is directly against the vsphere API, so I'm not sure if the same could be configured via libvirt) I'm looking to port this work to KVM. It seems like a pretty natural thing to support.

2 2

[libvirt] [PATCH] maint: ignore recently-added test
by Eric Blake 17 Sep '13

17 Sep '13

* .gitignore: Ignore metadatatest. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 2b8652f..d70d0dd 100644 --- a/.gitignore +++ b/.gitignore @@ -166,6 +166,7 @@ /tests/hashtest /tests/jsontest /tests/libvirtdconftest +/tests/metadatatest /tests/networkxml2argvtest /tests/nodeinfotest /tests/nwfilterxml2xmltest -- 1.8.3.1

1 0