Commit 17fa24b7 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-fixes-20170411-1' into staging 



qxl: bugfixes.

# gpg: Signature made Tue 11 Apr 2017 08:00:00 BST
# gpg:                using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/pull-fixes-20170411-1:
  qxl: add migration blocker to avoid pre-save assert
  qxl: switch display on entering VGA

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c322fdd4 86dbcdd9

hw/display/qxl.c

+32 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "qemu/queue.h"

#include "qemu/atomic.h"

#include "sysemu/sysemu.h"

#include "migration/migration.h"

#include "trace.h"



#include "qxl.h"
@@ -639,6 +640,30 @@ static int interface_get_command(QXLInstance *sin, struct QXLCommandExt *ext) 
        qxl->guest_primary.commands++;

        qxl_track_command(qxl, ext);

        qxl_log_command(qxl, "cmd", ext);

        {

            /*

             * Windows 8 drivers place qxl commands in the vram

             * (instead of the ram) bar.  We can't live migrate such a

             * guest, so add a migration blocker in case we detect

             * this, to avoid triggering the assert in pre_save().

             *

             * https://cgit.freedesktop.org/spice/win32/qxl-wddm-dod/commit/?id=f6e099db39e7d0787f294d5fd0dce328b5210faa

             */

            void *msg = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id);

            if (msg != NULL && (

                    msg < (void *)qxl->vga.vram_ptr ||

                    msg > ((void *)qxl->vga.vram_ptr + qxl->vga.vram_size))) {

                if (!qxl->migration_blocker) {

                    Error *local_err = NULL;

                    error_setg(&qxl->migration_blocker,

                               "qxl: guest bug: command not in ram bar");

                    migrate_add_blocker(qxl->migration_blocker, &local_err);

                    if (local_err) {

                        error_report_err(local_err);

                    }

                }

            }

        }

        trace_qxl_ring_command_get(qxl->id, qxl_mode_to_string(qxl->mode));

        return true;

    default:
@@ -1146,6 +1171,7 @@ static void qxl_enter_vga_mode(PCIQXLDevice *d) 
    update_displaychangelistener(&d->ssd.dcl, GUI_REFRESH_INTERVAL_DEFAULT);

    qemu_spice_create_host_primary(&d->ssd);

    d->mode = QXL_MODE_VGA;

    qemu_spice_display_switch(&d->ssd, d->ssd.ds);

    vga_dirty_log_start(&d->vga);

    graphic_hw_update(d->vga.con);

}
@@ -1235,6 +1261,12 @@ static void qxl_hard_reset(PCIQXLDevice *d, int loadvm) 
    qemu_spice_create_host_memslot(&d->ssd);

    qxl_soft_reset(d);



    if (d->migration_blocker) {

        migrate_del_blocker(d->migration_blocker);

        error_free(d->migration_blocker);

        d->migration_blocker = NULL;

    }



    if (startstop) {

        qemu_spice_display_start();

    }

hw/display/qxl.h

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ typedef struct PCIQXLDevice { 
    uint32_t           cmdlog;



    uint32_t           guest_bug;

    Error              *migration_blocker;



    enum qxl_mode      mode;

    uint32_t           cmdflags;