Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Lh9ju-0002fU-Cj for qemu-devel@nongnu.org; Tue, 10 Mar 2009 17:43:54 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lh9jt-0002eI-Ju for qemu-devel@nongnu.org; Tue, 10 Mar 2009 17:43:53 -0400 Received: from [199.232.76.173] (port=45708 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lh9jt-0002dx-9l for qemu-devel@nongnu.org; Tue, 10 Mar 2009 17:43:53 -0400 Received: from hall.aurel32.net ([88.191.82.174]:35239) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Lh9js-0001ER-OC for qemu-devel@nongnu.org; Tue, 10 Mar 2009 17:43:53 -0400 Date: Tue, 10 Mar 2009 22:43:46 +0100 From: Aurelien Jarno Subject: Re: [Qemu-devel] [PATCH] clean build: Add bt-host.h Message-ID: <20090310214346.GB433@volta.aurel32.net> 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> <49B422DD.3080300@web.de> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <49B422DD.3080300@web.de> Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jan Kiszka Cc: qemu-devel@nongnu.org On Sun, Mar 08, 2009 at 08:56:13PM +0100, Jan Kiszka wrote: > 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 Thanks, applied. > > 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" > > > -- Aurelien Jarno GPG: 1024D/F1BCDB73 aurelien@aurel32.net http://www.aurel32.net