From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NXMkZ-0004c4-9c for qemu-devel@nongnu.org; Tue, 19 Jan 2010 17:40:39 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NXMkU-0004bb-FH for qemu-devel@nongnu.org; Tue, 19 Jan 2010 17:40:38 -0500 Received: from [199.232.76.173] (port=58897 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NXMkU-0004bY-Ay for qemu-devel@nongnu.org; Tue, 19 Jan 2010 17:40:34 -0500 Received: from mail-qy0-f197.google.com ([209.85.221.197]:40718) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NXMkU-0004s0-4U for qemu-devel@nongnu.org; Tue, 19 Jan 2010 17:40:34 -0500 Received: by mail-qy0-f197.google.com with SMTP id 35so1358126qyk.19 for ; Tue, 19 Jan 2010 14:40:33 -0800 (PST) Message-ID: <4B5634DF.90101@codemonkey.ws> Date: Tue, 19 Jan 2010 16:40:31 -0600 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH] Fix QEMU_WARN_UNUSED_RESULT References: <1263556601-15351-1-git-send-email-kwolf@redhat.com> In-Reply-To: <1263556601-15351-1-git-send-email-kwolf@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf Cc: qemu-devel@nongnu.org, kraxel@redhat.com On 01/15/2010 05:56 AM, Kevin Wolf wrote: > Since commit 747bbdf7 QEMU_WARN_UNUSED_RESULT is never defined as it is > conditional on a define from config-host.h which is included only later. > Include that file earlier to get the warnings back. > > Reactivating it unfortunately leads to some warnings about unused qdev_init > results. These calls are changed to qdev_init_nofail to avoid build failures. > > Signed-off-by: Kevin Wolf > Applied. Thanks. Regards, Anthony Liguori > --- > > Gerd, can you please check if using nofail is appropriate or should be replaced > by some real error checks (and if so, which)? > > hw/usb-net.c | 2 +- > hw/usb-serial.c | 4 ++-- > qemu-common.h | 3 ++- > usb-linux.c | 2 +- > 4 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/hw/usb-net.c b/hw/usb-net.c > index 9744dfa..cfd2f62 100644 > --- a/hw/usb-net.c > +++ b/hw/usb-net.c > @@ -1492,7 +1492,7 @@ static USBDevice *usb_net_init(const char *cmdline) > > dev = usb_create(NULL /* FIXME */, "usb-net"); > qdev_set_nic_properties(&dev->qdev,&nd_table[idx]); > - qdev_init(&dev->qdev); > + qdev_init_nofail(&dev->qdev); > return dev; > } > > diff --git a/hw/usb-serial.c b/hw/usb-serial.c > index 2775cf0..37293ea 100644 > --- a/hw/usb-serial.c > +++ b/hw/usb-serial.c > @@ -583,7 +583,7 @@ static USBDevice *usb_serial_init(const char *filename) > qdev_prop_set_uint16(&dev->qdev, "vendorid", vendorid); > if (productid) > qdev_prop_set_uint16(&dev->qdev, "productid", productid); > - qdev_init(&dev->qdev); > + qdev_init_nofail(&dev->qdev); > > return dev; > } > @@ -599,7 +599,7 @@ static USBDevice *usb_braille_init(const char *unused) > > dev = usb_create(NULL /* FIXME */, "usb-braille"); > qdev_prop_set_chr(&dev->qdev, "chardev", cdrv); > - qdev_init(&dev->qdev); > + qdev_init_nofail(&dev->qdev); > > return dev; > } > diff --git a/qemu-common.h b/qemu-common.h > index 8630f8c..d96060a 100644 > --- a/qemu-common.h > +++ b/qemu-common.h > @@ -2,6 +2,8 @@ > #ifndef QEMU_COMMON_H > #define QEMU_COMMON_H > > +#include "config-host.h" > + > #define QEMU_NORETURN __attribute__ ((__noreturn__)) > #ifdef CONFIG_GCC_ATTRIBUTE_WARN_UNUSED_RESULT > #define QEMU_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) > @@ -29,7 +31,6 @@ > #include > #include > #include > -#include "config-host.h" > > #ifndef O_LARGEFILE > #define O_LARGEFILE 0 > diff --git a/usb-linux.c b/usb-linux.c > index 88728e9..5619b30 100644 > --- a/usb-linux.c > +++ b/usb-linux.c > @@ -1036,7 +1036,7 @@ USBDevice *usb_host_device_open(const char *devname) > qdev_prop_set_uint32(&dev->qdev, "hostaddr", filter.addr); > qdev_prop_set_uint32(&dev->qdev, "vendorid", filter.vendor_id); > qdev_prop_set_uint32(&dev->qdev, "productid", filter.product_id); > - qdev_init(&dev->qdev); > + qdev_init_nofail(&dev->qdev); > return dev; > > fail: >