[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/54] block: fix recursion in hw/block/dataplane
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 01/54] block: fix recursion in hw/block/dataplane |
Date: |
Mon, 4 Mar 2019 19:19:21 +0100 |
There are Xen files in hw/block/dataplane that should be compiled even if
virtio-blk is disabled.
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/block/Makefile.objs | 3 ++-
hw/block/dataplane/Makefile.objs | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/block/Makefile.objs b/hw/block/Makefile.objs
index e206b8e..f5f643f 100644
--- a/hw/block/Makefile.objs
+++ b/hw/block/Makefile.objs
@@ -12,5 +12,6 @@ common-obj-$(CONFIG_NVME_PCI) += nvme.o
obj-$(CONFIG_SH4) += tc58128.o
obj-$(CONFIG_VIRTIO_BLK) += virtio-blk.o
-obj-$(CONFIG_VIRTIO_BLK) += dataplane/
obj-$(CONFIG_VHOST_USER_BLK) += vhost-user-blk.o
+
+obj-y += dataplane/
diff --git a/hw/block/dataplane/Makefile.objs b/hw/block/dataplane/Makefile.objs
index c6c68db..0c52702 100644
--- a/hw/block/dataplane/Makefile.objs
+++ b/hw/block/dataplane/Makefile.objs
@@ -1,2 +1,2 @@
-obj-y += virtio-blk.o
+obj-$(CONFIG_VIRTIO_BLK) += virtio-blk.o
obj-$(CONFIG_XEN) += xen-block.o
--
1.8.3.1
- [Qemu-devel] [PULL 00/54] Kconfig conversion, excluding ARM and MIPS, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 02/54] 9pfs: remove unnecessary conditionals, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 01/54] block: fix recursion in hw/block/dataplane,
Paolo Bonzini <=
- [Qemu-devel] [PULL 05/54] minikconfig: add AST, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 03/54] xtensa: rename CONFIG_XTENSA_FPGA to CONFIG_XTENSA_XTFPGA, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 04/54] minikconfig: add parser skeleton, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 10/54] minikconfig: implement allnoconfig and defconfig modes, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 06/54] minikconfig: add semantic analysis, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 07/54] hw/display: make edid configurable, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 12/54] ide: express dependencies with Kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 14/54] isa: express dependencies with kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 09/54] build: switch to Kconfig, Paolo Bonzini, 2019/03/04
- [Qemu-devel] [PULL 11/54] kconfig: introduce CONFIG_TEST_DEVICES, Paolo Bonzini, 2019/03/04