Message ID | 1549562254-41157-31-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show |
Series | Support Kconfig in QEMU | expand |
On 07/02/19 18:57, Paolo Bonzini wrote: > diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.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 > > # For PowerNV > CONFIG_POWERNV=y > -CONFIG_ISA_IPMI_BT=y > > # For pSeries > CONFIG_PSERIES=y > -CONFIG_VIRTIO_VGA=y > -CONFIG_MEM_DEVICE=y > -CONFIG_DIMM=y > -CONFIG_SPAPR_RNG=y > 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 > > config XICS > bool > - default y > - depends on PSERIES > + depends on POWERNV || PSERIES > > config XICS_SPAPR > bool > - default y > - depends on PSERIES > + select XICS > > 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 > > 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 I'm changing this to "select VFIO if LINUX" to fix non-Linux compilation. Paolo
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.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 # For PowerNV CONFIG_POWERNV=y -CONFIG_ISA_IPMI_BT=y # For pSeries CONFIG_PSERIES=y -CONFIG_VIRTIO_VGA=y -CONFIG_MEM_DEVICE=y -CONFIG_DIMM=y -CONFIG_SPAPR_RNG=y 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 config XICS bool - default y - depends on PSERIES + depends on POWERNV || PSERIES config XICS_SPAPR bool - default y - depends on PSERIES + select XICS 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 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 config SPAPR_RNG bool + default y + depends on PSERIES 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 config PPC405 bool @@ -39,10 +57,10 @@ config VIRTEX config XIVE bool - default y - depends on PSERIES + depends on POWERNV || PSERIES config XIVE_SPAPR bool default y depends on PSERIES + select XIVE