From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:42372) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWzvg-0001RK-TS for qemu-devel@nongnu.org; Wed, 15 Jun 2011 19:55:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QWzvf-0001Wj-8m for qemu-devel@nongnu.org; Wed, 15 Jun 2011 19:55:24 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:49396) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWzve-0001Wb-LL for qemu-devel@nongnu.org; Wed, 15 Jun 2011 19:55:22 -0400 Received: by pzk30 with SMTP id 30so783174pzk.4 for ; Wed, 15 Jun 2011 16:55:21 -0700 (PDT) MIME-Version: 1.0 Sender: balrogg@gmail.com In-Reply-To: <9dbe300ba2a91da6ebe7f377ea953d64d4610b41.1308070416.git.jan.kiszka@siemens.com> References: <9dbe300ba2a91da6ebe7f377ea953d64d4610b41.1308070416.git.jan.kiszka@siemens.com> Date: Thu, 16 Jun 2011 01:55:21 +0200 Message-ID: From: andrzej zaborowski Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 08/13] vmware-vga: Register reset service Reply-To: balrogg@gmail.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jan Kiszka Cc: Anthony Liguori , qemu-devel On 14 June 2011 18:53, Jan Kiszka wrote: > Fixes cold reset in vmware graphic modes. > > CC: Andrzej Zaborowski > Signed-off-by: Jan Kiszka Reviewed-by: Andrzej Zaborowski > --- > =C2=A0hw/vmware_vga.c | =C2=A0 =C2=A09 ++++++--- > =C2=A01 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c > index 93b8811..c20f154 100644 > --- a/hw/vmware_vga.c > +++ b/hw/vmware_vga.c > @@ -966,8 +966,12 @@ static void vmsvga_update_display(void *opaque) > =C2=A0 =C2=A0 } > =C2=A0} > > -static void vmsvga_reset(struct vmsvga_state_s *s) > +static void vmsvga_reset(DeviceState *dev) > =C2=A0{ > + =C2=A0 =C2=A0struct pci_vmsvga_state_s *pci =3D > + =C2=A0 =C2=A0 =C2=A0 =C2=A0DO_UPCAST(struct pci_vmsvga_state_s, card.qd= ev, dev); > + =C2=A0 =C2=A0struct vmsvga_state_s *s =3D &pci->chip; > + > =C2=A0 =C2=A0 s->index =3D 0; > =C2=A0 =C2=A0 s->enable =3D 0; > =C2=A0 =C2=A0 s->config =3D 0; > @@ -1117,8 +1121,6 @@ static void vmsvga_init(struct vmsvga_state_s *s, i= nt vga_ram_size) > =C2=A0 =C2=A0 vga_common_init(&s->vga, vga_ram_size); > =C2=A0 =C2=A0 vga_init(&s->vga); > =C2=A0 =C2=A0 vmstate_register(NULL, 0, &vmstate_vga_common, &s->vga); > - > - =C2=A0 =C2=A0vmsvga_reset(s); > =C2=A0} > > =C2=A0static void pci_vmsvga_map_ioport(PCIDevice *pci_dev, int region_nu= m, > @@ -1207,6 +1209,7 @@ static PCIDeviceInfo vmsvga_info =3D { > =C2=A0 =C2=A0 .qdev.name =C2=A0 =C2=A0=3D "vmware-svga", > =C2=A0 =C2=A0 .qdev.size =C2=A0 =C2=A0=3D sizeof(struct pci_vmsvga_state_= s), > =C2=A0 =C2=A0 .qdev.vmsd =C2=A0 =C2=A0=3D &vmstate_vmware_vga, > + =C2=A0 =C2=A0.qdev.reset =C2=A0 =3D vmsvga_reset, > =C2=A0 =C2=A0 .no_hotplug =C2=A0 =3D 1, > =C2=A0 =C2=A0 .init =C2=A0 =C2=A0 =C2=A0 =C2=A0 =3D pci_vmsvga_initfn, > =C2=A0 =C2=A0 .romfile =C2=A0 =C2=A0 =C2=A0=3D "vgabios-vmware.bin", > -- > 1.7.1 > > >