[Xen-changelog] [qemu-xen master] hw/arm/allwinner-a10: Mark the allwinner-a10 device with user_creatable = false

[patchbot@xxxxxxx]

commit 65a24b5c448710d1d2cf2ecdaea620793a9437e5
Author:     Thomas Huth <thuth@xxxxxxxxxx>
AuthorDate: Thu Sep 7 13:54:51 2017 +0100
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Thu Sep 14 19:26:40 2017 -0500

    hw/arm/allwinner-a10: Mark the allwinner-a10 device with user_creatable = 
false
    
    QEMU currently exits unexpectedly when the user accidentially
    tries to do something like this:
    
    $ aarch64-softmmu/qemu-system-aarch64 -S -M integratorcp -nographic
    QEMU 2.9.93 monitor - type 'help' for more information
    (qemu) device_add allwinner-a10
    Unsupported NIC model: smc91c111
    
    Exiting just due to a "device_add" should not happen. Looking closer
    at the the realize and instance_init function of this device also
    reveals that it is using serial_hds and nd_table directly there, so
    this device is clearly not creatable by the user and should be marked
    accordingly.
    
    Signed-off-by: Thomas Huth <thuth@xxxxxxxxxx>
    Reviewed-by: Eduardo Habkost <ehabkost@xxxxxxxxxx>
    Message-id: 1503416789-32080-1-git-send-email-thuth@xxxxxxxxxx
    Reviewed-by: Peter Maydell <peter.maydell@xxxxxxxxxx>
    Signed-off-by: Peter Maydell <peter.maydell@xxxxxxxxxx>
    (cherry picked from commit dc89a180caf143a5d596d3f2f776d13be83a687d)
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 hw/arm/allwinner-a10.c    | 2 ++
 scripts/device-crash-test | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c
index f62a9a3..43a3f01 100644
--- a/hw/arm/allwinner-a10.c
+++ b/hw/arm/allwinner-a10.c
@@ -118,6 +118,8 @@ static void aw_a10_class_init(ObjectClass *oc, void *data)
     DeviceClass *dc = DEVICE_CLASS(oc);
 
     dc->realize = aw_a10_realize;
+    /* Reason: Uses serial_hds in realize and nd_table in instance_init */
+    dc->user_creatable = false;
 }
 
 static const TypeInfo aw_a10_type_info = {
diff --git a/scripts/device-crash-test b/scripts/device-crash-test
index e77b693..81d65b9 100755
--- a/scripts/device-crash-test
+++ b/scripts/device-crash-test
@@ -187,7 +187,6 @@ ERROR_WHITELIST = [
     {'log':r"Device [\w.,-]+ can not be dynamically instantiated"},
     {'log':r"Platform Bus: Can not fit MMIO region of size "},
     # other more specific errors we will ignore:
-    {'device':'allwinner-a10', 'log':"Unsupported NIC model:"},
     {'device':'.*-spapr-cpu-core', 'log':r"CPU core type should be"},
     {'log':r"MSI(-X)? is not supported by interrupt controller"},
     {'log':r"pxb-pcie? devices cannot reside on a PCIe? bus"},
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog