[Qemu-devel] [PATCH] hw/ppc/spapr_rtc: Mark the RTC device with user_creatable = false

[Qemu-devel] [PATCH] hw/ppc/spapr_rtc: Mark the RTC device with user_creatable = false

[Thomas Huth]

QEMU currently aborts unexpectedly when a user tries to do something
like this:

$ qemu-system-ppc64 -nographic -S -nodefaults -monitor stdio
QEMU 2.9.92 monitor - type 'help' for more information
(qemu) device_add spapr-rtc,id=spapr-rtc
(qemu) device_del spapr-rtc
**
ERROR:qemu/qdev-monitor.c:872:qdev_unplug: assertion failed: (hotplug_ctrl)
Aborted (core dumped)

The RTC device is not meant to be hot-pluggable - it's an internal
device only and it even should not be possible to create it a
second time with the "-device" parameter, so let's mark this
with "user_creatable = false".

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

diff --git a/hw/ppc/spapr_rtc.c b/hw/ppc/spapr_rtc.c
index 00a4e4c..9ec3078 100644
--- a/hw/ppc/spapr_rtc.c
+++ b/hw/ppc/spapr_rtc.c
@@ -164,6 +164,8 @@ static void spapr_rtc_class_init(ObjectClass *oc, void *data)
 
     dc->realize = spapr_rtc_realize;
     dc->vmsd = &vmstate_spapr_rtc;
+    /* Reason: This is an internal device only for handling the hypercalls */
+    dc->user_creatable = false;
 
     spapr_rtas_register(RTAS_GET_TIME_OF_DAY, "get-time-of-day",
                         rtas_get_time_of_day);
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH] hw/ppc/spapr_rtc: Mark the RTC device with user_creatable = false

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 1618 bytes --]

On Thu, Aug 17, 2017 at 07:15:10AM +0200, Thomas Huth wrote:
> QEMU currently aborts unexpectedly when a user tries to do something
> like this:
> 
> $ qemu-system-ppc64 -nographic -S -nodefaults -monitor stdio
> QEMU 2.9.92 monitor - type 'help' for more information
> (qemu) device_add spapr-rtc,id=spapr-rtc
> (qemu) device_del spapr-rtc
> **
> ERROR:qemu/qdev-monitor.c:872:qdev_unplug: assertion failed: (hotplug_ctrl)
> Aborted (core dumped)
> 
> The RTC device is not meant to be hot-pluggable - it's an internal
> device only and it even should not be possible to create it a
> second time with the "-device" parameter, so let's mark this
> with "user_creatable = false".
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Applied to ppc-for-2.10, thanks.

> ---
>  hw/ppc/spapr_rtc.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/hw/ppc/spapr_rtc.c b/hw/ppc/spapr_rtc.c
> index 00a4e4c..9ec3078 100644
> --- a/hw/ppc/spapr_rtc.c
> +++ b/hw/ppc/spapr_rtc.c
> @@ -164,6 +164,8 @@ static void spapr_rtc_class_init(ObjectClass *oc, void *data)
>  
>      dc->realize = spapr_rtc_realize;
>      dc->vmsd = &vmstate_spapr_rtc;
> +    /* Reason: This is an internal device only for handling the hypercalls */
> +    dc->user_creatable = false;
>  
>      spapr_rtas_register(RTAS_GET_TIME_OF_DAY, "get-time-of-day",
>                          rtas_get_time_of_day);

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]