mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-11 12:25:52 +00:00
Xen: xenconfig: remove use of XEND_CONFIG_VERSION in xen_xm
Remove use of XEND_CONFIG_VERSION_* in xm parser/formatter. Signed-off-by: Jim Fehlig <jfehlig@suse.com>
This commit is contained in:
parent
4796d7b34b
commit
0f58db3092
@ -104,9 +104,9 @@ xenParseXMOS(virConfPtr conf, virDomainDefPtr def)
|
|||||||
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
xenParseXMDisk(virConfPtr conf, virDomainDefPtr def, int xendConfigVersion)
|
xenParseXMDisk(virConfPtr conf, virDomainDefPtr def,
|
||||||
|
int xendConfigVersion ATTRIBUTE_UNUSED)
|
||||||
{
|
{
|
||||||
const char *str = NULL;
|
|
||||||
virDomainDiskDefPtr disk = NULL;
|
virDomainDiskDefPtr disk = NULL;
|
||||||
int hvm = def->os.type == VIR_DOMAIN_OSTYPE_HVM;
|
int hvm = def->os.type == VIR_DOMAIN_OSTYPE_HVM;
|
||||||
virConfValuePtr list = virConfGetValue(conf, "disk");
|
virConfValuePtr list = virConfGetValue(conf, "disk");
|
||||||
@ -271,29 +271,6 @@ xenParseXMDisk(virConfPtr conf, virDomainDefPtr def, int xendConfigVersion)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (hvm && xendConfigVersion == XEND_CONFIG_VERSION_3_0_2) {
|
|
||||||
if (xenConfigGetString(conf, "cdrom", &str, NULL) < 0)
|
|
||||||
goto cleanup;
|
|
||||||
if (str) {
|
|
||||||
if (!(disk = virDomainDiskDefNew(NULL)))
|
|
||||||
goto cleanup;
|
|
||||||
|
|
||||||
virDomainDiskSetType(disk, VIR_STORAGE_TYPE_FILE);
|
|
||||||
disk->device = VIR_DOMAIN_DISK_DEVICE_CDROM;
|
|
||||||
if (virDomainDiskSetDriver(disk, "file") < 0)
|
|
||||||
goto cleanup;
|
|
||||||
if (virDomainDiskSetSource(disk, str) < 0)
|
|
||||||
goto cleanup;
|
|
||||||
if (VIR_STRDUP(disk->dst, "hdc") < 0)
|
|
||||||
goto cleanup;
|
|
||||||
disk->bus = VIR_DOMAIN_DISK_BUS_IDE;
|
|
||||||
disk->src->readonly = true;
|
|
||||||
|
|
||||||
if (VIR_APPEND_ELEMENT(def->disks, def->ndisks, disk) < 0)
|
|
||||||
goto cleanup;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
@ -305,8 +282,8 @@ xenParseXMDisk(virConfPtr conf, virDomainDefPtr def, int xendConfigVersion)
|
|||||||
static int
|
static int
|
||||||
xenFormatXMDisk(virConfValuePtr list,
|
xenFormatXMDisk(virConfValuePtr list,
|
||||||
virDomainDiskDefPtr disk,
|
virDomainDiskDefPtr disk,
|
||||||
int hvm,
|
int hvm ATTRIBUTE_UNUSED,
|
||||||
int xendConfigVersion)
|
int xendConfigVersion ATTRIBUTE_UNUSED)
|
||||||
{
|
{
|
||||||
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
virBuffer buf = VIR_BUFFER_INITIALIZER;
|
||||||
virConfValuePtr val, tmp;
|
virConfValuePtr val, tmp;
|
||||||
@ -343,8 +320,6 @@ xenFormatXMDisk(virConfValuePtr list,
|
|||||||
virBufferAdd(&buf, src, -1);
|
virBufferAdd(&buf, src, -1);
|
||||||
}
|
}
|
||||||
virBufferAddLit(&buf, ",");
|
virBufferAddLit(&buf, ",");
|
||||||
if (hvm && xendConfigVersion == XEND_CONFIG_VERSION_3_0_2)
|
|
||||||
virBufferAddLit(&buf, "ioemu:");
|
|
||||||
|
|
||||||
virBufferAdd(&buf, disk->dst, -1);
|
virBufferAdd(&buf, disk->dst, -1);
|
||||||
if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM)
|
if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM)
|
||||||
@ -400,13 +375,6 @@ xenFormatXMDisks(virConfPtr conf, virDomainDefPtr def, int xendConfigVersion)
|
|||||||
diskVal->list = NULL;
|
diskVal->list = NULL;
|
||||||
|
|
||||||
for (i = 0; i < def->ndisks; i++) {
|
for (i = 0; i < def->ndisks; i++) {
|
||||||
if (xendConfigVersion == XEND_CONFIG_VERSION_3_0_2 &&
|
|
||||||
def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_CDROM &&
|
|
||||||
def->disks[i]->dst &&
|
|
||||||
STREQ(def->disks[i]->dst, "hdc")) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY)
|
if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user