[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/9] virtio: simplify Makefile conditionals
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 5/9] virtio: simplify Makefile conditionals |
Date: |
Fri, 19 Apr 2013 16:24:16 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/Makefile.objs | 2 +-
hw/virtio/Makefile.objs | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index b7a1613..0243d6a 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -24,7 +24,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += ssi/
devices-dirs-$(CONFIG_SOFTMMU) += timer/
devices-dirs-$(CONFIG_TPM) += tpm/
devices-dirs-$(CONFIG_SOFTMMU) += usb/
-devices-dirs-$(CONFIG_SOFTMMU) += virtio/
+devices-dirs-$(CONFIG_VIRTIO) += virtio/
devices-dirs-$(CONFIG_SOFTMMU) += watchdog/
devices-dirs-$(CONFIG_SOFTMMU) += xen/
devices-dirs-y += core/
diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs
index c7e8013..cbe6d51 100644
--- a/hw/virtio/Makefile.objs
+++ b/hw/virtio/Makefile.objs
@@ -1,7 +1,7 @@
-common-obj-$(CONFIG_VIRTIO) += virtio-rng.o
+common-obj-y += virtio-rng.o
common-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
-common-obj-$(CONFIG_VIRTIO) += virtio-bus.o
+common-obj-y += virtio-bus.o
common-obj-$(CONFIG_VIRTIO_BLK_DATA_PLANE) += dataplane/
-obj-$(CONFIG_VIRTIO) += virtio.o virtio-balloon.o
-obj-$(CONFIG_VHOST_NET) += vhost.o
+obj-y += virtio.o virtio-balloon.o
+obj-$(CONFIG_LINUX) += vhost.o
--
1.8.1.4
- [Qemu-devel] [PULL 0/9] SCSI updates for 2013-04-13, Paolo Bonzini, 2013/04/19
- [Qemu-devel] [PATCH 1/9] scsi: avoid assertion failure on VERIFY command, Paolo Bonzini, 2013/04/19
- [Qemu-devel] [PATCH 3/9] vhost: Add vhost_commit callback for SeaBIOS ROM region re-mapping, Paolo Bonzini, 2013/04/19
- [Qemu-devel] [PATCH 5/9] virtio: simplify Makefile conditionals,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 4/9] virtio-scsi: create VirtIOSCSICommon, Paolo Bonzini, 2013/04/19
- [Qemu-devel] [PATCH 7/9] vhost-scsi-pci: new device supporting the tcm_vhost Linux kernel module, Paolo Bonzini, 2013/04/19
- [Qemu-devel] [PATCH 6/9] vhost-scsi: new device supporting the tcm_vhost Linux kernel module, Paolo Bonzini, 2013/04/19
- [Qemu-devel] [PATCH 8/9] vhost-scsi-ccw: new device supporting the tcm_vhost Linux kernel module, Paolo Bonzini, 2013/04/19
- [Qemu-devel] [PATCH 9/9] vhost-scsi-s390: new device supporting the tcm_vhost Linux kernel module, Paolo Bonzini, 2013/04/19
- [Qemu-devel] [PATCH 2/9] scsi: VMWare PVSCSI paravirtual device implementation, Paolo Bonzini, 2013/04/19
- Re: [Qemu-devel] [PULL 0/9] SCSI updates for 2013-04-13, Nicholas A. Bellinger, 2013/04/23