Switch QEMU driver over to generic network APIs

ChangeLog

+Fri Jul 11 18:32:59 BST 2008 Daniel P. Berrange <berrange@redhat.com>
+
+	* src/bridge.c, src/bridge.h, src/qemu_conf.c, src/qemu_conf.h,
+	src/qemu_driver.c: Switch over to generic network APIs
+
 Fri Jul 11 17:39:59 BST 2008 Daniel P. Berrange <berrange@redhat.com>
 
 	* src/test.c, src/test.h: Convert to the new domain XML apis

src/bridge.c

@@ -116,60 +116,41 @@ brShutdown(brControl *ctl)
 /**
  * brAddBridge:
  * @ctl: bridge control pointer
- * @nameOrFmt: the bridge name (or name template)
- * @name: pointer to @maxlen bytes to store the bridge name
- * @maxlen: size of @name array
+ * @name: the bridge name
  *
- * This function register a new bridge, @nameOrFmt can be either
- * a fixed name or a name template with '%d' for dynamic name allocation.
- * in either case the final name for the bridge will be stored in @name.
+ * This function register a new bridge
  *
  * Returns 0 in case of success or an errno code in case of failure.
  */
 #ifdef SIOCBRADDBR
 int
 brAddBridge(brControl *ctl,
-            const char *nameOrFmt,
-            char *name,
-            int maxlen)
+            char **name)
 {
-    int id, subst;
-
-    if (!ctl || !ctl->fd || !nameOrFmt || !name)
+    if (!ctl || !ctl->fd || !name)
         return EINVAL;
 
-    if (maxlen >= BR_IFNAME_MAXLEN)
-        maxlen = BR_IFNAME_MAXLEN;
-
-    subst = id = 0;
-
-    if (strstr(nameOrFmt, "%d"))
-        subst = 1;
-
-    do {
-        char try[BR_IFNAME_MAXLEN];
-        int len;
-
-        if (subst) {
-            len = snprintf(try, maxlen, nameOrFmt, id);
-            if (len >= maxlen)
-                return EADDRINUSE;
-        } else {
-            len = strlen(nameOrFmt);
-            if (len >= maxlen - 1)
-                return EINVAL;
-
-            strncpy(try, nameOrFmt, len);
-            try[len] = '\0';
-        }
-
-        if (ioctl(ctl->fd, SIOCBRADDBR, try) == 0) {
-            strncpy(name, try, maxlen);
+    if (*name) {
+        if (ioctl(ctl->fd, SIOCBRADDBR, *name) == 0)
             return 0;
-        }
+    } else {
+        int id = 0;
+        do {
+            char try[50];
+
+            snprintf(try, sizeof(try), "virbr%d", id);
+
+            if (ioctl(ctl->fd, SIOCBRADDBR, try) == 0) {
+                if (!(*name = strdup(try))) {
+                    ioctl(ctl->fd, SIOCBRDELBR, name);
+                    return ENOMEM;
+                }
+                return 0;
+            }
 
-        id++;
-    } while (subst && id <= MAX_BRIDGE_ID);
+            id++;
+        } while (id < MAX_BRIDGE_ID);
+    }
 
     return errno;
 }

src/bridge.h

@@ -47,9 +47,7 @@ int     brInit                  (brControl **ctl);
 void    brShutdown              (brControl *ctl);
 
 int     brAddBridge             (brControl *ctl,
-                                 const char *nameOrFmt,
-                                 char *name,
-                                 int maxlen);
+                                 char **name);
 int     brDeleteBridge          (brControl *ctl,
                                  const char *name);
 

src/qemu_conf.h

@@ -32,6 +32,7 @@
 #include "bridge.h"
 #include "iptables.h"
 #include "capabilities.h"
+#include "network_conf.h"
 #include <netinet/in.h>
 #include <sched.h>
 
@@ -96,12 +97,6 @@ enum qemud_vm_net_type {
     QEMUD_NET_BRIDGE,
 };
 
-/* 2 possible types of forwarding */
-enum qemud_vm_net_forward_type {
-    QEMUD_NET_FORWARD_NAT,
-    QEMUD_NET_FORWARD_ROUTE,
-};
-
 #define QEMUD_MAX_NAME_LEN 50
 #define QEMUD_MAX_XML_LEN 4096
 #define QEMUD_MAX_ERROR_LEN 1024
@@ -349,53 +344,6 @@ 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[VIR_UUID_BUFLEN];
-    char name[QEMUD_MAX_NAME_LEN];
-
-    char bridge[BR_IFNAME_MAXLEN];
-    int disableSTP;
-    int forwardDelay;
-
-    int forward;
-    int forwardMode; /* From qemud_vm_net_forward_type */
-    char forwardDev[BR_IFNAME_MAXLEN];
-
-    char ipAddress[BR_INET_ADDR_MAXLEN];
-    char netmask[BR_INET_ADDR_MAXLEN];
-    char network[BR_INET_ADDR_MAXLEN+BR_INET_ADDR_MAXLEN+1];
-
-    int nranges;
-    struct qemud_dhcp_range_def *ranges;
-};
-
-/* Virtual Network runtime state */
-struct qemud_network {
-    char configFile[PATH_MAX];
-    char autostartLink[PATH_MAX];
-
-    struct qemud_network_def *def; /* The current definition */
-    struct qemud_network_def *newDef; /* New definition to activate at shutdown */
-
-    char bridge[BR_IFNAME_MAXLEN];
-    int dnsmasqPid;
-
-    unsigned int active : 1;
-    unsigned int autostart : 1;
-
-    struct qemud_network *next;
-};
-
-
 /* Main driver state */
 struct qemud_driver {
     int qemuVersion;
@@ -403,9 +351,9 @@ struct qemud_driver {
     int ninactivevms;
     struct qemud_vm *vms;
     int nextvmid;
-    int nactivenetworks;
-    int ninactivenetworks;
-    struct qemud_network *networks;
+
+    virNetworkObjPtr networks;
+
     brControl *brctl;
     iptablesContext *iptables;
     char *configDir;
@@ -428,12 +376,6 @@ qemudIsActiveVM(const struct qemud_vm *vm)
     return vm->id != -1;
 }
 
-static inline int
-qemudIsActiveNetwork(const struct qemud_network *network)
-{
-    return network->active;
-}
-
 void qemudReportError(virConnectPtr conn,
                       virDomainPtr dom,
                       virNetworkPtr net,
@@ -451,11 +393,6 @@ struct qemud_vm *qemudFindVMByUUID(const struct qemud_driver *driver,
 struct qemud_vm *qemudFindVMByName(const struct qemud_driver *driver,
                                    const char *name);
 
-struct qemud_network *qemudFindNetworkByUUID(const struct qemud_driver *driver,
-                                             const unsigned char *uuid);
-struct qemud_network *qemudFindNetworkByName(const struct qemud_driver *driver,
-                                             const char *name);
-
 virCapsPtr  qemudCapsInit               (void);
 
 int         qemudExtractVersion         (virConnectPtr conn,
@@ -501,30 +438,6 @@ char *      qemudGenerateXML            (virConnectPtr conn,
                                          struct qemud_vm_def *def,
                                          int live);
 
-void        qemudFreeNetworkDef         (struct qemud_network_def *def);
-void        qemudFreeNetwork            (struct qemud_network *network);
-
-struct qemud_network *
-            qemudAssignNetworkDef       (virConnectPtr conn,
-                                         struct qemud_driver *driver,
-                                         struct qemud_network_def *def);
-void        qemudRemoveInactiveNetwork  (struct qemud_driver *driver,
-                                         struct qemud_network *network);
-
-struct qemud_network_def *
-            qemudParseNetworkDef        (virConnectPtr conn,
-                                         struct qemud_driver *driver,
-                                         const char *xmlStr,
-                                         const char *displayName);
-int         qemudSaveNetworkDef         (virConnectPtr conn,
-                                         struct qemud_driver *driver,
-                                         struct qemud_network *network,
-                                         struct qemud_network_def *def);
-char *      qemudGenerateNetworkXML     (virConnectPtr conn,
-                                         struct qemud_driver *driver,
-                                         struct qemud_network *network,
-                                         struct qemud_network_def *def);
-
 const char *qemudVirtTypeToString       (int type);
 
 #endif /* WITH_QEMU */