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

conf: use disk source accessors in parallels/

Browse Source 
Part of a series of cleanups to use new accessor methods.

* src/parallels/parallels_driver.c (parallelsGetHddInfo)
(parallelsAddHdd, parallelsApplyDisksParams, parallelsCreateVm):
Likewise.

Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Eric Blake 2014-03-17 15:11:07 -06:00
parent a7785ccfd7
commit e04a4ab926
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/parallels/parallels_driver.c
View File

@ -2,6 +2,7 @@
* parallels_driver.c: core driver functions for managing * parallels_driver.c: core driver functions for managing
* Parallels Cloud Server hosts * Parallels Cloud Server hosts
* *
* Copyright (C) 2014 Red Hat, Inc.
* Copyright (C) 2012 Parallels, Inc. * Copyright (C) 2012 Parallels, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
@ -301,24 +302,24 @@ parallelsGetHddInfo(virDomainDefPtr def,
disk->device = VIR_DOMAIN_DISK_DEVICE_DISK; disk->device = VIR_DOMAIN_DISK_DEVICE_DISK;
if (virJSONValueObjectHasKey(value, "real") == 1) { if (virJSONValueObjectHasKey(value, "real") == 1) {
disk->type = VIR_DOMAIN_DISK_TYPE_BLOCK; virDomainDiskSetType(disk, VIR_DOMAIN_DISK_TYPE_BLOCK);
if (!(tmp = virJSONValueObjectGetString(value, "real"))) { if (!(tmp = virJSONValueObjectGetString(value, "real"))) {
parallelsParseError(); parallelsParseError();
return -1; return -1;
} }
if (VIR_STRDUP(disk->src, tmp) < 0) if (virDomainDiskSetSource(disk, tmp) < 0)
return -1; return -1;
} else { } else {
disk->type = VIR_DOMAIN_DISK_TYPE_FILE; virDomainDiskSetType(disk, VIR_DOMAIN_DISK_TYPE_FILE);
if (!(tmp = virJSONValueObjectGetString(value, "image"))) { if (!(tmp = virJSONValueObjectGetString(value, "image"))) {
parallelsParseError(); parallelsParseError();
return -1; return -1;
} }
if (VIR_STRDUP(disk->src, tmp) < 0) if (virDomainDiskSetSource(disk, tmp) < 0)
return -1; return -1;
} }
@ -1647,10 +1648,11 @@ static int parallelsAddHdd(virConnectPtr conn,
virStoragePoolObjPtr pool = NULL; virStoragePoolObjPtr pool = NULL;
virStorageVolPtr vol = NULL; virStorageVolPtr vol = NULL;
int ret = -1; int ret = -1;
const char *src = virDomainDiskGetSource(disk);
if (!(vol = parallelsStorageVolLookupByPathLocked(conn, disk->src))) { if (!(vol = parallelsStorageVolLookupByPathLocked(conn, src))) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("Can't find volume with path '%s'"), disk->src); _("Can't find volume with path '%s'"), src);
return -1; return -1;
} }
@ -1662,11 +1664,11 @@ static int parallelsAddHdd(virConnectPtr conn,
goto cleanup; goto cleanup;
} }
voldef = virStorageVolDefFindByPath(pool, disk->src); voldef = virStorageVolDefFindByPath(pool, src);
if (!voldef) { if (!voldef) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("Can't find storage volume definition for path '%s'"), _("Can't find storage volume definition for path '%s'"),
disk->src); src);
goto cleanup; goto cleanup;
} }
@ -1725,7 +1727,8 @@ parallelsApplyDisksParams(virConnectPtr conn, parallelsDomObjPtr pdom,
if (olddisk->bus != newdisk->bus || if (olddisk->bus != newdisk->bus ||
olddisk->info.addr.drive.target != newdisk->info.addr.drive.target || olddisk->info.addr.drive.target != newdisk->info.addr.drive.target ||
!STREQ_NULLABLE(olddisk->src, newdisk->src)) { !STREQ_NULLABLE(virDomainDiskGetSource(olddisk),
virDomainDiskGetSource(newdisk))) {
char prlname[16]; char prlname[16];
char strpos[16]; char strpos[16];
@ -2201,16 +2204,18 @@ parallelsCreateVm(virConnectPtr conn, virDomainDefPtr def)
virStoragePoolObjPtr pool = NULL; virStoragePoolObjPtr pool = NULL;
virStorageVolPtr vol = NULL; virStorageVolPtr vol = NULL;
char uuidstr[VIR_UUID_STRING_BUFLEN]; char uuidstr[VIR_UUID_STRING_BUFLEN];
const char *src;
for (i = 0; i < def->ndisks; i++) { for (i = 0; i < def->ndisks; i++) {
if (def->disks[i]->device != VIR_DOMAIN_DISK_DEVICE_DISK) if (def->disks[i]->device != VIR_DOMAIN_DISK_DEVICE_DISK)
continue; continue;
vol = parallelsStorageVolLookupByPathLocked(conn, def->disks[i]->src); src = virDomainDiskGetSource(def->disks[i]);
vol = parallelsStorageVolLookupByPathLocked(conn, src);
if (!vol) { if (!vol) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("Can't find volume with path '%s'"), _("Can't find volume with path '%s'"),
def->disks[i]->src); src);
return -1; return -1;
} }
break; break;
@ -2234,11 +2239,11 @@ parallelsCreateVm(virConnectPtr conn, virDomainDefPtr def)
goto error; goto error;
} }
privvol = virStorageVolDefFindByPath(pool, def->disks[i]->src); privvol = virStorageVolDefFindByPath(pool, src);
if (!privvol) { if (!privvol) {
virReportError(VIR_ERR_INVALID_ARG, virReportError(VIR_ERR_INVALID_ARG,
_("Can't find storage volume definition for path '%s'"), _("Can't find storage volume definition for path '%s'"),
def->disks[i]->src); src);
goto error2; goto error2;
} }