From patchwork Thu Jul 11 17:22:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 11040457 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 94A9D912 for ; Thu, 11 Jul 2019 17:22:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 76B4D288F8 for ; Thu, 11 Jul 2019 17:22:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A99B28AF9; Thu, 11 Jul 2019 17:22:39 +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=-5.0 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0C916288F8 for ; Thu, 11 Jul 2019 17:22:39 +0000 (UTC) Received: from localhost ([::1]:43740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlcmE-0006ko-BD for patchwork-qemu-devel@patchwork.kernel.org; Thu, 11 Jul 2019 13:22:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60004) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlcm0-0005q7-7Z for qemu-devel@nongnu.org; Thu, 11 Jul 2019 13:22:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlcly-0003jA-So for qemu-devel@nongnu.org; Thu, 11 Jul 2019 13:22:24 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:33218) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hlcly-0003hi-Mf for qemu-devel@nongnu.org; Thu, 11 Jul 2019 13:22:22 -0400 Received: by mail-wm1-x344.google.com with SMTP id h19so7450056wme.0 for ; Thu, 11 Jul 2019 10:22:20 -0700 (PDT) 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=8jfPHYDP/Jv1ss0TndIwtapkw5U3C3otDUhZHMou5PA=; b=Iae8uT6jM74ZpwsABNNOFKNAaxIdsCfwjGTObwn6yc9B4VV81Qu/+05YM85Ed2X4wN J1bUyCxLWiYZCIeG6KzboZGaUGYdFan9ReQkfdSCdP/kZ7HXuTfLu13CgpX9MxG3ZyOj LYwWOwWr10j5z2Vs84o2HxPIBjcru8XI05YjbaZcAukgcFovSmgUyfO9z3HJ23y1DCuJ 1GNsM18HIjKNl9BBNFtj6fpWMLBoZuUyLCyOO3r32C7mbtm+b6JcYxrshAVYz9ZqSapF KtgRB+YdazgL2EKNqN4qGZs+WkQqY2s4zqBsEl5QKy0bKzyZzvlUodPfR5PWCL6n3iDY pUkA== 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=8jfPHYDP/Jv1ss0TndIwtapkw5U3C3otDUhZHMou5PA=; b=WW/yck4sk72IK6FaTzUSHCQkwUQQJXGCRqadTYQeEgyIJ+FPrbYQyi4zAHFaQJYBPn O0qjBXebA0kJ3dEht8OClfqjdQOG4c8GMUsfhNzGQfO95sQemOO72bLX75H6dVE47iGi Oku0WYMY0wkv7YOD9t/Re9XyW5Q0Dy3uFxpMiO2FozfnZuljy5kcttoYTlz1mzEbU0nL f5AUDa8KGEvwBIAXEvM6cVF61AXdowOlDfpX4zsmNWxb1PV6ydqIWsangOVUuMSYAUgM h5SJ7S6ciRqSjZhPCf0swvu+viEqW1FgJG1/O4uIS8zxwdqykgyzAt+81PQq2wzqoAav tSyQ== X-Gm-Message-State: APjAAAVTR+pkfjBe/gcguxxP5oihQChqrfw0jcsEj3CA+BlfPji2p/hx DtbwF36hfJUz0vJLaPEZUbdwJ+WpqIE= X-Google-Smtp-Source: APXvYqyPXq2MH5kCz10RZUiuekuxhMzRRsCCVVZs7DQT+cDqElvkdrEheXZTPQLkoYROwY+tHh8XUw== X-Received: by 2002:a1c:6a17:: with SMTP id f23mr5096115wmc.91.1562865739372; Thu, 11 Jul 2019 10:22:19 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c11sm8654514wrq.45.2019.07.11.10.22.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Jul 2019 10:22:18 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 11 Jul 2019 19:22:15 +0200 Message-Id: <1562865736-3546-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1562865736-3546-1-git-send-email-pbonzini@redhat.com> References: <1562865736-3546-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::344 Subject: [Qemu-devel] [PATCH 1/2] Makefile: do not repeat $(CONFIG_SOFTMMU) in hw/Makefile.objs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: philmd@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The device directories must be included only for softmmu builds. Instead of repeating $(CONFIG_SOFTMMU), use an "ifeq". Signed-off-by: Paolo Bonzini --- hw/Makefile.objs | 61 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/hw/Makefile.objs b/hw/Makefile.objs index d770926..ece6cc3 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -1,42 +1,45 @@ +devices-dirs-y = core/ +ifeq ($(CONFIG_SOFTMMU), y) 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/ -devices-dirs-$(CONFIG_SOFTMMU) += block/ -devices-dirs-$(CONFIG_SOFTMMU) += bt/ -devices-dirs-$(CONFIG_SOFTMMU) += char/ -devices-dirs-$(CONFIG_SOFTMMU) += cpu/ -devices-dirs-$(CONFIG_SOFTMMU) += display/ -devices-dirs-$(CONFIG_SOFTMMU) += dma/ -devices-dirs-$(CONFIG_SOFTMMU) += gpio/ +devices-dirs-y += acpi/ +devices-dirs-y += adc/ +devices-dirs-y += audio/ +devices-dirs-y += block/ +devices-dirs-y += bt/ +devices-dirs-y += char/ +devices-dirs-y += cpu/ +devices-dirs-y += display/ +devices-dirs-y += dma/ +devices-dirs-y += gpio/ devices-dirs-$(CONFIG_HYPERV) += hyperv/ devices-dirs-$(CONFIG_I2C) += i2c/ -devices-dirs-$(CONFIG_SOFTMMU) += ide/ -devices-dirs-$(CONFIG_SOFTMMU) += input/ -devices-dirs-$(CONFIG_SOFTMMU) += intc/ +devices-dirs-y += ide/ +devices-dirs-y += input/ +devices-dirs-y += intc/ devices-dirs-$(CONFIG_IPACK) += ipack/ devices-dirs-$(CONFIG_IPMI) += ipmi/ -devices-dirs-$(CONFIG_SOFTMMU) += isa/ -devices-dirs-$(CONFIG_SOFTMMU) += misc/ -devices-dirs-$(CONFIG_SOFTMMU) += net/ -devices-dirs-$(CONFIG_SOFTMMU) += rdma/ -devices-dirs-$(CONFIG_SOFTMMU) += nvram/ -devices-dirs-$(CONFIG_SOFTMMU) += pci/ +devices-dirs-y += isa/ +devices-dirs-y += misc/ +devices-dirs-y += net/ +devices-dirs-y += rdma/ +devices-dirs-y += nvram/ +devices-dirs-y += pci/ devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/ -devices-dirs-$(CONFIG_SOFTMMU) += pcmcia/ +devices-dirs-y += pcmcia/ devices-dirs-$(CONFIG_SCSI) += scsi/ -devices-dirs-$(CONFIG_SOFTMMU) += sd/ -devices-dirs-$(CONFIG_SOFTMMU) += ssi/ -devices-dirs-$(CONFIG_SOFTMMU) += timer/ +devices-dirs-y += sd/ +devices-dirs-y += ssi/ +devices-dirs-y += timer/ devices-dirs-$(CONFIG_TPM) += tpm/ -devices-dirs-$(CONFIG_SOFTMMU) += usb/ +devices-dirs-y += usb/ devices-dirs-$(CONFIG_VFIO) += vfio/ -devices-dirs-$(CONFIG_SOFTMMU) += virtio/ -devices-dirs-$(CONFIG_SOFTMMU) += watchdog/ -devices-dirs-$(CONFIG_SOFTMMU) += xen/ +devices-dirs-y += virtio/ +devices-dirs-y += watchdog/ +devices-dirs-y += xen/ devices-dirs-$(CONFIG_MEM_DEVICE) += mem/ -devices-dirs-$(CONFIG_SOFTMMU) += smbios/ devices-dirs-y += semihosting/ -devices-dirs-y += core/ +devices-dirs-y += smbios/ +endif + common-obj-y += $(devices-dirs-y) obj-y += $(devices-dirs-y) From patchwork Thu Jul 11 17:22:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 11040459 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 6D1DA912 for ; Thu, 11 Jul 2019 17:22:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4C72F288F8 for ; Thu, 11 Jul 2019 17:22:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D61728AF7; Thu, 11 Jul 2019 17:22:54 +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=-5.0 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E5FA7288F8 for ; Thu, 11 Jul 2019 17:22:53 +0000 (UTC) Received: from localhost ([::1]:43748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlcmT-0007w8-9W for patchwork-qemu-devel@patchwork.kernel.org; Thu, 11 Jul 2019 13:22:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60001) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlcm0-0005q5-2q for qemu-devel@nongnu.org; Thu, 11 Jul 2019 13:22:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlclz-0003jJ-1s for qemu-devel@nongnu.org; Thu, 11 Jul 2019 13:22:24 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:37882) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hlcly-0003i1-Rd for qemu-devel@nongnu.org; Thu, 11 Jul 2019 13:22:22 -0400 Received: by mail-wr1-x442.google.com with SMTP id n9so7167585wrr.4 for ; Thu, 11 Jul 2019 10:22:21 -0700 (PDT) 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=RxYfAEyw36ihWSXQYKfqSMDy1K9OXWQsSR7Cb5/oOMk=; b=PmGVcfthSxJ+fHCa/bi19s0VtpgRlUtxyC7RLRL1GOu0yffMUyI32MIwnAzKz5FOL7 99KmcX5Nvcl8n/kuNbgg12N73vApHl7H7h7PYkuLT5p1JkeHGF5AlKhx5TBoCmK8plHO ROS4aQK3dsGp85OcNr5OuCP6AbkZasJSffPWKM/PDtk2Utns2V3NWXl8q6/Ygu0nTU+A 5eS8h85lsavLJnU2OL0+WsE9+hizNirIfUTXfMiTSeEmE/xwHUzKKQZawjQuCaEadLUf wXJTE558QiUSwm1LWLPIgGZNvqFrZ1AUStOb46EA1xxEjBdD4GQf2EJe/5ooL6BeDS8/ wL+g== 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=RxYfAEyw36ihWSXQYKfqSMDy1K9OXWQsSR7Cb5/oOMk=; b=GuQda7FDJqvrvPFfRgw0j+MEPGlGgL6teWtsuOUi9zR4B3yKbS0KvACUcFxvq0dWPv Nrgbp/XPcBR+3KkmBuu9hO4ekx0tcXYmH+2FA3Jgj9iUb6gjAPOsX4bCBhllPuhQeyrn 8PsHtnH2FAaY5ni62WKMTBVqqHdahSvPOqk702geTyB3rod+odh7b7u/7BlXduYPat0v aCPagxHJS22mk7LWKhoXuwBIibjgBxpJ6okbJnSxmNfLqpki/bd2MxZzMzCZM+LUijBM Se4Dcug7S9GWtgvVJpRRhL6UV6nlSAaCfrVyj0ik1BVg+kyVZbl2uXe4zJOXx0Cn1fit YDFQ== X-Gm-Message-State: APjAAAWsTvPcHVfIkBGGF6jeVQGX6EHXVldgOQ7DLURywZ4d/n5XHt6U kAT1cIHEskHX7+yrzB2+Grd13soQcdU= X-Google-Smtp-Source: APXvYqzchK2uToAFfTfutp8KJqYHTQciCRLD2h3RWRxRvPbn2xlvFt/6nD1IdosiefQ3ZccRsa5c2g== X-Received: by 2002:adf:e4c6:: with SMTP id v6mr6004069wrm.315.1562865740294; Thu, 11 Jul 2019 10:22:20 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id c11sm8654514wrq.45.2019.07.11.10.22.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Jul 2019 10:22:19 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 11 Jul 2019 19:22:16 +0200 Message-Id: <1562865736-3546-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1562865736-3546-1-git-send-email-pbonzini@redhat.com> References: <1562865736-3546-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::442 Subject: [Qemu-devel] [PATCH 2/2] create_config: remove $(CONFIG_SOFTMMU) hack X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: philmd@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP CONFIG_TPM is defined to a rather weird $(CONFIG_SOFTMMU) so that it expands to the right thing in hw/Makefile.objs. This however is not needed anymore and it has a corresponding hack in create_config to turn it into "#define CONFIG_TPM 1". Clean up. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Julio Montes Tested-by: Julio Montes --- configure | 2 +- scripts/create_config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 4983c8b..eb635c3 100755 --- a/configure +++ b/configure @@ -7159,7 +7159,7 @@ if test "$live_block_migration" = "yes" ; then fi if test "$tpm" = "yes"; then - echo 'CONFIG_TPM=$(CONFIG_SOFTMMU)' >> $config_host_mak + echo 'CONFIG_TPM=y' >> $config_host_mak fi echo "TRACE_BACKENDS=$trace_backends" >> $config_host_mak diff --git a/scripts/create_config b/scripts/create_config index 00e86c8..6d8f08b 100755 --- a/scripts/create_config +++ b/scripts/create_config @@ -54,7 +54,7 @@ case $line in done echo " NULL" ;; - CONFIG_*='$(CONFIG_SOFTMMU)'|CONFIG_*=y) # configuration + CONFIG_*=y) # configuration name=${line%=*} echo "#define $name 1" ;;