[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/7] spice: fix initialization order
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 7/7] spice: fix initialization order |
Date: |
Fri, 2 Nov 2012 10:35:19 +0100 |
Register displaychangelistener last, after spice is fully initialized,
otherwise we may hit NULL pointer dereferences when qemu starts calling
our callbacks.
Commit e250d949feb1334828f27f0d145c35f29c4b7639 triggers this bug.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/qxl.c | 10 ++++++++--
ui/spice-display.c | 2 +-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/hw/qxl.c b/hw/qxl.c
index e7bf3a1..1bc2d32 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -2049,6 +2049,7 @@ static int qxl_init_primary(PCIDevice *dev)
PCIQXLDevice *qxl = DO_UPCAST(PCIQXLDevice, pci, dev);
VGACommonState *vga = &qxl->vga;
PortioList *qxl_vga_port_list = g_new(PortioList, 1);
+ int rc;
qxl->id = 0;
qxl_init_ramsize(qxl);
@@ -2063,9 +2064,14 @@ static int qxl_init_primary(PCIDevice *dev)
qemu_spice_display_init_common(&qxl->ssd, vga->ds);
qxl0 = qxl;
- register_displaychangelistener(vga->ds, &display_listener);
- return qxl_init_common(qxl);
+ rc = qxl_init_common(qxl);
+ if (rc != 0) {
+ return rc;
+ }
+
+ register_displaychangelistener(vga->ds, &display_listener);
+ return rc;
}
static int qxl_init_secondary(PCIDevice *dev)
diff --git a/ui/spice-display.c b/ui/spice-display.c
index fe2fdfb..0cc0116 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -573,7 +573,6 @@ void qemu_spice_display_init(DisplayState *ds)
{
assert(sdpy.ds == NULL);
qemu_spice_display_init_common(&sdpy, ds);
- register_displaychangelistener(ds, &display_listener);
sdpy.qxl.base.sif = &dpy_interface.base;
qemu_spice_add_interface(&sdpy.qxl.base);
@@ -581,4 +580,5 @@ void qemu_spice_display_init(DisplayState *ds)
qemu_spice_create_host_memslot(&sdpy);
qemu_spice_create_host_primary(&sdpy);
+ register_displaychangelistener(ds, &display_listener);
}
--
1.7.1
- [Qemu-devel] [PULL 0/7] spice patch queue, Gerd Hoffmann, 2012/11/02
- [Qemu-devel] [PATCH 3/7] qxl: fix cursor reset, Gerd Hoffmann, 2012/11/02
- [Qemu-devel] [PATCH 2/7] hw/qxl: qxl_send_events: nop if stopped, Gerd Hoffmann, 2012/11/02
- [Qemu-devel] [PATCH 5/7] spice: switch to pixman, Gerd Hoffmann, 2012/11/02
- [Qemu-devel] [PATCH 1/7] hw/qxl: guest bug on primary create with stride %4 != 0, Gerd Hoffmann, 2012/11/02
- [Qemu-devel] [PATCH 7/7] spice: fix initialization order,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 4/7] qxl: call dpy_gfx_resize when entering vga mode, Gerd Hoffmann, 2012/11/02
- [Qemu-devel] [PATCH 6/7] pflib: unused, remove it., Gerd Hoffmann, 2012/11/02
- Re: [Qemu-devel] [PULL 0/7] spice patch queue, Gerd Hoffmann, 2012/11/05
- Re: [Qemu-devel] [PULL 0/7] spice patch queue, Anthony Liguori, 2012/11/14