diff options
Diffstat (limited to 'hw/s390x')
| -rw-r--r-- | hw/s390x/ipl.c | 8 | ||||
| -rw-r--r-- | hw/s390x/s390-skeys-kvm.c | 2 | ||||
| -rw-r--r-- | hw/s390x/s390-skeys.c | 16 |
3 files changed, 13 insertions, 13 deletions
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index b91fcc6e79..e100428f20 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -94,7 +94,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp) bios_filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); if (bios_filename == NULL) { - error_setg(&l_err, "could not find stage1 bootloader\n"); + error_setg(&l_err, "could not find stage1 bootloader"); goto error; } @@ -113,7 +113,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp) g_free(bios_filename); if (bios_size == -1) { - error_setg(&l_err, "could not load bootloader '%s'\n", bios_name); + error_setg(&l_err, "could not load bootloader '%s'", bios_name); goto error; } @@ -128,7 +128,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp) kernel_size = load_image_targphys(ipl->kernel, 0, ram_size); } if (kernel_size < 0) { - error_setg(&l_err, "could not load kernel '%s'\n", ipl->kernel); + error_setg(&l_err, "could not load kernel '%s'", ipl->kernel); goto error; } /* @@ -156,7 +156,7 @@ static void s390_ipl_realize(DeviceState *dev, Error **errp) initrd_size = load_image_targphys(ipl->initrd, initrd_offset, ram_size - initrd_offset); if (initrd_size == -1) { - error_setg(&l_err, "could not load initrd '%s'\n", ipl->initrd); + error_setg(&l_err, "could not load initrd '%s'", ipl->initrd); goto error; } diff --git a/hw/s390x/s390-skeys-kvm.c b/hw/s390x/s390-skeys-kvm.c index 682949afb2..eaa37ba408 100644 --- a/hw/s390x/s390-skeys-kvm.c +++ b/hw/s390x/s390-skeys-kvm.c @@ -21,7 +21,7 @@ static int kvm_s390_skeys_enabled(S390SKeysState *ss) r = skeyclass->get_skeys(ss, 0, 1, &single_key); if (r != 0 && r != KVM_S390_GET_SKEYS_NONE) { - error_report("S390_GET_KEYS error %d\n", r); + error_report("S390_GET_KEYS error %d", r); } return (r == 0); } diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c index 4af1558205..f2b732e300 100644 --- a/hw/s390x/s390-skeys.c +++ b/hw/s390x/s390-skeys.c @@ -191,8 +191,8 @@ static int qemu_s390_skeys_set(S390SKeysState *ss, uint64_t start_gfn, /* 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 " - "of memory: gfn=%" PRIx64 " count=%" PRId64 "\n", start_gfn, - count); + "of memory: gfn=%" PRIx64 " count=%" PRId64, + start_gfn, count); return -EINVAL; } @@ -211,8 +211,8 @@ static int qemu_s390_skeys_get(S390SKeysState *ss, uint64_t start_gfn, /* 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 " - "of memory: gfn=%" PRIx64 " count=%" PRId64 "\n", start_gfn, - count); + "of memory: gfn=%" PRIx64 " count=%" PRId64, + start_gfn, count); return -EINVAL; } @@ -256,7 +256,7 @@ static void s390_storage_keys_save(QEMUFile *f, void *opaque) buf = g_try_malloc(S390_SKEYS_BUFFER_SIZE); if (!buf) { - error_report("storage key save could not allocate memory\n"); + error_report("storage key save could not allocate memory"); goto end_stream; } @@ -276,7 +276,7 @@ static void s390_storage_keys_save(QEMUFile *f, void *opaque) * use S390_SKEYS_SAVE_FLAG_ERROR to indicate failure to the * reading side. */ - error_report("S390_GET_KEYS error %d\n", error); + error_report("S390_GET_KEYS error %d", error); memset(buf, 0, S390_SKEYS_BUFFER_SIZE); eos = S390_SKEYS_SAVE_FLAG_ERROR; } @@ -314,7 +314,7 @@ static int s390_storage_keys_load(QEMUFile *f, void *opaque, int version_id) uint8_t *buf = g_try_malloc(S390_SKEYS_BUFFER_SIZE); if (!buf) { - error_report("storage key load could not allocate memory\n"); + error_report("storage key load could not allocate memory"); ret = -ENOMEM; break; } @@ -326,7 +326,7 @@ static int s390_storage_keys_load(QEMUFile *f, void *opaque, int version_id) ret = skeyclass->set_skeys(ss, cur_gfn, cur_count, buf); if (ret < 0) { - error_report("S390_SET_KEYS error %d\n", ret); + error_report("S390_SET_KEYS error %d", ret); break; } handled_count += cur_count; |