diff mbox series

hw/misc/macio: Mark the macio devices with user_creatable = false

Message ID 1520432574-20615-1-git-send-email-thuth@redhat.com
State New
Headers show
Series hw/misc/macio: Mark the macio devices with user_creatable = false | expand

Commit Message

Thomas Huth March 7, 2018, 2:22 p.m. UTC
The macio devices currently cause a crash when the user tries to
instantiate them on a different machine:

$ ppc64-softmmu/qemu-system-ppc64 -device macio-newworld
Unexpected error in qemu_chr_fe_init() at chardev/char-fe.c:222:
qemu-system-ppc64: -device macio-newworld: Device 'serial0' is in use
Aborted (core dumped)

These devices are clearly not intended to be creatable by the user
since they are using serial_hds[] directly in their instance_init
function. So let's mark them with user_creatable = false.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 hw/misc/macio/macio.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Mark Cave-Ayland March 7, 2018, 6:47 p.m. UTC | #1
On 07/03/18 14:22, Thomas Huth wrote:

> The macio devices currently cause a crash when the user tries to
> instantiate them on a different machine:
> 
> $ ppc64-softmmu/qemu-system-ppc64 -device macio-newworld
> Unexpected error in qemu_chr_fe_init() at chardev/char-fe.c:222:
> qemu-system-ppc64: -device macio-newworld: Device 'serial0' is in use
> Aborted (core dumped)
> 
> These devices are clearly not intended to be creatable by the user
> since they are using serial_hds[] directly in their instance_init
> function. So let's mark them with user_creatable = false.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   hw/misc/macio/macio.c | 2 ++
>   1 file changed, 2 insertions(+)
> 
> diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
> index af1bd46..454244f 100644
> --- a/hw/misc/macio/macio.c
> +++ b/hw/misc/macio/macio.c
> @@ -406,6 +406,8 @@ static void macio_class_init(ObjectClass *klass, void *data)
>       k->class_id = PCI_CLASS_OTHERS << 8;
>       dc->props = macio_properties;
>       set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
> +    /* Reason: Uses serial_hds in macio_instance_init */
> +    dc->user_creatable = false;
>   }
>   
>   static const TypeInfo macio_oldworld_type_info = {

Looks like both Daniel and Peter also agree this is the correct 
approach, so:

Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


ATB,

Mark.
David Gibson March 8, 2018, 2:06 a.m. UTC | #2
On Wed, Mar 07, 2018 at 03:22:54PM +0100, Thomas Huth wrote:
> The macio devices currently cause a crash when the user tries to
> instantiate them on a different machine:
> 
> $ ppc64-softmmu/qemu-system-ppc64 -device macio-newworld
> Unexpected error in qemu_chr_fe_init() at chardev/char-fe.c:222:
> qemu-system-ppc64: -device macio-newworld: Device 'serial0' is in use
> Aborted (core dumped)
> 
> These devices are clearly not intended to be creatable by the user
> since they are using serial_hds[] directly in their instance_init
> function. So let's mark them with user_creatable = false.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Applied, thanks.

> ---
>  hw/misc/macio/macio.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
> index af1bd46..454244f 100644
> --- a/hw/misc/macio/macio.c
> +++ b/hw/misc/macio/macio.c
> @@ -406,6 +406,8 @@ static void macio_class_init(ObjectClass *klass, void *data)
>      k->class_id = PCI_CLASS_OTHERS << 8;
>      dc->props = macio_properties;
>      set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
> +    /* Reason: Uses serial_hds in macio_instance_init */
> +    dc->user_creatable = false;
>  }
>  
>  static const TypeInfo macio_oldworld_type_info = {
diff mbox series

Patch

diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
index af1bd46..454244f 100644
--- a/hw/misc/macio/macio.c
+++ b/hw/misc/macio/macio.c
@@ -406,6 +406,8 @@  static void macio_class_init(ObjectClass *klass, void *data)
     k->class_id = PCI_CLASS_OTHERS << 8;
     dc->props = macio_properties;
     set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
+    /* Reason: Uses serial_hds in macio_instance_init */
+    dc->user_creatable = false;
 }
 
 static const TypeInfo macio_oldworld_type_info = {