Adds the virNetwork API and hooks up the API to driver methods. The API closely mirrors the domains API with the following exceptions: - Networks don't have IDs - only names and UUIDs - There is no virNetworkCreateFlags We use a seperate driver vtable for the networks support and require at least one network driver. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com&gt; Index: libvirt/include/libvirt/libvirt.h.in =================================================================== --- libvirt.orig/include/libvirt/libvirt.h.in +++ libvirt/include/libvirt/libvirt.h.in @@ -443,6 +443,90 @@ int virDomainGetVcpus (virDomainPtr do int virDomainAttachDevice(virDomainPtr domain, char *xml); int virDomainDetachDevice(virDomainPtr domain, char *xml); +/* + * Virtual Networks API + */ + +/** + * virNetwork: + * + * a virNetwork is a private structure representing a virtual network. + */ +typedef struct _virNetwork virNetwork; + +/** + * virNetworkPtr: + * + * a virNetworkPtr is pointer to a virNetwork private structure, this is the + * type used to reference a virtual network in the API. + */ +typedef virNetwork *virNetworkPtr; + +/* + * List active networks + */ +int virConnectNumOfNetworks (virConnectPtr conn); +int virConnectListNetworks (virConnectPtr conn, + const char **names, + int maxnames); + +/* + * List inactive networks + */ +int virConnectNumOfDefinedNetworks (virConnectPtr conn); +int virConnectListDefinedNetworks (virConnectPtr conn, + const char **names, + int maxnames); + +/* + * Lookup network by name or uuid + */ +virNetworkPtr virNetworkLookupByName (virConnectPtr conn, + const char *name); +virNetworkPtr virNetworkLookupByUUID (virConnectPtr conn, + const unsigned char *uuid); +virNetworkPtr virNetworkLookupByUUIDString (virConnectPtr conn, + const char *uuid); + +/* + * Create active transient network + */ +virNetworkPtr virNetworkCreateXML (virConnectPtr conn, + const char *xmlDesc); + +/* + * Define inactive persistent network + */ +virNetworkPtr virNetworkDefineXML (virConnectPtr conn, + const char *xmlDesc); + +/* + * Delete persistent network + */ +int virNetworkUndefine (virNetworkPtr network); + +/* + * Activate persistent network + */ +int virNetworkCreate (virNetworkPtr network); + +/* + * Network destroy/free + */ +int virNetworkDestroy (virNetworkPtr network); +int virNetworkFree (virNetworkPtr network); + +/* + * Network informations + */ +const char* virNetworkGetName (virNetworkPtr network); +int virNetworkGetUUID (virNetworkPtr network, + unsigned char *uuid); +int virNetworkGetUUIDString (virNetworkPtr network, + char *buf); +char * virNetworkGetXMLDesc (virNetworkPtr network, + int flags); + #ifdef __cplusplus } #endif Index: libvirt/include/libvirt/virterror.h =================================================================== --- libvirt.orig/include/libvirt/virterror.h +++ libvirt/include/libvirt/virterror.h @@ -48,6 +48,7 @@ typedef enum { VIR_FROM_PROXY, /* Error in the proxy code */ VIR_FROM_CONF, /* Error in the configuration file handling */ VIR_FROM_QEMU, /* Error at the QEMU daemon */ + VIR_FROM_NET, /* Error when operating on a network */ } virErrorDomain; @@ -114,7 +115,9 @@ typedef enum { VIR_ERR_PARSE_FAILED, /* failed to parse a conf file */ VIR_ERR_CONF_SYNTAX, /* failed to parse the syntax of a conf file */ VIR_ERR_WRITE_FAILED, /* failed to write a conf file */ - VIR_ERR_XML_DETAIL /* detail of an XML error */ + VIR_ERR_XML_DETAIL, /* detail of an XML error */ + VIR_ERR_INVALID_NETWORK, /* invalid network object */ + VIR_ERR_NETWORK_EXIST, /* the network already exist */ } virErrorNumber; /** Index: libvirt/src/driver.h =================================================================== --- libvirt.orig/src/driver.h +++ libvirt/src/driver.h @@ -188,6 +188,65 @@ struct _virDriver { virDrvDomainDetachDevice domainDetachDevice; }; +typedef int + (*virDrvNumOfNetworks) (virConnectPtr conn); +typedef int + (*virDrvListNetworks) (virConnectPtr conn, + const char **names, + int maxnames); +typedef int + (*virDrvNumOfDefinedNetworks) (virConnectPtr conn); +typedef int + (*virDrvListDefinedNetworks) (virConnectPtr conn, + const char **names, + int maxnames); +typedef virNetworkPtr + (*virDrvNetworkLookupByUUID) (virConnectPtr conn, + const unsigned char *uuid); +typedef virNetworkPtr + (*virDrvNetworkLookupByName) (virConnectPtr conn, + const char *name); +typedef virNetworkPtr + (*virDrvNetworkCreateXML) (virConnectPtr conn, + const char *xmlDesc); +typedef virNetworkPtr + (*virDrvNetworkDefineXML) (virConnectPtr conn, const char *xml); +typedef int + (*virDrvNetworkUndefine) (virNetworkPtr network); +typedef int + (*virDrvNetworkCreate) (virNetworkPtr network); +typedef int + (*virDrvNetworkDestroy) (virNetworkPtr network); +typedef char * + (*virDrvNetworkDumpXML) (virNetworkPtr network, + int flags); + +typedef struct _virNetworkDriver virNetworkDriver; +typedef virNetworkDriver *virNetworkDriverPtr; + +/** + * _virNetworkDriver: + * + * Structure associated to a network virtualization driver, defining the various + * entry points for it. + */ +struct _virNetworkDriver { + virDrvOpen open; + virDrvClose close; + virDrvNumOfNetworks numOfNetworks; + virDrvListNetworks listNetworks; + virDrvNumOfDefinedNetworks numOfDefinedNetworks; + virDrvListDefinedNetworks listDefinedNetworks; + virDrvNetworkLookupByUUID networkLookupByUUID; + virDrvNetworkLookupByName networkLookupByName; + virDrvNetworkCreateXML networkCreateXML; + virDrvNetworkDefineXML networkDefineXML; + virDrvNetworkUndefine networkUndefine; + virDrvNetworkCreate networkCreate; + virDrvNetworkDestroy networkDestroy; + virDrvNetworkDumpXML networkDumpXML; +}; + /* * Registration @@ -195,6 +254,7 @@ struct _virDriver { * lookup based on the URI given in a virConnectOpen(ReadOnly) */ int virRegisterDriver(virDriverPtr); +int virRegisterNetworkDriver(virNetworkDriverPtr); #ifdef __cplusplus } Index: libvirt/src/hash.c =================================================================== --- libvirt.orig/src/hash.c +++ libvirt/src/hash.c @@ -637,6 +637,20 @@ virDomainFreeName(virDomainPtr domain, c } /** + * virNetworkFreeName: + * @network: a network object + * + * Destroy the network object, this is just used by the network hash callback. + * + * Returns 0 in case of success and -1 in case of failure. + */ +static int +virNetworkFreeName(virNetworkPtr network, const char *name ATTRIBUTE_UNUSED) +{ + return (virNetworkFree(network)); +} + +/** * virGetConnect: * * Allocates a new hypervisor connection structure @@ -660,6 +674,9 @@ virGetConnect(void) { ret->domains = virHashCreate(20); if (ret->domains == NULL) goto failed; + ret->networks = virHashCreate(20); + if (ret->networks == NULL) + goto failed; ret->hashes_mux = xmlNewMutex(); if (ret->hashes_mux == NULL) goto failed; @@ -671,6 +688,8 @@ failed: if (ret != NULL) { if (ret->domains != NULL) virHashFree(ret->domains, (virHashDeallocator) virDomainFreeName); + if (ret->networks != NULL) + virHashFree(ret->networks, (virHashDeallocator) virNetworkFreeName); if (ret->hashes_mux != NULL) xmlFreeMutex(ret->hashes_mux); free(ret); @@ -705,6 +724,8 @@ virFreeConnect(virConnectPtr conn) { if (conn->domains != NULL) virHashFree(conn->domains, (virHashDeallocator) virDomainFreeName); + if (conn->networks != NULL) + virHashFree(conn->networks, (virHashDeallocator) virNetworkFreeName); if (conn->hashes_mux != NULL) xmlFreeMutex(conn->hashes_mux); free(conn); @@ -893,6 +914,139 @@ done: xmlMutexUnlock(conn->hashes_mux); return(ret); } + +/** + * virGetNetwork: + * @conn: the hypervisor connection + * @name: pointer to the network name or NULL + * @uuid: pointer to the uuid or NULL + * + * Lookup if the network is already registered for that connection, + * if yes return a new pointer to it, if no allocate a new structure, + * and register it in the table. In any case a corresponding call to + * virFreeNetwork() is needed to not leak data. + * + * Returns a pointer to the network, or NULL in case of failure + */ +virNetworkPtr +virGetNetwork(virConnectPtr conn, const char *name, const unsigned char *uuid) { + virNetworkPtr ret = NULL; + + if ((!VIR_IS_CONNECT(conn)) || ((name == NULL) && (uuid == NULL)) || + (conn->hashes_mux == NULL)) { + virHashError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + return(NULL); + } + xmlMutexLock(conn->hashes_mux); + + /* TODO search by UUID first as they are better differenciators */ + + ret = (virNetworkPtr) virHashLookup(conn->networks, name); + if (ret != NULL) { + /* TODO check the UUID */ + goto done; + } + + /* + * not found, allocate a new one + */ + ret = (virNetworkPtr) malloc(sizeof(virNetwork)); + if (ret == NULL) { + virHashError(conn, VIR_ERR_NO_MEMORY, _("allocating network")); + goto error; + } + memset(ret, 0, sizeof(virNetwork)); + ret->name = strdup(name); + if (ret->name == NULL) { + virHashError(conn, VIR_ERR_NO_MEMORY, _("allocating network")); + goto error; + } + ret->magic = VIR_NETWORK_MAGIC; + ret->conn = conn; + if (uuid != NULL) + memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN); + + if (virHashAddEntry(conn->networks, name, ret) < 0) { + virHashError(conn, VIR_ERR_INTERNAL_ERROR, + _("failed to add network to connection hash table")); + goto error; + } + conn->uses++; +done: + ret->uses++; + xmlMutexUnlock(conn->hashes_mux); + return(ret); + +error: + xmlMutexUnlock(conn->hashes_mux); + if (ret != NULL) { + if (ret->name != NULL) + free(ret->name ); + free(ret); + } + return(NULL); +} + +/** + * virFreeNetwork: + * @conn: the hypervisor connection + * @network: the network to release + * + * Release the given network, if the reference count drops to zero, then + * the network is really freed. + * + * Returns the reference count or -1 in case of failure. + */ +int +virFreeNetwork(virConnectPtr conn, virNetworkPtr network) { + int ret = 0; + + if ((!VIR_IS_CONNECT(conn)) || (!VIR_IS_CONNECTED_NETWORK(network)) || + (network->conn != conn) || (conn->hashes_mux == NULL)) { + virHashError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + return(-1); + } + xmlMutexLock(conn->hashes_mux); + + /* + * decrement the count for the network + */ + network->uses--; + ret = network->uses; + if (ret > 0) + goto done; + + /* TODO search by UUID first as they are better differenciators */ + + if (virHashRemoveEntry(conn->networks, network->name, NULL) < 0) { + virHashError(conn, VIR_ERR_INTERNAL_ERROR, + _("network missing from connection hash table")); + goto done; + } + network->magic = -1; + if (network->name) + free(network->name); + free(network); + + /* + * decrement the count for the connection + */ + conn->uses--; + if (conn->uses > 0) + goto done; + + if (conn->networks != NULL) + virHashFree(conn->networks, (virHashDeallocator) virNetworkFreeName); + if (conn->hashes_mux != NULL) + xmlFreeMutex(conn->hashes_mux); + free(conn); + return(0); + +done: + xmlMutexUnlock(conn->hashes_mux); + return(ret); +} + /* * Local variables: * indent-tabs-mode: nil Index: libvirt/src/internal.h =================================================================== --- libvirt.orig/src/internal.h +++ libvirt/src/internal.h @@ -84,6 +84,16 @@ extern "C" { #define VIR_IS_DOMAIN(obj) ((obj) && (obj)->magic==VIR_DOMAIN_MAGIC) #define VIR_IS_CONNECTED_DOMAIN(obj) (VIR_IS_DOMAIN(obj) && VIR_IS_CONNECT((obj)->conn)) +/** + * VIR_NETWORK_MAGIC: + * + * magic value used to protect the API when pointers to network structures + * are passed down by the uers. + */ +#define VIR_NETWORK_MAGIC 0xDEAD1234 +#define VIR_IS_NETWORK(obj) ((obj) && (obj)->magic==VIR_NETWORK_MAGIC) +#define VIR_IS_CONNECTED_NETWORK(obj) (VIR_IS_NETWORK(obj) && VIR_IS_CONNECT((obj)->conn)) + #define MAX_DRIVERS 10 /* @@ -104,6 +114,10 @@ struct _virConnect { virDriverPtr drivers[MAX_DRIVERS]; int nb_drivers; + /* the list of available network drivers */ + virNetworkDriverPtr networkDrivers[MAX_DRIVERS]; + int nb_network_drivers; + /* extra data needed by drivers */ int handle; /* internal handle used for hypercall */ struct xs_handle *xshandle;/* handle to talk to the xenstore */ @@ -125,8 +139,9 @@ struct _virConnect { void *userData; /* the user data */ /* misc */ - xmlMutexPtr hashes_mux;/* a mutex to protect the domain hash table */ + xmlMutexPtr hashes_mux;/* a mutex to protect the domain and networks hash tables */ virHashTablePtr domains;/* hash table for known domains */ + virHashTablePtr networks;/* hash table for known domains */ int flags; /* a set of connection flags */ }; @@ -158,6 +173,19 @@ struct _virDomain { char *xml; /* the XML description for defined domains */ }; +/** +* _virNetwork: +* +* Internal structure associated to a domain +*/ +struct _virNetwork { + unsigned int magic; /* specific value to check */ + int uses; /* reference count */ + virConnectPtr conn; /* pointer back to the connection */ + char *name; /* the network external name */ + unsigned char uuid[VIR_UUID_BUFLEN]; /* the network unique identifier */ +}; + /* * Internal routines */ @@ -196,6 +224,11 @@ int virFreeDomain (virConnectPtr conn, virDomainPtr domain); virDomainPtr virGetDomainByID(virConnectPtr conn, int id); +virNetworkPtr virGetNetwork (virConnectPtr conn, + const char *name, + const unsigned char *uuid); +int virFreeNetwork (virConnectPtr conn, + virNetworkPtr domain); #ifdef __cplusplus } Index: libvirt/src/libvirt.c =================================================================== --- libvirt.orig/src/libvirt.c +++ libvirt/src/libvirt.c @@ -42,6 +42,7 @@ */ static virDriverPtr virDriverTab[MAX_DRIVERS]; +static virNetworkDriverPtr virNetworkDriverTab[MAX_DRIVERS]; static int initialized = 0; /** @@ -68,8 +69,10 @@ virInitialize(void) /* * should not be needed but... */ - for (i = 0;i < MAX_DRIVERS;i++) + for (i = 0;i < MAX_DRIVERS;i++) { virDriverTab[i] = NULL; + virNetworkDriverTab[i] = NULL; + } /* * Note that the order is important the first ones have a higher priority @@ -135,16 +138,36 @@ virLibDomainError(virDomainPtr domain, v } /** - * virRegisterDriver: - * @driver: pointer to a driver block - * - * Register a virtualization driver + * virLibNetworkError: + * @conn: the connection if available + * @error: the error noumber + * @info: extra information string * - * Returns the driver priority or -1 in case of error. + * Handle an error at the connection level */ -int -virRegisterDriver(virDriverPtr driver) +static void +virLibNetworkError(virNetworkPtr network, virErrorNumber error, + const char *info) +{ + virConnectPtr conn = NULL; + const char *errmsg; + + if (error == VIR_ERR_OK) + return; + + errmsg = __virErrorMsg(error, info); + if (error != VIR_ERR_INVALID_NETWORK) { + conn = network->conn; + } + /* XXX: should be able to pass network pointer here */ + __virRaiseError(conn, NULL, VIR_FROM_NET, error, VIR_ERR_ERROR, + errmsg, info, NULL, 0, 0, errmsg, info); +} + +static int +_virRegisterDriver(void *driver, int isNetwork) { + void **drivers; int i; if (!initialized) @@ -155,13 +178,14 @@ virRegisterDriver(virDriverPtr driver) virLibConnError(NULL, VIR_ERR_INVALID_ARG, __FUNCTION__); return(-1); } + drivers = isNetwork ? (void **) virNetworkDriverTab : (void **) virDriverTab; for (i = 0;i < MAX_DRIVERS;i++) { - if (virDriverTab[i] == driver) + if (drivers[i] == driver) return(i); } for (i = 0;i < MAX_DRIVERS;i++) { - if (virDriverTab[i] == NULL) { - virDriverTab[i] = driver; + if (drivers[i] == NULL) { + drivers[i] = driver; return(i); } } @@ -170,6 +194,34 @@ virRegisterDriver(virDriverPtr driver) } /** + * virRegisterNetworkDriver: + * @driver: pointer to a network driver block + * + * Register a network virtualization driver + * + * Returns the driver priority or -1 in case of error. + */ +int +virRegisterNetworkDriver(virNetworkDriverPtr driver) +{ + return _virRegisterDriver(driver, 1); +} + +/** + * virRegisterDriver: + * @driver: pointer to a driver block + * + * Register a virtualization driver + * + * Returns the driver priority or -1 in case of error. + */ +int +virRegisterDriver(virDriverPtr driver) +{ + return _virRegisterDriver(driver, 0); +} + +/** * virGetVersion: * @libVer: return value for the library version (OUT) * @type: the type of connection/driver looked at @@ -265,7 +317,14 @@ virConnectOpen(const char *name) } } - if (ret->nb_drivers == 0) { + for (i = 0;i < MAX_DRIVERS;i++) { + if ((virNetworkDriverTab[i] != NULL) && (virNetworkDriverTab[i]->open != NULL) && + (res = virNetworkDriverTab[i]->open(ret, name, VIR_DRV_OPEN_QUIET)) == 0) { + ret->networkDrivers[ret->nb_network_drivers++] = virNetworkDriverTab[i]; + } + } + + if (ret->nb_drivers == 0 || ret->nb_network_drivers == 0) { /* we failed to find an adequate driver */ virLibConnError(NULL, VIR_ERR_NO_SUPPORT, name); goto failed; @@ -279,6 +338,10 @@ failed: if ((ret->drivers[i] != NULL) && (ret->drivers[i]->close != NULL)) ret->drivers[i]->close(ret); } + for (i = 0;i < ret->nb_network_drivers;i++) { + if ((ret->networkDrivers[i] != NULL) && (ret->networkDrivers[i]->close != NULL)) + ret->networkDrivers[i]->close(ret); + } virFreeConnect(ret); } return (NULL); @@ -321,6 +384,10 @@ virConnectOpenReadOnly(const char *name) ret->drivers[ret->nb_drivers++] = virDriverTab[i]; } + if ((virNetworkDriverTab[i] != NULL) && (virNetworkDriverTab[i]->open != NULL) && + (res = virNetworkDriverTab[i]->open(ret, name, VIR_DRV_OPEN_QUIET)) == 0) { + ret->networkDrivers[ret->nb_network_drivers++] = virNetworkDriverTab[i]; + } } if (ret->nb_drivers == 0) { if (name == NULL) @@ -341,6 +408,10 @@ failed: if ((ret->drivers[i] != NULL) && (ret->drivers[i]->close != NULL)) ret->drivers[i]->close(ret); } + for (i = 0;i < ret->nb_network_drivers;i++) { + if ((ret->networkDrivers[i] != NULL) && (ret->networkDrivers[i]->close != NULL)) + ret->networkDrivers[i]->close(ret); + } virFreeConnect(ret); } return (NULL); @@ -368,6 +439,10 @@ virConnectClose(virConnectPtr conn) if ((conn->drivers[i] != NULL) && (conn->drivers[i]->close != NULL)) conn->drivers[i]->close(conn); } + for (i = 0;i < conn->nb_network_drivers;i++) { + if ((conn->networkDrivers[i] != NULL) && (conn->networkDrivers[i]->close != NULL)) + conn->networkDrivers[i]->close(conn); + } if (virFreeConnect(conn) < 0) return (-1); return (0); @@ -2053,3 +2128,607 @@ virDomainDetachDevice(virDomainPtr domai virLibConnError(conn, VIR_ERR_CALL_FAILED, __FUNCTION__); return (-1); } + +/** + * virConnectNumOfNetworks: + * @conn: pointer to the hypervisor connection + * + * Provides the number of active networks. + * + * Returns the number of network found or -1 in case of error + */ +int +virConnectNumOfNetworks(virConnectPtr conn) +{ + int ret = -1; + int i; + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__); + return (-1); + } + + /* Go though the driver registered entry points */ + for (i = 0;i < conn->nb_network_drivers;i++) { + if ((conn->networkDrivers[i] != NULL) && + (conn->networkDrivers[i]->numOfNetworks != NULL)) { + ret = conn->networkDrivers[i]->numOfNetworks(conn); + if (ret >= 0) + return(ret); + } + } + + return(-1); +} + +/** + * virConnectListNetworks: + * @conn: pointer to the hypervisor connection + * @names: array to collect the list of names of active networks + * @maxnames: size of @names + * + * Collect the list of active networks, and store their names in @names + * + * Returns the number of networks found or -1 in case of error + */ +int +virConnectListNetworks(virConnectPtr conn, const char **names, int maxnames) +{ + int ret = -1; + int i; + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__); + return (-1); + } + + if ((names == NULL) || (maxnames <= 0)) { + virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + return (-1); + } + + /* Go though the driver registered entry points */ + for (i = 0;i < conn->nb_drivers;i++) { + if ((conn->networkDrivers[i] != NULL) && + (conn->networkDrivers[i]->listNetworks != NULL)) { + ret = conn->networkDrivers[i]->listNetworks(conn, names, maxnames); + if (ret >= 0) + return(ret); + } + } + + return (-1); +} + +/** + * virConnectNumOfDefinedNetworks: + * @conn: pointer to the hypervisor connection + * + * Provides the number of inactive networks. + * + * Returns the number of networks found or -1 in case of error + */ +int +virConnectNumOfDefinedNetworks(virConnectPtr conn) +{ + int ret = -1; + int i; + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__); + return (-1); + } + + /* Go though the driver registered entry points */ + for (i = 0;i < conn->nb_drivers;i++) { + if ((conn->networkDrivers[i] != NULL) && + (conn->networkDrivers[i]->numOfDefinedNetworks != NULL)) { + ret = conn->networkDrivers[i]->numOfDefinedNetworks(conn); + if (ret >= 0) + return(ret); + } + } + + return(-1); +} + +/** + * virConnectListDefinedNetworks: + * @conn: pointer to the hypervisor connection + * @names: pointer to an array to store the names + * @maxnames: size of the array + * + * list the inactive networks, stores the pointers to the names in @names + * + * Returns the number of names provided in the array or -1 in case of error + */ +int +virConnectListDefinedNetworks(virConnectPtr conn, const char **names, + int maxnames) { + int ret = -1; + int i; + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__); + return (-1); + } + + if ((names == NULL) || (maxnames <= 0)) { + virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + return (-1); + } + + /* Go though the driver registered entry points */ + for (i = 0;i < conn->nb_drivers;i++) { + if ((conn->networkDrivers[i] != NULL) && + (conn->networkDrivers[i]->listDefinedNetworks != NULL)) { + ret = conn->networkDrivers[i]->listDefinedNetworks(conn, names, maxnames); + if (ret >= 0) + return(ret); + } + } + + return (-1); +} + +/** + * virNetworkLookupByName: + * @conn: pointer to the hypervisor connection + * @name: name for the network + * + * Try to lookup a network on the given hypervisor based on its name. + * + * Returns a new network object or NULL in case of failure + */ +virNetworkPtr +virNetworkLookupByName(virConnectPtr conn, const char *name) +{ + virNetworkPtr ret = NULL; + int i; + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__); + return (NULL); + } + if (name == NULL) { + virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + return (NULL); + } + + /* Go though the driver registered entry points */ + for (i = 0;i < conn->nb_drivers;i++) { + if ((conn->networkDrivers[i] != NULL) && + (conn->networkDrivers[i]->networkLookupByName != NULL)) { + ret = conn->networkDrivers[i]->networkLookupByName(conn, name); + if (ret) + return(ret); + } + } + return (NULL); +} + +/** + * virNetworkLookupByUUID: + * @conn: pointer to the hypervisor connection + * @uuid: the raw UUID for the network + * + * Try to lookup a network on the given hypervisor based on its UUID. + * + * Returns a new network object or NULL in case of failure + */ +virNetworkPtr +virNetworkLookupByUUID(virConnectPtr conn, const unsigned char *uuid) +{ + virNetworkPtr ret; + int i; + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__); + return (NULL); + } + if (uuid == NULL) { + virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + return (NULL); + } + + /* Go though the driver registered entry points */ + for (i = 0;i < conn->nb_drivers;i++) { + if ((conn->networkDrivers[i] != NULL) && + (conn->networkDrivers[i]->networkLookupByUUID != NULL)) { + ret = conn->networkDrivers[i]->networkLookupByUUID(conn, uuid); + if (ret) + return(ret); + } + } + + return (NULL); +} + +/** + * virNetworkLookupByUUIDString: + * @conn: pointer to the hypervisor connection + * @uuidstr: the string UUID for the network + * + * Try to lookup a network on the given hypervisor based on its UUID. + * + * Returns a new network object or NULL in case of failure + */ +virNetworkPtr +virNetworkLookupByUUIDString(virConnectPtr conn, const char *uuidstr) +{ + int raw[VIR_UUID_BUFLEN], i; + unsigned char uuid[VIR_UUID_BUFLEN]; + int ret; + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__); + return (NULL); + } + if (uuidstr == NULL) { + virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + return (NULL); + } + + /* XXX: sexpr_uuid() also supports 'xxxx-xxxx-xxxx-xxxx' format. + * We needn't it here. Right? + */ + ret = sscanf(uuidstr, + "%02x%02x%02x%02x-" + "%02x%02x-" + "%02x%02x-" + "%02x%02x-" + "%02x%02x%02x%02x%02x%02x", + raw + 0, raw + 1, raw + 2, raw + 3, + raw + 4, raw + 5, raw + 6, raw + 7, + raw + 8, raw + 9, raw + 10, raw + 11, + raw + 12, raw + 13, raw + 14, raw + 15); + + if (ret!=VIR_UUID_BUFLEN) { + virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + return (NULL); + } + for (i = 0; i < VIR_UUID_BUFLEN; i++) + uuid[i] = raw[i] & 0xFF; + + return virNetworkLookupByUUID(conn, &uuid[0]); +} + +/** + * virNetworkCreateXML: + * @conn: pointer to the hypervisor connection + * @xmlDesc: an XML description of the network + * + * Create and start a new virtual network, based on an XML description + * similar to the one returned by virNetworkGetXMLDesc() + * + * Returns a new network object or NULL in case of failure + */ +virNetworkPtr +virNetworkCreateXML(virConnectPtr conn, const char *xmlDesc) +{ + virNetworkPtr ret; + int i; + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__); + return (NULL); + } + if (xmlDesc == NULL) { + virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + return (NULL); + } + if (conn->flags & VIR_CONNECT_RO) { + virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + return (NULL); + } + + for (i = 0;i < conn->nb_drivers;i++) { + if ((conn->networkDrivers[i] != NULL) && + (conn->networkDrivers[i]->networkCreateXML != NULL)) { + ret = conn->networkDrivers[i]->networkCreateXML(conn, xmlDesc); + if (ret != NULL) + return(ret); + } + } + return(NULL); +} + +/** + * virNetworkDefineXML: + * @conn: pointer to the hypervisor connection + * @xml: the XML description for the network, preferably in UTF-8 + * + * Define a network, but does not create it + * + * Returns NULL in case of error, a pointer to the network otherwise + */ +virNetworkPtr +virNetworkDefineXML(virConnectPtr conn, const char *xml) { + virNetworkPtr ret = NULL; + int i; + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(conn, VIR_ERR_INVALID_CONN, __FUNCTION__); + return (NULL); + } + if (conn->flags & VIR_CONNECT_RO) { + virLibConnError(conn, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + return (NULL); + } + if (xml == NULL) { + virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); + return (NULL); + } + + /* Go though the driver registered entry points */ + for (i = 0;i < conn->nb_drivers;i++) { + if ((conn->networkDrivers[i] != NULL) && + (conn->networkDrivers[i]->networkDefineXML != NULL)) { + ret = conn->networkDrivers[i]->networkDefineXML(conn, xml); + if (ret) + return(ret); + } + } + + return(ret); +} + +/** + * virNetworkUndefine: + * @network: pointer to a defined network + * + * Undefine a network but does not stop it if it is running + * + * Returns 0 in case of success, -1 in case of error + */ +int +virNetworkUndefine(virNetworkPtr network) { + int ret, i; + virConnectPtr conn; + + if (!VIR_IS_CONNECTED_NETWORK(network)) { + virLibNetworkError(network, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + return (-1); + } + conn = network->conn; + if (conn->flags & VIR_CONNECT_RO) { + virLibNetworkError(network, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + return (-1); + } + + /* Go though the driver registered entry points */ + for (i = 0;i < conn->nb_drivers;i++) { + if ((conn->networkDrivers[i] != NULL) && + (conn->networkDrivers[i]->networkUndefine != NULL)) { + ret = conn->networkDrivers[i]->networkUndefine(network); + if (ret >= 0) + return(ret); + } + } + + return(-1); +} + +/** + * virNetworkCreate: + * @network: pointer to a defined network + * + * Create and start a defined network. If the call succeed the network + * moves from the defined to the running networks pools. + * + * Returns 0 in case of success, -1 in case of error + */ +int +virNetworkCreate(virNetworkPtr network) { + int i, ret = -1; + virConnectPtr conn; + if (network == NULL) { + TODO + return (-1); + } + if (!VIR_IS_CONNECTED_NETWORK(network)) { + virLibNetworkError(network, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + return (-1); + } + conn = network->conn; + if (conn->flags & VIR_CONNECT_RO) { + virLibNetworkError(network, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + return (-1); + } + + for (i = 0;i < conn->nb_drivers;i++) { + if ((conn->networkDrivers[i] != NULL) && + (conn->networkDrivers[i]->networkCreate != NULL)) { + ret = conn->networkDrivers[i]->networkCreate(network); + if (ret == 0) + return(ret); + } + } + return(ret); +} + +/** + * virNetworkDestroy: + * @network: a network object + * + * Destroy the network object. The running instance is shutdown if not down + * already and all resources used by it are given back to the hypervisor. + * The data structure is freed and should not be used thereafter if the + * call does not return an error. + * This function may requires priviledged access + * + * Returns 0 in case of success and -1 in case of failure. + */ +int +virNetworkDestroy(virNetworkPtr network) +{ + int i; + virConnectPtr conn; + + if (!VIR_IS_CONNECTED_NETWORK(network)) { + virLibNetworkError(network, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + return (-1); + } + + conn = network->conn; + if (conn->flags & VIR_CONNECT_RO) { + virLibNetworkError(network, VIR_ERR_OPERATION_DENIED, __FUNCTION__); + return (-1); + } + + /* + * Go though the driver registered entry points + */ + for (i = 0;i < conn->nb_drivers;i++) { + if ((conn->networkDrivers[i] != NULL) && + (conn->networkDrivers[i]->networkDestroy != NULL)) { + if (conn->networkDrivers[i]->networkDestroy(network) == 0) + return (0); + } + } + + virLibConnError(conn, VIR_ERR_CALL_FAILED, __FUNCTION__); + return (-1); +} + +/** + * virNetworkFree: + * @network: a network object + * + * Free the network object. The running instance is kept alive. + * The data structure is freed and should not be used thereafter. + * + * Returns 0 in case of success and -1 in case of failure. + */ +int +virNetworkFree(virNetworkPtr network) +{ + if (!VIR_IS_NETWORK(network)) { + virLibNetworkError(network, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + return (-1); + } + if (virFreeNetwork(network->conn, network) < 0) + return (-1); + return(0); +} + +/** + * virNetworkGetName: + * @network: a network object + * + * Get the public name for that network + * + * Returns a pointer to the name or NULL, the string need not be deallocated + * its lifetime will be the same as the network object. + */ +const char * +virNetworkGetName(virNetworkPtr network) +{ + if (!VIR_IS_NETWORK(network)) { + virLibNetworkError(network, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + return (NULL); + } + return (network->name); +} + +/** + * virNetworkGetUUID: + * @network: a network object + * @uuid: pointer to a VIR_UUID_BUFLEN bytes array + * + * Get the UUID for a network + * + * Returns -1 in case of error, 0 in case of success + */ +int +virNetworkGetUUID(virNetworkPtr network, unsigned char *uuid) +{ + if (!VIR_IS_NETWORK(network)) { + virLibNetworkError(network, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + return (-1); + } + if (uuid == NULL) { + virLibNetworkError(network, VIR_ERR_INVALID_ARG, __FUNCTION__); + return (-1); + } + + memcpy(uuid, &network->uuid[0], VIR_UUID_BUFLEN); + + return (0); +} + +/** + * virNetworkGetUUIDString: + * @network: a network object + * @buf: pointer to a VIR_UUID_STRING_BUFLEN bytes array + * + * Get the UUID for a network as string. For more information about + * UUID see RFC4122. + * + * Returns -1 in case of error, 0 in case of success + */ +int +virNetworkGetUUIDString(virNetworkPtr network, char *buf) +{ + unsigned char uuid[VIR_UUID_BUFLEN]; + + if (!VIR_IS_NETWORK(network)) { + virLibNetworkError(network, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + return (-1); + } + if (buf == NULL) { + virLibNetworkError(network, VIR_ERR_INVALID_ARG, __FUNCTION__); + return (-1); + } + + if (virNetworkGetUUID(network, &uuid[0])) + return (-1); + + snprintf(buf, VIR_UUID_STRING_BUFLEN, + "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x", + uuid[0], uuid[1], uuid[2], uuid[3], + uuid[4], uuid[5], uuid[6], uuid[7], + uuid[8], uuid[9], uuid[10], uuid[11], + uuid[12], uuid[13], uuid[14], uuid[15]); + return (0); +} + +/** + * virNetworkGetXMLDesc: + * @network: a network object + * @flags: and OR'ed set of extraction flags, not used yet + * + * Provide an XML description of the network. The description may be reused + * later to relaunch the network with virNetworkCreateXML(). + * + * Returns a 0 terminated UTF-8 encoded XML instance, or NULL in case of error. + * the caller must free() the returned value. + */ +char * +virNetworkGetXMLDesc(virNetworkPtr network, int flags) +{ + int i; + char *ret = NULL; + if (!VIR_IS_NETWORK(network)) { + virLibNetworkError(network, VIR_ERR_INVALID_NETWORK, __FUNCTION__); + return (NULL); + } + if (flags != 0) { + virLibNetworkError(network, VIR_ERR_INVALID_ARG, __FUNCTION__); + return (NULL); + } + + for (i = 0;i < network->conn->nb_network_drivers;i++) { + if ((network->conn->networkDrivers[i] != NULL) && + (network->conn->networkDrivers[i]->networkDumpXML != NULL)) { + ret = network->conn->networkDrivers[i]->networkDumpXML(network, flags); + if (ret) + break; + } + } + if (!ret) { + virLibConnError(network->conn, VIR_ERR_CALL_FAILED, __FUNCTION__); + return (NULL); + } + return(ret); +} Index: libvirt/src/libvirt_sym.version =================================================================== --- libvirt.orig/src/libvirt_sym.version +++ libvirt/src/libvirt_sym.version @@ -57,5 +57,24 @@ virDomainAttachDevice; virDomainDetachDevice; + + virConnectNumOfNetworks; + virConnectListNetworks; + virConnectNumOfDefinedNetworks; + virConnectListDefinedNetworks; + virNetworkLookupByName; + virNetworkLookupByUUID; + virNetworkLookupByUUIDString; + virNetworkCreateXML; + virNetworkDefineXML; + virNetworkUndefine; + virNetworkCreate; + virNetworkDestroy; + virNetworkFree; + virNetworkGetName; + virNetworkGetUUID; + virNetworkGetUUIDString; + virNetworkGetXMLDesc; + local: *; }; Index: libvirt/src/virterror.c =================================================================== --- libvirt.orig/src/virterror.c +++ libvirt/src/virterror.c @@ -271,6 +271,9 @@ virDefaultErrorFunc(virErrorPtr err) case VIR_FROM_QEMU: dom = "QEMU "; break; + case VIR_FROM_NET: + dom = "Network "; + break; } if ((err->dom != NULL) && (err->code != VIR_ERR_INVALID_DOMAIN)) { domain = err->dom->name; @@ -585,6 +588,18 @@ __virErrorMsg(virErrorNumber error, cons else errmsg = "%s"; break; + case VIR_ERR_INVALID_NETWORK: + if (info == NULL) + errmsg = _("invalid network pointer in"); + else + errmsg = _("invalid network pointer in %s"); + break; + case VIR_ERR_NETWORK_EXIST: + if (info == NULL) + errmsg = _("this network exists already"); + else + errmsg = _("network %s exists already"); + break; } return (errmsg); } --

Implement the virsh net-* commands. These too mirror the domain commands. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com&gt; Index: libvirt-foo/src/virsh.c =================================================================== --- libvirt-foo.orig/src/virsh.c 2007-02-14 16:04:55.000000000 +0000 +++ libvirt-foo.orig/src/virsh.c 2007-02-14 16:04:55.000000000 +0000 @@ -10,7 +10,7 @@ * Daniel P. Berrange <berrange(a)redhat.com&gt; * * - * $Id: virsh.c,v 1.50 2007/02/14 16:04:55 markmc Exp $ + * $Id: virsh.c,v 1.51 2007/02/14 15:44:58 markmc Exp $ */ #define _GNU_SOURCE /* isblank() */ @@ -206,6 +206,14 @@ static virDomainPtr vshCommandOptDomainB vshCommandOptDomainBy(_ctl, _cmd, _optname, _name, \ VSH_BYID|VSH_BYUUID|VSH_BYNAME) +static virNetworkPtr vshCommandOptNetworkBy(vshControl * ctl, vshCmd * cmd, + const char *optname, char **name, int flag); + +/* default is lookup by Name and UUID */ +#define vshCommandOptNetwork(_ctl, _cmd, _optname, _name) \ + vshCommandOptNetworkBy(_ctl, _cmd, _optname, _name, \ + VSH_BYUUID|VSH_BYNAME) + static void vshPrintExtra(vshControl * ctl, const char *format, ...); static void vshDebug(vshControl * ctl, int level, const char *format, ...); @@ -1626,6 +1634,459 @@ cmdDomuuid(vshControl * ctl, vshCmd * cm /* + * "net-create" command + */ +static vshCmdInfo info_network_create[] = { + {"syntax", "create a network from an XML <file>"}, + {"help", gettext_noop("create a network from an XML file")}, + {"desc", gettext_noop("Create a network.")}, + {NULL, NULL} +}; + +static vshCmdOptDef opts_network_create[] = { + {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("file containing an XML network description")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdNetworkCreate(vshControl * ctl, vshCmd * cmd) +{ + virNetworkPtr network; + char *from; + int found; + int ret = TRUE; + char buffer[BUFSIZ]; + int fd, l; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + from = vshCommandOptString(cmd, "file", &found); + if (!found) + return FALSE; + + fd = open(from, O_RDONLY); + if (fd < 0) { + vshError(ctl, FALSE, _("Failed to read description file %s"), from); + return(FALSE); + } + l = read(fd, &buffer[0], sizeof(buffer)); + if ((l <= 0) || (l >= (int) sizeof(buffer))) { + vshError(ctl, FALSE, _("Failed to read description file %s"), from); + close(fd); + return(FALSE); + } + buffer[l] = 0; + network = virNetworkCreateXML(ctl->conn, &buffer[0]); + if (network != NULL) { + vshPrint(ctl, _("Network %s created from %s\n"), + virNetworkGetName(network), from); + } else { + vshError(ctl, FALSE, _("Failed to create network from %s"), from); + ret = FALSE; + } + return ret; +} + + +/* + * "net-define" command + */ +static vshCmdInfo info_network_define[] = { + {"syntax", "define a network from an XML <file>"}, + {"help", gettext_noop("define (but don't start) a network from an XML file")}, + {"desc", gettext_noop("Define a network.")}, + {NULL, NULL} +}; + +static vshCmdOptDef opts_network_define[] = { + {"file", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("file conatining an XML network description")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdNetworkDefine(vshControl * ctl, vshCmd * cmd) +{ + virNetworkPtr network; + char *from; + int found; + int ret = TRUE; + char buffer[BUFSIZ]; + int fd, l; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + from = vshCommandOptString(cmd, "file", &found); + if (!found) + return FALSE; + + fd = open(from, O_RDONLY); + if (fd < 0) { + vshError(ctl, FALSE, _("Failed to read description file %s"), from); + return(FALSE); + } + l = read(fd, &buffer[0], sizeof(buffer)); + if ((l <= 0) || (l >= (int) sizeof(buffer))) { + vshError(ctl, FALSE, _("Failed to read description file %s"), from); + close(fd); + return(FALSE); + } + buffer[l] = 0; + network = virNetworkDefineXML(ctl->conn, &buffer[0]); + if (network != NULL) { + vshPrint(ctl, _("Network %s defined from %s\n"), + virNetworkGetName(network), from); + } else { + vshError(ctl, FALSE, _("Failed to define network from %s"), from); + ret = FALSE; + } + return ret; +} + + +/* + * "net-destroy" command + */ +static vshCmdInfo info_network_destroy[] = { + {"syntax", "net-destroy <network>"}, + {"help", gettext_noop("destroy a network")}, + {"desc", gettext_noop("Destroy a given network.")}, + {NULL, NULL} +}; + +static vshCmdOptDef opts_network_destroy[] = { + {"network", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("network name, id or uuid")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdNetworkDestroy(vshControl * ctl, vshCmd * cmd) +{ + virNetworkPtr network; + int ret = TRUE; + char *name; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(network = vshCommandOptNetwork(ctl, cmd, "network", &name))) + return FALSE; + + if (virNetworkDestroy(network) == 0) { + vshPrint(ctl, _("Network %s destroyed\n"), name); + } else { + vshError(ctl, FALSE, _("Failed to destroy network %s"), name); + ret = FALSE; + virNetworkFree(network); + } + + return ret; +} + + +/* + * "net-dumpxml" command + */ +static vshCmdInfo info_network_dumpxml[] = { + {"syntax", "net-dumpxml <name>"}, + {"help", gettext_noop("network information in XML")}, + {"desc", gettext_noop("Ouput the network information as an XML dump to stdout.")}, + {NULL, NULL} +}; + +static vshCmdOptDef opts_network_dumpxml[] = { + {"network", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("network name, id or uuid")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdNetworkDumpXML(vshControl * ctl, vshCmd * cmd) +{ + virNetworkPtr network; + int ret = TRUE; + char *dump; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(network = vshCommandOptNetwork(ctl, cmd, "network", NULL))) + return FALSE; + + dump = virNetworkGetXMLDesc(network, 0); + if (dump != NULL) { + printf("%s", dump); + free(dump); + } else { + ret = FALSE; + } + + virNetworkFree(network); + return ret; +} + + +/* + * "net-list" command + */ +static vshCmdInfo info_network_list[] = { + {"syntax", "net-list [ --inactive | --all ]"}, + {"help", gettext_noop("list networks")}, + {"desc", gettext_noop("Returns list of networks.")}, + {NULL, NULL} +}; + +static vshCmdOptDef opts_network_list[] = { + {"inactive", VSH_OT_BOOL, 0, gettext_noop("list inactive networks")}, + {"all", VSH_OT_BOOL, 0, gettext_noop("list inactive & active networks")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdNetworkList(vshControl * ctl, vshCmd * cmd ATTRIBUTE_UNUSED) +{ + int inactive = vshCommandOptBool(cmd, "inactive"); + int all = vshCommandOptBool(cmd, "all"); + int active = !inactive || all ? 1 : 0; + int maxactive = 0, maxinactive = 0, i; + const char **activeNames = NULL, **inactiveNames = NULL; + inactive |= all; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (active) { + maxactive = virConnectNumOfNetworks(ctl->conn); + if (maxactive < 0) { + vshError(ctl, FALSE, _("Failed to list active networks")); + return FALSE; + } + if (maxactive) { + activeNames = vshMalloc(ctl, sizeof(int) * maxactive); + + if ((maxactive = virConnectListNetworks(ctl->conn, &activeNames[0], maxactive)) < 0) { + vshError(ctl, FALSE, _("Failed to list active networks")); + free(activeNames); + return FALSE; + } + + qsort(&activeNames[0], maxactive, sizeof(int), namesorter); + } + } + if (inactive) { + maxinactive = virConnectNumOfDefinedNetworks(ctl->conn); + if (maxinactive < 0) { + vshError(ctl, FALSE, _("Failed to list inactive networks")); + if (activeNames) + free(activeNames); + return FALSE; + } + if (maxinactive) { + inactiveNames = vshMalloc(ctl, sizeof(char *) * maxinactive); + + if ((maxinactive = virConnectListDefinedNetworks(ctl->conn, inactiveNames, maxinactive)) < 0) { + vshError(ctl, FALSE, _("Failed to list inactive networks")); + if (activeNames) + free(activeNames); + free(inactiveNames); + return FALSE; + } + + qsort(&inactiveNames[0], maxinactive, sizeof(char*), namesorter); + } + } + vshPrintExtra(ctl, "%-20s\n", _("Name")); + vshPrintExtra(ctl, "----------------------------------\n"); + + for (i = 0; i < maxactive; i++) { + virNetworkPtr network = virNetworkLookupByName(ctl->conn, activeNames[i]); + + /* this kind of work with networks is not atomic operation */ + if (!network) { + free(activeNames[i]); + continue; + } + + vshPrint(ctl, "%-20s\n", + virNetworkGetName(network)); + virNetworkFree(network); + free(activeNames[i]); + } + for (i = 0; i < maxinactive; i++) { + virNetworkPtr network = virNetworkLookupByName(ctl->conn, inactiveNames[i]); + + /* this kind of work with networks is not atomic operation */ + if (!network) { + free(inactiveNames[i]); + continue; + } + + vshPrint(ctl, "%-20s\n", + inactiveNames[i]); + + virNetworkFree(network); + free(inactiveNames[i]); + } + if (activeNames) + free(activeNames); + if (inactiveNames) + free(inactiveNames); + return TRUE; +} + + +/* + * "net-name" command + */ +static vshCmdInfo info_network_name[] = { + {"syntax", "net-name <network>"}, + {"help", gettext_noop("convert a network UUID to network name")}, + {NULL, NULL} +}; + +static vshCmdOptDef opts_network_name[] = { + {"network", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("network uuid")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdNetworkName(vshControl * ctl, vshCmd * cmd) +{ + virNetworkPtr network; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + if (!(network = vshCommandOptNetworkBy(ctl, cmd, "network", NULL, + VSH_BYUUID))) + return FALSE; + + vshPrint(ctl, "%s\n", virNetworkGetName(network)); + virNetworkFree(network); + return TRUE; +} + + +/* + * "net-start" command + */ +static vshCmdInfo info_network_start[] = { + {"syntax", "start <network>"}, + {"help", gettext_noop("start a (previously defined) inactive network")}, + {"desc", gettext_noop("Start a network.")}, + {NULL, NULL} +}; + +static vshCmdOptDef opts_network_start[] = { + {"name", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("name of the inactive network")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdNetworkStart(vshControl * ctl, vshCmd * cmd) +{ + virNetworkPtr network; + char *name; + int found; + int ret = TRUE; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + name = vshCommandOptString(cmd, "name", &found); + if (!found) + return FALSE; + + network = virNetworkLookupByName(ctl->conn, name); + if (!network) + return FALSE; + + if (virNetworkCreate(network) == 0) { + vshPrint(ctl, _("Network %s started\n"), + name); + } else { + vshError(ctl, FALSE, _("Failed to start network %s"), name); + ret = FALSE; + } + return ret; +} + + +/* + * "net-undefine" command + */ +static vshCmdInfo info_network_undefine[] = { + {"syntax", "net-undefine <network>"}, + {"help", gettext_noop("undefine an inactive network")}, + {"desc", gettext_noop("Undefine the configuration for an inactive network.")}, + {NULL, NULL} +}; + +static vshCmdOptDef opts_network_undefine[] = { + {"network", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("network name or uuid")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdNetworkUndefine(vshControl * ctl, vshCmd * cmd) +{ + virNetworkPtr network; + int ret = TRUE; + char *name; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(network = vshCommandOptNetwork(ctl, cmd, "network", &name))) + return FALSE; + + if (virNetworkUndefine(network) == 0) { + vshPrint(ctl, _("Network %s has been undefined\n"), name); + } else { + vshError(ctl, FALSE, _("Failed to undefine network %s"), name); + ret = FALSE; + } + + return ret; +} + + +/* + * "net-uuid" command + */ +static vshCmdInfo info_network_uuid[] = { + {"syntax", "net-uuid <network>"}, + {"help", gettext_noop("convert a network name to network UUID")}, + {NULL, NULL} +}; + +static vshCmdOptDef opts_network_uuid[] = { + {"network", VSH_OT_DATA, VSH_OFLAG_REQ, gettext_noop("network name")}, + {NULL, 0, 0, NULL} +}; + +static int +cmdNetworkUuid(vshControl * ctl, vshCmd * cmd) +{ + virNetworkPtr network; + char uuid[VIR_UUID_STRING_BUFLEN]; + + if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) + return FALSE; + + if (!(network = vshCommandOptNetworkBy(ctl, cmd, "network", NULL, + VSH_BYNAME))) + return FALSE; + + if (virNetworkGetUUIDString(network, uuid) != -1) + vshPrint(ctl, "%s\n", uuid); + else + vshError(ctl, FALSE, _("failed to get network UUID")); + + return TRUE; +} + + +/* * "version" command */ static vshCmdInfo info_version[] = { @@ -1821,6 +2282,15 @@ static vshCmdDef commands[] = { {"dumpxml", cmdDumpXML, opts_dumpxml, info_dumpxml}, {"help", cmdHelp, opts_help, info_help}, {"list", cmdList, opts_list, info_list}, + {"net-create", cmdNetworkCreate, opts_network_create, info_network_create}, + {"net-define", cmdNetworkDefine, opts_network_define, info_network_define}, + {"net-destroy", cmdNetworkDestroy, opts_network_destroy, info_network_destroy}, + {"net-dumpxml", cmdNetworkDumpXML, opts_network_dumpxml, info_network_dumpxml}, + {"net-list", cmdNetworkList, opts_network_list, info_network_list}, + {"net-name", cmdNetworkName, opts_network_name, info_network_name}, + {"net-start", cmdNetworkStart, opts_network_start, info_network_start}, + {"net-undefine", cmdNetworkUndefine, opts_network_undefine, info_network_undefine}, + {"net-uuid", cmdNetworkUuid, opts_network_uuid, info_network_uuid}, {"nodeinfo", cmdNodeinfo, NULL, info_nodeinfo}, {"quit", cmdQuit, NULL, info_quit}, {"reboot", cmdReboot, opts_reboot, info_reboot}, @@ -2118,6 +2588,43 @@ vshCommandOptDomainBy(vshControl * ctl, return dom; } +static virNetworkPtr +vshCommandOptNetworkBy(vshControl * ctl, vshCmd * cmd, const char *optname, + char **name, int flag) +{ + virNetworkPtr network = NULL; + char *n; + + if (!(n = vshCommandOptString(cmd, optname, NULL))) { + vshError(ctl, FALSE, _("undefined network name")); + return NULL; + } + + vshDebug(ctl, 5, "%s: found option <%s>: %s\n", + cmd->def->name, optname, n); + + if (name) + *name = n; + + /* try it by UUID */ + if (network==NULL && (flag & VSH_BYUUID) && strlen(n)==VIR_UUID_STRING_BUFLEN-1) { + vshDebug(ctl, 5, "%s: <%s> tring as network UUID\n", + cmd->def->name, optname); + network = virNetworkLookupByUUIDString(ctl->conn, n); + } + /* try it by NAME */ + if (network==NULL && (flag & VSH_BYNAME)) { + vshDebug(ctl, 5, "%s: <%s> tring as network NAME\n", + cmd->def->name, optname); + network = virNetworkLookupByName(ctl->conn, n); + } + + if (!network) + vshError(ctl, FALSE, _("failed to get network '%s'"), n); + + return network; +} + /* * Executes command(s) and returns return code from last command */ --

Implement the qemud's network stubs, but don't actually do anything when starting a network. Note, an example XML file would be: <network> <name>TestNetwork</name> <uuid>ac57b808-bfdd-4aa3-8da8-0bd4ac1faceb</uuid> <ip address="10.0.0.1" netmask="255.255.255.0"> <dhcp> <range start="10.0.0.16" end="10.0.0.32" /> <range start="10.0.0.128" end="10.0.0.254" /> </dhcp> </ip> </network> Signed-off-by: Mark McLoughlin <markmc(a)redhat.com&gt; Index: libvirt-foo/qemud/conf.c =================================================================== --- libvirt-foo.orig/qemud/conf.c 2007-02-14 14:57:31.000000000 +0000 +++ libvirt-foo.orig/qemud/conf.c 2007-02-14 14:57:31.000000000 +0000 @@ -1098,17 +1098,186 @@ struct qemud_vm *qemudLoadConfigXML(stru } +void qemudFreeNetwork(struct qemud_network *network) { + free(network); +} + + +static int qemudSaveNetworkConfig(struct qemud_server *server, + struct qemud_network *network) { + char *xml; + int fd, ret = -1; + int towrite; + + if (!(xml = qemudGenerateNetworkXML(server, network))) { + return -1; + } + + if (qemudEnsureConfigDir(server, server->networkConfigDir) < 0) { + goto cleanup; + } + + if ((fd = open(network->configFile, + O_WRONLY | O_CREAT | O_TRUNC, + S_IRUSR | S_IWUSR )) < 0) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot create config file %s", network->configFile); + goto cleanup; + } + + towrite = strlen(xml); + if (write(fd, xml, towrite) != towrite) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot write config file %s", network->configFile); + goto cleanup; + } + + if (close(fd) < 0) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot save config file %s", network->configFile); + goto cleanup; + } + + ret = 0; + + cleanup: + + free(xml); + + return ret; +} + + +static int qemudParseNetworkXML(struct qemud_server *server, + xmlDocPtr xml, + struct qemud_network *network) { + xmlNodePtr root = NULL; + xmlXPathContextPtr ctxt = NULL; + xmlXPathObjectPtr obj = NULL; + + /* Prepare parser / xpath context */ + root = xmlDocGetRootElement(xml); + if ((root == NULL) || (!xmlStrEqual(root->name, BAD_CAST "network"))) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "%s", "incorrect root element"); + goto error; + } + + ctxt = xmlXPathNewContext(xml); + if (ctxt == NULL) { + qemudReportError(server, VIR_ERR_NO_MEMORY, "xmlXPathContext"); + goto error; + } + + + /* Extract network name */ + obj = xmlXPathEval(BAD_CAST "string(/network/name[1])", ctxt); + if ((obj == NULL) || (obj->type != XPATH_STRING) || + (obj->stringval == NULL) || (obj->stringval[0] == 0)) { + qemudReportError(server, VIR_ERR_NO_NAME, NULL); + goto error; + } + if (strlen((const char *)obj->stringval) >= (QEMUD_MAX_NAME_LEN-1)) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "%s", "network name length too long"); + goto error; + } + strcpy(network->def.name, (const char *)obj->stringval); + xmlXPathFreeObject(obj); + + + /* Extract network uuid */ + obj = xmlXPathEval(BAD_CAST "string(/network/uuid[1])", ctxt); + if ((obj == NULL) || (obj->type != XPATH_STRING) || + (obj->stringval == NULL) || (obj->stringval[0] == 0)) { + /* XXX auto-generate a UUID */ + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "%s", "missing uuid element"); + goto error; + } + if (qemudParseUUID((const char *)obj->stringval, network->def.uuid) < 0) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "%s", "malformed uuid element"); + goto error; + } + xmlXPathFreeObject(obj); + + xmlXPathFreeContext(ctxt); + + return 0; + + error: + /* XXX free all the stuff in the qemud_network struct, or leave it upto + the caller ? */ + if (obj) + xmlXPathFreeObject(obj); + if (ctxt) + xmlXPathFreeContext(ctxt); + return -1; +} + + +struct qemud_network *qemudLoadNetworkConfigXML(struct qemud_server *server, + const char *file, + const char *doc, + int save) { + struct qemud_network *network = NULL; + xmlDocPtr xml; + + if (!(xml = xmlReadDoc(BAD_CAST doc, file ? file : "network.xml", NULL, + XML_PARSE_NOENT | XML_PARSE_NONET | + XML_PARSE_NOERROR | XML_PARSE_NOWARNING))) { + qemudReportError(server, VIR_ERR_XML_ERROR, NULL); + return NULL; + } + + if (!(network = calloc(1, sizeof(struct qemud_network)))) { + qemudReportError(server, VIR_ERR_NO_MEMORY, "network"); + return NULL; + } + + if (qemudParseNetworkXML(server, xml, network) < 0) { + xmlFreeDoc(xml); + qemudFreeNetwork(network); + return NULL; + } + xmlFreeDoc(xml); + + if (qemudFindNetworkByUUID(server, network->def.uuid) || + qemudFindNetworkByName(server, network->def.name)) { + qemudReportError(server, VIR_ERR_NETWORK_EXIST, network->def.name); + qemudFreeNetwork(network); + return NULL; + } + + if (file) { + strncpy(network->configFile, file, PATH_MAX); + network->configFile[PATH_MAX-1] = '\0'; + } else { + if (save) { + if (qemudMakeConfigPath(server->networkConfigDir, network->def.name, ".xml", network->configFile, PATH_MAX) < 0) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot construct config file path"); + qemudFreeNetwork(network); + return NULL; + } + + if (qemudSaveNetworkConfig(server, network) < 0) { + qemudFreeNetwork(network); + return NULL; + } + } else { + network->configFile[0] = '\0'; + } + } + + return network; +} + + /* Load a guest from its persistent config file */ static void qemudLoadConfig(struct qemud_server *server, - const char *file) { + const char *file, + int isGuest) { FILE *fh; struct stat st; - struct qemud_vm *vm; char xml[QEMUD_MAX_XML_LEN]; int ret; if (!(fh = fopen(file, "r"))) { - qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot open guest config file %s", file); + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot open config file %s", file); return; } @@ -1118,7 +1287,7 @@ static void qemudLoadConfig(struct qemud } if (st.st_size >= QEMUD_MAX_XML_LEN) { - qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "guest config too large in file %s", file); + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "config too large in file %s", file); goto cleanup; } @@ -1128,10 +1297,20 @@ static void qemudLoadConfig(struct qemud } xml[st.st_size] = '\0'; - if ((vm = qemudLoadConfigXML(server, file, xml, 1))) { - vm->next = server->inactivevms; - server->inactivevms = vm; - server->ninactivevms++; + if (isGuest) { + struct qemud_vm *vm; + if ((vm = qemudLoadConfigXML(server, file, xml, 1))) { + vm->next = server->inactivevms; + server->inactivevms = vm; + server->ninactivevms++; + } + } else { + struct qemud_network *network; + if ((network = qemudLoadNetworkConfigXML(server, file, xml, 1))) { + network->next = server->inactivenetworks; + server->inactivenetworks = network; + server->ninactivenetworks++; + } } cleanup: @@ -1141,7 +1320,8 @@ static void qemudLoadConfig(struct qemud static int qemudScanConfigDir(struct qemud_server *server, - const char *configDir) { + const char *configDir, + int isGuest) { DIR *dir; struct dirent *entry; @@ -1159,7 +1339,7 @@ int qemudScanConfigDir(struct qemud_serv if (qemudMakeConfigPath(configDir, entry->d_name, NULL, file, PATH_MAX) < 0) continue; - qemudLoadConfig(server, file); + qemudLoadConfig(server, file, isGuest); } closedir(dir); @@ -1169,7 +1349,9 @@ int qemudScanConfigDir(struct qemud_serv /* Scan for all guest and network config files */ int qemudScanConfigs(struct qemud_server *server) { - return qemudScanConfigDir(server, server->configDir); + if (qemudScanConfigDir(server, server->configDir, 0) < 0) + return -1; + return qemudScanConfigDir(server, server->networkConfigDir, 1); } /* Simple grow-on-demand string buffer */ @@ -1424,19 +1606,54 @@ char *qemudGenerateXML(struct qemud_serv } -int qemudDeleteConfigXML(struct qemud_server *server, struct qemud_vm *vm) { - if (!vm->configFile[0]) { - qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "no config file for guest %s", vm->def.name); +char *qemudGenerateNetworkXML(struct qemud_server *server, + struct qemud_network *network) { + struct qemudBuffer buf; + unsigned char *uuid; + + buf.len = QEMUD_MAX_XML_LEN; + buf.used = 0; + buf.data = malloc(buf.len); + + if (qemudBufferPrintf(&buf, "<network>\n") < 0) + goto no_memory; + + if (qemudBufferPrintf(&buf, " <name>%s</name>\n", network->def.name) < 0) + goto no_memory; + + uuid = network->def.uuid; + if (qemudBufferPrintf(&buf, " <uuid>%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x</uuid>\n", + uuid[0], uuid[1], uuid[2], uuid[3], + uuid[4], uuid[5], uuid[6], uuid[7], + uuid[8], uuid[9], uuid[10], uuid[11], + uuid[12], uuid[13], uuid[14], uuid[15]) < 0) + goto no_memory; + + if (qemudBufferAdd(&buf, "</network>\n") < 0) + goto no_memory; + + return buf.data; + + no_memory: + qemudReportError(server, VIR_ERR_NO_MEMORY, "xml"); + free(buf.data); + return NULL; +} + + +int qemudDeleteConfig(struct qemud_server *server, + const char *configFile, + const char *name) { + if (!configFile[0]) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "no config file for %s", name); return -1; } - if (unlink(vm->configFile) < 0) { - qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot remove config for guest %s", vm->def.name); + if (unlink(configFile) < 0) { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, "cannot remove config for %s", name); return -1; } - vm->configFile[0] = '\0'; - return 0; } Index: libvirt-foo/qemud/conf.h =================================================================== --- libvirt-foo.orig/qemud/conf.h 2007-02-14 15:06:41.000000000 +0000 +++ libvirt-foo.orig/qemud/conf.h 2007-02-14 15:06:41.000000000 +0000 @@ -30,18 +30,26 @@ int qemudBuildCommandLine(struct qemud_s struct qemud_vm *vm, char ***argv); +int qemudScanConfigs(struct qemud_server *server); +int qemudDeleteConfig(struct qemud_server *server, + const char *configFile, + const char *name); + void qemudFreeVM(struct qemud_vm *vm); struct qemud_vm *qemudLoadConfigXML(struct qemud_server *server, const char *file, const char *doc, int persist); -int qemudScanConfigs(struct qemud_server *server); char *qemudGenerateXML(struct qemud_server *server, struct qemud_vm *vm); -int qemudDeleteConfigXML(struct qemud_server *server, - struct qemud_vm *vm); - +void qemudFreeNetwork(struct qemud_network *network); +struct qemud_network *qemudLoadNetworkConfigXML(struct qemud_server *server, + const char *file, + const char *doc, + int persist); +char *qemudGenerateNetworkXML(struct qemud_server *server, + struct qemud_network *network); #endif Index: libvirt-foo/qemud/driver.c =================================================================== --- libvirt-foo.orig/qemud/driver.c 2007-02-14 15:46:58.000000000 +0000 +++ libvirt-foo.orig/qemud/driver.c 2007-02-14 15:46:58.000000000 +0000 @@ -522,9 +522,11 @@ int qemudDomainUndefine(struct qemud_ser return -1; } - if (qemudDeleteConfigXML(server, vm) < 0) + if (qemudDeleteConfig(server, vm->configFile, vm->def.name) < 0) return -1; + vm->configFile[0] = '\0'; + while (curr) { if (curr == vm) { if (prev) { @@ -547,67 +549,198 @@ int qemudDomainUndefine(struct qemud_ser struct qemud_network *qemudFindNetworkByUUID(const struct qemud_server *server, const unsigned char *uuid) { - server = NULL; uuid = NULL; + struct qemud_network *network = server->activenetworks; + + while (network) { + if (!memcmp(network->def.uuid, uuid, QEMUD_UUID_RAW_LEN)) + return network; + network = network->next; + } + + network = server->inactivenetworks; + while (network) { + if (!memcmp(network->def.uuid, uuid, QEMUD_UUID_RAW_LEN)) + return network; + network = network->next; + } + return NULL; } struct qemud_network *qemudFindNetworkByName(const struct qemud_server *server, const char *name) { - server = NULL; name = NULL; + struct qemud_network *network = server->activenetworks; + + while (network) { + if (!strcmp(network->def.name, name)) + return network; + network = network->next; + } + + network = server->inactivenetworks; + while (network) { + if (!strcmp(network->def.name, name)) + return network; + network = network->next; + } + return NULL; } int qemudNumNetworks(struct qemud_server *server) { - server = NULL; - return 0; + return server->nactivenetworks; } int qemudListNetworks(struct qemud_server *server, char *const*names, int nnames) { - server = NULL; names = NULL; nnames = 0; - return 0; + struct qemud_network *network = server->activenetworks; + int got = 0; + while (network && got < nnames) { + strncpy(names[got], network->def.name, QEMUD_MAX_NAME_LEN-1); + names[got][QEMUD_MAX_NAME_LEN-1] = '\0'; + network = network->next; + got++; + } + return got; } int qemudNumDefinedNetworks(struct qemud_server *server) { - server = NULL; - return 0; + return server->ninactivenetworks; } int qemudListDefinedNetworks(struct qemud_server *server, char *const*names, int nnames) { - server = NULL; names = NULL; nnames = 0; - return 0; + struct qemud_network *network = server->inactivenetworks; + int got = 0; + while (network && got < nnames) { + strncpy(names[got], network->def.name, QEMUD_MAX_NAME_LEN-1); + names[got][QEMUD_MAX_NAME_LEN-1] = '\0'; + network = network->next; + got++; + } + return got; } struct qemud_network *qemudNetworkCreate(struct qemud_server *server, const char *xml) { - server = NULL; xml = NULL; - return NULL; + struct qemud_network *network; + + if (!(network = qemudLoadNetworkConfigXML(server, NULL, xml, 0))) { + return NULL; + } + + if (qemudStartNetworkDaemon(server, network) < 0) { + qemudFreeNetwork(network); + return NULL; + } + + network->next = server->activenetworks; + server->activenetworks = network; + server->nactivenetworks++; + + return network; } struct qemud_network *qemudNetworkDefine(struct qemud_server *server, const char *xml) { - server = NULL; xml = NULL; - return NULL; + struct qemud_network *network; + + if (!(network = qemudLoadNetworkConfigXML(server, NULL, xml, 1))) { + return NULL; + } + + network->next = server->inactivenetworks; + server->inactivenetworks = network; + server->ninactivenetworks++; + + return network; } int qemudNetworkUndefine(struct qemud_server *server, const unsigned char *uuid) { - qemudReportError(server, VIR_ERR_INVALID_NETWORK, "no network with matching uuid"); - uuid = NULL; - return -1; + struct qemud_network *network = qemudFindNetworkByUUID(server, uuid); + struct qemud_network *prev = NULL, *curr = server->inactivenetworks; + + if (!network) { + qemudReportError(server, VIR_ERR_INVALID_DOMAIN, "no network with matching uuid"); + return -1; + } + + if (qemudDeleteConfig(server, network->configFile, network->def.name) < 0) + return -1; + + network->configFile[0] = '\0'; + + while (curr) { + if (curr == network) { + if (prev) { + prev->next = curr->next; + } else { + server->inactivenetworks = curr->next; + } + server->ninactivenetworks--; + break; + } + + prev = curr; + curr = curr->next; + } + + qemudFreeNetwork(network); + + return 0; } int qemudNetworkStart(struct qemud_server *server, struct qemud_network *network) { - server = NULL; network = NULL; - return 1; + struct qemud_network *prev = NULL, *curr = server->inactivenetworks; + if (qemudStartNetworkDaemon(server, network) < 0) { + return 1; + } + + while (curr) { + if (curr == network) { + if (prev) + prev->next = curr->next; + else + server->inactivenetworks = curr->next; + server->ninactivenetworks--; + break; + } + prev = curr; + curr = curr->next; + } + + network->next = server->activenetworks; + server->activenetworks = network; + server->nactivenetworks++; + + return 0; } int qemudNetworkDestroy(struct qemud_server *server, const unsigned char *uuid) { - uuid = NULL; - qemudReportError(server, VIR_ERR_INVALID_NETWORK, "no network with matching uuid"); - return -1; + struct qemud_network *network = qemudFindNetworkByUUID(server, uuid); + if (!network) { + qemudReportError(server, VIR_ERR_INVALID_NETWORK, "no network with matching uuid"); + return -1; + } + + if (qemudShutdownNetworkDaemon(server, network) < 0) + return -1; + + return 0; } int qemudNetworkDumpXML(struct qemud_server *server, const unsigned char *uuid, char *xml, int xmllen) { - qemudReportError(server, VIR_ERR_INVALID_NETWORK, "no network with matching uuid"); - uuid = NULL; xml = NULL; xmllen = 0; - return -1; + struct qemud_network *network = qemudFindNetworkByUUID(server, uuid); + char *networkxml; + if (!network) { + qemudReportError(server, VIR_ERR_INVALID_NETWORK, "no network with matching uuid"); + return -1; + } + + networkxml = qemudGenerateNetworkXML(server, network); + if (!networkxml) + return -1; + + strncpy(xml, networkxml, xmllen); + xml[xmllen-1] = '\0'; + + return 0; } /* Index: libvirt-foo/qemud/internal.h =================================================================== --- libvirt-foo.orig/qemud/internal.h 2007-02-14 15:46:58.000000000 +0000 +++ libvirt-foo.orig/qemud/internal.h 2007-02-14 15:46:58.000000000 +0000 @@ -207,6 +207,8 @@ struct qemud_network_def { /* Virtual Network runtime state */ struct qemud_network { + char configFile[PATH_MAX]; + struct qemud_network_def def; struct qemud_network *next; }; @@ -243,7 +245,12 @@ struct qemud_server { int ninactivevms; struct qemud_vm *inactivevms; int nextvmid; + int nactivenetworks; + struct qemud_network *activenetworks; + int ninactivenetworks; + struct qemud_network *inactivenetworks; char configDir[PATH_MAX]; + char networkConfigDir[PATH_MAX]; char errorMessage[QEMUD_MAX_ERROR_LEN]; int errorCode; }; @@ -254,6 +261,13 @@ int qemudStartVMDaemon(struct qemud_serv int qemudShutdownVMDaemon(struct qemud_server *server, struct qemud_vm *vm); +int qemudStartNetworkDaemon(struct qemud_server *server, + struct qemud_network *network); + +int qemudShutdownNetworkDaemon(struct qemud_server *server, + struct qemud_network *network); + + #endif /* Index: libvirt-foo/qemud/qemud.c =================================================================== --- libvirt-foo.orig/qemud/qemud.c 2007-02-14 14:53:23.000000000 +0000 +++ libvirt-foo.orig/qemud/qemud.c 2007-02-14 14:53:23.000000000 +0000 @@ -251,6 +251,9 @@ static struct qemud_server *qemudInitial if (snprintf(server->configDir, sizeof(server->configDir), "%s/qemud", SYSCONF_DIR) >= (int)sizeof(server->configDir)) { goto cleanup; } + if (snprintf(server->networkConfigDir, sizeof(server->networkConfigDir), "%s/qemud/networks", SYSCONF_DIR) >= (int)sizeof(server->networkConfigDir)) { + goto cleanup; + } } else { struct passwd *pw; int uid; @@ -264,8 +267,13 @@ static struct qemud_server *qemudInitial if (snprintf(server->configDir, sizeof(server->configDir), "%s/.qemud", pw->pw_dir) >= (int)sizeof(server->configDir)) { goto cleanup; } + + if (snprintf(server->networkConfigDir, sizeof(server->networkConfigDir), "%s/.qemud.d/networks", pw->pw_dir) >= (int)sizeof(server->networkConfigDir)) { + goto cleanup; + } } + if (qemudListen(server, sys) < 0) { goto cleanup; } @@ -696,6 +704,20 @@ static int qemudDispatchVMFailure(struct } +int qemudStartNetworkDaemon(struct qemud_server *server, + struct qemud_network *network) { + server = NULL; network = NULL; + return 0; +} + + +int qemudShutdownNetworkDaemon(struct qemud_server *server, + struct qemud_network *network) { + server = NULL; network = NULL; + return 0; +} + + static int qemudDispatchPoll(struct qemud_server *server, struct pollfd *fds) { struct qemud_socket *sock = server->sockets; struct qemud_client *client = server->clients; --

Add support for starting dnsmasq and a <dhcp> element to configure the behaviour of the dhcp server. Note, there's quite a bit more interesting stuff we can do with dnsmasq to e.g. pre-define a set of mac <-> ip address mappings but we can add that later. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com&gt; Index: libvirt-foo/qemud/conf.c =================================================================== --- libvirt-foo.orig/qemud/conf.c 2007-02-14 15:59:02.000000000 +0000 +++ libvirt-foo.orig/qemud/conf.c 2007-02-14 15:59:02.000000000 +0000 @@ -1099,6 +1099,12 @@ struct qemud_vm *qemudLoadConfigXML(stru void qemudFreeNetwork(struct qemud_network *network) { + struct qemud_dhcp_range_def *range = network->def.ranges; + while (range) { + struct qemud_dhcp_range_def *next = range->next; + free(range); + range = next; + } free(network); } @@ -1177,11 +1183,61 @@ static int qemudParseBridgeXML(struct qe return 1; } +static int qemudParseDhcpRangesXML(struct qemud_server *server, + struct qemud_network *network, + xmlNodePtr node) { + + xmlNodePtr cur; + + cur = node->children; + while (cur != NULL) { + struct qemud_dhcp_range_def *range; + xmlChar *start, *end; + + if (cur->type != XML_ELEMENT_NODE || + !xmlStrEqual(cur->name, BAD_CAST "range")) { + cur = cur->next; + continue; + } + + if (!(range = calloc(1, sizeof(struct qemud_dhcp_range_def)))) { + qemudReportError(server, VIR_ERR_NO_MEMORY, "range"); + return 0; + } + + start = xmlGetProp(cur, BAD_CAST "start"); + end = xmlGetProp(cur, BAD_CAST "end"); + + if (start && start[0] && end && end[0]) { + strncpy(range->start, (const char *)start, BR_INET_ADDR_MAXLEN-1); + range->start[BR_INET_ADDR_MAXLEN-1] = '\0'; + + strncpy(range->end, (const char *)end, BR_INET_ADDR_MAXLEN-1); + range->end[BR_INET_ADDR_MAXLEN-1] = '\0'; + + range->next = network->def.ranges; + network->def.ranges = range; + network->def.nranges++; + } else { + free(range); + } + + if (start) + xmlFree(start); + if (end) + xmlFree(end); + + cur = cur->next; + } + + return 1; +} static int qemudParseInetXML(struct qemud_server *server ATTRIBUTE_UNUSED, struct qemud_network *network, xmlNodePtr node) { xmlChar *address, *netmask; + xmlNodePtr cur; address = xmlGetProp(node, BAD_CAST "address"); if (address != NULL) { @@ -1199,6 +1255,15 @@ static int qemudParseInetXML(struct qemu netmask = NULL; } + cur = node->children; + while (cur != NULL) { + if (cur->type == XML_ELEMENT_NODE && + xmlStrEqual(cur->name, BAD_CAST "dhcp") && + !qemudParseDhcpRangesXML(server, network, cur)) + return 0; + cur = cur->next; + } + return 1; } @@ -1724,7 +1789,24 @@ char *qemudGenerateNetworkXML(struct qem qemudBufferPrintf(&buf, " netmask='%s'", network->def.netmask) < 0) goto no_memory; - if (qemudBufferAdd(&buf, "/>\n") < 0) + if (qemudBufferAdd(&buf, ">\n") < 0) + goto no_memory; + + if (network->def.ranges) { + struct qemud_dhcp_range_def *range = network->def.ranges; + if (qemudBufferAdd(&buf, " <dhcp>\n") < 0) + goto no_memory; + while (range) { + if (qemudBufferPrintf(&buf, " <range start='%s' end='%s' />\n", + range->start, range->end) < 0) + goto no_memory; + range = range->next; + } + if (qemudBufferAdd(&buf, " </dhcp>\n") < 0) + goto no_memory; + } + + if (qemudBufferAdd(&buf, " </ip>\n") < 0) goto no_memory; } Index: libvirt-foo/qemud/internal.h =================================================================== --- libvirt-foo.orig/qemud/internal.h 2007-02-14 15:59:02.000000000 +0000 +++ libvirt-foo.orig/qemud/internal.h 2007-02-14 15:59:02.000000000 +0000 @@ -200,6 +200,14 @@ struct qemud_vm { struct qemud_vm *next; }; +/* Store start and end addresses of a dhcp range */ +struct qemud_dhcp_range_def { + char start[BR_INET_ADDR_MAXLEN]; + char end[BR_INET_ADDR_MAXLEN]; + + struct qemud_dhcp_range_def *next; +}; + /* Virtual Network main configuration */ struct qemud_network_def { unsigned char uuid[QEMUD_UUID_RAW_LEN]; @@ -211,6 +219,9 @@ struct qemud_network_def { char ipAddress[BR_INET_ADDR_MAXLEN]; char netmask[BR_INET_ADDR_MAXLEN]; + + int nranges; + struct qemud_dhcp_range_def *ranges; }; /* Virtual Network runtime state */ @@ -220,6 +231,7 @@ struct qemud_network { struct qemud_network_def def; char bridge[BR_IFNAME_MAXLEN]; + int dnsmasqPid; unsigned int active : 1; Index: libvirt-foo/qemud/qemud.c =================================================================== --- libvirt-foo.orig/qemud/qemud.c 2007-02-14 15:59:02.000000000 +0000 +++ libvirt-foo.orig/qemud/qemud.c 2007-02-14 15:59:02.000000000 +0000 @@ -703,6 +703,105 @@ static int qemudDispatchVMFailure(struct return 0; } +static int +qemudBuildDnsmasqArgv(struct qemud_server *server, + struct qemud_network *network, + char ***argv) { + int i, len; + char buf[BR_INET_ADDR_MAXLEN * 2]; + struct qemud_dhcp_range_def *range; + + len = + 1 + /* dnsmasq */ + 1 + /* --keep-in-foreground */ + 1 + /* --bind-interfaces */ + 2 + /* --pid-file "" */ + 2 + /* --conf-file "" */ + 2 + /* --except-interface lo */ + 2 + /* --listen-address 10.0.0.1 */ + (2 * network->def.nranges) + /* --dhcp-range 10.0.0.2,10.0.0.254 */ + 1; /* NULL */ + + if (!(*argv = malloc(len * sizeof(char *)))) + goto no_memory; + + memset(*argv, 0, len * sizeof(char *)); + +#define APPEND_ARG(v, n, s) do { \ + if (!((v)[(n)] = strdup(s))) \ + goto no_memory; \ + } while (0) + + i = 0; + + APPEND_ARG(*argv, i++, "dnsmasq"); + + APPEND_ARG(*argv, i++, "--keep-in-foreground"); + APPEND_ARG(*argv, i++, "--bind-interfaces"); + + APPEND_ARG(*argv, i++, "--pid-file"); + APPEND_ARG(*argv, i++, ""); + + APPEND_ARG(*argv, i++, "--conf-file"); + APPEND_ARG(*argv, i++, ""); + + APPEND_ARG(*argv, i++, "--except-interface"); + APPEND_ARG(*argv, i++, "lo"); + + APPEND_ARG(*argv, i++, "--listen-address"); + APPEND_ARG(*argv, i++, network->def.ipAddress); + + range = network->def.ranges; + while (range) { + snprintf(buf, sizeof(buf), "%s,%s", + range->start, range->end); + + APPEND_ARG(*argv, i++, "--dhcp-range"); + APPEND_ARG(*argv, i++, buf); + + range = range->next; + } + +#undef APPEND_ARG + + return 0; + + no_memory: + if (argv) { + for (i = 0; (*argv)[i]; i++) + free((*argv)[i]); + free(*argv); + } + qemudReportError(server, VIR_ERR_NO_MEMORY, "dnsmasq argv"); + return -1; +} + + +static int +dhcpStartDhcpDaemon(struct qemud_server *server, + struct qemud_network *network) +{ + char **argv; + int ret, i; + + if (network->def.ipAddress[0] == '\0') { + qemudReportError(server, VIR_ERR_INTERNAL_ERROR, + "cannot start dhcp daemon without IP address for server"); + return -1; + } + + argv = NULL; + if (qemudBuildDnsmasqArgv(server, network, &argv) < 0) + return -1; + + ret = qemudExec(server, argv, &network->dnsmasqPid, NULL, NULL); + + for (i = 0; argv[i]; i++) + free(argv[i]); + free(argv); + + return ret; +} int qemudStartNetworkDaemon(struct qemud_server *server, struct qemud_network *network) { @@ -758,10 +857,21 @@ int qemudStartNetworkDaemon(struct qemud goto err_delbr; } + if (network->def.ranges && + dhcpStartDhcpDaemon(server, network) < 0) + goto err_delbr1; + network->active = 1; return 0; + err_delbr1: + if (network->def.ipAddress[0] && + (err = brSetInterfaceUp(server->brctl, network->bridge, 0))) { + printf("Damn! Failed to bring down bridge '%s' : %s\n", + network->bridge, strerror(err)); + } + err_delbr: if ((err = brDeleteBridge(server->brctl, network->bridge))) { printf("Damn! Couldn't delete bridge '%s' : %s\n", @@ -780,6 +890,9 @@ int qemudShutdownNetworkDaemon(struct qe if (!network->active) return 0; + if (network->dnsmasqPid > 0) + kill(network->dnsmasqPid, SIGTERM); + if (network->def.ipAddress[0] && (err = brSetInterfaceUp(server->brctl, network->bridge, 0))) { printf("Damn! Failed to bring down bridge '%s' : %s\n", @@ -812,7 +925,15 @@ int qemudShutdownNetworkDaemon(struct qe curr = curr->next; } + if (network->dnsmasqPid > 0 && + waitpid(network->dnsmasqPid, NULL, WNOHANG) != network->dnsmasqPid) { + kill(network->dnsmasqPid, SIGKILL); + if (waitpid(network->dnsmasqPid, NULL, 0) != network->dnsmasqPid) + printf("Got unexpected pid for dnsmasq, damn\n"); + } + network->bridge[0] = '\0'; + network->dnsmasqPid = -1; network->active = 0; return 0; --

In order to be able to call virNetworkGetBridgeName() from virDomainParseXMLIfDesc() we need to pass the virConnectPtr to virDomainParseXMLDesc() Also, pass the connection pointer to virXMLError(). Note, we need this so that we can lookup which bridge the guest's backend interface should be enslaved to in order for the guest to join a specific network. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com&gt; Index: libvirt-foo/src/xend_internal.c =================================================================== --- libvirt-foo.orig/src/xend_internal.c 2007-02-14 15:37:08.000000000 +0000 +++ libvirt-foo.orig/src/xend_internal.c 2007-02-14 15:37:08.000000000 +0000 @@ -2828,7 +2828,7 @@ xenDaemonCreateLinux(virConnectPtr conn, return (NULL); } - sexpr = virDomainParseXMLDesc(xmlDesc, &name, conn->xendConfigVersion); + sexpr = virDomainParseXMLDesc(conn, xmlDesc, &name, conn->xendConfigVersion); if ((sexpr == NULL) || (name == NULL)) { virXendError(conn, VIR_ERR_XML_ERROR, "domain"); if (sexpr != NULL) @@ -2897,7 +2897,7 @@ xenDaemonAttachDevice(virDomainPtr domai if (strcmp(virDomainGetOSType(domain), "linux")) hvm = 1; - sexpr = virParseXMLDevice(xml, hvm, domain->conn->xendConfigVersion); + sexpr = virParseXMLDevice(domain->conn, xml, hvm, domain->conn->xendConfigVersion); if (sexpr == NULL) return (-1); if (!memcmp(sexpr, "(device ", 8)) { @@ -2954,7 +2954,7 @@ virDomainPtr xenDaemonDomainDefineXML(vi if (conn->xendConfigVersion < 3) return(NULL); - sexpr = virDomainParseXMLDesc(xmlDesc, &name, conn->xendConfigVersion); + sexpr = virDomainParseXMLDesc(conn, xmlDesc, &name, conn->xendConfigVersion); if ((sexpr == NULL) || (name == NULL)) { virXendError(conn, VIR_ERR_XML_ERROR, "domain"); if (sexpr != NULL) Index: libvirt-foo/src/xm_internal.c =================================================================== --- libvirt-foo.orig/src/xm_internal.c 2007-02-14 15:37:08.000000000 +0000 +++ libvirt-foo.orig/src/xm_internal.c 2007-02-14 15:37:08.000000000 +0000 @@ -1287,7 +1287,7 @@ int xenXMDomainCreate(virDomainPtr domai if (!(xml = xenXMDomainDumpXML(domain, 0))) return (-1); - if (!(sexpr = virDomainParseXMLDesc(xml, NULL, domain->conn->xendConfigVersion))) { + if (!(sexpr = virDomainParseXMLDesc(domain->conn, xml, NULL, domain->conn->xendConfigVersion))) { free(xml); return (-1); } Index: libvirt-foo/src/xml.c =================================================================== --- libvirt-foo.orig/src/xml.c 2007-02-14 15:37:08.000000000 +0000 +++ libvirt-foo.orig/src/xml.c 2007-02-14 15:37:08.000000000 +0000 @@ -26,7 +26,7 @@ #include "xs_internal.h" /* for xenStoreDomainGetNetworkID */ static void -virXMLError(virErrorNumber error, const char *info, int value) +virXMLError(virConnectPtr conn, virErrorNumber error, const char *info, int value) { const char *errmsg; @@ -34,7 +34,7 @@ virXMLError(virErrorNumber error, const return; errmsg = __virErrorMsg(error, info); - __virRaiseError(NULL, NULL, NULL, VIR_FROM_XML, error, VIR_ERR_ERROR, + __virRaiseError(conn, NULL, NULL, VIR_FROM_XML, error, VIR_ERR_ERROR, errmsg, info, NULL, value, 0, errmsg, info, value); } @@ -62,7 +62,7 @@ virBufferGrow(virBufferPtr buf, unsigned newbuf = (char *) realloc(buf->content, size); if (newbuf == NULL) { - virXMLError(VIR_ERR_NO_MEMORY, _("growing buffer"), size); + virXMLError(NULL, VIR_ERR_NO_MEMORY, _("growing buffer"), size); return (-1); } buf->content = newbuf; @@ -114,11 +114,11 @@ virBufferNew(unsigned int size) virBufferPtr buf; if (!(buf = malloc(sizeof(*buf)))) { - virXMLError(VIR_ERR_NO_MEMORY, _("allocate new buffer"), sizeof(*buf)); + virXMLError(NULL, VIR_ERR_NO_MEMORY, _("allocate new buffer"), sizeof(*buf)); return NULL; } if (size && (buf->content = malloc(size))==NULL) { - virXMLError(VIR_ERR_NO_MEMORY, _("allocate buffer content"), size); + virXMLError(NULL, VIR_ERR_NO_MEMORY, _("allocate buffer content"), size); free(buf); return NULL; } @@ -213,6 +213,7 @@ virBufferStrcat(virBufferPtr buf, ...) #ifndef PROXY /** * virtDomainParseXMLGraphicsDescImage: + * @conn: pointer to the hypervisor connection * @node: node containing graphics description * @buf: a buffer for the result S-Expr * @xendConfigVersion: xend configuration file format @@ -224,7 +225,7 @@ virBufferStrcat(virBufferPtr buf, ...) * * Returns 0 in case of success, -1 in case of error */ -static int virDomainParseXMLGraphicsDescImage(xmlNodePtr node, virBufferPtr buf, int xendConfigVersion) +static int virDomainParseXMLGraphicsDescImage(virConnectPtr conn ATTRIBUTE_UNUSED, xmlNodePtr node, virBufferPtr buf, int xendConfigVersion) { xmlChar *graphics_type = NULL; @@ -271,6 +272,7 @@ static int virDomainParseXMLGraphicsDesc /** * virtDomainParseXMLGraphicsDescVFB: + * @conn: pointer to the hypervisor connection * @node: node containing graphics description * @buf: a buffer for the result S-Expr * @@ -281,7 +283,7 @@ static int virDomainParseXMLGraphicsDesc * * Returns 0 in case of success, -1 in case of error */ -static int virDomainParseXMLGraphicsDescVFB(xmlNodePtr node, virBufferPtr buf) +static int virDomainParseXMLGraphicsDescVFB(virConnectPtr conn ATTRIBUTE_UNUSED, xmlNodePtr node, virBufferPtr buf) { xmlChar *graphics_type = NULL; @@ -329,6 +331,7 @@ static int virDomainParseXMLGraphicsDesc /** * virDomainParseXMLOSDescHVM: + * @conn: pointer to the hypervisor connection * @node: node containing HVM OS description * @buf: a buffer for the result S-Expr * @ctxt: a path context representing the XML description @@ -343,7 +346,7 @@ static int virDomainParseXMLGraphicsDesc * Returns 0 in case of success, -1 in case of error. */ static int -virDomainParseXMLOSDescHVM(xmlNodePtr node, virBufferPtr buf, xmlXPathContextPtr ctxt, int vcpus, int xendConfigVersion) +virDomainParseXMLOSDescHVM(virConnectPtr conn, xmlNodePtr node, virBufferPtr buf, xmlXPathContextPtr ctxt, int vcpus, int xendConfigVersion) { xmlXPathObjectPtr obj = NULL; xmlNodePtr cur, txt; @@ -376,12 +379,12 @@ virDomainParseXMLOSDescHVM(xmlNodePtr no } if ((type == NULL) || (!xmlStrEqual(type, BAD_CAST "hvm"))) { /* VIR_ERR_OS_TYPE */ - virXMLError(VIR_ERR_OS_TYPE, (const char *) type, 0); + virXMLError(conn, VIR_ERR_OS_TYPE, (const char *) type, 0); return (-1); } virBufferAdd(buf, "(image (hvm ", 12); if (loader == NULL) { - virXMLError(VIR_ERR_NO_KERNEL, NULL, 0); + virXMLError(conn, VIR_ERR_NO_KERNEL, NULL, 0); goto error; } else { virBufferVSprintf(buf, "(kernel '%s')", (const char *) loader); @@ -391,7 +394,7 @@ virDomainParseXMLOSDescHVM(xmlNodePtr no obj = xmlXPathEval(BAD_CAST "string(/domain/devices/emulator[1])", ctxt); if ((obj == NULL) || (obj->type != XPATH_STRING) || (obj->stringval == NULL) || (obj->stringval[0] == 0)) { - virXMLError(VIR_ERR_NO_KERNEL, NULL, 0); /* TODO: error */ + virXMLError(conn, VIR_ERR_NO_KERNEL, NULL, 0); /* TODO: error */ goto error; } virBufferVSprintf(buf, "(device_model '%s')", @@ -410,7 +413,7 @@ virDomainParseXMLOSDescHVM(xmlNodePtr no virBufferVSprintf(buf, "(boot c)", (const char *) boot_dev); } else { /* Any other type of boot dev is unsupported right now */ - virXMLError(VIR_ERR_XML_ERROR, NULL, 0); + virXMLError(conn, VIR_ERR_XML_ERROR, NULL, 0); } /* get the 1st floppy device file */ @@ -491,7 +494,7 @@ virDomainParseXMLOSDescHVM(xmlNodePtr no obj = xmlXPathEval(BAD_CAST "count(domain/devices/console) > 0", ctxt); if ((obj == NULL) || (obj->type != XPATH_BOOLEAN)) { - virXMLError(VIR_ERR_XML_ERROR, NULL, 0); + virXMLError(conn, VIR_ERR_XML_ERROR, NULL, 0); goto error; } if (obj->boolval) { @@ -504,7 +507,7 @@ virDomainParseXMLOSDescHVM(xmlNodePtr no obj = xmlXPathEval(BAD_CAST "/domain/devices/graphics[1]", ctxt); if ((obj != NULL) && (obj->type == XPATH_NODESET) && (obj->nodesetval != NULL) && (obj->nodesetval->nodeNr > 0)) { - res = virDomainParseXMLGraphicsDescImage(obj->nodesetval->nodeTab[0], buf, xendConfigVersion); + res = virDomainParseXMLGraphicsDescImage(conn, obj->nodesetval->nodeTab[0], buf, xendConfigVersion); if (res != 0) { goto error; } @@ -527,6 +530,7 @@ virDomainParseXMLOSDescHVM(xmlNodePtr no /** * virDomainParseXMLOSDescPV: + * @conn: pointer to the hypervisor connection * @node: node containing PV OS description * @buf: a buffer for the result S-Expr * @ctxt: a path context representing the XML description @@ -540,7 +544,7 @@ virDomainParseXMLOSDescHVM(xmlNodePtr no * Returns 0 in case of success, -1 in case of error. */ static int -virDomainParseXMLOSDescPV(xmlNodePtr node, virBufferPtr buf, xmlXPathContextPtr ctxt, int xendConfigVersion) +virDomainParseXMLOSDescPV(virConnectPtr conn, xmlNodePtr node, virBufferPtr buf, xmlXPathContextPtr ctxt, int xendConfigVersion) { xmlNodePtr cur, txt; xmlXPathObjectPtr obj = NULL; @@ -590,12 +594,12 @@ virDomainParseXMLOSDescPV(xmlNodePtr nod } if ((type != NULL) && (!xmlStrEqual(type, BAD_CAST "linux"))) { /* VIR_ERR_OS_TYPE */ - virXMLError(VIR_ERR_OS_TYPE, (const char *) type, 0); + virXMLError(conn, VIR_ERR_OS_TYPE, (const char *) type, 0); return (-1); } virBufferAdd(buf, "(image (linux ", 14); if (kernel == NULL) { - virXMLError(VIR_ERR_NO_KERNEL, NULL, 0); + virXMLError(conn, VIR_ERR_NO_KERNEL, NULL, 0); return (-1); } else { virBufferVSprintf(buf, "(kernel '%s')", (const char *) kernel); @@ -613,7 +617,7 @@ virDomainParseXMLOSDescPV(xmlNodePtr nod obj = xmlXPathEval(BAD_CAST "/domain/devices/graphics[1]", ctxt); if ((obj != NULL) && (obj->type == XPATH_NODESET) && (obj->nodesetval != NULL) && (obj->nodesetval->nodeNr > 0)) { - res = virDomainParseXMLGraphicsDescImage(obj->nodesetval->nodeTab[0], buf, xendConfigVersion); + res = virDomainParseXMLGraphicsDescImage(conn, obj->nodesetval->nodeTab[0], buf, xendConfigVersion); if (res != 0) { goto error; } @@ -642,7 +646,7 @@ virCatchXMLParseError(void *ctx, const c if ((ctxt != NULL) && (ctxt->lastError.level == XML_ERR_FATAL) && (ctxt->lastError.message != NULL)) { - virXMLError(VIR_ERR_XML_DETAIL, ctxt->lastError.message, + virXMLError(NULL, VIR_ERR_XML_DETAIL, ctxt->lastError.message, ctxt->lastError.line); } } @@ -650,6 +654,7 @@ virCatchXMLParseError(void *ctx, const c /** * virDomainParseXMLDiskDesc: * @node: node containing disk description + * @conn: pointer to the hypervisor connection * @buf: a buffer for the result S-Expr * @xendConfigVersion: xend configuration file format * @@ -661,7 +666,7 @@ virCatchXMLParseError(void *ctx, const c * Returns 0 in case of success, -1 in case of error. */ static int -virDomainParseXMLDiskDesc(xmlNodePtr node, virBufferPtr buf, int hvm, int xendConfigVersion) +virDomainParseXMLDiskDesc(virConnectPtr conn, xmlNodePtr node, virBufferPtr buf, int hvm, int xendConfigVersion) { xmlNodePtr cur; xmlChar *type = NULL; @@ -713,7 +718,7 @@ virDomainParseXMLDiskDesc(xmlNodePtr nod } if (source == NULL) { - virXMLError(VIR_ERR_NO_SOURCE, (const char *) target, 0); + virXMLError(conn, VIR_ERR_NO_SOURCE, (const char *) target, 0); if (target != NULL) xmlFree(target); @@ -722,7 +727,7 @@ virDomainParseXMLDiskDesc(xmlNodePtr nod return (-1); } if (target == NULL) { - virXMLError(VIR_ERR_NO_TARGET, (const char *) source, 0); + virXMLError(conn, VIR_ERR_NO_TARGET, (const char *) source, 0); if (source != NULL) xmlFree(source); if (device != NULL) @@ -816,6 +821,7 @@ virDomainParseXMLDiskDesc(xmlNodePtr nod /** * virDomainParseXMLIfDesc: + * @conn: pointer to the hypervisor connection * @node: node containing the interface description * @buf: a buffer for the result S-Expr * @@ -827,7 +833,7 @@ virDomainParseXMLDiskDesc(xmlNodePtr nod * Returns 0 in case of success, -1 in case of error. */ static int -virDomainParseXMLIfDesc(xmlNodePtr node, virBufferPtr buf, int hvm) +virDomainParseXMLIfDesc(virConnectPtr conn ATTRIBUTE_UNUSED, xmlNodePtr node, virBufferPtr buf, int hvm) { xmlNodePtr cur; xmlChar *type = NULL; @@ -902,6 +908,7 @@ virDomainParseXMLIfDesc(xmlNodePtr node, /** * virDomainParseXMLDesc: + * @conn: pointer to the hypervisor connection * @xmldesc: string with the XML description * @xendConfigVersion: xend configuration file format * @@ -914,7 +921,7 @@ virDomainParseXMLIfDesc(xmlNodePtr node, * the caller must free() the returned value. */ char * -virDomainParseXMLDesc(const char *xmldesc, char **name, int xendConfigVersion) +virDomainParseXMLDesc(virConnectPtr conn, const char *xmldesc, char **name, int xendConfigVersion) { xmlDocPtr xml = NULL; xmlNodePtr node; @@ -945,6 +952,9 @@ virDomainParseXMLDesc(const char *xmldes goto error; } + /* TODO pass the connection point to the error handler: + * pctxt->userData = virConnectPtr; + */ pctxt->sax->error = virCatchXMLParseError; xml = xmlCtxtReadDoc(pctxt, (const xmlChar *) xmldesc, "domain.xml", NULL, @@ -976,13 +986,13 @@ virDomainParseXMLDesc(const char *xmldes obj = xmlXPathEval(BAD_CAST "string(/domain/name[1])", ctxt); if ((obj == NULL) || (obj->type != XPATH_STRING) || (obj->stringval == NULL) || (obj->stringval[0] == 0)) { - virXMLError(VIR_ERR_NO_NAME, xmldesc, 0); + virXMLError(conn, VIR_ERR_NO_NAME, xmldesc, 0); goto error; } virBufferVSprintf(&buf, "(name '%s')", obj->stringval); nam = strdup((const char *) obj->stringval); if (nam == NULL) { - virXMLError(VIR_ERR_NO_MEMORY, "copying name", 0); + virXMLError(conn, VIR_ERR_NO_MEMORY, "copying name", 0); goto error; } xmlXPathFreeObject(obj); @@ -1069,17 +1079,17 @@ virDomainParseXMLDesc(const char *xmldes ((tmpobj->type != XPATH_STRING) || (tmpobj->stringval == NULL) || (tmpobj->stringval[0] == 0))) { xmlXPathFreeObject(tmpobj); - virXMLError(VIR_ERR_OS_TYPE, nam, 0); + virXMLError(conn, VIR_ERR_OS_TYPE, nam, 0); goto error; } if ((tmpobj == NULL) || !xmlStrEqual(tmpobj->stringval, BAD_CAST "hvm")) { - res = virDomainParseXMLOSDescPV(obj->nodesetval->nodeTab[0], + res = virDomainParseXMLOSDescPV(conn, obj->nodesetval->nodeTab[0], &buf, ctxt, xendConfigVersion); } else { hvm = 1; - res = virDomainParseXMLOSDescHVM(obj->nodesetval->nodeTab[0], + res = virDomainParseXMLOSDescHVM(conn, obj->nodesetval->nodeTab[0], &buf, ctxt, vcpus, xendConfigVersion); } @@ -1088,7 +1098,7 @@ virDomainParseXMLDesc(const char *xmldes if (res != 0) goto error; } else if (bootloader == 0) { - virXMLError(VIR_ERR_NO_OS, nam, 0); + virXMLError(conn, VIR_ERR_NO_OS, nam, 0); goto error; } xmlXPathFreeObject(obj); @@ -1099,7 +1109,7 @@ virDomainParseXMLDesc(const char *xmldes if ((obj != NULL) && (obj->type == XPATH_NODESET) && (obj->nodesetval != NULL) && (obj->nodesetval->nodeNr >= 0)) { for (i = 0; i < obj->nodesetval->nodeNr; i++) { - res = virDomainParseXMLDiskDesc(obj->nodesetval->nodeTab[i], &buf, hvm, xendConfigVersion); + res = virDomainParseXMLDiskDesc(conn, obj->nodesetval->nodeTab[i], &buf, hvm, xendConfigVersion); if (res != 0) { goto error; } @@ -1112,7 +1122,7 @@ virDomainParseXMLDesc(const char *xmldes (obj->nodesetval != NULL) && (obj->nodesetval->nodeNr >= 0)) { for (i = 0; i < obj->nodesetval->nodeNr; i++) { virBufferAdd(&buf, "(device ", 8); - res = virDomainParseXMLIfDesc(obj->nodesetval->nodeTab[i], &buf, hvm); + res = virDomainParseXMLIfDesc(conn, obj->nodesetval->nodeTab[i], &buf, hvm); if (res != 0) { goto error; } @@ -1127,7 +1137,7 @@ virDomainParseXMLDesc(const char *xmldes if ((obj != NULL) && (obj->type == XPATH_NODESET) && (obj->nodesetval != NULL) && (obj->nodesetval->nodeNr >= 0)) { for (i = 0; i < obj->nodesetval->nodeNr; i++) { - res = virDomainParseXMLGraphicsDescVFB(obj->nodesetval->nodeTab[i], &buf); + res = virDomainParseXMLGraphicsDescVFB(conn, obj->nodesetval->nodeTab[i], &buf); if (res != 0) { goto error; } @@ -1232,6 +1242,7 @@ unsigned char *virParseUUID(char **ptr, #ifndef PROXY /** * virParseXMLDevice: + * @conn: pointer to the hypervisor connection * @xmldesc: string with the XML description * @hvm: 1 for fully virtualized guest, 0 for paravirtualized * @xendConfigVersion: xend configuration file format @@ -1245,7 +1256,7 @@ unsigned char *virParseUUID(char **ptr, * the caller must free() the returned value. */ char * -virParseXMLDevice(char *xmldesc, int hvm, int xendConfigVersion) +virParseXMLDevice(virConnectPtr conn, char *xmldesc, int hvm, int xendConfigVersion) { xmlDocPtr xml = NULL; xmlNodePtr node; @@ -1265,11 +1276,11 @@ virParseXMLDevice(char *xmldesc, int hvm if (node == NULL) goto error; if (xmlStrEqual(node->name, BAD_CAST "disk")) { - if (virDomainParseXMLDiskDesc(node, &buf, hvm, xendConfigVersion) != 0) + if (virDomainParseXMLDiskDesc(conn, node, &buf, hvm, xendConfigVersion) != 0) goto error; } else if (xmlStrEqual(node->name, BAD_CAST "interface")) { - if (virDomainParseXMLIfDesc(node, &buf, hvm) != 0) + if (virDomainParseXMLIfDesc(conn, node, &buf, hvm) != 0) goto error; } cleanup: Index: libvirt-foo/src/xml.h =================================================================== --- libvirt-foo.orig/src/xml.h 2006-11-16 18:11:29.000000000 +0000 +++ libvirt-foo.orig/src/xml.h 2006-11-16 18:11:29.000000000 +0000 @@ -29,9 +29,9 @@ void virBufferFree(virBufferPtr buf); int virBufferAdd(virBufferPtr buf, const char *str, int len); int virBufferVSprintf(virBufferPtr buf, const char *format, ...); int virBufferStrcat(virBufferPtr buf, ...); -char *virDomainParseXMLDesc(const char *xmldesc, char **name, int xendConfigVersion); +char *virDomainParseXMLDesc(virConnectPtr conn, const char *xmldesc, char **name, int xendConfigVersion); unsigned char *virParseUUID(char **ptr, const char *uuid); -char *virParseXMLDevice(char *xmldesc, int hvm, int xendConfigVersion); +char *virParseXMLDevice(virConnectPtr conn, char *xmldesc, int hvm, int xendConfigVersion); int virDomainXMLDevID(virDomainPtr domain, char *xmldesc, char *class, char *ref); #ifdef __cplusplus Index: libvirt-foo/tests/xml2sexprtest.c =================================================================== --- libvirt-foo.orig/tests/xml2sexprtest.c 2006-12-13 14:08:51.000000000 +0000 +++ libvirt-foo.orig/tests/xml2sexprtest.c 2006-12-13 14:08:51.000000000 +0000 @@ -24,7 +24,7 @@ static int testCompareFiles(const char * if (virtTestLoadFile(sexpr, &sexprPtr, MAX_FILE) < 0) goto fail; - if (!(gotsexpr = virDomainParseXMLDesc(xmlData, &gotname, xendConfigVersion))) + if (!(gotsexpr = virDomainParseXMLDesc(NULL, xmlData, &gotname, xendConfigVersion))) goto fail; if (getenv("DEBUG_TESTS")) { --

When create Xen guests with <interface type='network'>, lookup the bridge associated with the network and configure the guest to connect to that bridge. Signed-off-by: Mark McLoughlin <markmc(a)redhat.com&gt; Index: libvirt-foo/src/xml.c =================================================================== --- libvirt-foo.orig/src/xml.c 2007-02-14 16:13:36.000000000 +0000 +++ libvirt-foo.orig/src/xml.c 2007-02-14 16:13:36.000000000 +0000 @@ -842,6 +842,7 @@ virDomainParseXMLIfDesc(virConnectPtr co xmlChar *script = NULL; xmlChar *ip = NULL; int typ = 0; + int ret = -1; type = xmlGetProp(node, BAD_CAST "type"); if (type != NULL) { @@ -849,6 +850,8 @@ virDomainParseXMLIfDesc(virConnectPtr co typ = 0; else if (xmlStrEqual(type, BAD_CAST "ethernet")) typ = 1; + else if (xmlStrEqual(type, BAD_CAST "network")) + typ = 2; xmlFree(type); } cur = node->children; @@ -858,8 +861,10 @@ virDomainParseXMLIfDesc(virConnectPtr co (xmlStrEqual(cur->name, BAD_CAST "source"))) { if (typ == 0) source = xmlGetProp(cur, BAD_CAST "bridge"); - else + else if (typ == 1) source = xmlGetProp(cur, BAD_CAST "dev"); + else + source = xmlGetProp(cur, BAD_CAST "network"); } else if ((mac == NULL) && (xmlStrEqual(cur->name, BAD_CAST "mac"))) { mac = xmlGetProp(cur, BAD_CAST "address"); @@ -884,8 +889,18 @@ virDomainParseXMLIfDesc(virConnectPtr co if (source != NULL) { if (typ == 0) virBufferVSprintf(buf, "(bridge '%s')", (const char *) source); - else /* TODO does that work like that ? */ + else if (typ == 1) /* TODO does that work like that ? */ virBufferVSprintf(buf, "(dev '%s')", (const char *) source); + else { + virNetworkPtr network = virNetworkLookupByName(conn, (const char *) source); + char *bridge; + if (!network || !(bridge = virNetworkGetBridgeName(network))) { + virXMLError(conn, VIR_ERR_NO_SOURCE, (const char *) source, 0); + goto error; + } + virBufferVSprintf(buf, "(bridge '%s')", bridge); + free(bridge); + } } if (script != NULL) virBufferVSprintf(buf, "(script '%s')", script); @@ -895,6 +910,8 @@ virDomainParseXMLIfDesc(virConnectPtr co virBufferAdd(buf, "(type ioemu)", 12); virBufferAdd(buf, ")", 1); + ret = 0; + error: if (mac != NULL) xmlFree(mac); if (source != NULL) @@ -903,7 +920,7 @@ virDomainParseXMLIfDesc(virConnectPtr co xmlFree(script); if (ip != NULL) xmlFree(ip); - return (0); + return (ret); } /** --