From nobody Sun Oct 5 01:45:11 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551727356208771.1055085741874; Mon, 4 Mar 2019 11:22:36 -0800 (PST) Received: from localhost ([127.0.0.1]:59535 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tAW-0003Hj-3c for importer@patchew.org; Mon, 04 Mar 2019 14:22:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45603) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) 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 ) 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 ) 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 ; Mon, 04 Mar 2019 10:20:19 -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) 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) From: Paolo Bonzini 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yang Zhong , thuth@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The VIRTIO_9P || VIRTFS && XEN condition can be computed in hw/Makefile.obj= s, removing an "if" from hw/9pfs/Makefile.objs. Signed-off-by: Paolo Bonzini --- hw/9pfs/Makefile.objs | 2 -- hw/Makefile.objs | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) 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 =3D 9p.o 9p-util.o common-obj-y +=3D 9p-local.o 9p-xattr.o common-obj-y +=3D 9p-xattr-user.o 9p-posix-acl.o common-obj-y +=3D coth.o cofs.o codir.o cofile.o common-obj-y +=3D coxattr.o 9p-synth.o common-obj-y +=3D 9p-proxy.o -endif =20 common-obj-$(CONFIG_XEN) +=3D xen-9p-backend.o obj-$(CONFIG_VIRTIO_9P) +=3D 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),$(CO= NFIG_XEN))) +=3D 9pfs/ +devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call land,$(CONFIG_VIRTFS),$= (CONFIG_XEN))) +=3D 9pfs/ devices-dirs-$(CONFIG_SOFTMMU) +=3D acpi/ devices-dirs-$(CONFIG_SOFTMMU) +=3D adc/ devices-dirs-$(CONFIG_SOFTMMU) +=3D audio/ --=20 1.8.3.1