Revision 58ae52a8
| b/include/sysemu/sysemu.h | ||
|---|---|---|
| 103 | 103 |
|
| 104 | 104 |
extern int vga_interface_type; |
| 105 | 105 |
#define xenfb_enabled (vga_interface_type == VGA_XENFB) |
| 106 |
#define qxl_enabled (vga_interface_type == VGA_QXL) |
|
| 107 | 106 |
|
| 108 | 107 |
extern int graphic_width; |
| 109 | 108 |
extern int graphic_height; |
| b/include/ui/qemu-spice.h | ||
|---|---|---|
| 27 | 27 |
#include "monitor/monitor.h" |
| 28 | 28 |
|
| 29 | 29 |
extern int using_spice; |
| 30 |
extern int spice_displays; |
|
| 30 | 31 |
|
| 31 | 32 |
void qemu_spice_init(void); |
| 32 | 33 |
void qemu_spice_input_init(void); |
| ... | ... | |
| 57 | 58 |
#include "monitor/monitor.h" |
| 58 | 59 |
|
| 59 | 60 |
#define using_spice 0 |
| 61 |
#define spice_displays 0 |
|
| 60 | 62 |
static inline int qemu_spice_set_passwd(const char *passwd, |
| 61 | 63 |
bool fail_if_connected, |
| 62 | 64 |
bool disconnect_if_connected) |
| b/ui/spice-core.c | ||
|---|---|---|
| 48 | 48 |
static time_t auth_expires = TIME_MAX; |
| 49 | 49 |
static int spice_migration_completed; |
| 50 | 50 |
int using_spice = 0; |
| 51 |
int spice_displays; |
|
| 51 | 52 |
|
| 52 | 53 |
static QemuThread me; |
| 53 | 54 |
|
| ... | ... | |
| 836 | 837 |
qemu_add_vm_change_state_handler(vm_change_state_handler, NULL); |
| 837 | 838 |
} |
| 838 | 839 |
|
| 840 |
if (strcmp(sin->sif->type, SPICE_INTERFACE_QXL) == 0) {
|
|
| 841 |
spice_displays++; |
|
| 842 |
} |
|
| 843 |
|
|
| 839 | 844 |
return spice_server_add_interface(spice_server, sin); |
| 840 | 845 |
} |
| 841 | 846 |
|
| b/vl.c | ||
|---|---|---|
| 4387 | 4387 |
} |
| 4388 | 4388 |
#endif |
| 4389 | 4389 |
#ifdef CONFIG_SPICE |
| 4390 |
if (using_spice && !qxl_enabled) {
|
|
| 4390 |
if (using_spice && !spice_displays) {
|
|
| 4391 | 4391 |
qemu_spice_display_init(ds); |
| 4392 | 4392 |
} |
| 4393 | 4393 |
#endif |
Also available in: Unified diff