mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-28 22:33:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'spice/spice.v72' into staging

Browse Source 
# By Gerd Hoffmann
# Via Gerd Hoffmann
* spice/spice.v72:
  spice: fix display initialization

Message-id: 1375173625-3784-1-git-send-email-kraxel@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Anthony Liguori 2013-07-30 18:48:58 -05:00
commit 75e2a4baf1
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sysemu/sysemu.h
View File

@ -103,7 +103,6 @@ typedef enum {
extern int vga_interface_type; extern int vga_interface_type;
#define xenfb_enabled (vga_interface_type == VGA_XENFB) #define xenfb_enabled (vga_interface_type == VGA_XENFB)
#define qxl_enabled (vga_interface_type == VGA_QXL)
extern int graphic_width; extern int graphic_width;
extern int graphic_height; extern int graphic_height;

2
include/ui/qemu-spice.h
View File

@ -27,6 +27,7 @@
#include "monitor/monitor.h" #include "monitor/monitor.h"
extern int using_spice; extern int using_spice;
extern int spice_displays;
void qemu_spice_init(void); void qemu_spice_init(void);
void qemu_spice_input_init(void); void qemu_spice_input_init(void);
@ -57,6 +58,7 @@ static inline CharDriverState *qemu_chr_open_spice_port(const char *name)
#include "monitor/monitor.h" #include "monitor/monitor.h"
#define using_spice 0 #define using_spice 0
#define spice_displays 0
static inline int qemu_spice_set_passwd(const char *passwd, static inline int qemu_spice_set_passwd(const char *passwd,
bool fail_if_connected, bool fail_if_connected,
bool disconnect_if_connected) bool disconnect_if_connected)

5
ui/spice-core.c
View File

@ -48,6 +48,7 @@ static char *auth_passwd;
static time_t auth_expires = TIME_MAX; static time_t auth_expires = TIME_MAX;
static int spice_migration_completed; static int spice_migration_completed;
int using_spice = 0; int using_spice = 0;
int spice_displays;
static QemuThread me; static QemuThread me;
@ -836,6 +837,10 @@ int qemu_spice_add_interface(SpiceBaseInstance *sin)
qemu_add_vm_change_state_handler(vm_change_state_handler, NULL); qemu_add_vm_change_state_handler(vm_change_state_handler, NULL);
} }
if (strcmp(sin->sif->type, SPICE_INTERFACE_QXL) == 0) {
spice_displays++;
}
return spice_server_add_interface(spice_server, sin); return spice_server_add_interface(spice_server, sin);
} }

2
vl.c
View File

@ -4387,7 +4387,7 @@ int main(int argc, char **argv, char **envp)
} }
#endif #endif
#ifdef CONFIG_SPICE #ifdef CONFIG_SPICE
if (using_spice && !qxl_enabled) { if (using_spice && !spice_displays) {
qemu_spice_display_init(ds); qemu_spice_display_init(ds);
} }
#endif #endif