Re: [libvirt] [PATCH 6/9] storage_backend: Convert virRunWithHook usage to virCommand

["Daniel P. Berrange" <berrange redhat com>]

On Fri, May 13, 2011 at 04:10:34PM -0400, Cole Robinson wrote:
> virRunWithHook is now unused, so we can drop it. Tested w/ raw + qcow2
> volume creation and copying.
> 
> v2:
>     Use opaque data to skip hook second time around
>     Simply command building
> 
> Signed-off-by: Cole Robinson <crobinso redhat com>
> @@ -871,17 +869,14 @@ int virSetInherit(int fd ATTRIBUTE_UNUSED, bool inherit ATTRIBUTE_UNUSED)
>      return -1;
>  }
>  
> -int
> -virRunWithHook(const char *const *argv ATTRIBUTE_UNUSED,
> -               virExecHook hook ATTRIBUTE_UNUSED,
> -               void *data ATTRIBUTE_UNUSED,
> -               int *status)
> +virRun(const char *const *argv ATTRIBUTE_UNUSED,
> +       int *status)

This broke Win32 builds, as it lost the return type for 'virRun'. I
pushed this fix:

  commit 00e74007cb959399a1cfaefb967827e59d961609
  Author: Daniel P. Berrange <berrange redhat com>
  Date:   Tue May 17 16:22:49 2011 +0100

    Fix prototype of virRun for Win32 targets
    
    * src/util/util.c: Fix virRun prototype

diff --git a/src/util/util.c b/src/util/util.c
index f07b8b0..d1a08a6 100644
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -869,6 +869,7 @@ int virSetInherit(int fd ATTRIBUTE_UNUSED, bool inherit ATTRIBUTE_UNUSED)
     return -1;
 }
 
+int
 virRun(const char *const *argv ATTRIBUTE_UNUSED,
        int *status)
 {


Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|