All of lore.kernel.org
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: ehabkost@redhat.com
Subject: [Qemu-devel] [PATCH 08/11] stubs: move vhost stubs to stubs/vhost.o
Date: Thu, 22 Dec 2016 16:59:12 +0100	[thread overview]
Message-ID: <20161222155915.7232-9-pbonzini@redhat.com> (raw)
In-Reply-To: <20161222155915.7232-1-pbonzini@redhat.com>

No need to include them in libqemustub.a, since only system emulators
need them.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/Makefile.objs                        | 2 +-
 hw/virtio/Makefile.objs                 | 6 +++++-
 stubs/vhost.c => hw/virtio/vhost-stub.c | 0
 stubs/Makefile.objs                     | 1 -
 4 files changed, 6 insertions(+), 3 deletions(-)
 rename stubs/vhost.c => hw/virtio/vhost-stub.c (100%)

diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 2a73ae5..7be399e 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -29,7 +29,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += timer/
 devices-dirs-$(CONFIG_TPM) += tpm/
 devices-dirs-$(CONFIG_SOFTMMU) += usb/
 devices-dirs-$(CONFIG_SOFTMMU) += vfio/
-devices-dirs-$(CONFIG_VIRTIO) += virtio/
+devices-dirs-$(CONFIG_SOFTMMU) += virtio/
 devices-dirs-$(CONFIG_SOFTMMU) += watchdog/
 devices-dirs-$(CONFIG_SOFTMMU) += xen/
 devices-dirs-$(CONFIG_MEM_HOTPLUG) += mem/
diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs
index 95c4c30..765d363 100644
--- a/hw/virtio/Makefile.objs
+++ b/hw/virtio/Makefile.objs
@@ -1,3 +1,4 @@
+ifeq ($(CONFIG_VIRTIO),y)
 common-obj-y += virtio-rng.o
 common-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
 common-obj-y += virtio-bus.o
@@ -5,7 +6,10 @@ common-obj-y += virtio-mmio.o
 
 obj-y += virtio.o virtio-balloon.o 
 obj-$(CONFIG_LINUX) += vhost.o vhost-backend.o vhost-user.o
-
 obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o
 obj-y += virtio-crypto.o
 obj-$(CONFIG_VIRTIO_PCI) += virtio-crypto-pci.o
+endif
+
+common-obj-$(call lnot,$(CONFIG_LINUX)) += vhost-stub.o
+common-obj-$(CONFIG_ALL) += vhost-stub.o
diff --git a/stubs/vhost.c b/hw/virtio/vhost-stub.c
similarity index 100%
rename from stubs/vhost.c
rename to hw/virtio/vhost-stub.c
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index 40b4e15..0b642d7 100644
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -35,7 +35,6 @@ stub-obj-y += kvm.o
 stub-obj-y += qmp_pc_dimm_device_list.o
 stub-obj-y += target-monitor-defs.o
 stub-obj-y += target-get-monitor-def.o
-stub-obj-y += vhost.o
 stub-obj-y += iohandler.o
 stub-obj-y += pc_madt_cpu_entry.o
 stub-obj-y += migration-colo.o
-- 
2.9.3

  parent reply	other threads:[~2016-12-22 15:59 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-22 15:59 [Qemu-devel] [RFC PATCH 00/11] Stubs cleanup Paolo Bonzini
2016-12-22 15:59 ` [Qemu-devel] [PATCH 01/11] stubs: merge all monitor stubs in one file, remove monitor_cur_is_qmp stub Paolo Bonzini
2016-12-22 15:59 ` [Qemu-devel] [PATCH 02/11] stubs: move smbios stubs to hw/smbios Paolo Bonzini
2016-12-22 15:59 ` [Qemu-devel] [PATCH 03/11] stubs: move acpi stubs to hw/acpi Paolo Bonzini
2016-12-22 15:59 ` [Qemu-devel] [PATCH 04/11] stubs: remove unused stub for serial_hd Paolo Bonzini
2016-12-22 15:59 ` [Qemu-devel] [PATCH 05/11] hw: move reset handlers from vl.c to hw/core Paolo Bonzini
2016-12-22 15:59 ` [Qemu-devel] [PATCH 06/11] stubs: group stubs for user-mode emulation Paolo Bonzini
2016-12-22 15:59 ` [Qemu-devel] [PATCH 07/11] stubs: group all monitor_fdset_* functions in a single file Paolo Bonzini
2016-12-22 15:59 ` Paolo Bonzini [this message]
2016-12-22 15:59 ` [Qemu-devel] [PATCH 09/11] event_notifier: cleanups around event_notifier_set_handler Paolo Bonzini
2016-12-22 15:59 ` [Qemu-devel] [PATCH 10/11] build: remove --enable-colo/--disable-colo Paolo Bonzini
2016-12-22 15:59 ` [Qemu-devel] [PATCH 11/11] stubs: remove stubs/kvm.c Paolo Bonzini
2016-12-22 17:30 ` [Qemu-devel] [RFC PATCH 00/11] Stubs cleanup Peter Maydell
2016-12-22 17:32   ` Paolo Bonzini
2016-12-22 17:42     ` Eduardo Habkost
2016-12-22 17:45       ` Paolo Bonzini
2016-12-23  9:02         ` Markus Armbruster
2016-12-23  9:18           ` Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161222155915.7232-9-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.