Attachment 277111 Details for Bug 333221 – Strip auto-genereted vnetXXXX interfaces

[patch] Strip auto-genereted vnetXXXX interfaces

vnet.patch (text/plain), 2.08 KB, created by Daniel Berrangé on 2007-12-04 15:36:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Berrangé

Created: 2007-12-04 15:36:05 UTC

Size: 2.08 KB

patch

obsolete

>Index: src/qemu_conf.c
>===================================================================
>RCS file: /data/cvs/libvirt/src/qemu_conf.c,v
>retrieving revision 1.20
>diff -u -r1.20 qemu_conf.c
>--- src/qemu_conf.c	1 Dec 2007 15:29:45 -0000	1.20
>+++ src/qemu_conf.c	3 Dec 2007 13:51:32 -0000
>@@ -758,13 +758,18 @@
>         }
> 
>         if (ifname != NULL) {
>-            if ((len = xmlStrlen(ifname)) >= (BR_IFNAME_MAXLEN-1)) {
>-                qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
>-                                 "TAP interface name '%s' is too long", ifname);
>-                goto error;
>+            if (STRNEQLEN("vnet", (const char*)ifname, 4)) {
>+                /* An auto-generated target name, so turn back into a wildcard */
>+                strcpy(net->dst.network.ifname, "vnet%d");
>             } else {
>-                strncpy(net->dst.network.ifname, (char *)ifname, len);
>-                net->dst.network.ifname[len] = '\0';
>+                if ((len = xmlStrlen(ifname)) >= (BR_IFNAME_MAXLEN-1)) {
>+                    qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR,
>+                                     "TAP interface name '%s' is too long", ifname);
>+                    goto error;
>+                } else {
>+                    strncpy(net->dst.network.ifname, (char *)ifname, len);
>+                    net->dst.network.ifname[len] = '\0';
>+                }
>             }
>             xmlFree(ifname);
>             ifname = NULL;
>@@ -1459,6 +1464,7 @@
>         }
>         brname = network->bridge;
>         if (net->dst.network.ifname[0] == '\0' ||
>+            STREQLEN(net->dst.network.ifname, "vnet", 4) ||
>             strchr(net->dst.network.ifname, '%')) {
>             strcpy(net->dst.network.ifname, "vnet%d");
>         }
>@@ -1466,6 +1472,7 @@
>     } else if (net->type == QEMUD_NET_BRIDGE) {
>         brname = net->dst.bridge.brname;
>         if (net->dst.bridge.ifname[0] == '\0' ||
>+            STREQLEN(net->dst.bridge.ifname, "vnet", 4) ||
>             strchr(net->dst.bridge.ifname, '%')) {
>             strcpy(net->dst.bridge.ifname, "vnet%d");
>         }

Actions: View | Diff

Attachments on bug 333221: 277111 | 277161