From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53657) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVwV7-0003qQ-1T for qemu-devel@nongnu.org; Fri, 14 Jul 2017 05:03:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dVwV6-0005xx-Be for qemu-devel@nongnu.org; Fri, 14 Jul 2017 05:03:05 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:37570) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dVwV6-0005xZ-4V for qemu-devel@nongnu.org; Fri, 14 Jul 2017 05:03:04 -0400 From: Peter Maydell Date: Fri, 14 Jul 2017 09:33:43 +0100 Message-Id: <1500021225-4118-2-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1500021225-4118-1-git-send-email-peter.maydell@linaro.org> References: <1500021225-4118-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 1/3] configure: Rename CONFIG_IVSHMEM to CONFIG_IVSHMEM_DEVICE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: patches@linaro.org, Kamil Rytarowski , Markus Armbruster 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 --- hw/misc/Makefile.objs | 2 +- default-configs/pci.mak | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index 7e373db..28c1560 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 diff --git a/default-configs/pci.mak b/default-configs/pci.mak index 53ff109..2451eb2 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) -- 2.7.4