From: TeLeMan <geleman@gmail.com>
Date: Wed, 12 May 2010 02:28:51 +0000 (+0800)
Subject: vmstate: fix breakage by 7e72abc382b700a72549e8147bdea413534eeedc
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ae6b2c4ed956c17456e70efefe13ad0ab7db31de;p=qemu.git

vmstate: fix breakage by 7e72abc382b700a72549e8147bdea413534eeedc

cirrus_post_load() will be executed twice when loading vm states and then the
wrong physical memory will be registered. This issue may lead to crash qemu.

Signed-off-by: TeLeMan <geleman@gmail.com>
Acked-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---

diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index 9f61a01d45..ba4828996a 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -2985,7 +2985,6 @@ static const VMStateDescription vmstate_pci_cirrus_vga = {
     .version_id = 2,
     .minimum_version_id = 2,
     .minimum_version_id_old = 2,
-    .post_load = cirrus_post_load,
     .fields      = (VMStateField []) {
         VMSTATE_PCI_DEVICE(dev, PCICirrusVGAState),
         VMSTATE_STRUCT(cirrus_vga, PCICirrusVGAState, 0,