diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-06-06 20:57:56 +0800 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-06-06 20:57:56 +0800 |
| commit | 349417004a0f7cf5518a998dca755cd06f6c212b (patch) | |
| tree | 70bad616da7eb6d55a1d1781fdd64915a532bbcb /net/tap-win32.c | |
| parent | e1ae9a7a78be8d894c111059955fe0e25ec4c203 (diff) | |
| parent | 4860853d60ecea44b65e9cdefce980de3a641dce (diff) | |
Merge remote-tracking branch 'qmp/queue/qmp' into staging
* qmp/queue/qmp: (29 commits)
Add 'query-events' command to QMP to query async events
qapi: convert netdev_del
qapi: convert netdev_add
net: net_client_init(): use error_set()
net: purge the monitor object from all init functions
qemu-config: introduce qemu_find_opts_err()
qemu-config: find_list(): use error_set()
qerror: introduce QERR_INVALID_OPTION_GROUP
qemu-option: qemu_opts_from_qdict(): use error_set()
qemu-option: introduce qemu_opt_set_err()
qemu-option: opt_set(): use error_set()
qemu-option: qemu_opts_validate(): use error_set()
qemu-option: qemu_opt_parse(): use error_set()
qemu-option: parse_option_size(): use error_set()
qemu-option: parse_option_bool(): use error_set()
qemu-option: parse_option_number(): use error_set()
qemu-option: qemu_opts_create(): use error_set()
introduce a new monitor command 'dump-guest-memory' to dump guest's memory
make gdb_id() generally avialable and rename it to cpu_index()
target-i386: Add API to get note's size
...
Diffstat (limited to 'net/tap-win32.c')
| -rw-r--r-- | net/tap-win32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tap-win32.c b/net/tap-win32.c index 596132e272..a801a553c4 100644 --- a/net/tap-win32.c +++ b/net/tap-win32.c @@ -699,7 +699,7 @@ static int tap_win32_init(VLANState *vlan, const char *model, return 0; } -int net_init_tap(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan) +int net_init_tap(QemuOpts *opts, const char *name, VLANState *vlan) { const char *ifname; |