shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-11 05:17:44 +03:00
Code

Merge pull request #1119 from teg/virtio-names

Browse Source 
udev: net_id - support predictable ifnames on virtio buses
This commit is contained in:
Kay Sievers 2015-09-02 14:30:49 +02:00
commit c069f47779
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/udev/udev-builtin-net_id.c
View File

@ -280,8 +280,16 @@ static int names_pci(struct udev_device *dev, struct netnames *names) {
assert(names); assert(names);
parent = udev_device_get_parent(dev); parent = udev_device_get_parent(dev);
/* there can only ever be one virtio bus per parent device, so we can
safely ignore any virtio buses. see
<http://lists.linuxfoundation.org/pipermail/virtualization/2015-August/030331.html> */
while (parent && streq_ptr("virtio", udev_device_get_subsystem(parent)))
parent = udev_device_get_parent(parent);
if (!parent) if (!parent)
return -ENOENT; return -ENOENT;
/* check if our direct parent is a PCI device with no other bus in-between */ /* check if our direct parent is a PCI device with no other bus in-between */
if (streq_ptr("pci", udev_device_get_subsystem(parent))) { if (streq_ptr("pci", udev_device_get_subsystem(parent))) {
names->type = NET_PCI; names->type = NET_PCI;