All of lore.kernel.org
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Cc: qemu-s390x@nongnu.org, David Hildenbrand <david@redhat.com>
Subject: [PULL 17/20] hw/s390x/s390-skeys: rename skeys_enabled to skeys_are_enabled
Date: Tue,  7 Sep 2021 15:14:46 +0200	[thread overview]
Message-ID: <20210907131449.493875-18-thuth@redhat.com> (raw)
In-Reply-To: <20210907131449.493875-1-thuth@redhat.com>

From: David Hildenbrand <david@redhat.com>

... and make it return a bool instead.

Signed-off-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210903155514.44772-13-david@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 hw/s390x/s390-skeys-kvm.c       |  4 ++--
 hw/s390x/s390-skeys.c           | 12 ++++++------
 include/hw/s390x/storage-keys.h |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/hw/s390x/s390-skeys-kvm.c b/hw/s390x/s390-skeys-kvm.c
index 1c4d805ad8..3ff9d94b80 100644
--- a/hw/s390x/s390-skeys-kvm.c
+++ b/hw/s390x/s390-skeys-kvm.c
@@ -15,7 +15,7 @@
 #include "qemu/error-report.h"
 #include "qemu/module.h"
 
-static int kvm_s390_skeys_enabled(S390SKeysState *ss)
+static bool kvm_s390_skeys_are_enabled(S390SKeysState *ss)
 {
     S390SKeysClass *skeyclass = S390_SKEYS_GET_CLASS(ss);
     uint8_t single_key;
@@ -57,7 +57,7 @@ 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->skeys_are_enabled = kvm_s390_skeys_are_enabled;
     skeyclass->get_skeys = kvm_s390_skeys_get;
     skeyclass->set_skeys = kvm_s390_skeys_set;
 
diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c
index db73e9091d..9e994a5582 100644
--- a/hw/s390x/s390-skeys.c
+++ b/hw/s390x/s390-skeys.c
@@ -82,7 +82,7 @@ void hmp_info_skeys(Monitor *mon, const QDict *qdict)
     int r;
 
     /* Quick check to see if guest is using storage keys*/
-    if (!skeyclass->skeys_enabled(ss)) {
+    if (!skeyclass->skeys_are_enabled(ss)) {
         monitor_printf(mon, "Error: This guest is not using storage keys\n");
         return;
     }
@@ -128,7 +128,7 @@ void qmp_dump_skeys(const char *filename, Error **errp)
     FILE *f;
 
     /* Quick check to see if guest is using storage keys*/
-    if (!skeyclass->skeys_enabled(ss)) {
+    if (!skeyclass->skeys_are_enabled(ss)) {
         error_setg(errp, "This guest is not using storage keys - "
                          "nothing to dump");
         return;
@@ -200,9 +200,9 @@ static void qemu_s390_skeys_init(Object *obj)
     skeys->keydata = g_malloc0(skeys->key_count);
 }
 
-static int qemu_s390_skeys_enabled(S390SKeysState *ss)
+static bool qemu_s390_skeys_are_enabled(S390SKeysState *ss)
 {
-    return 1;
+    return true;
 }
 
 static int qemu_s390_skeys_set(S390SKeysState *ss, uint64_t start_gfn,
@@ -250,7 +250,7 @@ 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->skeys_are_enabled = qemu_s390_skeys_are_enabled;
     skeyclass->get_skeys = qemu_s390_skeys_get;
     skeyclass->set_skeys = qemu_s390_skeys_set;
 
@@ -277,7 +277,7 @@ static void s390_storage_keys_save(QEMUFile *f, void *opaque)
     int error = 0;
     uint8_t *buf;
 
-    if (!skeyclass->skeys_enabled(ss)) {
+    if (!skeyclass->skeys_are_enabled(ss)) {
         goto end_stream;
     }
 
diff --git a/include/hw/s390x/storage-keys.h b/include/hw/s390x/storage-keys.h
index 2888d42d0b..eb091842c8 100644
--- a/include/hw/s390x/storage-keys.h
+++ b/include/hw/s390x/storage-keys.h
@@ -28,7 +28,7 @@ struct S390SKeysState {
 
 struct S390SKeysClass {
     DeviceClass parent_class;
-    int (*skeys_enabled)(S390SKeysState *ks);
+    bool (*skeys_are_enabled)(S390SKeysState *ks);
     int (*get_skeys)(S390SKeysState *ks, uint64_t start_gfn, uint64_t count,
                      uint8_t *keys);
     int (*set_skeys)(S390SKeysState *ks, uint64_t start_gfn, uint64_t count,
-- 
2.27.0



  parent reply	other threads:[~2021-09-07 13:48 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-07 13:14 [PULL 00/20] s390x patches Thomas Huth
2021-09-07 13:14 ` [PULL 01/20] vfio-ccw: forward halt/clear errors Thomas Huth
2021-09-07 13:14 ` [PULL 02/20] css: fix actl handling for unit exceptions Thomas Huth
2021-09-07 13:14 ` [PULL 03/20] tests/tcg/s390x: Test SIGILL and SIGSEGV handling Thomas Huth
2021-09-07 13:14 ` [PULL 04/20] s390x/tcg: fix and optimize SPX (SET PREFIX) Thomas Huth
2021-09-07 13:14 ` [PULL 05/20] s390x/ioinst: Fix wrong MSCH alignment check on little endian Thomas Huth
2021-09-07 13:14 ` [PULL 06/20] s390x/tcg: wrap address for RRBE Thomas Huth
2021-09-07 13:14 ` [PULL 07/20] s390x/tcg: fix ignoring bit 63 when setting the storage key in SSKE Thomas Huth
2021-09-07 13:14 ` [PULL 08/20] s390x/tcg: convert real to absolute address for RRBE, SSKE and ISKE Thomas Huth
2021-09-07 13:14 ` [PULL 09/20] s390x/tcg: check for addressing exceptions " Thomas Huth
2021-09-07 13:14 ` [PULL 10/20] s390x/mmu_helper: no need to pass access type to mmu_translate_asce() Thomas Huth
2021-09-07 13:14 ` [PULL 11/20] s390x/mmu_helper: fixup mmu_translate() documentation Thomas Huth
2021-09-07 13:14 ` [PULL 12/20] s390x/mmu_helper: move address validation into mmu_translate*() Thomas Huth
2021-09-07 13:14 ` [PULL 13/20] s390x/mmu_helper: avoid setting the storage key if nothing changed Thomas Huth
2021-09-07 13:14 ` [PULL 14/20] hw/s390x/s390-skeys: use memory mapping to detect which storage keys to migrate Thomas Huth
2021-09-07 13:14 ` [PULL 15/20] hw/s390x/s390-skeys: use memory mapping to detect which storage keys to dump Thomas Huth
2021-09-07 13:14 ` [PULL 16/20] hw/s390x/s390-skeys: check if an address is valid before dumping the key Thomas Huth
2021-09-07 13:14 ` Thomas Huth [this message]
2021-09-07 13:14 ` [PULL 18/20] hw/s390x/s390-skeys: lazy storage key enablement under TCG Thomas Huth
2021-09-07 13:14 ` [PULL 19/20] s390x: Replace PAGE_SIZE, PAGE_SHIFT and PAGE_MASK Thomas Huth
2021-09-07 13:14 ` [PULL 20/20] s390x/cpumodel: Add more feature to gen16 default model Thomas Huth
2021-09-07 19:22 ` [PULL 00/20] s390x patches Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210907131449.493875-18-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=david@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.