|
@@ -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,
|