Re: [libvirt] [PATCH 2/4] vbox: replace vboxGlobalData with vboxPrivate.

2016-10-11 Thread Martin Kletzander 

On Wed, Sep 28, 2016 at 01:41:34PM -0400, Dawid Zamirski wrote:

Since those stucts are identical at the moment, this patch basically
does s/vboxGlobalData \*data/vboxPrivate *data/ with type casts in
vboxDriverLock/Unlock calls to keep the code working and take care of
unavoidable diff noise to set the stage for further commits that
actually address the issue for the patch series.
---
src/vbox/vbox_common.c| 164 +-
src/vbox/vbox_network.c   |  24 +++
src/vbox/vbox_storage.c   |  20 +++---
src/vbox/vbox_tmpl.c  | 146 ++---
src/vbox/vbox_uniformed_api.h |  54 +++---
5 files changed, 204 insertions(+), 204 deletions(-)

diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 23f63f9..13869eb 100644
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -206,12 +206,12 @@ static vboxGlobalData *g_pVBoxGlobalData;


So the g_pVBoxGlobalData is still pointer to vboxGlobalData, but ...


@@ -1312,7 +1312,7 @@ _vboxDomainSnapshotRestore(virDomainPtr dom,
  IMachine *machine,
  ISnapshot *snapshot)
{
-vboxGlobalData *data = dom->conn->privateData;
+vboxPrivate *data = dom->conn->privateData;


in all cases you change here, like this...


# if VBOX_API_VERSION < 500
IConsole *console = NULL;
# endif /*VBOX_API_VERSION < 500*/
@@ -1422,7 +1422,7 @@ vboxCallbackOnMachineStateChange(IVirtualBoxCallback 
*pThis ATTRIBUTE_UNUSED,
int event = 0;
int detail = 0;

-vboxDriverLock(g_pVBoxGlobalData);
+vboxDriverLock((vboxPrivate *) g_pVBoxGlobalData);



and this (and others) you *just* cast it to different struct.  That's
not good.  I'm guessing this is still just a differently separated
commit.


signature.asc
Description: Digital signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH 2/4] vbox: replace vboxGlobalData with vboxPrivate.

2016-09-28 Thread Dawid Zamirski 
Since those stucts are identical at the moment, this patch basically
does s/vboxGlobalData \*data/vboxPrivate *data/ with type casts in
vboxDriverLock/Unlock calls to keep the code working and take care of
unavoidable diff noise to set the stage for further commits that
actually address the issue for the patch series.
---
 src/vbox/vbox_common.c| 164 +-
 src/vbox/vbox_network.c   |  24 +++
 src/vbox/vbox_storage.c   |  20 +++---
 src/vbox/vbox_tmpl.c  | 146 ++---
 src/vbox/vbox_uniformed_api.h |  54 +++---
 5 files changed, 204 insertions(+), 204 deletions(-)

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index 1472639..be6ff2d 100644
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -57,7 +57,7 @@ VIR_LOG_INIT("vbox.vbox_common");
 /* global vbox API, used for all common codes. */
 static vboxUniformedAPI gVBoxAPI;
 
-static int openSessionForMachine(vboxGlobalData *data, const unsigned char 
*dom_uuid, vboxIIDUnion *iid,
+static int openSessionForMachine(vboxPrivate *data, const unsigned char 
*dom_uuid, vboxIIDUnion *iid,
  IMachine **machine, bool checkflag)
 {
 VBOX_IID_INITIALIZE(iid);
@@ -286,7 +286,7 @@ vboxXMLConfInit(void)
  NULL, NULL);
 }
 
-static int vboxInitialize(vboxGlobalData *data)
+static int vboxInitialize(vboxPrivate *data)
 {
 if (gVBoxAPI.UPFN.Initialize(data) != 0)
 goto cleanup;
@@ -348,7 +348,7 @@ static virCapsPtr vboxCapsInit(void)
 return NULL;
 }
 
-static int vboxExtractVersion(vboxGlobalData *data)
+static int vboxExtractVersion(vboxPrivate *data)
 {
 int ret = -1;
 PRUnichar *versionUtf16 = NULL;
@@ -377,7 +377,7 @@ static int vboxExtractVersion(vboxGlobalData *data)
 return ret;
 }
 
-static void vboxUninitialize(vboxGlobalData *data)
+static void vboxUninitialize(vboxPrivate *data)
 {
 if (!data)
 return;
@@ -397,7 +397,7 @@ vboxConnectOpen(virConnectPtr conn,
 virConfPtr conf ATTRIBUTE_UNUSED,
 unsigned int flags)
 {
-vboxGlobalData *data = NULL;
+vboxPrivate *data = NULL;
 uid_t uid = geteuid();
 
 virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR);
@@ -466,7 +466,7 @@ vboxConnectOpen(virConnectPtr conn,
 
 static int vboxConnectClose(virConnectPtr conn)
 {
-vboxGlobalData *data = conn->privateData;
+vboxPrivate *data = conn->privateData;
 VIR_DEBUG("%s: in vboxClose", conn->driver->name);
 
 vboxUninitialize(data);
@@ -478,7 +478,7 @@ static int vboxConnectClose(virConnectPtr conn)
 static int
 vboxDomainSave(virDomainPtr dom, const char *path ATTRIBUTE_UNUSED)
 {
-vboxGlobalData *data = dom->conn->privateData;
+vboxPrivate *data = dom->conn->privateData;
 IConsole *console = NULL;
 vboxIIDUnion iid;
 IMachine *machine = NULL;
@@ -530,19 +530,19 @@ vboxDomainSave(virDomainPtr dom, const char *path 
ATTRIBUTE_UNUSED)
 return ret;
 }
 
-static void vboxDriverLock(vboxGlobalData *data)
+static void vboxDriverLock(vboxPrivate *data)
 {
 virMutexLock(>lock);
 }
 
-static void vboxDriverUnlock(vboxGlobalData *data)
+static void vboxDriverUnlock(vboxPrivate *data)
 {
 virMutexUnlock(>lock);
 }
 
 static int vboxConnectGetVersion(virConnectPtr conn, unsigned long *version)
 {
-vboxGlobalData *data = conn->privateData;
+vboxPrivate *data = conn->privateData;
 VIR_DEBUG("%s: in vboxGetVersion", conn->driver->name);
 
 vboxDriverLock(data);
@@ -577,7 +577,7 @@ static int vboxConnectIsAlive(virConnectPtr conn 
ATTRIBUTE_UNUSED)
 static int
 vboxConnectGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNUSED)
 {
-vboxGlobalData *data = conn->privateData;
+vboxPrivate *data = conn->privateData;
 PRUint32 maxCPUCount = 0;
 int ret = -1;
 
@@ -604,7 +604,7 @@ vboxConnectGetMaxVcpus(virConnectPtr conn, const char *type 
ATTRIBUTE_UNUSED)
 
 static char *vboxConnectGetCapabilities(virConnectPtr conn)
 {
-vboxGlobalData *data = conn->privateData;
+vboxPrivate *data = conn->privateData;
 char *ret = NULL;
 
 if (!data->vboxObj)
@@ -619,7 +619,7 @@ static char *vboxConnectGetCapabilities(virConnectPtr conn)
 
 static int vboxConnectListDomains(virConnectPtr conn, int *ids, int nids)
 {
-vboxGlobalData *data = conn->privateData;
+vboxPrivate *data = conn->privateData;
 vboxArray machines = VBOX_ARRAY_INITIALIZER;
 PRUint32 state;
 nsresult rc;
@@ -661,7 +661,7 @@ static int vboxConnectListDomains(virConnectPtr conn, int 
*ids, int nids)
 
 static int vboxConnectNumOfDomains(virConnectPtr conn)
 {
-vboxGlobalData *data = conn->privateData;
+vboxPrivate *data = conn->privateData;
 vboxArray machines = VBOX_ARRAY_INITIALIZER;
 PRUint32 state;
 nsresult rc;
@@ -700,7 +700,7 @@ static int vboxConnectNumOfDomains(virConnectPtr conn)
 
 static virDomainPtr