tree 328c5e856f25c5f0176d9361b641e8061e093ae2
parent 22bfa16ed3d4c9d534dcfe6f2381a654f32296b9
parent fef7fbc92496f5f6d2b7395263830bce15ebf410
author Blue Swirl <blauwirbel@gmail.com> 1371293624 +0000
committer Blue Swirl <blauwirbel@gmail.com> 1371293624 +0000

Merge branch 'realize-isa.v2' of git://github.com/afaerber/qemu-cpu

* 'realize-isa.v2' of git://github.com/afaerber/qemu-cpu:
  qdev: Drop FROM_QBUS() macro
  isa: QOM'ify ISADevice
  isa: QOM'ify ISABus
  i8259: Convert PICCommonState to use QOM realizefn
  kvm/i8259: QOM'ify some more
  i8259: QOM'ify some more
  i8254: Convert PITCommonState to QOM realizefn
  kvm/i8254: QOM'ify some more
  i8254: QOM'ify some more
  isa: Use realizefn for ISADevice
  cs4231a: QOM'ify some more
  gus: QOM'ify some more