Commit beb6f0de authored by Kevin Wolf's avatar Kevin Wolf Committed by Anthony Liguori
Browse files

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: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 0d2ed46a

hw/usb-net.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

hw/usb-serial.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}

qemu-common.h

+2 −1
Original line number Diff line number Diff line
@@ -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

usb-linux.c

+1 −1
Original line number Diff line number Diff line
@@ -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: