Ani Sinha <[email protected]> writes:
> error_report() is more appropriate for error situations. Replace fprintf with
> error_report. Cosmetic. No functional change.
>
> CC: [email protected]
> CC: [email protected]
> CC: [email protected]
> Reviewed-by: Zhao Liu <[email protected]>
> Signed-off-by: Ani Sinha <[email protected]>
> ---
> accel/kvm/kvm-all.c | 40 ++++++++++++++++++----------------------
> 1 file changed, 18 insertions(+), 22 deletions(-)
>
> changelog:
> v2: fix a bug.
> v3: replace one instance of error_report() with error_printf(). added tags.
> v4: changes suggested by Markus.
>
> diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
> index 75d11a07b2..d9f477bb06 100644
> --- a/accel/kvm/kvm-all.c
> +++ b/accel/kvm/kvm-all.c
> @@ -2427,7 +2427,7 @@ static int kvm_init(MachineState *ms)
> QLIST_INIT(&s->kvm_parked_vcpus);
> s->fd = qemu_open_old(s->device ?: "/dev/kvm", O_RDWR);
> if (s->fd == -1) {
> - fprintf(stderr, "Could not access KVM kernel module: %m\n");
> + error_report("Could not access KVM kernel module: %m");
The use of %m gave me pause. It's a GNU extension, but this
Linux-specific code, so it's fine.
> ret = -errno;
> goto err;
> }
> @@ -2437,13 +2437,13 @@ static int kvm_init(MachineState *ms)
> if (ret >= 0) {
> ret = -EINVAL;
> }
> - fprintf(stderr, "kvm version too old\n");
> + error_report("kvm version too old");
> goto err;
> }
>
> if (ret > KVM_API_VERSION) {
> ret = -EINVAL;
> - fprintf(stderr, "kvm version not supported\n");
> + error_report("kvm version not supported");
> goto err;
> }
>
> @@ -2488,26 +2488,22 @@ static int kvm_init(MachineState *ms)
if (object_property_find(OBJECT(current_machine), "kvm-type")) {
g_autofree char *kvm_type =
object_property_get_str(OBJECT(current_machine),
"kvm-type",
&error_abort);
type = mc->kvm_type(ms, kvm_type);
} else if (mc->kvm_type) {
type = mc->kvm_type(ms, NULL);
} else {
type = kvm_arch_get_default_type(ms);
}
if (type < 0) {
ret = -EINVAL;
goto err;
Note: the code assigning to @type is responsible for reporting an error
when it assigns a negative value. I guess it does. Even if it doesn't,
not your patch's problem.
}
do {
ret = kvm_ioctl(s, KVM_CREATE_VM, type);
> } while (ret == -EINTR);
>
> if (ret < 0) {
> - fprintf(stderr, "ioctl(KVM_CREATE_VM) failed: %d %s\n", -ret,
> - strerror(-ret));
> + error_report("ioctl(KVM_CREATE_VM) failed: %d %s", -ret,
> + strerror(-ret));
We don't normally report a numeric errno code in additon to its
description text. Should we use the opportunity to drop it here?
>
> #ifdef TARGET_S390X
> if (ret == -EINVAL) {
> - fprintf(stderr,
> - "Host kernel setup problem detected. Please verify:\n");
> - fprintf(stderr, "- for kernels supporting the switch_amode or"
> - " user_mode parameters, whether\n");
> - fprintf(stderr,
> - " user space is running in primary address space\n");
> - fprintf(stderr,
> - "- for kernels supporting the vm.allocate_pgste sysctl, "
> - "whether it is enabled\n");
> + error_printf("Host kernel setup problem detected. Please
> verify:");
> + error_printf("\n- for kernels supporting the"
Please keep the \n at the end of the string literal:
error_printf("Host kernel setup problem detected."
" Please verify:\n");
error_printf("- for kernels supporting the"
> + " switch_amode or user_mode parameters, whether");
> + error_printf(" user space is running in primary address
> space\n");
> + error_printf("- for kernels supporting the vm.allocate_pgste "
> + "sysctl, whether it is enabled\n");
Opportunity to break this line like we break the others:
error_printf("- for kernels supporting the vm.allocate_pgste"
" sysctl, whether it is enabled\n");
> }
> #elif defined(TARGET_PPC)
> if (ret == -EINVAL) {
> - fprintf(stderr,
> - "PPC KVM module is not loaded. Try modprobe kvm_%s.\n",
> - (type == 2) ? "pr" : "hv");
> + error_printf("PPC KVM module is not loaded. Try modprobe
> kvm_%s.\n",
> + (type == 2) ? "pr" : "hv");
> }
> #endif
> goto err;
> @@ -2526,9 +2522,9 @@ static int kvm_init(MachineState *ms)
> nc->name, nc->num, soft_vcpus_limit);
>
> if (nc->num > hard_vcpus_limit) {
> - fprintf(stderr, "Number of %s cpus requested (%d) exceeds "
> - "the maximum cpus supported by KVM (%d)\n",
> - nc->name, nc->num, hard_vcpus_limit);
> + error_report("Number of %s cpus requested (%d) exceeds "
> + "the maximum cpus supported by KVM (%d)",
> + nc->name, nc->num, hard_vcpus_limit);
> exit(1);
Not this patch's problem, but why do we exit(1) here?
> }
> }
> @@ -2542,8 +2538,8 @@ static int kvm_init(MachineState *ms)
> }
> if (missing_cap) {
> ret = -EINVAL;
> - fprintf(stderr, "kvm does not support %s\n%s",
> - missing_cap->name, upgrade_note);
> + error_printf("kvm does not support %s\n%s",
> + missing_cap->name, upgrade_note);
This is an error message, so it should be marked as such:
error_report("kvm does not support %s", missing_cap->name);
error_printf("%s", upgrade_note);
> goto err;
> }
There are a few more uses of fprintf() for reporting errors in kvm.c.
Would be nice to have them cleaned up. This is not a demand.
