- Devel - libvirt List Archives

[Libvir] Libvirt on Mac OS X 10.5
by Richard W.M. Jones 23 Jan '08

23 Jan '08

I got a little bit further with this, my current patch is attached. At the moment, it gets as far as building libvirt & virsh, but fails to build the Python bindings. However virsh doesn't run, apparently because of a simple dynamic linking problem because of where the libraries are (not yet) installed. I'm afraid that my understanding of how to build and install applications on Mac OS X ends around here. In particular I have no idea how to get the detailed abort trace that Andrew showed up in his previous email. References to portablexdr will be explained in a forthcoming email. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

3 6

[Libvir] API "int virDomainRestore(Conn, from)"
by Daniel Schwager 23 Jan '08

23 Jan '08

Hi, I would like to restore a domain. I think, after restoring the domain, the vnc-port maybe has changed (because e.g. another domain use the old VNC-port at the meantime). If I do not know the domainname I restored, I have no possibility to get this vnc-port or connect to the restored domain. Is this correct ? So, would it not be better to change the API to virDomainPtr virDomainRestore(Conn, from) regards Danny ------------------------------------------------------------------- DT Netsolution GmbH - Taläckerstr. 30 - D-70437 Stuttgart Geschäftsführer: Daniel Schwager, Stefan Hörz - HRB Stuttgart 19870 Tel: +49-711-849910-32, Fax: -932 - Mailto:daniel.schwager@dtnet.de

2 1

[Libvir] Any sample code to use virConnectOpenAuth() in C binding ?
by Arun Sharma 23 Jan '08

23 Jan '08

Hello All, Can anyone provide me sample code for connecting hypervisor using credentials. As of now i have implemented using(virConnectOpen(NULL)) , but this function does not takes any credential information. I saw that there is function (virConnectOpenAuth()) which can be used , but i don;t know any way to implement Thanks in advance. -- Regards Arun Sharma 0-934-829-3810

2 1

[Libvir] Windows sizeof(long) != Linux sizeof(long)
by Daniel P. Berrange 23 Jan '08

23 Jan '08

Just discovered that on x86_64, Windows and Linux differ in what they think sizeof(long) to be. http://lists.xensource.com/archives/html/xen-devel/2008-01/msg00736.html http://www.winehq.org/pipermail/wine-devel/2005-July/038602.html Windows i686: sizeof(long) == 4, sizeof(void*) == 4 Windows x86_64: sizeof(long) == 4, sizeof(void*) == 8 Linux i686: sizeof(long) == 4, sizeof(void*) == 4 Linux x86_64: sizeof(long) == 8, sizeof(void*) == 8 Unfortunately we have a number of APIs which use 'long' in the public header file for dealing with VM memory. Fortunately they are all using memory in size of KB, so we are not totally doomed until people start wanting to manage VMs with > 2 TB of RAM. Also fortunately, the wire-encoding for these APIs all uses hyper, so on the wire everything is 64-bit guarenteed. Eventually though we might want to consider adding struct virDomainInfo64 struct virNodeInfo64 virDomainGetMemory64 virDomainSetMemory64 virDomainSetMaxMemory64 ....simply replacing 'long' with 'long long' in these 5 APIs so we have public APIs whose precision matches the wire encoding. More immediately though, we need to be careful that there is no code that assumes sizeof(long) == sizeof(void*) - eg any places we cast pointers to integers and back again will break on Windows 64. Again fortunately, so far I can only find places going from int -> pointer -> int which is OK because we're not loosing precision. Regards, Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

5 4

[Libvir] PortableXDR - an XDR library for Windows and Mac OS X
by Richard W.M. Jones 23 Jan '08

23 Jan '08

This is a formal project to support a known XDR platform on Windows and Mac OS X. It includes / supersedes the XDR port that Windows users were told to use before to get libvirt to compile. http://et.redhat.com/~rjones/portablexdr/ Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

1 0

[Libvir] Remove useless "if (foo)" before "free (foo)".
by Jim Meyering 23 Jan '08

23 Jan '08

Likewise, given if (foo != NULL) free (foo); remove the useless "if" test. Do the same for sexpr_free, since it has similar semantics. Detect with this: (-0x3b tells Perl to use ';' as the input record separator) perl -0x3b -ne '/\b(if $(.+?)(?:\s*!=\s*NULL\s*)?$\s+(sexpr_)?free *$\2$)/s and print "$ARGV: $1\n"'\ $(git ls-files) Note that it also changes the code produced by generator.py. This is just a heads-up. Before committing it, I will add a rule using something like the above to help avoid regressions. BTW, there is some very misleading indentation in the vicinity of some of these changes, but I didn't correct any of that. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- proxy/libvirt_proxy.c | 3 +- python/generator.py | 2 +- qemud/qemud.c | 5 +-- src/buf.c | 3 +- src/conf.c | 7 +---- src/hash.c | 15 ++++--------- src/iptables.c | 6 +--- src/libvirt.c | 6 ++-- src/openvz_conf.c | 3 +- src/qemu_conf.c | 8 ++---- src/qemu_driver.c | 18 +++++----------- src/remote_internal.c | 26 ++++++++++++------------ src/test.c | 24 +++++++-------------- src/virsh.c | 53 ++++++++++++++++-------------------------------- src/virterror.c | 12 +++------- src/xen_internal.c | 9 ++----- src/xen_unified.c | 12 +++------- src/xend_internal.c | 44 +++++++++++++--------------------------- src/xm_internal.c | 9 ++----- src/xml.c | 21 ++++++------------- src/xmlrpc.c | 20 +++++------------- src/xs_internal.c | 2 - tests/testutils.c | 3 +- tests/xencapstest.c | 3 +- tests/xmconfigtest.c | 3 +- 25 files changed, 110 insertions(+), 207 deletions(-) diff --git a/proxy/libvirt_proxy.c b/proxy/libvirt_proxy.c index d8f2e64..5ccf855 100644 --- a/proxy/libvirt_proxy.c +++ b/proxy/libvirt_proxy.c @@ -505,8 +505,7 @@ retry2: memcpy(&request.extra.str[0], uuid, VIR_UUID_BUFLEN); strcpy(&request.extra.str[VIR_UUID_BUFLEN], name); } - if (name) - free(name); + free(name); break; } case VIR_PROXY_LOOKUP_UUID: { diff --git a/python/generator.py b/python/generator.py index 7625a93..30b03fd 100755 --- a/python/generator.py +++ b/python/generator.py @@ -375,7 +375,7 @@ def print_function_wrapper(name, output, export, include): if ret[0] == 'void': if file == "python_accessor": if args[1][1] == "char *": - c_call = "\n if (%s->%s != NULL) free(%s->%s);\n" % ( + c_call = "\n free(%s->%s);\n" % ( args[0][0], args[1][0], args[0][0], args[1][0]) c_call = c_call + " %s->%s = (%s)strdup((const xmlChar *)%s);\n" % (args[0][0], args[1][0], args[1][1], args[1][0]) diff --git a/qemud/qemud.c b/qemud/qemud.c index 467e011..4cbe04e 100644 --- a/qemud/qemud.c +++ b/qemud/qemud.c @@ -1132,7 +1132,7 @@ static void qemudDispatchClientFailure(struct qemud_server *server, struct qemud #if HAVE_SASL if (client->saslconn) sasl_dispose(&client->saslconn); - if (client->saslUsername) free(client->saslUsername); + free(client->saslUsername); #endif if (client->tlssession) gnutls_deinit (client->tlssession); close(client->fd); @@ -1638,8 +1638,7 @@ static void qemudCleanup(struct qemud_server *server) { if (server->saslUsernameWhitelist) { char **list = server->saslUsernameWhitelist; while (*list) { - if (*list) - free(*list); + free(*list); list++; } } diff --git a/src/buf.c b/src/buf.c index 5f58027..188d040 100644 --- a/src/buf.c +++ b/src/buf.c @@ -150,8 +150,7 @@ void virBufferFree(virBufferPtr buf) { if (buf) { - if (buf->content) - free(buf->content); + free(buf->content); free(buf); } } diff --git a/src/conf.c b/src/conf.c index 62c42ff..8e66d84 100644 --- a/src/conf.c +++ b/src/conf.c @@ -490,7 +490,6 @@ virConfParseValue(virConfParserCtxtPtr ctxt) ret = calloc(1, sizeof(*ret)); if (ret == NULL) { virConfError(NULL, VIR_ERR_NO_MEMORY, _("allocating configuration"), 0); - if (str != NULL) free(str); return(NULL); } @@ -642,8 +641,7 @@ virConfParseStatement(virConfParserCtxtPtr ctxt) if (virConfAddEntry(ctxt->conf, name, value, comm) == NULL) { free(name); virConfFreeValue(value); - if (comm != NULL) - free(comm); + free(comm); return(-1); } return(0); @@ -776,8 +774,7 @@ __virConfFree(virConfPtr conf) virConfEntryPtr next; free(tmp->name); virConfFreeValue(tmp->value); - if (tmp->comment) - free(tmp->comment); + free(tmp->comment); next = tmp->next; free(tmp); tmp = next; diff --git a/src/hash.c b/src/hash.c index d95eea9..4e4ce60 100644 --- a/src/hash.c +++ b/src/hash.c @@ -226,8 +226,7 @@ virHashFree(virHashTablePtr table, virHashDeallocator f) next = iter->next; if ((f != NULL) && (iter->payload != NULL)) f(iter->payload, iter->name); - if (iter->name) - free(iter->name); + free(iter->name); iter->payload = NULL; if (!inside_table) free(iter); @@ -453,8 +452,7 @@ virHashRemoveEntry(virHashTablePtr table, const char *name, if ((f != NULL) && (entry->payload != NULL)) f(entry->payload, entry->name); entry->payload = NULL; - if (entry->name) - free(entry->name); + free(entry->name); if (prev) { prev->next = entry->next; free(entry); @@ -538,8 +536,7 @@ int virHashRemoveSet(virHashTablePtr table, virHashSearcher iter, virHashDealloc if (iter(entry->payload, entry->name, data)) { count++; f(entry->payload, entry->name); - if (entry->name) - free(entry->name); + free(entry->name); if (prev) { prev->next = entry->next; free(entry); @@ -812,8 +809,7 @@ __virGetDomain(virConnectPtr conn, const char *name, const unsigned char *uuid) error: pthread_mutex_unlock(&conn->lock); if (ret != NULL) { - if (ret->name != NULL) - free(ret->name ); + free(ret->name ); free(ret); } return(NULL); @@ -946,8 +942,7 @@ __virGetNetwork(virConnectPtr conn, const char *name, const unsigned char *uuid) error: pthread_mutex_unlock(&conn->lock); if (ret != NULL) { - if (ret->name != NULL) - free(ret->name ); + free(ret->name ); free(ret); } return(NULL); diff --git a/src/iptables.c b/src/iptables.c index 5ac9be6..b59faa4 100644 --- a/src/iptables.c +++ b/src/iptables.c @@ -254,8 +254,7 @@ iptRulesSave(iptRules *rules) static void iptRuleFree(iptRule *rule) { - if (rule->rule) - free(rule->rule); + free(rule->rule); rule->rule = NULL; if (rule->argv) { @@ -488,8 +487,7 @@ iptablesAddRemoveRule(iptRules *rules, int action, const char *arg, ...) } error: - if (rule) - free(rule); + free(rule); if (argv) { n = 0; diff --git a/src/libvirt.c b/src/libvirt.c index e400783..af81930 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -615,7 +615,7 @@ do_open (const char *name, return ret; failed: - if (ret->name) free (ret->name); + free (ret->name); if (ret->driver) ret->driver->close (ret); if (uri) xmlFreeURI(uri); virUnrefConnect(ret); @@ -1978,8 +1978,8 @@ virDomainMigrate (virDomainPtr domain, ddomain = virDomainLookupByName (dconn, dname); done: - if (uri_out) free (uri_out); - if (cookie) free (cookie); + free (uri_out); + free (cookie); return ddomain; } diff --git a/src/openvz_conf.c b/src/openvz_conf.c index a886001..4e4019c 100644 --- a/src/openvz_conf.c +++ b/src/openvz_conf.c @@ -494,8 +494,7 @@ static struct openvz_vm_def return def; bail_out: - if (prop) - free(prop); + free(prop); if (obj) xmlXPathFreeObject(obj); if (ctxt) diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 922223e..0de641d 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -1379,8 +1379,7 @@ static struct qemud_vm_def *qemudParseXML(virConnectPtr conn, return def; error: - if (prop) - free(prop); + free(prop); if (obj) xmlXPathFreeObject(obj); if (ctxt) @@ -1468,8 +1467,7 @@ qemudNetworkIfaceConnect(virConnectPtr conn, no_memory: qemudReportError(conn, NULL, NULL, VIR_ERR_NO_MEMORY, "tapfds"); error: - if (retval) - free(retval); + free(retval); if (tapfd != -1) close(tapfd); return NULL; @@ -1941,7 +1939,7 @@ qemudParseVMDeviceDef(virConnectPtr conn, error: if (xml) xmlFreeDoc(xml); - if (dev) free(dev); + free(dev); return NULL; } diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 566fb76..71a3125 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -228,7 +228,7 @@ qemudStartup(void) { out_of_memory: qemudLog (QEMUD_ERR, "qemudStartup: out of memory"); - if (base) free (base); + free (base); free(qemu_driver); qemu_driver = NULL; return -1; @@ -330,17 +330,11 @@ qemudShutdown(void) { qemu_driver->nactivenetworks = 0; qemu_driver->ninactivenetworks = 0; - if (qemu_driver->configDir) - free(qemu_driver->configDir); - if (qemu_driver->autostartDir) - free(qemu_driver->autostartDir); - if (qemu_driver->networkConfigDir) - free(qemu_driver->networkConfigDir); - if (qemu_driver->networkAutostartDir) - free(qemu_driver->networkAutostartDir); - - if (qemu_driver->vncTLSx509certdir) - free(qemu_driver->vncTLSx509certdir); + free(qemu_driver->configDir); + free(qemu_driver->autostartDir); + free(qemu_driver->networkConfigDir); + free(qemu_driver->networkAutostartDir); + free(qemu_driver->vncTLSx509certdir); if (qemu_driver->brctl) brShutdown(qemu_driver->brctl); diff --git a/src/remote_internal.c b/src/remote_internal.c index 860b4d8..4d855ab 100644 --- a/src/remote_internal.c +++ b/src/remote_internal.c @@ -735,13 +735,13 @@ doRemoteOpen (virConnectPtr conn, cleanup: /* Free up the URL and strings. */ - if (name) free (name); - if (command) free (command); - if (sockname) free (sockname); - if (authtype) free (authtype); - if (netcat) free (netcat); - if (username) free (username); - if (port) free (port); + free (name); + free (command); + free (sockname); + free (authtype); + free (netcat); + free (username); + free (port); if (cmd_argv) { char **cmd_argv_ptr = cmd_argv; while (*cmd_argv_ptr) { @@ -1139,10 +1139,10 @@ doRemoteClose (virConnectPtr conn, struct private_data *priv) #endif /* Free hostname copy */ - if (priv->hostname) free (priv->hostname); + free (priv->hostname); /* See comment for remoteType. */ - if (priv->type) free (priv->type); + free (priv->type); /* Free private data. */ priv->magic = DEAD; @@ -3267,7 +3267,7 @@ remoteAuthSASL (virConnectPtr conn, struct private_data *priv, int in_open, /* This server call shows complete, and earlier client step was OK */ if (complete && err == SASL_OK) { - if (serverin) free(serverin); + free(serverin); break; } } @@ -3297,9 +3297,9 @@ remoteAuthSASL (virConnectPtr conn, struct private_data *priv, int in_open, ret = 0; cleanup: - if (localAddr) free(localAddr); - if (remoteAddr) free(remoteAddr); - if (serverin) free(serverin); + free(localAddr); + free(remoteAddr); + free(serverin); free(saslcb); remoteAuthFreeCredentials(cred, ncred); diff --git a/src/test.c b/src/test.c index d228b31..d39207f 100644 --- a/src/test.c +++ b/src/test.c @@ -354,8 +354,7 @@ static int testLoadDomain(virConnectPtr conn, return (handle); error: - if (name) - free(name); + free(name); return (-1); } @@ -525,16 +524,11 @@ static int testLoadNetwork(virConnectPtr conn, return (handle); error: - if (ipaddress) - free(ipaddress); - if (ipnetmask) - free(ipnetmask); - if (dhcpstart) - free(dhcpstart); - if (dhcpend) - free(dhcpend); - if (name) - free(name); + free(ipaddress); + free(ipnetmask); + free(dhcpstart); + free(dhcpend); + free(name); return (-1); } @@ -838,10 +832,8 @@ static int testOpenFromFile(virConnectPtr conn, return (0); error: - if (domains != NULL) - free(domains); - if (networks != NULL) - free(networks); + free(domains); + free(networks); if (xml) xmlFreeDoc(xml); if (fd != -1) diff --git a/src/virsh.c b/src/virsh.c index 78c7c85..d081008 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -428,8 +428,7 @@ cmdConnect(vshControl * ctl, vshCmd * cmd) ctl->conn = NULL; } - if (ctl->name) - free(ctl->name); + free(ctl->name); ctl->name = vshStrdup(ctl, vshCommandOptString(cmd, "name", NULL)); if (!ro) { @@ -577,8 +576,7 @@ cmdList(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) maxname = virConnectNumOfDefinedDomains(ctl->conn); if (maxname < 0) { vshError(ctl, FALSE, "%s", _("Failed to list inactive domains")); - if (ids) - free(ids); + free(ids); return FALSE; } if (maxname) { @@ -586,8 +584,7 @@ cmdList(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) if ((maxname = virConnectListDefinedDomains(ctl->conn, names, maxname)) < 0) { vshError(ctl, FALSE, "%s", _("Failed to list inactive domains")); - if (ids) - free(ids); + free(ids); free(names); return FALSE; } @@ -639,10 +636,8 @@ cmdList(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) virDomainFree(dom); free(names[i]); } - if (ids) - free(ids); - if (names) - free(names); + free(ids); + free(names); return TRUE; } @@ -1217,8 +1212,7 @@ cmdSchedinfo(vshControl * ctl, vshCmd * cmd) } } cleanup: - if (params) - free(params); + free(params); virDomainFree(dom); return ret_val; } @@ -2513,8 +2507,7 @@ cmdNetworkList(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) maxinactive = virConnectNumOfDefinedNetworks(ctl->conn); if (maxinactive < 0) { vshError(ctl, FALSE, "%s", _("Failed to list inactive networks")); - if (activeNames) - free(activeNames); + free(activeNames); return FALSE; } if (maxinactive) { @@ -2522,8 +2515,7 @@ cmdNetworkList(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) if ((maxinactive = virConnectListDefinedNetworks(ctl->conn, inactiveNames, maxinactive)) < 0) { vshError(ctl, FALSE, "%s", _("Failed to list inactive networks")); - if (activeNames) - free(activeNames); + free(activeNames); free(inactiveNames); return FALSE; } @@ -2581,10 +2573,8 @@ cmdNetworkList(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) virNetworkFree(network); free(inactiveNames[i]); } - if (activeNames) - free(activeNames); - if (inactiveNames) - free(inactiveNames); + free(activeNames); + free(inactiveNames); return TRUE; } @@ -3230,10 +3220,8 @@ cmdAttachInterface(vshControl * ctl, vshCmd * cmd) cleanup: if (dom) virDomainFree(dom); - if (buf) - free(buf); - if (tmp) - free(tmp); + free(buf); + free(tmp); return ret; } @@ -3516,10 +3504,8 @@ cmdAttachDisk(vshControl * ctl, vshCmd * cmd) cleanup: if (dom) virDomainFree(dom); - if (buf) - free(buf); - if (tmp) - free(tmp); + free(buf); + free(tmp); return ret; } @@ -3868,8 +3854,7 @@ vshCommandOptFree(vshCmdOpt * arg) a = a->next; - if (tmp->data) - free(tmp->data); + free(tmp->data); free(tmp); } } @@ -4267,7 +4252,7 @@ vshCommandParse(vshControl * ctl, char *cmdstr) c->next = NULL; if (!vshCommandCheckOpts(ctl, c)) { - if(c) free(c); + free(c); goto syntaxError; } @@ -4286,8 +4271,7 @@ vshCommandParse(vshControl * ctl, char *cmdstr) vshCommandFree(ctl->cmd); if (first) vshCommandOptFree(first); - if (tkdata) - free(tkdata); + free(tkdata); return FALSE; } @@ -4791,8 +4775,7 @@ static int vshDeinit(vshControl * ctl) { vshCloseLogFile(ctl); - if (ctl->name) - free(ctl->name); + free(ctl->name); if (ctl->conn) { if (virConnectClose(ctl->conn) != 0) { ctl->conn = NULL; /* prevent recursive call from vshError() */ diff --git a/src/virterror.c b/src/virterror.c index 0c0423b..bf4062d 100644 --- a/src/virterror.c +++ b/src/virterror.c @@ -109,14 +109,10 @@ virResetError(virErrorPtr err) { if (err == NULL) return; - if (err->message != NULL) - free(err->message); - if (err->str1 != NULL) - free(err->str1); - if (err->str2 != NULL) - free(err->str2); - if (err->str3 != NULL) - free(err->str3); + free(err->message); + free(err->str1); + free(err->str2); + free(err->str3); memset(err, 0, sizeof(virError)); } diff --git a/src/xen_internal.c b/src/xen_internal.c index 2ca1052..133c253 100644 --- a/src/xen_internal.c +++ b/src/xen_internal.c @@ -1680,8 +1680,7 @@ virXen_setvcpumap(int handle, int id, unsigned int vcpu, op.u.setvcpumapd5.cpumap.nr_cpus = nr_cpus; } ret = xenHypervisorDoV2Dom(handle, &op); - if (new) - free(new); + free(new); if (unlock_pages(cpumap, maplen) < 0) { virXenError(NULL, VIR_ERR_XEN_CALL, " release", maplen); @@ -2056,15 +2055,13 @@ xenHypervisorInit(void) virXenError(NULL, VIR_ERR_XEN_CALL, " ioctl ", IOCTL_PRIVCMD_HYPERCALL); close(fd); in_init = 0; - if (ipt) - free(ipt); + free(ipt); return(-1); done: close(fd); in_init = 0; - if (ipt) - free(ipt); + free(ipt); return(0); } diff --git a/src/xen_unified.c b/src/xen_unified.c index 187b7f5..d46e63b 100644 --- a/src/xen_unified.c +++ b/src/xen_unified.c @@ -200,12 +200,9 @@ xenDomainUsedCpus(virDomainPtr dom) } done: - if (cpulist != NULL) - free(cpulist); - if (cpumap != NULL) - free(cpumap); - if (cpuinfo != NULL) - free(cpuinfo); + free(cpulist); + free(cpumap); + free(cpuinfo); return(res); } @@ -912,9 +909,8 @@ xenUnifiedDomainDumpXML (virDomainPtr dom, int flags) char *cpus, *res; cpus = xenDomainUsedCpus(dom); res = xenDaemonDomainDumpXML(dom, flags, cpus); - if (cpus != NULL) free(cpus); - return(res); + return(res); } if (priv->opened[XEN_UNIFIED_PROXY_OFFSET]) return xenProxyDomainDumpXML(dom, flags); diff --git a/src/xend_internal.c b/src/xend_internal.c index a9fc332..61af69b 100644 --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -620,8 +620,7 @@ xend_op_ext2(virConnectPtr xend, const char *path, char *error, } ret = http2unix(xend, xend_post(xend, path, buf.content, error, n_error)); - if (buf.content != NULL) - free(buf.content); + free(buf.content); return ret; } @@ -1640,10 +1639,8 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root, virBufferAdd(&buf, " </disk>\n", 12); bad_parse: - if (drvName) - free(drvName); - if (drvType) - free(drvType); + free(drvName); + free(drvType); } else if (sexpr_lookup(node, "device/vif")) { const char *tmp2; tmp2 = sexpr_node(node, "device/vif/script"); @@ -1809,8 +1806,7 @@ xend_parse_sexp_desc(virConnectPtr conn, struct sexpr *root, return (buf.content); error: - if (buf.content != NULL) - free(buf.content); + free(buf.content); return (NULL); } @@ -2809,7 +2805,6 @@ xenDaemonListDomains(virConnectPtr conn, int *ids, int maxids) } error: - if (root != NULL) sexpr_free(root); return(ret); } @@ -2843,7 +2838,6 @@ xenDaemonNumOfDomains(virConnectPtr conn) } error: - if (root != NULL) sexpr_free(root); return(ret); } @@ -2877,8 +2871,7 @@ xenDaemonLookupByID(virConnectPtr conn, int id) { return (ret); error: - if (name != NULL) - free(name); + free(name); return (NULL); } @@ -3152,10 +3145,8 @@ xenDaemonCreateLinux(virConnectPtr conn, const char *xmlDesc, sexpr = virDomainParseXMLDesc(conn, xmlDesc, &name, priv->xendConfigVersion); if ((sexpr == NULL) || (name == NULL)) { virXendError(conn, VIR_ERR_XML_ERROR, "domain"); - if (sexpr != NULL) - free(sexpr); - if (name != NULL) - free(name); + free(sexpr); + free(name); return (NULL); } @@ -3187,8 +3178,7 @@ xenDaemonCreateLinux(virConnectPtr conn, const char *xmlDesc, xenDaemonDomainDestroy(dom); virUnrefDomain(dom); } - if (name != NULL) - free(name); + free(name); return (NULL); } @@ -3228,8 +3218,7 @@ xenDaemonAttachDevice(virDomainPtr domain, const char *xml) str = virDomainGetOSType(domain); if (strcmp(str, "linux")) hvm = 1; - if (str) - free(str); + free(str); sexpr = virParseXMLDevice(domain->conn, xml, hvm, priv->xendConfigVersion); if (sexpr == NULL) return (-1); @@ -3460,10 +3449,8 @@ virDomainPtr xenDaemonDomainDefineXML(virConnectPtr conn, const char *xmlDesc) { sexpr = virDomainParseXMLDesc(conn, xmlDesc, &name, priv->xendConfigVersion); if ((sexpr == NULL) || (name == NULL)) { virXendError(conn, VIR_ERR_XML_ERROR, "domain"); - if (sexpr != NULL) - free(sexpr); - if (name != NULL) - free(name); + free(sexpr); + free(name); return (NULL); } @@ -3482,8 +3469,7 @@ virDomainPtr xenDaemonDomainDefineXML(virConnectPtr conn, const char *xmlDesc) { return (dom); error: - if (name != NULL) - free(name); + free(name); return (NULL); } int xenDaemonDomainCreate(virDomainPtr domain) @@ -3558,8 +3544,7 @@ xenDaemonNumOfDefinedDomains(virConnectPtr conn) } error: - if (root != NULL) - sexpr_free(root); + sexpr_free(root); return(ret); } @@ -3591,8 +3576,7 @@ int xenDaemonListDefinedDomains(virConnectPtr conn, char **const names, int maxn } error: - if (root != NULL) - sexpr_free(root); + sexpr_free(root); return(ret); } diff --git a/src/xm_internal.c b/src/xm_internal.c index 6b502d0..a1317c4 100644 --- a/src/xm_internal.c +++ b/src/xm_internal.c @@ -1865,8 +1865,7 @@ static char *xenXMParseXMLVif(virConnectPtr conn, xmlNodePtr node, int hvm) { } cleanup: - if (bridge != NULL) - free(bridge); + free(bridge); if (mac != NULL) xmlFree(mac); if (source != NULL) @@ -2238,8 +2237,7 @@ virConfPtr xenXMParseXMLToConfig(virConnectPtr conn, const char *xml) { if (!vif) goto error; if (!(thisVif = malloc(sizeof(*thisVif)))) { - if (vif) - free(vif); + free(vif); xenXMError(conn, VIR_ERR_NO_MEMORY, "config"); goto error; } @@ -2410,8 +2408,7 @@ virDomainPtr xenXMDomainDefineXML(virConnectPtr conn, const char *xml) { return (ret); error: - if (entry) - free(entry); + free(entry); if (conf) virConfFree(conf); return (NULL); diff --git a/src/xml.c b/src/xml.c index c698889..a546002 100644 --- a/src/xml.c +++ b/src/xml.c @@ -397,14 +397,12 @@ virParseXenCpuTopology(virConnectPtr conn, virBufferPtr xml, parse_error: virXMLError(conn, VIR_ERR_XEN_CALL, _("topology syntax error"), 0); error: - if (cpuset != NULL) - free(cpuset); + free(cpuset); return (-1); memory_error: - if (cpuset != NULL) - free(cpuset); + free(cpuset); virXMLError(conn, VIR_ERR_NO_MEMORY, _("allocate buffer"), 0); return (-1); } @@ -1066,16 +1064,14 @@ virDomainParseXMLOSDescHVM(virConnectPtr conn, xmlNodePtr node, if (str != NULL && !strcmp(str, "localtime")) { virBufferAdd(buf, "(localtime 1)", 13); } - if (str) - free(str); + free(str); virBufferAdd(buf, "))", 2); return (0); error: - if (nodes) - free(nodes); + free(nodes); return (-1); } @@ -1723,8 +1719,7 @@ virDomainParseXMLDesc(virConnectPtr conn, const char *xmldesc, char **name, vcpus, xendConfigVersion); } - if (str != NULL) - free(str); + free(str); if (res != 0) goto error; @@ -1797,8 +1792,7 @@ virDomainParseXMLDesc(virConnectPtr conn, const char *xmldesc, char **name, return (buf.content); error: - if (nam != NULL) - free(nam); + free(nam); if (name != NULL) *name = NULL; if (ctxt != NULL) @@ -1807,8 +1801,7 @@ virDomainParseXMLDesc(virConnectPtr conn, const char *xmldesc, char **name, xmlFreeDoc(xml); if (pctxt != NULL) xmlFreeParserCtxt(pctxt); - if (buf.content != NULL) - free(buf.content); + free(buf.content); return (NULL); } diff --git a/src/xmlrpc.c b/src/xmlrpc.c index b433ef5..f956f0d 100644 --- a/src/xmlrpc.c +++ b/src/xmlrpc.c @@ -115,8 +115,7 @@ static xmlRpcValuePtr xmlRpcValueUnmarshalInteger(xmlNodePtr node) if (ret && value) ret->value.integer = atoi(value); - if (value) - free(value); + free(value); return ret; } @@ -131,8 +130,7 @@ static xmlRpcValuePtr xmlRpcValueUnmarshalBoolean(xmlNodePtr node) ret->value.boolean = true; else ret->value.boolean = false; - if (value) - free(value); + free(value); return ret; } @@ -143,8 +141,7 @@ static xmlRpcValuePtr xmlRpcValueUnmarshalDouble(xmlNodePtr node) if (ret && value) ret->value.real = atof(value); - if (value) - free(value); + free(value); return ret; } @@ -198,8 +195,7 @@ static xmlRpcValueDictElementPtr xmlRpcValueUnmarshalDictElement(xmlNodePtr node ret->value = xmlRpcValueUnmarshal(cur); } else { xmlRpcError(VIR_ERR_XML_ERROR, _("unexpected dict node"), 0); - if (ret->name) - free(ret->name); + free(ret->name); if (ret->value) xmlRpcValueFree(ret->value); free(ret); @@ -679,12 +675,8 @@ xmlRpcContextPtr xmlRpcContextNew(const char *uri) void xmlRpcContextFree(xmlRpcContextPtr context) { if (context) { - if (context->uri) - free(context->uri); - - if (context->faultMessage) - free(context->faultMessage); - + free(context->uri); + free(context->faultMessage); free(context); } } diff --git a/src/xs_internal.c b/src/xs_internal.c index 726af30..1dbbba6 100644 --- a/src/xs_internal.c +++ b/src/xs_internal.c @@ -635,9 +635,7 @@ xenStoreLookupByName(virConnectPtr conn, const char *name) ret->id = id; done: - if (xenddomain != NULL) free(xenddomain); - if (idlist != NULL) free(idlist); return(ret); diff --git a/tests/testutils.c b/tests/testutils.c index 1141edb..4fea6b6 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -83,8 +83,7 @@ virtTestRun(const char *title, int nloops, int (*body)(const void *data), const else fprintf(stderr, "%-50s ... FAILED\n", title); - if (ts) - free(ts); + free(ts); return ret; } diff --git a/tests/xencapstest.c b/tests/xencapstest.c index dd1c386..bf9ce07 100644 --- a/tests/xencapstest.c +++ b/tests/xencapstest.c @@ -62,8 +62,7 @@ static int testCompareFiles(const char *hostmachine, fail: - if (actualxml) - free(actualxml); + free(actualxml); if (fp1) fclose(fp1); if (fp2) diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index f49ca6c..51f4b67 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -153,8 +153,7 @@ static int testCompareFormatXML(const char *xmcfg_rel, const char *xml_rel, fail: if (conf) virConfFree(conf); - if (gotxml) - free(gotxml); + free(gotxml); if (conn) { conn->privateData = old_priv; -- 1.5.4.rc3.14.g44397

2 5

[Libvir] Probs migrating domain with libvirt 0.4.0
by Daniel Schwager 23 Jan '08

23 Jan '08

Hi, I try migrate a domain from xen02 to xen03-server (both fedora core-8 linux) - but it failed. Could you tell me, where a can look for more information About this failure ? [root@xen02 ~]# rpm -qa | grep libvirt libvirt-0.4.0-3.fc8 libvirt-0.4.0-3.fc8 libvirt-devel-0.4.0-3.fc8 libvirt-python-0.4.0-3.fc8 [root@xen03 log]# rpm -qa | grep libvirt libvirt-0.4.0-3.fc8 libvirt-python-0.4.0-3.fc8 ********** **** Migration with native XEN ********** [root@xen02 ~]# xm list Name ID Mem VCPUs State Time(s) Domain-0 0 512 8 r----- 1610.6 vm-home.winxp100-home.winxp100.1200950924765.2.1200950924765.4 1 250 1 -b---- 735.4 vm-home.winxp100-home.winxp100.1200951541281.2.1200951541281.4 2 250 1 -b---- 1564.2 vm-home.winxp100-home.winxp100.1200951640937.2.1200951640937.4 3 250 1 -b---- 1540.6 [root@xen02 ~]# xm migrate -l 2 xen03.domain.com [root@xen02 ~]# xm list Name ID Mem VCPUs State Time(s) Domain-0 0 512 8 r----- 1618.5 vm-home.winxp100-home.winxp100.1200950924765.2.1200950924765.4 1 250 1 -b---- 735.6 vm-home.winxp100-home.winxp100.1200951640937.2.1200951640937.4 3 250 1 -b---- 1541.1 ********** **** Check remote access (show migrated domain) ********** [root@xen02 ~]# virsh -c xen://xen03.domain.com/ list Id Name State ---------------------------------- 0 Domain-0 running 1 vm-home.winxp100-home.winxp100.1200951541281.2.1200951541281.4 no state ********** **** Migration with libvirtd ********** [root@xen02 ~]# virsh Welcome to virsh, the virtualization interactive terminal. virsh # list Id Name State ---------------------------------- 0 Domain-0 running 1 vm-home.winxp100-home.winxp100.1200950924765.2.1200950924765.4 blocked 3 vm-home.winxp100-home.winxp100.1200951640937.2.1200951640937.4 blocked virsh # migrate 3 xen://xen03.domain.com libvir: Remote error : remoteDispatchClientRequest: internal error: library function returned error but did not set virterror regards Danny ------------------------------------------------------------------- DT Netsolution GmbH - Taläckerstr. 30 - D-70437 Stuttgart Geschäftsführer: Daniel Schwager, Stefan Hörz - HRB Stuttgart 19870 Tel: +49-711-849910-32, Fax: -932 - Mailto:daniel.schwager@dtnet.de

2 3

Re: [Libvir] [PATCH] Linux-VServer support
by Daniel Hokka Zakrisson 23 Jan '08

23 Jan '08

This update has moved the interface name to /domain/devices/interface/target/@dev. > This is an XML dump from one of my guests: > <domain type='vserver' id='40010'> > <name>lenny</name> > <uuid>19e12957-261a-5a06-d6d0-89917d6d439f</uuid> > <memory>2048000</memory> > <os> > <hostname>lenny.test</hostname> > <type arch='i686'>vserver</type> > </os> > <devices> > <interface type='ethernet'> > <ip prefix='24' address='192.168.20.4' /> > <target dev='dummy0'/> > </interface> > <interface type='ethernet'> > <ip prefix='24' type='range' > address='192.168.32.100' address2='192.168.32.200'/> > <target dev='dummy0'/> > </interface> > <disk type='directory' device='directory'> > <source directory='/vservers/lenny' type='auto' options='defaults'/> <target directory='/'/> > </disk> > <disk type='directory' device='directory'> > <source directory='/srv' type='ext3' options='bind,ro'/> > <target directory='/srv'/> > </disk> > <disk type='block' device='directory'> > <source dev='/dev/mapper/test' type='ext3' options='defaults'/> <target directory='/mnt'/> > </disk> > </devices> > </domain> -- Daniel Hokka Zakrisson

1 0

[Libvir] libvirt on OS X Leopard 10.5.1
by Schley Andrew Kutz 22 Jan '08

22 Jan '08

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 I spent the weekend attempting to get libvirt working on OS X Leopard 10.5.1. I was able to get it to compile, but not connect to libvirtd running on either my KVM or Xen servers. Here are the instructions for getting it to compile: 1. Download libvirt-0.4.0 from the mirrors. 2. Use macports to install pkgconfig and gnutls 3. Configure your source: ./configure --without-xen --without-qemu 4. Replace instances of 'hyper' in qemu/remote_protocol.x with 'long' and then follow the instructions on http://libvirt.org/windows.html to regen XDR structures. 5. Edit '/usr/include/net/if.h' and add the following include: #include <net/if_var.h> #include <sys/types.h> // // EDIT: akutz // #include <sys/socket.h> 6. Create a symlink for 'malloc.h' so the libvirt source can find it: sudo ln -s /usr/include/malloc/malloc.h /usr/include/malloc.h 7. Add a header to "src/remote_internal.c": // // EDIT: akutz // #include <sys/un.h> 8. The version-script parameter of ld is not portable to OS X. Edit 'src/Makefile': # # EDIT: akutz # #libvirt_la_LDFLAGS = -Wl,--version-script=$(srcdir)/ libvirt_sym.version \ # -version-info 4:0:4 \ # $(COVERAGE_CFLAGS:-f%=-Wc,-f%) \ libvirt_la_LDFLAGS = -Wl, \ -version-info 4:0:4 \ $(COVERAGE_CFLAGS:-f%=-Wc,-f%) \ 9. Replace the distribution copy of libread.dylib with the one from Macports or else you will get errors about missing symbols (thread starts here http://www.mail-archive.com/macports-dev@lists.macosforge.org/msg00729.html) : sudo mv /usr/lib/libreadline.dylib /usr/lib/libreadline.dylib.dist sudo ln -s /opt/local/lib/libreadline.dylib /usr/lib/libreadline.dylib 10. The sources should now build and install. At this point any attempt to connect to a remote host results in the thread dying and OS X catching the exception with the following report: <beginReport> Process: Python [57356] Path: /System/Library/Frameworks/Python.framework/Versions/ 2.5/Resources/Python.app/Contents/MacOS/Python Identifier: Python Version: ??? (???) Code Type: X86 (Native) Parent Process: bash [59098] Date/Time: 2008-01-21 16:48:52.228 -0600 OS Version: Mac OS X 10.5.1 (9B18) Report Version: 6 Exception Type: EXC_BAD_ACCESS (SIGBUS) Exception Codes: KERN_PROTECTION_FAILURE at 0x0000000000000004 Crashed Thread: 0 Thread 0 Crashed: 0 libvirt.0.dylib 0x00412911 remoteAuthenticate + 1345 (remote_internal.c:3062) 1 libvirt.0.dylib 0x00414869 doRemoteOpen + 3593 (remote_internal.c:753) 2 libvirt.0.dylib 0x00415499 remoteOpen + 137 (remote_internal.c:860) 3 libvirt.0.dylib 0x00401438 do_open + 392 (libvirt.c: 579) 4 libvirtmod.so 0x000c0e06 libvirt_virConnectOpen + 102 (libvirt-py.c:1026) 5 org.python.python 0x0018d826 PyEval_EvalFrameEx + 17116 6 org.python.python 0x0018da08 PyEval_EvalFrameEx + 17598 7 org.python.python 0x0018f47b PyEval_EvalCodeEx + 1638 8 org.python.python 0x0018f568 PyEval_EvalCode + 87 9 org.python.python 0x001a6a0c PyErr_Display + 1896 10 org.python.python 0x001a7036 PyRun_FileExFlags + 135 11 org.python.python 0x001a89a2 PyRun_SimpleFileExFlags + 421 12 org.python.python 0x001b3c23 Py_Main + 3095 13 org.python.pythonapp 0x00001fca 0x1000 + 4042 Thread 0 crashed with X86 Thread State (32-bit): eax: 0x00000000 ebx: 0x004123e1 ecx: 0xbfffe826 edx: 0x00000000 edi: 0x00000000 esi: 0xbfffe92c ebp: 0xbfffea48 esp: 0xbfffe860 ss: 0x0000001f efl: 0x00010202 eip: 0x00412911 cs: 0x00000017 ds: 0x0000001f es: 0x0000001f fs: 0x00000000 gs: 0x00000037 cr2: 0x00000004 Binary Images: 0x1000 - 0x1ffe org.python.pythonapp 2.5.0 (2.5.0a0) <a2ccf04a940c23b34c33d7fe108d773e> /System/Library/Frameworks/ Python.framework/Versions/2.5/Resources/Python.app/Contents/MacOS/Python 0x49000 - 0x4bfff +libgpg-error.0.dylib ??? (???) /opt/local/ lib/libgpg-error.0.dylib 0xbb000 - 0xc2ff3 +libvirtmod.so ??? (???) <20dea38de64927c9e8b50a1fa240e067> /usr/local/lib/python2.5/site- packages/libvirtmod.so 0x118000 - 0x1e3ffb org.python.python 2.5 (2.5) <9786e5d8790a594bb7b3cdcf9a9d0b49> /System/Library/Frameworks/ Python.framework/Versions/2.5/Python 0x2f0000 - 0x2f7ff3 +libintl.8.dylib ??? (???) /opt/local/lib/ libintl.8.dylib 0x400000 - 0x424fef +libvirt.0.dylib ??? (???) <70af9029fa4c7accc04377f0f65c53ae> /usr/local/lib/libvirt.0.dylib 0x43b000 - 0x49bfff +libgnutls.26.dylib ??? (???) /opt/local/lib/ libgnutls.26.dylib 0x4b5000 - 0x4c2fe2 +libtasn1.3.dylib ??? (???) /opt/local/lib/ libtasn1.3.dylib 0x4c7000 - 0x528ff3 +libgcrypt.11.dylib ??? (???) <76bad0ad90909bf99f422f8bbfd61124> /opt/local/lib/libgcrypt.11.dylib 0x540000 - 0x637ff0 +libiconv.2.dylib ??? (???) /opt/local/lib/ libiconv.2.dylib 0x644000 - 0x654ffd +libz.1.dylib ??? (???) /opt/local/lib/libz. 1.dylib 0x65f000 - 0x661ffc apop.so ??? (???) <8e5cbfa49bbed80ed34f03e008e3e086> /usr/lib/sasl2/apop.so 0x665000 - 0x67dfe2 dhx.so ??? (???) <0831cf2893deaa2b5525ea7bfda17404> /usr/lib/sasl2/dhx.so 0x68c000 - 0x694fff digestmd5WebDAV.so ??? (???) <42e13c06e037f02eee71a43324169f62> /usr/lib/sasl2/digestmd5WebDAV.so 0x698000 - 0x69afff libanonymous.2.so ??? (???) <161902c9ed78dce78b61125c7c155f0f> /usr/lib/sasl2/libanonymous.2.so 0x69e000 - 0x6a0ffc libcrammd5.2.so ??? (???) <c917c89eefddcfcacf48c939c3af12aa> /usr/lib/sasl2/libcrammd5.2.so 0x6a4000 - 0x6adffb libdigestmd5.2.so ??? (???) <c8595204acd0e7cb362b33d008693019> /usr/lib/sasl2/libdigestmd5.2.so 0x6b1000 - 0x6b5fff libgssapiv2.2.so ??? (???) <a47ee23249e7c36aee418a6e7fd3a502> /usr/lib/sasl2/libgssapiv2.2.so 0x6bb000 - 0x6bdffc login.so ??? (???) <03d28ec908a6ed9abee1b25fe87716ef> /usr/lib/sasl2/login.so 0x6c1000 - 0x6c8ffc libotp.2.so ??? (???) <0b7c8cd165835331c586e49465ef1186> /usr/lib/sasl2/libotp.2.so 0x6d2000 - 0x6d4ffc libplain.2.so ??? (???) <5992f1149ff6cc7fadafa2bfd4ecc00a> /usr/lib/sasl2/libplain.2.so 0x6d8000 - 0x6ddffc libpps.so ??? (???) <ae02d7b23951bddb4db705b2d632c6ac> /usr/lib/sasl2/libpps.so 0x6e3000 - 0x6e6fff mschapv2.so ??? (???) <8d5951f3d3a0565fd772ebec4d2054fb> /usr/lib/sasl2/mschapv2.so 0x6ea000 - 0x6ecffc shadow_auxprop.so ??? (???) <5137115453406a92cf514b65046a6b28> /usr/lib/sasl2/shadow_auxprop.so 0x6f2000 - 0x6f4ffd smb_lm.so ??? (???) <e9ad275441e15388bf580b1cdf55b430> /usr/lib/sasl2/smb_lm.so 0x6f8000 - 0x6faffc smb_nt.so ??? (???) <a7144a88919b4aea313caf6c4e86353a> /usr/lib/sasl2/smb_nt.so 0x6fe000 - 0x701ff0 smb_ntlmv2.so ??? (???) <ccfa6d0eafa992db95ad309e32c6d400> /usr/lib/sasl2/smb_ntlmv2.so 0x8fe00000 - 0x8fe2d883 dyld 95.3 (???) <81592e798780564b5d46b988f7ee1a6a> /usr/lib/dyld 0x90d29000 - 0x90e5bfe7 com.apple.CoreFoundation 6.5 (476) <8bfebc0dbad6fc33bea0fa00a1b9ec37> /System/Library/Frameworks/ CoreFoundation.framework/Versions/A/CoreFoundation 0x90e5c000 - 0x90e7aff3 com.apple.DirectoryService.Framework 3.5 (3.5) <899d8c9ee31b004a6ff73dab88982b1a> /System/Library/Frameworks/ DirectoryService.framework/Versions/A/DirectoryService 0x922a3000 - 0x92353fff edu.mit.Kerberos 6.0.11 (6.0.11) <33c25789baedcd70a7e24881775dd9ad> /System/Library/Frameworks/ Kerberos.framework/Versions/A/Kerberos 0x9244f000 - 0x924acffb libstdc++.6.dylib ??? (???) <04b812dcec670daa8b7d2852ab14be60> /usr/lib/libstdc++.6.dylib 0x92510000 - 0x926d9fef com.apple.security 5.0.1 (32736) <8c9eda0fcc1d8a571543025ac900715f> /System/Library/Frameworks/ Security.framework/Versions/A/Security 0x92f62000 - 0x92f80fff libresolv.9.dylib ??? (???) <54e6a08c2f108bdf5916fb483d51961b> /usr/lib/libresolv.9.dylib 0x93661000 - 0x9366fffd libz.1.dylib ??? (???) <5ddd8539ae2ebfd8e7cc1c57525385c7> /usr/lib/libz.1.dylib 0x936a2000 - 0x93783ff7 libxml2.2.dylib ??? (???) <450ec38b57fb46013847cce851001a2f> /usr/lib/libxml2.2.dylib 0x93d28000 - 0x93d2ffe9 libgcc_s.1.dylib ??? (???) <f53c808e87d1184c0f9df63aef53ce0b> /usr/lib/libgcc_s.1.dylib 0x94a5b000 - 0x94b93ff7 libicucore.A.dylib ??? (???) <afcea652ff2ec36885b2c81c57d06d4c> /usr/lib/libicucore.A.dylib 0x95a7f000 - 0x95b5efff libobjc.A.dylib ??? (???) <5eda47fec2d0e7853b3506aa1fd2dafa> /usr/lib/libobjc.A.dylib 0x9631e000 - 0x963d0ffb libcrypto.0.9.7.dylib ??? (???) <330b0e48e67faffc8c22dfc069ca7a47> /usr/lib/libcrypto.0.9.7.dylib 0x9642c000 - 0x9643bfff libsasl2.2.dylib ??? (???) <b9e1ca0b6612e280b6cbea6df0eec5f6> /usr/lib/libsasl2.2.dylib 0x9643c000 - 0x96466fef libauto.dylib ??? (???) <d468bc4a8a69343f1748c293db1b57fb> /usr/lib/libauto.dylib 0x96d8c000 - 0x96d8dfef libmathCommon.A.dylib ??? (???) /usr/lib/ system/libmathCommon.A.dylib 0x96d9a000 - 0x96ef4fe3 libSystem.B.dylib ??? (???) <8ecc83dc0399be3946f7a46e88cf4bbb> /usr/lib/libSystem.B.dylib 0xfffe8000 - 0xfffebfff libobjc.A.dylib ??? (???) /usr/lib/ libobjc.A.dylib 0xffff0000 - 0xffff1780 libSystem.B.dylib ??? (???) /usr/lib/ libSystem.B.dylib </beginReport> Anyway, hopefully someone on the list can make heads or tails of why this is not working on OS X. I sure would love to be able to use libvirt instead of xenapi. Thanks! - -- - -a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (Darwin) iD8DBQFHlSG1Tg8lceyAqqQRAiD1AJ99NZC23AheQl36oGYU/mmjqILbtwCg07+i /TT0j27cGU7krDDMk+hVX/k= =P+Cg -----END PGP SIGNATURE-----

5 59

[Libvir] a vmware driver
by Schley Andrew Kutz 22 Jan '08

22 Jan '08

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Does anyone know if there is work being done on a VMware driver? If not, I could write one. I'm about to release an application via SearchServerVirtualization called ivi (Java Virtual Interface) that uses the VI SDK and the XenApi (cannot get libvirt to work on my dev platform - OS X) to enable management of both VMware VI3 boxes as well as Xen boxes. I would love to move away from the XenApi to libvirt, and even more so to extend libvirt to support the VI SDK. - -- - -a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (Darwin) iD8DBQFHlhhqTg8lceyAqqQRAlaQAKCCjfrmKMAZyXlEQUVKh9uF/OoTHwCgkpSm dPni/xjrHwSMrDvPmAkgidA= =QfY7 -----END PGP SIGNATURE-----

3 4

Re: [Libvir] libvirt on OS X Leopard 10.5.1
by Richard W.M. Jones 22 Jan '08

22 Jan '08

Schley Andrew Kutz wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > >> Probably the simplest is to compile the RPC bindings which are >> generated on Linux and supplied with libvirt in CVS and the tarball >> (ie. remote_protocol.[ch]). We need to supply only the xdr_quad type >> and a handful of 64 bit functions. I did the same thing for Windows >> but in that case built my own version of a mini-XDR library with some >> contributions from glibc. What we could do is bundle this mini-XDR >> library with libvirt itself (or perhaps persuade gnulib to take it -- >> Jim?). > > I would try this, but as you can see from the thread, I've hit a wall > running the autogen script in Linux. It cannot find a devhelp file... Try Jim's suggestion. As for an XDR library replacement, take a look at my hacked-togther XDR replacement. I have no idea if it'll work on Mac OS X, but worth a try: http://www.annexia.org/tmp/xdr-4.0-mingw5.tar.gz Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

1 0

[Libvir] Libvirt windows compilation errors
by Gabriel Kaufmann 22 Jan '08

22 Jan '08

Hi, I downloaded libvirt-0.4.0 sources and patched it with libvirt-windows-20071129-2.patch. I followed all the instructions from http://libvirt.org/windows.html and experienced some compilation problems which Caused me to make the following changes. 1- For some reason Cygwin does not configure correctly the winsock2 usage, so after running the configure I had to go to the config.h file and manually comment out the HAVE_WINSOCK2 macro declaration. 2- On file src/remote_internal.c : 1- Rename gnutls_cipher_algorithm_t to gnutls_cipher_algorithm 2- Add #include <sys/un.h> 3- On file qemud/qemud.c : 4- Remove include : #include "getaddrinfo.h" (It was conflicting the include from ../src/getaddrinfo.h ) 5- On file src/remote.c : 1- Rename gnutls_cipher_algorithm_t to gnutls_cipher_algorithm 2- Add #include "../src/getaddrinfo.h" 6- On tests folder added -lintl flag to the LIBS variable Best Regards, Gabriel Kaufmann Software Engineer Gabriel.Kaufmann(a)ericom.com<mailto:Gabriel.Kaufmann@ericom.com> Ericom Software Tel (Dir): +972 2 591 1700 Ext 754 Tel (Main): +972 2 591 1700 http://www.ericom.com Access Done Right Empower Enterprise-Wide Access to Microsoft(r) Terminal Server, Virtual Desktops and Legacy Applications

2 1

[Libvir] unnecessary "if-before-free" tests
by Jim Meyering 21 Jan '08

21 Jan '08

Hi Dan, I noticed a few new unnecessary "if-before-free" tests: src/storage_backend.c:2591: if (groups[j]) free(groups[j]); src/storage_backend_iscsi.c: if (devpath) free(devpath); src/storage_backend_iscsi.c: if (portal) free(portal); src/storage_backend_iscsi.c: if (session) free(session); FYI, this finds all the one-liners: git grep -E 'if $([^)]+)$ free *$\1$' I had to think harder to get the 2-line occurrences: perl -0ne '/\b(if $([^)]+)$\s+free *$\2$)/sgm and print "$ARGV:$.: $1\n"'\ $(git ls-files) or rather this, if you don't have a git repo handy: perl -0ne '/\b(if $([^)]+)$\s+free *$\2$)/sgm and print "$ARGV:$.: $1\n"'\ {src,tests,qemud,proxy}/*.[ch] If no one objects, I'm going to remove them and add a build-time test to ensure they stay gone. ------------------ gnulib/lib/getaddrinfo.c:2257: if (cur->ai_canonname) free (cur->ai_canonname) gnulib/lib/printf-parse.c:2277: if (a->arg) free (a->arg) proxy/libvirt_proxy.c:2499: if (name) free(name) qemud/qemud.c:2529: if (client->saslUsername) free(client->saslUsername) src/buf.c:2549: if (buf->content) free(buf->content) src/conf.c:2551: if (tmp->comment) free(tmp->comment) src/hash.c:2559: if (iter->name) free(iter->name) src/iptables.c:2562: if (rule->rule) free(rule->rule) src/libvirt.c:2566: if (ret->name) free (ret->name) src/openvz_conf.c:2570: if (prop) free(prop) src/qemu_conf.c:2578: if (prop) free(prop) src/qemu_driver.c:2580: if (base) free (base) src/remote_internal.c:2584: if (name) free (name) src/storage_backend.c:2591: if (groups[j]) free(groups[j]) src/storage_backend_iscsi.c:2597: if (devpath) free(devpath) src/storage_conf.c:2605: if (def->name) free(def->name) src/storage_driver.c:2607: if (base) free (base) src/test.c:2609: if (name) free(name) src/virsh.c:2615: if (ctl->name) free(ctl->name) src/xen_internal.c:2617: if (new) free(new) src/xend_internal.c:2621: if (drvName) free(drvName) src/xm_internal.c:2623: if (vif) free(vif) src/xml.c:2625: if (str) free(str) src/xmlrpc.c:2627: if (value) free(value) tests/testutils.c:2739: if (ts) free(ts) tests/xencapstest.c:2784: if (actualxml) free(actualxml) tests/xmconfigtest.c:2804: if (gotxml) free(gotxml)

2 1

[Libvir] Repository for work-in-progress storage patches
by Daniel P. Berrange 21 Jan '08

21 Jan '08

Jim suggested that it might be useful for me to make a repository available with my work-in-progress storage patches even if they're not ready to merge just yet. I work using a mercurial patch queue, which is basically a mercurial native version of quilt. The master HG repository is an automated sync of CVS -> HG: http://hg.berrange.com/libraries/libvirt--devel The patch queue which applies ontop of this repo is: http://hg.berrange.com/libraries/libvirt--storage To use this you would try the following 1. Make sure the 'mg' extension is enabled in $HOME/.hgrc. You should have: $ cat $HOME/.hgrc [extensions] hgext.mq= 2. Clone both repos in one go: hg qclone -p http://hg.berrange.com/libraries/libvirt--storage \ http://hg.berrange.com/libraries/libvirt--devel 3. The local 'libvirt-storage' directory now contains the master repo, along with an embedded patch queue. You can view the patch queue: $ hg qseries ignore-rules misc-connection-hash misc-libvirt-debug misc-virsh-read-all misc-default-uri job-api job-virsh job-test-thread-safety job-test-driver storage-public-api storage-driver-api storage-remote-protocol storage-remote-driver storage-virsh storage-virsh-args storage-driver storage-examples storage-backend-helpers storage-backend-fs storage-backend-loop storage-backend-lvm storage-backend-iscsi storage-backend-disk storage-python-api misc-python-generator 4. And you can apply / remove patches to/from the working directory with the 'hg qpush' and 'hg qpop' commands. 'hg qdiff' will show contents of the patches $ hg qpush applying ignore-rules Now at: ignore-rules $ hg qpush applying misc-connection-hash Now at: misc-connection-hash ....etc When I've tidying up a few loose ends in the next few days I'll post the current series with proper descriptions of each patch Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

4 30

[Libvir] [PATCH] Avoid "may be used uninitialized" warning.
by Jim Meyering 21 Jan '08

21 Jan '08

I've been seeing this on rawhide for a few days: xmconfigtest.c:115: warning: 'old_priv' may be used uninitialized in this function Here's a fix: Avoid "may be used uninitialized" warning. * tests/xmconfigtest.c (testCompareParseXML): Initialize "old_priv". Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- tests/xmconfigtest.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index d66b660..f49ca6c 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -51,7 +51,7 @@ static int testCompareParseXML(const char *xmcfg_rel, const char *xml_rel, int ret = -1; virConnectPtr conn; int wrote = MAX_FILE; - void *old_priv; + void *old_priv = NULL; struct _xenUnifiedPrivate priv; char xmcfg[PATH_MAX]; char xml[PATH_MAX]; -- 1.5.4.rc4.1.g1895

2 1

[Libvir] PATCH: Cleanup generator & force build fail on missing APIs
by Daniel P. Berrange 21 Jan '08

21 Jan '08

The python generator will happily ignore functions it can't handle and pretend everything completed without error. This leads to the situation where we add new APis to C library and no one ever notices that they are missing from the python until months later. This requires that my previous patch be applied first to implement the missing APIs we already have :-) This patch causes the generator to return a non-zero exit status if there are any APIs marked as FAILED. It will also explicitly print out their names so its clear what is missing. In doing this I added a bunch more functions to the skip list - ones that we already manually wrote. It also removes the manually written virCloseConnect/virDomainFree/ virNetworkFree C code, since the generated code is just fine. Finally, it makes all manually written C functions static for consistency generator.py | 50 ++++++++++++++++++++++------------ libvir.c | 85 ++++++----------------------------------------------------- 2 files changed, 43 insertions(+), 92 deletions(-) Dan. diff -r 842dc0869c87 python/generator.py --- a/python/generator.py Sat Jan 19 14:54:24 2008 -0500 +++ b/python/generator.py Sat Jan 19 14:58:50 2008 -0500 @@ -212,7 +212,7 @@ skipped_modules = { } skipped_types = { - 'int *': "usually a return type", +# 'int *': "usually a return type", } ####################################################################### @@ -277,6 +277,8 @@ skip_impl = ( 'virDomainLookupByUUID', 'virNetworkGetUUID', 'virNetworkLookupByUUID', + 'virDomainGetAutostart', + 'virNetworkGetAutostart', 'virDomainBlockStats', 'virDomainInterfaceStats', 'virNodeGetCellsFreeMemory', @@ -287,18 +289,23 @@ skip_impl = ( 'virDomainPinVcpu', ) -def skip_function(name): - if name == "virConnectClose": - return 1 - if name == "virDomainFree": - return 1 - if name == "virNetworkFree": - return 1 - if name == "vshRunConsole": - return 1 - if name == "virGetVersion": - return 1 - return 0 + +# These are functions which the generator skips completly - no python +# or C code is generated. Generally should not be used for any more +# functions than those already listed +skip_function = ( + 'virConnectListDomains', # Python API is called virConectListDomainsID for unknown reasons + 'virConnSetErrorFunc', # Not used in Python API XXX is this a bug ? + 'virResetError', # Not used in Python API XXX is this a bug ? + 'virConnectGetVersion', # Not used in Python API XXX is this a bug ? + 'virGetVersion', # Python C code is manually written + 'virSetErrorFunc', # Python API is called virRegisterErrorHandler for unknown reasons + 'virConnCopyLastError', # Python API is called virConnGetLastError instead + 'virCopyLastError', # Python API is called virGetLastError instead + 'virConnectOpenAuth', # Python C code is manually written + 'virDefaultErrorFunc', # Python virErrorFuncHandler impl calls this from C +) + def print_function_wrapper(name, output, export, include): global py_types @@ -314,7 +321,7 @@ def print_function_wrapper(name, output, if skipped_modules.has_key(file): return 0 - if skip_function(name) == 1: + if name in skip_function: return 0 if name in skip_impl: # Don't delete the function entry in the caller. @@ -527,12 +534,19 @@ def buildStubs(): export.close() wrapper.close() - print "Generated %d wrapper functions, %d failed, %d skipped\n" % (nb_wrap, - failed, skipped); + print "Generated %d wrapper functions" % nb_wrap + print "Missing type converters: " for type in unknown_types.keys(): print "%s:%d " % (type, len(unknown_types[type])), print + + for f in functions_failed: + print "ERROR: failed %s" % f + + if failed > 0: + return -1 + return 0 ####################################################################### # @@ -1130,5 +1144,7 @@ def buildWrappers(): txt.close() classes.close() -buildStubs() +if buildStubs() < 0: + sys.exit(1) buildWrappers() +sys.exit(0) diff -r 842dc0869c87 python/libvir.c --- a/python/libvir.c Sat Jan 19 14:54:24 2008 -0500 +++ b/python/libvir.c Sat Jan 19 14:58:50 2008 -0500 @@ -23,14 +23,6 @@ extern void initcygvirtmod(void); extern void initcygvirtmod(void); #endif -PyObject *libvirt_virDomainGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args); -PyObject *libvirt_virNetworkGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args); -PyObject *libvirt_virGetLastError(PyObject *self ATTRIBUTE_UNUSED, PyObject *args); -PyObject *libvirt_virConnGetLastError(PyObject *self ATTRIBUTE_UNUSED, PyObject *args); -PyObject * libvirt_virDomainBlockStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args); -PyObject * libvirt_virDomainInterfaceStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args); -PyObject * libvirt_virNodeGetCellsFreeMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *args); - /* The two-statement sequence "Py_INCREF(Py_None); return Py_None;" is so common that we encapsulate it here. Now, each use is simply return VIR_PY_NONE; */ @@ -42,7 +34,7 @@ PyObject * libvirt_virNodeGetCellsFreeMe * * ************************************************************************/ -PyObject * +static PyObject * libvirt_virDomainBlockStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { virDomainPtr domain; PyObject *pyobj_domain; @@ -71,7 +63,7 @@ libvirt_virDomainBlockStats(PyObject *se return(info); } -PyObject * +static PyObject * libvirt_virDomainInterfaceStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { virDomainPtr domain; PyObject *pyobj_domain; @@ -422,7 +414,7 @@ static PyObject *libvirt_virPythonErrorF static PyObject *libvirt_virPythonErrorFuncHandler = NULL; static PyObject *libvirt_virPythonErrorFuncCtxt = NULL; -PyObject * +static PyObject * libvirt_virGetLastError(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUTE_UNUSED) { virError err; @@ -446,7 +438,7 @@ libvirt_virGetLastError(PyObject *self A return info; } -PyObject * +static PyObject * libvirt_virConnGetLastError(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { virError err; @@ -714,41 +706,6 @@ libvirt_virGetVersion (PyObject *self AT return Py_BuildValue ((char *) "kk", libVer, typeVer); } -static PyObject * -libvirt_virDomainFree(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { - PyObject *py_retval; - int c_retval; - virDomainPtr domain; - PyObject *pyobj_domain; - - if (!PyArg_ParseTuple(args, (char *)"O:virDomainFree", &pyobj_domain)) - return(NULL); - domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); - - LIBVIRT_BEGIN_ALLOW_THREADS; - c_retval = virDomainFree(domain); - LIBVIRT_END_ALLOW_THREADS; - py_retval = libvirt_intWrap((int) c_retval); - return(py_retval); -} - -static PyObject * -libvirt_virConnectClose(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { - PyObject *py_retval; - int c_retval; - virConnectPtr conn; - PyObject *pyobj_conn; - - if (!PyArg_ParseTuple(args, (char *)"O:virConnectClose", &pyobj_conn)) - return(NULL); - conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); - - LIBVIRT_BEGIN_ALLOW_THREADS; - c_retval = virConnectClose(conn); - LIBVIRT_END_ALLOW_THREADS; - py_retval = libvirt_intWrap((int) c_retval); - return(py_retval); -} static PyObject * libvirt_virConnectListDomainsID(PyObject *self ATTRIBUTE_UNUSED, @@ -872,7 +829,7 @@ libvirt_virNodeGetInfo(PyObject *self AT return(py_retval); } -PyObject * +static PyObject * libvirt_virDomainGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; unsigned char uuid[VIR_UUID_BUFLEN]; @@ -917,25 +874,6 @@ libvirt_virDomainLookupByUUID(PyObject * c_retval = virDomainLookupByUUID(conn, uuid); LIBVIRT_END_ALLOW_THREADS; py_retval = libvirt_virDomainPtrWrap((virDomainPtr) c_retval); - return(py_retval); -} - - -static PyObject * -libvirt_virNetworkFree(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { - PyObject *py_retval; - int c_retval; - virNetworkPtr domain; - PyObject *pyobj_domain; - - if (!PyArg_ParseTuple(args, (char *)"O:virNetworkFree", &pyobj_domain)) - return(NULL); - domain = (virNetworkPtr) PyvirNetwork_Get(pyobj_domain); - - LIBVIRT_BEGIN_ALLOW_THREADS; - c_retval = virNetworkFree(domain); - LIBVIRT_END_ALLOW_THREADS; - py_retval = libvirt_intWrap((int) c_retval); return(py_retval); } @@ -1024,7 +962,7 @@ libvirt_virConnectListDefinedNetworks(Py } -PyObject * +static PyObject * libvirt_virNetworkGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; unsigned char uuid[VIR_UUID_BUFLEN]; @@ -1073,7 +1011,7 @@ libvirt_virNetworkLookupByUUID(PyObject } -PyObject * +static PyObject * libvirt_virDomainGetAutostart(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; int c_retval, autostart; @@ -1096,7 +1034,7 @@ libvirt_virDomainGetAutostart(PyObject * } -PyObject * +static PyObject * libvirt_virNetworkGetAutostart(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; int c_retval, autostart; @@ -1118,8 +1056,8 @@ libvirt_virNetworkGetAutostart(PyObject return(py_retval); } -PyObject * libvirt_virNodeGetCellsFreeMemory(PyObject *self ATTRIBUTE_UNUSED, - PyObject *args) +static PyObject * +libvirt_virNodeGetCellsFreeMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { PyObject *py_retval; PyObject *pyobj_conn; @@ -1165,9 +1103,7 @@ static PyMethodDef libvirtMethods[] = { static PyMethodDef libvirtMethods[] = { #include "libvirt-export.c" {(char *) "virGetVersion", libvirt_virGetVersion, METH_VARARGS, NULL}, - {(char *) "virDomainFree", libvirt_virDomainFree, METH_VARARGS, NULL}, {(char *) "virConnectOpenAuth", libvirt_virConnectOpenAuth, METH_VARARGS, NULL}, - {(char *) "virConnectClose", libvirt_virConnectClose, METH_VARARGS, NULL}, {(char *) "virConnectListDomainsID", libvirt_virConnectListDomainsID, METH_VARARGS, NULL}, {(char *) "virConnectListDefinedDomains", libvirt_virConnectListDefinedDomains, METH_VARARGS, NULL}, {(char *) "virDomainGetInfo", libvirt_virDomainGetInfo, METH_VARARGS, NULL}, @@ -1177,7 +1113,6 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virRegisterErrorHandler", libvirt_virRegisterErrorHandler, METH_VARARGS, NULL}, {(char *) "virGetLastError", libvirt_virGetLastError, METH_VARARGS, NULL}, {(char *) "virConnGetLastError", libvirt_virConnGetLastError, METH_VARARGS, NULL}, - {(char *) "virNetworkFree", libvirt_virNetworkFree, METH_VARARGS, NULL}, {(char *) "virConnectListNetworks", libvirt_virConnectListNetworks, METH_VARARGS, NULL}, {(char *) "virConnectListDefinedNetworks", libvirt_virConnectListDefinedNetworks, METH_VARARGS, NULL}, {(char *) "virNetworkGetUUID", libvirt_virNetworkGetUUID, METH_VARARGS, NULL}, -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

3 5

[Libvir] PATCH: Add missing APIs to python binding
by Daniel P. Berrange 21 Jan '08

21 Jan '08

The python binding is missing all the APIs relating to CPU pinning and schedular parameters because they are too hard for the generator to manage. This patch implements them manually. Now a few words about the impls since they are non-trivial * virDomainGetSchedulerType The C binding has a return value, and an out parameter. I translated this into a tuple in python (schedular-type, n-parms) eg print dom.schedulerType() ('credit', 2) Arguably we could drop the nparams field - its less use in python since you don't have to pre-allocate a virSchedParam list. * virDomainGetSchedulerParameters This has an out parameter which is a list of virSchedParam structs, and a param specifying the length of the passed in virSchedParam list. The latter is irrelevant; The former I translated into a hash table return value eg print dom.schedulerParameters() {'cap': 0, 'weight': 100} * virDomainSetSchedulerParameters This has two in parameters, a list of virSchedParma structs, and a param specifying length of the list. I just convert this into a hash. I also make all the fields optional - it'll copy existing values for any params which are omimtted. eg dom.setSchedulerParameters({'weight': 100}) * virDomainGetVcpus This has two out parameters, a list of virVcpuInfo structs, and a bitmap both pre-allocated, and their size passed in. This needs to be turned into a 2 element tuple return value. First element returning vcpu info, and the second element returning mapping. The vcpu info will be returned as a list of lists, and the cpumap will be another list of lists - a True indicating affinity. eg (cpuinfo, cpumap) = dom.vcpus() print cpuinfo print cpumap [(0, 2, 7753916026L, 1), (1, 2, 5698028782L, 0), (2, 2, 4916522979L, 0), (3, 2, 3773416711L, 1)] [(False, True), (True, True), (True, False), (True, True)] * virDomainPinVcpu This takes a vcpu number and a bitmap of affinity. I turn the bitmap into a list of True/False values eg dom.pinVcpu(1, (True, True)) The generator fails on the C code part of the bindings completely, so that is hand-written. It also fails on the python part of the bindings, but the way the generator is structured doesn't enable us to hand-write the python part for methods within objects :-( So I have basically just editted the generator to blacklist all the out-parameters, and blacklist the in parameters which specify list lengths. Here is the code I used to test the functions: #!/usr/bin/python import libvirt con = libvirt.open("xen:///") dom = con.lookupByName("rhel5pv") dominfo = dom.info() nodeinfo = con.getInfo() pcpus = nodeinfo[4] * nodeinfo[5] * nodeinfo[6] * nodeinfo[7] (cpuinfo, cpumap) = dom.vcpus() print cpuinfo print cpumap for i in range(dominfo[3]): print "vcpu: %d" % i if cpuinfo[i][1] == 0: print "state: offline" elif cpuinfo[i][1] == 2: print "state: blocked" else: print "state: running" print "cputime: %d" % cpuinfo[i][2] print "pcpu: %d" % cpuinfo[i][3] affinity = "" for p in range(pcpus): if cpumap[i][p] == True: affinity = affinity + "y" else: affinity = affinity + "-" print "affinity: %s" % affinity print dom.pinVcpu(1, (True, True)) print dom.schedulerType() print dom.schedulerParameters() dom.setSchedulerParameters({"weight": 100}) And here is the diffstat: generator.py | 26 ++++ libvir.c | 318 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 344 insertions(+) Dan. diff -r 8468c0d428c9 python/generator.py --- a/python/generator.py Sun Jan 20 12:06:47 2008 -0500 +++ b/python/generator.py Sun Jan 20 12:07:59 2008 -0500 @@ -229,6 +229,7 @@ py_types = { 'double': ('d', None, "double", "double"), 'unsigned int': ('i', None, "int", "int"), 'unsigned long': ('l', None, "long", "long"), + 'unsigned long long': ('l', None, "longlong", "long long"), 'unsigned char *': ('z', None, "charPtr", "char *"), 'char *': ('z', None, "charPtr", "char *"), 'const char *': ('z', None, "charPtrConst", "const char *"), @@ -279,6 +280,11 @@ skip_impl = ( 'virDomainBlockStats', 'virDomainInterfaceStats', 'virNodeGetCellsFreeMemory', + 'virDomainGetSchedulerType', + 'virDomainGetSchedulerParameters', + 'virDomainSetSchedulerParameters', + 'virDomainGetVcpus', + 'virDomainPinVcpu', ) def skip_function(name): @@ -918,6 +924,16 @@ def buildWrappers(): txt.write(" %s()\n" % func); n = 0 for arg in args: + if name == "virDomainPinVcpu" and arg[0] == "maplen": + continue + if name == "virDomainGetSchedulerType" and arg[0] == "nparams": + continue + if name == "virDomainSetSchedulerParameters" and arg[0] == "nparams": + continue + if name == "virDomainGetSchedulerParameters" and arg[0] != "domain": + continue + if name == "virDomainGetVcpus" and arg[0] != "domain": + continue if n != index: classes.write(", %s" % arg[0]) n = n + 1 @@ -939,6 +955,16 @@ def buildWrappers(): classes.write("libvirtmod.%s(" % name) n = 0 for arg in args: + if name == "virDomainPinVcpu" and arg[0] == "maplen": + continue + if name == "virDomainGetSchedulerType" and arg[0] == "nparams": + continue + if name == "virDomainSetSchedulerParameters" and arg[0] == "nparams": + continue + if name == "virDomainGetSchedulerParameters" and arg[0] != "domain": + continue + if name == "virDomainGetVcpus" and arg[0] != "domain": + continue if n != 0: classes.write(", "); if n != index: diff -r 8468c0d428c9 python/libvir.c --- a/python/libvir.c Sun Jan 20 12:06:47 2008 -0500 +++ b/python/libvir.c Sun Jan 20 12:07:59 2008 -0500 @@ -102,6 +102,319 @@ libvirt_virDomainInterfaceStats(PyObject PyTuple_SetItem(info, 7, PyLong_FromLongLong(stats.tx_drop)); return(info); } + + +static PyObject * +libvirt_virDomainGetSchedulerType(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) { + virDomainPtr domain; + PyObject *pyobj_domain, *info; + char *c_retval; + int nparams; + + if (!PyArg_ParseTuple(args, (char *)"O:virDomainGetScedulerType", + &pyobj_domain)) + return(NULL); + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + c_retval = virDomainGetSchedulerType(domain, &nparams); + if (c_retval == NULL) + return VIR_PY_NONE; + + /* convert to a Python tupple of long objects */ + if ((info = PyTuple_New(2)) == NULL) { + free(c_retval); + return VIR_PY_NONE; + } + + PyTuple_SetItem(info, 0, libvirt_constcharPtrWrap(c_retval)); + PyTuple_SetItem(info, 1, PyInt_FromLong((long)nparams)); + free(c_retval); + return(info); +} + +static PyObject * +libvirt_virDomainGetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) { + virDomainPtr domain; + PyObject *pyobj_domain, *info; + char *c_retval; + int nparams, i; + virSchedParameterPtr params; + + if (!PyArg_ParseTuple(args, (char *)"O:virDomainGetScedulerParameters", + &pyobj_domain)) + return(NULL); + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + c_retval = virDomainGetSchedulerType(domain, &nparams); + if (c_retval == NULL) + return VIR_PY_NONE; + free(c_retval); + + if ((params = malloc(sizeof(*params)*nparams)) == NULL) + return VIR_PY_NONE; + + if (virDomainGetSchedulerParameters(domain, params, &nparams) < 0) { + free(params); + return VIR_PY_NONE; + } + + /* convert to a Python tupple of long objects */ + if ((info = PyDict_New()) == NULL) { + free(params); + return VIR_PY_NONE; + } + for (i = 0 ; i < nparams ; i++) { + PyObject *key, *val; + + switch (params[i].type) { + case VIR_DOMAIN_SCHED_FIELD_INT: + val = PyInt_FromLong((long)params[i].value.i); + break; + + case VIR_DOMAIN_SCHED_FIELD_UINT: + val = PyInt_FromLong((long)params[i].value.ui); + break; + + case VIR_DOMAIN_SCHED_FIELD_LLONG: + val = PyLong_FromLongLong((long long)params[i].value.l); + break; + + case VIR_DOMAIN_SCHED_FIELD_ULLONG: + val = PyLong_FromLongLong((long long)params[i].value.ul); + break; + + case VIR_DOMAIN_SCHED_FIELD_DOUBLE: + val = PyFloat_FromDouble((double)params[i].value.d); + break; + + case VIR_DOMAIN_SCHED_FIELD_BOOLEAN: + val = PyBool_FromLong((long)params[i].value.b); + break; + + default: + free(params); + Py_DECREF(info); + return VIR_PY_NONE; + } + + key = libvirt_constcharPtrWrap(params[i].field); + PyDict_SetItem(info, key, val); + } + free(params); + return(info); +} + +static PyObject * +libvirt_virDomainSetSchedulerParameters(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) { + virDomainPtr domain; + PyObject *pyobj_domain, *info; + char *c_retval; + int nparams, i; + virSchedParameterPtr params; + + if (!PyArg_ParseTuple(args, (char *)"OO:virDomainSetScedulerParameters", + &pyobj_domain, &info)) + return(NULL); + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + c_retval = virDomainGetSchedulerType(domain, &nparams); + if (c_retval == NULL) + return VIR_PY_NONE; + free(c_retval); + + if ((params = malloc(sizeof(*params)*nparams)) == NULL) + return VIR_PY_NONE; + + if (virDomainGetSchedulerParameters(domain, params, &nparams) < 0) { + free(params); + return VIR_PY_NONE; + } + + /* convert to a Python tupple of long objects */ + for (i = 0 ; i < nparams ; i++) { + PyObject *key, *val; + key = libvirt_constcharPtrWrap(params[i].field); + val = PyDict_GetItem(info, key); + Py_DECREF(key); + + if (val == NULL) + continue; + + switch (params[i].type) { + case VIR_DOMAIN_SCHED_FIELD_INT: + params[i].value.i = (int)PyInt_AS_LONG(val); + break; + + case VIR_DOMAIN_SCHED_FIELD_UINT: + params[i].value.ui = (unsigned int)PyInt_AS_LONG(val); + break; + + case VIR_DOMAIN_SCHED_FIELD_LLONG: + params[i].value.l = (long long)PyLong_AsLongLong(val); + break; + + case VIR_DOMAIN_SCHED_FIELD_ULLONG: + params[i].value.ul = (unsigned long long)PyLong_AsLongLong(val); + break; + + case VIR_DOMAIN_SCHED_FIELD_DOUBLE: + params[i].value.d = (double)PyFloat_AsDouble(val); + break; + + case VIR_DOMAIN_SCHED_FIELD_BOOLEAN: + { + /* Hack - Python's definition of Py_True breaks strict + * aliasing rules, so can't directly compare :-( + */ + PyObject *hacktrue = PyBool_FromLong(1); + params[i].value.b = hacktrue == val ? 1 : 0; + Py_DECREF(hacktrue); + } + break; + + default: + free(params); + return VIR_PY_NONE; + } + } + + if (virDomainSetSchedulerParameters(domain, params, nparams) < 0) { + free(params); + return VIR_PY_NONE; + } + + free(params); + return VIR_PY_NONE; +} + +static PyObject * +libvirt_virDomainGetVcpus(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) { + virDomainPtr domain; + PyObject *pyobj_domain, *pyretval = NULL, *pycpuinfo = NULL, *pycpumap = NULL; + virNodeInfo nodeinfo; + virDomainInfo dominfo; + virVcpuInfoPtr cpuinfo = NULL; + unsigned char *cpumap = NULL; + int cpumaplen, i; + + if (!PyArg_ParseTuple(args, (char *)"O:virDomainGetVcpus", + &pyobj_domain)) + return(NULL); + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + if (virNodeGetInfo(virDomainGetConnect(domain), &nodeinfo) != 0) + return VIR_PY_NONE; + + if (virDomainGetInfo(domain, &dominfo) != 0) + return VIR_PY_NONE; + + if ((cpuinfo = malloc(sizeof(*cpuinfo)*dominfo.nrVirtCpu)) == NULL) + return VIR_PY_NONE; + + cpumaplen = VIR_CPU_MAPLEN(VIR_NODEINFO_MAXCPUS(nodeinfo)); + if ((cpumap = malloc(dominfo.nrVirtCpu * cpumaplen)) == NULL) + goto cleanup; + + if (virDomainGetVcpus(domain, + cpuinfo, dominfo.nrVirtCpu, + cpumap, cpumaplen) < 0) + goto cleanup; + + /* convert to a Python tupple of long objects */ + if ((pyretval = PyTuple_New(2)) == NULL) + goto cleanup; + if ((pycpuinfo = PyList_New(dominfo.nrVirtCpu)) == NULL) + goto cleanup; + if ((pycpumap = PyList_New(dominfo.nrVirtCpu)) == NULL) + goto cleanup; + + for (i = 0 ; i < dominfo.nrVirtCpu ; i++) { + PyObject *info = PyTuple_New(4); + if (info == NULL) + goto cleanup; + PyTuple_SetItem(info, 0, PyInt_FromLong((long)cpuinfo[i].number)); + PyTuple_SetItem(info, 1, PyInt_FromLong((long)cpuinfo[i].state)); + PyTuple_SetItem(info, 2, PyLong_FromLongLong((long long)cpuinfo[i].cpuTime)); + PyTuple_SetItem(info, 3, PyInt_FromLong((long)cpuinfo[i].cpu)); + PyList_SetItem(pycpuinfo, i, info); + } + for (i = 0 ; i < dominfo.nrVirtCpu ; i++) { + PyObject *info = PyTuple_New(VIR_NODEINFO_MAXCPUS(nodeinfo)); + int j; + if (info == NULL) + goto cleanup; + for (j = 0 ; j < VIR_NODEINFO_MAXCPUS(nodeinfo) ; j++) { + PyTuple_SetItem(info, j, PyBool_FromLong(VIR_CPU_USABLE(cpumap, cpumaplen, i, j))); + } + PyList_SetItem(pycpumap, i, info); + } + PyTuple_SetItem(pyretval, 0, pycpuinfo); + PyTuple_SetItem(pyretval, 1, pycpumap); + + free(cpuinfo); + free(cpumap); + + return(pyretval); + + cleanup: + free(cpuinfo); + free(cpumap); + /* NB, Py_DECREF is a badly defined macro, so we require + * braces here to avoid 'ambiguous else' warnings from + * the compiler. + * NB. this comment is true at of time of writing wrt to + * at least python2.5. + */ + if (pyretval) { Py_DECREF(pyretval); } + if (pycpuinfo) { Py_DECREF(pycpuinfo); } + if (pycpumap) { Py_DECREF(pycpumap); } + return VIR_PY_NONE; +} + + +static PyObject * +libvirt_virDomainPinVcpu(PyObject *self ATTRIBUTE_UNUSED, + PyObject *args) { + virDomainPtr domain; + PyObject *pyobj_domain, *pycpumap, *truth; + virNodeInfo nodeinfo; + unsigned char *cpumap; + int cpumaplen, i, vcpu; + + if (!PyArg_ParseTuple(args, (char *)"OiO:virDomainPinVcpu", + &pyobj_domain, &vcpu, &pycpumap)) + return(NULL); + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + if (virNodeGetInfo(virDomainGetConnect(domain), &nodeinfo) != 0) + return VIR_PY_NONE; + + cpumaplen = VIR_CPU_MAPLEN(VIR_NODEINFO_MAXCPUS(nodeinfo)); + if ((cpumap = malloc(cpumaplen)) == NULL) + return VIR_PY_NONE; + memset(cpumap, 0, cpumaplen); + + truth = PyBool_FromLong(1); + for (i = 0 ; i < VIR_NODEINFO_MAXCPUS(nodeinfo) ; i++) { + PyObject *flag = PyTuple_GetItem(pycpumap, i); + if (flag == truth) + VIR_USE_CPU(cpumap, i); + else + VIR_UNUSE_CPU(cpumap, i); + } + + virDomainPinVcpu(domain, vcpu, cpumap, cpumaplen); + Py_DECREF(truth); + free(cpumap); + + return VIR_PY_NONE; +} + + /************************************************************************ * * * Global error handler at the Python level * @@ -876,6 +1189,11 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virDomainBlockStats", libvirt_virDomainBlockStats, METH_VARARGS, NULL}, {(char *) "virDomainInterfaceStats", libvirt_virDomainInterfaceStats, METH_VARARGS, NULL}, {(char *) "virNodeGetCellsFreeMemory", libvirt_virNodeGetCellsFreeMemory, METH_VARARGS, NULL}, + {(char *) "virDomainGetSchedulerType", libvirt_virDomainGetSchedulerType, METH_VARARGS, NULL}, + {(char *) "virDomainGetSchedulerParameters", libvirt_virDomainGetSchedulerParameters, METH_VARARGS, NULL}, + {(char *) "virDomainSetSchedulerParameters", libvirt_virDomainSetSchedulerParameters, METH_VARARGS, NULL}, + {(char *) "virDomainGetVcpus", libvirt_virDomainGetVcpus, METH_VARARGS, NULL}, + {(char *) "virDomainPinVcpu", libvirt_virDomainPinVcpu, METH_VARARGS, NULL}, {NULL, NULL, 0, NULL} }; -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

3 7

[Libvir] PATCH: Remove no-op network API impl from OpenVZ driver
by Daniel P. Berrange 21 Jan '08

21 Jan '08

The openvz_driver.c file registers an implementation of the networking driver APIs, which is a no-op. Even though the networking APIs are implemented in the QEMU driver, this one impl is *shared* and used across all virtualization driver backends. Thus no other driver such as Xen/OpenVZ/etc should ever implement the network APIs. The only exceptions are the remote driver, and the test driver. So this patch removes the no-op impl from openvz diff -r 079dc4e2fd54 src/openvz_driver.c --- a/src/openvz_driver.c Mon Jan 14 18:09:49 2008 -0500 +++ b/src/openvz_driver.c Mon Jan 14 19:04:10 2008 -0500 @@ -86,14 +86,6 @@ static int openvzShutdown(void); static int openvzShutdown(void); static int openvzReload(void); static int openvzActive(void); -static int openvzCloseNetwork(virConnectPtr conn); -static virDrvOpenStatus openvzOpenNetwork(virConnectPtr conn, - const char *name ATTRIBUTE_UNUSED, - int *credtype ATTRIBUTE_UNUSED, - int ncredtype ATTRIBUTE_UNUSED, - virConnectAuthCallbackPtr cb ATTRIBUTE_UNUSED, - void *cbdata ATTRIBUTE_UNUSED, - int flags ATTRIBUTE_UNUSED); static virDomainPtr openvzDomainDefineXML(virConnectPtr conn, const char *xml); static virDomainPtr openvzDomainCreateLinux(virConnectPtr conn, const char *xml, @@ -696,20 +688,6 @@ static int openvzActive(void) { static int openvzActive(void) { return 1; -} - -static int openvzCloseNetwork(virConnectPtr conn ATTRIBUTE_UNUSED) { - return 0; -} - -static virDrvOpenStatus openvzOpenNetwork(virConnectPtr conn ATTRIBUTE_UNUSED, - const char *name ATTRIBUTE_UNUSED, - int *credtype ATTRIBUTE_UNUSED, - int ncredtype ATTRIBUTE_UNUSED, - virConnectAuthCallbackPtr cb ATTRIBUTE_UNUSED, - void *cbdata ATTRIBUTE_UNUSED, - int flags ATTRIBUTE_UNUSED) { - return VIR_DRV_OPEN_SUCCESS; } static virDriver openvzDriver = { @@ -771,27 +749,6 @@ static virDriver openvzDriver = { NULL, /* nodeGetFreeMemory */ }; -static virNetworkDriver openvzNetworkDriver = { - NULL, /* name */ - openvzOpenNetwork, /* open */ - openvzCloseNetwork, /* close */ - NULL, /* numOfNetworks */ - NULL, /* listNetworks */ - NULL, /* numOfDefinedNetworks */ - NULL, /* listDefinedNetworks */ - NULL, /* networkLookupByUUID */ - NULL, /* networkLookupByName */ - NULL, /* networkCreateXML */ - NULL, /* networkDefineXML */ - NULL, /* networkUndefine */ - NULL, /* networkCreate */ - NULL, /* networkDestroy */ - NULL, /* networkDumpXML */ - NULL, /* networkGetBridgeName */ - NULL, /* networkGetAutostart */ - NULL, /* networkSetAutostart */ -}; - static virStateDriver openvzStateDriver = { openvzStartup, openvzShutdown, @@ -801,7 +758,6 @@ static virStateDriver openvzStateDriver int openvzRegister(void) { virRegisterDriver(&openvzDriver); - virRegisterNetworkDriver(&openvzNetworkDriver); virRegisterStateDriver(&openvzStateDriver); return 0; } Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

3 3

[Libvir] PATCH: Make virsh use virFileReadAll
by Daniel P. Berrange 21 Jan '08

21 Jan '08

This patch makes virsh use the virFileReadAll API from util.c, instead of duplicating it. This means we need to export this symbol from the library. diff -r 1eb02a424697 src/libvirt_sym.version --- a/src/libvirt_sym.version Sat Jan 19 13:45:07 2008 -0500 +++ b/src/libvirt_sym.version Sat Jan 19 14:28:41 2008 -0500 @@ -131,5 +131,7 @@ __virDomainMigratePerform; __virDomainMigrateFinish; + __virFileReadAll; + local: *; }; diff -r 1eb02a424697 src/util.c --- a/src/util.c Sat Jan 19 13:45:07 2008 -0500 +++ b/src/util.c Sat Jan 19 14:28:41 2008 -0500 @@ -316,9 +316,9 @@ ssize_t safewrite(int fd, const void *bu } -int virFileReadAll(const char *path, - int maxlen, - char **buf) +int __virFileReadAll(const char *path, + int maxlen, + char **buf) { FILE *fh; struct stat st; diff -r 1eb02a424697 src/util.h --- a/src/util.h Sat Jan 19 13:45:07 2008 -0500 +++ b/src/util.h Sat Jan 19 14:28:41 2008 -0500 @@ -33,9 +33,10 @@ int saferead(int fd, void *buf, size_t c int saferead(int fd, void *buf, size_t count); ssize_t safewrite(int fd, const void *buf, size_t count); -int virFileReadAll(const char *path, - int maxlen, - char **buf); +int __virFileReadAll(const char *path, + int maxlen, + char **buf); +#define virFileReadAll(p,m,b) __virFileReadAll((p),(m),(b)) int virFileMatchesNameSuffix(const char *file, const char *name, diff -r 1eb02a424697 src/virsh.c --- a/src/virsh.c Sat Jan 19 13:45:07 2008 -0500 +++ b/src/virsh.c Sat Jan 19 14:28:41 2008 -0500 @@ -48,6 +48,7 @@ #include "internal.h" #include "console.h" +#include "util.h" static char *progname; @@ -55,6 +56,8 @@ static char *progname; #define TRUE 1 #define FALSE 0 #endif + +#define VIRSH_MAX_XML_FILE 10*1024*1024 #define VSH_PROMPT_RW "virsh # " #define VSH_PROMPT_RO "virsh > " @@ -858,66 +861,6 @@ static vshCmdOptDef opts_create[] = { {NULL, 0, 0, NULL} }; -/* Read in a whole file and return it as a string. - * If it fails, it logs an error and returns NULL. - * String must be freed by caller. - */ -static char * -readFile (vshControl *ctl, const char *filename) -{ - char *retval; - int len = 0, fd; - - if ((fd = open(filename, O_RDONLY)) == -1) { - vshError (ctl, FALSE, _("Failed to open '%s': %s"), - filename, strerror (errno)); - return NULL; - } - - if (!(retval = malloc(len + 1))) - goto out_of_memory; - - while (1) { - char buffer[1024]; - char *new; - int ret; - - if ((ret = read(fd, buffer, sizeof(buffer))) == 0) - break; - - if (ret == -1) { - if (errno == EINTR) - continue; - - vshError (ctl, FALSE, _("Failed to open '%s': read: %s"), - filename, strerror (errno)); - goto error; - } - - if (!(new = realloc(retval, len + ret + 1))) - goto out_of_memory; - - retval = new; - - memcpy(retval + len, buffer, ret); - len += ret; - } - - retval[len] = '\0'; - return retval; - - out_of_memory: - vshError (ctl, FALSE, _("Error allocating memory: %s"), - strerror(errno)); - - error: - if (retval) - free(retval); - close(fd); - - return NULL; -} - static int cmdCreate(vshControl * ctl, vshCmd * cmd) { @@ -934,8 +877,8 @@ cmdCreate(vshControl * ctl, vshCmd * cmd if (!found) return FALSE; - buffer = readFile (ctl, from); - if (buffer == NULL) return FALSE; + if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) + return FALSE; dom = virDomainCreateLinux(ctl->conn, buffer, 0); free (buffer); @@ -982,8 +925,8 @@ cmdDefine(vshControl * ctl, vshCmd * cmd if (!found) return FALSE; - buffer = readFile (ctl, from); - if (buffer == NULL) return FALSE; + if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) + return FALSE; dom = virDomainDefineXML(ctl->conn, buffer); free (buffer); @@ -2372,8 +2315,8 @@ cmdNetworkCreate(vshControl * ctl, vshCm if (!found) return FALSE; - buffer = readFile (ctl, from); - if (buffer == NULL) return FALSE; + if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) + return FALSE; network = virNetworkCreateXML(ctl->conn, buffer); free (buffer); @@ -2420,8 +2363,8 @@ cmdNetworkDefine(vshControl * ctl, vshCm if (!found) return FALSE; - buffer = readFile (ctl, from); - if (buffer == NULL) return FALSE; + if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) + return FALSE; network = virNetworkDefineXML(ctl->conn, buffer); free (buffer); @@ -3107,8 +3050,8 @@ cmdAttachDevice(vshControl * ctl, vshCmd return FALSE; } - buffer = readFile (ctl, from); - if (buffer == NULL) return FALSE; + if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) + return FALSE; ret = virDomainAttachDevice(dom, buffer); free (buffer); @@ -3161,8 +3104,8 @@ cmdDetachDevice(vshControl * ctl, vshCmd return FALSE; } - buffer = readFile (ctl, from); - if (buffer == NULL) return FALSE; + if (virFileReadAll(from, VIRSH_MAX_XML_FILE, &buffer) < 0) + return FALSE; ret = virDomainDetachDevice(dom, buffer); free (buffer); Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

3 3

[Libvir] PATCH: Fix and cleanup ref counting/ domain/network object release
by Daniel P. Berrange 21 Jan '08

21 Jan '08

The referencing counting code for Connect/Domain/Network objects has many repeated codepaths, not all of which are correct. eg, the virFreeDomain method forgets to release networks when garbage collecting a virConnectPtr, and the virFreeNetwork method forgets to release domains. I've also found it very confusing having both virFreeDomain and virDomainFree. So I've changed the impl of the cleanup functions in hash.c to use a slightly different structure. There are now 6 functions: - virUnrefConnect - virReleaseConnect - virUnrefDomain - virReleaseDomain - virUnrefNetwork The 'virUnref*' APIs are intended for use by the drivers to decrement the ref count on objects they no loner need. In the virUnref* method, if the ref count hits zero, then it calls the corresponding virRelease* method to actually free the object's memory. The virUnref* methods are responsible for acquiring the connection mutex. The virRelease* method mandate that5D the mutex is already held, and will releae it as the very last step when deleting the object. The virReleaseDomain/virReleaeNetwork methods will also derecement the ref count of the connection, and call virReleaseConnection if appropriate. The patch for all this looks horrific but its not as bad as it looks, so I'd recommend reviewing the final code in hash.c, rather than the patch. I have also switched from xmlMutex to the POSIX standard pthread_mutex_t object. In theory the former may give more portability, but the patches which follow are also going to require actual pthread_t objects, for which libxml has no wrappers. Thus it is pointless using the xmlMutex abstraction. The added plus, is that pthread_mutex_t objects do not require any memory allocation, merely initialization of their pre-allocated contents so it simplifies a little code. Finally, the code in hash.c for dealing with ref counting seriously abused the 'goto' statement with multiple jumps overlapping each other in a single method. This made it very hard to follow. So I removed the use of goto in most places so its only used in error cleanup paths, and not for regular flow control. Oh, and in cleaning up internal.h I found an odd declaration of some functions from xs_internal.h which could have been made static. So I made them static. In this version I removed the call to 'virUnrefDomain' from the libvirt.c file's virDomainDestroy call, and likewise in virNetworkDestroy. Regards, Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

3 5

[Libvir] PATCH: const-correct sexpr
by Jim Meyering 21 Jan '08

21 Jan '08

I was looking at xend_internal.c and wondered why sexpr_int's sexpr pointer wasn't const... surely, it *can't* modify that, I thought. So I made it const, and pulled the thread, which ended up making most of the sexpr* parameters in sexpr.[ch] const. I added the few inevitable casts, but imho, that cost is far outweighed by having accurate prototypes for all of these functions. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- src/sexpr.c | 26 +++++++++++++------------- src/sexpr.h | 12 ++++++------ src/xend_internal.c | 18 ++++++++++-------- 3 files changed, 29 insertions(+), 27 deletions(-) diff --git a/src/sexpr.c b/src/sexpr.c index f9e7226..b273117 100644 --- a/src/sexpr.c +++ b/src/sexpr.c @@ -150,15 +150,15 @@ sexpr_string(const char *str, ssize_t len) * Returns the resulting S-Expression pointer or NULL in case of error. */ struct sexpr * -sexpr_cons(struct sexpr *car, struct sexpr *cdr) +sexpr_cons(const struct sexpr *car, const struct sexpr *cdr) { struct sexpr *ret = sexpr_new(); if (ret == NULL) return ret; ret->kind = SEXPR_CONS; - ret->u.s.car = car; - ret->u.s.cdr = cdr; + ret->u.s.car = (struct sexpr *) car; + ret->u.s.cdr = (struct sexpr *) cdr; return ret; } @@ -171,14 +171,14 @@ sexpr_cons(struct sexpr *car, struct sexpr *cdr) * Internal operation appending a value at the end of an existing list */ static void -append(struct sexpr *lst, struct sexpr *value) +append(struct sexpr *lst, const struct sexpr *value) { while (lst->kind != SEXPR_NIL) { lst = lst->u.s.cdr; } lst->kind = SEXPR_CONS; - lst->u.s.car = value; + lst->u.s.car = (struct sexpr *) value; lst->u.s.cdr = sexpr_nil(); } @@ -191,7 +191,7 @@ append(struct sexpr *lst, struct sexpr *value) * Returns lst or NULL in case of error */ struct sexpr * -sexpr_append(struct sexpr *lst, struct sexpr *value) +sexpr_append(struct sexpr *lst, const struct sexpr *value) { if (lst == NULL) return (NULL); @@ -215,7 +215,7 @@ sexpr_append(struct sexpr *lst, struct sexpr *value) * 0 in case of error. */ size_t -sexpr2string(struct sexpr * sexpr, char *buffer, size_t n_buffer) +sexpr2string(const struct sexpr * sexpr, char *buffer, size_t n_buffer) { size_t ret = 0, tmp; @@ -415,7 +415,7 @@ string2sexpr(const char *buffer) * Returns the pointer to the sub expression or NULL if not found. */ static struct sexpr * -sexpr_lookup_key(struct sexpr *sexpr, const char *node) +sexpr_lookup_key(const struct sexpr *sexpr, const char *node) { char buffer[4096], *ptr, *token; @@ -436,7 +436,7 @@ sexpr_lookup_key(struct sexpr *sexpr, const char *node) } for (token = strsep(&ptr, "/"); token; token = strsep(&ptr, "/")) { - struct sexpr *i; + const struct sexpr *i; if (token == NULL) continue; @@ -464,7 +464,7 @@ sexpr_lookup_key(struct sexpr *sexpr, const char *node) return NULL; } - return sexpr; + return (struct sexpr *) sexpr; } /** @@ -478,7 +478,7 @@ sexpr_lookup_key(struct sexpr *sexpr, const char *node) * Returns the pointer to the sub expression or NULL if not found. */ struct sexpr * -sexpr_lookup(struct sexpr *sexpr, const char *node) +sexpr_lookup(const struct sexpr *sexpr, const char *node) { struct sexpr *s = sexpr_lookup_key(sexpr, node); @@ -528,7 +528,7 @@ sexpr_has(struct sexpr *sexpr, const char *node) * Returns the value of the node or NULL if not found. */ const char * -sexpr_node(struct sexpr *sexpr, const char *node) +sexpr_node(const struct sexpr *sexpr, const char *node) { struct sexpr *n = sexpr_lookup(sexpr, node); @@ -547,7 +547,7 @@ sexpr_node(struct sexpr *sexpr, const char *node) * Returns the value of the node or NULL if not found. */ const char * -sexpr_fmt_node(struct sexpr *sexpr, const char *fmt, ...) +sexpr_fmt_node(const struct sexpr *sexpr, const char *fmt, ...) { va_list ap; char node[4096]; diff --git a/src/sexpr.h b/src/sexpr.h index eb82479..0dd882d 100644 --- a/src/sexpr.h +++ b/src/sexpr.h @@ -35,20 +35,20 @@ struct sexpr { }; /* conversion to/from strings */ -size_t sexpr2string(struct sexpr *sexpr, char *buffer, size_t n_buffer); +size_t sexpr2string(const struct sexpr *sexpr, char *buffer, size_t n_buffer); struct sexpr *string2sexpr(const char *buffer); /* constructors and destructors */ struct sexpr *sexpr_nil(void); struct sexpr *sexpr_string(const char *str, ssize_t len); -struct sexpr *sexpr_cons(struct sexpr *car, struct sexpr *cdr); -struct sexpr *sexpr_append(struct sexpr *lst, struct sexpr *item); +struct sexpr *sexpr_cons(const struct sexpr *car, const struct sexpr *cdr); +struct sexpr *sexpr_append(struct sexpr *lst, const struct sexpr *item); void sexpr_free(struct sexpr *sexpr); /* lookup in S-Expressions */ -const char *sexpr_node(struct sexpr *sexpr, const char *node); -const char *sexpr_fmt_node(struct sexpr *sexpr, const char *fmt, ...) +const char *sexpr_node(const struct sexpr *sexpr, const char *node); +const char *sexpr_fmt_node(const struct sexpr *sexpr, const char *fmt, ...) ATTRIBUTE_FORMAT(printf,2,3); -struct sexpr *sexpr_lookup(struct sexpr *sexpr, const char *node); +struct sexpr *sexpr_lookup(const struct sexpr *sexpr, const char *node); int sexpr_has(struct sexpr *sexpr, const char *node); #endif diff --git a/src/xend_internal.c b/src/xend_internal.c index bff625b..f1389c8 100644 --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -730,7 +730,7 @@ sexpr_get(virConnectPtr xend, const char *fmt, ...) * Returns the value found or 0 if not found (but may not be an error) */ static int -sexpr_int(struct sexpr *sexpr, const char *name) +sexpr_int(const struct sexpr *sexpr, const char *name) { const char *value = sexpr_node(sexpr, name); @@ -751,7 +751,7 @@ sexpr_int(struct sexpr *sexpr, const char *name) * Returns the value found or 0 if not found (but may not be an error) */ static double -sexpr_float(struct sexpr *sexpr, const char *name) +sexpr_float(const struct sexpr *sexpr, const char *name) { const char *value = sexpr_node(sexpr, name); @@ -772,7 +772,7 @@ sexpr_float(struct sexpr *sexpr, const char *name) * Returns the value found or 0 if not found (but may not be an error) */ static uint64_t -sexpr_u64(struct sexpr *sexpr, const char *name) +sexpr_u64(const struct sexpr *sexpr, const char *name) { const char *value = sexpr_node(sexpr, name); @@ -794,7 +794,7 @@ sexpr_u64(struct sexpr *sexpr, const char *name) * Returns a -1 on error, 0 on success */ static int -sexpr_uuid(unsigned char *ptr, struct sexpr *node, const char *path) +sexpr_uuid(unsigned char *ptr, const struct sexpr *node, const char *path) { const char *r = sexpr_node(node, path); if (!r) @@ -1840,7 +1840,8 @@ xend_parse_domain_sexp(virConnectPtr conn, char *sexpr, int xendConfigVersion) { * Returns 0 in case of success, -1 in case of error */ static int -sexpr_to_xend_domain_info(virDomainPtr domain, struct sexpr *root, virDomainInfoPtr info) +sexpr_to_xend_domain_info(virDomainPtr domain, const struct sexpr *root, + virDomainInfoPtr info) { const char *flags; @@ -1889,7 +1890,7 @@ sexpr_to_xend_domain_info(virDomainPtr domain, struct sexpr *root, virDomainInfo * Returns 0 in case of success, -1 in case of error */ static int -sexpr_to_xend_node_info(struct sexpr *root, virNodeInfoPtr info) +sexpr_to_xend_node_info(const struct sexpr *root, virNodeInfoPtr info) { const char *machine; @@ -1939,7 +1940,8 @@ sexpr_to_xend_node_info(struct sexpr *root, virNodeInfoPtr info) * Returns 0 in case of success, -1 in case of error */ static int -sexpr_to_xend_topology_xml(virConnectPtr conn, struct sexpr *root, virBufferPtr xml) +sexpr_to_xend_topology_xml(virConnectPtr conn, const struct sexpr *root, + virBufferPtr xml) { const char *nodeToCpu; int numCells = 0; @@ -1992,7 +1994,7 @@ error: * Returns the domain pointer or NULL in case of error. */ static virDomainPtr -sexpr_to_domain(virConnectPtr conn, struct sexpr *root) +sexpr_to_domain(virConnectPtr conn, const struct sexpr *root) { virDomainPtr ret = NULL; unsigned char uuid[VIR_UUID_BUFLEN]; -- 1.5.4.rc3.14.g44397

2 4

[Libvir] [PATCH] Don't access line[-1] for a zero-length "line" from fgets.
by Jim Meyering 21 Jan '08

21 Jan '08

In reviewing the StorageAPI patches, I saw that some bogus input could cause a segfault. There's similar code in libvirt.c, so this fixes both. Note that virsh.c does this, too, but it already has the required guard. The src/libvirt.c patch applies to the trunk, but isn't a big deal, since it's in the sample AuthCallback function. The storage_backend.c part applies to the work-in-progress mercurial queue, but does matter, because we have no guarantee what the exec'd command will output. Don't access line[-1] for a zero-length "line" from fgets. A NUL byte at beginning of input, or just after a newline would provoke an invalid buf[-1] access (possible segfault). * src/libvirt.c (virConnectAuthCallbackDefault): * src/storage_backend.c (virStorageBackendRunProgRegex): Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- src/libvirt.c | 6 ++++-- src/storage_backend.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 2972382..331c937 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -74,6 +74,7 @@ static int virConnectAuthCallbackDefault(virConnectCredentialPtr cred, for (i = 0 ; i < ncred ; i++) { char buf[1024]; char *bufptr = buf; + size_t len; if (printf("%s:", cred[i].prompt) < 0) return -1; @@ -92,8 +93,9 @@ static int virConnectAuthCallbackDefault(virConnectCredentialPtr cred, } return -1; } - if (buf[strlen(buf)-1] == '\n') - buf[strlen(buf)-1] = '\0'; + len = strlen(buf); + if (len != 0 && buf[len-1] == '\n') + buf[len-1] = '\0'; break; case VIR_CRED_PASSPHRASE: diff --git a/src/storage_backend.c b/src/storage_backend.c index 32a8d65..58d8642 100644 --- a/src/storage_backend.c +++ b/src/storage_backend.c @@ -338,7 +338,7 @@ int virStorageBackendRunProgRegex(virConnectPtr conn, while (fgets(line, sizeof(line), list) != NULL) { /* Strip trailing newline */ int len = strlen(line); - if (line[len-1] == '\n') + if (len && line[len-1] == '\n') line[len-1] = '\0'; for (i = 0 ; i <= maxReg && i < nregex ; i++) { -- 1.5.4.rc4.1.g1895

3 3

[Libvir] PATCH: Fix qemu-dm path in capabilities info
by Daniel P. Berrange 21 Jan '08

21 Jan '08

The current Xen capabilities XML data chooses between /usr/lib/xen/bin/qemu-dm and /usr/lib64/xen/bin/qemu-dm based on whether the guest arch is 64 bit. This is incorrect because the path is actually determined based on the host OS. Only x86_64 uses /usr/lib64, all other arches just use /usr/lib - even on ia64. So this patch changes the logic so that /usr/lib64 is only used if we see an x86_64 guest present - this implies host is x86_64 and that all guests whether 32 or 64bit shoudl use /usr/lib64 Dan. diff -r 38f2abccef9b src/xen_internal.c --- a/src/xen_internal.c Sun Jan 20 11:28:37 2008 -0500 +++ b/src/xen_internal.c Sun Jan 20 12:36:23 2008 -0500 @@ -2186,6 +2186,7 @@ xenHypervisorMakeCapabilitiesXML(virConn int ia64_be; } guest_archs[32]; int nr_guest_archs = 0; + int lib64 = 0; virBufferPtr xml; char *xml_str; @@ -2261,6 +2262,7 @@ xenHypervisorMakeCapabilitiesXML(virConn else if (strncmp (&token[subs[2].rm_so], "x86_64", 6) == 0) { model = "x86_64"; bits = 64; + lib64 = 1; } else if (strncmp (&token[subs[2].rm_so], "ia64", 4) == 0) { model = "ia64"; @@ -2376,7 +2378,7 @@ xenHypervisorMakeCapabilitiesXML(virConn <machine>pc</machine>\n\ <machine>isapc</machine>\n\ <loader>/usr/lib/xen/boot/hvmloader</loader>\n", - guest_archs[i].bits == 64 ? "64" : ""); + lib64 ? "64" : ""); if (r == -1) goto vir_buffer_failed; } r = virBufferAdd (xml, -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

2 2

[Libvir] Dom0 and entitlement
by Katti, Vadiraj (STSD-Openview) 21 Jan '08

21 Jan '08

Hi, I've some questions related to xen. Can anybody help me regarding the following questions. 1. Is dom0 a logical system(like any other vm's that are configured on it) ? If yes, then all xm commands should be applicable to it (ex : vcpu-set) . 2. /proc on dom0 reflects the physical or logical utilization. 3. Is there any entitelment concept in xen for cpu and memory? What is cpu weight used for and how is set. 4. virt-manager shows physical or logical utilization (cpu, memory) 5. How do i get the IP address of each of the guests from dom0 ? 6. What are the interfaces in domU to tell me that its a guest (or dom0) and also the type of virtualization ( eg. XEN/ VMWARE etc ) Thanks, Vadiraj

2 1

[Libvir] Question about building libvirt on Windows
by Atsushi SAKAI 21 Jan '08

21 Jan '08

Hi, Rich I try to build on current libvirt on Windows. But failed in attached compilation message. I would be appreciate If you have any suggestions. My Instruction is follows. build cygwinenvironment. Install gettext-devel, gnutls, gnutls-devel additionally. install sunrpc-4.0-4 on / compile libvirt(current) and fails and get attached message. I have not added any additional patches to libvirt. Thanks Atsushi SAKAI

2 1

[Libvir] Windows support document seems little bit old.
by Atsushi SAKAI 21 Jan '08

21 Jan '08

Hi, Rich I am trying to build libvirt on Windows for checking Xen domain operation. I am doing this based on following instruction. http://libvirt.org/windows.html Anyway Your document seems old. since the suggest patch is already applied to libvirt itself. Is there any plan to update it? Thanks Atsushi SAKAI

2 1

[Libvir] OCaml libvirt 0.4.0.2 released
by Richard W.M. Jones 21 Jan '08

21 Jan '08

This is an experimental release of the OCaml libvirt bindings and tools. The main changes are that we have moved to automatically generating as many of the C bindings as possible, and this includes experimental support for the libvirt storage API. Main site: http://libvirt.org/ocaml/ Source tarball: http://libvirt.org/sources/ocaml/ocaml-libvirt-0.4.0.2.tar.gz Changes: http://libvirt.org/ocaml/ChangeLog.txt I've revamped and improved the API documentation. You can find full API documentation here: http://libvirt.org/ocaml/html/Libvirt.html Example module - the job control API: http://libvirt.org/ocaml/html/Libvirt.Job.html Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

2 2

[Libvir] [PATCH] NIC should define in order
by Hiroyuki Kaguchi 21 Jan '08

21 Jan '08

Currently NIC definition order is reversed. If we set over 4-NICs for a domain by virt-install, this causes a network communication problem. This is because virtual mac to eth relation is lost. This patch fixes the NIC definition order. N.B. If less than 3-NICs, this problem does not occur. Sign-off-by: Hiroyuki Kaguchi <fj7025cf(a)aa.jp.fujitsu.com> Index: xm_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/xm_internal.c,v retrieving revision 1.53 diff -u -p -r1.53 xm_internal.c --- xm_internal.c 14 Dec 2007 15:51:42 -0000 1.53 +++ xm_internal.c 16 Jan 2008 00:43:17 -0000 @@ -2232,7 +2232,7 @@ virConfPtr xenXMParseXMLToConfig(virConn } vifs->type = VIR_CONF_LIST; vifs->list = NULL; - for (i = 0; i < obj->nodesetval->nodeNr; i++) { + for (i = obj->nodesetval->nodeNr - 1; i >= 0; i--) { virConfValuePtr thisVif; char *vif = xenXMParseXMLVif(conn, obj->nodesetval->nodeTab[i], hvm); if (!vif)

2 1

[Libvir] What do the docs/APIchunk*.html files do ?
by Daniel P. Berrange 21 Jan '08

21 Jan '08

Whenever we change any of the embedded API docs or add new APIs we end up with huge diffs on the docs/APIchunk*.html files. These HTML files don't seem to be visible anywhere on the website, nor are there even any <a href> links to them in other pages on the website. Can we just kill off these APIchunk* files from the doc generator in CVS Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

2 3

[Libvir] PATCH: Add xstrtol variants for long long
by Daniel P. Berrange 20 Jan '08

20 Jan '08

Jim's xstrtol convenience function simplified the use of strtol, but only support the 'int' variant. For the storage drivers I need a similar function that will always be at minimum 64-bit since we may have files > 2 GB even on 32-bit. So this adds a variant of the xstrtol functions which use a long long / unsigned long long type Regards, Dan. diff -r 83e80c558f4d src/internal.h --- a/src/internal.h Wed Jan 16 09:28:01 2008 -0500 +++ b/src/internal.h Wed Jan 16 09:28:05 2008 -0500 @@ -304,6 +304,42 @@ xstrtol_ui(char const *s, char **end_ptr return 0; } +static inline int +xstrtol_ll(char const *s, char **end_ptr, int base, long long *result) +{ + long long val; + char *p; + int err; + + errno = 0; + val = strtoll(s, &p, base); + err = (errno || (!end_ptr && *p) || p == s || (long long) val != val); + if (end_ptr) + *end_ptr = p; + if (err) + return -1; + *result = val; + return 0; +} + +/* Just like xstrtol_i, above, but produce an "unsigned long long" value. */ +static inline int +xstrtol_ull(char const *s, char **end_ptr, int base, unsigned long long *result) +{ + unsigned long long val; + char *p; + int err; + + errno = 0; + val = strtoull(s, &p, base); + err = (errno || (!end_ptr && *p) || p == s || (unsigned long long) val != val); + if (end_ptr) + *end_ptr = p; + if (err) + return -1; + *result = val; + return 0; +} #ifdef __cplusplus } #endif /* __cplusplus */ Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

3 4

[Libvir] PATCH: RFC: env var to set default connection URI
by Daniel P. Berrange 20 Jan '08

20 Jan '08

Currently, if the app provides NULL as the connect URI, we always connect to a Xen hypervisor. virsh provides a VIR_DEFAULT_CONNECT_URI env var which can be used to override this. virt-install/virt-manager never use NULL, and now try to 'guess' a default URI based on whether /dev/kvm or /proc/xen exist. Users have requested that VIR_DEFAULT_CONNECT_URI apply to other apps besides virsh. So this patch adds support for LIBVIRT_DEFAULT_URI env variable which will be used if the connect URI is NULL. If that variable is not set it will still default to Xen. diff -r 673c98e11c78 src/libvirt.c --- a/src/libvirt.c Wed Jan 16 09:27:56 2008 -0500 +++ b/src/libvirt.c Wed Jan 16 09:28:00 2008 -0500 @@ -516,8 +516,13 @@ do_open (const char *name, xmlURIPtr uri; /* Convert NULL or "" to xen:/// for back compat */ - if (!name || name[0] == '\0') - name = "xen:///"; + if (!name || name[0] == '\0') { + char *defname = getenv("LIBVIRT_DEFAULT_URI"); + if (defname && *defname) + name = defname; + else + name = "xen:///"; + } /* Convert xen -> xen:/// for back compat */ if (!strcasecmp(name, "xen")) Regards, Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

3 3

[Libvir] PATCH: Fix compat for Xen 3.2.0
by Daniel P. Berrange 20 Jan '08

20 Jan '08

Xen 3.2.0 removed the sockets_per_node field from the nodeinfo data returned by XenD. I previously add compat for this, but got it in the wrong place so it would most likely end up in a divide-by-zero error. This patch re-arranges it to be correct. diff -rup libvirt-0.4.0.orig/src/xend_internal.c libvirt-0.4.0.new/src/xend_internal.c --- libvirt-0.4.0.orig/src/xend_internal.c 2007-12-17 18:05:27.000000000 -0500 +++ libvirt-0.4.0.new/src/xend_internal.c 2008-01-18 21:13:30.000000000 -0500 @@ -1907,6 +1907,9 @@ sexpr_to_xend_node_info(struct sexpr *ro info->mhz = sexpr_int(root, "node/cpu_mhz"); info->nodes = sexpr_int(root, "node/nr_nodes"); info->sockets = sexpr_int(root, "node/sockets_per_node"); + info->cores = sexpr_int(root, "node/cores_per_socket"); + info->threads = sexpr_int(root, "node/threads_per_core"); + /* Xen 3.2.0 replaces sockets_per_node with 'nr_cpus'. * Old Xen calculated sockets_per_node using its internal * nr_cpus / (nodes*cores*threads), so fake it ourselves @@ -1921,8 +1924,6 @@ sexpr_to_xend_node_info(struct sexpr *ro if (info->sockets == 0) info->sockets = 1; } - info->cores = sexpr_int(root, "node/cores_per_socket"); - info->threads = sexpr_int(root, "node/threads_per_core"); return (0); } Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

3 5

[Libvir] PATCH: make debug builds quiet by default
by Daniel P. Berrange 19 Jan '08

19 Jan '08

During development I like to have the --enable-debug flag enabled all the time because its very handy at times. I don't want it spewing to stderr all the time though, just because I turned on the compile option. So this patch adds an env variable 'LIBVIRT_DEBUG' which controls whether it is chatty or not. So with this patch you can use --enable-debug all the time, and just run LIBVIRT_DEBUG=1 ./src/virsh .... to turn it on for a particular test, or likewise for the daemon LIBVIRT_DEBUG=1 ./qemud/libvirtd Dan. libvirt.c | 64 +++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 27 deletions(-) diff -r c747561694fc src/libvirt.c --- a/src/libvirt.c Tue Jan 08 23:52:20 2008 -0500 +++ b/src/libvirt.c Tue Jan 08 23:53:57 2008 -0500 @@ -59,10 +59,11 @@ static int initialized = 0; * are printed to stderr for debugging. */ #ifdef ENABLE_DEBUG +static int debugFlag = 0; #define DEBUG(fs,...) \ - fprintf (stderr, "libvirt: %s (" fs ")\n", __func__, __VA_ARGS__) + do { if (debugFlag) fprintf (stderr, "libvirt: %s (" fs ")\n", __func__, __VA_ARGS__); } while (0) #define DEBUG0 \ - fprintf (stderr, "libvirt: %s ()\n", __func__) + do { if (debugFlag) fprintf (stderr, "libvirt: %s ()\n", __func__); } while (0) #else #define DEBUG0 #define DEBUG(fs,...) @@ -179,10 +180,20 @@ int int virInitialize(void) { - DEBUG0; +#ifdef ENABLE_DEBUG + char *debugEnv; +#endif if (initialized) return(0); initialized = 1; + +#ifdef ENABLE_DEBUG + debugEnv = getenv("LIBVIRT_DEBUG"); + if (debugEnv && *debugEnv) + debugFlag = 1; +#endif + + DEBUG0; #if HAVE_WINSOCK2_H if (winsock_init () == -1) return -1; @@ -543,18 +554,17 @@ do_open (const char *name, } #ifdef ENABLE_DEBUG - fprintf (stderr, - "libvirt: do_open: name \"%s\" to URI components:\n" - " scheme %s\n" - " opaque %s\n" - " authority %s\n" - " server %s\n" - " user %s\n" - " port %d\n" - " path %s\n", - name, - uri->scheme, uri->opaque, uri->authority, uri->server, - uri->user, uri->port, uri->path); + DEBUG("libvirt: do_open: name \"%s\" to URI components:\n" + " scheme %s\n" + " opaque %s\n" + " authority %s\n" + " server %s\n" + " user %s\n" + " port %d\n" + " path %s\n", + name, + uri->scheme, uri->opaque, uri->authority, uri->server, + uri->user, uri->port, uri->path); #endif ret->name = strdup (name); @@ -565,16 +575,16 @@ do_open (const char *name, for (i = 0; i < virDriverTabCount; i++) { #ifdef ENABLE_DEBUG - fprintf (stderr, "libvirt: do_open: trying driver %d (%s) ...\n", - i, virDriverTab[i]->name); + DEBUG("libvirt: do_open: trying driver %d (%s) ...\n", + i, virDriverTab[i]->name); #endif res = virDriverTab[i]->open (ret, uri, auth, flags); #ifdef ENABLE_DEBUG - fprintf (stderr, "libvirt: do_open: driver %d %s returned %s\n", - i, virDriverTab[i]->name, - res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : - (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : - (res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status"))); + DEBUG("libvirt: do_open: driver %d %s returned %s\n", + i, virDriverTab[i]->name, + res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : + (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : + (res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status"))); #endif if (res == VIR_DRV_OPEN_ERROR) goto failed; else if (res == VIR_DRV_OPEN_SUCCESS) { @@ -592,11 +602,11 @@ do_open (const char *name, for (i = 0; i < virNetworkDriverTabCount; i++) { res = virNetworkDriverTab[i]->open (ret, uri, auth, flags); #ifdef ENABLE_DEBUG - fprintf (stderr, "libvirt: do_open: network driver %d %s returned %s\n", - i, virNetworkDriverTab[i]->name, - res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : - (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : - (res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status"))); + DEBUG("libvirt: do_open: network driver %d %s returned %s\n", + i, virNetworkDriverTab[i]->name, + res == VIR_DRV_OPEN_SUCCESS ? "SUCCESS" : + (res == VIR_DRV_OPEN_DECLINED ? "DECLINED" : + (res == VIR_DRV_OPEN_ERROR ? "ERROR" : "unknown status"))); #endif if (res == VIR_DRV_OPEN_ERROR) { if (STREQ(virNetworkDriverTab[i]->name, "remote")) { Regards, Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

3 7

[Libvir] [PATCH] Update from gnulib.
by Jim Meyering 19 Jan '08

19 Jan '08

I ran ./bootstrap against a just-updated gnulib directory, so these changes now sync into libvirt all of the changes from gnulib since the last time: Update from gnulib. FYI, nearly all of these changes are also in the latest coreutils beta/test release, so if there are problems, I should hear about it soon. If you'd like to see justification for a particular change, you'll probably find it in a combination of these: gnulib's ChangeLog file a unit test change or addition, a message on the bug-gnulib mailing list. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- gnulib/lib/Makefile.am | 11 +++++++ gnulib/lib/float.in.h | 2 +- gnulib/lib/fseeko.c | 3 ++ gnulib/lib/printf-parse.c | 40 ++++++++++++++++++++++++- gnulib/lib/stdint.in.h | 10 +++++- gnulib/lib/stdio.in.h | 4 +- gnulib/lib/stdlib.in.h | 25 +++++++++++++++- gnulib/lib/string.in.h | 70 +++++++++++++++++++++++++++++++++++--------- gnulib/lib/unistd.in.h | 5 ++- gnulib/lib/vasnprintf.h | 4 +- gnulib/m4/alloca.m4 | 8 +---- gnulib/m4/float_h.m4 | 4 +- gnulib/m4/gnulib-comp.m4 | 14 +++++++++ gnulib/m4/stdlib_h.m4 | 7 ++++- gnulib/m4/string_h.m4 | 9 +++++- gnulib/m4/unistd_h.m4 | 1 + gnulib/tests/Makefile.am | 3 +- gnulib/tests/test-fseeko.c | 26 +++++++++++++++- 18 files changed, 209 insertions(+), 37 deletions(-) diff --git a/gnulib/lib/Makefile.am b/gnulib/lib/Makefile.am index a94ed2d..e7a6edf 100644 --- a/gnulib/lib/Makefile.am +++ b/gnulib/lib/Makefile.am @@ -420,13 +420,18 @@ stdlib.h: stdlib.in.h -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \ -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \ -e 's|@''GNULIB_PUTENV''@|$(GNULIB_PUTENV)|g' \ + -e 's|@''GNULIB_SETENV''@|$(GNULIB_SETENV)|g' \ + -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \ -e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \ -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \ -e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \ -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \ -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \ + -e 's|@''HAVE_SETENV''@|$(HAVE_SETENV)|g' \ + -e 's|@''HAVE_UNSETENV''@|$(HAVE_UNSETENV)|g' \ -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \ -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ + -e 's|@''VOID_UNSETENV''@|$(VOID_UNSETENV)|g' \ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ < $(srcdir)/stdlib.in.h; \ } > $@-t @@ -482,9 +487,11 @@ string.h: string.in.h -e 's|@''GNULIB_STRNLEN''@|$(GNULIB_STRNLEN)|g' \ -e 's|@''GNULIB_STRPBRK''@|$(GNULIB_STRPBRK)|g' \ -e 's|@''GNULIB_STRSEP''@|$(GNULIB_STRSEP)|g' \ + -e 's|@''GNULIB_STRSTR''@|$(GNULIB_STRSTR)|g' \ -e 's|@''GNULIB_STRCASESTR''@|$(GNULIB_STRCASESTR)|g' \ -e 's|@''GNULIB_STRTOK_R''@|$(GNULIB_STRTOK_R)|g' \ -e 's|@''GNULIB_STRERROR''@|$(GNULIB_STRERROR)|g' \ + -e 's|@''GNULIB_STRSIGNAL''@|$(GNULIB_STRSIGNAL)|g' \ -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \ -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \ -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \ @@ -500,6 +507,9 @@ string.h: string.in.h -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \ -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \ -e 's|@''HAVE_DECL_STRERROR''@|$(HAVE_DECL_STRERROR)|g' \ + -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \ + -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \ + -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \ -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ < $(srcdir)/string.in.h; \ @@ -677,6 +687,7 @@ unistd.h: unistd.in.h -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ + -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ < $(srcdir)/unistd.in.h; \ diff --git a/gnulib/lib/float.in.h b/gnulib/lib/float.in.h index 7cf0791..1984fd7 100644 --- a/gnulib/lib/float.in.h +++ b/gnulib/lib/float.in.h @@ -24,7 +24,7 @@ #define _GL_FLOAT_H /* 'long double' properties. */ -#if defined __i386__ && defined __BEOS__ +#if defined __i386__ && (defined __BEOS__ || defined __OpenBSD__) /* Number of mantissa units, in base FLT_RADIX. */ # undef LDBL_MANT_DIG # define LDBL_MANT_DIG 64 diff --git a/gnulib/lib/fseeko.c b/gnulib/lib/fseeko.c index c66ba26..8543d42 100644 --- a/gnulib/lib/fseeko.c +++ b/gnulib/lib/fseeko.c @@ -111,6 +111,9 @@ rpl_fseeko (FILE *fp, off_t offset, int whence) #if defined __sferror /* FreeBSD, NetBSD, OpenBSD, MacOS X, Cygwin */ fp->_offset = pos; fp->_flags |= __SOFF; + fp->_flags &= ~__SEOF; +#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, mingw */ + fp->_flag &= ~_IOEOF; #endif return 0; } diff --git a/gnulib/lib/printf-parse.c b/gnulib/lib/printf-parse.c index 94c6c61..66b45a7 100644 --- a/gnulib/lib/printf-parse.c +++ b/gnulib/lib/printf-parse.c @@ -1,5 +1,5 @@ /* Formatted output to strings. - Copyright (C) 1999-2000, 2002-2003, 2006-2007 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2002-2003, 2006-2008 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -392,6 +392,44 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a) } cp++; } +#if defined __APPLE__ && defined __MACH__ + /* On MacOS X 10.3, PRIdMAX is defined as "qd". + We cannot change it to "lld" because PRIdMAX must also + be understood by the system's printf routines. */ + else if (*cp == 'q') + { + if (64 / 8 > sizeof (long)) + { + /* int64_t = long long */ + flags += 16; + } + else + { + /* int64_t = long */ + flags += 8; + } + cp++; + } +#endif +#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ + /* On native Win32, PRIdMAX is defined as "I64d". + We cannot change it to "lld" because PRIdMAX must also + be understood by the system's printf routines. */ + else if (*cp == 'I' && cp[1] == '6' && cp[2] == '4') + { + if (64 / 8 > sizeof (long)) + { + /* __int64 = long long */ + flags += 16; + } + else + { + /* __int64 = long */ + flags += 8; + } + cp += 3; + } +#endif else break; } diff --git a/gnulib/lib/stdint.in.h b/gnulib/lib/stdint.in.h index af31648..fbe39c5 100644 --- a/gnulib/lib/stdint.in.h +++ b/gnulib/lib/stdint.in.h @@ -23,6 +23,12 @@ #ifndef _GL_STDINT_H +/* When including a system file that in turn includes <inttypes.h>, + use the system <inttypes.h>, not our substitute. This avoids + problems with (for example) VMS, whose <sys/bitypes.h> includes + <inttypes.h>. */ +#define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H + /* Get those types that are already defined in other system include files, so that we can "#define int8_t signed char" below without worrying about a later system include file containing a "typedef @@ -66,9 +72,7 @@ /* In OpenBSD 3.8, <inttypes.h> includes <machine/types.h>, which defines int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__. <inttypes.h> also defines intptr_t and uintptr_t. */ -# define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H # include <inttypes.h> -# undef _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H #elif @HAVE_SYS_INTTYPES_H@ /* Solaris 7 <sys/inttypes.h> has the types except the *_fast*_t types, and the macros except for *_FAST*_*, INTPTR_MIN, PTRDIFF_MIN, PTRDIFF_MAX. */ @@ -91,6 +95,8 @@ #endif +#undef _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H + /* Minimum and maximum values for a integer type under the usual assumption. Return an unspecified value if BITS == 0, adding a check to pacify picky compilers. */ diff --git a/gnulib/lib/stdio.in.h b/gnulib/lib/stdio.in.h index b176424..d5962aa 100644 --- a/gnulib/lib/stdio.in.h +++ b/gnulib/lib/stdio.in.h @@ -1,6 +1,6 @@ /* A GNU-like <stdio.h>. - Copyright (C) 2004, 2007 Free Software Foundation, Inc. + Copyright (C) 2004, 2007-2008 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -45,7 +45,7 @@ #ifndef __attribute__ /* This feature is available in gcc versions 2.5 and later. */ -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__ +# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) # define __attribute__(Spec) /* empty */ # endif /* The __-protected variants of `format' and `printf' attributes diff --git a/gnulib/lib/stdlib.in.h b/gnulib/lib/stdlib.in.h index baebcce..bc7dc4f 100644 --- a/gnulib/lib/stdlib.in.h +++ b/gnulib/lib/stdlib.in.h @@ -1,6 +1,6 @@ /* A GNU-like <stdlib.h>. - Copyright (C) 1995, 2001-2002, 2006-2007 Free Software Foundation, Inc. + Copyright (C) 1995, 2001-2004, 2006-2007 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -176,6 +176,29 @@ extern int putenv (char *string); #endif +#if @GNULIB_SETENV@ +# if !@HAVE_SETENV@ +/* Set NAME to VALUE in the environment. + If REPLACE is nonzero, overwrite an existing value. */ +extern int setenv (const char *name, const char *value, int replace); +# endif +#endif + + +#if @GNULIB_UNSETENV@ +# if @HAVE_UNSETENV@ +# if @VOID_UNSETENV@ +/* On some systems, unsetenv() returns void. + This is the case for MacOS X 10.3, FreeBSD 4.8, NetBSD 1.6, OpenBSD 3.4. */ +# define unsetenv(name) ((unsetenv)(name), 0) +# endif +# else +/* Remove the variable NAME from the environment. */ +extern int unsetenv (const char *name); +# endif +#endif + + #ifdef __cplusplus } #endif diff --git a/gnulib/lib/string.in.h b/gnulib/lib/string.in.h index a371e5c..dbbe2fd 100644 --- a/gnulib/lib/string.in.h +++ b/gnulib/lib/string.in.h @@ -1,6 +1,6 @@ /* A GNU-like <string.h>. - Copyright (C) 1995-1996, 2001-2007 Free Software Foundation, Inc. + Copyright (C) 1995-1996, 2001-2008 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -25,6 +25,18 @@ #define _GL_STRING_H +#ifndef __attribute__ +/* This feature is available in gcc versions 2.5 and later. */ +# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) +# define __attribute__(Spec) /* empty */ +# endif +/* The attribute __pure__ was added in gcc 2.96. */ +# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 96) +# define __pure__ /* empty */ +# endif +#endif + + /* The definition of GL_LINK_WARNING is copied here. */ @@ -35,15 +47,20 @@ extern "C" { /* Return the first occurrence of NEEDLE in HAYSTACK. */ #if @GNULIB_MEMMEM@ -# if ! @HAVE_DECL_MEMMEM@ +# if @REPLACE_MEMMEM@ +# define memmem rpl_memmem +# endif +# if ! @HAVE_DECL_MEMMEM@ || @REPLACE_MEMMEM@ extern void *memmem (void const *__haystack, size_t __haystack_len, - void const *__needle, size_t __needle_len); + void const *__needle, size_t __needle_len) + __attribute__ ((__pure__)); # endif #elif defined GNULIB_POSIXCHECK # undef memmem # define memmem(a,al,b,bl) \ - (GL_LINK_WARNING ("memmem is unportable - " \ - "use gnulib module memmem for portability"), \ + (GL_LINK_WARNING ("memmem is unportable and often quadratic - " \ + "use gnulib module memmem-simple for portability, " \ + "and module memmem for speed" ), \ memmem (a, al, b, bl)) #endif @@ -65,7 +82,8 @@ extern void *mempcpy (void *restrict __dest, void const *restrict __src, /* Search backwards through a block for a byte (specified as an int). */ #if @GNULIB_MEMRCHR@ # if ! @HAVE_DECL_MEMRCHR@ -extern void *memrchr (void const *, int, size_t); +extern void *memrchr (void const *, int, size_t) + __attribute__ ((__pure__)); # endif #elif defined GNULIB_POSIXCHECK # undef memrchr @@ -118,7 +136,8 @@ extern char *stpncpy (char *restrict __dst, char const *restrict __src, /* Find the first occurrence of C in S or the final NUL byte. */ #if @GNULIB_STRCHRNUL@ # if ! @HAVE_STRCHRNUL@ -extern char *strchrnul (char const *__s, int __c_in); +extern char *strchrnul (char const *__s, int __c_in) + __attribute__ ((__pure__)); # endif #elif defined GNULIB_POSIXCHECK # undef strchrnul @@ -163,7 +182,8 @@ extern char *strndup (char const *__string, size_t __n); return MAXLEN. */ #if @GNULIB_STRNLEN@ # if ! @HAVE_DECL_STRNLEN@ -extern size_t strnlen (char const *__string, size_t __maxlen); +extern size_t strnlen (char const *__string, size_t __maxlen) + __attribute__ ((__pure__)); # endif #elif defined GNULIB_POSIXCHECK # undef strnlen @@ -189,7 +209,8 @@ extern size_t strnlen (char const *__string, size_t __maxlen); /* Find the first occurrence in S of any character in ACCEPT. */ #if @GNULIB_STRPBRK@ # if ! @HAVE_STRPBRK@ -extern char *strpbrk (char const *__s, char const *__accept); +extern char *strpbrk (char const *__s, char const *__accept) + __attribute__ ((__pure__)); # endif # if defined GNULIB_POSIXCHECK /* strpbrk() assumes the second argument is a list of single-byte characters. @@ -269,23 +290,32 @@ extern char *strsep (char **restrict __stringp, char const *restrict __delim); strsep (s, d)) #endif -#if defined GNULIB_POSIXCHECK +#if @GNULIB_STRSTR@ +# if @REPLACE_STRSTR@ +# define strstr rpl_strstr +char *strstr (const char *haystack, const char *needle) + __attribute__ ((__pure__)); +# endif +#elif defined GNULIB_POSIXCHECK /* strstr() does not work with multibyte strings if the locale encoding is different from UTF-8: POSIX says that it operates on "strings", and "string" in POSIX is defined as a sequence of bytes, not of characters. */ # undef strstr # define strstr(a,b) \ - (GL_LINK_WARNING ("strstr cannot work correctly on character strings " \ - "in most multibyte locales - " \ - "use mbsstr if you care about internationalization"), \ + (GL_LINK_WARNING ("strstr is quadratic on many systems, and cannot " \ + "work correctly on character strings in most " \ + "multibyte locales - " \ + "use mbsstr if you care about internationalization, " \ + "or use strstr if you care about speed"), \ strstr (a, b)) #endif /* Find the first occurrence of NEEDLE in HAYSTACK, using case-insensitive comparison. */ #if ! @HAVE_STRCASESTR@ -extern char *strcasestr (const char *haystack, const char *needle); +extern char *strcasestr (const char *haystack, const char *needle) + __attribute__ ((__pure__)); #endif #if defined GNULIB_POSIXCHECK /* strcasestr() does not work with multibyte strings: @@ -511,6 +541,18 @@ extern char *strerror (int); strerror (e)) #endif +#if @GNULIB_STRSIGNAL@ +# if ! @HAVE_DECL_STRSIGNAL@ +extern char *strsignal (int __sig); +# endif +#elif defined GNULIB_POSIXCHECK +# undef strsignal +# define strsignal(a) \ + (GL_LINK_WARNING ("strsignal is unportable - " \ + "use gnulib module strsignal for portability"), \ + strsignal (a)) +#endif + #ifdef __cplusplus } diff --git a/gnulib/lib/unistd.in.h b/gnulib/lib/unistd.in.h index 4916f75..10678f4 100644 --- a/gnulib/lib/unistd.in.h +++ b/gnulib/lib/unistd.in.h @@ -181,7 +181,10 @@ extern int getlogin_r (char *name, size_t size); #if @GNULIB_GETPAGESIZE@ -# if !@HAVE_GETPAGESIZE@ +# if @REPLACE_GETPAGESIZE@ +# define getpagesize rpl_getpagesize +extern int getpagesize (void); +# elif !@HAVE_GETPAGESIZE@ /* This is for POSIX systems. */ # if !defined getpagesize && defined _SC_PAGESIZE # if ! (defined __VMS && __VMS_VER < 70000000) diff --git a/gnulib/lib/vasnprintf.h b/gnulib/lib/vasnprintf.h index 4524ce7..7f5770a 100644 --- a/gnulib/lib/vasnprintf.h +++ b/gnulib/lib/vasnprintf.h @@ -1,5 +1,5 @@ /* vsprintf with automatic memory allocation. - Copyright (C) 2002-2004, 2007 Free Software Foundation, Inc. + Copyright (C) 2002-2004, 2007-2008 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -26,7 +26,7 @@ #ifndef __attribute__ /* This feature is available in gcc versions 2.5 and later. */ -# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__ +# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) # define __attribute__(Spec) /* empty */ # endif /* The __-protected variants of `format' and `printf' attributes diff --git a/gnulib/m4/alloca.m4 b/gnulib/m4/alloca.m4 index eb62e0e..95f54a6 100644 --- a/gnulib/m4/alloca.m4 +++ b/gnulib/m4/alloca.m4 @@ -1,5 +1,5 @@ -# alloca.m4 serial 7 -dnl Copyright (C) 2002-2004, 2006 Free Software Foundation, Inc. +# alloca.m4 serial 8 +dnl Copyright (C) 2002-2004, 2006, 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -39,10 +39,6 @@ AC_DEFUN([gl_FUNC_ALLOCA], ALLOCA_H=alloca.h fi AC_SUBST([ALLOCA_H]) - - AC_DEFINE(HAVE_ALLOCA_H, 1, - [Define HAVE_ALLOCA_H for backward compatibility with older code - that includes <alloca.h> only if HAVE_ALLOCA_H is defined.]) ]) # Prerequisites of lib/alloca.c. diff --git a/gnulib/m4/float_h.m4 b/gnulib/m4/float_h.m4 index 1b1ad10..d36e3a4 100644 --- a/gnulib/m4/float_h.m4 +++ b/gnulib/m4/float_h.m4 @@ -1,4 +1,4 @@ -# float_h.m4 serial 2 +# float_h.m4 serial 3 dnl Copyright (C) 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,7 +10,7 @@ AC_DEFUN([gl_FLOAT_H], AC_REQUIRE([AC_CANONICAL_HOST]) FLOAT_H= case "$host_os" in - beos*) + beos* | openbsd*) FLOAT_H=float.h gl_CHECK_NEXT_HEADERS([float.h]) ;; diff --git a/gnulib/m4/gnulib-comp.m4 b/gnulib/m4/gnulib-comp.m4 index d92a377..1b91a1e 100644 --- a/gnulib/m4/gnulib-comp.m4 +++ b/gnulib/m4/gnulib-comp.m4 @@ -157,6 +157,13 @@ AC_DEFUN([gl_LIBOBJ], [ gl_LIBOBJS="$gl_LIBOBJS $1.$ac_objext" ]) +# m4_foreach_w is provided by autoconf-2.59c and later. +# This definition is to accommodate developers using versions +# of autoconf older than that. +m4_ifndef([m4_foreach_w], + [m4_define([m4_foreach_w], + [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])]) + # Like AC_REPLACE_FUNCS, except that the module name goes # into gl_LIBOBJS instead of into LIBOBJS. AC_DEFUN([gl_REPLACE_FUNCS], [ @@ -185,6 +192,13 @@ AC_DEFUN([gltests_LIBOBJ], [ gltests_LIBOBJS="$gltests_LIBOBJS $1.$ac_objext" ]) +# m4_foreach_w is provided by autoconf-2.59c and later. +# This definition is to accommodate developers using versions +# of autoconf older than that. +m4_ifndef([m4_foreach_w], + [m4_define([m4_foreach_w], + [m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3])])]) + # Like AC_REPLACE_FUNCS, except that the module name goes # into gltests_LIBOBJS instead of into LIBOBJS. AC_DEFUN([gltests_REPLACE_FUNCS], [ diff --git a/gnulib/m4/stdlib_h.m4 b/gnulib/m4/stdlib_h.m4 index 278df74..fe4ce12 100644 --- a/gnulib/m4/stdlib_h.m4 +++ b/gnulib/m4/stdlib_h.m4 @@ -1,4 +1,4 @@ -# stdlib_h.m4 serial 4 +# stdlib_h.m4 serial 5 dnl Copyright (C) 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -26,12 +26,17 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS], GNULIB_MKDTEMP=0; AC_SUBST([GNULIB_MKDTEMP]) GNULIB_MKSTEMP=0; AC_SUBST([GNULIB_MKSTEMP]) GNULIB_PUTENV=0; AC_SUBST([GNULIB_PUTENV]) + GNULIB_SETENV=0; AC_SUBST([GNULIB_SETENV]) + GNULIB_UNSETENV=0; AC_SUBST([GNULIB_UNSETENV]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_CALLOC_POSIX=1; AC_SUBST([HAVE_CALLOC_POSIX]) HAVE_GETSUBOPT=1; AC_SUBST([HAVE_GETSUBOPT]) HAVE_MALLOC_POSIX=1; AC_SUBST([HAVE_MALLOC_POSIX]) HAVE_MKDTEMP=1; AC_SUBST([HAVE_MKDTEMP]) HAVE_REALLOC_POSIX=1; AC_SUBST([HAVE_REALLOC_POSIX]) + HAVE_SETENV=1; AC_SUBST([HAVE_SETENV]) + HAVE_UNSETENV=1; AC_SUBST([HAVE_UNSETENV]) REPLACE_MKSTEMP=0; AC_SUBST([REPLACE_MKSTEMP]) REPLACE_PUTENV=0; AC_SUBST([REPLACE_PUTENV]) + VOID_UNSETENV=0; AC_SUBST([VOID_UNSETENV]) ]) diff --git a/gnulib/m4/string_h.m4 b/gnulib/m4/string_h.m4 index 8371179..69761d7 100644 --- a/gnulib/m4/string_h.m4 +++ b/gnulib/m4/string_h.m4 @@ -1,10 +1,12 @@ # Configure a GNU-like replacement for <string.h>. -# Copyright (C) 2007 Free Software Foundation, Inc. +# Copyright (C) 2007, 2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 3 + # Written by Paul Eggert. AC_DEFUN([gl_HEADER_STRING_H], @@ -41,6 +43,7 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], GNULIB_STRNLEN=0; AC_SUBST([GNULIB_STRNLEN]) GNULIB_STRPBRK=0; AC_SUBST([GNULIB_STRPBRK]) GNULIB_STRSEP=0; AC_SUBST([GNULIB_STRSEP]) + GNULIB_STRSTR=0; AC_SUBST([GNULIB_STRSTR]) GNULIB_STRCASESTR=0; AC_SUBST([GNULIB_STRCASESTR]) GNULIB_STRTOK_R=0; AC_SUBST([GNULIB_STRTOK_R]) GNULIB_MBSLEN=0; AC_SUBST([GNULIB_MBSLEN]) @@ -58,6 +61,7 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], GNULIB_MBSSEP=0; AC_SUBST([GNULIB_MBSSEP]) GNULIB_MBSTOK_R=0; AC_SUBST([GNULIB_MBSTOK_R]) GNULIB_STRERROR=0; AC_SUBST([GNULIB_STRERROR]) + GNULIB_STRSIGNAL=0; AC_SUBST([GNULIB_STRSIGNAL]) dnl Assume proper GNU behavior unless another module says otherwise. HAVE_DECL_MEMMEM=1; AC_SUBST([HAVE_DECL_MEMMEM]) HAVE_MEMPCPY=1; AC_SUBST([HAVE_MEMPCPY]) @@ -74,5 +78,8 @@ AC_DEFUN([gl_HEADER_STRING_H_DEFAULTS], HAVE_STRCASESTR=1; AC_SUBST([HAVE_STRCASESTR]) HAVE_DECL_STRTOK_R=1; AC_SUBST([HAVE_DECL_STRTOK_R]) HAVE_DECL_STRERROR=1; AC_SUBST([HAVE_DECL_STRERROR]) + HAVE_DECL_STRSIGNAL=1; AC_SUBST([HAVE_DECL_STRSIGNAL]) REPLACE_STRERROR=0; AC_SUBST([REPLACE_STRERROR]) + REPLACE_MEMMEM=0; AC_SUBST([REPLACE_MEMMEM]) + REPLACE_STRSTR=0; AC_SUBST([REPLACE_STRSTR]) ]) diff --git a/gnulib/m4/unistd_h.m4 b/gnulib/m4/unistd_h.m4 index 91c02e7..4b8857c 100644 --- a/gnulib/m4/unistd_h.m4 +++ b/gnulib/m4/unistd_h.m4 @@ -55,6 +55,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], REPLACE_CHOWN=0; AC_SUBST([REPLACE_CHOWN]) REPLACE_FCHDIR=0; AC_SUBST([REPLACE_FCHDIR]) REPLACE_GETCWD=0; AC_SUBST([REPLACE_GETCWD]) + REPLACE_GETPAGESIZE=0; AC_SUBST([REPLACE_GETPAGESIZE]) REPLACE_LCHOWN=0; AC_SUBST([REPLACE_LCHOWN]) REPLACE_LSEEK=0; AC_SUBST([REPLACE_LSEEK]) ]) diff --git a/gnulib/tests/Makefile.am b/gnulib/tests/Makefile.am index db70ba1..4dae90d 100644 --- a/gnulib/tests/Makefile.am +++ b/gnulib/tests/Makefile.am @@ -34,12 +34,13 @@ AM_CPPFLAGS = \ -I../.. -I$(srcdir)/../.. \ -I../../gnulib/lib -I$(srcdir)/../../gnulib/lib -LDADD = libtests.a $(LIBTESTS_LIBDEPS) ../../gnulib/lib/libgnu.la +LDADD = libtests.a ../../gnulib/lib/libgnu.la libtests.a $(LIBTESTS_LIBDEPS) libtests_a_SOURCES = libtests_a_LIBADD = $(gltests_LIBOBJS) libtests_a_DEPENDENCIES = $(gltests_LIBOBJS) EXTRA_libtests_a_SOURCES = +AM_LIBTOOLFLAGS = --preserve-dup-deps ## begin gnulib module alloca-opt-tests diff --git a/gnulib/tests/test-fseeko.c b/gnulib/tests/test-fseeko.c index bcafeea..25289ce 100644 --- a/gnulib/tests/test-fseeko.c +++ b/gnulib/tests/test-fseeko.c @@ -26,10 +26,32 @@ int main (int argc, char **argv) { - /* Assume stdin is seekable iff argc > 1. */ + /* Assume stdin is non-empty and seekable iff argc > 1. */ int expected = argc > 1 ? 0 : -1; /* Exit with success only if fseek/fseeko agree. */ int r1 = fseeko (stdin, (off_t)0, SEEK_CUR); int r2 = fseek (stdin, (long)0, SEEK_CUR); - return ! (r1 == r2 && r1 == expected); + if (r1 != r2 || r1 != expected) + return 1; + if (argc > 1) + { + /* Test that fseek discards ungetc data. */ + int ch = fgetc (stdin); + if (ch == EOF) + return 1; + if (ungetc (ch ^ 0xff, stdin) != (ch ^ 0xff)) + return 1; + if (fseeko (stdin, (off_t) 0, SEEK_END)) + return 1; + if (fgetc (stdin) != EOF) + return 1; + /* Test that fseek resets end-of-file marker. */ + if (!feof (stdin)) + return 1; + if (fseeko (stdin, (off_t) 0, SEEK_END)) + return 1; + if (feof (stdin)) + return 1; + } + return 0; } -- 1.5.4.rc1.11.gd2f82

4 4

Re: [Libvir] [PATCH] python/libvir.c (VIR_PY_NONE): New macro, to encapsulate a common two-statement sequence. Handle PyTuple_New's malloc failure. Use VIR_PY_NONE.
by Jim Meyering 18 Jan '08

18 Jan '08

Thanks for the review, Rich. Seeing that messed-up Subject: line, I realized that I sent a patch produced by "git-format-patch", forgetting that the ancient version of mailman behind this list would remove important parts of it. For the record, here's what I really sent: (with the "From " line escaped) From: Jim Meyering <jim(a)meyering.net> To: "Daniel P. Berrange" <berrange(a)redhat.com> Cc: Libvirt <libvir-list(a)redhat.com> Subject: Re: [Libvir] handle PyTuple_New's malloc failure In-Reply-To: <20080117155200.GC21549(a)redhat.com> (Daniel P. Berrange's message of "Thu, 17 Jan 2008 15:52:00 +0000") References: <87zlv4larm.fsf(a)rho.meyering.net> <20080117155200.GC21549(a)redhat.com> Date: Thu, 17 Jan 2008 19:59:07 +0100 Message-ID: <87y7aojn2c.fsf(a)rho.meyering.net> "Daniel P. Berrange" <berrange(a)redhat.com> wrote: > On Thu, Jan 17, 2008 at 04:41:49PM +0100, Jim Meyering wrote: >> python/libvir.c calls PyTuple_New, but doesn't handle the possibility >> of a NULL return value. Subsequent use of the result pointer in e.g., >> PyTuple_SetItem, would dereference it. >> >> This fixes most of them, but leaves the ones in >> virConnectCredCallbackWrapper untouched. Fixing them >> properly is not as easy, and IMHO will require actual testing. >> >> In this patch, I combined each new test like this >> >> ((info = PyTuple_New(8)) == NULL) >> >> with the preceding "if (c_retval < 0)", since the bodies would be the same. >> >> Duplicating that 2-line body might look more readable, >> depending on which side of the bed you get up on... >> I can go either way. > Might be useful to have a macro to combine the Py_INCREF and return > (Py_None) in one convenient blob. return VIR_PY_NONE(); Good idea. That makes the patch a lot bigger, but makes the resulting code more readable, too. > I think it'd be nicer to keep the PyTuple_new bit separate as it is > now, because in some APIs there can be other code between the existing > c_retval < 0 check, and the point at which we create the Tuple. > > eg, the libvirt_virDomainGetSchedulerParameters method in the > patch I'm attaching which implements a number of missing APIs > NB, this patch is not tested yet, so not intended to be applied Makes sense. And with VIR_PY_NONE, the duplication isn't a problem. New patch below. > I curious as to why we ever return(NULL) here rather than Py_None. I'm > not sure of the python runtime / C binding contract - but returning an > actual NULL seems odd. Me too. Here's the combined patch. Considering the number of uses of VIR_PY_NONE this introduces, I'll have to do the right thing and split it into two: one that adds VIR_PY_NONE, and another that fixes the NULL-deref bugs. > From 55bafd1bdaf6dde1bd019397f569d397fea366a6 Mon Sep 17 00:00:00 2001 > From: Jim Meyering <meyering(a)redhat.com> > Date: Thu, 17 Jan 2008 16:40:17 +0100 > Subject: [PATCH] python/libvir.c (VIR_PY_NONE): New macro, to encapsulate a common two-statement sequence. Handle PyTuple_New's malloc failure. Use VIR_PY_NONE. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- python/libvir.c | 177 +++++++++++++++++++++---------------------------------- 1 files changed, 68 insertions(+), 109 deletions(-) diff --git a/python/libvir.c b/python/libvir.c index 3b41dc1..dbf148e 100644 --- a/python/libvir.c +++ b/python/libvir.c @@ -31,6 +31,11 @@ PyObject * libvirt_virDomainBlockStats(PyObject *self ATTRIBUTE_UNUSED, PyObject PyObject * libvirt_virDomainInterfaceStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args); PyObject * libvirt_virNodeGetCellsFreeMemory(PyObject *self ATTRIBUTE_UNUSED, PyObject *args); +/* The two-statement sequence "Py_INCREF(Py_None); return Py_None;" + is so common that we encapsulate it here. Now, each use is simply + return VIR_PY_NONE; */ +#define VIR_PY_NONE (Py_INCREF (Py_None), Py_None) + /************************************************************************ * * * Statistics * @@ -48,17 +53,16 @@ libvirt_virDomainBlockStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { if (!PyArg_ParseTuple(args, (char *)"Oz:virDomainBlockStats", &pyobj_domain,&path)) - return(NULL); + return(NULL); domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); c_retval = virDomainBlockStats(domain, path, &stats, sizeof(stats)); - if (c_retval < 0) { - Py_INCREF(Py_None); - return(Py_None); - } + if (c_retval < 0) + return VIR_PY_NONE; - /* convert to a Python tupple of long objects */ - info = PyTuple_New(5); + /* convert to a Python tuple of long objects */ + if ((info = PyTuple_New(5)) == NULL) + return VIR_PY_NONE; PyTuple_SetItem(info, 0, PyLong_FromLongLong(stats.rd_req)); PyTuple_SetItem(info, 1, PyLong_FromLongLong(stats.rd_bytes)); PyTuple_SetItem(info, 2, PyLong_FromLongLong(stats.wr_req)); @@ -82,13 +86,12 @@ libvirt_virDomainInterfaceStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); c_retval = virDomainInterfaceStats(domain, path, &stats, sizeof(stats)); - if (c_retval < 0) { - Py_INCREF(Py_None); - return(Py_None); - } + if (c_retval < 0) + return VIR_PY_NONE; - /* convert to a Python tupple of long objects */ - info = PyTuple_New(8); + /* convert to a Python tuple of long objects */ + if ((info = PyTuple_New(8)) == NULL) + return VIR_PY_NONE; PyTuple_SetItem(info, 0, PyLong_FromLongLong(stats.rx_bytes)); PyTuple_SetItem(info, 1, PyLong_FromLongLong(stats.rx_packets)); PyTuple_SetItem(info, 2, PyLong_FromLongLong(stats.rx_errs)); @@ -114,12 +117,11 @@ libvirt_virGetLastError(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUT virError err; PyObject *info; - if (virCopyLastError(&err) <= 0) { - Py_INCREF(Py_None); - return(Py_None); - } + if (virCopyLastError(&err) <= 0) + return VIR_PY_NONE; - info = PyTuple_New(9); + if ((info = PyTuple_New(9)) == NULL) + return VIR_PY_NONE; PyTuple_SetItem(info, 0, PyInt_FromLong((long) err.code)); PyTuple_SetItem(info, 1, PyInt_FromLong((long) err.domain)); PyTuple_SetItem(info, 2, libvirt_constcharPtrWrap(err.message)); @@ -145,12 +147,11 @@ libvirt_virConnGetLastError(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) return(NULL); conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); - if (virConnCopyLastError(conn, &err) <= 0) { - Py_INCREF(Py_None); - return(Py_None); - } + if (virConnCopyLastError(conn, &err) <= 0) + return VIR_PY_NONE; - info = PyTuple_New(9); + if ((info = PyTuple_New(9)) == NULL) + return VIR_PY_NONE; PyTuple_SetItem(info, 0, PyInt_FromLong((long) err.code)); PyTuple_SetItem(info, 1, PyInt_FromLong((long) err.domain)); PyTuple_SetItem(info, 2, libvirt_constcharPtrWrap(err.message)); @@ -348,10 +349,8 @@ libvirt_virConnectOpenAuth(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { if (auth.ncredtype) { int i; auth.credtype = malloc(sizeof(*auth.credtype) * auth.ncredtype); - if (auth.credtype == NULL) { - Py_INCREF(Py_None); - return (Py_None); - } + if (auth.credtype == NULL) + return VIR_PY_NONE; for (i = 0 ; i < auth.ncredtype ; i++) { PyObject *val; val = PyList_GetItem(pycredtype, i); @@ -395,10 +394,8 @@ libvirt_virGetVersion (PyObject *self ATTRIBUTE_UNUSED, PyObject *args) LIBVIRT_END_ALLOW_THREADS; - if (c_retval == -1) { - Py_INCREF(Py_None); - return (Py_None); - } + if (c_retval == -1) + return VIR_PY_NONE; if (type == NULL) return PyInt_FromLong (libVer); @@ -458,10 +455,8 @@ libvirt_virConnectListDomainsID(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virConnectListDomains(conn, &ids[0], 500); LIBVIRT_END_ALLOW_THREADS; - if (c_retval < 0) { - Py_INCREF(Py_None); - return(Py_None); - } + if (c_retval < 0) + return VIR_PY_NONE; py_retval = PyList_New(c_retval); for (i = 0;i < c_retval;i++) { PyList_SetItem(py_retval, i, libvirt_intWrap(ids[i])); @@ -484,22 +479,17 @@ libvirt_virConnectListDefinedDomains(PyObject *self ATTRIBUTE_UNUSED, conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); c_retval = virConnectNumOfDefinedDomains(conn); - if (c_retval < 0) { - Py_INCREF(Py_None); - return (Py_None); - } + if (c_retval < 0) + return VIR_PY_NONE; if (c_retval) { names = malloc(sizeof(*names) * c_retval); - if (!names) { - Py_INCREF(Py_None); - return (Py_None); - } + if (!names) + return VIR_PY_NONE; c_retval = virConnectListDefinedDomains(conn, names, c_retval); if (c_retval < 0) { free(names); - Py_INCREF(Py_None); - return(Py_None); + return VIR_PY_NONE; } } py_retval = PyList_New(c_retval); @@ -530,10 +520,8 @@ libvirt_virDomainGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainGetInfo(domain, &info); LIBVIRT_END_ALLOW_THREADS; - if (c_retval < 0) { - Py_INCREF(Py_None); - return(Py_None); - } + if (c_retval < 0) + return VIR_PY_NONE; py_retval = PyList_New(5); PyList_SetItem(py_retval, 0, libvirt_intWrap((int) info.state)); PyList_SetItem(py_retval, 1, libvirt_ulongWrap(info.maxMem)); @@ -559,10 +547,8 @@ libvirt_virNodeGetInfo(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNodeGetInfo(conn, &info); LIBVIRT_END_ALLOW_THREADS; - if (c_retval < 0) { - Py_INCREF(Py_None); - return(Py_None); - } + if (c_retval < 0) + return VIR_PY_NONE; py_retval = PyList_New(8); PyList_SetItem(py_retval, 0, libvirt_constcharPtrWrap(&info.model[0])); PyList_SetItem(py_retval, 1, libvirt_longWrap((long) info.memory >> 10)); @@ -587,18 +573,14 @@ libvirt_virDomainGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { return(NULL); domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); - if (domain == NULL) { - Py_INCREF(Py_None); - return(Py_None); - } + if (domain == NULL) + return VIR_PY_NONE; LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainGetUUID(domain, &uuid[0]); LIBVIRT_END_ALLOW_THREADS; - if (c_retval < 0) { - Py_INCREF(Py_None); - return(Py_None); - } + if (c_retval < 0) + return VIR_PY_NONE; py_retval = PyString_FromStringAndSize((char *) &uuid[0], VIR_UUID_BUFLEN); return(py_retval); @@ -617,10 +599,8 @@ libvirt_virDomainLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { return(NULL); conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); - if ((uuid == NULL) || (len != VIR_UUID_BUFLEN)) { - Py_INCREF(Py_None); - return(Py_None); - } + if ((uuid == NULL) || (len != VIR_UUID_BUFLEN)) + return VIR_PY_NONE; LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virDomainLookupByUUID(conn, uuid); @@ -664,22 +644,17 @@ libvirt_virConnectListNetworks(PyObject *self ATTRIBUTE_UNUSED, conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); c_retval = virConnectNumOfNetworks(conn); - if (c_retval < 0) { - Py_INCREF(Py_None); - return (Py_None); - } - + if (c_retval < 0) + return VIR_PY_NONE; + if (c_retval) { names = malloc(sizeof(*names) * c_retval); - if (!names) { - Py_INCREF(Py_None); - return (Py_None); - } + if (!names) + return VIR_PY_NONE; c_retval = virConnectListNetworks(conn, names, c_retval); if (c_retval < 0) { free(names); - Py_INCREF(Py_None); - return(Py_None); + return VIR_PY_NONE; } } py_retval = PyList_New(c_retval); @@ -711,22 +686,17 @@ libvirt_virConnectListDefinedNetworks(PyObject *self ATTRIBUTE_UNUSED, conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); c_retval = virConnectNumOfDefinedNetworks(conn); - if (c_retval < 0) { - Py_INCREF(Py_None); - return (Py_None); - } + if (c_retval < 0) + return VIR_PY_NONE; if (c_retval) { names = malloc(sizeof(*names) * c_retval); - if (!names) { - Py_INCREF(Py_None); - return (Py_None); - } + if (!names) + return VIR_PY_NONE; c_retval = virConnectListDefinedNetworks(conn, names, c_retval); if (c_retval < 0) { free(names); - Py_INCREF(Py_None); - return(Py_None); + return VIR_PY_NONE; } } py_retval = PyList_New(c_retval); @@ -755,18 +725,14 @@ libvirt_virNetworkGetUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { return(NULL); domain = (virNetworkPtr) PyvirNetwork_Get(pyobj_domain); - if (domain == NULL) { - Py_INCREF(Py_None); - return(Py_None); - } + if (domain == NULL) + return VIR_PY_NONE; LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNetworkGetUUID(domain, &uuid[0]); LIBVIRT_END_ALLOW_THREADS; - if (c_retval < 0) { - Py_INCREF(Py_None); - return(Py_None); - } + if (c_retval < 0) + return VIR_PY_NONE; py_retval = PyString_FromStringAndSize((char *) &uuid[0], VIR_UUID_BUFLEN); return(py_retval); @@ -785,10 +751,8 @@ libvirt_virNetworkLookupByUUID(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) return(NULL); conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); - if ((uuid == NULL) || (len != VIR_UUID_BUFLEN)) { - Py_INCREF(Py_None); - return(Py_None); - } + if ((uuid == NULL) || (len != VIR_UUID_BUFLEN)) + return VIR_PY_NONE; LIBVIRT_BEGIN_ALLOW_THREADS; c_retval = virNetworkLookupByUUID(conn, uuid); @@ -814,10 +778,8 @@ libvirt_virDomainGetAutostart(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { c_retval = virDomainGetAutostart(domain, &autostart); LIBVIRT_END_ALLOW_THREADS; - if (c_retval < 0) { - Py_INCREF(Py_None); - return Py_None; - } + if (c_retval < 0) + return VIR_PY_NONE; py_retval = libvirt_intWrap(autostart); return(py_retval); } @@ -839,10 +801,8 @@ libvirt_virNetworkGetAutostart(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) c_retval = virNetworkGetAutostart(network, &autostart); LIBVIRT_END_ALLOW_THREADS; - if (c_retval < 0) { - Py_INCREF(Py_None); - return Py_None; - } + if (c_retval < 0) + return VIR_PY_NONE; py_retval = libvirt_intWrap(autostart); return(py_retval); } @@ -873,10 +833,9 @@ PyObject * libvirt_virNodeGetCellsFreeMemory(PyObject *self ATTRIBUTE_UNUSED, LIBVIRT_END_ALLOW_THREADS; if (c_retval < 0) { - free(freeMems); + free(freeMems); error: - Py_INCREF(Py_None); - return Py_None; + return VIR_PY_NONE; } py_retval = PyList_New(c_retval); for (i = 0;i < c_retval;i++) { -- 1.5.4.rc3.14.g44397

1 0

Re: [Libvir] [PATCH] python/libvir.c (VIR_PY_NONE): New macro, to encapsulate a common two-statement sequence. Handle PyTuple_New's malloc failure. Use VIR_PY_NONE.
by Richard W.M. Jones 18 Jan '08

18 Jan '08

Jim Meyering wrote: [...] Patch looks good to me. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

1 0

[Libvir] handle PyTuple_New's malloc failure
by Jim Meyering 17 Jan '08

17 Jan '08

python/libvir.c calls PyTuple_New, but doesn't handle the possibility of a NULL return value. Subsequent use of the result pointer in e.g., PyTuple_SetItem, would dereference it. This fixes most of them, but leaves the ones in virConnectCredCallbackWrapper untouched. Fixing them properly is not as easy, and IMHO will require actual testing. In this patch, I combined each new test like this ((info = PyTuple_New(8)) == NULL) with the preceding "if (c_retval < 0)", since the bodies would be the same. Duplicating that 2-line body might look more readable, depending on which side of the bed you get up on... I can go either way. Subject: [PATCH] python/libvir.c: Handle PyTuple_New's malloc failure. --- python/libvir.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/python/libvir.c b/python/libvir.c index 3b41dc1..13b809f 100644 --- a/python/libvir.c +++ b/python/libvir.c @@ -48,17 +48,16 @@ libvirt_virDomainBlockStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { if (!PyArg_ParseTuple(args, (char *)"Oz:virDomainBlockStats", &pyobj_domain,&path)) - return(NULL); + return(NULL); domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); c_retval = virDomainBlockStats(domain, path, &stats, sizeof(stats)); - if (c_retval < 0) { + if (c_retval < 0 || (info = PyTuple_New(5)) == NULL) { Py_INCREF(Py_None); - return(Py_None); + return(Py_None); } - /* convert to a Python tupple of long objects */ - info = PyTuple_New(5); + /* convert to a Python tuple of long objects */ PyTuple_SetItem(info, 0, PyLong_FromLongLong(stats.rd_req)); PyTuple_SetItem(info, 1, PyLong_FromLongLong(stats.rd_bytes)); PyTuple_SetItem(info, 2, PyLong_FromLongLong(stats.wr_req)); @@ -82,13 +81,12 @@ libvirt_virDomainInterfaceStats(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); c_retval = virDomainInterfaceStats(domain, path, &stats, sizeof(stats)); - if (c_retval < 0) { + if (c_retval < 0 || (info = PyTuple_New(8)) == NULL) { Py_INCREF(Py_None); - return(Py_None); + return(Py_None); } - /* convert to a Python tupple of long objects */ - info = PyTuple_New(8); + /* convert to a Python tuple of long objects */ PyTuple_SetItem(info, 0, PyLong_FromLongLong(stats.rx_bytes)); PyTuple_SetItem(info, 1, PyLong_FromLongLong(stats.rx_packets)); PyTuple_SetItem(info, 2, PyLong_FromLongLong(stats.rx_errs)); @@ -114,12 +112,11 @@ libvirt_virGetLastError(PyObject *self ATTRIBUTE_UNUSED, PyObject *args ATTRIBUT virError err; PyObject *info; - if (virCopyLastError(&err) <= 0) { + if (virCopyLastError(&err) <= 0 || (info = PyTuple_New(9)) == NULL) { Py_INCREF(Py_None); - return(Py_None); + return(Py_None); } - info = PyTuple_New(9); PyTuple_SetItem(info, 0, PyInt_FromLong((long) err.code)); PyTuple_SetItem(info, 1, PyInt_FromLong((long) err.domain)); PyTuple_SetItem(info, 2, libvirt_constcharPtrWrap(err.message)); @@ -145,12 +142,12 @@ libvirt_virConnGetLastError(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) return(NULL); conn = (virConnectPtr) PyvirConnect_Get(pyobj_conn); - if (virConnCopyLastError(conn, &err) <= 0) { + if (virConnCopyLastError(conn, &err) <= 0 + || (info = PyTuple_New(9)) == NULL) { Py_INCREF(Py_None); - return(Py_None); + return(Py_None); } - info = PyTuple_New(9); PyTuple_SetItem(info, 0, PyInt_FromLong((long) err.code)); PyTuple_SetItem(info, 1, PyInt_FromLong((long) err.domain)); PyTuple_SetItem(info, 2, libvirt_constcharPtrWrap(err.message)); -- 1.5.4.rc3.14.g44397

2 6

[Libvir] [RFC] Add Container support to libvirt
by Dave Leskovec 17 Jan '08

17 Jan '08

Greetings, I'd like to extend libvirt to support Containers. As libvirt already supports Xen, KVM, QEMU and OpenVZ, I think it would be valuable to be able to utilize existing utilities to manage containers. I've spent some time looking through the libvirt api and how this Container support will fit. Based on the XML format section of the libvirt website and some list discussions I put together the following proposed XML format: <domain type='linuxcontainer'> <name>Container123</name> <uuid>8dfd44b31e76d8d335150a2d98211ea0</uuid> <container> <filesystem> <mount>/etc = /home/user/lxc_files/etc</mount> <mount>/var = /home/user/lxc_files/var</mount> </filesystem> <application>dbserver</application> <network hostname='browndog'> <ip address="192.168.1.110" netmask="255.255.255.0"/> <gateway address="192.168.1.1"/> <nameserver>192.168.1.1</nameserver> </ip> </network> <cpushare>40</cpushare> <memory>65536</memory> </container> <devices> <console tty='/dev/pts/4' /> </devices> </domain> The clone() function is used with the CLONE_NEWPID and CLONE_NEWNS flags to start a new process within it's own process name space. The only processes visible to it will be itself and any processes that it spawns. The process that clone creates will start out preparing the container environment. This involves setting up any network interface, setting up the file system by performing any requested mounts, mounting /proc, setting up a tty device, populating /dev as necessary, and performing any other necessary initializations. It will then start the application(s) requested by the user. The executables started within the container could be an application or script or possibly /sbin/init. The mounts that the user specifies will need to be populated with the appropriate contents for whatever applications they are going to run within the container. cgroup will be used for isolation and association with controllers for cpu and memory resources. I'm planning to start in on defining a container. All comments and questions are welcome. Best Regards, Dave Leskovec IBM Linux Technology Center Open Virtualization

7 23

[Libvir] avoid more format string warnings
by Jim Meyering 16 Jan '08

16 Jan '08

I compiled libvirt with the latest gcc in rawhide and these CFLAGS: -O -Wall -Wcast-align -Wextra -Wformat -Wformat-security -Winit-self -Winline -Wmissing-prototypes -Wnested-externs -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -Wpointer-arith -Wredundant-decls -Wshadow -Wstrict-prototypes -Wwrite-strings and ended up with a whole bunch of these warnings: virsh.c:6896: warning: format not a string literal and no format arguments Here's the patch: Avoid new format string warnings. * src/virsh.c: Add "%s" where needed. * src/proxy_internal.c: Likewise. --- src/proxy_internal.c | 8 ++-- src/virsh.c | 148 +++++++++++++++++++++++++------------------------- 2 files changed, 79 insertions(+), 77 deletions(-) diff --git a/src/proxy_internal.c b/src/proxy_internal.c index 7f902c5..e0e5631 100644 --- a/src/proxy_internal.c +++ b/src/proxy_internal.c @@ -499,10 +499,10 @@ retry: */ if ((res == NULL) || (res->version != PROXY_PROTO_VERSION) || (res->len < sizeof(virProxyPacket))) { - fprintf(stderr, - _("Communication error with proxy: malformed packet\n")); - xenProxyClose(conn); - return(-1); + fprintf(stderr, "%s", + _("Communication error with proxy: malformed packet\n")); + xenProxyClose(conn); + return(-1); } if (res->serial != serial) { TODO /* Asynchronous communication */ diff --git a/src/virsh.c b/src/virsh.c index 6604eea..cbe3e8e 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -351,7 +351,7 @@ cmdMonitorProgress(vshControl *ctl, vshCmd *cmd, virJobPtr job, virJobInfoPtr in do { if (virJobGetInfo(job, info) < 0) { - vshError(ctl, FALSE, _("Failed to get job status")); + vshError(ctl, FALSE, "%s", _("Failed to get job status")); return -1; } @@ -437,7 +437,7 @@ cmdHelp(vshControl * ctl, vshCmd * cmd) if (!cmdname) { vshCmdDef *def; - vshPrint(ctl, _("Commands:\n\n")); + vshPrint(ctl, "%s", _("Commands:\n\n")); for (def = commands; def->name; def++) vshPrint(ctl, " %-15s %s\n", def->name, N_(vshCmddefGetInfo(def, "help"))); @@ -522,7 +522,7 @@ cmdConnect(vshControl * ctl, vshCmd * cmd) if (ctl->conn) { if (virConnectClose(ctl->conn) != 0) { - vshError(ctl, FALSE, + vshError(ctl, FALSE, "%s", _("Failed to disconnect from the hypervisor")); return FALSE; } @@ -542,7 +542,7 @@ cmdConnect(vshControl * ctl, vshCmd * cmd) } if (!ctl->conn) - vshError(ctl, FALSE, _("Failed to connect to the hypervisor")); + vshError(ctl, FALSE, "%s", _("Failed to connect to the hypervisor")); return ctl->conn ? TRUE : FALSE; } @@ -601,7 +601,7 @@ cmdConsole(vshControl * ctl, vshCmd * cmd) if (vshRunConsole((const char *)obj->stringval) == 0) ret = TRUE; } else { - vshPrintExtra(ctl, _("No console available for domain\n")); + vshPrintExtra(ctl, "%s", _("No console available for domain\n")); } xmlXPathFreeObject(obj); @@ -619,7 +619,7 @@ cmdConsole(vshControl * ctl, vshCmd * cmd) static int cmdConsole(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) { - vshError (ctl, FALSE, _("console not implemented on this platform")); + vshError (ctl, FALSE, "%s", _("console not implemented on this platform")); return FALSE; } @@ -659,14 +659,14 @@ cmdList(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) if (active) { maxid = virConnectNumOfDomains(ctl->conn); if (maxid < 0) { - vshError(ctl, FALSE, _("Failed to list active domains")); + vshError(ctl, FALSE, "%s", _("Failed to list active domains")); return FALSE; } if (maxid) { ids = vshMalloc(ctl, sizeof(int) * maxid); if ((maxid = virConnectListDomains(ctl->conn, &ids[0], maxid)) < 0) { - vshError(ctl, FALSE, _("Failed to list active domains")); + vshError(ctl, FALSE, "%s", _("Failed to list active domains")); free(ids); return FALSE; } @@ -677,7 +677,7 @@ cmdList(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) if (inactive) { maxname = virConnectNumOfDefinedDomains(ctl->conn); if (maxname < 0) { - vshError(ctl, FALSE, _("Failed to list inactive domains")); + vshError(ctl, FALSE, "%s", _("Failed to list inactive domains")); if (ids) free(ids); return FALSE; @@ -686,7 +686,7 @@ cmdList(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) names = vshMalloc(ctl, sizeof(char *) * maxname); if ((maxname = virConnectListDefinedDomains(ctl->conn, names, maxname)) < 0) { - vshError(ctl, FALSE, _("Failed to list inactive domains")); + vshError(ctl, FALSE, "%s", _("Failed to list inactive domains")); if (ids) free(ids); free(names); @@ -1004,7 +1004,7 @@ cmdCreate(vshControl * ctl, vshCmd * cmd) virDomainGetName(dom), from); virDomainFree(dom); } else if (info.state == VIR_JOB_CANCELLED) { - vshError(ctl, FALSE, _("Cancelled domain create operation")); + vshError(ctl, FALSE, "%s", _("Cancelled domain create operation")); ret = FALSE; } else { vshError(ctl, FALSE, _("Failed to create domain from %s"), from); @@ -1145,7 +1145,7 @@ cmdStart(vshControl * ctl, vshCmd * cmd) return FALSE; if (virDomainGetID(dom) != (unsigned int)-1) { - vshError(ctl, FALSE, _("Domain is already active")); + vshError(ctl, FALSE, "%s", _("Domain is already active")); virDomainFree(dom); return FALSE; } @@ -1172,7 +1172,7 @@ cmdStart(vshControl * ctl, vshCmd * cmd) vshPrint(ctl, _("Domain %s started\n"), virDomainGetName(dom)); } else if (info.state == VIR_JOB_CANCELLED) { - vshError(ctl, FALSE, _("Cancelled domain start operation")); + vshError(ctl, FALSE, "%s", _("Cancelled domain start operation")); ret = FALSE; } else { vshError(ctl, FALSE, _("Failed to start domain %s"), @@ -1248,7 +1248,7 @@ cmdSave(vshControl * ctl, vshCmd * cmd) if (info.state == VIR_JOB_COMPLETE) { vshPrint(ctl, _("Domain %s saved to %s\n"), name, to); } else if (info.state == VIR_JOB_CANCELLED) { - vshError(ctl, FALSE, _("Cancelled domain save operation")); + vshError(ctl, FALSE, "%s", _("Cancelled domain save operation")); ret = FALSE; } else { vshError(ctl, FALSE, _("Failed to save domain %s to %s"), name, to); @@ -1313,7 +1313,7 @@ cmdSchedinfo(vshControl * ctl, vshCmd * cmd) if(vshCommandOptBool(cmd, "weight")) { weight = vshCommandOptInt(cmd, "weight", &weightfound); if (!weightfound) { - vshError(ctl, FALSE, _("Invalid value of weight")); + vshError(ctl, FALSE, "%s", _("Invalid value of weight")); goto cleanup; } else { nr_inputparams++; @@ -1323,7 +1323,7 @@ cmdSchedinfo(vshControl * ctl, vshCmd * cmd) if(vshCommandOptBool(cmd, "cap")) { cap = vshCommandOptInt(cmd, "cap", &capfound); if (!capfound) { - vshError(ctl, FALSE, _("Invalid value of cap")); + vshError(ctl, FALSE, "%s", _("Invalid value of cap")); goto cleanup; } else { nr_inputparams++; @@ -1468,7 +1468,7 @@ cmdRestore(vshControl * ctl, vshCmd * cmd) if (info.state == VIR_JOB_COMPLETE) { vshPrint(ctl, _("Domain restored from %s\n"),from); } else if (info.state == VIR_JOB_CANCELLED) { - vshError(ctl, FALSE, _("Cancelled domain restore operation")); + vshError(ctl, FALSE, "%s", _("Cancelled domain restore operation")); ret = FALSE; } else { vshError(ctl, FALSE, _("Failed to restore domain from %s"), from); @@ -1541,7 +1541,7 @@ cmdDump(vshControl * ctl, vshCmd * cmd) if (info.state == VIR_JOB_COMPLETE) { vshPrint(ctl, _("Domain %s dumped to %s\n"), name, to); } else if (info.state == VIR_JOB_CANCELLED) { - vshError(ctl, FALSE, _("Cancelled domain dump operation")); + vshError(ctl, FALSE, "%s", _("Cancelled domain dump operation")); ret = FALSE; } else { vshError(ctl, FALSE, _("Failed to core dump domain %s to %s"), @@ -1913,7 +1913,7 @@ cmdVcpuinfo(vshControl * ctl, vshCmd * cmd) } } else { if (info.state == VIR_DOMAIN_SHUTOFF) { - vshError(ctl, FALSE, + vshError(ctl, FALSE, "%s", _("Domain shut off, virtual CPUs not present.")); } ret = FALSE; @@ -1993,7 +1993,7 @@ cmdVcpupin(vshControl * ctl, vshCmd * cmd) * numbers and give an intelligent error message if not. */ if (cpulist[0] == '\0') { - vshError(ctl, FALSE, _("cpulist: Invalid format. Empty string.")); + vshError(ctl, FALSE, "%s", _("cpulist: Invalid format. Empty string.")); virDomainFree (dom); return FALSE; } @@ -2085,7 +2085,7 @@ cmdSetvcpus(vshControl * ctl, vshCmd * cmd) count = vshCommandOptInt(cmd, "count", &count); if (count <= 0) { - vshError(ctl, FALSE, _("Invalid number of virtual CPUs.")); + vshError(ctl, FALSE, "%s", _("Invalid number of virtual CPUs.")); virDomainFree(dom); return FALSE; } @@ -2097,7 +2097,7 @@ cmdSetvcpus(vshControl * ctl, vshCmd * cmd) } if (count > maxcpu) { - vshError(ctl, FALSE, _("Too many virtual CPUs.")); + vshError(ctl, FALSE, "%s", _("Too many virtual CPUs.")); virDomainFree(dom); return FALSE; } @@ -2149,7 +2149,7 @@ cmdSetmem(vshControl * ctl, vshCmd * cmd) if (virDomainGetInfo(dom, &info) != 0) { virDomainFree(dom); - vshError(ctl, FALSE, _("Unable to verify MaxMemorySize")); + vshError(ctl, FALSE, "%s", _("Unable to verify MaxMemorySize")); return FALSE; } @@ -2206,20 +2206,20 @@ cmdSetmaxmem(vshControl * ctl, vshCmd * cmd) if (virDomainGetInfo(dom, &info) != 0) { virDomainFree(dom); - vshError(ctl, FALSE, _("Unable to verify current MemorySize")); + vshError(ctl, FALSE, "%s", _("Unable to verify current MemorySize")); return FALSE; } if (kilobytes < info.memory) { if (virDomainSetMemory(dom, kilobytes) != 0) { virDomainFree(dom); - vshError(ctl, FALSE, _("Unable to shrink current MemorySize")); + vshError(ctl, FALSE, "%s", _("Unable to shrink current MemorySize")); return FALSE; } } if (virDomainSetMaxMemory(dom, kilobytes) != 0) { - vshError(ctl, FALSE, _("Unable to change MaxMemorySize")); + vshError(ctl, FALSE, "%s", _("Unable to change MaxMemorySize")); ret = FALSE; } @@ -2246,7 +2246,7 @@ cmdNodeinfo(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) return FALSE; if (virNodeGetInfo(ctl->conn, &info) < 0) { - vshError(ctl, FALSE, _("failed to get node information")); + vshError(ctl, FALSE, "%s", _("failed to get node information")); return FALSE; } vshPrint(ctl, "%-20s %s\n", _("CPU model:"), info.model); @@ -2280,7 +2280,7 @@ cmdCapabilities (vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) return FALSE; if ((caps = virConnectGetCapabilities (ctl->conn)) == NULL) { - vshError(ctl, FALSE, _("failed to get capabilities")); + vshError(ctl, FALSE, "%s", _("failed to get capabilities")); return FALSE; } vshPrint (ctl, "%s\n", caps); @@ -2422,7 +2422,7 @@ cmdDomuuid(vshControl * ctl, vshCmd * cmd) if (virDomainGetUUIDString(dom, uuid) != -1) vshPrint(ctl, "%s\n", uuid); else - vshError(ctl, FALSE, _("failed to get domain UUID")); + vshError(ctl, FALSE, "%s", _("failed to get domain UUID")); return TRUE; } @@ -2463,7 +2463,7 @@ cmdMigrate (vshControl *ctl, vshCmd *cmd) desturi = vshCommandOptString (cmd, "desturi", &found); if (!found) { - vshError (ctl, FALSE, _("migrate: Missing desturi")); + vshError (ctl, FALSE, "%s", _("migrate: Missing desturi")); goto done; } @@ -2599,7 +2599,7 @@ cmdNetworkCreate(vshControl * ctl, vshCmd * cmd) virNetworkGetName(dom), from); virNetworkFree(dom); } else if (info.state == VIR_JOB_CANCELLED) { - vshError(ctl, FALSE, _("Cancelled network create operation")); + vshError(ctl, FALSE, "%s", _("Cancelled network create operation")); ret = FALSE; } else { vshError(ctl, FALSE, _("Failed to create network from %s"), from); @@ -2783,7 +2783,7 @@ cmdNetworkList(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) if (active) { maxactive = virConnectNumOfNetworks(ctl->conn); if (maxactive < 0) { - vshError(ctl, FALSE, _("Failed to list active networks")); + vshError(ctl, FALSE, "%s", _("Failed to list active networks")); return FALSE; } if (maxactive) { @@ -2791,7 +2791,7 @@ cmdNetworkList(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) if ((maxactive = virConnectListNetworks(ctl->conn, activeNames, maxactive)) < 0) { - vshError(ctl, FALSE, _("Failed to list active networks")); + vshError(ctl, FALSE, "%s", _("Failed to list active networks")); free(activeNames); return FALSE; } @@ -2802,7 +2802,7 @@ cmdNetworkList(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) if (inactive) { maxinactive = virConnectNumOfDefinedNetworks(ctl->conn); if (maxinactive < 0) { - vshError(ctl, FALSE, _("Failed to list inactive networks")); + vshError(ctl, FALSE, "%s", _("Failed to list inactive networks")); if (activeNames) free(activeNames); return FALSE; @@ -2811,7 +2811,7 @@ cmdNetworkList(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) inactiveNames = vshMalloc(ctl, sizeof(char *) * maxinactive); if ((maxinactive = virConnectListDefinedNetworks(ctl->conn, inactiveNames, maxinactive)) < 0) { - vshError(ctl, FALSE, _("Failed to list inactive networks")); + vshError(ctl, FALSE, "%s", _("Failed to list inactive networks")); if (activeNames) free(activeNames); free(inactiveNames); @@ -2961,7 +2961,7 @@ cmdNetworkStart(vshControl * ctl, vshCmd * cmd) vshPrint(ctl, _("Network %s started\n"), virNetworkGetName(network)); } else if (info.state == VIR_JOB_CANCELLED) { - vshError(ctl, FALSE, _("Cancelled network start operation")); + vshError(ctl, FALSE, "%s", _("Cancelled network start operation")); ret = FALSE; } else { vshError(ctl, FALSE, _("Failed to start network %s"), @@ -3053,7 +3053,7 @@ cmdNetworkUuid(vshControl * ctl, vshCmd * cmd) if (virNetworkGetUUIDString(network, uuid) != -1) vshPrint(ctl, "%s\n", uuid); else - vshError(ctl, FALSE, _("failed to get network UUID")); + vshError(ctl, FALSE, "%s", _("failed to get network UUID")); return TRUE; } @@ -3567,7 +3567,7 @@ cmdPoolList(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) if (active) { maxactive = virConnectNumOfStoragePools(ctl->conn); if (maxactive < 0) { - vshError(ctl, FALSE, _("Failed to list active pools")); + vshError(ctl, FALSE, "%s", _("Failed to list active pools")); return FALSE; } if (maxactive) { @@ -3575,7 +3575,7 @@ cmdPoolList(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) if ((maxactive = virConnectListStoragePools(ctl->conn, activeNames, maxactive)) < 0) { - vshError(ctl, FALSE, _("Failed to list active pools")); + vshError(ctl, FALSE, "%s", _("Failed to list active pools")); free(activeNames); return FALSE; } @@ -3586,7 +3586,7 @@ cmdPoolList(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) if (inactive) { maxinactive = virConnectNumOfDefinedStoragePools(ctl->conn); if (maxinactive < 0) { - vshError(ctl, FALSE, _("Failed to list inactive pools")); + vshError(ctl, FALSE, "%s", _("Failed to list inactive pools")); if (activeNames) free(activeNames); return FALSE; @@ -3595,7 +3595,7 @@ cmdPoolList(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) inactiveNames = vshMalloc(ctl, sizeof(char *) * maxinactive); if ((maxinactive = virConnectListDefinedStoragePools(ctl->conn, inactiveNames, maxinactive)) < 0) { - vshError(ctl, FALSE, _("Failed to list inactive pools")); + vshError(ctl, FALSE, "%s", _("Failed to list inactive pools")); if (activeNames) free(activeNames); free(inactiveNames); @@ -3701,7 +3701,7 @@ cmdPoolDiscover(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) type, 0, &xmlDesc)) < 0) { - vshError(ctl, FALSE, _("Failed to discover pools")); + vshError(ctl, FALSE, "%s", _("Failed to discover pools")); return FALSE; } @@ -3934,7 +3934,7 @@ cmdPoolUuid(vshControl * ctl, vshCmd * cmd) if (virStoragePoolGetUUIDString(pool, uuid) != -1) vshPrint(ctl, "%s\n", uuid); else - vshError(ctl, FALSE, _("failed to get pool UUID")); + vshError(ctl, FALSE, "%s", _("failed to get pool UUID")); return TRUE; } @@ -4310,7 +4310,7 @@ cmdVolList(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) maxactive = virStoragePoolNumOfVolumes(pool); if (maxactive < 0) { virStoragePoolFree(pool); - vshError(ctl, FALSE, _("Failed to list active vols")); + vshError(ctl, FALSE, "%s", _("Failed to list active vols")); return FALSE; } if (maxactive) { @@ -4318,7 +4318,7 @@ cmdVolList(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) if ((maxactive = virStoragePoolListVolumes(pool, activeNames, maxactive)) < 0) { - vshError(ctl, FALSE, _("Failed to list active vols")); + vshError(ctl, FALSE, "%s", _("Failed to list active vols")); free(activeNames); virStoragePoolFree(pool); return FALSE; @@ -4491,7 +4491,7 @@ cmdVersion(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) hvType = virConnectGetType(ctl->conn); if (hvType == NULL) { - vshError(ctl, FALSE, _("failed to get hypervisor type")); + vshError(ctl, FALSE, "%s", _("failed to get hypervisor type")); return FALSE; } @@ -4505,7 +4505,7 @@ cmdVersion(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) ret = virGetVersion(&libVersion, hvType, &apiVersion); if (ret < 0) { - vshError(ctl, FALSE, _("failed to get the library version")); + vshError(ctl, FALSE, "%s", _("failed to get the library version")); return FALSE; } major = libVersion / 1000000; @@ -4524,7 +4524,7 @@ cmdVersion(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) ret = virConnectGetVersion(ctl->conn, &hvVersion); if (ret < 0) { - vshError(ctl, FALSE, _("failed to get the hypervisor version")); + vshError(ctl, FALSE, "%s", _("failed to get the hypervisor version")); return FALSE; } if (hvVersion == 0) { @@ -4561,7 +4561,7 @@ cmdHostname (vshControl *ctl, vshCmd *cmd ATTRIBUTE_UNUSED) hostname = virConnectGetHostname (ctl->conn); if (hostname == NULL) { - vshError(ctl, FALSE, _("failed to get hostname")); + vshError(ctl, FALSE, "%s", _("failed to get hostname")); return FALSE; } @@ -4590,7 +4590,7 @@ cmdURI (vshControl *ctl, vshCmd *cmd ATTRIBUTE_UNUSED) uri = virConnectGetURI (ctl->conn); if (uri == NULL) { - vshError(ctl, FALSE, _("failed to get URI")); + vshError(ctl, FALSE, "%s", _("failed to get URI")); return FALSE; } @@ -5016,12 +5016,12 @@ cmdDetachInterface(vshControl * ctl, vshCmd * cmd) XML_PARSE_NOWARNING); free(doc); if (!xml) { - vshError(ctl, FALSE, _("Failed to get interface information")); + vshError(ctl, FALSE, "%s", _("Failed to get interface information")); goto cleanup; } ctxt = xmlXPathNewContext(xml); if (!ctxt) { - vshError(ctl, FALSE, _("Failed to get interface information")); + vshError(ctl, FALSE, "%s", _("Failed to get interface information")); goto cleanup; } @@ -5057,12 +5057,12 @@ cmdDetachInterface(vshControl * ctl, vshCmd * cmd) hit: xml_buf = xmlBufferCreate(); if (!xml_buf) { - vshError(ctl, FALSE, _("Failed to allocate memory")); + vshError(ctl, FALSE, "%s", _("Failed to allocate memory")); goto cleanup; } if(xmlNodeDump(xml_buf, xml, obj->nodesetval->nodeTab[i], 0, 0) < 0){ - vshError(ctl, FALSE, _("Failed to create XML")); + vshError(ctl, FALSE, "%s", _("Failed to create XML")); goto cleanup; } @@ -5298,19 +5298,19 @@ cmdDetachDisk(vshControl * ctl, vshCmd * cmd) XML_PARSE_NOWARNING); free(doc); if (!xml) { - vshError(ctl, FALSE, _("Failed to get disk information")); + vshError(ctl, FALSE, "%s", _("Failed to get disk information")); goto cleanup; } ctxt = xmlXPathNewContext(xml); if (!ctxt) { - vshError(ctl, FALSE, _("Failed to get disk information")); + vshError(ctl, FALSE, "%s", _("Failed to get disk information")); goto cleanup; } obj = xmlXPathEval(BAD_CAST "/domain/devices/disk", ctxt); if ((obj == NULL) || (obj->type != XPATH_NODESET) || (obj->nodesetval == NULL) || (obj->nodesetval->nodeNr == 0)) { - vshError(ctl, FALSE, _("Failed to get disk information")); + vshError(ctl, FALSE, "%s", _("Failed to get disk information")); goto cleanup; } @@ -5335,12 +5335,12 @@ cmdDetachDisk(vshControl * ctl, vshCmd * cmd) hit: xml_buf = xmlBufferCreate(); if (!xml_buf) { - vshError(ctl, FALSE, _("Failed to allocate memory")); + vshError(ctl, FALSE, "%s", _("Failed to allocate memory")); goto cleanup; } if(xmlNodeDump(xml_buf, xml, obj->nodesetval->nodeTab[i], 0, 0) < 0){ - vshError(ctl, FALSE, _("Failed to create XML")); + vshError(ctl, FALSE, "%s", _("Failed to create XML")); goto cleanup; } @@ -5742,7 +5742,7 @@ vshCommandOptDomainBy(vshControl * ctl, vshCmd * cmd, const char *optname, int id; if (!(n = vshCommandOptString(cmd, optname, NULL))) { - vshError(ctl, FALSE, _("undefined domain name or id")); + vshError(ctl, FALSE, "%s", _("undefined domain name or id")); return NULL; } @@ -5787,7 +5787,7 @@ vshCommandOptNetworkBy(vshControl * ctl, vshCmd * cmd, const char *optname, char *n; if (!(n = vshCommandOptString(cmd, optname, NULL))) { - vshError(ctl, FALSE, _("undefined network name")); + vshError(ctl, FALSE, "%s", _("undefined network name")); return NULL; } @@ -5824,7 +5824,7 @@ vshCommandOptPoolBy(vshControl * ctl, vshCmd * cmd, const char *optname, char *n; if (!(n = vshCommandOptString(cmd, optname, NULL))) { - vshError(ctl, FALSE, _("undefined pool name")); + vshError(ctl, FALSE, "%s", _("undefined pool name")); return NULL; } @@ -5865,12 +5865,12 @@ vshCommandOptVolBy(vshControl * ctl, vshCmd * cmd, int found; if (!(n = vshCommandOptString(cmd, optname, NULL))) { - vshError(ctl, FALSE, _("undefined vol name")); + vshError(ctl, FALSE, "%s", _("undefined vol name")); return NULL; } if (!(p = vshCommandOptString(cmd, pooloptname, &found)) && found) { - vshError(ctl, FALSE, _("undefined pool name")); + vshError(ctl, FALSE, "%s", _("undefined pool name")); return NULL; } @@ -6006,7 +6006,7 @@ vshCommandGetToken(vshControl * ctl, char *str, char **end, char **res) sz++; } if (quote) { - vshError(ctl, FALSE, _("missing \"")); + vshError(ctl, FALSE, "%s", _("missing \"")); return VSH_TK_ERROR; } if (tkstr == NULL || *tkstr == '\0' || p == NULL) @@ -6216,7 +6216,7 @@ vshConnectionUsability(vshControl * ctl, virConnectPtr conn, int showerror) */ if (!conn) { if (showerror) - vshError(ctl, FALSE, _("no valid connection")); + vshError(ctl, FALSE, "%s", _("no valid connection")); return FALSE; } return TRUE; @@ -6366,7 +6366,7 @@ vshInit(vshControl * ctl) * such as "help". */ if (!ctl->conn) { - vshError(ctl, FALSE, _("failed to connect to the hypervisor")); + vshError(ctl, FALSE, "%s", _("failed to connect to the hypervisor")); return FALSE; } @@ -6397,18 +6397,20 @@ vshOpenLogFile(vshControl *ctl) case ENOENT: break; default: - vshError(ctl, TRUE, _("failed to get the log file information")); + vshError(ctl, TRUE, "%s", + _("failed to get the log file information")); break; } } else { if (!S_ISREG(st.st_mode)) { - vshError(ctl, TRUE, _("the log path is not a file")); + vshError(ctl, TRUE, "%s", _("the log path is not a file")); } } /* log file open */ if ((ctl->log_fd = open(ctl->logfile, LOGFILE_FLAGS, FILE_MODE)) < 0) { - vshError(ctl, TRUE, _("failed to open the log file. check the log file path")); + vshError(ctl, TRUE, "%s", + _("failed to open the log file. check the log file path")); } } @@ -6476,7 +6478,7 @@ vshOutputLogFile(vshControl *ctl, int log_level, const char *msg_format, va_list /* write log */ if (write(ctl->log_fd, msg_buf, strlen(msg_buf)) == -1) { vshCloseLogFile(ctl); - vshError(ctl, FALSE, _("failed to write the log file")); + vshError(ctl, FALSE, "%s", _("failed to write the log file")); } } @@ -6704,7 +6706,7 @@ vshUsage(vshControl * ctl, const char *cmdname) " %-15s %s\n", cmd->name, N_(vshCmddefGetInfo(cmd, "help"))); - fprintf(stdout, + fprintf(stdout, "%s", _("\n (specify help <command> for details about the command)\n\n")); return; } @@ -6891,7 +6893,7 @@ main(int argc, char **argv) vshPrint(ctl, _("Welcome to %s, the virtualization interactive terminal.\n\n"), progname); - vshPrint(ctl, + vshPrint(ctl, "%s", _("Type: 'help' for help with commands\n" " 'quit' to quit\n\n")); } -- 1.5.4.rc1.11.gd2f82

2 2

[Libvir] OpenVZ XML
by Mikhail A. Pokidko 16 Jan '08

16 Jan '08

On Jan 16, 2008 1:52 AM, Dave Leskovec wrote: > 2) The Linux Container driver will be a little different than the Xen > and OpenVZ drivers in that it doesn't have already existing > configuration files or facilities. Yes, thats me who took Linux Container XML for OpenVZ XML. I better ask Shuveb. Hi, Shuveb, there is a whole bunch of questions! > Quota is not implemented as yet. As quota is not implemented yet i want to ask - what is the meaning of it? Is it analog of diskspace and diskinodes? And what does <gateway> sets? OpenVZ always uses fake gw 192.0.2.1 Question about <netmask> is connected with one above. As i understand <name> means veid? Should <name> be exactly <name> as there is vzctl set --name? I think it can be misunderstood. Or is it a question of compatibility -- ALTLinux Team xmpp: solar AT solar.net.ru

2 2

[Libvir] [PATCH] Linux-VServer support
by Daniel Hokka Zakrisson 15 Jan '08

15 Jan '08

This patch implements support for Linux-VServer guests. It is currently missing vcpu and console support, and the necessary virsh code to support it, but is otherwise pretty feature complete. This is an XML dump from one of my guests: <domain type='vserver' id='40010'> <name>lenny</name> <uuid>19e12957-261a-5a06-d6d0-89917d6d439f</uuid> <memory>2048000</memory> <os> <hostname>lenny.test</hostname> <type arch='i686'>vserver</type> </os> <devices> <interface type='ethernet'> <ip prefix='24' interface='dummy0' address='192.168.20.4' /> </interface> <interface type='ethernet'> <ip prefix='24' interface='dummy0' type='range' address='192.168.32.100' address2='192.168.32.200'/> </interface> <disk type='directory' device='directory'> <source directory='/vservers/lenny' type='auto' options='defaults'/> <target directory='/'/> </disk> <disk type='directory' device='directory'> <source directory='/srv' type='ext3' options='bind,ro'/> <target directory='/srv'/> </disk> <disk type='block' device='directory'> <source dev='/dev/mapper/test' type='ext3' options='defaults'/> <target directory='/mnt'/> </disk> </devices> </domain> -- Daniel Hokka Zakrisson

2 4

[Libvir] PATCH: Fix remote driver SSH tunnelling
by Daniel P. Berrange 15 Jan '08

15 Jan '08

An off-by-one error in the remote driver checking for malloc() failure in the SSH argv meant all SSH connections were always rejected. It was always checking the trailing NULL in the argv[] Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

3 3

[Libvir] [PATCH] Keyboard layout support for QEMU/KVM
by Daniel Hokka Zakrisson 15 Jan '08

15 Jan '08

This patch adds support for qemu's -k option, which is required to run virt-manager with a non-US keymap. Without it, keys are remapped a number of times, ending up with a completely unusable layout. Even with this patch I am having problems using the AltGr key, returning a scancode of 00. This seems to be a qemu problem though. -- Daniel Hokka Zakrisson

4 5

[Libvir] RFC: Add a short doc with libvirt coding style guidelines
by Daniel P. Berrange 15 Jan '08

15 Jan '08

There's a few coding style guidelines we've kind of informally agreed upon wrt to libvirt patches, and perhaps more that we ought to make decisions on. For the benefit of people sending patches I reckon its worth writing these down. So I'm attaching a proposed doc 'HACKING' in which we can detail the guidelines. And yes, we don't uniformly comply with these guidelines in all places....all the more reason to list them & fix cases where we don't comply :-) Thoughts.. ? Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

4 8

[Libvir] RFC: PATCH 0/5: asynchronous background jobs
by Daniel P. Berrange 14 Jan '08

14 Jan '08

We currently have a restriction that virConnectPtr objects must only be used by a single thread. At the same time we have a number of operations that can take a very long time. This means that applications are pretty much forced to use multi-threading if they want to continue to respond to user input, and thus are also forced to use multiple virConnectPtr objects. This is sub-optimal because opening multiple virConnectPtr objects may well result in the user being prompted for auth credentials multiple times. It also doesn't provide any way of providing progess information on the long running jobs, nor a way to cancel them. Thus the following series of patches introduces the concept of an 'asynchronous background job', represented by a virJobPtr object in the libvirt public API. A job has an elapsed time, and may optionally include an estimated time of completion. If it is a job with a bounded amount of work, it will also have a percentage completion counter. There is the ability to request cancellation of an in progress job, and fetch any error associated with a completed job. The primary reason I implemented this support, is that the storage APIs will make the current situation untennable. Allocating storage can take a seriously long time (many many minutes if cloning multi-GB files). This absolutely requires progress information and an ability to cancel an operation. There are a number of existing APIs which can benefit from this, hence I decided to work on this separately from the main storage APIs. The APIs which can make use of this are virDomainCreateLinux, virDomainCreate, virNetworkCreate, virNetworkCreateXML, virDomainSave, virDomainRestore, and virDomainDumpCore. For all of these we add a second variant postfixed with 'Job' in the name, returning a virJobPtr object This work isn't finished, but I wanted to put these patches out for comment before going further. In particular I need to figure out how to hook this up to the remote driver and daemon, and deal with a few lifecycle issues. eg what todo if a virConnectPtr object is released while a background job is active. With all 5 patches applied you should be able to run the following test case: virsh --connect test:///default save --verbose test foo No other drivers / commands are hooked up aside from 'save' in the 'test' driver. Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

3 16

[Libvir] [PATCH] examples.xml: Regenerate, now that *.c file names are sorted
by Jim Meyering 14 Jan '08

14 Jan '08

I ran "make distcheck" and noticed these changes in generated-and-version-controlled files: * docs/examples/examples.xml: Regenerate, now that *.c file names are sorted. Signed-off-by: Jim Meyering <meyering(a)redhat.com> --- docs/examples/.cvsignore | 2 +- docs/examples/examples.xml | 50 ++++++++++++++++++++++---------------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/docs/examples/.cvsignore b/docs/examples/.cvsignore index aa743cb..5f0e251 100644 --- a/docs/examples/.cvsignore +++ b/docs/examples/.cvsignore @@ -3,5 +3,5 @@ Makefile.in Makefile .deps .libs -suspend info1 +suspend diff --git a/docs/examples/examples.xml b/docs/examples/examples.xml index af7d4b9..5e54567 100644 --- a/docs/examples/examples.xml +++ b/docs/examples/examples.xml @@ -1,4 +1,23 @@ <examples> + <example filename='info1.c'> + <synopsis>Extract informations about Xen domain 0</synopsis> + <purpose>Demonstrate the basic use of the library to connect to the hypervisor and extract domain informations.</purpose> + <usage>info1</usage> + <test>info1</test> + <author>Daniel Veillard</author> + <copy>see Copyright for the status of this software. </copy> + <section>Informations</section> + <includes> + </includes> + <uses> + <function line='43' file='libvirt' name='virDomainGetInfo'/> + <function line='53' file='libvirt' name='virDomainFree'/> + <function line='36' file='libvirt' name='virDomainLookupByID'/> + <function line='55' file='libvirt' name='virConnectClose'/> + <struct line='25' file='libvirt' name='virDomainInfo'/> + <function line='29' file='libvirt' name='virConnectOpenReadOnly'/> + </uses> + </example> <example filename='suspend.c'> <synopsis>Suspend a domain and then resume its execution</synopsis> <purpose>Demonstrate the basic use of the library to suspend and resume a domain. If no id is given on the command line this script will suspend and resume the first domain found which is not Domain 0.</purpose> @@ -21,52 +40,33 @@ <function line='100' file='libvirt' name='virConnectOpenReadOnly'/> </uses> </example> - <example filename='info1.c'> - <synopsis>Extract informations about Xen domain 0</synopsis> - <purpose>Demonstrate the basic use of the library to connect to the hypervisor and extract domain informations.</purpose> - <usage>info1</usage> - <test>info1</test> - <author>Daniel Veillard</author> - <copy>see Copyright for the status of this software. </copy> - <section>Informations</section> - <includes> - </includes> - <uses> - <function line='43' file='libvirt' name='virDomainGetInfo'/> - <function line='53' file='libvirt' name='virDomainFree'/> - <function line='36' file='libvirt' name='virDomainLookupByID'/> - <function line='55' file='libvirt' name='virConnectClose'/> - <struct line='25' file='libvirt' name='virDomainInfo'/> - <function line='29' file='libvirt' name='virConnectOpenReadOnly'/> - </uses> - </example> <symbols> <symbol name='virConnectClose'> - <ref filename='suspend.c'/> <ref filename='info1.c'/> + <ref filename='suspend.c'/> </symbol> <symbol name='virConnectListDomains'> <ref filename='suspend.c'/> </symbol> <symbol name='virConnectOpenReadOnly'> - <ref filename='suspend.c'/> <ref filename='info1.c'/> + <ref filename='suspend.c'/> </symbol> <symbol name='virDomainFree'> - <ref filename='suspend.c'/> <ref filename='info1.c'/> + <ref filename='suspend.c'/> </symbol> <symbol name='virDomainGetInfo'> - <ref filename='suspend.c'/> <ref filename='info1.c'/> + <ref filename='suspend.c'/> </symbol> <symbol name='virDomainInfo'> - <ref filename='suspend.c'/> <ref filename='info1.c'/> + <ref filename='suspend.c'/> </symbol> <symbol name='virDomainLookupByID'> - <ref filename='suspend.c'/> <ref filename='info1.c'/> + <ref filename='suspend.c'/> </symbol> <symbol name='virDomainResume'> <ref filename='suspend.c'/> -- 1.5.4.rc1.11.gd2f82

3 2

[Libvir] [PATCH] Clean up global name space in examples and tests.
by Jim Meyering 14 Jan '08

14 Jan '08

These don't really matter, other than to remove false-positives if/when we ever automate checks for unnecessarily-global symbols. Clean up global name space in examples and tests. * docs/examples/suspend.c: Declare global "conn" to be static. * tests/qemuxml2argvtest.c: Declare global "driver" to be static. * tests/qemuxml2xmltest.c: Likewise. diff --git a/docs/examples/suspend.c b/docs/examples/suspend.c index 80e4da7..9ca6299 100644 --- a/docs/examples/suspend.c +++ b/docs/examples/suspend.c @@ -15,7 +15,7 @@ #include <stdio.h> #include <libvirt/libvirt.h> -virConnectPtr conn = NULL; /* the hypervisor connection */ +static virConnectPtr conn = NULL; /* the hypervisor connection */ /** * checkDomainState: diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index d4e39b2..22e2e81 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -16,7 +16,7 @@ static char *progname; static char *abs_top_srcdir; -struct qemud_driver driver; +static struct qemud_driver driver; #define MAX_FILE 4096 diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index c42e6fb..2ab1696 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -16,7 +16,7 @@ static char *progname; static char *abs_top_srcdir; -struct qemud_driver driver; +static struct qemud_driver driver; #define MAX_FILE 4096 -- 1.5.4.rc1.11.gd2f82

3 2

[Libvir] [PATCH] Clean up the global name space.
by Jim Meyering 14 Jan '08

14 Jan '08

After mentioning "avoid global variables" as a potential addition to HACKING, I did some quick tests and spotted a few that are easy to eliminate. This is useful even if we don't end up automating the check: Clean up the global name space. * src/qemu_conf.c: Add "static" and "const" attributes to some globals. * src/qemu_conf.h: Update a declaration. * src/qemu_driver.c (qemud_driver): Declare static. diff --git a/src/qemu_conf.c b/src/qemu_conf.c index 15779b7..d03d989 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -231,35 +231,35 @@ void qemudFreeVM(struct qemud_vm *vm) { /* The list of possible machine types for various architectures, as supported by QEMU - taken from 'qemu -M ?' for each arch */ -static const char *arch_info_x86_machines[] = { +static const char *const arch_info_x86_machines[] = { "pc", "isapc", NULL }; -static const char *arch_info_mips_machines[] = { +static const char *const arch_info_mips_machines[] = { "mips", NULL }; -static const char *arch_info_sparc_machines[] = { +static const char *const arch_info_sparc_machines[] = { "sun4m", NULL }; -static const char *arch_info_ppc_machines[] = { +static const char *const arch_info_ppc_machines[] = { "g3bw", "mac99", "prep", NULL }; /* Feature flags for the architecture info */ -struct qemu_feature_flags arch_info_i686_flags [] = { +static const struct qemu_feature_flags const arch_info_i686_flags [] = { { "pae", 1, 1 }, { "acpi", 1, 1 }, { "apic", 1, 0 }, { NULL, -1, -1 } }; -struct qemu_feature_flags arch_info_x86_64_flags [] = { +static const struct qemu_feature_flags const arch_info_x86_64_flags [] = { { "acpi", 1, 1 }, { "apic", 1, 0 }, { NULL, -1, -1 } }; /* The archicture tables for supported QEMU archs */ -struct qemu_arch_info qemudArchs[] = { +const struct qemu_arch_info const qemudArchs[] = { /* i686 must be in position 0 */ { "i686", 32, arch_info_x86_machines, "qemu", arch_info_i686_flags }, /* x86_64 must be in position 1 */ diff --git a/src/qemu_conf.h b/src/qemu_conf.h index 69342cb..e2c7514 100644 --- a/src/qemu_conf.h +++ b/src/qemu_conf.h @@ -426,11 +426,11 @@ struct qemu_feature_flags { struct qemu_arch_info { const char *arch; int wordsize; - const char **machines; + const char *const *machines; const char *binary; const struct qemu_feature_flags *fflags; }; -extern struct qemu_arch_info qemudArchs[]; +extern const struct qemu_arch_info const qemudArchs[]; #endif /* WITH_QEMU */ diff --git a/src/qemu_driver.c b/src/qemu_driver.c index c96fb45..dee6ba6 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -107,7 +107,7 @@ static int qemudShutdownNetworkDaemon(virConnectPtr conn, struct qemud_driver *driver, struct qemud_network *network); -struct qemud_driver *qemu_driver = NULL; +static struct qemud_driver *qemu_driver = NULL; static -- 1.5.4.rc1.11.gd2f82

3 2

Re: [Libvir] [patch 7/9] Add support for lokkit
by Richard W.M. Jones 14 Jan '08

14 Jan '08

+AC_ARG_ENABLE(iptables-lokkit, Just a minor nit here: My reading of the autoconf info page is that this should be a --with argument, not an --enable argument. [...] Optional Features: ... --enable-bar include bar Optional Packages: ... --with-foo use foo [...] 14.2 Working With External Software =================================== Some packages require, or can optionally use, other software packages that are already installed. The user can give `configure' command line options to specify which such external software to use. The options have one of these forms: --with-PACKAGE[=ARG] --without-PACKAGE [...] 14.3 Choosing Package Options ============================= If a software package has optional compile-time features, the user can give `configure' command line options to specify whether to compile them. The options have one of these forms: --enable-FEATURE[=ARG] --disable-FEATURE Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

4 4

[Libvir] [patch] qemu/kvm: use_system_powerdown instead of killing the vm hard
by Guido Guenther 14 Jan '08

14 Jan '08

Hi, currently domainShutdown kills qemu/kvm instances hard which is not very filesystem friendly. However recent kvm git acquired system_powerdown to shutdown the system gracefully by simulating an acpi power button press. We can now use this in libvirt: diff --git a/src/qemu_driver.c b/src/qemu_driver.c index f792eba..55adb18 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -1849,6 +1849,27 @@ static int qemudDomainResume(virDomainPtr dom) { } +static int qemudDomainShutdown(virDomainPtr dom) { + struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData; + struct qemud_vm *vm = qemudFindVMByID(driver, dom->id); + char* info; + + if (!vm) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN, + "no domain with matching id %d", dom->id); + return -1; + } + + if (qemudMonitorCommand(driver, vm, "system_powerdown", &info) < 0) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, + "shutdown operation failed"); + return -1; + } + return 0; + +} + + static int qemudDomainDestroy(virDomainPtr dom) { struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData; struct qemud_vm *vm = qemudFindVMByID(driver, dom->id); @@ -2855,7 +2876,7 @@ static virDriver qemuDriver = { qemudDomainLookupByName, /* domainLookupByName */ qemudDomainSuspend, /* domainSuspend */ qemudDomainResume, /* domainResume */ - qemudDomainDestroy, /* domainShutdown */ + qemudDomainShutdown, /* domainShutdown */ NULL, /* domainReboot */ qemudDomainDestroy, /* domainDestroy */ qemudDomainGetOSType, /* domainGetOSType */ Please apply, -- Guido

4 14

[Libvir] Error compiling libvirt 0.4.0 on debian etch
by Solli Honorio 14 Jan '08

14 Jan '08

Hi, when I'm trying to compile the libvirt 0.4.0 on Debian etch I'm getting the error below, I have no problem with version 0.3.3. I've look at line 578 of /usr/include/xen/xen.h and this error don't make sense for me. Does any anyone had this problem on debian etch too ? Maybe someone can help-me with this error ? Thanks for attention, Solli Honorio <error> .... In file included from /usr/include/xen/dom0_ops.h:31, from xen_unified.c:29: /usr/include/xen/xen.h:578: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'char' /usr/include/xen/xen.h:579: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'short' /usr/include/xen/xen.h:580: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'int' /usr/include/xen/xen.h:581: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'long' make[2]: *** [libvirt_la-xen_unified.lo] Error 1 make[2]: Leaving directory `/usr/src/libvirt-0.4.0/src' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/usr/src/libvirt-0.4.0' make: *** [all] Error 2 </error>

2 1

[Libvir] [patch 1/1] Reduce the number of times lokkit is run
by Mark McLoughlin 14 Jan '08

14 Jan '08

plain text document attachment (libvirt-iptables-save-rules.patch) With --enable-iptables-lokkit, the rules are saved to disk and lokkit --custom-rules is run each time a single rule is added or removed. This patch moves this code into a new iptablesSaveRules() function so that we can do it for all rules at once. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/src/iptables.c =================================================================== --- libvirt.orig/src/iptables.c 2008-01-04 15:30:31.000000000 +0000 +++ libvirt.orig/src/iptables.c 2008-01-04 15:30:31.000000000 +0000 @@ -282,6 +282,25 @@ writeRules(const char *path, #endif /* ENABLE_IPTABLES_LOKKIT */ static void +iptRulesSave(iptRules *rules) +{ +#ifdef ENABLE_IPTABLES_LOKKIT + int err; + + if ((err = writeRules(rules->path, rules->rules, rules->nrules))) { + qemudLog(QEMUD_WARN, "Failed to saves iptables rules to %s : %s", + rules->path, strerror(err)); + return; + } + + if (rules->nrules > 0) + notifyRulesUpdated(rules->table, rules->path); + else + notifyRulesRemoved(rules->table, rules->path); +#endif /* ENABLE_IPTABLES_LOKKIT */ +} + +static void iptRuleFree(iptRule *rule) { if (rule->rule) @@ -321,20 +340,6 @@ iptRulesAppend(iptRules *rules, rules->nrules++; -#ifdef ENABLE_IPTABLES_LOKKIT - { - int err; - - if ((err = virFileMakePath(rules->dir))) - return err; - - if ((err = writeRules(rules->path, rules->rules, rules->nrules))) - return err; - } - - notifyRulesUpdated(rules->table, rules->path); -#endif /* ENABLE_IPTABLES_LOKKIT */ - return 0; } @@ -359,20 +364,6 @@ iptRulesRemove(iptRules *rules, rules->nrules--; -#ifdef ENABLE_IPTABLES_LOKKIT - { - int err; - - if ((err = writeRules(rules->path, rules->rules, rules->nrules))) - return err; - } - - if (rules->nrules > 0) - notifyRulesUpdated(rules->table, rules->path); - else - notifyRulesRemoved(rules->table, rules->path); -#endif /* ENABLE_IPTABLES_LOKKIT */ - return 0; } @@ -658,6 +649,22 @@ iptablesContextFree(iptablesContext *ctx free(ctx); } +/** + * iptablesSaveRules: + * @ctx: pointer to the IP table context + * + * Saves all the IP table rules associated with a context + * to disk so that if iptables is restarted, the rules + * will automatically be reload. + */ +void +iptablesSaveRules(iptablesContext *ctx) +{ + iptRulesSave(ctx->input_filter); + iptRulesSave(ctx->forward_filter); + iptRulesSave(ctx->nat_postrouting); +} + static void iptRulesReload(iptRules *rules) { Index: libvirt/src/iptables.h =================================================================== --- libvirt.orig/src/iptables.h 2007-12-13 09:05:31.000000000 +0000 +++ libvirt.orig/src/iptables.h 2007-12-13 09:05:31.000000000 +0000 @@ -29,6 +29,7 @@ typedef struct _iptablesContext iptables iptablesContext *iptablesContextNew (void); void iptablesContextFree (iptablesContext *ctx); +void iptablesSaveRules (iptablesContext *ctx); void iptablesReloadRules (iptablesContext *ctx); int iptablesAddTcpInput (iptablesContext *ctx, Index: libvirt/src/qemu_driver.c =================================================================== --- libvirt.orig/src/qemu_driver.c 2007-12-13 09:05:31.000000000 +0000 +++ libvirt.orig/src/qemu_driver.c 2007-12-13 09:05:31.000000000 +0000 @@ -1009,8 +1009,10 @@ qemudAddIptablesRules(virConnectPtr conn /* The remaining rules are only needed for IP forwarding */ - if (!network->def->forward) + if (!network->def->forward) { + iptablesSaveRules(driver->iptables); return 1; + } /* allow forwarding packets from the bridge interface */ if ((err = iptablesAddForwardAllowOut(driver->iptables, @@ -1044,6 +1046,8 @@ qemudAddIptablesRules(virConnectPtr conn goto err10; } + iptablesSaveRules(driver->iptables); + return 1; err10: @@ -1100,6 +1104,7 @@ qemudRemoveIptablesRules(struct qemud_dr iptablesRemoveTcpInput(driver->iptables, network->bridge, 53); iptablesRemoveUdpInput(driver->iptables, network->bridge, 67); iptablesRemoveTcpInput(driver->iptables, network->bridge, 67); + iptablesSaveRules(driver->iptables); } static int --

3 2

[Libvir] PATCH: BZ 427107: fix crash wrt auth callback
by Daniel P. Berrange 14 Jan '08

14 Jan '08

If the application does not supply an authentication callback, and tries to connect to a server with PolicyKit auth turned on it will try to deference a NULL pointer with predictably crashtastic results: https://bugzilla.redhat.com/show_bug.cgi?id=427107 This patch has been tested by bug reporter to fix the issue Index: src/remote_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/remote_internal.c,v retrieving revision 1.49 diff -u -p -r1.49 remote_internal.c --- src/remote_internal.c 17 Dec 2007 17:41:02 -0000 1.49 +++ src/remote_internal.c 31 Dec 2007 20:30:19 -0000 @@ -3347,24 +3347,26 @@ remoteAuthPolkit (virConnectPtr conn, st }; remoteDebug(priv, "Client initialize PolicyKit authentication"); - for (i = 0 ; i < auth->ncredtype ; i++) { - if (auth->credtype[i] == VIR_CRED_EXTERNAL) - allowcb = 1; - } + if (auth && auth->cb) { + /* Check if the neccessary credential type for PolicyKit is supported */ + for (i = 0 ; i < auth->ncredtype ; i++) { + if (auth->credtype[i] == VIR_CRED_EXTERNAL) + allowcb = 1; + } - /* Run the authentication callback */ - if (allowcb) { - if (auth && auth->cb && - (*(auth->cb))(&cred, 1, auth->cbdata) < 0) { - __virRaiseError (in_open ? NULL : conn, NULL, NULL, VIR_FROM_REMOTE, - VIR_ERR_AUTH_FAILED, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, - "Failed to collect auth credentials"); - return -1; + if (allowcb) { + /* Run the authentication callback */ + if ((*(auth->cb))(&cred, 1, auth->cbdata) < 0) { + __virRaiseError (in_open ? NULL : conn, NULL, NULL, VIR_FROM_REMOTE, + VIR_ERR_AUTH_FAILED, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, + "Failed to collect auth credentials"); + return -1; + } } else { - remoteDebug(priv, "No auth callback provided for PolicyKit"); + remoteDebug(priv, "Client auth callback does not support PolicyKit"); } } else { - remoteDebug(priv, "Client auth callback does not support PolicyKit"); + remoteDebug(priv, "No auth callback provided"); } memset (&ret, 0, sizeof ret); Regards, Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

3 6

[Libvir] VMC - Virtual Machine Console
by Meng Kuan 14 Jan '08

14 Jan '08

Greetings, I would like to announce the availability of VMC (Virtual Machine Console). VMC is an attempt to provide an opensource, web-based VM management infrastructure. It uses libvirt as the underlying library to manage para-virtualized Xen VMs. You can find out more on our "Introduction to VMC" page: http://www.sxven.com/vmc List of current features and future plans: http://www.sxven.com/vmc/features To get started, we have made available a "VMC Install" document: http://www.sxven.com/vmc/gettingstarted We invite people to take a look at VMC and tell us what you like and what you don't like. If you have any problems, questions or suggestions please feel free to contact us at dev(a)sxven.com or post them on our forum: http://forum.sxven.com/ Best regards, Meng Kuan

1 0

Re: [Libvir] [patch 0/9] Add support for Fedora lokkit's --custom-rules option
by Mark McLoughlin 10 Jan '08

10 Jan '08

Hey, Sounds like this series is good to commit, but just to be clear: 1) Need Dan's virRun() and virReadFile() patches in first 2) Patch 5/9 wasn't ACK-ed 3) Also need ACKs for the "use virRun()" and "add --enable-iptables-lokkit=check" patches Cheers, Mark.

3 6

[Libvir] [PATCH] an irregular value is set as 'CPU Affinity' by virsh vcpupin
by Saori Fukuta 09 Jan '08

09 Jan '08

Hi, There is a difference between 'CPU Affinity' of 'virsh vcpuinfo' and 'CPU Affinity' of 'xm vcpu-list' when I set the vcpu affinity by 'virsh vcpupin'. i.e. 'xm vcpu-list' shows wrong value. But there is no difference between them when I set by 'xm vcpu-pin'. (a) set by 'virsh vcpupin' # virsh vcpupin guest_dom 0 1 # virsh vcpuinfo guest_dom VCPU: 0 CPU: 1 State: blocked CPU time: 17.1s CPU Affinity: -y------ # xm vcpu-list guest_dom Name ID VCPUs CPU State Time(s) CPU Affinity guest_dom 13 0 1 -b- 17.1 any cpu (b) set by 'xm vcpu-pin' # xm vcpu-pin guest_dom 0 0 # virsh vcpuinfo guest_dom VCPU: 0 CPU: 0 State: blocked CPU time: 17.1s CPU Affinity: y------- # xm vcpu-list guest_dom Name ID VCPUs CPU State Time(s) CPU Affinity guest_dom 13 0 0 -b- 17.1 0 I guess that the allocated memory to cpumap must be 8-byte for Xen because "xc_vcpu_setaffinity(a)libxc/xc_domain.c" is using uint64_t as cpumap. But the libvirt is allocating only maplen size for cpumap. virsh +--- cpumaplen ---+ (more than 1-byte) xen +----------------- 8-byte -----------------+ (uint64_t) Then, an irregular value is set to the buffer that is more than the number of physical CPU, because libvirt initialize maplen size only (i.e. not initialize 8-byte buffer). So, I changed the size of cpumap and the value of nr_cpus at xen_internal.c. Regards, Saori Fukuta

2 2

Re: [Libvir] [patch 6/9] Move iptablesSpawn()
by Daniel P. Berrange 09 Jan '08

09 Jan '08

On Fri, Jan 04, 2008 at 03:57:31PM +0000, Mark McLoughlin wrote: > The next patch requires iptablesSpawn() higher up in > the file. This patch just moves the code around; there > is no functional change. The util.c file has a virExec function, although its a little more cumbersome to use than iptablesSpawn. So for the storage APIs I've got a new virRun() function in util.c which is very similar to your iptablesSpawn code. How about we just make iptables use the virRun method in the attached patch ? diff -r a0ae4f87480b src/util.c --- a/src/util.c Thu Dec 06 15:35:43 2007 -0500 +++ b/src/util.c Thu Dec 06 15:39:34 2007 -0500 @@ -34,6 +34,7 @@ #include <errno.h> #include <sys/types.h> #include <sys/stat.h> +#include <sys/wait.h> #include <string.h> #include "libvirt/virterror.h" @@ -196,6 +197,43 @@ virExecNonBlock(virConnectPtr conn, int *retpid, int infd, int *outfd, int *errfd) { return(_virExec(conn, argv, retpid, infd, outfd, errfd, 1)); +} + +/** + * @conn connection to report errors against + * @argv NULL terminated argv to run + * @status optional variable to return exit status in + * + * Run a command without using the shell. + * + * If status is NULL, then return 0 if the command run and + * exited with 0 status; Otherwise return -1 + * + * If status is not-NULL, then return 0 if the command ran. + * The status variable is filled with the command exit status + * and should be checked by caller for success. Return -1 + * only if the command could not be run. + */ +int +virRun(virConnectPtr conn, + char **argv, + int *status) { + int childpid, exitstatus, ret; + + if ((ret = virExec(conn, argv, &childpid, -1, NULL, NULL)) < 0) + return ret; + + while ((ret = waitpid(childpid, &exitstatus, 0) == -1) && errno == EINTR); + if (ret == -1) + return -1; + + if (status == NULL) { + errno = EINVAL; + return (WIFEXITED(exitstatus) && WEXITSTATUS(exitstatus) == 0) ? 0 : -1; + } else { + *status = exitstatus; + return 0; + } } /* Like read(), but restarts after EINTR */ diff -r a0ae4f87480b src/util.h --- a/src/util.h Thu Dec 06 15:35:43 2007 -0500 +++ b/src/util.h Thu Dec 06 15:39:34 2007 -0500 @@ -28,6 +28,7 @@ int virExec(virConnectPtr conn, char **argv, int *retpid, int infd, int *outfd, int *errfd); int virExecNonBlock(virConnectPtr conn, char **argv, int *retpid, int infd, int *outfd, int *errfd); +int virRun(virConnectPtr conn, char **argv, int *status); int saferead(int fd, void *buf, size_t count); ssize_t safewrite(int fd, const void *buf, size_t count); Regards, Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

3 3

Re: [Libvir] [patch 1/2] Do not try and delete built-in iptables chains
by Daniel P. Berrange 08 Jan '08

08 Jan '08

On Mon, Jan 07, 2008 at 06:12:37PM +0000, Mark McLoughlin wrote: > Previously, when we supported adding our rules to chains > with a custom prefix (e.g. libvirt-Fedora-POSTROUTING) > we needed to be able to handle adding and deleting these > custom chains. > > Now that we only use built-in iptables chains, we don't > need to add or delete them - in fact, deleting them is > not allowed. ACK Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

1 0

Re: [Libvir] [patch 2/2] Enable stdout/stderr spew with --enable-debug
by Daniel P. Berrange 08 Jan '08

08 Jan '08

On Mon, Jan 07, 2008 at 06:12:38PM +0000, Mark McLoughlin wrote: > Change virExec() such that with --enable-debug, stdout > and stderr no longer go to /dev/null. ACK Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

1 0

[Libvir] PATCH: BZ 426425: Fix truncated reading of config files
by Daniel P. Berrange 08 Jan '08

08 Jan '08

The virConfReadFile API has a fixed 4096 byte buffer it reads the config file into, regardless of the config file size and silently drops any data exceeding this. This manifested itself in the 0.4.0 release by the fact that toggling the 'auth_unix_ro' config param from 'polkit' to 'none' had no effect at all. It turns out that with the user friendly verbose comments I added to the config file /etc/libvirt/libvirtd.cofn, the 'auth_unix_ro' param occurred beyond the 4096 byte mark in the file and was thus never read. In fixing this I decided to make virConfReadFile call to the recently added virFileReadAll() method. Except the latter takes a pre-allocated buffer as its input. So I've switched virFileReadAll() to pass in a char **, and auto-allocate the file as needed. As a sanity check there is also a 'maxlen' param to stop it reading stupidly huge files - for reading large files virFileReadll() shouldn't be used - they should be read incrementally. Finally, also added a larger test data file to trap this error case src/conf.c | 27 ++--- src/qemu_conf.c | 6 - src/util.c | 22 ++-- src/util.h | 4 tests/confdata/libvirtd.conf | 222 +++++++++++++++++++++++++++++++++++++++++++ tests/confdata/libvirtd.out | 180 ++++++++++++++++++++++++++++++++++ tests/test_conf.sh | 3 7 files changed, 441 insertions(+), 23 deletions(-) Index: src/conf.c =================================================================== RCS file: /data/cvs/libvirt/src/conf.c,v retrieving revision 1.15 diff -u -p -u -p -r1.15 conf.c --- src/conf.c 11 Dec 2007 21:57:29 -0000 1.15 +++ src/conf.c 3 Jan 2008 18:58:47 -0000 @@ -21,6 +21,7 @@ #include "internal.h" #include "buf.h" #include "conf.h" +#include "util.h" /************************************************************************ * * @@ -693,6 +694,9 @@ error: * * ************************************************************************/ +/* 10 MB limit on config file size as a sanity check */ +#define MAX_CONFIG_FILE_SIZE (1024*1024*10) + /** * __virConfReadFile: * @filename: the path to the configuration file. @@ -705,26 +709,25 @@ error: virConfPtr __virConfReadFile(const char *filename) { - char content[4096]; - int fd; + char *content; int len; + virConfPtr conf; if (filename == NULL) { virConfError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__, 0); return(NULL); } - fd = open(filename, O_RDONLY); - if (fd < 0) { + + if ((len = virFileReadAll(filename, MAX_CONFIG_FILE_SIZE, &content)) < 0) { virConfError(NULL, VIR_ERR_OPEN_FAILED, filename, 0); - return(NULL); + return NULL; } - len = read(fd, content, sizeof(content)); - close(fd); - if (len <= 0) { - virConfError(NULL, VIR_ERR_READ_FAILED, filename, 0); - return(NULL); - } - return(virConfParse(filename, content, len)); + + conf = virConfParse(filename, content, len); + + free(content); + + return conf; } /** Index: src/qemu_conf.c =================================================================== RCS file: /data/cvs/libvirt/src/qemu_conf.c,v retrieving revision 1.24 diff -u -p -u -p -r1.24 qemu_conf.c --- src/qemu_conf.c 11 Dec 2007 21:57:29 -0000 1.24 +++ src/qemu_conf.c 3 Jan 2008 18:58:48 -0000 @@ -2604,7 +2604,7 @@ int qemudScanConfigDir(struct qemud_driv } while ((entry = readdir(dir))) { - char xml[QEMUD_MAX_XML_LEN]; + char *xml; char path[PATH_MAX]; char autostartLink[PATH_MAX]; @@ -2626,13 +2626,15 @@ int qemudScanConfigDir(struct qemud_driv continue; } - if (virFileReadAll(path, xml, QEMUD_MAX_XML_LEN) < 0) + if (virFileReadAll(path, QEMUD_MAX_XML_LEN, &xml) < 0) continue; if (isGuest) qemudLoadConfig(driver, entry->d_name, path, xml, autostartLink); else qemudLoadNetworkConfig(driver, entry->d_name, path, xml, autostartLink); + + free(xml); } closedir(dir); Index: src/util.c =================================================================== RCS file: /data/cvs/libvirt/src/util.c,v retrieving revision 1.10 diff -u -p -u -p -r1.10 util.c --- src/util.c 7 Dec 2007 14:45:39 -0000 1.10 +++ src/util.c 3 Jan 2008 18:58:48 -0000 @@ -272,8 +272,8 @@ ssize_t safewrite(int fd, const void *bu int virFileReadAll(const char *path, - char *buf, - unsigned int buflen) + int maxlen, + char **buf) { FILE *fh; struct stat st; @@ -296,20 +296,28 @@ int virFileReadAll(const char *path, goto error; } - if (st.st_size >= (buflen-1)) { - virLog("File '%s' is too large", path); + if (st.st_size > maxlen) { + virLog("File '%s' is too large %d, max %d", path, st.st_size, maxlen); goto error; } - if ((ret = fread(buf, st.st_size, 1, fh)) != 1) { + *buf = malloc(st.st_size + 1); + if (*buf == NULL) { + virLog("Failed to allocate data"); + goto error; + } + + if ((ret = fread(*buf, st.st_size, 1, fh)) != 1) { + free(buf); + buf = NULL; virLog("Failed to read config file '%s': %s", path, strerror(errno)); goto error; } - buf[st.st_size] = '\0'; + (*buf)[st.st_size] = '\0'; - ret = 0; + ret = st.st_size; error: if (fh) Index: src/util.h =================================================================== RCS file: /data/cvs/libvirt/src/util.h,v retrieving revision 1.4 diff -u -p -u -p -r1.4 util.h --- src/util.h 3 Dec 2007 14:30:47 -0000 1.4 +++ src/util.h 3 Jan 2008 18:58:48 -0000 @@ -33,8 +33,8 @@ int saferead(int fd, void *buf, size_t c ssize_t safewrite(int fd, const void *buf, size_t count); int virFileReadAll(const char *path, - char *buf, - unsigned int buflen); + int maxlen, + char **buf); int virFileMatchesNameSuffix(const char *file, const char *name, Index: tests/test_conf.sh =================================================================== RCS file: /data/cvs/libvirt/tests/test_conf.sh,v retrieving revision 1.2 diff -u -p -u -p -r1.2 test_conf.sh --- tests/test_conf.sh 14 Nov 2007 10:35:59 -0000 1.2 +++ tests/test_conf.sh 3 Jan 2008 18:58:48 -0000 @@ -8,6 +8,9 @@ do diff $outfile conftest.$$ > /dev/null if [ $? != 0 ] then + if [ -n "$DEBUG_TESTS" ]; then + diff -u $outfile conftest.$$ + fi echo "$f FAILED" NOK=1 else Index: tests/confdata/libvirtd.conf =================================================================== RCS file: tests/confdata/libvirtd.conf diff -N tests/confdata/libvirtd.conf --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tests/confdata/libvirtd.conf 3 Jan 2008 18:58:48 -0000 @@ -0,0 +1,222 @@ +# Master libvirt daemon configuration file +# +# For further information consult http://libvirt.org/format.html + + +################################################################# +# +# Network connectivitiy controls +# + +# Flag listening for secure TLS connections on the public TCP/IP port. +# NB, must pass the --listen flag to the libvirtd process for this to +# have any effect. +# +# It is neccessary to setup a CA and issue server certificates before +# using this capability. +# +# This is enabled by default, uncomment this to disable it +listen_tls = 0 + +# Listen for unencrypted TCP connections on the public TCP/IP port. +# NB, must pass the --listen flag to the libvirtd process for this to +# have any effect. +# +# Using the TCP socket requires SASL authentication by default. Only +# SASL mechanisms which support data encryption are allowed. This is +# DIGEST_MD5 and GSSAPI (Kerberos5) +# +# This is disabled by default, uncomment this to enable it. +listen_tcp = 1 + + + +# Override the port for accepting secure TLS connections +# This can be a port number, or service name +# +tls_port = "16514" + +# Override the port for accepting insecure TCP connections +# This can be a port number, or service name +# +tcp_port = "16509" + + + +# Flag toggling mDNS advertizement of the libvirt service. +# +# Alternatively can disable for all services on a host by +# stopping the Avahi daemon +# +# This is enabled by default, uncomment this to disable it +mdns_adv = 0 + +# Override the default mDNS advertizement name. This must be +# unique on the immediate broadcast network. +# +# The default is "Virtualization Host HOSTNAME", where HOSTNAME +# is subsituted for the short hostname of the machine (without domain) +# +mdns_name = "Virtualization Host Joe Demo" + + +################################################################# +# +# UNIX socket access controls +# + +# Set the UNIX domain socket group ownership. This can be used to +# allow a 'trusted' set of users access to management capabilities +# without becoming root. +# +# This is restricted to 'root' by default. +unix_sock_group = "libvirt" + +# Set the UNIX socket permissions for the R/O socket. This is used +# for monitoring VM status only +# +# Default allows any user. If setting group ownership may want to +# restrict this to: +unix_sock_ro_perms = "0777" + +# Set the UNIX socket permissions for the R/W socket. This is used +# for full management of VMs +# +# Default allows only root. If PolicyKit is enabled on the socket, +# the default will change to allow everyone (eg, 0777) +# +# If not using PolicyKit and setting group ownership for access +# control then you may want to relax this to: +unix_sock_rw_perms = "0770" + + + +################################################################# +# +# Authentication. +# +# - none: do not perform auth checks. If you can connect to the +# socket you are allowed. This is suitable if there are +# restrictions on connecting to the socket (eg, UNIX +# socket permissions), or if there is a lower layer in +# the network providing auth (eg, TLS/x509 certificates) +# +# - sasl: use SASL infrastructure. The actual auth scheme is then +# controlled from /etc/sasl2/libvirt.conf. For the TCP +# socket only GSSAPI & DIGEST-MD5 mechanisms will be used. +# For non-TCP or TLS sockets, any scheme is allowed. +# +# - polkit: use PolicyKit to authenticate. This is only suitable +# for use on the UNIX sockets. The default policy will +# require a user to supply their own password to gain +# full read/write access (aka sudo like), while anyone +# is allowed read/only access. +# +# Set an authentication scheme for UNIX read-only sockets +# By default socket permissions allow anyone to connect +# +# To restrict monitoring of domains you may wish to enable +# an authentication mechanism here +auth_unix_ro = "none" + +# Set an authentication scheme for UNIX read-write sockets +# By default socket permissions only allow root. If PolicyKit +# support was compiled into libvirt, the default will be to +# use 'polkit' auth. +# +# If the unix_sock_rw_perms are changed you may wish to enable +# an authentication mechanism here +auth_unix_rw = "none" + +# Change the authentication scheme for TCP sockets. +# +# If you don't enable SASL, then all TCP traffic is cleartext. +# Don't do this outside of a dev/test scenario. For real world +# use, always enable SASL and use the GSSAPI or DIGEST-MD5 +# mechanism in /etc/sasl2/libvirt.conf +auth_tcp = "sasl" + +# Change the authentication scheme for TLS sockets. +# +# TLS sockets already have encryption provided by the TLS +# layer, and limited authentication is done by certificates +# +# It is possible to make use of any SASL authentication +# mechanism as well, by using 'sasl' for this option +auth_tls = "none" + + + +################################################################# +# +# TLS x509 certificate configuration +# + + +# Override the default server key file path +# +key_file = "/etc/pki/libvirt/private/serverkey.pem" + +# Override the default server certificate file path +# +cert_file = "/etc/pki/libvirt/servercert.pem" + +# Override the default CA certificate path +# +ca_file = "/etc/pki/CA/cacert.pem" + +# Specify a certificate revocation list. +# +# Defaults to not using a CRL, uncomment to enable it +crl_file = "/etc/pki/CA/crl.pem" + + + +################################################################# +# +# Authorization controls +# + + +# Flag to disable verification of client certificates +# +# Client certificate verification is the primary authentication mechanism. +# Any client which does not present a certificate signed by the CA +# will be rejected. +# +# Default is to always verify. Uncommenting this will disable +# verification - make sure an IP whitelist is set +tls_no_verify_certificate = 1 + + +# A whitelist of allowed x509 Distinguished Names +# This list may contain wildcards such as +# +# "C=GB,ST=London,L=London,O=Red Hat,CN=*" +# +# See the POSIX fnmatch function for the format of the wildcards. +# +# NB If this is an empty list, no client can connect, so comment out +# entirely rather than using empty list to disable these checks +# +# By default, no DN's are checked +tls_allowed_dn_list = ["DN1", "DN2"] + + +# A whitelist of allowed SASL usernames. The format for usernames +# depends on the SASL authentication mechanism. Kerberos usernames +# look like username@REALM +# +# This list may contain wildcards such as +# +# "*(a)EXAMPLE.COM" +# +# See the POSIX fnmatch function for the format of the wildcards. +# +# NB If this is an empty list, no client can connect, so comment out +# entirely rather than using empty list to disable these checks +# +# By default, no Username's are checked +sasl_allowed_username_list = ["joe(a)EXAMPLE.COM", "fred(a)EXAMPLE.COM" ] + + Index: tests/confdata/libvirtd.out =================================================================== RCS file: tests/confdata/libvirtd.out diff -N tests/confdata/libvirtd.out --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tests/confdata/libvirtd.out 3 Jan 2008 18:58:48 -0000 @@ -0,0 +1,180 @@ +# Master libvirt daemon configuration file +# +# For further information consult http://libvirt.org/format.html +################################################################# +# +# Network connectivitiy controls +# +# Flag listening for secure TLS connections on the public TCP/IP port. +# NB, must pass the --listen flag to the libvirtd process for this to +# have any effect. +# +# It is neccessary to setup a CA and issue server certificates before +# using this capability. +# +# This is enabled by default, uncomment this to disable it +listen_tls = 0 +# Listen for unencrypted TCP connections on the public TCP/IP port. +# NB, must pass the --listen flag to the libvirtd process for this to +# have any effect. +# +# Using the TCP socket requires SASL authentication by default. Only +# SASL mechanisms which support data encryption are allowed. This is +# DIGEST_MD5 and GSSAPI (Kerberos5) +# +# This is disabled by default, uncomment this to enable it. +listen_tcp = 1 +# Override the port for accepting secure TLS connections +# This can be a port number, or service name +# +tls_port = "16514" +# Override the port for accepting insecure TCP connections +# This can be a port number, or service name +# +tcp_port = "16509" +# Flag toggling mDNS advertizement of the libvirt service. +# +# Alternatively can disable for all services on a host by +# stopping the Avahi daemon +# +# This is enabled by default, uncomment this to disable it +mdns_adv = 0 +# Override the default mDNS advertizement name. This must be +# unique on the immediate broadcast network. +# +# The default is "Virtualization Host HOSTNAME", where HOSTNAME +# is subsituted for the short hostname of the machine (without domain) +# +mdns_name = "Virtualization Host Joe Demo" +################################################################# +# +# UNIX socket access controls +# +# Set the UNIX domain socket group ownership. This can be used to +# allow a 'trusted' set of users access to management capabilities +# without becoming root. +# +# This is restricted to 'root' by default. +unix_sock_group = "libvirt" +# Set the UNIX socket permissions for the R/O socket. This is used +# for monitoring VM status only +# +# Default allows any user. If setting group ownership may want to +# restrict this to: +unix_sock_ro_perms = "0777" +# Set the UNIX socket permissions for the R/W socket. This is used +# for full management of VMs +# +# Default allows only root. If PolicyKit is enabled on the socket, +# the default will change to allow everyone (eg, 0777) +# +# If not using PolicyKit and setting group ownership for access +# control then you may want to relax this to: +unix_sock_rw_perms = "0770" +################################################################# +# +# Authentication. +# +# - none: do not perform auth checks. If you can connect to the +# socket you are allowed. This is suitable if there are +# restrictions on connecting to the socket (eg, UNIX +# socket permissions), or if there is a lower layer in +# the network providing auth (eg, TLS/x509 certificates) +# +# - sasl: use SASL infrastructure. The actual auth scheme is then +# controlled from /etc/sasl2/libvirt.conf. For the TCP +# socket only GSSAPI & DIGEST-MD5 mechanisms will be used. +# For non-TCP or TLS sockets, any scheme is allowed. +# +# - polkit: use PolicyKit to authenticate. This is only suitable +# for use on the UNIX sockets. The default policy will +# require a user to supply their own password to gain +# full read/write access (aka sudo like), while anyone +# is allowed read/only access. +# +# Set an authentication scheme for UNIX read-only sockets +# By default socket permissions allow anyone to connect +# +# To restrict monitoring of domains you may wish to enable +# an authentication mechanism here +auth_unix_ro = "none" +# Set an authentication scheme for UNIX read-write sockets +# By default socket permissions only allow root. If PolicyKit +# support was compiled into libvirt, the default will be to +# use 'polkit' auth. +# +# If the unix_sock_rw_perms are changed you may wish to enable +# an authentication mechanism here +auth_unix_rw = "none" +# Change the authentication scheme for TCP sockets. +# +# If you don't enable SASL, then all TCP traffic is cleartext. +# Don't do this outside of a dev/test scenario. For real world +# use, always enable SASL and use the GSSAPI or DIGEST-MD5 +# mechanism in /etc/sasl2/libvirt.conf +auth_tcp = "sasl" +# Change the authentication scheme for TLS sockets. +# +# TLS sockets already have encryption provided by the TLS +# layer, and limited authentication is done by certificates +# +# It is possible to make use of any SASL authentication +# mechanism as well, by using 'sasl' for this option +auth_tls = "none" +################################################################# +# +# TLS x509 certificate configuration +# +# Override the default server key file path +# +key_file = "/etc/pki/libvirt/private/serverkey.pem" +# Override the default server certificate file path +# +cert_file = "/etc/pki/libvirt/servercert.pem" +# Override the default CA certificate path +# +ca_file = "/etc/pki/CA/cacert.pem" +# Specify a certificate revocation list. +# +# Defaults to not using a CRL, uncomment to enable it +crl_file = "/etc/pki/CA/crl.pem" +################################################################# +# +# Authorization controls +# +# Flag to disable verification of client certificates +# +# Client certificate verification is the primary authentication mechanism. +# Any client which does not present a certificate signed by the CA +# will be rejected. +# +# Default is to always verify. Uncommenting this will disable +# verification - make sure an IP whitelist is set +tls_no_verify_certificate = 1 +# A whitelist of allowed x509 Distinguished Names +# This list may contain wildcards such as +# +# "C=GB,ST=London,L=London,O=Red Hat,CN=*" +# +# See the POSIX fnmatch function for the format of the wildcards. +# +# NB If this is an empty list, no client can connect, so comment out +# entirely rather than using empty list to disable these checks +# +# By default, no DN's are checked +tls_allowed_dn_list = [ "DN1", "DN2" ] +# A whitelist of allowed SASL usernames. The format for usernames +# depends on the SASL authentication mechanism. Kerberos usernames +# look like username@REALM +# +# This list may contain wildcards such as +# +# "*(a)EXAMPLE.COM" +# +# See the POSIX fnmatch function for the format of the wildcards. +# +# NB If this is an empty list, no client can connect, so comment out +# entirely rather than using empty list to disable these checks +# +# By default, no Username's are checked +sasl_allowed_username_list = [ "joe(a)EXAMPLE.COM", "fred(a)EXAMPLE.COM" ] Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

3 5

[Libvir] [PATCH] Xen: Support cpu_weight and cpu_cap for Xen.
by Tatsuro Enokura 08 Jan '08

08 Jan '08

Hi, I set the information of cpu_weight/cpu_cap to configuration file or sxp format, and execute "virsh start". But the information of weight/cap is lost. libvirt doesn't support cpu_weight and cpu_cap for XML format. see also Bz#337591 https://bugzilla.redhat.com/show_bug.cgi?id=337591 I make a patch to add weight/cap attributes as vcpus element (eg. <vcpus weight='512' cap='280'>4</vcpus>) c.f. the thread at: https://www.redhat.com/archives/libvir-list/2007-October/msg00044.html Signed-off-by: Tatsuro Enokura <fj7716hz(a)aa.jp.fujitsu.com> Thanks, Tatsuro Enokura Index: libvirt/src/xend_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/xend_internal.c,v retrieving revision 1.151 diff -u -p -r1.151 xend_internal.c --- libvirt/src/xend_internal.c 22 Oct 2007 20:28:55 -0000 1.151 +++ libvirt/src/xend_internal.c 24 Oct 2007 06:02:27 -0000 @@ -1438,8 +1438,19 @@ xend_parse_sexp_desc(virConnectPtr conn, if ((cur_mem >= MIN_XEN_GUEST_SIZE) && (cur_mem != max_mem)) virBufferVSprintf(&buf, " <currentMemory>%d</currentMemory>\n", cur_mem); - virBufferVSprintf(&buf, " <vcpu>%d</vcpu>\n", + virBufferVSprintf(&buf, " <vcpu"); + if (sexpr_node(root, "domain/cpu_weight") != NULL) { + virBufferVSprintf(&buf, " weight='%d'", + sexpr_int(root, "domain/cpu_weight")); + } + if (sexpr_node(root, "domain/cpu_cap") != NULL) { + virBufferVSprintf(&buf, " cap='%d'", + sexpr_int(root, "domain/cpu_cap")); + } + virBufferVSprintf(&buf, ">%d</vcpu>\n", sexpr_int(root, "domain/vcpus")); + + tmp = sexpr_node(root, "domain/on_poweroff"); if (tmp != NULL) virBufferVSprintf(&buf, " <on_poweroff>%s</on_poweroff>\n", tmp); Index: libvirt/src/xm_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/xm_internal.c,v retrieving revision 1.41 diff -u -p -r1.41 xm_internal.c --- libvirt/src/xm_internal.c 10 Oct 2007 17:55:38 -0000 1.41 +++ libvirt/src/xm_internal.c 24 Oct 2007 06:02:28 -0000 @@ -661,9 +661,14 @@ char *xenXMDomainFormatXML(virConnectPtr virBufferVSprintf(buf, " <memory>%ld</memory>\n", val * 1024); + virBufferVSprintf(buf, " <vcpu"); + if (xenXMConfigGetInt(conf, "cpu_weight", &val) == 0) + virBufferVSprintf(buf, " weight='%ld'", val); + if (xenXMConfigGetInt(conf, "cpu_cap", &val) == 0) + virBufferVSprintf(buf, " cap='%ld'", val); if (xenXMConfigGetInt(conf, "vcpus", &val) < 0) val = 1; - virBufferVSprintf(buf, " <vcpu>%ld</vcpu>\n", val); + virBufferVSprintf(buf, ">%ld</vcpu>\n", val); if (xenXMConfigGetString(conf, "on_poweroff", &str) < 0) @@ -1820,6 +1825,12 @@ virConfPtr xenXMParseXMLToConfig(virConn if (xenXMConfigSetIntFromXPath(conn, conf, ctxt, "vcpus", "string(/domain/vcpu)", 0, 1, "cannot set vcpus config parameter") < 0) goto error; + if (xenXMConfigSetIntFromXPath(conn, conf, ctxt, "cpu_weight", "string(/domain/vcpu/@weight)", 0, 1, + "cannot set cpu_weight config paramerter") < 0) + goto error; + if (xenXMConfigSetIntFromXPath(conn, conf, ctxt, "cpu_cap", "string(/domain/vcpu/@cap)", 0, 1, + "cannot set cpu_cap config paramerter") < 0) + goto error; obj = xmlXPathEval(BAD_CAST "string(/domain/os/type)", ctxt); if ((obj != NULL) && (obj->type == XPATH_STRING) && Index: libvirt/src/xml.c =================================================================== RCS file: /data/cvs/libvirt/src/xml.c,v retrieving revision 1.94 diff -u -p -r1.94 xml.c --- libvirt/src/xml.c 23 Oct 2007 15:31:33 -0000 1.94 +++ libvirt/src/xml.c 24 Oct 2007 06:02:28 -0000 @@ -1529,6 +1529,12 @@ virDomainParseXMLDesc(virConnectPtr conn vcpus = (unsigned int) f; } virBufferVSprintf(&buf, "(vcpus %u)", vcpus); + if (virXPathNumber("number(/domain/vcpu[1]/@weight)", ctxt, &f) == 0) { + virBufferVSprintf(&buf, "(cpu_weight %ld)", (long) f); + } + if (virXPathNumber("number(/domain/vcpu[1]/@cap)", ctxt, &f) == 0) { + virBufferVSprintf(&buf, "(cpu_cap %ld)", (long) f); + } str = virXPathString("string(/domain/vcpu/@cpuset)", ctxt); if (str != NULL) {

6 11

[Libvir] OCaml bindings 0.4.0.1 released
by Richard W.M. Jones 08 Jan '08

08 Jan '08

I'm pleased to announce the latest release of the libvirt OCaml bindings and programs. http://libvirt.org/ocaml/ There's a large list of changes since the last release, so best thing is to refer to the Changelog itself: http://libvirt.org/ocaml/ChangeLog.txt Source code is available from here: http://libvirt.org/sources/ocaml/ Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

1 0

[Libvir] OCaml bindings - Windows installer
by Richard W.M. Jones 08 Jan '08

08 Jan '08

This is a Windows installer for the OCaml libvirt bindings and programs: http://libvirt.org/sources/ocaml/ocaml-libvirt-0.4.0.1.exe If someone has a 'virgin' Windows system and could test that the above installer works, particularly for Windows < Vista and for Windows which has not had any GTK/MinGW development tools installed. About 90% of the size of the installer is down to the GTK DLLs and configuration files which need to be carried along to support the GTK graphical program (Virt Control). It's possible that I haven't placed the GTK files in exactly the right place, so instead it is using my own GTK development environment. Screenshots showing the installer in action: http://annexia.org/tmp/wininstaller-1-desktop.png Desktop, nothing installed, showing the installer icon. http://annexia.org/tmp/wininstaller-2-packages.png List of required, recommended and optional subpackages. http://annexia.org/tmp/wininstaller-3-instpath.png Select the installation path. http://annexia.org/tmp/wininstaller-4-installdone.png Install complete. Notice the desktop icons, ... http://annexia.org/tmp/wininstaller-5-menu.png ... and the menu entries and uninstaller program. http://annexia.org/tmp/wininstaller-6-virtctrl.png Running Virt Control. http://annexia.org/tmp/wininstaller-7-uninstall.png After uninstall. Notice that the desktop icons have gone. The installer uses NSIS (the Nullsoft Scriptable Install System, http://nsis.sf.net/) and is reasonably well integrated into the autoconf / make build system. In particular if you are compiling under Windows and NSIS is installed, then a simple './configure --with-nsis; make wininstaller' will build a Windows installer. This is something to look at if libvirt wants/needs a Windows installer. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

1 0

Re: [Libvir] [patch 2/2] Enable stdout/stderr spew with --enable-debug
by Daniel Veillard 08 Jan '08

08 Jan '08

On Mon, Jan 07, 2008 at 06:12:38PM +0000, Mark McLoughlin wrote: > Change virExec() such that with --enable-debug, stdout > and stderr no longer go to /dev/null. > Looks fine to me, but I didn't see [1/2] numbering problem ? I didn't see any bounced mail in the list either, Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

2 1

[Libvir] [patch 2/2] Enable stdout/stderr spew with --enable-debug
by Mark McLoughlin 07 Jan '08

07 Jan '08

Change virExec() such that with --enable-debug, stdout and stderr no longer go to /dev/null. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/src/util.c =================================================================== --- libvirt.orig/src/util.c 2008-01-07 18:00:03.000000000 +0000 +++ libvirt.orig/src/util.c 2008-01-07 18:00:03.000000000 +0000 @@ -157,10 +157,17 @@ _virExec(virConnectPtr conn, if (dup2(infd >= 0 ? infd : null, STDIN_FILENO) < 0) _exit(1); +#ifndef ENABLE_DEBUG if (dup2(pipeout[1] > 0 ? pipeout[1] : null, STDOUT_FILENO) < 0) _exit(1); if (dup2(pipeerr[1] > 0 ? pipeerr[1] : null, STDERR_FILENO) < 0) _exit(1); +#else /* ENABLE_DEBUG */ + if (pipeout[1] > 0 && dup2(pipeout[1], STDOUT_FILENO) < 0) + _exit(1); + if (pipeerr[1] > 0 && dup2(pipeerr[1], STDERR_FILENO) < 0) + _exit(1); +#endif /* ENABLE_DEBUG */ close(null); if (pipeout[1] > 0) --

1 0

[Libvir] [patch 1/2] Do not try and delete built-in iptables chains
by Mark McLoughlin 07 Jan '08

07 Jan '08

Previously, when we supported adding our rules to chains with a custom prefix (e.g. libvirt-Fedora-POSTROUTING) we needed to be able to handle adding and deleting these custom chains. Now that we only use built-in iptables chains, we don't need to add or delete them - in fact, deleting them is not allowed. (Note: this was the only user of the iptablesSpawn(NO_ERRORS) stuff - we didn't want error spew when adding/deleting the chains failed as expected in most cases) Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/src/iptables.c =================================================================== --- libvirt.orig/src/iptables.c 2008-01-07 17:26:42.000000000 +0000 +++ libvirt.orig/src/iptables.c 2008-01-07 17:26:42.000000000 +0000 @@ -386,53 +386,6 @@ iptRulesNew(const char *table, return NULL; } -static int -iptablesAddRemoveChain(iptRules *rules, int action) -{ - char **argv; - int retval = ENOMEM; - int n, status; - - n = 1 + /* /sbin/iptables */ - 2 + /* --table foo */ - 2; /* --new-chain bar */ - - if (!(argv = calloc(n + 1, sizeof(*argv)))) - goto error; - - n = 0; - - if (!(argv[n++] = strdup(IPTABLES_PATH))) - goto error; - - if (!(argv[n++] = strdup("--table"))) - goto error; - - if (!(argv[n++] = strdup(rules->table))) - goto error; - - if (!(argv[n++] = strdup(action == ADD ? "--new-chain" : "--delete-chain"))) - goto error; - - if (!(argv[n++] = strdup(rules->chain))) - goto error; - - if (virRun(NULL, argv, &status) < 0) - retval = errno; - - retval = 0; - - error: - if (argv) { - n = 0; - while (argv[n]) - free(argv[n++]); - free(argv); - } - - return retval; -} - static char * argvToString(char **argv) { @@ -521,19 +474,11 @@ iptablesAddRemoveRule(iptRules *rules, i goto error; } - if (action == ADD && - (retval = iptablesAddRemoveChain(rules, action))) - goto error; - if (virRun(NULL, argv, NULL) < 0) { retval = errno; goto error; } - if (action == REMOVE && - (retval = iptablesAddRemoveChain(rules, action))) - goto error; - if (action == ADD) { retval = iptRulesAppend(rules, rule, argv, command_idx); rule = NULL; @@ -641,11 +586,6 @@ iptRulesReload(iptRules *rules) rule->argv[rule->command_idx] = orig; } - if ((retval = iptablesAddRemoveChain(rules, REMOVE)) || - (retval = iptablesAddRemoveChain(rules, ADD))) - qemudLog(QEMUD_WARN, "Failed to re-create chain '%s' in table '%s': %s", - rules->chain, rules->table, strerror(retval)); - for (i = 0; i < rules->nrules; i++) if (virRun(NULL, rules->rules[i].argv, NULL) < 0) qemudLog(QEMUD_WARN, "Failed to add iptables rule '%s' to chain '%s' in table '%s': %s", --

1 0

[Libvir] [patch 0/2] Couple more misc iptables related patches
by Mark McLoughlin 07 Jan '08

07 Jan '08

Hey, Dan's suggestion to enable debug spew from spawned processes with --enable-debug reminded me that the only reason I wanted the NO_ERRORS stuff in the iptables code was to avoid spewage when trying to add/delete builtin iptables chains. Cheers, Mark. --

1 0

Re: [Libvir] [patch 7/9] Add support for lokkit
by Daniel P. Berrange 07 Jan '08

07 Jan '08

On Fri, Jan 04, 2008 at 03:57:32PM +0000, Mark McLoughlin wrote: > Add support for integrating our iptables support with Fedora's > iptables configuration using the lokkit --custom-rules command. > > Basically, we write out our rules to /var/lib/libvirt/iptables > and run lokkit --custom-rules so that if e.g. iptables is > restarted or the user edits their firewall configuration, then > libvirt's rules get reloaded. Ahh, that's very nice to have. > +dnl > +dnl ensure that Fedora's system-config-firewall knows > +dnl about libvirt's iptables rules > +dnl > +AC_ARG_ENABLE(iptables-lokkit, > + AC_HELP_STRING([--enable-iptables-lokkit=no/yes], > + [enable registering libvirt's iptables rules with Fedora's lokkit]), > + [],[enable_iptables_lokkit=no]) > +if test x"$enable_iptables_lokkit" = x"yes"; then > + AC_DEFINE(ENABLE_IPTABLES_LOKKIT, [], [whether support for Fedora's lokkit is enabled]) > + AC_PATH_PROG(LOKKIT_PATH, lokkit, /usr/sbin/lokkit) > + AC_DEFINE_UNQUOTED(LOKKIT_PATH, "$LOKKIT_PATH", [path to lokkit binary]) > +fi > + Could we make the configure script a little more clever so that it is a tri-state and can auto-detect whether lokkit is available. - enable_iptables_lokkit=no - force disable - enable_iptables_lokkit=yes - check if it is supported, and error if not - enable_iptables_lokkit=check - check if it is supported and enable or disable as needed With 'check' being the default. This makes it 'do the right' thing by default, and lets the user have a strict override if neccessary. ACK to the rest of the patch Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

2 2

Re: [Libvir] [patch 5/9] Include the iptables command and chain name in the saved rules file
by Daniel P. Berrange 07 Jan '08

07 Jan '08

On Fri, Jan 04, 2008 at 03:57:30PM +0000, Mark McLoughlin wrote: > lokkit --custom-rules expects the passed file to include the > iptables command and chain name (e.g. "--inset INPUT") rather > than just the rest of the arguments. > > Add both of those to what will be saved to the rules file > and simplify the resulting code by splitting out a > argvToString() helper function. > > The one complication is that when we're removing a rule > we need to make sure we don't search for it using > "--delete" rather than "--insert". For that reason, > only change the argument to "--delete" once we've > constructed the string we use to search through the > existing rules. ACK. Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

1 0

[Libvir] OCaml mlvirtmanager ported to Windows
by Richard W.M. Jones 05 Jan '08

05 Jan '08

(NB. This is _not_ the real virt-manager). Screenshots: http://www.annexia.org/tmp/mlvirtmanager-win-1.png http://www.annexia.org/tmp/mlvirtmanager-win-2.png http://www.annexia.org/tmp/mlvirtmanager-win-3.png The code is in the Mercurial repository, http://hg.et.redhat.com/virt/applications/virt-top--devel . You will need to install lablgtk2 binary from: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html and Windows Gtk development binary from: http://gladewin32.sourceforge.net/ and then follow the installation instructions for lablgtk2 given here: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/install-win32.txt After that, ocaml-libvirt should automatically detect that you've got Gtk / lablgtk2 installed (you might need to restart the MSys shell so it gets the new $PATH), and will offer to compile mlvirtmanager. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

1 0

[Libvir] [PATCH] A few more Windows / MinGW fixups
by Richard W.M. Jones 05 Jan '08

05 Jan '08

A few fairly miscellaneous fixups for Windows (MinGW) which fix shared library builds and fix error handling for sockets. (1) XDR functions on MinGW come from a library called 'libxdr', not 'librpc'. (2) To build a DLL under MinGW we need to pass the -no-undefined flag to the linker. (3) Socket compatibility header file replaces <winsock2.h> inclusion. This just defines a portable 'socket_errno()' function which returns errno in the normal case, or WSAGetLastError() in the Windows case. (4) Use socket_errno() instead of errno in a few cases (but only when the code can be compiled under Windows, ie. only in the remote client case). Example -- a dynamically linked virsh.exe (linked to libvirt-0.dll) accessing a remote libvirtd: $ src/.libs/virsh.exe -c test+tcp://192.168.2.128/default list Id Name State ---------------------------------- 1 test running If you want to compile this under Windows, you will need: (a) MinGW & MSYS (select the "candidate" versions of MinGW tools if you are using Vista or W2K8, since otherwise nothing works because of a known bug). (b) Install gcc 4 experimental package from MinGW site. It's called gcc-sjlj for reasons which escape me. (c) Install GnuTLS binary from http://www.gnu.org/software/gnutls/download.html. I'm using GnuTLS Windows binary 1.6.3 and I had to hand-hack the *.la files in that distribution because they contain incorrect paths. (d) Compile and install latest libxml2 from http://xmlsoft.org/. I'm using 2.6.30. (e) Compile and install my XDR package for Windows (http://www.annexia.org/tmp/xdr-4.0-mingw5.tar.gz) (f) ./configure --without-xen --without-qemu --without-sasl --without-libvirtd (g) make Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

3 4

[Libvir] OCaml bindings now build and run under Windows (MinGW)
by Richard W.M. Jones 05 Jan '08

05 Jan '08

The OCaml bindings, examples, and mlvirsh tool, now build and run under Windows (MinGW), both for bytecode and native code. You'll need the libvirt patches for MinGW as in my previous email. OCaml bindings: http://hg.et.redhat.com/virt/applications/virt-top--devel Example of using mlvirsh (native code version) to access a remote libvirtd: rjones@WIN-MJ27YD6XBZI /c/d/virt-top--devel $ ./mlvirsh/mlvirsh.opt -c test+tcp://192.168.2.128/default list 1 test running rjones@WIN-MJ27YD6XBZI /c/d/virt-top--devel $ ./mlvirsh/mlvirsh.opt -c test+tcp://192.168.2.128/default nodeinfo model: i686 memory: 3145728 K cpus: 16 mhz: 1400 nodes: 2 sockets: 2 cores: 2 threads: 2 [Screenshot: http://www.annexia.org/tmp/Screenshot-VNC_win-mj27yd6xbzi.png ] Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

1 0

Re: [Libvir] [patch 9/9] Remove --with-iptables-dir
by Daniel P. Berrange 05 Jan '08

05 Jan '08

On Fri, Jan 04, 2008 at 03:57:34PM +0000, Mark McLoughlin wrote: > --with-iptables-dir was added to integrate with > a proposed system for letting iptables know how to > reload our rules. > > The idea was that we'd save our rules to a file > under /etc/sysconfig/iptable.d and the iptables > init script would load the rules from there when > it was reloading. > > The proposed system wasn't accepted so, although > there might be some theoretical use for this other > than the lokkit support, let's just remove it > for now. ACK Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

1 0

Re: [Libvir] [patch 8/9] Remove --with-iptables-prefix
by Daniel P. Berrange 05 Jan '08

05 Jan '08

On Fri, Jan 04, 2008 at 03:57:33PM +0000, Mark McLoughlin wrote: > --with-iptables-prefix was added to integrate with > a proposed system for letting iptables know how to > reload our rules. > > The idea was that we'd add our rules to a chain > like libvirt-INPUT rather than INPUT, and there'd > be a configuration file which would specify whether > INPUT should include libvirt-INPUT. > > The proposed system wasn't accepted so, although > there might be some other theoretical use for this, > let's just remove it. I rather doubt anyone's using it, so ACK to killing it off. Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

1 0

Re: [Libvir] [patch 4/9] Re-name the "flipflop" variable to "command_idx"
by Daniel P. Berrange 05 Jan '08

05 Jan '08

On Fri, Jan 04, 2008 at 03:57:29PM +0000, Mark McLoughlin wrote: > The "flipflop" variable marks the index into argv where > the "--insert" is at, so that when we're reloading the > rules we can easily change it to "--delete" and back > again. > > It's a rather silly name, and the next patch is going > to make more use out of it, so let's use the more sane > "command_idx" name. Fair, enough. ACK. Dan -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

1 0

Re: [Libvir] [patch 3/9] Make iptables code use common utils
by Daniel P. Berrange 05 Jan '08

05 Jan '08

On Fri, Jan 04, 2008 at 03:57:28PM +0000, Mark McLoughlin wrote: > utils.c has grown some functions since the iptables code > was written - make use of virFileMakePath() and virFileBuildPath(). ACK. Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

1 0

Re: [Libvir] [patch 2/9] Fix minor iptables error logging issue
by Daniel P. Berrange 05 Jan '08

05 Jan '08

On Fri, Jan 04, 2008 at 03:57:27PM +0000, Mark McLoughlin wrote: > Fix a minor issue with some error reporting in the iptables > code - namely that we use errno after it may have been set > to something other than the error reported. ACK Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

1 0

Re: [Libvir] [patch 1/9] Fix compile error in --with-iptables-dir code
by Daniel P. Berrange 05 Jan '08

05 Jan '08

On Fri, Jan 04, 2008 at 03:57:26PM +0000, Mark McLoughlin wrote: > It seems no-one ever used --with-iptables-dir, since it > doesn't compile :-) ACK. Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

1 0

[Libvir] [patch 9/9] Remove --with-iptables-dir
by Mark McLoughlin 04 Jan '08

04 Jan '08

--with-iptables-dir was added to integrate with a proposed system for letting iptables know how to reload our rules. The idea was that we'd save our rules to a file under /etc/sysconfig/iptable.d and the iptables init script would load the rules from there when it was reloading. The proposed system wasn't accepted so, although there might be some theoretical use for this other than the lokkit support, let's just remove it for now. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/configure.in =================================================================== --- libvirt.orig/configure.in 2008-01-04 15:24:39.000000000 +0000 +++ libvirt.orig/configure.in 2008-01-04 15:24:39.000000000 +0000 @@ -183,18 +183,6 @@ AM_CONDITIONAL(LIBVIRT_INIT_SCRIPTS_RED_ AC_MSG_RESULT($with_init_scripts) dnl -dnl also support saving the various chains to files -dnl in e.g. /etc/sysconfig/iptables.d -dnl -AC_ARG_WITH(iptables-dir, - AC_HELP_STRING([--with-iptables-dir=path], - [directory used to save iptables chains, defaults to not saving]), - [IPTABLES_DIR=$withval]) -if test x"$IPTABLES_DIR" != "x"; then - AC_DEFINE_UNQUOTED(IPTABLES_DIR, "$IPTABLES_DIR", [directory used for saving iptables chains]) -fi - -dnl dnl ensure that Fedora's system-config-firewall knows dnl about libvirt's iptables rules dnl Index: libvirt/src/iptables.c =================================================================== --- libvirt.orig/src/iptables.c 2008-01-04 15:25:07.000000000 +0000 +++ libvirt.orig/src/iptables.c 2008-01-04 15:25:07.000000000 +0000 @@ -48,11 +48,6 @@ #define qemudLog(level, msg...) fprintf(stderr, msg) -#ifdef ENABLE_IPTABLES_LOKKIT -#undef IPTABLES_DIR -#define IPTABLES_DIR LOCAL_STATE_DIR "/lib/libvirt/iptables" -#endif - enum { ADD = 0, REMOVE @@ -78,12 +73,12 @@ typedef struct int nrules; iptRule *rules; -#ifdef IPTABLES_DIR +#ifdef ENABLE_IPTABLES_LOKKIT char dir[PATH_MAX]; char path[PATH_MAX]; -#endif /* IPTABLES_DIR */ +#endif /* ENABLE_IPTABLES_LOKKIT */ } iptRules; @@ -137,7 +132,6 @@ iptablesSpawn(int errors, char * const * return (WIFEXITED(status) && WEXITSTATUS(status) == 0) ? 0 : EINVAL; } -#ifdef IPTABLES_DIR #ifdef ENABLE_IPTABLES_LOKKIT static void notifyRulesUpdated(const char *table, @@ -238,7 +232,6 @@ notifyRulesRemoved(const char *table, #undef MAX_FILE_LEN } -#endif /* ENABLE_IPTABLES_LOKKIT */ static int writeRules(const char *path, @@ -286,7 +279,7 @@ writeRules(const char *path, return 0; } -#endif /* IPTABLES_DIR */ +#endif /* ENABLE_IPTABLES_LOKKIT */ static void iptRuleFree(iptRule *rule) @@ -328,7 +321,7 @@ iptRulesAppend(iptRules *rules, rules->nrules++; -#ifdef IPTABLES_DIR +#ifdef ENABLE_IPTABLES_LOKKIT { int err; @@ -339,12 +332,9 @@ iptRulesAppend(iptRules *rules, return err; } -#ifdef ENABLE_IPTABLES_LOKKIT notifyRulesUpdated(rules->table, rules->path); #endif /* ENABLE_IPTABLES_LOKKIT */ -#endif /* IPTABLES_DIR */ - return 0; } @@ -369,7 +359,7 @@ iptRulesRemove(iptRules *rules, rules->nrules--; -#ifdef IPTABLES_DIR +#ifdef ENABLE_IPTABLES_LOKKIT { int err; @@ -377,15 +367,12 @@ iptRulesRemove(iptRules *rules, return err; } -#ifdef ENABLE_IPTABLES_LOKKIT if (rules->nrules > 0) notifyRulesUpdated(rules->table, rules->path); else notifyRulesRemoved(rules->table, rules->path); #endif /* ENABLE_IPTABLES_LOKKIT */ -#endif /* IPTABLES_DIR */ - return 0; } @@ -415,10 +402,10 @@ iptRulesFree(iptRules *rules) rules->nrules = 0; } -#ifdef IPTABLES_DIR +#ifdef ENABLE_IPTABLES_LOKKIT rules->dir[0] = '\0'; rules->path[0] = '\0'; -#endif /* IPTABLES_DIR */ +#endif /* ENABLE_IPTABLES_LOKKIT */ free(rules); } @@ -441,13 +428,14 @@ iptRulesNew(const char *table, rules->rules = NULL; rules->nrules = 0; -#ifdef IPTABLES_DIR - if (virFileBuildPath(IPTABLES_DIR, table, NULL, rules->dir, sizeof(rules->dir)) < 0) +#ifdef ENABLE_IPTABLES_LOKKIT + if (virFileBuildPath(LOCAL_STATE_DIR "/lib/libvirt/iptables", table, NULL, + rules->dir, sizeof(rules->dir)) < 0) goto error; if (virFileBuildPath(rules->dir, chain, ".chain", rules->path, sizeof(rules->path)) < 0) goto error; -#endif /* IPTABLES_DIR */ +#endif /* ENABLE_IPTABLES_LOKKIT */ return rules; --

1 0

[Libvir] [patch 8/9] Remove --with-iptables-prefix
by Mark McLoughlin 04 Jan '08

04 Jan '08

--with-iptables-prefix was added to integrate with a proposed system for letting iptables know how to reload our rules. The idea was that we'd add our rules to a chain like libvirt-INPUT rather than INPUT, and there'd be a configuration file which would specify whether INPUT should include libvirt-INPUT. The proposed system wasn't accepted so, although there might be some other theoretical use for this, let's just remove it. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/configure.in =================================================================== --- libvirt.orig/configure.in 2008-01-04 14:51:29.000000000 +0000 +++ libvirt.orig/configure.in 2008-01-04 14:51:29.000000000 +0000 @@ -183,16 +183,6 @@ AM_CONDITIONAL(LIBVIRT_INIT_SCRIPTS_RED_ AC_MSG_RESULT($with_init_scripts) dnl -dnl allow the creation of iptables rules in chains with a -dnl specific prefix rather than in the standard toplevel chains -dnl -AC_ARG_WITH(iptables-prefix, - AC_HELP_STRING([--with-iptables-prefix=prefix], - [prefix used for iptables chains, default is to use standard toplevel chains]), - [IPTABLES_PREFIX=$withval]) -AC_DEFINE_UNQUOTED(IPTABLES_PREFIX, "$IPTABLES_PREFIX", [prefix used for iptables chains]) - -dnl dnl also support saving the various chains to files dnl in e.g. /etc/sysconfig/iptables.d dnl Index: libvirt/src/iptables.c =================================================================== --- libvirt.orig/src/iptables.c 2008-01-04 15:17:18.000000000 +0000 +++ libvirt.orig/src/iptables.c 2008-01-04 15:17:18.000000000 +0000 @@ -636,13 +636,13 @@ iptablesContextNew(void) if (!(ctx = calloc(1, sizeof (*ctx)))) return NULL; - if (!(ctx->input_filter = iptRulesNew("filter", IPTABLES_PREFIX "INPUT"))) + if (!(ctx->input_filter = iptRulesNew("filter", "INPUT"))) goto error; - if (!(ctx->forward_filter = iptRulesNew("filter", IPTABLES_PREFIX "FORWARD"))) + if (!(ctx->forward_filter = iptRulesNew("filter", "FORWARD"))) goto error; - if (!(ctx->nat_postrouting = iptRulesNew("nat", IPTABLES_PREFIX "POSTROUTING"))) + if (!(ctx->nat_postrouting = iptRulesNew("nat", "POSTROUTING"))) goto error; return ctx; --

1 0

[Libvir] [patch 7/9] Add support for lokkit
by Mark McLoughlin 04 Jan '08

04 Jan '08

Add support for integrating our iptables support with Fedora's iptables configuration using the lokkit --custom-rules command. Basically, we write out our rules to /var/lib/libvirt/iptables and run lokkit --custom-rules so that if e.g. iptables is restarted or the user edits their firewall configuration, then libvirt's rules get reloaded. The slightly nasty bit is that rather than running something like lokkit --remove-custom-rules, we have to grub around in /etc/sysconfig/system-config-firewall to remove our rules files. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/configure.in =================================================================== --- libvirt.orig/configure.in 2008-01-04 14:48:49.000000000 +0000 +++ libvirt.orig/configure.in 2008-01-04 14:48:49.000000000 +0000 @@ -204,6 +204,20 @@ if test x"$IPTABLES_DIR" != "x"; then AC_DEFINE_UNQUOTED(IPTABLES_DIR, "$IPTABLES_DIR", [directory used for saving iptables chains]) fi +dnl +dnl ensure that Fedora's system-config-firewall knows +dnl about libvirt's iptables rules +dnl +AC_ARG_ENABLE(iptables-lokkit, + AC_HELP_STRING([--enable-iptables-lokkit=no/yes], + [enable registering libvirt's iptables rules with Fedora's lokkit]), + [],[enable_iptables_lokkit=no]) +if test x"$enable_iptables_lokkit" = x"yes"; then + AC_DEFINE(ENABLE_IPTABLES_LOKKIT, [], [whether support for Fedora's lokkit is enabled]) + AC_PATH_PROG(LOKKIT_PATH, lokkit, /usr/sbin/lokkit) + AC_DEFINE_UNQUOTED(LOKKIT_PATH, "$LOKKIT_PATH", [path to lokkit binary]) +fi + AC_PATH_PROG(IPTABLES_PATH, iptables, /sbin/iptables) AC_DEFINE_UNQUOTED(IPTABLES_PATH, "$IPTABLES_PATH", [path to iptables binary]) Index: libvirt/src/iptables.c =================================================================== --- libvirt.orig/src/iptables.c 2008-01-04 14:51:29.000000000 +0000 +++ libvirt.orig/src/iptables.c 2008-01-04 14:51:29.000000000 +0000 @@ -48,6 +48,11 @@ #define qemudLog(level, msg...) fprintf(stderr, msg) +#ifdef ENABLE_IPTABLES_LOKKIT +#undef IPTABLES_DIR +#define IPTABLES_DIR LOCAL_STATE_DIR "/lib/libvirt/iptables" +#endif + enum { ADD = 0, REMOVE @@ -133,6 +138,108 @@ iptablesSpawn(int errors, char * const * } #ifdef IPTABLES_DIR +#ifdef ENABLE_IPTABLES_LOKKIT +static void +notifyRulesUpdated(const char *table, + const char *path) +{ + char arg[PATH_MAX]; + char *argv[4]; + int retval; + + snprintf(arg, sizeof(arg), "--custom-rules=ipv4:%s:%s", table, path); + + argv[0] = (char *) LOKKIT_PATH; + argv[1] = (char *) "--nostart"; + argv[2] = arg; + argv[3] = NULL; + + if ((retval = iptablesSpawn(WITH_ERRORS, argv))) + qemudLog(QEMUD_WARN, "Failed to run '" LOKKIT_PATH " %s' : %s", + arg, strerror(retval)); +} + +static int +stripLine(char *str, int len, const char *line) +{ + char *s, *p; + int changed; + + changed = 0; + s = str; + + while ((p = strchr(s, '\n'))) { + if (p == s || strncmp(s, line, p - s) != 0) { + s = ++p; + continue; + } + + ++p; + memmove(s, p, len - (p - str) + 1); + len -= p - s; + changed = 1; + } + + if (strcmp(s, line) == 0) { + *s = '\0'; + changed = 1; + } + + return changed; +} + +static void +notifyRulesRemoved(const char *table, + const char *path) +{ +/* 10 MB limit on config file size as a sanity check */ +#define MAX_FILE_LEN (1024*1024*10) + + char arg[PATH_MAX]; + char *content; + int len; + FILE *f = NULL; + + len = virFileReadAll(SYSCONF_DIR "/sysconfig/system-config-firewall", + MAX_FILE_LEN, &content); + if (len < 0) { + qemudLog(QEMUD_WARN, "Failed to read " SYSCONF_DIR "/sysconfig/system-config-firewall"); + return; + } + + snprintf(arg, sizeof(arg), "--custom-rules=ipv4:%s:%s", table, path); + + if (!stripLine(content, len, arg)) { + free(content); + return; + } + + if (!(f = fopen(SYSCONF_DIR "/sysconfig/system-config-firewall", "w"))) + goto write_error; + + if (fputs(content, f) == EOF) + goto write_error; + + if (fclose(f) == EOF) { + f = NULL; + goto write_error; + } + + free(content); + + return; + + write_error: + qemudLog(QEMUD_WARN, "Failed to write to " SYSCONF_DIR "/sysconfig/system-config-firewall : %s", + strerror(errno)); + if (f) + fclose(f); + free(content); + +#undef MAX_FILE_LEN +} +#endif /* ENABLE_IPTABLES_LOKKIT */ + static int writeRules(const char *path, const iptRule *rules, @@ -231,6 +338,11 @@ iptRulesAppend(iptRules *rules, if ((err = writeRules(rules->path, rules->rules, rules->nrules))) return err; } + +#ifdef ENABLE_IPTABLES_LOKKIT + notifyRulesUpdated(rules->table, rules->path); +#endif /* ENABLE_IPTABLES_LOKKIT */ + #endif /* IPTABLES_DIR */ return 0; @@ -264,6 +376,14 @@ iptRulesRemove(iptRules *rules, if ((err = writeRules(rules->path, rules->rules, rules->nrules))) return err; } + +#ifdef ENABLE_IPTABLES_LOKKIT + if (rules->nrules > 0) + notifyRulesUpdated(rules->table, rules->path); + else + notifyRulesRemoved(rules->table, rules->path); +#endif /* ENABLE_IPTABLES_LOKKIT */ + #endif /* IPTABLES_DIR */ return 0; --

1 0

[Libvir] [patch 6/9] Move iptablesSpawn()
by Mark McLoughlin 04 Jan '08

04 Jan '08

The next patch requires iptablesSpawn() higher up in the file. This patch just moves the code around; there is no functional change. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/src/iptables.c =================================================================== --- libvirt.orig/src/iptables.c 2008-01-04 11:55:21.000000000 +0000 +++ libvirt.orig/src/iptables.c 2008-01-04 11:55:21.000000000 +0000 @@ -89,6 +89,49 @@ struct _iptablesContext iptRules *nat_postrouting; }; +static int +iptablesSpawn(int errors, char * const *argv) +{ + pid_t pid, ret; + int status; + int null = -1; + + if (errors == NO_ERRORS && (null = open(_PATH_DEVNULL, O_RDONLY)) < 0) + return errno; + + pid = fork(); + if (pid == -1) { + if (errors == NO_ERRORS) + close(null); + return errno; + } + + if (pid == 0) { /* child */ + if (errors == NO_ERRORS) { + dup2(null, STDIN_FILENO); + dup2(null, STDOUT_FILENO); + dup2(null, STDERR_FILENO); + close(null); + } + + execvp(argv[0], argv); + + _exit (1); + } + + if (errors == NO_ERRORS) + close(null); + + while ((ret = waitpid(pid, &status, 0) == -1) && errno == EINTR); + if (ret == -1) + return errno; + + if (errors == NO_ERRORS) + return 0; + else + return (WIFEXITED(status) && WEXITSTATUS(status) == 0) ? 0 : EINVAL; +} + #ifdef IPTABLES_DIR static int writeRules(const char *path, @@ -294,49 +337,6 @@ iptRulesNew(const char *table, } static int -iptablesSpawn(int errors, char * const *argv) -{ - pid_t pid, ret; - int status; - int null = -1; - - if (errors == NO_ERRORS && (null = open(_PATH_DEVNULL, O_RDONLY)) < 0) - return errno; - - pid = fork(); - if (pid == -1) { - if (errors == NO_ERRORS) - close(null); - return errno; - } - - if (pid == 0) { /* child */ - if (errors == NO_ERRORS) { - dup2(null, STDIN_FILENO); - dup2(null, STDOUT_FILENO); - dup2(null, STDERR_FILENO); - close(null); - } - - execvp(argv[0], argv); - - _exit (1); - } - - if (errors == NO_ERRORS) - close(null); - - while ((ret = waitpid(pid, &status, 0) == -1) && errno == EINTR); - if (ret == -1) - return errno; - - if (errors == NO_ERRORS) - return 0; - else - return (WIFEXITED(status) && WEXITSTATUS(status) == 0) ? 0 : EINVAL; -} - -static int iptablesAddRemoveChain(iptRules *rules, int action) { char **argv; --

1 0

[Libvir] [patch 5/9] Include the iptables command and chain name in the saved rules file
by Mark McLoughlin 04 Jan '08

04 Jan '08

lokkit --custom-rules expects the passed file to include the iptables command and chain name (e.g. "--inset INPUT") rather than just the rest of the arguments. Add both of those to what will be saved to the rules file and simplify the resulting code by splitting out a argvToString() helper function. The one complication is that when we're removing a rule we need to make sure we don't search for it using "--delete" rather than "--insert". For that reason, only change the argument to "--delete" once we've constructed the string we use to search through the existing rules. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/src/iptables.c =================================================================== --- libvirt.orig/src/iptables.c 2008-01-04 12:09:05.000000000 +0000 +++ libvirt.orig/src/iptables.c 2008-01-04 12:09:05.000000000 +0000 @@ -380,37 +380,55 @@ iptablesAddRemoveChain(iptRules *rules, return retval; } +static char * +argvToString(char **argv) +{ + int len, i; + char *ret, *p; + + for (len = 1, i = 0; argv[i]; i++) + len += strlen(argv[i]) + 1; + + if (!(p = ret = (char *)malloc(len))) + return NULL; + + for (i = 0; argv[i]; i++) { + if (i != 0) + *(p++) = ' '; + + strcpy(p, argv[i]); + p += strlen(argv[i]); + } + + *p = '\0'; + + return ret; +} + static int iptablesAddRemoveRule(iptRules *rules, int action, const char *arg, ...) { va_list args; int retval = ENOMEM; char **argv; - char *rule = NULL, *p; + char *rule = NULL; const char *s; - int n, rulelen, command_idx; + int n, command_idx; n = 1 + /* /sbin/iptables */ 2 + /* --table foo */ 2 + /* --insert bar */ 1; /* arg */ - rulelen = strlen(arg) + 1; - va_start(args, arg); - while ((s = va_arg(args, const char *))) { + while ((s = va_arg(args, const char *))) n++; - rulelen += strlen(s) + 1; - } va_end(args); if (!(argv = calloc(n + 1, sizeof(*argv)))) goto error; - if (!(rule = (char *)malloc(rulelen))) - goto error; - n = 0; if (!(argv[n++] = strdup(IPTABLES_PATH))) @@ -424,7 +442,7 @@ iptablesAddRemoveRule(iptRules *rules, i command_idx = n; - if (!(argv[n++] = strdup(action == ADD ? "--insert" : "--delete"))) + if (!(argv[n++] = strdup("--insert"))) goto error; if (!(argv[n++] = strdup(rules->chain))) @@ -433,23 +451,22 @@ iptablesAddRemoveRule(iptRules *rules, i if (!(argv[n++] = strdup(arg))) goto error; - p = strcpy(rule, arg); - p += strlen(arg); - va_start(args, arg); - while ((s = va_arg(args, const char *))) { + while ((s = va_arg(args, const char *))) if (!(argv[n++] = strdup(s))) goto error; - *(p++) = ' '; - strcpy(p, s); - p += strlen(s); - } - va_end(args); - *p = '\0'; + if (!(rule = argvToString(&argv[command_idx]))) + goto error; + + if (action == REMOVE) { + free(argv[command_idx]); + if (!(argv[command_idx] = strdup("--delete"))) + goto error; + } if (action == ADD && (retval = iptablesAddRemoveChain(rules, action))) --

1 0

[Libvir] [patch 4/9] Re-name the "flipflop" variable to "command_idx"
by Mark McLoughlin 04 Jan '08

04 Jan '08

The "flipflop" variable marks the index into argv where the "--insert" is at, so that when we're reloading the rules we can easily change it to "--delete" and back again. It's a rather silly name, and the next patch is going to make more use out of it, so let's use the more sane "command_idx" name. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/src/iptables.c =================================================================== --- libvirt.orig/src/iptables.c 2008-01-04 10:00:03.000000000 +0000 +++ libvirt.orig/src/iptables.c 2008-01-04 10:00:03.000000000 +0000 @@ -62,7 +62,7 @@ typedef struct { char *rule; char **argv; - int flipflop; + int command_idx; } iptRule; typedef struct @@ -158,7 +158,7 @@ static int iptRulesAppend(iptRules *rules, char *rule, char **argv, - int flipflop) + int command_idx) { iptRule *r; @@ -172,9 +172,9 @@ iptRulesAppend(iptRules *rules, rules->rules = r; - rules->rules[rules->nrules].rule = rule; - rules->rules[rules->nrules].argv = argv; - rules->rules[rules->nrules].flipflop = flipflop; + rules->rules[rules->nrules].rule = rule; + rules->rules[rules->nrules].argv = argv; + rules->rules[rules->nrules].command_idx = command_idx; rules->nrules++; @@ -388,7 +388,7 @@ iptablesAddRemoveRule(iptRules *rules, i char **argv; char *rule = NULL, *p; const char *s; - int n, rulelen, flipflop; + int n, rulelen, command_idx; n = 1 + /* /sbin/iptables */ 2 + /* --table foo */ @@ -422,7 +422,7 @@ iptablesAddRemoveRule(iptRules *rules, i if (!(argv[n++] = strdup(rules->table))) goto error; - flipflop = n; + command_idx = n; if (!(argv[n++] = strdup(action == ADD ? "--insert" : "--delete"))) goto error; @@ -463,7 +463,7 @@ iptablesAddRemoveRule(iptRules *rules, i goto error; if (action == ADD) { - retval = iptRulesAppend(rules, rule, argv, flipflop); + retval = iptRulesAppend(rules, rule, argv, command_idx); rule = NULL; argv = NULL; } else { @@ -543,14 +543,14 @@ iptRulesReload(iptRules *rules) iptRule *rule = &rules->rules[i]; char *orig; - orig = rule->argv[rule->flipflop]; - rule->argv[rule->flipflop] = (char *) "--delete"; + orig = rule->argv[rule->command_idx]; + rule->argv[rule->command_idx] = (char *) "--delete"; if ((retval = iptablesSpawn(WITH_ERRORS, rule->argv))) qemudLog(QEMUD_WARN, "Failed to remove iptables rule '%s' from chain '%s' in table '%s': %s", rule->rule, rules->chain, rules->table, strerror(retval)); - rule->argv[rule->flipflop] = orig; + rule->argv[rule->command_idx] = orig; } if ((retval = iptablesAddRemoveChain(rules, REMOVE)) || --

1 0

[Libvir] [patch 3/9] Make iptables code use common utils
by Mark McLoughlin 04 Jan '08

04 Jan '08

utils.c has grown some functions since the iptables code was written - make use of virFileMakePath() and virFileBuildPath(). Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/src/iptables.c =================================================================== --- libvirt.orig/src/iptables.c 2008-01-04 09:46:19.000000000 +0000 +++ libvirt.orig/src/iptables.c 2008-01-04 09:46:19.000000000 +0000 @@ -44,6 +44,7 @@ #include "internal.h" #include "iptables.h" +#include "util.h" #define qemudLog(level, msg...) fprintf(stderr, msg) @@ -135,60 +136,6 @@ writeRules(const char *path, return 0; } - -static int -ensureDir(const char *path) -{ - struct stat st; - char parent[PATH_MAX]; - char *p; - int err; - - if (stat(path, &st) >= 0) - return 0; - - strncpy(parent, path, PATH_MAX); - parent[PATH_MAX - 1] = '\0'; - - if (!(p = strrchr(parent, '/'))) - return EINVAL; - - if (p == parent) - return EPERM; - - *p = '\0'; - - if ((err = ensureDir(parent))) - return err; - - if (mkdir(path, 0700) < 0 && errno != EEXIST) - return errno; - - return 0; -} - -static int -buildDir(const char *table, - char *path, - int maxlen) -{ - if (snprintf(path, maxlen, IPTABLES_DIR "/%s", table) >= maxlen) - return EINVAL; - else - return 0; -} - -static int -buildPath(const char *table, - const char *chain, - char *path, - int maxlen) -{ - if (snprintf(path, maxlen, IPTABLES_DIR "/%s/%s.chain", table, chain) >= maxlen) - return EINVAL; - else - return 0; -} #endif /* IPTABLES_DIR */ static void @@ -235,7 +182,7 @@ iptRulesAppend(iptRules *rules, { int err; - if ((err = ensureDir(rules->dir))) + if ((err = virFileMakePath(rules->dir))) return err; if ((err = writeRules(rules->path, rules->rules, rules->nrules))) @@ -332,10 +279,10 @@ iptRulesNew(const char *table, rules->nrules = 0; #ifdef IPTABLES_DIR - if (buildDir(table, rules->dir, sizeof(rules->dir))) + if (virFileBuildPath(IPTABLES_DIR, table, NULL, rules->dir, sizeof(rules->dir)) < 0) goto error; - if (buildPath(table, chain, rules->path, sizeof(rules->path))) + if (virFileBuildPath(rules->dir, chain, ".chain", rules->path, sizeof(rules->path)) < 0) goto error; #endif /* IPTABLES_DIR */ --

1 0

[Libvir] [patch 2/9] Fix minor iptables error logging issue
by Mark McLoughlin 04 Jan '08

04 Jan '08

Fix a minor issue with some error reporting in the iptables code - namely that we use errno after it may have been set to something other than the error reported. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/src/iptables.c =================================================================== --- libvirt.orig/src/iptables.c 2008-01-04 11:46:38.000000000 +0000 +++ libvirt.orig/src/iptables.c 2008-01-04 11:46:38.000000000 +0000 @@ -601,7 +601,7 @@ iptRulesReload(iptRules *rules) if ((retval = iptablesSpawn(WITH_ERRORS, rule->argv))) qemudLog(QEMUD_WARN, "Failed to remove iptables rule '%s' from chain '%s' in table '%s': %s", - rule->rule, rules->chain, rules->table, strerror(errno)); + rule->rule, rules->chain, rules->table, strerror(retval)); rule->argv[rule->flipflop] = orig; } --

1 0

[Libvir] [patch 1/9] Fix compile error in --with-iptables-dir code
by Mark McLoughlin 04 Jan '08

04 Jan '08

It seems no-one ever used --with-iptables-dir, since it doesn't compile :-) Signed-off-by: Mark McLoughlin <markmc(a)redhat.com> Index: libvirt/src/iptables.c =================================================================== --- libvirt.orig/src/iptables.c 2007-12-13 09:05:31.000000000 +0000 +++ libvirt.orig/src/iptables.c 2007-12-13 09:05:31.000000000 +0000 @@ -91,7 +91,7 @@ struct _iptablesContext #ifdef IPTABLES_DIR static int writeRules(const char *path, - const iptRules *rules, + const iptRule *rules, int nrules) { char tmp[PATH_MAX]; --

1 0

[Libvir] [patch 0/9] Add support for Fedora lokkit's --custom-rules option
by Mark McLoughlin 04 Jan '08

04 Jan '08

Hey, When the iptables support was first added to libvirtd, we proposed a change to iptables to allow us to register our rules so that the rules would be automatically reloaded e.g. "service iptables restart" was run or if the user modified their firewall configuration with system-config-firewall. See: https://bugzilla.redhat.com/227011 That proposal wasn't accepted and so users must currently force libvirt to reload its iptables configuration using SIGHUP in those circumstances. However, since Fedora 8, lokkit has grown a --custom-rules option which we can use to achieve the same effect. The following series of patches does just that. Most of the patches are pretty trivial; the only really significant one is 7/9. (Oh, 7/9 requires Dan's virFileReadAll() patch) Thanks, Mark. --

1 0

[Libvir] [PATCH] #include "config.h" needed
by Richard W.M. Jones 04 Jan '08

04 Jan '08

There is one file missing: #include "config.h" which ought to be included at the beginning of every C file. If missing, it causes problems on Windows -- in particular the C99 keyword 'restrict' won't be recognised and that causes compile errors all over the place. I've also changed a few <config.h> --> "config.h", which I think is more correct because config.h is a local file and should never come from the system include files (CC'd to Jim Meyering -- is this right in your opinion?) Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

3 4

Re: [Libvir] java-libvirt on cvs:libvirt.org
by Richard W.M. Jones 02 Jan '08

02 Jan '08

[Sorry, accidentally deleted the attached message while combing through the awesome amount of spam that this list receives ...] -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

1 0

[Libvir] Re: Documentation on the xml format
by Daniel Schwager 29 Dec '07

29 Dec '07

Hi Rich, >Unfortunately this level of detail is only in the source, and usually >depends on the backend (Xen/QEMU/whatever). > >If you'd like to help document these sorts of issues, then we'd welcome >patches. The source for this page is in libvirt CVS doc/ directory. > >http://libvirt.org/format.html I want extend the java-libvirt implementation based on the code of István Tóth. Therefore, I created a XSD file (XML description file). This could be a base for the XML-documentation. Should I post it ? One more question: Is there a changelist for the libvirt API between 0.3.2 and 0.4 ? The code based on 0.3.2 ... regards Danny ------------------------------------------------------------------- DT Netsolution GmbH - Taläckerstr. 30 - D-70437 Stuttgart Geschäftsführer: Daniel Schwager, Stefan Hörz - HRB Stuttgart 19870 Tel: +49-711-849910-32, Fax: -932 - Mailto:daniel.schwager@dtnet.de

3 4

[Libvir] with-openvz compile error
by Mikhail A. Pokidko 26 Dec '07

26 Dec '07

Hi all! I try to build-up libvirt-0.4.0 with openvz support : %configure --with-init-script=redhat --with-qemud-pid-file=/var/run/libvirt_qemud.pid \ --with-remote-file=/var/run/libvirtd.pid \ --with-xen-proxy=yes --with-openvz I`ve got the error on the following stage: gcc -DHAVE_CONFIG_H -I. -I.. -I../gnulib/lib -I../gnulib/lib -I../include -I../include -I../qemud -I/usr/include/libxml2 -DBINDIR=\"/usr/lib\" -DSBINDIR=\"/usr/sbin\" -DSYSCONF_DIR=\"/etc\" -DLOCALEBASEDIR=\"/usr/share/locale\" -DLOCAL_STATE_DIR=\"/var/lib\" -DGETTEXT_PACKAGE=\"libvirt\" -Wall -Wformat -Wformat-security -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Winline -Wredundant-decls -Wno-sign-compare -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fasynchronous-unwind-tables -DWITH_OPENVZ -DWITH_QEMU -DWITH_TEST -DWITH_REMOTE -DWITH_XEN -pipe -Wall -O2 -march=i686 -mtune=i686 -c openvz_driver.c -fPIC -DPIC -o .libs/libvirt_la-openvz_driver.o openvz_driver.c:562: error: conflicting types for 'openvzOpen' openvz_driver.c:76: error: previous declaration of 'openvzOpen' was here openvz_driver.c:716: warning: initialization from incompatible pointer type openvz_driver.c:773: warning: initialization from incompatible pointer type Unfortunately i`m not confident neither with C nor with C/C++ so can anyone educate me whats wrong with that declarating openvzOpen in openvz_driver.c? -- ALTLinux Team xmpp: solar AT solar.net.ru

4 4

[Libvir] Documentation on the xml format
by Gerrard Geldenhuis 21 Dec '07

21 Dec '07

Hi I am looking for documentation on the xml-format for virtlib. The information on the website is handy but not nearly complete enough. I am looking for documentation that will tell me what options are available to use in the xml and what things will be done automatically by the libraries. If I thus leave out the uuid will it create it automatically? etc. Regards

2 1

[Libvir] OCaml bindings 0.4.0.0 released
by Richard W.M. Jones 20 Dec '07

20 Dec '07

The only significant change here is that these now don't block all threads during a long-running libvirt API call. So you can have a thread to keep the display updated and another making libvirt calls. As with all libvirt programs, each thread that needs to make libvirt calls should have its own connection. http://libvirt.org/ocaml/ Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

1 0

[Libvir] Libvirt version
by Katti, Vadiraj (STSD-Openview) 18 Dec '07

18 Dec '07

Hi, Currently the latest version of libvirt available is 0.3.3. But SLES 10 ships 0.2.0 version of libvirt (not sure what version RHEL 5.1 ships). Any idea when and on what basis SLES decides to ship the upgraded version of libvirt. Thanks, Vadiraj

3 3

[Libvir] PATCH: Add dep on 'nc' RPM
by Daniel P. Berrange 18 Dec '07

18 Dec '07

The libvirt SSH tunnelling support requires 'nc' to operate. The libvirt RPM does not, however, have any dependancy on 'nc'. So by default it is pure luck whether you can use SSH tunnelling after installing the libvirt package & starting the daemon. Even though we don't technically need it on the client end, I figure nc is so small we may as well add a dep to the main libvirt RPM. This ensures nc is present anywhere the daemon is. Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

2 3

[Libvir] PATCH: Compatability with Xen 3.2.0
by Daniel P. Berrange 18 Dec '07

18 Dec '07

In Xen 3.2.0 the physinfo hypercall was changed to remove the field 'sockets_per_node' and add in 'nr_cpus'. We use the sockets_per_node field in livirt for the virNodeInfo struct :-( This patch re-calculates its value in terms of 'nr_cpus / (nodes*cores*threads)' which is how older Xen used to figure it out. Dan. -- |=- Red Hat, Engineering, Emerging Technologies, Boston. +1 978 392 2496 -=| |=- Perl modules: http://search.cpan.org/~danberr/ -=| |=- Projects: http://freshmeat.net/~danielpb/ -=| |=- GnuPG: 7D3B9505 F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 -=|

4 5

[Libvir] Release of libvirt-0.4.0
by Daniel Veillard 18 Dec '07

18 Dec '07

A new release is available from ftp://libvirt.org/libvirt/ We ddin;t had a release since the end of September and the logs below shows it, in retrospect I should have done an intermediate release around mid November. There is so much new code that it makes sense to bump the minor version: * New features: - Compilation on Windows cygwin/mingw (Richard Jones) - Ruby bindings (David Lutterkort) - SASL based authentication for libvirt remote support (Daniel Berrange) - PolicyKit authentication (Daniel Berrange) * Documentation: - example files for QEMU and libvirtd configuations (Daniel Berrange) - english cleanups (Jim Paris) - CIM and OpenVZ references - document <shareable/> - daemon startup when using QEMU/KVM - document HV support for new NUMA calls (Richard Jones) - various english fixes (Bruce Montague) - OCaml docs links (Richard Jones) - describe the various bindings add Ruby link - Windows support page (Richard Jones) - authentication documentation updates (Daniel Berrange) * Bug fixes: - NUMA topology error handling (Beth Kon) - NUMA topology cells without CPU (Beth Kon) - XML to/from XM bridge config (Daniel Berrange) - XM processing of vnc parameters (Daniel Berrange) - Reset migration source after failure (Jim Paris) - negative integer in config (Tatsuro Enokura) - zero terminating string buffer - detect integer overflow (Jim Meyering) - QEmu command line ending fixes (Daniel Berrange) - recursion problem in the daemon (Daniel Berrange) - HVM domain with CDRom (Masayuki Sunou) - off by one error in NUMA cpu count (Beth Kon) - avoid xend errors when adding disks (Masayuki Sunou) - compile error (Chris Lalancette) - transposed fwrite args (Jim Meyering) - compile without xen and on solaris (Jim Paris) - parsing of interface names (Richard Jones) - overflow for starts on 32bits (Daniel Berrange) - fix problems in error reporting (Saori Fukuta) - wrong call to brSetForwardDelay changed to brSetEnableSTP (Richard Jones) - allow shareable disk in old Xen - fix wrong certificate file (Jim Meyering) - avoid some startup error when non-root - off-by-1 buffer NULL termination (Daniel Berrange) - various string allocation fixes (Daniel Berrange) - avoid problems with vnetXXX interfaces in domain dumps (Daniel Berrange) - build fixes for RHEL (Daniel Berrange) - virsh prompt should not depend on uid (Richard Jones) - fix scaping of '<' (Richard Jones) - fix detach-disk on Xen tap devices (Saori Fukuta) - CPU parameter setting in XM config (Saori Fukuta) - credential handling fixes (Daniel Berrange) - fix compatibility with Xen 3.2.0 (Daniel Berrange) * Improvements: - /etc/libvirt/qemu.conf configuration for QEMU driver (Daniel Berrange) - NUMA cpu pinning in config files (DV and Saori Fukuta) - CDRom media change in KVM/QEMU (Daniel Berrange) - tests for <shareable/> in configs - pinning inactive domains for Xen 3.0.3 (Saori Fukuta) - use gnulib for portability enhancement (Jim Meyering) - --without-libvirtd config option (Richard Jones) - Python bindings for NUMA - add extra utility functions to buffer (Richard Jones) - separate qparams module for handling query parameters (Richard Jones) * Code cleanups: - remove virDomainRestart from API as it was never used (Richard Jones) - constify params for attach/detach APIs (Daniel Berrange) - gcc printf attribute checkings (Jim Meyering) - refactoring of device parsing code and shell escaping (Daniel Berrange) - virsh schedinfo parameters validation (Masayuki Sunou) - Avoid risk of format string abuse (Jim Meyering) - integer parsing cleanups (Jim Meyering) - build out of the source tree (Jim Meyering) - URI parsing refactoring (Richard Jones) - failed strdup/malloc handling (Jim Meyering) - Make "make distcheck" work (Jim Meyering) - improve xen internall error reports (Richard Jones) - cleanup of the daemon remote code (Daniel Berrange) - rename error VIR_FROM_LINUX to VIR_FROM_STATS_LINUX (Richard Jones) - don't compile the proxy if without Xen (Richard Jones) - fix paths when configuring for /usr prefix - improve error reporting code (Jim Meyering) - detect heap allocation failure (Jim Meyering) - disable xen sexpr parsing code if Xen is disabled (Daniel Berrange) - cleanup of the GetType entry point for Xen drivers - move some QEmu path handling to generic module (Daniel Berrange) - many code cleanups related to the Windows port (Richard Jones) - disable the proxy if using PolicyKit (Daniel Berrange) - readline availability detection - test libvirtd's config-processing code (Jim Meyering) - use a variable name as sizeof argument (Jim Meyering) Thanks to everybody who helped for this release, by providing feedback, documentation, patches, etc. ! Daniel -- Red Hat Virtualization group http://redhat.com/virtualization/ Daniel Veillard | virtualization library http://libvirt.org/ veillard(a)redhat.com | libxml GNOME XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | Rpmfind RPM search engine http://rpmfind.net/

1 0

[Libvir] [PATCH] Enhance virBuffer code
by Richard W.M. Jones 17 Dec '07

17 Dec '07

Apart from a couple of minor fixes, this adds the following useful functions to the virBuffer implementation: virBufferAddChar: Append a single character to the buffer. virBufferURIEncodeString: Append a %-encoded string to the buffer (eg. virBufferEscapeString and the similar function in libxml2). Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903

5 22

[Libvir] More queries
by Katti, Vadiraj (STSD-Openview) 17 Dec '07

17 Dec '07

Hi, I've more quries on libvirt apis: 1. Is there any API in libvirt that gives me the uptime of the guets. 2. Can I know how many physical CPUs are dedicated to a VM or if they are shared. 3. How do I know the logical cpu consumption of the guests( from dom0 using libvirt obviously). 4. Can get the ip address of each of the guests with any of the APIs Thanks, Vadiraj

3 5