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
<address@hidden> 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 <address@hidden>
> ---
>  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
>
>