Message ID | 1551723614-1823-3-git-send-email-pbonzini@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> 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 EB16F13B5 for <patchwork-qemu-devel@patchwork.kernel.org>; Mon, 4 Mar 2019 19:21:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA0ED2B22C for <patchwork-qemu-devel@patchwork.kernel.org>; Mon, 4 Mar 2019 19:21:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D82F22B24B; Mon, 4 Mar 2019 19:21:55 +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 8311E2B22C for <patchwork-qemu-devel@patchwork.kernel.org>; Mon, 4 Mar 2019 19:21:55 +0000 (UTC) Received: from localhost ([127.0.0.1]:59535 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org>) id 1h0t9u-0003Hj-Jk for patchwork-qemu-devel@patchwork.kernel.org; Mon, 04 Mar 2019 14:21:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45603) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1h0sCK-0001ju-L0 for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1h0sCJ-0003bX-QC for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:20 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:40567) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <paolo.bonzini@gmail.com>) id 1h0sCJ-0003av-IX for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:19 -0500 Received: by mail-wr1-x435.google.com with SMTP id q1so6645616wrp.7 for <qemu-devel@nongnu.org>; Mon, 04 Mar 2019 10:20:19 -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=R3GjwA6mCMsy8iR3C99D8ELRROaMgKrmWV10YFgy+YE=; b=joueLt4PxoKcfp3GfSXLDfjLJWxsqZlrwaNFEO0KjIwmq1Eiii6TpaleV+fZO40Pzq BEbQN4Qu+0Lrpn7CQ723YiF3XnlJ/byVUQw9TdFsYUGzHokqmizvrBjObVUKxJ+YzVe6 ZUyl1rgq8lnyBg2dE3iKEYfuWTPVChowI/qdtFaXvDzZ6+xGCq1Lux9DcZot5quZaib4 x17ZPDJm9PktOmLJ2UV5Otqc7OA7UoOgAsyNPz6Vzt8ckQ48t4XozsfxmguRuDczDtR3 O8OuQK7sP3KzeEY5wHmWF0b9vNRr5epzozYp5UxRPCjMxJ4UiyVaguUoqWwMFm9CNv6E 7tOA== 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=R3GjwA6mCMsy8iR3C99D8ELRROaMgKrmWV10YFgy+YE=; b=jk7BBZwoeRShxomNIfpaHA0aMr4L5Buw3QSioi0HbRZxd5EysfIxZ5KzysYugcwJDf rZcoRXCspVBB3OD549Kl73rZpQN5H/AznaFTC6JT8NBOk6mJumgqUtkE6H/Xkh85Jtvj i69sMoMOPKO1oak1h7LvqmD4nM5MnVMCBxek+6L1FnZ4t89YmaApd4ccsbI2PyBq8SZT SbTJpT0GuESAfBRl05HaEZllphLND06j5r6IQUAlxdvXWjYq5LHAngnTcr121aLuXrYX cpsdDv6JOXh+jB5Hbpn5qG18D8iMGBRQjPRom6Zj88Ka55W/mc/MdVokpY2Jgsv0biGP kUyw== X-Gm-Message-State: APjAAAUKdZ4UjtqRk90KLSkoqJbPw4mJJfuHphZlvAK9A7sg2EmZAQaO 3ig5qjHVifQ19Zc5PIAfwVjJvEtu X-Google-Smtp-Source: APXvYqxMMiKQKC4QDTUlcf6L5sgdli8loOtJ+BtXt4q4yQpeZj/k808jHAYLz6msLYVbMayArt38LQ== X-Received: by 2002:a5d:4e43:: with SMTP id r3mr14228922wrt.162.1551723618325; Mon, 04 Mar 2019 10:20:18 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:17 -0800 (PST) From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:22 +0100 Message-Id: <1551723614-1823-3-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::435 Subject: [Qemu-devel] [PULL 02/54] 9pfs: remove unnecessary conditionals X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: Yang Zhong <yang.zhong@intel.com>, thuth@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
[PULL,01/54] block: fix recursion in hw/block/dataplane
|
expand
|
diff --git a/hw/9pfs/Makefile.objs b/hw/9pfs/Makefile.objs index 8ac0496..70ded6f 100644 --- a/hw/9pfs/Makefile.objs +++ b/hw/9pfs/Makefile.objs @@ -1,11 +1,9 @@ -ifeq ($(call lor,$(CONFIG_VIRTIO_9P),$(CONFIG_XEN)),y) common-obj-y = 9p.o 9p-util.o common-obj-y += 9p-local.o 9p-xattr.o common-obj-y += 9p-xattr-user.o 9p-posix-acl.o common-obj-y += coth.o cofs.o codir.o cofile.o common-obj-y += coxattr.o 9p-synth.o common-obj-y += 9p-proxy.o -endif common-obj-$(CONFIG_XEN) += xen-9p-backend.o obj-$(CONFIG_VIRTIO_9P) += virtio-9p-device.o diff --git a/hw/Makefile.objs b/hw/Makefile.objs index e2fcd6a..2d9b42d 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -1,4 +1,4 @@ -devices-dirs-$(call land,$(CONFIG_VIRTFS),$(call lor,$(CONFIG_VIRTIO),$(CONFIG_XEN))) += 9pfs/ +devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call land,$(CONFIG_VIRTFS),$(CONFIG_XEN))) += 9pfs/ devices-dirs-$(CONFIG_SOFTMMU) += acpi/ devices-dirs-$(CONFIG_SOFTMMU) += adc/ devices-dirs-$(CONFIG_SOFTMMU) += audio/
The VIRTIO_9P || VIRTFS && XEN condition can be computed in hw/Makefile.objs, removing an "if" from hw/9pfs/Makefile.objs. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- hw/9pfs/Makefile.objs | 2 -- hw/Makefile.objs | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-)