From nobody Fri Dec 19 07:47:20 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1549564823829811.0317173741964; Thu, 7 Feb 2019 10:40:23 -0800 (PST) Received: from localhost ([127.0.0.1]:45026 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1groav-0001dc-Ob for importer@patchew.org; Thu, 07 Feb 2019 13:40:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57678) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grnwC-0002Fj-Jj for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grnwA-0002Qj-4Q for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:11 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:43200) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1grnw9-0002PV-A0 for qemu-devel@nongnu.org; Thu, 07 Feb 2019 12:58:09 -0500 Received: by mail-wr1-x444.google.com with SMTP id r2so785336wrv.10 for ; Thu, 07 Feb 2019 09:58:08 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q12sm12708982wmf.2.2019.02.07.09.58.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Feb 2019 09:58:07 -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=Br9acmsw/eWOsnfF1ERIFgW+eoTqEVJa/frT05h97i8=; b=HDqo50MhsGEBhsTLa2KzLj80qhHjgsYadX1FTZ59Xm2RjdeOIzYmTT4ernK0PmO/iR HJ1HGRWYMPPUzNdFK0K8LOiz0eA5Tgg2nJdtAkl1PA7bz3vhq4M3jck9XJwoQrjGL4yO 9gV+5QsxOTwdhTE9UTKsvio+SUSwMpTxzZpS+Y1Kyx/peUhFILjTAvrAKwaSBvn9aXeb BH2Pbqctss+TKhmFq7kaPlJbcwFWMS3aL4ziobVr0Mw370c9u/cuBSpibIpelsVVwxBo DWFD5o6kuHrK3HXamTsTfUXCNE2M7HOu8qh6JvT3R0uAmUN498tZsea2wqapAXF5shJR xoaw== 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=Br9acmsw/eWOsnfF1ERIFgW+eoTqEVJa/frT05h97i8=; b=Ln5hVkp1zmKqG2UH3wxyH1dZOheM7rUAsPudFZLtD09lKG4CE5D0syRvDFfJz+QXwI xC4hX7ulhReEsNVYmzyzxEjKbWpygpy5u3rB4M80HQsm5R9oop3kKH5NzZKpVn6Wngvo QvG0/kHxKDCHR66EG4sVZhkKcn8USoMsWMrRciro4W7EQheybeXQmHb0jflyg9WGRJQ4 l4KJaFVaHttErUpfrSFtq/f6WlIkLRI/LAr6mZiVcpgRA/OlLvYL6fxfA5YnJi7BVbu0 AGXpbe+/PWMdEop+IXoX/slQg4prIlSbpHWm5toNpSqIxukmrE9xo5F+EJGUS4eb0ayc K+DQ== X-Gm-Message-State: AHQUAuYiywm1tNJS3FCoKfJRPqMpUeJEHG4butDC5ZJ2JV54u4t27kaC IbUpIARTfknAVLhrpnT9DuJehi1H X-Google-Smtp-Source: AHgI3IZdooarcnrZ9ETIZHyfz9xvOsB7zUgH/+xMcq2/L0zK3auJKUrMlYQpxneu5C+/oVrtrU6duQ== X-Received: by 2002:a5d:4349:: with SMTP id u9mr13822874wrr.223.1549562287830; Thu, 07 Feb 2019 09:58:07 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 7 Feb 2019 18:57:13 +0100 Message-Id: <1549562254-41157-31-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549562254-41157-1-git-send-email-pbonzini@redhat.com> References: <1549562254-41157-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::444 Subject: [Qemu-devel] [PATCH 30/51] ppc64: Express dependencies of 'pseries' and 'powernv' machines with kconfig 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: thuth@redhat.com, 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" From: Thomas Huth The POWERNV switch should always select ISA_IPMI_BT, then the other IPMI options are turned on automatically now. CONFIG_DIMM should always be selected by the pseries machine, which in turn depends on CONFIG_MEM_DEVICE since DIMM implements this interface. CONFIG_VIRTIO_VGA can be dropped from default-configs/ppc64-softmmu.mak completely since this device is already automatically enabled via hw/display/Kconfig now. Signed-off-by: Thomas Huth Signed-off-by: Paolo Bonzini --- default-configs/ppc64-softmmu.mak | 5 ----- hw/intc/Kconfig | 6 ++---- hw/mem/Kconfig | 1 + hw/ppc/Kconfig | 22 ++++++++++++++++++++-- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-soft= mmu.mak index d642b67..cca5266 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -5,11 +5,6 @@ include ppc-softmmu.mak =20 # For PowerNV CONFIG_POWERNV=3Dy -CONFIG_ISA_IPMI_BT=3Dy =20 # For pSeries CONFIG_PSERIES=3Dy -CONFIG_VIRTIO_VGA=3Dy -CONFIG_MEM_DEVICE=3Dy -CONFIG_DIMM=3Dy -CONFIG_SPAPR_RNG=3Dy diff --git a/hw/intc/Kconfig b/hw/intc/Kconfig index 6eea14e..de10a6b 100644 --- a/hw/intc/Kconfig +++ b/hw/intc/Kconfig @@ -31,13 +31,11 @@ config OPENPIC_KVM =20 config XICS bool - default y - depends on PSERIES + depends on POWERNV || PSERIES =20 config XICS_SPAPR bool - default y - depends on PSERIES + select XICS =20 config XICS_KVM bool diff --git a/hw/mem/Kconfig b/hw/mem/Kconfig index d1e635c..620fd4c 100644 --- a/hw/mem/Kconfig +++ b/hw/mem/Kconfig @@ -1,5 +1,6 @@ config DIMM bool + select MEM_DEVICE =20 config MEM_DEVICE bool diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index fb085d7..be6440e 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -1,11 +1,29 @@ config PSERIES bool + imply PCI_DEVICES + imply TEST_DEVICES + select DIMM + select PCI + select VFIO + select XICS_SPAPR + select XIVE_SPAPR + select SPAPR_VSCSI =20 config SPAPR_RNG bool + default y + depends on PSERIES =20 config POWERNV bool + imply PCI_DEVICES + imply TEST_DEVICES + select ISA_IPMI_BT + select IPMI_LOCAL + select ISA_BUS + select MC146818RTC + select XICS + select XIVE =20 config PPC405 bool @@ -39,10 +57,10 @@ config VIRTEX =20 config XIVE bool - default y - depends on PSERIES + depends on POWERNV || PSERIES =20 config XIVE_SPAPR bool default y depends on PSERIES + select XIVE --=20 1.8.3.1