openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

hw/s390x/s390-skeys: rename skeys_enabled to skeys_are_enabled 

... 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>
This commit is contained in:
David Hildenbrand 2021-09-03 17:55:13 +02:00 committed by Thomas Huth
parent 2162faf77e
commit 5227b32601
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/s390x/s390-skeys-kvm.c
View File

@ -15,7 +15,7 @@
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qemu/module.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); S390SKeysClass *skeyclass = S390_SKEYS_GET_CLASS(ss);
uint8_t single_key; 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); S390SKeysClass *skeyclass = S390_SKEYS_CLASS(oc);
DeviceClass *dc = DEVICE_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->get_skeys = kvm_s390_skeys_get;
skeyclass->set_skeys = kvm_s390_skeys_set; skeyclass->set_skeys = kvm_s390_skeys_set;

12
hw/s390x/s390-skeys.c
View File

@ -82,7 +82,7 @@ void hmp_info_skeys(Monitor *mon, const QDict *qdict)
int r; int r;
/* Quick check to see if guest is using storage keys*/ /* 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"); monitor_printf(mon, "Error: This guest is not using storage keys\n");
return; return;
} }
@ -128,7 +128,7 @@ void qmp_dump_skeys(const char *filename, Error **errp)
FILE *f; FILE *f;
/* Quick check to see if guest is using storage keys*/ /* 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 - " error_setg(errp, "This guest is not using storage keys - "
"nothing to dump"); "nothing to dump");
return; return;
@ -200,9 +200,9 @@ static void qemu_s390_skeys_init(Object *obj)
skeys->keydata = g_malloc0(skeys->key_count); 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, 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); S390SKeysClass *skeyclass = S390_SKEYS_CLASS(oc);
DeviceClass *dc = DEVICE_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->get_skeys = qemu_s390_skeys_get;
skeyclass->set_skeys = qemu_s390_skeys_set; skeyclass->set_skeys = qemu_s390_skeys_set;
@ -277,7 +277,7 @@ static void s390_storage_keys_save(QEMUFile *f, void *opaque)
int error = 0; int error = 0;
uint8_t *buf; uint8_t *buf;
if (!skeyclass->skeys_enabled(ss)) { if (!skeyclass->skeys_are_enabled(ss)) {
goto end_stream; goto end_stream;
} }

2
include/hw/s390x/storage-keys.h
View File

@ -28,7 +28,7 @@ struct S390SKeysState {
struct S390SKeysClass { struct S390SKeysClass {
DeviceClass parent_class; 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, int (*get_skeys)(S390SKeysState *ks, uint64_t start_gfn, uint64_t count,
uint8_t *keys); uint8_t *keys);
int (*set_skeys)(S390SKeysState *ks, uint64_t start_gfn, uint64_t count, int (*set_skeys)(S390SKeysState *ks, uint64_t start_gfn, uint64_t count,