[libvirt] [PATCH 1/2] rpc: convert unknown procedures to VIR_ERR_NO_SUPPORT

Eric Blake eblake at redhat.com
Wed Sep 14 18:51:51 UTC 2011


Libvirt special-cases a specific VIR_ERR_RPC from the remote driver
back into VIR_ERR_NO_SUPPORT on the client, so that clients can
handle missing rpc functions the same whether the hypervisor driver
is local or remote.  However, commit c1b22644 introduced a regression:
VIR_FROM_THIS changed from VIR_FROM_REMOTE to VIR_FROM_RPC, so the
special casing no longer works if the server uses the newer error
domain.

* src/rpc/virnetclientprogram.c
(virNetClientProgramDispatchError): Also cater to 0.9.3 and newer.
---
 src/rpc/virnetclientprogram.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c
index a07b744..33fa507 100644
--- a/src/rpc/virnetclientprogram.c
+++ b/src/rpc/virnetclientprogram.c
@@ -151,7 +151,7 @@ virNetClientProgramDispatchError(virNetClientProgramPtr prog ATTRIBUTE_UNUSED,
         break;
     }

-    if (err.domain == VIR_FROM_REMOTE &&
+    if ((err.domain == VIR_FROM_REMOTE || err.domain == VIR_FROM_RPC) &&
         err.code == VIR_ERR_RPC &&
         err.level == VIR_ERR_ERROR &&
         err.message &&
-- 
1.7.4.4




More information about the libvir-list mailing list