summaryrefslogtreecommitdiff
path: root/vl.c
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2013-03-07 17:08:29 +0100
committerGerd Hoffmann <kraxel@redhat.com>2013-04-16 09:03:47 +0200
commit64840c66b702cc4c809c72d8ad5d26861dd7fd8d (patch)
treef566c08b0f58ef7f9ad5a4d78d17b1499388a0be /vl.c
parent437fe1061be3da49b0b05ed2f0c9c50e2255c3fe (diff)
downloadqemu-64840c66b702cc4c809c72d8ad5d26861dd7fd8d.tar.gz
console: displaystate init revamp
We have only one DisplayState, so there is no need for the "next" linking, rip it. Also consolidate all displaystate initialization into init_displaystate(). This function is called by vl.c after creating the devices (and thus all QemuConsoles) and before initializing DisplayChangeListensers (aka gtk/sdl/vnc/spice ui). Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/vl.c b/vl.c
index 05989986f3..63fe9a44a8 100644
--- a/vl.c
+++ b/vl.c
@@ -4331,8 +4331,7 @@ int main(int argc, char **argv, char **envp)
net_check_clients();
- /* just use the first displaystate for the moment */
- ds = get_displaystate();
+ ds = init_displaystate();
/* init local displays */
switch (display_type) {
@@ -4388,9 +4387,6 @@ int main(int argc, char **argv, char **envp)
}
#endif
- /* display setup */
- text_consoles_set_display(ds);
-
if (foreach_device_config(DEV_GDB, gdbserver_start) < 0) {
exit(1);
}