[libvirt] [PATCH] Remove unused nwfilter field from struct remote_error

[Daniel Veillard]

On Thu, May 06, 2010 at 11:14:47AM +0100, Matthew Booth wrote:
> Change 965466c1 added a new field to struct remote_error, which broke the RPC
> protocol. Fortunately the new field is unused, so this change simply removes it
> again.
> 
> * src/remote/remote_protocol.(c|h|x): Remove remote_nwfilter from struct
>                                       remote_error
> ---
>  src/remote/remote_protocol.c |    2 --
>  src/remote/remote_protocol.h |    1 -
>  src/remote/remote_protocol.x |    1 -
>  3 files changed, 0 insertions(+), 4 deletions(-)
> 
> diff --git a/src/remote/remote_protocol.c b/src/remote/remote_protocol.c
> index 187281d..972bf52 100644
> --- a/src/remote/remote_protocol.c
> +++ b/src/remote/remote_protocol.c
> @@ -227,8 +227,6 @@ xdr_remote_error (XDR *xdrs, remote_error *objp)
>                   return FALSE;
>           if (!xdr_remote_network (xdrs, &objp->net))
>                   return FALSE;
> -         if (!xdr_remote_nwfilter (xdrs, &objp->nwfilter))
> -                 return FALSE;
>          return TRUE;
>  }
>  
> diff --git a/src/remote/remote_protocol.h b/src/remote/remote_protocol.h
> index 6f01da7..a600af6 100644
> --- a/src/remote/remote_protocol.h
> +++ b/src/remote/remote_protocol.h
> @@ -143,7 +143,6 @@ struct remote_error {
>          int int1;
>          int int2;
>          remote_network net;
> -        remote_nwfilter nwfilter;
>  };
>  typedef struct remote_error remote_error;
>  
> diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
> index 8000ee0..1ce488c 100644
> --- a/src/remote/remote_protocol.x
> +++ b/src/remote/remote_protocol.x
> @@ -266,7 +266,6 @@ struct remote_error {
>      int int1;
>      int int2;
>      remote_network net;
> -    remote_nwfilter nwfilter;
>  };
>  
>  /* Authentication types available thus far.... */

  ACK,

I suggest people packaging libvirt-0.8.0 or 0.8.1 in dustributions to
apply this patch to avoid the protocol break with other versions !

Daniel

-- 
Daniel Veillard      | libxml Gnome XML XSLT toolkit  http://xmlsoft.org/
daniel at veillard.com  | Rpmfind RPM search engine http://rpmfind.net/
http://veillard.com/ | virtualization library  http://libvirt.org/