Mon Apr 30 18:33:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>

	* src/libvirt.c, src/driver.h, src/proxy_internal.c,
	  src/qemu_internal.c, src/test.c, src/xen_internal.c,
	  src/xend_internal.c, src/xs_internal.c,
	  proxy/libvirt_proxy.c: Remove VIR_DRV_OPEN_QUIET.

diff --git a/ChangeLog b/ChangeLog
index 56a9108582a5a5a7fa427e28c3f6052de0be1303..35ad44e6dee4ad54fb8e5d907559d64cd44f14e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Apr 30 18:33:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
+
+       * src/libvirt.c, src/driver.h, src/proxy_internal.c,
+         src/qemu_internal.c, src/test.c, src/xen_internal.c,
+         src/xend_internal.c, src/xs_internal.c,
+         proxy/libvirt_proxy.c: Remove VIR_DRV_OPEN_QUIET.
+
 Mon Apr 30 18:02:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
 
        * src/proxy_internal.c (xenProxyGetCapabilities): Add support

diff --git a/proxy/libvirt_proxy.c b/proxy/libvirt_proxy.c
index 21424d05c13ee7fa79f1c25b0a6287cad3ea8055..0e074d1aea477736a37ebbfd302b6f34206f8367 100644 (file)
--- a/proxy/libvirt_proxy.c
+++ b/proxy/libvirt_proxy.c
@@ -77,7 +77,7 @@ proxyInitXen(void) {
     priv->xshandle = NULL;
     priv->proxy = -1;
 
-    ret = xenHypervisorOpen(conn, NULL, VIR_DRV_OPEN_QUIET);
+    ret = xenHypervisorOpen(conn, NULL, 0);
     if (ret < 0) {
         fprintf(stderr, "Failed to open Xen hypervisor\n");
         return(-1);
@@ -93,7 +93,7 @@ proxyInitXen(void) {
         fprintf(stderr, "Failed to connect to Xen daemon\n");
         return(-1);
     }
-    ret = xenStoreOpen(conn, NULL, VIR_DRV_OPEN_QUIET | VIR_DRV_OPEN_RO);
+    ret = xenStoreOpen(conn, NULL, VIR_DRV_OPEN_RO);
     if (ret < 0) {
         fprintf(stderr, "Failed to open XenStore connection");
         return (-1);

diff --git a/src/driver.h b/src/driver.h
index 7f508ef7a1f1b15ae19431e73af413158ca106c8..a287477752f1c7191278aa9d3b7b41a1967d68b3 100644 (file)
--- a/src/driver.h
+++ b/src/driver.h
@@ -24,7 +24,7 @@ typedef enum {
 
 
 typedef enum {
-    VIR_DRV_OPEN_QUIET = 1,
+    /* VIR_DRV_OPEN_QUIET = 1 - removed by RWMJ */
     VIR_DRV_OPEN_RO = 2
 } virDrvOpenFlag;
 

diff --git a/src/libvirt.c b/src/libvirt.c
index 7f0df8bf0cdc1126c14052f21c2f0498565fe5dd..53393968c442717ca75de2e9a08519b4571c6e05 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -326,7 +326,7 @@ failed:
 virConnectPtr
 virConnectOpen (const char *name)
 {
-    return do_open (name, VIR_DRV_OPEN_QUIET);
+    return do_open (name, 0);
 }
 
 /**
@@ -342,7 +342,7 @@ virConnectOpen (const char *name)
 virConnectPtr
 virConnectOpenReadOnly(const char *name)
 {
-    return do_open (name, VIR_DRV_OPEN_QUIET | VIR_DRV_OPEN_RO);
+    return do_open (name, VIR_DRV_OPEN_RO);
 }
 
 /**

diff --git a/src/proxy_internal.c b/src/proxy_internal.c
index fdf16f02698b375283d28450acc4b23d3e4c1c1f..006911da9b3ccdea967dd2ab3482edbf14efd89b 100644 (file)
--- a/src/proxy_internal.c
+++ b/src/proxy_internal.c
@@ -544,7 +544,6 @@ xenProxyOpen(virConnectPtr conn, const char *name ATTRIBUTE_UNUSED, int flags)
 
     fd = virProxyOpenClientSocket(PROXY_SOCKET_PATH);
     if (fd < 0) {
-        if (!(flags & VIR_DRV_OPEN_QUIET))
            virProxyError(conn, VIR_ERR_NO_XEN, PROXY_SOCKET_PATH);
         return(-1);
     }
@@ -555,7 +554,6 @@ xenProxyOpen(virConnectPtr conn, const char *name ATTRIBUTE_UNUSED, int flags)
     req.len = sizeof(req);
     ret = xenProxyCommand(conn, &req, NULL, 1);
     if ((ret < 0) || (req.command != VIR_PROXY_NONE)) {
-        if (!(flags & VIR_DRV_OPEN_QUIET))
            virProxyError(conn, VIR_ERR_OPERATION_FAILED, __FUNCTION__);
         xenProxyClose(conn);
        return(-1);

diff --git a/src/qemu_internal.c b/src/qemu_internal.c
index ecfce220897eb91d5df1ddb8b6589d978ea81c41..e8c7708e468383b7439ee079010d4cc66f73701b 100644 (file)
--- a/src/qemu_internal.c
+++ b/src/qemu_internal.c
@@ -395,8 +395,7 @@ static int qemuOpen(virConnectPtr conn,
 
     uri = xmlParseURI(name);
     if (uri == NULL) {
-        if (!(flags & VIR_DRV_OPEN_QUIET))
-            qemuError(conn, NULL, VIR_ERR_NO_SUPPORT, name);
+        qemuError(conn, NULL, VIR_ERR_NO_SUPPORT, name);
         return VIR_DRV_OPEN_DECLINED;
     }
 

diff --git a/src/test.c b/src/test.c
index 98d6be9a00f4bec3c66b2fb18357f93a387b9afa..2ae2948969b7040093d8bd128da5cdd60406c37a 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -706,7 +706,7 @@ static int getDomainIndex(virDomainPtr domain) {
 
 int testOpen(virConnectPtr conn,
              const char *name,
-             int flags)
+             int flags ATTRIBUTE_UNUSED)
 {
     xmlURIPtr uri;
     int ret, connid;
@@ -717,8 +717,7 @@ int testOpen(virConnectPtr conn,
 
     uri = xmlParseURI(name);
     if (uri == NULL) {
-        if (!(flags & VIR_DRV_OPEN_QUIET))
-            testError(conn, NULL, VIR_ERR_NO_SUPPORT, name);
+        testError(conn, NULL, VIR_ERR_NO_SUPPORT, name);
         return VIR_DRV_OPEN_DECLINED;
     }
 

diff --git a/src/xen_internal.c b/src/xen_internal.c
index 6a90f58956b5b5257cd51a4e1a4e196ac79fc12f..fe6aeff526b27a9b1c43de1bb9da043941db433c 100644 (file)
--- a/src/xen_internal.c
+++ b/src/xen_internal.c
@@ -1516,8 +1516,9 @@ xenHypervisorInit(void)
  * Returns 0 or -1 in case of error.
  */
 int
-xenHypervisorOpen(virConnectPtr conn ATTRIBUTE_UNUSED,
-                  const char *name ATTRIBUTE_UNUSED, int flags)
+xenHypervisorOpen(virConnectPtr conn,
+                  const char *name ATTRIBUTE_UNUSED,
+                  int flags ATTRIBUTE_UNUSED)
 {
     int ret;
     xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData;
@@ -1530,8 +1531,7 @@ xenHypervisorOpen(virConnectPtr conn ATTRIBUTE_UNUSED,
 
     ret = open(XEN_HYPERVISOR_SOCKET, O_RDWR);
     if (ret < 0) {
-        if (!(flags & VIR_DRV_OPEN_QUIET))
-            virXenError(VIR_ERR_NO_XEN, XEN_HYPERVISOR_SOCKET, 0);
+        virXenError(VIR_ERR_NO_XEN, XEN_HYPERVISOR_SOCKET, 0);
         return (-1);
     }
 

diff --git a/src/xend_internal.c b/src/xend_internal.c
index 681c000b425ce1c4e654825aa4ae4455c3a5013d..1358c0b26c324a673658a2e288ebe12cf81f01b7 100644 (file)
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -1923,7 +1923,8 @@ error:
  * Returns 0 in case of success, -1 in case of error.
  */
 int
-xenDaemonOpen(virConnectPtr conn, const char *name, int flags)
+xenDaemonOpen(virConnectPtr conn, const char *name,
+              int flags ATTRIBUTE_UNUSED)
 {
     xmlURIPtr uri = NULL;
     int ret;
@@ -1959,16 +1960,14 @@ xenDaemonOpen(virConnectPtr conn, const char *name, int flags)
          */
         uri = xmlParseURI(name);
         if (uri == NULL) {
-            if (!(flags & VIR_DRV_OPEN_QUIET))
-                virXendError(conn, VIR_ERR_NO_SUPPORT, name);
+            virXendError(conn, VIR_ERR_NO_SUPPORT, name);
             goto failed;
         }
 
         if (uri->scheme == NULL) {
             /* It should be a file access */
             if (uri->path == NULL) {
-                if (!(flags & VIR_DRV_OPEN_QUIET))
-                    virXendError(conn, VIR_ERR_NO_SUPPORT, name);
+                virXendError(conn, VIR_ERR_NO_SUPPORT, name);
                 goto failed;
             }
             ret = xenDaemonOpen_unix(conn, uri->path);
@@ -1986,8 +1985,7 @@ xenDaemonOpen(virConnectPtr conn, const char *name, int flags)
             if (ret == -1)
                 goto failed;
         } else {
-            if (!(flags & VIR_DRV_OPEN_QUIET))
-                virXendError(conn, VIR_ERR_NO_SUPPORT, name);
+            virXendError(conn, VIR_ERR_NO_SUPPORT, name);
             goto failed;
         }
     }

diff --git a/src/xs_internal.c b/src/xs_internal.c
index 35189eee05a79c430d7f7a4429ea7b0b522b4319..6e6fbbb96429d8909fc8c3200b3ac0305b10fed2 100644 (file)
--- a/src/xs_internal.c
+++ b/src/xs_internal.c
@@ -325,7 +325,8 @@ virConnectCheckStoreID(virConnectPtr conn, int id)
  */
 int
 xenStoreOpen(virConnectPtr conn,
-             const char *name ATTRIBUTE_UNUSED, int flags)
+             const char *name ATTRIBUTE_UNUSED,
+             int flags ATTRIBUTE_UNUSED)
 {
     xenUnifiedPrivatePtr priv = (xenUnifiedPrivatePtr) conn->privateData;
 
@@ -339,8 +340,7 @@ xenStoreOpen(virConnectPtr conn,
 #endif /* ! PROXY */
 
     if (priv->xshandle == NULL) {
-        if (!(flags & VIR_DRV_OPEN_QUIET))
-            virXenStoreError(conn, VIR_ERR_NO_XEN, 
+        virXenStoreError(conn, VIR_ERR_NO_XEN, 
                             _("failed to connect to Xen Store"));
         return (-1);
     }