[libvirt] [PATCH 2/3] vbox: remove duplicate macros
There is a definiton of VIR_FROM_THIS just two lines above.
The rest is defined in vbox_common.h.
---
src/vbox/vbox_driver.c | 2 --
src/vbox/vbox_network.c | 43 -------------------------------------------
2 files changed, 45 deletions(-)
diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c
index a5f3721..b3b4ee6 100644
--- a/src/vbox/vbox_driver.c
+++ b/src/vbox/vbox_driver.c
@@ -48,8 +48,6 @@
VIR_LOG_INIT("vbox.vbox_driver");
-#define VIR_FROM_THIS VIR_FROM_VBOX
-
#if !defined(WITH_DRIVER_MODULES) || defined(VBOX_DRIVER)
static virDrvOpenStatus dummyConnectOpen(virConnectPtr conn,
virConnectAuthPtr auth ATTRIBUTE_UNUSED,
diff --git a/src/vbox/vbox_network.c b/src/vbox/vbox_network.c
index ee409e3..4cfc365 100644
--- a/src/vbox/vbox_network.c
+++ b/src/vbox/vbox_network.c
@@ -37,49 +37,6 @@
VIR_LOG_INIT("vbox.vbox_network");
-#define RC_SUCCEEDED(rc) NS_SUCCEEDED(rc.resultCode)
-#define RC_FAILED(rc) NS_FAILED(rc.resultCode)
-
-#define VBOX_UTF16_FREE(arg) \
- do { \
- if (arg) { \
- gVBoxAPI.UPFN.Utf16Free(data->pFuncs, arg); \
- (arg) = NULL; \
- } \
- } while (0)
-
-#define VBOX_UTF8_FREE(arg) \
- do { \
- if (arg) { \
- gVBoxAPI.UPFN.Utf8Free(data->pFuncs, arg); \
- (arg) = NULL; \
- } \
- } while (0)
-
-#define VBOX_UTF16_TO_UTF8(arg1, arg2) gVBoxAPI.UPFN.Utf16ToUtf8(data->pFuncs, arg1,
arg2)
-#define VBOX_UTF8_TO_UTF16(arg1, arg2) gVBoxAPI.UPFN.Utf8ToUtf16(data->pFuncs, arg1,
arg2)
-
-#define VBOX_RELEASE(arg) \
- do { \
- if (arg) { \
- gVBoxAPI.nsUISupports.Release((void *)arg); \
- (arg) = NULL; \
- } \
- } while (0)
-
-#define vboxIIDUnalloc(iid) gVBoxAPI.UIID.vboxIIDUnalloc(data, iid)
-#define vboxIIDToUUID(iid, uuid) gVBoxAPI.UIID.vboxIIDToUUID(data, iid,
uuid)
-#define vboxIIDFromUUID(iid, uuid) gVBoxAPI.UIID.vboxIIDFromUUID(data, iid,
uuid)
-#define vboxIIDIsEqual(iid1, iid2) gVBoxAPI.UIID.vboxIIDIsEqual(data, iid1,
iid2)
-#define DEBUGIID(msg, iid) gVBoxAPI.UIID.DEBUGIID(msg, iid)
-#define vboxIIDFromArrayItem(iid, array, idx) \
- gVBoxAPI.UIID.vboxIIDFromArrayItem(data, iid, array, idx)
-
-#define VBOX_IID_INITIALIZE(iid) gVBoxAPI.UIID.vboxIIDInitialize(iid)
-
-#define ARRAY_GET_MACHINES \
- (gVBoxAPI.UArray.handleGetMachines(data->vboxObj))
-
static vboxUniformedAPI gVBoxAPI;
/**
--
2.7.3