error: Move qemu_error & friends into their own header
This commit is contained in:
parent
6e4f984cb9
commit
2f7920166d
@ -1,5 +1,5 @@
|
||||
#include "hw.h"
|
||||
#include "sysemu.h"
|
||||
#include "qemu-error.h"
|
||||
#include "scsi.h"
|
||||
#include "scsi-defs.h"
|
||||
#include "block.h"
|
||||
|
@ -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"
|
||||
|
@ -12,6 +12,7 @@
|
||||
*/
|
||||
|
||||
#include "qemu-common.h"
|
||||
#include "qemu-error.h"
|
||||
#include "block.h"
|
||||
#include "scsi.h"
|
||||
|
||||
|
@ -9,6 +9,7 @@
|
||||
*/
|
||||
|
||||
#include "qemu-common.h"
|
||||
#include "qemu-error.h"
|
||||
#include "usb.h"
|
||||
#include "qemu-char.h"
|
||||
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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 {
|
||||
|
@ -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;
|
||||
|
@ -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"
|
||||
|
||||
|
@ -1,4 +1,5 @@
|
||||
#include "qemu-common.h"
|
||||
#include "qemu-error.h"
|
||||
#include "qemu-option.h"
|
||||
#include "qemu-config.h"
|
||||
#include "sysemu.h"
|
||||
|
12
qemu-error.h
Normal file
12
qemu-error.h
Normal file
@ -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
|
@ -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>
|
||||
|
||||
|
2
qerror.c
2
qerror.c
@ -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);
|
||||
|
||||
|
8
sysemu.h
8
sysemu.h
@ -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 */
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user