External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 06:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use 'vnet' as prefix for veth devices

Browse Source 
The XML parser reserves 'vnet' as a prefix for automatically
generated NIC device names. Switch the veth device creation
to use this prefix, so it does not have to worry about clashes
with user specified names in the XML.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-10-02 12:24:54 +01:00
parent f2e53555eb
commit fe3f108d85
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/util/virnetdevveth.c
View File

@ -43,10 +43,10 @@ static int virNetDevVethExists(int devNum)
{ {
int ret; int ret;
char *path = NULL; char *path = NULL;
if (virAsprintf(&path, "/sys/class/net/veth%d/", devNum) < 0) if (virAsprintf(&path, "/sys/class/net/vnet%d/", devNum) < 0)
return -1; return -1;
ret = virFileExists(path) ? 1 : 0; ret = virFileExists(path) ? 1 : 0;
VIR_DEBUG("Checked dev veth%d usage: %d", devNum, ret); VIR_DEBUG("Checked dev vnet%d usage: %d", devNum, ret);
VIR_FREE(path); VIR_FREE(path);
return ret; return ret;
} }
@ -125,7 +125,7 @@ int virNetDevVethCreate(char** veth1, char** veth2)
if ((veth1num = virNetDevVethGetFreeNum(vethNum)) < 0) if ((veth1num = virNetDevVethGetFreeNum(vethNum)) < 0)
goto cleanup; goto cleanup;
if (virAsprintf(&veth1auto, "veth%d", veth1num) < 0) if (virAsprintf(&veth1auto, "vnet%d", veth1num) < 0)
goto cleanup; goto cleanup;
vethNum = veth1num + 1; vethNum = veth1num + 1;
} }
@ -134,7 +134,7 @@ int virNetDevVethCreate(char** veth1, char** veth2)
if ((veth2num = virNetDevVethGetFreeNum(vethNum)) < 0) if ((veth2num = virNetDevVethGetFreeNum(vethNum)) < 0)
goto cleanup; goto cleanup;
if (virAsprintf(&veth2auto, "veth%d", veth2num) < 0) if (virAsprintf(&veth2auto, "vnet%d", veth2num) < 0)
goto cleanup; goto cleanup;
vethNum = veth2num + 1; vethNum = veth2num + 1;
} }