From b43401b915556d10c8b52624518de3c51d2eb435 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Thu, 4 Dec 2008 20:53:20 +0000 Subject: [PATCH] Add thread locking stubs --- ChangeLog | 8 ++++++++ src/domain_conf.c | 8 ++++++++ src/domain_conf.h | 2 ++ src/libvirt_sym.version.in | 8 ++++++++ src/network_conf.c | 8 ++++++++ src/network_conf.h | 3 +++ src/node_device_conf.c | 8 ++++++++ src/node_device_conf.h | 3 +++ src/storage_conf.c | 9 +++++++++ src/storage_conf.h | 3 +++ 10 files changed, 60 insertions(+) diff --git a/ChangeLog b/ChangeLog index bf13411145..66c8986085 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu Dec 4 20:47:41 GMT 2008 Daniel P. Berrange + + Thread locking API stubs + * src/domain_conf.c, src/domain_conf.h, src/libvirt_sym.version.in, + src/network_conf.c, src/network_conf.h, src/node_device_conf.c, + src/node_device_conf.h, src/storage_conf.c, src/storage_conf.h: + Define API stubs for locking and unlocking objects + Thu Dec 4 16:51:41 CET 2008 Daniel Veillard * src/libvirt_sym.version.in configure.in NEWS docs/*: release diff --git a/src/domain_conf.c b/src/domain_conf.c index 292cecfaaf..2740ab72e8 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -3470,4 +3470,12 @@ const char *virDomainDefDefaultEmulator(virConnectPtr conn, } +void virDomainObjLock(virDomainObjPtr obj ATTRIBUTE_UNUSED) +{ +} + +void virDomainObjUnlock(virDomainObjPtr obj ATTRIBUTE_UNUSED) +{ +} + #endif /* ! PROXY */ diff --git a/src/domain_conf.h b/src/domain_conf.h index 5a5e7ce857..7640557852 100644 --- a/src/domain_conf.h +++ b/src/domain_conf.h @@ -593,6 +593,8 @@ const char *virDomainDefDefaultEmulator(virConnectPtr conn, virDomainDefPtr def, virCapsPtr caps); +void virDomainObjLock(virDomainObjPtr obj); +void virDomainObjUnlock(virDomainObjPtr obj); VIR_ENUM_DECL(virDomainVirt) VIR_ENUM_DECL(virDomainBoot) diff --git a/src/libvirt_sym.version.in b/src/libvirt_sym.version.in index 18d3bdeed7..9aa1497f7c 100644 --- a/src/libvirt_sym.version.in +++ b/src/libvirt_sym.version.in @@ -374,6 +374,8 @@ LIBVIRT_PRIVATE_@VERSION@ { virDomainSoundModelTypeToString; virDomainVirtTypeToString; virDomainFSDefFree; + virDomainObjLock; + virDomainObjUnlock; /* domain_event.h */ @@ -478,6 +480,8 @@ LIBVIRT_PRIVATE_@VERSION@ { virNetworkDefParseNode; virNetworkRemoveInactive; virNetworkSaveConfig; + virNetworkObjLock; + virNetworkObjUnlock; /* nodeinfo.h */ @@ -492,6 +496,8 @@ LIBVIRT_PRIVATE_@VERSION@ { virNodeDeviceDefFree; virNodeDevCapsDefFree; virNodeDeviceDefFormat; + virNodeDeviceObjLock; + virNodeDeviceObjUnlock; /* qparams.h */ @@ -545,6 +551,8 @@ LIBVIRT_PRIVATE_@VERSION@ { virStoragePoolFormatFileSystemNetTypeToString; virStorageVolFormatFileSystemTypeToString; virStoragePoolTypeFromString; + virStoragePoolObjLock; + virStoragePoolObjUnlock; /* util.h */ diff --git a/src/network_conf.c b/src/network_conf.c index 5add62ec27..0dfde672db 100644 --- a/src/network_conf.c +++ b/src/network_conf.c @@ -811,3 +811,11 @@ int virNetworkDeleteConfig(virConnectPtr conn, return 0; } + +void virNetworkObjLock(virNetworkObjPtr obj ATTRIBUTE_UNUSED) +{ +} + +void virNetworkObjUnlock(virNetworkObjPtr obj ATTRIBUTE_UNUSED) +{ +} diff --git a/src/network_conf.h b/src/network_conf.h index 2614e47366..c83eeabc97 100644 --- a/src/network_conf.h +++ b/src/network_conf.h @@ -155,5 +155,8 @@ int virNetworkLoadAllConfigs(virConnectPtr conn, int virNetworkDeleteConfig(virConnectPtr conn, virNetworkObjPtr net); +void virNetworkObjLock(virNetworkObjPtr obj); +void virNetworkObjUnlock(virNetworkObjPtr obj); + #endif /* __NETWORK_CONF_H__ */ diff --git a/src/node_device_conf.c b/src/node_device_conf.c index 96ef388d37..bee466b119 100644 --- a/src/node_device_conf.c +++ b/src/node_device_conf.c @@ -397,3 +397,11 @@ void virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps) VIR_FREE(caps); } + +void virNodeDeviceObjLock(virNodeDeviceObjPtr obj ATTRIBUTE_UNUSED) +{ +} + +void virNodeDeviceObjUnlock(virNodeDeviceObjPtr obj ATTRIBUTE_UNUSED) +{ +} diff --git a/src/node_device_conf.h b/src/node_device_conf.h index ad3c8935b5..e1f9e77216 100644 --- a/src/node_device_conf.h +++ b/src/node_device_conf.h @@ -190,4 +190,7 @@ void virNodeDeviceObjListFree(virNodeDeviceObjListPtr devs); void virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps); +void virNodeDeviceObjLock(virNodeDeviceObjPtr obj); +void virNodeDeviceObjUnlock(virNodeDeviceObjPtr obj); + #endif /* __VIR_NODE_DEVICE_CONF_H__ */ diff --git a/src/storage_conf.c b/src/storage_conf.c index 192932b23b..c54490a99d 100644 --- a/src/storage_conf.c +++ b/src/storage_conf.c @@ -1507,3 +1507,12 @@ char *virStoragePoolSourceListFormat(virConnectPtr conn, free(virBufferContentAndReset(&buf)); return NULL; } + + +void virStoragePoolObjLock(virStoragePoolObjPtr obj ATTRIBUTE_UNUSED) +{ +} + +void virStoragePoolObjUnlock(virStoragePoolObjPtr obj ATTRIBUTE_UNUSED) +{ +} diff --git a/src/storage_conf.h b/src/storage_conf.h index a2131307c7..00a732f725 100644 --- a/src/storage_conf.h +++ b/src/storage_conf.h @@ -326,6 +326,9 @@ void virStoragePoolObjRemove(virStoragePoolObjListPtr pools, char *virStoragePoolSourceListFormat(virConnectPtr conn, virStoragePoolSourceListPtr def); +void virStoragePoolObjLock(virStoragePoolObjPtr obj); +void virStoragePoolObjUnlock(virStoragePoolObjPtr obj); + enum virStoragePoolFormatFileSystem { VIR_STORAGE_POOL_FS_AUTO = 0,