From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Lgm2Y-0007V6-Ma for qemu-devel@nongnu.org; Mon, 09 Mar 2009 16:25:34 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lgm2Y-0007U1-1u for qemu-devel@nongnu.org; Mon, 09 Mar 2009 16:25:34 -0400 Received: from [199.232.76.173] (port=56196 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lgm2X-0007Tf-SY for qemu-devel@nongnu.org; Mon, 09 Mar 2009 16:25:33 -0400 Received: from mx20.gnu.org ([199.232.41.8]:3150) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Lgm2X-00015A-1w for qemu-devel@nongnu.org; Mon, 09 Mar 2009 16:25:33 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LgP79-0000RL-Ms for qemu-devel@nongnu.org; Sun, 08 Mar 2009 15:56:48 -0400 Message-ID: <49B422DD.3080300@web.de> Date: Sun, 08 Mar 2009 20:56:13 +0100 From: Jan Kiszka MIME-Version: 1.0 References: <20090221190054.12485.30486.stgit@mchn012c.ww002.siemens.net> <20090221190055.12485.61603.stgit@mchn012c.ww002.siemens.net> <49B3DC8C.6050700@web.de> <20090308184444.GT32521@hall.aurel32.net> In-Reply-To: <20090308184444.GT32521@hall.aurel32.net> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Sender: jan.kiszka@web.de Subject: [Qemu-devel] [PATCH] clean build: Add bt-host.h Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Aurelien Jarno Cc: qemu-devel Aurelien Jarno wrote: > On Sun, Mar 08, 2009 at 03:56:12PM +0100, Jan Kiszka wrote: >> Jan Kiszka wrote: >>> Silence compiler warning by providing a prototype in the CONFIG_BLUEZ >>> case (hw/bt.h provides it otherwise). >>> >>> Signed-off-by: Jan Kiszka >>> --- >>> >>> bt-host.c | 2 ++ >>> 1 files changed, 2 insertions(+), 0 deletions(-) >>> >>> diff --git a/bt-host.c b/bt-host.c >>> index 07679f6..066757a 100644 >>> --- a/bt-host.c >>> +++ b/bt-host.c >>> @@ -31,6 +31,8 @@ >>> # include >>> # include >>> # include >>> +/* Silence compiler warning */ >>> +struct HCIInfo *bt_host_hci(const char *id); >>> # else >>> # include "hw/bt.h" >>> # define HCI_MAX_FRAME_SIZE 1028 >> Thanks for applying the other patches, but this tiny one always seems to >> be ignored - for unknown reasons. :) >> > > On my side, I consider that a hack, not a fix. We should make sure the > correct header is included so that this function is declared. > As always: no comment means no progress. This one better? --------> Silence compiler warning by providing proper CONFIG_BLUEZ-independent header for the bt-host API. Signed-off-by: Jan Kiszka --- bt-host.c | 1 + bt-host.h | 9 +++++++++ hw/bt.h | 3 --- vl.c | 1 + 4 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 bt-host.h diff --git a/bt-host.c b/bt-host.c index a0dcce7..3701fbd 100644 --- a/bt-host.c +++ b/bt-host.c @@ -22,6 +22,7 @@ #include "qemu-char.h" #include "sysemu.h" #include "net.h" +#include "bt-host.h" #ifndef _WIN32 # include diff --git a/bt-host.h b/bt-host.h new file mode 100644 index 0000000..f1eff65 --- /dev/null +++ b/bt-host.h @@ -0,0 +1,9 @@ +#ifndef BT_HOST_H +#define BT_HOST_H + +struct HCIInfo; + +/* bt-host.c */ +struct HCIInfo *bt_host_hci(const char *id); + +#endif diff --git a/hw/bt.h b/hw/bt.h index 2d65e10..726905f 100644 --- a/hw/bt.h +++ b/hw/bt.h @@ -112,9 +112,6 @@ void bt_device_done(struct bt_device_s *dev); /* bt-hci.c */ struct HCIInfo *bt_new_hci(struct bt_scatternet_s *net); -/* bt-host.c */ -struct HCIInfo *bt_host_hci(const char *id); - /* bt-vhci.c */ void bt_vhci_init(struct HCIInfo *info); diff --git a/vl.c b/vl.c index 06e9f73..c426fb0 100644 --- a/vl.c +++ b/vl.c @@ -137,6 +137,7 @@ int main(int argc, char **argv) #include "hw/isa.h" #include "hw/baum.h" #include "hw/bt.h" +#include "bt-host.h" #include "net.h" #include "monitor.h" #include "console.h"