Commit 5cff81f0 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'afaerber/tags/qom-devices-for-anthony' into staging 

QOM device refactorings

* Fix QOM and ISA documentation errors
* Extend object_initialize() et al. to check the instance size

# gpg: Signature made Fri 30 Aug 2013 02:19:48 PM CDT using RSA key ID 3E7E013F
# gpg: Can't check signature: public key not found

# By Andreas Färber (14) and others
# Via Andreas Färber
* afaerber/tags/qom-devices-for-anthony:
  isa: Fix documentation of isa_register_portio_list()
  qom: Assert instance size in object_initialize_with_type()
  qom: Pass available size to object_initialize()
  qdev: Pass size to qbus_create_inplace()
  virtio-mmio: Pass size to virtio_mmio_bus_new()
  virtio-ccw: Pass size to virtio_ccw_bus_new()
  s390-virtio-bus: Pass size to virtio_s390_bus_new()
  virtio-pci: Pass size to virtio_pci_bus_new()
  usb: Pass size to usb_bus_new()
  scsi: Pass size to scsi_bus_new()
  pci: Pass size to pci_bus_new_inplace()
  ide: Pass size to ide_bus_new()
  ipack: Pass size to ipack_bus_new_inplace()
  intel-hda: Pass size to hda_codec_bus_init()
  qom: Fix object_initialize_with_type() argument name in documentation
  virtio: Remove unnecessary OBJECT() casts
  object: Fix typo in qom/object.h
parents 545825d4 520902a6

hw/audio/intel-hda.c

+3 −3
Original line number Diff line number Diff line
@@ -40,11 +40,11 @@ static const TypeInfo hda_codec_bus_info = { 
    .instance_size = sizeof(HDACodecBus),

};



void hda_codec_bus_init(DeviceState *dev, HDACodecBus *bus,

void hda_codec_bus_init(DeviceState *dev, HDACodecBus *bus, size_t bus_size,

                        hda_codec_response_func response,

                        hda_codec_xfer_func xfer)

{

    qbus_create_inplace(&bus->qbus, TYPE_HDA_BUS, dev, NULL);

    qbus_create_inplace(bus, bus_size, TYPE_HDA_BUS, dev, NULL);

    bus->response = response;

    bus->xfer = xfer;

}
@@ -1142,7 +1142,7 @@ static int intel_hda_init(PCIDevice *pci) 
        msi_init(&d->pci, 0x50, 1, true, false);

    }



    hda_codec_bus_init(DEVICE(pci), &d->codecs,

    hda_codec_bus_init(DEVICE(pci), &d->codecs, sizeof(d->codecs),

                       intel_hda_response, intel_hda_xfer);



    return 0;

hw/audio/intel-hda.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ struct HDACodecDevice { 
    uint32_t            cad;    /* codec address */

};



void hda_codec_bus_init(DeviceState *dev, HDACodecBus *bus,

void hda_codec_bus_init(DeviceState *dev, HDACodecBus *bus, size_t bus_size,

                        hda_codec_response_func response,

                        hda_codec_xfer_func xfer);

HDACodecDevice *hda_codec_find(HDACodecBus *bus, uint32_t cad);

hw/char/ipack.c

+3 −2
Original line number Diff line number Diff line
@@ -24,11 +24,12 @@ IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot) 
    return NULL;

}



void ipack_bus_new_inplace(IPackBus *bus, DeviceState *parent,

void ipack_bus_new_inplace(IPackBus *bus, size_t bus_size,

                           DeviceState *parent,

                           const char *name, uint8_t n_slots,

                           qemu_irq_handler handler)

{

    qbus_create_inplace(&bus->qbus, TYPE_IPACK_BUS, parent, name);

    qbus_create_inplace(bus, bus_size, TYPE_IPACK_BUS, parent, name);

    bus->n_slots = n_slots;

    bus->set_irq = handler;

}

hw/char/ipack.h

+2 −1
Original line number Diff line number Diff line
@@ -72,7 +72,8 @@ extern const VMStateDescription vmstate_ipack_device; 
    VMSTATE_STRUCT(_field, _state, 1, vmstate_ipack_device, IPackDevice)



IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot);

void ipack_bus_new_inplace(IPackBus *bus, DeviceState *parent,

void ipack_bus_new_inplace(IPackBus *bus, size_t bus_size,

                           DeviceState *parent,

                           const char *name, uint8_t n_slots,

                           qemu_irq_handler handler);

hw/char/tpci200.c

+1 −1
Original line number Diff line number Diff line
@@ -607,7 +607,7 @@ static int tpci200_initfn(PCIDevice *pci_dev) 
    pci_register_bar(&s->dev, 4, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->las2);

    pci_register_bar(&s->dev, 5, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->las3);



    ipack_bus_new_inplace(&s->bus, DEVICE(&s->dev), NULL,

    ipack_bus_new_inplace(&s->bus, sizeof(s->bus), DEVICE(pci_dev), NULL,

                          N_MODULES, tpci200_set_irq);



    return 0;