mirror of
https://github.com/qemu/qemu.git
synced 2024-12-18 09:43:38 +08:00
56f41de737
hw/net/vhost_net.c needs functions that are declared in net/vhost-user.c: the vhost-user code is always compiled into QEMU, only the constructor net_init_vhost_user is unreachable. Also, net/vhost-user.c needs functions declared in hw/virtio/vhost-stub.c even if no virtio device exists. Break this dependency. First, add a minimal version of net/vhost-user.c, with no functionality and no dependency on vhost code. Second, #ifdef out the calls back to net/vhost-user.c from hw/net/vhost_net.c. While at it, this patch fixes the CONFIG_VHOST_NET_USE*D* typo. Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <1543851204-41186-3-git-send-email-pbonzini@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <1550165756-21617-3-git-send-email-pbonzini@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
30 lines
1014 B
Makefile
30 lines
1014 B
Makefile
common-obj-y = net.o queue.o checksum.o util.o hub.o
|
|
common-obj-y += socket.o
|
|
common-obj-y += dump.o
|
|
common-obj-y += eth.o
|
|
common-obj-$(CONFIG_L2TPV3) += l2tpv3.o
|
|
common-obj-$(call land,$(CONFIG_VIRTIO_NET),$(CONFIG_VHOST_NET_USER)) += vhost-user.o
|
|
common-obj-$(call land,$(call lnot,$(CONFIG_VIRTIO_NET)),$(CONFIG_VHOST_NET_USER)) += vhost-user-stub.o
|
|
common-obj-$(CONFIG_ALL) += vhost-user-stub.o
|
|
common-obj-$(CONFIG_SLIRP) += slirp.o
|
|
common-obj-$(CONFIG_VDE) += vde.o
|
|
common-obj-$(CONFIG_NETMAP) += netmap.o
|
|
common-obj-y += filter.o
|
|
common-obj-y += filter-buffer.o
|
|
common-obj-y += filter-mirror.o
|
|
common-obj-y += colo-compare.o
|
|
common-obj-y += colo.o
|
|
common-obj-y += filter-rewriter.o
|
|
common-obj-y += filter-replay.o
|
|
|
|
tap-obj-$(CONFIG_LINUX) = tap-linux.o
|
|
tap-obj-$(CONFIG_BSD) = tap-bsd.o
|
|
tap-obj-$(CONFIG_SOLARIS) = tap-solaris.o
|
|
tap-obj-y ?= tap-stub.o
|
|
common-obj-$(CONFIG_POSIX) += tap.o $(tap-obj-y)
|
|
common-obj-$(CONFIG_WIN32) += tap-win32.o
|
|
|
|
vde.o-libs = $(VDE_LIBS)
|
|
|
|
common-obj-$(CONFIG_CAN_BUS) += can/
|