SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net: net_check_clients() runs too early to see -device, fix

Browse Source 
Call it right after -device devices get created.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Markus Armbruster 2010-02-11 14:44:58 +01:00 committed by Anthony Liguori
parent 7f76abe1c9
commit 668680f75f
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net.c
View File

@ -1275,7 +1275,7 @@ void net_cleanup(void)
} }
} }
static void net_check_clients(void) void net_check_clients(void)
{ {
VLANState *vlan; VLANState *vlan;
@ -1323,8 +1323,6 @@ int net_init_clients(void)
return -1; return -1;
} }
net_check_clients();
return 0; return 0;
} }

1
net.h
View File

@ -165,6 +165,7 @@ extern const char *legacy_bootp_filename;
int net_client_init(Monitor *mon, QemuOpts *opts, int is_netdev); int net_client_init(Monitor *mon, QemuOpts *opts, int is_netdev);
int net_client_parse(QemuOptsList *opts_list, const char *str); int net_client_parse(QemuOptsList *opts_list, const char *str);
int net_init_clients(void); int net_init_clients(void);
void net_check_clients(void);
void net_cleanup(void); void net_cleanup(void);
void net_set_boot_mask(int boot_mask); void net_set_boot_mask(int boot_mask);
void net_host_device_add(Monitor *mon, const QDict *qdict); void net_host_device_add(Monitor *mon, const QDict *qdict);

2
vl.c
View File

@ -5897,6 +5897,8 @@ int main(int argc, char **argv, char **envp)
if (qemu_opts_foreach(&qemu_device_opts, device_init_func, NULL, 1) != 0) if (qemu_opts_foreach(&qemu_device_opts, device_init_func, NULL, 1) != 0)
exit(1); exit(1);
net_check_clients();
if (!display_state) if (!display_state)
dumb_display_init(); dumb_display_init();
/* just use the first displaystate for the moment */ /* just use the first displaystate for the moment */