External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 19:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

maint: inline VIR_IS*_DOMAIN macro

Browse Source 
Cleanup after a previous patch, commit 6e130dd.  In particular,
note that xenDomainUsedCpus can only be reached from
xenUnifiedDomainGetXMLDesc, which in turn is only reached from
public API that already validated the domain.

* src/xen/xen_driver.c (xenDomainUsedCpus): Drop redundant check.
* src/datatypes.h (VIR_IS_DOMAIN, VIR_IS_CONNECTED_DOMAIN):
Delete, and inline into all callers, since no other file uses it
any more.

Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Eric Blake 2013-12-27 16:08:16 -07:00
parent 37705c12be
commit c2aa14b4e2
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/datatypes.h
View File

@ -60,10 +60,6 @@ extern virClassPtr virStoragePoolClass;
} \ } \
} while (0) } while (0)
# define VIR_IS_DOMAIN(obj) \
(virObjectIsClass((obj), virDomainClass))
# define VIR_IS_CONNECTED_DOMAIN(obj) \
(VIR_IS_DOMAIN(obj) && virObjectIsClass((obj)->conn, virConnectClass))
# define virCheckDomainReturn(obj, retval) \ # define virCheckDomainReturn(obj, retval) \
do { \ do { \
virDomainPtr _dom = (obj); \ virDomainPtr _dom = (obj); \
@ -131,7 +127,7 @@ extern virClassPtr virStoragePoolClass;
# define VIR_IS_SNAPSHOT(obj) \ # define VIR_IS_SNAPSHOT(obj) \
(virObjectIsClass((obj), virDomainSnapshotClass)) (virObjectIsClass((obj), virDomainSnapshotClass))
# define VIR_IS_DOMAIN_SNAPSHOT(obj) \ # define VIR_IS_DOMAIN_SNAPSHOT(obj) \
(VIR_IS_SNAPSHOT(obj) && VIR_IS_DOMAIN((obj)->domain)) (VIR_IS_SNAPSHOT(obj) && virObjectIsClass((obj)->domain, virDomainClass))
/* Helper macros to implement VIR_DOMAIN_DEBUG using just C99. This /* Helper macros to implement VIR_DOMAIN_DEBUG using just C99. This
@ -169,7 +165,7 @@ extern virClassPtr virStoragePoolClass;
char _uuidstr[VIR_UUID_STRING_BUFLEN]; \ char _uuidstr[VIR_UUID_STRING_BUFLEN]; \
const char *_domname = NULL; \ const char *_domname = NULL; \
\ \
if (!VIR_IS_DOMAIN(dom)) { \ if (!virObjectIsClass(dom, virDomainClass)) { \
memset(_uuidstr, 0, sizeof(_uuidstr)); \ memset(_uuidstr, 0, sizeof(_uuidstr)); \
} else { \ } else { \
virUUIDFormat((dom)->uuid, _uuidstr); \ virUUIDFormat((dom)->uuid, _uuidstr); \

3
src/xen/xen_driver.c
View File

@ -203,9 +203,6 @@ xenDomainUsedCpus(virDomainPtr dom, virDomainDefPtr def)
virNodeInfo nodeinfo; virNodeInfo nodeinfo;
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv;
if (!VIR_IS_CONNECTED_DOMAIN(dom))
return NULL;
priv = dom->conn->privateData; priv = dom->conn->privateData;
if (priv->nbNodeCpus <= 0) if (priv->nbNodeCpus <= 0)