motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-29 21:12:07 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

net/vmnet: Drop ifdef for macOS versions older than 12.0

Browse source 
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-4-6e70a6b700a0@daynix.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
This commit is contained in:
Akihiko Odaki 2024-06-29 15:24:47 +09:00 • committed by Philippe Mathieu-Daudé
parent e9c9d8dc3b
commit 3bf445fbb1
4 changed files with 2 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

13
net/vmnet-bridged.m
View file

@ -88,15 +88,6 @@ static bool validate_options(const Netdev *netdev, Error **errp)
return false; 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; return true;
} }
@ -115,12 +106,10 @@ static xpc_object_t build_if_desc(const Netdev *netdev)
vmnet_shared_interface_name_key, vmnet_shared_interface_name_key,
options->ifname); 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, xpc_dictionary_set_bool(if_desc,
vmnet_enable_isolation_key, vmnet_enable_isolation_key,
options->isolated); options->isolated);
#endif
return if_desc; return if_desc;
} }

3
net/vmnet-common.m
View file

@ -47,11 +47,8 @@ const char *vmnet_status_map_str(vmnet_return_t status)
return "buffers exhausted in kernel"; return "buffers exhausted in kernel";
case VMNET_TOO_MANY_PACKETS: case VMNET_TOO_MANY_PACKETS:
return "packet count exceeds limit"; 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: case VMNET_SHARING_SERVICE_BUSY:
return "conflict, sharing service is in use"; return "conflict, sharing service is in use";
#endif
default: default:
return "unknown vmnet error"; return "unknown vmnet error";
} }

24
net/vmnet-host.c
View file

@ -21,31 +21,13 @@
static bool validate_options(const Netdev *netdev, Error **errp) static bool validate_options(const Netdev *netdev, Error **errp)
{ {
const NetdevVmnetHostOptions *options = &(netdev->u.vmnet_host); 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; QemuUUID net_uuid;
if (options->net_uuid && if (options->net_uuid &&
qemu_uuid_parse(options->net_uuid, &net_uuid) < 0) { qemu_uuid_parse(options->net_uuid, &net_uuid) < 0) {
error_setg(errp, "Invalid UUID provided in 'net-uuid'"); error_setg(errp, "Invalid UUID provided in 'net-uuid'");
return false; 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 || if ((options->start_address ||
options->end_address || options->end_address ||
@ -71,9 +53,6 @@ static xpc_object_t build_if_desc(const Netdev *netdev)
vmnet_operation_mode_key, vmnet_operation_mode_key,
VMNET_HOST_MODE); 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, xpc_dictionary_set_bool(if_desc,
vmnet_enable_isolation_key, vmnet_enable_isolation_key,
options->isolated); options->isolated);
@ -85,7 +64,6 @@ static xpc_object_t build_if_desc(const Netdev *netdev)
vmnet_network_identifier_key, vmnet_network_identifier_key,
net_uuid.data); net_uuid.data);
} }
#endif
if (options->start_address) { if (options->start_address) {
xpc_dictionary_set_string(if_desc, xpc_dictionary_set_string(if_desc,

13
net/vmnet-shared.c
View file

@ -21,16 +21,6 @@ static bool validate_options(const Netdev *netdev, Error **errp)
{ {
const NetdevVmnetSharedOptions *options = &(netdev->u.vmnet_shared); 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 || if ((options->start_address ||
options->end_address || options->end_address ||
options->subnet_mask) && options->subnet_mask) &&
@ -76,14 +66,11 @@ static xpc_object_t build_if_desc(const Netdev *netdev)
options->subnet_mask); 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( xpc_dictionary_set_bool(
if_desc, if_desc,
vmnet_enable_isolation_key, vmnet_enable_isolation_key,
options->isolated options->isolated
); );
#endif
return if_desc; return if_desc;
} }