External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 12:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Xen: Do not generate net ifname if domain is inactive

Browse Source 
V2: Use virAsprintf instead of snprintf/strdup

The xend driver will generate a virDomainNetDef ifname if one is not
specified in xend sexpr, even if domain is inactive.  The result is
network interface XML containing 'vif-1.Y' on dev attribute of target
element, e.g.

  <interface type='bridge'>
    <target dev='vif-1.0'/>
    ...

This patch changes the behavior to only generate the ifname if not
specified in xend sexpr *and* domain is not inactive (id != -1).
This commit is contained in:
Jim Fehlig 2011-04-27 16:39:37 -06:00
parent a88916665d
commit 578391e1bc
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/xenxs/xen_sxpr.c
View File

@ -510,7 +510,6 @@ xenParseSxprNets(virDomainDefPtr def,
node = cur->u.s.car;
if (sexpr_lookup(node, "device/vif")) {
const char *tmp2, *model, *type;
char buf[50];
tmp2 = sexpr_node(node, "device/vif/script");
tmp = sexpr_node(node, "device/vif/bridge");
model = sexpr_node(node, "device/vif/model");
@ -547,12 +546,16 @@ xenParseSxprNets(virDomainDefPtr def,
}
tmp = sexpr_node(node, "device/vif/vifname");
if (!tmp) {
snprintf(buf, sizeof(buf), "vif%d.%d", def->id, vif_index);
tmp = buf;
/* If vifname is specified in xend config, include it in net
* definition regardless of domain state. If vifname is not
* specified, only generate one if domain is active (id != -1). */
if (tmp) {
if (!(net->ifname = strdup(tmp)))
goto no_memory;
} else if (def->id != -1) {
if (virAsprintf(&net->ifname, "vif%d.%d", def->id, vif_index) < 0)
goto no_memory;
}
if (!(net->ifname = strdup(tmp)))
goto no_memory;
tmp = sexpr_node(node, "device/vif/mac");
if (tmp) {