From patchwork Mon Mar 4 18:19:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 10838259 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4F3A914DE for ; Mon, 4 Mar 2019 19:02:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 399702AE8E for ; Mon, 4 Mar 2019 19:02:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C62A2B0E6; Mon, 4 Mar 2019 19:02:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0BD632AE8E for ; Mon, 4 Mar 2019 19:02:01 +0000 (UTC) Received: from localhost ([127.0.0.1]:59221 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sqf-0002KV-4t for patchwork-qemu-devel@patchwork.kernel.org; Mon, 04 Mar 2019 14:02:01 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45589) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCJ-0001j3-PN for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCJ-0003b3-48 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:19 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:41180) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCI-0003aG-SV for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:19 -0500 Received: by mail-wr1-x42e.google.com with SMTP id n2so6632541wrw.8 for ; Mon, 04 Mar 2019 10:20:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=UELZZFGuOSKHSOTDqFd4P08XlGWHaWt9WwMO4hy4Irs=; b=pcrCUI5uvugkR7dl8G4lnQbtQzdc9Xc4ANOan0e778OE17jHNRPNGVEMlyqRn/0kks w0mMKJUpWHK8pwfs7rPgL+D/mWM+IcXfJL2xJ2C/Cffk1c5Hb56iXnpj9X40aS/igBYi ZOpJcYe6y/7vkkce3jSmTtJ/gR/nLc+ev360l8MhQ1LaiYlYQ5iNclx6OVjd74A3YiHB qq2Ib4EbDKrr8oA2J48FaC1mQHAa8VU6kVeUzUJ1eLUTeqZuLMtFQYCRaPXRRdxJOJz+ durJSUU4gV33czoN71Mv9nhdVgoTWSKsiKlvze2Hlc88805TuM92rtxMMBPcyJ4b6P+1 SwVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=UELZZFGuOSKHSOTDqFd4P08XlGWHaWt9WwMO4hy4Irs=; b=qzon3hmHeFK83dHvcBRZlI9pi/HmS9178BmjvavTzMVmxegDaZ2LJq0unTnmxGJMZr 91YGoGuodYlEK26ts8fNbfvW7/c6xP9YTID8lYA881cmSpNhsbvGlH8FJuKKhn3ijlVj WGF8sLP9BccPUYLn2wFYnHz7uOmEOIlTSdh1V+/YeePtr59LHD8XpO2NOGyoj9i6OG6W vBDjTfWFvsfOvtja+K/fI09/481DWq3NcVWp7MPoNdz/Hqe/7iNVwdSRJlsddfGIhHGG SL7Z2dDrCoVnVQE2VEQptSpGW4EOMcBzWOPPpGdcmh2bE/v8Qu1p1u6p6yg0ZyRIzDgR LNIg== X-Gm-Message-State: APjAAAX2AwahsyBduQlogMgdQRczzUI8TT4YbbpdAmu2K8cBhdK5eHvL 5zQP9psnBngsnWwPGkStGWT+sPJb X-Google-Smtp-Source: APXvYqyDuxyaBeyRNZMwvckeYucGJjInLUPYuVMUlKBvMoNvDK5viQL4DhYAEoqCjpTQESaW1wNtjg== X-Received: by 2002:a05:6000:1142:: with SMTP id d2mr13265738wrx.43.1551723617511; Mon, 04 Mar 2019 10:20:17 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:17 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:21 +0100 Message-Id: <1551723614-1823-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1551723614-1823-1-git-send-email-pbonzini@redhat.com> References: <1551723614-1823-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e Subject: [Qemu-devel] [PULL 01/54] block: fix recursion in hw/block/dataplane X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yang Zhong , thuth@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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