Patchwork [8/8] Move virtio-serial and virtio-serial-bus to Makefile.hw

login
register
mail settings
Submitter Amit Shah
Date Jan. 4, 2010, 5:34 p.m.
Message ID <1262626457-26671-9-git-send-email-amit.shah@redhat.com>
Download mbox | patch
Permalink /patch/42077/
State New
Headers show

Comments

Amit Shah - Jan. 4, 2010, 5:34 p.m.
There's nothing target-dependent in the virtio-serial code so allow it
to be compiled just once for all the targets.

Signed-off-by: Amit Shah <amit.shah@redhat.com>
---
 Makefile.hw     |    2 +-
 Makefile.target |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/Makefile.hw b/Makefile.hw
index bd252f5..60b954e 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -13,7 +13,7 @@  QEMU_CFLAGS+=-I.. -I$(SRC_PATH)/fpu
 
 obj-y =
 obj-y += loader.o
-obj-y += virtio.o
+obj-y += virtio.o virtio-serial.o virtio-serial-bus.o
 obj-y += fw_cfg.o
 obj-y += watchdog.o
 obj-$(CONFIG_ECC) += ecc.o
diff --git a/Makefile.target b/Makefile.target
index d217f07..d7e1702 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -156,7 +156,7 @@  ifdef CONFIG_SOFTMMU
 obj-y = vl.o async.o monitor.o pci.o pci_host.o pcie_host.o machine.o gdbstub.o
 # virtio has to be here due to weird dependency between PCI and virtio-net.
 # need to fix this properly
-obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial.o virtio-serial-bus.o virtio-pci.o
+obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-pci.o
 obj-$(CONFIG_KVM) += kvm.o kvm-all.o
 obj-$(CONFIG_ISA_MMIO) += isa_mmio.o
 LIBS+=-lz