| Message ID | 20230727073134.134102-5-akihiko.odaki@daynix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | accel/kvm: Specify default IPA size for arm64 | expand |
On Thu, 27 Jul 2023 at 08:31, Akihiko Odaki <akihiko.odaki@daynix.com> wrote: > > 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(-) I might have put this earlier in the series, but we get to the same place in the end whichever way around we do it. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
On 27/7/23 09:31, Akihiko Odaki wrote: > 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(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
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; } /*
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(-)