This the diff between systemd-210 and 19aa72f74e41045510b4af3f1415b419d42ff20b But we do not remove the ATA support as in HEAD --- src/udev/udev-builtin-net_id.c | 54 ++++++---------------------------------- src/udev/udev-builtin-path_id.c | 3 -- 2 files changed, 9 insertions(+), 48 deletions(-) --- src/udev/udev-builtin-net_id.c +++ src/udev/udev-builtin-net_id.c 2014-04-08 07:16:45.094235605 +0000 @@ -33,6 +33,8 @@ * ww -- wwan * * Type of names: + * b -- BCMA bus core number + * ccw -- CCW bus group name * o -- on-board device index number * s[f][d] -- hotplug slot index number * x -- MAC address @@ -92,6 +94,7 @@ #include #include #include +#include #include #include "udev.h" @@ -119,12 +122,8 @@ struct netnames { const char *pci_onboard_label; char usb_ports[IFNAMSIZ]; - char bcma_core[IFNAMSIZ]; - - char virtio_core[IFNAMSIZ]; - - char ccw_core[IFNAMSIZ]; + char ccw_group[IFNAMSIZ]; }; /* retrieve on-board index number and label from firmware */ @@ -351,25 +350,6 @@ static int names_bcma(struct udev_device 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_ccw(struct udev_device *dev, struct netnames *names) { struct udev_device *cdev; const char *bus_id; @@ -402,8 +382,8 @@ static int names_ccw(struct udev_device return -EINVAL; /* Store the CCW bus-ID for use as network device name */ - rc = snprintf(names->ccw_core, sizeof(names->ccw_core), "ccw%s", bus_id); - if (rc >= 0 && rc < (int)sizeof(names->ccw_core)) + rc = snprintf(names->ccw_group, sizeof(names->ccw_group), "ccw%s", bus_id); + if (rc >= 0 && rc < (int)sizeof(names->ccw_group)) names->type = NET_CCWGROUP; return 0; } @@ -472,10 +452,10 @@ static int builtin_net_id(struct udev_de return EXIT_FAILURE; i = strtoul(s, NULL, 0); switch (i) { - case 1: /* ARPHRD_ETHER */ + case ARPHRD_ETHER: prefix = "en"; break; - case 256: /* ARPHRD_SLIP */ + case ARPHRD_SLIP: prefix = "sl"; break; default: @@ -517,7 +497,7 @@ static int builtin_net_id(struct udev_de if (err >= 0 && names.type == NET_CCWGROUP) { char str[IFNAMSIZ]; - if (snprintf(str, sizeof(str), "%s%s", prefix, names.ccw_core) < (int)sizeof(str)) + if (snprintf(str, sizeof(str), "%s%s", prefix, names.ccw_group) < (int)sizeof(str)) udev_builtin_add_property(dev, test, "ID_NET_NAME_PATH", str); goto out; } @@ -578,22 +558,6 @@ static int builtin_net_id(struct udev_de udev_builtin_add_property(dev, test, "ID_NET_NAME_SLOT", str); 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; } --- src/udev/udev-builtin-path_id.c +++ src/udev/udev-builtin-path_id.c 2014-03-28 09:27:20.402735390 +0000 @@ -571,9 +571,6 @@ static int builtin_path_id(struct udev_d } else if (streq(subsys, "xen")) { path_prepend(&path, "xen-%s", udev_device_get_sysname(parent)); parent = skip_subsystem(parent, "xen"); - } else if (streq(subsys, "virtio")) { - path_prepend(&path, "virtio-pci-%s", udev_device_get_sysname(parent)); - parent = skip_subsystem(parent, "virtio"); } else if (streq(subsys, "scm")) { path_prepend(&path, "scm-%s", udev_device_get_sysname(parent)); parent = skip_subsystem(parent, "scm");