Hi. cirrus_init_common() is used by both isa and pci cirrus. and isa cirrus isn't qdevfied yet. So what you want is - remove qemu_register_reset() and cirrus_reset() from cirrus_init_common()
- add to PCIDeviceInfo cirrus_vga_info .qdev.reset = cirrus_reset() in order to use pci reset framework. - add qemu_register_reset() and cirrus_reset() to isa_cirrus_vga_init() (Hopefully convert isa cirrus to qdev. and use .qdev.reset at best. But it's up to you) thanks, On Sat, Mar 26, 2011 at 10:53:09PM +0100, Stefan Weil wrote: > cirrus_reset is also called by the pci framework, > so there is no need to call it in cirrus_init_common. > > Cc: Michael S. Tsirkin <m...@redhat.com> > Signed-off-by: Stefan Weil <w...@mail.berlios.de> > --- > hw/cirrus_vga.c | 1 - > 1 files changed, 0 insertions(+), 1 deletions(-) > > diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c > index 2724f7b..bdf4c8b 100644 > --- a/hw/cirrus_vga.c > +++ b/hw/cirrus_vga.c > @@ -3024,7 +3024,6 @@ static void cirrus_init_common(CirrusVGAState * s, int > device_id, int is_pci) > s->vga.cursor_draw_line = cirrus_cursor_draw_line; > > qemu_register_reset(cirrus_reset, s); > - cirrus_reset(s); > } > > /*************************************** > -- > 1.7.2.5 > > -- yamahata
