Commit 1a87e527 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



QOM infrastructure fixes and device conversions

* Conversion of cadence_uart to QOM realize
* qom-tree QMP script
* qom-list and qom-set HMP commands to match their QMP counterparts
* Basic qom-tree HMP command
* Cleanups for /machine QOM composition tree

# gpg: Signature made Tue Mar 17 15:02:57 2015 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg:                 aka "Andreas Färber <afaerber@suse.com>"

* remotes/afaerber/tags/qom-devices-for-peter:
  qdev: Move owner-less IRQs to /machine/unattached
  memory: Move owner-less MemoryRegions to /machine/unattached
  qom: Implement info qom-tree HMP command
  qom: Implement qom-set HMP command
  qom: Implement qom-list HMP command
  scripts: Add qom-tree script
  cadence_uart: Convert to QOM realize()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5a499283 88950eef

hmp-commands.hx

+28 −0
Original line number Diff line number Diff line
@@ -1671,6 +1671,32 @@ ETEXI 
STEXI

@item cpu-add @var{id}

Add CPU with id @var{id}

ETEXI



    {

        .name       = "qom-list",

        .args_type  = "path:s?",

        .params     = "path",

        .help       = "list QOM properties",

        .mhandler.cmd  = hmp_qom_list,

    },



STEXI

@item qom-list [@var{path}]

Print QOM properties of object at location @var{path}

ETEXI



    {

        .name       = "qom-set",

        .args_type  = "path:s,property:s,value:s",

        .params     = "path property value",

        .help       = "set QOM property",

        .mhandler.cmd  = hmp_qom_set,

    },



STEXI

@item qom-set @var{path} @var{property} @var{value}

Set QOM property @var{property} of object at location @var{path} to value @var{value}

ETEXI



    {
@@ -1756,6 +1782,8 @@ show balloon information 
show device tree

@item info qdm

show qdev device model list

@item info qom-tree

show object composition tree

@item info roms

show roms

@item info tpm

hmp.c

+47 −0
Original line number Diff line number Diff line
@@ -1866,3 +1866,50 @@ void hmp_info_memory_devices(Monitor *mon, const QDict *qdict) 


    qapi_free_MemoryDeviceInfoList(info_list);

}



void hmp_qom_list(Monitor *mon, const QDict *qdict)

{

    const char *path = qdict_get_try_str(qdict, "path");

    ObjectPropertyInfoList *list;

    Error *err = NULL;



    if (path == NULL) {

        monitor_printf(mon, "/\n");

        return;

    }



    list = qmp_qom_list(path, &err);

    if (err == NULL) {

        ObjectPropertyInfoList *start = list;

        while (list != NULL) {

            ObjectPropertyInfo *value = list->value;



            monitor_printf(mon, "%s (%s)\n",

                           value->name, value->type);

            list = list->next;

        }

        qapi_free_ObjectPropertyInfoList(start);

    }

    hmp_handle_error(mon, &err);

}



void hmp_qom_set(Monitor *mon, const QDict *qdict)

{

    const char *path = qdict_get_str(qdict, "path");

    const char *property = qdict_get_str(qdict, "property");

    const char *value = qdict_get_str(qdict, "value");

    Error *err = NULL;

    bool ambiguous = false;

    Object *obj;



    obj = object_resolve_path(path, &ambiguous);

    if (obj == NULL) {

        error_set(&err, QERR_DEVICE_NOT_FOUND, path);

    } else {

        if (ambiguous) {

            monitor_printf(mon, "Warning: Path '%s' is ambiguous\n", path);

        }

        object_property_parse(obj, value, property, &err);

    }

    hmp_handle_error(mon, &err);

}

hmp.h

+2 −0
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ void hmp_object_add(Monitor *mon, const QDict *qdict); 
void hmp_object_del(Monitor *mon, const QDict *qdict);

void hmp_info_memdev(Monitor *mon, const QDict *qdict);

void hmp_info_memory_devices(Monitor *mon, const QDict *qdict);

void hmp_qom_list(Monitor *mon, const QDict *qdict);

void hmp_qom_set(Monitor *mon, const QDict *qdict);

void object_add_completion(ReadLineState *rs, int nb_args, const char *str);

void object_del_completion(ReadLineState *rs, int nb_args, const char *str);

void device_add_completion(ReadLineState *rs, int nb_args, const char *str);

hw/char/cadence_uart.c

+15 −11
Original line number Diff line number Diff line
@@ -476,18 +476,12 @@ static void cadence_uart_reset(DeviceState *dev) 
    uart_update_status(s);

}



static int cadence_uart_init(SysBusDevice *dev)

static void cadence_uart_realize(DeviceState *dev, Error **errp)

{

    UartState *s = CADENCE_UART(dev);



    memory_region_init_io(&s->iomem, OBJECT(s), &uart_ops, s, "uart", 0x1000);

    sysbus_init_mmio(dev, &s->iomem);

    sysbus_init_irq(dev, &s->irq);



    s->fifo_trigger_handle = timer_new_ns(QEMU_CLOCK_VIRTUAL,

            (QEMUTimerCB *)fifo_trigger_update, s);



    s->char_tx_time = (get_ticks_per_sec() / 9600) * 10;

                                          fifo_trigger_update, s);



    s->chr = qemu_char_get_next_serial();
@@ -495,8 +489,18 @@ static int cadence_uart_init(SysBusDevice *dev) 
        qemu_chr_add_handlers(s->chr, uart_can_receive, uart_receive,

                              uart_event, s);

    }

}



    return 0;

static void cadence_uart_init(Object *obj)

{

    SysBusDevice *sbd = SYS_BUS_DEVICE(obj);

    UartState *s = CADENCE_UART(obj);



    memory_region_init_io(&s->iomem, obj, &uart_ops, s, "uart", 0x1000);

    sysbus_init_mmio(sbd, &s->iomem);

    sysbus_init_irq(sbd, &s->irq);



    s->char_tx_time = (get_ticks_per_sec() / 9600) * 10;

}



static int cadence_uart_post_load(void *opaque, int version_id)
@@ -528,9 +532,8 @@ static const VMStateDescription vmstate_cadence_uart = { 
static void cadence_uart_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass);



    sdc->init = cadence_uart_init;

    dc->realize = cadence_uart_realize;

    dc->vmsd = &vmstate_cadence_uart;

    dc->reset = cadence_uart_reset;

}
@@ -539,6 +542,7 @@ static const TypeInfo cadence_uart_info = { 
    .name          = TYPE_CADENCE_UART,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .instance_size = sizeof(UartState),

    .instance_init = cadence_uart_init,

    .class_init    = cadence_uart_class_init,

};

hw/core/qdev.c

+3 −2
Original line number Diff line number Diff line
@@ -501,8 +501,9 @@ void qdev_connect_gpio_out_named(DeviceState *dev, const char *name, int n, 
         * with an error without doing anything.  If it has none, it will

         * never fail.  So we can just call it with a NULL Error pointer.

         */

        object_property_add_child(qdev_get_machine(), "non-qdev-gpio[*]",

                                  OBJECT(pin), NULL);

        object_property_add_child(container_get(qdev_get_machine(),

                                                "/unattached"),

                                  "non-qdev-gpio[*]", OBJECT(pin), NULL);

    }

    object_property_set_link(OBJECT(dev), OBJECT(pin), propname, &error_abort);

    g_free(propname);