Commit 75e2a4ba authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents c095e108 58ae52a8

include/sysemu/sysemu.h

+0 −1
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ typedef enum { 


extern int vga_interface_type;

#define xenfb_enabled (vga_interface_type == VGA_XENFB)

#define qxl_enabled (vga_interface_type == VGA_QXL)



extern int graphic_width;

extern int graphic_height;

include/ui/qemu-spice.h

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "monitor/monitor.h"



extern int using_spice;

extern int spice_displays;



void qemu_spice_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"



#define using_spice 0

#define spice_displays 0

static inline int qemu_spice_set_passwd(const char *passwd,

                                        bool fail_if_connected,

                                        bool disconnect_if_connected)

ui/spice-core.c

+5 −0
Original line number Diff line number Diff line
@@ -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);

}

vl.c

+1 −1
Original line number Diff line number Diff line
@@ -4387,7 +4387,7 @@ int main(int argc, char **argv, char **envp) 
    }

#endif

#ifdef CONFIG_SPICE

    if (using_spice && !qxl_enabled) {

    if (using_spice && !spice_displays) {

        qemu_spice_display_init(ds);

    }

#endif