From nobody Sun Oct 5 01:46:24 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 1551729541566590.0795475074543; Mon, 4 Mar 2019 11:59:01 -0800 (PST) Received: from localhost ([127.0.0.1]:60083 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0tjl-0001F2-D5 for importer@patchew.org; Mon, 04 Mar 2019 14:58:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46107) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h0sCv-0002Hx-7C for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h0sCq-0004bw-1B for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:53 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:54968) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h0sCn-0004UX-Uh for qemu-devel@nongnu.org; Mon, 04 Mar 2019 13:20:50 -0500 Received: by mail-wm1-x344.google.com with SMTP id f3so122947wmj.4 for ; Mon, 04 Mar 2019 10:20:48 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id q5sm8371364wrn.43.2019.03.04.10.20.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Mar 2019 10:20:46 -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=GcrRUiFZIM7HgqkI6pf6+H9FUc04ONoipAdVkbxOkgQ=; b=jpXsHiuP30x247IDNyfHl9f761WZlziqJTxJmbQMnq0PXhyMGD8G0XfzTBwHh5StrA W3kwNXcNFVL+mAXXR8wAM0J9xYrbAPz7ozB88Y+Q5n8jP+g49pvnMFFrz4GeCbs+U30c mX6/Dq3mRmwgYmNMkKTx979VVgvYgWz9w5ClZtA2B6syDHbyefb50/KeRSRm/O2XgTC9 MQ6njIB1eDY0nTD3tu4F6f8GM3lQm92zMOZfEIe5cw+HdkTzTHJraqBWfBbvuJFscUX/ yEfm95T1+n0aEl3Mi+nuEjUaETENJGFAoydf9hlCMQjTddE65Y2bTk+HbxKOonnPEVeF vfVQ== 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=GcrRUiFZIM7HgqkI6pf6+H9FUc04ONoipAdVkbxOkgQ=; b=b4s/LydryExWaV301ecmHRYCghOniN6/Vj4QD8kHcBNGWZIXuz42Sz0KJ+pJSpv4bC iZiDoCVE0O17MHaO5FAjocT6+xJJbYnkWksIE2bbUDQehWcyHmj6PLYvWVsVWHGSRKLy 00Je3632gSR/KMMX7gFU5pYfzmH2UK9SKbT5ILrlGjfg/gnZIou7Oq8sn/waab500XiJ Bgz9RHkMU6JiQc9L/zpBJMnd+Xu1wdl2WcOdbAfvpHQK1Kj7CpUG/c+afxKAanjiDqtF /hc32qEcqjadnVQrRIYHBYW130xKrdwGQSBC5cmqAqx/lf1+fGwt4BG2lJvRHtiFgmLG FoKA== X-Gm-Message-State: APjAAAU2mWZCj/6Qi9I2Y9cfQ/4ZMtnvOcHs4wGB4NPpmlhY5bSyN82U w3T72kI1SQy+GuHx2v59zc4q1FZQ X-Google-Smtp-Source: APXvYqyFsrYgJLpmPD9B3+TaQwpVs0wjB74iiALQjiyDomB46e9vQZgpty7wzgPVgMpFPLH7nDq8EQ== X-Received: by 2002:a1c:4884:: with SMTP id v126mr281366wma.118.1551723647186; Mon, 04 Mar 2019 10:20:47 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Mar 2019 19:19:52 +0100 Message-Id: <1551723614-1823-33-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::344 Subject: [Qemu-devel] [PULL 32/54] 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: 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" 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 | 21 +++++++++++++++++++-- 4 files changed, 22 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 1d5d72f..30e3e81 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -1,12 +1,29 @@ config PSERIES bool + imply PCI_DEVICES + imply TEST_DEVICES + select DIMM + select PCI + select SPAPR_VSCSI select VFIO if LINUX + select XICS_SPAPR + select XIVE_SPAPR =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 @@ -40,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