Commit 8aca5215 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'afaerber-or/qom-next-2' into staging 

* afaerber-or/qom-next-2: (22 commits)
  qom: Push error reporting to object_property_find()
  qdev: Remove qdev_prop_exists()
  qbus: Initialize in standard way
  qbus: Make child devices links
  qdev: Connect busses with their parent devices
  qdev: Convert busses to QEMU Object Model
  qdev: Move SysBus initialization to sysbus.c
  qdev: Use wrapper for qdev_get_path
  qdev: Remove qdev_prop_set_defaults
  qdev: Clean up global properties
  qdev: Move bus properties to abstract superclasses
  qdev: Move bus properties to a separate global
  qdev: Push "type" property up to Object
  arm_l2x0: Rename "type" property to "cache-type"
  m48t59: Rename "type" property to "model"
  qom: Assert that public types have a non-NULL parent field
  qom: Drop type_register_static_alias() macro
  qom: Make Object a type
  qom: Add class_base_init
  qom: Add object_child_foreach()
  ...
parents 664535c3 89bfe000

exec.c

+2 −2
Original line number Diff line number Diff line
@@ -2603,8 +2603,8 @@ void qemu_ram_set_idstr(ram_addr_t addr, const char *name, DeviceState *dev) 
    assert(new_block);

    assert(!new_block->idstr[0]);



    if (dev && dev->parent_bus && dev->parent_bus->info->get_dev_path) {

        char *id = dev->parent_bus->info->get_dev_path(dev);

    if (dev) {

        char *id = qdev_get_dev_path(dev);

        if (id) {

            snprintf(new_block->idstr, sizeof(new_block->idstr), "%s/", id);

            g_free(id);

hw/acpi_piix4.c

+6 −4
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static const VMStateDescription vmstate_acpi = { 


static void acpi_piix_eject_slot(PIIX4PMState *s, unsigned slots)

{

    DeviceState *qdev, *next;

    BusChild *kid, *next;

    BusState *bus = qdev_get_parent_bus(&s->dev.qdev);

    int slot = ffs(slots) - 1;

    bool slot_free = true;
@@ -292,7 +292,8 @@ static void acpi_piix_eject_slot(PIIX4PMState *s, unsigned slots) 
    /* Mark request as complete */

    s->pci0_status.down &= ~(1U << slot);



    QTAILQ_FOREACH_SAFE(qdev, &bus->children, sibling, next) {

    QTAILQ_FOREACH_SAFE(kid, &bus->children, sibling, next) {

        DeviceState *qdev = kid->child;

        PCIDevice *dev = PCI_DEVICE(qdev);

        PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(dev);

        if (PCI_SLOT(dev->devfn) == slot) {
@@ -313,7 +314,7 @@ static void piix4_update_hotplug(PIIX4PMState *s) 
{

    PCIDevice *dev = &s->dev;

    BusState *bus = qdev_get_parent_bus(&dev->qdev);

    DeviceState *qdev, *next;

    BusChild *kid, *next;



    /* Execute any pending removes during reset */

    while (s->pci0_status.down) {
@@ -323,7 +324,8 @@ static void piix4_update_hotplug(PIIX4PMState *s) 
    s->pci0_hotplug_enable = ~0;

    s->pci0_slot_device_present = 0;



    QTAILQ_FOREACH_SAFE(qdev, &bus->children, sibling, next) {

    QTAILQ_FOREACH_SAFE(kid, &bus->children, sibling, next) {

        DeviceState *qdev = kid->child;

        PCIDevice *pdev = PCI_DEVICE(qdev);

        PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(pdev);

        int slot = PCI_SLOT(pdev->devfn);

hw/arm_l2x0.c

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static int l2x0_priv_init(SysBusDevice *dev) 
}



static Property l2x0_properties[] = {

    DEFINE_PROP_UINT32("type", l2x0_state, cache_type, 0x1c100100),

    DEFINE_PROP_UINT32("cache-type", l2x0_state, cache_type, 0x1c100100),

    DEFINE_PROP_END_OF_LIST(),

};

hw/i2c.c

+19 −11
Original line number Diff line number Diff line
@@ -17,13 +17,18 @@ struct i2c_bus 
    uint8_t saved_address;

};



static struct BusInfo i2c_bus_info = {

    .name = "I2C",

    .size = sizeof(i2c_bus),

    .props = (Property[]) {

static Property i2c_props[] = {

    DEFINE_PROP_UINT8("address", struct I2CSlave, address, 0),

    DEFINE_PROP_END_OF_LIST(),

    }

};



#define TYPE_I2C_BUS "i2c-bus"

#define I2C_BUS(obj) OBJECT_CHECK(i2c_bus, (obj), TYPE_I2C_BUS)



static const TypeInfo i2c_bus_info = {

    .name = TYPE_I2C_BUS,

    .parent = TYPE_BUS,

    .instance_size = sizeof(i2c_bus),

};



static void i2c_bus_pre_save(void *opaque)
@@ -61,7 +66,7 @@ i2c_bus *i2c_init_bus(DeviceState *parent, const char *name) 
{

    i2c_bus *bus;



    bus = FROM_QBUS(i2c_bus, qbus_create(&i2c_bus_info, parent, name));

    bus = FROM_QBUS(i2c_bus, qbus_create(TYPE_I2C_BUS, parent, name));

    vmstate_register(NULL, -1, &vmstate_i2c_bus, bus);

    return bus;

}
@@ -81,11 +86,12 @@ int i2c_bus_busy(i2c_bus *bus) 
/* TODO: Make this handle multiple masters.  */

int i2c_start_transfer(i2c_bus *bus, uint8_t address, int recv)

{

    DeviceState *qdev;

    BusChild *kid;

    I2CSlave *slave = NULL;

    I2CSlaveClass *sc;



    QTAILQ_FOREACH(qdev, &bus->qbus.children, sibling) {

    QTAILQ_FOREACH(kid, &bus->qbus.children, sibling) {

        DeviceState *qdev = kid->child;

        I2CSlave *candidate = I2C_SLAVE_FROM_QDEV(qdev);

        if (candidate->address == address) {

            slave = candidate;
@@ -218,7 +224,8 @@ static void i2c_slave_class_init(ObjectClass *klass, void *data) 
{

    DeviceClass *k = DEVICE_CLASS(klass);

    k->init = i2c_slave_qdev_init;

    k->bus_info = &i2c_bus_info;

    k->bus_type = TYPE_I2C_BUS;

    k->props = i2c_props;

}



static TypeInfo i2c_slave_type_info = {
@@ -232,6 +239,7 @@ static TypeInfo i2c_slave_type_info = { 


static void i2c_slave_register_types(void)

{

    type_register_static(&i2c_bus_info);

    type_register_static(&i2c_slave_type_info);

}

hw/ide/internal.h

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ typedef struct IDEState IDEState; 
typedef struct IDEDMA IDEDMA;

typedef struct IDEDMAOps IDEDMAOps;



#define TYPE_IDE_BUS "IDE"

#define IDE_BUS(obj) OBJECT_CHECK(IDEBus, (obj), TYPE_IDE_BUS)



/* Bits of HD_STATUS */

#define ERR_STAT		0x01

#define INDEX_STAT		0x02