From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:57360) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnvu-0001vz-Dj for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnvt-0002Fa-0T for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:54 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:52622) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnvs-0002Dg-PT for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:57:52 -0500 Received: by mail-wm1-x333.google.com with SMTP id m1so821600wml.2 for ; Thu, 07 Feb 2019 09:57:52 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 7 Feb 2019 18:56:57 +0100 Message-Id: <1549562254-41157-15-git-send-email-pbonzini@redhat.com> In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 14/51] block: fix recursion in hw/block/dataplane List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: thuth@redhat.com, philmd@redhat.com There are Xen files in hw/block/dataplane that should be compiled even if virtio-blk is disabled. Signed-off-by: Paolo Bonzini --- 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