qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] qxl: upon reset, if spice worker is stopped, the command rings can be not empty
@ 2011-07-12  8:51 Yonit Halperin
  2011-07-14  8:31 ` Gerd Hoffmann
  0 siblings, 1 reply; 2+ messages in thread
From: Yonit Halperin @ 2011-07-12  8:51 UTC (permalink / raw)
  To: qemu-devel; +Cc: Yonit Halperin, alevy, kraxel

Spice worker does no longer process commands when it is stopped.
Otherwise, it might crash during migration when attempting to process
commands while the guest is not completely loaded.

Cc: Alon Levy <alevy@redhat.com>
---
 hw/qxl.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/qxl.c b/hw/qxl.c
index 0b9a4c7..a6fb7f0 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -656,8 +656,8 @@ static void qxl_reset_state(PCIQXLDevice *d)
     QXLRam *ram = d->ram;
     QXLRom *rom = d->rom;
 
-    assert(SPICE_RING_IS_EMPTY(&ram->cmd_ring));
-    assert(SPICE_RING_IS_EMPTY(&ram->cursor_ring));
+    assert(!d->ssd.running || SPICE_RING_IS_EMPTY(&ram->cmd_ring));
+    assert(!d->ssd.running || SPICE_RING_IS_EMPTY(&ram->cursor_ring));
     d->shadow_rom.update_id = cpu_to_le32(0);
     *rom = d->shadow_rom;
     qxl_rom_set_dirty(d);
-- 
1.7.4.4

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Qemu-devel] [PATCH] qxl: upon reset, if spice worker is stopped, the command rings can be not empty
  2011-07-12  8:51 [Qemu-devel] [PATCH] qxl: upon reset, if spice worker is stopped, the command rings can be not empty Yonit Halperin
@ 2011-07-14  8:31 ` Gerd Hoffmann
  0 siblings, 0 replies; 2+ messages in thread
From: Gerd Hoffmann @ 2011-07-14  8:31 UTC (permalink / raw)
  To: Yonit Halperin; +Cc: alevy, qemu-devel

On 07/12/11 10:51, Yonit Halperin wrote:
> Spice worker does no longer process commands when it is stopped.
> Otherwise, it might crash during migration when attempting to process
> commands while the guest is not completely loaded.
>
> Cc: Alon Levy<alevy@redhat.com>
> ---
>   hw/qxl.c |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/qxl.c b/hw/qxl.c
> index 0b9a4c7..a6fb7f0 100644
> --- a/hw/qxl.c
> +++ b/hw/qxl.c
> @@ -656,8 +656,8 @@ static void qxl_reset_state(PCIQXLDevice *d)
>       QXLRam *ram = d->ram;
>       QXLRom *rom = d->rom;
>
> -    assert(SPICE_RING_IS_EMPTY(&ram->cmd_ring));
> -    assert(SPICE_RING_IS_EMPTY(&ram->cursor_ring));
> +    assert(!d->ssd.running || SPICE_RING_IS_EMPTY(&ram->cmd_ring));
> +    assert(!d->ssd.running || SPICE_RING_IS_EMPTY(&ram->cursor_ring));
>       d->shadow_rom.update_id = cpu_to_le32(0);
>       *rom = d->shadow_rom;
>       qxl_rom_set_dirty(d);

Patch added to spice patch queue.

thanks,
   Gerd

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-07-14  8:31 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-12  8:51 [Qemu-devel] [PATCH] qxl: upon reset, if spice worker is stopped, the command rings can be not empty Yonit Halperin
2011-07-14  8:31 ` Gerd Hoffmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).