Re: [libvirt] [PATCH 03/40] Remove pointless GET_PRIVATE macro from Xen driver

2013-05-03 Thread Jim Fehlig 
Daniel P. Berrange wrote:
 From: Daniel P. Berrange berra...@redhat.com

 The Xen driver uses a macro GET_PRIVATE as a supposed shorthand
 for 'xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) (conn)-privateData'.
 It does not in fact save any lines of code, and obscures what is
 happening. Remove it, since it adds no value.

 Signed-off-by: Daniel P. Berrange berra...@redhat.com
 ---
  src/xen/xen_driver.c | 131 
 +--
  1 file changed, 64 insertions(+), 67 deletions(-)
   

ACK.

Regards,
Jim

 diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
 index 0342523..2ecb86f 100644
 --- a/src/xen/xen_driver.c
 +++ b/src/xen/xen_driver.c
 @@ -470,13 +470,10 @@ clean:
  return ret;
  }
  
 -#define GET_PRIVATE(conn) \
 -xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) (conn)-privateData
 -
  static int
  xenUnifiedConnectClose(virConnectPtr conn)
  {
 -GET_PRIVATE(conn);
 +xenUnifiedPrivatePtr priv = conn-privateData;
  int i;
  
  virObjectUnref(priv-caps);
 @@ -508,7 +505,7 @@ unsigned long xenUnifiedVersion(void)
  static const char *
  xenUnifiedConnectGetType(virConnectPtr conn)
  {
 -GET_PRIVATE(conn);
 +xenUnifiedPrivatePtr priv = conn-privateData;
  int i;
  
  for (i = 0; i  XEN_UNIFIED_NR_DRIVERS; ++i)
 @@ -534,7 +531,7 @@ xenUnifiedConnectSupportsFeature(virConnectPtr conn 
 ATTRIBUTE_UNUSED, int featur
  static int
  xenUnifiedConnectGetVersion(virConnectPtr conn, unsigned long *hvVer)
  {
 -GET_PRIVATE(conn);
 +xenUnifiedPrivatePtr priv = conn-privateData;
  int i;
  
  for (i = 0; i  XEN_UNIFIED_NR_DRIVERS; ++i)
 @@ -562,7 +559,7 @@ xenUnifiedConnectIsEncrypted(virConnectPtr conn 
 ATTRIBUTE_UNUSED)
  static int
  xenUnifiedConnectIsSecure(virConnectPtr conn)
  {
 -GET_PRIVATE(conn);
 +xenUnifiedPrivatePtr priv = conn-privateData;
  int ret = 1;
  
  /* All drivers are secure, except for XenD over TCP */
 @@ -583,7 +580,7 @@ xenUnifiedConnectIsAlive(virConnectPtr conn 
 ATTRIBUTE_UNUSED)
  int
  xenUnifiedConnectGetMaxVcpus(virConnectPtr conn, const char *type)
  {
 -GET_PRIVATE(conn);
 +xenUnifiedPrivatePtr priv = conn-privateData;
  
  if (type  STRCASENEQ(type, Xen)) {
  virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
 @@ -601,7 +598,7 @@ xenUnifiedConnectGetMaxVcpus(virConnectPtr conn, const 
 char *type)
  static int
  xenUnifiedNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info)
  {
 -GET_PRIVATE(conn);
 +xenUnifiedPrivatePtr priv = conn-privateData;
  
  if (priv-opened[XEN_UNIFIED_XEND_OFFSET])
  return xenDaemonNodeGetInfo(conn, info);
 @@ -625,7 +622,7 @@ xenUnifiedConnectGetCapabilities(virConnectPtr conn)
  static int
  xenUnifiedConnectListDomains(virConnectPtr conn, int *ids, int maxids)
  {
 -GET_PRIVATE(conn);
 +xenUnifiedPrivatePtr priv = conn-privateData;
  int ret;
  
  /* Try xenstore. */
 @@ -652,7 +649,7 @@ xenUnifiedConnectListDomains(virConnectPtr conn, int 
 *ids, int maxids)
  static int
  xenUnifiedConnectNumOfDomains(virConnectPtr conn)
  {
 -GET_PRIVATE(conn);
 +xenUnifiedPrivatePtr priv = conn-privateData;
  int ret;
  
  /* Try xenstore. */
 @@ -680,7 +677,7 @@ static virDomainPtr
  xenUnifiedDomainCreateXML(virConnectPtr conn,
const char *xmlDesc, unsigned int flags)
  {
 -GET_PRIVATE(conn);
 +xenUnifiedPrivatePtr priv = conn-privateData;
  
  if (priv-opened[XEN_UNIFIED_XEND_OFFSET])
  return xenDaemonCreateXML(conn, xmlDesc, flags);
 @@ -694,7 +691,7 @@ xenUnifiedDomainCreateXML(virConnectPtr conn,
  static virDomainPtr
  xenUnifiedDomainLookupByID(virConnectPtr conn, int id)
  {
 -GET_PRIVATE(conn);
 +xenUnifiedPrivatePtr priv = conn-privateData;
  virDomainPtr ret;
  
  /* Reset any connection-level errors in virterror first, in case
 @@ -725,7 +722,7 @@ static virDomainPtr
  xenUnifiedDomainLookupByUUID(virConnectPtr conn,
   const unsigned char *uuid)
  {
 -GET_PRIVATE(conn);
 +xenUnifiedPrivatePtr priv = conn-privateData;
  virDomainPtr ret;
  
  /* Reset any connection-level errors in virterror first, in case
 @@ -763,7 +760,7 @@ static virDomainPtr
  xenUnifiedDomainLookupByName(virConnectPtr conn,
   const char *name)
  {
 -GET_PRIVATE(conn);
 +xenUnifiedPrivatePtr priv = conn-privateData;
  virDomainPtr ret;
  
  /* Reset any connection-level errors in virterror first, in case
 @@ -818,7 +815,7 @@ xenUnifiedDomainIsActive(virDomainPtr dom)
  static int
  xenUnifiedDomainIsPersistent(virDomainPtr dom)
  {
 -GET_PRIVATE(dom-conn);
 +xenUnifiedPrivatePtr priv = dom-conn-privateData;
  virDomainPtr currdom = NULL;
  int ret = -1;
  
 @@ -875,7 +872,7 @@ xenUnifiedDomainIsUpdated(virDomainPtr dom 
 ATTRIBUTE_UNUSED)
  static int
  xenUnifiedDomainSuspend(virDomainPtr dom)
  {
 -

[libvirt] [PATCH 03/40] Remove pointless GET_PRIVATE macro from Xen driver

2013-05-02 Thread Daniel P. Berrange 
From: Daniel P. Berrange berra...@redhat.com

The Xen driver uses a macro GET_PRIVATE as a supposed shorthand
for 'xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) (conn)-privateData'.
It does not in fact save any lines of code, and obscures what is
happening. Remove it, since it adds no value.

Signed-off-by: Daniel P. Berrange berra...@redhat.com
---
 src/xen/xen_driver.c | 131 +--
 1 file changed, 64 insertions(+), 67 deletions(-)

diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 0342523..2ecb86f 100644
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -470,13 +470,10 @@ clean:
 return ret;
 }
 
-#define GET_PRIVATE(conn) \
-xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) (conn)-privateData
-
 static int
 xenUnifiedConnectClose(virConnectPtr conn)
 {
-GET_PRIVATE(conn);
+xenUnifiedPrivatePtr priv = conn-privateData;
 int i;
 
 virObjectUnref(priv-caps);
@@ -508,7 +505,7 @@ unsigned long xenUnifiedVersion(void)
 static const char *
 xenUnifiedConnectGetType(virConnectPtr conn)
 {
-GET_PRIVATE(conn);
+xenUnifiedPrivatePtr priv = conn-privateData;
 int i;
 
 for (i = 0; i  XEN_UNIFIED_NR_DRIVERS; ++i)
@@ -534,7 +531,7 @@ xenUnifiedConnectSupportsFeature(virConnectPtr conn 
ATTRIBUTE_UNUSED, int featur
 static int
 xenUnifiedConnectGetVersion(virConnectPtr conn, unsigned long *hvVer)
 {
-GET_PRIVATE(conn);
+xenUnifiedPrivatePtr priv = conn-privateData;
 int i;
 
 for (i = 0; i  XEN_UNIFIED_NR_DRIVERS; ++i)
@@ -562,7 +559,7 @@ xenUnifiedConnectIsEncrypted(virConnectPtr conn 
ATTRIBUTE_UNUSED)
 static int
 xenUnifiedConnectIsSecure(virConnectPtr conn)
 {
-GET_PRIVATE(conn);
+xenUnifiedPrivatePtr priv = conn-privateData;
 int ret = 1;
 
 /* All drivers are secure, except for XenD over TCP */
@@ -583,7 +580,7 @@ xenUnifiedConnectIsAlive(virConnectPtr conn 
ATTRIBUTE_UNUSED)
 int
 xenUnifiedConnectGetMaxVcpus(virConnectPtr conn, const char *type)
 {
-GET_PRIVATE(conn);
+xenUnifiedPrivatePtr priv = conn-privateData;
 
 if (type  STRCASENEQ(type, Xen)) {
 virReportError(VIR_ERR_INVALID_ARG, __FUNCTION__);
@@ -601,7 +598,7 @@ xenUnifiedConnectGetMaxVcpus(virConnectPtr conn, const char 
*type)
 static int
 xenUnifiedNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info)
 {
-GET_PRIVATE(conn);
+xenUnifiedPrivatePtr priv = conn-privateData;
 
 if (priv-opened[XEN_UNIFIED_XEND_OFFSET])
 return xenDaemonNodeGetInfo(conn, info);
@@ -625,7 +622,7 @@ xenUnifiedConnectGetCapabilities(virConnectPtr conn)
 static int
 xenUnifiedConnectListDomains(virConnectPtr conn, int *ids, int maxids)
 {
-GET_PRIVATE(conn);
+xenUnifiedPrivatePtr priv = conn-privateData;
 int ret;
 
 /* Try xenstore. */
@@ -652,7 +649,7 @@ xenUnifiedConnectListDomains(virConnectPtr conn, int *ids, 
int maxids)
 static int
 xenUnifiedConnectNumOfDomains(virConnectPtr conn)
 {
-GET_PRIVATE(conn);
+xenUnifiedPrivatePtr priv = conn-privateData;
 int ret;
 
 /* Try xenstore. */
@@ -680,7 +677,7 @@ static virDomainPtr
 xenUnifiedDomainCreateXML(virConnectPtr conn,
   const char *xmlDesc, unsigned int flags)
 {
-GET_PRIVATE(conn);
+xenUnifiedPrivatePtr priv = conn-privateData;
 
 if (priv-opened[XEN_UNIFIED_XEND_OFFSET])
 return xenDaemonCreateXML(conn, xmlDesc, flags);
@@ -694,7 +691,7 @@ xenUnifiedDomainCreateXML(virConnectPtr conn,
 static virDomainPtr
 xenUnifiedDomainLookupByID(virConnectPtr conn, int id)
 {
-GET_PRIVATE(conn);
+xenUnifiedPrivatePtr priv = conn-privateData;
 virDomainPtr ret;
 
 /* Reset any connection-level errors in virterror first, in case
@@ -725,7 +722,7 @@ static virDomainPtr
 xenUnifiedDomainLookupByUUID(virConnectPtr conn,
  const unsigned char *uuid)
 {
-GET_PRIVATE(conn);
+xenUnifiedPrivatePtr priv = conn-privateData;
 virDomainPtr ret;
 
 /* Reset any connection-level errors in virterror first, in case
@@ -763,7 +760,7 @@ static virDomainPtr
 xenUnifiedDomainLookupByName(virConnectPtr conn,
  const char *name)
 {
-GET_PRIVATE(conn);
+xenUnifiedPrivatePtr priv = conn-privateData;
 virDomainPtr ret;
 
 /* Reset any connection-level errors in virterror first, in case
@@ -818,7 +815,7 @@ xenUnifiedDomainIsActive(virDomainPtr dom)
 static int
 xenUnifiedDomainIsPersistent(virDomainPtr dom)
 {
-GET_PRIVATE(dom-conn);
+xenUnifiedPrivatePtr priv = dom-conn-privateData;
 virDomainPtr currdom = NULL;
 int ret = -1;
 
@@ -875,7 +872,7 @@ xenUnifiedDomainIsUpdated(virDomainPtr dom ATTRIBUTE_UNUSED)
 static int
 xenUnifiedDomainSuspend(virDomainPtr dom)
 {
-GET_PRIVATE(dom-conn);
+xenUnifiedPrivatePtr priv = dom-conn-privateData;
 int i;
 
 /* Try non-hypervisor methods first, then hypervisor direct method
@@ -898,7 +895,7 @@