diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-30 18:48:58 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-30 18:48:58 -0500 |
| commit | 75e2a4baf1536682d111d9bee0261806737a32dc (patch) | |
| tree | 4d3c93e4a0977e7c9adcedb36cd51fbe1374a86c /ui | |
| parent | c095e108473f57516e7ad958d905a7017b225f82 (diff) | |
| parent | 58ae52a8dc7752e3da9a905678580b4cb8181cdc (diff) | |
| download | qemu-75e2a4baf1536682d111d9bee0261806737a32dc.zip qemu-75e2a4baf1536682d111d9bee0261806737a32dc.tar.gz qemu-75e2a4baf1536682d111d9bee0261806737a32dc.tar.bz2 | |
Merge remote-tracking branch 'spice/spice.v72' into staging
# 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>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/spice-core.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ui/spice-core.c b/ui/spice-core.c index 033fd89..bd7a248 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -48,6 +48,7 @@ static char *auth_passwd; static time_t auth_expires = TIME_MAX; static int spice_migration_completed; int using_spice = 0; +int spice_displays; 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); } + if (strcmp(sin->sif->type, SPICE_INTERFACE_QXL) == 0) { + spice_displays++; + } + return spice_server_add_interface(spice_server, sin); } |