Commit 76849223 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-10-09' into staging 



Fix device introspection regressions

# gpg: Signature made Fri 09 Oct 2015 14:43:41 BST using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"

* remotes/armbru/tags/pull-monitor-2015-10-09:
  Revert "qdev: Use qdev_get_device_class() for -device <type>,help"
  qdev: Protect device-list-properties against broken devices
  qmp: Fix device-list-properties not to crash for abstract device
  device-introspect-test: New, covering device introspection
  libqtest: New hmp() & friends
  libqtest: Clean up unused QTestState member sigact_old
  tests: Fix how qom-test is run
  macio: move DBDMA_init from instance_init to realize
  hw: do not pass NULL to memory_region_init from instance_init
  memory: allow destroying a non-empty MemoryRegion
  virtio-input: Fix device introspection on non-Linux hosts
  update-linux-headers: Rename SW_MAX to SW_MAX_

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c9003eb4 33fe9683

hw/arm/allwinner-a10.c

+6 −0
Original line number Diff line number Diff line
@@ -103,6 +103,12 @@ static void aw_a10_class_init(ObjectClass *oc, void *data) 
    DeviceClass *dc = DEVICE_CLASS(oc);



    dc->realize = aw_a10_realize;



    /*

     * Reason: creates an ARM CPU, thus use after free(), see

     * arm_cpu_class_init()

     */

    dc->cannot_destroy_with_object_finalize_yet = true;

}



static const TypeInfo aw_a10_type_info = {

hw/arm/digic.c

+6 −0
Original line number Diff line number Diff line
@@ -97,6 +97,12 @@ static void digic_class_init(ObjectClass *oc, void *data) 
    DeviceClass *dc = DEVICE_CLASS(oc);



    dc->realize = digic_realize;



    /*

     * Reason: creates an ARM CPU, thus use after free(), see

     * arm_cpu_class_init()

     */

    dc->cannot_destroy_with_object_finalize_yet = true;

}



static const TypeInfo digic_type_info = {

hw/arm/fsl-imx25.c

+6 −0
Original line number Diff line number Diff line
@@ -284,6 +284,12 @@ static void fsl_imx25_class_init(ObjectClass *oc, void *data) 
    DeviceClass *dc = DEVICE_CLASS(oc);



    dc->realize = fsl_imx25_realize;



    /*

     * Reason: creates an ARM CPU, thus use after free(), see

     * arm_cpu_class_init()

     */

    dc->cannot_destroy_with_object_finalize_yet = true;

}



static const TypeInfo fsl_imx25_type_info = {

hw/arm/fsl-imx31.c

+6 −0
Original line number Diff line number Diff line
@@ -258,6 +258,12 @@ static void fsl_imx31_class_init(ObjectClass *oc, void *data) 
    DeviceClass *dc = DEVICE_CLASS(oc);



    dc->realize = fsl_imx31_realize;



    /*

     * Reason: creates an ARM CPU, thus use after free(), see

     * arm_cpu_class_init()

     */

    dc->cannot_destroy_with_object_finalize_yet = true;

}



static const TypeInfo fsl_imx31_type_info = {

hw/arm/pxa2xx.c

+1 −1
Original line number Diff line number Diff line
@@ -1958,7 +1958,7 @@ static void pxa2xx_fir_instance_init(Object *obj) 
    PXA2xxFIrState *s = PXA2XX_FIR(obj);

    SysBusDevice *sbd = SYS_BUS_DEVICE(obj);



    memory_region_init_io(&s->iomem, NULL, &pxa2xx_fir_ops, s,

    memory_region_init_io(&s->iomem, obj, &pxa2xx_fir_ops, s,

                          "pxa2xx-fir", 0x1000);

    sysbus_init_mmio(sbd, &s->iomem);

    sysbus_init_irq(sbd, &s->irq);