New upstream version 1.32.12 upstream/1.32.12

1 files changed, 0 insertions, 169 deletions

diff --git a/libnm/nm-device-ovs-bridge.c b/libnm/nm-device-ovs-bridge.c
deleted file mode 100644
index 9c175548..00000000
--- a/libnm/nm-device-ovs-bridge.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/* SPDX-License-Identifier: LGPL-2.1-or-later */
-/*
- * Copyright (C) 2017, 2018 Red Hat, Inc.
- */
-
-#include "libnm/nm-default-libnm.h"
-
-#include "nm-device-ovs-bridge.h"
-
-#include "nm-object-private.h"
-#include "nm-setting-ovs-bridge.h"
-#include "nm-setting-ovs-port.h"
-#include "nm-setting-connection.h"
-#include "nm-core-internal.h"
-
-/*****************************************************************************/
-
-NM_GOBJECT_PROPERTIES_DEFINE_BASE(PROP_SLAVES, );
-
-typedef struct {
-    NMLDBusPropertyAO slaves;
-} NMDeviceOvsBridgePrivate;
-
-struct _NMDeviceOvsBridge {
-    NMDevice                 parent;
-    NMDeviceOvsBridgePrivate _priv;
-};
-
-struct _NMDeviceOvsBridgeClass {
-    NMDeviceClass parent;
-};
-
-G_DEFINE_TYPE(NMDeviceOvsBridge, nm_device_ovs_bridge, NM_TYPE_DEVICE)
-
-#define NM_DEVICE_OVS_BRIDGE_GET_PRIVATE(self) \
-    _NM_GET_PRIVATE(self, NMDeviceOvsBridge, NM_IS_DEVICE_OVS_BRIDGE, NMObject, NMDevice)
-
-/*****************************************************************************/
-
-/**
- * nm_device_ovs_bridge_get_slaves:
- * @device: a #NMDeviceOvsBridge
- *
- * Gets the ports currently enslaved to @device.
- *
- * Returns: (element-type NMDevice): the #GPtrArray containing
- * #NMDevices that are slaves of @device. This is the internal
- * copy used by the device, and must not be modified.
- *
- * Since: 1.14
- **/
-const GPtrArray *
-nm_device_ovs_bridge_get_slaves(NMDeviceOvsBridge *device)
-{
-    g_return_val_if_fail(NM_IS_DEVICE_OVS_BRIDGE(device), FALSE);
-
-    return nml_dbus_property_ao_get_objs_as_ptrarray(
-        &NM_DEVICE_OVS_BRIDGE_GET_PRIVATE(device)->slaves);
-}
-
-static const char *
-get_type_description(NMDevice *device)
-{
-    return "ovs-bridge";
-}
-
-static gboolean
-connection_compatible(NMDevice *device, NMConnection *connection, GError **error)
-{
-    const char *iface_name;
-
-    if (!NM_DEVICE_CLASS(nm_device_ovs_bridge_parent_class)
-             ->connection_compatible(device, connection, error))
-        return FALSE;
-
-    if (!nm_connection_is_type(connection, NM_SETTING_OVS_BRIDGE_SETTING_NAME)) {
-        g_set_error_literal(error,
-                            NM_DEVICE_ERROR,
-                            NM_DEVICE_ERROR_INCOMPATIBLE_CONNECTION,
-                            _("The connection was not a ovs_bridge connection."));
-        return FALSE;
-    }
-
-    iface_name = nm_connection_get_interface_name(connection);
-    if (!iface_name) {
-        g_set_error_literal(error,
-                            NM_DEVICE_ERROR,
-                            NM_DEVICE_ERROR_INVALID_CONNECTION,
-                            _("The connection did not specify an interface name."));
-        return FALSE;
-    }
-
-    return TRUE;
-}
-
-static GType
-get_setting_type(NMDevice *device)
-{
-    return NM_TYPE_SETTING_OVS_BRIDGE;
-}
-
-/*****************************************************************************/
-
-static void
-get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
-{
-    NMDeviceOvsBridge *device = NM_DEVICE_OVS_BRIDGE(object);
-
-    switch (prop_id) {
-    case PROP_SLAVES:
-        g_value_take_boxed(value,
-                           _nm_utils_copy_object_array(nm_device_ovs_bridge_get_slaves(device)));
-        break;
-    default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
-        break;
-    }
-}
-
-/*****************************************************************************/
-
-static void
-nm_device_ovs_bridge_init(NMDeviceOvsBridge *device)
-{}
-
-const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_ovsbridge =
-    NML_DBUS_META_IFACE_INIT_PROP(NM_DBUS_INTERFACE_DEVICE_OVS_BRIDGE,
-                                  nm_device_ovs_bridge_get_type,
-                                  NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
-                                  NML_DBUS_META_IFACE_DBUS_PROPERTIES(
-                                      NML_DBUS_META_PROPERTY_INIT_AO_PROP("Slaves",
-                                                                          PROP_SLAVES,
-                                                                          NMDeviceOvsBridge,
-                                                                          _priv.slaves,
-                                                                          nm_device_get_type), ), );
-
-static void
-nm_device_ovs_bridge_class_init(NMDeviceOvsBridgeClass *klass)
-{
-    GObjectClass * object_class    = G_OBJECT_CLASS(klass);
-    NMObjectClass *nm_object_class = NM_OBJECT_CLASS(klass);
-    NMDeviceClass *device_class    = NM_DEVICE_CLASS(klass);
-
-    object_class->get_property = get_property;
-
-    _NM_OBJECT_CLASS_INIT_PRIV_PTR_DIRECT(nm_object_class, NMDeviceOvsBridge);
-
-    _NM_OBJECT_CLASS_INIT_PROPERTY_AO_FIELDS_1(nm_object_class, NMDeviceOvsBridgePrivate, slaves);
-
-    device_class->get_type_description  = get_type_description;
-    device_class->connection_compatible = connection_compatible;
-    device_class->get_setting_type      = get_setting_type;
-
-    /**
-     * NMDeviceOvsBridge:slaves: (type GPtrArray(NMDevice))
-     *
-     * Gets the ports currently enslaved to the device.
-     *
-     * Since: 1.22
-     */
-    obj_properties[PROP_SLAVES] = g_param_spec_boxed(NM_DEVICE_OVS_BRIDGE_SLAVES,
-                                                     "",
-                                                     "",
-                                                     G_TYPE_PTR_ARRAY,
-                                                     G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-
-    _nml_dbus_meta_class_init_with_properties(object_class,
-                                              &_nml_dbus_meta_iface_nm_device_ovsbridge);
-}