openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

conf: use disk source accessors in locking/ 

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

* src/locking/domain_lock.c (virDomainLockManagerAddDisk): Use
accessors.

Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Eric Blake 2014-03-17 14:23:08 -06:00
parent f7c81d8458
commit 6b44ccf7fe
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/locking/domain_lock.c
View File

@ -1,7 +1,7 @@
/* /*
* domain_lock.c: Locking for domain lifecycle operations * domain_lock.c: Locking for domain lifecycle operations
* *
* Copyright (C) 2010-2011 Red Hat, Inc. * Copyright (C) 2010-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
@ -72,12 +72,15 @@ static int virDomainLockManagerAddDisk(virLockManagerPtr lock,
virDomainDiskDefPtr disk) virDomainDiskDefPtr disk)
{ {
unsigned int diskFlags = 0; unsigned int diskFlags = 0;
if (!disk->src) const char *src = virDomainDiskGetSource(disk);
int type = virDomainDiskGetType(disk);
if (!src)
return 0; return 0;
if (!(disk->type == VIR_DOMAIN_DISK_TYPE_BLOCK || if (!(type == VIR_DOMAIN_DISK_TYPE_BLOCK ||
disk->type == VIR_DOMAIN_DISK_TYPE_FILE || type == VIR_DOMAIN_DISK_TYPE_FILE ||
disk->type == VIR_DOMAIN_DISK_TYPE_DIR)) type == VIR_DOMAIN_DISK_TYPE_DIR))
return 0; return 0;
if (disk->readonly) if (disk->readonly)
@ -85,14 +88,14 @@ static int virDomainLockManagerAddDisk(virLockManagerPtr lock,
if (disk->shared) if (disk->shared)
diskFlags |= VIR_LOCK_MANAGER_RESOURCE_SHARED; diskFlags |= VIR_LOCK_MANAGER_RESOURCE_SHARED;
VIR_DEBUG("Add disk %s", disk->src); VIR_DEBUG("Add disk %s", src);
if (virLockManagerAddResource(lock, if (virLockManagerAddResource(lock,
VIR_LOCK_MANAGER_RESOURCE_TYPE_DISK, VIR_LOCK_MANAGER_RESOURCE_TYPE_DISK,
disk->src, src,
0, 0,
NULL, NULL,
diskFlags) < 0) { diskFlags) < 0) {
VIR_DEBUG("Failed add disk %s", disk->src); VIR_DEBUG("Failed add disk %s", src);
return -1; return -1;
} }
return 0; return 0;