- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Allow cpu pinning for all logical CPUs, not just physical
by Cole Robinson 06 Nov '09

06 Nov '09

This is what virsh already expects when printing output, and what 'man cpuset' claims to support. Signed-off-by: Cole Robinson <crobinso(a)redhat.com> --- src/qemu/qemu_driver.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 1f3a0e4..5463951 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1222,7 +1222,7 @@ qemudInitCpus(virConnectPtr conn, const char *migrateFrom) { #if HAVE_SCHED_GETAFFINITY cpu_set_t mask; - int i, maxcpu = QEMUD_CPUMASK_LEN; + int i, hostcpus, maxcpu = QEMUD_CPUMASK_LEN; virNodeInfo nodeinfo; if (nodeGetInfo(conn, &nodeinfo) < 0) @@ -1230,8 +1230,9 @@ qemudInitCpus(virConnectPtr conn, /* setaffinity fails if you set bits for CPUs which * aren't present, so we have to limit ourselves */ - if (maxcpu > nodeinfo.cpus) - maxcpu = nodeinfo.cpus; + hostcpus = VIR_NODEINFO_MAXCPUS(nodeinfo); + if (maxcpu > hostcpus) + maxcpu = hostcpus; CPU_ZERO(&mask); if (vm->def->cpumask) { @@ -3339,7 +3340,7 @@ qemudDomainPinVcpu(virDomainPtr dom, struct qemud_driver *driver = dom->conn->privateData; virDomainObjPtr vm; cpu_set_t mask; - int i, maxcpu; + int i, maxcpu, hostcpus; virNodeInfo nodeinfo; int ret = -1; @@ -3371,13 +3372,14 @@ qemudDomainPinVcpu(virDomainPtr dom, if (nodeGetInfo(dom->conn, &nodeinfo) < 0) goto cleanup; + hostcpus = VIR_NODEINFO_MAXCPUS(nodeinfo); maxcpu = maplen * 8; - if (maxcpu > nodeinfo.cpus) - maxcpu = nodeinfo.cpus; + if (maxcpu > hostcpus) + maxcpu = hostcpus; CPU_ZERO(&mask); for (i = 0 ; i < maxcpu ; i++) { - if ((cpumap[i/8] >> (i % 8)) & 1) + if (VIR_CPU_USABLE(cpumap, maplen, 0, i)) CPU_SET(i, &mask); } @@ -3409,7 +3411,7 @@ qemudDomainGetVcpus(virDomainPtr dom, struct qemud_driver *driver = dom->conn->privateData; virDomainObjPtr vm; virNodeInfo nodeinfo; - int i, v, maxcpu; + int i, v, maxcpu, hostcpus; int ret = -1; qemuDriverLock(driver); @@ -3434,9 +3436,10 @@ qemudDomainGetVcpus(virDomainPtr dom, if (nodeGetInfo(dom->conn, &nodeinfo) < 0) goto cleanup; + hostcpus = VIR_NODEINFO_MAXCPUS(nodeinfo); maxcpu = maplen * 8; - if (maxcpu > nodeinfo.cpus) - maxcpu = nodeinfo.cpus; + if (maxcpu > hostcpus) + maxcpu = hostcpus; /* Clamp to actual number of vcpus */ if (maxinfo > vm->nvcpupids) -- 1.6.5.1

2 2

[libvirt] [PATCH] Cleanup whitespace in docs
by Matthew Booth 06 Nov '09

06 Nov '09

This patch is the result of running the following command in the docs direct sed -i 's/\t/ /g; s/\s*$//' *.html.in * docs/api.html.in docs/api_extension.html.in docs/apps.html.in docs/archnetwork.html.in docs/archstorage.html.in docs/bugs.html.in docs/drvlxc.html.in docs/drvone.html.in docs/drvqemu.html.in docs/drvxen.html.in docs/formatdomain.html.in docs/formatnetwork.html.in docs/formatsecret.html.in docs/formatstorage.html.in docs/hacking.html.in docs/hvsupport.html.in docs/index.html.in docs/news.html.in docs/relatedlinks.html.in docs/sitemap.html.in: convert tabs into 8 spaces and remove trailing whitespace docs/api.html.in | 6 +- docs/api_extension.html.in | 14 +- docs/apps.html.in | 92 ++++++------ docs/archnetwork.html.in | 26 ++-- docs/archstorage.html.in | 16 +- docs/bugs.html.in | 34 ++-- docs/drvlxc.html.in | 80 +++++----- docs/drvone.html.in | 14 +- docs/drvqemu.html.in | 28 ++-- docs/drvxen.html.in | 38 +++--- docs/formatdomain.html.in | 376 ++++++++++++++++++++++---------------------- docs/formatnetwork.html.in | 158 +++++++++--------- docs/formatsecret.html.in | 8 +- docs/formatstorage.html.in | 208 ++++++++++++------------ docs/hacking.html.in | 108 +++++++------- docs/hvsupport.html.in | 2 +- docs/index.html.in | 36 ++-- docs/news.html.in | 94 ++++++------ docs/relatedlinks.html.in | 22 ++-- docs/sitemap.html.in | 16 +- 20 files changed, 688 insertions(+), 688 deletions(-) Matt -- Matthew Booth, RHCA, RHCSS Red Hat Engineering, Virtualisation Team M: +44 (0)7977 267231 GPG ID: D33C3490 GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490

2 1

[libvirt] [PATCH] Use virBuffer when constructing QEMU character device command line
by Matthew Booth 06 Nov '09

06 Nov '09

This patch updates qemudBuildCommandLineChrDevStr to use a virBuffer instead of a char[]. This is slightly tidier, and it makes it cleaner to (ap|pre)pend the output in other command lines. * src/qemu/qemu_conf.c: Update qemudBuildCommandLineChrDevStr to use a virBuffer --- src/qemu/qemu_conf.c | 97 +++++++++++++++++++++++-------------------------- 1 files changed, 46 insertions(+), 51 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 40613dd..052ae98 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1409,83 +1409,66 @@ qemuBuildHostNetStr(virConnectPtr conn, return 0; } -static int qemudBuildCommandLineChrDevStr(virDomainChrDefPtr dev, - char *buf, - int buflen) +static void qemudBuildCommandLineChrDevStr(virDomainChrDefPtr dev, + virBufferPtr buf) { switch (dev->type) { case VIR_DOMAIN_CHR_TYPE_NULL: - if (virStrcpy(buf, "null", buflen) == NULL) - return -1; + virBufferAddLit(buf, "null"); break; case VIR_DOMAIN_CHR_TYPE_VC: - if (virStrcpy(buf, "vc", buflen) == NULL) - return -1; + virBufferAddLit(buf, "vc"); break; case VIR_DOMAIN_CHR_TYPE_PTY: - if (virStrcpy(buf, "pty", buflen) == NULL) - return -1; + virBufferAddLit(buf, "pty"); break; case VIR_DOMAIN_CHR_TYPE_DEV: - if (snprintf(buf, buflen, "%s", - dev->data.file.path) >= buflen) - return -1; + virBufferStrcat(buf, dev->data.file.path, NULL); break; case VIR_DOMAIN_CHR_TYPE_FILE: - if (snprintf(buf, buflen, "file:%s", - dev->data.file.path) >= buflen) - return -1; + virBufferVSprintf(buf, "file:%s", dev->data.file.path); break; case VIR_DOMAIN_CHR_TYPE_PIPE: - if (snprintf(buf, buflen, "pipe:%s", - dev->data.file.path) >= buflen) - return -1; + virBufferVSprintf(buf, "pipe:%s", dev->data.file.path); break; case VIR_DOMAIN_CHR_TYPE_STDIO: - if (virStrcpy(buf, "stdio", buflen) == NULL) - return -1; + virBufferAddLit(buf, "stdio"); break; case VIR_DOMAIN_CHR_TYPE_UDP: - if (snprintf(buf, buflen, "udp:%s:%s@%s:%s", - dev->data.udp.connectHost, - dev->data.udp.connectService, - dev->data.udp.bindHost, - dev->data.udp.bindService) >= buflen) - return -1; + virBufferVSprintf(buf, "udp:%s:%s@%s:%s", + dev->data.udp.connectHost, + dev->data.udp.connectService, + dev->data.udp.bindHost, + dev->data.udp.bindService); break; case VIR_DOMAIN_CHR_TYPE_TCP: if (dev->data.tcp.protocol == VIR_DOMAIN_CHR_TCP_PROTOCOL_TELNET) { - if (snprintf(buf, buflen, "telnet:%s:%s%s", - dev->data.tcp.host, - dev->data.tcp.service, - dev->data.tcp.listen ? ",server,nowait" : "") >= buflen) - return -1; + virBufferVSprintf(buf, "telnet:%s:%s%s", + dev->data.tcp.host, + dev->data.tcp.service, + dev->data.tcp.listen ? ",server,nowait" : ""); } else { - if (snprintf(buf, buflen, "tcp:%s:%s%s", - dev->data.tcp.host, - dev->data.tcp.service, - dev->data.tcp.listen ? ",server,nowait" : "") >= buflen) - return -1; + virBufferVSprintf(buf, "tcp:%s:%s%s", + dev->data.tcp.host, + dev->data.tcp.service, + dev->data.tcp.listen ? ",server,nowait" : ""); } break; case VIR_DOMAIN_CHR_TYPE_UNIX: - if (snprintf(buf, buflen, "unix:%s%s", - dev->data.nix.path, - dev->data.nix.listen ? ",server,nowait" : "") >= buflen) - return -1; + virBufferVSprintf(buf, "unix:%s%s", + dev->data.nix.path, + dev->data.nix.listen ? ",server,nowait" : ""); break; } - - return 0; } #define QEMU_SERIAL_PARAM_ACCEPTED_CHARS \ @@ -1773,13 +1756,17 @@ int qemudBuildCommandLine(virConnectPtr conn, ADD_ARG_LIT("-nographic"); if (monitor_chr) { - char buf[4096]; + virBuffer buf = VIR_BUFFER_INITIALIZER; - if (qemudBuildCommandLineChrDevStr(monitor_chr, buf, sizeof(buf)) < 0) + qemudBuildCommandLineChrDevStr(monitor_chr, &buf); + const char *argStr = virBufferContentAndReset(&buf); + if (argStr == NULL) goto error; ADD_ARG_LIT("-monitor"); - ADD_ARG_LIT(buf); + ADD_ARG_LIT(argStr); + + VIR_FREE(argStr); } if (def->localtime) @@ -2059,14 +2046,18 @@ int qemudBuildCommandLine(virConnectPtr conn, ADD_ARG_LIT("none"); } else { for (i = 0 ; i < def->nserials ; i++) { - char buf[4096]; + virBuffer buf = VIR_BUFFER_INITIALIZER; virDomainChrDefPtr serial = def->serials[i]; - if (qemudBuildCommandLineChrDevStr(serial, buf, sizeof(buf)) < 0) + qemudBuildCommandLineChrDevStr(serial, &buf); + const char *argStr = virBufferContentAndReset(&buf); + if (argStr == NULL) goto error; ADD_ARG_LIT("-serial"); - ADD_ARG_LIT(buf); + ADD_ARG_LIT(argStr); + + VIR_FREE(argStr); } } @@ -2075,14 +2066,18 @@ int qemudBuildCommandLine(virConnectPtr conn, ADD_ARG_LIT("none"); } else { for (i = 0 ; i < def->nparallels ; i++) { - char buf[4096]; + virBuffer buf = VIR_BUFFER_INITIALIZER; virDomainChrDefPtr parallel = def->parallels[i]; - if (qemudBuildCommandLineChrDevStr(parallel, buf, sizeof(buf)) < 0) + qemudBuildCommandLineChrDevStr(parallel, &buf); + const char *argStr = virBufferContentAndReset(&buf); + if (argStr == NULL) goto error; ADD_ARG_LIT("-parallel"); - ADD_ARG_LIT(buf); + ADD_ARG_LIT(argStr); + + VIR_FREE(argStr); } } -- 1.6.2.5

3 3

[libvirt] [PATCH] Cleanup virBuffer usage in qemdBuildCommandLine
by Matthew Booth 06 Nov '09

06 Nov '09

Dan Berrangé pointed out that using virBufferError() is preferred to checking virBufferContentAndReset() for NULL return. Also, this allows ADD_ARG_LIT to be replaced with ADD_ARG, skipping an intermediate variable. * src/qemu_qemu_conf.c: Cleanup usage of virBuffer in qemudBuildCommandLine --- src/qemu/qemu_conf.c | 15 ++++----------- 1 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index f010f4a..4a278e3 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -2182,7 +2182,6 @@ int qemudBuildCommandLine(virConnectPtr conn, for (i = 0 ; i < def->nchannels ; i++) { virBuffer buf = VIR_BUFFER_INITIALIZER; - const char *argStr; char id[16]; virDomainChrDefPtr channel = def->channels[i]; @@ -2199,24 +2198,18 @@ int qemudBuildCommandLine(virConnectPtr conn, } qemudBuildCommandLineChrDevChardevStr(channel, id, &buf); - argStr = virBufferContentAndReset(&buf); - if (argStr == NULL) + if (virBufferError(&buf)) goto error; ADD_ARG_LIT("-chardev"); - ADD_ARG_LIT(argStr); - - VIR_FREE(argStr); + ADD_ARG(virBufferContentAndReset(&buf)); qemudBuildCommandLineChrDevTargetStr(channel, id, &buf); - argStr = virBufferContentAndReset(&buf); - if (argStr == NULL) + if (virBufferError(&buf)) goto error; ADD_ARG_LIT("-net"); - ADD_ARG_LIT(argStr); - - VIR_FREE(argStr); + ADD_ARG(virBufferContentAndReset(&buf)); } } -- 1.6.2.5

2 1

[libvirt] [PATCH] add sentinel attribute
by Paolo Bonzini 06 Nov '09

06 Nov '09

This patch adds a (macro-wrapped) sentinel attribute to functions that take a NULL-terminated variable argument list. This is a nice debugging aid. * src/internal.h (ATTRIBUTE_SENTINEL): New. * src/util/buf.c (virBufferStrcat): Use it. * src/util/ebtables.c (ebtablesAddRemoveRule): Use it. * src/util/iptables.c (iptableAddRemoveRule: Use it. * src/util/qparams.h (new_qparam_set, append_qparams): Use it. --- src/internal.h | 11 +++++++++++ src/util/buf.h | 3 ++- src/util/ebtables.c | 2 +- src/util/iptables.c | 2 +- src/util/qparams.h | 6 ++++-- 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/internal.h b/src/internal.h index bd1cfe6..09c19ea 100644 --- a/src/internal.h +++ b/src/internal.h @@ -93,6 +93,17 @@ #endif /** + * ATTRIBUTE_SENTINEL: + * + * Macro to check for NULL-terminated varargs lists + */ +#ifndef ATTRIBUTE_SENTINEL +#if __GNUC_PREREQ (4, 0) +#define ATTRIBUTE_SENTINEL __attribute__((__sentinel__)) +#endif +#endif + +/** * ATTRIBUTE_FMT_PRINTF * * Macro used to check printf like functions, if compiling diff --git a/src/util/buf.h b/src/util/buf.h index 7d31cb2..94ee8a3 100644 --- a/src/util/buf.h +++ b/src/util/buf.h @@ -41,7 +41,8 @@ void virBufferAdd(const virBufferPtr buf, const char *str, int len); void virBufferAddChar(const virBufferPtr buf, char c); void virBufferVSprintf(const virBufferPtr buf, const char *format, ...) ATTRIBUTE_FMT_PRINTF(2, 3); -void virBufferStrcat(const virBufferPtr buf, ...); +void virBufferStrcat(const virBufferPtr buf, ...) + ATTRIBUTE_SENTINEL; void virBufferEscapeString(const virBufferPtr buf, const char *format, const char *str); void virBufferURIEncodeString (const virBufferPtr buf, const char *str); diff --git a/src/util/ebtables.c b/src/util/ebtables.c index 60427d7..20f3342 100644 --- a/src/util/ebtables.c +++ b/src/util/ebtables.c @@ -175,7 +175,7 @@ ebtRulesNew(const char *table, return NULL; } -static int +static int ATTRIBUTE_SENTINEL ebtablesAddRemoveRule(ebtRules *rules, int action, const char *arg, ...) { va_list args; diff --git a/src/util/iptables.c b/src/util/iptables.c index 4562800..284f3c0 100644 --- a/src/util/iptables.c +++ b/src/util/iptables.c @@ -382,7 +382,7 @@ iptRulesNew(const char *table, return NULL; } -static int +static int ATTRIBUTE_SENTINEL iptablesAddRemoveRule(iptRules *rules, int action, const char *arg, ...) { va_list args; diff --git a/src/util/qparams.h b/src/util/qparams.h index 1a92048..a2f5aa2 100644 --- a/src/util/qparams.h +++ b/src/util/qparams.h @@ -38,10 +38,12 @@ struct qparam_set { }; /* New parameter set. */ -extern struct qparam_set *new_qparam_set (int init_alloc, ...); +extern struct qparam_set *new_qparam_set (int init_alloc, ...) + ATTRIBUTE_SENTINEL; /* Appending parameters. */ -extern int append_qparams (struct qparam_set *ps, ...); +extern int append_qparams (struct qparam_set *ps, ...) + ATTRIBUTE_SENTINEL; extern int append_qparam (struct qparam_set *ps, const char *name, const char *value); -- 1.6.2.5

3 5

Re: [libvirt] Remote access and libvirtd
by Maximilian Wilhelm 06 Nov '09

06 Nov '09

Anno domini 2009 Dave Bryson scripsit: Hi Dave! (Moved the thread back to the list, hope thats OK) > Thank you for the response. I'm working with ESX and am looking at > libvirt to see if it would be beneficial to use over the ESX SOAP API > (i'm not a SOAP fan). But in the case of remote access it doesn't appear > that libvirt will be able to help me. Well, the ESX driver is working completely remote and should therefore be helpful. The driver only uses the VI API, which practically is SOAP, to communicate with the server. If you could describe the problem you are facing a bit more precisly, one could give you some hints about how to solve this. Ciao Max -- Träume nicht von Dein Leben: Lebe Deinen Traum!

4 3

[libvirt] [PATCH 0/2] test: Update inactive guest config on shutdown
by Cole Robinson 05 Nov '09

05 Nov '09

This small series teaches the test driver to abide changes to the inactive domain definition (caused by 'defining' over an already running domain). Cole Robinson (2): test: Add testDomainShutdownState helper test: Update inactive guest config on shutdown src/test/test_driver.c | 48 +++++++++++++++++++++++++++++------------------- 1 files changed, 29 insertions(+), 19 deletions(-)

2 5

[libvirt] [PATCH] fix cut-and-paste error
by Paolo Bonzini 05 Nov '09

05 Nov '09

Seems like a bad merge conflict. * src/qemu/qemu_driver.c (qemudDomainMigratePerform): Do call doPeer2PeerMigrate for VIR_MIGRATE_PEER2PEER. --- Note: untested beyond compiling. src/qemu/qemu_driver.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0ed2136..635d787 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6792,9 +6792,9 @@ qemudDomainMigratePerform (virDomainPtr dom, event = NULL; } - if ((flags & VIR_MIGRATE_TUNNELLED)) { + if ((flags & (VIR_MIGRATE_TUNNELLED | VIR_MIGRATE_PEER2PEER))) { if (doPeer2PeerMigrate(dom, vm, uri, flags, dname, resource) < 0) - /* doTunnelMigrate already set the error, so just get out */ + /* doPeer2PeerMigrate already set the error, so just get out */ goto cleanup; } else { if (doNativeMigrate(dom, vm, uri, flags, dname, resource) < 0) -- 1.6.2.5

3 2

[libvirt] [PATCH 00/15] Rewrite the QEMU monitor handling v2
by Daniel P. Berrange 05 Nov '09

05 Nov '09

This is an update of this series: http://www.redhat.com/archives/libvir-list/2009-October/msg00644.html minus the patches DV already ACKd which I've merged. The main change in this series is that I've removed the change which added a RW-lock primitive in the QEMU driver. Instead I've implemented the job condition variable idea I described here http://www.redhat.com/archives/libvir-list/2009-October/msg00815.html The nice thing about this is that its actually possible to start doing timeouts of commands. This series only partially supports timeouts. A long running monitor command itself will not timeout, but if a second API call is made while someone else is using the monitor, this waiting call will timeout after 30 seconds if the monitor was not relased. Daniel

3 37

[libvirt] [PATCH] network utilities: Add functions for address->text and get/set port number
by Matthew Booth 05 Nov '09

05 Nov '09

--- src/libvirt_private.syms | 3 ++ src/util/network.c | 88 +++++++++++++++++++++++++++++++++++++++++++++- src/util/network.h | 6 +++ 3 files changed, 96 insertions(+), 1 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 8525dbd..15d75fd 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -289,10 +289,13 @@ virFree; virSocketAddrInNetwork; virSocketAddrIsNetmask; virSocketCheckNetmask; +virSocketFormatAddr; +virSocketGetPort; virSocketGetRange; virSocketParseAddr; virSocketParseIpv4Addr; virSocketParseIpv6Addr; +virSocketSetPort; # network_conf.h diff --git a/src/util/network.c b/src/util/network.c index abd866c..094130f 100644 --- a/src/util/network.c +++ b/src/util/network.c @@ -9,6 +9,7 @@ */ #include <config.h> +#include <arpa/inet.h> #include "memory.h" #include "network.h" @@ -64,7 +65,7 @@ static int getIPv6Addr(virSocketAddrPtr addr, virIPv6AddrPtr tab) { * Mostly a wrapper for getaddrinfo() extracting the address storage * from the numeric string like 1.2.3.4 or 2001:db8:85a3:0:0:8a2e:370:7334 * - * Returns the lenght of the network address or -1 in case of error. + * Returns the length of the network address or -1 in case of error. */ int virSocketParseAddr(const char *val, virSocketAddrPtr addr, int hint) { @@ -116,6 +117,91 @@ virSocketParseIpv6Addr(const char *val, virSocketAddrPtr addr) { return(virSocketParseAddr(val, addr, AF_INET6)); } +/* + * virSocketFormatAddr: + * @addr: an initialised virSocketAddrPtr + * + * Returns a string representation of the given address + * Returns NULL on any error + * Caller must free the returned string + */ +char * +virSocketFormatAddr(virSocketAddrPtr addr) { + char *out; + size_t outlen; + void *inaddr; + + if (addr->stor.ss_family == AF_INET) { + outlen = INET_ADDRSTRLEN; + inaddr = &addr->inet4.sin_addr; + } + + else if (addr->stor.ss_family == AF_INET6) { + outlen = INET6_ADDRSTRLEN; + inaddr = &addr->inet6.sin6_addr; + } + + else { + return NULL; + } + + if (VIR_ALLOC_N(out, outlen) < 0) + return NULL; + + if (inet_ntop(addr->stor.ss_family, inaddr, out, outlen) == NULL) { + VIR_FREE(out); + return NULL; + } + + return out; +} + +/* + * virSocketSetPort: + * @addr: an initialised virSocketAddrPtr + * @port: the port number to set + * + * Set the transport layer port of the given virtSocketAddr + * + * Returns 0 on success, -1 on failure + */ +int +virSocketSetPort(virSocketAddrPtr addr, in_port_t port) { + if(addr->stor.ss_family == AF_INET) { + addr->inet4.sin_port = port; + } + + else if(addr->stor.ss_family == AF_INET6) { + addr->inet6.sin6_port = port; + } + + else { + return -1; + } + + return 0; +} + +/* + * virSocketGetPort: + * @addr: an initialised virSocketAddrPtr + * + * Returns the transport layer port of the given virtSocketAddr + * Returns 0 if @addr is invalid + */ +in_port_t +virSocketGetPort(virSocketAddrPtr addr) { + if(addr->stor.ss_family == AF_INET) { + return addr->inet4.sin_port; + } + + else if(addr->stor.ss_family == AF_INET6) { + return addr->inet6.sin6_port; + } + + return 0; +} + /** * virSocketAddrIsNetmask: * @netmask: the netmask address diff --git a/src/util/network.h b/src/util/network.h index e590747..7618547 100644 --- a/src/util/network.h +++ b/src/util/network.h @@ -34,6 +34,12 @@ int virSocketParseIpv4Addr(const char *val, int virSocketParseIpv6Addr(const char *val, virSocketAddrPtr addr); +char * virSocketFormatAddr(virSocketAddrPtr addr); + +int virSocketSetPort(virSocketAddrPtr addr, in_port_t port); + +in_port_t virSocketGetPort(virSocketAddrPtr addr); + int virSocketAddrInNetwork(virSocketAddrPtr addr1, virSocketAddrPtr addr2, virSocketAddrPtr netmask); -- 1.6.2.5

3 7

[libvirt] [PATCH] create() and destroy() support for Power Hypervisor
by Eduardo Otubo 05 Nov '09

05 Nov '09

Hello all, This patch includes a lot of changes: * I changed all references of uuid_db to uuid_table. Bigger name, but this semantic has a better understanding. * Now we have a little control of UUID generated for each partition. It's based on a table that matches UUID with LPAR's IDs, I keep it in a file that is stored in the managed system (HMC or IVM). Even having isolated functions to manipulate this file I still need to implement a way to lock it and make the operation atomic to avoid corruptions. * The XML file used in the create() function still must be improved. I used the <disk> tag to make a work around to handle storage pools. Now I ask for some help, how do I use the <pool> tag if there is no reference to it at the virDomainDef structure? I've been told that libvirt possibly would make a mini-release this week to push some major fixes on Fedora 12. Is there a little possibility to push these new phyp features too? This would be very important for the phyp project, since this functions are not just to manage partitions but manipulate them. Any comments are always welcome. []'s -- Eduardo Otubo Software Engineer Linux Technology Center IBM Systems & Technology Group Mobile: +55 19 8135 0885 eotubo(a)linux.vnet.ibm.com

5 13

[libvirt] Remote access and libvirtd
by Dave Bryson 05 Nov '09

05 Nov '09

I need to be able to access libvirt remotely. Reading through the documention is says "libvirtd should be running on the remote machine" for clarification does this mean that libvirtd needs to run *on* the remote hypervisor? Thanks, Dave

2 1

[libvirt] Add support for legacy -vmchannel option
by Matthew Booth 05 Nov '09

05 Nov '09

These patches add support for the legacy qemu -vmchannel option. The following domain xml: <channel type='unix'> <source mode='bind' path='/tmp/vmchannel'/> <target type='vmchannel' deviceid='0200'/> </channel> becomes: -vmchannel di:0200,unix:/tmp/vmchannel,server,nowait I don't expect these to be merged, but I would appreciate a review. Thanks, Matt

4 6

[libvirt] Guestfwd support (round 3)
by Matthew Booth 05 Nov '09

05 Nov '09

This is substantially the same as the last set. I don't think I changed patches 1 and 2 at all. Patch 3 is updated to use a virBuffer as Rich Jones recommended. Patch 4 is updated slightly for the above change, and there are a couple of other trivial tidy ups in there. Patch 5 is new. QEMU's guestfwd only supports IPv4 addresses, so we check for that. Rich Jones also noted that guestfwd is specific to QEMU. If there's a good chance this same syntax might do something simililar in a different driver, I agree that changing the name would be a good idea. However, I'm not familiar enough with other hypervisors to be able to make a call on this. If nothing else does anything similar, I'd keep the QEMU name for clarity. Matt

3 17

[libvirt] [PATCH] LXC allow container to have ethN interfaces
by Ryota Ozaki 05 Nov '09

05 Nov '09

Current implementation of lxc driver creates vethN named interface(s) in the host and passes as it is to a container. The reason why it doesn't use ethN is due to the limitation that one namespace cannot have multiple iterfaces that have an identical name so that we give up creating ethN named interface in the host for the container. However, we should be able to allow the container to have ethN by changing the name after clone(CLONE_NEWNET). The patch simply does that and numberes to ethN with ascending order from zero with no concern for what vethN is named. So say if there is one interface, its name will be eth0. Note that this patch is based on top of the prior cleanup patches. --- src/lxc/lxc_container.c | 34 ++++++++++++++++++++++++---------- src/lxc/veth.c | 31 +++++++++++++++++++++++++++++++ src/lxc/veth.h | 1 + 3 files changed, 56 insertions(+), 10 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 2419345..97b7903 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -225,26 +225,38 @@ static int lxcContainerWaitForContinue(int control) /** - * lxcContainerEnableInterfaces: + * lxcContainerRenameAndEnableInterfaces: * @nveths: number of interfaces * @veths: interface names * - * This function will enable the interfaces for this container. + * This function will rename the interfaces to ethN + * with id ascending order from zero and enable the + * renamed interfaces for this container. * * Returns 0 on success or nonzero in case of error */ -static int lxcContainerEnableInterfaces(unsigned int nveths, - char **veths) +static int lxcContainerRenameAndEnableInterfaces(unsigned int nveths, + char **veths) { int rc = 0; unsigned int i; + char *newname = NULL; for (i = 0 ; i < nveths ; i++) { - DEBUG("Enabling %s", veths[i]); - rc = vethInterfaceUpOrDown(veths[i], 1); - if (0 != rc) { + rc = virAsprintf(&newname, "eth%d", i); + if (rc < 0) goto error_out; - } + + DEBUG("Renaming %s to %s", veths[i], newname); + rc = setInterfaceName(veths[i], newname); + if (0 != rc) + goto error_out; + + DEBUG("Enabling %s", newname); + rc = vethInterfaceUpOrDown(newname, 1); + if (0 != rc) + goto error_out; + VIR_FREE(newname); } /* enable lo device only if there were other net devices */ @@ -252,6 +264,7 @@ static int lxcContainerEnableInterfaces(unsigned int nveths, rc = vethInterfaceUpOrDown("lo", 1); error_out: + VIR_FREE(newname); return rc; } @@ -757,8 +770,9 @@ static int lxcContainerChild( void *data ) if (lxcContainerWaitForContinue(argv->monitor) < 0) return -1; - /* enable interfaces */ - if (lxcContainerEnableInterfaces(argv->nveths, argv->veths) < 0) + /* rename and enable interfaces */ + if (lxcContainerRenameAndEnableInterfaces(argv->nveths, + argv->veths) < 0) return -1; /* drop a set of root capabilities */ diff --git a/src/lxc/veth.c b/src/lxc/veth.c index 8617cf7..ede85ce 100644 --- a/src/lxc/veth.c +++ b/src/lxc/veth.c @@ -247,3 +247,34 @@ int setMacAddr(const char* iface, const char* macaddr) error_out: return rc; } + +/** + * setInterfaceName + * @iface: name of device + * @new: new name of @iface + * + * Changes the name of the given device with the + * given new name using this command: + * ip link set @iface name @new + * + * Returns 0 on success or -1 in case of error + */ +int setInterfaceName(const char* iface, const char* new) +{ + int rc = -1; + const char *argv[] = { + "ip", "link", "set", iface, "name", new, NULL + }; + int cmdResult; + + if (NULL == iface || NULL == new) { + goto error_out; + } + + rc = virRun(NULL, argv, &cmdResult); + if (0 == rc) + rc = cmdResult; + +error_out: + return rc; +} diff --git a/src/lxc/veth.h b/src/lxc/veth.h index 8f2f514..8075a5e 100644 --- a/src/lxc/veth.h +++ b/src/lxc/veth.h @@ -21,5 +21,6 @@ int vethDelete(const char* veth); int vethInterfaceUpOrDown(const char* veth, int upOrDown); int moveInterfaceToNetNs(const char *iface, int pidInNs); int setMacAddr(const char* iface, const char* macaddr); +int setInterfaceName(const char* iface, const char* new); #endif /* VETH_H */ -- 1.6.2.5

2 1

[libvirt] [PATCH 0/3] LXC misc fixes and cleanups
by Ryota Ozaki 05 Nov '09

05 Nov '09

This patch series fix and cleanup over whole lxc codes. I want to clean up before adding more in them. Thanks, ozaki-r Ryota Ozaki (3): LXC fix wrong or out-of-date function descriptions LXC cleanup and fix lxcError LXC cleanup deep indentation in lxcDomainSetAutostart src/lxc/lxc_container.c | 85 +++++++++++----------- src/lxc/lxc_controller.c | 40 ++++++----- src/lxc/lxc_driver.c | 177 +++++++++++++++++++++++++--------------------- src/lxc/veth.c | 8 +- 4 files changed, 164 insertions(+), 146 deletions(-)

3 7

[libvirt] flush guest page cache and suspend?
by Marco Colombo 05 Nov '09

05 Nov '09

Hi, I'm new to this list. I've searched the archives (and google) but I haven't found an answer. Recently I moved to CentOS 5.4, with libvirt-0.6.3 and kvm-83. They are rather new compared to 5.3 ones, so I'm still investigating on the new capabilities. My guests disk images are LV single devices, /dev/vg_virt/<guestname>, usually with two partitions, the root fs and swap space. I'd like to run backups on the node only, taking snapshots of the LVs. I'm already doing that, actually. Everything works fine, using bacula (with one minor glitch, but that's for another list). Now I wonder if it makes sense to suspend the guest before creating the snapshot: virsh suspend <guestname> lvcreate --snapshot ... virsh resume <guestname> ... perform backup ... lvremove -f <the snapshot> but thinking about it a second time it seems it doesn't add anything to the equation, the filesystem is still potentially unclean, with data to be written still in the guest page cache. The filesystem is ext3, so it's not that bad (recovers a consistent state from the journal, with standard options even data-consistent, not just metadata-consistent). Yet it's like doing a backup of a (potentially badly) crashed filesystem. While I trust the recovery step of ext3, my feeling is that it can't be 100% reliable. I have (rarely) seen ext3 crash and ask for fsck at boot, journal or not (for truth's sake, I can't rule out an hard disk problem in those cases). So, first question: does the suspend command cause a flush in the guest OS (details: both guest and node are CentOS 5.4, hypervisor is qemu-kvm)? I guess not (otherwise I won't be here). So if not, what are the options to force the sync? Ideally, there should be a single atomic 'sync & suspend'. In practice, I can think of some workarounds: ssh <guest> -c sync, or the very old-fashioned way of enabling the 'sync' user and logging in from the serial console, or issuing a sysrq-s, again on the console. I'm interested in the latter, but I wasn't able to trigger the sysrq from either 'virsh console <guestname>' or 'screen `virsh ttyconsole <guestname>` (tried minicom, too). The serial console is on pty, I'm not even sure you can generate a break on a pty. (and yes, I remembered to sysctl -w kernel.sysrq=1 on the guest). I know XEN has 'xm sysrq', but this is kvm. Is there anything similar? I think it can be done if you invoke qemu-kvm from the command line with -nographics (it multiplexes the console and the monitor lines on stdin/out, and you can send a 'break' with C-a b I think, I've never tried). So question 2): is there a way to send a sysrq-s to the guest? My fallback plan is to try and map the serial line over telnet instead of pty, and the figure out a way to send the break (which I think is part of the telnet protocol) from the command line. I'd rather not mess with telnet and local port assignment to the guests, if not necessary. My really fallback plan is to revert to shutdown/snapshot/create, which is overkill for a daily backup. Question 3): does it _really_ make sense to try and sync the guest OS page cache before taking the snapshot? Or is it just me being paranoid? For reference, here's the qemu cmdline of one of the guests: /usr/libexec/qemu-kvm -S -M pc -m 512 -smp 1 -name wtitv -uuid 445d0fe5-c1b6-4baf-a186-da1fe021158c -monitor pty -pidfile /var/run/libvirt/qemu//wtitv.pid -boot c -drive file=/dev/vg_virt/wtitv,if=ide,index=0,boot=on -net nic,macaddr=00:16:3e:57:45:4f,vlan=0,model=e1000 -net tap,fd=14,script=,vlan=0,ifname=vnet0 -serial pty -parallel none -usb -usbdevice tablet -vnc 127.0.0.1:0 and here's the xml config file for libvirt, same guest: <domain type='kvm'> <name>wtitv</name> <uuid>445d0fe5-c1b6-4baf-a186-da1fe021158c</uuid> <memory>524288</memory> <currentMemory>524288</currentMemory> <vcpu>1</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> </os> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <features> <acpi/> </features> <devices> <emulator>/usr/libexec/qemu-kvm</emulator> <disk type='block' device='disk'> <source dev='/dev/vg_virt/wtitv'/> <target dev='hda' bus='ide'/> </disk> <interface type='bridge'> <mac address='00:16:3e:57:45:4f'/> <source bridge='br1'/> <model type='e1000'/> </interface> <console type='pty'> <target port='0'/> </console> <input type='tablet' bus='usb'/> <graphics type='vnc' autoport='yes'/> </devices> </domain> TIA, .TM.

2 2

[libvirt] [PATCH 0/2] CPU flags capabilities and domain configuration
by Jiri Denemark 05 Nov '09

05 Nov '09

Hi, These are two initial patches for CPU flags/masks support for libvirt. The first patch contains changes to schemas and describes semantics of new elements and attributes. The second patch introduces internal API functions for XML parsing and formating. Jiri Denemark (2): XML schema for CPU flags XML parsing/formating code for CPU flags docs/schemas/capability.rng | 30 ++++ docs/schemas/domain.rng | 49 ++++++ include/libvirt/virterror.h | 1 + src/Makefile.am | 9 +- src/conf/capabilities.c | 31 ++++- src/conf/capabilities.h | 6 + src/conf/cpu_conf.c | 345 +++++++++++++++++++++++++++++++++++++++++++ src/conf/cpu_conf.h | 110 ++++++++++++++ src/conf/domain_conf.c | 15 ++ src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 8 + src/util/virterror.c | 3 + 12 files changed, 606 insertions(+), 3 deletions(-) create mode 100644 src/conf/cpu_conf.c create mode 100644 src/conf/cpu_conf.h

2 4

[libvirt] F12beta guest will not connect to LAN via bridge
by Gerry Reno 05 Nov '09

05 Nov '09

Setup: HOST: F11 x86_64 GUEST: F12beta x86_64 I have a number of guests setup on this host and all connect without a problem with the 'br0' bridge on the host. I created a new guest and loaded F12beta on it. I defined it to also use 'br0' networking but this guest cannot ping anything on the LAN. All the other guests have no problems communicating to addresses on the LAN. Details: ### on HOST: # brctl showmacs br0 port no mac addr is local? ageing timer 1 00:0b:82:11:bc:cb no 15.88 3 00:0c:01:30:50:00 no 16.37 2 00:0c:01:40:50:00 no 2.51 1 00:0c:29:e3:bc:ee no 0.49 1 00:18:f8:48:27:15 no 2.51 1 00:18:f8:9b:ba:b4 no 116.39 1 00:18:f8:9b:ba:b5 no 20.60 1 00:1a:4d:5e:f6:36 no 156.43 1 00:24:1d:19:05:cf yes 0.00 3 06:1d:1d:7a:31:9b yes 0.00 2 06:ba:11:dd:7b:08 yes 0.00 1 54:52:00:24:5e:cf no 28.93 # EXISTING GUEST: network interface in xml file: <interface type='bridge'> <mac address='00:0c:01:30:50:00'/> <source bridge='br0'/> <target dev='vnet0'/> <model type='virtio'/> </interface> # NEW GUEST: network interface in xml file: <interface type='bridge'> <mac address='00:0c:01:40:50:00'/> <source bridge='br0'/> <target dev='vnet0'/> <model type='virtio'/> </interface> ### on EXISTING GUEST: DEVICE=eth0 ONBOOT=yes BOOTPROTO=static HWADDR=00:0c:01:30:50:00 IPADDR=192.168.1.200 NETMASK=255.255.255.0 NETWORK=192.168.1.0 ### on NEW GUEST: DEVICE=eth0 ONBOOT=yes BOOTPROTO=static HWADDR=00:0c:01:40:50:00 IPADDR=192.168.1.210 NETMASK=255.255.255.0 GATEWAY=192.168.1.1 NETWORK=192.168.1.0 TYPE=Ethernet IPV6INIT=no USERCTL=no ### on EXISTING GUEST: # ping 192.168.1.1 succeeds ### on NEW GUEST: # ping 192.168.1.1 fails with Destination Host Unreachable Is there something else I need to configure in F12beta to get this working? -Gerry

1 2

[libvirt] Minor doc fix for <clock>
by Cole Robinson 04 Nov '09

04 Nov '09

FYI, I just pushed this minor docs fix: commit 45bd290b64c9f911ebb6e0990f8fcef249576436 Author: Cole Robinson <crobinso(a)redhat.com> Date: Wed Nov 4 13:26:28 2009 -0500 docs: <clock> property is 'offset', not 'sync' diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 53cd960..d26ce75 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -300,7 +300,7 @@ <dl> <dt><code>clock</code></dt> - <dd>The <code>sync</code> attribute takes either "utc" or + <dd>The <code>offset</code> attribute takes either "utc" or "localtime" to specify how the guest clock is initialized in relation to the host OS. </dd> Thanks, Cole

1 0

[libvirt] ESX with Python binding
by Dave Bryson 04 Nov '09

04 Nov '09

I'm new to libvirt. Is it possible to use the python binding with the latest ESX support? If so, does anyone have a simple example I can try? Thanks in advance! Dave

3 2

[libvirt] [RFC][PATCH] LXC allow a container to have ethN named interfaces
by Ryota Ozaki 04 Nov '09

04 Nov '09

Note that this patch is not mature yet and still proof- of-concept prototype, although it actually works. Current implementation of lxc driver creates vethN named interface(s) in the host and passes as it is to a container. The reason why it doesn't use ethN is due to the limitation that one namespace cannot have multiple iterfaces that have an identical name so that we give up creating ethN named interface in the host for the container. However, we should be able to allow the container to have ethN by changing the name after clone(CLONE_NEWNET) in controller. To this end, this patch extends --veth argument of controller to be able to have two names; one is the name of a created veth, and the other is a new name. The format is: --veth veth1,eth0 --veth veth3,eth1 ... where veth1 is old name and eth0 is new one. The implementation also allows a single name, in that case, controller does not do nothing for the interface, which is the original behavior. The numbering of the new names is simply ascending order from zero. So if there is one interface, its name will be eth0. --- src/lxc/lxc_container.c | 23 ++++++++++++++++++----- src/lxc/lxc_container.h | 1 + src/lxc/lxc_controller.c | 30 ++++++++++++++++++++++++++++-- src/lxc/lxc_driver.c | 30 +++++++++++++++++++++++++----- src/lxc/veth.c | 20 ++++++++++++++++++++ src/lxc/veth.h | 1 + 6 files changed, 93 insertions(+), 12 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index f4381e7..f065788 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -84,6 +84,7 @@ struct __lxc_child_argv { virDomainDefPtr config; unsigned int nveths; char **veths; + char **newveths; int monitor; char *ttyPath; }; @@ -233,14 +234,23 @@ static int lxcContainerWaitForContinue(int control) * Returns 0 on success or nonzero in case of error */ static int lxcContainerEnableInterfaces(unsigned int nveths, - char **veths) + char **veths, char **newveths) { int rc = 0; unsigned int i; for (i = 0 ; i < nveths ; i++) { - DEBUG("Enabling %s", veths[i]); - rc = vethInterfaceUpOrDown(veths[i], 1); + char *veth = veths[i]; + if (newveths[i] && !STREQ(veths[i], newveths[i])) { + DEBUG("changing %s", veths[i]); + rc = setInterfaceName(veths[i], newveths[i]); + if (0 != rc) { + goto error_out; + } + veth = newveths[i]; + } + DEBUG("Enabling %s", veth); + rc = vethInterfaceUpOrDown(veth, 1); if (0 != rc) { goto error_out; } @@ -758,7 +768,9 @@ static int lxcContainerChild( void *data ) return -1; /* enable interfaces */ - if (lxcContainerEnableInterfaces(argv->nveths, argv->veths) < 0) + if (lxcContainerEnableInterfaces(argv->nveths, + argv->veths, + argv->newveths) < 0) return -1; /* drop a set of root capabilities */ @@ -786,6 +798,7 @@ static int userns_supported(void) int lxcContainerStart(virDomainDefPtr def, unsigned int nveths, char **veths, + char **newveths, int control, char *ttyPath) { @@ -793,7 +806,7 @@ int lxcContainerStart(virDomainDefPtr def, int flags; int stacksize = getpagesize() * 4; char *stack, *stacktop; - lxc_child_argv_t args = { def, nveths, veths, control, ttyPath }; + lxc_child_argv_t args = { def, nveths, veths, newveths, control, ttyPath }; /* allocate a stack for the container */ if (VIR_ALLOC_N(stack, stacksize) < 0) { diff --git a/src/lxc/lxc_container.h b/src/lxc/lxc_container.h index a1dd5a1..d796380 100644 --- a/src/lxc/lxc_container.h +++ b/src/lxc/lxc_container.h @@ -49,6 +49,7 @@ int lxcContainerSendContinue(int control); int lxcContainerStart(virDomainDefPtr def, unsigned int nveths, char **veths, + char **newveths, int control, char *ttyPath); diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 545f718..75dd73a 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -493,6 +493,7 @@ static int lxcControllerRun(virDomainDefPtr def, unsigned int nveths, char **veths, + char **newveths, int monitor, int client, int appPty) @@ -603,6 +604,7 @@ lxcControllerRun(virDomainDefPtr def, if ((container = lxcContainerStart(def, nveths, veths, + newveths, control[1], containerPtyPath)) < 0) goto cleanup; @@ -649,6 +651,7 @@ int main(int argc, char *argv[]) char *name = NULL; int nveths = 0; char **veths = NULL; + char **newveths = NULL; int monitor = -1; int appPty = -1; int bg = 0; @@ -691,10 +694,33 @@ int main(int argc, char *argv[]) virReportOOMError(NULL); goto cleanup; } - if ((veths[nveths++] = strdup(optarg)) == NULL) { + if (VIR_REALLOC_N(newveths, nveths+1) < 0) { virReportOOMError(NULL); goto cleanup; } + { + char *sep = strchr(optarg, ','); + if (sep) { + *sep = '\0'; + sep++; + if ((veths[nveths] = strdup(optarg)) == NULL) { + virReportOOMError(NULL); + goto cleanup; + } + if ((newveths[nveths] = strdup(sep)) == NULL) { + virReportOOMError(NULL); + goto cleanup; + } + nveths++; + } else { + if ((veths[nveths] = strdup(optarg)) == NULL) { + virReportOOMError(NULL); + goto cleanup; + } + newveths[nveths] = NULL; + nveths++; + } + } break; case 'c': @@ -803,7 +829,7 @@ int main(int argc, char *argv[]) goto cleanup; } - rc = lxcControllerRun(def, nveths, veths, monitor, client, appPty); + rc = lxcControllerRun(def, nveths, veths, newveths, monitor, client, appPty); cleanup: diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 4f0787b..1323cff 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -693,13 +693,15 @@ static int lxcVMCleanup(virConnectPtr conn, static int lxcSetupInterfaces(virConnectPtr conn, virDomainDefPtr def, unsigned int *nveths, - char ***veths) + char ***veths, + char ***newveths) { int rc = -1, i; char *bridge = NULL; char parentVeth[PATH_MAX] = ""; char containerVeth[PATH_MAX] = ""; brControl *brctl = NULL; + char *newveth; if (brInit(&brctl) != 0) return -1; @@ -744,10 +746,20 @@ static int lxcSetupInterfaces(virConnectPtr conn, if (NULL == def->nets[i]->ifname) { def->nets[i]->ifname = strdup(parentVeth); } + if (VIR_REALLOC_N(*veths, (*nveths)+1) < 0) goto error_exit; - if (((*veths)[(*nveths)++] = strdup(containerVeth)) == NULL) + if (VIR_REALLOC_N(*newveths, (*nveths)+1) < 0) + goto error_exit; + + if (((*veths)[*nveths] = strdup(containerVeth)) == NULL) + goto error_exit; + if (virAsprintf(&newveth, "eth%d", i) < 0) goto error_exit; + if (((*newveths)[*nveths] = strdup(newveth)) == NULL) + goto error_exit; + (*nveths)++; + VIR_FREE(newveth); if (NULL == def->nets[i]->ifname) { lxcError(NULL, NULL, VIR_ERR_INTERNAL_ERROR, @@ -906,6 +918,7 @@ static int lxcControllerStart(virConnectPtr conn, virDomainObjPtr vm, int nveths, char **veths, + char **newveths, int appPty, int logfd) { @@ -1029,7 +1042,13 @@ static int lxcControllerStart(virConnectPtr conn, for (i = 0 ; i < nveths ; i++) { ADD_ARG_LIT("--veth"); - ADD_ARG_LIT(veths[i]); + if (newveths[i]) { + if (virAsprintf(&tmp, "%s,%s", veths[i], newveths[i]) < 0) + goto no_memory; + ADD_ARG_LIT(tmp); + } else { + ADD_ARG_LIT(veths[i]); + } } ADD_ARG(NULL); @@ -1107,6 +1126,7 @@ static int lxcVmStart(virConnectPtr conn, int logfd = -1; unsigned int nveths = 0; char **veths = NULL; + char **newveths = NULL; if ((r = virFileMakePath(driver->logDir)) < 0) { virReportSystemError(conn, r, @@ -1135,7 +1155,7 @@ static int lxcVmStart(virConnectPtr conn, VIR_FREE(parentTtyPath); } - if (lxcSetupInterfaces(conn, vm->def, &nveths, &veths) != 0) + if (lxcSetupInterfaces(conn, vm->def, &nveths, &veths, &newveths) != 0) goto cleanup; /* Persist the live configuration now we have veth & tty info */ @@ -1152,7 +1172,7 @@ static int lxcVmStart(virConnectPtr conn, if (lxcControllerStart(conn, vm, - nveths, veths, + nveths, veths, newveths, parentTty, logfd) < 0) goto cleanup; diff --git a/src/lxc/veth.c b/src/lxc/veth.c index b15df8d..fbd1195 100644 --- a/src/lxc/veth.c +++ b/src/lxc/veth.c @@ -247,3 +247,23 @@ int setMacAddr(const char* iface, const char* macaddr) error_out: return rc; } + +int setInterfaceName(const char* iface, const char* new) +{ + int rc = -1; + const char *argv[] = { + "ip", "link", "set", iface, "name", new, NULL + }; + int cmdResult; + + if (NULL == iface || NULL == new) { + goto error_out; + } + + rc = virRun(NULL, argv, &cmdResult); + if (0 == rc) + rc = cmdResult; + +error_out: + return rc; +} diff --git a/src/lxc/veth.h b/src/lxc/veth.h index 8f2f514..8075a5e 100644 --- a/src/lxc/veth.h +++ b/src/lxc/veth.h @@ -21,5 +21,6 @@ int vethDelete(const char* veth); int vethInterfaceUpOrDown(const char* veth, int upOrDown); int moveInterfaceToNetNs(const char *iface, int pidInNs); int setMacAddr(const char* iface, const char* macaddr); +int setInterfaceName(const char* iface, const char* new); #endif /* VETH_H */ -- 1.6.2.5

2 4

[libvirt] starting vm using virsh somewhat fails
by Ricardo Tiago 04 Nov '09

04 Nov '09

Hi all, I have started a vm using virsh create domain.xml and it starts for a second and then its destroyed automatically. When I do xm create -f <xm cfg> it works fine. I don't know if this is relevant but virsh net-list --all Name State Autostart ----------------------------------------- default inactive yes virsh net-start default error: Failed to start network default error: Failed to open file '/etc/sysconfig/system-config-firewall': No such file or directory Can this be the problem? Why do I need /etc/sysconfig/system-config-firewall? Domain XML Description: (converted from a xm cfg file) <domain type='xen'> <name>rtiago_test</name> <uuid>8f07fe28-753f-2729-d76d-bdbd892f949a</uuid> <memory>2560000</memory> <currentMemory>200000</currentMemory> <vcpu>8</vcpu> <bootloader>/usr/bin/pygrub</bootloader> <os> <type arch='x86_64' machine='xenpv'>linux</type> <cmdline>rtiago</cmdline> </os> <clock offset='utc'/> <on_poweroff>restart</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <disk type='file' device='disk'> <driver name='file'/> <source file='/images/fc-6.img'/> <target dev='xvda1' bus='xen'/> </disk> </domain>

1 1

[libvirt] [PATCH] network utilities: Allocate space for terminating NUL in virSocketFormatAddr
by Matthew Booth 04 Nov '09

04 Nov '09

* src/util/network.c: Allocate an additional byte for virSocketFormatAddr's return buffer --- src/util/network.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/network.c b/src/util/network.c index 56426e7..f6588c7 100644 --- a/src/util/network.c +++ b/src/util/network.c @@ -135,12 +135,12 @@ virSocketFormatAddr(virSocketAddrPtr addr) { return NULL; if (addr->stor.ss_family == AF_INET) { - outlen = INET_ADDRSTRLEN; + outlen = INET_ADDRSTRLEN + 1; inaddr = &addr->inet4.sin_addr; } else if (addr->stor.ss_family == AF_INET6) { - outlen = INET6_ADDRSTRLEN; + outlen = INET6_ADDRSTRLEN + 1; inaddr = &addr->inet6.sin6_addr; } -- 1.6.2.5

2 2

[libvirt] [PATCH] Fix up NLS warnings.
by Chris Lalancette 04 Nov '09

04 Nov '09

When building with --disable-nls, I got a few messages like this: storage/storage_backend.c: In function 'virStorageBackendCreateQemuImg': storage/storage_backend.c:571: warning: format not a string literal and no format arguments Fix these up. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/conf/domain_conf.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/qemu/qemu_driver.c | 6 +++--- src/storage/storage_backend.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ba6b28d..a9c8573 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1813,7 +1813,7 @@ virDomainWatchdogDefParseXML(virConnectPtr conn, model = virXMLPropString (node, "model"); if (model == NULL) { - virDomainReportError (conn, VIR_ERR_INTERNAL_ERROR, + virDomainReportError (conn, VIR_ERR_INTERNAL_ERROR, "%s", _("watchdog must contain model name")); goto error; } diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 9a5c43a..1e984c5 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -1858,7 +1858,7 @@ static int lxcSetSchedulerParameters(virDomainPtr domain, for (i = 0; i < nparams; i++) { virSchedParameterPtr param = &params[i]; if (param->type != VIR_DOMAIN_SCHED_FIELD_ULLONG) { - lxcError(NULL, domain, VIR_ERR_INVALID_ARG, + lxcError(NULL, domain, VIR_ERR_INVALID_ARG, "%s", _("invalid type for cpu_shares tunable, expected a 'ullong'")); goto cleanup; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 38fe19e..7295641 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5299,7 +5299,7 @@ static int qemuSetSchedulerParameters(virDomainPtr dom, if (STREQ(param->field, "cpu_shares")) { int rc; if (param->type != VIR_DOMAIN_SCHED_FIELD_ULLONG) { - qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_ARG, + qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_ARG, "%s", _("invalid type for cpu_shares tunable, expected a 'ullong'")); goto cleanup; } @@ -6479,7 +6479,7 @@ static int doTunnelSendAll(virDomainPtr dom, break; if (virStreamSend(st, buffer, nbytes) < 0) { - qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, + qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, "%s", _("Failed to write migration data to remote libvirtd")); return -1; } @@ -6701,7 +6701,7 @@ static int doNonTunnelMigrate(virDomainPtr dom, goto cleanup; if (uri_out == NULL) { - qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, + qemudReportError(NULL, NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("domainMigratePrepare2 did not set uri")); } diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 18a69be..bb926cd 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -568,7 +568,7 @@ virStorageBackendCreateQemuImg(virConnectPtr conn, return -1; } if (enc->nsecrets > 1) { - virStorageReportError(conn, VIR_ERR_INVALID_STORAGE_VOL, + virStorageReportError(conn, VIR_ERR_INVALID_STORAGE_VOL, "%s", _("too many secrets for qcow encryption")); return -1; } -- 1.6.0.6

3 3