From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:44126) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gomP9-00021K-Bj for qemu-devel@nongnu.org; Wed, 30 Jan 2019 04:43:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gomP7-0004LB-3Q for qemu-devel@nongnu.org; Wed, 30 Jan 2019 04:43:35 -0500 From: Thomas Huth Date: Wed, 30 Jan 2019 10:43:03 +0100 Message-Id: <1548841387-7670-2-git-send-email-thuth@redhat.com> In-Reply-To: <1548841387-7670-1-git-send-email-thuth@redhat.com> References: <3f01a301-d639-dbe7-f522-42a50e2d443e@redhat.com> <1548841387-7670-1-git-send-email-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [RFC PATCH 1/5] ppc64: Express dependencies of 'pseries' and 'powernv' machines with kconfig List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, yang.zhong@intel.com Cc: pbonzini@redhat.com, qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= 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. CONFIG_SPAPR_RNG should stay in the ppc-softmmu.mak file since this is a completely optional device. Cc: C=C3=A9dric Le Goater Signed-off-by: Thomas Huth --- default-configs/ppc64-softmmu.mak | 7 ------- hw/intc/Kconfig | 4 +--- hw/mem/Kconfig | 1 + hw/ppc/Kconfig | 9 +++++++++ 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-so= ftmmu.mak index a0a9151..6f8d7ea 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -5,14 +5,7 @@ include ppc-softmmu.mak =20 # For PowerNV CONFIG_POWERNV=3Dy -CONFIG_IPMI=3Dy -CONFIG_IPMI_LOCAL=3Dy -CONFIG_IPMI_EXTERN=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..1e819d0 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 =20 config XICS_SPAPR bool default y - depends on PSERIES + depends on XICS && PSERIES =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 b0095e1..b44e3bd 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -1,11 +1,20 @@ config PSERIES bool + select DIMM + select PCI + select VFIO + select XICS =20 config SPAPR_RNG bool + depends on PSERIES =20 config POWERNV bool + select ISA_IPMI_BT + select ISA_BUS + select MC146818RTC + select XICS =20 config PPC405 bool --=20 1.8.3.1