[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 4/6] accel/kvm: Use negative KVM type for error propagation
From: |
Akihiko Odaki |
Subject: |
[PATCH v5 4/6] accel/kvm: Use negative KVM type for error propagation |
Date: |
Thu, 27 Jul 2023 16:31:29 +0900 |
On MIPS, kvm_arch_get_default_type() returns a negative value when an
error occurred so handle the case. Also, let other machines return
negative values when errors occur and declare returning a negative
value as the correct way to propagate an error that happened when
determining KVM type.
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---
accel/kvm/kvm-all.c | 5 +++++
hw/arm/virt.c | 2 +-
hw/ppc/spapr.c | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index d591b5079c..94a62efa3c 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -2527,6 +2527,11 @@ static int kvm_init(MachineState *ms)
type = kvm_arch_get_default_type(ms);
}
+ if (type < 0) {
+ ret = -EINVAL;
+ goto err;
+ }
+
do {
ret = kvm_ioctl(s, KVM_CREATE_VM, type);
} while (ret == -EINTR);
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 8a4c663735..161f3ffbf7 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -2977,7 +2977,7 @@ static int virt_kvm_type(MachineState *ms, const char
*type_str)
"require an IPA range (%d bits) larger than "
"the one supported by the host (%d bits)",
requested_pa_size, max_vm_pa_size);
- exit(1);
+ return -1;
}
/*
* We return the requested PA log size, unless KVM only supports
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 54dbfd7fe9..1b522e8e40 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -3104,7 +3104,7 @@ static int spapr_kvm_type(MachineState *machine, const
char *vm_type)
}
error_report("Unknown kvm-type specified '%s'", vm_type);
- exit(1);
+ return -1;
}
/*
--
2.41.0
- [PATCH v5 0/6] accel/kvm: Specify default IPA size for arm64, Akihiko Odaki, 2023/07/27
- [PATCH v5 3/6] mips: Report an error when KVM_VM_MIPS_VZ is unavailable, Akihiko Odaki, 2023/07/27
- [PATCH v5 2/6] accel/kvm: Specify default IPA size for arm64, Akihiko Odaki, 2023/07/27
- [PATCH v5 1/6] kvm: Introduce kvm_arch_get_default_type hook, Akihiko Odaki, 2023/07/27
- [PATCH v5 4/6] accel/kvm: Use negative KVM type for error propagation,
Akihiko Odaki <=
- [PATCH v5 5/6] accel/kvm: Free as when an error occurred, Akihiko Odaki, 2023/07/27
- [PATCH v5 6/6] accel/kvm: Make kvm_dirty_ring_reaper_init() void, Akihiko Odaki, 2023/07/27