In the case where WHPX isn't supported on the platform, makes the intended error appear instead of failing at getting the IPA width.
Signed-off-by: Mohamed Mediouni <[email protected]> --- target/arm/whpx/whpx-all.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/target/arm/whpx/whpx-all.c b/target/arm/whpx/whpx-all.c index d106400686..46f0b9524e 100644 --- a/target/arm/whpx/whpx-all.c +++ b/target/arm/whpx/whpx-all.c @@ -879,14 +879,6 @@ int whpx_accel_init(AccelState *as, MachineState *ms) goto error; } - if (mc->get_physical_address_range) { - pa_range = mc->get_physical_address_range(ms, - whpx_arm_get_ipa_bit_size(), whpx_arm_get_ipa_bit_size()); - if (pa_range < 0) { - return -EINVAL; - } - } - whpx->mem_quota = ms->ram_size; hr = whp_dispatch.WHvGetCapability( @@ -914,6 +906,14 @@ int whpx_accel_init(AccelState *as, MachineState *ms) goto error; } + if (mc->get_physical_address_range) { + pa_range = mc->get_physical_address_range(ms, + whpx_arm_get_ipa_bit_size(), whpx_arm_get_ipa_bit_size()); + if (pa_range < 0) { + return -EINVAL; + } + } + hr = whp_dispatch.WHvCreatePartition(&whpx->partition); if (FAILED(hr)) { error_report("WHPX: Failed to create partition, hr=%08lx", hr); -- 2.54.0 (Apple Git-157)
