summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2014-01-04 14:43:45 +0100
committerTom Gundersen <teg@jklm.no>2014-01-04 15:21:58 +0100
commite3d563346c4237af23335cc6904e0662efdf62ad (patch)
tree8df5de337484aa8dd7dac459f011ee1dac01d049 /src
parentd69b12ac8aed834e4a8220d19c6895ef04c73679 (diff)
udev: net_id - handle virtio buses
This was already supported in path_id, so should be uncontroversial.
Diffstat (limited to 'src')
-rw-r--r--src/udev/udev-builtin-net_id.c37
1 files changed, 37 insertions, 0 deletions
diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c
index b91ca9df5b..c3220565ed 100644
--- a/src/udev/udev-builtin-net_id.c
+++ b/src/udev/udev-builtin-net_id.c
@@ -101,6 +101,7 @@ enum netname_type{
NET_PCI,
NET_USB,
NET_BCMA,
+ NET_VIRTIO,
};
struct netnames {
@@ -118,6 +119,8 @@ struct netnames {
char usb_ports[IFNAMSIZ];
char bcma_core[IFNAMSIZ];
+
+ char virtio_core[IFNAMSIZ];
};
/* retrieve on-board index number and label from firmware */
@@ -344,6 +347,25 @@ static int names_bcma(struct udev_device *dev, struct netnames *names) {
return 0;
}
+static int names_virtio(struct udev_device *dev, struct netnames *names) {
+ struct udev_device *virtdev;
+ unsigned int core;
+
+ virtdev = udev_device_get_parent_with_subsystem_devtype(dev, "virtio", NULL);
+ if (!virtdev)
+ return -ENOENT;
+
+ /* core num */
+ if (sscanf(udev_device_get_sysname(virtdev), "virtio%u", &core) != 1)
+ return -EINVAL;
+ /* suppress the common core == 0 */
+ if (core > 0)
+ snprintf(names->virtio_core, sizeof(names->virtio_core), "v%u", core);
+
+ names->type = NET_VIRTIO;
+ return 0;
+}
+
static int names_mac(struct udev_device *dev, struct netnames *names) {
const char *s;
unsigned int i;
@@ -497,6 +519,21 @@ static int builtin_net_id(struct udev_device *dev, int argc, char *argv[], bool
goto out;
}
+ /* virtio bus */
+ err = names_virtio(dev, &names);
+ if (err >= 0 && names.type == NET_VIRTIO) {
+ char str[IFNAMSIZ];
+
+ if (names.pci_path[0])
+ if (snprintf(str, sizeof(str), "%s%s%s", prefix, names.pci_path, names.virtio_core) < (int)sizeof(str))
+ udev_builtin_add_property(dev, test, "ID_NET_NAME_PATH", str);
+
+ if (names.pci_slot[0])
+ if (snprintf(str, sizeof(str), "%s%s%s", prefix, names.pci_slot, names.virtio_core) < (int)sizeof(str))
+ udev_builtin_add_property(dev, test, "ID_NET_NAME_SLOT", str);
+ goto out;
+ }
+
out:
return EXIT_SUCCESS;
}