diff options
| author | David Hildenbrand <david@redhat.com> | 2024-12-19 15:41:10 +0100 |
|---|---|---|
| committer | David Hildenbrand <david@redhat.com> | 2024-12-21 15:59:59 +0100 |
| commit | d1e3c2ac41b3f73708682e4e8212c32ad35013b9 (patch) | |
| tree | 7d0f18bcc0551a256a3dc2b258abea3ac039f1a2 | |
| parent | 241e6b2d27b090b17cda5b011b2064544b0c458b (diff) | |
| download | qemu-d1e3c2ac41b3f73708682e4e8212c32ad35013b9.zip qemu-d1e3c2ac41b3f73708682e4e8212c32ad35013b9.tar.gz qemu-d1e3c2ac41b3f73708682e4e8212c32ad35013b9.tar.bz2 | |
s390x/s390-skeys: prepare for memory devices
With memory devices, we will have storage keys for memory that
exceeds the initial ram size.
The TODO already states that current handling is subopimal,
but we won't worry about improving that (TCG-only) thing for now.
Message-ID: <20241219144115.2820241-10-david@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
| -rw-r--r-- | hw/s390x/s390-skeys.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c index 6d0a47e..6ea4d8c 100644 --- a/hw/s390x/s390-skeys.c +++ b/hw/s390x/s390-skeys.c @@ -11,7 +11,7 @@ #include "qemu/osdep.h" #include "qemu/units.h" -#include "hw/boards.h" +#include "hw/s390x/s390-virtio-ccw.h" #include "hw/qdev-properties.h" #include "hw/s390x/storage-keys.h" #include "qapi/error.h" @@ -251,9 +251,9 @@ static bool qemu_s390_enable_skeys(S390SKeysState *ss) * g_once_init_enter() is good enough. */ if (g_once_init_enter(&initialized)) { - MachineState *machine = MACHINE(qdev_get_machine()); + S390CcwMachineState *s390ms = S390_CCW_MACHINE(qdev_get_machine()); - skeys->key_count = machine->ram_size / TARGET_PAGE_SIZE; + skeys->key_count = s390_get_memory_limit(s390ms) / TARGET_PAGE_SIZE; skeys->keydata = g_malloc0(skeys->key_count); g_once_init_leave(&initialized, 1); } |