提交 968fe2c8 编写于 作者: E Eric Blake

maint: inline VIR_IS_CONNECT macro

Cleanup after commit db3dd082 removed all clients outside of
the .h file.

* src/datatypes.h (VIR_IS_CONNECT): Delete, and inline into all
callers, since no other file uses it any more.
Signed-off-by: NEric Blake <eblake@redhat.com>
上级 31b5bad9
...@@ -40,11 +40,9 @@ extern virClassPtr virStreamClass; ...@@ -40,11 +40,9 @@ extern virClassPtr virStreamClass;
extern virClassPtr virStorageVolClass; extern virClassPtr virStorageVolClass;
extern virClassPtr virStoragePoolClass; extern virClassPtr virStoragePoolClass;
# define VIR_IS_CONNECT(obj) \
(virObjectIsClass((obj), virConnectClass))
# define virCheckConnectReturn(obj, retval) \ # define virCheckConnectReturn(obj, retval) \
do { \ do { \
if (!VIR_IS_CONNECT(obj)) { \ if (!virObjectIsClass(obj, virConnectClass)) { \
virReportErrorHelper(VIR_FROM_THIS, VIR_ERR_INVALID_CONN, \ virReportErrorHelper(VIR_FROM_THIS, VIR_ERR_INVALID_CONN, \
__FILE__, __FUNCTION__, __LINE__, \ __FILE__, __FUNCTION__, __LINE__, \
__FUNCTION__); \ __FUNCTION__); \
...@@ -54,7 +52,7 @@ extern virClassPtr virStoragePoolClass; ...@@ -54,7 +52,7 @@ extern virClassPtr virStoragePoolClass;
} while (0) } while (0)
# define virCheckConnectGoto(obj, label) \ # define virCheckConnectGoto(obj, label) \
do { \ do { \
if (!VIR_IS_CONNECT(obj)) { \ if (!virObjectIsClass(obj, virConnectClass)) { \
virReportErrorHelper(VIR_FROM_THIS, VIR_ERR_INVALID_CONN, \ virReportErrorHelper(VIR_FROM_THIS, VIR_ERR_INVALID_CONN, \
__FILE__, __FUNCTION__, __LINE__, \ __FILE__, __FUNCTION__, __LINE__, \
__FUNCTION__); \ __FUNCTION__); \
...@@ -65,47 +63,47 @@ extern virClassPtr virStoragePoolClass; ...@@ -65,47 +63,47 @@ extern virClassPtr virStoragePoolClass;
# define VIR_IS_DOMAIN(obj) \ # define VIR_IS_DOMAIN(obj) \
(virObjectIsClass((obj), virDomainClass)) (virObjectIsClass((obj), virDomainClass))
# define VIR_IS_CONNECTED_DOMAIN(obj) \ # define VIR_IS_CONNECTED_DOMAIN(obj) \
(VIR_IS_DOMAIN(obj) && VIR_IS_CONNECT((obj)->conn)) (VIR_IS_DOMAIN(obj) && virObjectIsClass((obj)->conn, virConnectClass))
# define VIR_IS_NETWORK(obj) \ # define VIR_IS_NETWORK(obj) \
(virObjectIsClass((obj), virNetworkClass)) (virObjectIsClass((obj), virNetworkClass))
# define VIR_IS_CONNECTED_NETWORK(obj) \ # define VIR_IS_CONNECTED_NETWORK(obj) \
(VIR_IS_NETWORK(obj) && VIR_IS_CONNECT((obj)->conn)) (VIR_IS_NETWORK(obj) && virObjectIsClass((obj)->conn, virConnectClass))
# define VIR_IS_INTERFACE(obj) \ # define VIR_IS_INTERFACE(obj) \
(virObjectIsClass((obj), virInterfaceClass)) (virObjectIsClass((obj), virInterfaceClass))
# define VIR_IS_CONNECTED_INTERFACE(obj) \ # define VIR_IS_CONNECTED_INTERFACE(obj) \
(VIR_IS_INTERFACE(obj) && VIR_IS_CONNECT((obj)->conn)) (VIR_IS_INTERFACE(obj) && virObjectIsClass((obj)->conn, virConnectClass))
# define VIR_IS_STORAGE_POOL(obj) \ # define VIR_IS_STORAGE_POOL(obj) \
(virObjectIsClass((obj), virStoragePoolClass)) (virObjectIsClass((obj), virStoragePoolClass))
# define VIR_IS_CONNECTED_STORAGE_POOL(obj) \ # define VIR_IS_CONNECTED_STORAGE_POOL(obj) \
(VIR_IS_STORAGE_POOL(obj) && VIR_IS_CONNECT((obj)->conn)) (VIR_IS_STORAGE_POOL(obj) && virObjectIsClass((obj)->conn, virConnectClass))
# define VIR_IS_STORAGE_VOL(obj) \ # define VIR_IS_STORAGE_VOL(obj) \
(virObjectIsClass((obj), virStorageVolClass)) (virObjectIsClass((obj), virStorageVolClass))
# define VIR_IS_CONNECTED_STORAGE_VOL(obj) \ # define VIR_IS_CONNECTED_STORAGE_VOL(obj) \
(VIR_IS_STORAGE_VOL(obj) && VIR_IS_CONNECT((obj)->conn)) (VIR_IS_STORAGE_VOL(obj) && virObjectIsClass((obj)->conn, virConnectClass))
# define VIR_IS_NODE_DEVICE(obj) \ # define VIR_IS_NODE_DEVICE(obj) \
(virObjectIsClass((obj), virNodeDeviceClass)) (virObjectIsClass((obj), virNodeDeviceClass))
# define VIR_IS_CONNECTED_NODE_DEVICE(obj) \ # define VIR_IS_CONNECTED_NODE_DEVICE(obj) \
(VIR_IS_NODE_DEVICE(obj) && VIR_IS_CONNECT((obj)->conn)) (VIR_IS_NODE_DEVICE(obj) && virObjectIsClass((obj)->conn, virConnectClass))
# define VIR_IS_SECRET(obj) \ # define VIR_IS_SECRET(obj) \
(virObjectIsClass((obj), virSecretClass)) (virObjectIsClass((obj), virSecretClass))
# define VIR_IS_CONNECTED_SECRET(obj) \ # define VIR_IS_CONNECTED_SECRET(obj) \
(VIR_IS_SECRET(obj) && VIR_IS_CONNECT((obj)->conn)) (VIR_IS_SECRET(obj) && virObjectIsClass((obj)->conn, virConnectClass))
# define VIR_IS_STREAM(obj) \ # define VIR_IS_STREAM(obj) \
(virObjectIsClass((obj), virStreamClass)) (virObjectIsClass((obj), virStreamClass))
# define VIR_IS_CONNECTED_STREAM(obj) \ # define VIR_IS_CONNECTED_STREAM(obj) \
(VIR_IS_STREAM(obj) && VIR_IS_CONNECT((obj)->conn)) (VIR_IS_STREAM(obj) && virObjectIsClass((obj)->conn, virConnectClass))
# define VIR_IS_NWFILTER(obj) \ # define VIR_IS_NWFILTER(obj) \
(virObjectIsClass((obj), virNWFilterClass)) (virObjectIsClass((obj), virNWFilterClass))
# define VIR_IS_CONNECTED_NWFILTER(obj) \ # define VIR_IS_CONNECTED_NWFILTER(obj) \
(VIR_IS_NWFILTER(obj) && VIR_IS_CONNECT((obj)->conn)) (VIR_IS_NWFILTER(obj) && virObjectIsClass((obj)->conn, virConnectClass))
# define VIR_IS_SNAPSHOT(obj) \ # define VIR_IS_SNAPSHOT(obj) \
(virObjectIsClass((obj), virDomainSnapshotClass)) (virObjectIsClass((obj), virDomainSnapshotClass))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册