Revision 526f0ac1

b/Makefile
129 129
qemu-img.o: qemu-img-cmds.h
130 130
qemu-img.o qemu-tool.o qemu-nbd.o qemu-io.o: $(GENERATED_HEADERS)
131 131

  
132
qemu-img$(EXESUF): qemu-img.o qemu-tool.o $(block-obj-y) $(qobject-obj-y)
132
qemu-img$(EXESUF): qemu-img.o qemu-tool.o qemu-error.o $(block-obj-y) $(qobject-obj-y)
133 133

  
134
qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o $(block-obj-y) $(qobject-obj-y)
134
qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o qemu-error.o $(block-obj-y) $(qobject-obj-y)
135 135

  
136
qemu-io$(EXESUF): qemu-io.o qemu-tool.o cmd.o $(block-obj-y) $(qobject-obj-y)
136
qemu-io$(EXESUF): qemu-io.o cmd.o qemu-tool.o qemu-error.o $(block-obj-y) $(qobject-obj-y)
137 137

  
138 138
qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
139 139
	$(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@,"  GEN   $@")
b/qemu-tool.c
15 15
#include "monitor.h"
16 16
#include "qemu-timer.h"
17 17
#include "qemu-log.h"
18
#include "qemu-error.h"
19 18

  
20 19
#include <sys/time.h>
21 20

  
......
33 32
{
34 33
}
35 34

  
35
Monitor *cur_mon;
36

  
37
int monitor_cur_is_qmp(void)
38
{
39
    return 0;
40
}
41

  
42
void monitor_set_error(Monitor *mon, QError *qerror)
43
{
44
}
45

  
46
void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
47
{
48
}
49

  
36 50
void monitor_printf(Monitor *mon, const char *fmt, ...)
37 51
{
38 52
}
......
103 117
    qemu_gettimeofday(&tv);
104 118
    return (tv.tv_sec * 1000000000LL + (tv.tv_usec * 1000)) / 1000000;
105 119
}
106

  
107
Location *loc_push_restore(Location *loc)
108
{
109
    return loc;
110
}
111

  
112
Location *loc_push_none(Location *loc)
113
{
114
    return loc;
115
}
116

  
117
Location *loc_pop(Location *loc)
118
{
119
    return loc;
120
}
121

  
122
Location *loc_save(Location *loc)
123
{
124
    return loc;
125
}
126

  
127
void loc_restore(Location *loc)
128
{
129
}
130

  
131
void error_report(const char *fmt, ...)
132
{
133
    va_list args;
134

  
135
    va_start(args, fmt);
136
    vfprintf(stderr, fmt, args);
137
    va_end(args);
138
}

Also available in: Unified diff