[libvirt] [PATCH 1/5] tests: qemuxml2argvmock: Don't mock virCommandPassFD

Daniel P. Berrangé berrange at redhat.com
Tue Aug 14 13:32:38 UTC 2018


On Tue, Aug 14, 2018 at 03:21:06PM +0200, Peter Krempa wrote:
> This function does not modify the host. It merely puts the file
> descriptor into a list in virCommandPtr.

Yes & no.

It doesn't directly modify the host, but my adding the FD to 'passfd' set,
when virCommandFree is run later, it will call VIR_FORCE_CLOSE on every
FD in the set that has the CLOSE_PARENT flag. So not mocking this could
indirectly cause cleanup code to modify the host by closing FDs.

All depends on whether we have any other mocks that are faking file
descriptors. If we don't then removing the mock is safe.

> Signed-off-by: Peter Krempa <pkrempa at redhat.com>
> ---
>  tests/qemuxml2argvmock.c | 8 --------
>  1 file changed, 8 deletions(-)
> 
> diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c
> index 4df92cf396..c8a5f186d5 100644
> --- a/tests/qemuxml2argvmock.c
> +++ b/tests/qemuxml2argvmock.c
> @@ -184,14 +184,6 @@ virNetDevRunEthernetScript(const char *ifname ATTRIBUTE_UNUSED,
>      return 0;
>  }
> 
> -void
> -virCommandPassFD(virCommandPtr cmd ATTRIBUTE_UNUSED,
> -                 int fd ATTRIBUTE_UNUSED,
> -                 unsigned int flags ATTRIBUTE_UNUSED)
> -{
> -    /* nada */
> -}
> -
>  int
>  virNetDevOpenvswitchGetVhostuserIfname(const char *path ATTRIBUTE_UNUSED,
>                                         char **ifname)
> -- 
> 2.16.2
> 
> --
> libvir-list mailing list
> libvir-list at redhat.com
> https://www.redhat.com/mailman/listinfo/libvir-list

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|




More information about the libvir-list mailing list