mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 07:43:54 -06:00
error: Link qemu-img, qemu-nbd, qemu-io with qemu-error.o
The location tracking interface is used by code shared with qemi-img,
qemu-nbd and qemu-io, so it needs to be available there. Commit
827b0813
provides it in a rather hamfisted way: it adds a dummy
implementation to qemu-tool.c.
It's cleaner to provide the real thing, and put a few more dummy
monitor functions into qemu-tool.c.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
parent
6627f64510
commit
526f0ac153
2 changed files with 18 additions and 37 deletions
49
qemu-tool.c
49
qemu-tool.c
|
@ -15,7 +15,6 @@
|
|||
#include "monitor.h"
|
||||
#include "qemu-timer.h"
|
||||
#include "qemu-log.h"
|
||||
#include "qemu-error.h"
|
||||
|
||||
#include <sys/time.h>
|
||||
|
||||
|
@ -33,6 +32,21 @@ void qemu_service_io(void)
|
|||
{
|
||||
}
|
||||
|
||||
Monitor *cur_mon;
|
||||
|
||||
int monitor_cur_is_qmp(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
void monitor_set_error(Monitor *mon, QError *qerror)
|
||||
{
|
||||
}
|
||||
|
||||
void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
|
||||
{
|
||||
}
|
||||
|
||||
void monitor_printf(Monitor *mon, const char *fmt, ...)
|
||||
{
|
||||
}
|
||||
|
@ -103,36 +117,3 @@ int64_t qemu_get_clock(QEMUClock *clock)
|
|||
qemu_gettimeofday(&tv);
|
||||
return (tv.tv_sec * 1000000000LL + (tv.tv_usec * 1000)) / 1000000;
|
||||
}
|
||||
|
||||
Location *loc_push_restore(Location *loc)
|
||||
{
|
||||
return loc;
|
||||
}
|
||||
|
||||
Location *loc_push_none(Location *loc)
|
||||
{
|
||||
return loc;
|
||||
}
|
||||
|
||||
Location *loc_pop(Location *loc)
|
||||
{
|
||||
return loc;
|
||||
}
|
||||
|
||||
Location *loc_save(Location *loc)
|
||||
{
|
||||
return loc;
|
||||
}
|
||||
|
||||
void loc_restore(Location *loc)
|
||||
{
|
||||
}
|
||||
|
||||
void error_report(const char *fmt, ...)
|
||||
{
|
||||
va_list args;
|
||||
|
||||
va_start(args, fmt);
|
||||
vfprintf(stderr, fmt, args);
|
||||
va_end(args);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue