Re: [Qemu-devel] [PATCH for-2.11] hw/s390x/s390-skeys: Mark the storage key devices with user_creatable = false

[Halil Pasic]

On 08/24/2017 12:08 PM, Thomas Huth wrote:
> QEMU currently aborts if the user tries to create a skey device:
> 
> $ s390x-softmmu/qemu-system-s390x -nographic -device s390-skeys-qemu
> qemu-system-s390x: hw/s390x/s390-skeys.c:30: s390_get_skeys_device:
>  Assertion `ss' failed.
> Aborted (core dumped)
> 
> The storage key devices are only meant to be instantiated one time,
> internally. They can not be used by the user, so mark them with
> user_creatable = false.
> 
> Signed-off-by: Thomas Huth <address@hidden>
> ---
>  hw/s390x/s390-skeys-kvm.c | 4 ++++
>  hw/s390x/s390-skeys.c     | 4 ++++
>  2 files changed, 8 insertions(+)
> 
> diff --git a/hw/s390x/s390-skeys-kvm.c b/hw/s390x/s390-skeys-kvm.c
> index 131da56..dc54ed8 100644
> --- a/hw/s390x/s390-skeys-kvm.c
> +++ b/hw/s390x/s390-skeys-kvm.c
> @@ -54,10 +54,14 @@ static int kvm_s390_skeys_set(S390SKeysState *ss, 
> uint64_t start_gfn,
>  static void kvm_s390_skeys_class_init(ObjectClass *oc, void *data)
>  {
>      S390SKeysClass *skeyclass = S390_SKEYS_CLASS(oc);
> +    DeviceClass *dc = DEVICE_CLASS(oc);
> 
>      skeyclass->skeys_enabled = kvm_s390_skeys_enabled;
>      skeyclass->get_skeys = kvm_s390_skeys_get;
>      skeyclass->set_skeys = kvm_s390_skeys_set;
> +
> +    /* Reason: Internal device (only one skeys device for the whole memory) 
> */
> +    dc->user_creatable = false;
>  }
> 
>  static const TypeInfo kvm_s390_skeys_info = {
> diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c
> index c0de3b0..53ad5d3 100644
> --- a/hw/s390x/s390-skeys.c
> +++ b/hw/s390x/s390-skeys.c
> @@ -229,10 +229,14 @@ static int qemu_s390_skeys_get(S390SKeysState *ss, 
> uint64_t start_gfn,
>  static void qemu_s390_skeys_class_init(ObjectClass *oc, void *data)
>  {
>      S390SKeysClass *skeyclass = S390_SKEYS_CLASS(oc);
> +    DeviceClass *dc = DEVICE_CLASS(oc);
> 
>      skeyclass->skeys_enabled = qemu_s390_skeys_enabled;
>      skeyclass->get_skeys = qemu_s390_skeys_get;
>      skeyclass->set_skeys = qemu_s390_skeys_set;
> +
> +    /* Reason: Internal device (only one skeys device for the whole memory) 
> */
> +    dc->user_creatable = false;
>  }
> 
>  static const TypeInfo qemu_s390_skeys_info = {
> 

Reviewed-by: Halil Pasic <address@hidden>