Drop ifdef for macOS versions older than 12.0
Subsystems (2)
cover 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:
Quoted 3 lines
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/
---
Akihiko Odaki (4):
hvf: Drop ifdef for macOS versions older than 12.0
audio: Drop ifdef for macOS versions older than 12.0 block/file-posix: Drop ifdef for macOS versions older than 12.0 net/vmnet: Drop ifdef for macOS versions older than 12.0
accel/hvf/hvf-all.c | 3 --- block/file-posix.c | 5 ----- net/vmnet-host.c | 24 +----------------------- net/vmnet-shared.c | 13 ------------- target/i386/hvf/hvf.c | 23 +---------------------- audio/coreaudio.m | 5 ----- net/vmnet-bridged.m | 13 +------------ net/vmnet-common.m | 3 --- 8 files changed, 3 insertions(+), 86 deletions(-)
---
base-commit: 046a64b9801343e2e89eef10c7a48eec8d8c0d4f
change-id: 20240628-macos-d194d420f01a
Best regards,
Signature · 1 line
Akihiko Odaki <[email protected]>
PATCH 1/4 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:
Quoted 3 lines
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/
--- accel/hvf/hvf-all.c | 3 --- target/i386/hvf/hvf.c | 23 +---------------------- 2 files changed, 1 insertion(+), 25 deletions(-)
accel/hvf/hvf-all.c +0 -3
@@ -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]" ; } }
target/i386/hvf/hvf.c +1 -22
@@ -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 */
Signature · 1 line
2.45.2
Re: [PATCH 1/4] hvf: Drop ifdef for macOS versions older than 12.0
Quoted 7 lines · Akihiko Odaki
macOS versions older than 12.0 are no longer supported.
docs/about/build-platforms.rstsays:Quoted 3 lines
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.
Quoted 8 lines
macOS 12.0 was released 2021:
https://www.apple.com/newsroom/2021/10/macos-monterey-is-now-available/Signed-off-by Akihiko Odaki <[email protected]>--- accel/hvf/hvf-all.c | 3 --- target/i386/hvf/hvf.c | 23 +---------------------- 2 files changed, 1 insertion(+), 25 deletions(-)
PATCH 2/4 audio: Drop ifdef for macOS versions older than 12.0
In reply to Akihiko OdakimacOS versions older than 12.0 are no longer supported.
docs/about/build-platforms.rst says:
Quoted 3 lines
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/
--- audio/coreaudio.m | 5 ----- 1 file changed, 5 deletions(-)
audio/coreaudio.m +0 -5
@@ -44,11 +44,6 @@ bool enabled; } coreaudioVoiceOut; -#if !defined(MAC_OS_VERSION_12_0) \ - || (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_VERSION_12_0) -#define kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster -#endif - static const AudioObjectPropertyAddress voice_addr = { kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeGlobal,
Signature · 1 line
2.45.2
Re: [PATCH 2/4] audio: Drop ifdef for macOS versions older than 12.0
Quoted 7 lines · Akihiko Odaki
macOS versions older than 12.0 are no longer supported.
docs/about/build-platforms.rstsays:Quoted 3 lines
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.
Quoted 7 lines
macOS 12.0 was released 2021:
https://www.apple.com/newsroom/2021/10/macos-monterey-is-now-available/Signed-off-by Akihiko Odaki <[email protected]>--- audio/coreaudio.m | 5 ----- 1 file changed, 5 deletions(-)
PATCH 3/4 block/file-posix: Drop ifdef for macOS versions older than 12.0
In reply to Akihiko OdakimacOS versions older than 12.0 are no longer supported.
docs/about/build-platforms.rst says:
Quoted 3 lines
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/
--- block/file-posix.c | 5 ----- 1 file changed, 5 deletions(-)
block/file-posix.c +0 -5
@@ -3929,11 +3929,6 @@ BlockDriver bdrv_file = {static kern_return_t GetBSDPath (io_iterator_t mediaIterator,char *bsdPath,CFIndex maxPathSize,int flags); -#if !defined(MAC_OS_VERSION_12_0 ) \ - || (MAC_OS_X_VERSION_MIN_REQUIRED <MAC_OS_VERSION_12_0 ) -#define IOMainPort IOMasterPort -#endif -static char *FindEjectableOpticalMedia (io_iterator_t *mediaIterator) {kern_return_t kernResult =KERN_FAILURE ;
Signature · 1 line
2.45.2
Re: [PATCH 3/4] block/file-posix: Drop ifdef for macOS versions older than 12.0
Quoted 7 lines · Akihiko Odaki
macOS versions older than 12.0 are no longer supported.
docs/about/build-platforms.rstsays:Quoted 3 lines
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.
Quoted 7 lines
macOS 12.0 was released 2021:
https://www.apple.com/newsroom/2021/10/macos-monterey-is-now-available/Signed-off-by Akihiko Odaki <[email protected]>--- block/file-posix.c | 5 ----- 1 file changed, 5 deletions(-)
PATCH 4/4 net/vmnet: Drop ifdef for macOS versions older than 12.0
In reply to Akihiko OdakimacOS versions older than 12.0 are no longer supported.
docs/about/build-platforms.rst says:
Quoted 3 lines
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/
--- net/vmnet-host.c | 24 +----------------------- net/vmnet-shared.c | 13 ------------- net/vmnet-bridged.m | 13 +------------ net/vmnet-common.m | 3 --- 4 files changed, 2 insertions(+), 51 deletions(-)
net/vmnet-host.c +1 -23
@@ -21,31 +21,13 @@static bool validate_options (const Netdev *netdev,Error **errp) {const NetdevVmnetHostOptions *options = &(netdev->u.vmnet_host); - -#if defined(MAC_OS_VERSION_11_0 ) && \ -MAC_OS_X_VERSION_MIN_REQUIRED >=MAC_OS_VERSION_11_0 -QemuUUID net_uuid; +if (options->net_uuid &&qemu_uuid_parse (options->net_uuid, &net_uuid) <0 ) {error_setg (errp,"Invalid UUID provided in 'net-uuid'" );return false; } -#else -if (options->has_isolated) { -error_setg (errp, -"vmnet-host.isolated feature is " -"unavailable: outdated vmnet.framework API" ); -return false; - } - -if (options->net_uuid) { -error_setg (errp, -"vmnet-host.net-uuid feature is " -"unavailable: outdated vmnet.framework API" ); -return false; - } -#endif if ((options->start_address || options->end_address ||
@@ -71,9 +53,6 @@ static xpc_object_t build_if_desc(const Netdev *netdev) vmnet_operation_mode_key, VMNET_HOST_MODE); -#if defined(MAC_OS_VERSION_11_0 ) && \ -MAC_OS_X_VERSION_MIN_REQUIRED >=MAC_OS_VERSION_11_0 -xpc_dictionary_set_bool (if_desc, vmnet_enable_isolation_key, options->isolated);
@@ -85,7 +64,6 @@ static xpc_object_t build_if_desc(const Netdev *netdev) vmnet_network_identifier_key, net_uuid.data); } -#endif if (options->start_address) { xpc_dictionary_set_string(if_desc,
net/vmnet-shared.c +0 -13
@@ -21,16 +21,6 @@ static bool validate_options(const Netdev *netdev, Error **errp) {const NetdevVmnetSharedOptions *options = &(netdev->u.vmnet_shared); -#if !defined(MAC_OS_VERSION_11_0 ) || \ -MAC_OS_X_VERSION_MIN_REQUIRED <MAC_OS_VERSION_11_0 -if (options->has_isolated) { -error_setg (errp, -"vmnet-shared.isolated feature is " -"unavailable: outdated vmnet.framework API" ); -return false; - } -#endif - if ((options->start_address || options->end_address || options->subnet_mask) &&
@@ -76,14 +66,11 @@ static xpc_object_t build_if_desc(const Netdev *netdev) options->subnet_mask); } -#if defined(MAC_OS_VERSION_11_0 ) && \ -MAC_OS_X_VERSION_MIN_REQUIRED >=MAC_OS_VERSION_11_0 xpc_dictionary_set_bool ( if_desc, vmnet_enable_isolation_key, options->isolated ); -#endif return if_desc; }
net/vmnet-bridged.m +1 -12
@@ -88,15 +88,6 @@ static bool validate_options(const Netdev *netdev, Error **errp) return false; } -#if !defined(MAC_OS_VERSION_11_0) || \ - MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_VERSION_11_0 - if (options->has_isolated) { - error_setg(errp, - "vmnet-bridged.isolated feature is " - "unavailable: outdated vmnet.framework API"); - return false; - } -#endif return true; }
@@ -115,12 +106,10 @@ static xpc_object_t build_if_desc(const Netdev *netdev) vmnet_shared_interface_name_key, options->ifname); -#if defined(MAC_OS_VERSION_11_0) && \ - MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_VERSION_11_0 xpc_dictionary_set_bool(if_desc, vmnet_enable_isolation_key, options->isolated); -#endif + return if_desc; }
net/vmnet-common.m +0 -3
@@ -47,11 +47,8 @@ return "buffers exhausted in kernel"; case VMNET_TOO_MANY_PACKETS: return "packet count exceeds limit"; -#if defined(MAC_OS_VERSION_11_0) && \ - MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_VERSION_11_0 case VMNET_SHARING_SERVICE_BUSY: return "conflict, sharing service is in use"; -#endif default: return "unknown vmnet error"; }
Signature · 1 line
2.45.2
Re: [PATCH 4/4] net/vmnet: Drop ifdef for macOS versions older than 12.0
Quoted 10 lines · Akihiko Odaki
macOS versions older than 12.0 are no longer supported.
docs/about/build-platforms.rstsays:Quoted 3 lines
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/
Quoted 7 lines
Signed-off-by Akihiko Odaki <[email protected]>--- net/vmnet-host.c | 24 +----------------------- net/vmnet-shared.c | 13 ------------- net/vmnet-bridged.m | 13 +------------ net/vmnet-common.m | 3 --- 4 files changed, 2 insertions(+), 51 deletions(-)
Quoted 10 lines · Akihiko Odaki
macOS versions older than 12.0 are no longer supported.
docs/about/build-platforms.rstsays:Quoted 3 lines
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/
Further, we have already dropped support for macos < 12 in the ui/cocoa.m code in commit 2d27c91e2b72ac.
For the whole series:
Quoted 1 line
Signed-off-by Akihiko Odaki <[email protected]>
PS: you don't need to put a signed-off-by line on the cover letter, only in the individual patches.
thanks
-- PMM
Quoted 16 lines · Peter Maydell
Quoted 10 lines · Akihiko Odaki
macOS versions older than 12.0 are no longer supported.
docs/about/build-platforms.rstsays:Quoted 3 lines
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/Further, we have already dropped support for macos < 12 in the ui/cocoa.m code in commit
2d27c91e2b72ac.
Quoted 7 lines
For the whole series:
Reviewed-by Peter Maydell <[email protected]>Quoted 1 line
Signed-off-by Akihiko Odaki <[email protected]>PS: you don't need to put a signed-off-by line on the cover letter, only in the individual patches.
I have been using b4 (https://b4.docs.kernel.org/en/latest/) these days and it automatically appends Signed-off-by to the cover letter.
Regards,
Akihiko Odaki
Quoted 7 lines · Akihiko Odaki
Quoted 4 lines
Quoted 1 line
Signed-off-by Akihiko Odaki <[email protected]>PS: you don't need to put a signed-off-by line on the cover letter, only in the individual patches.
I have been using b4 (https://b4.docs.kernel.org/en/latest/) these days and it automatically appends Signed-off-by to the cover letter.
Many subsystems use cover letters as templates for merge commits, which is why b4 puts the Signed-off-by there. It has no impact on subsystems that don't do that.
-K
Quoted 7 lines · Konstantin Ryabitsev
Quoted 5 lines · Akihiko Odaki
Quoted 4 lines
Quoted 1 line
Signed-off-by Akihiko Odaki <[email protected]>PS: you don't need to put a signed-off-by line on the cover letter, only in the individual patches.
Quoted 6 lines
Quoted 2 lines
I have been using b4 (https://b4.docs.kernel.org/en/latest/) these days and it automatically appends Signed-off-by to the cover letter.
Many subsystems use cover letters as templates for merge commits, which is why b4 puts the Signed-off-by there. It has no impact on subsystems that don't do that.
...well, except that it sends the implicit signal "this person or tool doesn't know how QEMU's patch workflow works, maybe check more closely", which is slightly unfortunate.
-- PMM
Quoted 7 lines · Akihiko Odaki
macOS versions older than 12.0 are no longer supported.
Akihiko Odaki (4):
hvf: Drop ifdef for macOS versions older than 12.0
audio: Drop ifdef for macOS versions older than 12.0block/file-posix: Drop ifdef for macOS versions older than 12.0 net/vmnet: Drop ifdef for macOS versions older than 12.0
Series queued, thanks!