On Fri, Jun 7, 2013 at 12:58 PM, Andreas Färber <afaer...@suse.de> wrote: > Hello, > > Here is my next batch of QOM realize patches for ISA devices. > > For two "new" ISA devices QOM cast macros are introduced (gus, cs4231a); > these two and the new pvpanic ISA device are now converted, too. > > Series is extended to clean up all ISABus and ISADevice uses; > it then becomes easy to get rid of FROM_QBUS() as next step. > > Available from: > https://github.com/afaerber/qemu-cpu/commits/realize-isa.v2 > git://github.com/afaerber/qemu-cpu.git realize-isa.v2
Thanks, pulled. > > Regards, > Andreas > > v1 -> v2: > * Most QOM'ifications were already applied. > * Rebased on file movements. > * Dropped \n from error_setg(). > * gus.c and cs4231a.c are now compiled in and needed to be updated. > * pvpanic device was added and needed to be converted. > * Tidied errp argument/variable naming consistently. > * debugcon: Don't double-report error. > * parallel: Dropped \n. > * serial: Replaced fprintf()+exit(). > * pc port92: Split off instance_init from realizefn. > * Appended patches renaming ISABus and ISADevice parent fields. > * Appended patch dropping FROM_QBUS() macro. > > Cc: Anthony Liguori <anth...@codemonkey.ws> > Cc: Blue Swirl <blauwir...@gmail.com> > Cc: Aurélien Jarno <aurel...@aurel32.net> > > Cc: Paolo Bonzini <pbonz...@redhat.com> > Cc: malc <av1...@comtv.ru> > Cc: Hu Tao <hu...@cn.fujitsu.com> > Cc: Michael S. Tsirkin <m...@redhat.com> > Cc: Peter C. Crosthwaite <peter.crosthwa...@xilinx.com> > > Andreas Färber (12): > gus: QOM'ify some more > cs4231a: QOM'ify some more > isa: Use realizefn for ISADevice > i8254: QOM'ify some more > kvm/i8254: QOM'ify some more > i8254: Convert PITCommonState to QOM realizefn > i8259: QOM'ify some more > kvm/i8259: QOM'ify some more > i8259: Convert PICCommonState to use QOM realizefn > isa: QOM'ify ISABus > isa: QOM'ify ISADevice > qdev: Drop FROM_QBUS() macro > > hw/audio/adlib.c | 23 ++++++++------- > hw/audio/cs4231a.c | 38 +++++++++++++++---------- > hw/audio/gus.c | 27 ++++++++++-------- > hw/audio/pcspk.c | 19 ++++++++----- > hw/audio/sb16.c | 21 +++++++++----- > hw/block/fdc.c | 40 +++++++++++++++----------- > hw/char/debugcon.c | 23 +++++++++------ > hw/char/parallel.c | 29 +++++++++++-------- > hw/char/serial-isa.c | 34 ++++++++++++---------- > hw/char/serial-pci.c | 17 +++++++++-- > hw/char/serial.c | 22 +++++++++++---- > hw/display/cirrus_vga.c | 12 ++++---- > hw/display/vga-isa.c | 17 ++++++----- > hw/dma/i82374.c | 13 ++++----- > hw/i2c/core.c | 4 +-- > hw/i386/kvm/i8254.c | 59 > ++++++++++++++++++++++++++------------- > hw/i386/kvm/i8259.c | 34 ++++++++++++++++++---- > hw/i386/pc.c | 28 ++++++++++++------- > hw/i386/pc_piix.c | 2 +- > hw/ide/isa.c | 16 +++++------ > hw/input/pckbd.c | 29 +++++++++++-------- > hw/input/vmmouse.c | 8 ++---- > hw/intc/i8259.c | 48 ++++++++++++++++++++++--------- > hw/intc/i8259_common.c | 34 ++++++++++------------ > hw/isa/i82378.c | 4 +-- > hw/isa/isa-bus.c | 25 ++++------------- > hw/isa/pc87312.c | 12 ++++---- > hw/isa/piix4.c | 2 +- > hw/isa/vt82c686.c | 2 +- > hw/misc/applesmc.c | 10 +++---- > hw/misc/debugexit.c | 10 +++---- > hw/misc/pc-testdev.c | 11 ++++---- > hw/misc/pvpanic.c | 19 ++++++++----- > hw/misc/sga.c | 7 ++--- > hw/misc/vmport.c | 10 +++---- > hw/net/ne2000-isa.c | 15 +++++----- > hw/pci/pci.c | 2 +- > hw/ppc/prep.c | 7 +++-- > hw/sparc64/sun4u.c | 3 +- > hw/ssi/ssi.c | 2 +- > hw/timer/i8254.c | 28 ++++++++++++++----- > hw/timer/i8254_common.c | 19 ++++--------- > hw/timer/m48t59.c | 22 +++++++++------ > hw/timer/mc146818rtc.c | 18 ++++++------ > hw/watchdog/wdt_ib700.c | 8 ++---- > include/hw/audio/pcspk.h | 14 ++++++---- > include/hw/char/serial.h | 2 +- > include/hw/i386/pc.h | 30 +++++++++++--------- > include/hw/isa/i8259_internal.h | 2 +- > include/hw/isa/isa.h | 11 ++++++-- > include/hw/qdev-core.h | 2 -- > include/hw/timer/i8254.h | 31 ++++++++++++-------- > include/hw/timer/i8254_internal.h | 1 - > 53 files changed, 535 insertions(+), 391 deletions(-) > > -- > 1.8.1.4 >