- Devel - libvirt List Archives

[libvirt] RFC: virt-console
by John Levon 01 Jul '08

01 Jul '08

See implementation here: http://cr.opensolaris.org/~johnlev/virt-console/ (inside libvirt.hg/patches/libvirt/virt-console) This splits virsh console into a separate binary to allow it to be setuid-root on Solaris (where we check permissions then drop privilege). It also fixes a number of RFEs This is against 0.4.0, so it's not ready for merging yet (I hope to get it forward ported at some point). regards john

3 12

[libvirt] PATCH: Generic internal API for network XML parser/formatter
by Daniel P. Berrange 01 Jul '08

01 Jul '08

We currently have two drivers which handle the networking XML containing duplicated parsers and formatters for the XML, and very similar structs. This patch introduces a new general purpose internal API for parsing and formatting network XML, and representing it as a series of structs. This code is derived from the current equivalent code in the QEMU driver for networks. The naming conventions I'm adopting in this patch follow those in the storage driver: - virNetworkPtr - the public opaque object in libvirt.h - virNetworkObjPtr - the primary internal object for network state - virNetworkDefPtr - the configuration data for a network A virNetworkObjPtr contains a reference to one or two virNetworkDefPtr objects - the current live config, and potentially a secondary inactive config which will become live at the next restart. The structs are defined in network_conf.h, along with a bunch of APIs for dealing with them. These APIs are the same as similarly named ones from the current qemu driver, but I'll go over them again for a reminder: virNetworkObjPtr virNetworkFindByUUID(const virNetworkObjPtr nets, const unsigned char *uuid); virNetworkObjPtr virNetworkFindByName(const virNetworkObjPtr nets, const char *name); Allow lookup of a virNetworkObjPtr object based on its name or UUID, as typically obtained from the public virNetworkPtr object. The 'nets' parameter to both of thse is a linked list of networks which are currently known to the driver using this API. void virNetworkDefFree(virNetworkDefPtr def); void virNetworkObjFree(virNetworkObjPtr net); Convenience APIs to totally free the memory associated with these objects. virNetworkObjPtr virNetworkAssignDef(virConnectPtr conn, virNetworkObjPtr *nets, const virNetworkDefPtr def); Given a virNetworkDefPtr object, it'll search for a pre-existing virNetworkObjPtr object with matching config. If one is found, its config will be updated, otherwise a new object will be allocated. void virNetworkRemoveInactive(virNetworkObjPtr *nets, const virNetworkObjPtr net); Convenience for removing and free'ing a virNetworkObjPtr object in the current list of active networks. virNetworkDefPtr virNetworkDefParse(virConnectPtr conn, const char *xmlStr, const char *displayName); Given an XML document describing a network, parses the doc and generates a virNetworkDefPtr to represent it in memory. char *virNetworkDefFormat(virConnectPtr conn, const virNetworkDefPtr def); Given a virNetworkDefPtr object, generate a XML document describing the network. As a mentioned earlier, the impl of these APIs is just copied from the QEMU driver, but instead of using pre-declared char[PATH_MAX] fields, we allocate memory for strings as required. Regards, Daniel diff -r a6e5acdd23df src/Makefile.am --- a/src/Makefile.am Tue Jun 24 15:07:21 2008 +0100 +++ b/src/Makefile.am Tue Jun 24 15:07:23 2008 +0100 @@ -52,6 +52,7 @@ driver.h \ proxy_internal.c proxy_internal.h \ conf.c conf.h \ + network_conf.c network_conf.h \ xm_internal.c xm_internal.h \ remote_internal.c remote_internal.h \ bridge.c bridge.h \ diff -r a6e5acdd23df src/network_conf.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/network_conf.c Tue Jun 24 15:07:23 2008 +0100 @@ -0,0 +1,467 @@ +/* + * network_conf.h: network XML handling + * + * Copyright (C) 2006-2008 Red Hat, Inc. + * Copyright (C) 2006-2008 Daniel P. Berrange + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Daniel P. Berrange <berrange(a)redhat.com> + */ + + + +#include <config.h> + +#include <arpa/inet.h> + +#include "internal.h" + +#include "network_conf.h" +#include "memory.h" +#include "xml.h" +#include "uuid.h" +#include "util.h" +#include "buf.h" + +VIR_ENUM_DECL(virNetworkForward) + +VIR_ENUM_IMPL(virNetworkForward, + VIR_NETWORK_FORWARD_LAST, + "none", "nat", "route" ) + +static void virNetworkReportError(virConnectPtr conn, + int code, const char *fmt, ...) +{ + va_list args; + char errorMessage[1024]; + const char *virerr; + + if (fmt) { + va_start(args, fmt); + vsnprintf(errorMessage, sizeof(errorMessage)-1, fmt, args); + va_end(args); + } else { + errorMessage[0] = '\0'; + } + + virerr = __virErrorMsg(code, (errorMessage[0] ? errorMessage : NULL)); + __virRaiseError(conn, NULL, NULL, VIR_FROM_QEMU, code, VIR_ERR_ERROR, + virerr, errorMessage, NULL, -1, -1, virerr, errorMessage); +} + + +virNetworkObjPtr virNetworkFindByUUID(const virNetworkObjPtr nets, + const unsigned char *uuid) +{ + virNetworkObjPtr net = nets; + while (net) { + if (!memcmp(net->def->uuid, uuid, VIR_UUID_BUFLEN)) + return net; + net = net->next; + } + + return NULL; +} + +virNetworkObjPtr virNetworkFindByName(const virNetworkObjPtr nets, + const char *name) +{ + virNetworkObjPtr net = nets; + while (net) { + if (STREQ(net->def->name, name)) + return net; + net = net->next; + } + + return NULL; +} + + +void virNetworkDefFree(virNetworkDefPtr def) +{ + int i; + + if (!def) + return; + + VIR_FREE(def->name); + VIR_FREE(def->bridge); + VIR_FREE(def->forwardDev); + VIR_FREE(def->ipAddress); + VIR_FREE(def->network); + VIR_FREE(def->netmask); + + for (i = 0 ; i < def->nranges && def->ranges ; i++) { + VIR_FREE(def->ranges[i].start); + VIR_FREE(def->ranges[i].end); + } + VIR_FREE(def->ranges); + + VIR_FREE(def); +} + +void virNetworkObjFree(virNetworkObjPtr net) +{ + if (!net) + return; + + virNetworkDefFree(net->def); + virNetworkDefFree(net->newDef); + + VIR_FREE(net->configFile); + VIR_FREE(net->autostartLink); + + VIR_FREE(net); +} + +virNetworkObjPtr virNetworkAssignDef(virConnectPtr conn, + virNetworkObjPtr *nets, + const virNetworkDefPtr def) +{ + virNetworkObjPtr network; + + if ((network = virNetworkFindByName(*nets, def->name))) { + if (!virNetworkIsActive(network)) { + virNetworkDefFree(network->def); + network->def = def; + } else { + if (network->newDef) + virNetworkDefFree(network->newDef); + network->newDef = def; + } + + return network; + } + + if (VIR_ALLOC(network) < 0) { + virNetworkReportError(conn, VIR_ERR_NO_MEMORY, NULL); + return NULL; + } + + network->def = def; + network->next = *nets; + + *nets = network; + + return network; + +} + +void virNetworkRemoveInactive(virNetworkObjPtr *nets, + const virNetworkObjPtr net) +{ + virNetworkObjPtr prev = NULL; + virNetworkObjPtr curr = *nets; + + while (curr && + curr != net) { + prev = curr; + curr = curr->next; + } + + if (curr) { + if (prev) + prev->next = curr->next; + else + *nets = curr->next; + } + + virNetworkObjFree(net); +} + + +static int +virNetworkDHCPRangeDefParseXML(virConnectPtr conn, + virNetworkDefPtr def, + xmlNodePtr node) { + + xmlNodePtr cur; + + cur = node->children; + while (cur != NULL) { + xmlChar *start, *end; + + if (cur->type != XML_ELEMENT_NODE || + !xmlStrEqual(cur->name, BAD_CAST "range")) { + cur = cur->next; + continue; + } + + if (!(start = xmlGetProp(cur, BAD_CAST "start"))) { + cur = cur->next; + continue; + } + if (!(end = xmlGetProp(cur, BAD_CAST "end"))) { + cur = cur->next; + xmlFree(start); + continue; + } + + if (VIR_REALLOC_N(def->ranges, def->nranges + 1) < 0) { + xmlFree(start); + xmlFree(end); + virNetworkReportError(conn, VIR_ERR_NO_MEMORY, NULL); + return -1; + } + def->ranges[def->nranges].start = (char *)start; + def->ranges[def->nranges].end = (char *)end; + def->nranges++; + + cur = cur->next; + } + + return 0; +} + +static virNetworkDefPtr +virNetworkDefParseXML(virConnectPtr conn, + xmlDocPtr xml) +{ + xmlNodePtr root = NULL; + xmlXPathContextPtr ctxt = NULL; + virNetworkDefPtr def; + char *tmp; + + if (VIR_ALLOC(def) < 0) { + virNetworkReportError(conn, VIR_ERR_NO_MEMORY, NULL); + return NULL; + } + + /* Prepare parser / xpath context */ + root = xmlDocGetRootElement(xml); + if ((root == NULL) || (!xmlStrEqual(root->name, BAD_CAST "network"))) { + virNetworkReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("incorrect root element")); + goto error; + } + + ctxt = xmlXPathNewContext(xml); + if (ctxt == NULL) { + virNetworkReportError(conn, VIR_ERR_NO_MEMORY, + "%s", _("failed to allocate space for xmlXPathContext string")); + goto error; + } + + + /* Extract network name */ + def->name = virXPathString("string(/network/name[1])", ctxt); + if (!def->name) { + virNetworkReportError(conn, VIR_ERR_NO_NAME, NULL); + goto error; + } + + /* Extract network uuid */ + tmp = virXPathString("string(/network/uuid[1])", ctxt); + if (!tmp) { + int err; + if ((err = virUUIDGenerate(def->uuid))) { + virNetworkReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("Failed to generate UUID: %s"), strerror(err)); + goto error; + } + } else { + if (virUUIDParse(tmp, def->uuid) < 0) { + VIR_FREE(tmp); + virNetworkReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("malformed uuid element")); + goto error; + } + VIR_FREE(tmp); + } + + /* Parse bridge information */ + def->bridge = virXPathString("string(/network/bridge[1]/@name)", ctxt); + tmp = virXPathString("string(/network/bridge[1]/@stp)", ctxt); + if (tmp && STREQ(tmp, "off")) + def->stp = 0; + else + def->stp = 1; + VIR_FREE(tmp); + + if (virXPathLong("string(/network/bridge[1]/@delay)", ctxt, &def->delay) < 0) + def->delay = 0; + + def->ipAddress = virXPathString("string(/network/ip[1]/@address)", ctxt); + def->netmask = virXPathString("string(/network/ip[1]/@netmask)", ctxt); + if (def->ipAddress && + def->netmask) { + /* XXX someday we want IPv6 too, so inet_aton won't work there */ + struct in_addr inaddress, innetmask; + char *netaddr; + int netlen; + xmlNodePtr dhcp; + + if (!inet_aton(def->ipAddress, &inaddress)) { + virNetworkReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("cannot parse IP address '%s'"), + def->ipAddress); + goto error; + } + if (!inet_aton(def->netmask, &innetmask)) { + virNetworkReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("cannot parse netmask '%s'"), + def->netmask); + goto error; + } + + inaddress.s_addr &= innetmask.s_addr; + netaddr = inet_ntoa(inaddress); + + netlen = strlen(netaddr) + 1 + strlen(def->netmask) + 1; + if (VIR_ALLOC_N(def->network, netlen) < 0) { + virNetworkReportError(conn, VIR_ERR_NO_MEMORY, NULL); + goto error; + } + strcpy(def->network, netaddr); + strcat(def->network, "/"); + strcat(def->network, def->netmask); + + + if ((dhcp = virXPathNode("/network/ip[1]/dhcp[1]", ctxt)) && + virNetworkDHCPRangeDefParseXML(conn, def, dhcp) < 0) + goto error; + } + + + /* IPv4 forwarding setup */ + if (virXPathBoolean("count(/network/forward) > 0", ctxt)) { + if (!def->ipAddress || + !def->netmask) { + virNetworkReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("Forwarding requested, but no IPv4 address/netmask provided")); + goto error; + } + + tmp = virXPathString("string(/network/forward[1]/@mode)", ctxt); + if (tmp) { + if ((def->forwardType = virNetworkForwardTypeFromString(tmp)) < 0) { + virNetworkReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("unknown forwarding type '%s'"), tmp); + VIR_FREE(tmp); + } + VIR_FREE(tmp); + } else { + def->forwardType = VIR_NETWORK_FORWARD_NAT; + } + + + def->forwardDev = virXPathString("string(/network/forward[1]/@dev)", ctxt); + } else { + def->forwardType = VIR_NETWORK_FORWARD_NONE; + } + + xmlXPathFreeContext(ctxt); + + return def; + + error: + xmlXPathFreeContext(ctxt); + virNetworkDefFree(def); + return NULL; +} + +virNetworkDefPtr virNetworkDefParse(virConnectPtr conn, + const char *xmlStr, + const char *displayName) +{ + xmlDocPtr xml; + virNetworkDefPtr def; + + if (!(xml = xmlReadDoc(BAD_CAST xmlStr, displayName ? displayName : "network.xml", NULL, + XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NOERROR | XML_PARSE_NOWARNING))) { + virNetworkReportError(conn, VIR_ERR_XML_ERROR, NULL); + return NULL; + } + + def = virNetworkDefParseXML(conn, xml); + + xmlFreeDoc(xml); + + return def; +} + +char *virNetworkDefFormat(virConnectPtr conn, + const virNetworkDefPtr def) +{ + virBuffer buf = VIR_BUFFER_INITIALIZER; + unsigned char *uuid; + char *tmp; + char uuidstr[VIR_UUID_STRING_BUFLEN]; + + virBufferAddLit(&buf, "<network>\n"); + virBufferVSprintf(&buf, " <name>%s</name>\n", def->name); + + uuid = def->uuid; + virUUIDFormat(uuid, uuidstr); + virBufferVSprintf(&buf, " <uuid>%s</uuid>\n", uuidstr); + + if (def->forwardType != VIR_NETWORK_FORWARD_NONE) { + const char *mode = virNetworkForwardTypeToString(def->forwardType); + if (mode) { + if (def->forwardDev) { + virBufferVSprintf(&buf, " <forward dev='%s' mode='%s'/>\n", + def->forwardDev, mode); + } else { + virBufferVSprintf(&buf, " <forward mode='%s'/>\n", mode); + } + } + } + + virBufferAddLit(&buf, " <bridge"); + if (def->bridge) + virBufferVSprintf(&buf, " name='%s'", def->bridge); + virBufferVSprintf(&buf, " stp='%s' forwardDelay='%ld' />\n", + def->stp ? "on" : "off", + def->delay); + + if (def->ipAddress || def->netmask) { + virBufferAddLit(&buf, " <ip"); + + if (def->ipAddress) + virBufferVSprintf(&buf, " address='%s'", def->ipAddress); + + if (def->netmask) + virBufferVSprintf(&buf, " netmask='%s'", def->netmask); + + virBufferAddLit(&buf, ">\n"); + + if (def->nranges) { + int i; + virBufferAddLit(&buf, " <dhcp>\n"); + for (i = 0 ; i < def->nranges ; i++) + virBufferVSprintf(&buf, " <range start='%s' end='%s' />\n", + def->ranges[i].start, def->ranges[i].end); + virBufferAddLit(&buf, " </dhcp>\n"); + } + + virBufferAddLit(&buf, " </ip>\n"); + } + + virBufferAddLit(&buf, "</network>\n"); + + if (virBufferError(&buf)) + goto no_memory; + + return virBufferContentAndReset(&buf); + + no_memory: + virNetworkReportError(conn, VIR_ERR_NO_MEMORY, NULL); + tmp = virBufferContentAndReset(&buf); + VIR_FREE(tmp); + return NULL; +} + diff -r a6e5acdd23df src/network_conf.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/network_conf.h Tue Jun 24 15:07:23 2008 +0100 @@ -0,0 +1,114 @@ +/* + * network_conf.h: network XML handling + * + * Copyright (C) 2006-2008 Red Hat, Inc. + * Copyright (C) 2006-2008 Daniel P. Berrange + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Daniel P. Berrange <berrange(a)redhat.com> + */ + +#ifndef __NETWORK_CONF_H__ +#define __NETWORK_CONF_H__ + +#include "internal.h" + +/* 2 possible types of forwarding */ +enum virNetworkForwardType { + VIR_NETWORK_FORWARD_NONE = 0, + VIR_NETWORK_FORWARD_NAT, + VIR_NETWORK_FORWARD_ROUTE, + + VIR_NETWORK_FORWARD_LAST, +}; + +typedef struct _virNetworkDHCPRangeDef virNetworkDHCPRangeDef; +typedef virNetworkDHCPRangeDef *virNetworkDHCPRangeDefPtr; +struct _virNetworkDHCPRangeDef { + char *start; + char *end; +}; + +typedef struct _virNetworkDef virNetworkDef; +typedef virNetworkDef *virNetworkDefPtr; +struct _virNetworkDef { + unsigned char uuid[VIR_UUID_BUFLEN]; + char *name; + + char *bridge; /* Name of bridge device */ + int stp : 1; /* Spanning tree protocol */ + long delay; /* Bridge forward delay (ms) */ + + int forwardType; /* One of virNetworkForwardType constants */ + char *forwardDev; /* Destination device for forwarding */ + + char *ipAddress; /* Bridge IP address */ + char *netmask; + char *network; + + int nranges; /* Zero or more dhcp ranges */ + virNetworkDHCPRangeDefPtr ranges; +}; + +typedef struct _virNetworkObj virNetworkObj; +typedef virNetworkObj *virNetworkObjPtr; +struct _virNetworkObj { + int dnsmasqPid; + unsigned int active : 1; + unsigned int autostart : 1; + unsigned int persistent : 1; + + char *configFile; /* Persistent config file path */ + char *autostartLink; /* Symlink path for autostart */ + + virNetworkDefPtr def; /* The current definition */ + virNetworkDefPtr newDef; /* New definition to activate at shutdown */ + + virNetworkObjPtr next; +}; + +static inline int +virNetworkIsActive(const virNetworkObjPtr net) +{ + return net->active; +} + + +virNetworkObjPtr virNetworkFindByUUID(const virNetworkObjPtr nets, + const unsigned char *uuid); +virNetworkObjPtr virNetworkFindByName(const virNetworkObjPtr nets, + const char *name); + + +void virNetworkDefFree(virNetworkDefPtr def); +void virNetworkObjFree(virNetworkObjPtr net); + +virNetworkObjPtr virNetworkAssignDef(virConnectPtr conn, + virNetworkObjPtr *nets, + const virNetworkDefPtr def); +void virNetworkRemoveInactive(virNetworkObjPtr *nets, + const virNetworkObjPtr net); + +virNetworkDefPtr virNetworkDefParse(virConnectPtr conn, + const char *xmlStr, + const char *displayName); + +char *virNetworkDefFormat(virConnectPtr conn, + const virNetworkDefPtr def); + + +#endif /* __NETWORK_CONF_H__ */ + -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 5

[libvirt] Release of libvirt-java-0.1.1
by Daniel Veillard 01 Jul '08

01 Jul '08

A new release which should fix the main portability problems (crossing fingers) and add the authentication support patch from Tóth István. Available at ftp://libvirt.org/libvirt/java/ 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

[libvirt] read-only git mirror of cvs libvirt-java repo
by Jim Meyering 01 Jul '08

01 Jul '08

A libvirt-java git mirror is in place: Browse change-sets via the web (gitweb): http://git.et.redhat.com/?p=libvirt-java.git;a=summary "check out" a copy of the repository with this command: git clone git://git.et.redhat.com/libvirt-java

1 0

[libvirt] libvirt-java patch
by Tóth István 30 Jun '08

30 Jun '08

This patch contains: -random bugfixes -gcc -Wall "fixes" -a few new constants for 4.x -Implementation of virConnectAuth -javah build fixes (One .class file can generate many .h files.) It is NOT a full update for 4.x, the only major new feature is authentication support. I've attached the patch, and the new files. (Is there some way to generate patches with new files?) Please remove the /src/jni/org_libvirt_VirDomain_CreateFlags.h /src/jni/org_libvirt_VirDomain_MigrateFlags.h files from the CVS, as these are auto-generated. regards István ? .project ? src/jni/VirConnectAuthCallbackBridge.c ? src/jni/VirConnectAuthCallbackBridge.h ? src/org/libvirt/VirConnectAuth.java ? src/org/libvirt/VirConnectAuthDefault.java ? src/org/libvirt/VirConnectCredential.java Index: src/Makefile.am =================================================================== RCS file: /data/cvs/libvirt-java/src/Makefile.am,v retrieving revision 1.2 diff -u -p -r1.2 Makefile.am --- src/Makefile.am 25 Jun 2008 13:02:30 -0000 1.2 +++ src/Makefile.am 29 Jun 2008 17:22:35 -0000 @@ -4,6 +4,9 @@ SUBDIRS=. jni java_libvirt_source_files = \ org/libvirt/LibvirtException.java \ org/libvirt/VirConnect.java \ + org/libvirt/VirConnectAuthDefault.java \ + org/libvirt/VirConnectAuth.java \ + org/libvirt/VirConnectCredential.java \ org/libvirt/VirDomainBlockStats.java \ org/libvirt/VirDomainInfo.java \ org/libvirt/VirDomainInterfaceStats.java \ Index: src/test.java =================================================================== RCS file: /data/cvs/libvirt-java/src/test.java,v retrieving revision 1.1 diff -u -p -r1.1 test.java --- src/test.java 24 Jun 2008 16:32:24 -0000 1.1 +++ src/test.java 29 Jun 2008 17:22:35 -0000 @@ -16,6 +16,19 @@ public class test { Integer.decode("0xc3"), Integer.decode("0x0f"), Integer.decode("0x5a"), Integer.decode("0xa5"), Integer.decode("0xf0"), Integer.decode("0x3c"), Integer.decode("0x87"), Integer.decode("0xd2"), Integer.decode("0x1e"), Integer.decode("0x69")} ; + + //For testing the authentication + VirConnectAuth defaultAuth = new VirConnectAuthDefault(); + + //You need to configure your libvirtd for remote/authenticated connections, and adjust the URL below + //for this to work. Otherwise, you'll get an error + try{ + conn = new VirConnect("test+tcp://localhost/default", defaultAuth, 0); + System.out.println("Encrypted connection successful!"); + } catch (LibvirtException e){ + System.out.println("exception caught:"+e); + System.out.println(e.getVirError()); + } try{ conn = new VirConnect("test:///default", false); Index: src/jni/Makefile.am =================================================================== RCS file: /data/cvs/libvirt-java/src/jni/Makefile.am,v retrieving revision 1.2 diff -u -p -r1.2 Makefile.am --- src/jni/Makefile.am 25 Jun 2008 13:02:30 -0000 1.2 +++ src/jni/Makefile.am 29 Jun 2008 17:22:35 -0000 @@ -5,12 +5,17 @@ SOURCES = \ org_libvirt_VirConnect.c \ org_libvirt_VirDomain.c \ VirErrorHandler.c \ - VirErrorHandler.h + VirErrorHandler.h \ + VirConnectAuthCallbackBridge.c \ + VirConnectAuthCallbackBridge.h GENERATED = \ org_libvirt_VirConnect.h \ org_libvirt_VirNetwork.h \ - org_libvirt_VirDomain.h + org_libvirt_VirDomain.h \ + org_libvirt_VirDomain_CreateFlags.h \ + org_libvirt_VirDomain_MigrateFlags.h \ + org_libvirt_VirDomain_XMLFlags.h BUILT_SOURCES = $(GENERATED) @@ -20,7 +25,7 @@ org_libvirt_VirConnect.h : $(JAVA_CLASS_ org_libvirt_VirNetwork.h: $(JAVA_CLASS_ROOT)/org/libvirt/VirNetwork.class $(JAVAH) -classpath $(JAVA_CLASS_ROOT) org.libvirt.VirNetwork -org_libvirt_VirDomain.h: $(JAVA_CLASS_ROOT)/org/libvirt/VirDomain.class +org_libvirt_VirDomain.h org_libvirt_VirDomain_CreateFlags.h org_libvirt_VirDomain_MigrateFlags.h org_libvirt_VirDomain_XMLFlags.h : $(JAVA_CLASS_ROOT)/org/libvirt/VirDomain.class $(JAVAH) -classpath $(JAVA_CLASS_ROOT) org.libvirt.VirDomain lib_LTLIBRARIES = libvirt_jni.la @@ -31,4 +36,4 @@ libvirt_jni_la_LDFLAGS = -version-info CLEANFILES = \ - $(GENERATED) + $(GENERATED) $(GENERATED_SUB_1) Index: src/jni/org_libvirt_VirConnect.c =================================================================== RCS file: /data/cvs/libvirt-java/src/jni/org_libvirt_VirConnect.c,v retrieving revision 1.1 diff -u -p -r1.1 org_libvirt_VirConnect.c --- src/jni/org_libvirt_VirConnect.c 24 Jun 2008 16:32:24 -0000 1.1 +++ src/jni/org_libvirt_VirConnect.c 29 Jun 2008 17:22:35 -0000 @@ -2,14 +2,20 @@ #include <libvirt/libvirt.h> #include <stdlib.h> #include "VirErrorHandler.h" +#include "VirConnectAuthCallbackBridge.h" + +#include <assert.h> + +//TODO We are leaking UTFChars all over the place. We need to strcpy, then release every string we get from JAVA, and not use them directly! JNIEXPORT jint JNICALL Java_org_libvirt_VirConnect__1virInitialize (JNIEnv *env, jclass cls){ int result; result=virInitialize(); - //The connection-less errors go to the initializing thread as an aexception. + //The connection-less errors go to the initializing thread as an exception. //Not ideal, but better than just dropping the errors. virSetErrorFunc(env, virErrorHandler); + return result; } JNIEXPORT void JNICALL Java_org_libvirt_VirConnect__1close @@ -22,7 +28,7 @@ JNIEXPORT jstring JNICALL Java_org_libvi //All this gymnastics is so that we can free() the hostname string jstring j_hostname=NULL; char *hostname; - if(hostname = virConnectGetHostname((virConnectPtr)VCP)){ + if((hostname = virConnectGetHostname((virConnectPtr)VCP))){ j_hostname = (*env)->NewStringUTF(env, hostname); free(hostname); } @@ -33,7 +39,7 @@ JNIEXPORT jstring JNICALL Java_org_libvi (JNIEnv *env, jobject obj, jlong VCP){ jstring j_capabilities=NULL; char *capabilities; - if(capabilities = virConnectGetCapabilities((virConnectPtr)VCP)){ + if((capabilities = virConnectGetCapabilities((virConnectPtr)VCP))){ j_capabilities = (*env)->NewStringUTF(env, capabilities); free(capabilities); } @@ -49,7 +55,7 @@ JNIEXPORT jstring JNICALL Java_org_libvi (JNIEnv *env, jobject obj, jlong VCP){ const char *type; //Here we get a static string, no need to free() - if(type=virConnectGetType((virConnectPtr)VCP)){ + if((type=virConnectGetType((virConnectPtr)VCP))){ return (*env)->NewStringUTF(env, type); } else { return NULL; @@ -60,7 +66,7 @@ JNIEXPORT jstring JNICALL Java_org_libvi (JNIEnv *env, jobject obj, jlong VCP){ jstring j_uri=NULL; char *uri; - if(uri = virConnectGetURI((virConnectPtr)VCP)){ + if((uri = virConnectGetURI((virConnectPtr)VCP))){ j_uri = (*env)->NewStringUTF(env, uri); free(uri); } @@ -150,7 +156,7 @@ JNIEXPORT jlong JNICALL Java_org_libvirt if(vc==NULL){ virCopyLastError(&error); virErrorHandler(env, &error); - return (long)NULL; + return (jlong)NULL; } //Initialized the error handler for this connection @@ -170,7 +176,7 @@ JNIEXPORT jlong JNICALL Java_org_libvirt if(vc==NULL){ virCopyLastError(&error); virErrorHandler(env, &error); - return (long)NULL; + return (jlong)NULL; } //Initialized the error handler for this connection @@ -179,14 +185,67 @@ JNIEXPORT jlong JNICALL Java_org_libvirt return (jlong)vc; }; +JNIEXPORT jlong JNICALL Java_org_libvirt_VirConnect__1openAuth + (JNIEnv *env, jobject obj, jstring uri, jobject j_auth, jint flags){ + + virConnectPtr vc; + virError error; + + virConnectAuth *auth = malloc(sizeof(virConnectAuth)); + + jobject j_credTypeElement; + int c; + + //Prepare by computing the class and field IDs + jfieldID credTypeArray_id = (*env)->GetFieldID(env, + (*env)->FindClass(env, "org/libvirt/VirConnectAuth"), + "credType", + "[Lorg/libvirt/VirConnectCredential$VirConnectCredentialType;"); + jmethodID credTypeMapToInt_id = (*env)->GetMethodID(env, + (*env)->FindClass(env, "org/libvirt/VirConnectCredential$VirConnectCredentialType"), + "mapToInt", + "()I"); + + //Copy the array of credtypes with the helper function + jarray j_credTypeArray=(*env)->GetObjectField(env, j_auth, credTypeArray_id); + auth->ncredtype = (*env)->GetArrayLength(env, j_credTypeArray); + + auth->credtype = calloc(auth->ncredtype, sizeof(int)); + for(c=0; c< auth->ncredtype; c++){ + j_credTypeElement = (*env)->GetObjectArrayElement(env, j_credTypeArray, c); + auth->credtype[c]=(*env)->CallIntMethod(env, j_credTypeElement, credTypeMapToInt_id); + } + + //The callback function is always VirConnectAuthCallbackBridge + auth->cb = &VirConnectAuthCallbackBridge; + //We pass the VirConnectAuth object and the JNI env in cdbata + CallBackStructType* cb_wrapper; + cb_wrapper = malloc(sizeof(CallBackStructType)); + cb_wrapper->env = env; + cb_wrapper->auth = j_auth; + auth->cbdata=cb_wrapper; + + vc=virConnectOpenAuth((*env)->GetStringUTFChars(env, uri, NULL), auth, flags); + if(vc==NULL){ + virCopyLastError(&error); + virErrorHandler(env, &error); + return (jlong)NULL; + } + + //Initialize the error handler for this connection + virConnSetErrorFunc(vc, env, virErrorHandler); + + return (jlong)vc; +} + JNIEXPORT jlong JNICALL Java_org_libvirt_VirConnect__1virNetworkCreateXML (JNIEnv *env, jobject obj, jlong VCP, jstring xmlDesc){ - return(jlong)virNetworkCreateXML((virConnectPtr)VCP, (*env)->GetStringUTFChars(env, xmlDesc, NULL)); + return (jlong)virNetworkCreateXML((virConnectPtr)VCP, (*env)->GetStringUTFChars(env, xmlDesc, NULL)); } JNIEXPORT jlong JNICALL Java_org_libvirt_VirConnect__1virNetworkDefineXML (JNIEnv *env, jobject obj, jlong VCP, jstring xmlDesc){ - return(jlong)virNetworkDefineXML((virConnectPtr)VCP, (*env)->GetStringUTFChars(env, xmlDesc, NULL)); + return (jlong)virNetworkDefineXML((virConnectPtr)VCP, (*env)->GetStringUTFChars(env, xmlDesc, NULL)); } JNIEXPORT jlong JNICALL Java_org_libvirt_VirConnect__1virNetworkLookupByName @@ -202,7 +261,6 @@ JNIEXPORT jlong JNICALL Java_org_libvirt //compact to bytes for(c=0; c < VIR_UUID_BUFLEN; c++) UUID[c]=UUID_int[c]; - (*env)->ExceptionDescribe(env); return (jlong)virNetworkLookupByUUID((virConnectPtr)VCP, UUID); } @@ -266,8 +324,8 @@ JNIEXPORT jintArray JNICALL Java_org_lib (JNIEnv *env, jobject obj, jlong VCP){ int maxids; int *ids; - int c; jintArray j_ids=NULL; + if((maxids = virConnectNumOfDomains((virConnectPtr)VCP))<0) return NULL; ids= (int*)calloc(maxids, sizeof(int)); @@ -313,7 +371,7 @@ JNIEXPORT jlong JNICALL Java_org_libvirt JNIEXPORT jlong JNICALL Java_org_libvirt_VirConnect__1virGetHypervisorVersion (JNIEnv *env, jobject obj, jstring j_type){ - long libVer; + unsigned long libVer; const char *type; unsigned long typeVer; Index: src/jni/org_libvirt_VirDomain.c =================================================================== RCS file: /data/cvs/libvirt-java/src/jni/org_libvirt_VirDomain.c,v retrieving revision 1.1 diff -u -p -r1.1 org_libvirt_VirDomain.c --- src/jni/org_libvirt_VirDomain.c 24 Jun 2008 16:32:24 -0000 1.1 +++ src/jni/org_libvirt_VirDomain.c 29 Jun 2008 17:22:36 -0000 @@ -7,7 +7,7 @@ JNIEXPORT jstring JNICALL Java_org_libvi (JNIEnv *env, jobject obj, jlong VDP, jint flags){ jstring j_xmlDesc; char* xmlDesc = NULL; - if(xmlDesc = virDomainGetXMLDesc((virDomainPtr)VDP, flags)){ + if((xmlDesc = virDomainGetXMLDesc((virDomainPtr)VDP, flags))){ j_xmlDesc = (*env)->NewStringUTF(env, xmlDesc); free(xmlDesc); } @@ -56,7 +56,7 @@ JNIEXPORT jstring JNICALL Java_org_libvi jstring j_OSType; char *OSType; - if(OSType = virDomainGetOSType((virDomainPtr)VDP)){ + if((OSType = virDomainGetOSType((virDomainPtr)VDP))){ j_OSType = (*env)->NewStringUTF(env, OSType); free(OSType); } @@ -70,7 +70,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_ int nparams; //We don't return nparams - if(schedulerType = virDomainGetSchedulerType((virDomainPtr)VDP, &nparams)){ + if((schedulerType = virDomainGetSchedulerType((virDomainPtr)VDP, &nparams))){ j_schedulerType = (*env)->NewStringUTF(env, schedulerType); free(schedulerType); } @@ -264,7 +264,6 @@ JNIEXPORT jobjectArray JNICALL Java_org_ jobject j_info; jobjectArray j_infoArray=NULL; - jobjectArray j_statusArray; jfieldID number_id; jfieldID state_id; @@ -332,7 +331,7 @@ JNIEXPORT jintArray JNICALL Java_org_lib int *i_cpumaps; jintArray j_cpumaps; int c; - virNodeInfo nodeinfo; + virNodeInfoPtr nodeinfo; virVcpuInfoPtr info; //Check number of vcpus; @@ -340,9 +339,9 @@ JNIEXPORT jintArray JNICALL Java_org_lib return NULL; //Get maplen - if(VirNodeGetInfo( virDomainGetConnect( (virDomainPtr)VDP), nodeinfo )<0) + if(virNodeGetInfo( virDomainGetConnect( (virDomainPtr)VDP), nodeinfo )<0) return NULL; - maplen=VIR_CPU_MAPLEN( VIR_NODEINFO_MAXCPUS( nodeinfo ) ); + maplen=VIR_CPU_MAPLEN( VIR_NODEINFO_MAXCPUS( *nodeinfo ) ); info=(virVcpuInfoPtr)calloc(maxinfo, sizeof(virVcpuInfo)); cpumaps=malloc(sizeof(int)*maxinfo*maplen); @@ -368,6 +367,7 @@ JNIEXPORT jint JNICALL Java_org_libvirt_ unsigned char *cpumap; jint *i_cpumap; int c; + int retval; //Get maplen maplen=(*env)->GetArrayLength(env, j_cpumap); @@ -382,10 +382,11 @@ JNIEXPORT jint JNICALL Java_org_libvirt_ cpumap[c]=i_cpumap[c]; //Call libvirt - virDomainPinVcpu((virDomainPtr)VDP, vcpu, cpumap, maplen); + retval = virDomainPinVcpu((virDomainPtr)VDP, vcpu, cpumap, maplen); free(cpumap); free(i_cpumap); + return retval; } JNIEXPORT jint JNICALL Java_org_libvirt_VirDomain__1setVcpus Index: src/jni/org_libvirt_VirNetwork.c =================================================================== RCS file: /data/cvs/libvirt-java/src/jni/org_libvirt_VirNetwork.c,v retrieving revision 1.1 diff -u -p -r1.1 org_libvirt_VirNetwork.c --- src/jni/org_libvirt_VirNetwork.c 24 Jun 2008 16:32:24 -0000 1.1 +++ src/jni/org_libvirt_VirNetwork.c 29 Jun 2008 17:22:36 -0000 @@ -1,11 +1,12 @@ #include "org_libvirt_VirNetwork.h" #include <libvirt/libvirt.h> +#include <stdlib.h> JNIEXPORT jstring JNICALL Java_org_libvirt_VirNetwork__1getXMLDesc (JNIEnv *env, jobject obj, jlong VNP, jint flags){ jstring j_xmlDesc; char* xmlDesc; - if(xmlDesc = virNetworkGetXMLDesc((virNetworkPtr)VNP, flags)){ + if((xmlDesc = virNetworkGetXMLDesc((virNetworkPtr)VNP, flags))){ j_xmlDesc = (*env)->NewStringUTF(env, xmlDesc); free(xmlDesc); } @@ -36,15 +37,15 @@ JNIEXPORT jboolean JNICALL Java_org_libv JNIEXPORT jint JNICALL Java_org_libvirt_VirNetwork__1setAutostart (JNIEnv *env, jobject obj, jlong VNP, jboolean autostart){ - virNetworkSetAutostart((virNetworkPtr)VNP, autostart); + return virNetworkSetAutostart((virNetworkPtr)VNP, autostart); } JNIEXPORT jstring JNICALL Java_org_libvirt_VirNetwork__1getBridgeName (JNIEnv *env, jobject obj, jlong VNP){ jstring j_bridgeName; - char *bridgeName; + char *bridgeName=NULL; - if(bridgeName = virNetworkGetBridgeName((virNetworkPtr)VNP)){ + if((bridgeName = virNetworkGetBridgeName((virNetworkPtr)VNP))){ j_bridgeName = (*env)->NewStringUTF(env, bridgeName); free(bridgeName); } Index: src/org/libvirt/VirConnect.java =================================================================== RCS file: /data/cvs/libvirt-java/src/org/libvirt/VirConnect.java,v retrieving revision 1.1 diff -u -p -r1.1 VirConnect.java --- src/org/libvirt/VirConnect.java 24 Jun 2008 16:32:24 -0000 1.1 +++ src/org/libvirt/VirConnect.java 29 Jun 2008 17:22:36 -0000 @@ -49,16 +49,30 @@ public class VirConnect { } /** + * Constructs a VirConnect object from the supplied URI, + * using the supplied authentication callback + * + * @param uri The connection URI + * @param auth a VirConnectAuth object + * @param flags + * @throws LibvirtException + * @see <a href="http://libvirt.org/uri.html">The URI documentation</a> + */ + public VirConnect(String uri, VirConnectAuth auth, int flags) throws LibvirtException { + VCP = _openAuth(uri, auth, flags); + } + + /** * Constructs a read-write VirConnect object from the supplied URI. * - * @param uri + * @param uri The connection URI * @throws LibvirtException * @see <a href="http://libvirt.org/uri.html">The URI documentation</a> */ public VirConnect(String uri) throws LibvirtException { VCP = _open(uri); } - + public void finalize() throws LibvirtException { close(); } @@ -307,6 +321,9 @@ public class VirConnect { // openReadOnly private native long _openReadOnly(String uri) throws LibvirtException; + // openAuth + private native long _openAuth(String uri, VirConnectAuth auth, int flags) throws LibvirtException; + // virNetwork stuff /** Index: src/org/libvirt/VirDomain.java =================================================================== RCS file: /data/cvs/libvirt-java/src/org/libvirt/VirDomain.java,v retrieving revision 1.1 diff -u -p -r1.1 VirDomain.java --- src/org/libvirt/VirDomain.java 24 Jun 2008 16:32:24 -0000 1.1 +++ src/org/libvirt/VirDomain.java 29 Jun 2008 17:22:36 -0000 @@ -7,9 +7,23 @@ public class VirDomain { } static final class MigrateFlags{ + /** + * live migration + */ static final int VIR_MIGRATE_LIVE = 1; } + static final class XMLFlags{ + /** + * dump security sensitive information too + */ + static final int VIR_DOMAIN_XML_SECURE = 1; + /** + * dump inactive domain information + */ + static final int VIR_DOMAIN_XML_INACTIVE = 2; + } + /** * the native virDomainPtr. */ Index: src/org/libvirt/VirError.java =================================================================== RCS file: /data/cvs/libvirt-java/src/org/libvirt/VirError.java,v retrieving revision 1.1 diff -u -p -r1.1 VirError.java --- src/org/libvirt/VirError.java 24 Jun 2008 16:32:24 -0000 1.1 +++ src/org/libvirt/VirError.java 29 Jun 2008 17:22:37 -0000 @@ -59,7 +59,23 @@ public class VirError { /** * Error from OpenVZ driver */ - VIR_FROM_OPENVZ + VIR_FROM_OPENVZ, + /** + * Error at Xen XM layer + */ + VIR_FROM_XENXM, + /** + * Error in the Linux Stats code + */ + VIR_FROM_STATS_LINUX, + /** + * Error from Linux Container driver + */ + VIR_FROM_LXC, + /** + * Error from storage driver + */ + VIR_FROM_STORAGE } public static enum VirErrorLevel { @@ -251,7 +267,31 @@ public class VirError { /** * invalid MAC adress */ - VIR_ERR_INVALID_MAC + VIR_ERR_INVALID_MAC, + /** + * authentication failed + */ + VIR_ERR_AUTH_FAILED, + /** + * invalid storage pool object + */ + VIR_ERR_INVALID_STORAGE_POOL, + /** + * invalid storage vol object + */ + VIR_ERR_INVALID_STORAGE_VOL, + /** + * failed to start storage + */ + VIR_WAR_NO_STORAGE, + /** + * storage pool not found + */ + VIR_ERR_NO_STORAGE_POOL, + /** + * storage pool not found + */ + VIR_ERR_NO_STORAGE_VOL } VirErrorNumber code; @@ -328,7 +368,7 @@ public class VirError { } /** - * Does this error has a valid Connection object atteched? + * Does this error has a valid Connection object attached? * @return */ public boolean hasConn(){ @@ -416,7 +456,6 @@ public class VirError { output.append("int1:" + int1 + "\n"); output.append("int2:" + int2 + "\n"); return output.toString(); - } } Index: src/org/libvirt/VirSchedParameter.java =================================================================== RCS file: /data/cvs/libvirt-java/src/org/libvirt/VirSchedParameter.java,v retrieving revision 1.1 diff -u -p -r1.1 VirSchedParameter.java --- src/org/libvirt/VirSchedParameter.java 24 Jun 2008 16:32:24 -0000 1.1 +++ src/org/libvirt/VirSchedParameter.java 29 Jun 2008 17:22:37 -0000 @@ -20,7 +20,7 @@ public abstract class VirSchedParameter */ public abstract String getValueAsString(); /** - * Utility function for displayinf the type + * Utility function for displaying the type * * @return the Type of the parameter as string */ #include <jni.h> #include <libvirt/libvirt.h> #include <string.h> #include "VirConnectAuthCallbackBridge.h" #include <assert.h> int VirConnectAuthCallbackBridge(virConnectCredentialPtr cred, unsigned int ncred, void * cbdata){ //cbdata contains the java object that contains tha callback, as well as the JNI environment JNIEnv *env = ((CallBackStructType*)cbdata)->env; jobject j_auth = ((CallBackStructType*)cbdata)->auth; jclass j_auth_cls = (*env)->GetObjectClass(env, j_auth); jmethodID j_auth_cb_id=(*env)->GetMethodID(env, (*env)->GetObjectClass(env, j_auth), "callback", "([Lorg/libvirt/VirConnectCredential;)I"); jclass j_cred_cls = (*env)->FindClass(env, "org/libvirt/VirConnectCredential"); jmethodID j_cred_constructor = (*env)->GetMethodID(env, j_cred_cls, "<init>", "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"); jfieldID j_cred_result_id = (*env)->GetFieldID(env, j_cred_cls, "result", "Ljava/lang/String;"); jobjectArray j_credArray = (*env)->NewObjectArray(env, ncred, j_cred_cls, NULL); //copy the credentials array to the Java object. int c; jobject j_cred; for(c=0; c<ncred; c++){ j_cred=(*env)->NewObject(env, j_cred_cls, j_cred_constructor, cred[c].type, (*env)->NewStringUTF(env, cred[c].prompt), (*env)->NewStringUTF(env, cred[c].challenge), (*env)->NewStringUTF(env, cred[c].defresult)); (*env)->SetObjectArrayElement(env, j_credArray, c, j_cred); } //Time to call the actual java callback function int retval = (*env)->CallNonvirtualIntMethod(env, j_auth, j_auth_cls, j_auth_cb_id, j_credArray); if(retval){ //The java callback function has failed, so we fail as well. return -1; } //If we are still here, the java callback returned sucessfully, so copy the results back. jstring j_cred_result; const char* result; for(c=0; c<ncred; c++){ j_cred = (*env)->GetObjectArrayElement(env, j_credArray, c); j_cred_result = (*env)->GetObjectField(env, j_cred, j_cred_result_id); //If this assert triggers, then the user-supplied VirConnectAuth.callback function is broken assert(j_cred_result); result = (*env)->GetStringUTFChars(env, j_cred_result, NULL); cred[c].result = strdup(result); cred[c].resultlen = strlen(result); (*env)->ReleaseStringUTFChars(env, j_cred_result, result); } //All done, back to libvirt return 0; } #include <jni.h> #include <libvirt/libvirt.h> typedef struct { JNIEnv *env; jobject auth; } CallBackStructType; int VirConnectAuthCallbackBridge(virConnectCredentialPtr cred, unsigned int ncred, void * cbdata); package org.libvirt; /** * We diverge from the C implementation * There is no explicit cbdata field, you should just add any extra data to the child class's instance. * * @author stoty * */ public abstract class VirConnectAuth { /** * List of supported VirConnectCredential.VirConnectCredentialType values */ public VirConnectCredential.VirConnectCredentialType credType[]; /** * The callback function that fills the credentials in * @param cred the array of credentials passed by libvirt * @return 0 if the defresult field contains a vailde response, -1 otherwise */ public abstract int callback(VirConnectCredential[] cred); } package org.libvirt; import java.io.BufferedReader; import java.io.InputStreamReader; /** * @author stoty * Implements virConnectAuthPtrDefault functionality from libvirt.c without the external method support * It's not officially a part of the libvirt API, but provided here for completeness, testing, and as an example */ public final class VirConnectAuthDefault extends VirConnectAuth { { credType= new VirConnectCredential.VirConnectCredentialType[] { VirConnectCredential.VirConnectCredentialType.VIR_CRED_AUTHNAME, VirConnectCredential.VirConnectCredentialType.VIR_CRED_ECHOPROMPT, VirConnectCredential.VirConnectCredentialType.VIR_CRED_REALM, VirConnectCredential.VirConnectCredentialType.VIR_CRED_PASSPHRASE, VirConnectCredential.VirConnectCredentialType.VIR_CRED_NOECHOPROMPT }; } @Override public int callback(VirConnectCredential[] cred) { BufferedReader in = new BufferedReader(new InputStreamReader(System.in)); try{ for(VirConnectCredential c: cred){ String response=""; switch(c.type){ case VIR_CRED_USERNAME: case VIR_CRED_AUTHNAME: case VIR_CRED_ECHOPROMPT: case VIR_CRED_REALM: System.out.println(c.prompt); response= in.readLine(); break; case VIR_CRED_PASSPHRASE: case VIR_CRED_NOECHOPROMPT: System.out.println(c.prompt); System.out.println("WARNING: THE ENTERED PASSWORD WILL NOT BE MASKED!"); response= in.readLine(); break; } if(response.equals("") && !c.defresult.equals("")){ c.result=c.defresult; } else { c.result=response; } if(c.result.equals("")){ return -1; } } } catch (Exception e) { return -1; } return 0; } } package org.libvirt; /** * @author stoty * */ public class VirConnectCredential { public static enum VirConnectCredentialType { //This is off by one, but we don't care, because we can't convert java Enum to C enum in a sane way anyway /** * Identity to act as */ VIR_CRED_USERNAME, /** * Identify to authorize as */ VIR_CRED_AUTHNAME, /** * RFC 1766 languages, comma separated */ VIR_CRED_LANGUAGE, /** * client supplies a nonce */ VIR_CRED_CNONCE, /** * Passphrase secret */ VIR_CRED_PASSPHRASE, /** * Challenge response */ VIR_CRED_ECHOPROMPT, /** * Challenge response */ VIR_CRED_NOECHOPROMPT, /** * Authentication realm */ VIR_CRED_REALM, /** * Externally managed credential More may be added - expect the unexpected */ VIR_CRED_EXTERNAL; /** * Maps the java VirConnectCredentialType Enum to libvirt's integer constant * * @return The integer equivalent */ private int mapToInt(){ switch(this){ case VIR_CRED_USERNAME: return 1; case VIR_CRED_AUTHNAME: return 2; case VIR_CRED_LANGUAGE: return 3; case VIR_CRED_CNONCE: return 4; case VIR_CRED_PASSPHRASE: return 5; case VIR_CRED_ECHOPROMPT: return 6; case VIR_CRED_NOECHOPROMPT: return 7; case VIR_CRED_REALM: return 8; case VIR_CRED_EXTERNAL: return 9; } //We may never reach this point assert(false); return 0; } } /** * One of virConnectCredentialType constants */ public VirConnectCredentialType type; /** * Prompt to show to user */ public String prompt; /** * Additional challenge to show */ public String challenge; /** * Optional default result */ public String defresult; /** * Result to be filled with user response (or defresult) */ public String result; /** * Convenience constructor to be called from the JNI side * * @param type * @param prompt * @param challenge * @param defresult */ VirConnectCredential(int type, String prompt, String challenge, String defresult){ switch(type){ case 1: this.type=VirConnectCredentialType.VIR_CRED_USERNAME; break; case 2: this.type=VirConnectCredentialType.VIR_CRED_AUTHNAME; break; case 3: this.type=VirConnectCredentialType.VIR_CRED_LANGUAGE; break; case 4: this.type=VirConnectCredentialType.VIR_CRED_CNONCE; break; case 5: this.type=VirConnectCredentialType.VIR_CRED_PASSPHRASE; break; case 6: this.type=VirConnectCredentialType.VIR_CRED_ECHOPROMPT; break; case 7: this.type=VirConnectCredentialType.VIR_CRED_NOECHOPROMPT; break; case 8: this.type=VirConnectCredentialType.VIR_CRED_REALM; break; case 9: this.type=VirConnectCredentialType.VIR_CRED_EXTERNAL; break; default: assert(false); } this.prompt = prompt; this.challenge = challenge; this.defresult = defresult; } }

2 1

[libvirt] [PATCH] [LXC] Remove unused variable and fix uninitialized variable
by Dan Smith 27 Jun '08

27 Jun '08

Also remove a stale comment in the area. This makes libvirt compile when passed --with-lxc and --enable-compiler-warnings=error diff -r bd08a3f22fb2 -r fa048279476d src/veth.c --- a/src/veth.c Thu Jun 26 16:09:48 2008 +0000 +++ b/src/veth.c Fri Jun 27 06:48:10 2008 -0700 @@ -192,14 +192,12 @@ */ int moveInterfaceToNetNs(const char* interface, int pidInNs) { - int rc; - /* offset of the pid field in the following args */ + int rc = -1; char *pid = NULL; const char *argv[] = { "ip", "link", "set", interface, "netns", NULL, NULL }; int cmdResult; - int len; if (NULL == interface) { goto error_out;

2 1

[libvirt] HTTP-API for libvirt
by Stefan de Konink 27 Jun '08

27 Jun '08

New thread. > Honnestly I'm still lost trying to understand what you wanted to do. I have implemented a webserver plugin that allows (by mDNS) to access all 'VMs' on the network. http://xen.bot.nu/virt/ <- demo > I didn't understand the point, I just noted you wanted to put things > in libvirtd, something about event API while to me i don't see the even side > of the proposal. Using mDNS, mDNS events can be used on the network to subscribe to certain VM changes. Reboot/Shutdown/etc. > Now suggesting to convey this as part of Java *bindings* sounds even more > confusing, how does that relate at all ? You proposed (new) bindings for Java. I have written new bindings using the HTTP protocol. I wonder what should be done to get it adapted into libvirt, or standardize the format (like any other API). Stefan

2 4

[libvirt] LXC veth.c issue
by Atsushi SAKAI 27 Jun '08

27 Jun '08

Hello, Dan Smith Please check your moveInterfaceToNetNs on veth.c **rc** and **len** have warning problem. http://builder.virt-manager.org/logs/modules/libvirt--devel-build-output.log P.S. Many Dan stay in this mailing list. Also My previous patch save this problem for general users but not for LXC users :-) Thanks Atsushi SAKAI

1 0

[libvirt] cannot migrate vm back to original machine
by Elaine Cheong 27 Jun '08

27 Jun '08

I am running Fedora 8 with Xen 3.1.2 and libvirt 0.4.3 on two machines (machine #1 and #2). I am using virDomainMigrate() to migrate a VM from machine #2 (where it originally resides) to machine #1. I am unable to migrate the VM back to machine #2 using virDomainMigrate(), even if I first migrate the VM from #2 to #1 by hand, using "xm migrate -l <vmname> <ipaddress1>". When I make the call to virDomainMigrate(domain_to_migrate, connection_to_machine_2, VIR_MIGRATE_LIVE, NULL, NULL, 0), I get the following message: libvir: Xen Daemon error : POST operation failed: xend_post: error from xen daemon: (xend.err "can't connect: Name or service not known") I have tried running my program on both machine #2 (connecting to machine #1 with ssh, and machine #2 with local (NULL) or ssh), and on a separate 3rd machine (connecting to machine #1 and #2 with ssh), but I get the same error message in both cases. I've tried connecting with both virConnectOpen() and virConnectOpenReadOnly(). I don't see any obvious error messages when running libvirtd -- verbose, other than the one above, which shows up on machine #1. There are no obvious error messages in libvirtd --verbose on machine #2. I checked /var/log/xen/xend.log and xend-debug.log, but didn't see any error message there either. My /etc/xen/xend-config.sxp is set with default loglevel of DEBUG. Any clues as to why I cannot migrate the VM back to the original machine with libvirt? I am able to migrate it back from #1 to #2 by hand using "xm migrate -l <vmname> <ipaddress2>". Thanks, Elaine

1 0

[libvirt] [PATCH] minor Solaris patches
by Ryan Scott 26 Jun '08

26 Jun '08

Hi, Most of the changes in the attached patch are trivial #ifdef corrections for Solaris compilation. The biggest part of the change gets 'virsh capabilities' running correctly under Xen on Solaris. Signed-off-by: Mark Johnson <Mark.Johnson(a)Sun.COM> --- a/src/xs_internal.c +++ b/src/xs_internal.c @@ -35,7 +35,7 @@ #ifdef __linux__ #define XEN_HYPERVISOR_SOCKET "/proc/xen/privcmd" -#elif define(__sun__) +#elif defined(__sun) #define XEN_HYPERVISOR_SOCKET "/dev/xen/privcmd" #else #error "unsupported platform" --- a/src/xen_internal.c +++ b/src/xen_internal.c @@ -75,7 +75,7 @@ typedef struct v1_hypercall_struct #define XEN_V1_IOCTL_HYPERCALL_CMD \ _IOC(_IOC_NONE, 'P', 0, sizeof(v1_hypercall_t)) typedef v1_hypercall_t hypercall_t; -#elif define(__sun__) +#elif defined(__sun) typedef privcmd_hypercall_t hypercall_t; #else #error "unsupported platform" @@ -340,8 +340,10 @@ lock_pages(void *addr, size_t len) { #ifdef __linux__ return (mlock(addr, len)); -#elif define(__sun) +#elif defined(__sun) return (0); +#else +#error "unsupported platform" #endif } @@ -350,8 +352,10 @@ unlock_pages(void *addr, size_t len) { #ifdef __linux__ return (munlock(addr, len)); -#elif define(__sun) +#elif defined(__sun) return (0); +#else +#error "unsupported platform" #endif } @@ -666,7 +670,7 @@ typedef struct xen_op_v2_dom xen_op_v2_d #define XEN_HYPERVISOR_SOCKET "/proc/xen/privcmd" #define HYPERVISOR_CAPABILITIES "/sys/hypervisor/properties/capabilities" #define CPUINFO "/proc/cpuinfo" -#elif define(__sun__) +#elif defined(__sun) #define XEN_HYPERVISOR_SOCKET "/dev/xen/privcmd" #define HYPERVISOR_CAPABILITIES "" #define CPUINFO "/dev/cpu/self/cpuid" @@ -1948,7 +1952,7 @@ xenHypervisorInit(void) goto detect_v2; } -#ifndef __sun__ +#ifndef __sun /* * check if the old hypercall are actually working */ @@ -2265,6 +2269,92 @@ xenHypervisorBuildCapabilities(virConnec return NULL; } +#ifdef __linux__ +void +loadCapabilities(FILE *cpuinfo, FILE *capabilities, char *hvm_type, + int *host_pae, char *line, int LINE_SIZE) +{ + regmatch_t subs[4]; + + /* /proc/cpuinfo: flags: Intel calls HVM "vmx", AMD calls it "svm". + * It's not clear if this will work on IA64, let alone other + * architectures and non-Linux. (XXX) + */ + if (cpuinfo) { + while (fgets (line, LINE_SIZE, cpuinfo)) { + if (regexec (&flags_hvm_rec, line, + sizeof(subs)/sizeof(regmatch_t), subs, 0) == 0 + && subs[0].rm_so != -1) { + strncpy (hvm_type, + &line[subs[1].rm_so], subs[1].rm_eo-subs[1].rm_so+1); + hvm_type[subs[1].rm_eo-subs[1].rm_so] = '\0'; + } else if (regexec (&flags_pae_rec, line, 0, NULL, 0) == 0) + *host_pae = 1; + } + } + + /* Expecting one line in this file - ignore any more. */ + (void) fgets(line, LINE_SIZE, capabilities); +} + +#else +void +loadCapabilities(FILE *cpuinfo, FILE *capabilities, char *hvm_type, + int *host_pae, char *line, int LINE_SIZE) +{ + struct { + uint32_t r_eax, r_ebx, r_ecx, r_edx; + } _r, *rp = &_r; + int d, cmd; + char *s; + hypercall_t hc; + + + if ((d = open(CPUINFO, O_RDONLY)) == -1) { + goto cpuinfo_open_fail; + } + + if (pread(d, rp, sizeof (*rp), 0) != sizeof (*rp)) { + goto cpuinfo_pread_fail; + } + + s = (char *)&rp->r_ebx; + if (strncmp(s, "Auth" "cAMD" "enti", 12) == 0) { + if (pread(d, rp, sizeof (*rp), 0x80000001) == sizeof (*rp)) { + /* Read secure virtual machine bit (bit 2 of ECX feature ID) */ + if ((rp->r_ecx >> 2) & 1) { + strcpy(hvm_type, "svm"); + } + if ((rp->r_edx >> 6) & 1) { + *host_pae = 1; + } + } + } else if (strncmp(s, "Genu" "ntel" "ineI", 12) == 0) { + if (pread(d, rp, sizeof (*rp), 0x00000001) == sizeof (*rp)) { + /* Read VMXE feature bit (bit 5 of ECX feature ID) */ + if ((rp->r_ecx >> 5) & 1) { + strcpy(hvm_type, "vmx"); + } + if ((rp->r_edx >> 6) & 1) { + *host_pae = 1; + } + } + } +cpuinfo_pread_fail: + (void) close(d); +cpuinfo_open_fail: + + d = open(XEN_HYPERVISOR_SOCKET, O_RDWR); + hc.op = __HYPERVISOR_xen_version; + hc.arg[0] = (unsigned long) XENVER_capabilities; + hc.arg[1] = (unsigned long) line; + cmd = IOCTL_PRIVCMD_HYPERCALL; + (void) ioctl(d, cmd, (unsigned long) &hc); + close(d); +} + +#endif + /** * xenHypervisorGetCapabilities: * @conn: pointer to the connection block @@ -2278,7 +2368,8 @@ xenHypervisorMakeCapabilitiesXML(virConn const char *hostmachine, FILE *cpuinfo, FILE *capabilities) { - char line[1024], *str, *token; + const int LINE_SIZE = 1024; + char line[LINE_SIZE], *str, *token; regmatch_t subs[4]; char *saveptr = NULL; int i; @@ -2295,24 +2386,12 @@ xenHypervisorMakeCapabilitiesXML(virConn memset(guest_archs, 0, sizeof(guest_archs)); - /* /proc/cpuinfo: flags: Intel calls HVM "vmx", AMD calls it "svm". - * It's not clear if this will work on IA64, let alone other - * architectures and non-Linux. (XXX) - */ - if (cpuinfo) { - while (fgets (line, sizeof line, cpuinfo)) { - if (regexec (&flags_hvm_rec, line, sizeof(subs)/sizeof(regmatch_t), subs, 0) == 0 - && subs[0].rm_so != -1) { - strncpy (hvm_type, - &line[subs[1].rm_so], subs[1].rm_eo-subs[1].rm_so+1); - hvm_type[subs[1].rm_eo-subs[1].rm_so] = '\0'; - } else if (regexec (&flags_pae_rec, line, 0, NULL, 0) == 0) - host_pae = 1; - } - } + memset(line, 0, sizeof(line)); + loadCapabilities(cpuinfo, capabilities, hvm_type, &host_pae, line, + LINE_SIZE); - /* Most of the useful info is in /sys/hypervisor/properties/capabilities - * which is documented in the code in xen-unstable.hg/xen/arch/.../setup.c. + /* The capabilities line is documented in the code in + * xen-unstable.hg/xen/arch/.../setup.c. * * It is a space-separated list of supported guest architectures. * @@ -2335,80 +2414,77 @@ xenHypervisorMakeCapabilitiesXML(virConn * +--------------- "xen" or "hvm" for para or full virt respectively */ - /* Expecting one line in this file - ignore any more. */ - if ((capabilities) && (fgets (line, sizeof line, capabilities))) { - /* Split the line into tokens. strtok_r is OK here because we "own" - * this buffer. Parse out the features from each token. - */ - for (str = line, nr_guest_archs = 0; - nr_guest_archs < sizeof guest_archs / sizeof guest_archs[0] - && (token = strtok_r (str, " ", &saveptr)) != NULL; - str = NULL) { - - if (regexec (&xen_cap_rec, token, sizeof subs / sizeof subs[0], - subs, 0) == 0) { - int hvm = STRPREFIX(&token[subs[1].rm_so], "hvm"); - const char *model; - int bits, pae = 0, nonpae = 0, ia64_be = 0; - - if (STRPREFIX(&token[subs[2].rm_so], "x86_32")) { - model = "i686"; - bits = 32; - if (subs[3].rm_so != -1 && - STRPREFIX(&token[subs[3].rm_so], "p")) - pae = 1; - else - nonpae = 1; - } - else if (STRPREFIX(&token[subs[2].rm_so], "x86_64")) { - model = "x86_64"; - bits = 64; - } - else if (STRPREFIX(&token[subs[2].rm_so], "ia64")) { - model = "ia64"; - bits = 64; - if (subs[3].rm_so != -1 && - STRPREFIX(&token[subs[3].rm_so], "be")) - ia64_be = 1; - } - else if (STRPREFIX(&token[subs[2].rm_so], "powerpc64")) { - model = "ppc64"; - bits = 64; - } else { - /* XXX surely no other Xen archs exist */ - continue; - } + /* Split the line into tokens. strtok_r is OK here because we "own" + * this buffer. Parse out the features from each token. + */ + for (str = line, nr_guest_archs = 0; + nr_guest_archs < sizeof guest_archs / sizeof guest_archs[0] + && (token = strtok_r (str, " ", &saveptr)) != NULL; + str = NULL) { + + if (regexec (&xen_cap_rec, token, sizeof subs / sizeof subs[0], + subs, 0) == 0) { + int hvm = STRPREFIX(&token[subs[1].rm_so], "hvm"); + const char *model; + int bits, pae = 0, nonpae = 0, ia64_be = 0; + + if (STRPREFIX(&token[subs[2].rm_so], "x86_32")) { + model = "i686"; + bits = 32; + if (subs[3].rm_so != -1 && + STRPREFIX(&token[subs[3].rm_so], "p")) + pae = 1; + else + nonpae = 1; + } + else if (STRPREFIX(&token[subs[2].rm_so], "x86_64")) { + model = "x86_64"; + bits = 64; + } + else if (STRPREFIX(&token[subs[2].rm_so], "ia64")) { + model = "ia64"; + bits = 64; + if (subs[3].rm_so != -1 && + STRPREFIX(&token[subs[3].rm_so], "be")) + ia64_be = 1; + } + else if (STRPREFIX(&token[subs[2].rm_so], "powerpc64")) { + model = "ppc64"; + bits = 64; + } else { + /* XXX surely no other Xen archs exist */ + continue; + } - /* Search for existing matching (model,hvm) tuple */ - for (i = 0 ; i < nr_guest_archs ; i++) { - if (STREQ(guest_archs[i].model, model) && - guest_archs[i].hvm == hvm) { - break; - } + /* Search for existing matching (model,hvm) tuple */ + for (i = 0 ; i < nr_guest_archs ; i++) { + if (STREQ(guest_archs[i].model, model) && + guest_archs[i].hvm == hvm) { + break; } - - /* Too many arch flavours - highly unlikely ! */ - if (i >= sizeof(guest_archs)/sizeof(guest_archs[0])) - continue; - /* Didn't find a match, so create a new one */ - if (i == nr_guest_archs) - nr_guest_archs++; - - guest_archs[i].model = model; - guest_archs[i].bits = bits; - guest_archs[i].hvm = hvm; - - /* Careful not to overwrite a previous positive - setting with a negative one here - some archs - can do both pae & non-pae, but Xen reports - separately capabilities so we're merging archs */ - if (pae) - guest_archs[i].pae = pae; - if (nonpae) - guest_archs[i].nonpae = nonpae; - if (ia64_be) - guest_archs[i].ia64_be = ia64_be; } + + /* Too many arch flavours - highly unlikely ! */ + if (i >= sizeof(guest_archs)/sizeof(guest_archs[0])) + continue; + /* Didn't find a match, so create a new one */ + if (i == nr_guest_archs) + nr_guest_archs++; + + guest_archs[i].model = model; + guest_archs[i].bits = bits; + guest_archs[i].hvm = hvm; + + /* Careful not to overwrite a previous positive + setting with a negative one here - some archs + can do both pae & non-pae, but Xen reports + separately capabilities so we're merging archs */ + if (pae) + guest_archs[i].pae = pae; + if (nonpae) + guest_archs[i].nonpae = nonpae; + if (ia64_be) + guest_archs[i].ia64_be = ia64_be; } } @@ -2447,29 +2523,33 @@ xenHypervisorGetCapabilities (virConnect /* Really, this never fails - look at the man-page. */ uname (&utsname); - cpuinfo = fopen ("/proc/cpuinfo", "r"); +#ifdef __linux__ + cpuinfo = fopen (CPUINFO, "r"); if (cpuinfo == NULL) { if (errno != ENOENT) { - virXenPerror (conn, "/proc/cpuinfo"); + virXenPerror (conn, CPUINFO); return NULL; } } - capabilities = fopen ("/sys/hypervisor/properties/capabilities", "r"); + capabilities = fopen (HYPERVISOR_CAPABILITIES, "r"); if (capabilities == NULL) { if (errno != ENOENT) { fclose(cpuinfo); - virXenPerror (conn, "/sys/hypervisor/properties/capabilities"); + virXenPerror (conn, HYPERVISOR_CAPABILITIES); return NULL; } } +#endif xml = xenHypervisorMakeCapabilitiesXML(conn, utsname.machine, cpuinfo, capabilities); +#ifdef __linux__ if (cpuinfo) fclose(cpuinfo); if (capabilities) fclose(capabilities); +#endif return xml; }

2 1