chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] handle renamed network interfaces properly if we manage hotplug.d/
[elogind.git]
/
udev_sysfs.c
diff --git
a/udev_sysfs.c
b/udev_sysfs.c
index e2c706c6f5d6477abd60fc3899966281256e04f9..d46f1f26d85bf94fc55eab0a425ba2f164aac15d 100644
(file)
--- a/
udev_sysfs.c
+++ b/
udev_sysfs.c
@@
-31,14
+31,15
@@
#include "libsysfs/sysfs/libsysfs.h"
#include "udev_version.h"
#include "udev_sysfs.h"
#include "libsysfs/sysfs/libsysfs.h"
#include "udev_version.h"
#include "udev_sysfs.h"
-#include "udev_
lib
.h"
+#include "udev_
utils
.h"
#include "logging.h"
/* list of subsystem specific files, NULL if there is no file to wait for */
#include "logging.h"
/* list of subsystem specific files, NULL if there is no file to wait for */
-static struct subsystem_file {
- char *subsystem;
- char *file;
+static
const
struct subsystem_file {
+ c
onst c
har *subsystem;
+ c
onst c
har *file;
} subsystem_files[] = {
} subsystem_files[] = {
+ { .subsystem = "class", .file = NULL },
{ .subsystem = "net", .file = "ifindex" },
{ .subsystem = "scsi_host", .file = "unique_id" },
{ .subsystem = "scsi_device", .file = NULL },
{ .subsystem = "net", .file = "ifindex" },
{ .subsystem = "scsi_host", .file = "unique_id" },
{ .subsystem = "scsi_device", .file = NULL },
@@
-51,12
+52,16
@@
static struct subsystem_file {
{ .subsystem = "ieee1394", .file = NULL },
{ .subsystem = "ieee1394_host", .file = NULL },
{ .subsystem = "ieee1394_node", .file = NULL },
{ .subsystem = "ieee1394", .file = NULL },
{ .subsystem = "ieee1394_host", .file = NULL },
{ .subsystem = "ieee1394_node", .file = NULL },
+ { .subsystem = "fc_transport", .file = "port_id" },
+ { .subsystem = "fc_host", .file = "port_id" },
+ { .subsystem = "spi_transport", .file = "width" },
+ { .subsystem = "spi_host", .file = "width" },
{ NULL, NULL }
};
int subsystem_expect_no_dev(const char *subsystem)
{
{ NULL, NULL }
};
int subsystem_expect_no_dev(const char *subsystem)
{
- struct subsystem_file *file;
+
const
struct subsystem_file *file;
for (file = subsystem_files; file->subsystem != NULL; file++)
if (strcmp(subsystem, file->subsystem) == 0)
for (file = subsystem_files; file->subsystem != NULL; file++)
if (strcmp(subsystem, file->subsystem) == 0)
@@
-66,9
+71,9
@@
int subsystem_expect_no_dev(const char *subsystem)
}
/* get subsystem specific files, returns "dev" if no other found */
}
/* get subsystem specific files, returns "dev" if no other found */
-static char *get_subsystem_specific_file(const char *subsystem)
+static c
onst c
har *get_subsystem_specific_file(const char *subsystem)
{
{
- struct subsystem_file *file;
+
const
struct subsystem_file *file;
/* look if we want to look for another file instead of "dev" */
for (file = subsystem_files; file->subsystem != NULL; file++)
/* look if we want to look for another file instead of "dev" */
for (file = subsystem_files; file->subsystem != NULL; file++)
@@
-123,9
+128,9
@@
static int class_device_expect_no_device_link(struct sysfs_class_device *class_d
{
/* list of devices without a "device" symlink to the physical device
* if device is set to NULL, no devices in that subsystem has a link */
{
/* list of devices without a "device" symlink to the physical device
* if device is set to NULL, no devices in that subsystem has a link */
- static struct class_device {
- char *subsystem;
- char *device;
+ static
const
struct class_device {
+ c
onst c
har *subsystem;
+ c
onst c
har *device;
} class_device[] = {
{ .subsystem = "block", .device = "double" },
{ .subsystem = "block", .device = "nb" },
} class_device[] = {
{ .subsystem = "block", .device = "double" },
{ .subsystem = "block", .device = "nb" },
@@
-170,9
+175,12
@@
static int class_device_expect_no_device_link(struct sysfs_class_device *class_d
{ .subsystem = "net", .device = "bnep" },
{ .subsystem = "net", .device = "vmnet" },
{ .subsystem = "net", .device = "ippp" },
{ .subsystem = "net", .device = "bnep" },
{ .subsystem = "net", .device = "vmnet" },
{ .subsystem = "net", .device = "ippp" },
+ { .subsystem = "net", .device = "nlv" },
+ { .subsystem = "net", .device = "atml" },
{ .subsystem = "ppp", .device = NULL },
{ .subsystem = "sound", .device = NULL },
{ .subsystem = "printer", .device = "lp" },
{ .subsystem = "ppp", .device = NULL },
{ .subsystem = "sound", .device = NULL },
{ .subsystem = "printer", .device = "lp" },
+ { .subsystem = "ppdev", .device = NULL },
{ .subsystem = "nvidia", .device = NULL },
{ .subsystem = "video4linux", .device = "vbi" },
{ .subsystem = "dvb", .device = NULL },
{ .subsystem = "nvidia", .device = NULL },
{ .subsystem = "video4linux", .device = "vbi" },
{ .subsystem = "dvb", .device = NULL },
@@
-202,7
+210,7
@@
static int class_device_expect_no_device_link(struct sysfs_class_device *class_d
{ .subsystem = "capi", .device = NULL },
{ NULL, NULL }
};
{ .subsystem = "capi", .device = NULL },
{ NULL, NULL }
};
- struct class_device *classdevice;
+
const
struct class_device *classdevice;
int len;
/* the kernel may tell us what to wait for */
int len;
/* the kernel may tell us what to wait for */
@@
-240,13
+248,13
@@
static int class_device_expect_no_device_link(struct sysfs_class_device *class_d
/* skip waiting for the bus of the devices device */
static int class_device_expect_no_bus(struct sysfs_class_device *class_dev)
{
/* skip waiting for the bus of the devices device */
static int class_device_expect_no_bus(struct sysfs_class_device *class_dev)
{
- static char *devices_without_bus[] = {
+ static c
onst c
har *devices_without_bus[] = {
"scsi_host",
"i2c-adapter",
"i2c-dev",
NULL
};
"scsi_host",
"i2c-adapter",
"i2c-dev",
NULL
};
- char **device;
+ c
onst c
har **device;
for (device = devices_without_bus; *device != NULL; device++) {
int len = strlen(*device);
for (device = devices_without_bus; *device != NULL; device++) {
int len = strlen(*device);
@@
-262,9
+270,9
@@
static int class_device_expect_no_bus(struct sysfs_class_device *class_dev)
int wait_for_devices_device(struct sysfs_device *devices_dev,
const char **error)
{
int wait_for_devices_device(struct sysfs_device *devices_dev,
const char **error)
{
- static struct device_file {
- char *bus;
- char *file;
+ static
const
struct device_file {
+ c
onst c
har *bus;
+ c
onst c
har *file;
} device_files[] = {
{ .bus = "scsi", .file = "vendor" },
{ .bus = "usb", .file = "idVendor" },
} device_files[] = {
{ .bus = "scsi", .file = "vendor" },
{ .bus = "usb", .file = "idVendor" },
@@
-274,11
+282,12
@@
int wait_for_devices_device(struct sysfs_device *devices_dev,
{ .bus = "ide", .file = "detach_state" },
{ .bus = "pci", .file = "vendor" },
{ .bus = "platform", .file = "detach_state" },
{ .bus = "ide", .file = "detach_state" },
{ .bus = "pci", .file = "vendor" },
{ .bus = "platform", .file = "detach_state" },
+ { .bus = "pcmcia", .file = "detach_state" },
{ .bus = "i2c", .file = "detach_state" },
{ .bus = "ieee1394", .file = "node_count" },
{ .bus = "ieee1394", .file = "nodeid" },
{ .bus = "ieee1394", .file = "address" },
{ .bus = "i2c", .file = "detach_state" },
{ .bus = "ieee1394", .file = "node_count" },
{ .bus = "ieee1394", .file = "nodeid" },
{ .bus = "ieee1394", .file = "address" },
- { .bus = "bttv-sub", .file =
"detach_state"
},
+ { .bus = "bttv-sub", .file =
NULL
},
{ .bus = "pnp", .file = "detach_state" },
{ .bus = "eisa", .file = "detach_state" },
{ .bus = "pseudo", .file = "detach_state" },
{ .bus = "pnp", .file = "detach_state" },
{ .bus = "eisa", .file = "detach_state" },
{ .bus = "pseudo", .file = "detach_state" },
@@
-302,7
+311,7
@@
int wait_for_devices_device(struct sysfs_device *devices_dev,
{ .bus = "iucv", .file = "detach_state" },
{ NULL, NULL }
};
{ .bus = "iucv", .file = "detach_state" },
{ NULL, NULL }
};
- struct device_file *devicefile;
+
const
struct device_file *devicefile;
int loop;
/* the kernel may tell us what to wait for */
int loop;
/* the kernel may tell us what to wait for */
@@
-338,6
+347,11
@@
int wait_for_devices_device(struct sysfs_device *devices_dev,
char filename[SYSFS_PATH_MAX];
struct stat stats;
char filename[SYSFS_PATH_MAX];
struct stat stats;
+ if (devicefile->file == NULL) {
+ dbg("bus '%s' has no file to wait for", devices_dev->bus);
+ return 0;
+ }
+
found_bus_type = 1;
snprintf(filename, SYSFS_PATH_MAX-1, "%s/%s", devices_dev->path, devicefile->file);
dbg("looking at bus '%s' device for specific file '%s'", devices_dev->bus, filename);
found_bus_type = 1;
snprintf(filename, SYSFS_PATH_MAX-1, "%s/%s", devices_dev->path, devicefile->file);
dbg("looking at bus '%s' device for specific file '%s'", devices_dev->bus, filename);