diff options
| author | Petr Mladek <pmladek@suse.com> | 2021-11-02 10:39:27 +0100 | 
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2021-11-02 10:39:27 +0100 | 
| commit | 40e64a88dadcfa168914065baf7f035de957bbe0 (patch) | |
| tree | 06c8c4a9e6c1b478aa6851794c6a33bec1ce6ec4 /scripts/mod/file2alias.c | |
| parent | 24a1dffbecafeb00d8830985eb7a318e37aabc4e (diff) | |
| parent | 6a7ca80f4033c9cf3003625b2ef8b497f4ec44da (diff) | |
Merge branch 'for-5.16-vsprintf-pgp' into for-linus
Diffstat (limited to 'scripts/mod/file2alias.c')
| -rw-r--r-- | scripts/mod/file2alias.c | 17 | 
1 files changed, 15 insertions, 2 deletions
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c index 7c97fa8e36bc..49aba862073e 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c @@ -426,7 +426,7 @@ static int do_ieee1394_entry(const char *filename,  	return 1;  } -/* Looks like: pci:vNdNsvNsdNbcNscNiN. */ +/* Looks like: pci:vNdNsvNsdNbcNscNiN or <prefix>_pci:vNdNsvNsdNbcNscNiN. */  static int do_pci_entry(const char *filename,  			void *symval, char *alias)  { @@ -440,8 +440,21 @@ static int do_pci_entry(const char *filename,  	DEF_FIELD(symval, pci_device_id, subdevice);  	DEF_FIELD(symval, pci_device_id, class);  	DEF_FIELD(symval, pci_device_id, class_mask); +	DEF_FIELD(symval, pci_device_id, override_only); + +	switch (override_only) { +	case 0: +		strcpy(alias, "pci:"); +		break; +	case PCI_ID_F_VFIO_DRIVER_OVERRIDE: +		strcpy(alias, "vfio_pci:"); +		break; +	default: +		warn("Unknown PCI driver_override alias %08X\n", +		     override_only); +		return 0; +	} -	strcpy(alias, "pci:");  	ADD(alias, "v", vendor != PCI_ANY_ID, vendor);  	ADD(alias, "d", device != PCI_ANY_ID, device);  	ADD(alias, "sv", subvendor != PCI_ANY_ID, subvendor);  | 
