diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-14 09:33:43 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-20 14:56:20 +0100 |
| commit | ab7a75b553de295bd308884122101d9afed1d147 (patch) | |
| tree | 5e9a5cae9881b14cbc71a1e6f06e0f90ec27ccf4 | |
| parent | 8dbcd0e5e7cdef9ce0532f454a40e64bc2a1c283 (diff) | |
| download | focaccia-qemu-ab7a75b553de295bd308884122101d9afed1d147.tar.gz focaccia-qemu-ab7a75b553de295bd308884122101d9afed1d147.zip | |
configure: Rename CONFIG_IVSHMEM to CONFIG_IVSHMEM_DEVICE
The current CONFIG_IVSHMEM is confusing, because it looks like it's a flag for "do we have ivshmem support?", but actually it's a flag for "is the ivshmem PCI device being compiled?" (and implicitly "do we have ivshmem support?" is tested with CONFIG_EVENTFD). Rename it to CONFIG_IVSHMEM_DEVICE to clear this confusion up; shortly we will add a new CONFIG_IVSHMEM which really does indicate whether the host can support ivshmem. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Markus Armbruster <armbru@redhat.com> Message-id: 1500021225-4118-2-git-send-email-peter.maydell@linaro.org
| -rw-r--r-- | default-configs/pci.mak | 2 | ||||
| -rw-r--r-- | hw/misc/Makefile.objs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/default-configs/pci.mak b/default-configs/pci.mak index 53ff10975c..2451eb26c7 100644 --- a/default-configs/pci.mak +++ b/default-configs/pci.mak @@ -41,6 +41,6 @@ CONFIG_SDHCI=y CONFIG_EDU=y CONFIG_VGA=y CONFIG_VGA_PCI=y -CONFIG_IVSHMEM=$(CONFIG_EVENTFD) +CONFIG_IVSHMEM_DEVICE=$(CONFIG_EVENTFD) CONFIG_ROCKER=y CONFIG_VHOST_USER_SCSI=$(CONFIG_LINUX) diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index 3b91d32071..29fb922cef 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -23,7 +23,7 @@ common-obj-$(CONFIG_PUV3) += puv3_pm.o common-obj-$(CONFIG_MACIO) += macio/ -obj-$(CONFIG_IVSHMEM) += ivshmem.o +obj-$(CONFIG_IVSHMEM_DEVICE) += ivshmem.o obj-$(CONFIG_REALVIEW) += arm_sysctl.o obj-$(CONFIG_NSERIES) += cbus.o |