proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-14 16:11:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vbe: Remove the stored VBE dir

Browse Source 
This can be easily retrieved using LOCALSTATEDIR_PKG by the subclass.
This commit is contained in:
Richard Hughes 2023-01-10 20:18:55 +00:00
parent 61c6a11ec3
commit 7cc725b918
3 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
plugins/vbe/fu-vbe-device.c
View File

@ -10,13 +10,12 @@
#include "fu-vbe-device.h" #include "fu-vbe-device.h"
enum { PROP_0, PROP_VBE_METHOD, PROP_FDT_ROOT, PROP_FDT_NODE, PROP_VBE_DIR, PROP_LAST }; enum { PROP_0, PROP_VBE_METHOD, PROP_FDT_ROOT, PROP_FDT_NODE, PROP_LAST };
typedef struct { typedef struct {
FuFdtImage *fdt_root; FuFdtImage *fdt_root;
FuFdtImage *fdt_node; FuFdtImage *fdt_node;
gchar **compatible; gchar **compatible;
gchar *vbe_dir;
} FuVbeDevicePrivate; } FuVbeDevicePrivate;
G_DEFINE_TYPE_WITH_PRIVATE(FuVbeDevice, fu_vbe_device, FU_TYPE_DEVICE) G_DEFINE_TYPE_WITH_PRIVATE(FuVbeDevice, fu_vbe_device, FU_TYPE_DEVICE)
@ -28,7 +27,6 @@ fu_vbe_device_to_string(FuDevice *device, guint idt, GString *str)
FuVbeDevice *self = FU_VBE_DEVICE(device); FuVbeDevice *self = FU_VBE_DEVICE(device);
FuVbeDevicePrivate *priv = GET_PRIVATE(self); FuVbeDevicePrivate *priv = GET_PRIVATE(self);
fu_string_append(str, idt, "VbeDir", priv->vbe_dir);
if (priv->compatible != NULL) { if (priv->compatible != NULL) {
g_autofree gchar *tmp = g_strjoinv(":", priv->compatible); g_autofree gchar *tmp = g_strjoinv(":", priv->compatible);
fu_string_append(str, idt, "Compatible", tmp); fu_string_append(str, idt, "Compatible", tmp);
@ -59,14 +57,6 @@ fu_vbe_device_get_compatible(FuVbeDevice *self)
return priv->compatible; return priv->compatible;
} }
const gchar *
fu_vbe_device_get_dir(FuVbeDevice *self)
{
FuVbeDevicePrivate *priv = GET_PRIVATE(self);
g_return_val_if_fail(FU_IS_VBE_DEVICE(self), NULL);
return priv->vbe_dir;
}
static void static void
fu_vbe_device_init(FuVbeDevice *self) fu_vbe_device_init(FuVbeDevice *self)
{ {
@ -131,9 +121,6 @@ fu_vbe_device_get_property(GObject *obj, guint prop_id, GValue *value, GParamSpe
case PROP_FDT_NODE: case PROP_FDT_NODE:
g_value_set_object(value, priv->fdt_node); g_value_set_object(value, priv->fdt_node);
break; break;
case PROP_VBE_DIR:
g_value_set_string(value, priv->vbe_dir);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, prop_id, pspec);
break; break;
@ -152,10 +139,6 @@ fu_vbe_device_set_property(GObject *obj, guint prop_id, const GValue *value, GPa
case PROP_FDT_NODE: case PROP_FDT_NODE:
g_set_object(&priv->fdt_node, g_value_get_object(value)); g_set_object(&priv->fdt_node, g_value_get_object(value));
break; break;
case PROP_VBE_DIR:
g_free(priv->vbe_dir);
priv->vbe_dir = g_strdup(g_value_get_string(value));
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID(obj, prop_id, pspec);
break; break;
@ -167,7 +150,6 @@ fu_vbe_device_finalize(GObject *obj)
{ {
FuVbeDevice *self = FU_VBE_DEVICE(obj); FuVbeDevice *self = FU_VBE_DEVICE(obj);
FuVbeDevicePrivate *priv = GET_PRIVATE(self); FuVbeDevicePrivate *priv = GET_PRIVATE(self);
g_free(priv->vbe_dir);
g_strfreev(priv->compatible); g_strfreev(priv->compatible);
if (priv->fdt_root != NULL) if (priv->fdt_root != NULL)
g_object_unref(priv->fdt_root); g_object_unref(priv->fdt_root);
@ -202,14 +184,6 @@ fu_vbe_device_class_init(FuVbeDeviceClass *klass)
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_NAME); G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_NAME);
g_object_class_install_property(object_class, PROP_FDT_NODE, pspec); g_object_class_install_property(object_class, PROP_FDT_NODE, pspec);
pspec =
g_param_spec_string("vbe-dir",
NULL,
"Directory containing state file for each VBE method",
NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_NAME);
g_object_class_install_property(object_class, PROP_VBE_DIR, pspec);
object_class->constructed = fu_vbe_device_constructed; object_class->constructed = fu_vbe_device_constructed;
object_class->finalize = fu_vbe_device_finalize; object_class->finalize = fu_vbe_device_finalize;
klass_device->to_string = fu_vbe_device_to_string; klass_device->to_string = fu_vbe_device_to_string;

2
plugins/vbe/fu-vbe-device.h
View File

@ -21,5 +21,3 @@ FuFdtImage *
fu_vbe_device_get_fdt_node(FuVbeDevice *self); fu_vbe_device_get_fdt_node(FuVbeDevice *self);
gchar ** gchar **
fu_vbe_device_get_compatible(FuVbeDevice *self); fu_vbe_device_get_compatible(FuVbeDevice *self);
const gchar *
fu_vbe_device_get_dir(FuVbeDevice *self);

3
plugins/vbe/fu-vbe-plugin.c
View File

@ -25,7 +25,6 @@ fu_vbe_plugin_coldplug_img(FuPlugin *plugin,
FuFdtImage *fdt_node, FuFdtImage *fdt_node,
GError **error) GError **error)
{ {
FuVbePlugin *self = FU_VBE_PLUGIN(plugin);
GType device_gtype = G_TYPE_INVALID; GType device_gtype = G_TYPE_INVALID;
g_autofree gchar *compatible = NULL; g_autofree gchar *compatible = NULL;
g_auto(GStrv) split = NULL; g_auto(GStrv) split = NULL;
@ -85,8 +84,6 @@ fu_vbe_plugin_coldplug_img(FuPlugin *plugin,
fdt_root, fdt_root,
"fdt-node", "fdt-node",
fdt_node, fdt_node,
"vbe-dir",
self->vbe_dir,
NULL); NULL);
fu_plugin_device_add(plugin, dev); fu_plugin_device_add(plugin, dev);
return TRUE; return TRUE;