Revision 5708fc66

b/Makefile
171 171

  
172 172
qemu-img.o: qemu-img-cmds.h
173 173

  
174
tools-obj-y = $(oslib-obj-y) $(trace-obj-y) qemu-tool.o qemu-timer.o \
174
tools-obj-y = $(oslib-obj-y) $(trace-obj-y) qemu-timer.o \
175 175
	main-loop.o iohandler.o error.o
176 176
tools-obj-$(CONFIG_POSIX) += compatfd.o
177 177

  
b/Makefile.objs
130 130
user-obj-y += tcg-runtime.o host-utils.o
131 131
user-obj-y += cache-utils.o
132 132
user-obj-y += module.o
133
user-obj-y += qemu-user.o
134 133
user-obj-y += qom/
135 134

  
136 135
######################################################################
......
171 170
######################################################################
172 171
# guest agent
173 172

  
174
qga-obj-y = qga/ module.o qemu-tool.o
173
qga-obj-y = qga/ module.o
175 174
qga-obj-$(CONFIG_POSIX) += qemu-sockets.o qemu-option.o
176 175

  
177 176
vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
b/exec.c
78 78
/* 0 = Do not count executed instructions.
79 79
   1 = Precise instruction counting.
80 80
   2 = Adaptive rate instruction counting.  */
81
int use_icount = 0;
81
int use_icount;
82 82

  
83 83
#if !defined(CONFIG_USER_ONLY)
84 84

  
/dev/null
1
/*
2
 * Compatibility for qemu-img/qemu-nbd
3
 *
4
 * Copyright IBM, Corp. 2008
5
 *
6
 * Authors:
7
 *  Anthony Liguori   <aliguori@us.ibm.com>
8
 *
9
 * This work is licensed under the terms of the GNU GPL, version 2.  See
10
 * the COPYING file in the top-level directory.
11
 *
12
 * Contributions after 2012-01-13 are licensed under the terms of the
13
 * GNU GPL, version 2 or (at your option) any later version.
14
 */
15

  
16
#include "qemu-common.h"
17
#include "monitor/monitor.h"
18
#include "qemu/timer.h"
19
#include "qemu/log.h"
20
#include "migration/migration.h"
21
#include "qemu/main-loop.h"
22
#include "sysemu/sysemu.h"
23
#include "qemu/sockets.h"
24
#include "slirp/libslirp.h"
25

  
26
#include <sys/time.h>
27

  
28
struct QEMUBH
29
{
30
    QEMUBHFunc *cb;
31
    void *opaque;
32
};
33

  
34
const char *qemu_get_vm_name(void)
35
{
36
    return NULL;
37
}
38

  
39
Monitor *cur_mon;
40

  
41
void vm_stop(RunState state)
42
{
43
    abort();
44
}
45

  
46
int monitor_cur_is_qmp(void)
47
{
48
    return 0;
49
}
50

  
51
void monitor_set_error(Monitor *mon, QError *qerror)
52
{
53
}
54

  
55
void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
56
{
57
}
58

  
59
void monitor_printf(Monitor *mon, const char *fmt, ...)
60
{
61
}
62

  
63
void monitor_print_filename(Monitor *mon, const char *filename)
64
{
65
}
66

  
67
void monitor_protocol_event(MonitorEvent event, QObject *data)
68
{
69
}
70

  
71
int64_t cpu_get_clock(void)
72
{
73
    return get_clock_realtime();
74
}
75

  
76
int64_t cpu_get_icount(void)
77
{
78
    abort();
79
}
80

  
81
void qemu_mutex_lock_iothread(void)
82
{
83
}
84

  
85
void qemu_mutex_unlock_iothread(void)
86
{
87
}
88

  
89
int use_icount;
90

  
91
void qemu_clock_warp(QEMUClock *clock)
92
{
93
}
94

  
95
void slirp_update_timeout(uint32_t *timeout)
96
{
97
}
98

  
99
void slirp_select_fill(int *pnfds, fd_set *readfds,
100
                       fd_set *writefds, fd_set *xfds)
101
{
102
}
103

  
104
void slirp_select_poll(fd_set *readfds, fd_set *writefds,
105
                       fd_set *xfds, int select_error)
106
{
107
}
108

  
109
void migrate_add_blocker(Error *reason)
110
{
111
}
112

  
113
void migrate_del_blocker(Error *reason)
114
{
115
}
/dev/null
1
/*
2
 * Stubs for QEMU user emulation
3
 *
4
 * Copyright (c) 2012 SUSE LINUX Products GmbH
5
 *
6
 * This program is free software; you can redistribute it and/or
7
 * modify it under the terms of the GNU General Public License
8
 * as published by the Free Software Foundation; either version 2
9
 * of the License, or (at your option) any later version.
10
 *
11
 * This program is distributed in the hope that it will be useful,
12
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
 * GNU General Public License for more details.
15
 *
16
 * You should have received a copy of the GNU General Public License
17
 * along with this program; if not, see
18
 * <http://www.gnu.org/licenses/gpl-2.0.html>
19
 */
20

  
21
#include "qemu-common.h"
22
#include "monitor/monitor.h"
23

  
24
Monitor *cur_mon;
25

  
26
int monitor_cur_is_qmp(void)
27
{
28
    return 0;
29
}
30

  
31
void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
32
{
33
}
34

  
35
void monitor_set_error(Monitor *mon, QError *qerror)
36
{
37
}
b/stubs/Makefile.objs
1 1
stub-obj-y += arch-query-cpu-def.o
2
stub-obj-y += clock-warp.o
3
stub-obj-y += cpu-get-clock.o
4
stub-obj-y += cpu-get-icount.o
2 5
stub-obj-y += fdset-add-fd.o
3 6
stub-obj-y += fdset-find-fd.o
4 7
stub-obj-y += fdset-get-fd.o
5 8
stub-obj-y += fdset-remove-fd.o
6 9
stub-obj-y += get-fd.o
7
stub-obj-y += set-fd-handler.o
10
stub-obj-y += get-vm-name.o
11
stub-obj-y += iothread-lock.o
12
stub-obj-y += migr-blocker.o
13
stub-obj-y += mon-is-qmp.o
14
stub-obj-y += mon-printf.o
15
stub-obj-y += mon-print-filename.o
16
stub-obj-y += mon-protocol-event.o
17
stub-obj-y += mon-set-error.o
8 18
stub-obj-y += reset.o
9
stub-obj-y += vmstate.o
19
stub-obj-y += set-fd-handler.o
20
stub-obj-y += slirp.o
10 21
stub-obj-y += sysbus.o
22
stub-obj-y += vm-stop.o
23
stub-obj-y += vmstate.o
11 24
stub-obj-$(CONFIG_WIN32) += fd-register.o
b/stubs/clock-warp.c
1
#include "qemu-common.h"
2
#include "qemu/timer.h"
3

  
4
void qemu_clock_warp(QEMUClock *clock)
5
{
6
}
7

  
b/stubs/cpu-get-clock.c
1
#include "qemu-common.h"
2
#include "qemu/timer.h"
3

  
4
int64_t cpu_get_clock(void)
5
{
6
    return get_clock_realtime();
7
}
b/stubs/cpu-get-icount.c
1
#include "qemu-common.h"
2
#include "qemu/timer.h"
3

  
4
int use_icount;
5

  
6
int64_t cpu_get_icount(void)
7
{
8
    abort();
9
}
b/stubs/get-vm-name.c
1
#include "qemu-common.h"
2

  
3
const char *qemu_get_vm_name(void)
4
{
5
    return NULL;
6
}
7

  
b/stubs/iothread-lock.c
1
#include "qemu-common.h"
2
#include "qemu/main-loop.h"
3

  
4
void qemu_mutex_lock_iothread(void)
5
{
6
}
7

  
8
void qemu_mutex_unlock_iothread(void)
9
{
10
}
b/stubs/migr-blocker.c
1
#include "qemu-common.h"
2
#include "migration/migration.h"
3

  
4
void migrate_add_blocker(Error *reason)
5
{
6
}
7

  
8
void migrate_del_blocker(Error *reason)
9
{
10
}
b/stubs/mon-is-qmp.c
1
#include "qemu-common.h"
2
#include "monitor/monitor.h"
3

  
4
int monitor_cur_is_qmp(void)
5
{
6
    return 0;
7
}
b/stubs/mon-print-filename.c
1
#include "qemu-common.h"
2
#include "monitor/monitor.h"
3

  
4
void monitor_print_filename(Monitor *mon, const char *filename)
5
{
6
}
b/stubs/mon-printf.c
1
#include "qemu-common.h"
2
#include "monitor/monitor.h"
3

  
4
void monitor_printf(Monitor *mon, const char *fmt, ...)
5
{
6
}
7

  
8
void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
9
{
10
}
b/stubs/mon-protocol-event.c
1
#include "qemu-common.h"
2
#include "monitor/monitor.h"
3

  
4
void monitor_protocol_event(MonitorEvent event, QObject *data)
5
{
6
}
b/stubs/mon-set-error.c
1
#include "qemu-common.h"
2
#include "monitor/monitor.h"
3

  
4
Monitor *cur_mon;
5

  
6
void monitor_set_error(Monitor *mon, QError *qerror)
7
{
8
}
b/stubs/slirp.c
1
#include "qemu-common.h"
2
#include "slirp/slirp.h"
3

  
4
void slirp_update_timeout(uint32_t *timeout)
5
{
6
}
7

  
8
void slirp_select_fill(int *pnfds, fd_set *readfds,
9
                       fd_set *writefds, fd_set *xfds)
10
{
11
}
12

  
13
void slirp_select_poll(fd_set *readfds, fd_set *writefds,
14
                       fd_set *xfds, int select_error)
15
{
16
}
17

  
b/stubs/vm-stop.c
1
#include "qemu-common.h"
2
#include "sysemu/sysemu.h"
3

  
4
void vm_stop(RunState state)
5
{
6
    abort();
7
}
b/tests/Makefile
70 70
	tests/test-qmp-input-visitor.o tests/test-qmp-input-strict.o \
71 71
	tests/test-qmp-commands.o tests/test-visitor-serialization.o
72 72

  
73
test-qapi-obj-y =  $(qobject-obj-y) $(qapi-obj-y) qemu-tool.o
73
test-qapi-obj-y =  $(qobject-obj-y) $(qapi-obj-y)
74 74
test-qapi-obj-y += tests/test-qapi-visit.o tests/test-qapi-types.o
75 75
test-qapi-obj-y += module.o
76 76

  
......
81 81
tests/check-qdict$(EXESUF): tests/check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qlist.o
82 82
tests/check-qlist$(EXESUF): tests/check-qlist.o qlist.o qint.o
83 83
tests/check-qfloat$(EXESUF): tests/check-qfloat.o qfloat.o
84
tests/check-qjson$(EXESUF): tests/check-qjson.o $(qobject-obj-y) qemu-tool.o
84
tests/check-qjson$(EXESUF): tests/check-qjson.o $(qobject-obj-y) libqemustub.a
85 85
tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(coroutine-obj-y) $(tools-obj-y) $(block-obj-y) iov.o libqemustub.a
86 86
tests/test-aio$(EXESUF): tests/test-aio.o $(coroutine-obj-y) $(tools-obj-y) $(block-obj-y) libqemustub.a
87 87
tests/test-thread-pool$(EXESUF): tests/test-thread-pool.o $(coroutine-obj-y) $(tools-obj-y) $(block-obj-y) libqemustub.a
......
98 98
	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py $(gen-out-type) -o tests -p "test-" < $<, "  GEN   $@")
99 99

  
100 100

  
101
tests/test-string-output-visitor$(EXESUF): tests/test-string-output-visitor.o $(test-qapi-obj-y)
102
tests/test-string-input-visitor$(EXESUF): tests/test-string-input-visitor.o $(test-qapi-obj-y)
103
tests/test-qmp-output-visitor$(EXESUF): tests/test-qmp-output-visitor.o $(test-qapi-obj-y)
104
tests/test-qmp-input-visitor$(EXESUF): tests/test-qmp-input-visitor.o $(test-qapi-obj-y)
105
tests/test-qmp-input-strict$(EXESUF): tests/test-qmp-input-strict.o $(test-qapi-obj-y)
106
tests/test-qmp-commands$(EXESUF): tests/test-qmp-commands.o tests/test-qmp-marshal.o $(test-qapi-obj-y)
107
tests/test-visitor-serialization$(EXESUF): tests/test-visitor-serialization.o $(test-qapi-obj-y)
101
tests/test-string-output-visitor$(EXESUF): tests/test-string-output-visitor.o $(test-qapi-obj-y) libqemustub.a
102
tests/test-string-input-visitor$(EXESUF): tests/test-string-input-visitor.o $(test-qapi-obj-y) libqemustub.a
103
tests/test-qmp-output-visitor$(EXESUF): tests/test-qmp-output-visitor.o $(test-qapi-obj-y) libqemustub.a
104
tests/test-qmp-input-visitor$(EXESUF): tests/test-qmp-input-visitor.o $(test-qapi-obj-y) libqemustub.a
105
tests/test-qmp-input-strict$(EXESUF): tests/test-qmp-input-strict.o $(test-qapi-obj-y) libqemustub.a
106
tests/test-qmp-commands$(EXESUF): tests/test-qmp-commands.o tests/test-qmp-marshal.o $(test-qapi-obj-y) libqemustub.a
107
tests/test-visitor-serialization$(EXESUF): tests/test-visitor-serialization.o $(test-qapi-obj-y) libqemustub.a
108 108

  
109 109
tests/rtc-test$(EXESUF): tests/rtc-test.o $(trace-obj-y)
110 110
tests/m48t59-test$(EXESUF): tests/m48t59-test.o $(trace-obj-y)

Also available in: Unified diff