Re: [libvirt] [PATCH 05/14] Use a libvirt custom struct for virURIPtr

[Osier Yang]

On 2012年03月21日 01:33, Daniel P. Berrange wrote:

From: "Daniel P. Berrange"

Instead of just typedef'ing the xmlURIPtr struct for virURIPtr,
use a custom libvirt struct. This allows us to fix various
problems with libxml2. This initially just fixes the query vs
query_raw handling problems.
---
  src/esx/esx_util.c |4 --
  src/hyperv/hyperv_util.c   |4 --
  src/libvirt.c  |5 +--
  src/remote/remote_driver.c |   16 +
  src/util/viruri.c  |   79 +++
  src/util/viruri.h  |   14 +++-
  6 files changed, 78 insertions(+), 44 deletions(-)

diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c
index 7d4b908..67b07b7 100644
--- a/src/esx/esx_util.c
+++ b/src/esx/esx_util.c
@@ -62,11 +62,7 @@ esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, virURIPtr 
uri)
  return -1;
  }

-#ifdef HAVE_XMLURI_QUERY_RAW
-queryParamSet = qparam_query_parse(uri->query_raw);
-#else
  queryParamSet = qparam_query_parse(uri->query);
-#endif

  if (queryParamSet == NULL) {
  goto cleanup;
diff --git a/src/hyperv/hyperv_util.c b/src/hyperv/hyperv_util.c
index 2e6a2d4..63c761b 100644
--- a/src/hyperv/hyperv_util.c
+++ b/src/hyperv/hyperv_util.c
@@ -54,11 +54,7 @@ hypervParseUri(hypervParsedUri **parsedUri, virURIPtr uri)
  return -1;
  }

-#ifdef HAVE_XMLURI_QUERY_RAW
-queryParamSet = qparam_query_parse(uri->query_raw);
-#else
  queryParamSet = qparam_query_parse(uri->query);
-#endif

  if (queryParamSet == NULL) {
  goto cleanup;
diff --git a/src/libvirt.c b/src/libvirt.c
index f7590e0..fb7885f 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -1173,15 +1173,12 @@ do_open (const char *name,

  VIR_DEBUG("name \"%s\" to URI components:\n"
"  scheme %s\n"
-  "  opaque %s\n"
-  "  authority %s\n"
"  server %s\n"
"  user %s\n"
"  port %d\n"
"  path %s\n",
alias ? alias : name,
-  NULLSTR(ret->uri->scheme), NULLSTR(ret->uri->opaque),
-  NULLSTR(ret->uri->authority), NULLSTR(ret->uri->server),
+  NULLSTR(ret->uri->scheme), NULLSTR(ret->uri->server),
NULLSTR(ret->uri->user), ret->uri->port,
NULLSTR(ret->uri->path));

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index c6c5809..9de966f 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -417,15 +417,9 @@ doRemoteOpen (virConnectPtr conn,
   */
  struct qparam *var;
  int i;
-char *query;

  if (conn->uri) {
-#ifdef HAVE_XMLURI_QUERY_RAW
-query = conn->uri->query_raw;
-#else
-query = conn->uri->query;
-#endif
-vars = qparam_query_parse (query);
+vars = qparam_query_parse (conn->uri->query);
  if (vars == NULL) goto failed;

  for (i = 0; i<  vars->n; i++) {
@@ -490,11 +484,7 @@ doRemoteOpen (virConnectPtr conn,
  } else {
  virURI tmpuri = {
  .scheme = conn->uri->scheme,
-#ifdef HAVE_XMLURI_QUERY_RAW
-.query_raw = qparam_get_query (vars),
-#else
  .query = qparam_get_query (vars),
-#endif
  .path = conn->uri->path,
  .fragment = conn->uri->fragment,
  };
@@ -507,11 +497,7 @@ doRemoteOpen (virConnectPtr conn,

  name = virURIFormat(&tmpuri);

-#ifdef HAVE_XMLURI_QUERY_RAW
-VIR_FREE(tmpuri.query_raw);
-#else
  VIR_FREE(tmpuri.query);
-#endif

  /* Restore transport scheme */
  if (transport_str)
diff --git a/src/util/viruri.c b/src/util/viruri.c
index bbd8742..d8618d1 100644
--- a/src/util/viruri.c
+++ b/src/util/viruri.c
@@ -36,15 +36,45 @@
  virURIPtr
  virURIParse(const char *uri)
  {
-virURIPtr ret = xmlParseURI(uri);
+xmlURIPtr xmluri;
+virURIPtr ret = NULL;

-if (!ret) {
+xmluri = xmlParseURI(uri);
+
+if (!uri) {


s/uri/xmluri/


  /* libxml2 does not tell us what failed. Grr :-( */
  virURIReportError(VIR_ERR_INTERNAL_ERROR,
"Unable to parse URI %s", uri);
  return NULL;
  }

+if (VIR_ALLOC(ret)<  0)
+goto no_memory;
+
+if (xmluri->scheme&&
+!(ret->scheme = strdup(xmluri->scheme)))
+goto no_memory;
+if (xmluri->server&&
+!(ret->server = strdup(xmluri->server)))
+goto no_memory;
+ret->port = xmluri->port;
+if (xmluri->path&&
+!(ret->path = strdup(xmluri->path)))
+goto no_memory;
+#ifdef HAVE_XMLURI_QUERY_RAW
+if (xmluri->query_raw&&
+!(ret->query = strdup(xmluri->query_raw)))
+goto no_memory;
+#else
+if (xmluri->query&&
+!(ret->query = strdup(xmluri->query)))
+goto 

[libvirt] [PATCH 05/14] Use a libvirt custom struct for virURIPtr

[Daniel P. Berrange]

From: "Daniel P. Berrange" 

Instead of just typedef'ing the xmlURIPtr struct for virURIPtr,
use a custom libvirt struct. This allows us to fix various
problems with libxml2. This initially just fixes the query vs
query_raw handling problems.
---
 src/esx/esx_util.c |4 --
 src/hyperv/hyperv_util.c   |4 --
 src/libvirt.c  |5 +--
 src/remote/remote_driver.c |   16 +
 src/util/viruri.c  |   79 +++
 src/util/viruri.h  |   14 +++-
 6 files changed, 78 insertions(+), 44 deletions(-)

diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c
index 7d4b908..67b07b7 100644
--- a/src/esx/esx_util.c
+++ b/src/esx/esx_util.c
@@ -62,11 +62,7 @@ esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, virURIPtr 
uri)
 return -1;
 }
 
-#ifdef HAVE_XMLURI_QUERY_RAW
-queryParamSet = qparam_query_parse(uri->query_raw);
-#else
 queryParamSet = qparam_query_parse(uri->query);
-#endif
 
 if (queryParamSet == NULL) {
 goto cleanup;
diff --git a/src/hyperv/hyperv_util.c b/src/hyperv/hyperv_util.c
index 2e6a2d4..63c761b 100644
--- a/src/hyperv/hyperv_util.c
+++ b/src/hyperv/hyperv_util.c
@@ -54,11 +54,7 @@ hypervParseUri(hypervParsedUri **parsedUri, virURIPtr uri)
 return -1;
 }
 
-#ifdef HAVE_XMLURI_QUERY_RAW
-queryParamSet = qparam_query_parse(uri->query_raw);
-#else
 queryParamSet = qparam_query_parse(uri->query);
-#endif
 
 if (queryParamSet == NULL) {
 goto cleanup;
diff --git a/src/libvirt.c b/src/libvirt.c
index f7590e0..fb7885f 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -1173,15 +1173,12 @@ do_open (const char *name,
 
 VIR_DEBUG("name \"%s\" to URI components:\n"
   "  scheme %s\n"
-  "  opaque %s\n"
-  "  authority %s\n"
   "  server %s\n"
   "  user %s\n"
   "  port %d\n"
   "  path %s\n",
   alias ? alias : name,
-  NULLSTR(ret->uri->scheme), NULLSTR(ret->uri->opaque),
-  NULLSTR(ret->uri->authority), NULLSTR(ret->uri->server),
+  NULLSTR(ret->uri->scheme), NULLSTR(ret->uri->server),
   NULLSTR(ret->uri->user), ret->uri->port,
   NULLSTR(ret->uri->path));
 
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index c6c5809..9de966f 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -417,15 +417,9 @@ doRemoteOpen (virConnectPtr conn,
  */
 struct qparam *var;
 int i;
-char *query;
 
 if (conn->uri) {
-#ifdef HAVE_XMLURI_QUERY_RAW
-query = conn->uri->query_raw;
-#else
-query = conn->uri->query;
-#endif
-vars = qparam_query_parse (query);
+vars = qparam_query_parse (conn->uri->query);
 if (vars == NULL) goto failed;
 
 for (i = 0; i < vars->n; i++) {
@@ -490,11 +484,7 @@ doRemoteOpen (virConnectPtr conn,
 } else {
 virURI tmpuri = {
 .scheme = conn->uri->scheme,
-#ifdef HAVE_XMLURI_QUERY_RAW
-.query_raw = qparam_get_query (vars),
-#else
 .query = qparam_get_query (vars),
-#endif
 .path = conn->uri->path,
 .fragment = conn->uri->fragment,
 };
@@ -507,11 +497,7 @@ doRemoteOpen (virConnectPtr conn,
 
 name = virURIFormat(&tmpuri);
 
-#ifdef HAVE_XMLURI_QUERY_RAW
-VIR_FREE(tmpuri.query_raw);
-#else
 VIR_FREE(tmpuri.query);
-#endif
 
 /* Restore transport scheme */
 if (transport_str)
diff --git a/src/util/viruri.c b/src/util/viruri.c
index bbd8742..d8618d1 100644
--- a/src/util/viruri.c
+++ b/src/util/viruri.c
@@ -36,15 +36,45 @@
 virURIPtr
 virURIParse(const char *uri)
 {
-virURIPtr ret = xmlParseURI(uri);
+xmlURIPtr xmluri;
+virURIPtr ret = NULL;
 
-if (!ret) {
+xmluri = xmlParseURI(uri);
+
+if (!uri) {
 /* libxml2 does not tell us what failed. Grr :-( */
 virURIReportError(VIR_ERR_INTERNAL_ERROR,
   "Unable to parse URI %s", uri);
 return NULL;
 }
 
+if (VIR_ALLOC(ret) < 0)
+goto no_memory;
+
+if (xmluri->scheme &&
+!(ret->scheme = strdup(xmluri->scheme)))
+goto no_memory;
+if (xmluri->server &&
+!(ret->server = strdup(xmluri->server)))
+goto no_memory;
+ret->port = xmluri->port;
+if (xmluri->path &&
+!(ret->path = strdup(xmluri->path)))
+goto no_memory;
+#ifdef HAVE_XMLURI_QUERY_RAW
+if (xmluri->query_raw &&
+!(ret->query = strdup(xmluri->query_raw)))
+goto no_memory;
+#else
+if (xmluri->query &&
+!(ret->query = strdup(xmluri->query)))
+goto no_memory;
+#endif
+if (xmluri->fragment &&
+!(ret->fragment = strdup(xmluri->fragment))