From patchwork Fri Jan 15 11:56:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 42961 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1E09CB7CBB for ; Fri, 15 Jan 2010 23:04:26 +1100 (EST) Received: from localhost ([127.0.0.1]:36720 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NVkpW-0006uS-VN for incoming@patchwork.ozlabs.org; Fri, 15 Jan 2010 06:59:07 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NVkoF-0006tj-Fk for qemu-devel@nongnu.org; Fri, 15 Jan 2010 06:57:47 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NVkoA-0006sN-Sv for qemu-devel@nongnu.org; Fri, 15 Jan 2010 06:57:47 -0500 Received: from [199.232.76.173] (port=36642 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NVkoA-0006sH-LL for qemu-devel@nongnu.org; Fri, 15 Jan 2010 06:57:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33092) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NVkoA-0002u3-4e for qemu-devel@nongnu.org; Fri, 15 Jan 2010 06:57:42 -0500 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o0FBveNm014255 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 15 Jan 2010 06:57:40 -0500 Received: from localhost.localdomain (vpn1-4-48.ams2.redhat.com [10.36.4.48]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o0FBvc4p002285; Fri, 15 Jan 2010 06:57:38 -0500 From: Kevin Wolf To: qemu-devel@nongnu.org Date: Fri, 15 Jan 2010 12:56:41 +0100 Message-Id: <1263556601-15351-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Kevin Wolf , kraxel@redhat.com Subject: [Qemu-devel] [PATCH] Fix QEMU_WARN_UNUSED_RESULT X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Acked-by: Markus Armbruster --- 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: