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

Merge remote-tracking branch 'remotes/armbru/tags/pull-qdev-2017-04-21' into staging 



qdev patches for 2017-04-21

# gpg: Signature made Fri 21 Apr 2017 06:37:19 BST
# gpg:                using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qdev-2017-04-21:
  qdev: remove cannot_destroy_with_object_finalize_yet
  versatile: remove cannot_destroy_with_object_finalize_yet
  ppc: remove cannot_destroy_with_object_finalize_yet
  arm: remove remaining cannot_destroy_with_object_finalize_yet

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 7cd37925 08f00df4

hw/arm/allwinner-a10.c

+0 −6
Original line number Diff line number Diff line
@@ -118,12 +118,6 @@ 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/bcm2836.c

+0 −6
Original line number Diff line number Diff line
@@ -160,12 +160,6 @@ static void bcm2836_class_init(ObjectClass *oc, void *data) 


    dc->props = bcm2836_props;

    dc->realize = bcm2836_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 bcm2836_type_info = {

hw/arm/digic.c

+0 −6
Original line number Diff line number Diff line
@@ -101,12 +101,6 @@ 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

+0 −5
Original line number Diff line number Diff line
@@ -290,11 +290,6 @@ static void fsl_imx25_class_init(ObjectClass *oc, void *data) 


    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;

    dc->desc = "i.MX25 SOC";

}

hw/arm/fsl-imx31.c

+0 −5
Original line number Diff line number Diff line
@@ -262,11 +262,6 @@ static void fsl_imx31_class_init(ObjectClass *oc, void *data) 


    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;

    dc->desc = "i.MX31 SOC";

}