mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-25 18:55:26 -06:00
conf: eliminate hardcoded indentation in node device xml
Completely mechanical changes, but there were a lot of lines so I made it a separate patch.
This commit is contained in:
Laine Stump
parent
75f0b66c3a
commit
f728155f69
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* node_device_conf.c: config handling for node devices
|
||||
*
|
||||
* Copyright (C) 2009-2013 Red Hat, Inc.
|
||||
* Copyright (C) 2009-2014 Red Hat, Inc.
|
||||
* Copyright (C) 2008 Virtual Iron Software, Inc.
|
||||
* Copyright (C) 2008 David F. Lively
|
||||
*
|
||||
@ -225,14 +225,16 @@ char *virNodeDeviceDefFormat(const virNodeDeviceDef *def)
|
||||
size_t i = 0;
|
||||
|
||||
virBufferAddLit(&buf, "<device>\n");
|
||||
virBufferAdjustIndent(&buf, 2);
|
||||
virBufferEscapeString(&buf, "<name>%s</name>\n", def->name);
|
||||
virBufferEscapeString(&buf, "<path>%s</path>\n", def->sysfs_path);
|
||||
if (def->parent) {
|
||||
if (def->parent)
|
||||
virBufferEscapeString(&buf, "<parent>%s</parent>\n", def->parent);
|
||||
}
|
||||
if (def->driver) {
|
||||
virBufferAddLit(&buf, "<driver>\n");
|
||||
virBufferAdjustIndent(&buf, 2);
|
||||
virBufferEscapeString(&buf, "<name>%s</name>\n", def->driver);
|
||||
virBufferAdjustIndent(&buf, -2);
|
||||
virBufferAddLit(&buf, "</driver>\n");
|
||||
}
|
||||
|
||||
@ -242,12 +244,14 @@ char *virNodeDeviceDefFormat(const virNodeDeviceDef *def)
|
||||
|
||||
virBufferAsprintf(&buf, "<capability type='%s'>\n",
|
||||
virNodeDevCapTypeToString(caps->type));
|
||||
virBufferAdjustIndent(&buf, 2);
|
||||
switch (caps->type) {
|
||||
case VIR_NODE_DEV_CAP_SYSTEM:
|
||||
if (data->system.product_name)
|
||||
virBufferEscapeString(&buf, "<product>%s</product>\n",
|
||||
data->system.product_name);
|
||||
virBufferAddLit(&buf, "<hardware>\n");
|
||||
virBufferAdjustIndent(&buf, 2);
|
||||
if (data->system.hardware.vendor_name)
|
||||
virBufferEscapeString(&buf, "<vendor>%s</vendor>\n",
|
||||
data->system.hardware.vendor_name);
|
||||
@ -259,8 +263,11 @@ char *virNodeDeviceDefFormat(const virNodeDeviceDef *def)
|
||||
data->system.hardware.serial);
|
||||
virUUIDFormat(data->system.hardware.uuid, uuidstr);
|
||||
virBufferAsprintf(&buf, "<uuid>%s</uuid>\n", uuidstr);
|
||||
virBufferAdjustIndent(&buf, -2);
|
||||
virBufferAddLit(&buf, "</hardware>\n");
|
||||
|
||||
virBufferAddLit(&buf, "<firmware>\n");
|
||||
virBufferAdjustIndent(&buf, 2);
|
||||
if (data->system.firmware.vendor_name)
|
||||
virBufferEscapeString(&buf, "<vendor>%s</vendor>\n",
|
||||
data->system.firmware.vendor_name);
|
||||
@ -268,9 +275,9 @@ char *virNodeDeviceDefFormat(const virNodeDeviceDef *def)
|
||||
virBufferEscapeString(&buf, "<version>%s</version>\n",
|
||||
data->system.firmware.version);
|
||||
if (data->system.firmware.release_date)
|
||||
virBufferEscapeString(&buf,
|
||||
" <release_date>%s</release_date>\n",
|
||||
virBufferEscapeString(&buf, "<release_date>%s</release_date>\n",
|
||||
data->system.firmware.release_date);
|
||||
virBufferAdjustIndent(&buf, -2);
|
||||
virBufferAddLit(&buf, "</firmware>\n");
|
||||
break;
|
||||
case VIR_NODE_DEV_CAP_PCI_DEV:
|
||||
@ -297,6 +304,7 @@ char *virNodeDeviceDefFormat(const virNodeDeviceDef *def)
|
||||
virBufferAddLit(&buf, " />\n");
|
||||
if (data->pci_dev.flags & VIR_NODE_DEV_CAP_FLAG_PCI_PHYSICAL_FUNCTION) {
|
||||
virBufferAddLit(&buf, "<capability type='phys_function'>\n");
|
||||
virBufferAdjustIndent(&buf, 2);
|
||||
virBufferAsprintf(&buf,
|
||||
"<address domain='0x%.4x' bus='0x%.2x' "
|
||||
"slot='0x%.2x' function='0x%.1x'/>\n",
|
||||
@ -304,10 +312,12 @@ char *virNodeDeviceDefFormat(const virNodeDeviceDef *def)
|
||||
data->pci_dev.physical_function->bus,
|
||||
data->pci_dev.physical_function->slot,
|
||||
data->pci_dev.physical_function->function);
|
||||
virBufferAdjustIndent(&buf, -2);
|
||||
virBufferAddLit(&buf, "</capability>\n");
|
||||
}
|
||||
if (data->pci_dev.flags & VIR_NODE_DEV_CAP_FLAG_PCI_VIRTUAL_FUNCTION) {
|
||||
virBufferAddLit(&buf, "<capability type='virt_functions'>\n");
|
||||
virBufferAdjustIndent(&buf, 2);
|
||||
for (i = 0; i < data->pci_dev.num_virtual_functions; i++) {
|
||||
virBufferAsprintf(&buf,
|
||||
"<address domain='0x%.4x' bus='0x%.2x' "
|
||||
@ -317,11 +327,13 @@ char *virNodeDeviceDefFormat(const virNodeDeviceDef *def)
|
||||
data->pci_dev.virtual_functions[i]->slot,
|
||||
data->pci_dev.virtual_functions[i]->function);
|
||||
}
|
||||
virBufferAdjustIndent(&buf, -2);
|
||||
virBufferAddLit(&buf, "</capability>\n");
|
||||
}
|
||||
if (data->pci_dev.nIommuGroupDevices) {
|
||||
virBufferAsprintf(&buf, "<iommuGroup number='%d'>\n",
|
||||
data->pci_dev.iommuGroupNumber);
|
||||
virBufferAdjustIndent(&buf, 2);
|
||||
for (i = 0; i < data->pci_dev.nIommuGroupDevices; i++) {
|
||||
virBufferAsprintf(&buf,
|
||||
"<address domain='0x%.4x' bus='0x%.2x' "
|
||||
@ -331,6 +343,7 @@ char *virNodeDeviceDefFormat(const virNodeDeviceDef *def)
|
||||
data->pci_dev.iommuGroupDevices[i]->slot,
|
||||
data->pci_dev.iommuGroupDevices[i]->function);
|
||||
}
|
||||
virBufferAdjustIndent(&buf, -2);
|
||||
virBufferAddLit(&buf, "</iommuGroup>\n");
|
||||
}
|
||||
break;
|
||||
@ -385,20 +398,24 @@ char *virNodeDeviceDefFormat(const virNodeDeviceDef *def)
|
||||
data->scsi_host.host);
|
||||
if (data->scsi_host.flags & VIR_NODE_DEV_CAP_FLAG_HBA_FC_HOST) {
|
||||
virBufferAddLit(&buf, "<capability type='fc_host'>\n");
|
||||
virBufferAdjustIndent(&buf, 2);
|
||||
virBufferEscapeString(&buf, "<wwnn>%s</wwnn>\n",
|
||||
data->scsi_host.wwnn);
|
||||
virBufferEscapeString(&buf, "<wwpn>%s</wwpn>\n",
|
||||
data->scsi_host.wwpn);
|
||||
virBufferEscapeString(&buf, "<fabric_wwn>%s</fabric_wwn>\n",
|
||||
data->scsi_host.fabric_wwn);
|
||||
virBufferAdjustIndent(&buf, -2);
|
||||
virBufferAddLit(&buf, "</capability>\n");
|
||||
}
|
||||
if (data->scsi_host.flags & VIR_NODE_DEV_CAP_FLAG_HBA_VPORT_OPS) {
|
||||
virBufferAddLit(&buf, "<capability type='vport_ops'>\n");
|
||||
virBufferAdjustIndent(&buf, 2);
|
||||
virBufferAsprintf(&buf, "<max_vports>%d</max_vports>\n",
|
||||
data->scsi_host.max_vports);
|
||||
virBufferAsprintf(&buf, "<vports>%d</vports>\n",
|
||||
data->scsi_host.vports);
|
||||
virBufferAdjustIndent(&buf, -2);
|
||||
virBufferAddLit(&buf, "</capability>\n");
|
||||
}
|
||||
|
||||
@ -441,8 +458,8 @@ char *virNodeDeviceDefFormat(const virNodeDeviceDef *def)
|
||||
int avl = data->storage.flags &
|
||||
VIR_NODE_DEV_CAP_STORAGE_REMOVABLE_MEDIA_AVAILABLE;
|
||||
virBufferAddLit(&buf, "<capability type='removable'>\n");
|
||||
virBufferAsprintf(&buf,
|
||||
" <media_available>%d"
|
||||
virBufferAdjustIndent(&buf, 2);
|
||||
virBufferAsprintf(&buf, "<media_available>%d"
|
||||
"</media_available>\n", avl ? 1 : 0);
|
||||
virBufferAsprintf(&buf, "<media_size>%llu</media_size>\n",
|
||||
data->storage.removable_media_size);
|
||||
@ -450,7 +467,6 @@ char *virNodeDeviceDefFormat(const virNodeDeviceDef *def)
|
||||
virBufferEscapeString(&buf,
|
||||
"<media_label>%s</media_label>\n",
|
||||
data->storage.media_label);
|
||||
|
||||
if (data->storage.logical_block_size > 0)
|
||||
virBufferAsprintf(&buf, "<logical_block_size>%llu"
|
||||
"</logical_block_size>\n",
|
||||
@ -459,6 +475,7 @@ char *virNodeDeviceDefFormat(const virNodeDeviceDef *def)
|
||||
virBufferAsprintf(&buf,
|
||||
"<num_blocks>%llu</num_blocks>\n",
|
||||
data->storage.num_blocks);
|
||||
virBufferAdjustIndent(&buf, -2);
|
||||
virBufferAddLit(&buf, "</capability>\n");
|
||||
} else {
|
||||
virBufferAsprintf(&buf, "<size>%llu</size>\n",
|
||||
@ -468,13 +485,11 @@ char *virNodeDeviceDefFormat(const virNodeDeviceDef *def)
|
||||
"</logical_block_size>\n",
|
||||
data->storage.logical_block_size);
|
||||
if (data->storage.num_blocks > 0)
|
||||
virBufferAsprintf(&buf,
|
||||
" <num_blocks>%llu</num_blocks>\n",
|
||||
virBufferAsprintf(&buf, "<num_blocks>%llu</num_blocks>\n",
|
||||
data->storage.num_blocks);
|
||||
}
|
||||
if (data->storage.flags & VIR_NODE_DEV_CAP_STORAGE_HOTPLUGGABLE)
|
||||
virBufferAddLit(&buf,
|
||||
" <capability type='hotpluggable' />\n");
|
||||
virBufferAddLit(&buf, "<capability type='hotpluggable' />\n");
|
||||
break;
|
||||
case VIR_NODE_DEV_CAP_SCSI_GENERIC:
|
||||
virBufferEscapeString(&buf, "<char>%s</char>\n",
|
||||
@ -487,9 +502,11 @@ char *virNodeDeviceDefFormat(const virNodeDeviceDef *def)
|
||||
break;
|
||||
}
|
||||
|
||||
virBufferAdjustIndent(&buf, -2);
|
||||
virBufferAddLit(&buf, "</capability>\n");
|
||||
}
|
||||
|
||||
virBufferAdjustIndent(&buf, -2);
|
||||
virBufferAddLit(&buf, "</device>\n");
|
||||
|
||||
if (virBufferError(&buf))
|
||||
|
||||
Loading…
Reference in New Issue
Block a user