diff options
| -rw-r--r-- | hw/scsi-bus.c | 2 | ||||
| -rw-r--r-- | hw/scsi-disk.c | 3 | ||||
| -rw-r--r-- | hw/scsi-generic.c | 1 | ||||
| -rw-r--r-- | hw/usb-serial.c | 1 | ||||
| -rw-r--r-- | hw/virtio-net.c | 1 | ||||
| -rw-r--r-- | hw/virtio-pci.c | 2 | ||||
| -rw-r--r-- | monitor.h | 1 | ||||
| -rw-r--r-- | net/dump.c | 1 | ||||
| -rw-r--r-- | net/socket.c | 2 | ||||
| -rw-r--r-- | net/tap-linux.c | 1 | ||||
| -rw-r--r-- | net/tap.c | 1 | ||||
| -rw-r--r-- | qemu-config.c | 1 | ||||
| -rw-r--r-- | qemu-error.h | 12 | ||||
| -rw-r--r-- | qemu-tool.c | 2 | ||||
| -rw-r--r-- | qerror.c | 2 | ||||
| -rw-r--r-- | sysemu.h | 8 |
16 files changed, 26 insertions, 15 deletions
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index a2f9cc1cc3..c41ce9b32a 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -1,5 +1,5 @@ #include "hw.h" -#include "sysemu.h" +#include "qemu-error.h" #include "scsi.h" #include "scsi-defs.h" #include "block.h" diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 8f7ffc143d..9cc35f8e97 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -19,8 +19,6 @@ * the host adapter emulator. */ -#include <qemu-common.h> -#include <sysemu.h> //#define DEBUG_SCSI #ifdef DEBUG_SCSI @@ -34,6 +32,7 @@ do { printf("scsi-disk: " fmt , ## __VA_ARGS__); } while (0) do { fprintf(stderr, "scsi-disk: " fmt , ## __VA_ARGS__); } while (0) #include "qemu-common.h" +#include "qemu-error.h" #include "block.h" #include "scsi.h" #include "scsi-defs.h" diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index de778efa3b..cfd990352f 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -12,6 +12,7 @@ */ #include "qemu-common.h" +#include "qemu-error.h" #include "block.h" #include "scsi.h" diff --git a/hw/usb-serial.c b/hw/usb-serial.c index 1410b11b2b..6db9446b82 100644 --- a/hw/usb-serial.c +++ b/hw/usb-serial.c @@ -9,6 +9,7 @@ */ #include "qemu-common.h" +#include "qemu-error.h" #include "usb.h" #include "qemu-char.h" diff --git a/hw/virtio-net.c b/hw/virtio-net.c index 5c0093e879..8359be69e7 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -15,6 +15,7 @@ #include "net.h" #include "net/checksum.h" #include "net/tap.h" +#include "qemu-error.h" #include "qemu-timer.h" #include "virtio-net.h" diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 799f664d8e..52f8812b0b 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -19,7 +19,7 @@ #include "virtio-blk.h" #include "virtio-net.h" #include "pci.h" -#include "sysemu.h" +#include "qemu-error.h" #include "msix.h" #include "net.h" #include "block_int.h" @@ -3,6 +3,7 @@ #include "qemu-common.h" #include "qemu-char.h" +#include "qemu-error.h" #include "qerror.h" #include "qdict.h" #include "block.h" diff --git a/net/dump.c b/net/dump.c index d50b4eeac4..e702830108 100644 --- a/net/dump.c +++ b/net/dump.c @@ -25,6 +25,7 @@ #include "dump.h" #include "qemu-common.h" #include "sysemu.h" +#include "qemu-error.h" #include "qemu-log.h" typedef struct DumpState { diff --git a/net/socket.c b/net/socket.c index 442a9c790c..474d573a47 100644 --- a/net/socket.c +++ b/net/socket.c @@ -28,9 +28,9 @@ #include "net.h" #include "qemu-char.h" #include "qemu-common.h" +#include "qemu-error.h" #include "qemu-option.h" #include "qemu_socket.h" -#include "sysemu.h" typedef struct NetSocketState { VLANClientState nc; diff --git a/net/tap-linux.c b/net/tap-linux.c index 6af9e824d3..c5748e631b 100644 --- a/net/tap-linux.c +++ b/net/tap-linux.c @@ -31,6 +31,7 @@ #include "sysemu.h" #include "qemu-common.h" +#include "qemu-error.h" int tap_open(char *ifname, int ifname_size, int *vnet_hdr, int vnet_hdr_required) { @@ -38,6 +38,7 @@ #include "sysemu.h" #include "qemu-char.h" #include "qemu-common.h" +#include "qemu-error.h" #include "net/tap-linux.h" diff --git a/qemu-config.c b/qemu-config.c index 246fae6f99..2c9a7a5f2d 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -1,4 +1,5 @@ #include "qemu-common.h" +#include "qemu-error.h" #include "qemu-option.h" #include "qemu-config.h" #include "sysemu.h" diff --git a/qemu-error.h b/qemu-error.h new file mode 100644 index 0000000000..fa161135fd --- /dev/null +++ b/qemu-error.h @@ -0,0 +1,12 @@ +#ifndef QEMU_ERROR_H +#define QEMU_ERROR_H + +void qemu_error(const char *fmt, ...) __attribute__ ((format(printf, 1, 2))); +void qemu_error_internal(const char *file, int linenr, const char *func, + const char *fmt, ...) + __attribute__ ((format(printf, 4, 5))); + +#define qemu_error_new(fmt, ...) \ + qemu_error_internal(__FILE__, __LINE__, __func__, fmt, ## __VA_ARGS__) + +#endif diff --git a/qemu-tool.c b/qemu-tool.c index bbce99fd8d..26f46eb09c 100644 --- a/qemu-tool.c +++ b/qemu-tool.c @@ -13,9 +13,9 @@ #include "qemu-common.h" #include "monitor.h" -#include "sysemu.h" #include "qemu-timer.h" #include "qemu-log.h" +#include "qemu-error.h" #include <sys/time.h> @@ -12,8 +12,8 @@ #include "qjson.h" #include "qerror.h" #include "qstring.h" -#include "sysemu.h" #include "qemu-common.h" +#include "qemu-error.h" static void qerror_destroy_obj(QObject *obj); @@ -73,14 +73,6 @@ int qemu_savevm_state_complete(Monitor *mon, QEMUFile *f); void qemu_savevm_state_cancel(Monitor *mon, QEMUFile *f); int qemu_loadvm_state(QEMUFile *f); -void qemu_error(const char *fmt, ...) __attribute__ ((format(printf, 1, 2))); -void qemu_error_internal(const char *file, int linenr, const char *func, - const char *fmt, ...) - __attribute__ ((format(printf, 4, 5))); - -#define qemu_error_new(fmt, ...) \ - qemu_error_internal(__FILE__, __LINE__, __func__, fmt, ## __VA_ARGS__) - #ifdef _WIN32 /* Polling handling */ |