Merge commit '62dd25e56d18a7f902c682914212fd84fd108546'

Merge commit '62dd25e56d18a7f902c682914212fd84fd108546'

kvm-apic/ioapic merge from Jan Kiszka.

* commit '62dd25e56d18a7f902c682914212fd84fd108546': (95 commits)
  qdev: change ambiguous qdev names
  virtio-s390: convert to QEMU Object Model
  sysbus: apic: ioapic: convert to QEMU Object Model
  pci: convert to QEMU Object Model
  unin_pci: Drop unused reset handler
  unin_pci: Drop duplicate busdev
  unin_pci: Clean up qdev names
  virtio-serial: convert to QEMU Object Model
  spapr: convert to QEMU Object Model (v2)
  scsi: convert to QEMU Object Model
  ide: convert to QEMU Object Model
  hda-codec: convert to QEMU Object Model
  isa: pic: convert to QEMU Object Model
  qdev: prepare source tree for code conversion
  i2c: smbus: convert to QEMU Object Model
  i2c: rename i2c_slave -> I2CSlave
  ssi: convert to QEMU Object Model
  ccid: convert to QEMU Object Model
  usb: convert to QEMU Object Model
  qdev: add class_init to DeviceInfo
  ...

Signed-off-by: Avi Kivity <avi@redhat.com>