gltm, thanks!
Reviewed-by: Claudio Fontana <cfontana@xxxxxxx>
On 8/9/24 07:10, Ani Sinha wrote:
> 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@xxxxxxxxxx
> CC: zhao1.liu@xxxxxxxxx
> CC: cfontana@xxxxxxx
> CC: qemu-trivial@xxxxxxxxxx
> Signed-off-by: Ani Sinha <anisinha@xxxxxxxxxx>
> ---
> accel/kvm/kvm-all.c | 86 ++++++++++++++++++++++++++++-----------------
> 1 file changed, 53 insertions(+), 33 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 ac168b9663..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,45 +2518,14 @@ 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;
> }
>
