From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N8M40-0008V3-3U for qemu-devel@nongnu.org; Wed, 11 Nov 2009 17:53:20 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N8M3v-0008Q4-Ea for qemu-devel@nongnu.org; Wed, 11 Nov 2009 17:53:19 -0500 Received: from [199.232.76.173] (port=58764 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N8M3v-0008Pw-Ax for qemu-devel@nongnu.org; Wed, 11 Nov 2009 17:53:15 -0500 Received: from fmmailgate03.web.de ([217.72.192.234]:41608) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N8M3u-0002wU-N3 for qemu-devel@nongnu.org; Wed, 11 Nov 2009 17:53:15 -0500 Message-ID: <4AFB4059.8020607@web.de> Date: Wed, 11 Nov 2009 23:53:13 +0100 From: Jan Kiszka MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enigBF5B2151B8F3AC73DCDDC53C" Sender: jan.kiszka@web.de Subject: [Qemu-devel] [PATCH] fdc: Fix vmsave/restore regression List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Blue Swirl Cc: Gerd Hoffmann , qemu-devel , Juan Quintela This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigBF5B2151B8F3AC73DCDDC53C Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable This partly reverts 2be3783328: First, the conversion neglected to update the opaque translation in fdc_pre_save/fdc_post_load which causes memory corruptions on vmsave/restore. And second, we can't apply a common translation here as DeviceState->fdctrl_t is different for sysbus and ISA. Signed-off-by: Jan Kiszka --- hw/fdc.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) *** NOTE *** 'git shortlog|grep "reset + vmsd"' shows 10 such conversions. I only briefly checked the first one, and it looks similar broken. Could someone have a second look at them? Maybe it is also better to define a vmsd opaque in DeviceInfo, which would also allow to solve this issue differently. diff --git a/hw/fdc.c b/hw/fdc.c index d2bfa71..1e1b827 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -1932,6 +1932,8 @@ static int fdctrl_init_common(fdctrl_t *fdctrl) DMA_register_channel(fdctrl->dma_chann, &fdctrl_transfer_handler= , fdctrl); fdctrl_connect_drives(fdctrl); =20 + vmstate_register(-1, &vmstate_fdc, fdctrl); + return 0; } =20 @@ -1998,7 +2000,6 @@ static ISADeviceInfo isa_fdc_info =3D { .qdev.name =3D "isa-fdc", .qdev.size =3D sizeof(fdctrl_isabus_t), .qdev.no_user =3D 1, - .qdev.vmsd =3D &vmstate_fdc, .qdev.reset =3D fdctrl_external_reset_isa, .qdev.props =3D (Property[]) { DEFINE_PROP_DRIVE("driveA", fdctrl_isabus_t, state.drives[0].din= fo), @@ -2011,7 +2012,6 @@ static SysBusDeviceInfo sysbus_fdc_info =3D { .init =3D sysbus_fdc_init1, .qdev.name =3D "sysbus-fdc", .qdev.size =3D sizeof(fdctrl_sysbus_t), - .qdev.vmsd =3D &vmstate_fdc, .qdev.reset =3D fdctrl_external_reset_sysbus, .qdev.props =3D (Property[]) { DEFINE_PROP_DRIVE("driveA", fdctrl_sysbus_t, state.drives[0].din= fo), @@ -2024,7 +2024,6 @@ static SysBusDeviceInfo sun4m_fdc_info =3D { .init =3D sun4m_fdc_init1, .qdev.name =3D "SUNW,fdtwo", .qdev.size =3D sizeof(fdctrl_sysbus_t), - .qdev.vmsd =3D &vmstate_fdc, .qdev.reset =3D fdctrl_external_reset_sysbus, .qdev.props =3D (Property[]) { DEFINE_PROP_DRIVE("drive", fdctrl_sysbus_t, state.drives[0].dinf= o), --------------enigBF5B2151B8F3AC73DCDDC53C Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org iEYEARECAAYFAkr7QF8ACgkQitSsb3rl5xRuoACggBpwvwRlGKcHyxOEJA3uYLWW wzUAoLtYJXsTHQIYg7bbEku5XYik5qTD =5Rqt -----END PGP SIGNATURE----- --------------enigBF5B2151B8F3AC73DCDDC53C--