External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

conf: eliminate outmoded/odd indent method from interface xml

Browse Source 
These format functions needed the ability to be indented by an
arbitrary amount, but were written before the introduction of
virBufferAdjustIndent(). They instead used the much more clunky method
of adding a "level" arg to every format function, and padding with
spaces using the "%*s" printf format specifier (giving it the level,
and "", which has the effect of adding level spaces to the output).

While eliminating the hardcoded indentation in other xml, I decided it
was finally time to also modernize the interface formatter code to
make it more consistent.
This commit is contained in:
Laine Stump 2014-03-05 14:24:22 +02:00
parent b1258b2747
commit 257e62dfee
1 changed files with 64 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
src/conf/interface_conf.c
View File

@ -1,7 +1,7 @@
/* /*
* interface_conf.c: interfaces XML handling * interface_conf.c: interfaces XML handling
* *
* Copyright (C) 2006-2010, 2013 Red Hat, Inc. * Copyright (C) 2006-2010, 2013, 2014 Red Hat, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -41,8 +41,7 @@ VIR_ENUM_IMPL(virInterface,
static virInterfaceDefPtr static virInterfaceDefPtr
virInterfaceDefParseXML(xmlXPathContextPtr ctxt, int parentIfType); virInterfaceDefParseXML(xmlXPathContextPtr ctxt, int parentIfType);
static int static int
virInterfaceDefDevFormat(virBufferPtr buf, virInterfaceDefDevFormat(virBufferPtr buf, const virInterfaceDef *def);
const virInterfaceDef *def, int level);
static static
void virInterfaceIpDefFree(virInterfaceIpDefPtr def) { void virInterfaceIpDefFree(virInterfaceIpDefPtr def) {
@ -857,13 +856,12 @@ virInterfaceDefPtr virInterfaceDefParseFile(const char *filename)
} }
static int static int
virInterfaceBridgeDefFormat(virBufferPtr buf, virInterfaceBridgeDefFormat(virBufferPtr buf, const virInterfaceDef *def)
const virInterfaceDef *def, int level)
{ {
size_t i; size_t i;
int ret = 0; int ret = 0;
virBufferAsprintf(buf, "%*s <bridge", level*2, ""); virBufferAddLit(buf, "<bridge");
if (def->data.bridge.stp == 1) if (def->data.bridge.stp == 1)
virBufferAddLit(buf, " stp='on'"); virBufferAddLit(buf, " stp='on'");
else if (def->data.bridge.stp == 0) else if (def->data.bridge.stp == 0)
@ -871,25 +869,25 @@ virInterfaceBridgeDefFormat(virBufferPtr buf,
if (def->data.bridge.delay != NULL) if (def->data.bridge.delay != NULL)
virBufferAsprintf(buf, " delay='%s'", def->data.bridge.delay); virBufferAsprintf(buf, " delay='%s'", def->data.bridge.delay);
virBufferAddLit(buf, ">\n"); virBufferAddLit(buf, ">\n");
virBufferAdjustIndent(buf, 2);
for (i = 0; i < def->data.bridge.nbItf; i++) { for (i = 0; i < def->data.bridge.nbItf; i++) {
if (virInterfaceDefDevFormat(buf, if (virInterfaceDefDevFormat(buf, def->data.bridge.itf[i]) < 0)
def->data.bridge.itf[i], level+2) < 0)
ret = -1; ret = -1;
} }
virBufferAsprintf(buf, "%*s </bridge>\n", level*2, ""); virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</bridge>\n");
return ret; return ret;
} }
static int static int
virInterfaceBondDefFormat(virBufferPtr buf, virInterfaceBondDefFormat(virBufferPtr buf, const virInterfaceDef *def)
const virInterfaceDef *def, int level)
{ {
size_t i; size_t i;
int ret = 0; int ret = 0;
virBufferAsprintf(buf, "%*s <bond", level*2, ""); virBufferAddLit(buf, "<bond");
if (def->data.bond.mode == VIR_INTERFACE_BOND_BALRR) if (def->data.bond.mode == VIR_INTERFACE_BOND_BALRR)
virBufferAddLit(buf, " mode='balance-rr'"); virBufferAddLit(buf, " mode='balance-rr'");
else if (def->data.bond.mode == VIR_INTERFACE_BOND_ABACKUP) else if (def->data.bond.mode == VIR_INTERFACE_BOND_ABACKUP)
@ -905,10 +903,11 @@ virInterfaceBondDefFormat(virBufferPtr buf,
else if (def->data.bond.mode == VIR_INTERFACE_BOND_BALALB) else if (def->data.bond.mode == VIR_INTERFACE_BOND_BALALB)
virBufferAddLit(buf, " mode='balance-alb'"); virBufferAddLit(buf, " mode='balance-alb'");
virBufferAddLit(buf, ">\n"); virBufferAddLit(buf, ">\n");
virBufferAdjustIndent(buf, 2);
if (def->data.bond.monit == VIR_INTERFACE_BOND_MONIT_MII) { if (def->data.bond.monit == VIR_INTERFACE_BOND_MONIT_MII) {
virBufferAsprintf(buf, "%*s <miimon freq='%d'", virBufferAsprintf(buf, "<miimon freq='%d'",
level*2, "", def->data.bond.frequency); def->data.bond.frequency);
if (def->data.bond.downdelay > 0) if (def->data.bond.downdelay > 0)
virBufferAsprintf(buf, " downdelay='%d'", def->data.bond.downdelay); virBufferAsprintf(buf, " downdelay='%d'", def->data.bond.downdelay);
if (def->data.bond.updelay > 0) if (def->data.bond.updelay > 0)
@ -924,8 +923,7 @@ virInterfaceBondDefFormat(virBufferPtr buf,
"%s", _("bond arp monitoring has no target")); "%s", _("bond arp monitoring has no target"));
return -1; return -1;
} }
virBufferAsprintf(buf, "%*s <arpmon interval='%d' target='%s'", virBufferAsprintf(buf, "<arpmon interval='%d' target='%s'",
level*2, "",
def->data.bond.interval, def->data.bond.target); def->data.bond.interval, def->data.bond.target);
if (def->data.bond.validate == VIR_INTERFACE_BOND_ARP_ACTIVE) if (def->data.bond.validate == VIR_INTERFACE_BOND_ARP_ACTIVE)
virBufferAddLit(buf, " validate='active'"); virBufferAddLit(buf, " validate='active'");
@ -936,17 +934,17 @@ virInterfaceBondDefFormat(virBufferPtr buf,
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");
} }
for (i = 0; i < def->data.bond.nbItf; i++) { for (i = 0; i < def->data.bond.nbItf; i++) {
if (virInterfaceDefDevFormat(buf, def->data.bond.itf[i], level+2) < 0) if (virInterfaceDefDevFormat(buf, def->data.bond.itf[i]) < 0)
ret = -1; ret = -1;
} }
virBufferAsprintf(buf, "%*s </bond>\n", level*2, ""); virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</bond>\n");
return ret; return ret;
} }
static int static int
virInterfaceVlanDefFormat(virBufferPtr buf, virInterfaceVlanDefFormat(virBufferPtr buf, const virInterfaceDef *def)
const virInterfaceDef *def, int level)
{ {
if (def->data.vlan.tag == NULL) { if (def->data.vlan.tag == NULL) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
@ -954,48 +952,45 @@ virInterfaceVlanDefFormat(virBufferPtr buf,
return -1; return -1;
} }
virBufferAsprintf(buf, "%*s <vlan tag='%s'", virBufferAsprintf(buf, "<vlan tag='%s'", def->data.vlan.tag);
level*2, "", def->data.vlan.tag);
if (def->data.vlan.devname != NULL) { if (def->data.vlan.devname != NULL) {
virBufferAddLit(buf, ">\n"); virBufferAddLit(buf, ">\n");
virBufferAsprintf(buf, "%*s <interface name='%s'/>\n", virBufferAdjustIndent(buf, 2);
level*2, "", def->data.vlan.devname); virBufferAsprintf(buf, "<interface name='%s'/>\n",
virBufferAsprintf(buf, "%*s </vlan>\n", level*2, ""); def->data.vlan.devname);
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</vlan>\n");
} else } else
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");
return 0; return 0;
} }
static int static int
virInterfaceProtocolDefFormat(virBufferPtr buf, const virInterfaceDef *def, virInterfaceProtocolDefFormat(virBufferPtr buf, const virInterfaceDef *def)
int level)
{ {
size_t i, j; size_t i, j;
for (i = 0; i < def->nprotos; i++) { for (i = 0; i < def->nprotos; i++) {
virBufferAsprintf(buf, "%*s <protocol family='%s'>\n", virBufferAsprintf(buf, "<protocol family='%s'>\n",
level*2, "", def->protos[i]->family); def->protos[i]->family);
virBufferAdjustIndent(buf, 2);
if (def->protos[i]->autoconf) {
virBufferAsprintf(buf, "%*s <autoconf/>\n", level*2, "");
}
if (def->protos[i]->autoconf)
virBufferAddLit(buf, "<autoconf/>\n");
if (def->protos[i]->dhcp) { if (def->protos[i]->dhcp) {
if (def->protos[i]->peerdns == 0) if (def->protos[i]->peerdns == 0)
virBufferAsprintf(buf, "%*s <dhcp peerdns='no'/>\n", virBufferAddLit(buf, "<dhcp peerdns='no'/>\n");
level*2, "");
else if (def->protos[i]->peerdns == 1) else if (def->protos[i]->peerdns == 1)
virBufferAsprintf(buf, "%*s <dhcp peerdns='yes'/>\n", virBufferAddLit(buf, "<dhcp peerdns='yes'/>\n");
level*2, "");
else else
virBufferAsprintf(buf, "%*s <dhcp/>\n", level*2, ""); virBufferAddLit(buf, "<dhcp/>\n");
} }
for (j = 0; j < def->protos[i]->nips; j++) { for (j = 0; j < def->protos[i]->nips; j++) {
if (def->protos[i]->ips[j]->address != NULL) { if (def->protos[i]->ips[j]->address != NULL) {
virBufferAsprintf(buf, "%*s <ip address='%s'", level*2, "", virBufferAsprintf(buf, "<ip address='%s'",
def->protos[i]->ips[j]->address); def->protos[i]->ips[j]->address);
if (def->protos[i]->ips[j]->prefix != 0) { if (def->protos[i]->ips[j]->prefix != 0) {
virBufferAsprintf(buf, " prefix='%d'", virBufferAsprintf(buf, " prefix='%d'",
@ -1005,19 +1000,20 @@ virInterfaceProtocolDefFormat(virBufferPtr buf, const virInterfaceDef *def,
} }
} }
if (def->protos[i]->gateway != NULL) { if (def->protos[i]->gateway != NULL) {
virBufferAsprintf(buf, "%*s <route gateway='%s'/>\n", virBufferAsprintf(buf, "<route gateway='%s'/>\n",
level*2, "", def->protos[i]->gateway); def->protos[i]->gateway);
} }
virBufferAsprintf(buf, "%*s </protocol>\n", level*2, ""); virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</protocol>\n");
} }
return 0; return 0;
} }
static int static int
virInterfaceStartmodeDefFormat(virBufferPtr buf, virInterfaceStartmodeDefFormat(virBufferPtr buf,
enum virInterfaceStartMode startmode, enum virInterfaceStartMode startmode)
int level) { {
const char *mode; const char *mode;
switch (startmode) { switch (startmode) {
case VIR_INTERFACE_START_UNSPECIFIED: case VIR_INTERFACE_START_UNSPECIFIED:
@ -1036,13 +1032,12 @@ virInterfaceStartmodeDefFormat(virBufferPtr buf,
"%s", _("virInterfaceDefFormat unknown startmode")); "%s", _("virInterfaceDefFormat unknown startmode"));
return -1; return -1;
} }
virBufferAsprintf(buf, "%*s <start mode='%s'/>\n", level*2, "", mode); virBufferAsprintf(buf, "<start mode='%s'/>\n", mode);
return 0; return 0;
} }
static int static int
virInterfaceDefDevFormat(virBufferPtr buf, virInterfaceDefDevFormat(virBufferPtr buf, const virInterfaceDef *def)
const virInterfaceDef *def, int level)
{ {
const char *type = NULL; const char *type = NULL;
@ -1064,52 +1059,48 @@ virInterfaceDefDevFormat(virBufferPtr buf,
goto cleanup; goto cleanup;
} }
virBufferAsprintf(buf, "%*s<interface type='%s' ", level*2, "", type); virBufferAsprintf(buf, "<interface type='%s' ", type);
if (def->name != NULL) if (def->name != NULL)
virBufferEscapeString(buf, "name='%s'", def->name); virBufferEscapeString(buf, "name='%s'", def->name);
virBufferAddLit(buf, ">\n"); virBufferAddLit(buf, ">\n");
virBufferAdjustIndent(buf, 2);
switch (def->type) { switch (def->type) {
case VIR_INTERFACE_TYPE_ETHERNET: case VIR_INTERFACE_TYPE_ETHERNET:
virInterfaceStartmodeDefFormat(buf, def->startmode, level); virInterfaceStartmodeDefFormat(buf, def->startmode);
if (def->mac != NULL) if (def->mac != NULL)
virBufferAsprintf(buf, "%*s <mac address='%s'/>\n", virBufferAsprintf(buf, "<mac address='%s'/>\n", def->mac);
level*2, "", def->mac);
if (def->mtu != 0) if (def->mtu != 0)
virBufferAsprintf(buf, "%*s <mtu size='%d'/>\n", virBufferAsprintf(buf, "<mtu size='%d'/>\n", def->mtu);
level*2, "", def->mtu); virInterfaceProtocolDefFormat(buf, def);
virInterfaceProtocolDefFormat(buf, def, level);
break; break;
case VIR_INTERFACE_TYPE_BRIDGE: case VIR_INTERFACE_TYPE_BRIDGE:
virInterfaceStartmodeDefFormat(buf, def->startmode, level); virInterfaceStartmodeDefFormat(buf, def->startmode);
if (def->mtu != 0) if (def->mtu != 0)
virBufferAsprintf(buf, "%*s <mtu size='%d'/>\n", virBufferAsprintf(buf, "<mtu size='%d'/>\n", def->mtu);
level*2, "", def->mtu); virInterfaceProtocolDefFormat(buf, def);
virInterfaceProtocolDefFormat(buf, def, level); virInterfaceBridgeDefFormat(buf, def);
virInterfaceBridgeDefFormat(buf, def, level);
break; break;
case VIR_INTERFACE_TYPE_BOND: case VIR_INTERFACE_TYPE_BOND:
virInterfaceStartmodeDefFormat(buf, def->startmode, level); virInterfaceStartmodeDefFormat(buf, def->startmode);
if (def->mtu != 0) if (def->mtu != 0)
virBufferAsprintf(buf, "%*s <mtu size='%d'/>\n", virBufferAsprintf(buf, "<mtu size='%d'/>\n", def->mtu);
level*2, "", def->mtu); virInterfaceProtocolDefFormat(buf, def);
virInterfaceProtocolDefFormat(buf, def, level); virInterfaceBondDefFormat(buf, def);
virInterfaceBondDefFormat(buf, def, level);
break; break;
case VIR_INTERFACE_TYPE_VLAN: case VIR_INTERFACE_TYPE_VLAN:
virInterfaceStartmodeDefFormat(buf, def->startmode, level); virInterfaceStartmodeDefFormat(buf, def->startmode);
if (def->mac != NULL) if (def->mac != NULL)
virBufferAsprintf(buf, "%*s <mac address='%s'/>\n", virBufferAsprintf(buf, "<mac address='%s'/>\n", def->mac);
level*2, "", def->mac);
if (def->mtu != 0) if (def->mtu != 0)
virBufferAsprintf(buf, "%*s <mtu size='%d'/>\n", virBufferAsprintf(buf, "<mtu size='%d'/>\n", def->mtu);
level*2, "", def->mtu); virInterfaceProtocolDefFormat(buf, def);
virInterfaceProtocolDefFormat(buf, def, level); virInterfaceVlanDefFormat(buf, def);
virInterfaceVlanDefFormat(buf, def, level);
break; break;
} }
virBufferAsprintf(buf, "%*s</interface>\n", level*2, ""); virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</interface>\n");
if (virBufferError(buf)) if (virBufferError(buf))
goto no_memory; goto no_memory;
@ -1124,7 +1115,7 @@ char *virInterfaceDefFormat(const virInterfaceDef *def)
{ {
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
if (virInterfaceDefDevFormat(&buf, def, 0) < 0) { if (virInterfaceDefDevFormat(&buf, def) < 0) {
virBufferFreeAndReset(&buf); virBufferFreeAndReset(&buf);
return NULL; return NULL;
} }