mirrors
/
qemu
mirror of https://gitlab.com/qemu-project/qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hvf: Drop ifdef for macOS versions older than 12.0 

macOS versions older than 12.0 are no longer supported.

docs/about/build-platforms.rst says:
> Support for the previous major version will be dropped 2 years after
> the new major version is released or when the vendor itself drops
> support, whichever comes first.

macOS 12.0 was released 2021:
https://www.apple.com/newsroom/2021/10/macos-monterey-is-now-available/

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240629-macos-v1-1-6e70a6b700a0@daynix.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Akihiko Odaki 2024-06-29 15:24:44 +09:00 committed by Philippe Mathieu-Daudé
parent efb359346c
commit f64933c8ae
2 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
accel/hvf/hvf-all.c
View File

@ -23,10 +23,7 @@ const char *hvf_return_string(hv_return_t ret)
case HV_NO_RESOURCES: return "HV_NO_RESOURCES";
case HV_NO_DEVICE: return "HV_NO_DEVICE";
case HV_UNSUPPORTED: return "HV_UNSUPPORTED";
#if defined(MAC_OS_VERSION_11_0) && \
MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_VERSION_11_0
case HV_DENIED: return "HV_DENIED";
#endif
default: return "[unknown hv_return value]";
}
}

23
target/i386/hvf/hvf.c
View File

@ -427,27 +427,6 @@ static void hvf_cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
}
}
static hv_return_t hvf_vcpu_run(hv_vcpuid_t vcpu_id)
{
/*
* hv_vcpu_run_until is available and recommended from macOS 10.15+,
* HV_DEADLINE_FOREVER from 11.0. Test for availability at runtime and fall
* back to hv_vcpu_run() only where necessary.
*/
#ifndef MAC_OS_VERSION_11_0
return hv_vcpu_run(vcpu_id);
#elif MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_VERSION_11_0
return hv_vcpu_run_until(vcpu_id, HV_DEADLINE_FOREVER);
#else /* MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_VERSION_11_0 */
/* 11.0 SDK or newer, but could be < 11 at runtime */
if (__builtin_available(macOS 11.0, *)) {
return hv_vcpu_run_until(vcpu_id, HV_DEADLINE_FOREVER);
} else {
return hv_vcpu_run(vcpu_id);
}
#endif
}
int hvf_vcpu_exec(CPUState *cpu)
{
X86CPU *x86_cpu = X86_CPU(cpu);
@ -476,7 +455,7 @@ int hvf_vcpu_exec(CPUState *cpu)
return EXCP_HLT;
}
hv_return_t r = hvf_vcpu_run(cpu->accel->fd);
hv_return_t r = hv_vcpu_run_until(cpu->accel->fd, HV_DEADLINE_FOREVER);
assert_hvf_ok(r);
/* handle VMEXIT */