[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 01/10] Use display types for local display only.
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH v6 01/10] Use display types for local display only. |
Date: |
Tue, 21 Sep 2010 18:51:32 +0200 |
This patch drops DT_VNC. The display types are only used to select
select the local display (i.e. curses, sdl, coca, ...). Remote
displays (for now only vnc, spice will follow) can be enabled
independently.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
sysemu.h | 1 -
vl.c | 24 +++++++++++++-----------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/sysemu.h b/sysemu.h
index a1f6466..b81a70e 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -94,7 +94,6 @@ typedef enum DisplayType
DT_DEFAULT,
DT_CURSES,
DT_SDL,
- DT_VNC,
DT_NOGRAPHIC,
} DisplayType;
diff --git a/vl.c b/vl.c
index 3f45aa9..f434193 100644
--- a/vl.c
+++ b/vl.c
@@ -176,6 +176,7 @@ static const char *data_dir;
const char *bios_name = NULL;
enum vga_retrace_method vga_retrace_method = VGA_RETRACE_DUMB;
DisplayType display_type = DT_DEFAULT;
+int display_remote = 0;
const char* keyboard_layout = NULL;
ram_addr_t ram_size;
const char *mem_path = NULL;
@@ -2477,7 +2478,7 @@ int main(int argc, char **argv, char **envp)
}
break;
case QEMU_OPTION_vnc:
- display_type = DT_VNC;
+ display_remote++;
vnc_display = optarg;
break;
case QEMU_OPTION_no_acpi:
@@ -2921,17 +2922,17 @@ int main(int argc, char **argv, char **envp)
/* just use the first displaystate for the moment */
ds = get_displaystate();
- if (display_type == DT_DEFAULT) {
+ if (display_type == DT_DEFAULT && !display_remote) {
#if defined(CONFIG_SDL) || defined(CONFIG_COCOA)
display_type = DT_SDL;
#else
- display_type = DT_VNC;
vnc_display = "localhost:0,to=99";
show_vnc_port = 1;
#endif
}
+ /* init local displays */
switch (display_type) {
case DT_NOGRAPHIC:
break;
@@ -2949,7 +2950,12 @@ int main(int argc, char **argv, char **envp)
cocoa_display_init(ds, full_screen);
break;
#endif
- case DT_VNC:
+ default:
+ break;
+ }
+
+ /* init remote displays */
+ if (vnc_display) {
vnc_display_init(ds);
if (vnc_display_open(ds, vnc_display) < 0)
exit(1);
@@ -2957,12 +2963,10 @@ int main(int argc, char **argv, char **envp)
if (show_vnc_port) {
printf("VNC server running on `%s'\n", vnc_display_local_addr(ds));
}
- break;
- default:
- break;
}
- dpy_resize(ds);
+ /* display setup */
+ dpy_resize(ds);
dcl = ds->listeners;
while (dcl != NULL) {
if (dcl->dpy_refresh != NULL) {
@@ -2972,12 +2976,10 @@ int main(int argc, char **argv, char **envp)
}
dcl = dcl->next;
}
-
- if (display_type == DT_NOGRAPHIC || display_type == DT_VNC) {
+ if (ds->gui_timer == NULL) {
nographic_timer = qemu_new_timer(rt_clock, nographic_update, NULL);
qemu_mod_timer(nographic_timer, qemu_get_clock(rt_clock));
}
-
text_consoles_set_display(ds);
if (gdbstub_dev && gdbserver_start(gdbstub_dev) < 0) {
--
1.7.1
- [Qemu-devel] [PATCH v6 00/10] initial spice support., Gerd Hoffmann, 2010/09/21
- [Qemu-devel] [PATCH v6 04/10] configure: add logging, Gerd Hoffmann, 2010/09/21
- [Qemu-devel] [PATCH v6 06/10] spice: core bits, Gerd Hoffmann, 2010/09/21
- [Qemu-devel] [PATCH v6 03/10] add pflib: PixelFormat conversion library., Gerd Hoffmann, 2010/09/21
- [Qemu-devel] [PATCH v6 05/10] add spice into the configure file, Gerd Hoffmann, 2010/09/21
- [Qemu-devel] [PATCH v6 02/10] Use machine_init() to register virtfs config options., Gerd Hoffmann, 2010/09/21
- [Qemu-devel] [PATCH v6 01/10] Use display types for local display only.,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH v6 08/10] spice: add mouse, Gerd Hoffmann, 2010/09/21
- [Qemu-devel] [PATCH v6 07/10] spice: add keyboard, Gerd Hoffmann, 2010/09/21
- [Qemu-devel] [PATCH v6 10/10] spice: add tablet support, Gerd Hoffmann, 2010/09/21
- [Qemu-devel] [PATCH v6 09/10] spice: simple display, Gerd Hoffmann, 2010/09/21