2008-11-04 23:22:06 +00:00
|
|
|
/*
|
|
|
|
* datatypes.h: management of structs for public data types
|
|
|
|
*
|
2010-03-01 23:38:28 +00:00
|
|
|
* Copyright (C) 2006-2010 Red Hat, Inc.
|
2008-11-04 23:22:06 +00:00
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <config.h>
|
2009-10-07 10:18:31 +00:00
|
|
|
#include <unistd.h>
|
2008-11-04 23:22:06 +00:00
|
|
|
|
|
|
|
#include "datatypes.h"
|
|
|
|
#include "virterror_internal.h"
|
2008-11-06 16:36:07 +00:00
|
|
|
#include "logging.h"
|
2008-11-04 23:22:06 +00:00
|
|
|
#include "memory.h"
|
Fix UUID handling in secrets/storage encryption APIs
Convert all the secret/storage encryption APIs / wire format to
handle UUIDs in raw format instead of non-canonical printable
format. Guarentees data format correctness.
* docs/schemas/storageencryption.rng: Make UUID mandatory for a secret
and validate fully
* docs/schemas/secret.rng: Fully validate UUID
* include/libvirt/libvirt.h, include/libvirt/libvirt.h.in, Add
virSecretLookupByUUID and virSecretGetUUID. Make
virSecretGetUUIDString follow normal API design pattern
* python/generator.py: Skip generation of virSecretGetUUID,
virSecretGetUUIDString and virSecretLookupByUUID
* python/libvir.c, python/libvirt-python-api.xml: Manual impl
of virSecretGetUUID,virSecretGetUUIDString and virSecretLookupByUUID
* qemud/remote.c: s/virSecretLookupByUUIDString/virSecretLookupByUUID/
Fix get_nonnull_secret/make_nonnull_secret to use unsigned char
* qemud/remote_protocol.x: Fix remote_nonnull_secret to use a
remote_uuid instead of remote_nonnull_string for UUID field.
Rename REMOTE_PROC_SECRET_LOOKUP_BY_UUID_STRING to
REMOTE_PROC_SECRET_LOOKUP_BY_UUID_STRING and make it take an
remote_uuid value
* qemud/remote_dispatch_args.h, qemud/remote_dispatch_prototypes.h,
qemud/remote_dispatch_ret.h, qemud/remote_dispatch_table.h,
qemud/remote_protocol.c, qemud/remote_protocol.h: Re-generate
* src/datatypes.h, src/datatypes.c: Store UUID in raw format instead
of printable. Change virGetSecret to use raw format UUID
* src/driver.h: Rename virDrvSecretLookupByUUIDString to
virDrvSecretLookupByUUID and use raw format UUID
* src/libvirt.c: Add virSecretLookupByUUID and virSecretGetUUID
and re-implement virSecretLookupByUUIDString and
virSecretGetUUIDString in terms of those
* src/libvirt_public.syms: Add virSecretLookupByUUID and
virSecretGetUUID
* src/remote_internal.c: Rename remoteSecretLookupByUUIDString
to remoteSecretLookupByUUID. Fix typo in args for
remoteSecretDefineXML impl. Use raw UUID format for
get_nonnull_secret and make_nonnull_secret
* src/storage_encryption_conf.c, src/storage_encryption_conf.h:
Storage UUID in raw format, and require it to be present in
XML. Use UUID parser to validate.
* secret_conf.h, secret_conf.c: Generate a UUID if none is provided.
Storage UUID in raw format.
* src/secret_driver.c: Adjust to deal with raw UUIDs. Save secrets
in a filed with printable UUID, instead of base64 UUID.
* src/virsh.c: Adjust for changed public API contract of
virSecretGetUUIDString.
* src/storage_Backend.c: DOn't undefine secret we just generated
upon successful volume creation. Fix to handle raw UUIDs. Generate
a non-clashing UUID
* src/qemu_driver.c: Change to use lookupByUUID instead of
lookupByUUIDString
2009-09-10 16:44:12 +00:00
|
|
|
#include "uuid.h"
|
2009-08-03 12:37:44 +00:00
|
|
|
#include "util.h"
|
2008-11-04 23:22:06 +00:00
|
|
|
|
2009-01-29 12:10:32 +00:00
|
|
|
#define VIR_FROM_THIS VIR_FROM_NONE
|
|
|
|
|
2010-04-03 13:01:26 +00:00
|
|
|
#define virLibConnError(code, ...) \
|
|
|
|
virReportErrorHelper(NULL, VIR_FROM_THIS, code, __FILE__, \
|
2010-03-01 23:38:28 +00:00
|
|
|
__FUNCTION__, __LINE__, __VA_ARGS__)
|
2009-04-01 10:31:01 +00:00
|
|
|
|
2008-11-04 23:22:06 +00:00
|
|
|
/************************************************************************
|
|
|
|
* *
|
|
|
|
* Domain and Connections allocations *
|
|
|
|
* *
|
|
|
|
************************************************************************/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virDomainFreeName:
|
|
|
|
* @domain: a domain object
|
|
|
|
*
|
|
|
|
* Destroy the domain object, this is just used by the domain hash callback.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success and -1 in case of failure.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
virDomainFreeName(virDomainPtr domain, const char *name ATTRIBUTE_UNUSED)
|
|
|
|
{
|
2009-05-11 15:27:37 +00:00
|
|
|
return (virUnrefDomain(domain));
|
2008-11-04 23:22:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virNetworkFreeName:
|
|
|
|
* @network: a network object
|
|
|
|
*
|
|
|
|
* Destroy the network object, this is just used by the network hash callback.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success and -1 in case of failure.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
virNetworkFreeName(virNetworkPtr network, const char *name ATTRIBUTE_UNUSED)
|
|
|
|
{
|
2009-05-11 15:27:37 +00:00
|
|
|
return (virUnrefNetwork(network));
|
2008-11-04 23:22:06 +00:00
|
|
|
}
|
|
|
|
|
2009-05-20 14:26:49 +00:00
|
|
|
/**
|
|
|
|
* virInterfaceFreeName:
|
2009-10-26 23:02:46 +00:00
|
|
|
* @interface: an interface object
|
2009-05-20 14:26:49 +00:00
|
|
|
*
|
|
|
|
* Destroy the interface object, this is just used by the interface hash callback.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success and -1 in case of failure.
|
|
|
|
*/
|
|
|
|
static int
|
2009-05-29 14:29:22 +00:00
|
|
|
virInterfaceFreeName(virInterfacePtr iface, const char *name ATTRIBUTE_UNUSED)
|
2009-05-20 14:26:49 +00:00
|
|
|
{
|
2009-05-29 14:29:22 +00:00
|
|
|
return (virUnrefInterface(iface));
|
2009-05-20 14:26:49 +00:00
|
|
|
}
|
|
|
|
|
2008-11-04 23:22:06 +00:00
|
|
|
/**
|
|
|
|
* virStoragePoolFreeName:
|
|
|
|
* @pool: a pool object
|
|
|
|
*
|
|
|
|
* Destroy the pool object, this is just used by the pool hash callback.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success and -1 in case of failure.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
virStoragePoolFreeName(virStoragePoolPtr pool, const char *name ATTRIBUTE_UNUSED)
|
|
|
|
{
|
2009-05-11 15:27:37 +00:00
|
|
|
return (virUnrefStoragePool(pool));
|
2008-11-04 23:22:06 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virStorageVolFreeName:
|
|
|
|
* @vol: a vol object
|
|
|
|
*
|
|
|
|
* Destroy the vol object, this is just used by the vol hash callback.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success and -1 in case of failure.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
virStorageVolFreeName(virStorageVolPtr vol, const char *name ATTRIBUTE_UNUSED)
|
|
|
|
{
|
2009-05-11 15:27:37 +00:00
|
|
|
return (virUnrefStorageVol(vol));
|
2008-11-04 23:22:06 +00:00
|
|
|
}
|
|
|
|
|
2009-08-14 19:42:19 +00:00
|
|
|
/**
|
|
|
|
* virSecretFreeName:
|
|
|
|
* @secret_: a secret object
|
|
|
|
*
|
|
|
|
* Destroy the secret object, this is just used by the secret hash callback.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success and -1 in case of failure.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
virSecretFreeName(void *secret_, const char *name ATTRIBUTE_UNUSED)
|
|
|
|
{
|
|
|
|
virSecretPtr secret;
|
|
|
|
|
|
|
|
secret = secret_;
|
|
|
|
virUnrefSecret(secret);
|
|
|
|
}
|
|
|
|
|
2010-04-17 16:20:15 +00:00
|
|
|
/**
|
|
|
|
* virNWFilterPoolFreeName:
|
|
|
|
* @pool: a nwfilter pool object
|
|
|
|
*
|
|
|
|
* Destroy the nwfilter pool object, this is just used by the nwfilter pool hash callback.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success and -1 in case of failure.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
virNWFilterPoolFreeName(virNWFilterPtr pool, const char *name ATTRIBUTE_UNUSED)
|
|
|
|
{
|
|
|
|
return (virUnrefNWFilter(pool));
|
|
|
|
}
|
|
|
|
|
2010-03-31 20:33:13 +00:00
|
|
|
/**
|
|
|
|
* virDomainSnapshotFreeName:
|
|
|
|
* @snapshot: a domain snapshotobject
|
|
|
|
*
|
|
|
|
* Destroy the domain snapshot object, this is just used by the domain hash callback.
|
|
|
|
*
|
|
|
|
* Returns 0 in case of success and -1 in case of failure.
|
|
|
|
*/
|
|
|
|
static int
|
|
|
|
virDomainSnapshotFreeName(virDomainSnapshotPtr snapshot, const char *name ATTRIBUTE_UNUSED)
|
|
|
|
{
|
|
|
|
return (virUnrefDomainSnapshot(snapshot));
|
|
|
|
}
|
|
|
|
|
2008-11-04 23:22:06 +00:00
|
|
|
/**
|
|
|
|
* virGetConnect:
|
|
|
|
*
|
|
|
|
* Allocates a new hypervisor connection structure
|
|
|
|
*
|
|
|
|
* Returns a new pointer or NULL in case of error.
|
|
|
|
*/
|
|
|
|
virConnectPtr
|
|
|
|
virGetConnect(void) {
|
|
|
|
virConnectPtr ret;
|
|
|
|
|
|
|
|
if (VIR_ALLOC(ret) < 0) {
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2008-11-04 23:22:06 +00:00
|
|
|
goto failed;
|
|
|
|
}
|
2009-01-15 19:56:05 +00:00
|
|
|
if (virMutexInit(&ret->lock) < 0) {
|
|
|
|
VIR_FREE(ret);
|
|
|
|
goto failed;
|
|
|
|
}
|
|
|
|
|
2008-11-04 23:22:06 +00:00
|
|
|
ret->magic = VIR_CONNECT_MAGIC;
|
|
|
|
ret->driver = NULL;
|
|
|
|
ret->networkDriver = NULL;
|
|
|
|
ret->privateData = NULL;
|
|
|
|
ret->networkPrivateData = NULL;
|
2009-05-20 14:26:49 +00:00
|
|
|
ret->interfacePrivateData = NULL;
|
2008-11-04 23:22:06 +00:00
|
|
|
ret->domains = virHashCreate(20);
|
|
|
|
if (ret->domains == NULL)
|
|
|
|
goto failed;
|
|
|
|
ret->networks = virHashCreate(20);
|
|
|
|
if (ret->networks == NULL)
|
|
|
|
goto failed;
|
2009-05-20 14:26:49 +00:00
|
|
|
ret->interfaces = virHashCreate(20);
|
|
|
|
if (ret->interfaces == NULL)
|
|
|
|
goto failed;
|
2008-11-04 23:22:06 +00:00
|
|
|
ret->storagePools = virHashCreate(20);
|
|
|
|
if (ret->storagePools == NULL)
|
|
|
|
goto failed;
|
|
|
|
ret->storageVols = virHashCreate(20);
|
|
|
|
if (ret->storageVols == NULL)
|
|
|
|
goto failed;
|
2008-11-21 12:19:22 +00:00
|
|
|
ret->nodeDevices = virHashCreate(256);
|
|
|
|
if (ret->nodeDevices == NULL)
|
|
|
|
goto failed;
|
2009-08-14 19:42:19 +00:00
|
|
|
ret->secrets = virHashCreate(20);
|
|
|
|
if (ret->secrets == NULL)
|
|
|
|
goto failed;
|
2010-03-25 17:46:02 +00:00
|
|
|
ret->nwfilterPools = virHashCreate(20);
|
|
|
|
if (ret->nwfilterPools == NULL)
|
|
|
|
goto failed;
|
2008-11-04 23:22:06 +00:00
|
|
|
|
|
|
|
ret->refs = 1;
|
|
|
|
return(ret);
|
|
|
|
|
|
|
|
failed:
|
|
|
|
if (ret != NULL) {
|
|
|
|
if (ret->domains != NULL)
|
|
|
|
virHashFree(ret->domains, (virHashDeallocator) virDomainFreeName);
|
|
|
|
if (ret->networks != NULL)
|
|
|
|
virHashFree(ret->networks, (virHashDeallocator) virNetworkFreeName);
|
2009-05-20 14:26:49 +00:00
|
|
|
if (ret->interfaces != NULL)
|
|
|
|
virHashFree(ret->interfaces, (virHashDeallocator) virInterfaceFreeName);
|
2008-11-04 23:22:06 +00:00
|
|
|
if (ret->storagePools != NULL)
|
|
|
|
virHashFree(ret->storagePools, (virHashDeallocator) virStoragePoolFreeName);
|
|
|
|
if (ret->storageVols != NULL)
|
|
|
|
virHashFree(ret->storageVols, (virHashDeallocator) virStorageVolFreeName);
|
2008-11-21 12:19:22 +00:00
|
|
|
if (ret->nodeDevices != NULL)
|
|
|
|
virHashFree(ret->nodeDevices, (virHashDeallocator) virNodeDeviceFree);
|
2009-08-14 19:42:19 +00:00
|
|
|
if (ret->secrets != NULL)
|
|
|
|
virHashFree(ret->secrets, virSecretFreeName);
|
2010-04-17 16:20:15 +00:00
|
|
|
if (ret->nwfilterPools != NULL)
|
|
|
|
virHashFree(ret->nwfilterPools, (virHashDeallocator) virNWFilterPoolFreeName);
|
2008-11-04 23:22:06 +00:00
|
|
|
|
2009-01-15 19:56:05 +00:00
|
|
|
virMutexDestroy(&ret->lock);
|
2008-11-04 23:22:06 +00:00
|
|
|
VIR_FREE(ret);
|
|
|
|
}
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virReleaseConnect:
|
|
|
|
* @conn: the hypervisor connection to release
|
|
|
|
*
|
|
|
|
* Unconditionally release all memory associated with a connection.
|
|
|
|
* The conn.lock mutex must be held prior to calling this, and will
|
|
|
|
* be released prior to this returning. The connection obj must not
|
|
|
|
* be used once this method returns.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
virReleaseConnect(virConnectPtr conn) {
|
2008-11-17 11:44:51 +00:00
|
|
|
DEBUG("release connection %p", conn);
|
2008-11-04 23:22:06 +00:00
|
|
|
if (conn->domains != NULL)
|
|
|
|
virHashFree(conn->domains, (virHashDeallocator) virDomainFreeName);
|
|
|
|
if (conn->networks != NULL)
|
|
|
|
virHashFree(conn->networks, (virHashDeallocator) virNetworkFreeName);
|
2009-05-20 14:26:49 +00:00
|
|
|
if (conn->interfaces != NULL)
|
|
|
|
virHashFree(conn->interfaces, (virHashDeallocator) virInterfaceFreeName);
|
2008-11-04 23:22:06 +00:00
|
|
|
if (conn->storagePools != NULL)
|
|
|
|
virHashFree(conn->storagePools, (virHashDeallocator) virStoragePoolFreeName);
|
|
|
|
if (conn->storageVols != NULL)
|
|
|
|
virHashFree(conn->storageVols, (virHashDeallocator) virStorageVolFreeName);
|
2008-11-21 12:19:22 +00:00
|
|
|
if (conn->nodeDevices != NULL)
|
|
|
|
virHashFree(conn->nodeDevices, (virHashDeallocator) virNodeDeviceFree);
|
2009-08-14 19:42:19 +00:00
|
|
|
if (conn->secrets != NULL)
|
|
|
|
virHashFree(conn->secrets, virSecretFreeName);
|
2010-04-17 16:20:15 +00:00
|
|
|
if (conn->nwfilterPools != NULL)
|
|
|
|
virHashFree(conn->nwfilterPools, (virHashDeallocator) virNWFilterPoolFreeName);
|
2008-11-04 23:22:06 +00:00
|
|
|
|
|
|
|
virResetError(&conn->err);
|
|
|
|
|
2008-11-17 11:44:51 +00:00
|
|
|
xmlFreeURI(conn->uri);
|
2008-11-04 23:22:06 +00:00
|
|
|
|
2009-01-15 19:56:05 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
|
|
|
virMutexDestroy(&conn->lock);
|
2008-11-04 23:22:06 +00:00
|
|
|
VIR_FREE(conn);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virUnrefConnect:
|
|
|
|
* @conn: the hypervisor connection to unreference
|
|
|
|
*
|
|
|
|
* Unreference the connection. If the use count drops to zero, the structure is
|
|
|
|
* actually freed.
|
|
|
|
*
|
|
|
|
* Returns the reference count or -1 in case of failure.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
virUnrefConnect(virConnectPtr conn) {
|
|
|
|
int refs;
|
|
|
|
|
|
|
|
if ((!VIR_IS_CONNECT(conn))) {
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2008-11-04 23:22:06 +00:00
|
|
|
return(-1);
|
|
|
|
}
|
2009-01-15 19:56:05 +00:00
|
|
|
virMutexLock(&conn->lock);
|
2008-11-17 11:44:51 +00:00
|
|
|
DEBUG("unref connection %p %d", conn, conn->refs);
|
2008-11-04 23:22:06 +00:00
|
|
|
conn->refs--;
|
|
|
|
refs = conn->refs;
|
|
|
|
if (refs == 0) {
|
2009-08-11 13:48:59 +00:00
|
|
|
/* make sure to release the connection lock before we call the
|
|
|
|
* close() callbacks, otherwise we will deadlock if an error
|
|
|
|
* is raised by any of the callbacks
|
|
|
|
*/
|
|
|
|
virMutexUnlock(&conn->lock);
|
|
|
|
if (conn->networkDriver)
|
|
|
|
conn->networkDriver->close (conn);
|
|
|
|
if (conn->interfaceDriver)
|
|
|
|
conn->interfaceDriver->close (conn);
|
|
|
|
if (conn->storageDriver)
|
|
|
|
conn->storageDriver->close (conn);
|
|
|
|
if (conn->deviceMonitor)
|
|
|
|
conn->deviceMonitor->close (conn);
|
2009-08-14 19:42:19 +00:00
|
|
|
if (conn->secretDriver)
|
|
|
|
conn->secretDriver->close (conn);
|
2010-04-17 16:20:15 +00:00
|
|
|
if (conn->nwfilterDriver)
|
|
|
|
conn->nwfilterDriver->close (conn);
|
2009-08-11 13:48:59 +00:00
|
|
|
if (conn->driver)
|
|
|
|
conn->driver->close (conn);
|
|
|
|
|
|
|
|
/* reacquire the connection lock since virReleaseConnect expects
|
|
|
|
* it to already be held
|
|
|
|
*/
|
|
|
|
virMutexLock(&conn->lock);
|
2008-11-04 23:22:06 +00:00
|
|
|
virReleaseConnect(conn);
|
|
|
|
/* Already unlocked mutex */
|
|
|
|
return (0);
|
|
|
|
}
|
2009-01-15 19:56:05 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
2008-11-04 23:22:06 +00:00
|
|
|
return (refs);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virGetDomain:
|
|
|
|
* @conn: the hypervisor connection
|
|
|
|
* @name: pointer to the domain name
|
|
|
|
* @uuid: pointer to the uuid
|
|
|
|
*
|
|
|
|
* Lookup if the domain is already registered for that connection,
|
|
|
|
* if yes return a new pointer to it, if no allocate a new structure,
|
|
|
|
* and register it in the table. In any case a corresponding call to
|
|
|
|
* virUnrefDomain() is needed to not leak data.
|
|
|
|
*
|
|
|
|
* Returns a pointer to the domain, or NULL in case of failure
|
|
|
|
*/
|
|
|
|
virDomainPtr
|
2008-11-17 11:03:25 +00:00
|
|
|
virGetDomain(virConnectPtr conn, const char *name, const unsigned char *uuid) {
|
2008-11-04 23:22:06 +00:00
|
|
|
virDomainPtr ret = NULL;
|
|
|
|
|
|
|
|
if ((!VIR_IS_CONNECT(conn)) || (name == NULL) || (uuid == NULL)) {
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2008-11-04 23:22:06 +00:00
|
|
|
return(NULL);
|
|
|
|
}
|
2009-01-15 19:56:05 +00:00
|
|
|
virMutexLock(&conn->lock);
|
2008-11-04 23:22:06 +00:00
|
|
|
|
|
|
|
/* TODO search by UUID first as they are better differenciators */
|
|
|
|
|
|
|
|
ret = (virDomainPtr) virHashLookup(conn->domains, name);
|
|
|
|
/* TODO check the UUID */
|
|
|
|
if (ret == NULL) {
|
|
|
|
if (VIR_ALLOC(ret) < 0) {
|
2009-07-22 17:22:41 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2008-11-04 23:22:06 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
ret->name = strdup(name);
|
|
|
|
if (ret->name == NULL) {
|
2009-07-22 17:22:41 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2008-11-04 23:22:06 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
ret->magic = VIR_DOMAIN_MAGIC;
|
|
|
|
ret->conn = conn;
|
|
|
|
ret->id = -1;
|
|
|
|
if (uuid != NULL)
|
|
|
|
memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN);
|
2010-03-31 20:33:13 +00:00
|
|
|
ret->snapshots = virHashCreate(20);
|
2008-11-04 23:22:06 +00:00
|
|
|
|
|
|
|
if (virHashAddEntry(conn->domains, name, ret) < 0) {
|
2009-07-22 17:22:41 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("failed to add domain to connection hash table"));
|
2008-11-04 23:22:06 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
conn->refs++;
|
|
|
|
DEBUG("New hash entry %p", ret);
|
|
|
|
} else {
|
|
|
|
DEBUG("Existing hash entry %p: refs now %d", ret, ret->refs+1);
|
|
|
|
}
|
|
|
|
ret->refs++;
|
2009-01-15 19:56:05 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
2008-11-04 23:22:06 +00:00
|
|
|
return(ret);
|
|
|
|
|
|
|
|
error:
|
|
|
|
if (ret != NULL) {
|
|
|
|
VIR_FREE(ret->name);
|
|
|
|
VIR_FREE(ret);
|
|
|
|
}
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virReleaseDomain:
|
|
|
|
* @domain: the domain to release
|
|
|
|
*
|
|
|
|
* Unconditionally release all memory associated with a domain.
|
|
|
|
* The conn.lock mutex must be held prior to calling this, and will
|
|
|
|
* be released prior to this returning. The domain obj must not
|
|
|
|
* be used once this method returns.
|
|
|
|
*
|
|
|
|
* It will also unreference the associated connection object,
|
|
|
|
* which may also be released if its ref count hits zero.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
virReleaseDomain(virDomainPtr domain) {
|
|
|
|
virConnectPtr conn = domain->conn;
|
|
|
|
DEBUG("release domain %p %s", domain, domain->name);
|
|
|
|
|
|
|
|
/* TODO search by UUID first as they are better differenciators */
|
2009-07-22 17:22:41 +00:00
|
|
|
if (virHashRemoveEntry(conn->domains, domain->name, NULL) < 0) {
|
|
|
|
virMutexUnlock(&conn->lock);
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("domain missing from connection hash table"));
|
2009-07-22 17:22:41 +00:00
|
|
|
conn = NULL;
|
|
|
|
}
|
2008-11-04 23:22:06 +00:00
|
|
|
|
|
|
|
domain->magic = -1;
|
|
|
|
domain->id = -1;
|
|
|
|
VIR_FREE(domain->name);
|
2010-03-31 20:33:13 +00:00
|
|
|
if (domain->snapshots != NULL)
|
|
|
|
virHashFree(domain->snapshots, (virHashDeallocator) virDomainSnapshotFreeName);
|
2008-11-04 23:22:06 +00:00
|
|
|
VIR_FREE(domain);
|
|
|
|
|
2009-07-22 17:22:41 +00:00
|
|
|
if (conn) {
|
|
|
|
DEBUG("unref connection %p %d", conn, conn->refs);
|
|
|
|
conn->refs--;
|
|
|
|
if (conn->refs == 0) {
|
|
|
|
virReleaseConnect(conn);
|
|
|
|
/* Already unlocked mutex */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
virMutexUnlock(&conn->lock);
|
2008-11-04 23:22:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virUnrefDomain:
|
|
|
|
* @domain: the domain to unreference
|
|
|
|
*
|
|
|
|
* Unreference the domain. If the use count drops to zero, the structure is
|
|
|
|
* actually freed.
|
|
|
|
*
|
|
|
|
* Returns the reference count or -1 in case of failure.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
virUnrefDomain(virDomainPtr domain) {
|
|
|
|
int refs;
|
|
|
|
|
|
|
|
if (!VIR_IS_CONNECTED_DOMAIN(domain)) {
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2008-11-04 23:22:06 +00:00
|
|
|
return(-1);
|
|
|
|
}
|
2009-01-15 19:56:05 +00:00
|
|
|
virMutexLock(&domain->conn->lock);
|
2008-11-04 23:22:06 +00:00
|
|
|
DEBUG("unref domain %p %s %d", domain, domain->name, domain->refs);
|
|
|
|
domain->refs--;
|
|
|
|
refs = domain->refs;
|
|
|
|
if (refs == 0) {
|
|
|
|
virReleaseDomain(domain);
|
|
|
|
/* Already unlocked mutex */
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
2009-01-15 19:56:05 +00:00
|
|
|
virMutexUnlock(&domain->conn->lock);
|
2008-11-04 23:22:06 +00:00
|
|
|
return (refs);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virGetNetwork:
|
|
|
|
* @conn: the hypervisor connection
|
|
|
|
* @name: pointer to the network name
|
|
|
|
* @uuid: pointer to the uuid
|
|
|
|
*
|
|
|
|
* Lookup if the network is already registered for that connection,
|
|
|
|
* if yes return a new pointer to it, if no allocate a new structure,
|
|
|
|
* and register it in the table. In any case a corresponding call to
|
|
|
|
* virUnrefNetwork() is needed to not leak data.
|
|
|
|
*
|
|
|
|
* Returns a pointer to the network, or NULL in case of failure
|
|
|
|
*/
|
|
|
|
virNetworkPtr
|
2008-11-17 11:03:25 +00:00
|
|
|
virGetNetwork(virConnectPtr conn, const char *name, const unsigned char *uuid) {
|
2008-11-04 23:22:06 +00:00
|
|
|
virNetworkPtr ret = NULL;
|
|
|
|
|
|
|
|
if ((!VIR_IS_CONNECT(conn)) || (name == NULL) || (uuid == NULL)) {
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2008-11-04 23:22:06 +00:00
|
|
|
return(NULL);
|
|
|
|
}
|
2009-01-15 19:56:05 +00:00
|
|
|
virMutexLock(&conn->lock);
|
2008-11-04 23:22:06 +00:00
|
|
|
|
|
|
|
/* TODO search by UUID first as they are better differenciators */
|
|
|
|
|
|
|
|
ret = (virNetworkPtr) virHashLookup(conn->networks, name);
|
|
|
|
/* TODO check the UUID */
|
|
|
|
if (ret == NULL) {
|
|
|
|
if (VIR_ALLOC(ret) < 0) {
|
2009-07-22 17:22:41 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2008-11-04 23:22:06 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
ret->name = strdup(name);
|
|
|
|
if (ret->name == NULL) {
|
2009-07-22 17:22:41 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2008-11-04 23:22:06 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
ret->magic = VIR_NETWORK_MAGIC;
|
|
|
|
ret->conn = conn;
|
|
|
|
if (uuid != NULL)
|
|
|
|
memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN);
|
|
|
|
|
|
|
|
if (virHashAddEntry(conn->networks, name, ret) < 0) {
|
2009-07-22 17:22:41 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("failed to add network to connection hash table"));
|
2008-11-04 23:22:06 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
conn->refs++;
|
|
|
|
}
|
|
|
|
ret->refs++;
|
2009-01-15 19:56:05 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
2008-11-04 23:22:06 +00:00
|
|
|
return(ret);
|
|
|
|
|
|
|
|
error:
|
|
|
|
if (ret != NULL) {
|
|
|
|
VIR_FREE(ret->name);
|
|
|
|
VIR_FREE(ret);
|
|
|
|
}
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virReleaseNetwork:
|
|
|
|
* @network: the network to release
|
|
|
|
*
|
|
|
|
* Unconditionally release all memory associated with a network.
|
|
|
|
* The conn.lock mutex must be held prior to calling this, and will
|
|
|
|
* be released prior to this returning. The network obj must not
|
|
|
|
* be used once this method returns.
|
|
|
|
*
|
|
|
|
* It will also unreference the associated connection object,
|
|
|
|
* which may also be released if its ref count hits zero.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
virReleaseNetwork(virNetworkPtr network) {
|
|
|
|
virConnectPtr conn = network->conn;
|
|
|
|
DEBUG("release network %p %s", network, network->name);
|
|
|
|
|
|
|
|
/* TODO search by UUID first as they are better differenciators */
|
2009-07-22 17:22:41 +00:00
|
|
|
if (virHashRemoveEntry(conn->networks, network->name, NULL) < 0) {
|
|
|
|
virMutexUnlock(&conn->lock);
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("network missing from connection hash table"));
|
2009-07-22 17:22:41 +00:00
|
|
|
conn = NULL;
|
|
|
|
}
|
2008-11-04 23:22:06 +00:00
|
|
|
|
|
|
|
network->magic = -1;
|
|
|
|
VIR_FREE(network->name);
|
|
|
|
VIR_FREE(network);
|
|
|
|
|
2009-07-22 17:22:41 +00:00
|
|
|
if (conn) {
|
|
|
|
DEBUG("unref connection %p %d", conn, conn->refs);
|
|
|
|
conn->refs--;
|
|
|
|
if (conn->refs == 0) {
|
|
|
|
virReleaseConnect(conn);
|
|
|
|
/* Already unlocked mutex */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
virMutexUnlock(&conn->lock);
|
2008-11-04 23:22:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virUnrefNetwork:
|
|
|
|
* @network: the network to unreference
|
|
|
|
*
|
|
|
|
* Unreference the network. If the use count drops to zero, the structure is
|
|
|
|
* actually freed.
|
|
|
|
*
|
|
|
|
* Returns the reference count or -1 in case of failure.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
virUnrefNetwork(virNetworkPtr network) {
|
|
|
|
int refs;
|
|
|
|
|
|
|
|
if (!VIR_IS_CONNECTED_NETWORK(network)) {
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2008-11-04 23:22:06 +00:00
|
|
|
return(-1);
|
|
|
|
}
|
2009-01-15 19:56:05 +00:00
|
|
|
virMutexLock(&network->conn->lock);
|
2008-11-04 23:22:06 +00:00
|
|
|
DEBUG("unref network %p %s %d", network, network->name, network->refs);
|
|
|
|
network->refs--;
|
|
|
|
refs = network->refs;
|
|
|
|
if (refs == 0) {
|
|
|
|
virReleaseNetwork(network);
|
|
|
|
/* Already unlocked mutex */
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
2009-01-15 19:56:05 +00:00
|
|
|
virMutexUnlock(&network->conn->lock);
|
2008-11-04 23:22:06 +00:00
|
|
|
return (refs);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-05-20 14:26:49 +00:00
|
|
|
/**
|
|
|
|
* virGetInterface:
|
|
|
|
* @conn: the hypervisor connection
|
|
|
|
* @name: pointer to the interface name
|
|
|
|
* @mac: pointer to the mac
|
|
|
|
*
|
|
|
|
* Lookup if the interface is already registered for that connection,
|
2009-07-21 13:37:20 +00:00
|
|
|
* if yes return a new pointer to it (possibly updating the MAC
|
|
|
|
* address), if no allocate a new structure, and register it in the
|
|
|
|
* table. In any case a corresponding call to virUnrefInterface() is
|
|
|
|
* needed to not leak data.
|
2009-05-20 14:26:49 +00:00
|
|
|
*
|
|
|
|
* Returns a pointer to the interface, or NULL in case of failure
|
|
|
|
*/
|
|
|
|
virInterfacePtr
|
|
|
|
virGetInterface(virConnectPtr conn, const char *name, const char *mac) {
|
|
|
|
virInterfacePtr ret = NULL;
|
|
|
|
|
2009-11-03 15:42:53 +00:00
|
|
|
if ((!VIR_IS_CONNECT(conn)) || (name == NULL)) {
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2009-05-20 14:26:49 +00:00
|
|
|
return(NULL);
|
|
|
|
}
|
2009-11-03 15:42:53 +00:00
|
|
|
|
|
|
|
/* a NULL mac from caller is okay. Treat it as blank */
|
|
|
|
if (mac == NULL)
|
|
|
|
mac = "";
|
|
|
|
|
2009-05-20 14:26:49 +00:00
|
|
|
virMutexLock(&conn->lock);
|
|
|
|
|
|
|
|
ret = (virInterfacePtr) virHashLookup(conn->interfaces, name);
|
2009-07-21 13:37:20 +00:00
|
|
|
|
2009-07-22 14:07:26 +00:00
|
|
|
if (ret != NULL) {
|
|
|
|
if (STRCASENEQ(ret->mac, mac)) {
|
|
|
|
/*
|
|
|
|
* If the mac address has changed, try to modify it in
|
|
|
|
* place, which will only work if the new mac is the
|
|
|
|
* same length as, or shorter than, the old mac.
|
|
|
|
*/
|
|
|
|
size_t newmaclen = strlen(mac);
|
|
|
|
size_t oldmaclen = strlen(ret->mac);
|
|
|
|
if (newmaclen <= oldmaclen) {
|
|
|
|
strcpy(ret->mac, mac);
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* If it's longer, we're kind of screwed, because we
|
|
|
|
* can't add a new hashtable entry (it would clash
|
|
|
|
* with the existing entry of same name), and we can't
|
|
|
|
* free/re-alloc the existing entry's mac, as some
|
|
|
|
* other thread may already be using the existing mac
|
|
|
|
* pointer. Fortunately, this should never happen,
|
|
|
|
* since the length of the mac address for any
|
|
|
|
* interface is determined by the type of the
|
|
|
|
* interface, and that is unlikely to change.
|
|
|
|
*/
|
|
|
|
virMutexUnlock(&conn->lock);
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INTERNAL_ERROR,
|
|
|
|
_("Failed to change interface mac address "
|
|
|
|
"from %s to %s due to differing lengths."),
|
2009-07-22 14:07:26 +00:00
|
|
|
ret->mac, mac);
|
|
|
|
ret = NULL;
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
2009-05-20 14:26:49 +00:00
|
|
|
if (VIR_ALLOC(ret) < 0) {
|
2009-07-22 14:15:52 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2009-05-20 14:26:49 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
ret->name = strdup(name);
|
|
|
|
if (ret->name == NULL) {
|
2009-07-22 14:15:52 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2009-05-20 14:26:49 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
ret->mac = strdup(mac);
|
|
|
|
if (ret->mac == NULL) {
|
2009-07-22 14:15:52 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2009-05-20 14:26:49 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret->magic = VIR_INTERFACE_MAGIC;
|
|
|
|
ret->conn = conn;
|
|
|
|
|
|
|
|
if (virHashAddEntry(conn->interfaces, name, ret) < 0) {
|
2009-07-22 14:15:52 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("failed to add interface to connection hash table"));
|
2009-05-20 14:26:49 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
conn->refs++;
|
|
|
|
}
|
|
|
|
ret->refs++;
|
|
|
|
virMutexUnlock(&conn->lock);
|
|
|
|
return(ret);
|
|
|
|
|
|
|
|
error:
|
|
|
|
if (ret != NULL) {
|
|
|
|
VIR_FREE(ret->name);
|
|
|
|
VIR_FREE(ret->mac);
|
|
|
|
VIR_FREE(ret);
|
|
|
|
}
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virReleaseInterface:
|
|
|
|
* @interface: the interface to release
|
|
|
|
*
|
2009-10-26 23:02:46 +00:00
|
|
|
* Unconditionally release all memory associated with an interface.
|
2009-05-20 14:26:49 +00:00
|
|
|
* The conn.lock mutex must be held prior to calling this, and will
|
|
|
|
* be released prior to this returning. The interface obj must not
|
|
|
|
* be used once this method returns.
|
|
|
|
*
|
|
|
|
* It will also unreference the associated connection object,
|
|
|
|
* which may also be released if its ref count hits zero.
|
|
|
|
*/
|
|
|
|
static void
|
2009-05-29 14:29:22 +00:00
|
|
|
virReleaseInterface(virInterfacePtr iface) {
|
|
|
|
virConnectPtr conn = iface->conn;
|
|
|
|
DEBUG("release interface %p %s", iface, iface->name);
|
2009-05-20 14:26:49 +00:00
|
|
|
|
2009-07-22 14:15:52 +00:00
|
|
|
if (virHashRemoveEntry(conn->interfaces, iface->name, NULL) < 0) {
|
|
|
|
/* unlock before reporting error because error report grabs lock */
|
|
|
|
virMutexUnlock(&conn->lock);
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("interface missing from connection hash table"));
|
2009-07-22 14:15:52 +00:00
|
|
|
/* don't decr the conn refct if we weren't connected to it */
|
|
|
|
conn = NULL;
|
|
|
|
}
|
2009-05-20 14:26:49 +00:00
|
|
|
|
2009-05-29 14:29:22 +00:00
|
|
|
iface->magic = -1;
|
|
|
|
VIR_FREE(iface->name);
|
|
|
|
VIR_FREE(iface->mac);
|
|
|
|
VIR_FREE(iface);
|
2009-05-20 14:26:49 +00:00
|
|
|
|
2009-07-22 14:15:52 +00:00
|
|
|
if (conn) {
|
|
|
|
DEBUG("unref connection %p %d", conn, conn->refs);
|
|
|
|
conn->refs--;
|
|
|
|
if (conn->refs == 0) {
|
|
|
|
virReleaseConnect(conn);
|
|
|
|
/* Already unlocked mutex */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
virMutexUnlock(&conn->lock);
|
2009-05-20 14:26:49 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virUnrefInterface:
|
|
|
|
* @interface: the interface to unreference
|
|
|
|
*
|
|
|
|
* Unreference the interface. If the use count drops to zero, the structure is
|
|
|
|
* actually freed.
|
|
|
|
*
|
|
|
|
* Returns the reference count or -1 in case of failure.
|
|
|
|
*/
|
|
|
|
int
|
2009-05-29 14:29:22 +00:00
|
|
|
virUnrefInterface(virInterfacePtr iface) {
|
2009-05-20 14:26:49 +00:00
|
|
|
int refs;
|
|
|
|
|
2009-05-29 14:29:22 +00:00
|
|
|
if (!VIR_IS_CONNECTED_INTERFACE(iface)) {
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2009-05-20 14:26:49 +00:00
|
|
|
return(-1);
|
|
|
|
}
|
2009-05-29 14:29:22 +00:00
|
|
|
virMutexLock(&iface->conn->lock);
|
|
|
|
DEBUG("unref interface %p %s %d", iface, iface->name, iface->refs);
|
|
|
|
iface->refs--;
|
|
|
|
refs = iface->refs;
|
2009-05-20 14:26:49 +00:00
|
|
|
if (refs == 0) {
|
2009-05-29 14:29:22 +00:00
|
|
|
virReleaseInterface(iface);
|
2009-05-20 14:26:49 +00:00
|
|
|
/* Already unlocked mutex */
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
2009-05-29 14:29:22 +00:00
|
|
|
virMutexUnlock(&iface->conn->lock);
|
2009-05-20 14:26:49 +00:00
|
|
|
return (refs);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-11-04 23:22:06 +00:00
|
|
|
/**
|
|
|
|
* virGetStoragePool:
|
|
|
|
* @conn: the hypervisor connection
|
|
|
|
* @name: pointer to the storage pool name
|
|
|
|
* @uuid: pointer to the uuid
|
|
|
|
*
|
|
|
|
* Lookup if the storage pool is already registered for that connection,
|
|
|
|
* if yes return a new pointer to it, if no allocate a new structure,
|
|
|
|
* and register it in the table. In any case a corresponding call to
|
|
|
|
* virFreeStoragePool() is needed to not leak data.
|
|
|
|
*
|
|
|
|
* Returns a pointer to the network, or NULL in case of failure
|
|
|
|
*/
|
|
|
|
virStoragePoolPtr
|
2008-11-17 11:03:25 +00:00
|
|
|
virGetStoragePool(virConnectPtr conn, const char *name, const unsigned char *uuid) {
|
2008-11-04 23:22:06 +00:00
|
|
|
virStoragePoolPtr ret = NULL;
|
|
|
|
|
|
|
|
if ((!VIR_IS_CONNECT(conn)) || (name == NULL) || (uuid == NULL)) {
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2008-11-04 23:22:06 +00:00
|
|
|
return(NULL);
|
|
|
|
}
|
2009-01-15 19:56:05 +00:00
|
|
|
virMutexLock(&conn->lock);
|
2008-11-04 23:22:06 +00:00
|
|
|
|
|
|
|
/* TODO search by UUID first as they are better differenciators */
|
|
|
|
|
|
|
|
ret = (virStoragePoolPtr) virHashLookup(conn->storagePools, name);
|
|
|
|
/* TODO check the UUID */
|
|
|
|
if (ret == NULL) {
|
|
|
|
if (VIR_ALLOC(ret) < 0) {
|
2009-07-22 17:22:41 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2008-11-04 23:22:06 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
ret->name = strdup(name);
|
|
|
|
if (ret->name == NULL) {
|
2009-07-22 17:22:41 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2008-11-04 23:22:06 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
ret->magic = VIR_STORAGE_POOL_MAGIC;
|
|
|
|
ret->conn = conn;
|
|
|
|
if (uuid != NULL)
|
|
|
|
memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN);
|
|
|
|
|
|
|
|
if (virHashAddEntry(conn->storagePools, name, ret) < 0) {
|
2009-07-22 17:22:41 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INTERNAL_ERROR,
|
2009-07-23 16:27:47 +00:00
|
|
|
"%s", _("failed to add storage pool to connection hash table"));
|
2008-11-04 23:22:06 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
conn->refs++;
|
|
|
|
}
|
|
|
|
ret->refs++;
|
2009-01-15 19:56:05 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
2008-11-04 23:22:06 +00:00
|
|
|
return(ret);
|
|
|
|
|
|
|
|
error:
|
|
|
|
if (ret != NULL) {
|
|
|
|
VIR_FREE(ret->name);
|
|
|
|
VIR_FREE(ret);
|
|
|
|
}
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virReleaseStoragePool:
|
|
|
|
* @pool: the pool to release
|
|
|
|
*
|
|
|
|
* Unconditionally release all memory associated with a pool.
|
|
|
|
* The conn.lock mutex must be held prior to calling this, and will
|
|
|
|
* be released prior to this returning. The pool obj must not
|
|
|
|
* be used once this method returns.
|
|
|
|
*
|
|
|
|
* It will also unreference the associated connection object,
|
|
|
|
* which may also be released if its ref count hits zero.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
virReleaseStoragePool(virStoragePoolPtr pool) {
|
|
|
|
virConnectPtr conn = pool->conn;
|
|
|
|
DEBUG("release pool %p %s", pool, pool->name);
|
|
|
|
|
|
|
|
/* TODO search by UUID first as they are better differenciators */
|
2009-07-22 17:22:41 +00:00
|
|
|
if (virHashRemoveEntry(conn->storagePools, pool->name, NULL) < 0) {
|
|
|
|
virMutexUnlock(&conn->lock);
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("pool missing from connection hash table"));
|
2009-07-22 17:22:41 +00:00
|
|
|
conn = NULL;
|
|
|
|
}
|
2008-11-04 23:22:06 +00:00
|
|
|
|
|
|
|
pool->magic = -1;
|
|
|
|
VIR_FREE(pool->name);
|
|
|
|
VIR_FREE(pool);
|
|
|
|
|
2009-07-22 17:22:41 +00:00
|
|
|
if (conn) {
|
|
|
|
DEBUG("unref connection %p %d", conn, conn->refs);
|
|
|
|
conn->refs--;
|
|
|
|
if (conn->refs == 0) {
|
|
|
|
virReleaseConnect(conn);
|
|
|
|
/* Already unlocked mutex */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
virMutexUnlock(&conn->lock);
|
2008-11-04 23:22:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virUnrefStoragePool:
|
|
|
|
* @pool: the pool to unreference
|
|
|
|
*
|
|
|
|
* Unreference the pool. If the use count drops to zero, the structure is
|
|
|
|
* actually freed.
|
|
|
|
*
|
|
|
|
* Returns the reference count or -1 in case of failure.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
virUnrefStoragePool(virStoragePoolPtr pool) {
|
|
|
|
int refs;
|
|
|
|
|
|
|
|
if (!VIR_IS_CONNECTED_STORAGE_POOL(pool)) {
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2008-11-04 23:22:06 +00:00
|
|
|
return(-1);
|
|
|
|
}
|
2009-01-15 19:56:05 +00:00
|
|
|
virMutexLock(&pool->conn->lock);
|
2008-11-04 23:22:06 +00:00
|
|
|
DEBUG("unref pool %p %s %d", pool, pool->name, pool->refs);
|
|
|
|
pool->refs--;
|
|
|
|
refs = pool->refs;
|
|
|
|
if (refs == 0) {
|
|
|
|
virReleaseStoragePool(pool);
|
|
|
|
/* Already unlocked mutex */
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
2009-01-15 19:56:05 +00:00
|
|
|
virMutexUnlock(&pool->conn->lock);
|
2008-11-04 23:22:06 +00:00
|
|
|
return (refs);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virGetStorageVol:
|
|
|
|
* @conn: the hypervisor connection
|
|
|
|
* @pool: pool owning the volume
|
|
|
|
* @name: pointer to the storage vol name
|
|
|
|
* @uuid: pointer to the uuid
|
|
|
|
*
|
|
|
|
* Lookup if the storage vol is already registered for that connection,
|
|
|
|
* if yes return a new pointer to it, if no allocate a new structure,
|
|
|
|
* and register it in the table. In any case a corresponding call to
|
|
|
|
* virFreeStorageVol() is needed to not leak data.
|
|
|
|
*
|
|
|
|
* Returns a pointer to the storage vol, or NULL in case of failure
|
|
|
|
*/
|
|
|
|
virStorageVolPtr
|
2008-11-17 11:03:25 +00:00
|
|
|
virGetStorageVol(virConnectPtr conn, const char *pool, const char *name, const char *key) {
|
2008-11-04 23:22:06 +00:00
|
|
|
virStorageVolPtr ret = NULL;
|
|
|
|
|
|
|
|
if ((!VIR_IS_CONNECT(conn)) || (name == NULL) || (key == NULL)) {
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2008-11-04 23:22:06 +00:00
|
|
|
return(NULL);
|
|
|
|
}
|
2009-01-15 19:56:05 +00:00
|
|
|
virMutexLock(&conn->lock);
|
2008-11-04 23:22:06 +00:00
|
|
|
|
|
|
|
ret = (virStorageVolPtr) virHashLookup(conn->storageVols, key);
|
|
|
|
if (ret == NULL) {
|
|
|
|
if (VIR_ALLOC(ret) < 0) {
|
2009-07-22 17:22:41 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2008-11-04 23:22:06 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
ret->pool = strdup(pool);
|
|
|
|
if (ret->pool == NULL) {
|
2009-07-22 17:22:41 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2008-11-04 23:22:06 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
ret->name = strdup(name);
|
|
|
|
if (ret->name == NULL) {
|
2009-07-22 17:22:41 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2008-11-04 23:22:06 +00:00
|
|
|
goto error;
|
|
|
|
}
|
2009-08-03 12:37:44 +00:00
|
|
|
if (virStrcpyStatic(ret->key, key) == NULL) {
|
|
|
|
virMutexUnlock(&conn->lock);
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INTERNAL_ERROR,
|
2009-08-03 12:37:44 +00:00
|
|
|
_("Volume key %s too large for destination"), key);
|
|
|
|
goto error;
|
|
|
|
}
|
2008-11-04 23:22:06 +00:00
|
|
|
ret->magic = VIR_STORAGE_VOL_MAGIC;
|
|
|
|
ret->conn = conn;
|
|
|
|
|
|
|
|
if (virHashAddEntry(conn->storageVols, key, ret) < 0) {
|
2009-07-22 17:22:41 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("failed to add storage vol to connection hash table"));
|
2008-11-04 23:22:06 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
conn->refs++;
|
|
|
|
}
|
|
|
|
ret->refs++;
|
2009-01-15 19:56:05 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
2008-11-04 23:22:06 +00:00
|
|
|
return(ret);
|
|
|
|
|
|
|
|
error:
|
|
|
|
if (ret != NULL) {
|
|
|
|
VIR_FREE(ret->name);
|
|
|
|
VIR_FREE(ret->pool);
|
|
|
|
VIR_FREE(ret);
|
|
|
|
}
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virReleaseStorageVol:
|
|
|
|
* @vol: the vol to release
|
|
|
|
*
|
|
|
|
* Unconditionally release all memory associated with a vol.
|
|
|
|
* The conn.lock mutex must be held prior to calling this, and will
|
|
|
|
* be released prior to this returning. The vol obj must not
|
|
|
|
* be used once this method returns.
|
|
|
|
*
|
|
|
|
* It will also unreference the associated connection object,
|
|
|
|
* which may also be released if its ref count hits zero.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
virReleaseStorageVol(virStorageVolPtr vol) {
|
|
|
|
virConnectPtr conn = vol->conn;
|
|
|
|
DEBUG("release vol %p %s", vol, vol->name);
|
|
|
|
|
|
|
|
/* TODO search by UUID first as they are better differenciators */
|
2009-07-22 17:22:41 +00:00
|
|
|
if (virHashRemoveEntry(conn->storageVols, vol->key, NULL) < 0) {
|
|
|
|
virMutexUnlock(&conn->lock);
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("vol missing from connection hash table"));
|
2009-07-22 17:22:41 +00:00
|
|
|
conn = NULL;
|
|
|
|
}
|
2008-11-04 23:22:06 +00:00
|
|
|
|
|
|
|
vol->magic = -1;
|
|
|
|
VIR_FREE(vol->name);
|
|
|
|
VIR_FREE(vol->pool);
|
|
|
|
VIR_FREE(vol);
|
|
|
|
|
2009-07-22 17:22:41 +00:00
|
|
|
if (conn) {
|
|
|
|
DEBUG("unref connection %p %d", conn, conn->refs);
|
|
|
|
conn->refs--;
|
|
|
|
if (conn->refs == 0) {
|
|
|
|
virReleaseConnect(conn);
|
|
|
|
/* Already unlocked mutex */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
virMutexUnlock(&conn->lock);
|
2008-11-04 23:22:06 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virUnrefStorageVol:
|
|
|
|
* @vol: the vol to unreference
|
|
|
|
*
|
|
|
|
* Unreference the vol. If the use count drops to zero, the structure is
|
|
|
|
* actually freed.
|
|
|
|
*
|
|
|
|
* Returns the reference count or -1 in case of failure.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
virUnrefStorageVol(virStorageVolPtr vol) {
|
|
|
|
int refs;
|
|
|
|
|
|
|
|
if (!VIR_IS_CONNECTED_STORAGE_VOL(vol)) {
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2008-11-04 23:22:06 +00:00
|
|
|
return(-1);
|
|
|
|
}
|
2009-01-15 19:56:05 +00:00
|
|
|
virMutexLock(&vol->conn->lock);
|
2008-11-04 23:22:06 +00:00
|
|
|
DEBUG("unref vol %p %s %d", vol, vol->name, vol->refs);
|
|
|
|
vol->refs--;
|
|
|
|
refs = vol->refs;
|
|
|
|
if (refs == 0) {
|
|
|
|
virReleaseStorageVol(vol);
|
|
|
|
/* Already unlocked mutex */
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
2009-01-15 19:56:05 +00:00
|
|
|
virMutexUnlock(&vol->conn->lock);
|
2008-11-04 23:22:06 +00:00
|
|
|
return (refs);
|
|
|
|
}
|
2008-11-21 12:19:22 +00:00
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virGetNodeDevice:
|
|
|
|
* @conn: the hypervisor connection
|
|
|
|
* @name: device name (unique on node)
|
|
|
|
*
|
|
|
|
* Lookup if the device is already registered for that connection,
|
|
|
|
* if yes return a new pointer to it, if no allocate a new structure,
|
|
|
|
* and register it in the table. In any case a corresponding call to
|
|
|
|
* virFreeNodeDevice() is needed to not leak data.
|
|
|
|
*
|
|
|
|
* Returns a pointer to the node device, or NULL in case of failure
|
|
|
|
*/
|
|
|
|
virNodeDevicePtr
|
|
|
|
virGetNodeDevice(virConnectPtr conn, const char *name)
|
|
|
|
{
|
|
|
|
virNodeDevicePtr ret = NULL;
|
|
|
|
|
|
|
|
if ((!VIR_IS_CONNECT(conn)) || (name == NULL)) {
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2008-11-21 12:19:22 +00:00
|
|
|
return(NULL);
|
|
|
|
}
|
2009-01-15 19:56:05 +00:00
|
|
|
virMutexLock(&conn->lock);
|
2008-11-21 12:19:22 +00:00
|
|
|
|
|
|
|
ret = (virNodeDevicePtr) virHashLookup(conn->nodeDevices, name);
|
|
|
|
if (ret == NULL) {
|
2009-07-22 17:22:41 +00:00
|
|
|
if (VIR_ALLOC(ret) < 0) {
|
|
|
|
virMutexUnlock(&conn->lock);
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2008-11-21 12:19:22 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
ret->magic = VIR_NODE_DEVICE_MAGIC;
|
|
|
|
ret->conn = conn;
|
|
|
|
ret->name = strdup(name);
|
|
|
|
if (ret->name == NULL) {
|
2009-07-22 17:22:41 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2008-11-21 12:19:22 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (virHashAddEntry(conn->nodeDevices, name, ret) < 0) {
|
2009-07-22 17:22:41 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INTERNAL_ERROR,
|
2009-07-23 16:27:47 +00:00
|
|
|
"%s", _("failed to add node dev to conn hash table"));
|
2008-11-21 12:19:22 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
conn->refs++;
|
|
|
|
}
|
|
|
|
ret->refs++;
|
2009-01-15 19:56:05 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
2008-11-21 12:19:22 +00:00
|
|
|
return(ret);
|
|
|
|
|
|
|
|
error:
|
|
|
|
if (ret != NULL) {
|
|
|
|
VIR_FREE(ret->name);
|
|
|
|
VIR_FREE(ret);
|
|
|
|
}
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virReleaseNodeDevice:
|
|
|
|
* @dev: the dev to release
|
|
|
|
*
|
|
|
|
* Unconditionally release all memory associated with a dev.
|
|
|
|
* The conn.lock mutex must be held prior to calling this, and will
|
|
|
|
* be released prior to this returning. The dev obj must not
|
|
|
|
* be used once this method returns.
|
|
|
|
*
|
|
|
|
* It will also unreference the associated connection object,
|
|
|
|
* which may also be released if its ref count hits zero.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
virReleaseNodeDevice(virNodeDevicePtr dev) {
|
|
|
|
virConnectPtr conn = dev->conn;
|
|
|
|
DEBUG("release dev %p %s", dev, dev->name);
|
|
|
|
|
2009-07-22 17:22:41 +00:00
|
|
|
if (virHashRemoveEntry(conn->nodeDevices, dev->name, NULL) < 0) {
|
|
|
|
virMutexUnlock(&conn->lock);
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INTERNAL_ERROR,
|
2009-07-23 16:27:47 +00:00
|
|
|
"%s", _("dev missing from connection hash table"));
|
2009-07-22 17:22:41 +00:00
|
|
|
conn = NULL;
|
|
|
|
}
|
2008-11-21 12:19:22 +00:00
|
|
|
|
|
|
|
dev->magic = -1;
|
|
|
|
VIR_FREE(dev->name);
|
2008-12-04 21:46:34 +00:00
|
|
|
VIR_FREE(dev->parent);
|
2008-11-21 12:19:22 +00:00
|
|
|
VIR_FREE(dev);
|
|
|
|
|
2009-07-22 17:22:41 +00:00
|
|
|
if (conn) {
|
|
|
|
DEBUG("unref connection %p %d", conn, conn->refs);
|
|
|
|
conn->refs--;
|
|
|
|
if (conn->refs == 0) {
|
|
|
|
virReleaseConnect(conn);
|
|
|
|
/* Already unlocked mutex */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
virMutexUnlock(&conn->lock);
|
2008-11-21 12:19:22 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virUnrefNodeDevice:
|
|
|
|
* @dev: the dev to unreference
|
|
|
|
*
|
|
|
|
* Unreference the dev. If the use count drops to zero, the structure is
|
|
|
|
* actually freed.
|
|
|
|
*
|
|
|
|
* Returns the reference count or -1 in case of failure.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
virUnrefNodeDevice(virNodeDevicePtr dev) {
|
|
|
|
int refs;
|
|
|
|
|
2009-01-15 19:56:05 +00:00
|
|
|
virMutexLock(&dev->conn->lock);
|
2008-11-21 12:19:22 +00:00
|
|
|
DEBUG("unref dev %p %s %d", dev, dev->name, dev->refs);
|
|
|
|
dev->refs--;
|
|
|
|
refs = dev->refs;
|
|
|
|
if (refs == 0) {
|
|
|
|
virReleaseNodeDevice(dev);
|
|
|
|
/* Already unlocked mutex */
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
2009-01-15 19:56:05 +00:00
|
|
|
virMutexUnlock(&dev->conn->lock);
|
2008-11-21 12:19:22 +00:00
|
|
|
return (refs);
|
|
|
|
}
|
2009-08-14 19:42:19 +00:00
|
|
|
|
2009-07-10 11:18:12 +00:00
|
|
|
|
2009-08-14 19:42:19 +00:00
|
|
|
/**
|
|
|
|
* virGetSecret:
|
|
|
|
* @conn: the hypervisor connection
|
|
|
|
* @uuid: secret UUID
|
|
|
|
*
|
|
|
|
* Lookup if the secret is already registered for that connection, if so return
|
|
|
|
* a pointer to it, otherwise allocate a new structure, and register it in the
|
|
|
|
* table. In any case a corresponding call to virFreeSecret() is needed to not
|
|
|
|
* leak data.
|
|
|
|
*
|
|
|
|
* Returns a pointer to the secret, or NULL in case of failure
|
|
|
|
*/
|
|
|
|
virSecretPtr
|
Add usage type/id as a public API property of virSecret
* include/libvirt/libvirt.h, include/libvirt/libvirt.h.in: Add
virSecretGetUsageType, virSecretGetUsageID and virLookupSecretByUsage
* python/generator.py: Mark virSecretGetUsageType, virSecretGetUsageID
as not throwing exceptions
* qemud/remote.c: Implement dispatch for virLookupSecretByUsage
* qemud/remote_protocol.x: Add usage type & ID as attributes of
remote_nonnull_secret. Add RPC calls for new public APIs
* qemud/remote_dispatch_args.h, qemud/remote_dispatch_prototypes.h,
qemud/remote_dispatch_ret.h, qemud/remote_dispatch_table.h,
qemud/remote_protocol.c, qemud/remote_protocol.h: Re-generate
* src/datatypes.c, src/datatypes.h: Add usageType and usageID as
properties of virSecretPtr
* src/driver.h: Add virLookupSecretByUsage driver entry point
* src/libvirt.c: Implement virSecretGetUsageType, virSecretGetUsageID
and virLookupSecretByUsage
* src/libvirt_public.syms: Export virSecretGetUsageType, virSecretGetUsageID
and virLookupSecretByUsage
* src/remote_internal.c: Implement virLookupSecretByUsage entry
* src/secret_conf.c, src/secret_conf.h: Remove the
virSecretUsageType enum, now in public API. Make volume
path mandatory when parsing XML
* src/secret_driver.c: Enforce usage uniqueness when defining secrets.
Implement virSecretLookupByUsage api method
* src/virsh.c: Include usage for secret-list command
2009-09-11 13:06:15 +00:00
|
|
|
virGetSecret(virConnectPtr conn, const unsigned char *uuid,
|
|
|
|
int usageType, const char *usageID)
|
2009-08-14 19:42:19 +00:00
|
|
|
{
|
|
|
|
virSecretPtr ret = NULL;
|
Fix UUID handling in secrets/storage encryption APIs
Convert all the secret/storage encryption APIs / wire format to
handle UUIDs in raw format instead of non-canonical printable
format. Guarentees data format correctness.
* docs/schemas/storageencryption.rng: Make UUID mandatory for a secret
and validate fully
* docs/schemas/secret.rng: Fully validate UUID
* include/libvirt/libvirt.h, include/libvirt/libvirt.h.in, Add
virSecretLookupByUUID and virSecretGetUUID. Make
virSecretGetUUIDString follow normal API design pattern
* python/generator.py: Skip generation of virSecretGetUUID,
virSecretGetUUIDString and virSecretLookupByUUID
* python/libvir.c, python/libvirt-python-api.xml: Manual impl
of virSecretGetUUID,virSecretGetUUIDString and virSecretLookupByUUID
* qemud/remote.c: s/virSecretLookupByUUIDString/virSecretLookupByUUID/
Fix get_nonnull_secret/make_nonnull_secret to use unsigned char
* qemud/remote_protocol.x: Fix remote_nonnull_secret to use a
remote_uuid instead of remote_nonnull_string for UUID field.
Rename REMOTE_PROC_SECRET_LOOKUP_BY_UUID_STRING to
REMOTE_PROC_SECRET_LOOKUP_BY_UUID_STRING and make it take an
remote_uuid value
* qemud/remote_dispatch_args.h, qemud/remote_dispatch_prototypes.h,
qemud/remote_dispatch_ret.h, qemud/remote_dispatch_table.h,
qemud/remote_protocol.c, qemud/remote_protocol.h: Re-generate
* src/datatypes.h, src/datatypes.c: Store UUID in raw format instead
of printable. Change virGetSecret to use raw format UUID
* src/driver.h: Rename virDrvSecretLookupByUUIDString to
virDrvSecretLookupByUUID and use raw format UUID
* src/libvirt.c: Add virSecretLookupByUUID and virSecretGetUUID
and re-implement virSecretLookupByUUIDString and
virSecretGetUUIDString in terms of those
* src/libvirt_public.syms: Add virSecretLookupByUUID and
virSecretGetUUID
* src/remote_internal.c: Rename remoteSecretLookupByUUIDString
to remoteSecretLookupByUUID. Fix typo in args for
remoteSecretDefineXML impl. Use raw UUID format for
get_nonnull_secret and make_nonnull_secret
* src/storage_encryption_conf.c, src/storage_encryption_conf.h:
Storage UUID in raw format, and require it to be present in
XML. Use UUID parser to validate.
* secret_conf.h, secret_conf.c: Generate a UUID if none is provided.
Storage UUID in raw format.
* src/secret_driver.c: Adjust to deal with raw UUIDs. Save secrets
in a filed with printable UUID, instead of base64 UUID.
* src/virsh.c: Adjust for changed public API contract of
virSecretGetUUIDString.
* src/storage_Backend.c: DOn't undefine secret we just generated
upon successful volume creation. Fix to handle raw UUIDs. Generate
a non-clashing UUID
* src/qemu_driver.c: Change to use lookupByUUID instead of
lookupByUUIDString
2009-09-10 16:44:12 +00:00
|
|
|
char uuidstr[VIR_UUID_STRING_BUFLEN];
|
2009-08-14 19:42:19 +00:00
|
|
|
|
Add usage type/id as a public API property of virSecret
* include/libvirt/libvirt.h, include/libvirt/libvirt.h.in: Add
virSecretGetUsageType, virSecretGetUsageID and virLookupSecretByUsage
* python/generator.py: Mark virSecretGetUsageType, virSecretGetUsageID
as not throwing exceptions
* qemud/remote.c: Implement dispatch for virLookupSecretByUsage
* qemud/remote_protocol.x: Add usage type & ID as attributes of
remote_nonnull_secret. Add RPC calls for new public APIs
* qemud/remote_dispatch_args.h, qemud/remote_dispatch_prototypes.h,
qemud/remote_dispatch_ret.h, qemud/remote_dispatch_table.h,
qemud/remote_protocol.c, qemud/remote_protocol.h: Re-generate
* src/datatypes.c, src/datatypes.h: Add usageType and usageID as
properties of virSecretPtr
* src/driver.h: Add virLookupSecretByUsage driver entry point
* src/libvirt.c: Implement virSecretGetUsageType, virSecretGetUsageID
and virLookupSecretByUsage
* src/libvirt_public.syms: Export virSecretGetUsageType, virSecretGetUsageID
and virLookupSecretByUsage
* src/remote_internal.c: Implement virLookupSecretByUsage entry
* src/secret_conf.c, src/secret_conf.h: Remove the
virSecretUsageType enum, now in public API. Make volume
path mandatory when parsing XML
* src/secret_driver.c: Enforce usage uniqueness when defining secrets.
Implement virSecretLookupByUsage api method
* src/virsh.c: Include usage for secret-list command
2009-09-11 13:06:15 +00:00
|
|
|
if (!VIR_IS_CONNECT(conn) || uuid == NULL || usageID == NULL) {
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2009-08-14 19:42:19 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
virMutexLock(&conn->lock);
|
|
|
|
|
Fix UUID handling in secrets/storage encryption APIs
Convert all the secret/storage encryption APIs / wire format to
handle UUIDs in raw format instead of non-canonical printable
format. Guarentees data format correctness.
* docs/schemas/storageencryption.rng: Make UUID mandatory for a secret
and validate fully
* docs/schemas/secret.rng: Fully validate UUID
* include/libvirt/libvirt.h, include/libvirt/libvirt.h.in, Add
virSecretLookupByUUID and virSecretGetUUID. Make
virSecretGetUUIDString follow normal API design pattern
* python/generator.py: Skip generation of virSecretGetUUID,
virSecretGetUUIDString and virSecretLookupByUUID
* python/libvir.c, python/libvirt-python-api.xml: Manual impl
of virSecretGetUUID,virSecretGetUUIDString and virSecretLookupByUUID
* qemud/remote.c: s/virSecretLookupByUUIDString/virSecretLookupByUUID/
Fix get_nonnull_secret/make_nonnull_secret to use unsigned char
* qemud/remote_protocol.x: Fix remote_nonnull_secret to use a
remote_uuid instead of remote_nonnull_string for UUID field.
Rename REMOTE_PROC_SECRET_LOOKUP_BY_UUID_STRING to
REMOTE_PROC_SECRET_LOOKUP_BY_UUID_STRING and make it take an
remote_uuid value
* qemud/remote_dispatch_args.h, qemud/remote_dispatch_prototypes.h,
qemud/remote_dispatch_ret.h, qemud/remote_dispatch_table.h,
qemud/remote_protocol.c, qemud/remote_protocol.h: Re-generate
* src/datatypes.h, src/datatypes.c: Store UUID in raw format instead
of printable. Change virGetSecret to use raw format UUID
* src/driver.h: Rename virDrvSecretLookupByUUIDString to
virDrvSecretLookupByUUID and use raw format UUID
* src/libvirt.c: Add virSecretLookupByUUID and virSecretGetUUID
and re-implement virSecretLookupByUUIDString and
virSecretGetUUIDString in terms of those
* src/libvirt_public.syms: Add virSecretLookupByUUID and
virSecretGetUUID
* src/remote_internal.c: Rename remoteSecretLookupByUUIDString
to remoteSecretLookupByUUID. Fix typo in args for
remoteSecretDefineXML impl. Use raw UUID format for
get_nonnull_secret and make_nonnull_secret
* src/storage_encryption_conf.c, src/storage_encryption_conf.h:
Storage UUID in raw format, and require it to be present in
XML. Use UUID parser to validate.
* secret_conf.h, secret_conf.c: Generate a UUID if none is provided.
Storage UUID in raw format.
* src/secret_driver.c: Adjust to deal with raw UUIDs. Save secrets
in a filed with printable UUID, instead of base64 UUID.
* src/virsh.c: Adjust for changed public API contract of
virSecretGetUUIDString.
* src/storage_Backend.c: DOn't undefine secret we just generated
upon successful volume creation. Fix to handle raw UUIDs. Generate
a non-clashing UUID
* src/qemu_driver.c: Change to use lookupByUUID instead of
lookupByUUIDString
2009-09-10 16:44:12 +00:00
|
|
|
virUUIDFormat(uuid, uuidstr);
|
|
|
|
|
|
|
|
ret = virHashLookup(conn->secrets, uuidstr);
|
2009-08-14 19:42:19 +00:00
|
|
|
if (ret == NULL) {
|
|
|
|
if (VIR_ALLOC(ret) < 0) {
|
|
|
|
virMutexUnlock(&conn->lock);
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2009-08-14 19:42:19 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
ret->magic = VIR_SECRET_MAGIC;
|
|
|
|
ret->conn = conn;
|
Fix UUID handling in secrets/storage encryption APIs
Convert all the secret/storage encryption APIs / wire format to
handle UUIDs in raw format instead of non-canonical printable
format. Guarentees data format correctness.
* docs/schemas/storageencryption.rng: Make UUID mandatory for a secret
and validate fully
* docs/schemas/secret.rng: Fully validate UUID
* include/libvirt/libvirt.h, include/libvirt/libvirt.h.in, Add
virSecretLookupByUUID and virSecretGetUUID. Make
virSecretGetUUIDString follow normal API design pattern
* python/generator.py: Skip generation of virSecretGetUUID,
virSecretGetUUIDString and virSecretLookupByUUID
* python/libvir.c, python/libvirt-python-api.xml: Manual impl
of virSecretGetUUID,virSecretGetUUIDString and virSecretLookupByUUID
* qemud/remote.c: s/virSecretLookupByUUIDString/virSecretLookupByUUID/
Fix get_nonnull_secret/make_nonnull_secret to use unsigned char
* qemud/remote_protocol.x: Fix remote_nonnull_secret to use a
remote_uuid instead of remote_nonnull_string for UUID field.
Rename REMOTE_PROC_SECRET_LOOKUP_BY_UUID_STRING to
REMOTE_PROC_SECRET_LOOKUP_BY_UUID_STRING and make it take an
remote_uuid value
* qemud/remote_dispatch_args.h, qemud/remote_dispatch_prototypes.h,
qemud/remote_dispatch_ret.h, qemud/remote_dispatch_table.h,
qemud/remote_protocol.c, qemud/remote_protocol.h: Re-generate
* src/datatypes.h, src/datatypes.c: Store UUID in raw format instead
of printable. Change virGetSecret to use raw format UUID
* src/driver.h: Rename virDrvSecretLookupByUUIDString to
virDrvSecretLookupByUUID and use raw format UUID
* src/libvirt.c: Add virSecretLookupByUUID and virSecretGetUUID
and re-implement virSecretLookupByUUIDString and
virSecretGetUUIDString in terms of those
* src/libvirt_public.syms: Add virSecretLookupByUUID and
virSecretGetUUID
* src/remote_internal.c: Rename remoteSecretLookupByUUIDString
to remoteSecretLookupByUUID. Fix typo in args for
remoteSecretDefineXML impl. Use raw UUID format for
get_nonnull_secret and make_nonnull_secret
* src/storage_encryption_conf.c, src/storage_encryption_conf.h:
Storage UUID in raw format, and require it to be present in
XML. Use UUID parser to validate.
* secret_conf.h, secret_conf.c: Generate a UUID if none is provided.
Storage UUID in raw format.
* src/secret_driver.c: Adjust to deal with raw UUIDs. Save secrets
in a filed with printable UUID, instead of base64 UUID.
* src/virsh.c: Adjust for changed public API contract of
virSecretGetUUIDString.
* src/storage_Backend.c: DOn't undefine secret we just generated
upon successful volume creation. Fix to handle raw UUIDs. Generate
a non-clashing UUID
* src/qemu_driver.c: Change to use lookupByUUID instead of
lookupByUUIDString
2009-09-10 16:44:12 +00:00
|
|
|
memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN);
|
Add usage type/id as a public API property of virSecret
* include/libvirt/libvirt.h, include/libvirt/libvirt.h.in: Add
virSecretGetUsageType, virSecretGetUsageID and virLookupSecretByUsage
* python/generator.py: Mark virSecretGetUsageType, virSecretGetUsageID
as not throwing exceptions
* qemud/remote.c: Implement dispatch for virLookupSecretByUsage
* qemud/remote_protocol.x: Add usage type & ID as attributes of
remote_nonnull_secret. Add RPC calls for new public APIs
* qemud/remote_dispatch_args.h, qemud/remote_dispatch_prototypes.h,
qemud/remote_dispatch_ret.h, qemud/remote_dispatch_table.h,
qemud/remote_protocol.c, qemud/remote_protocol.h: Re-generate
* src/datatypes.c, src/datatypes.h: Add usageType and usageID as
properties of virSecretPtr
* src/driver.h: Add virLookupSecretByUsage driver entry point
* src/libvirt.c: Implement virSecretGetUsageType, virSecretGetUsageID
and virLookupSecretByUsage
* src/libvirt_public.syms: Export virSecretGetUsageType, virSecretGetUsageID
and virLookupSecretByUsage
* src/remote_internal.c: Implement virLookupSecretByUsage entry
* src/secret_conf.c, src/secret_conf.h: Remove the
virSecretUsageType enum, now in public API. Make volume
path mandatory when parsing XML
* src/secret_driver.c: Enforce usage uniqueness when defining secrets.
Implement virSecretLookupByUsage api method
* src/virsh.c: Include usage for secret-list command
2009-09-11 13:06:15 +00:00
|
|
|
ret->usageType = usageType;
|
|
|
|
if (!(ret->usageID = strdup(usageID))) {
|
|
|
|
virMutexUnlock(&conn->lock);
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
Add usage type/id as a public API property of virSecret
* include/libvirt/libvirt.h, include/libvirt/libvirt.h.in: Add
virSecretGetUsageType, virSecretGetUsageID and virLookupSecretByUsage
* python/generator.py: Mark virSecretGetUsageType, virSecretGetUsageID
as not throwing exceptions
* qemud/remote.c: Implement dispatch for virLookupSecretByUsage
* qemud/remote_protocol.x: Add usage type & ID as attributes of
remote_nonnull_secret. Add RPC calls for new public APIs
* qemud/remote_dispatch_args.h, qemud/remote_dispatch_prototypes.h,
qemud/remote_dispatch_ret.h, qemud/remote_dispatch_table.h,
qemud/remote_protocol.c, qemud/remote_protocol.h: Re-generate
* src/datatypes.c, src/datatypes.h: Add usageType and usageID as
properties of virSecretPtr
* src/driver.h: Add virLookupSecretByUsage driver entry point
* src/libvirt.c: Implement virSecretGetUsageType, virSecretGetUsageID
and virLookupSecretByUsage
* src/libvirt_public.syms: Export virSecretGetUsageType, virSecretGetUsageID
and virLookupSecretByUsage
* src/remote_internal.c: Implement virLookupSecretByUsage entry
* src/secret_conf.c, src/secret_conf.h: Remove the
virSecretUsageType enum, now in public API. Make volume
path mandatory when parsing XML
* src/secret_driver.c: Enforce usage uniqueness when defining secrets.
Implement virSecretLookupByUsage api method
* src/virsh.c: Include usage for secret-list command
2009-09-11 13:06:15 +00:00
|
|
|
goto error;
|
|
|
|
}
|
Fix UUID handling in secrets/storage encryption APIs
Convert all the secret/storage encryption APIs / wire format to
handle UUIDs in raw format instead of non-canonical printable
format. Guarentees data format correctness.
* docs/schemas/storageencryption.rng: Make UUID mandatory for a secret
and validate fully
* docs/schemas/secret.rng: Fully validate UUID
* include/libvirt/libvirt.h, include/libvirt/libvirt.h.in, Add
virSecretLookupByUUID and virSecretGetUUID. Make
virSecretGetUUIDString follow normal API design pattern
* python/generator.py: Skip generation of virSecretGetUUID,
virSecretGetUUIDString and virSecretLookupByUUID
* python/libvir.c, python/libvirt-python-api.xml: Manual impl
of virSecretGetUUID,virSecretGetUUIDString and virSecretLookupByUUID
* qemud/remote.c: s/virSecretLookupByUUIDString/virSecretLookupByUUID/
Fix get_nonnull_secret/make_nonnull_secret to use unsigned char
* qemud/remote_protocol.x: Fix remote_nonnull_secret to use a
remote_uuid instead of remote_nonnull_string for UUID field.
Rename REMOTE_PROC_SECRET_LOOKUP_BY_UUID_STRING to
REMOTE_PROC_SECRET_LOOKUP_BY_UUID_STRING and make it take an
remote_uuid value
* qemud/remote_dispatch_args.h, qemud/remote_dispatch_prototypes.h,
qemud/remote_dispatch_ret.h, qemud/remote_dispatch_table.h,
qemud/remote_protocol.c, qemud/remote_protocol.h: Re-generate
* src/datatypes.h, src/datatypes.c: Store UUID in raw format instead
of printable. Change virGetSecret to use raw format UUID
* src/driver.h: Rename virDrvSecretLookupByUUIDString to
virDrvSecretLookupByUUID and use raw format UUID
* src/libvirt.c: Add virSecretLookupByUUID and virSecretGetUUID
and re-implement virSecretLookupByUUIDString and
virSecretGetUUIDString in terms of those
* src/libvirt_public.syms: Add virSecretLookupByUUID and
virSecretGetUUID
* src/remote_internal.c: Rename remoteSecretLookupByUUIDString
to remoteSecretLookupByUUID. Fix typo in args for
remoteSecretDefineXML impl. Use raw UUID format for
get_nonnull_secret and make_nonnull_secret
* src/storage_encryption_conf.c, src/storage_encryption_conf.h:
Storage UUID in raw format, and require it to be present in
XML. Use UUID parser to validate.
* secret_conf.h, secret_conf.c: Generate a UUID if none is provided.
Storage UUID in raw format.
* src/secret_driver.c: Adjust to deal with raw UUIDs. Save secrets
in a filed with printable UUID, instead of base64 UUID.
* src/virsh.c: Adjust for changed public API contract of
virSecretGetUUIDString.
* src/storage_Backend.c: DOn't undefine secret we just generated
upon successful volume creation. Fix to handle raw UUIDs. Generate
a non-clashing UUID
* src/qemu_driver.c: Change to use lookupByUUID instead of
lookupByUUIDString
2009-09-10 16:44:12 +00:00
|
|
|
if (virHashAddEntry(conn->secrets, uuidstr, ret) < 0) {
|
2009-08-14 19:42:19 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("failed to add secret to conn hash table"));
|
2009-08-14 19:42:19 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
conn->refs++;
|
|
|
|
}
|
|
|
|
ret->refs++;
|
|
|
|
virMutexUnlock(&conn->lock);
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
error:
|
|
|
|
if (ret != NULL) {
|
Add usage type/id as a public API property of virSecret
* include/libvirt/libvirt.h, include/libvirt/libvirt.h.in: Add
virSecretGetUsageType, virSecretGetUsageID and virLookupSecretByUsage
* python/generator.py: Mark virSecretGetUsageType, virSecretGetUsageID
as not throwing exceptions
* qemud/remote.c: Implement dispatch for virLookupSecretByUsage
* qemud/remote_protocol.x: Add usage type & ID as attributes of
remote_nonnull_secret. Add RPC calls for new public APIs
* qemud/remote_dispatch_args.h, qemud/remote_dispatch_prototypes.h,
qemud/remote_dispatch_ret.h, qemud/remote_dispatch_table.h,
qemud/remote_protocol.c, qemud/remote_protocol.h: Re-generate
* src/datatypes.c, src/datatypes.h: Add usageType and usageID as
properties of virSecretPtr
* src/driver.h: Add virLookupSecretByUsage driver entry point
* src/libvirt.c: Implement virSecretGetUsageType, virSecretGetUsageID
and virLookupSecretByUsage
* src/libvirt_public.syms: Export virSecretGetUsageType, virSecretGetUsageID
and virLookupSecretByUsage
* src/remote_internal.c: Implement virLookupSecretByUsage entry
* src/secret_conf.c, src/secret_conf.h: Remove the
virSecretUsageType enum, now in public API. Make volume
path mandatory when parsing XML
* src/secret_driver.c: Enforce usage uniqueness when defining secrets.
Implement virSecretLookupByUsage api method
* src/virsh.c: Include usage for secret-list command
2009-09-11 13:06:15 +00:00
|
|
|
VIR_FREE(ret->usageID);
|
2009-08-14 19:42:19 +00:00
|
|
|
VIR_FREE(ret->uuid);
|
|
|
|
VIR_FREE(ret);
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virReleaseSecret:
|
|
|
|
* @secret: the secret to release
|
|
|
|
*
|
|
|
|
* Unconditionally release all memory associated with a secret. The conn.lock
|
|
|
|
* mutex must be held prior to calling this, and will be released prior to this
|
|
|
|
* returning. The secret obj must not be used once this method returns.
|
|
|
|
*
|
|
|
|
* It will also unreference the associated connection object, which may also be
|
|
|
|
* released if its ref count hits zero.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
virReleaseSecret(virSecretPtr secret) {
|
|
|
|
virConnectPtr conn = secret->conn;
|
Fix UUID handling in secrets/storage encryption APIs
Convert all the secret/storage encryption APIs / wire format to
handle UUIDs in raw format instead of non-canonical printable
format. Guarentees data format correctness.
* docs/schemas/storageencryption.rng: Make UUID mandatory for a secret
and validate fully
* docs/schemas/secret.rng: Fully validate UUID
* include/libvirt/libvirt.h, include/libvirt/libvirt.h.in, Add
virSecretLookupByUUID and virSecretGetUUID. Make
virSecretGetUUIDString follow normal API design pattern
* python/generator.py: Skip generation of virSecretGetUUID,
virSecretGetUUIDString and virSecretLookupByUUID
* python/libvir.c, python/libvirt-python-api.xml: Manual impl
of virSecretGetUUID,virSecretGetUUIDString and virSecretLookupByUUID
* qemud/remote.c: s/virSecretLookupByUUIDString/virSecretLookupByUUID/
Fix get_nonnull_secret/make_nonnull_secret to use unsigned char
* qemud/remote_protocol.x: Fix remote_nonnull_secret to use a
remote_uuid instead of remote_nonnull_string for UUID field.
Rename REMOTE_PROC_SECRET_LOOKUP_BY_UUID_STRING to
REMOTE_PROC_SECRET_LOOKUP_BY_UUID_STRING and make it take an
remote_uuid value
* qemud/remote_dispatch_args.h, qemud/remote_dispatch_prototypes.h,
qemud/remote_dispatch_ret.h, qemud/remote_dispatch_table.h,
qemud/remote_protocol.c, qemud/remote_protocol.h: Re-generate
* src/datatypes.h, src/datatypes.c: Store UUID in raw format instead
of printable. Change virGetSecret to use raw format UUID
* src/driver.h: Rename virDrvSecretLookupByUUIDString to
virDrvSecretLookupByUUID and use raw format UUID
* src/libvirt.c: Add virSecretLookupByUUID and virSecretGetUUID
and re-implement virSecretLookupByUUIDString and
virSecretGetUUIDString in terms of those
* src/libvirt_public.syms: Add virSecretLookupByUUID and
virSecretGetUUID
* src/remote_internal.c: Rename remoteSecretLookupByUUIDString
to remoteSecretLookupByUUID. Fix typo in args for
remoteSecretDefineXML impl. Use raw UUID format for
get_nonnull_secret and make_nonnull_secret
* src/storage_encryption_conf.c, src/storage_encryption_conf.h:
Storage UUID in raw format, and require it to be present in
XML. Use UUID parser to validate.
* secret_conf.h, secret_conf.c: Generate a UUID if none is provided.
Storage UUID in raw format.
* src/secret_driver.c: Adjust to deal with raw UUIDs. Save secrets
in a filed with printable UUID, instead of base64 UUID.
* src/virsh.c: Adjust for changed public API contract of
virSecretGetUUIDString.
* src/storage_Backend.c: DOn't undefine secret we just generated
upon successful volume creation. Fix to handle raw UUIDs. Generate
a non-clashing UUID
* src/qemu_driver.c: Change to use lookupByUUID instead of
lookupByUUIDString
2009-09-10 16:44:12 +00:00
|
|
|
char uuidstr[VIR_UUID_STRING_BUFLEN];
|
|
|
|
DEBUG("release secret %p %p", secret, secret->uuid);
|
2009-08-14 19:42:19 +00:00
|
|
|
|
Fix UUID handling in secrets/storage encryption APIs
Convert all the secret/storage encryption APIs / wire format to
handle UUIDs in raw format instead of non-canonical printable
format. Guarentees data format correctness.
* docs/schemas/storageencryption.rng: Make UUID mandatory for a secret
and validate fully
* docs/schemas/secret.rng: Fully validate UUID
* include/libvirt/libvirt.h, include/libvirt/libvirt.h.in, Add
virSecretLookupByUUID and virSecretGetUUID. Make
virSecretGetUUIDString follow normal API design pattern
* python/generator.py: Skip generation of virSecretGetUUID,
virSecretGetUUIDString and virSecretLookupByUUID
* python/libvir.c, python/libvirt-python-api.xml: Manual impl
of virSecretGetUUID,virSecretGetUUIDString and virSecretLookupByUUID
* qemud/remote.c: s/virSecretLookupByUUIDString/virSecretLookupByUUID/
Fix get_nonnull_secret/make_nonnull_secret to use unsigned char
* qemud/remote_protocol.x: Fix remote_nonnull_secret to use a
remote_uuid instead of remote_nonnull_string for UUID field.
Rename REMOTE_PROC_SECRET_LOOKUP_BY_UUID_STRING to
REMOTE_PROC_SECRET_LOOKUP_BY_UUID_STRING and make it take an
remote_uuid value
* qemud/remote_dispatch_args.h, qemud/remote_dispatch_prototypes.h,
qemud/remote_dispatch_ret.h, qemud/remote_dispatch_table.h,
qemud/remote_protocol.c, qemud/remote_protocol.h: Re-generate
* src/datatypes.h, src/datatypes.c: Store UUID in raw format instead
of printable. Change virGetSecret to use raw format UUID
* src/driver.h: Rename virDrvSecretLookupByUUIDString to
virDrvSecretLookupByUUID and use raw format UUID
* src/libvirt.c: Add virSecretLookupByUUID and virSecretGetUUID
and re-implement virSecretLookupByUUIDString and
virSecretGetUUIDString in terms of those
* src/libvirt_public.syms: Add virSecretLookupByUUID and
virSecretGetUUID
* src/remote_internal.c: Rename remoteSecretLookupByUUIDString
to remoteSecretLookupByUUID. Fix typo in args for
remoteSecretDefineXML impl. Use raw UUID format for
get_nonnull_secret and make_nonnull_secret
* src/storage_encryption_conf.c, src/storage_encryption_conf.h:
Storage UUID in raw format, and require it to be present in
XML. Use UUID parser to validate.
* secret_conf.h, secret_conf.c: Generate a UUID if none is provided.
Storage UUID in raw format.
* src/secret_driver.c: Adjust to deal with raw UUIDs. Save secrets
in a filed with printable UUID, instead of base64 UUID.
* src/virsh.c: Adjust for changed public API contract of
virSecretGetUUIDString.
* src/storage_Backend.c: DOn't undefine secret we just generated
upon successful volume creation. Fix to handle raw UUIDs. Generate
a non-clashing UUID
* src/qemu_driver.c: Change to use lookupByUUID instead of
lookupByUUIDString
2009-09-10 16:44:12 +00:00
|
|
|
virUUIDFormat(secret->uuid, uuidstr);
|
|
|
|
if (virHashRemoveEntry(conn->secrets, uuidstr, NULL) < 0) {
|
2009-08-14 19:42:19 +00:00
|
|
|
virMutexUnlock(&conn->lock);
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("secret missing from connection hash table"));
|
2009-08-14 19:42:19 +00:00
|
|
|
conn = NULL;
|
|
|
|
}
|
|
|
|
|
Add usage type/id as a public API property of virSecret
* include/libvirt/libvirt.h, include/libvirt/libvirt.h.in: Add
virSecretGetUsageType, virSecretGetUsageID and virLookupSecretByUsage
* python/generator.py: Mark virSecretGetUsageType, virSecretGetUsageID
as not throwing exceptions
* qemud/remote.c: Implement dispatch for virLookupSecretByUsage
* qemud/remote_protocol.x: Add usage type & ID as attributes of
remote_nonnull_secret. Add RPC calls for new public APIs
* qemud/remote_dispatch_args.h, qemud/remote_dispatch_prototypes.h,
qemud/remote_dispatch_ret.h, qemud/remote_dispatch_table.h,
qemud/remote_protocol.c, qemud/remote_protocol.h: Re-generate
* src/datatypes.c, src/datatypes.h: Add usageType and usageID as
properties of virSecretPtr
* src/driver.h: Add virLookupSecretByUsage driver entry point
* src/libvirt.c: Implement virSecretGetUsageType, virSecretGetUsageID
and virLookupSecretByUsage
* src/libvirt_public.syms: Export virSecretGetUsageType, virSecretGetUsageID
and virLookupSecretByUsage
* src/remote_internal.c: Implement virLookupSecretByUsage entry
* src/secret_conf.c, src/secret_conf.h: Remove the
virSecretUsageType enum, now in public API. Make volume
path mandatory when parsing XML
* src/secret_driver.c: Enforce usage uniqueness when defining secrets.
Implement virSecretLookupByUsage api method
* src/virsh.c: Include usage for secret-list command
2009-09-11 13:06:15 +00:00
|
|
|
VIR_FREE(secret->usageID);
|
2009-08-14 19:42:19 +00:00
|
|
|
secret->magic = -1;
|
|
|
|
VIR_FREE(secret);
|
|
|
|
|
|
|
|
if (conn) {
|
|
|
|
DEBUG("unref connection %p %d", conn, conn->refs);
|
|
|
|
conn->refs--;
|
|
|
|
if (conn->refs == 0) {
|
|
|
|
virReleaseConnect(conn);
|
|
|
|
/* Already unlocked mutex */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
virMutexUnlock(&conn->lock);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virUnrefSecret:
|
|
|
|
* @secret: the secret to unreference
|
|
|
|
*
|
|
|
|
* Unreference the secret. If the use count drops to zero, the structure is
|
|
|
|
* actually freed.
|
|
|
|
*
|
|
|
|
* Returns the reference count or -1 in case of failure.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
virUnrefSecret(virSecretPtr secret) {
|
|
|
|
int refs;
|
|
|
|
|
|
|
|
if (!VIR_IS_CONNECTED_SECRET(secret)) {
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2009-08-14 19:42:19 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
virMutexLock(&secret->conn->lock);
|
Fix UUID handling in secrets/storage encryption APIs
Convert all the secret/storage encryption APIs / wire format to
handle UUIDs in raw format instead of non-canonical printable
format. Guarentees data format correctness.
* docs/schemas/storageencryption.rng: Make UUID mandatory for a secret
and validate fully
* docs/schemas/secret.rng: Fully validate UUID
* include/libvirt/libvirt.h, include/libvirt/libvirt.h.in, Add
virSecretLookupByUUID and virSecretGetUUID. Make
virSecretGetUUIDString follow normal API design pattern
* python/generator.py: Skip generation of virSecretGetUUID,
virSecretGetUUIDString and virSecretLookupByUUID
* python/libvir.c, python/libvirt-python-api.xml: Manual impl
of virSecretGetUUID,virSecretGetUUIDString and virSecretLookupByUUID
* qemud/remote.c: s/virSecretLookupByUUIDString/virSecretLookupByUUID/
Fix get_nonnull_secret/make_nonnull_secret to use unsigned char
* qemud/remote_protocol.x: Fix remote_nonnull_secret to use a
remote_uuid instead of remote_nonnull_string for UUID field.
Rename REMOTE_PROC_SECRET_LOOKUP_BY_UUID_STRING to
REMOTE_PROC_SECRET_LOOKUP_BY_UUID_STRING and make it take an
remote_uuid value
* qemud/remote_dispatch_args.h, qemud/remote_dispatch_prototypes.h,
qemud/remote_dispatch_ret.h, qemud/remote_dispatch_table.h,
qemud/remote_protocol.c, qemud/remote_protocol.h: Re-generate
* src/datatypes.h, src/datatypes.c: Store UUID in raw format instead
of printable. Change virGetSecret to use raw format UUID
* src/driver.h: Rename virDrvSecretLookupByUUIDString to
virDrvSecretLookupByUUID and use raw format UUID
* src/libvirt.c: Add virSecretLookupByUUID and virSecretGetUUID
and re-implement virSecretLookupByUUIDString and
virSecretGetUUIDString in terms of those
* src/libvirt_public.syms: Add virSecretLookupByUUID and
virSecretGetUUID
* src/remote_internal.c: Rename remoteSecretLookupByUUIDString
to remoteSecretLookupByUUID. Fix typo in args for
remoteSecretDefineXML impl. Use raw UUID format for
get_nonnull_secret and make_nonnull_secret
* src/storage_encryption_conf.c, src/storage_encryption_conf.h:
Storage UUID in raw format, and require it to be present in
XML. Use UUID parser to validate.
* secret_conf.h, secret_conf.c: Generate a UUID if none is provided.
Storage UUID in raw format.
* src/secret_driver.c: Adjust to deal with raw UUIDs. Save secrets
in a filed with printable UUID, instead of base64 UUID.
* src/virsh.c: Adjust for changed public API contract of
virSecretGetUUIDString.
* src/storage_Backend.c: DOn't undefine secret we just generated
upon successful volume creation. Fix to handle raw UUIDs. Generate
a non-clashing UUID
* src/qemu_driver.c: Change to use lookupByUUID instead of
lookupByUUIDString
2009-09-10 16:44:12 +00:00
|
|
|
DEBUG("unref secret %p %p %d", secret, secret->uuid, secret->refs);
|
2009-08-14 19:42:19 +00:00
|
|
|
secret->refs--;
|
|
|
|
refs = secret->refs;
|
|
|
|
if (refs == 0) {
|
|
|
|
virReleaseSecret(secret);
|
|
|
|
/* Already unlocked mutex */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
virMutexUnlock(&secret->conn->lock);
|
|
|
|
return refs;
|
|
|
|
}
|
2009-07-10 11:18:12 +00:00
|
|
|
|
|
|
|
virStreamPtr virGetStream(virConnectPtr conn) {
|
|
|
|
virStreamPtr ret = NULL;
|
|
|
|
|
|
|
|
virMutexLock(&conn->lock);
|
|
|
|
|
|
|
|
if (VIR_ALLOC(ret) < 0) {
|
2010-02-04 18:19:08 +00:00
|
|
|
virReportOOMError();
|
2009-07-10 11:18:12 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
ret->magic = VIR_STREAM_MAGIC;
|
|
|
|
ret->conn = conn;
|
|
|
|
conn->refs++;
|
|
|
|
ret->refs++;
|
|
|
|
virMutexUnlock(&conn->lock);
|
|
|
|
return(ret);
|
|
|
|
|
|
|
|
error:
|
|
|
|
virMutexUnlock(&conn->lock);
|
|
|
|
VIR_FREE(ret);
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
virReleaseStream(virStreamPtr st) {
|
|
|
|
virConnectPtr conn = st->conn;
|
|
|
|
DEBUG("release dev %p", st);
|
|
|
|
|
|
|
|
st->magic = -1;
|
|
|
|
VIR_FREE(st);
|
|
|
|
|
|
|
|
DEBUG("unref connection %p %d", conn, conn->refs);
|
|
|
|
conn->refs--;
|
|
|
|
if (conn->refs == 0) {
|
|
|
|
virReleaseConnect(conn);
|
|
|
|
/* Already unlocked mutex */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
virMutexUnlock(&conn->lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
int virUnrefStream(virStreamPtr st) {
|
|
|
|
int refs;
|
|
|
|
|
|
|
|
virMutexLock(&st->conn->lock);
|
|
|
|
DEBUG("unref stream %p %d", st, st->refs);
|
|
|
|
st->refs--;
|
|
|
|
refs = st->refs;
|
|
|
|
if (refs == 0) {
|
|
|
|
virReleaseStream(st);
|
|
|
|
/* Already unlocked mutex */
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
virMutexUnlock(&st->conn->lock);
|
|
|
|
return (refs);
|
|
|
|
}
|
2010-03-25 17:46:02 +00:00
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virGetNWFilter:
|
|
|
|
* @conn: the hypervisor connection
|
|
|
|
* @name: pointer to the network filter pool name
|
|
|
|
* @uuid: pointer to the uuid
|
|
|
|
*
|
|
|
|
* Lookup if the network filter is already registered for that connection,
|
|
|
|
* if yes return a new pointer to it, if no allocate a new structure,
|
|
|
|
* and register it in the table. In any case a corresponding call to
|
|
|
|
* virFreeNWFilterPool() is needed to not leak data.
|
|
|
|
*
|
|
|
|
* Returns a pointer to the network, or NULL in case of failure
|
|
|
|
*/
|
|
|
|
virNWFilterPtr
|
|
|
|
virGetNWFilter(virConnectPtr conn, const char *name, const unsigned char *uuid) {
|
|
|
|
virNWFilterPtr ret = NULL;
|
|
|
|
|
|
|
|
if ((!VIR_IS_CONNECT(conn)) || (name == NULL) || (uuid == NULL)) {
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2010-03-25 17:46:02 +00:00
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
virMutexLock(&conn->lock);
|
|
|
|
|
|
|
|
/* TODO search by UUID first as they are better differenciators */
|
|
|
|
|
|
|
|
ret = (virNWFilterPtr) virHashLookup(conn->nwfilterPools, name);
|
|
|
|
/* TODO check the UUID */
|
|
|
|
if (ret == NULL) {
|
|
|
|
if (VIR_ALLOC(ret) < 0) {
|
|
|
|
virMutexUnlock(&conn->lock);
|
|
|
|
virReportOOMError();
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
ret->name = strdup(name);
|
|
|
|
if (ret->name == NULL) {
|
|
|
|
virMutexUnlock(&conn->lock);
|
|
|
|
virReportOOMError();
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
ret->magic = VIR_NWFILTER_MAGIC;
|
|
|
|
ret->conn = conn;
|
|
|
|
if (uuid != NULL)
|
|
|
|
memcpy(&(ret->uuid[0]), uuid, VIR_UUID_BUFLEN);
|
|
|
|
|
|
|
|
if (virHashAddEntry(conn->nwfilterPools, name, ret) < 0) {
|
|
|
|
virMutexUnlock(&conn->lock);
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("failed to add network filter pool to connection hash table"));
|
2010-03-25 17:46:02 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
conn->refs++;
|
|
|
|
}
|
|
|
|
ret->refs++;
|
|
|
|
virMutexUnlock(&conn->lock);
|
|
|
|
return(ret);
|
|
|
|
|
|
|
|
error:
|
|
|
|
if (ret != NULL) {
|
|
|
|
VIR_FREE(ret->name);
|
|
|
|
VIR_FREE(ret);
|
|
|
|
}
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virReleaseNWFilterPool:
|
|
|
|
* @pool: the pool to release
|
|
|
|
*
|
|
|
|
* Unconditionally release all memory associated with a pool.
|
|
|
|
* The conn.lock mutex must be held prior to calling this, and will
|
|
|
|
* be released prior to this returning. The pool obj must not
|
|
|
|
* be used once this method returns.
|
|
|
|
*
|
|
|
|
* It will also unreference the associated connection object,
|
|
|
|
* which may also be released if its ref count hits zero.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
virReleaseNWFilterPool(virNWFilterPtr pool) {
|
|
|
|
virConnectPtr conn = pool->conn;
|
|
|
|
DEBUG("release pool %p %s", pool, pool->name);
|
|
|
|
|
|
|
|
/* TODO search by UUID first as they are better differenciators */
|
|
|
|
if (virHashRemoveEntry(conn->nwfilterPools, pool->name, NULL) < 0) {
|
|
|
|
virMutexUnlock(&conn->lock);
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
|
_("pool missing from connection hash table"));
|
2010-03-25 17:46:02 +00:00
|
|
|
conn = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
pool->magic = -1;
|
|
|
|
VIR_FREE(pool->name);
|
|
|
|
VIR_FREE(pool);
|
|
|
|
|
|
|
|
if (conn) {
|
|
|
|
DEBUG("unref connection %p %d", conn, conn->refs);
|
|
|
|
conn->refs--;
|
|
|
|
if (conn->refs == 0) {
|
|
|
|
virReleaseConnect(conn);
|
|
|
|
/* Already unlocked mutex */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
virMutexUnlock(&conn->lock);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* virUnrefNWFilter:
|
|
|
|
* @pool: the nwfilter to unreference
|
|
|
|
*
|
|
|
|
* Unreference the networkf itler. If the use count drops to zero, the
|
|
|
|
* structure is actually freed.
|
|
|
|
*
|
|
|
|
* Returns the reference count or -1 in case of failure.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
virUnrefNWFilter(virNWFilterPtr pool) {
|
|
|
|
int refs;
|
|
|
|
|
|
|
|
if (!VIR_IS_CONNECTED_NWFILTER(pool)) {
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2010-03-25 17:46:02 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
virMutexLock(&pool->conn->lock);
|
|
|
|
DEBUG("unref pool %p %s %d", pool, pool->name, pool->refs);
|
|
|
|
pool->refs--;
|
|
|
|
refs = pool->refs;
|
|
|
|
if (refs == 0) {
|
|
|
|
virReleaseNWFilterPool(pool);
|
|
|
|
/* Already unlocked mutex */
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
virMutexUnlock(&pool->conn->lock);
|
|
|
|
return (refs);
|
|
|
|
}
|
2010-03-31 20:33:13 +00:00
|
|
|
|
|
|
|
|
|
|
|
virDomainSnapshotPtr
|
|
|
|
virGetDomainSnapshot(virDomainPtr domain, const char *name)
|
|
|
|
{
|
|
|
|
virDomainSnapshotPtr ret = NULL;
|
|
|
|
|
|
|
|
if ((!VIR_IS_DOMAIN(domain)) || (name == NULL)) {
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2010-03-31 20:33:13 +00:00
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
virMutexLock(&domain->conn->lock);
|
|
|
|
|
|
|
|
ret = (virDomainSnapshotPtr) virHashLookup(domain->snapshots, name);
|
|
|
|
if (ret == NULL) {
|
|
|
|
if (VIR_ALLOC(ret) < 0) {
|
|
|
|
virMutexUnlock(&domain->conn->lock);
|
|
|
|
virReportOOMError();
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
ret->name = strdup(name);
|
|
|
|
if (ret->name == NULL) {
|
|
|
|
virMutexUnlock(&domain->conn->lock);
|
|
|
|
virReportOOMError();
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
ret->magic = VIR_SNAPSHOT_MAGIC;
|
|
|
|
ret->domain = domain;
|
|
|
|
|
|
|
|
if (virHashAddEntry(domain->snapshots, name, ret) < 0) {
|
|
|
|
virMutexUnlock(&domain->conn->lock);
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INTERNAL_ERROR,
|
2010-03-31 20:33:13 +00:00
|
|
|
"%s", _("failed to add snapshot to domain hash table"));
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
domain->refs++;
|
|
|
|
DEBUG("New hash entry %p", ret);
|
|
|
|
} else {
|
|
|
|
DEBUG("Existing hash entry %p: refs now %d", ret, ret->refs+1);
|
|
|
|
}
|
|
|
|
ret->refs++;
|
|
|
|
virMutexUnlock(&domain->conn->lock);
|
|
|
|
return(ret);
|
|
|
|
|
|
|
|
error:
|
|
|
|
if (ret != NULL) {
|
|
|
|
VIR_FREE(ret->name);
|
|
|
|
VIR_FREE(ret);
|
|
|
|
}
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
virReleaseDomainSnapshot(virDomainSnapshotPtr snapshot)
|
|
|
|
{
|
|
|
|
virDomainPtr domain = snapshot->domain;
|
|
|
|
DEBUG("release snapshot %p %s", snapshot, snapshot->name);
|
|
|
|
|
|
|
|
if (virHashRemoveEntry(domain->snapshots, snapshot->name, NULL) < 0) {
|
|
|
|
virMutexUnlock(&domain->conn->lock);
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INTERNAL_ERROR,
|
2010-03-31 20:33:13 +00:00
|
|
|
"%s", _("snapshot missing from domain hash table"));
|
|
|
|
domain = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
snapshot->magic = -1;
|
|
|
|
VIR_FREE(snapshot->name);
|
|
|
|
VIR_FREE(snapshot);
|
|
|
|
|
|
|
|
if (domain) {
|
|
|
|
DEBUG("unref domain %p %d", domain, domain->refs);
|
|
|
|
domain->refs--;
|
|
|
|
if (domain->refs == 0) {
|
|
|
|
virReleaseDomain(domain);
|
|
|
|
/* Already unlocked mutex */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
virMutexUnlock(&domain->conn->lock);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
virUnrefDomainSnapshot(virDomainSnapshotPtr snapshot)
|
|
|
|
{
|
|
|
|
int refs;
|
|
|
|
|
|
|
|
if (!VIR_IS_DOMAIN_SNAPSHOT(snapshot)) {
|
2010-04-03 13:01:26 +00:00
|
|
|
virLibConnError(VIR_ERR_INVALID_ARG, __FUNCTION__);
|
2010-03-31 20:33:13 +00:00
|
|
|
return(-1);
|
|
|
|
}
|
|
|
|
|
|
|
|
virMutexLock(&snapshot->domain->conn->lock);
|
|
|
|
DEBUG("unref snapshot %p %s %d", snapshot, snapshot->name, snapshot->refs);
|
|
|
|
snapshot->refs--;
|
|
|
|
refs = snapshot->refs;
|
|
|
|
if (refs == 0) {
|
|
|
|
virReleaseDomainSnapshot(snapshot);
|
|
|
|
/* Already unlocked mutex */
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
virMutexUnlock(&snapshot->domain->conn->lock);
|
|
|
|
return (refs);
|
|
|
|
}
|