* [PATCH 1/2] kvm: replace fprintf with error_report() in kvm_init() for error conditions
[not found] <20240809045153.1744397-1-anisinha@redhat.com>
@ 2024-08-09 4:51 ` Ani Sinha
2024-08-09 5:03 ` Ani Sinha
2024-08-09 4:51 ` [PATCH v3 2/2] kvm: refactor core virtual machine creation into its own function Ani Sinha
1 sibling, 1 reply; 3+ messages in thread
From: Ani Sinha @ 2024-08-09 4:51 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: Ani Sinha, qemu-trivial, zhao1.liu, kvm, qemu-devel
error_report() is more appropriate for error situations. Replace fprintf with
error_report. Cosmetic. No functional change.
CC: qemu-trivial@nongnu.org
CC: zhao1.liu@intel.com
Signed-off-by: Ani Sinha <anisinha@redhat.com>
---
accel/kvm/kvm-all.c | 42 +++++++++++++++++++-----------------------
1 file changed, 19 insertions(+), 23 deletions(-)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 75d11a07b2..899b5264e3 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");
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,30 +2488,26 @@ static int kvm_init(MachineState *ms)
} 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));
#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_report("Host kernel setup problem detected. Please verify:");
+ error_report("- for kernels supporting the switch_amode or"
+ " user_mode parameters, whether");
+ error_report(" user space is running in primary address space");
+ error_report("- for kernels supporting the vm.allocate_pgste "
+ "sysctl, whether it is enabled");
}
#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_report("PPC KVM module is not loaded. Try modprobe kvm_%s.",
+ (type == 2) ? "pr" : "hv");
}
#endif
- goto err;
}
+ goto err;
s->vmfd = ret;
@@ -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);
}
}
@@ -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_report("kvm does not support %s", missing_cap->name);
+ error_report("%s", upgrade_note);
goto err;
}
--
2.45.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v3 2/2] kvm: refactor core virtual machine creation into its own function
[not found] <20240809045153.1744397-1-anisinha@redhat.com>
2024-08-09 4:51 ` [PATCH 1/2] kvm: replace fprintf with error_report() in kvm_init() for error conditions Ani Sinha
@ 2024-08-09 4:51 ` Ani Sinha
1 sibling, 0 replies; 3+ messages in thread
From: Ani Sinha @ 2024-08-09 4:51 UTC (permalink / raw)
To: Paolo Bonzini
Cc: Ani Sinha, zhao1.liu, cfontana, qemu-trivial, kvm, qemu-devel
Refactoring the core logic around KVM_CREATE_VM into its own separate function
so that it can be called from other functions in subsequent patches. There is
no functional change in this patch.
CC: pbonzini@redhat.com
CC: zhao1.liu@intel.com
CC: cfontana@suse.de
CC: qemu-trivial@nongnu.org
Signed-off-by: Ani Sinha <anisinha@redhat.com>
---
accel/kvm/kvm-all.c | 88 +++++++++++++++++++++++++++------------------
1 file changed, 54 insertions(+), 34 deletions(-)
changelog:
v2: s/fprintf/warn_report as suggested by zhao
v3: s/warn_report/error_report. function names adjusted to conform to
other names. fprintf -> error_report() moved to its own patch.
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 899b5264e3..610b3ead32 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -2385,6 +2385,57 @@ uint32_t kvm_dirty_ring_size(void)
return kvm_state->kvm_dirty_ring_size;
}
+static int kvm_create_vm(MachineState *ms, KVMState *s, int type)
+{
+ int ret;
+
+ do {
+ ret = kvm_ioctl(s, KVM_CREATE_VM, type);
+ } while (ret == -EINTR);
+
+ if (ret < 0) {
+ error_report("ioctl(KVM_CREATE_VM) failed: %d %s", -ret,
+ strerror(-ret));
+
+#ifdef TARGET_S390X
+ if (ret == -EINVAL) {
+ error_report("Host kernel setup problem detected. Please verify:");
+ error_report("- for kernels supporting the switch_amode or"
+ " user_mode parameters, whether");
+ error_report(" user space is running in primary address space");
+ error_report("- for kernels supporting the vm.allocate_pgste "
+ "sysctl, whether it is enabled");
+ }
+#elif defined(TARGET_PPC)
+ if (ret == -EINVAL) {
+ error_report("PPC KVM module is not loaded. Try modprobe kvm_%s.",
+ (type == 2) ? "pr" : "hv");
+ }
+#endif
+ }
+
+ return ret;
+}
+
+static int kvm_machine_type(MachineState *ms)
+{
+ MachineClass *mc = MACHINE_GET_CLASS(ms);
+ int type;
+
+ if (object_property_find(OBJECT(current_machine), "kvm-type")) {
+ g_autofree char *kvm_type;
+ 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);
+ }
+ return type;
+}
+
static int kvm_init(MachineState *ms)
{
MachineClass *mc = MACHINE_GET_CLASS(ms);
@@ -2467,47 +2518,16 @@ static int kvm_init(MachineState *ms)
}
s->as = g_new0(struct KVMAs, s->nr_as);
- 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);
- }
-
+ type = kvm_machine_type(ms);
if (type < 0) {
ret = -EINVAL;
goto err;
}
- do {
- ret = kvm_ioctl(s, KVM_CREATE_VM, type);
- } while (ret == -EINTR);
-
+ ret = kvm_create_vm(ms, s, type);
if (ret < 0) {
- error_report("ioctl(KVM_CREATE_VM) failed: %d %s", -ret,
- strerror(-ret));
-
-#ifdef TARGET_S390X
- if (ret == -EINVAL) {
- error_report("Host kernel setup problem detected. Please verify:");
- error_report("- for kernels supporting the switch_amode or"
- " user_mode parameters, whether");
- error_report(" user space is running in primary address space");
- error_report("- for kernels supporting the vm.allocate_pgste "
- "sysctl, whether it is enabled");
- }
-#elif defined(TARGET_PPC)
- if (ret == -EINVAL) {
- error_report("PPC KVM module is not loaded. Try modprobe kvm_%s.",
- (type == 2) ? "pr" : "hv");
- }
-#endif
- }
goto err;
+ }
s->vmfd = ret;
--
2.45.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] kvm: replace fprintf with error_report() in kvm_init() for error conditions
2024-08-09 4:51 ` [PATCH 1/2] kvm: replace fprintf with error_report() in kvm_init() for error conditions Ani Sinha
@ 2024-08-09 5:03 ` Ani Sinha
0 siblings, 0 replies; 3+ messages in thread
From: Ani Sinha @ 2024-08-09 5:03 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-trivial, zhao1.liu, kvm, qemu-devel
On Fri, Aug 9, 2024 at 10:23 AM Ani Sinha <anisinha@redhat.com> wrote:
>
> error_report() is more appropriate for error situations. Replace fprintf with
> error_report. Cosmetic. No functional change.
>
> CC: qemu-trivial@nongnu.org
> CC: zhao1.liu@intel.com
> Signed-off-by: Ani Sinha <anisinha@redhat.com>
> ---
> accel/kvm/kvm-all.c | 42 +++++++++++++++++++-----------------------
> 1 file changed, 19 insertions(+), 23 deletions(-)
>
> diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
> index 75d11a07b2..899b5264e3 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");
> 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,30 +2488,26 @@ static int kvm_init(MachineState *ms)
> } 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));
>
> #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_report("Host kernel setup problem detected. Please verify:");
> + error_report("- for kernels supporting the switch_amode or"
> + " user_mode parameters, whether");
> + error_report(" user space is running in primary address space");
> + error_report("- for kernels supporting the vm.allocate_pgste "
> + "sysctl, whether it is enabled");
> }
> #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_report("PPC KVM module is not loaded. Try modprobe kvm_%s.",
> + (type == 2) ? "pr" : "hv");
> }
> #endif
> - goto err;
> }
> + goto err;
Sorry, this is a bug. I will resend.
>
> s->vmfd = ret;
>
> @@ -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);
> }
> }
> @@ -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_report("kvm does not support %s", missing_cap->name);
> + error_report("%s", upgrade_note);
> goto err;
> }
>
> --
> 2.45.2
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-08-09 5:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20240809045153.1744397-1-anisinha@redhat.com>
2024-08-09 4:51 ` [PATCH 1/2] kvm: replace fprintf with error_report() in kvm_init() for error conditions Ani Sinha
2024-08-09 5:03 ` Ani Sinha
2024-08-09 4:51 ` [PATCH v3 2/2] kvm: refactor core virtual machine creation into its own function Ani Sinha
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).