On 19/09/2017 18:52, Marc-André Lureau wrote:
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> Makefile | 2 +-
> Makefile.objs | 1 -
> 2 files changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 8a64b6afb0..e0aeb77854 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -475,7 +475,7 @@ ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMMON_LDADDS)
> ivshmem-server$(EXESUF): $(ivshmem-server-obj-y) $(COMMON_LDADDS)
> $(call LINK, $^)
> endif
> -vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y)
> +vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) libvhost-user.a
> $(call LINK, $^)
>
> module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak
> diff --git a/Makefile.objs b/Makefile.objs
> index 3a6914c56c..de2d92f8cb 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -115,7 +115,6 @@ libvhost-user-obj-y = contrib/libvhost-user/
> vhost-user-scsi.o-cflags := $(LIBISCSI_CFLAGS)
> vhost-user-scsi.o-libs := $(LIBISCSI_LIBS)
> vhost-user-scsi-obj-y = contrib/vhost-user-scsi/
> -vhost-user-scsi-obj-y += contrib/libvhost-user/libvhost-user.o
>
> ######################################################################
> trace-events-subdirs =
>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>