2015-06-26 18:54:51 +03:00
|
|
|
/*
|
|
|
|
* s390 storage key device
|
|
|
|
*
|
|
|
|
* Copyright 2015 IBM Corp.
|
|
|
|
* Author(s): Jason J. Herne <jjherne@linux.vnet.ibm.com>
|
|
|
|
*
|
|
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or (at
|
|
|
|
* your option) any later version. See the COPYING file in the top-level
|
|
|
|
* directory.
|
|
|
|
*/
|
|
|
|
|
2016-01-26 21:17:00 +03:00
|
|
|
#include "qemu/osdep.h"
|
2018-06-25 15:42:11 +03:00
|
|
|
#include "qemu/units.h"
|
2015-06-26 18:54:51 +03:00
|
|
|
#include "hw/boards.h"
|
|
|
|
#include "hw/s390x/storage-keys.h"
|
2018-02-01 14:18:31 +03:00
|
|
|
#include "qapi/error.h"
|
2019-06-19 23:10:46 +03:00
|
|
|
#include "qapi/qapi-commands-misc-target.h"
|
2018-02-01 14:18:39 +03:00
|
|
|
#include "qapi/qmp/qdict.h"
|
2015-06-26 18:54:51 +03:00
|
|
|
#include "qemu/error-report.h"
|
2015-12-04 14:06:26 +03:00
|
|
|
#include "sysemu/kvm.h"
|
2019-08-12 08:23:39 +03:00
|
|
|
#include "migration/qemu-file-types.h"
|
2017-04-24 14:42:55 +03:00
|
|
|
#include "migration/register.h"
|
2015-06-26 18:54:51 +03:00
|
|
|
|
2018-06-25 15:42:11 +03:00
|
|
|
#define S390_SKEYS_BUFFER_SIZE (128 * KiB) /* Room for 128k storage keys */
|
2015-06-26 21:11:23 +03:00
|
|
|
#define S390_SKEYS_SAVE_FLAG_EOS 0x01
|
|
|
|
#define S390_SKEYS_SAVE_FLAG_SKEYS 0x02
|
|
|
|
#define S390_SKEYS_SAVE_FLAG_ERROR 0x04
|
2015-06-26 21:03:16 +03:00
|
|
|
|
2015-06-26 18:54:51 +03:00
|
|
|
S390SKeysState *s390_get_skeys_device(void)
|
|
|
|
{
|
|
|
|
S390SKeysState *ss;
|
|
|
|
|
|
|
|
ss = S390_SKEYS(object_resolve_path_type("", TYPE_S390_SKEYS, NULL));
|
|
|
|
assert(ss);
|
|
|
|
return ss;
|
|
|
|
}
|
|
|
|
|
|
|
|
void s390_skeys_init(void)
|
|
|
|
{
|
|
|
|
Object *obj;
|
|
|
|
|
|
|
|
if (kvm_enabled()) {
|
|
|
|
obj = object_new(TYPE_KVM_S390_SKEYS);
|
|
|
|
} else {
|
|
|
|
obj = object_new(TYPE_QEMU_S390_SKEYS);
|
|
|
|
}
|
|
|
|
object_property_add_child(qdev_get_machine(), TYPE_S390_SKEYS,
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 18:29:22 +03:00
|
|
|
obj);
|
2015-06-26 18:54:51 +03:00
|
|
|
object_unref(obj);
|
|
|
|
|
qdev: Convert bus-less devices to qdev_realize() with Coccinelle
All remaining conversions to qdev_realize() are for bus-less devices.
Coccinelle script:
// only correct for bus-less @dev!
@@
expression errp;
expression dev;
@@
- qdev_init_nofail(dev);
+ qdev_realize(dev, NULL, &error_fatal);
@ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@
expression errp;
expression dev;
symbol true;
@@
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize(DEVICE(dev), NULL, errp);
@ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@
expression errp;
expression dev;
symbol true;
@@
- object_property_set_bool(dev, true, "realized", errp);
+ qdev_realize(DEVICE(dev), NULL, errp);
Note that Coccinelle chokes on ARMSSE typedef vs. macro in
hw/arm/armsse.c. Worked around by temporarily renaming the macro for
the spatch run.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-57-armbru@redhat.com>
2020-06-10 08:32:45 +03:00
|
|
|
qdev_realize(DEVICE(obj), NULL, &error_fatal);
|
2015-06-26 18:54:51 +03:00
|
|
|
}
|
|
|
|
|
2016-04-27 13:04:51 +03:00
|
|
|
static void write_keys(FILE *f, uint8_t *keys, uint64_t startgfn,
|
2015-06-26 21:03:16 +03:00
|
|
|
uint64_t count, Error **errp)
|
|
|
|
{
|
|
|
|
uint64_t curpage = startgfn;
|
|
|
|
uint64_t maxpage = curpage + count - 1;
|
|
|
|
|
|
|
|
for (; curpage <= maxpage; curpage++) {
|
|
|
|
uint8_t acc = (*keys & 0xF0) >> 4;
|
|
|
|
int fp = (*keys & 0x08);
|
|
|
|
int ref = (*keys & 0x04);
|
|
|
|
int ch = (*keys & 0x02);
|
|
|
|
int res = (*keys & 0x01);
|
|
|
|
|
2016-04-27 13:04:51 +03:00
|
|
|
fprintf(f, "page=%03" PRIx64 ": key(%d) => ACC=%X, FP=%d, REF=%d,"
|
|
|
|
" ch=%d, reserved=%d\n",
|
|
|
|
curpage, *keys, acc, fp, ref, ch, res);
|
2015-06-26 21:03:16 +03:00
|
|
|
keys++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-06-26 21:10:16 +03:00
|
|
|
void hmp_info_skeys(Monitor *mon, const QDict *qdict)
|
|
|
|
{
|
|
|
|
S390SKeysState *ss = s390_get_skeys_device();
|
|
|
|
S390SKeysClass *skeyclass = S390_SKEYS_GET_CLASS(ss);
|
|
|
|
uint64_t addr = qdict_get_int(qdict, "addr");
|
|
|
|
uint8_t key;
|
|
|
|
int r;
|
|
|
|
|
|
|
|
/* Quick check to see if guest is using storage keys*/
|
|
|
|
if (!skeyclass->skeys_enabled(ss)) {
|
|
|
|
monitor_printf(mon, "Error: This guest is not using storage keys\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
r = skeyclass->get_skeys(ss, addr / TARGET_PAGE_SIZE, 1, &key);
|
|
|
|
if (r < 0) {
|
|
|
|
monitor_printf(mon, "Error: %s\n", strerror(-r));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
monitor_printf(mon, " key: 0x%X\n", key);
|
|
|
|
}
|
|
|
|
|
2015-06-26 21:07:21 +03:00
|
|
|
void hmp_dump_skeys(Monitor *mon, const QDict *qdict)
|
|
|
|
{
|
|
|
|
const char *filename = qdict_get_str(qdict, "filename");
|
|
|
|
Error *err = NULL;
|
|
|
|
|
|
|
|
qmp_dump_skeys(filename, &err);
|
|
|
|
if (err) {
|
error: Use error_report_err() instead of monitor_printf()
Both error_report_err() and monitor_printf() print to the same
destination when monitor_printf() is used correctly, i.e. within an
HMP monitor. Elsewhere, monitor_printf() does nothing, while
error_report_err() reports to stderr.
Most changed functions are HMP command handlers. These should only
run within an HMP monitor. The one exception is bdrv_password_cb(),
which should also only run within an HMP monitor.
Four command handlers prefix the error message with the command name:
balloon, migrate_set_capability, migrate_set_parameter, migrate.
Pointless, drop.
Unlike monitor_printf(), error_report_err() uses the error whole
instead of just its message obtained with error_get_pretty(). This
avoids suppressing its hint (see commit 50b7b00). Example:
(qemu) device_add ivshmem,id=666
Parameter 'id' expects an identifier
Identifiers consist of letters, digits, '-', '.', '_', starting with a letter.
Try "help device_add" for more information
The "Identifiers consist of..." line is new with this patch.
Coccinelle semantic patch:
@@
expression M, E;
@@
- monitor_printf(M, "%s\n", error_get_pretty(E));
- error_free(E);
+ error_report_err(E);
@r1@
expression M, E;
format F;
position p;
@@
- monitor_printf(M, "...%@F@\n", error_get_pretty(E));@p
- error_free(E);
+ error_report_err(E);
@script:python@
p << r1.p;
@@
print "%s:%s:%s: prefix dropped" % (p[0].file, p[0].line, p[0].column)
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1450452927-8346-4-git-send-email-armbru@redhat.com>
2015-12-18 18:35:06 +03:00
|
|
|
error_report_err(err);
|
2015-06-26 21:07:21 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-06-26 21:03:16 +03:00
|
|
|
void qmp_dump_skeys(const char *filename, Error **errp)
|
|
|
|
{
|
|
|
|
S390SKeysState *ss = s390_get_skeys_device();
|
|
|
|
S390SKeysClass *skeyclass = S390_SKEYS_GET_CLASS(ss);
|
|
|
|
const uint64_t total_count = ram_size / TARGET_PAGE_SIZE;
|
|
|
|
uint64_t handled_count = 0, cur_count;
|
|
|
|
Error *lerr = NULL;
|
|
|
|
vaddr cur_gfn = 0;
|
|
|
|
uint8_t *buf;
|
|
|
|
int ret;
|
2016-04-27 13:04:51 +03:00
|
|
|
int fd;
|
|
|
|
FILE *f;
|
2015-06-26 21:03:16 +03:00
|
|
|
|
|
|
|
/* Quick check to see if guest is using storage keys*/
|
|
|
|
if (!skeyclass->skeys_enabled(ss)) {
|
|
|
|
error_setg(errp, "This guest is not using storage keys - "
|
|
|
|
"nothing to dump");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2016-04-27 13:04:51 +03:00
|
|
|
fd = qemu_open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0600);
|
|
|
|
if (fd < 0) {
|
|
|
|
error_setg_file_open(errp, errno, filename);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
f = fdopen(fd, "wb");
|
2015-06-26 21:03:16 +03:00
|
|
|
if (!f) {
|
2016-04-27 13:04:51 +03:00
|
|
|
close(fd);
|
2015-06-26 21:03:16 +03:00
|
|
|
error_setg_file_open(errp, errno, filename);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
buf = g_try_malloc(S390_SKEYS_BUFFER_SIZE);
|
|
|
|
if (!buf) {
|
|
|
|
error_setg(errp, "Could not allocate memory");
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* we'll only dump initial memory for now */
|
|
|
|
while (handled_count < total_count) {
|
|
|
|
/* Calculate how many keys to ask for & handle overflow case */
|
|
|
|
cur_count = MIN(total_count - handled_count, S390_SKEYS_BUFFER_SIZE);
|
|
|
|
|
|
|
|
ret = skeyclass->get_skeys(ss, cur_gfn, cur_count, buf);
|
|
|
|
if (ret < 0) {
|
|
|
|
error_setg(errp, "get_keys error %d", ret);
|
|
|
|
goto out_free;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* write keys to stream */
|
|
|
|
write_keys(f, buf, cur_gfn, cur_count, &lerr);
|
|
|
|
if (lerr) {
|
|
|
|
goto out_free;
|
|
|
|
}
|
|
|
|
|
|
|
|
cur_gfn += cur_count;
|
|
|
|
handled_count += cur_count;
|
|
|
|
}
|
|
|
|
|
|
|
|
out_free:
|
|
|
|
error_propagate(errp, lerr);
|
|
|
|
g_free(buf);
|
|
|
|
out:
|
2016-04-27 13:04:51 +03:00
|
|
|
fclose(f);
|
2015-06-26 21:03:16 +03:00
|
|
|
}
|
|
|
|
|
2015-06-26 18:54:51 +03:00
|
|
|
static void qemu_s390_skeys_init(Object *obj)
|
|
|
|
{
|
|
|
|
QEMUS390SKeysState *skeys = QEMU_S390_SKEYS(obj);
|
|
|
|
MachineState *machine = MACHINE(qdev_get_machine());
|
|
|
|
|
2020-04-01 15:37:54 +03:00
|
|
|
skeys->key_count = machine->ram_size / TARGET_PAGE_SIZE;
|
2015-06-26 18:54:51 +03:00
|
|
|
skeys->keydata = g_malloc0(skeys->key_count);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int qemu_s390_skeys_enabled(S390SKeysState *ss)
|
|
|
|
{
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* TODO: for memory hotplug support qemu_s390_skeys_set and qemu_s390_skeys_get
|
|
|
|
* will have to make sure that the given gfn belongs to a memory region and not
|
|
|
|
* a memory hole.
|
|
|
|
*/
|
|
|
|
static int qemu_s390_skeys_set(S390SKeysState *ss, uint64_t start_gfn,
|
|
|
|
uint64_t count, uint8_t *keys)
|
|
|
|
{
|
|
|
|
QEMUS390SKeysState *skeydev = QEMU_S390_SKEYS(ss);
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* Check for uint64 overflow and access beyond end of key data */
|
|
|
|
if (start_gfn + count > skeydev->key_count || start_gfn + count < count) {
|
|
|
|
error_report("Error: Setting storage keys for page beyond the end "
|
2015-12-18 18:35:19 +03:00
|
|
|
"of memory: gfn=%" PRIx64 " count=%" PRId64,
|
|
|
|
start_gfn, count);
|
2015-06-26 18:54:51 +03:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < count; i++) {
|
|
|
|
skeydev->keydata[start_gfn + i] = keys[i];
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int qemu_s390_skeys_get(S390SKeysState *ss, uint64_t start_gfn,
|
|
|
|
uint64_t count, uint8_t *keys)
|
|
|
|
{
|
|
|
|
QEMUS390SKeysState *skeydev = QEMU_S390_SKEYS(ss);
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* Check for uint64 overflow and access beyond end of key data */
|
|
|
|
if (start_gfn + count > skeydev->key_count || start_gfn + count < count) {
|
|
|
|
error_report("Error: Getting storage keys for page beyond the end "
|
2015-12-18 18:35:19 +03:00
|
|
|
"of memory: gfn=%" PRIx64 " count=%" PRId64,
|
|
|
|
start_gfn, count);
|
2015-06-26 18:54:51 +03:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < count; i++) {
|
|
|
|
keys[i] = skeydev->keydata[start_gfn + i];
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void qemu_s390_skeys_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
S390SKeysClass *skeyclass = S390_SKEYS_CLASS(oc);
|
2017-08-24 13:08:48 +03:00
|
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
2015-06-26 18:54:51 +03:00
|
|
|
|
|
|
|
skeyclass->skeys_enabled = qemu_s390_skeys_enabled;
|
|
|
|
skeyclass->get_skeys = qemu_s390_skeys_get;
|
|
|
|
skeyclass->set_skeys = qemu_s390_skeys_set;
|
2017-08-24 13:08:48 +03:00
|
|
|
|
|
|
|
/* Reason: Internal device (only one skeys device for the whole memory) */
|
|
|
|
dc->user_creatable = false;
|
2015-06-26 18:54:51 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static const TypeInfo qemu_s390_skeys_info = {
|
|
|
|
.name = TYPE_QEMU_S390_SKEYS,
|
|
|
|
.parent = TYPE_S390_SKEYS,
|
|
|
|
.instance_init = qemu_s390_skeys_init,
|
|
|
|
.instance_size = sizeof(QEMUS390SKeysState),
|
|
|
|
.class_init = qemu_s390_skeys_class_init,
|
2015-12-08 11:16:27 +03:00
|
|
|
.class_size = sizeof(S390SKeysClass),
|
2015-06-26 18:54:51 +03:00
|
|
|
};
|
|
|
|
|
2015-06-26 21:11:23 +03:00
|
|
|
static void s390_storage_keys_save(QEMUFile *f, void *opaque)
|
|
|
|
{
|
|
|
|
S390SKeysState *ss = S390_SKEYS(opaque);
|
|
|
|
S390SKeysClass *skeyclass = S390_SKEYS_GET_CLASS(ss);
|
|
|
|
uint64_t pages_left = ram_size / TARGET_PAGE_SIZE;
|
|
|
|
uint64_t read_count, eos = S390_SKEYS_SAVE_FLAG_EOS;
|
|
|
|
vaddr cur_gfn = 0;
|
|
|
|
int error = 0;
|
|
|
|
uint8_t *buf;
|
|
|
|
|
|
|
|
if (!skeyclass->skeys_enabled(ss)) {
|
|
|
|
goto end_stream;
|
|
|
|
}
|
|
|
|
|
|
|
|
buf = g_try_malloc(S390_SKEYS_BUFFER_SIZE);
|
|
|
|
if (!buf) {
|
2015-12-18 18:35:19 +03:00
|
|
|
error_report("storage key save could not allocate memory");
|
2015-06-26 21:11:23 +03:00
|
|
|
goto end_stream;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* We only support initial memory. Standby memory is not handled yet. */
|
|
|
|
qemu_put_be64(f, (cur_gfn * TARGET_PAGE_SIZE) | S390_SKEYS_SAVE_FLAG_SKEYS);
|
|
|
|
qemu_put_be64(f, pages_left);
|
|
|
|
|
|
|
|
while (pages_left) {
|
|
|
|
read_count = MIN(pages_left, S390_SKEYS_BUFFER_SIZE);
|
|
|
|
|
|
|
|
if (!error) {
|
|
|
|
error = skeyclass->get_skeys(ss, cur_gfn, read_count, buf);
|
|
|
|
if (error) {
|
|
|
|
/*
|
|
|
|
* If error: we want to fill the stream with valid data instead
|
|
|
|
* of stopping early so we pad the stream with 0x00 values and
|
|
|
|
* use S390_SKEYS_SAVE_FLAG_ERROR to indicate failure to the
|
|
|
|
* reading side.
|
|
|
|
*/
|
2015-12-18 18:35:19 +03:00
|
|
|
error_report("S390_GET_KEYS error %d", error);
|
2015-06-26 21:11:23 +03:00
|
|
|
memset(buf, 0, S390_SKEYS_BUFFER_SIZE);
|
|
|
|
eos = S390_SKEYS_SAVE_FLAG_ERROR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
qemu_put_buffer(f, buf, read_count);
|
|
|
|
cur_gfn += read_count;
|
|
|
|
pages_left -= read_count;
|
|
|
|
}
|
|
|
|
|
|
|
|
g_free(buf);
|
|
|
|
end_stream:
|
|
|
|
qemu_put_be64(f, eos);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int s390_storage_keys_load(QEMUFile *f, void *opaque, int version_id)
|
|
|
|
{
|
|
|
|
S390SKeysState *ss = S390_SKEYS(opaque);
|
|
|
|
S390SKeysClass *skeyclass = S390_SKEYS_GET_CLASS(ss);
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
while (!ret) {
|
|
|
|
ram_addr_t addr;
|
|
|
|
int flags;
|
|
|
|
|
|
|
|
addr = qemu_get_be64(f);
|
|
|
|
flags = addr & ~TARGET_PAGE_MASK;
|
|
|
|
addr &= TARGET_PAGE_MASK;
|
|
|
|
|
|
|
|
switch (flags) {
|
|
|
|
case S390_SKEYS_SAVE_FLAG_SKEYS: {
|
|
|
|
const uint64_t total_count = qemu_get_be64(f);
|
|
|
|
uint64_t handled_count = 0, cur_count;
|
|
|
|
uint64_t cur_gfn = addr / TARGET_PAGE_SIZE;
|
|
|
|
uint8_t *buf = g_try_malloc(S390_SKEYS_BUFFER_SIZE);
|
|
|
|
|
|
|
|
if (!buf) {
|
2015-12-18 18:35:19 +03:00
|
|
|
error_report("storage key load could not allocate memory");
|
2015-06-26 21:11:23 +03:00
|
|
|
ret = -ENOMEM;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (handled_count < total_count) {
|
|
|
|
cur_count = MIN(total_count - handled_count,
|
|
|
|
S390_SKEYS_BUFFER_SIZE);
|
|
|
|
qemu_get_buffer(f, buf, cur_count);
|
|
|
|
|
|
|
|
ret = skeyclass->set_skeys(ss, cur_gfn, cur_count, buf);
|
|
|
|
if (ret < 0) {
|
2015-12-18 18:35:19 +03:00
|
|
|
error_report("S390_SET_KEYS error %d", ret);
|
2015-06-26 21:11:23 +03:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
handled_count += cur_count;
|
|
|
|
cur_gfn += cur_count;
|
|
|
|
}
|
|
|
|
g_free(buf);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case S390_SKEYS_SAVE_FLAG_ERROR: {
|
|
|
|
error_report("Storage key data is incomplete");
|
|
|
|
ret = -EINVAL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case S390_SKEYS_SAVE_FLAG_EOS:
|
|
|
|
/* normal exit */
|
|
|
|
return 0;
|
|
|
|
default:
|
|
|
|
error_report("Unexpected storage key flag data: %#x", flags);
|
|
|
|
ret = -EINVAL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2015-07-09 20:56:44 +03:00
|
|
|
static inline bool s390_skeys_get_migration_enabled(Object *obj, Error **errp)
|
|
|
|
{
|
|
|
|
S390SKeysState *ss = S390_SKEYS(obj);
|
|
|
|
|
|
|
|
return ss->migration_enabled;
|
|
|
|
}
|
|
|
|
|
2017-05-24 15:10:48 +03:00
|
|
|
static SaveVMHandlers savevm_s390_storage_keys = {
|
|
|
|
.save_state = s390_storage_keys_save,
|
|
|
|
.load_state = s390_storage_keys_load,
|
|
|
|
};
|
|
|
|
|
2015-07-09 20:56:44 +03:00
|
|
|
static inline void s390_skeys_set_migration_enabled(Object *obj, bool value,
|
|
|
|
Error **errp)
|
2015-06-26 21:11:23 +03:00
|
|
|
{
|
|
|
|
S390SKeysState *ss = S390_SKEYS(obj);
|
|
|
|
|
2015-07-09 20:56:44 +03:00
|
|
|
/* Prevent double registration of savevm handler */
|
|
|
|
if (ss->migration_enabled == value) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
ss->migration_enabled = value;
|
|
|
|
|
|
|
|
if (ss->migration_enabled) {
|
2019-08-22 14:54:33 +03:00
|
|
|
register_savevm_live(TYPE_S390_SKEYS, 0, 1,
|
2017-05-24 15:10:48 +03:00
|
|
|
&savevm_s390_storage_keys, ss);
|
2015-07-09 20:56:44 +03:00
|
|
|
} else {
|
2019-08-28 15:02:32 +03:00
|
|
|
unregister_savevm(VMSTATE_IF(ss), TYPE_S390_SKEYS, ss);
|
2015-07-09 20:56:44 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void s390_skeys_instance_init(Object *obj)
|
|
|
|
{
|
|
|
|
object_property_add_bool(obj, "migration-enabled",
|
|
|
|
s390_skeys_get_migration_enabled,
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 18:29:22 +03:00
|
|
|
s390_skeys_set_migration_enabled);
|
qom: Put name parameter before value / visitor parameter
The object_property_set_FOO() setters take property name and value in
an unusual order:
void object_property_set_FOO(Object *obj, FOO_TYPE value,
const char *name, Error **errp)
Having to pass value before name feels grating. Swap them.
Same for object_property_set(), object_property_get(), and
object_property_parse().
Convert callers with this Coccinelle script:
@@
identifier fun = {
object_property_get, object_property_parse, object_property_set_str,
object_property_set_link, object_property_set_bool,
object_property_set_int, object_property_set_uint, object_property_set,
object_property_set_qobject
};
expression obj, v, name, errp;
@@
- fun(obj, v, name, errp)
+ fun(obj, name, v, errp)
Chokes on hw/arm/musicpal.c's lcd_refresh() with the unhelpful error
message "no position information". Convert that one manually.
Fails to convert hw/arm/armsse.c, because Coccinelle gets confused by
ARMSSE being used both as typedef and function-like macro there.
Convert manually.
Fails to convert hw/rx/rx-gdbsim.c, because Coccinelle gets confused
by RXCPU being used both as typedef and function-like macro there.
Convert manually. The other files using RXCPU that way don't need
conversion.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-27-armbru@redhat.com>
[Straightforwad conflict with commit 2336172d9b "audio: set default
value for pcspk.iobase property" resolved]
2020-07-07 19:05:54 +03:00
|
|
|
object_property_set_bool(obj, "migration-enabled", true, NULL);
|
2015-06-26 21:11:23 +03:00
|
|
|
}
|
|
|
|
|
2015-06-26 18:54:51 +03:00
|
|
|
static void s390_skeys_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
|
|
|
|
|
|
|
dc->hotpluggable = false;
|
|
|
|
set_bit(DEVICE_CATEGORY_MISC, dc->categories);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const TypeInfo s390_skeys_info = {
|
|
|
|
.name = TYPE_S390_SKEYS,
|
|
|
|
.parent = TYPE_DEVICE,
|
2015-06-26 21:11:23 +03:00
|
|
|
.instance_init = s390_skeys_instance_init,
|
2015-06-26 18:54:51 +03:00
|
|
|
.instance_size = sizeof(S390SKeysState),
|
|
|
|
.class_init = s390_skeys_class_init,
|
|
|
|
.class_size = sizeof(S390SKeysClass),
|
|
|
|
.abstract = true,
|
|
|
|
};
|
|
|
|
|
|
|
|
static void qemu_s390_skeys_register_types(void)
|
|
|
|
{
|
|
|
|
type_register_static(&s390_skeys_info);
|
|
|
|
type_register_static(&qemu_s390_skeys_info);
|
|
|
|
}
|
|
|
|
|
|
|
|
type_init(qemu_s390_skeys_register_types)
|