diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2010-01-15 12:56:41 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-01-19 16:31:04 -0600 |
| commit | beb6f0de7aa19ce62fdd21a876b8c171ac7fde2e (patch) | |
| tree | 8955992d29c37fd607dd79006d8d9737c83a8dc6 | |
| parent | 0d2ed46af43365fd713532c5eb9450380635b694 (diff) | |
Fix QEMU_WARN_UNUSED_RESULT
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 <kwolf@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | hw/usb-net.c | 2 | ||||
| -rw-r--r-- | hw/usb-serial.c | 4 | ||||
| -rw-r--r-- | qemu-common.h | 3 | ||||
| -rw-r--r-- | usb-linux.c | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/hw/usb-net.c b/hw/usb-net.c index 9744dfa5d..cfd2f62e0 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 2775cf0f0..37293ea41 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 8630f8c41..d96060adb 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 <fcntl.h> #include <sys/stat.h> #include <assert.h> -#include "config-host.h" #ifndef O_LARGEFILE #define O_LARGEFILE 0 diff --git a/usb-linux.c b/usb-linux.c index 88728e927..5619b3060 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: |