[Qemu-devel] [PATCH 0/3] Add config options for some not-always-sensible devices

[Qemu-devel] [PATCH 0/3] Add config options for some not-always-sensible devices

[David Gibson]

This series adds explicit config options to control inclusion of a
number of devices.  These are generally things that could
theoretically appear on anything (or at least a wide range of
targets), but are in practice only likely to appear on a much smaller
set of targets.

In some cases the set of default targets where these are included is
also trimmed, but either way it allows users or distributors to more
easily tweak which devices are and aren't included in the build.

David Gibson (3):
  Add specific config options for PCI-E bridges
  Create specific config option for "platform-bus"
  Give ivshmem its own config option

 default-configs/arm-softmmu.mak    | 5 +++++
 default-configs/i386-softmmu.mak   | 3 +++
 default-configs/pci.mak            | 1 +
 default-configs/ppc-softmmu.mak    | 1 +
 default-configs/ppc64-softmmu.mak  | 1 +
 default-configs/x86_64-softmmu.mak | 3 +++
 hw/core/Makefile.objs              | 2 +-
 hw/misc/Makefile.objs              | 4 +---
 hw/pci-bridge/Makefile.objs        | 5 +++--
 9 files changed, 19 insertions(+), 6 deletions(-)

-- 
2.1.0

[Qemu-devel] [PATCH 1/3] Add specific config options for PCI-E bridges

[David Gibson]

The i82801b11, ioh3420 and xio3130 PCI Express devices are currently
included in the build unconditionally.

While they could theoretically appear on any target platform with PCI-E,
they're pretty unlikely to appear on platforms that aren't Intel derived.

Therefore, to avoid presenting unlikely-to-be-relevant devices to the user,
add config options to enable these componenets, and enable they by default
only on x86 and arm platforms.

(Note that this patch does include these for aarch64, via its inclusion of
arm-softmmu.mak).

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 default-configs/arm-softmmu.mak    | 4 ++++
 default-configs/i386-softmmu.mak   | 3 +++
 default-configs/x86_64-softmmu.mak | 3 +++
 hw/pci-bridge/Makefile.objs        | 5 +++--
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index b00c2e1..6ee9b43 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -91,3 +91,7 @@ CONFIG_INTEGRATOR_DEBUG=y
 CONFIG_ALLWINNER_A10_PIT=y
 CONFIG_ALLWINNER_A10_PIC=y
 CONFIG_ALLWINNER_A10=y
+
+CONFIG_XIO3130=y
+CONFIG_IOH3420=y
+CONFIG_I82801B11=y
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index bd99af9..0b8ce4b 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -43,3 +43,6 @@ CONFIG_IOAPIC=y
 CONFIG_ICC_BUS=y
 CONFIG_PVPANIC=y
 CONFIG_MEM_HOTPLUG=y
+CONFIG_XIO3130=y
+CONFIG_IOH3420=y
+CONFIG_I82801B11=y
diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
index e7c2734..6add04a 100644
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/x86_64-softmmu.mak
@@ -43,3 +43,6 @@ CONFIG_IOAPIC=y
 CONFIG_ICC_BUS=y
 CONFIG_PVPANIC=y
 CONFIG_MEM_HOTPLUG=y
+CONFIG_XIO3130=y
+CONFIG_IOH3420=y
+CONFIG_I82801B11=y
diff --git a/hw/pci-bridge/Makefile.objs b/hw/pci-bridge/Makefile.objs
index 968b369..96c596e 100644
--- a/hw/pci-bridge/Makefile.objs
+++ b/hw/pci-bridge/Makefile.objs
@@ -1,5 +1,6 @@
 common-obj-y += pci_bridge_dev.o
-common-obj-y += ioh3420.o xio3130_upstream.o xio3130_downstream.o
-common-obj-y += i82801b11.o
+common-obj-$(CONFIG_XIO3130) += xio3130_upstream.o xio3130_downstream.o
+common-obj-$(CONFIG_IOH3420) += ioh3420.o
+common-obj-$(CONFIG_I82801B11) += i82801b11.o
 # NewWorld PowerMac
 common-obj-$(CONFIG_DEC_PCI) += dec.o
-- 
2.1.0

[Qemu-devel] [PATCH 2/3] Create specific config option for "platform-bus"

[David Gibson]

Currently the "platform-bus" device is included for all softmmu builds.
This bridge is intended for use on any platforms that require dynamic
creation of sysbus devices.  However, at present it is used only for the
PPC E500 target, with plans for the ARM "virt" target in the immediate
future.

To avoid a not-very-useful entry appearing in "qemu -device ?" output on
other targets, this patch makes a specific config option for platform-bus
and enables it (for now) only on ppc configurations which include E500
and on ARM (which always includes the "virt" target).

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 default-configs/arm-softmmu.mak   | 1 +
 default-configs/ppc-softmmu.mak   | 1 +
 default-configs/ppc64-softmmu.mak | 1 +
 hw/core/Makefile.objs             | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 6ee9b43..cc2745f 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -79,6 +79,7 @@ CONFIG_NSERIES=y
 CONFIG_REALVIEW=y
 CONFIG_ZAURUS=y
 CONFIG_ZYNQ=y
+CONFIG_PLATFORM_BUS=y
 
 CONFIG_VERSATILE_PCI=y
 CONFIG_VERSATILE_I2C=y
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index aebfab9..4b60e69 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -43,6 +43,7 @@ CONFIG_PREP=y
 CONFIG_MAC=y
 CONFIG_E500=y
 CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))
+CONFIG_PLATFORM_BUS=y
 CONFIG_ETSEC=y
 CONFIG_LIBDECNUMBER=y
 # For PReP
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
index f195a87..de71e41 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -44,6 +44,7 @@ CONFIG_PREP=y
 CONFIG_MAC=y
 CONFIG_E500=y
 CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))
+CONFIG_PLATFORM_BUS=y
 CONFIG_ETSEC=y
 CONFIG_LIBDECNUMBER=y
 # For pSeries
diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs
index 9dce1bc..abb3560 100644
--- a/hw/core/Makefile.objs
+++ b/hw/core/Makefile.objs
@@ -14,4 +14,4 @@ common-obj-$(CONFIG_SOFTMMU) += machine.o
 common-obj-$(CONFIG_SOFTMMU) += null-machine.o
 common-obj-$(CONFIG_SOFTMMU) += loader.o
 common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o
-common-obj-$(CONFIG_SOFTMMU) += platform-bus.o
+common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o
-- 
2.1.0

[Qemu-devel] [PATCH 3/3] Give ivshmem its own config option

[David Gibson]

Currently the ivshmem device is built whenever both PCI and KVM support are
included.  This patch gives it its own config option to allow easier
customization of whether to include it.  It's enabled by default in the
same circumstances as now - when both PCI and KVM are available.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 default-configs/pci.mak | 1 +
 hw/misc/Makefile.objs   | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/default-configs/pci.mak b/default-configs/pci.mak
index bea6b01..58a2c0a 100644
--- a/default-configs/pci.mak
+++ b/default-configs/pci.mak
@@ -35,3 +35,4 @@ CONFIG_SDHCI=y
 CONFIG_EDU=y
 CONFIG_VGA=y
 CONFIG_VGA_PCI=y
+CONFIG_IVSHMEM=$(CONFIG_KVM)
diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs
index 029a56f..6c6e296 100644
--- a/hw/misc/Makefile.objs
+++ b/hw/misc/Makefile.objs
@@ -19,9 +19,7 @@ common-obj-$(CONFIG_PUV3) += puv3_pm.o
 
 common-obj-$(CONFIG_MACIO) += macio/
 
-ifeq ($(CONFIG_PCI), y)
-obj-$(CONFIG_KVM) += ivshmem.o
-endif
+obj-$(CONFIG_IVSHMEM) += ivshmem.o
 
 obj-$(CONFIG_REALVIEW) += arm_sysctl.o
 obj-$(CONFIG_NSERIES) += cbus.o
-- 
2.1.0

Re: [Qemu-devel] [PATCH 1/3] Add specific config options for PCI-E bridges

[Peter Crosthwaite]

On Mon, Feb 23, 2015 at 3:05 PM, David Gibson
<david@gibson.dropbear.id.au> wrote:
> The i82801b11, ioh3420 and xio3130 PCI Express devices are currently
> included in the build unconditionally.
>
> While they could theoretically appear on any target platform with PCI-E,
> they're pretty unlikely to appear on platforms that aren't Intel derived.
>
> Therefore, to avoid presenting unlikely-to-be-relevant devices to the user,
> add config options to enable these componenets, and enable they by default

"components", "them"

> only on x86 and arm platforms.
>
> (Note that this patch does include these for aarch64, via its inclusion of
> arm-softmmu.mak).
>

"it's"

> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>

Otherwise,

Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>

> ---
>  default-configs/arm-softmmu.mak    | 4 ++++
>  default-configs/i386-softmmu.mak   | 3 +++
>  default-configs/x86_64-softmmu.mak | 3 +++
>  hw/pci-bridge/Makefile.objs        | 5 +++--
>  4 files changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index b00c2e1..6ee9b43 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -91,3 +91,7 @@ CONFIG_INTEGRATOR_DEBUG=y
>  CONFIG_ALLWINNER_A10_PIT=y
>  CONFIG_ALLWINNER_A10_PIC=y
>  CONFIG_ALLWINNER_A10=y
> +
> +CONFIG_XIO3130=y
> +CONFIG_IOH3420=y
> +CONFIG_I82801B11=y
> diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
> index bd99af9..0b8ce4b 100644
> --- a/default-configs/i386-softmmu.mak
> +++ b/default-configs/i386-softmmu.mak
> @@ -43,3 +43,6 @@ CONFIG_IOAPIC=y
>  CONFIG_ICC_BUS=y
>  CONFIG_PVPANIC=y
>  CONFIG_MEM_HOTPLUG=y
> +CONFIG_XIO3130=y
> +CONFIG_IOH3420=y
> +CONFIG_I82801B11=y
> diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
> index e7c2734..6add04a 100644
> --- a/default-configs/x86_64-softmmu.mak
> +++ b/default-configs/x86_64-softmmu.mak
> @@ -43,3 +43,6 @@ CONFIG_IOAPIC=y
>  CONFIG_ICC_BUS=y
>  CONFIG_PVPANIC=y
>  CONFIG_MEM_HOTPLUG=y
> +CONFIG_XIO3130=y
> +CONFIG_IOH3420=y
> +CONFIG_I82801B11=y
> diff --git a/hw/pci-bridge/Makefile.objs b/hw/pci-bridge/Makefile.objs
> index 968b369..96c596e 100644
> --- a/hw/pci-bridge/Makefile.objs
> +++ b/hw/pci-bridge/Makefile.objs
> @@ -1,5 +1,6 @@
>  common-obj-y += pci_bridge_dev.o
> -common-obj-y += ioh3420.o xio3130_upstream.o xio3130_downstream.o
> -common-obj-y += i82801b11.o
> +common-obj-$(CONFIG_XIO3130) += xio3130_upstream.o xio3130_downstream.o
> +common-obj-$(CONFIG_IOH3420) += ioh3420.o
> +common-obj-$(CONFIG_I82801B11) += i82801b11.o
>  # NewWorld PowerMac
>  common-obj-$(CONFIG_DEC_PCI) += dec.o
> --
> 2.1.0
>
>

Re: [Qemu-devel] [PATCH 2/3] Create specific config option for "platform-bus"

[Peter Crosthwaite]

On Mon, Feb 23, 2015 at 3:05 PM, David Gibson
<david@gibson.dropbear.id.au> wrote:
> Currently the "platform-bus" device is included for all softmmu builds.
> This bridge is intended for use on any platforms that require dynamic
> creation of sysbus devices.  However, at present it is used only for the
> PPC E500 target, with plans for the ARM "virt" target in the immediate
> future.
>
> To avoid a not-very-useful entry appearing in "qemu -device ?" output on
> other targets, this patch makes a specific config option for platform-bus
> and enables it (for now) only on ppc configurations which include E500
> and on ARM (which always includes the "virt" target).
>
> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> ---
>  default-configs/arm-softmmu.mak   | 1 +
>  default-configs/ppc-softmmu.mak   | 1 +
>  default-configs/ppc64-softmmu.mak | 1 +
>  hw/core/Makefile.objs             | 2 +-
>  4 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 6ee9b43..cc2745f 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -79,6 +79,7 @@ CONFIG_NSERIES=y
>  CONFIG_REALVIEW=y
>  CONFIG_ZAURUS=y
>  CONFIG_ZYNQ=y
> +CONFIG_PLATFORM_BUS=y
>

This location might not fit best for this config. REALVIEW, and ZYNQ
are ARM specific boards and this logical grouping of configs seems to
be about ARM boards and their specific devs.

Should it just be in it's own category? Alternatively, the first block
of configs seems to contain all the generic stuff (like SSI, SD,
SERIAL and pci.mak) so I think it fits in that bucket most closely.

Regards,
Peter

>  CONFIG_VERSATILE_PCI=y
>  CONFIG_VERSATILE_I2C=y
> diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
> index aebfab9..4b60e69 100644
> --- a/default-configs/ppc-softmmu.mak
> +++ b/default-configs/ppc-softmmu.mak
> @@ -43,6 +43,7 @@ CONFIG_PREP=y
>  CONFIG_MAC=y
>  CONFIG_E500=y
>  CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))
> +CONFIG_PLATFORM_BUS=y
>  CONFIG_ETSEC=y
>  CONFIG_LIBDECNUMBER=y
>  # For PReP
> diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
> index f195a87..de71e41 100644
> --- a/default-configs/ppc64-softmmu.mak
> +++ b/default-configs/ppc64-softmmu.mak
> @@ -44,6 +44,7 @@ CONFIG_PREP=y
>  CONFIG_MAC=y
>  CONFIG_E500=y
>  CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))
> +CONFIG_PLATFORM_BUS=y
>  CONFIG_ETSEC=y
>  CONFIG_LIBDECNUMBER=y
>  # For pSeries
> diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs
> index 9dce1bc..abb3560 100644
> --- a/hw/core/Makefile.objs
> +++ b/hw/core/Makefile.objs
> @@ -14,4 +14,4 @@ common-obj-$(CONFIG_SOFTMMU) += machine.o
>  common-obj-$(CONFIG_SOFTMMU) += null-machine.o
>  common-obj-$(CONFIG_SOFTMMU) += loader.o
>  common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o
> -common-obj-$(CONFIG_SOFTMMU) += platform-bus.o
> +common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o
> --
> 2.1.0
>
>

Re: [Qemu-devel] [PATCH 3/3] Give ivshmem its own config option

[Peter Crosthwaite]

On Mon, Feb 23, 2015 at 3:05 PM, David Gibson
<david@gibson.dropbear.id.au> wrote:
> Currently the ivshmem device is built whenever both PCI and KVM support are
> included.  This patch gives it its own config option to allow easier
> customization of whether to include it.  It's enabled by default in the
> same circumstances as now - when both PCI and KVM are available.
>
> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> ---
>  default-configs/pci.mak | 1 +
>  hw/misc/Makefile.objs   | 4 +---
>  2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/default-configs/pci.mak b/default-configs/pci.mak
> index bea6b01..58a2c0a 100644
> --- a/default-configs/pci.mak
> +++ b/default-configs/pci.mak
> @@ -35,3 +35,4 @@ CONFIG_SDHCI=y
>  CONFIG_EDU=y
>  CONFIG_VGA=y
>  CONFIG_VGA_PCI=y
> +CONFIG_IVSHMEM=$(CONFIG_KVM)

Does this create an order of definition requirement between the
configs? I guess its ok as CONFIG_KVM is defined super-early but it
seems to be avoided where one config def depends on another.

Regards,
Peter

> diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs
> index 029a56f..6c6e296 100644
> --- a/hw/misc/Makefile.objs
> +++ b/hw/misc/Makefile.objs
> @@ -19,9 +19,7 @@ common-obj-$(CONFIG_PUV3) += puv3_pm.o
>
>  common-obj-$(CONFIG_MACIO) += macio/
>
> -ifeq ($(CONFIG_PCI), y)
> -obj-$(CONFIG_KVM) += ivshmem.o
> -endif
> +obj-$(CONFIG_IVSHMEM) += ivshmem.o
>
>  obj-$(CONFIG_REALVIEW) += arm_sysctl.o
>  obj-$(CONFIG_NSERIES) += cbus.o
> --
> 2.1.0
>
>

Re: [Qemu-devel] [PATCH 1/3] Add specific config options for PCI-E bridges

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 3350 bytes --]

On Mon, Feb 23, 2015 at 10:17:58PM -0800, Peter Crosthwaite wrote:
> On Mon, Feb 23, 2015 at 3:05 PM, David Gibson
> <david@gibson.dropbear.id.au> wrote:
> > The i82801b11, ioh3420 and xio3130 PCI Express devices are currently
> > included in the build unconditionally.
> >
> > While they could theoretically appear on any target platform with PCI-E,
> > they're pretty unlikely to appear on platforms that aren't Intel derived.
> >
> > Therefore, to avoid presenting unlikely-to-be-relevant devices to the user,
> > add config options to enable these componenets, and enable they by default
> 
> "components", "them"

Oops, those are embarrassing.

> > only on x86 and arm platforms.
> >
> > (Note that this patch does include these for aarch64, via its inclusion of
> > arm-softmmu.mak).
> >
> 
> "it's"

No, "its" is correct.  It's a possessive, not a contraction.

> > Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> 
> Otherwise,
> 
> Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> 
> > ---
> >  default-configs/arm-softmmu.mak    | 4 ++++
> >  default-configs/i386-softmmu.mak   | 3 +++
> >  default-configs/x86_64-softmmu.mak | 3 +++
> >  hw/pci-bridge/Makefile.objs        | 5 +++--
> >  4 files changed, 13 insertions(+), 2 deletions(-)
> >
> > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> > index b00c2e1..6ee9b43 100644
> > --- a/default-configs/arm-softmmu.mak
> > +++ b/default-configs/arm-softmmu.mak
> > @@ -91,3 +91,7 @@ CONFIG_INTEGRATOR_DEBUG=y
> >  CONFIG_ALLWINNER_A10_PIT=y
> >  CONFIG_ALLWINNER_A10_PIC=y
> >  CONFIG_ALLWINNER_A10=y
> > +
> > +CONFIG_XIO3130=y
> > +CONFIG_IOH3420=y
> > +CONFIG_I82801B11=y
> > diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
> > index bd99af9..0b8ce4b 100644
> > --- a/default-configs/i386-softmmu.mak
> > +++ b/default-configs/i386-softmmu.mak
> > @@ -43,3 +43,6 @@ CONFIG_IOAPIC=y
> >  CONFIG_ICC_BUS=y
> >  CONFIG_PVPANIC=y
> >  CONFIG_MEM_HOTPLUG=y
> > +CONFIG_XIO3130=y
> > +CONFIG_IOH3420=y
> > +CONFIG_I82801B11=y
> > diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
> > index e7c2734..6add04a 100644
> > --- a/default-configs/x86_64-softmmu.mak
> > +++ b/default-configs/x86_64-softmmu.mak
> > @@ -43,3 +43,6 @@ CONFIG_IOAPIC=y
> >  CONFIG_ICC_BUS=y
> >  CONFIG_PVPANIC=y
> >  CONFIG_MEM_HOTPLUG=y
> > +CONFIG_XIO3130=y
> > +CONFIG_IOH3420=y
> > +CONFIG_I82801B11=y
> > diff --git a/hw/pci-bridge/Makefile.objs b/hw/pci-bridge/Makefile.objs
> > index 968b369..96c596e 100644
> > --- a/hw/pci-bridge/Makefile.objs
> > +++ b/hw/pci-bridge/Makefile.objs
> > @@ -1,5 +1,6 @@
> >  common-obj-y += pci_bridge_dev.o
> > -common-obj-y += ioh3420.o xio3130_upstream.o xio3130_downstream.o
> > -common-obj-y += i82801b11.o
> > +common-obj-$(CONFIG_XIO3130) += xio3130_upstream.o xio3130_downstream.o
> > +common-obj-$(CONFIG_IOH3420) += ioh3420.o
> > +common-obj-$(CONFIG_I82801B11) += i82801b11.o
> >  # NewWorld PowerMac
> >  common-obj-$(CONFIG_DEC_PCI) += dec.o
> >
> >
> 

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]

Re: [Qemu-devel] [PATCH 3/3] Give ivshmem its own config option

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 1510 bytes --]

On Mon, Feb 23, 2015 at 10:38:06PM -0800, Peter Crosthwaite wrote:
> On Mon, Feb 23, 2015 at 3:05 PM, David Gibson
> <david@gibson.dropbear.id.au> wrote:
> > Currently the ivshmem device is built whenever both PCI and KVM support are
> > included.  This patch gives it its own config option to allow easier
> > customization of whether to include it.  It's enabled by default in the
> > same circumstances as now - when both PCI and KVM are available.
> >
> > Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> > ---
> >  default-configs/pci.mak | 1 +
> >  hw/misc/Makefile.objs   | 4 +---
> >  2 files changed, 2 insertions(+), 3 deletions(-)
> >
> > diff --git a/default-configs/pci.mak b/default-configs/pci.mak
> > index bea6b01..58a2c0a 100644
> > --- a/default-configs/pci.mak
> > +++ b/default-configs/pci.mak
> > @@ -35,3 +35,4 @@ CONFIG_SDHCI=y
> >  CONFIG_EDU=y
> >  CONFIG_VGA=y
> >  CONFIG_VGA_PCI=y
> > +CONFIG_IVSHMEM=$(CONFIG_KVM)
> 
> Does this create an order of definition requirement between the
> configs? I guess its ok as CONFIG_KVM is defined super-early but it
> seems to be avoided where one config def depends on another.

Actually, I don't think it does.  When "=" is used, rather than ":="
make variables are expanded when used, not when defined.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]

Re: [Qemu-devel] [PATCH 2/3] Create specific config option for "platform-bus"

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 2166 bytes --]

On Mon, Feb 23, 2015 at 10:27:20PM -0800, Peter Crosthwaite wrote:
> On Mon, Feb 23, 2015 at 3:05 PM, David Gibson
> <david@gibson.dropbear.id.au> wrote:
> > Currently the "platform-bus" device is included for all softmmu builds.
> > This bridge is intended for use on any platforms that require dynamic
> > creation of sysbus devices.  However, at present it is used only for the
> > PPC E500 target, with plans for the ARM "virt" target in the immediate
> > future.
> >
> > To avoid a not-very-useful entry appearing in "qemu -device ?" output on
> > other targets, this patch makes a specific config option for platform-bus
> > and enables it (for now) only on ppc configurations which include E500
> > and on ARM (which always includes the "virt" target).
> >
> > Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> > ---
> >  default-configs/arm-softmmu.mak   | 1 +
> >  default-configs/ppc-softmmu.mak   | 1 +
> >  default-configs/ppc64-softmmu.mak | 1 +
> >  hw/core/Makefile.objs             | 2 +-
> >  4 files changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> > index 6ee9b43..cc2745f 100644
> > --- a/default-configs/arm-softmmu.mak
> > +++ b/default-configs/arm-softmmu.mak
> > @@ -79,6 +79,7 @@ CONFIG_NSERIES=y
> >  CONFIG_REALVIEW=y
> >  CONFIG_ZAURUS=y
> >  CONFIG_ZYNQ=y
> > +CONFIG_PLATFORM_BUS=y
> >
> 
> This location might not fit best for this config. REALVIEW, and ZYNQ
> are ARM specific boards and this logical grouping of configs seems to
> be about ARM boards and their specific devs.
> 
> Should it just be in it's own category? Alternatively, the first block
> of configs seems to contain all the generic stuff (like SSI, SD,
> SERIAL and pci.mak) so I think it fits in that bucket most closely.

I really don't know ARM well enough to have any intuition on this.
I'm happy to put it wherever I'm told is best.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]

Re: [Qemu-devel] [PATCH 1/3] Add specific config options for PCI-E bridges

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 989 bytes --]

On 02/23/2015 11:17 PM, Peter Crosthwaite wrote:
> On Mon, Feb 23, 2015 at 3:05 PM, David Gibson
> <david@gibson.dropbear.id.au> wrote:
>> The i82801b11, ioh3420 and xio3130 PCI Express devices are currently
>> included in the build unconditionally.
>>
>> While they could theoretically appear on any target platform with PCI-E,
>> they're pretty unlikely to appear on platforms that aren't Intel derived.
>>
>> Therefore, to avoid presenting unlikely-to-be-relevant devices to the user,
>> add config options to enable these componenets, and enable they by default
> 
> "components", "them"
> 
>> only on x86 and arm platforms.
>>
>> (Note that this patch does include these for aarch64, via its inclusion of
>> arm-softmmu.mak).
>>
> 
> "it's"

"it's" is only correct when you can replace "it is" (or "it has"); this
is a place where "its" is correct.

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]

Re: [Qemu-devel] [PATCH 1/3] Add specific config options for PCI-E bridges

[Peter Crosthwaite]

On Tue, Feb 24, 2015 at 12:55 AM, David Gibson
<david@gibson.dropbear.id.au> wrote:
> On Mon, Feb 23, 2015 at 10:17:58PM -0800, Peter Crosthwaite wrote:
>> On Mon, Feb 23, 2015 at 3:05 PM, David Gibson
>> <david@gibson.dropbear.id.au> wrote:
>> > The i82801b11, ioh3420 and xio3130 PCI Express devices are currently
>> > included in the build unconditionally.
>> >
>> > While they could theoretically appear on any target platform with PCI-E,
>> > they're pretty unlikely to appear on platforms that aren't Intel derived.
>> >
>> > Therefore, to avoid presenting unlikely-to-be-relevant devices to the user,
>> > add config options to enable these componenets, and enable they by default
>>
>> "components", "them"
>
> Oops, those are embarrassing.
>
>> > only on x86 and arm platforms.
>> >
>> > (Note that this patch does include these for aarch64, via its inclusion of
>> > arm-softmmu.mak).
>> >
>>
>> "it's"
>
> No, "its" is correct.  It's a possessive, not a contraction.
>

OK, my bad.

Regards,
Peter

>> > Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
>>
>> Otherwise,
>>
>> Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
>>
>> > ---
>> >  default-configs/arm-softmmu.mak    | 4 ++++
>> >  default-configs/i386-softmmu.mak   | 3 +++
>> >  default-configs/x86_64-softmmu.mak | 3 +++
>> >  hw/pci-bridge/Makefile.objs        | 5 +++--
>> >  4 files changed, 13 insertions(+), 2 deletions(-)
>> >
>> > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
>> > index b00c2e1..6ee9b43 100644
>> > --- a/default-configs/arm-softmmu.mak
>> > +++ b/default-configs/arm-softmmu.mak
>> > @@ -91,3 +91,7 @@ CONFIG_INTEGRATOR_DEBUG=y
>> >  CONFIG_ALLWINNER_A10_PIT=y
>> >  CONFIG_ALLWINNER_A10_PIC=y
>> >  CONFIG_ALLWINNER_A10=y
>> > +
>> > +CONFIG_XIO3130=y
>> > +CONFIG_IOH3420=y
>> > +CONFIG_I82801B11=y
>> > diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
>> > index bd99af9..0b8ce4b 100644
>> > --- a/default-configs/i386-softmmu.mak
>> > +++ b/default-configs/i386-softmmu.mak
>> > @@ -43,3 +43,6 @@ CONFIG_IOAPIC=y
>> >  CONFIG_ICC_BUS=y
>> >  CONFIG_PVPANIC=y
>> >  CONFIG_MEM_HOTPLUG=y
>> > +CONFIG_XIO3130=y
>> > +CONFIG_IOH3420=y
>> > +CONFIG_I82801B11=y
>> > diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
>> > index e7c2734..6add04a 100644
>> > --- a/default-configs/x86_64-softmmu.mak
>> > +++ b/default-configs/x86_64-softmmu.mak
>> > @@ -43,3 +43,6 @@ CONFIG_IOAPIC=y
>> >  CONFIG_ICC_BUS=y
>> >  CONFIG_PVPANIC=y
>> >  CONFIG_MEM_HOTPLUG=y
>> > +CONFIG_XIO3130=y
>> > +CONFIG_IOH3420=y
>> > +CONFIG_I82801B11=y
>> > diff --git a/hw/pci-bridge/Makefile.objs b/hw/pci-bridge/Makefile.objs
>> > index 968b369..96c596e 100644
>> > --- a/hw/pci-bridge/Makefile.objs
>> > +++ b/hw/pci-bridge/Makefile.objs
>> > @@ -1,5 +1,6 @@
>> >  common-obj-y += pci_bridge_dev.o
>> > -common-obj-y += ioh3420.o xio3130_upstream.o xio3130_downstream.o
>> > -common-obj-y += i82801b11.o
>> > +common-obj-$(CONFIG_XIO3130) += xio3130_upstream.o xio3130_downstream.o
>> > +common-obj-$(CONFIG_IOH3420) += ioh3420.o
>> > +common-obj-$(CONFIG_I82801B11) += i82801b11.o
>> >  # NewWorld PowerMac
>> >  common-obj-$(CONFIG_DEC_PCI) += dec.o
>> >
>> >
>>
>
> --
> David Gibson                    | I'll have my music baroque, and my code
> david AT gibson.dropbear.id.au  | minimalist, thank you.  NOT _the_ _other_
>                                 | _way_ _around_!
> http://www.ozlabs.org/~dgibson

Re: [Qemu-devel] [PATCH 2/3] Create specific config option for "platform-bus"

[Peter Crosthwaite]

On Tue, Feb 24, 2015 at 12:57 AM, David Gibson
<david@gibson.dropbear.id.au> wrote:
> On Mon, Feb 23, 2015 at 10:27:20PM -0800, Peter Crosthwaite wrote:
>> On Mon, Feb 23, 2015 at 3:05 PM, David Gibson
>> <david@gibson.dropbear.id.au> wrote:
>> > Currently the "platform-bus" device is included for all softmmu builds.
>> > This bridge is intended for use on any platforms that require dynamic
>> > creation of sysbus devices.  However, at present it is used only for the
>> > PPC E500 target, with plans for the ARM "virt" target in the immediate
>> > future.
>> >
>> > To avoid a not-very-useful entry appearing in "qemu -device ?" output on
>> > other targets, this patch makes a specific config option for platform-bus
>> > and enables it (for now) only on ppc configurations which include E500
>> > and on ARM (which always includes the "virt" target).
>> >
>> > Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
>> > ---
>> >  default-configs/arm-softmmu.mak   | 1 +
>> >  default-configs/ppc-softmmu.mak   | 1 +
>> >  default-configs/ppc64-softmmu.mak | 1 +
>> >  hw/core/Makefile.objs             | 2 +-
>> >  4 files changed, 4 insertions(+), 1 deletion(-)
>> >
>> > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
>> > index 6ee9b43..cc2745f 100644
>> > --- a/default-configs/arm-softmmu.mak
>> > +++ b/default-configs/arm-softmmu.mak
>> > @@ -79,6 +79,7 @@ CONFIG_NSERIES=y
>> >  CONFIG_REALVIEW=y
>> >  CONFIG_ZAURUS=y
>> >  CONFIG_ZYNQ=y
>> > +CONFIG_PLATFORM_BUS=y
>> >
>>
>> This location might not fit best for this config. REALVIEW, and ZYNQ
>> are ARM specific boards and this logical grouping of configs seems to
>> be about ARM boards and their specific devs.
>>
>> Should it just be in it's own category? Alternatively, the first block
>> of configs seems to contain all the generic stuff (like SSI, SD,
>> SERIAL and pci.mak) so I think it fits in that bucket most closely.
>
> I really don't know ARM well enough to have any intuition on this.
> I'm happy to put it wherever I'm told is best.
>

First grouping of configs IMO.

Regards,
Peter

> --
> David Gibson                    | I'll have my music baroque, and my code
> david AT gibson.dropbear.id.au  | minimalist, thank you.  NOT _the_ _other_
>                                 | _way_ _around_!
> http://www.ozlabs.org/~dgibson

Re: [Qemu-devel] [PATCH 3/3] Give ivshmem its own config option

[Peter Crosthwaite]

On Tue, Feb 24, 2015 at 12:57 AM, David Gibson
<david@gibson.dropbear.id.au> wrote:
> On Mon, Feb 23, 2015 at 10:38:06PM -0800, Peter Crosthwaite wrote:
>> On Mon, Feb 23, 2015 at 3:05 PM, David Gibson
>> <david@gibson.dropbear.id.au> wrote:
>> > Currently the ivshmem device is built whenever both PCI and KVM support are
>> > included.  This patch gives it its own config option to allow easier
>> > customization of whether to include it.  It's enabled by default in the
>> > same circumstances as now - when both PCI and KVM are available.
>> >
>> > Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
>> > ---
>> >  default-configs/pci.mak | 1 +
>> >  hw/misc/Makefile.objs   | 4 +---
>> >  2 files changed, 2 insertions(+), 3 deletions(-)
>> >
>> > diff --git a/default-configs/pci.mak b/default-configs/pci.mak
>> > index bea6b01..58a2c0a 100644
>> > --- a/default-configs/pci.mak
>> > +++ b/default-configs/pci.mak
>> > @@ -35,3 +35,4 @@ CONFIG_SDHCI=y
>> >  CONFIG_EDU=y
>> >  CONFIG_VGA=y
>> >  CONFIG_VGA_PCI=y
>> > +CONFIG_IVSHMEM=$(CONFIG_KVM)
>>
>> Does this create an order of definition requirement between the
>> configs? I guess its ok as CONFIG_KVM is defined super-early but it
>> seems to be avoided where one config def depends on another.
>
> Actually, I don't think it does.  When "=" is used, rather than ":="
> make variables are expanded when used, not when defined.
>

Neat, it's all good.

Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>

> --
> David Gibson                    | I'll have my music baroque, and my code
> david AT gibson.dropbear.id.au  | minimalist, thank you.  NOT _the_ _other_
>                                 | _way_ _around_!
> http://www.ozlabs.org/~dgibson