From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=44067 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PKtxO-00009U-Il for qemu-devel@nongnu.org; Tue, 23 Nov 2010 09:34:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PKtxL-00072Q-Oq for qemu-devel@nongnu.org; Tue, 23 Nov 2010 09:34:54 -0500 Received: from cantor.suse.de ([195.135.220.2]:55039 helo=mx1.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PKtxL-00072B-KB for qemu-devel@nongnu.org; Tue, 23 Nov 2010 09:34:51 -0500 From: Alexander Graf Date: Tue, 23 Nov 2010 15:34:47 +0100 Message-Id: <1290522889-27559-11-git-send-email-agraf@suse.de> In-Reply-To: <1290522889-27559-1-git-send-email-agraf@suse.de> References: <1290522889-27559-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 10/12] config: Add header file for device config options List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU-devel Developers Cc: Kevin Wolf , Joerg Roedel , Gerd Hoffmann , Stefan Hajnoczi , tj@kernel.org, Roland Elek , Sebastian Herbszt So far we have C preprocessor defines for target and host config options, but we're lacking any information on which devices are available. We do need that information at times though, for example in the ahci patch where we need to call a legacy init function depending on whether we have support compiled in or not. So this patch makes all config-devices options available as header file. Please only include it in machine description code! Signed-off-by: Alexander Graf --- v3 -> v4: - config: only include config-devices.h in machine description (blue swirl) --- Makefile.target | 5 ++++- hw/pc_piix.c | 1 + 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/Makefile.target b/Makefile.target index 91e6e74..35862fd 100644 --- a/Makefile.target +++ b/Makefile.target @@ -1,6 +1,6 @@ # -*- Mode: makefile -*- -GENERATED_HEADERS = config-target.h +GENERATED_HEADERS = config-target.h config-devices.h CONFIG_NO_KVM = $(if $(subst n,,$(CONFIG_KVM)),n,y) include ../config-host.mak @@ -40,6 +40,9 @@ kvm.o kvm-all.o vhost.o vhost_net.o: QEMU_CFLAGS+=$(KVM_CFLAGS) config-target.h: config-target.h-timestamp config-target.h-timestamp: config-target.mak +config-devices.h: config-target.h-timestamp +config-devices.h-timestamp: config-target.mak + all: $(PROGS) # Dummy command so that make thinks it has done something diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 12359a7..2be25a6 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -35,6 +35,7 @@ #include "sysemu.h" #include "sysbus.h" #include "blockdev.h" +#include "config-devices.h" #define MAX_IDE_BUS 2 -- 1.6.0.2