NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2026-08-09 12:38:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add support for vifname= in XM config files

Browse Source
This commit is contained in:
Daniel P. Berrange
2009-04-01 10:16:05 +00:00
parent 3ad8a273b5
commit 83a618f807
5 changed files with 71 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xm_internal.c
+16
View File
@@ -989,6 +989,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) {
char ip[16];
char mac[18];
char bridge[50];
char vifname[50];
char *key;
bridge[0] = '\0';
@@ -996,6 +997,7 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) {
script[0] = '\0';
ip[0] = '\0';
model[0] = '\0';
vifname[0] = '\0';
if ((list->type != VIR_CONF_STRING) || (list->str == NULL))
goto skipnic;
@@ -1034,6 +1036,12 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) {
len = sizeof(model)-1;
strncpy(model, data, len);
model[len] = '\0';
} else if (STRPREFIX(key, "vifname=")) {
int len = nextkey ? (nextkey - data) : sizeof(vifname)-1;
if (len > (sizeof(vifname)-1))
len = sizeof(vifname)-1;
strncpy(vifname, data, len);
vifname[len] = '\0';
} else if (STRPREFIX(key, "ip=")) {
int len = nextkey ? (nextkey - data) : 15;
if (len > 15)
@@ -1103,6 +1111,10 @@ xenXMDomainConfigParse(virConnectPtr conn, virConfPtr conf) {
!(net->model = strdup(model)))
goto no_memory;
if (vifname[0] &&
!(net->ifname = strdup(vifname)))
goto no_memory;
if (VIR_REALLOC_N(def->nets, def->nnets+1) < 0)
goto no_memory;
def->nets[def->nnets++] = net;
@@ -1910,6 +1922,10 @@ static int xenXMDomainConfigFormatNet(virConnectPtr conn,
virBufferVSprintf(&buf, ",model=%s",
net->model);
if (net->ifname)
virBufferVSprintf(&buf, ",vifname=%s",
net->ifname);
if (VIR_ALLOC(val) < 0) {
virReportOOMError(conn);
goto cleanup;