From nobody Tue Apr 23 23:38:47 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1562865771; cv=none; d=zoho.com; s=zohoarc; b=n12c8p3ERdqpkg5zovgDHbmN/2eN6CxDT5vUgyDMDJMQpyN89EvOM123Acz4YFIuiW46TA3ymgVpLx9wsu2pgXX79zBZqrI4VupVJjIaja35shwyIm1K0W58TjN7o/k4t6k3k3kp2aXyWjVGJuXL++mTesZEfp47dR8MNK35Up0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562865771; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=8jfPHYDP/Jv1ss0TndIwtapkw5U3C3otDUhZHMou5PA=; b=iJ4+IePxj/0tuQf3b28uVCNVwFAlMHU5S7+tYuc45FuDyhuioQ+2clluCRqiQ5tMYM49asD+7/sB5apNRZTef7Br+nGkCnf/YyxFbsR6WagnA+zwiTHyqEXerdOzfigKkvf/ud3tOUjxxgqECmXaPj8LwA27uobSNEm50dU7RkI= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562865771149955.2128255506174; Thu, 11 Jul 2019 10:22:51 -0700 (PDT) Received: from localhost ([::1]:43740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlcmI-0006ko-N2 for importer@patchew.org; Thu, 11 Jul 2019 13:22:42 -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) 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) 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) 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+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 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 =3D core/ +ifeq ($(CONFIG_SOFTMMU), y) 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/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D block/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D bt/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D char/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D cpu/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D display/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D dma/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D gpio/ +devices-dirs-y +=3D acpi/ +devices-dirs-y +=3D adc/ +devices-dirs-y +=3D audio/ +devices-dirs-y +=3D block/ +devices-dirs-y +=3D bt/ +devices-dirs-y +=3D char/ +devices-dirs-y +=3D cpu/ +devices-dirs-y +=3D display/ +devices-dirs-y +=3D dma/ +devices-dirs-y +=3D gpio/ devices-dirs-$(CONFIG_HYPERV) +=3D hyperv/ devices-dirs-$(CONFIG_I2C) +=3D i2c/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D ide/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D input/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D intc/ +devices-dirs-y +=3D ide/ +devices-dirs-y +=3D input/ +devices-dirs-y +=3D intc/ devices-dirs-$(CONFIG_IPACK) +=3D ipack/ devices-dirs-$(CONFIG_IPMI) +=3D ipmi/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D isa/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D misc/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D net/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D rdma/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D nvram/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D pci/ +devices-dirs-y +=3D isa/ +devices-dirs-y +=3D misc/ +devices-dirs-y +=3D net/ +devices-dirs-y +=3D rdma/ +devices-dirs-y +=3D nvram/ +devices-dirs-y +=3D pci/ devices-dirs-$(CONFIG_PCI) +=3D pci-bridge/ pci-host/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D pcmcia/ +devices-dirs-y +=3D pcmcia/ devices-dirs-$(CONFIG_SCSI) +=3D scsi/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D sd/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D ssi/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D timer/ +devices-dirs-y +=3D sd/ +devices-dirs-y +=3D ssi/ +devices-dirs-y +=3D timer/ devices-dirs-$(CONFIG_TPM) +=3D tpm/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D usb/ +devices-dirs-y +=3D usb/ devices-dirs-$(CONFIG_VFIO) +=3D vfio/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D virtio/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D watchdog/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D xen/ +devices-dirs-y +=3D virtio/ +devices-dirs-y +=3D watchdog/ +devices-dirs-y +=3D xen/ devices-dirs-$(CONFIG_MEM_DEVICE) +=3D mem/ -devices-dirs-$(CONFIG_SOFTMMU) +=3D smbios/ devices-dirs-y +=3D semihosting/ -devices-dirs-y +=3D core/ +devices-dirs-y +=3D smbios/ +endif + common-obj-y +=3D $(devices-dirs-y) obj-y +=3D $(devices-dirs-y) --=20 1.8.3.1 From nobody Tue Apr 23 23:38:47 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1562865776; cv=none; d=zoho.com; s=zohoarc; b=QhMK9b+RDdXdnRSBdncFMLSFVlMRZm/5IKneGfio3X2zBWUE+V7QatQ/mu6aPb/+hHcVI4hKBh8kcQFGhrPbGcQ0zjMq2M3nYE56mJRZYxqpvTLSP2fypy8Eg7bdyxmy9KIsgVLLO0ebkl9wlxn5DUIZ1emGrQfAcINuExz14w4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562865776; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=RxYfAEyw36ihWSXQYKfqSMDy1K9OXWQsSR7Cb5/oOMk=; b=A02j3gv6bXj9b4utkavWrOBAXG9RlSh6E9OshjHgBGBZ4SZXLTn1RWstD9YMFuK5JjTvCMXCAOGQ5B7FhzxaOk8kUQMU8iu/ddGmO7/tAQAazjwUmPHZGIo2dCCOrnkxPZrXOS6TchYmjxfRmsq9w3dG7oggdszd5Hf8m2+PgaI= ARC-Authentication-Results: i=1; mx.zoho.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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562865776712991.5248062839771; Thu, 11 Jul 2019 10:22:56 -0700 (PDT) Received: from localhost ([::1]:43748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlcmV-0007w8-QM for importer@patchew.org; Thu, 11 Jul 2019 13:22:55 -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) 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) 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) 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+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" 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: Julio Montes Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Julio Montes Tested-by: Philippe Mathieu-Daud=C3=A9 --- 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" =3D "yes" ; then fi =20 if test "$tpm" =3D "yes"; then - echo 'CONFIG_TPM=3D$(CONFIG_SOFTMMU)' >> $config_host_mak + echo 'CONFIG_TPM=3Dy' >> $config_host_mak fi =20 echo "TRACE_BACKENDS=3D$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_*=3D'$(CONFIG_SOFTMMU)'|CONFIG_*=3Dy) # configuration + CONFIG_*=3Dy) # configuration name=3D${line%=3D*} echo "#define $name 1" ;; --=20 1.8.3.1