]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #11617 from topimiettinen/backlight-handle-zero-file-load
authorLennart Poettering <lennart@poettering.net>
Fri, 15 Feb 2019 10:32:58 +0000 (11:32 +0100)
committerGitHub <noreply@github.com>
Fri, 15 Feb 2019 10:32:58 +0000 (11:32 +0100)
backlight: handle loading truncated file

110 files changed:
.mailmap
NEWS
README.md
TODO
docs/PORTABLE_SERVICES.md
hwdb/20-OUI.hwdb
hwdb/20-acpi-vendor.hwdb
hwdb/20-acpi-vendor.hwdb.patch
hwdb/20-pci-vendor-model.hwdb
hwdb/60-keyboard.hwdb
hwdb/60-sensor.hwdb
hwdb/70-mouse.hwdb
hwdb/acpi_id_registry.html
hwdb/ma-large.txt
hwdb/ma-medium.txt
hwdb/ma-small.txt
hwdb/pci.ids
hwdb/pnp_id_registry.html
man/coredump.conf.xml
man/journal-remote.conf.xml
man/journal-upload.conf.xml
man/journald.conf.xml
man/kernel-command-line.xml
man/logind.conf.xml
man/machine-info.xml
man/os-release.xml
man/pam_systemd.xml
man/sd-bus-errors.xml
man/sd-login.xml
man/sd_bus_request_name.xml
man/systemd-boot.xml
man/systemd-sleep.conf.xml
man/systemd-system.conf.xml
man/systemd.exec.xml
man/systemd.kill.xml
man/systemd.mount.xml
man/systemd.netdev.xml
man/systemd.nspawn.xml
man/systemd.resource-control.xml
man/systemd.service.xml
man/systemd.socket.xml
man/systemd.swap.xml
man/systemd.unit.xml
man/udev.conf.xml
man/vconsole.conf.xml
rules/60-block.rules
semaphoreci/gcc-compilation.sh [new file with mode: 0755]
semaphoreci/setup.sh [new file with mode: 0755]
src/analyze/analyze-security.c
src/basic/hashmap.c
src/basic/missing_network.h
src/basic/util.h
src/boot/efi/meson.build
src/core/automount.c
src/core/dbus-service.c
src/core/job.c
src/core/load-fragment.c
src/core/macros.systemd.in
src/core/manager.c
src/core/mount.c
src/core/service.c
src/core/unit.c
src/cryptsetup/cryptsetup-generator.c
src/import/curl-util.c
src/import/pull-job.c
src/journal/catalog.c
src/journal/journal-def.h
src/libsystemd-network/network-internal.c
src/libsystemd-network/radv-internal.h
src/libsystemd/sd-bus/bus-socket.c
src/libsystemd/sd-daemon/sd-daemon.c
src/libsystemd/sd-device/device-private.c
src/libsystemd/sd-device/test-sd-device-monitor.c
src/libsystemd/sd-hwdb/sd-hwdb.c
src/login/logind-dbus.c
src/machine/machinectl.c
src/network/networkd-address.c
src/network/networkd-brvlan.c
src/network/networkd-dhcp6.c
src/network/networkd-link.c
src/network/networkd-ndisc.c
src/nss-myhostname/nss-myhostname.c
src/nss-mymachines/nss-mymachines.c
src/nss-resolve/nss-resolve.c
src/nss-systemd/nss-systemd.c
src/shared/acl-util.c
src/shared/dissect-image.c
src/shared/efivars.c
src/test/meson.build
src/test/test-execute.c
src/test/test-fs-util.c
src/test/test-json.c
src/test/test-libudev.c
src/test/test-sizeof.c
src/test/test-util.c
src/udev/net/link-config.c
src/udev/udev-rules.c
src/udev/udevadm-info.c
src/udev/udevd.c
test/TEST-10-ISSUE-2467/test.sh
test/fuzz/fuzz-udev-rules/oss-fuzz-12980 [new file with mode: 0644]
test/rule-syntax-check.py
test/test-execute/exec-privatenetwork-yes.service
test/test-functions
test/test-network/conf/25-bind-carrier.network [new file with mode: 0644]
test/test-network/conf/25-link-local-addressing-no.network [new file with mode: 0644]
test/test-network/conf/25-link-local-addressing-yes.network [new file with mode: 0644]
test/test-network/systemd-networkd-tests.py
tools/make-directive-index.py
travis-ci/managers/xenial.sh

index f3809eac4c07b916597bfd0fa09966a451b74f7c..abde31e48c9157108dfb8575aa0fd4e586722320 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -192,3 +192,9 @@ Yin Kangkai <kangkai.yin@intel.com> <kangkai.yin@linux.intel.com>
 Zachary Winnerman <33329648+winnerman-pythian@users.noreply.github.com>
 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
 Łukasz Stelmach <l.stelmach@samsung.com> <stlman@poczta.fm>
+Jonathon Kowalski <bl0pbl33p@gmail.com>
+Diego Canuhe <dcanuhe@gmail.com> <46734128+dcanuhe@users.noreply.github.com>
+David Santamaría Rogado <howl.nsp@gmail.com>
+Mike Auty <mike.auty@gmail.com>
+Roger James <roger@beardandsandals.co.uk>
+Stephan Edel <se@se-it.eu>
diff --git a/NEWS b/NEWS
index 1f187c895babef16f927b5a6147c5e1ba9ca02f8..f61262fd570c6c2777663b0f412a0afee2c5ee91 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 systemd System and Service Manager
 
-CHANGES WITH 241 in spe:
+CHANGES WITH 241:
 
         * The default locale can now be configured at compile time. Otherwise,
           a suitable default will be selected automatically (one of C.UTF-8,
@@ -83,21 +83,28 @@ CHANGES WITH 241 in spe:
         * udevadm control learnt a new option for --ping for testing whether a
           systemd-udevd instance is running and reacting.
 
-        Contributions from: Aaron Plattner, Alex Mayer, Ayman Bagabas,
-        Beniamino Galvani, bl33pbl0p, Burt P, Chris Down, Chris Lamb, Chris
-        Morin, Claudius Ellsel, dana, Daniel Axtens, Daniele Medri, Dave
-        Reisner, dcanuhe, Dimitri John Ledkov, Evgeny Vereshchagin, Fabrice
-        Fontaine, Filipe Brandenburger, Franck Bui, Frantisek Sumsal, howl,
-        ikelos, James Hilliard, Jani Uusitalo, Jan Janssen, Jonathan Roemer,
-        Jonathon Kowalski, Joost Heitbrink, Jörg Thalheim, Lennart Poettering,
-        Louis Taylor, Lucas Werkmeister, Marc-Antoine Perennou, marvelousblack,
-        Michael Biebl, Michael Sloan, Michal Sekletar, Mike Auty, Mike Gilbert,
-        Mikhail Kasimov, Niklas Hambüchen, Patrick Williams, Paul Seyfert,
-        Philip Withnall, rogerjames99, Ronnie P. Thomas, Ryan Gonzalez, Sam
-        Morris, Susant Sahani, Taro Yamada, Thomas Haller, Topi Miettinen,
-        YunQiang Su, Yu Watanabe, Zbigniew Jędrzejewski-Szmek, zsergeant77
-
-        — Berlin, 2018-XX-XX
+        * udevadm trigger learnt a new option for --wait-daemon for waiting
+          systemd-udevd daemon to be initialized.
+
+        Contributions from: Aaron Plattner, Alberts Muktupāvels, Alex Mayer,
+        Ayman Bagabas, Beniamino Galvani, Burt P, Chris Down, Chris Lamb, Chris
+        Morin, Christian Hesse, Claudius Ellsel, dana, Daniel Axtens, Daniele
+        Medri, Dave Reisner, David Santamaría Rogado, Diego Canuhe, Dimitri
+        John Ledkov, Evgeny Vereshchagin, Fabrice Fontaine, Filipe
+        Brandenburger, Franck Bui, Frantisek Sumsal, govwin, Hans de Goede,
+        James Hilliard, Jan Engelhardt, Jani Uusitalo, Jan Janssen, Jan
+        Synacek, Jonathan McDowell, Jonathan Roemer, Jonathon Kowalski, Joost
+        Heitbrink, Jörg Thalheim, Lance, Lennart Poettering, Louis Taylor,
+        Lucas Werkmeister, Mantas Mikulėnas, Marc-Antoine Perennou,
+        marvelousblack, Michael Biebl, Michael Sloan, Michal Sekletar, Mike
+        Auty, Mike Gilbert, Mikhail Kasimov, Neil Brown, Niklas Hambüchen,
+        Patrick Williams, Paul Seyfert, Peter Hutterer, Philip Withnall, Roger
+        James, Ronnie P. Thomas, Ryan Gonzalez, Sam Morris, Stephan Edel,
+        Stephan Gerhold, Susant Sahani, Taro Yamada, Thomas Haller, Topi
+        Miettinen, YiFei Zhu, YmrDtnJu, YunQiang Su, Yu Watanabe, Zbigniew
+        Jędrzejewski-Szmek, zsergeant77, Дамјан Георгиевски
+
+        — Berlin, 2019-02-14
 
 CHANGES WITH 240:
 
@@ -201,7 +208,7 @@ CHANGES WITH 240:
           file descriptors currently enforced (fs.file-max, fs.nr_open,
           RLIMIT_NOFILE hard, RLIMIT_NOFILE soft) we turn off the first two,
           and keep only the latter two. A set of build-time options
-          (-Dbump-proc-sys-fs-file-max=no and -Dbump-proc-sys-fs-nr-open=no)
+          (-Dbump-proc-sys-fs-file-max=false and -Dbump-proc-sys-fs-nr-open=false)
           has been added to revert this change in behaviour, which might be
           an option for systems that turn off memcg in the kernel.
 
index 31d530733aa88ce282e1ced58574735f16f8a5bd..72484f620c1acfeff010b18ed80bab2f9e5dce0e 100644 (file)
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 <a href="https://in.waw.pl/systemd-github-state/systemd-systemd-issues.svg"><img align="right" src="https://in.waw.pl/systemd-github-state/systemd-systemd-issues-small.svg" alt="Count of open issues over time"></a>
 <a href="https://in.waw.pl/systemd-github-state/systemd-systemd-pull-requests.svg"><img align="right" src="https://in.waw.pl/systemd-github-state/systemd-systemd-pull-requests-small.svg" alt="Count of open pull requests over time"></a>
 [![Semaphore CI Build Status](https://semaphoreci.com/api/v1/projects/28a5a3ca-3c56-4078-8b5e-7ed6ef912e14/443470/shields_badge.svg)](https://semaphoreci.com/systemd/systemd)<br/>
+[![Coverity Scan Status](https://scan.coverity.com/projects/350/badge.svg)](https://scan.coverity.com/projects/350)<br/>
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/1369/badge)](https://bestpractices.coreinfrastructure.org/projects/1369)<br/>
 [![Travis CI Build Status](https://travis-ci.org/systemd/systemd.svg?branch=master)](https://travis-ci.org/systemd/systemd)<br/>
 [![Language Grade: C/C++](https://img.shields.io/lgtm/grade/cpp/g/systemd/systemd.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/systemd/systemd/context:cpp)<br/>
diff --git a/TODO b/TODO
index 77a84472336f1297ef9153836750bd68f7de37f4..462db57a3a53a2b9ac1bbd966e41a0f21f19419d 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1114,3 +1114,5 @@ Regularly:
 * use secure_getenv() instead of getenv() where appropriate
 
 * link up selected blog stories from man pages and unit files Documentation= fields
+String is not UTF-8 clean, ignoring assignment
+ timedatex.service: Consumed 26ms CPU time.
index 2dbeeee760b1a6c6f374c8674cbd3655f03a978f..5b6c085af096859cdc38c39aaad3db3025de5199 100644 (file)
@@ -89,8 +89,9 @@ If you have portable service image, maybe in a raw disk image called
 
 This command does the following:
 
-1. It dissects the image, checks and validates the `/etc/os-release` data of
-   the image, and looks for all included unit files.
+1. It dissects the image, checks and validates the `/etc/os-release`
+   (or `/usr/lib/os-release`, see below)  data of the image, and looks for
+   all included unit files.
 
 2. It copies out all unit files with a suffix of `.service`, `.socket`,
    `.target`, `.timer` and `.path`. whose name begins with the image's name
@@ -170,8 +171,11 @@ requirements are made for an image that can be attached/detached with
    image. (The implementation will check a couple of other paths too, but it's
    recommended to use these two paths.)
 
-4. The image must contain an os-release file, either in /etc/os-release or
-   /usr/lib/os-release. The file should follow the standard format.
+4. The image must contain an os-release file, either in `/etc/os-release` or
+   `/usr/lib/os-release`. The file should follow the standard format.
+
+5. The image must contain the files `/etc/resolv.conf` and `/etc/machine-id`
+   (empty files are ok), they will be bind mounted from the host at runtime.
 
 Note that generally images created by tools such as `debootstrap`, `dnf
 --installroot=` or `mkosi` qualify for all of the above in one way or
index 896451c53810af1067367501ad768465e3a5f1bc..d65cd6dc40f3ad3c7a92d3d562c7f5f92747bf3a 100644 (file)
@@ -2364,7 +2364,7 @@ OUI:000311*
  ID_OUI_FROM_DATABASE=Micro Technology Co., Ltd.
 
 OUI:000312*
- ID_OUI_FROM_DATABASE=TR-Systemtechnik GmbH
+ ID_OUI_FROM_DATABASE=TRsystems GmbH
 
 OUI:000313*
  ID_OUI_FROM_DATABASE=Access Media SPA
@@ -27045,7 +27045,7 @@ OUI:002288*
  ID_OUI_FROM_DATABASE=Sagrad, Inc.
 
 OUI:002289*
- ID_OUI_FROM_DATABASE=Optosecurity Inc.
+ ID_OUI_FROM_DATABASE=Vandelrande APC inc.
 
 OUI:00228A*
  ID_OUI_FROM_DATABASE=Teratronik elektronische systeme gmbh
@@ -27159,7 +27159,7 @@ OUI:0022AE*
  ID_OUI_FROM_DATABASE=Mattel Inc.
 
 OUI:0022AF*
- ID_OUI_FROM_DATABASE=Safety Vision
+ ID_OUI_FROM_DATABASE=Safety Vision, LLC
 
 OUI:0022B0*
  ID_OUI_FROM_DATABASE=D-Link Corporation
@@ -41987,6 +41987,9 @@ OUI:103B59*
 OUI:103D0A*
  ID_OUI_FROM_DATABASE=Hui Zhou Gaoshengda Technology Co.,LTD
 
+OUI:103D3E*
+ ID_OUI_FROM_DATABASE=China Mobile Group Device Co.,Ltd.
+
 OUI:103DEA*
  ID_OUI_FROM_DATABASE=HFC Technology (Beijing) Ltd. Co.
 
@@ -42191,6 +42194,9 @@ OUI:108EE0*
 OUI:109266*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:109397*
+ ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
+
 OUI:1093E9*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -42371,6 +42377,9 @@ OUI:10D542*
 OUI:10DA43*
  ID_OUI_FROM_DATABASE=NETGEAR
 
+OUI:10DC4A*
+ ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
+
 OUI:10DDB1*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -43208,6 +43217,9 @@ OUI:18204C*
 OUI:1820A6*
  ID_OUI_FROM_DATABASE=Sage Co., Ltd.
 
+OUI:1820D5*
+ ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
+
 OUI:182195*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
@@ -43313,6 +43325,9 @@ OUI:1844E6*
 OUI:184617*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:184644*
+ ID_OUI_FROM_DATABASE=Home Control Singapore Pte Ltd
+
 OUI:1848D8*
  ID_OUI_FROM_DATABASE=Fastback Networks
 
@@ -43727,6 +43742,9 @@ OUI:18D717*
 OUI:18D949*
  ID_OUI_FROM_DATABASE=Qvis Labs, LLC
 
+OUI:18D9EF*
+ ID_OUI_FROM_DATABASE=Shuttle Inc.
+
 OUI:18DBF2*
  ID_OUI_FROM_DATABASE=Dell Inc.
 
@@ -44120,6 +44138,9 @@ OUI:1C66AA*
 OUI:1C6758*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
+OUI:1C697A*
+ ID_OUI_FROM_DATABASE=EliteGroup Computer Systems Co., LTD
+
 OUI:1C69A5*
  ID_OUI_FROM_DATABASE=BlackBerry RTS
 
@@ -47984,6 +48005,9 @@ OUI:304EC3*
 OUI:304F75*
  ID_OUI_FROM_DATABASE=DASAN Network Solutions
 
+OUI:3050FD*
+ ID_OUI_FROM_DATABASE=Skyworth Digital Technology(Shenzhen) Co.,Ltd
+
 OUI:3051F8*
  ID_OUI_FROM_DATABASE=BYK-Gardner GmbH
 
@@ -48743,6 +48767,9 @@ OUI:346AC2*
 OUI:346B46*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
+OUI:346B5B*
+ ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
+
 OUI:346BD3*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -49988,6 +50015,9 @@ OUI:38F135*
 OUI:38F23E*
  ID_OUI_FROM_DATABASE=Microsoft Mobile Oy
 
+OUI:38F32E*
+ ID_OUI_FROM_DATABASE=Skullcandy
+
 OUI:38F33F*
  ID_OUI_FROM_DATABASE=TATSUNO CORPORATION
 
@@ -51848,6 +51878,9 @@ OUI:444AB0*
 OUI:444B5D*
  ID_OUI_FROM_DATABASE=GE Healthcare
 
+OUI:444B7E*
+ ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
+
 OUI:444C0C*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -52508,6 +52541,9 @@ OUI:485D36*
 OUI:485D60*
  ID_OUI_FROM_DATABASE=AzureWave Technology Inc.
 
+OUI:485DEB*
+ ID_OUI_FROM_DATABASE=Just Add Power
+
 OUI:485F99*
  ID_OUI_FROM_DATABASE=Cloud Network Technology (Samoa) Limited
 
@@ -52631,6 +52667,9 @@ OUI:4886E8*
 OUI:48872D*
  ID_OUI_FROM_DATABASE=SHEN ZHEN DA XIA LONG QUE TECHNOLOGY CO.,LTD
 
+OUI:488764*
+ ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
+
 OUI:488803*
  ID_OUI_FROM_DATABASE=ManTechnology Inc.
 
@@ -52829,6 +52868,9 @@ OUI:48D845*
 OUI:48D855*
  ID_OUI_FROM_DATABASE=Telvent
 
+OUI:48D875*
+ ID_OUI_FROM_DATABASE=China TransInfo Technology Co., Ltd
+
 OUI:48D8FE*
  ID_OUI_FROM_DATABASE=ClarIDy Solutions, Inc.
 
@@ -53012,6 +53054,9 @@ OUI:4C16F1*
 OUI:4C16FC*
  ID_OUI_FROM_DATABASE=Juniper Networks
 
+OUI:4C1744*
+ ID_OUI_FROM_DATABASE=Amazon Technologies Inc.
+
 OUI:4C17EB*
  ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
 
@@ -53219,6 +53264,9 @@ OUI:4C6AF6*
 OUI:4C6E6E*
  ID_OUI_FROM_DATABASE=Comnect Technology CO.,LTD
 
+OUI:4C6F9C*
+ ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
+
 OUI:4C72B9*
  ID_OUI_FROM_DATABASE=PEGATRON CORPORATION
 
@@ -53297,6 +53345,9 @@ OUI:4C8FA5*
 OUI:4C910C*
  ID_OUI_FROM_DATABASE=Lanix Internacional, S.A. de C.V.
 
+OUI:4C9157*
+ ID_OUI_FROM_DATABASE=Fujian LANDI Commercial Equipment Co.,Ltd
+
 OUI:4C917A0*
  ID_OUI_FROM_DATABASE=Shenzhen Dangs Science & Technology CO.,LTD
 
@@ -53426,6 +53477,9 @@ OUI:4CBB58*
 OUI:4CBC42*
  ID_OUI_FROM_DATABASE=Shenzhen Hangsheng Electronics Co.,Ltd.
 
+OUI:4CBC48*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:4CBC980*
  ID_OUI_FROM_DATABASE=Charge-Amps AB
 
@@ -53741,6 +53795,9 @@ OUI:500FF5*
 OUI:5011EB*
  ID_OUI_FROM_DATABASE=SilverNet Ltd
 
+OUI:501395*
+ ID_OUI_FROM_DATABASE=Sichuan AI-Link Technology Co., Ltd.
+
 OUI:501479*
  ID_OUI_FROM_DATABASE=iRobot Corporation
 
@@ -53873,6 +53930,9 @@ OUI:503F98*
 OUI:504061*
  ID_OUI_FROM_DATABASE=Nokia
 
+OUI:5041B9*
+ ID_OUI_FROM_DATABASE=I-O DATA DEVICE,INC.
+
 OUI:5045F7*
  ID_OUI_FROM_DATABASE=Liuhe Intelligence Technology Ltd.
 
@@ -54026,6 +54086,9 @@ OUI:507224*
 OUI:50724D*
  ID_OUI_FROM_DATABASE=BEG Brueck Electronic GmbH
 
+OUI:5075F1*
+ ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
+
 OUI:507691*
  ID_OUI_FROM_DATABASE=Tekpea, Inc.
 
@@ -54251,6 +54314,9 @@ OUI:50C006*
 OUI:50C271*
  ID_OUI_FROM_DATABASE=SECURETECH INC
 
+OUI:50C4DD*
+ ID_OUI_FROM_DATABASE=BUFFALO.INC
+
 OUI:50C58D*
  ID_OUI_FROM_DATABASE=Juniper Networks
 
@@ -55748,6 +55814,9 @@ OUI:5C18B5*
 OUI:5C1A6F*
  ID_OUI_FROM_DATABASE=Cambridge Industries(Group) Co.,Ltd.
 
+OUI:5C1CB9*
+ ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
+
 OUI:5C1DD9*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -56333,6 +56402,9 @@ OUI:600810*
 OUI:600837*
  ID_OUI_FROM_DATABASE=ivvi Scientific(Nanchang)Co.Ltd
 
+OUI:6009C3*
+ ID_OUI_FROM_DATABASE=u-blox AG
+
 OUI:600B03*
  ID_OUI_FROM_DATABASE=Hangzhou H3C Technologies Co., Limited
 
@@ -56648,6 +56720,9 @@ OUI:6091F3*
 OUI:609217*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:6092F5*
+ ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
+
 OUI:609620*
  ID_OUI_FROM_DATABASE=Private
 
@@ -57464,6 +57539,9 @@ OUI:64CB5D*
 OUI:64CBA3*
  ID_OUI_FROM_DATABASE=Pointmobile
 
+OUI:64CC22*
+ ID_OUI_FROM_DATABASE=Arcadyan Corporation
+
 OUI:64CC2E*
  ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
 
@@ -57878,6 +57956,9 @@ OUI:687CD5*
 OUI:687F74*
  ID_OUI_FROM_DATABASE=Cisco-Linksys, LLC
 
+OUI:6882F2*
+ ID_OUI_FROM_DATABASE=grandcentrix GmbH
+
 OUI:68831A*
  ID_OUI_FROM_DATABASE=Pandora Mobility Corporation
 
@@ -58997,6 +59078,9 @@ OUI:702DD1*
 OUI:702E22*
  ID_OUI_FROM_DATABASE=zte corporation
 
+OUI:702E80*
+ ID_OUI_FROM_DATABASE=DIEHL Connectivity Solutions
+
 OUI:702ED9*
  ID_OUI_FROM_DATABASE=Guangzhou Shiyuan Electronics Co., Ltd.
 
@@ -59480,6 +59564,9 @@ OUI:70B3D5009*
 OUI:70B3D500A*
  ID_OUI_FROM_DATABASE=FUJICOM Co.,Ltd.
 
+OUI:70B3D500C*
+ ID_OUI_FROM_DATABASE=EXARA Group
+
 OUI:70B3D500D*
  ID_OUI_FROM_DATABASE=Scrona AG
 
@@ -59642,6 +59729,9 @@ OUI:70B3D5052*
 OUI:70B3D5054*
  ID_OUI_FROM_DATABASE=Groupeer Technologies
 
+OUI:70B3D5056*
+ ID_OUI_FROM_DATABASE=MIRAE INFORMATION TECHNOLOGY CO., LTD.
+
 OUI:70B3D5058*
  ID_OUI_FROM_DATABASE=Telink Semiconductor CO, Limtied, Taiwan
 
@@ -59843,6 +59933,9 @@ OUI:70B3D50AB*
 OUI:70B3D50AC*
  ID_OUI_FROM_DATABASE=RoboCore Tecnologia
 
+OUI:70B3D50AD*
+ ID_OUI_FROM_DATABASE=Vega-Absolute
+
 OUI:70B3D50AE*
  ID_OUI_FROM_DATABASE=Norsat International Inc.
 
@@ -60005,6 +60098,9 @@ OUI:70B3D50F0*
 OUI:70B3D50F1*
  ID_OUI_FROM_DATABASE=Beijing One City Science & Technology Co., LTD
 
+OUI:70B3D50F2*
+ ID_OUI_FROM_DATABASE=TrexEdge, Inc.
+
 OUI:70B3D50F3*
  ID_OUI_FROM_DATABASE=MonsoonRF, Inc.
 
@@ -60830,6 +60926,9 @@ OUI:70B3D5273*
 OUI:70B3D5274*
  ID_OUI_FROM_DATABASE=Stercom Power Solutions GmbH
 
+OUI:70B3D5275*
+ ID_OUI_FROM_DATABASE=INTERNET PROTOCOLO LOGICA SL
+
 OUI:70B3D5276*
  ID_OUI_FROM_DATABASE=TELL Software Hungaria Kft.
 
@@ -60941,6 +61040,9 @@ OUI:70B3D52A4*
 OUI:70B3D52A5*
  ID_OUI_FROM_DATABASE=Taitotekniikka
 
+OUI:70B3D52A6*
+ ID_OUI_FROM_DATABASE=GSI Technology
+
 OUI:70B3D52A7*
  ID_OUI_FROM_DATABASE=Plasmability, LLC
 
@@ -61424,6 +61526,9 @@ OUI:70B3D5384*
 OUI:70B3D5387*
  ID_OUI_FROM_DATABASE=GWF MessSysteme AG
 
+OUI:70B3D5388*
+ ID_OUI_FROM_DATABASE=Xitron
+
 OUI:70B3D5389*
  ID_OUI_FROM_DATABASE=Private
 
@@ -61871,6 +61976,9 @@ OUI:70B3D546B*
 OUI:70B3D546C*
  ID_OUI_FROM_DATABASE=SHANGHAI CHENZHU INSTRUMENT CO., LTD.
 
+OUI:70B3D546E*
+ ID_OUI_FROM_DATABASE=Zamir Recognition Systems Ltd.
+
 OUI:70B3D546F*
  ID_OUI_FROM_DATABASE=serva transport systems GmbH
 
@@ -61889,6 +61997,9 @@ OUI:70B3D5475*
 OUI:70B3D5476*
  ID_OUI_FROM_DATABASE=FR-Team International SA
 
+OUI:70B3D5477*
+ ID_OUI_FROM_DATABASE=digitrol limited
+
 OUI:70B3D5478*
  ID_OUI_FROM_DATABASE=Touchnet/OneCard
 
@@ -62345,6 +62456,9 @@ OUI:70B3D5555*
 OUI:70B3D5557*
  ID_OUI_FROM_DATABASE=HEITEC AG
 
+OUI:70B3D5558*
+ ID_OUI_FROM_DATABASE=Multiple Access Communications Ltd
+
 OUI:70B3D5559*
  ID_OUI_FROM_DATABASE=Eagle Mountain Technology
 
@@ -62744,6 +62858,9 @@ OUI:70B3D561E*
 OUI:70B3D561F*
  ID_OUI_FROM_DATABASE=Labotect Labor-Technik-Göttingen GmbH
 
+OUI:70B3D5620*
+ ID_OUI_FROM_DATABASE=Orlaco Products B.V.
+
 OUI:70B3D5623*
  ID_OUI_FROM_DATABASE=Beijing HuaLian Technology Co, Ltd.
 
@@ -62972,6 +63089,9 @@ OUI:70B3D5696*
 OUI:70B3D5697*
  ID_OUI_FROM_DATABASE=Alazar Technologies Inc.
 
+OUI:70B3D569A*
+ ID_OUI_FROM_DATABASE=Altaneos
+
 OUI:70B3D569C*
  ID_OUI_FROM_DATABASE=Keepen
 
@@ -63035,6 +63155,9 @@ OUI:70B3D56B7*
 OUI:70B3D56B8*
  ID_OUI_FROM_DATABASE=BT9
 
+OUI:70B3D56BA*
+ ID_OUI_FROM_DATABASE=Integrotech sp. z o.o.
+
 OUI:70B3D56BB*
  ID_OUI_FROM_DATABASE=LUCEO
 
@@ -63086,6 +63209,9 @@ OUI:70B3D56D9*
 OUI:70B3D56DA*
  ID_OUI_FROM_DATABASE=Enovative Networks, Inc.
 
+OUI:70B3D56DE*
+ ID_OUI_FROM_DATABASE=Ametek Solidstate Controls
+
 OUI:70B3D56DF*
  ID_OUI_FROM_DATABASE=Mango DSP, Inc.
 
@@ -63128,6 +63254,9 @@ OUI:70B3D56ED*
 OUI:70B3D56F0*
  ID_OUI_FROM_DATABASE=iTelaSoft Pvt Ltd
 
+OUI:70B3D56F1*
+ ID_OUI_FROM_DATABASE=Discover Battery
+
 OUI:70B3D56F2*
  ID_OUI_FROM_DATABASE=P&C Micro's Pty Ltd
 
@@ -63350,6 +63479,9 @@ OUI:70B3D5751*
 OUI:70B3D5753*
  ID_OUI_FROM_DATABASE=HCH. Kündig & CIE. AG
 
+OUI:70B3D5754*
+ ID_OUI_FROM_DATABASE=COSMOIT.CO.LTD
+
 OUI:70B3D5755*
  ID_OUI_FROM_DATABASE=LandmarkTech Systems Technology Co.,Ltd.
 
@@ -63593,6 +63725,9 @@ OUI:70B3D57B9*
 OUI:70B3D57BA*
  ID_OUI_FROM_DATABASE=Decentlab GmbH
 
+OUI:70B3D57BC*
+ ID_OUI_FROM_DATABASE=FIRST RF Corporation
+
 OUI:70B3D57BF*
  ID_OUI_FROM_DATABASE=Stone Three
 
@@ -63761,6 +63896,9 @@ OUI:70B3D5805*
 OUI:70B3D5807*
  ID_OUI_FROM_DATABASE=Camsat Przemysław Gralak
 
+OUI:70B3D5808*
+ ID_OUI_FROM_DATABASE=Becton Dickinson
+
 OUI:70B3D5809*
  ID_OUI_FROM_DATABASE=Tecnint HTE SRL
 
@@ -64094,6 +64232,9 @@ OUI:70B3D58A6*
 OUI:70B3D58A8*
  ID_OUI_FROM_DATABASE=megatec electronic GmbH
 
+OUI:70B3D58A9*
+ ID_OUI_FROM_DATABASE=WoKa-Elektronik GmbH
+
 OUI:70B3D58AB*
  ID_OUI_FROM_DATABASE=EMAC, Inc.
 
@@ -64220,9 +64361,6 @@ OUI:70B3D58EF*
 OUI:70B3D58F0*
  ID_OUI_FROM_DATABASE=ERAESEEDS co.,ltd.
 
-OUI:70B3D58F1*
- ID_OUI_FROM_DATABASE=Fränkische Rohrwerke Gebr. Kirchner GmbH & Co. KG
-
 OUI:70B3D58F2*
  ID_OUI_FROM_DATABASE=Rimota Limited
 
@@ -64397,6 +64535,9 @@ OUI:70B3D5943*
 OUI:70B3D5945*
  ID_OUI_FROM_DATABASE=Symboticware Incorporated
 
+OUI:70B3D5946*
+ ID_OUI_FROM_DATABASE=GREATWALL Infotech Co., Ltd.
+
 OUI:70B3D5947*
  ID_OUI_FROM_DATABASE=Checkbill Co,Ltd.
 
@@ -64652,6 +64793,9 @@ OUI:70B3D59BA*
 OUI:70B3D59BD*
  ID_OUI_FROM_DATABASE=Signal Processing Devices Sweden AB
 
+OUI:70B3D59BE*
+ ID_OUI_FROM_DATABASE=Izome
+
 OUI:70B3D59C0*
  ID_OUI_FROM_DATABASE=Schneider Displaytechnik GmbH
 
@@ -65531,6 +65675,9 @@ OUI:70B3D5B4A*
 OUI:70B3D5B4D*
  ID_OUI_FROM_DATABASE=Avidbots Corporation
 
+OUI:70B3D5B50*
+ ID_OUI_FROM_DATABASE=iGrid T&D
+
 OUI:70B3D5B51*
  ID_OUI_FROM_DATABASE=Critical Link LLC
 
@@ -65699,6 +65846,9 @@ OUI:70B3D5BA6*
 OUI:70B3D5BA7*
  ID_OUI_FROM_DATABASE=Digital Yacht Ltd
 
+OUI:70B3D5BA8*
+ ID_OUI_FROM_DATABASE=Controlled Power Company
+
 OUI:70B3D5BA9*
  ID_OUI_FROM_DATABASE=Alma
 
@@ -65768,6 +65918,9 @@ OUI:70B3D5BC3*
 OUI:70B3D5BC4*
  ID_OUI_FROM_DATABASE=Digital Media Professionals
 
+OUI:70B3D5BC5*
+ ID_OUI_FROM_DATABASE=U&R GmbH Hardware- und Systemdesign
+
 OUI:70B3D5BC6*
  ID_OUI_FROM_DATABASE=Hatteland Display AS
 
@@ -65798,6 +65951,9 @@ OUI:70B3D5BD2*
 OUI:70B3D5BD3*
  ID_OUI_FROM_DATABASE=FOTONA D.D.
 
+OUI:70B3D5BD4*
+ ID_OUI_FROM_DATABASE=YUYAMA MFG Co.,Ltd
+
 OUI:70B3D5BD5*
  ID_OUI_FROM_DATABASE=Synics AG
 
@@ -65846,6 +66002,9 @@ OUI:70B3D5BEC*
 OUI:70B3D5BED*
  ID_OUI_FROM_DATABASE=Itrinegy Ltd.
 
+OUI:70B3D5BEE*
+ ID_OUI_FROM_DATABASE=Sicon srl
+
 OUI:70B3D5BEF*
  ID_OUI_FROM_DATABASE=Sensortech Systems Inc.
 
@@ -66053,6 +66212,9 @@ OUI:70B3D5C4F*
 OUI:70B3D5C53*
  ID_OUI_FROM_DATABASE=S Labs sp. z o.o.
 
+OUI:70B3D5C54*
+ ID_OUI_FROM_DATABASE=Flexsolution APS
+
 OUI:70B3D5C55*
  ID_OUI_FROM_DATABASE=Intelligent Energy Ltd
 
@@ -66497,6 +66659,9 @@ OUI:70B3D5D37*
 OUI:70B3D5D38*
  ID_OUI_FROM_DATABASE=Vista Research, Inc.
 
+OUI:70B3D5D3A*
+ ID_OUI_FROM_DATABASE=PROMOMED RUS LLC
+
 OUI:70B3D5D3B*
  ID_OUI_FROM_DATABASE=NimbeLink Corp
 
@@ -66839,6 +67004,9 @@ OUI:70B3D5DD7*
 OUI:70B3D5DD8*
  ID_OUI_FROM_DATABASE=EMSCAN Corp.
 
+OUI:70B3D5DD9*
+ ID_OUI_FROM_DATABASE=MaNima Technologies BV
+
 OUI:70B3D5DDB*
  ID_OUI_FROM_DATABASE=Intra Corporation
 
@@ -66923,6 +67091,9 @@ OUI:70B3D5DFD*
 OUI:70B3D5DFF*
  ID_OUI_FROM_DATABASE=Spanawave Corporation
 
+OUI:70B3D5E00*
+ ID_OUI_FROM_DATABASE=Jeaway CCTV Security Ltd,.
+
 OUI:70B3D5E02*
  ID_OUI_FROM_DATABASE=YEHL & JORDAN LLC
 
@@ -66995,12 +67166,18 @@ OUI:70B3D5E27*
 OUI:70B3D5E28*
  ID_OUI_FROM_DATABASE=iotec GmbH
 
+OUI:70B3D5E29*
+ ID_OUI_FROM_DATABASE=Invent Vision - iVision Sistemas de Imagem e Visão S.A.
+
 OUI:70B3D5E2B*
  ID_OUI_FROM_DATABASE=Guan Show Technologe Co., Ltd.
 
 OUI:70B3D5E2C*
  ID_OUI_FROM_DATABASE=Fourth Frontier Technologies Private Limited
 
+OUI:70B3D5E2D*
+ ID_OUI_FROM_DATABASE=Private
+
 OUI:70B3D5E2E*
  ID_OUI_FROM_DATABASE=Merz s.r.o.
 
@@ -67484,6 +67661,9 @@ OUI:70B3D5F19*
 OUI:70B3D5F1A*
  ID_OUI_FROM_DATABASE=Sator Controls s.r.o.
 
+OUI:70B3D5F1C*
+ ID_OUI_FROM_DATABASE=Bavaria Digital Technik GmbH
+
 OUI:70B3D5F1D*
  ID_OUI_FROM_DATABASE=Critical Link LLC
 
@@ -67556,6 +67736,9 @@ OUI:70B3D5F3F*
 OUI:70B3D5F42*
  ID_OUI_FROM_DATABASE=Matsuhisa Corporation
 
+OUI:70B3D5F43*
+ ID_OUI_FROM_DATABASE=Divelbiss Corporation
+
 OUI:70B3D5F45*
  ID_OUI_FROM_DATABASE=Norbit ODM AS
 
@@ -67568,6 +67751,9 @@ OUI:70B3D5F4D*
 OUI:70B3D5F4F*
  ID_OUI_FROM_DATABASE=Power Electronics Espana, S.L.
 
+OUI:70B3D5F50*
+ ID_OUI_FROM_DATABASE=Vectology,Inc
+
 OUI:70B3D5F51*
  ID_OUI_FROM_DATABASE=IoT Routers Limited
 
@@ -67781,6 +67967,9 @@ OUI:70B3D5FAF*
 OUI:70B3D5FB0*
  ID_OUI_FROM_DATABASE=Rohde&Schwarz Topex SA
 
+OUI:70B3D5FB2*
+ ID_OUI_FROM_DATABASE=KJ3 Elektronik AB
+
 OUI:70B3D5FB3*
  ID_OUI_FROM_DATABASE=3PS Inc
 
@@ -68057,6 +68246,9 @@ OUI:70DB98*
 OUI:70DDA1*
  ID_OUI_FROM_DATABASE=Tellabs
 
+OUI:70DDA8*
+ ID_OUI_FROM_DATABASE=GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
+
 OUI:70DEE2*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -69167,6 +69359,9 @@ OUI:7829ED*
 OUI:782BCB*
  ID_OUI_FROM_DATABASE=Dell Inc.
 
+OUI:782C29*
+ ID_OUI_FROM_DATABASE=New H3C Technologies Co., Ltd
+
 OUI:782D7E*
  ID_OUI_FROM_DATABASE=TRENDnet, Inc.
 
@@ -70157,6 +70352,9 @@ OUI:7C4FB5*
 OUI:7C5049*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:7C50DA*
+ ID_OUI_FROM_DATABASE=Private
+
 OUI:7C5259*
  ID_OUI_FROM_DATABASE=Sichuan Jiuzhou Electronic Technology Co., Ltd.
 
@@ -70664,6 +70862,9 @@ OUI:7CD1C3*
 OUI:7CD30A*
  ID_OUI_FROM_DATABASE=INVENTEC CORPORATION
 
+OUI:7CD661*
+ ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
+
 OUI:7CD762*
  ID_OUI_FROM_DATABASE=Freestyle Technology Pty Ltd
 
@@ -70892,6 +71093,9 @@ OUI:801F12*
 OUI:8020AF*
  ID_OUI_FROM_DATABASE=Trade FIDES, a.s.
 
+OUI:8020DA*
+ ID_OUI_FROM_DATABASE=Sagemcom Broadband SAS
+
 OUI:802275*
  ID_OUI_FROM_DATABASE=Beijing Beny Wave Technology Co Ltd
 
@@ -71360,6 +71564,9 @@ OUI:80CF41*
 OUI:80D019*
  ID_OUI_FROM_DATABASE=Embed, Inc
 
+OUI:80D04A*
+ ID_OUI_FROM_DATABASE=Technicolor CH USA Inc.
+
 OUI:80D065*
  ID_OUI_FROM_DATABASE=CKS Corporation
 
@@ -71393,6 +71600,9 @@ OUI:80D733*
 OUI:80DA13*
  ID_OUI_FROM_DATABASE=eero inc.
 
+OUI:80DABC*
+ ID_OUI_FROM_DATABASE=Megafone Limited
+
 OUI:80DB31*
  ID_OUI_FROM_DATABASE=Power Quotient International Co., Ltd.
 
@@ -72068,6 +72278,9 @@ OUI:84C3E8*
 OUI:84C727*
  ID_OUI_FROM_DATABASE=Gnodal Ltd
 
+OUI:84C78F*
+ ID_OUI_FROM_DATABASE=STORDIS GmbH
+
 OUI:84C7A9*
  ID_OUI_FROM_DATABASE=C3PO S.A.
 
@@ -72200,6 +72413,9 @@ OUI:84E629*
 OUI:84E714*
  ID_OUI_FROM_DATABASE=Liang Herng Enterprise,Co.Ltd.
 
+OUI:84E892*
+ ID_OUI_FROM_DATABASE=Actiontec Electronics, Inc
+
 OUI:84EA99*
  ID_OUI_FROM_DATABASE=Vieworks
 
@@ -72236,6 +72452,9 @@ OUI:84FCAC*
 OUI:84FCFE*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:84FDD1*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:84FE9E*
  ID_OUI_FROM_DATABASE=RTC Industries, Inc.
 
@@ -72929,6 +73148,9 @@ OUI:88D962*
 OUI:88DA1A*
  ID_OUI_FROM_DATABASE=Redpine Signals, Inc.
 
+OUI:88DA33*
+ ID_OUI_FROM_DATABASE=Beijing Xiaoyuer Network Technology Co., Ltd
+
 OUI:88DC96*
  ID_OUI_FROM_DATABASE=SENAO Networks, Inc.
 
@@ -72965,6 +73187,9 @@ OUI:88E603*
 OUI:88E628*
  ID_OUI_FROM_DATABASE=Shenzhen Kezhonglong Optoelectronic Technology Co.,Ltd
 
+OUI:88E64B*
+ ID_OUI_FROM_DATABASE=Juniper Networks
+
 OUI:88E712*
  ID_OUI_FROM_DATABASE=Whirlpool Corporation
 
@@ -74057,6 +74282,9 @@ OUI:905851*
 OUI:9059AF*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
+OUI:905C34*
+ ID_OUI_FROM_DATABASE=Sirius Electronic Systems Srl
+
 OUI:905C44*
  ID_OUI_FROM_DATABASE=Compal Broadband Networks, Inc.
 
@@ -75083,6 +75311,9 @@ OUI:94EB2C*
 OUI:94EBCD*
  ID_OUI_FROM_DATABASE=BlackBerry RTS
 
+OUI:94EE9F*
+ ID_OUI_FROM_DATABASE=HMD Global Oy
+
 OUI:94F128*
  ID_OUI_FROM_DATABASE=Hewlett Packard Enterprise
 
@@ -75632,6 +75863,9 @@ OUI:98B039*
 OUI:98B6E9*
  ID_OUI_FROM_DATABASE=Nintendo Co.,Ltd
 
+OUI:98B8BA*
+ ID_OUI_FROM_DATABASE=LG Electronics (Mobile Communications)
+
 OUI:98B8E3*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -75923,6 +76157,9 @@ OUI:9C216A*
 OUI:9C220E*
  ID_OUI_FROM_DATABASE=TASCAN Systems GmbH
 
+OUI:9C25BE*
+ ID_OUI_FROM_DATABASE=Wildlife Acoustics, Inc.
+
 OUI:9C2840*
  ID_OUI_FROM_DATABASE=Discovery Technology,LTD..
 
@@ -77093,6 +77330,9 @@ OUI:A090DE*
 OUI:A09169*
  ID_OUI_FROM_DATABASE=LG Electronics (Mobile Communications)
 
+OUI:A091A2*
+ ID_OUI_FROM_DATABASE=OnePlus Electronics (Shenzhen) Co., Ltd.
+
 OUI:A091C8*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -78995,6 +79235,9 @@ OUI:AA0003*
 OUI:AA0004*
  ID_OUI_FROM_DATABASE=DIGITAL EQUIPMENT CORPORATION
 
+OUI:AC00D0*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:AC0142*
  ID_OUI_FROM_DATABASE=Uriel Technologies SIA
 
@@ -79487,6 +79730,9 @@ OUI:ACA31E*
 OUI:ACA430*
  ID_OUI_FROM_DATABASE=Peerless AV
 
+OUI:ACA46E*
+ ID_OUI_FROM_DATABASE=SHENZHEN GONGJIN ELECTRONICS CO.,LT
+
 OUI:ACA667*
  ID_OUI_FROM_DATABASE=Electronic Systems Protection, Inc.
 
@@ -79844,6 +80090,9 @@ OUI:B02A1F*
 OUI:B02A43*
  ID_OUI_FROM_DATABASE=Google, Inc.
 
+OUI:B03055*
+ ID_OUI_FROM_DATABASE=China Mobile IOT Company Limited
+
 OUI:B033A6*
  ID_OUI_FROM_DATABASE=Juniper Networks
 
@@ -79985,6 +80234,9 @@ OUI:B06EBF*
 OUI:B06FE0*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
+OUI:B0700D*
+ ID_OUI_FROM_DATABASE=Nokia
+
 OUI:B0702D*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -80138,6 +80390,9 @@ OUI:B0AA36*
 OUI:B0AA77*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
+OUI:B0AAD2*
+ ID_OUI_FROM_DATABASE=Sichuan tianyi kanghe communications co., LTD
+
 OUI:B0ACD2*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -80405,6 +80660,27 @@ OUI:B0FC0D*
 OUI:B0FC36*
  ID_OUI_FROM_DATABASE=CyberTAN Technology Inc.
 
+OUI:B0FD0B2*
+ ID_OUI_FROM_DATABASE=Vista Manufacturing
+
+OUI:B0FD0B3*
+ ID_OUI_FROM_DATABASE=DMAC Security LLC
+
+OUI:B0FD0B8*
+ ID_OUI_FROM_DATABASE=eSenseLab Ltd.
+
+OUI:B0FD0BA*
+ ID_OUI_FROM_DATABASE=TEMCO JAPAN CO., LTD.
+
+OUI:B0FD0BB*
+ ID_OUI_FROM_DATABASE=MartinLogan, Ltd.
+
+OUI:B0FD0BC*
+ ID_OUI_FROM_DATABASE=Haltian Products Oy
+
+OUI:B0FD0BD*
+ ID_OUI_FROM_DATABASE=Habana Labs LTD
+
 OUI:B0FEBD*
  ID_OUI_FROM_DATABASE=Private
 
@@ -82802,6 +83078,9 @@ OUI:C09F05*
 OUI:C09F42*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:C09FE1*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:C0A00D*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
@@ -83048,6 +83327,9 @@ OUI:C0F945*
 OUI:C0F991*
  ID_OUI_FROM_DATABASE=GME Standard Communications P/L
 
+OUI:C0FD84*
+ ID_OUI_FROM_DATABASE=zte corporation
+
 OUI:C0FFD4*
  ID_OUI_FROM_DATABASE=NETGEAR
 
@@ -83324,6 +83606,9 @@ OUI:C464B7*
 OUI:C464E3*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
+OUI:C46516*
+ ID_OUI_FROM_DATABASE=Hewlett Packard
+
 OUI:C46699*
  ID_OUI_FROM_DATABASE=vivo Mobile Communication Co., Ltd.
 
@@ -83852,6 +84137,51 @@ OUI:C8292A*
 OUI:C82A14*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:C82C2B0*
+ ID_OUI_FROM_DATABASE=Fungible, Inc.
+
+OUI:C82C2B1*
+ ID_OUI_FROM_DATABASE=Galgus
+
+OUI:C82C2B2*
+ ID_OUI_FROM_DATABASE=Repp Health
+
+OUI:C82C2B3*
+ ID_OUI_FROM_DATABASE=RF Engineering and Energy Resource
+
+OUI:C82C2B4*
+ ID_OUI_FROM_DATABASE=iWave Systems Tech Pvt Ltd
+
+OUI:C82C2B5*
+ ID_OUI_FROM_DATABASE=DALCO AG
+
+OUI:C82C2B6*
+ ID_OUI_FROM_DATABASE=Grav I.T.
+
+OUI:C82C2B7*
+ ID_OUI_FROM_DATABASE=Merpa Bilgi Islem Ltd.Sti
+
+OUI:C82C2B8*
+ ID_OUI_FROM_DATABASE=Verifone Systems (China),lnc.
+
+OUI:C82C2B9*
+ ID_OUI_FROM_DATABASE=BIOT Sp. z o.o.
+
+OUI:C82C2BA*
+ ID_OUI_FROM_DATABASE=Shiftall Inc.
+
+OUI:C82C2BB*
+ ID_OUI_FROM_DATABASE=Kunshan SVL Electric  Co.,Ltd
+
+OUI:C82C2BC*
+ ID_OUI_FROM_DATABASE=Smart Wires Inc
+
+OUI:C82C2BD*
+ ID_OUI_FROM_DATABASE=UBITRON Co.,LTD
+
+OUI:C82C2BE*
+ ID_OUI_FROM_DATABASE=Fränkische Rohrwerke Gebr. Kirchner GmbH & Co. KG
+
 OUI:C82E47*
  ID_OUI_FROM_DATABASE=Suzhou SmartChip Semiconductor Co., LTD
 
@@ -83990,6 +84320,9 @@ OUI:C863148*
 OUI:C863149*
  ID_OUI_FROM_DATABASE=Maxcom S.A.
 
+OUI:C86314A*
+ ID_OUI_FROM_DATABASE=Optictimes Co.,Ltd
+
 OUI:C86314B*
  ID_OUI_FROM_DATABASE=Shenzhen Lihewei Electronics Co.,Ltd.Hunan Branch
 
@@ -84221,6 +84554,9 @@ OUI:C8B21E*
 OUI:C8B373*
  ID_OUI_FROM_DATABASE=Cisco-Linksys, LLC
 
+OUI:C8B422*
+ ID_OUI_FROM_DATABASE=ASKEY COMPUTER CORP
+
 OUI:C8B5AD*
  ID_OUI_FROM_DATABASE=Hewlett Packard Enterprise
 
@@ -84923,6 +85259,9 @@ OUI:CC9F7A*
 OUI:CCA0E5*
  ID_OUI_FROM_DATABASE=DZG Metering GmbH
 
+OUI:CCA12B*
+ ID_OUI_FROM_DATABASE=TCL King Electrical Appliances (Huizhou) Co., Ltd
+
 OUI:CCA219*
  ID_OUI_FROM_DATABASE=SHENZHEN ALONG INVESTMENT CO.,LTD
 
@@ -85295,6 +85634,9 @@ OUI:D0176A*
 OUI:D017C2*
  ID_OUI_FROM_DATABASE=ASUSTek COMPUTER INC.
 
+OUI:D0196A*
+ ID_OUI_FROM_DATABASE=Ciena Corporation
+
 OUI:D01AA7*
  ID_OUI_FROM_DATABASE=UniPrint
 
@@ -85394,6 +85736,9 @@ OUI:D03972*
 OUI:D039B3*
  ID_OUI_FROM_DATABASE=ARRIS Group, Inc.
 
+OUI:D039EA*
+ ID_OUI_FROM_DATABASE=NetApp
+
 OUI:D03DC3*
  ID_OUI_FROM_DATABASE=AQ Corporation
 
@@ -85697,6 +86042,9 @@ OUI:D09B05*
 OUI:D09C30*
  ID_OUI_FROM_DATABASE=Foster Electric Company, Limited
 
+OUI:D09C7A*
+ ID_OUI_FROM_DATABASE=Xiaomi Communications Co Ltd
+
 OUI:D09D0A*
  ID_OUI_FROM_DATABASE=LINKCOM
 
@@ -86027,6 +86375,9 @@ OUI:D41F0C*
 OUI:D4206D*
  ID_OUI_FROM_DATABASE=HTC Corporation
 
+OUI:D420B0*
+ ID_OUI_FROM_DATABASE=Mist Systems, Inc.
+
 OUI:D42122*
  ID_OUI_FROM_DATABASE=Sercomm Corporation.
 
@@ -86114,6 +86465,9 @@ OUI:D43260*
 OUI:D43266*
  ID_OUI_FROM_DATABASE=Fike Corporation
 
+OUI:D4351D*
+ ID_OUI_FROM_DATABASE=Technicolor
+
 OUI:D43639*
  ID_OUI_FROM_DATABASE=Texas Instruments
 
@@ -86174,6 +86528,9 @@ OUI:D44C9C*
 OUI:D44CA7*
  ID_OUI_FROM_DATABASE=Informtekhnika & Communication, LLC
 
+OUI:D44DA4*
+ ID_OUI_FROM_DATABASE=Murata Manufacturing Co., Ltd.
+
 OUI:D44F80*
  ID_OUI_FROM_DATABASE=Kemper Digital GmbH
 
@@ -86273,6 +86630,9 @@ OUI:D468BA*
 OUI:D469A5*
  ID_OUI_FROM_DATABASE=Miura Systems Ltd.
 
+OUI:D46A35*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:D46A6A*
  ID_OUI_FROM_DATABASE=Hon Hai Precision Ind. Co.,Ltd.
 
@@ -86474,6 +86834,9 @@ OUI:D49CDD*
 OUI:D49CF4*
  ID_OUI_FROM_DATABASE=Palo Alto Networks
 
+OUI:D49DC0*
+ ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
+
 OUI:D49E05*
  ID_OUI_FROM_DATABASE=zte corporation
 
@@ -86603,6 +86966,9 @@ OUI:D4D184*
 OUI:D4D249*
  ID_OUI_FROM_DATABASE=Power Ethernet
 
+OUI:D4D252*
+ ID_OUI_FROM_DATABASE=Intel Corporate
+
 OUI:D4D2E5*
  ID_OUI_FROM_DATABASE=BKAV Corporation
 
@@ -87251,6 +87617,9 @@ OUI:D8CE3A*
 OUI:D8CF9C*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:D8D090*
+ ID_OUI_FROM_DATABASE=Dell Inc.
+
 OUI:D8D1CB*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -87473,6 +87842,9 @@ OUI:DC293A*
 OUI:DC2A14*
  ID_OUI_FROM_DATABASE=Shanghai Longjing Technology Co.
 
+OUI:DC2AA1*
+ ID_OUI_FROM_DATABASE=MedHab LLC
+
 OUI:DC2B2A*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
@@ -87728,6 +88100,9 @@ OUI:DC86D8*
 OUI:DC8B28*
  ID_OUI_FROM_DATABASE=Intel Corporate
 
+OUI:DC8C37*
+ ID_OUI_FROM_DATABASE=Cisco Systems, Inc
+
 OUI:DC9088*
  ID_OUI_FROM_DATABASE=HUAWEI TECHNOLOGIES CO.,LTD
 
@@ -87803,6 +88178,9 @@ OUI:DCAF68*
 OUI:DCB058*
  ID_OUI_FROM_DATABASE=Bürkert Werke GmbH
 
+OUI:DCB082*
+ ID_OUI_FROM_DATABASE=Nokia
+
 OUI:DCB3B4*
  ID_OUI_FROM_DATABASE=Honeywell Environmental & Combustion Controls (Tianjin) Co., Ltd.
 
@@ -88793,6 +89171,48 @@ OUI:E41C4B*
 OUI:E41D2D*
  ID_OUI_FROM_DATABASE=Mellanox Technologies, Inc.
 
+OUI:E41E0A0*
+ ID_OUI_FROM_DATABASE=Zavod № 423
+
+OUI:E41E0A1*
+ ID_OUI_FROM_DATABASE=Connected Cars A/S
+
+OUI:E41E0A2*
+ ID_OUI_FROM_DATABASE=IDvaco Private Limited
+
+OUI:E41E0A3*
+ ID_OUI_FROM_DATABASE=Avast Software s.r.o.
+
+OUI:E41E0A4*
+ ID_OUI_FROM_DATABASE=XPR Group
+
+OUI:E41E0A6*
+ ID_OUI_FROM_DATABASE=SFC Energy AG
+
+OUI:E41E0A7*
+ ID_OUI_FROM_DATABASE=Tritium Pty Ltd
+
+OUI:E41E0A8*
+ ID_OUI_FROM_DATABASE=SAGE Glass
+
+OUI:E41E0A9*
+ ID_OUI_FROM_DATABASE=B METERS S.R.L.
+
+OUI:E41E0AA*
+ ID_OUI_FROM_DATABASE=FireAngel Safety Technology Ltd
+
+OUI:E41E0AB*
+ ID_OUI_FROM_DATABASE=Safety Vision, LLC
+
+OUI:E41E0AC*
+ ID_OUI_FROM_DATABASE=TELETASK BELGIUM
+
+OUI:E41E0AD*
+ ID_OUI_FROM_DATABASE=ROMO Wind A/S
+
+OUI:E41E0AE*
+ ID_OUI_FROM_DATABASE=Shanghai LeXiang Technology Co., Ltd
+
 OUI:E41F13*
  ID_OUI_FROM_DATABASE=IBM Corp
 
@@ -89354,6 +89774,9 @@ OUI:E4F365*
 OUI:E4F3E3*
  ID_OUI_FROM_DATABASE=Shanghai iComhome Co.,Ltd.
 
+OUI:E4F3E8*
+ ID_OUI_FROM_DATABASE=Shenzhen SuperElectron Technology Co.,Ltd.
+
 OUI:E4F3F5*
  ID_OUI_FROM_DATABASE=SHENZHEN MERCURY COMMUNICATION TECHNOLOGIES CO.,LTD.
 
@@ -89811,7 +90234,7 @@ OUI:E8A364*
  ID_OUI_FROM_DATABASE=Signal Path International / Peachtree Audio
 
 OUI:E8A4C1*
- ID_OUI_FROM_DATABASE=Deep Sea Electronics PLC
+ ID_OUI_FROM_DATABASE=Deep Sea Electronics Ltd
 
 OUI:E8A788*
  ID_OUI_FROM_DATABASE=XIAMEN LEELEN TECHNOLOGY CO., LTD
@@ -89879,6 +90302,9 @@ OUI:E8C229*
 OUI:E8C320*
  ID_OUI_FROM_DATABASE=Austco Communication Systems Pty Ltd
 
+OUI:E8C417*
+ ID_OUI_FROM_DATABASE=Fiberhome Telecommunication Technologies Co.,LTD
+
 OUI:E8C57A*
  ID_OUI_FROM_DATABASE=Ufispace Co., LTD.
 
@@ -89906,6 +90332,9 @@ OUI:E8D099*
 OUI:E8D0FA*
  ID_OUI_FROM_DATABASE=MKS Instruments Deutschland GmbH
 
+OUI:E8D0FC*
+ ID_OUI_FROM_DATABASE=Liteon Technology Corporation
+
 OUI:E8D11B*
  ID_OUI_FROM_DATABASE=ASKEY COMPUTER CORP
 
@@ -89972,6 +90401,9 @@ OUI:E8E776*
 OUI:E8E875*
  ID_OUI_FROM_DATABASE=iS5 Communications Inc.
 
+OUI:E8E8B7*
+ ID_OUI_FROM_DATABASE=Murata Manufacturing Co., Ltd.
+
 OUI:E8EA6A*
  ID_OUI_FROM_DATABASE=StarTech.com
 
@@ -91541,6 +91973,9 @@ OUI:F430B9*
 OUI:F431C3*
  ID_OUI_FROM_DATABASE=Apple, Inc.
 
+OUI:F4323D*
+ ID_OUI_FROM_DATABASE=Sichuan tianyi kanghe communications co., LTD
+
 OUI:F436E1*
  ID_OUI_FROM_DATABASE=Abilis Systems SARL
 
@@ -92675,6 +93110,9 @@ OUI:F8B568E*
 OUI:F8B599*
  ID_OUI_FROM_DATABASE=Guangzhou CHNAVS Digital Technology Co.,Ltd
 
+OUI:F8B797*
+ ID_OUI_FROM_DATABASE=NEC Platforms, Ltd.
+
 OUI:F8B7E2*
  ID_OUI_FROM_DATABASE=Cisco Systems, Inc
 
@@ -92795,6 +93233,9 @@ OUI:F8DF15*
 OUI:F8DFA8*
  ID_OUI_FROM_DATABASE=zte corporation
 
+OUI:F8DFE1*
+ ID_OUI_FROM_DATABASE=MyLight Systems
+
 OUI:F8E079*
  ID_OUI_FROM_DATABASE=Motorola Mobility LLC, a Lenovo Company
 
@@ -92804,6 +93245,9 @@ OUI:F8E44E*
 OUI:F8E4FB*
  ID_OUI_FROM_DATABASE=Actiontec Electronics, Inc
 
+OUI:F8E5CF*
+ ID_OUI_FROM_DATABASE=CGI IT UK LIMITED
+
 OUI:F8E61A*
  ID_OUI_FROM_DATABASE=Samsung Electronics Co.,Ltd
 
index 1948f674a71b76030b7d86e077d36f0951e66cf6..962820772093873b2a4b109f32967b471c747fe9 100644 (file)
@@ -24,6 +24,9 @@ acpi:AMDI*:
 acpi:AMPC*:
  ID_VENDOR_FROM_DATABASE=Ampere Computing
 
+acpi:AMZN*:
+ ID_VENDOR_FROM_DATABASE=Amazon Corporation
+
 acpi:APMC*:
  ID_VENDOR_FROM_DATABASE=Applied Micro Circuits Corporation
 
@@ -1950,6 +1953,9 @@ acpi:DMC*:
 acpi:DMM*:
  ID_VENDOR_FROM_DATABASE=Dimond Multimedia Systems Inc
 
+acpi:DMN*:
+ ID_VENDOR_FROM_DATABASE=Dimension Engineering LLC
+
 acpi:DMO*:
  ID_VENDOR_FROM_DATABASE=Data Modul AG
 
index a89beda44a606ba561a8439e5c91a22c82b8443d..4a3588189b62ce74bbb2f9de7a7ad3f46f653401 100644 (file)
@@ -1,5 +1,5 @@
---- 20-acpi-vendor.hwdb.base   2019-01-22 10:22:42.983936186 +0100
-+++ 20-acpi-vendor.hwdb        2019-01-22 10:22:43.003936379 +0100
+--- 20-acpi-vendor.hwdb.base   2019-02-14 10:59:47.388792656 +0100
++++ 20-acpi-vendor.hwdb        2019-02-14 10:59:47.398792674 +0100
 @@ -3,6 +3,8 @@
  # Data imported from:
  #     http://www.uefi.org/uefi-pnp-export
@@ -19,7 +19,7 @@
  acpi:AMDI*:
   ID_VENDOR_FROM_DATABASE=AMD
  
-@@ -274,6 +273,9 @@
+@@ -277,6 +276,9 @@
  acpi:AAA*:
   ID_VENDOR_FROM_DATABASE=Avolites Ltd
  
@@ -29,7 +29,7 @@
  acpi:AAE*:
   ID_VENDOR_FROM_DATABASE=Anatek Electronics Inc.
  
-@@ -301,6 +303,9 @@
+@@ -304,6 +306,9 @@
  acpi:ABO*:
   ID_VENDOR_FROM_DATABASE=D-Link Systems Inc
  
@@ -39,7 +39,7 @@
  acpi:ABS*:
   ID_VENDOR_FROM_DATABASE=Abaco Systems, Inc.
  
-@@ -346,7 +351,7 @@
+@@ -349,7 +354,7 @@
  acpi:ACO*:
   ID_VENDOR_FROM_DATABASE=Allion Computer Inc.
  
@@ -48,7 +48,7 @@
   ID_VENDOR_FROM_DATABASE=Aspen Tech Inc
  
  acpi:ACR*:
-@@ -619,6 +624,9 @@
+@@ -622,6 +627,9 @@
  acpi:AMT*:
   ID_VENDOR_FROM_DATABASE=AMT International Industry
  
@@ -58,7 +58,7 @@
  acpi:AMX*:
   ID_VENDOR_FROM_DATABASE=AMX LLC
  
-@@ -667,6 +675,9 @@
+@@ -670,6 +678,9 @@
  acpi:AOA*:
   ID_VENDOR_FROM_DATABASE=AOpen Inc.
  
@@ -68,7 +68,7 @@
  acpi:AOE*:
   ID_VENDOR_FROM_DATABASE=Advanced Optics Electronics, Inc.
  
-@@ -676,6 +687,9 @@
+@@ -679,6 +690,9 @@
  acpi:AOT*:
   ID_VENDOR_FROM_DATABASE=Alcatel
  
@@ -78,7 +78,7 @@
  acpi:APC*:
   ID_VENDOR_FROM_DATABASE=American Power Conversion
  
-@@ -851,7 +865,7 @@
+@@ -854,7 +868,7 @@
   ID_VENDOR_FROM_DATABASE=Alps Electric Inc
  
  acpi:AUO*:
@@ -87,7 +87,7 @@
  
  acpi:AUR*:
   ID_VENDOR_FROM_DATABASE=Aureal Semiconductor
-@@ -931,6 +945,9 @@
+@@ -934,6 +948,9 @@
  acpi:AXE*:
   ID_VENDOR_FROM_DATABASE=Axell Corporation
  
@@ -97,7 +97,7 @@
  acpi:AXI*:
   ID_VENDOR_FROM_DATABASE=American Magnetics
  
-@@ -1078,6 +1095,9 @@
+@@ -1081,6 +1098,9 @@
  acpi:BML*:
   ID_VENDOR_FROM_DATABASE=BIOMED Lab
  
  acpi:BMS*:
   ID_VENDOR_FROM_DATABASE=BIOMEDISYS
  
-@@ -1090,6 +1110,9 @@
+@@ -1093,6 +1113,9 @@
  acpi:BNO*:
   ID_VENDOR_FROM_DATABASE=Bang & Olufsen
  
  acpi:BNS*:
   ID_VENDOR_FROM_DATABASE=Boulder Nonlinear Systems
  
-@@ -1330,6 +1353,9 @@
+@@ -1333,6 +1356,9 @@
  acpi:CHA*:
   ID_VENDOR_FROM_DATABASE=Chase Research PLC
  
  acpi:CHD*:
   ID_VENDOR_FROM_DATABASE=ChangHong Electric Co.,Ltd
  
-@@ -1483,6 +1509,9 @@
+@@ -1486,6 +1512,9 @@
  acpi:COD*:
   ID_VENDOR_FROM_DATABASE=CODAN Pty. Ltd.
  
  acpi:COI*:
   ID_VENDOR_FROM_DATABASE=Codec Inc.
  
-@@ -1886,7 +1915,7 @@
+@@ -1889,7 +1918,7 @@
   ID_VENDOR_FROM_DATABASE=Dragon Information Technology
  
  acpi:DJE*:
  
  acpi:DJP*:
   ID_VENDOR_FROM_DATABASE=Maygay Machines, Ltd
-@@ -2209,6 +2238,9 @@
+@@ -2215,6 +2244,9 @@
  acpi:EIN*:
   ID_VENDOR_FROM_DATABASE=Elegant Invention
  
  acpi:EKA*:
   ID_VENDOR_FROM_DATABASE=MagTek Inc.
  
-@@ -2467,6 +2499,9 @@
+@@ -2473,6 +2505,9 @@
  acpi:FCG*:
   ID_VENDOR_FROM_DATABASE=First International Computer Ltd
  
  acpi:FCS*:
   ID_VENDOR_FROM_DATABASE=Focus Enhancements, Inc.
  
-@@ -2837,7 +2872,7 @@
+@@ -2843,7 +2878,7 @@
   ID_VENDOR_FROM_DATABASE=General Standards Corporation
  
  acpi:GSM*:
  
  acpi:GSN*:
   ID_VENDOR_FROM_DATABASE=Grandstream Networks, Inc.
-@@ -2938,6 +2973,9 @@
+@@ -2944,6 +2979,9 @@
  acpi:HEC*:
   ID_VENDOR_FROM_DATABASE=Hisense Electric Co., Ltd.
  
  acpi:HEL*:
   ID_VENDOR_FROM_DATABASE=Hitachi Micro Systems Europe Ltd
  
-@@ -3067,6 +3105,9 @@
+@@ -3073,6 +3111,9 @@
  acpi:HSD*:
   ID_VENDOR_FROM_DATABASE=HannStar Display Corp
  
  acpi:HSM*:
   ID_VENDOR_FROM_DATABASE=AT&T Microelectronics
  
-@@ -3190,6 +3231,9 @@
+@@ -3196,6 +3237,9 @@
  acpi:ICI*:
   ID_VENDOR_FROM_DATABASE=Infotek Communication Inc
  
  acpi:ICM*:
   ID_VENDOR_FROM_DATABASE=Intracom SA
  
-@@ -3283,6 +3327,9 @@
+@@ -3289,6 +3333,9 @@
  acpi:IKE*:
   ID_VENDOR_FROM_DATABASE=Ikegami Tsushinki Co. Ltd.
  
  acpi:IKS*:
   ID_VENDOR_FROM_DATABASE=Ikos Systems Inc
  
-@@ -3328,6 +3375,9 @@
+@@ -3334,6 +3381,9 @@
  acpi:IMT*:
   ID_VENDOR_FROM_DATABASE=Inmax Technology Corporation
  
  acpi:INA*:
   ID_VENDOR_FROM_DATABASE=Inventec Corporation
  
-@@ -3835,6 +3885,9 @@
+@@ -3841,6 +3891,9 @@
  acpi:LAN*:
   ID_VENDOR_FROM_DATABASE=Sodeman Lancom Inc
  
  acpi:LAS*:
   ID_VENDOR_FROM_DATABASE=LASAT Comm. A/S
  
-@@ -3880,6 +3933,9 @@
+@@ -3886,6 +3939,9 @@
  acpi:LED*:
   ID_VENDOR_FROM_DATABASE=Long Engineering Design Inc
  
  acpi:LEG*:
   ID_VENDOR_FROM_DATABASE=Legerity, Inc
  
-@@ -3895,6 +3951,9 @@
+@@ -3901,6 +3957,9 @@
  acpi:LGC*:
   ID_VENDOR_FROM_DATABASE=Logic Ltd
  
  acpi:LGI*:
   ID_VENDOR_FROM_DATABASE=Logitech Inc
  
-@@ -3946,6 +4005,9 @@
+@@ -3952,6 +4011,9 @@
  acpi:LND*:
   ID_VENDOR_FROM_DATABASE=Land Computer Company Ltd
  
  acpi:LNK*:
   ID_VENDOR_FROM_DATABASE=Link Tech Inc
  
-@@ -3980,7 +4042,7 @@
+@@ -3986,7 +4048,7 @@
   ID_VENDOR_FROM_DATABASE=Design Technology
  
  acpi:LPL*:
  
  acpi:LSC*:
   ID_VENDOR_FROM_DATABASE=LifeSize Communications
-@@ -4156,6 +4218,9 @@
+@@ -4162,6 +4224,9 @@
  acpi:MCX*:
   ID_VENDOR_FROM_DATABASE=Millson Custom Solutions Inc.
  
  acpi:MDA*:
   ID_VENDOR_FROM_DATABASE=Media4 Inc
  
-@@ -4387,6 +4452,9 @@
+@@ -4393,6 +4458,9 @@
  acpi:MOM*:
   ID_VENDOR_FROM_DATABASE=Momentum Data Systems
  
  acpi:MOS*:
   ID_VENDOR_FROM_DATABASE=Moses Corporation
  
-@@ -4612,6 +4680,9 @@
+@@ -4618,6 +4686,9 @@
  acpi:NAL*:
   ID_VENDOR_FROM_DATABASE=Network Alchemy
  
  acpi:NAT*:
   ID_VENDOR_FROM_DATABASE=NaturalPoint Inc.
  
-@@ -5116,6 +5187,9 @@
+@@ -5122,6 +5193,9 @@
  acpi:PCX*:
   ID_VENDOR_FROM_DATABASE=PC Xperten
  
  acpi:PDM*:
   ID_VENDOR_FROM_DATABASE=Psion Dacom Plc.
  
-@@ -5179,9 +5253,6 @@
+@@ -5185,9 +5259,6 @@
  acpi:PHE*:
   ID_VENDOR_FROM_DATABASE=Philips Medical Systems Boeblingen GmbH
  
  acpi:PHL*:
   ID_VENDOR_FROM_DATABASE=Philips Consumer Electronics Company
  
-@@ -5266,9 +5337,6 @@
+@@ -5272,9 +5343,6 @@
  acpi:PNL*:
   ID_VENDOR_FROM_DATABASE=Panelview, Inc.
  
  acpi:PNR*:
   ID_VENDOR_FROM_DATABASE=Planar Systems, Inc.
  
-@@ -5404,15 +5472,9 @@
+@@ -5410,15 +5478,9 @@
  acpi:PTS*:
   ID_VENDOR_FROM_DATABASE=Plain Tree Systems Inc
  
  acpi:PVG*:
   ID_VENDOR_FROM_DATABASE=Proview Global Co., Ltd
  
-@@ -5728,9 +5790,6 @@
+@@ -5734,9 +5796,6 @@
  acpi:RTI*:
   ID_VENDOR_FROM_DATABASE=Rancho Tech Inc
  
  acpi:RTL*:
   ID_VENDOR_FROM_DATABASE=Realtek Semiconductor Company Ltd
  
-@@ -5896,9 +5955,6 @@
+@@ -5902,9 +5961,6 @@
  acpi:SEE*:
   ID_VENDOR_FROM_DATABASE=SeeColor Corporation
  
  acpi:SEI*:
   ID_VENDOR_FROM_DATABASE=Seitz & Associates Inc
  
-@@ -6352,6 +6408,9 @@
+@@ -6358,6 +6414,9 @@
  acpi:SVD*:
   ID_VENDOR_FROM_DATABASE=SVD Computer
  
  acpi:SVI*:
   ID_VENDOR_FROM_DATABASE=Sun Microsystems
  
-@@ -6436,6 +6495,9 @@
+@@ -6442,6 +6501,9 @@
  acpi:SZM*:
   ID_VENDOR_FROM_DATABASE=Shenzhen MTC Co., Ltd
  
  acpi:TAA*:
   ID_VENDOR_FROM_DATABASE=Tandberg
  
-@@ -6526,6 +6588,9 @@
+@@ -6532,6 +6594,9 @@
  acpi:TDG*:
   ID_VENDOR_FROM_DATABASE=Six15 Technologies
  
  acpi:TDM*:
   ID_VENDOR_FROM_DATABASE=Tandem Computer Europe Inc
  
-@@ -6568,6 +6633,9 @@
+@@ -6574,6 +6639,9 @@
  acpi:TEV*:
   ID_VENDOR_FROM_DATABASE=Televés, S.A.
  
  acpi:TEZ*:
   ID_VENDOR_FROM_DATABASE=Tech Source Inc.
  
-@@ -6682,9 +6750,6 @@
+@@ -6688,9 +6756,6 @@
  acpi:TNC*:
   ID_VENDOR_FROM_DATABASE=TNC Industrial Company Ltd
  
  acpi:TNM*:
   ID_VENDOR_FROM_DATABASE=TECNIMAGEN SA
  
-@@ -6991,14 +7056,14 @@
+@@ -6997,14 +7062,14 @@
  acpi:UNC*:
   ID_VENDOR_FROM_DATABASE=Unisys Corporation
  
  
  acpi:UNI*:
   ID_VENDOR_FROM_DATABASE=Uniform Industry Corp.
-@@ -7033,6 +7098,9 @@
+@@ -7039,6 +7104,9 @@
  acpi:USA*:
   ID_VENDOR_FROM_DATABASE=Utimaco Safeware AG
  
  acpi:USD*:
   ID_VENDOR_FROM_DATABASE=U.S. Digital Corporation
  
-@@ -7273,9 +7341,6 @@
+@@ -7279,9 +7347,6 @@
  acpi:WAL*:
   ID_VENDOR_FROM_DATABASE=Wave Access
  
  acpi:WAV*:
   ID_VENDOR_FROM_DATABASE=Wavephore
  
-@@ -7397,7 +7462,7 @@
+@@ -7403,7 +7468,7 @@
   ID_VENDOR_FROM_DATABASE=WyreStorm Technologies LLC
  
  acpi:WYS*:
  
  acpi:WYT*:
   ID_VENDOR_FROM_DATABASE=Wooyoung Image & Information Co.,Ltd.
-@@ -7411,9 +7476,6 @@
+@@ -7417,9 +7482,6 @@
  acpi:XDM*:
   ID_VENDOR_FROM_DATABASE=XDM Ltd.
  
  acpi:XES*:
   ID_VENDOR_FROM_DATABASE=Extreme Engineering Solutions, Inc.
  
-@@ -7444,9 +7506,6 @@
+@@ -7450,9 +7512,6 @@
  acpi:XNT*:
   ID_VENDOR_FROM_DATABASE=XN Technologies, Inc.
  
  acpi:XQU*:
   ID_VENDOR_FROM_DATABASE=SHANGHAI SVA-DAV ELECTRONICS CO., LTD
  
-@@ -7513,6 +7572,9 @@
+@@ -7519,6 +7578,9 @@
  acpi:ZBX*:
   ID_VENDOR_FROM_DATABASE=Zebax Technologies
  
index d1c7ec36c518dc6ea3c13d5eb1854026b19c2a9d..9ca2c7bd717e8f65e31d78b8132fb83f519f0fa4 100644 (file)
@@ -1376,6 +1376,9 @@ pci:v00001000d00000072*
 pci:v00001000d00000072sv00001000sd00003040*
  ID_MODEL_FROM_DATABASE=SAS2008 PCI-Express Fusion-MPT SAS-2 [Falcon] (9210-8i)
 
+pci:v00001000d00000072sv00001000sd00003080*
+ ID_MODEL_FROM_DATABASE=SAS2008 PCI-Express Fusion-MPT SAS-2 [Falcon] (9200-8e [LSI SAS 6Gb/s SAS/SATA PCIe x8 External HBA])
+
 pci:v00001000d00000072sv00001000sd000030B0*
  ID_MODEL_FROM_DATABASE=SAS2008 PCI-Express Fusion-MPT SAS-2 [Falcon] (9200-8e [LSI SAS 6Gb/s SAS/SATA PCIe x8 External HBA])
 
@@ -1694,6 +1697,9 @@ pci:v00001000d00000087*
 pci:v00001000d00000087sv00001000sd00003020*
  ID_MODEL_FROM_DATABASE=SAS2308 PCI-Express Fusion-MPT SAS-2 (9207-8i SAS2.1 HBA)
 
+pci:v00001000d00000087sv00001000sd00003030*
+ ID_MODEL_FROM_DATABASE=SAS2308 PCI-Express Fusion-MPT SAS-2 (SAS9207-4i4e)
+
 pci:v00001000d00000087sv00001000sd00003040*
  ID_MODEL_FROM_DATABASE=SAS2308 PCI-Express Fusion-MPT SAS-2 (9207-8e SAS2.1 HBA)
 
@@ -1784,6 +1790,9 @@ pci:v00001000d00000097sv00001028sd00001FD2*
 pci:v00001000d00000097sv00001028sd00001FD3*
  ID_MODEL_FROM_DATABASE=SAS3008 PCI-Express Fusion-MPT SAS-3 (HBA330 MMZ)
 
+pci:v00001000d00000097sv000015D9sd00000808*
+ ID_MODEL_FROM_DATABASE=SAS3008 PCI-Express Fusion-MPT SAS-3 (AOC-S3008L-L8e)
+
 pci:v00001000d00000097sv00001BD4sd00000011*
  ID_MODEL_FROM_DATABASE=SAS3008 PCI-Express Fusion-MPT SAS-3 (Inspur 12Gb 8i-3008 IT SAS HBA)
 
@@ -2327,6 +2336,9 @@ pci:v00001002d00001551*
 pci:v00001002d00001552*
  ID_MODEL_FROM_DATABASE=Pooky
 
+pci:v00001002d00001561*
+ ID_MODEL_FROM_DATABASE=Anubis
+
 pci:v00001002d000015D8*
  ID_MODEL_FROM_DATABASE=Picasso
 
@@ -2340,10 +2352,13 @@ pci:v00001002d000015DDsv00001458sd0000D000*
  ID_MODEL_FROM_DATABASE=Raven Ridge [Radeon Vega Series / Radeon Vega Mobile Series] (Radeon RX Vega 11)
 
 pci:v00001002d000015DE*
- ID_MODEL_FROM_DATABASE=Raven Ridge HDMI/DP Audio Controller
+ ID_MODEL_FROM_DATABASE=Raven/Raven2/Fenghuang HDMI/DP Audio Controller
+
+pci:v00001002d000015DF*
+ ID_MODEL_FROM_DATABASE=Raven/Raven2/Fenghuang/Renoir Cryptographic Coprocessor
 
 pci:v00001002d000015FF*
- ID_MODEL_FROM_DATABASE=Vega 11 [Radeon Vega 28 Mobile]
+ ID_MODEL_FROM_DATABASE=Fenghuang [Zhongshan Subor Z+]
 
 pci:v00001002d00001607*
  ID_MODEL_FROM_DATABASE=Arden
@@ -2357,6 +2372,9 @@ pci:v00001002d00001714*
 pci:v00001002d00001714sv0000103Csd0000168B*
  ID_MODEL_FROM_DATABASE=BeaverCreek HDMI Audio [Radeon HD 6500D and 6400G-6600G series] (ProBook 4535s)
 
+pci:v00001002d00002191*
+ ID_MODEL_FROM_DATABASE=TU116M
+
 pci:v00001002d00003150*
  ID_MODEL_FROM_DATABASE=RV380/M24 [Mobility Radeon X600]
 
@@ -2595,7 +2613,7 @@ pci:v00001002d00004337sv0000103Csd00000850*
  ID_MODEL_FROM_DATABASE=RS200M [Radeon IGP 330M/340M/345M/350M] (Radeon IGP 345M)
 
 pci:v00001002d00004341*
- ID_MODEL_FROM_DATABASE=IXP150 AC'97 Audio Controller
+ ID_MODEL_FROM_DATABASE=SB200 AC97 Audio Controller
 
 pci:v00001002d00004342*
  ID_MODEL_FROM_DATABASE=SB200 PCI to PCI Bridge
@@ -2619,7 +2637,7 @@ pci:v00001002d0000434C*
  ID_MODEL_FROM_DATABASE=SB200 PCI to LPC Bridge
 
 pci:v00001002d0000434D*
- ID_MODEL_FROM_DATABASE=IXP AC'97 Modem
+ ID_MODEL_FROM_DATABASE=SB200 AC97 Modem Controller
 
 pci:v00001002d00004353*
  ID_MODEL_FROM_DATABASE=SB200 SMBus Controller
@@ -3254,6 +3272,12 @@ pci:v00001002d00004437*
 pci:v00001002d00004554*
  ID_MODEL_FROM_DATABASE=210888ET [Mach64 ET]
 
+pci:v00001002d00004630*
+ ID_MODEL_FROM_DATABASE=XENOS Parent Die (XBOX 360)
+
+pci:v00001002d00004631*
+ ID_MODEL_FROM_DATABASE=XENOS Daughter Die (XBOX 360)
+
 pci:v00001002d00004654*
  ID_MODEL_FROM_DATABASE=Mach64 VT
 
@@ -3494,6 +3518,168 @@ pci:v00001002d0000475Asv00001002sd00000087*
 pci:v00001002d0000475Asv00001002sd0000475A*
  ID_MODEL_FROM_DATABASE=3D Rage IIC AGP (Rage IIC AGP)
 
+pci:v00001002d00004845*
+ ID_MODEL_FROM_DATABASE=Xilleon 220 HBIU for HDTV2
+
+pci:v00001002d00004846*
+ ID_MODEL_FROM_DATABASE=Xilleon 220 IDE for HDTV2
+
+pci:v00001002d00004847*
+ ID_MODEL_FROM_DATABASE=Xilleon 220 USB for HDTV2
+
+pci:v00001002d00004848*
+ ID_MODEL_FROM_DATABASE=Xilleon 220 DAIO-0 for HDTV2
+
+pci:v00001002d00004849*
+ ID_MODEL_FROM_DATABASE=Xilleon 220 DAIO-1 for HDTV2
+
+pci:v00001002d0000484A*
+ ID_MODEL_FROM_DATABASE=Xilleon 220 LPC for HDTV2
+
+pci:v00001002d00004850*
+ ID_MODEL_FROM_DATABASE=Xilleon 215 HBIU for X215
+
+pci:v00001002d00004851*
+ ID_MODEL_FROM_DATABASE=Xilleon 215 IDE for X215
+
+pci:v00001002d00004852*
+ ID_MODEL_FROM_DATABASE=Xilleon 215 USB for X215
+
+pci:v00001002d00004853*
+ ID_MODEL_FROM_DATABASE=Xilleon 215 DAIO-0 for X215
+
+pci:v00001002d00004854*
+ ID_MODEL_FROM_DATABASE=Xilleon 215 DAIO-1 for X215
+
+pci:v00001002d00004855*
+ ID_MODEL_FROM_DATABASE=Xilleon 225 HBIU for X225
+
+pci:v00001002d00004856*
+ ID_MODEL_FROM_DATABASE=Xilleon 225 IDE for X225
+
+pci:v00001002d00004857*
+ ID_MODEL_FROM_DATABASE=Xilleon 225 USB for X225
+
+pci:v00001002d00004858*
+ ID_MODEL_FROM_DATABASE=Xilleon 225 DAIO-0 for X225
+
+pci:v00001002d00004859*
+ ID_MODEL_FROM_DATABASE=Xilleon 225 DAIO-1 for X225
+
+pci:v00001002d00004860*
+ ID_MODEL_FROM_DATABASE=Xilleon 210 HBIU for X210
+
+pci:v00001002d00004861*
+ ID_MODEL_FROM_DATABASE=Xilleon 210 IDE for X210
+
+pci:v00001002d00004862*
+ ID_MODEL_FROM_DATABASE=Xilleon 210 USB for X210
+
+pci:v00001002d00004863*
+ ID_MODEL_FROM_DATABASE=Xilleon 210 DAIO-0 for X210
+
+pci:v00001002d00004864*
+ ID_MODEL_FROM_DATABASE=Xilleon 210 DAIO-1 for X210
+
+pci:v00001002d00004865*
+ ID_MODEL_FROM_DATABASE=Xilleon 226 HBIU for X226
+
+pci:v00001002d00004866*
+ ID_MODEL_FROM_DATABASE=Xilleon 226 IDE for X226
+
+pci:v00001002d00004867*
+ ID_MODEL_FROM_DATABASE=Xilleon 226 USB for X226
+
+pci:v00001002d00004868*
+ ID_MODEL_FROM_DATABASE=Xilleon 226 DAIO-0 for X226
+
+pci:v00001002d00004869*
+ ID_MODEL_FROM_DATABASE=Xilleon 226 DAIO-1 for X226
+
+pci:v00001002d0000486A*
+ ID_MODEL_FROM_DATABASE=Xilleon 240S HBIU for X240S
+
+pci:v00001002d0000486B*
+ ID_MODEL_FROM_DATABASE=Xilleon 240H HBIU for X240H
+
+pci:v00001002d0000486C*
+ ID_MODEL_FROM_DATABASE=Xilleon 240S USB for X240S
+
+pci:v00001002d0000486D*
+ ID_MODEL_FROM_DATABASE=Xilleon 240H USB for X240H
+
+pci:v00001002d0000486E*
+ ID_MODEL_FROM_DATABASE=Xilleon 250 USB 1.1 for X250
+
+pci:v00001002d0000486F*
+ ID_MODEL_FROM_DATABASE=Xilleon 260 USB 1.1 for X260
+
+pci:v00001002d00004870*
+ ID_MODEL_FROM_DATABASE=Xilleon 250 HBIU for X250
+
+pci:v00001002d00004871*
+ ID_MODEL_FROM_DATABASE=Xilleon 250 IDE for X250
+
+pci:v00001002d00004872*
+ ID_MODEL_FROM_DATABASE=Xilleon 234/235 HBIU for X234/X235
+
+pci:v00001002d00004873*
+ ID_MODEL_FROM_DATABASE=Xilleon 244/245 HBIU for X244/X245
+
+pci:v00001002d00004874*
+ ID_MODEL_FROM_DATABASE=Xilleon 234/235 USB 1.1 for X234/X235
+
+pci:v00001002d00004875*
+ ID_MODEL_FROM_DATABASE=Xilleon 260 HBIU for X260
+
+pci:v00001002d00004876*
+ ID_MODEL_FROM_DATABASE=Xilleon 260 IDE for X260
+
+pci:v00001002d00004877*
+ ID_MODEL_FROM_DATABASE=Xilleon 244/245 USB 1.1 for X244/X245
+
+pci:v00001002d00004878*
+ ID_MODEL_FROM_DATABASE=Xilleon 270 HBIU for X270
+
+pci:v00001002d0000487B*
+ ID_MODEL_FROM_DATABASE=Xilleon 242 HBIU for X242
+
+pci:v00001002d0000487D*
+ ID_MODEL_FROM_DATABASE=Xilleon 242 USB 1.1 for X242
+
+pci:v00001002d00004880*
+ ID_MODEL_FROM_DATABASE=Xilleon 254 HBIU for X254
+
+pci:v00001002d00004881*
+ ID_MODEL_FROM_DATABASE=Xilleon 254 USB 1.1 for X254
+
+pci:v00001002d00004882*
+ ID_MODEL_FROM_DATABASE=Xilleon 255 HBIU for X255
+
+pci:v00001002d00004883*
+ ID_MODEL_FROM_DATABASE=Xilleon 255 USB 1.1 for X255
+
+pci:v00001002d00004884*
+ ID_MODEL_FROM_DATABASE=Xilleon 243 HBIU for X243
+
+pci:v00001002d00004885*
+ ID_MODEL_FROM_DATABASE=Xilleon 243 USB 1.1 for X243
+
+pci:v00001002d00004886*
+ ID_MODEL_FROM_DATABASE=Xilleon 233 HBIU for X233
+
+pci:v00001002d00004887*
+ ID_MODEL_FROM_DATABASE=Xilleon 233 USB 1.1 for X233
+
+pci:v00001002d00004888*
+ ID_MODEL_FROM_DATABASE=Xilleon 143 HBIU for X143
+
+pci:v00001002d00004889*
+ ID_MODEL_FROM_DATABASE=Xilleon 143 HBIU for X143L
+
+pci:v00001002d0000488A*
+ ID_MODEL_FROM_DATABASE=Xilleon 143 HBIU for X143S
+
 pci:v00001002d00004966*
  ID_MODEL_FROM_DATABASE=RV250 [Radeon 9000 Series]
 
@@ -4910,12 +5096,6 @@ pci:v00001002d00006601*
 pci:v00001002d00006601sv0000103Csd00002100*
  ID_MODEL_FROM_DATABASE=Mars [Radeon HD 8730M] (FirePro M4100)
 
-pci:v00001002d00006602*
- ID_MODEL_FROM_DATABASE=Mars
-
-pci:v00001002d00006603*
- ID_MODEL_FROM_DATABASE=Mars
-
 pci:v00001002d00006604*
  ID_MODEL_FROM_DATABASE=Opal XT [Radeon R7 M265/M365X/M465]
 
@@ -5012,15 +5192,6 @@ pci:v00001002d00006613sv0000148Csd00007340*
 pci:v00001002d00006613sv00001682sd00007240*
  ID_MODEL_FROM_DATABASE=Oland PRO [Radeon R7 240/340] (R7 240 2048 MB)
 
-pci:v00001002d00006620*
- ID_MODEL_FROM_DATABASE=Mars
-
-pci:v00001002d00006621*
- ID_MODEL_FROM_DATABASE=Mars PRO
-
-pci:v00001002d00006623*
- ID_MODEL_FROM_DATABASE=Mars
-
 pci:v00001002d00006631*
  ID_MODEL_FROM_DATABASE=Oland
 
@@ -5136,40 +5307,40 @@ pci:v00001002d0000665Fsv00001682sd00007360*
  ID_MODEL_FROM_DATABASE=Tobago PRO [Radeon R7 360 / R9 360 OEM] (Radeon R7 360)
 
 pci:v00001002d00006660*
- ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / R7 M520]
+ ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / Radeon 520 Mobile]
 
 pci:v00001002d00006660sv00001028sd000005EA*
- ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / R7 M520] (Radeon HD 8670M)
+ ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / Radeon 520 Mobile] (Radeon HD 8670M)
 
 pci:v00001002d00006660sv00001028sd000006BF*
- ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / R7 M520] (Radeon R5 M335)
+ ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / Radeon 520 Mobile] (Radeon R5 M335)
 
 pci:v00001002d00006660sv0000103Csd00001970*
- ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / R7 M520] (Radeon HD 8670M)
+ ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / Radeon 520 Mobile] (Radeon HD 8670M)
 
 pci:v00001002d00006660sv0000103Csd000080BE*
- ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / R7 M520] (Radeon R5 M330)
+ ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / Radeon 520 Mobile] (Radeon R5 M330)
 
 pci:v00001002d00006660sv0000103Csd00008136*
- ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / R7 M520] (Radeon R5 M330)
+ ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / Radeon 520 Mobile] (Radeon R5 M330)
 
 pci:v00001002d00006660sv0000103Csd00008329*
- ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / R7 M520] (Radeon R7 M520)
+ ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / Radeon 520 Mobile] (Radeon R7 M520)
 
 pci:v00001002d00006660sv000017AAsd00003633*
- ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / R7 M520] (Radeon R5 A330)
+ ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / Radeon 520 Mobile] (Radeon R5 A330)
 
 pci:v00001002d00006660sv000017AAsd00003804*
- ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / R7 M520] (Radeon R5 M330)
+ ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / Radeon 520 Mobile] (Radeon R5 M330)
 
 pci:v00001002d00006660sv000017AAsd00003809*
- ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / R7 M520] (Radeon R5 M330)
+ ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / Radeon 520 Mobile] (Radeon R5 M330)
 
 pci:v00001002d00006660sv000017AAsd0000381A*
- ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / R7 M520] (Radeon R5 M430)
+ ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / Radeon 520 Mobile] (Radeon R5 M430)
 
 pci:v00001002d00006660sv000017AAsd0000390C*
- ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / R7 M520] (Radeon R5 M330)
+ ID_MODEL_FROM_DATABASE=Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / Radeon 520 Mobile] (Radeon R5 M330)
 
 pci:v00001002d00006663*
  ID_MODEL_FROM_DATABASE=Sun PRO [Radeon HD 8570A/8570M]
@@ -5184,13 +5355,13 @@ pci:v00001002d00006664*
  ID_MODEL_FROM_DATABASE=Jet XT [Radeon R5 M240]
 
 pci:v00001002d00006665*
- ID_MODEL_FROM_DATABASE=Jet PRO [Radeon R5 M230 / R7 M260DX]
+ ID_MODEL_FROM_DATABASE=Jet PRO [Radeon R5 M230 / R7 M260DX / Radeon 520 Mobile]
 
 pci:v00001002d00006665sv000017AAsd00001309*
- ID_MODEL_FROM_DATABASE=Jet PRO [Radeon R5 M230 / R7 M260DX] (Radeon R7 M260DX)
+ ID_MODEL_FROM_DATABASE=Jet PRO [Radeon R5 M230 / R7 M260DX / Radeon 520 Mobile] (Radeon R7 M260DX)
 
 pci:v00001002d00006665sv000017AAsd0000368F*
- ID_MODEL_FROM_DATABASE=Jet PRO [Radeon R5 M230 / R7 M260DX] (Radeon R5 A230)
+ ID_MODEL_FROM_DATABASE=Jet PRO [Radeon R5 M230 / R7 M260DX / Radeon 520 Mobile] (Radeon R5 A230)
 
 pci:v00001002d00006667*
  ID_MODEL_FROM_DATABASE=Jet ULT [Radeon R5 M230]
@@ -5214,7 +5385,7 @@ pci:v00001002d000066A7*
  ID_MODEL_FROM_DATABASE=Vega 20 [Radeon Pro Vega 20]
 
 pci:v00001002d000066AF*
- ID_MODEL_FROM_DATABASE=Vega 20
+ ID_MODEL_FROM_DATABASE=Vega 20 [Radeon VII]
 
 pci:v00001002d00006704*
  ID_MODEL_FROM_DATABASE=Cayman PRO GL [FirePro V7900]
@@ -9399,11 +9570,14 @@ pci:v00001002d00006939sv0000174Bsd0000E308*
  ID_MODEL_FROM_DATABASE=Tonga PRO [Radeon R9 285/380] (Radeon R9 380 Nitro 4G D5)
 
 pci:v00001002d0000694C*
- ID_MODEL_FROM_DATABASE=Polaris 22 [Radeon RX Vega M GH]
+ ID_MODEL_FROM_DATABASE=Polaris 22 XT [Radeon RX Vega M GH]
 
 pci:v00001002d0000694E*
  ID_MODEL_FROM_DATABASE=Polaris 22 XL [Radeon RX Vega M GL]
 
+pci:v00001002d0000694F*
+ ID_MODEL_FROM_DATABASE=Polaris 22 MGL XL [Radeon Pro WX Vega M GL]
+
 pci:v00001002d00006980*
  ID_MODEL_FROM_DATABASE=Polaris12
 
@@ -10742,6 +10916,12 @@ pci:v00001002d00009874sv000017AAsd00005116*
 pci:v00001002d00009874sv000017AAsd00005118*
  ID_MODEL_FROM_DATABASE=Wani [Radeon R5/R6/R7 Graphics] (Radeon R5 Graphics)
 
+pci:v00001002d00009890*
+ ID_MODEL_FROM_DATABASE=Amur
+
+pci:v00001002d000098C0*
+ ID_MODEL_FROM_DATABASE=Nolan
+
 pci:v00001002d000098E4*
  ID_MODEL_FROM_DATABASE=Stoney [Radeon R2/R3/R4/R5 Graphics]
 
@@ -10823,12 +11003,30 @@ pci:v00001002d00009918*
 pci:v00001002d00009919*
  ID_MODEL_FROM_DATABASE=Trinity [Radeon HD 7500G]
 
+pci:v00001002d0000991E*
+ ID_MODEL_FROM_DATABASE=Bishop
+
 pci:v00001002d00009920*
  ID_MODEL_FROM_DATABASE=Liverpool [Playstation 4 APU]
 
 pci:v00001002d00009921*
  ID_MODEL_FROM_DATABASE=Liverpool HDMI/DP Audio Controller
 
+pci:v00001002d00009922*
+ ID_MODEL_FROM_DATABASE=Starshp
+
+pci:v00001002d00009923*
+ ID_MODEL_FROM_DATABASE=Starsha2 [Kingston/Clayton]
+
+pci:v00001002d00009924*
+ ID_MODEL_FROM_DATABASE=Gladius
+
+pci:v00001002d00009925*
+ ID_MODEL_FROM_DATABASE=Kingston/Clayton/Jupiter/Gladius/Montego HDMI Controller
+
+pci:v00001002d00009926*
+ ID_MODEL_FROM_DATABASE=Jupiter
+
 pci:v00001002d00009990*
  ID_MODEL_FROM_DATABASE=Trinity 2 [Radeon HD 7520G]
 
@@ -10962,7 +11160,7 @@ pci:v00001002d0000AAA0*
  ID_MODEL_FROM_DATABASE=Tahiti HDMI Audio [Radeon HD 7870 XT / 7950/7970]
 
 pci:v00001002d0000AAB0*
- ID_MODEL_FROM_DATABASE=Cape Verde/Pitcairn HDMI Audio [Radeon HD 7700/7800 Series]
+ ID_MODEL_FROM_DATABASE=Oland/Hainan/Cape Verde/Pitcairn HDMI Audio [Radeon HD 7000 Series]
 
 pci:v00001002d0000AAC0*
  ID_MODEL_FROM_DATABASE=Tobago HDMI Audio [Radeon R7 360 / R9 360 OEM]
@@ -10983,14 +11181,77 @@ pci:v00001002d0000AAE8*
  ID_MODEL_FROM_DATABASE=Fiji HDMI/DP Audio [Radeon R9 Nano / FURY/FURY X]
 
 pci:v00001002d0000AAF0*
- ID_MODEL_FROM_DATABASE=Ellesmere [Radeon RX 570/580]
+ ID_MODEL_FROM_DATABASE=Ellesmere HDMI Audio [Radeon RX 470/480 / 570/580/590]
+
+pci:v00001002d0000AAF8*
+ ID_MODEL_FROM_DATABASE=Vega 10 HDMI Audio [Radeon Vega 56/64]
+
+pci:v00001002d0000AB00*
+ ID_MODEL_FROM_DATABASE=Baffin HDMI/DP Audio [Radeon RX 550 640SP / RX 560/560X]
+
+pci:v00001002d0000AB08*
+ ID_MODEL_FROM_DATABASE=Polaris 22 HDMI Audio
+
+pci:v00001002d0000AB10*
+ ID_MODEL_FROM_DATABASE=Lexa HDMI Audio
+
+pci:v00001002d0000AB18*
+ ID_MODEL_FROM_DATABASE=Vega 12 HDMI Audio
+
+pci:v00001002d0000AB20*
+ ID_MODEL_FROM_DATABASE=Vega 20 HDMI Audio [Radeon VII]
+
+pci:v00001002d0000AB38*
+ ID_MODEL_FROM_DATABASE=Navi 10 HDMI Audio
 
 pci:v00001002d0000AC00*
- ID_MODEL_FROM_DATABASE=Theater 600 Pro
+ ID_MODEL_FROM_DATABASE=Theater 506 World-Wide Analog Decoder
+
+pci:v00001002d0000AC01*
+ ID_MODEL_FROM_DATABASE=Theater 506 World-Wide Analog Decoder
 
 pci:v00001002d0000AC02*
  ID_MODEL_FROM_DATABASE=TV Wonder HD 600 PCIe
 
+pci:v00001002d0000AC03*
+ ID_MODEL_FROM_DATABASE=Theater 506 PCIe
+
+pci:v00001002d0000AC04*
+ ID_MODEL_FROM_DATABASE=Theater 506 USB
+
+pci:v00001002d0000AC05*
+ ID_MODEL_FROM_DATABASE=Theater 506 USB
+
+pci:v00001002d0000AC06*
+ ID_MODEL_FROM_DATABASE=Theater 506 External USB
+
+pci:v00001002d0000AC07*
+ ID_MODEL_FROM_DATABASE=Theater 506 External USB
+
+pci:v00001002d0000AC08*
+ ID_MODEL_FROM_DATABASE=Theater 506A World-Wide Analog Decoder + Demodulator
+
+pci:v00001002d0000AC09*
+ ID_MODEL_FROM_DATABASE=Theater 506A World-Wide Analog Decoder + Demodulator
+
+pci:v00001002d0000AC0A*
+ ID_MODEL_FROM_DATABASE=Theater 506A PCIe
+
+pci:v00001002d0000AC0B*
+ ID_MODEL_FROM_DATABASE=Theater 506A PCIe
+
+pci:v00001002d0000AC0C*
+ ID_MODEL_FROM_DATABASE=Theater 506A USB
+
+pci:v00001002d0000AC0D*
+ ID_MODEL_FROM_DATABASE=Theater 506A USB
+
+pci:v00001002d0000AC0E*
+ ID_MODEL_FROM_DATABASE=Theater 506A External USB
+
+pci:v00001002d0000AC0F*
+ ID_MODEL_FROM_DATABASE=Theater 506A External USB
+
 pci:v00001002d0000AC12*
  ID_MODEL_FROM_DATABASE=Theater HD T507 (DVB-T) TV tuner/capture device
 
@@ -12515,6 +12776,93 @@ pci:v00001022d00001303*
 pci:v00001022d00001304*
  ID_MODEL_FROM_DATABASE=Family 11h Processor Link Control
 
+pci:v00001022d00001305*
+ ID_MODEL_FROM_DATABASE=Griffin Function 5
+
+pci:v00001022d00001306*
+ ID_MODEL_FROM_DATABASE=Griffin Function 6
+
+pci:v00001022d00001307*
+ ID_MODEL_FROM_DATABASE=Griffin Function 7
+
+pci:v00001022d00001308*
+ ID_MODEL_FROM_DATABASE=Kaveri Audio Controller
+
+pci:v00001022d00001314*
+ ID_MODEL_FROM_DATABASE=Wrestler/Bheem/Ontario/Krishna Audio Controller
+
+pci:v00001022d000013E0*
+ ID_MODEL_FROM_DATABASE=Ariel Root Complex
+
+pci:v00001022d000013E1*
+ ID_MODEL_FROM_DATABASE=Ariel IOMMU
+
+pci:v00001022d000013E2*
+ ID_MODEL_FROM_DATABASE=Ariel PCIe Dummy Host Bridge
+
+pci:v00001022d000013E3*
+ ID_MODEL_FROM_DATABASE=Ariel PCIe GPP Bridge
+
+pci:v00001022d000013E4*
+ ID_MODEL_FROM_DATABASE=Ariel PCIe Dummy Host Bridge
+
+pci:v00001022d000013E5*
+ ID_MODEL_FROM_DATABASE=Ariel Internal PCIe GPP Bridge 0 to Bus A
+
+pci:v00001022d000013E6*
+ ID_MODEL_FROM_DATABASE=Ariel Internal PCIe GPP Bridge 0 to Bus B
+
+pci:v00001022d000013E7*
+ ID_MODEL_FROM_DATABASE=Ariel SMBus Controller
+
+pci:v00001022d000013E8*
+ ID_MODEL_FROM_DATABASE=Ariel LPC Bridge
+
+pci:v00001022d000013E9*
+ ID_MODEL_FROM_DATABASE=Ariel Internal GPU
+
+pci:v00001022d000013EA*
+ ID_MODEL_FROM_DATABASE=Ariel HD Audio Controller
+
+pci:v00001022d000013EB*
+ ID_MODEL_FROM_DATABASE=Ariel HD Audio Coprocessor
+
+pci:v00001022d000013EC*
+ ID_MODEL_FROM_DATABASE=Ariel Cryptographic Coprocessor
+
+pci:v00001022d000013ED*
+ ID_MODEL_FROM_DATABASE=Ariel USB 3.1 Type C: Gen2 x 1port + DP Alt Mode
+
+pci:v00001022d000013EE*
+ ID_MODEL_FROM_DATABASE=Ariel USB 3.1 Type A: Gen2 x 2 ports
+
+pci:v00001022d000013EF*
+ ID_MODEL_FROM_DATABASE=Ariel ZCN/MP4
+
+pci:v00001022d000013F0*
+ ID_MODEL_FROM_DATABASE=Ariel Device 24: Function 0
+
+pci:v00001022d000013F1*
+ ID_MODEL_FROM_DATABASE=Ariel Device 24: Function 1
+
+pci:v00001022d000013F2*
+ ID_MODEL_FROM_DATABASE=Ariel Device 24: Function 2
+
+pci:v00001022d000013F3*
+ ID_MODEL_FROM_DATABASE=Ariel Device 24: Function 3
+
+pci:v00001022d000013F4*
+ ID_MODEL_FROM_DATABASE=Ariel Device 24: Function 4
+
+pci:v00001022d000013F5*
+ ID_MODEL_FROM_DATABASE=Ariel Device 24: Function 5
+
+pci:v00001022d000013F6*
+ ID_MODEL_FROM_DATABASE=Ariel Device 24: Function 6
+
+pci:v00001022d000013F7*
+ ID_MODEL_FROM_DATABASE=Ariel Device 24: Function 7
+
 pci:v00001022d00001400*
  ID_MODEL_FROM_DATABASE=Family 15h (Models 10h-1fh) Processor Function 0
 
@@ -12596,23 +12944,32 @@ pci:v00001022d00001423*
 pci:v00001022d00001424*
  ID_MODEL_FROM_DATABASE=Family 15h (Models 30h-3fh) Processor Root Port
 
+pci:v00001022d00001425*
+ ID_MODEL_FROM_DATABASE=Kaveri P2P Bridge for GFX PCIe Port [1:0]
+
 pci:v00001022d00001426*
  ID_MODEL_FROM_DATABASE=Family 15h (Models 30h-3fh) Processor Root Port
 
 pci:v00001022d0000142E*
- ID_MODEL_FROM_DATABASE=Liverpool Processor Function 0
+ ID_MODEL_FROM_DATABASE=Liverpool Processor HT configuration
 
 pci:v00001022d0000142F*
- ID_MODEL_FROM_DATABASE=Liverpool Processor Function 1
+ ID_MODEL_FROM_DATABASE=Liverpool Processor Address Maps
 
 pci:v00001022d00001430*
- ID_MODEL_FROM_DATABASE=Liverpool Processor Function 2
+ ID_MODEL_FROM_DATABASE=Liverpool Processor DRAM configuration
 
 pci:v00001022d00001431*
- ID_MODEL_FROM_DATABASE=Liverpool Processor Function 3
+ ID_MODEL_FROM_DATABASE=Liverpool Processor Misc configuration
 
 pci:v00001022d00001432*
- ID_MODEL_FROM_DATABASE=Liverpool Processor Function 4
+ ID_MODEL_FROM_DATABASE=Liverpool Processor PM configuration
+
+pci:v00001022d00001433*
+ ID_MODEL_FROM_DATABASE=Liverpool Processor NB Performance Monitor
+
+pci:v00001022d00001434*
+ ID_MODEL_FROM_DATABASE=Liverpool Processor SPLL Configuration
 
 pci:v00001022d00001436*
  ID_MODEL_FROM_DATABASE=Liverpool Processor Root Complex
@@ -12626,6 +12983,60 @@ pci:v00001022d00001438*
 pci:v00001022d00001439*
  ID_MODEL_FROM_DATABASE=Family 16h Processor Functions 5:1
 
+pci:v00001022d0000143A*
+ ID_MODEL_FROM_DATABASE=Kingston/Clayton/Gladius/Montego Root Complex
+
+pci:v00001022d0000143B*
+ ID_MODEL_FROM_DATABASE=Kingston/Clayton/Gladius/Montego P2P Bridge for UMI Link
+
+pci:v00001022d00001440*
+ ID_MODEL_FROM_DATABASE=Matisse Device 24: Function 0
+
+pci:v00001022d00001441*
+ ID_MODEL_FROM_DATABASE=Matisse Device 24: Function 1
+
+pci:v00001022d00001442*
+ ID_MODEL_FROM_DATABASE=Matisse Device 24: Function 2
+
+pci:v00001022d00001443*
+ ID_MODEL_FROM_DATABASE=Matisse Device 24: Function 3
+
+pci:v00001022d00001444*
+ ID_MODEL_FROM_DATABASE=Matisse Device 24: Function 4
+
+pci:v00001022d00001445*
+ ID_MODEL_FROM_DATABASE=Matisse Device 24: Function 5
+
+pci:v00001022d00001446*
+ ID_MODEL_FROM_DATABASE=Matisse Device 24: Function 6
+
+pci:v00001022d00001447*
+ ID_MODEL_FROM_DATABASE=Matisse Device 24: Function 7
+
+pci:v00001022d00001448*
+ ID_MODEL_FROM_DATABASE=Renoir Device 24: Function 0
+
+pci:v00001022d00001449*
+ ID_MODEL_FROM_DATABASE=Renoir Device 24: Function 1
+
+pci:v00001022d0000144A*
+ ID_MODEL_FROM_DATABASE=Renoir Device 24: Function 2
+
+pci:v00001022d0000144B*
+ ID_MODEL_FROM_DATABASE=Renoir Device 24: Function 3
+
+pci:v00001022d0000144C*
+ ID_MODEL_FROM_DATABASE=Renoir Device 24: Function 4
+
+pci:v00001022d0000144D*
+ ID_MODEL_FROM_DATABASE=Renoir Device 24: Function 5
+
+pci:v00001022d0000144E*
+ ID_MODEL_FROM_DATABASE=Renoir Device 24: Function 6
+
+pci:v00001022d0000144F*
+ ID_MODEL_FROM_DATABASE=Renoir Device 24: Function 7
+
 pci:v00001022d00001450*
  ID_MODEL_FROM_DATABASE=Family 17h (Models 00h-0fh) Root Complex
 
@@ -12641,18 +13052,30 @@ pci:v00001022d00001453*
 pci:v00001022d00001454*
  ID_MODEL_FROM_DATABASE=Family 17h (Models 00h-0fh) Internal PCIe GPP Bridge 0 to Bus B
 
+pci:v00001022d00001455*
+ ID_MODEL_FROM_DATABASE=Zeppelin/Renoir PCIe Dummy Function
+
 pci:v00001022d00001456*
  ID_MODEL_FROM_DATABASE=Family 17h (Models 00h-0fh) Platform Security Processor
 
 pci:v00001022d00001457*
  ID_MODEL_FROM_DATABASE=Family 17h (Models 00h-0fh) HD Audio Controller
 
+pci:v00001022d0000145A*
+ ID_MODEL_FROM_DATABASE=Zeppelin/Raven/Raven2 PCIe Dummy Function
+
 pci:v00001022d0000145B*
  ID_MODEL_FROM_DATABASE=Zeppelin Non-Transparent Bridge
 
 pci:v00001022d0000145C*
  ID_MODEL_FROM_DATABASE=Family 17h (Models 00h-0fh) USB 3.0 Host Controller
 
+pci:v00001022d0000145D*
+ ID_MODEL_FROM_DATABASE=Zeppelin Switch Upstream (PCIE SW.US)
+
+pci:v00001022d0000145E*
+ ID_MODEL_FROM_DATABASE=Zeppelin Switch Downstream (PCIE SW.DS)
+
 pci:v00001022d0000145F*
  ID_MODEL_FROM_DATABASE=USB 3.0 Host controller
 
@@ -12680,6 +13103,96 @@ pci:v00001022d00001466*
 pci:v00001022d00001467*
  ID_MODEL_FROM_DATABASE=Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 7
 
+pci:v00001022d00001468*
+ ID_MODEL_FROM_DATABASE=Zeppelin Cryptographic Coprocessor NTBCCP
+
+pci:v00001022d00001480*
+ ID_MODEL_FROM_DATABASE=Starship/Matisse Root Complex
+
+pci:v00001022d00001481*
+ ID_MODEL_FROM_DATABASE=Starship/Matisse IOMMU
+
+pci:v00001022d00001482*
+ ID_MODEL_FROM_DATABASE=Starship/Matisse PCIe Dummy Host Bridge
+
+pci:v00001022d00001483*
+ ID_MODEL_FROM_DATABASE=Starship/Matisse GPP Bridge
+
+pci:v00001022d00001484*
+ ID_MODEL_FROM_DATABASE=Starship/Matisse Internal PCIe GPP Bridge 0 to bus[E:B]
+
+pci:v00001022d00001485*
+ ID_MODEL_FROM_DATABASE=Starship/Matisse Reserved SPP
+
+pci:v00001022d00001486*
+ ID_MODEL_FROM_DATABASE=Starship/Matisse Cryptographic Coprocessor PSPCPP
+
+pci:v00001022d00001487*
+ ID_MODEL_FROM_DATABASE=Starship/Matisse HD Audio Controller
+
+pci:v00001022d00001488*
+ ID_MODEL_FROM_DATABASE=Starship Reserved SSP
+
+pci:v00001022d00001489*
+ ID_MODEL_FROM_DATABASE=Starship Reserved SSP
+
+pci:v00001022d0000148A*
+ ID_MODEL_FROM_DATABASE=Starship/Matisse PCIe Dummy Function
+
+pci:v00001022d0000148B*
+ ID_MODEL_FROM_DATABASE=Starship/Matisse Non-Transparent Bridge
+
+pci:v00001022d0000148C*
+ ID_MODEL_FROM_DATABASE=Starship USB 3.0 Host Controller
+
+pci:v00001022d0000148D*
+ ID_MODEL_FROM_DATABASE=Starship/Matisse Switch Upstream (PCIE SW.US)
+
+pci:v00001022d0000148E*
+ ID_MODEL_FROM_DATABASE=Starship/Matisse Switch Downstream (PCIE SW.DS)
+
+pci:v00001022d0000148F*
+ ID_MODEL_FROM_DATABASE=Starship Reserved SSP
+
+pci:v00001022d00001490*
+ ID_MODEL_FROM_DATABASE=Starship Device 24; Function 0
+
+pci:v00001022d00001491*
+ ID_MODEL_FROM_DATABASE=Starship Device 24; Function 1
+
+pci:v00001022d00001492*
+ ID_MODEL_FROM_DATABASE=Starship Device 24; Function 2
+
+pci:v00001022d00001493*
+ ID_MODEL_FROM_DATABASE=Starship Device 24; Function 3
+
+pci:v00001022d00001494*
+ ID_MODEL_FROM_DATABASE=Starship Device 24; Function 4
+
+pci:v00001022d00001495*
+ ID_MODEL_FROM_DATABASE=Starship Device 24; Function 5
+
+pci:v00001022d00001496*
+ ID_MODEL_FROM_DATABASE=Starship Device 24; Function 6
+
+pci:v00001022d00001497*
+ ID_MODEL_FROM_DATABASE=Starship Device 24; Function 7
+
+pci:v00001022d00001498*
+ ID_MODEL_FROM_DATABASE=Starship/Matisse PTDMA
+
+pci:v00001022d00001499*
+ ID_MODEL_FROM_DATABASE=Starship/Matisse NVMe
+
+pci:v00001022d0000149A*
+ ID_MODEL_FROM_DATABASE=Starship PCIe GPP Bridge [1:0]
+
+pci:v00001022d0000149B*
+ ID_MODEL_FROM_DATABASE=Starship Reserved SSP
+
+pci:v00001022d0000149C*
+ ID_MODEL_FROM_DATABASE=Matisse USB 3.0 Host Controller
+
 pci:v00001022d00001510*
  ID_MODEL_FROM_DATABASE=Family 14h Processor Root Complex
 
@@ -12722,12 +13235,84 @@ pci:v00001022d00001535*
 pci:v00001022d00001536*
  ID_MODEL_FROM_DATABASE=Family 16h Processor Root Complex
 
+pci:v00001022d00001537*
+ ID_MODEL_FROM_DATABASE=Kabini/Mullins PSP-Platform Security Processor
+
 pci:v00001022d00001538*
  ID_MODEL_FROM_DATABASE=Family 16h Processor Function 0
 
+pci:v00001022d00001539*
+ ID_MODEL_FROM_DATABASE=Kabini P2P Bridge for PCIe Ports[4:0]
+
+pci:v00001022d00001540*
+ ID_MODEL_FROM_DATABASE=Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky HT Configuration
+
+pci:v00001022d00001541*
+ ID_MODEL_FROM_DATABASE=Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky Address Maps
+
+pci:v00001022d00001542*
+ ID_MODEL_FROM_DATABASE=Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky DRAM Configuration
+
+pci:v00001022d00001543*
+ ID_MODEL_FROM_DATABASE=Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky Miscellaneous Configuration
+
+pci:v00001022d00001544*
+ ID_MODEL_FROM_DATABASE=Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky PM Configuration
+
+pci:v00001022d00001545*
+ ID_MODEL_FROM_DATABASE=Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky NB Performance Monitor
+
+pci:v00001022d00001546*
+ ID_MODEL_FROM_DATABASE=Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky Root Complex
+
+pci:v00001022d00001547*
+ ID_MODEL_FROM_DATABASE=Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky IOMMU
+
+pci:v00001022d00001548*
+ ID_MODEL_FROM_DATABASE=Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky UMI PCIe Dummy Host Bridge
+
+pci:v00001022d00001549*
+ ID_MODEL_FROM_DATABASE=Kryptos/Cato/Garfield/Garfield+ P2P Bridge for PCIe Port [3:0]
+
+pci:v00001022d0000154A*
+ ID_MODEL_FROM_DATABASE=Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky Audio Processor
+
+pci:v00001022d0000154B*
+ ID_MODEL_FROM_DATABASE=Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky Security Processor
+
+pci:v00001022d0000154D*
+ ID_MODEL_FROM_DATABASE=Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky/Anubis HDMI Controller
+
+pci:v00001022d0000154F*
+ ID_MODEL_FROM_DATABASE=Anubis Audio Processor
+
+pci:v00001022d00001550*
+ ID_MODEL_FROM_DATABASE=Garfield+/Arlene/Pooky/Anubis SPLL Configuration
+
+pci:v00001022d00001553*
+ ID_MODEL_FROM_DATABASE=Arlene/Pooky P2P Bridge for PCIE (3:0)
+
+pci:v00001022d0000155B*
+ ID_MODEL_FROM_DATABASE=Anubis Root Complex
+
+pci:v00001022d0000155C*
+ ID_MODEL_FROM_DATABASE=Anubis IOMMU
+
+pci:v00001022d0000155D*
+ ID_MODEL_FROM_DATABASE=Anubis UMI PCIe Dummy Bridge
+
+pci:v00001022d0000155E*
+ ID_MODEL_FROM_DATABASE=Anubis P2P Bridge for PCIe Ports [4:0]
+
+pci:v00001022d00001560*
+ ID_MODEL_FROM_DATABASE=Anubis Security Processor
+
 pci:v00001022d00001566*
  ID_MODEL_FROM_DATABASE=Family 16h (Models 30h-3fh) Processor Root Complex
 
+pci:v00001022d00001567*
+ ID_MODEL_FROM_DATABASE=Mullins IOMMU
+
 pci:v00001022d0000156B*
  ID_MODEL_FROM_DATABASE=Family 16h (Models 30h-3fh) Host Bridge
 
@@ -12755,6 +13340,12 @@ pci:v00001022d00001576*
 pci:v00001022d00001577*
  ID_MODEL_FROM_DATABASE=Family 15h (Models 60h-6fh) I/O Memory Management Unit
 
+pci:v00001022d00001578*
+ ID_MODEL_FROM_DATABASE=Carrizo Platform Security Processor
+
+pci:v00001022d00001579*
+ ID_MODEL_FROM_DATABASE=Carrizo Audio Processor
+
 pci:v00001022d0000157A*
  ID_MODEL_FROM_DATABASE=Family 15h (Models 60h-6fh) Audio Controller
 
@@ -12764,6 +13355,12 @@ pci:v00001022d0000157B*
 pci:v00001022d0000157C*
  ID_MODEL_FROM_DATABASE=Family 15h (Models 60h-6fh) Processor Root Port
 
+pci:v00001022d0000157D*
+ ID_MODEL_FROM_DATABASE=Carrizo Audio Dummy Host Bridge
+
+pci:v00001022d0000157E*
+ ID_MODEL_FROM_DATABASE=Carrizo Audio Controller
+
 pci:v00001022d00001580*
  ID_MODEL_FROM_DATABASE=Family 16h (Models 30h-3fh) Processor Function 0
 
@@ -12782,12 +13379,189 @@ pci:v00001022d00001584*
 pci:v00001022d00001585*
  ID_MODEL_FROM_DATABASE=Family 16h (Models 30h-3fh) Processor Function 5
 
+pci:v00001022d00001590*
+ ID_MODEL_FROM_DATABASE=Amur/Nolan HT Configuration
+
+pci:v00001022d00001591*
+ ID_MODEL_FROM_DATABASE=Amur/Nolan Address Maps
+
+pci:v00001022d00001592*
+ ID_MODEL_FROM_DATABASE=Amur/Nolan DRAM Configuration
+
+pci:v00001022d00001593*
+ ID_MODEL_FROM_DATABASE=Amur/Nolan Miscellaneous Configuration
+
+pci:v00001022d00001594*
+ ID_MODEL_FROM_DATABASE=Amur/Nolan PM Configuration
+
+pci:v00001022d00001595*
+ ID_MODEL_FROM_DATABASE=Amur/Nolan NB Performance Monitor
+
+pci:v00001022d00001596*
+ ID_MODEL_FROM_DATABASE=Amur/Nolan Root Complex
+
+pci:v00001022d00001597*
+ ID_MODEL_FROM_DATABASE=Amur/Nolan IOMMU
+
+pci:v00001022d00001598*
+ ID_MODEL_FROM_DATABASE=Amur/Nolan Platform Security Processor
+
+pci:v00001022d00001599*
+ ID_MODEL_FROM_DATABASE=Amur/Nolan PCIe Dummy Host Bridge
+
+pci:v00001022d0000159D*
+ ID_MODEL_FROM_DATABASE=Amur Function 6: Gasket
+
+pci:v00001022d000015B0*
+ ID_MODEL_FROM_DATABASE=Stoney HT Configuration
+
+pci:v00001022d000015B1*
+ ID_MODEL_FROM_DATABASE=Stoney Address Maps
+
+pci:v00001022d000015B2*
+ ID_MODEL_FROM_DATABASE=Stoney DRAM Configuration
+
+pci:v00001022d000015B3*
+ ID_MODEL_FROM_DATABASE=Stoney Miscellaneous Configuration
+
+pci:v00001022d000015B4*
+ ID_MODEL_FROM_DATABASE=Stoney PM Configuration
+
+pci:v00001022d000015B5*
+ ID_MODEL_FROM_DATABASE=Stoney NB Performance Monitor
+
+pci:v00001022d000015BC*
+ ID_MODEL_FROM_DATABASE=Stoney PCIe [GFX,GPP] Bridge [4:0]
+
+pci:v00001022d000015BE*
+ ID_MODEL_FROM_DATABASE=Stoney Audio Processor
+
+pci:v00001022d000015D0*
+ ID_MODEL_FROM_DATABASE=Raven/Raven2 Root Complex
+
+pci:v00001022d000015D1*
+ ID_MODEL_FROM_DATABASE=Raven/Raven2 IOMMU
+
+pci:v00001022d000015D2*
+ ID_MODEL_FROM_DATABASE=Raven/Raven2 PCIe Dummy Host Bridge
+
+pci:v00001022d000015D3*
+ ID_MODEL_FROM_DATABASE=Raven/Raven2 PCIe GPP Bridge [6:0]
+
+pci:v00001022d000015D4*
+ ID_MODEL_FROM_DATABASE=FireFlight USB 3.1
+
+pci:v00001022d000015D5*
+ ID_MODEL_FROM_DATABASE=FireFlight USB 3.1
+
+pci:v00001022d000015DA*
+ ID_MODEL_FROM_DATABASE=Raven/Raven2 PCIe Dummy Host Bridge
+
+pci:v00001022d000015DB*
+ ID_MODEL_FROM_DATABASE=Raven/Raven2 Internal PCIe GPP Bridge 0 to Bus A
+
+pci:v00001022d000015DC*
+ ID_MODEL_FROM_DATABASE=Raven/Raven2 Internal PCIe GPP Bridge 0 to Bus B
+
+pci:v00001022d000015DE*
+ ID_MODEL_FROM_DATABASE=Raven/Raven2/FireFlight HD Audio Controller
+
 pci:v00001022d000015DF*
  ID_MODEL_FROM_DATABASE=Family 17h (Models 10h-1fh) Platform Security Processor
 
+pci:v00001022d000015E0*
+ ID_MODEL_FROM_DATABASE=Raven USB 3.1
+
+pci:v00001022d000015E1*
+ ID_MODEL_FROM_DATABASE=Raven USB 3.1
+
+pci:v00001022d000015E2*
+ ID_MODEL_FROM_DATABASE=Raven/Raven2/FireFlight/Renoir Audio Processor
+
 pci:v00001022d000015E3*
  ID_MODEL_FROM_DATABASE=Family 17h (Models 10h-1fh) HD Audio Controller
 
+pci:v00001022d000015E4*
+ ID_MODEL_FROM_DATABASE=Raven/Raven2/Renoir Sensor Fusion Hub
+
+pci:v00001022d000015E5*
+ ID_MODEL_FROM_DATABASE=Raven2 USB 3.1
+
+pci:v00001022d000015E6*
+ ID_MODEL_FROM_DATABASE=Raven/Raven2/Renoir Non-Sensor Fusion Hub KMDF driver
+
+pci:v00001022d000015E8*
+ ID_MODEL_FROM_DATABASE=Raven/Raven2 Device 24: Function 0
+
+pci:v00001022d000015E9*
+ ID_MODEL_FROM_DATABASE=Raven/Raven2 Device 24: Function 1
+
+pci:v00001022d000015EA*
+ ID_MODEL_FROM_DATABASE=Raven/Raven2 Device 24: Function 2
+
+pci:v00001022d000015EB*
+ ID_MODEL_FROM_DATABASE=Raven/Raven2 Device 24: Function 3
+
+pci:v00001022d000015EC*
+ ID_MODEL_FROM_DATABASE=Raven/Raven2 Device 24: Function 4
+
+pci:v00001022d000015ED*
+ ID_MODEL_FROM_DATABASE=Raven/Raven2 Device 24: Function 5
+
+pci:v00001022d000015EE*
+ ID_MODEL_FROM_DATABASE=Raven/Raven2 Device 24: Function 6
+
+pci:v00001022d000015EF*
+ ID_MODEL_FROM_DATABASE=Raven/Raven2 Device 24: Function 7
+
+pci:v00001022d000015F0*
+ ID_MODEL_FROM_DATABASE=FireFlight Device 24: Function 0
+
+pci:v00001022d000015F1*
+ ID_MODEL_FROM_DATABASE=FireFlight Device 24: Function 1
+
+pci:v00001022d000015F2*
+ ID_MODEL_FROM_DATABASE=FireFlight Device 24: Function 2
+
+pci:v00001022d000015F3*
+ ID_MODEL_FROM_DATABASE=FireFlight Device 24: Function 3
+
+pci:v00001022d000015F4*
+ ID_MODEL_FROM_DATABASE=FireFlight Device 24: Function 4
+
+pci:v00001022d000015F5*
+ ID_MODEL_FROM_DATABASE=FireFlight Device 24: Function 5
+
+pci:v00001022d000015F6*
+ ID_MODEL_FROM_DATABASE=FireFlight Device 24: Function 6
+
+pci:v00001022d000015F7*
+ ID_MODEL_FROM_DATABASE=FireFlight Device 24: Function 7
+
+pci:v00001022d000015F8*
+ ID_MODEL_FROM_DATABASE=FireFlight Root Complex
+
+pci:v00001022d000015F9*
+ ID_MODEL_FROM_DATABASE=FireFlight IOMMU
+
+pci:v00001022d000015FA*
+ ID_MODEL_FROM_DATABASE=FireFlight PCIe Dummy Host Bridge
+
+pci:v00001022d000015FB*
+ ID_MODEL_FROM_DATABASE=FireFlight PCIe GPP Bride 3:0
+
+pci:v00001022d000015FC*
+ ID_MODEL_FROM_DATABASE=FireFlight PCIe Dummy Host Bridge
+
+pci:v00001022d000015FD*
+ ID_MODEL_FROM_DATABASE=FireFlight Internal PCIe GPP Bridge 0 to Bus A
+
+pci:v00001022d000015FE*
+ ID_MODEL_FROM_DATABASE=FireFlight Internal PCIe GPP Bridge 0 to Bus B
+
+pci:v00001022d000015FF*
+ ID_MODEL_FROM_DATABASE=FireFlight Bus A; Device 0: Function 0: Internal GPU
+
 pci:v00001022d00001600*
  ID_MODEL_FROM_DATABASE=Family 15h Processor Function 0
 
@@ -12806,6 +13580,105 @@ pci:v00001022d00001604*
 pci:v00001022d00001605*
  ID_MODEL_FROM_DATABASE=Family 15h Processor Function 5
 
+pci:v00001022d00001606*
+ ID_MODEL_FROM_DATABASE=Arden Security Processor
+
+pci:v00001022d00001608*
+ ID_MODEL_FROM_DATABASE=Arden Device 18h: Function 0
+
+pci:v00001022d00001609*
+ ID_MODEL_FROM_DATABASE=Arden Device 18h: Function 1
+
+pci:v00001022d0000160A*
+ ID_MODEL_FROM_DATABASE=Arden Device 18h: Function 2
+
+pci:v00001022d0000160B*
+ ID_MODEL_FROM_DATABASE=Arden Device 18h: Function 3
+
+pci:v00001022d0000160C*
+ ID_MODEL_FROM_DATABASE=Arden Device 18h: Function 4
+
+pci:v00001022d0000160D*
+ ID_MODEL_FROM_DATABASE=Arden Device 18h: Function 5
+
+pci:v00001022d0000160E*
+ ID_MODEL_FROM_DATABASE=Arden Device 18h: Function 6
+
+pci:v00001022d0000160F*
+ ID_MODEL_FROM_DATABASE=Arden Device 18h: Function 7
+
+pci:v00001022d00001620*
+ ID_MODEL_FROM_DATABASE=Anubis HT Configuration
+
+pci:v00001022d00001621*
+ ID_MODEL_FROM_DATABASE=Anubis Address Maps
+
+pci:v00001022d00001622*
+ ID_MODEL_FROM_DATABASE=Anubis DRAM Configuration
+
+pci:v00001022d00001623*
+ ID_MODEL_FROM_DATABASE=Anubis Miscellaneous Configuration
+
+pci:v00001022d00001624*
+ ID_MODEL_FROM_DATABASE=Anubis PM Configuration
+
+pci:v00001022d00001625*
+ ID_MODEL_FROM_DATABASE=Anubis NB Performance Monitor
+
+pci:v00001022d00001626*
+ ID_MODEL_FROM_DATABASE=Arden Root Complex
+
+pci:v00001022d00001627*
+ ID_MODEL_FROM_DATABASE=Arden IOMMU
+
+pci:v00001022d00001628*
+ ID_MODEL_FROM_DATABASE=Arden PCIe Dummy Host Bridge
+
+pci:v00001022d00001629*
+ ID_MODEL_FROM_DATABASE=Arden PCIe GPP Bridge
+
+pci:v00001022d0000162A*
+ ID_MODEL_FROM_DATABASE=Arden Internal PCIe GPP Bridge 0 to bus X
+
+pci:v00001022d0000162B*
+ ID_MODEL_FROM_DATABASE=Arden PCIe Non-Transparent Bridge
+
+pci:v00001022d00001630*
+ ID_MODEL_FROM_DATABASE=Renoir Root Complex
+
+pci:v00001022d00001631*
+ ID_MODEL_FROM_DATABASE=Renoir IOMMU
+
+pci:v00001022d00001632*
+ ID_MODEL_FROM_DATABASE=Renoir PCIe Dummy Host Bridge
+
+pci:v00001022d00001633*
+ ID_MODEL_FROM_DATABASE=Renoir PCIe GPP Bridge
+
+pci:v00001022d00001634*
+ ID_MODEL_FROM_DATABASE=Renoir PCIe GPP Bridge
+
+pci:v00001022d00001635*
+ ID_MODEL_FROM_DATABASE=Renoir Internal PCIe GPP Bridge to Bus
+
+pci:v00001022d00001637*
+ ID_MODEL_FROM_DATABASE=Renoir HD Audio Controller
+
+pci:v00001022d00001639*
+ ID_MODEL_FROM_DATABASE=Renoir USB 3.1
+
+pci:v00001022d00001641*
+ ID_MODEL_FROM_DATABASE=Renoir 10GbE Controller Port 0 (XGBE0/1)
+
+pci:v00001022d00001642*
+ ID_MODEL_FROM_DATABASE=Renoir WLAN
+
+pci:v00001022d00001643*
+ ID_MODEL_FROM_DATABASE=Renoir BT
+
+pci:v00001022d00001644*
+ ID_MODEL_FROM_DATABASE=Renoir I2S
+
 pci:v00001022d00001700*
  ID_MODEL_FROM_DATABASE=Family 12h/14h Processor Function 0
 
@@ -12824,6 +13697,9 @@ pci:v00001022d00001704*
 pci:v00001022d00001705*
  ID_MODEL_FROM_DATABASE=Family 12h Processor Root Complex
 
+pci:v00001022d00001706*
+ ID_MODEL_FROM_DATABASE=Llano P2P Bridge to external GPU
+
 pci:v00001022d00001707*
  ID_MODEL_FROM_DATABASE=Family 12h Processor Root Port
 
@@ -13259,6 +14135,9 @@ pci:v00001022d00007809*
 pci:v00001022d00007809sv0000103Csd0000194E*
  ID_MODEL_FROM_DATABASE=FCH USB OHCI Controller (ProBook 455 G1 Notebook)
 
+pci:v00001022d0000780A*
+ ID_MODEL_FROM_DATABASE=Kabini/Mullins SATA Raid/AHCI Mode (DotHill driver)
+
 pci:v00001022d0000780B*
  ID_MODEL_FROM_DATABASE=FCH SMBus Controller
 
@@ -15917,6 +16796,9 @@ pci:v0000103Cd0000127B*
 pci:v0000103Cd0000127C*
  ID_MODEL_FROM_DATABASE=sx1000 I/O Controller
 
+pci:v0000103Cd0000128D*
+ ID_MODEL_FROM_DATABASE=Diva [GSP] Management Board
+
 pci:v0000103Cd00001290*
  ID_MODEL_FROM_DATABASE=Auxiliary Diva Serial Port
 
@@ -29088,13 +29970,13 @@ pci:v000010DEd0000063F*
  ID_MODEL_FROM_DATABASE=G94 [GeForce 9600 GE]
 
 pci:v000010DEd00000640*
- ID_MODEL_FROM_DATABASE=G96 [GeForce 9500 GT]
+ ID_MODEL_FROM_DATABASE=G96C [GeForce 9500 GT]
 
 pci:v000010DEd00000641*
- ID_MODEL_FROM_DATABASE=G96 [GeForce 9400 GT]
+ ID_MODEL_FROM_DATABASE=G96C [GeForce 9400 GT]
 
 pci:v000010DEd00000641sv00001682sd00004009*
- ID_MODEL_FROM_DATABASE=G96 [GeForce 9400 GT] (PV-T94G-ZAFG)
+ ID_MODEL_FROM_DATABASE=G96C [GeForce 9400 GT] (PV-T94G-ZAFG)
 
 pci:v000010DEd00000642*
  ID_MODEL_FROM_DATABASE=G96 [D9M-10]
@@ -29109,22 +29991,22 @@ pci:v000010DEd00000644sv0000174Bsd00009600*
  ID_MODEL_FROM_DATABASE=G96 [GeForce 9500 GS] (Geforce 9500GS 512M DDR2 V/D/HDMI)
 
 pci:v000010DEd00000645*
- ID_MODEL_FROM_DATABASE=G96 [GeForce 9500 GS]
+ ID_MODEL_FROM_DATABASE=G96C [GeForce 9500 GS]
 
 pci:v000010DEd00000646*
- ID_MODEL_FROM_DATABASE=G96 [GeForce GT 120]
+ ID_MODEL_FROM_DATABASE=G96C [GeForce GT 120]
 
 pci:v000010DEd00000647*
- ID_MODEL_FROM_DATABASE=G96M [GeForce 9600M GT]
+ ID_MODEL_FROM_DATABASE=G96CM [GeForce 9600M GT]
 
 pci:v000010DEd00000648*
- ID_MODEL_FROM_DATABASE=G96M [GeForce 9600M GS]
+ ID_MODEL_FROM_DATABASE=G96CM [GeForce 9600M GS]
 
 pci:v000010DEd00000649*
- ID_MODEL_FROM_DATABASE=G96M [GeForce 9600M GT]
+ ID_MODEL_FROM_DATABASE=G96CM [GeForce 9600M GT]
 
 pci:v000010DEd00000649sv00001043sd0000202D*
- ID_MODEL_FROM_DATABASE=G96M [GeForce 9600M GT] (GeForce GT 220M)
+ ID_MODEL_FROM_DATABASE=G96CM [GeForce 9600M GT] (GeForce GT 220M)
 
 pci:v000010DEd0000064A*
  ID_MODEL_FROM_DATABASE=G96M [GeForce 9700M GT]
@@ -29133,52 +30015,49 @@ pci:v000010DEd0000064B*
  ID_MODEL_FROM_DATABASE=G96M [GeForce 9500M G]
 
 pci:v000010DEd0000064C*
- ID_MODEL_FROM_DATABASE=G96M [GeForce 9650M GT]
-
-pci:v000010DEd0000064D*
- ID_MODEL_FROM_DATABASE=G96 [GeForce 9600 GT]
+ ID_MODEL_FROM_DATABASE=G96CM [GeForce 9650M GT]
 
 pci:v000010DEd0000064E*
- ID_MODEL_FROM_DATABASE=G96 [GeForce 9600 GT / 9800 GT]
+ ID_MODEL_FROM_DATABASE=G96C [GeForce 9600 GSO / 9800 GT]
 
 pci:v000010DEd00000651*
- ID_MODEL_FROM_DATABASE=G96M [GeForce G 110M]
+ ID_MODEL_FROM_DATABASE=G96CM [GeForce G 110M]
 
 pci:v000010DEd00000652*
- ID_MODEL_FROM_DATABASE=G96M [GeForce GT 130M]
+ ID_MODEL_FROM_DATABASE=G96CM [GeForce GT 130M]
 
 pci:v000010DEd00000652sv0000152Dsd00000850*
- ID_MODEL_FROM_DATABASE=G96M [GeForce GT 130M] (GeForce GT 240M LE)
+ ID_MODEL_FROM_DATABASE=G96CM [GeForce GT 130M] (GeForce GT 240M LE)
 
 pci:v000010DEd00000653*
- ID_MODEL_FROM_DATABASE=G96M [GeForce GT 120M]
+ ID_MODEL_FROM_DATABASE=G96CM [GeForce GT 120M]
 
 pci:v000010DEd00000654*
- ID_MODEL_FROM_DATABASE=G96M [GeForce GT 220M]
+ ID_MODEL_FROM_DATABASE=G96CM [GeForce GT 220M]
 
 pci:v000010DEd00000654sv00001043sd000014A2*
- ID_MODEL_FROM_DATABASE=G96M [GeForce GT 220M] (GeForce GT 320M)
+ ID_MODEL_FROM_DATABASE=G96CM [GeForce GT 220M] (GeForce GT 320M)
 
 pci:v000010DEd00000654sv00001043sd000014D2*
- ID_MODEL_FROM_DATABASE=G96M [GeForce GT 220M] (GeForce GT 320M)
+ ID_MODEL_FROM_DATABASE=G96CM [GeForce GT 220M] (GeForce GT 320M)
 
 pci:v000010DEd00000655*
- ID_MODEL_FROM_DATABASE=G96 [GeForce GT 120]
+ ID_MODEL_FROM_DATABASE=G96 [GeForce GT 120 Mac Edition]
 
 pci:v000010DEd00000656*
- ID_MODEL_FROM_DATABASE=G96 [GeForce 9650 S]
+ ID_MODEL_FROM_DATABASE=G96 [GeForce GT 120 Mac Edition]
 
 pci:v000010DEd00000658*
  ID_MODEL_FROM_DATABASE=G96GL [Quadro FX 380]
 
 pci:v000010DEd00000659*
- ID_MODEL_FROM_DATABASE=G96GL [Quadro FX 580]
+ ID_MODEL_FROM_DATABASE=G96CGL [Quadro FX 580]
 
 pci:v000010DEd0000065A*
  ID_MODEL_FROM_DATABASE=G96GLM [Quadro FX 1700M]
 
 pci:v000010DEd0000065B*
- ID_MODEL_FROM_DATABASE=G96 [GeForce 9400 GT]
+ ID_MODEL_FROM_DATABASE=G96C [GeForce 9400 GT]
 
 pci:v000010DEd0000065C*
  ID_MODEL_FROM_DATABASE=G96GLM [Quadro FX 770M]
@@ -29187,7 +30066,7 @@ pci:v000010DEd0000065D*
  ID_MODEL_FROM_DATABASE=G96 [GeForce 9500 GA / 9600 GT / GTS 250]
 
 pci:v000010DEd0000065F*
- ID_MODEL_FROM_DATABASE=G96 [GeForce G210]
+ ID_MODEL_FROM_DATABASE=G96C [GeForce G210]
 
 pci:v000010DEd000006C0*
  ID_MODEL_FROM_DATABASE=GF100 [GeForce GTX 480]
@@ -33699,7 +34578,7 @@ pci:v000010DEd00001DB1*
  ID_MODEL_FROM_DATABASE=GV100GL [Tesla V100 SXM2 16GB]
 
 pci:v000010DEd00001DB2*
- ID_MODEL_FROM_DATABASE=GV100 [Tesla V100-DGXS-16GB]
+ ID_MODEL_FROM_DATABASE=GV100GL [Tesla V100-DGXS-16GB]
 
 pci:v000010DEd00001DB3*
  ID_MODEL_FROM_DATABASE=GV100GL [Tesla V100 FHHL 16GB]
@@ -33741,7 +34620,13 @@ pci:v000010DEd00001E2E*
  ID_MODEL_FROM_DATABASE=TU102B
 
 pci:v000010DEd00001E30*
- ID_MODEL_FROM_DATABASE=TU102GL [Quadro RTX 6000]
+ ID_MODEL_FROM_DATABASE=TU102GL [Quadro RTX 6000/8000]
+
+pci:v000010DEd00001E30sv000010DEsd0000129E*
+ ID_MODEL_FROM_DATABASE=TU102GL [Quadro RTX 6000/8000] (Quadro RTX 8000)
+
+pci:v000010DEd00001E30sv000010DEsd000012BA*
+ ID_MODEL_FROM_DATABASE=TU102GL [Quadro RTX 6000/8000] (Quadro RTX 6000)
 
 pci:v000010DEd00001E38*
  ID_MODEL_FROM_DATABASE=TU102GL
@@ -33815,6 +34700,30 @@ pci:v000010DEd00001F51*
 pci:v000010DEd00001F82*
  ID_MODEL_FROM_DATABASE=TU107
 
+pci:v000010DEd00001F92*
+ ID_MODEL_FROM_DATABASE=TU107M
+
+pci:v000010DEd00001FBF*
+ ID_MODEL_FROM_DATABASE=TU107GL
+
+pci:v000010DEd00002182*
+ ID_MODEL_FROM_DATABASE=TU116 [GeForce GTX 1660 Ti Rev. A]
+
+pci:v000010DEd00002183*
+ ID_MODEL_FROM_DATABASE=TU116
+
+pci:v000010DEd00002184*
+ ID_MODEL_FROM_DATABASE=TU116 [GeForce GTX 1660]
+
+pci:v000010DEd00002191*
+ ID_MODEL_FROM_DATABASE=TU116M
+
+pci:v000010DEd000021AE*
+ ID_MODEL_FROM_DATABASE=TU116GL
+
+pci:v000010DEd000021BF*
+ ID_MODEL_FROM_DATABASE=TU116GL
+
 pci:v000010DF*
  ID_VENDOR_FROM_DATABASE=Emulex Corporation
 
@@ -46133,6 +47042,9 @@ pci:v000012D8*
 pci:v000012D8d000001A7*
  ID_MODEL_FROM_DATABASE=7C21P100 2-port PCI-X to PCI-X Bridge
 
+pci:v000012D8d00002304*
+ ID_MODEL_FROM_DATABASE=PI7C9X2G304 EL/SL PCIe2 3-Port/4-Lane Packet Switch
+
 pci:v000012D8d00002608*
  ID_MODEL_FROM_DATABASE=PI7C9X2G608GP PCIe2 6-Port/8-Lane Packet Switch
 
@@ -54701,6 +55613,9 @@ pci:v000014E4d0000B842*
 pci:v000014E4d0000B850*
  ID_MODEL_FROM_DATABASE=Broadcom BCM56850 Switch ASIC
 
+pci:v000014E4d0000B880*
+ ID_MODEL_FROM_DATABASE=BCM56880 Switch ASIC
+
 pci:v000014E4d0000B960*
  ID_MODEL_FROM_DATABASE=Broadcom BCM56960 Switch ASIC
 
@@ -54710,6 +55625,9 @@ pci:v000014E4d0000D802*
 pci:v000014E4d0000D802sv000014E4sd00008021*
  ID_MODEL_FROM_DATABASE=BCM58802 Stingray 50Gb Ethernet SoC (Stingray Dual-Port 25Gb Ethernet PCIe SmartNIC w16GB DRAM (Part No BCM958802A8046C))
 
+pci:v000014E4d0000D802sv000014E4sd00008023*
+ ID_MODEL_FROM_DATABASE=BCM58802 Stingray 50Gb Ethernet SoC (PS410T-H04 NetXtreme-S 4x10G 10GBaseT PCIe SmartNIC)
+
 pci:v000014E4d0000D802sv000014E4sd00008024*
  ID_MODEL_FROM_DATABASE=BCM58802 Stingray 50Gb Ethernet SoC (Stingray Dual-Port 25Gb Ethernet PCIe SmartNIC w4GB DRAM (Part No BCM958802A8044C))
 
@@ -58847,6 +59765,15 @@ pci:v000016BE*
 pci:v000016C3*
  ID_VENDOR_FROM_DATABASE=Synopsys, Inc.
 
+pci:v000016C3d0000ABCD*
+ ID_MODEL_FROM_DATABASE=DWC_usb3
+
+pci:v000016C3d0000ABCE*
+ ID_MODEL_FROM_DATABASE=DWC_usb3
+
+pci:v000016C3d0000ABCF*
+ ID_MODEL_FROM_DATABASE=DWC_usb31
+
 pci:v000016C3d0000EDDA*
  ID_MODEL_FROM_DATABASE=EPMockUp
 
@@ -59186,6 +60113,18 @@ pci:v000016D5d00007043*
 pci:v000016D5d00007044*
  ID_MODEL_FROM_DATABASE=AP484 Counter Timer Module with RS422 Input/Output
 
+pci:v000016D5d00007051*
+ ID_MODEL_FROM_DATABASE=APA7-501 Reconfigurable Artix-7 52,160 Cell FPGA module 48 TTL channels
+
+pci:v000016D5d00007052*
+ ID_MODEL_FROM_DATABASE=APA7-502 Reconfigurable Artix-7 52,160 Cell FPGA module 24 RS485 channels
+
+pci:v000016D5d00007053*
+ ID_MODEL_FROM_DATABASE=APA7-503 Reconfigurable Artix-7 52,160 Cell FPGA module 24 TTL & 12 RS485 channels
+
+pci:v000016D5d00007054*
+ ID_MODEL_FROM_DATABASE=APA7-504 Reconfigurable Artix-7 52,160 Cell FPGA module 24 LVDS channels
+
 pci:v000016DA*
  ID_VENDOR_FROM_DATABASE=Advantech Co., Ltd.
 
@@ -59418,7 +60357,7 @@ pci:v00001771*
  ID_VENDOR_FROM_DATABASE=InnoVISION Multimedia Ltd.
 
 pci:v00001775*
- ID_VENDOR_FROM_DATABASE=GE Intelligent Platforms
+ ID_VENDOR_FROM_DATABASE=General Electric
 
 pci:v0000177D*
  ID_VENDOR_FROM_DATABASE=Cavium, Inc.
@@ -60377,6 +61316,15 @@ pci:v000017F3*
 pci:v000017F3d00001010*
  ID_MODEL_FROM_DATABASE=R1010 IDE Controller
 
+pci:v000017F3d00001011*
+ ID_MODEL_FROM_DATABASE=R1011 IDE Controller
+
+pci:v000017F3d00001012*
+ ID_MODEL_FROM_DATABASE=R1012 IDE Controller
+
+pci:v000017F3d00001031*
+ ID_MODEL_FROM_DATABASE=PCI/PCI-X to PCI-E Bridge
+
 pci:v000017F3d00002012*
  ID_MODEL_FROM_DATABASE=M2012/R3308 VGA-compatible graphics adapter
 
@@ -62453,6 +63401,9 @@ pci:v00001982d000016FF*
 pci:v00001987*
  ID_VENDOR_FROM_DATABASE=Phison Electronics Corporation
 
+pci:v00001987d00005007*
+ ID_MODEL_FROM_DATABASE=E7 NVMe Controller
+
 pci:v00001987d00005012*
  ID_MODEL_FROM_DATABASE=E12 NVMe Controller
 
@@ -64160,6 +65111,12 @@ pci:v00001C8C*
 pci:v00001CB1*
  ID_VENDOR_FROM_DATABASE=Collion UG & Co.KG
 
+pci:v00001CB5*
+ ID_VENDOR_FROM_DATABASE=Focusrite Audio Engineering Ltd
+
+pci:v00001CB5d00000002*
+ ID_MODEL_FROM_DATABASE=Clarett
+
 pci:v00001CB8*
  ID_VENDOR_FROM_DATABASE=Dawning Information Industry Co., Ltd.
 
@@ -64271,6 +65228,9 @@ pci:v00001D0Fd0000CD01*
 pci:v00001D0Fd0000EC20*
  ID_MODEL_FROM_DATABASE=Elastic Network Adapter (ENA)
 
+pci:v00001D0Fd0000EFA0*
+ ID_MODEL_FROM_DATABASE=Elastic Fabric Adapter (EFA)
+
 pci:v00001D17*
  ID_VENDOR_FROM_DATABASE=Zhaoxin
 
@@ -64781,8 +65741,47 @@ pci:v00001DEFd0000E00C*
 pci:v00001DF3*
  ID_VENDOR_FROM_DATABASE=Ethernity Networks
 
-pci:v00001DF3d00000102*
- ID_MODEL_FROM_DATABASE=ACENIC100 Programmable Network Accelerator
+pci:v00001DF3d00000201*
+ ID_MODEL_FROM_DATABASE=ACE-NIC40 Programmable Network Accelerator
+
+pci:v00001DF3d00000201sv00001DF3sd00000001*
+ ID_MODEL_FROM_DATABASE=ACE-NIC40 Programmable Network Accelerator (ENA1040)
+
+pci:v00001DF3d00000201sv00001DF3sd00000002*
+ ID_MODEL_FROM_DATABASE=ACE-NIC40 Programmable Network Accelerator (ENA1044)
+
+pci:v00001DF3d00000201sv00001DF3sd00000003*
+ ID_MODEL_FROM_DATABASE=ACE-NIC40 Programmable Network Accelerator (ENA1044S)
+
+pci:v00001DF3d00000202*
+ ID_MODEL_FROM_DATABASE=ACE-NIC50 Programmable Network Accelerator
+
+pci:v00001DF3d00000202sv00001DF3sd00000001*
+ ID_MODEL_FROM_DATABASE=ACE-NIC50 Programmable Network Accelerator (ENA2050F)
+
+pci:v00001DF3d00000202sv00001DF3sd00000002*
+ ID_MODEL_FROM_DATABASE=ACE-NIC50 Programmable Network Accelerator (ENA2050FS)
+
+pci:v00001DF3d00000203*
+ ID_MODEL_FROM_DATABASE=ACE-NIC100 Programmable Network Accelerator
+
+pci:v00001DF3d00000203sv00001DF3sd00000001*
+ ID_MODEL_FROM_DATABASE=ACE-NIC100 Programmable Network Accelerator (ENA2080F)
+
+pci:v00001DF3d00000203sv00001DF3sd00000002*
+ ID_MODEL_FROM_DATABASE=ACE-NIC100 Programmable Network Accelerator (ENA2080FS)
+
+pci:v00001DF3d00000203sv00001DF3sd00000003*
+ ID_MODEL_FROM_DATABASE=ACE-NIC100 Programmable Network Accelerator (ENA2100F)
+
+pci:v00001DF3d00000204*
+ ID_MODEL_FROM_DATABASE=ACE-NIC-NID Programmable Network Accelerator
+
+pci:v00001DF3d00000204sv00001DF3sd00000001*
+ ID_MODEL_FROM_DATABASE=ACE-NIC-NID Programmable Network Accelerator (ENA1020Z)
+
+pci:v00001DF3d00000204sv00001DF3sd00000002*
+ ID_MODEL_FROM_DATABASE=ACE-NIC-NID Programmable Network Accelerator (ENA1020ZS)
 
 pci:v00001DF7*
  ID_VENDOR_FROM_DATABASE=opencpi.org
@@ -64817,6 +65816,9 @@ pci:v00001E24d0000021F*
 pci:v00001E24d00001525*
  ID_MODEL_FROM_DATABASE=Xilinx BCU-1525
 
+pci:v00001E38*
+ ID_VENDOR_FROM_DATABASE=Thinci, Inc
+
 pci:v00001E3D*
  ID_VENDOR_FROM_DATABASE=Burlywood, Inc
 
@@ -68864,6 +69866,15 @@ pci:v00008086d00000C7E*
 pci:v00008086d00000C7F*
  ID_MODEL_FROM_DATABASE=Atom Processor S1200 Internal
 
+pci:v00008086d00000CF8*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 Intel(R) FPGA Programmable Acceleration Card N3000 for Networking
+
+pci:v00008086d00000CF8sv00008086sd00000000*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 Intel(R) FPGA Programmable Acceleration Card N3000 for Networking
+
+pci:v00008086d00000CF8sv00008086sd00000001*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 Intel(R) FPGA Programmable Acceleration Card N3000 for Networking
+
 pci:v00008086d00000D00*
  ID_MODEL_FROM_DATABASE=Crystal Well DRAM Controller
 
@@ -68891,6 +69902,15 @@ pci:v00008086d00000D26*
 pci:v00008086d00000D36*
  ID_MODEL_FROM_DATABASE=Crystal Well Integrated Graphics Controller
 
+pci:v00008086d00000D58*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller XXV710 Intel(R) FPGA Programmable Acceleration Card N3000 for Networking
+
+pci:v00008086d00000D58sv00008086sd00000000*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller XXV710 Intel(R) FPGA Programmable Acceleration Card N3000 for Networking
+
+pci:v00008086d00000D58sv00008086sd00000001*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller XXV710 Intel(R) FPGA Programmable Acceleration Card N3000 for Networking
+
 pci:v00008086d00000E00*
  ID_MODEL_FROM_DATABASE=Xeon E7 v2/Xeon E5 v2/Core i7 DMI2
 
@@ -71933,6 +72953,9 @@ pci:v00008086d00001521sv00008086sd00005001*
 pci:v00008086d00001521sv00008086sd00005002*
  ID_MODEL_FROM_DATABASE=I350 Gigabit Network Connection (Ethernet Server Adapter I350-T2)
 
+pci:v00008086d00001521sv00008086sd00005003*
+ ID_MODEL_FROM_DATABASE=I350 Gigabit Network Connection (Ethernet 1G 4P I350-t OCP)
+
 pci:v00008086d00001522*
  ID_MODEL_FROM_DATABASE=I350 Gigabit Fiber Network Connection
 
@@ -72434,6 +73457,15 @@ pci:v00008086d00001572sv00008086sd0000000F*
 pci:v00008086d00001572sv00008086sd00000010*
  ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet Converged Network Adapter X710)
 
+pci:v00008086d00001572sv00008086sd00000013*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet 10G 2P X710 OCP)
+
+pci:v00008086d00001572sv00008086sd00000014*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet 10G 4P X710 OCP)
+
+pci:v00008086d00001572sv00008086sd00000015*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+ (Ethernet Server Adapter X710-DA2 for OCP)
+
 pci:v00008086d00001572sv00008086sd00004005*
  ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GbE SFP+
 
@@ -72905,6 +73937,18 @@ pci:v00008086d000015F6*
 pci:v00008086d000015FF*
  ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GBASE-T
 
+pci:v00008086d000015FFsv00008086sd00000005*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GBASE-T (Ethernet 10G 2P X710-T2L-t Adapter)
+
+pci:v00008086d000015FFsv00008086sd00000006*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GBASE-T (Ethernet 10G 4P X710-T4L-t Adapter)
+
+pci:v00008086d000015FFsv00008086sd00000007*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GBASE-T (Ethernet 10G 2P X710-T2L-t OCP)
+
+pci:v00008086d000015FFsv00008086sd00000008*
+ ID_MODEL_FROM_DATABASE=Ethernet Controller X710 for 10GBASE-T (Ethernet 10G 4P X710-T4L-t OCP)
+
 pci:v00008086d00001600*
  ID_MODEL_FROM_DATABASE=Broadwell-U Host Bridge -OPI
 
@@ -84908,11 +85952,17 @@ pci:v00008086d00003CF5*
 pci:v00008086d00003CF6*
  ID_MODEL_FROM_DATABASE=Xeon E5/Core i7 System Address Decoder
 
+pci:v00008086d00003E10*
+ ID_MODEL_FROM_DATABASE=8th Gen Core 4-core Processor Host Bridge/DRAM Registers [Coffee Lake H]
+
 pci:v00008086d00003E18*
- ID_MODEL_FROM_DATABASE=8th Gen Core Processor Host Bridge/DRAM Registers
+ ID_MODEL_FROM_DATABASE=8th Gen Core 4-core Workstation Processor Host Bridge/DRAM Registers [Coffee Lake S]
 
 pci:v00008086d00003E1F*
- ID_MODEL_FROM_DATABASE=8th Gen Core Processor Host Bridge/DRAM Registers
+ ID_MODEL_FROM_DATABASE=8th Gen Core 4-core Desktop Processor Host Bridge/DRAM Registers [Coffee Lake S]
+
+pci:v00008086d00003E30*
+ ID_MODEL_FROM_DATABASE=8th Gen Core 8-core Desktop Processor Host Bridge/DRAM Registers [Coffee Lake S]
 
 pci:v00008086d00003E81*
  ID_MODEL_FROM_DATABASE=8th Gen Core Processor PCIe Controller (x16)
@@ -87882,10 +88932,13 @@ pci:v00008086d00009D48sv00001028sd000006F3*
  ID_MODEL_FROM_DATABASE=Sunrise Point-LP LPC Controller (Latitude 3570)
 
 pci:v00008086d00009D4E*
- ID_MODEL_FROM_DATABASE=Intel(R) 100 Series Chipset Family LPC Controller/eSPI Controller - 9D4E
+ ID_MODEL_FROM_DATABASE=Sunrise Point LPC Controller/eSPI Controller
 
 pci:v00008086d00009D4Esv000017AAsd0000225D*
- ID_MODEL_FROM_DATABASE=Intel(R) 100 Series Chipset Family LPC Controller/eSPI Controller - 9D4E (ThinkPad T480)
+ ID_MODEL_FROM_DATABASE=Sunrise Point LPC Controller/eSPI Controller (ThinkPad T480)
+
+pci:v00008086d00009D50*
+ ID_MODEL_FROM_DATABASE=Sunrise Point LPC Controller
 
 pci:v00008086d00009D56*
  ID_MODEL_FROM_DATABASE=Sunrise Point-LP LPC Controller
@@ -88703,6 +89756,15 @@ pci:v00008086d0000A2F0*
 pci:v00008086d0000A304*
  ID_MODEL_FROM_DATABASE=H370 Chipset LPC/eSPI Controller
 
+pci:v00008086d0000A305*
+ ID_MODEL_FROM_DATABASE=Z390 Chipset LPC/eSPI Controller
+
+pci:v00008086d0000A306*
+ ID_MODEL_FROM_DATABASE=Q370 Chipset LPC/eSPI Controller
+
+pci:v00008086d0000A30C*
+ ID_MODEL_FROM_DATABASE=QM370 Chipset LPC/eSPI Controller
+
 pci:v00008086d0000A323*
  ID_MODEL_FROM_DATABASE=Cannon Lake PCH SMBus Controller
 
@@ -88787,6 +89849,9 @@ pci:v00008086d0000A348*
 pci:v00008086d0000A352*
  ID_MODEL_FROM_DATABASE=Cannon Lake PCH SATA AHCI Controller
 
+pci:v00008086d0000A353*
+ ID_MODEL_FROM_DATABASE=Cannon Lake Mobile PCH SATA AHCI Controller
+
 pci:v00008086d0000A360*
  ID_MODEL_FROM_DATABASE=Cannon Lake PCH HECI Controller
 
@@ -90656,6 +91721,12 @@ pci:v0000CAFEd00000003*
 pci:v0000CAFEd00000006*
  ID_MODEL_FROM_DATABASE=Luna PCI-e 3000 Hardware Security Module
 
+pci:v0000CAFEd00000007*
+ ID_MODEL_FROM_DATABASE=Luna K6 Hardware Security Module
+
+pci:v0000CAFEd00000008*
+ ID_MODEL_FROM_DATABASE=Luna K7 Hardware Security Module
+
 pci:v0000CC53*
  ID_VENDOR_FROM_DATABASE=ScaleFlux Inc.
 
@@ -91271,6 +92342,9 @@ pci:v0000F043*
 pci:v0000F05B*
  ID_VENDOR_FROM_DATABASE=Foxconn International, Inc. (Wrong ID)
 
+pci:v0000F15E*
+ ID_VENDOR_FROM_DATABASE=SiFive, Inc.
+
 pci:v0000F1D0*
  ID_VENDOR_FROM_DATABASE=AJA Video
 
@@ -91304,6 +92378,9 @@ pci:v0000F1D0d0000DFEE*
 pci:v0000F1D0d0000EB0E*
  ID_MODEL_FROM_DATABASE=Corvid 44
 
+pci:v0000F1D0d0000EB1D*
+ ID_MODEL_FROM_DATABASE=Kona 5
+
 pci:v0000F1D0d0000EFAC*
  ID_MODEL_FROM_DATABASE=Xena SD-MM/SD-22-MM
 
index 2f46b6e23b0a2b15acc4e47a2d164fef3b074ed3..355544030ba197327cfba2d71344feacdabbbaaf 100644 (file)
@@ -430,6 +430,13 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnFUJITSU*:pn*ESPRIMO*Mobile*V6*:pvr*
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnGIGABYTE:pnU2442:*
  KEYBOARD_KEY_a0=!                                      # mute
 
+###########################################################
+# Gemini
+###########################################################
+
+evdev:atkbd:dmi:bvn*:bvr*:bd*:svnGeminiDevices:pnNC14V1006:*
+ KEYBOARD_KEY_9c=enter
+
 ###########################################################
 # Genius
 ###########################################################
@@ -618,6 +625,14 @@ evdev:atkbd:dmi:bvn*:bvr*:svnHP*:pnHP*ProBook*645*G4*
  KEYBOARD_KEY_73=slash                                  # Slash key
  KEYBOARD_KEY_f8=wlan                                   # Wireless HW switch button
 
+# HP Stream 7
+# The ACPI tables contains a gpio-keys entry for a non connected GPIO
+# causing spurious events, map this to unknown to disable it
+# older kernels use "ev:23" newer kernels "ev:3"
+evdev:name:gpio-keys:phys:gpio-keys/input0:ev:3:dmi:*:svnHewlett-Packard:pnHPStream7Tablet:*
+evdev:name:gpio-keys:phys:gpio-keys/input0:ev:23:dmi:*:svnHewlett-Packard:pnHPStream7Tablet:*
+ KEYBOARD_KEY_0=unknown
+
 ##########################################################
 # Huawei
 ##########################################################
index 8cfda94f4fca358521d465bae0e821eb6cc03ee8..b916addcadb6c213a04b11bb42135593cc584f7c 100644 (file)
@@ -107,6 +107,9 @@ sensor:modalias:acpi:INVN6500*:dmi:*svn*ASUSTeK*:*pn*TP300LA*
 sensor:modalias:acpi:INVN6500*:dmi:*svn*ASUSTeK*:*pn*TP300LD*
  ACCEL_MOUNT_MATRIX=0, 1, 0; 1, 0, 0; 0, 0, 1
 
+sensor:modalias:acpi:KXJ2109*:dmi:*:svnASUSTeK*:pnME176C*
+ ACCEL_MOUNT_MATRIX=-1, 0, 0; 0, 1, 0; 0, 0, 1
+
 sensor:modalias:acpi:SMO8500*:dmi:*svn*ASUSTeK*:*pn*TP300LJ*
  ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
 
@@ -364,9 +367,15 @@ sensor:modalias:acpi:SMO8500*:dmi:*:svnMicro-StarInternationalCo.,Ltd.:pnS100:*
 #########################################
 # Nuvision (TMax)
 #########################################
+
+# Nuvision/TMAX 8" Windows signature edition. TM800W560L
 sensor:modalias:acpi:KIOX000A*:dmi:*:svnTMAX:pnTM800W560L:*
  ACCEL_MOUNT_MATRIX=1, 0, 0; 0, -1, 0; 0, 0, 1
 
+# Nuvision Solo 10 Draw. TM101W610L
+sensor:modalias:acpi:KIOX000A*:dmi:*:svnTMAX:pnTM101W610L:*
+ ACCEL_MOUNT_MATRIX=0, -1, 0; -1, 0, 0; 0, 0, 1
+
 #########################################
 # Onda
 #########################################
index 3a15ff57ca8258c004d47bd77414d3883f4a89a4..98549039f39e8ca986a0798c2b8707c7752bfa53 100644 (file)
@@ -447,6 +447,7 @@ mouse:usb:v046dp406a:name:Logitech MX Anywhere 2S:
 
 # Logitech MX Master
 # Horiz wheel has 14 stops, angle is rounded up
+mouse:usb:v046dp4060:name:Logitech MX Master:
 mouse:usb:v046dp4041:name:Logitech MX Master:
  MOUSE_DPI=1000@166
  MOUSE_WHEEL_CLICK_ANGLE=15
index d712ab0419d2bbc83b4637c8f820e3e788fb5e74..73511032da1bbf085f60316533f121319b9606a8 100644 (file)
@@ -93,6 +93,7 @@
  <tr class="odd"><td>Sensel, Inc.</td><td>SNSL</td><td>08/20/2018</td> </tr>
  <tr class="even"><td>G2touch Co., LTD</td><td>GTCH</td><td>12/04/2018</td> </tr>
  <tr class="odd"><td>Guizhou Huaxintong Semiconductor Technology Co., Ltd</td><td>HXTS</td><td>01/18/2019</td> </tr>
+ <tr class="even"><td>Amazon Corporation</td><td>AMZN</td><td>02/06/2019</td> </tr>
       </tbody>
     </table>
   </body>
index ca94c1cb4c434dca753d6a44c9c44f2f6a465fc1..044e9db966ad921e4a65429335cd90c71f549930 100644 (file)
@@ -1694,12 +1694,6 @@ C8C50E     (base 16)             Shenzhen Primestone Network Technologies.Co., Ltd.
                                Jungwon-gu  Seongnam-si Gyeonggi-do,  462726\r
                                KR\r
 \r
-5C-5B-35   (hex)               Mist Systems, Inc.\r
-5C5B35     (base 16)           Mist Systems, Inc.\r
-                               4410 El Camino Real\r
-                               Los Altos  CA  94022\r
-                               US\r
-\r
 E8-07-BF   (hex)               SHENZHEN BOOMTECH INDUSTRY CO.,LTD\r
 E807BF     (base 16)           SHENZHEN BOOMTECH INDUSTRY CO.,LTD\r
                                Floor 6 East, Bldg 6, Yusheng Industrial Area, Xixiang, Bao'an District\r
@@ -22271,12 +22265,6 @@ B47443     (base 16)           Samsung Electronics Co.,Ltd
                                San Jose  CA  94568\r
                                US\r
 \r
-00-A0-B8   (hex)               NetApp\r
-00A0B8     (base 16)           NetApp\r
-                               2001 Danfield Ct.\r
-                               Fort Collins  CO  80525\r
-                               US\r
-\r
 9C-D4-8B   (hex)               Innolux Technology Europe BV\r
 9CD48B     (base 16)           Innolux Technology Europe BV\r
                                Stationstraat 39G\r
@@ -28811,42 +28799,6 @@ D05157     (base 16)           LEAX Arkivator Telecom
                                Roseville  CA  95747\r
                                US\r
 \r
-00-1F-90   (hex)               Actiontec Electronics, Inc\r
-001F90     (base 16)           Actiontec Electronics, Inc\r
-                               301 Olcott St\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
-20-76-00   (hex)               Actiontec Electronics, Inc\r
-207600     (base 16)           Actiontec Electronics, Inc\r
-                               301 Olcott St\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
-F8-E4-FB   (hex)               Actiontec Electronics, Inc\r
-F8E4FB     (base 16)           Actiontec Electronics, Inc\r
-                               301 Olcott St\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
-18-1B-EB   (hex)               Actiontec Electronics, Inc\r
-181BEB     (base 16)           Actiontec Electronics, Inc\r
-                               301 Olcott St\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
-E8-6F-F2   (hex)               Actiontec Electronics, Inc\r
-E86FF2     (base 16)           Actiontec Electronics, Inc\r
-                               301 Olcott St\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
-FC-2B-B2   (hex)               Actiontec Electronics, Inc\r
-FC2BB2     (base 16)           Actiontec Electronics, Inc\r
-                               301 Olcott St\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
 50-00-84   (hex)               Siemens Canada\r
 500084     (base 16)           Siemens Canada\r
                                300 Applewood Crescent\r
@@ -31121,30 +31073,180 @@ F848FD     (base 16)         China Mobile Group Device Co.,Ltd.
                                Beijing    100053\r
                                CN\r
 \r
-24-31-54   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
-243154     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+14-3C-C3   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+143CC3     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
                                No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
                                Dongguan    523808\r
                                CN\r
 \r
-48-3F-E9   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
-483FE9     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+EC-56-23   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+EC5623     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
                                No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
                                Dongguan    523808\r
                                CN\r
 \r
-14-3C-C3   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
-143CC3     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+24-31-54   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+243154     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
                                No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
                                Dongguan    523808\r
                                CN\r
 \r
-EC-56-23   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
-EC5623     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+48-3F-E9   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+483FE9     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
                                No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
                                Dongguan    523808\r
                                CN\r
 \r
+FC-2B-B2   (hex)               Actiontec Electronics, Inc\r
+FC2BB2     (base 16)           Actiontec Electronics, Inc\r
+                               3301 Olcott St.\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+34-6B-5B   (hex)               New H3C Technologies Co., Ltd\r
+346B5B     (base 16)           New H3C Technologies Co., Ltd\r
+                               466 Changhe Road, Binjiang District\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
+F8-E4-FB   (hex)               Actiontec Electronics, Inc\r
+F8E4FB     (base 16)           Actiontec Electronics, Inc\r
+                               301 Olcott St\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+20-76-00   (hex)               Actiontec Electronics, Inc\r
+207600     (base 16)           Actiontec Electronics, Inc\r
+                               301 Olcott St\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+00-1F-90   (hex)               Actiontec Electronics, Inc\r
+001F90     (base 16)           Actiontec Electronics, Inc\r
+                               301 Olcott St\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+E8-6F-F2   (hex)               Actiontec Electronics, Inc\r
+E86FF2     (base 16)           Actiontec Electronics, Inc\r
+                               3301 Olcott St.\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+18-1B-EB   (hex)               Actiontec Electronics, Inc\r
+181BEB     (base 16)           Actiontec Electronics, Inc\r
+                               301 Olcott St\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+94-EE-9F   (hex)               HMD Global Oy\r
+94EE9F     (base 16)           HMD Global Oy\r
+                               Bertel Jungin aukio 9\r
+                               Espoo    02600\r
+                               FI\r
+\r
+AC-A4-6E   (hex)               SHENZHEN GONGJIN ELECTRONICS CO.,LT\r
+ACA46E     (base 16)           SHENZHEN GONGJIN ELECTRONICS CO.,LT\r
+                               SONGGANG\r
+                               SHENZHEN  GUANGDONG  518105\r
+                               CN\r
+\r
+80-DA-BC   (hex)               Megafone Limited\r
+80DABC     (base 16)           Megafone Limited\r
+                               Unit 702,7/F,Bankok Bank Building,NO.18 Bonham Strand West\r
+                               Hong Kong    999077\r
+                               HK\r
+\r
+50-75-F1   (hex)               ARRIS Group, Inc.\r
+5075F1     (base 16)           ARRIS Group, Inc.\r
+                               6450 Sequence Drive\r
+                               San Diego  CA  92121\r
+                               US\r
+\r
+00-A0-B8   (hex)               NetApp\r
+00A0B8     (base 16)           NetApp\r
+                               1395 Crossman Ave\r
+                               Sunnyvale,  CA  94089\r
+                               US\r
+\r
+30-50-FD   (hex)               Skyworth Digital Technology(Shenzhen) Co.,Ltd\r
+3050FD     (base 16)           Skyworth Digital Technology(Shenzhen) Co.,Ltd\r
+                               7F,Block A,Skyworth Building,\r
+                               Shenzhen  Guangdong  518057\r
+                               CN\r
+\r
+80-D0-4A   (hex)               Technicolor CH USA Inc.\r
+80D04A     (base 16)           Technicolor CH USA Inc.\r
+                               5030 Sugarloaf Parkway Bldg 6\r
+                               Lawrenceville  GA  30044\r
+                               US\r
+\r
+4C-17-44   (hex)               Amazon Technologies Inc.\r
+4C1744     (base 16)           Amazon Technologies Inc.\r
+                               P.O. Box 8102\r
+                               Reno  NV  89507\r
+                               US\r
+\r
+4C-91-57   (hex)               Fujian LANDI Commercial Equipment Co.,Ltd\r
+4C9157     (base 16)           Fujian LANDI Commercial Equipment Co.,Ltd\r
+                               Building 17,the 1st Section ,Fuzhou Software Park\r
+                               No.89 Software Road   Fuzhou ,Fujian  350003\r
+                               CN\r
+\r
+50-13-95   (hex)               Sichuan AI-Link Technology Co., Ltd.\r
+501395     (base 16)           Sichuan AI-Link Technology Co., Ltd.\r
+                               Anzhou,Industrial Park\r
+                               Anzhou,Industrial Park  Sichuan  621000\r
+                               CN\r
+\r
+88-DA-33   (hex)               Beijing Xiaoyuer Network Technology Co., Ltd\r
+88DA33     (base 16)           Beijing Xiaoyuer Network Technology Co., Ltd\r
+                               Block K1, North American International Business Centre, 86 Beiyuan Road, Chaoyang District\r
+                               Beijing  Beijing  100012\r
+                               CN\r
+\r
+5C-1C-B9   (hex)               vivo Mobile Communication Co., Ltd.\r
+5C1CB9     (base 16)           vivo Mobile Communication Co., Ltd.\r
+                               #283,BBK Road\r
+                               Wusha,Chang'An  DongGuan City,Guangdong,  523860\r
+                               CN\r
+\r
+DC-B0-82   (hex)               Nokia\r
+DCB082     (base 16)           Nokia\r
+                               600 March Road\r
+                               Kanata  Ontario  K2K 2E6\r
+                               CA\r
+\r
+5C-5B-35   (hex)               Mist Systems, Inc.\r
+5C5B35     (base 16)           Mist Systems, Inc.\r
+                               1601 South De Anza Blvd, Suite 248\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+84-FD-D1   (hex)               Intel Corporate\r
+84FDD1     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3\r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
+D0-19-6A   (hex)               Ciena Corporation\r
+D0196A     (base 16)           Ciena Corporation\r
+                               7035 Ridge Road\r
+                               Hanover  MD  21076\r
+                               US\r
+\r
+D4-35-1D   (hex)               Technicolor\r
+D4351D     (base 16)           Technicolor\r
+                               Prins Boudewijnlaan 47\r
+                               Edegem - Belgium    B-2650\r
+                               BE\r
+\r
+60-09-C3   (hex)               u-blox AG\r
+6009C3     (base 16)           u-blox AG\r
+                               Zuercherstrasse 68\r
+                               Thalwil    8800\r
+                               CH\r
+\r
 0C-6F-9C   (hex)               Shaw Communications Inc.\r
 0C6F9C     (base 16)           Shaw Communications Inc.\r
                                Suite 900, 630 3rd Avenue S.W.\r
@@ -61547,24 +61649,6 @@ CC70ED     (base 16)           Cisco Systems, Inc
                                San Jose  CA  94568\r
                                US\r
 \r
-A8-39-44   (hex)               Actiontec Electronics, Inc\r
-A83944     (base 16)           Actiontec Electronics, Inc\r
-                               301 Olcott St\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
-00-24-7B   (hex)               Actiontec Electronics, Inc\r
-00247B     (base 16)           Actiontec Electronics, Inc\r
-                               301 Olcott St\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
-70-F2-20   (hex)               Actiontec Electronics, Inc\r
-70F220     (base 16)           Actiontec Electronics, Inc\r
-                               301 Olcott St\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
 D4-3D-39   (hex)               FCI. Inc\r
 D43D39     (base 16)           FCI. Inc\r
                                B-7F, SiliconPark, 35, Pangyo-ro 255beon-gil, Bundang-gu\r
@@ -62369,6 +62453,126 @@ FCAB90     (base 16)          HUAWEI TECHNOLOGIES CO.,LTD
                                Dongguan    523808\r
                                CN\r
 \r
+70-F2-20   (hex)               Actiontec Electronics, Inc\r
+70F220     (base 16)           Actiontec Electronics, Inc\r
+                               3301 Olcott St.\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+00-24-7B   (hex)               Actiontec Electronics, Inc\r
+00247B     (base 16)           Actiontec Electronics, Inc\r
+                               3301 Olcott St.\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+A8-39-44   (hex)               Actiontec Electronics, Inc\r
+A83944     (base 16)           Actiontec Electronics, Inc\r
+                               301 Olcott St\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+88-E6-4B   (hex)               Juniper Networks\r
+88E64B     (base 16)           Juniper Networks\r
+                               1133 Innovation Way\r
+                               Sunnyvale  CA  94089\r
+                               US\r
+\r
+48-D8-75   (hex)               China TransInfo Technology Co., Ltd\r
+48D875     (base 16)           China TransInfo Technology Co., Ltd\r
+                               Qianfang Building, Phase I, Zhongguancun Software Park, 8 Wangxi Road, Haidian District\r
+                               Beijing    100085\r
+                               CN\r
+\r
+CC-A1-2B   (hex)               TCL King Electrical Appliances (Huizhou) Co., Ltd\r
+CCA12B     (base 16)           TCL King Electrical Appliances (Huizhou) Co., Ltd\r
+                               10F, TCL Multimedia Building, TCL International E City, No.1001 Zhongshanyuan Rd., Nanshan District\r
+                               Shenzhen  Guangdong  518052\r
+                               CN\r
+\r
+4C-BC-48   (hex)               Cisco Systems, Inc\r
+4CBC48     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+D4-6A-35   (hex)               Cisco Systems, Inc\r
+D46A35     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+E4-F3-E8   (hex)               Shenzhen SuperElectron Technology Co.,Ltd.\r
+E4F3E8     (base 16)           Shenzhen SuperElectron Technology Co.,Ltd.\r
+                               1213-1214, haosheng business center, dongbin road, nanshan street, nanshan district, shenzhen city\r
+                               Shenzhen   Guangdong  518000\r
+                               CN\r
+\r
+B0-30-55   (hex)               China Mobile IOT Company Limited\r
+B03055     (base 16)           China Mobile IOT Company Limited\r
+                               NO.8 Yu Ma Road, NanAn Area\r
+                               Chongqing  Chongqing  401336\r
+                               CN\r
+\r
+E8-D0-FC   (hex)               Liteon Technology Corporation\r
+E8D0FC     (base 16)           Liteon Technology Corporation\r
+                               4F, 90, Chien 1 Road\r
+                               New Taipei City  Taiwan  23585\r
+                               TW\r
+\r
+C0-9F-E1   (hex)               zte corporation\r
+C09FE1     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen  guangdong  518057\r
+                               CN\r
+\r
+AC-00-D0   (hex)               zte corporation\r
+AC00D0     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen  guangdong  518057\r
+                               CN\r
+\r
+10-DC-4A   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
+10DC4A     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
+                               No.5 DongXin Road\r
+                               Wuhan  Hubei  430074\r
+                               CN\r
+\r
+44-4B-7E   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
+444B7E     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
+                               No.5 DongXin Road\r
+                               Wuhan  Hubei  430074\r
+                               CN\r
+\r
+84-C7-8F   (hex)               STORDIS GmbH\r
+84C78F     (base 16)           STORDIS GmbH\r
+                               Rosenwiesstr. 17\r
+                               Stuttgart    70567\r
+                               DE\r
+\r
+78-2C-29   (hex)               New H3C Technologies Co., Ltd\r
+782C29     (base 16)           New H3C Technologies Co., Ltd\r
+                               466 Changhe Road, Binjiang District\r
+                               Hangzhou  Zhejiang  310052\r
+                               CN\r
+\r
+98-B8-BA   (hex)               LG Electronics (Mobile Communications)\r
+98B8BA     (base 16)           LG Electronics (Mobile Communications)\r
+                               60-39, Gasan-dong, Geumcheon-gu\r
+                               Seoul    153-801\r
+                               KR\r
+\r
+D4-9D-C0   (hex)               Samsung Electronics Co.,Ltd\r
+D49DC0     (base 16)           Samsung Electronics Co.,Ltd\r
+                               129, Samsung-ro, Youngtongl-Gu\r
+                               Suwon  Gyeonggi-Do  16677\r
+                               KR\r
+\r
+D4-D2-52   (hex)               Intel Corporate\r
+D4D252     (base 16)           Intel Corporate\r
+                               Lot 8, Jalan Hi-Tech 2/3\r
+                               Kulim  Kedah  09000\r
+                               MY\r
+\r
 58-46-E1   (hex)               Baxter International Inc\r
 5846E1     (base 16)           Baxter International Inc\r
                                One Baxter Parkway\r
@@ -70682,12 +70886,6 @@ A893E6     (base 16)           JIANGXI JINGGANGSHAN CKING COMMUNICATION TECHNOLOGY CO.,LT
                                Paris    75015\r
                                FR\r
 \r
-00-22-89   (hex)               Optosecurity Inc.\r
-002289     (base 16)           Optosecurity Inc.\r
-                               505, Boul. du Parc Technologique\r
-                               Quebec    G1P 4S9\r
-                               CA\r
-\r
 00-22-82   (hex)               8086 Consultancy\r
 002282     (base 16)           8086 Consultancy\r
                                17 Lowfield Lane\r
@@ -84086,12 +84284,6 @@ B8A175     (base 16)           Roku, Inc.
                                Saratoga  CA  95070\r
                                US\r
 \r
-00-80-E5   (hex)               NetApp\r
-0080E5     (base 16)           NetApp\r
-                               3718 N. Rock Road\r
-                               Wichita  KS  67226-1397\r
-                               US\r
-\r
 00-23-40   (hex)               MiXTelematics\r
 002340     (base 16)           MiXTelematics\r
                                Blaauwklip Office Park 2\r
@@ -91970,30 +92162,6 @@ E09F2A     (base 16)           Iton Technology Corp.
                                Ulsan    44922\r
                                KR\r
 \r
-00-1E-A7   (hex)               Actiontec Electronics, Inc\r
-001EA7     (base 16)           Actiontec Electronics, Inc\r
-                               301 Olcott St\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
-10-5F-06   (hex)               Actiontec Electronics, Inc\r
-105F06     (base 16)           Actiontec Electronics, Inc\r
-                               301 Olcott St\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
-70-F1-96   (hex)               Actiontec Electronics, Inc\r
-70F196     (base 16)           Actiontec Electronics, Inc\r
-                               301 Olcott St\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
-00-26-B8   (hex)               Actiontec Electronics, Inc\r
-0026B8     (base 16)           Actiontec Electronics, Inc\r
-                               301 Olcott St\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
 64-25-5E   (hex)               Observint Technologies, Inc.\r
 64255E     (base 16)           Observint Technologies, Inc.\r
                                11000 N Mopac Expressway Suite 300\r
@@ -92906,12 +93074,6 @@ AC37C9     (base 16)           RAID Incorporated
                                Andover  MA  01810\r
                                US\r
 \r
-24-DA-33   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
-24DA33     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
-                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
-                               Dongguan    523808\r
-                               CN\r
-\r
 A8-E5-44   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
 A8E544     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
                                No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
@@ -92924,12 +93086,150 @@ A8E544     (base 16)         HUAWEI TECHNOLOGIES CO.,LTD
                                San Jose  CA  94568\r
                                US\r
 \r
+24-DA-33   (hex)               HUAWEI TECHNOLOGIES CO.,LTD\r
+24DA33     (base 16)           HUAWEI TECHNOLOGIES CO.,LTD\r
+                               No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
+                               Dongguan    523808\r
+                               CN\r
+\r
 D4-78-9B   (hex)               Cisco Systems, Inc\r
 D4789B     (base 16)           Cisco Systems, Inc\r
                                80 West Tasman Drive\r
                                San Jose  CA  94568\r
                                US\r
 \r
+00-26-B8   (hex)               Actiontec Electronics, Inc\r
+0026B8     (base 16)           Actiontec Electronics, Inc\r
+                               3301 Olcott St.\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+70-F1-96   (hex)               Actiontec Electronics, Inc\r
+70F196     (base 16)           Actiontec Electronics, Inc\r
+                               3301 Olcott St.\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+10-5F-06   (hex)               Actiontec Electronics, Inc\r
+105F06     (base 16)           Actiontec Electronics, Inc\r
+                               301 Olcott St\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+00-1E-A7   (hex)               Actiontec Electronics, Inc\r
+001EA7     (base 16)           Actiontec Electronics, Inc\r
+                               301 Olcott St\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+50-C4-DD   (hex)               BUFFALO.INC\r
+50C4DD     (base 16)           BUFFALO.INC\r
+                               AKAMONDORI Bld.,30-20,Ohsu 3-chome,Naka-ku\r
+                               Nagoya  Aichi Pref.  460-8315\r
+                               JP\r
+\r
+C4-65-16   (hex)               Hewlett Packard\r
+C46516     (base 16)           Hewlett Packard\r
+                               11445 Compaq Center Drive\r
+                               Houston  TX  77070\r
+                               US\r
+\r
+D8-D0-90   (hex)               Dell Inc.\r
+D8D090     (base 16)           Dell Inc.\r
+                               One Dell Way\r
+                               Round Rock  TX  78682\r
+                               US\r
+\r
+F8-DF-E1   (hex)               MyLight Systems\r
+F8DFE1     (base 16)           MyLight Systems\r
+                               290 rue Ferdinand Perrier\r
+                               Saint Priest    69800\r
+                               FR\r
+\r
+F4-32-3D   (hex)               Sichuan tianyi kanghe communications co., LTD\r
+F4323D     (base 16)           Sichuan tianyi kanghe communications co., LTD\r
+                               No.198, section 1, xueshan avenue, jinyuan town, dayi county, sichuan province\r
+                               chengdu  sichuan  611330\r
+                               CN\r
+\r
+D0-39-EA   (hex)               NetApp\r
+D039EA     (base 16)           NetApp\r
+                               1395 Crossman Ave\r
+                               Sunnyvale,  CA  94089\r
+                               US\r
+\r
+00-80-E5   (hex)               NetApp\r
+0080E5     (base 16)           NetApp\r
+                               1395 Crossman Ave\r
+                               Sunnyvale,  CA  94089\r
+                               US\r
+\r
+DC-2A-A1   (hex)               MedHab LLC\r
+DC2AA1     (base 16)           MedHab LLC\r
+                               3501 North US Highway 67\r
+                               San Angelo  TX  76905\r
+                               US\r
+\r
+90-5C-34   (hex)               Sirius Electronic Systems Srl\r
+905C34     (base 16)           Sirius Electronic Systems Srl\r
+                               via Robinie, 33\r
+                               Gravellona Toce  VB  28883\r
+                               IT\r
+\r
+50-41-B9   (hex)               I-O DATA DEVICE,INC.\r
+5041B9     (base 16)           I-O DATA DEVICE,INC.\r
+                               3-10,Sakurada-machi\r
+                               Kanazawa  Ishikawa  920-8512\r
+                               JP\r
+\r
+00-22-89   (hex)               Vandelrande APC inc.\r
+002289     (base 16)           Vandelrande APC inc.\r
+                               1280 Lebourgneuf Blvd.\r
+                               Quebec    G2K 0H1\r
+                               CA\r
+\r
+7C-D6-61   (hex)               Xiaomi Communications Co Ltd\r
+7CD661     (base 16)           Xiaomi Communications Co Ltd\r
+                               The Rainbow City of China Resources\r
+                               NO.68, Qinghe Middle Street  Haidian District, Beijing  100085\r
+                               CN\r
+\r
+18-D9-EF   (hex)               Shuttle Inc.\r
+18D9EF     (base 16)           Shuttle Inc.\r
+                               No. 30 Lane 76, Rei Kuang Rd\r
+                               Taipei    114\r
+                               TW\r
+\r
+F8-E5-CF   (hex)               CGI IT UK LIMITED\r
+F8E5CF     (base 16)           CGI IT UK LIMITED\r
+                               20 Fenchurch Street, 14th Floor\r
+                               London    EC3M 3BY\r
+                               GB\r
+\r
+70-DD-A8   (hex)               GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+70DDA8     (base 16)           GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+                               NO.18 HAIBIN ROAD,\r
+                               DONG GUAN  GUANG DONG  523860\r
+                               CN\r
+\r
+B0-FD-0B   (hex)               IEEE Registration Authority\r
+B0FD0B     (base 16)           IEEE Registration Authority\r
+                               445 Hoes Lane\r
+                               Piscataway  NJ  08554\r
+                               US\r
+\r
+D4-20-B0   (hex)               Mist Systems, Inc.\r
+D420B0     (base 16)           Mist Systems, Inc.\r
+                               1601 South De Anza Blvd, Suite 248\r
+                               Cupertino  CA  95014\r
+                               US\r
+\r
+68-82-F2   (hex)               grandcentrix GmbH\r
+6882F2     (base 16)           grandcentrix GmbH\r
+                               Holzmarkt 1 \r
+                               Cologne  NW  50676\r
+                               DE\r
+\r
 D8-6C-E9   (hex)               Sagemcom Broadband SAS\r
 D86CE9     (base 16)           Sagemcom Broadband SAS\r
                                250 route de l'Empereur\r
@@ -109472,12 +109772,6 @@ EC3091     (base 16)         Cisco Systems, Inc
                                Austin  TX  78731\r
                                US\r
 \r
-00-03-12   (hex)               TR-Systemtechnik GmbH\r
-000312     (base 16)           TR-Systemtechnik GmbH\r
-                               Eglishalde 6\r
-                                   \r
-                               DE\r
-\r
 00-04-47   (hex)               Acrowave Systems Co., Ltd.\r
 000447     (base 16)           Acrowave Systems Co., Ltd.\r
                                Maru B/D 86-6, Nonhyun-Dong\r
@@ -112409,12 +112703,6 @@ EC3091     (base 16)         Cisco Systems, Inc
                                FOSTER CITY  CA  94404-1138\r
                                US\r
 \r
-00-A0-98   (hex)               NetApp\r
-00A098     (base 16)           NetApp\r
-                               495 East Java Drive\r
-                               Sunnyvale,  CA  94089\r
-                               US\r
-\r
 00-A0-A8   (hex)               RENEX CORPORATION\r
 00A0A8     (base 16)           RENEX CORPORATION\r
                                2750 KILLARNEY DRIVE\r
@@ -123212,18 +123500,6 @@ D43A2E     (base 16)         SHENZHEN MTC CO LTD
                                Shenzhen  Guangdong  518100\r
                                CN\r
 \r
-10-9F-A9   (hex)               Actiontec Electronics, Inc\r
-109FA9     (base 16)           Actiontec Electronics, Inc\r
-                               301 Olcott St\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
-00-20-E0   (hex)               Actiontec Electronics, Inc\r
-0020E0     (base 16)           Actiontec Electronics, Inc\r
-                               301 Olcott St\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
 AC-43-30   (hex)               Versa Networks\r
 AC4330     (base 16)           Versa Networks\r
                                6001 America center Drive, Suite 400\r
@@ -123998,6 +124274,102 @@ C821DA     (base 16)                Shenzhen YOUHUA Technology Co., Ltd
                                Shanghai  Shanghai  201203\r
                                CN\r
 \r
+E4-1E-0A   (hex)               IEEE Registration Authority\r
+E41E0A     (base 16)           IEEE Registration Authority\r
+                               445 Hoes Lane\r
+                               Piscataway  NJ  08554\r
+                               US\r
+\r
+00-20-E0   (hex)               Actiontec Electronics, Inc\r
+0020E0     (base 16)           Actiontec Electronics, Inc\r
+                               3301 Olcott St.\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+A0-91-A2   (hex)               OnePlus Electronics (Shenzhen) Co., Ltd.\r
+A091A2     (base 16)           OnePlus Electronics (Shenzhen) Co., Ltd.\r
+                               Room 201, Block A, No.1, 1st Qian Wan Road, Qianhai Shenzhen-Hong Kong Cooperation Zone, Shenzhen, China.\r
+                               Shenzhen  Guangdong  518000\r
+                               CN\r
+\r
+10-9F-A9   (hex)               Actiontec Electronics, Inc\r
+109FA9     (base 16)           Actiontec Electronics, Inc\r
+                               301 Olcott St\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+60-92-F5   (hex)               ARRIS Group, Inc.\r
+6092F5     (base 16)           ARRIS Group, Inc.\r
+                               6450 Sequence Drive\r
+                               San Diego  CA  92121\r
+                               US\r
+\r
+18-20-D5   (hex)               ARRIS Group, Inc.\r
+1820D5     (base 16)           ARRIS Group, Inc.\r
+                               6450 Sequence Drive\r
+                               San Diego  CA  92121\r
+                               US\r
+\r
+00-03-12   (hex)               TRsystems GmbH\r
+000312     (base 16)           TRsystems GmbH\r
+                               Eglishalde 16\r
+                                Trossingen  Baden-Wuerttemberg  D-78647\r
+                               DE\r
+\r
+9C-25-BE   (hex)               Wildlife Acoustics, Inc.\r
+9C25BE     (base 16)           Wildlife Acoustics, Inc.\r
+                               3 Mill and Main Place, Suite 210\r
+                               MAYNARD  MA  01754\r
+                               US\r
+\r
+00-A0-98   (hex)               NetApp\r
+00A098     (base 16)           NetApp\r
+                               1395 Crossman Ave\r
+                               Sunnyvale,  CA  94089\r
+                               US\r
+\r
+1C-69-7A   (hex)               EliteGroup Computer Systems Co., LTD\r
+1C697A     (base 16)           EliteGroup Computer Systems Co., LTD\r
+                               No.239, Sec. 2, TiDing Blvd. Nei-Hu Dist.\r
+                               Taipei  Taiwan  11439\r
+                               TW\r
+\r
+D0-9C-7A   (hex)               Xiaomi Communications Co Ltd\r
+D09C7A     (base 16)           Xiaomi Communications Co Ltd\r
+                               The Rainbow City of China Resources\r
+                               NO.68, Qinghe Middle Street  Haidian District, Beijing  100085\r
+                               CN\r
+\r
+48-87-64   (hex)               vivo Mobile Communication Co., Ltd.\r
+488764     (base 16)           vivo Mobile Communication Co., Ltd.\r
+                               #283,BBK Road\r
+                               Wusha,Chang'An  DongGuan City,Guangdong,  523860\r
+                               CN\r
+\r
+C8-2C-2B   (hex)               IEEE Registration Authority\r
+C82C2B     (base 16)           IEEE Registration Authority\r
+                               445 Hoes Lane\r
+                               Piscataway  NJ  08554\r
+                               US\r
+\r
+C0-FD-84   (hex)               zte corporation\r
+C0FD84     (base 16)           zte corporation\r
+                               12/F.,zte R&D building ,kejinan Road,Shenzhen,P.R.China\r
+                               shenzhen  guangdong  518057\r
+                               CN\r
+\r
+4C-6F-9C   (hex)               GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+4C6F9C     (base 16)           GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD\r
+                               NO.18 HAIBIN ROAD,\r
+                               DONG GUAN  GUANG DONG  523860\r
+                               CN\r
+\r
+D4-4D-A4   (hex)               Murata Manufacturing Co., Ltd.\r
+D44DA4     (base 16)           Murata Manufacturing Co., Ltd.\r
+                               1-10-1, Higashikotari\r
+                               Nagaokakyo-shi  Kyoto  617-8555\r
+                               JP\r
+\r
 2C-39-96   (hex)               Sagemcom Broadband SAS\r
 2C3996     (base 16)           Sagemcom Broadband SAS\r
                                250 route de l'Empereur\r
@@ -131720,12 +132092,6 @@ A4DE50     (base 16)         Total Walther GmbH
                                Munich    80807\r
                                DE\r
 \r
-E8-A4-C1   (hex)               Deep Sea Electronics PLC\r
-E8A4C1     (base 16)           Deep Sea Electronics PLC\r
-                               Highfield House\r
-                               Hunmanby  North Yorkshire  YO14 0PH\r
-                               GB\r
-\r
 70-1A-ED   (hex)               ADVAS CO., LTD.\r
 701AED     (base 16)           ADVAS CO., LTD.\r
                                3-8-8 Shin-yokohama, Kohoku-ku\r
@@ -132716,12 +133082,6 @@ DC3350     (base 16)         TechSAT GmbH
                                Geumcheon-Gu  Seoul  153-782\r
                                KR\r
 \r
-00-22-AF   (hex)               Safety Vision\r
-0022AF     (base 16)           Safety Vision\r
-                               6100 W. Sam Houston Pkwy. North\r
-                               Houston  Texas  77041\r
-                               US\r
-\r
 00-22-A2   (hex)               Xtramus Technologies\r
 0022A2     (base 16)           Xtramus Technologies\r
                                5th Fl., No. 102, Lide St.,\r
@@ -154151,78 +154511,12 @@ F46E95     (base 16)                Extreme Networks, Inc.
                                San Jose    95119\r
                                US\r
 \r
-00-0F-B3   (hex)               Actiontec Electronics, Inc\r
-000FB3     (base 16)           Actiontec Electronics, Inc\r
-                               301 Olcott St\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
-00-15-05   (hex)               Actiontec Electronics, Inc\r
-001505     (base 16)           Actiontec Electronics, Inc\r
-                               301 Olcott St\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
-00-18-01   (hex)               Actiontec Electronics, Inc\r
-001801     (base 16)           Actiontec Electronics, Inc\r
-                               301 Olcott St\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
 28-80-88   (hex)               NETGEAR\r
 288088     (base 16)           NETGEAR\r
                                350 East Plumeria Drive\r
                                San Jose  CA  95134\r
                                US\r
 \r
-00-7F-28   (hex)               Actiontec Electronics, Inc\r
-007F28     (base 16)           Actiontec Electronics, Inc\r
-                               301 Olcott St\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
-40-8B-07   (hex)               Actiontec Electronics, Inc\r
-408B07     (base 16)           Actiontec Electronics, Inc\r
-                               301 Olcott St\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
-4C-8B-30   (hex)               Actiontec Electronics, Inc\r
-4C8B30     (base 16)           Actiontec Electronics, Inc\r
-                               301 Olcott St\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
-A0-A3-E2   (hex)               Actiontec Electronics, Inc\r
-A0A3E2     (base 16)           Actiontec Electronics, Inc\r
-                               301 Olcott St\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
-0C-61-27   (hex)               Actiontec Electronics, Inc\r
-0C6127     (base 16)           Actiontec Electronics, Inc\r
-                               301 Olcott St\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
-00-26-62   (hex)               Actiontec Electronics, Inc\r
-002662     (base 16)           Actiontec Electronics, Inc\r
-                               301 Olcott St\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
-10-78-5B   (hex)               Actiontec Electronics, Inc\r
-10785B     (base 16)           Actiontec Electronics, Inc\r
-                               301 Olcott St\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
-9C-1E-95   (hex)               Actiontec Electronics, Inc\r
-9C1E95     (base 16)           Actiontec Electronics, Inc\r
-                               301 Olcott St\r
-                               Santa Clara  CA  95054\r
-                               US\r
-\r
 9C-69-B4   (hex)               IEEE Registration Authority\r
 9C69B4     (base 16)           IEEE Registration Authority\r
                                445 Hoes Lane\r
@@ -154940,6 +155234,12 @@ A4975C     (base 16)         VTech Telecommunications Ltd.
                                Shanghai  Shanghai  201203\r
                                CN\r
 \r
+C4-B3-6A   (hex)               Cisco Systems, Inc\r
+C4B36A     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
 F8-BB-BF   (hex)               eero inc.\r
 F8BBBF     (base 16)           eero inc.\r
                                500 Howard St Suite 900\r
@@ -154958,12 +155258,6 @@ F8BBBF     (base 16)         eero inc.
                                Sweden    SE-640 40\r
                                SE\r
 \r
-C4-B3-6A   (hex)               Cisco Systems, Inc\r
-C4B36A     (base 16)           Cisco Systems, Inc\r
-                               80 West Tasman Drive\r
-                               San Jose  CA  94568\r
-                               US\r
-\r
 90-4D-C3   (hex)               Flonidan A/S\r
 904DC3     (base 16)           Flonidan A/S\r
                                Islandsvej 29\r
@@ -154999,3 +155293,180 @@ F89A78     (base 16)                HUAWEI TECHNOLOGIES CO.,LTD
                                No.2 Xin Cheng Road, Room R6,Songshan Lake Technology Park\r
                                Dongguan    523808\r
                                CN\r
+\r
+9C-1E-95   (hex)               Actiontec Electronics, Inc\r
+9C1E95     (base 16)           Actiontec Electronics, Inc\r
+                               3301 Olcott St.\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+10-78-5B   (hex)               Actiontec Electronics, Inc\r
+10785B     (base 16)           Actiontec Electronics, Inc\r
+                               3301 Olcott St.\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+00-26-62   (hex)               Actiontec Electronics, Inc\r
+002662     (base 16)           Actiontec Electronics, Inc\r
+                               3301 Olcott St.\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+0C-61-27   (hex)               Actiontec Electronics, Inc\r
+0C6127     (base 16)           Actiontec Electronics, Inc\r
+                               3301 Olcott St.\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+A0-A3-E2   (hex)               Actiontec Electronics, Inc\r
+A0A3E2     (base 16)           Actiontec Electronics, Inc\r
+                               3301 Olcott St.\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+4C-8B-30   (hex)               Actiontec Electronics, Inc\r
+4C8B30     (base 16)           Actiontec Electronics, Inc\r
+                               3301 Olcott St.\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+00-22-AF   (hex)               Safety Vision, LLC\r
+0022AF     (base 16)           Safety Vision, LLC\r
+                               6100 W. Sam Houston Pkwy. North\r
+                               Houston  Texas  77041\r
+                               US\r
+\r
+C8-B4-22   (hex)               ASKEY COMPUTER CORP\r
+C8B422     (base 16)           ASKEY COMPUTER CORP\r
+                               10F,No.119,JIANKANG RD,ZHONGHE DIST\r
+                               NEW TAIPEI  TAIWAN  23585\r
+                               TW\r
+\r
+40-8B-07   (hex)               Actiontec Electronics, Inc\r
+408B07     (base 16)           Actiontec Electronics, Inc\r
+                               301 Olcott St\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+00-7F-28   (hex)               Actiontec Electronics, Inc\r
+007F28     (base 16)           Actiontec Electronics, Inc\r
+                               301 Olcott St\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+00-18-01   (hex)               Actiontec Electronics, Inc\r
+001801     (base 16)           Actiontec Electronics, Inc\r
+                               301 Olcott St\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+00-15-05   (hex)               Actiontec Electronics, Inc\r
+001505     (base 16)           Actiontec Electronics, Inc\r
+                               301 Olcott St\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+00-0F-B3   (hex)               Actiontec Electronics, Inc\r
+000FB3     (base 16)           Actiontec Electronics, Inc\r
+                               301 Olcott St\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+84-E8-92   (hex)               Actiontec Electronics, Inc\r
+84E892     (base 16)           Actiontec Electronics, Inc\r
+                               301 Olcott St\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+10-93-97   (hex)               ARRIS Group, Inc.\r
+109397     (base 16)           ARRIS Group, Inc.\r
+                               6450 Sequence Drive\r
+                               San Diego  CA  92121\r
+                               US\r
+\r
+10-3D-3E   (hex)               China Mobile Group Device Co.,Ltd.\r
+103D3E     (base 16)           China Mobile Group Device Co.,Ltd.\r
+                               32 Xuanwumen West Street,Xicheng District\r
+                               Beijing    100053\r
+                               CN\r
+\r
+64-CC-22   (hex)               Arcadyan Corporation\r
+64CC22     (base 16)           Arcadyan Corporation\r
+                               No.8, Sec.2, Guangfu Rd.\r
+                               Hsinchu City  Hsinchu  30071\r
+                               TW\r
+\r
+38-F3-2E   (hex)               Skullcandy\r
+38F32E     (base 16)           Skullcandy\r
+                               6301 N. LANDMARK DRIVE\r
+                               Park City    84098\r
+                               US\r
+\r
+E8-E8-B7   (hex)               Murata Manufacturing Co., Ltd.\r
+E8E8B7     (base 16)           Murata Manufacturing Co., Ltd.\r
+                               1-10-1, Higashikotari\r
+                               Nagaokakyo-shi  Kyoto   617-8555\r
+                               JP\r
+\r
+80-20-DA   (hex)               Sagemcom Broadband SAS\r
+8020DA     (base 16)           Sagemcom Broadband SAS\r
+                               250, route de l'Empereur\r
+                               Rueil Malmaison Cedex  hauts de seine  92848\r
+                               FR\r
+\r
+18-46-44   (hex)               Home Control Singapore Pte Ltd\r
+184644     (base 16)           Home Control Singapore Pte Ltd\r
+                               151 Lorong Chuan\r
+                               Singapore    556741\r
+                               SG\r
+\r
+E8-C4-17   (hex)               Fiberhome Telecommunication Technologies Co.,LTD\r
+E8C417     (base 16)           Fiberhome Telecommunication Technologies Co.,LTD\r
+                               No.5 DongXin Road\r
+                               Wuhan  Hubei  430074\r
+                               CN\r
+\r
+48-5D-EB   (hex)               Just Add Power\r
+485DEB     (base 16)           Just Add Power\r
+                               12505 STARKEY RD STE A\r
+                               LARGO  FL  33773\r
+                               US\r
+\r
+F8-B7-97   (hex)               NEC Platforms, Ltd.\r
+F8B797     (base 16)           NEC Platforms, Ltd.\r
+                               2-3 Kandatsukasamachi\r
+                               Chiyodaku  Tokyo  101-8532\r
+                               JP\r
+\r
+B0-AA-D2   (hex)               Sichuan tianyi kanghe communications co., LTD\r
+B0AAD2     (base 16)           Sichuan tianyi kanghe communications co., LTD\r
+                               No.198, section 1, xueshan avenue, jinyuan town, dayi county, sichuan province\r
+                               chengdu  sichuan  611330\r
+                               CN\r
+\r
+E8-A4-C1   (hex)               Deep Sea Electronics Ltd\r
+E8A4C1     (base 16)           Deep Sea Electronics Ltd\r
+                               Highfield House\r
+                               Hunmanby  North Yorkshire  YO14 0PH\r
+                               GB\r
+\r
+B0-70-0D   (hex)               Nokia\r
+B0700D     (base 16)           Nokia\r
+                               600 March Road\r
+                               Kanata  Ontario  K2K 2E6\r
+                               CA\r
+\r
+DC-8C-37   (hex)               Cisco Systems, Inc\r
+DC8C37     (base 16)           Cisco Systems, Inc\r
+                               80 West Tasman Drive\r
+                               San Jose  CA  94568\r
+                               US\r
+\r
+70-2E-80   (hex)               DIEHL Connectivity Solutions\r
+702E80     (base 16)           DIEHL Connectivity Solutions\r
+                               Stephanstraße 49\r
+                               Nürnberg  Bayern  90478\r
+                               DE\r
+\r
+7C-50-DA   (hex)               Private\r
+7C50DA     (base 16)           Private\r
index 88e45bae90e78868253fa2deaf85f04fa11981b8..3090a958f9cbfa9950e65027961c0cc1a687d88e 100644 (file)
@@ -2162,9 +2162,6 @@ C00000-CFFFFF     (base 16)               Shenzhen Samchung Video Technology Co., Ltd.
 D0-76-50   (hex)               Private\r
 F00000-FFFFFF     (base 16)            Private\r
 \r
-1C-CA-E3   (hex)               Private\r
-F00000-FFFFFF     (base 16)            Private\r
-\r
 3C-39-E7   (hex)               Private\r
 F00000-FFFFFF     (base 16)            Private\r
 \r
@@ -2840,6 +2837,63 @@ C8-63-14   (hex)         Tymphany Acoustic Technology (Huizhou) Co., Ltd.
                                Huizhou  Guangdong  516223\r
                                CN\r
 \r
+E4-1E-0A   (hex)               Avast Software s.r.o.\r
+300000-3FFFFF     (base 16)            Avast Software s.r.o.\r
+                               Pikrtova 1737/1a\r
+                               Prague 4    14000\r
+                               CZ\r
+\r
+C8-2C-2B   (hex)               Fungible, Inc.\r
+000000-0FFFFF     (base 16)            Fungible, Inc.\r
+                               3201 Scott Blvd., 2nd floor\r
+                               Santa Clara  CA  95054\r
+                               US\r
+\r
+E4-1E-0A   (hex)               Shanghai LeXiang Technology Co., Ltd\r
+E00000-EFFFFF     (base 16)            Shanghai LeXiang Technology Co., Ltd\r
+                               Floor 6,Building 8,Yanjiaqiao Road,Pudong Area ,Shanghai ,China\r
+                               shanghai    200125\r
+                               CN\r
+\r
+E4-1E-0A   (hex)               SFC Energy AG\r
+600000-6FFFFF     (base 16)            SFC Energy AG\r
+                               Eugen-Saenger-Ring 7\r
+                               Brunnthal    85649\r
+                               DE\r
+\r
+C8-2C-2B   (hex)               RF Engineering and Energy Resource\r
+300000-3FFFFF     (base 16)            RF Engineering and Energy Resource\r
+                               4460 Commercial Ave.\r
+                               Portage  MI  49002\r
+                               US\r
+\r
+C8-2C-2B   (hex)               Repp Health\r
+200000-2FFFFF     (base 16)            Repp Health\r
+                               1919 14th Street , Suite 700\r
+                               Boulder  CO  80302\r
+                               US\r
+\r
+C8-2C-2B   (hex)               DALCO AG\r
+500000-5FFFFF     (base 16)            DALCO AG\r
+                               Industriestr. 28\r
+                               Volketswil  ZH  8604\r
+                               CH\r
+\r
+B0-FD-0B   (hex)               DMAC Security LLC\r
+300000-3FFFFF     (base 16)            DMAC Security LLC\r
+                               833 Shotgun Road\r
+                               Sunrise  FL  33326\r
+                               US\r
+\r
+B0-FD-0B   (hex)               eSenseLab Ltd.\r
+800000-8FFFFF     (base 16)            eSenseLab Ltd.\r
+                               1 Chervena stena Str., Office 1\r
+                               Sofia  Sofia-grad  1421\r
+                               BG\r
+\r
+1C-CA-E3   (hex)               Private\r
+F00000-FFFFFF     (base 16)            Private\r
+\r
 1C-87-76   (hex)               Strone Technology\r
 C00000-CFFFFF     (base 16)            Strone Technology\r
                                13 Ellis Street\r
@@ -5594,6 +5648,24 @@ C8-63-14   (hex)         GRINBI PARTNERS
                                Seoul    06272\r
                                KR\r
 \r
+E4-1E-0A   (hex)               Safety Vision, LLC\r
+B00000-BFFFFF     (base 16)            Safety Vision, LLC\r
+                               6100 West Sam Houston Parkway North\r
+                               Houston  TX  77041-5113\r
+                               US\r
+\r
+E4-1E-0A   (hex)               Zavod № 423\r
+000000-0FFFFF     (base 16)            Zavod № 423\r
+                               2B, Zavodskoy proezd\r
+                               Bogoroditsk  Tula  301830\r
+                               RU\r
+\r
+C8-2C-2B   (hex)               Verifone Systems (China),lnc.\r
+800000-8FFFFF     (base 16)            Verifone Systems (China),lnc.\r
+                               2nd Floor,No.39,Region C, Tongpan Road,Gulou District\r
+                               fuzhou  fujian  350004\r
+                               CN\r
+\r
 1C-87-76   (hex)               Zhuhai MYZR Technology Co.,Ltd\r
 500000-5FFFFF     (base 16)            Zhuhai MYZR Technology Co.,Ltd\r
                                Room 302,Area D2,National Hi-tech Zone,NO.1,Software Park Road\r
@@ -8549,6 +8621,60 @@ C8-63-14   (hex)         Thinci, Inc.
                                Campbell  CA  95008\r
                                US\r
 \r
+E4-1E-0A   (hex)               SAGE Glass\r
+800000-8FFFFF     (base 16)            SAGE Glass\r
+                               Two Sage Way\r
+                               Faribault  MN  55021\r
+                               US\r
+\r
+E4-1E-0A   (hex)               IDvaco Private Limited\r
+200000-2FFFFF     (base 16)            IDvaco Private Limited\r
+                               Aljunied road, 627A,06-02\r
+                               singapore  singapore  389842\r
+                               SG\r
+\r
+E4-1E-0A   (hex)               B METERS S.R.L.\r
+900000-9FFFFF     (base 16)            B METERS S.R.L.\r
+                               VIA FRIULI 3\r
+                               GONARS  UDINE  33050\r
+                               IT\r
+\r
+E4-1E-0A   (hex)               TELETASK BELGIUM\r
+C00000-CFFFFF     (base 16)            TELETASK BELGIUM\r
+                               Ottergemsesteenweg-zuid 729\r
+                               GENT  Oost-Vlaanderen  9000\r
+                               BE\r
+\r
+E4-1E-0A   (hex)               Connected Cars A/S\r
+100000-1FFFFF     (base 16)            Connected Cars A/S\r
+                               Park Allé 355\r
+                               Brøndby    2605\r
+                               DK\r
+\r
+C8-63-14   (hex)               Optictimes Co.,Ltd\r
+A00000-AFFFFF     (base 16)            Optictimes Co.,Ltd\r
+                               Hangzhou City,  Zhejiang Province\r
+                               Hangzhou  Zhejiang  310023\r
+                               CN\r
+\r
+C8-2C-2B   (hex)               Kunshan SVL Electric  Co.,Ltd\r
+B00000-BFFFFF     (base 16)            Kunshan SVL Electric  Co.,Ltd\r
+                               No. 568, JuJin Road, Zhangpu Town\r
+                               SuZhou    215300\r
+                               CN\r
+\r
+B0-FD-0B   (hex)               Habana Labs LTD\r
+D00000-DFFFFF     (base 16)            Habana Labs LTD\r
+                               5 Tarshish St,\r
+                               Caesarea    3079821\r
+                               IL\r
+\r
+B0-FD-0B   (hex)               Vista Manufacturing\r
+200000-2FFFFF     (base 16)            Vista Manufacturing\r
+                               53345 Columbia Drive\r
+                               Elkhart  IN  46514\r
+                               US\r
+\r
 1C-87-76   (hex)               Hekatron Vertriebs GmbH\r
 B00000-BFFFFF     (base 16)            Hekatron Vertriebs GmbH\r
                                Brühlmatten 9\r
@@ -10658,9 +10784,6 @@ B00000-BFFFFF     (base 16)             Shanghai Visteon Automotive Electronics System CO.
                                Chicago  IL  60607\r
                                US\r
 \r
-F0-23-B9   (hex)               Private\r
-D00000-DFFFFF     (base 16)            Private\r
-\r
 34-D0-B8   (hex)               Kongqiguanjia (Beijing)Technology co.,ltd\r
 E00000-EFFFFF     (base 16)            Kongqiguanjia (Beijing)Technology co.,ltd\r
                                Room 1201,Block A,Building of Fesco,Xidawang Road,Chaoyang district\r
@@ -10817,9 +10940,6 @@ B00000-BFFFFF     (base 16)             Popit Oy
                                Shenzhen  Guangdong  518000\r
                                CN\r
 \r
-8C-14-7D   (hex)               Private\r
-100000-1FFFFF     (base 16)            Private\r
-\r
 64-FB-81   (hex)               Private\r
 F00000-FFFFFF     (base 16)            Private\r
 \r
@@ -11378,6 +11498,42 @@ C8-63-14   (hex)               Maxcom S.A.
                                Tychy    43-100\r
                                PL\r
 \r
+E4-1E-0A   (hex)               FireAngel Safety Technology Ltd\r
+A00000-AFFFFF     (base 16)            FireAngel Safety Technology Ltd\r
+                               Sir William Lyons Road, Vanguard Centre\r
+                               Coventry  Warwickshire  CV4 7EZ\r
+                               GB\r
+\r
+E4-1E-0A   (hex)               XPR Group\r
+400000-4FFFFF     (base 16)            XPR Group\r
+                               Drève Richelle 161 - WOP G\r
+                               Waterloo    1410\r
+                               BE\r
+\r
+C8-2C-2B   (hex)               Galgus\r
+100000-1FFFFF     (base 16)            Galgus\r
+                               Italica 1, 1st floor\r
+                               Camas  Seville  41900\r
+                               ES\r
+\r
+C8-2C-2B   (hex)               Fränkische Rohrwerke Gebr. Kirchner GmbH & Co. KG\r
+E00000-EFFFFF     (base 16)            Fränkische Rohrwerke Gebr. Kirchner GmbH & Co. KG\r
+                               Hellinger Str. 1\r
+                               Königsberg/Bayern    97486\r
+                               DE\r
+\r
+B0-FD-0B   (hex)               Haltian Products Oy\r
+C00000-CFFFFF     (base 16)            Haltian Products Oy\r
+                               Yrttipellontie 1D\r
+                               Oulu    90230\r
+                               FI\r
+\r
+F0-23-B9   (hex)               Private\r
+D00000-DFFFFF     (base 16)            Private\r
+\r
+8C-14-7D   (hex)               Private\r
+100000-1FFFFF     (base 16)            Private\r
+\r
 1C-87-74   (hex)               Philips Personal Health Solutions\r
 000000-0FFFFF     (base 16)            Philips Personal Health Solutions\r
                                High Tech Campus, HTC37 floor 0\r
@@ -13550,9 +13706,6 @@ E00000-EFFFFF     (base 16)             Electronic Controlled Systems, Inc.
                                Bloomington  MN  55438\r
                                US\r
 \r
-80-7B-85   (hex)               Private\r
-F00000-FFFFFF     (base 16)            Private\r
-\r
 F0-AC-D7   (hex)               Sercomm Corporation.\r
 400000-4FFFFF     (base 16)            Sercomm Corporation.\r
                                3F,No.81,Yu-Yih Rd.,Chu-Nan Chen\r
@@ -14227,3 +14380,72 @@ C8-63-14   (hex)               Western Reserve Controls, Inc.
                                1485 Exeter Dr.\r
                                Akron  OH  44306\r
                                US\r
+\r
+E4-1E-0A   (hex)               Tritium Pty Ltd\r
+700000-7FFFFF     (base 16)            Tritium Pty Ltd\r
+                               1/31 Archimedes PL.\r
+                               Murarrie  QLD   4172\r
+                               AU\r
+\r
+E4-1E-0A   (hex)               ROMO Wind A/S\r
+D00000-DFFFFF     (base 16)            ROMO Wind A/S\r
+                               Olof Palmes Allé 47\r
+                               Aarhus N    8200\r
+                               DK\r
+\r
+C8-2C-2B   (hex)               UBITRON Co.,LTD\r
+D00000-DFFFFF     (base 16)            UBITRON Co.,LTD\r
+                               Sinbuk-Ro\r
+                               Chuncheon City  Gangwon  24206\r
+                               KR\r
+\r
+C8-2C-2B   (hex)               Merpa Bilgi Islem Ltd.Sti\r
+700000-7FFFFF     (base 16)            Merpa Bilgi Islem Ltd.Sti\r
+                               Oztekin CD NO:26\r
+                               Istanbul  Bayrampasa  34040\r
+                               TR\r
+\r
+C8-2C-2B   (hex)               Shiftall Inc.\r
+A00000-AFFFFF     (base 16)            Shiftall Inc.\r
+                               4F TokyoDaiwa Bldg., 2-6-10 Nihonbashibakurocho, \r
+                               Chuo,   Tokyo  1030002\r
+                               JP\r
+\r
+C8-2C-2B   (hex)               iWave Systems Tech Pvt Ltd\r
+400000-4FFFFF     (base 16)            iWave Systems Tech Pvt Ltd\r
+                               7/B 29th Main, BTM Layout 2nd Stage\r
+                               Bengalore  Kamataka  560076\r
+                               IN\r
+\r
+C8-2C-2B   (hex)               BIOT Sp. z o.o.\r
+900000-9FFFFF     (base 16)            BIOT Sp. z o.o.\r
+                               Nowy Kisielin-Nowa 7\r
+                               Zielona Góra  Lubuskie  66-002\r
+                               PL\r
+\r
+C8-2C-2B   (hex)               Smart Wires Inc\r
+C00000-CFFFFF     (base 16)            Smart Wires Inc\r
+                               3292 Whipple Road\r
+                               Union City   CA  94587\r
+                               US\r
+\r
+C8-2C-2B   (hex)               Grav I.T.\r
+600000-6FFFFF     (base 16)            Grav I.T.\r
+                               601 1st Ave NW\r
+                               Gravette  AR  72736\r
+                               US\r
+\r
+B0-FD-0B   (hex)               MartinLogan, Ltd.\r
+B00000-BFFFFF     (base 16)            MartinLogan, Ltd.\r
+                               2101 Delware St\r
+                               Lawrence  KS  66046\r
+                               US\r
+\r
+B0-FD-0B   (hex)               TEMCO JAPAN CO., LTD.\r
+A00000-AFFFFF     (base 16)            TEMCO JAPAN CO., LTD.\r
+                               2-21-4 HONAN\r
+                               SUGINAMI KU  Tokyo-to  168-0062\r
+                               JP\r
+\r
+80-7B-85   (hex)               Private\r
+F00000-FFFFFF     (base 16)            Private\r
index 1b643daa79e6ae28047b5df750f96af4f40fa1e8..abafe216698c59d93fa92e75e23b0eacb92242de 100644 (file)
@@ -176,12 +176,6 @@ B28000-B28FFF     (base 16)                HUSTY M.Styczen J.Hupert sp.j.
                                Natrona Heights  PA  15065\r
                                US\r
 \r
-70-B3-D5   (hex)               Orlaco Products B.V.\r
-EAE000-EAEFFF     (base 16)            Orlaco Products B.V.\r
-                               Albert Plesmanstraat 42\r
-                               Barneveld    3772MN\r
-                               NL\r
-\r
 70-B3-D5   (hex)               WICOM1 GmbH\r
 57D000-57DFFF     (base 16)            WICOM1 GmbH\r
                                Im Frauental 15\r
@@ -3482,6 +3476,36 @@ CBD000-CBDFFF     (base 16)              Preo Industries Far East Limited
                                Hong Kong    999077\r
                                HK\r
 \r
+70-B3-D5   (hex)               GSI Technology\r
+2A6000-2A6FFF     (base 16)            GSI Technology\r
+                               Raul Walenberg 18\r
+                               Tel Aviv  IL  6971915\r
+                               IL\r
+\r
+70-B3-D5   (hex)               Discover Battery\r
+6F1000-6F1FFF     (base 16)            Discover Battery\r
+                               #4 - 13511 Crestwood Place\r
+                               Richmond  BC  v6v 2e9\r
+                               CA\r
+\r
+70-B3-D5   (hex)               Jeaway CCTV Security Ltd,.\r
+E00000-E00FFF     (base 16)            Jeaway CCTV Security Ltd,.\r
+                               No. 24, Yifa St., Sanmin Dist.\r
+                               Kaohsiung     807\r
+                               TW\r
+\r
+70-B3-D5   (hex)               Orlaco Products B.V.\r
+EAE000-EAEFFF     (base 16)            Orlaco Products B.V.\r
+                               Albert Plesmanstraat 42\r
+                               Barneveld    3772MN\r
+                               NL\r
+\r
+70-B3-D5   (hex)               Izome\r
+9BE000-9BEFFF     (base 16)            Izome\r
+                               route de chaudron\r
+                               Montrevault sur Evre  Maine et Loire  49110\r
+                               FR\r
+\r
 70-B3-D5   (hex)               Flintab AB\r
 D60000-D60FFF     (base 16)            Flintab AB\r
                                Kabelvägen 4\r
@@ -7211,18 +7235,69 @@ E15000-E15FFF     (base 16)             Benetel
                                Dublin    D08 XV25\r
                                IE\r
 \r
-70-B3-D5   (hex)               Fränkische Rohrwerke Gebr. Kirchner GmbH & Co. KG\r
-8F1000-8F1FFF     (base 16)            Fränkische Rohrwerke Gebr. Kirchner GmbH & Co. KG\r
-                               Hellinger Str. 1\r
-                               Königsberg/Bayern    97486\r
-                               DE\r
-\r
 70-B3-D5   (hex)               XANTIA SA\r
 33F000-33FFFF     (base 16)            XANTIA SA\r
                                Chemin du Longchamps 99\r
                                Bienne    2504\r
                                CH\r
 \r
+70-B3-D5   (hex)               Divelbiss Corporation\r
+F43000-F43FFF     (base 16)            Divelbiss Corporation\r
+                               9778 Mount Gilead Road\r
+                               Fredericktown  OH  43019\r
+                               US\r
+\r
+70-B3-D5   (hex)               INTERNET PROTOCOLO LOGICA SL\r
+275000-275FFF     (base 16)            INTERNET PROTOCOLO LOGICA SL\r
+                               Sector Foresta 43, local 26\r
+                               Tres Cantos  Madrid  28760\r
+                               ES\r
+\r
+70-B3-D5   (hex)               Integrotech sp. z o.o.\r
+6BA000-6BAFFF     (base 16)            Integrotech sp. z o.o.\r
+                               plac Zwyciestwa 2 bud. D\r
+                               Lodz  lodzkie  90-312\r
+                               PL\r
+\r
+70-B3-D5   (hex)               Invent Vision - iVision Sistemas de Imagem e Visão S.A.\r
+E29000-E29FFF     (base 16)            Invent Vision - iVision Sistemas de Imagem e Visão S.A.\r
+                               R. Prof. José Vieira de Mendonça, 770, 2° andar - BHTEC, Parque Tecnológico de Belo Horizonte\r
+                               Belo Horizonte  Minas Gerais  31310-260\r
+                               BR\r
+\r
+70-B3-D5   (hex)               Altaneos\r
+69A000-69AFFF     (base 16)            Altaneos\r
+                               Chaussée Verte, 93B\r
+                               Saint-Georges    4470\r
+                               BE\r
+\r
+70-B3-D5   (hex)               Sicon srl\r
+BEE000-BEEFFF     (base 16)            Sicon srl\r
+                               Via Sila 1/3\r
+                               Isola Vicentina  Vicenza  36033\r
+                               IT\r
+\r
+70-B3-D5   (hex)               Private\r
+E2D000-E2DFFF     (base 16)            Private\r
+\r
+70-B3-D5   (hex)               Flexsolution APS\r
+C54000-C54FFF     (base 16)            Flexsolution APS\r
+                               Østervangsvej 39\r
+                               Esbjerg N  Jylland  6715\r
+                               DK\r
+\r
+70-B3-D5   (hex)               EXARA Group\r
+00C000-00CFFF     (base 16)            EXARA Group\r
+                               Andropova pr. 18 1\r
+                               Moscow    115432\r
+                               RU\r
+\r
+70-B3-D5   (hex)               Orlaco Products B.V.\r
+620000-620FFF     (base 16)            Orlaco Products B.V.\r
+                               Albert Plesmanstraat 42\r
+                               Barneveld    3772MN\r
+                               NL\r
+\r
 70-B3-D5   (hex)               Schildknecht AG\r
 494000-494FFF     (base 16)            Schildknecht AG\r
                                Haugweg 26\r
@@ -9893,9 +9968,6 @@ FFF000-FFFFFF     (base 16)               Private
                                Colorado Springs  CO  80918\r
                                US\r
 \r
-70-B3-D5   (hex)               Private\r
-4F8000-4F8FFF     (base 16)            Private\r
-\r
 70-B3-D5   (hex)               ENTEC Electric & Electronic Co., LTD.\r
 92B000-92BFFF     (base 16)            ENTEC Electric & Electronic Co., LTD.\r
                                78-2 Buncheon-ri, Bongdam-eup\r
@@ -10232,9 +10304,6 @@ A9F000-A9FFFF     (base 16)             Private
                                Littleton  MA  01460\r
                                US\r
 \r
-70-B3-D5   (hex)               Private\r
-30E000-30EFFF     (base 16)            Private\r
-\r
 70-B3-D5   (hex)               Moduware PTY LTD\r
 FC8000-FC8FFF     (base 16)            Moduware PTY LTD\r
                                502/37 Swanston Street\r
@@ -10823,6 +10892,48 @@ DBC000-DBCFFF     (base 16)            Gamber Johnson-LLC
                                Xiamen  Fujian  361021\r
                                CN\r
 \r
+70-B3-D5   (hex)               Becton Dickinson\r
+808000-808FFF     (base 16)            Becton Dickinson\r
+                               7 Loveton Circle\r
+                               Sparks  MD  21152\r
+                               US\r
+\r
+70-B3-D5   (hex)               COSMOIT.CO.LTD\r
+754000-754FFF     (base 16)            COSMOIT.CO.LTD\r
+                               14Fl., Ace Twin Tower II, 273, Digital-ro, Guro-gu\r
+                               Seoul    08381\r
+                               KR\r
+\r
+70-B3-D5   (hex)               Controlled Power Company\r
+BA8000-BA8FFF     (base 16)            Controlled Power Company\r
+                               1955 Stephenston Hwy\r
+                               Troy  MI  48083\r
+                               US\r
+\r
+70-B3-D5   (hex)               Private\r
+30E000-30EFFF     (base 16)            Private\r
+\r
+70-B3-D5   (hex)               Private\r
+4F8000-4F8FFF     (base 16)            Private\r
+\r
+70-B3-D5   (hex)               Vega-Absolute\r
+0AD000-0ADFFF     (base 16)            Vega-Absolute\r
+                               Kirova 113/1\r
+                               Novosibirsk    630008\r
+                               RU\r
+\r
+70-B3-D5   (hex)               MaNima Technologies BV\r
+DD9000-DD9FFF     (base 16)            MaNima Technologies BV\r
+                               Hastelweg 260B\r
+                               Eindhoven  Noord-Brabant  5652CN\r
+                               NL\r
+\r
+70-B3-D5   (hex)               digitrol limited\r
+477000-477FFF     (base 16)            digitrol limited\r
+                               CORONET WAY, ENTERPRISE PARK\r
+                               SWANSEA  WEST GLAMORGAN  SA6 8RH\r
+                               GB\r
+\r
 70-B3-D5   (hex)               Innitive B.V.\r
 66B000-66BFFF     (base 16)            Innitive B.V.\r
                                Brouwerijstraat 20\r
@@ -14483,9 +14594,6 @@ E1F000-E1FFFF     (base 16)             THETA432
                                Groningen  Groningen  9723 JP\r
                                NL\r
 \r
-70-B3-D5   (hex)               Private\r
-1D7000-1D7FFF     (base 16)            Private\r
-\r
 70-B3-D5   (hex)               Wuhan Xingtuxinke ELectronic Co.,Ltd\r
 70E000-70EFFF     (base 16)            Wuhan Xingtuxinke ELectronic Co.,Ltd\r
                                NO.C3-8F,Software Park,Optics Valley,East Lake Development Zone,Wuhan,Hubei,China\r
@@ -14540,6 +14648,45 @@ BA6000-BA6FFF     (base 16)            Gluon Solutions Inc.
                                Livermore  CA  94551\r
                                US\r
 \r
+70-B3-D5   (hex)               U&R GmbH Hardware- und Systemdesign\r
+BC5000-BC5FFF     (base 16)            U&R GmbH Hardware- und Systemdesign\r
+                               In den Wiesen 2\r
+                               Erbach    89155\r
+                               DE\r
+\r
+70-B3-D5   (hex)               Private\r
+1D7000-1D7FFF     (base 16)            Private\r
+\r
+70-B3-D5   (hex)               WoKa-Elektronik GmbH\r
+8A9000-8A9FFF     (base 16)            WoKa-Elektronik GmbH\r
+                               Fulder Tor 30\r
+                               Alsfeld  Hessen  36304\r
+                               DE\r
+\r
+70-B3-D5   (hex)               FIRST RF Corporation\r
+7BC000-7BCFFF     (base 16)            FIRST RF Corporation\r
+                               6150 Lookout Rd\r
+                               Boulder  CO  80301\r
+                               US\r
+\r
+70-B3-D5   (hex)               PROMOMED RUS LLC\r
+D3A000-D3AFFF     (base 16)            PROMOMED RUS LLC\r
+                               UL. POCHTOVAYA M., D. 2/2,C.1,P.iK2 I, K.2\r
+                               Moscow    129090\r
+                               RU\r
+\r
+70-B3-D5   (hex)               Multiple Access Communications Ltd\r
+558000-558FFF     (base 16)            Multiple Access Communications Ltd\r
+                               Delta House, Southampton Science Park\r
+                               Southampton  Hampshire  SO16 7NS\r
+                               GB\r
+\r
+70-B3-D5   (hex)               MIRAE INFORMATION TECHNOLOGY CO., LTD.\r
+056000-056FFF     (base 16)            MIRAE INFORMATION TECHNOLOGY CO., LTD.\r
+                               GYEONGGI-DO\r
+                               SEONGNAM-SI  JUNGWON-GU  13376\r
+                               KR\r
+\r
 70-B3-D5   (hex)               EMAC, Inc.\r
 8AB000-8ABFFF     (base 16)            EMAC, Inc.\r
                                2390 EMAC Way\r
@@ -18059,6 +18206,12 @@ C08000-C08FFF     (base 16)            Talleres de Escoriaza SA
                                Irun  Gipuzkoa  20305\r
                                ES\r
 \r
+70-B3-D5   (hex)               Soehnle Industrial Solutions GmbH\r
+F89000-F89FFF     (base 16)            Soehnle Industrial Solutions GmbH\r
+                               Gaildorfer Strasse 6\r
+                               Backnang    71522\r
+                               DE\r
+\r
 70-B3-D5   (hex)               MECT SRL\r
 628000-628FFF     (base 16)            MECT SRL\r
                                VIA E. FERMI 57/59\r
@@ -18071,12 +18224,6 @@ C08000-C08FFF     (base 16)            Talleres de Escoriaza SA
                                Lichfield  Staffordshire  WS13 8RZ\r
                                GB\r
 \r
-70-B3-D5   (hex)               Soehnle Industrial Solutions GmbH\r
-F89000-F89FFF     (base 16)            Soehnle Industrial Solutions GmbH\r
-                               Gaildorfer Strasse 6\r
-                               Backnang    71522\r
-                               DE\r
-\r
 70-B3-D5   (hex)               Tapdn\r
 FDC000-FDCFFF     (base 16)            Tapdn\r
                                840 Apollo St Suite 100\r
@@ -18106,3 +18253,63 @@ FDC000-FDCFFF     (base 16)            Tapdn
                                284, Gongdan-ro\r
                                Gunpo-si  Gyeonggi-do  15809\r
                                KR\r
+\r
+70-B3-D5   (hex)               Bavaria Digital Technik GmbH\r
+F1C000-F1CFFF     (base 16)            Bavaria Digital Technik GmbH\r
+                               Rehbichler Weg 26\r
+                               Pfronten  Bayern  87459\r
+                               DE\r
+\r
+70-B3-D5   (hex)               Vectology,Inc\r
+F50000-F50FFF     (base 16)            Vectology,Inc\r
+                               UU bld 4F  2-5-2 Shinyokohama\r
+                               Kouhoku-ku Yokohama  Kanagawa  2220033\r
+                               JP\r
+\r
+70-B3-D5   (hex)               Xitron\r
+388000-388FFF     (base 16)            Xitron\r
+                               4750 Venture Drive\r
+                               Ann Arbor  MI  48108\r
+                               US\r
+\r
+70-B3-D5   (hex)               TrexEdge, Inc.\r
+0F2000-0F2FFF     (base 16)            TrexEdge, Inc.\r
+                               1-2-2 Osaki\r
+                               Shinagawa  Tokyo  1410032\r
+                               JP\r
+\r
+70-B3-D5   (hex)               iGrid T&D\r
+B50000-B50FFF     (base 16)            iGrid T&D\r
+                               C. Marie Curie, 8-14\r
+                               Barcelona  Catalonia  08042\r
+                               ES\r
+\r
+70-B3-D5   (hex)               Ametek Solidstate Controls\r
+6DE000-6DEFFF     (base 16)            Ametek Solidstate Controls\r
+                               875 DEARBORN DR\r
+                               COLUMBUS  OH  43085-1586\r
+                               US\r
+\r
+70-B3-D5   (hex)               KJ3 Elektronik AB\r
+FB2000-FB2FFF     (base 16)            KJ3 Elektronik AB\r
+                               Fornåsa 110\r
+                               Fornåsa    59033\r
+                               SE\r
+\r
+70-B3-D5   (hex)               Zamir Recognition Systems Ltd.\r
+46E000-46EFFF     (base 16)            Zamir Recognition Systems Ltd.\r
+                               Manachat Tech Park 1/22\r
+                               Jerusalem    96951\r
+                               IL\r
+\r
+70-B3-D5   (hex)               YUYAMA MFG Co.,Ltd\r
+BD4000-BD4FFF     (base 16)            YUYAMA MFG Co.,Ltd\r
+                               3-3-1\r
+                               TOYONAKASHI  OSAKA  561-0841\r
+                               JP\r
+\r
+70-B3-D5   (hex)               GREATWALL Infotech Co., Ltd.\r
+946000-946FFF     (base 16)            GREATWALL Infotech Co., Ltd.\r
+                               7F, No. 143, Sec. 3, Cheng Gong Road,, Neihu District\r
+                               Taipei  Taiwan  114\r
+                               TW\r
index f90b4247cd4bedd26a4b126d85b1a45e61f2b09c..c986f78e02bad2ac59ee7ace1264d0d6717a5162 100644 (file)
@@ -1,8 +1,8 @@
 #
 #      List of PCI ID's
 #
-#      Version: 2019.01.20
-#      Date:    2019-01-20 03:15:02
+#      Version: 2019.02.13
+#      Date:    2019-02-13 03:15:01
 #
 #      Maintained by Albert Pool, Martin Mares, and other volunteers from
 #      the PCI ID Project at https://pci-ids.ucw.cz/.
        0071  MR SAS HBA 2004
        0072  SAS2008 PCI-Express Fusion-MPT SAS-2 [Falcon]
                1000 3040  9210-8i
+               1000 3080  9200-8e [LSI SAS 6Gb/s SAS/SATA PCIe x8 External HBA]
                1000 30b0  9200-8e [LSI SAS 6Gb/s SAS/SATA PCIe x8 External HBA]
                1028 1f1c  6Gbps SAS HBA Adapter
                1028 1f1d  PERC H200 Adapter
                15d9 0691  Onboard SAS2308 PCI-Express Fusion-MPT SAS-2
        0087  SAS2308 PCI-Express Fusion-MPT SAS-2
                1000 3020  9207-8i SAS2.1 HBA
+               1000 3030  SAS9207-4i4e
                1000 3040  9207-8e SAS2.1 HBA
                1000 3050  SAS9217-8i
                1014 0472  N2125 External Host Bus Adapter
                1028 1f53  HBA330 Mini
                1028 1fd2  HBA330 MX
                1028 1fd3  HBA330 MMZ
+# Supermicro AOC-S3008L-L8e uses 0808 for their SAS3008 SAS controller
+               15d9 0808  AOC-S3008L-L8e
                1bd4 0011  Inspur 12Gb 8i-3008 IT SAS HBA
        00ab  SAS3516 Fusion-MPT Tri-Mode RAID On Chip (ROC)
                8086 3530  Integrated RAID Module RMSP3JD160J
        154e  Garfield
        1551  Arlene
        1552  Pooky
+       1561  Anubis
        15d8  Picasso
        15dd  Raven Ridge [Radeon Vega Series / Radeon Vega Mobile Series]
                103c 83c6  Radeon Vega 8 Mobile
                1458 d000  Radeon RX Vega 11
-       15de  Raven Ridge HDMI/DP Audio Controller
-       15ff  Vega 11 [Radeon Vega 28 Mobile]
+       15de  Raven/Raven2/Fenghuang HDMI/DP Audio Controller
+       15df  Raven/Raven2/Fenghuang/Renoir Cryptographic Coprocessor
+       15ff  Fenghuang [Zhongshan Subor Z+]
        1607  Arden
        1636  Renoir
        1714  BeaverCreek HDMI Audio [Radeon HD 6500D and 6400G-6600G series]
                103c 168b  ProBook 4535s
+       2191  TU116M
        3150  RV380/M24 [Mobility Radeon X600]
                103c 0934  nx8220
        3151  RV380 GL [FireMV 2400]
        4337  RS200M [Radeon IGP 330M/340M/345M/350M]
                1014 053a  ThinkPad R40e
                103c 0850  Radeon IGP 345M
-       4341  IXP150 AC'97 Audio Controller
+       4341  SB200 AC97 Audio Controller
        4342  SB200 PCI to PCI Bridge
        4345  SB200 EHCI USB Controller
        4346  Crayola 6 [XENOS Parent Die (XBOX 360)]
        4348  SB200 OHCI USB Controller #2
        4349  SB200 IDE Controller
        434c  SB200 PCI to LPC Bridge
-       434d  IXP AC'97 Modem
+       434d  SB200 AC97 Modem Controller
        4353  SB200 SMBus Controller
        4354  215CT [Mach64 CT PCI]
        4358  Mach64 CX [Graphics Xpression]
        43a3  SB900 PCI to PCI bridge (PCIE port 3)
        4437  RS250 [Mobility Radeon 7000 IGP]
        4554  210888ET [Mach64 ET]
+       4630  XENOS Parent Die (XBOX 360)
+       4631  XENOS Daughter Die (XBOX 360)
        4654  Mach64 VT
        4742  Rage 3 [3D Rage PRO AGP 2X]
                1002 0040  Rage Pro Turbo AGP 2X
                1002 0084  Rage 3D Pro AGP 2x XPERT 98
                1002 0087  Rage 3D IIC
                1002 475a  Rage IIC AGP
+       4845  Xilleon 220 HBIU for HDTV2
+       4846  Xilleon 220 IDE for HDTV2
+       4847  Xilleon 220 USB for HDTV2
+       4848  Xilleon 220 DAIO-0 for HDTV2
+       4849  Xilleon 220 DAIO-1 for HDTV2
+       484a  Xilleon 220 LPC for HDTV2
+       4850  Xilleon 215 HBIU for X215
+       4851  Xilleon 215 IDE for X215
+       4852  Xilleon 215 USB for X215
+       4853  Xilleon 215 DAIO-0 for X215
+       4854  Xilleon 215 DAIO-1 for X215
+       4855  Xilleon 225 HBIU for X225
+       4856  Xilleon 225 IDE for X225
+       4857  Xilleon 225 USB for X225
+       4858  Xilleon 225 DAIO-0 for X225
+       4859  Xilleon 225 DAIO-1 for X225
+       4860  Xilleon 210 HBIU for X210
+       4861  Xilleon 210 IDE for X210
+       4862  Xilleon 210 USB for X210
+       4863  Xilleon 210 DAIO-0 for X210
+       4864  Xilleon 210 DAIO-1 for X210
+       4865  Xilleon 226 HBIU for X226
+       4866  Xilleon 226 IDE for X226
+       4867  Xilleon 226 USB for X226
+       4868  Xilleon 226 DAIO-0 for X226
+       4869  Xilleon 226 DAIO-1 for X226
+       486a  Xilleon 240S HBIU for X240S
+       486b  Xilleon 240H HBIU for X240H
+       486c  Xilleon 240S USB for X240S
+       486d  Xilleon 240H USB for X240H
+       486e  Xilleon 250 USB 1.1 for X250
+       486f  Xilleon 260 USB 1.1 for X260
+       4870  Xilleon 250 HBIU for X250
+       4871  Xilleon 250 IDE for X250
+       4872  Xilleon 234/235 HBIU for X234/X235
+       4873  Xilleon 244/245 HBIU for X244/X245
+       4874  Xilleon 234/235 USB 1.1 for X234/X235
+       4875  Xilleon 260 HBIU for X260
+       4876  Xilleon 260 IDE for X260
+       4877  Xilleon 244/245 USB 1.1 for X244/X245
+       4878  Xilleon 270 HBIU for X270
+       487b  Xilleon 242 HBIU for X242
+       487d  Xilleon 242 USB 1.1 for X242
+       4880  Xilleon 254 HBIU for X254
+       4881  Xilleon 254 USB 1.1 for X254
+       4882  Xilleon 255 HBIU for X255
+       4883  Xilleon 255 USB 1.1 for X255
+       4884  Xilleon 243 HBIU for X243
+       4885  Xilleon 243 USB 1.1 for X243
+       4886  Xilleon 233 HBIU for X233
+       4887  Xilleon 233 USB 1.1 for X233
+       4888  Xilleon 143 HBIU for X143
+       4889  Xilleon 143 HBIU for X143L
+       488a  Xilleon 143 HBIU for X143S
        4966  RV250 [Radeon 9000 Series]
                10f1 0002  RV250 If [Tachyon G9000 PRO]
                148c 2039  RV250 If [Radeon 9000 Pro "Evil Commando"]
                103c 1952  ProBook 455 G1
        6601  Mars [Radeon HD 8730M]
                103c 2100  FirePro M4100
-       6602  Mars
-       6603  Mars
        6604  Opal XT [Radeon R7 M265/M365X/M465]
                1025 0776  Aspire V5 Radeon R7 M265
                103c 8006  FirePro M4170
        6613  Oland PRO [Radeon R7 240/340]
                148c 7340  Radeon R7 340
                1682 7240  R7 240 2048 MB
-       6620  Mars
-       6621  Mars PRO
-       6623  Mars
        6631  Oland
        6640  Saturn XT [FirePro M6100]
                106b 014b  Tropo XT [Radeon R9 M380 Mac Edition]
                1462 2938  Radeon R9 360 OEM
                1462 3271  Radeon R9 360 OEM
                1682 7360  Radeon R7 360
-       6660  Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / R7 M520]
+       6660  Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / Radeon 520 Mobile]
                1028 05ea  Radeon HD 8670M
                1028 06bf  Radeon R5 M335
                103c 1970  Radeon HD 8670M
                1025 0846  Radeon HD 8570A
                17aa 3805  Radeon HD 8570M
        6664  Jet XT [Radeon R5 M240]
-       6665  Jet PRO [Radeon R5 M230 / R7 M260DX]
+       6665  Jet PRO [Radeon R5 M230 / R7 M260DX / Radeon 520 Mobile]
                17aa 1309  Radeon R7 M260DX
                17aa 368f  Radeon R5 A230
        6667  Jet ULT [Radeon R5 M230]
        66a2  Vega 20
        66a3  Vega 20
        66a7  Vega 20 [Radeon Pro Vega 20]
-       66af  Vega 20
+       66af  Vega 20 [Radeon VII]
        6704  Cayman PRO GL [FirePro V7900]
        6707  Cayman LE GL [FirePro V5900]
        6718  Cayman XT [Radeon HD 6970]
                148c 9380  Radeon R9 380
 # Make naming scheme consistent
                174b e308  Radeon R9 380 Nitro 4G D5
-       694c  Polaris 22 [Radeon RX Vega M GH]
+       694c  Polaris 22 XT [Radeon RX Vega M GH]
        694e  Polaris 22 XL [Radeon RX Vega M GL]
+       694f  Polaris 22 MGL XL [Radeon Pro WX Vega M GL]
        6980  Polaris12
        6981  Polaris12
        6985  Lexa XT [Radeon PRO WX 3100]
                17aa 5113  Radeon R6 Graphics
                17aa 5116  Radeon R6 Graphics
                17aa 5118  Radeon R5 Graphics
+       9890  Amur
+       98c0  Nolan
        98e4  Stoney [Radeon R2/R3/R4/R5 Graphics]
        9900  Trinity [Radeon HD 7660G]
                103c 1985  Pavilion 17-e163sg Notebook PC
        9917  Trinity [Radeon HD 7620G]
        9918  Trinity [Radeon HD 7600G]
        9919  Trinity [Radeon HD 7500G]
+       991e  Bishop
        9920  Liverpool [Playstation 4 APU]
        9921  Liverpool HDMI/DP Audio Controller
+       9922  Starshp
+       9923  Starsha2 [Kingston/Clayton]
+       9924  Gladius
+       9925  Kingston/Clayton/Jupiter/Gladius/Montego HDMI Controller
+       9926  Jupiter
        9990  Trinity 2 [Radeon HD 7520G]
        9991  Trinity 2 [Radeon HD 7540D]
        9992  Trinity 2 [Radeon HD 7420G]
        aa98  Caicos HDMI Audio [Radeon HD 6450 / 7450/8450/8490 OEM / R5 230/235/235X OEM]
                174b aa98  Radeon HD 6450 1GB DDR3
        aaa0  Tahiti HDMI Audio [Radeon HD 7870 XT / 7950/7970]
-       aab0  Cape Verde/Pitcairn HDMI Audio [Radeon HD 7700/7800 Series]
+       aab0  Oland/Hainan/Cape Verde/Pitcairn HDMI Audio [Radeon HD 7000 Series]
        aac0  Tobago HDMI Audio [Radeon R7 360 / R9 360 OEM]
        aac8  Hawaii HDMI Audio [Radeon R9 290/290X / 390/390X]
-# I have a Tonga card and this is the HDMI Audio part
        aad8  Tonga HDMI Audio [Radeon R9 285/380]
                174b aad8  Radeon R9 285/380 HDMI Audio
        aae0  Baffin HDMI/DP Audio [Radeon RX 550 640SP / RX 560/560X]
        aae8  Fiji HDMI/DP Audio [Radeon R9 Nano / FURY/FURY X]
-       aaf0  Ellesmere [Radeon RX 570/580]
-       ac00  Theater 600 Pro
+       aaf0  Ellesmere HDMI Audio [Radeon RX 470/480 / 570/580/590]
+       aaf8  Vega 10 HDMI Audio [Radeon Vega 56/64]
+       ab00  Baffin HDMI/DP Audio [Radeon RX 550 640SP / RX 560/560X]
+       ab08  Polaris 22 HDMI Audio
+       ab10  Lexa HDMI Audio
+       ab18  Vega 12 HDMI Audio
+       ab20  Vega 20 HDMI Audio [Radeon VII]
+       ab38  Navi 10 HDMI Audio
+       ac00  Theater 506 World-Wide Analog Decoder
+       ac01  Theater 506 World-Wide Analog Decoder
        ac02  TV Wonder HD 600 PCIe
+       ac03  Theater 506 PCIe
+       ac04  Theater 506 USB
+       ac05  Theater 506 USB
+       ac06  Theater 506 External USB
+       ac07  Theater 506 External USB
+       ac08  Theater 506A World-Wide Analog Decoder + Demodulator
+       ac09  Theater 506A World-Wide Analog Decoder + Demodulator
+       ac0a  Theater 506A PCIe
+       ac0b  Theater 506A PCIe
+       ac0c  Theater 506A USB
+       ac0d  Theater 506A USB
+       ac0e  Theater 506A External USB
+       ac0f  Theater 506A External USB
        ac12  Theater HD T507 (DVB-T) TV tuner/capture device
        cab0  RS100 Host Bridge
        cab2  RS200 Host Bridge
        1302  Family 11h Processor DRAM Controller
        1303  Family 11h Processor Miscellaneous Control
        1304  Family 11h Processor Link Control
+       1305  Griffin Function 5
+       1306  Griffin Function 6
+       1307  Griffin Function 7
+       1308  Kaveri Audio Controller
+       1314  Wrestler/Bheem/Ontario/Krishna Audio Controller
+       13e0  Ariel Root Complex
+       13e1  Ariel IOMMU
+       13e2  Ariel PCIe Dummy Host Bridge
+       13e3  Ariel PCIe GPP Bridge
+       13e4  Ariel PCIe Dummy Host Bridge
+       13e5  Ariel Internal PCIe GPP Bridge 0 to Bus A
+       13e6  Ariel Internal PCIe GPP Bridge 0 to Bus B
+       13e7  Ariel SMBus Controller
+       13e8  Ariel LPC Bridge
+       13e9  Ariel Internal GPU
+       13ea  Ariel HD Audio Controller
+       13eb  Ariel HD Audio Coprocessor
+       13ec  Ariel Cryptographic Coprocessor
+       13ed  Ariel USB 3.1 Type C: Gen2 x 1port + DP Alt Mode
+       13ee  Ariel USB 3.1 Type A: Gen2 x 2 ports
+       13ef  Ariel ZCN/MP4
+       13f0  Ariel Device 24: Function 0
+       13f1  Ariel Device 24: Function 1
+       13f2  Ariel Device 24: Function 2
+       13f3  Ariel Device 24: Function 3
+       13f4  Ariel Device 24: Function 4
+       13f5  Ariel Device 24: Function 5
+       13f6  Ariel Device 24: Function 6
+       13f7  Ariel Device 24: Function 7
        1400  Family 15h (Models 10h-1fh) Processor Function 0
        1401  Family 15h (Models 10h-1fh) Processor Function 1
        1402  Family 15h (Models 10h-1fh) Processor Function 2
        1422  Family 15h (Models 30h-3fh) Processor Root Complex
        1423  Family 15h (Models 30h-3fh) I/O Memory Management Unit
        1424  Family 15h (Models 30h-3fh) Processor Root Port
+       1425  Kaveri P2P Bridge for GFX PCIe Port [1:0]
        1426  Family 15h (Models 30h-3fh) Processor Root Port
-       142e  Liverpool Processor Function 0
-       142f  Liverpool Processor Function 1
-       1430  Liverpool Processor Function 2
-       1431  Liverpool Processor Function 3
-       1432  Liverpool Processor Function 4
+       142e  Liverpool Processor HT configuration
+       142f  Liverpool Processor Address Maps
+       1430  Liverpool Processor DRAM configuration
+       1431  Liverpool Processor Misc configuration
+       1432  Liverpool Processor PM configuration
+       1433  Liverpool Processor NB Performance Monitor
+       1434  Liverpool Processor SPLL Configuration
        1436  Liverpool Processor Root Complex
        1437  Liverpool I/O Memory Management Unit
        1438  Liverpool Processor Root Port
        1439  Family 16h Processor Functions 5:1
+       143a  Kingston/Clayton/Gladius/Montego Root Complex
+       143b  Kingston/Clayton/Gladius/Montego P2P Bridge for UMI Link
+       1440  Matisse Device 24: Function 0
+       1441  Matisse Device 24: Function 1
+       1442  Matisse Device 24: Function 2
+       1443  Matisse Device 24: Function 3
+       1444  Matisse Device 24: Function 4
+       1445  Matisse Device 24: Function 5
+       1446  Matisse Device 24: Function 6
+       1447  Matisse Device 24: Function 7
+       1448  Renoir Device 24: Function 0
+       1449  Renoir Device 24: Function 1
+       144a  Renoir Device 24: Function 2
+       144b  Renoir Device 24: Function 3
+       144c  Renoir Device 24: Function 4
+       144d  Renoir Device 24: Function 5
+       144e  Renoir Device 24: Function 6
+       144f  Renoir Device 24: Function 7
        1450  Family 17h (Models 00h-0fh) Root Complex
        1451  Family 17h (Models 00h-0fh) I/O Memory Management Unit
        1452  Family 17h (Models 00h-1fh) PCIe Dummy Host Bridge
        1453  Family 17h (Models 00h-0fh) PCIe GPP Bridge
        1454  Family 17h (Models 00h-0fh) Internal PCIe GPP Bridge 0 to Bus B
+       1455  Zeppelin/Renoir PCIe Dummy Function
        1456  Family 17h (Models 00h-0fh) Platform Security Processor
        1457  Family 17h (Models 00h-0fh) HD Audio Controller
+       145a  Zeppelin/Raven/Raven2 PCIe Dummy Function
        145b  Zeppelin Non-Transparent Bridge
        145c  Family 17h (Models 00h-0fh) USB 3.0 Host Controller
+       145d  Zeppelin Switch Upstream (PCIE SW.US)
+       145e  Zeppelin Switch Downstream (PCIE SW.DS)
        145f  USB 3.0 Host controller
        1460  Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 0
        1461  Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 1
        1465  Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 5
        1466  Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 6
        1467  Family 17h (Models 00h-0fh) Data Fabric: Device 18h; Function 7
+       1468  Zeppelin Cryptographic Coprocessor NTBCCP
+       1480  Starship/Matisse Root Complex
+       1481  Starship/Matisse IOMMU
+       1482  Starship/Matisse PCIe Dummy Host Bridge
+       1483  Starship/Matisse GPP Bridge
+       1484  Starship/Matisse Internal PCIe GPP Bridge 0 to bus[E:B]
+       1485  Starship/Matisse Reserved SPP
+       1486  Starship/Matisse Cryptographic Coprocessor PSPCPP
+       1487  Starship/Matisse HD Audio Controller
+       1488  Starship Reserved SSP
+       1489  Starship Reserved SSP
+       148a  Starship/Matisse PCIe Dummy Function
+       148b  Starship/Matisse Non-Transparent Bridge
+       148c  Starship USB 3.0 Host Controller
+       148d  Starship/Matisse Switch Upstream (PCIE SW.US)
+       148e  Starship/Matisse Switch Downstream (PCIE SW.DS)
+       148f  Starship Reserved SSP
+       1490  Starship Device 24; Function 0
+       1491  Starship Device 24; Function 1
+       1492  Starship Device 24; Function 2
+       1493  Starship Device 24; Function 3
+       1494  Starship Device 24; Function 4
+       1495  Starship Device 24; Function 5
+       1496  Starship Device 24; Function 6
+       1497  Starship Device 24; Function 7
+       1498  Starship/Matisse PTDMA
+       1499  Starship/Matisse NVMe
+       149a  Starship PCIe GPP Bridge [1:0]
+       149b  Starship Reserved SSP
+       149c  Matisse USB 3.0 Host Controller
        1510  Family 14h Processor Root Complex
                174b 1001  PURE Fusion Mini
        1512  Family 14h Processor Root Port
        1534  Family 16h Processor Function 4
        1535  Family 16h Processor Function 5
        1536  Family 16h Processor Root Complex
+       1537  Kabini/Mullins PSP-Platform Security Processor
        1538  Family 16h Processor Function 0
+       1539  Kabini P2P Bridge for PCIe Ports[4:0]
+       1540  Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky HT Configuration
+       1541  Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky Address Maps
+       1542  Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky DRAM Configuration
+       1543  Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky Miscellaneous Configuration
+       1544  Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky PM Configuration
+       1545  Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky NB Performance Monitor
+       1546  Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky Root Complex
+       1547  Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky IOMMU
+       1548  Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky UMI PCIe Dummy Host Bridge
+       1549  Kryptos/Cato/Garfield/Garfield+ P2P Bridge for PCIe Port [3:0]
+       154a  Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky Audio Processor
+       154b  Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky Security Processor
+       154d  Kryptos/Cato/Garfield/Garfield+/Arlene/Pooky/Anubis HDMI Controller
+       154f  Anubis Audio Processor
+       1550  Garfield+/Arlene/Pooky/Anubis SPLL Configuration
+       1553  Arlene/Pooky P2P Bridge for PCIE (3:0)
+       155b  Anubis Root Complex
+       155c  Anubis IOMMU
+       155d  Anubis UMI PCIe Dummy Bridge
+       155e  Anubis P2P Bridge for PCIe Ports [4:0]
+       1560  Anubis Security Processor
        1566  Family 16h (Models 30h-3fh) Processor Root Complex
+       1567  Mullins IOMMU
        156b  Family 16h (Models 30h-3fh) Host Bridge
        1570  Family 15h (Models 60h-6fh) Processor Function 0
        1571  Family 15h (Models 60h-6fh) Processor Function 1
        1575  Family 15h (Models 60h-6fh) Processor Function 5
        1576  Family 15h (Models 60h-6fh) Processor Root Complex
        1577  Family 15h (Models 60h-6fh) I/O Memory Management Unit
+       1578  Carrizo Platform Security Processor
+       1579  Carrizo Audio Processor
        157a  Family 15h (Models 60h-6fh) Audio Controller
        157b  Family 15h (Models 60h-6fh) Host Bridge
        157c  Family 15h (Models 60h-6fh) Processor Root Port
+       157d  Carrizo Audio Dummy Host Bridge
+       157e  Carrizo Audio Controller
        1580  Family 16h (Models 30h-3fh) Processor Function 0
        1581  Family 16h (Models 30h-3fh) Processor Function 1
        1582  Family 16h (Models 30h-3fh) Processor Function 2
        1583  Family 16h (Models 30h-3fh) Processor Function 3
        1584  Family 16h (Models 30h-3fh) Processor Function 4
        1585  Family 16h (Models 30h-3fh) Processor Function 5
+       1590  Amur/Nolan HT Configuration
+       1591  Amur/Nolan Address Maps
+       1592  Amur/Nolan DRAM Configuration
+       1593  Amur/Nolan Miscellaneous Configuration
+       1594  Amur/Nolan PM Configuration
+       1595  Amur/Nolan NB Performance Monitor
+       1596  Amur/Nolan Root Complex
+       1597  Amur/Nolan IOMMU
+       1598  Amur/Nolan Platform Security Processor
+       1599  Amur/Nolan PCIe Dummy Host Bridge
+       159d  Amur Function 6: Gasket
+       15b0  Stoney HT Configuration
+       15b1  Stoney Address Maps
+       15b2  Stoney DRAM Configuration
+       15b3  Stoney Miscellaneous Configuration
+       15b4  Stoney PM Configuration
+       15b5  Stoney NB Performance Monitor
+       15bc  Stoney PCIe [GFX,GPP] Bridge [4:0]
+       15be  Stoney Audio Processor
+       15d0  Raven/Raven2 Root Complex
+       15d1  Raven/Raven2 IOMMU
+       15d2  Raven/Raven2 PCIe Dummy Host Bridge
+       15d3  Raven/Raven2 PCIe GPP Bridge [6:0]
+       15d4  FireFlight USB 3.1
+       15d5  FireFlight USB 3.1
+       15da  Raven/Raven2 PCIe Dummy Host Bridge
+       15db  Raven/Raven2 Internal PCIe GPP Bridge 0 to Bus A
+       15dc  Raven/Raven2 Internal PCIe GPP Bridge 0 to Bus B
+       15de  Raven/Raven2/FireFlight HD Audio Controller
        15df  Family 17h (Models 10h-1fh) Platform Security Processor
+       15e0  Raven USB 3.1
+       15e1  Raven USB 3.1
+       15e2  Raven/Raven2/FireFlight/Renoir Audio Processor
        15e3  Family 17h (Models 10h-1fh) HD Audio Controller
+       15e4  Raven/Raven2/Renoir Sensor Fusion Hub
+       15e5  Raven2 USB 3.1
+       15e6  Raven/Raven2/Renoir Non-Sensor Fusion Hub KMDF driver
+       15e8  Raven/Raven2 Device 24: Function 0
+       15e9  Raven/Raven2 Device 24: Function 1
+       15ea  Raven/Raven2 Device 24: Function 2
+       15eb  Raven/Raven2 Device 24: Function 3
+       15ec  Raven/Raven2 Device 24: Function 4
+       15ed  Raven/Raven2 Device 24: Function 5
+       15ee  Raven/Raven2 Device 24: Function 6
+       15ef  Raven/Raven2 Device 24: Function 7
+       15f0  FireFlight Device 24: Function 0
+       15f1  FireFlight Device 24: Function 1
+       15f2  FireFlight Device 24: Function 2
+       15f3  FireFlight Device 24: Function 3
+       15f4  FireFlight Device 24: Function 4
+       15f5  FireFlight Device 24: Function 5
+       15f6  FireFlight Device 24: Function 6
+       15f7  FireFlight Device 24: Function 7
+       15f8  FireFlight Root Complex
+       15f9  FireFlight IOMMU
+       15fa  FireFlight PCIe Dummy Host Bridge
+       15fb  FireFlight PCIe GPP Bride 3:0
+       15fc  FireFlight PCIe Dummy Host Bridge
+       15fd  FireFlight Internal PCIe GPP Bridge 0 to Bus A
+       15fe  FireFlight Internal PCIe GPP Bridge 0 to Bus B
+       15ff  FireFlight Bus A; Device 0: Function 0: Internal GPU
        1600  Family 15h Processor Function 0
        1601  Family 15h Processor Function 1
        1602  Family 15h Processor Function 2
        1603  Family 15h Processor Function 3
        1604  Family 15h Processor Function 4
        1605  Family 15h Processor Function 5
+       1606  Arden Security Processor
+       1608  Arden Device 18h: Function 0
+       1609  Arden Device 18h: Function 1
+       160a  Arden Device 18h: Function 2
+       160b  Arden Device 18h: Function 3
+       160c  Arden Device 18h: Function 4
+       160d  Arden Device 18h: Function 5
+       160e  Arden Device 18h: Function 6
+       160f  Arden Device 18h: Function 7
+       1620  Anubis HT Configuration
+       1621  Anubis Address Maps
+       1622  Anubis DRAM Configuration
+       1623  Anubis Miscellaneous Configuration
+       1624  Anubis PM Configuration
+       1625  Anubis NB Performance Monitor
+       1626  Arden Root Complex
+       1627  Arden IOMMU
+       1628  Arden PCIe Dummy Host Bridge
+       1629  Arden PCIe GPP Bridge
+       162a  Arden Internal PCIe GPP Bridge 0 to bus X
+       162b  Arden PCIe Non-Transparent Bridge
+       1630  Renoir Root Complex
+       1631  Renoir IOMMU
+       1632  Renoir PCIe Dummy Host Bridge
+       1633  Renoir PCIe GPP Bridge
+       1634  Renoir PCIe GPP Bridge
+       1635  Renoir Internal PCIe GPP Bridge to Bus
+       1637  Renoir HD Audio Controller
+       1639  Renoir USB 3.1
+       1641  Renoir 10GbE Controller Port 0 (XGBE0/1)
+       1642  Renoir WLAN
+       1643  Renoir BT
+       1644  Renoir I2S
        1700  Family 12h/14h Processor Function 0
        1701  Family 12h/14h Processor Function 1
        1702  Family 12h/14h Processor Function 2
        1703  Family 12h/14h Processor Function 3
        1704  Family 12h/14h Processor Function 4
        1705  Family 12h Processor Root Complex
+       1706  Llano P2P Bridge to external GPU
        1707  Family 12h Processor Root Port
        1708  Family 12h Processor Root Port
        1709  Family 12h Processor Root Port
                103c 1985  Pavilion 17-e163sg Notebook PC
        7809  FCH USB OHCI Controller
                103c 194e  ProBook 455 G1 Notebook
+       780a  Kabini/Mullins SATA Raid/AHCI Mode (DotHill driver)
        780b  FCH SMBus Controller
                103c 194e  ProBook 455 G1 Notebook
                103c 1985  Pavilion 17-e163sg Notebook PC
        122e  PCI-X Local Bus Adapter
        127b  sx1000 System Bus Adapter
        127c  sx1000 I/O Controller
+       128d  Diva [GSP] Management Board
        1290  Auxiliary Diva Serial Port
                103c 1291  Diva SP2
        1291  Auxiliary Diva Serial Port
        0638  G94GL [Quadro FX 1800]
        063a  G94GLM [Quadro FX 2700M]
        063f  G94 [GeForce 9600 GE]
-       0640  G96 [GeForce 9500 GT]
-       0641  G96 [GeForce 9400 GT]
+       0640  G96C [GeForce 9500 GT]
+       0641  G96C [GeForce 9400 GT]
                1682 4009  PV-T94G-ZAFG
        0642  G96 [D9M-10]
        0643  G96 [GeForce 9500 GT]
        0644  G96 [GeForce 9500 GS]
                174b 9600  Geforce 9500GS 512M DDR2 V/D/HDMI
-       0645  G96 [GeForce 9500 GS]
-       0646  G96 [GeForce GT 120]
-       0647  G96M [GeForce 9600M GT]
-       0648  G96M [GeForce 9600M GS]
-       0649  G96M [GeForce 9600M GT]
+       0645  G96C [GeForce 9500 GS]
+       0646  G96C [GeForce GT 120]
+       0647  G96CM [GeForce 9600M GT]
+       0648  G96CM [GeForce 9600M GS]
+       0649  G96CM [GeForce 9600M GT]
                1043 202d  GeForce GT 220M
        064a  G96M [GeForce 9700M GT]
        064b  G96M [GeForce 9500M G]
-       064c  G96M [GeForce 9650M GT]
-       064d  G96 [GeForce 9600 GT]
-       064e  G96 [GeForce 9600 GT / 9800 GT]
-       0651  G96M [GeForce G 110M]
-       0652  G96M [GeForce GT 130M]
+       064c  G96CM [GeForce 9650M GT]
+       064e  G96C [GeForce 9600 GSO / 9800 GT]
+       0651  G96CM [GeForce G 110M]
+       0652  G96CM [GeForce GT 130M]
                152d 0850  GeForce GT 240M LE
-       0653  G96M [GeForce GT 120M]
-       0654  G96M [GeForce GT 220M]
+       0653  G96CM [GeForce GT 120M]
+       0654  G96CM [GeForce GT 220M]
                1043 14a2  GeForce GT 320M
                1043 14d2  GeForce GT 320M
-       0655  G96 [GeForce GT 120]
-       0656  G96 [GeForce 9650 S]
+       0655  G96 [GeForce GT 120 Mac Edition]
+       0656  G96 [GeForce GT 120 Mac Edition]
        0658  G96GL [Quadro FX 380]
-       0659  G96GL [Quadro FX 580]
+       0659  G96CGL [Quadro FX 580]
        065a  G96GLM [Quadro FX 1700M]
-       065b  G96 [GeForce 9400 GT]
+       065b  G96C [GeForce 9400 GT]
        065c  G96GLM [Quadro FX 770M]
        065d  G96 [GeForce 9500 GA / 9600 GT / GTS 250]
-       065f  G96 [GeForce G210]
+       065f  G96C [GeForce G210]
        06c0  GF100 [GeForce GTX 480]
        06c4  GF100 [GeForce GTX 465]
        06ca  GF100M [GeForce GTX 480M]
        1d52  GP108BM [GeForce MX250]
        1d81  GV100 [TITAN V]
        1db1  GV100GL [Tesla V100 SXM2 16GB]
-       1db2  GV100 [Tesla V100-DGXS-16GB]
+       1db2  GV100GL [Tesla V100-DGXS-16GB]
        1db3  GV100GL [Tesla V100 FHHL 16GB]
        1db4  GV100GL [Tesla V100 PCIe 16GB]
        1db5  GV100GL [Tesla V100 SXM2 32GB]
                1462 3715  RTX 2080 Ti GAMING X TRIO
        1e2d  TU102B
        1e2e  TU102B
-       1e30  TU102GL [Quadro RTX 6000]
+       1e30  TU102GL [Quadro RTX 6000/8000]
+               10de 129e  Quadro RTX 8000
+               10de 12ba  Quadro RTX 6000
        1e38  TU102GL
        1e3c  TU102GL
        1e3d  TU102GL
        1f50  TU106M [GeForce RTX 2070 Mobile]
        1f51  TU106M [GeForce RTX 2060 Mobile]
        1f82  TU107
+       1f92  TU107M
+       1fbf  TU107GL
+       2182  TU116 [GeForce GTX 1660 Ti Rev. A]
+       2183  TU116
+       2184  TU116 [GeForce GTX 1660]
+       2191  TU116M
+       21ae  TU116GL
+       21bf  TU116GL
 10df  Emulex Corporation
        0720  OneConnect NIC (Skyhawk)
                103c 1934  FlexFabric 20Gb 2-port 650M Adapter
        1000  BSP15
 12d6  Analogic Corp
 12d7  Biotronic SRL
+# acquired by Diodes Inc.
 12d8  Pericom Semiconductor
        01a7  7C21P100 2-port PCI-X to PCI-X Bridge
+       2304  PI7C9X2G304 EL/SL PCIe2 3-Port/4-Lane Packet Switch
        2608  PI7C9X2G608GP PCIe2 6-Port/8-Lane Packet Switch
        400a  PI7C9X442SL PCI Express Bridge Port
        400e  PI7C9X442SL USB OHCI Controller
        b842  BCM56842 Trident 10GE Switch Controller
 # Trident2
        b850  Broadcom BCM56850 Switch ASIC
+       b880  BCM56880 Switch ASIC
 # Tomahawk
        b960  Broadcom BCM56960 Switch ASIC
        d802  BCM58802 Stingray 50Gb Ethernet SoC
                14e4 8021  Stingray Dual-Port 25Gb Ethernet PCIe SmartNIC w16GB DRAM (Part No BCM958802A8046C)
+               14e4 8023  PS410T-H04 NetXtreme-S 4x10G 10GBaseT PCIe SmartNIC
                14e4 8024  Stingray Dual-Port 25Gb Ethernet PCIe SmartNIC w4GB DRAM (Part No BCM958802A8044C)
                14e4 8028  Stingray Dual-Port 25Gb Ethernet PCIe SmartNIC w8GB DRAM (Part No BCM958802A8048C)
        d804  BCM58804 Stingray 100Gb Ethernet SoC
 16b8  Sonnet Technologies, Inc.
 16be  Creatix Polymedia GmbH
 16c3  Synopsys, Inc.
+       abcd  DWC_usb3
+       abce  DWC_usb3
+       abcf  DWC_usb31
        edda  EPMockUp
 16c6  Micrel-Kendin
        8695  Centaur KS8695 ARM processor
        7042  AP482 Counter Timer Module with TTL Level Input/Output
        7043  AP483 Counter Timer Module with TTL Level and RS422 Input/Output
        7044  AP484 Counter Timer Module with RS422 Input/Output
+       7051  APA7-501 Reconfigurable Artix-7 52,160 Cell FPGA module 48 TTL channels
+       7052  APA7-502 Reconfigurable Artix-7 52,160 Cell FPGA module 24 RS485 channels
+       7053  APA7-503 Reconfigurable Artix-7 52,160 Cell FPGA module 24 TTL & 12 RS485 channels
+       7054  APA7-504 Reconfigurable Artix-7 52,160 Cell FPGA module 24 LVDS channels
 16da  Advantech Co., Ltd.
        0011  INES GPIB-PCI
 16df  PIKA Technologies Inc.
        ff00  CTU CAN FD PCIe Card
 1761  Pickering Interfaces Ltd
 1771  InnoVISION Multimedia Ltd.
-# nee SBS Technologies
-1775  GE Intelligent Platforms
+1775  General Electric
 177d  Cavium, Inc.
        0001  Nitrox XL N1
        0003  Nitrox XL N1 Lite
 17f2  Albatron Corp.
 17f3  RDC Semiconductor, Inc.
        1010  R1010 IDE Controller
+       1011  R1011 IDE Controller
+       1012  R1012 IDE Controller
+       1031  PCI/PCI-X to PCI-E Bridge
        2012  M2012/R3308 VGA-compatible graphics adapter
        6020  R6020 North Bridge
        6021  R6021 Host Bridge
        1600  OX16C954 HOST-A
        16ff  OX16C954 HOST-B
 1987  Phison Electronics Corporation
+       5007  E7 NVMe Controller
        5012  E12 NVMe Controller
 1989  Montilio Inc.
        0001  RapidFile Bridge
        0001  Hunter PCI Express
 1c8c  Mobiveil, Inc.
 1cb1  Collion UG & Co.KG
+1cb5  Focusrite Audio Engineering Ltd
+       0002  Clarett
 1cb8  Dawning Information Industry Co., Ltd.
 1cc5  Embedded Intelligence, Inc.
        0100  CAN-PCIe-02
 1d0f  Amazon.com, Inc.
        cd01  NVMe SSD Controller
        ec20  Elastic Network Adapter (ENA)
+       efa0  Elastic Fabric Adapter (EFA)
 1d17  Zhaoxin
        070f  ZX-100 PCI Express Root Port
        0710  ZX-100/ZX-200 PCI Express Root Port
        e00b  eMAG PCI Express Root Port 6
        e00c  eMAG PCI Express Root Port 7
 1df3  Ethernity Networks
-       0102  ACENIC100 Programmable Network Accelerator
+       0201  ACE-NIC40 Programmable Network Accelerator
+               1df3 0001  ENA1040
+               1df3 0002  ENA1044
+               1df3 0003  ENA1044S
+       0202  ACE-NIC50 Programmable Network Accelerator
+               1df3 0001  ENA2050F
+               1df3 0002  ENA2050FS
+       0203  ACE-NIC100 Programmable Network Accelerator
+               1df3 0001  ENA2080F
+               1df3 0002  ENA2080FS
+               1df3 0003  ENA2100F
+       0204  ACE-NIC-NID Programmable Network Accelerator
+               1df3 0001  ENA1020Z
+               1df3 0002  ENA1020ZS
 1df7  opencpi.org
        0001  ml605
        0002  alst4
        0215  Acorn CLE-215
        021f  Acorn CLE-215+
        1525  Xilinx BCU-1525
+1e38  Thinci, Inc
 1e3d  Burlywood, Inc
 # nee Tumsan Oy
 1fc0  Ascom (Finland) Oy
        0c7d  Atom Processor S1200 Internal
        0c7e  Atom Processor S1200 Internal
        0c7f  Atom Processor S1200 Internal
+       0cf8  Ethernet Controller X710 Intel(R) FPGA Programmable Acceleration Card N3000 for Networking
+               8086 0000  Ethernet Controller X710 Intel(R) FPGA Programmable Acceleration Card N3000 for Networking
+               8086 0001  Ethernet Controller X710 Intel(R) FPGA Programmable Acceleration Card N3000 for Networking
        0d00  Crystal Well DRAM Controller
        0d01  Crystal Well PCI Express x16 Controller
        0d04  Crystal Well DRAM Controller
        0d16  Crystal Well Integrated Graphics Controller
        0d26  Crystal Well Integrated Graphics Controller
        0d36  Crystal Well Integrated Graphics Controller
+       0d58  Ethernet Controller XXV710 Intel(R) FPGA Programmable Acceleration Card N3000 for Networking
+               8086 0000  Ethernet Controller XXV710 Intel(R) FPGA Programmable Acceleration Card N3000 for Networking
+               8086 0001  Ethernet Controller XXV710 Intel(R) FPGA Programmable Acceleration Card N3000 for Networking
        0e00  Xeon E7 v2/Xeon E5 v2/Core i7 DMI2
                1028 04f7  Xeon E5 v2 on PowerEdge R320 server
                15d9 066b  X9SRL-F
                8086 00a2  Ethernet Server Adapter I350-T2
                8086 5001  Ethernet Server Adapter I350-T4
                8086 5002  Ethernet Server Adapter I350-T2
+               8086 5003  Ethernet 1G 4P I350-t OCP
        1522  I350 Gigabit Fiber Network Connection
                108e 7b17  Quad Port GbE PCIe 2.0 ExpressModule, MMF
                108e 7b19  Dual Port GbE PCIe 2.0 Low Profile Adapter, MMF
                8086 000e  Ethernet Server Adapter OCP X710-2
                8086 000f  Ethernet Server Adapter OCP X710-2
                8086 0010  Ethernet Converged Network Adapter X710
+               8086 0013  Ethernet 10G 2P X710 OCP
+               8086 0014  Ethernet 10G 4P X710 OCP
+               8086 0015  Ethernet Server Adapter X710-DA2 for OCP
                8086 4005  Ethernet Controller X710 for 10GbE SFP+
                8086 4006  Ethernet Controller X710 for 10GbE SFP+
                8086 4007  Ethernet Controller X710 for 10GbE SFP+
        15f0  JHL7540 Thunderbolt 3 USB Controller [Titan Ridge DD 2018]
        15f6  I210 Gigabit Ethernet Connection
        15ff  Ethernet Controller X710 for 10GBASE-T
+               8086 0005  Ethernet 10G 2P X710-T2L-t Adapter
+               8086 0006  Ethernet 10G 4P X710-T4L-t Adapter
+               8086 0007  Ethernet 10G 2P X710-T2L-t OCP
+               8086 0008  Ethernet 10G 4P X710-T4L-t OCP
        1600  Broadwell-U Host Bridge -OPI
        1601  Broadwell-U PCI Express x16 Controller
        1602  Broadwell-U Integrated Graphics
        3cf4  Xeon E5/Core i7 Integrated Memory Controller System Address Decoder 0
        3cf5  Xeon E5/Core i7 Integrated Memory Controller System Address Decoder 1
        3cf6  Xeon E5/Core i7 System Address Decoder
-       3e18  8th Gen Core Processor Host Bridge/DRAM Registers
-       3e1f  8th Gen Core Processor Host Bridge/DRAM Registers
+       3e10  8th Gen Core 4-core Processor Host Bridge/DRAM Registers [Coffee Lake H]
+       3e18  8th Gen Core 4-core Workstation Processor Host Bridge/DRAM Registers [Coffee Lake S]
+       3e1f  8th Gen Core 4-core Desktop Processor Host Bridge/DRAM Registers [Coffee Lake S]
+       3e30  8th Gen Core 8-core Desktop Processor Host Bridge/DRAM Registers [Coffee Lake S]
        3e81  8th Gen Core Processor PCIe Controller (x16)
        3e85  8th Gen Core Processor PCIe Controller (x8)
        3e89  8th Gen Core Processor PCIe Controller (x4)
        9d48  Sunrise Point-LP LPC Controller
                1028 06dc  Latitude E7470
                1028 06f3  Latitude 3570
-       9d4e  Intel(R) 100 Series Chipset Family LPC Controller/eSPI Controller - 9D4E
+       9d4e  Sunrise Point LPC Controller/eSPI Controller
                17aa 225d  ThinkPad T480
+       9d50  Sunrise Point LPC Controller
        9d56  Sunrise Point-LP LPC Controller
        9d58  Sunrise Point-LP LPC Controller
                17aa 2247  ThinkPad T570
        a2ee  200 Series PCH PCI Express Root Port #24
        a2f0  200 Series PCH HD Audio
        a304  H370 Chipset LPC/eSPI Controller
+       a305  Z390 Chipset LPC/eSPI Controller
+       a306  Q370 Chipset LPC/eSPI Controller
+       a30c  QM370 Chipset LPC/eSPI Controller
        a323  Cannon Lake PCH SMBus Controller
        a324  Cannon Lake PCH SPI Controller
        a32c  Cannon Lake PCH PCI Express Root Port #21
        a343  Cannon Lake PCH PCI Express Root Port #20
        a348  Cannon Lake PCH cAVS
        a352  Cannon Lake PCH SATA AHCI Controller
+       a353  Cannon Lake Mobile PCH SATA AHCI Controller
        a360  Cannon Lake PCH HECI Controller
        a363  Cannon Lake PCH Active Management Technology - SOL
        a368  Cannon Lake PCH Serial IO I2C Controller #0
@@ -30698,6 +31053,8 @@ caed  Canny Edge
 cafe  Chrysalis-ITS
        0003  Luna K3 Hardware Security Module
        0006  Luna PCI-e 3000 Hardware Security Module
+       0007  Luna K6 Hardware Security Module
+       0008  Luna K7 Hardware Security Module
 cc53  ScaleFlux Inc.
 cccc  Catapult Communications
 ccec  Curtiss-Wright Controls Embedded Computing
@@ -30909,6 +31266,7 @@ edd8  ARK Logic Inc
 # Found on M2N68-AM Motherboard
 f043  ASUSTeK Computer Inc. (Wrong ID)
 f05b  Foxconn International, Inc. (Wrong ID)
+f15e  SiFive, Inc.
 f1d0  AJA Video
        c0fe  Xena HS/HD-R
        c0ff  Kona/Xena 2
@@ -30920,6 +31278,7 @@ f1d0  AJA Video
        dcaf  Kona HD
        dfee  Xena HD-DA
        eb0e  Corvid 44
+       eb1d  Kona 5
        efac  Xena SD-MM/SD-22-MM
        facd  Xena HD-MM
 f5f5  F5 Networks, Inc.
index da6b70c33559360cb851b2c3ca71466c588daf06..bab4262ec5b5f82cc97748ba5286f88aa89b691e 100644 (file)
  <tr class="odd"><td>WyreStorm Technologies LLC </td><td>WYR</td><td>09/05/2018</td> </tr>
  <tr class="even"><td>Astro HQ LLC</td><td>AHQ </td><td>09/05/2018</td> </tr>
  <tr class="odd"><td>QSC, LLC</td><td>QSC</td><td>01/18/2019</td> </tr>
+ <tr class="even"><td>Dimension Engineering LLC</td><td>DMN</td><td>02/06/2019</td> </tr>
       </tbody>
     </table>
   </body>
index ee3c1b69193455c81be401afdf250e20a809e84b..4ccc174bbc705010f6603224c4827d3092a1a27e 100644 (file)
@@ -54,7 +54,7 @@
     <para>All options are configured in the
     <literal>[Coredump]</literal> section:</para>
 
-    <variablelist>
+    <variablelist class='config-directives'>
 
       <varlistentry>
         <term><varname>Storage=</varname></term>
index acc1817cd8bc08bd9fe0fc594186d4f2121f31e9..8fa557c0ba0eb5cc31c08294c1120a817bf53f18 100644 (file)
@@ -51,7 +51,7 @@
     <para>All options are configured in the
     <literal>[Remote]</literal> section:</para>
 
-    <variablelist>
+    <variablelist class='config-directives'>
       <varlistentry>
         <term><varname>Seal=</varname></term>
 
index c3bfa4795002c7c5498b0bb2c1dce935ed895d7f..3dda3019b551bc589ae8c292c2599b1feb8ea8fa 100644 (file)
@@ -48,7 +48,7 @@
 
     <para>All options are configured in the <literal>[Upload]</literal> section:</para>
 
-    <variablelist>
+    <variablelist class='config-directives'>
       <varlistentry>
         <term><varname>URL=</varname></term>
 
index a44b0e84ed7a8b7343dcc451b3b6d1236513eccf..2791678a4f97128d845dc6ae3d0cb5909c31c862 100644 (file)
@@ -50,7 +50,7 @@
     <para>All options are configured in the
     <literal>[Journal]</literal> section:</para>
 
-    <variablelist>
+    <variablelist class='config-directives'>
 
       <varlistentry>
         <term><varname>Storage=</varname></term>
index 9d86bdf20326005857902529ab80128fd5da8ff9..43dfc1073bf1d1c34d068a0229b6e0c6efca3e67 100644 (file)
       <title>See Also</title>
       <para>
         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
         <citerefentry project='man-pages'><refentrytitle>bootparam</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
         <citerefentry project='man-pages'><refentrytitle>dracut.cmdline</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemd-debug-generator</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
index a40785895781501ca8743a4c511e25a2560e7d43..ac8032ab4dc70bcd0e16a3cc22901d0038d88d16 100644 (file)
@@ -51,7 +51,7 @@
     <para>All options are configured in the
     <literal>[Login]</literal> section:</para>
 
-    <variablelist>
+    <variablelist class='config-directives'>
 
       <varlistentry>
         <term><varname>NAutoVTs=</varname></term>
index 476996ce5ff9c29cca9f2c030d828fd593729295..5a268c9f3690c662f6f3a8570567e4101afda649 100644 (file)
@@ -58,7 +58,7 @@
     <para>The following machine metadata parameters may be set using
     <filename>/etc/machine-info</filename>:</para>
 
-    <variablelist>
+    <variablelist class='environment-variables'>
 
       <varlistentry>
         <term><varname>PRETTY_HOSTNAME=</varname></term>
index ea71b36c1e040385d2aefe6207e39ad250fed8f1..6de0cd7148b122c9bb4e3dc4841f47ba4b8f5b96 100644 (file)
@@ -90,7 +90,7 @@
     <para>The following OS identifications parameters may be set using
     <filename>os-release</filename>:</para>
 
-    <variablelist>
+    <variablelist class='environment-variables'>
 
       <varlistentry>
         <term><varname>NAME=</varname></term>
index 3ce3b282bd976e9c6ee5bb84317a9cccf97ded63..e5e14c12d7f8250f24d6792f0cc22437dc9d01f5 100644 (file)
@@ -82,7 +82,7 @@
     <variablelist class='pam-directives'>
 
       <varlistentry>
-        <term><option>class=</option></term>
+        <term><varname>class=</varname></term>
 
         <listitem><para>Takes a string argument which sets the session class. The <varname>XDG_SESSION_CLASS</varname>
         environment variable (see below) takes precedence. One of <literal>user</literal>, <literal>greeter</literal>,
@@ -92,7 +92,7 @@
       </varlistentry>
 
       <varlistentry>
-        <term><option>type=</option></term>
+        <term><varname>type=</varname></term>
 
         <listitem><para>Takes a string argument which sets the session type. The <varname>XDG_SESSION_TYPE</varname>
         environment variable (see below) takes precedence. One of <literal>unspecified</literal>,
       </varlistentry>
 
       <varlistentry>
-        <term><option>desktop=</option></term>
+        <term><varname>desktop=</varname></term>
 
         <listitem><para>Takes a single, short identifier string for the desktop environment. The
         <varname>XDG_SESSION_DESKTOP</varname> environment variable (see below) takes precedence. This may be used to
       </varlistentry>
 
       <varlistentry>
-        <term><option>debug<optional>=</optional></option></term>
+        <term><varname>debug</varname><optional>=</optional></term>
 
         <listitem><para>Takes an optional boolean argument. If yes or without the argument, the module will log
         debugging information as it operates.</para></listitem>
       <varlistentry>
         <term><varname>$XDG_SESSION_TYPE</varname></term>
 
-        <listitem><para>The session type. This may be used instead of <option>session=</option> on the module parameter
+        <listitem><para>The session type. This may be used instead of <varname>session=</varname> on the module parameter
         line, and is usually preferred.</para></listitem>
       </varlistentry>
 
       <varlistentry>
         <term><varname>$XDG_SESSION_CLASS</varname></term>
 
-        <listitem><para>The session class. This may be used instead of <option>class=</option> on the module parameter
+        <listitem><para>The session class. This may be used instead of <varname>class=</varname> on the module parameter
         line, and is usually preferred.</para></listitem>
       </varlistentry>
 
       <varlistentry>
         <term><varname>$XDG_SESSION_DESKTOP</varname></term>
 
-        <listitem><para>The desktop identifier. This may be used instead of <option>desktop=</option> on the module
+        <listitem><para>The desktop identifier. This may be used instead of <varname>desktop=</varname> on the module
         parameter line, and is usually preferred.</para></listitem>
       </varlistentry>
 
     the context objects.
     </para>
 
-    <variablelist>
+    <variablelist class='pam-directives'>
       <varlistentry>
         <term><varname>systemd.memory_max</varname></term>
 
index c896511541ea03e316a1396f8d882f6eabb0e7e2..a94022c025c0f83d84b1b623c007def8fc7e1ed4 100644 (file)
     <variablelist>
 
       <varlistentry>
-         <term><varname>SD_BUS_ERROR_FAILED</varname></term>
+         <term><constant>SD_BUS_ERROR_FAILED</constant></term>
          <listitem><para>A generic error indication. See the error
          message for further details. This error name should be
          avoided, in favor of a more expressive error
       </varlistentry>
 
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_NO_MEMORY</varname></term>
+        <term><constant>SD_BUS_ERROR_NO_MEMORY</constant></term>
         <listitem><para>A memory allocation failed, and the requested
         operation could not be completed.</para></listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_SERVICE_UNKNOWN</varname></term>
+        <term><constant>SD_BUS_ERROR_SERVICE_UNKNOWN</constant></term>
         <listitem><para>The contacted bus service is unknown and
         cannot be activated.</para></listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_NAME_HAS_NO_OWNER</varname></term>
+        <term><constant>SD_BUS_ERROR_NAME_HAS_NO_OWNER</constant></term>
         <listitem><para>The specified bus service name currently has
         no owner.</para></listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_NO_REPLY</varname></term>
+        <term><constant>SD_BUS_ERROR_NO_REPLY</constant></term>
         <listitem><para>A message did not receive a reply. This error
         is usually generated after a timeout.</para></listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_IO_ERROR</varname></term>
+        <term><constant>SD_BUS_ERROR_IO_ERROR</constant></term>
         <listitem><para>Generic input/output error, for example when
         accessing a socket or other I/O context.</para></listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_BAD_ADDRESS</varname></term>
+        <term><constant>SD_BUS_ERROR_BAD_ADDRESS</constant></term>
         <listitem><para>The specified D-Bus bus address string is
         malformed.</para></listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_NOT_SUPPORTED</varname></term>
+        <term><constant>SD_BUS_ERROR_NOT_SUPPORTED</constant></term>
         <listitem><para>The requested operation is not supported on
         the local system.</para></listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_LIMITS_EXCEEDED</varname></term>
+        <term><constant>SD_BUS_ERROR_LIMITS_EXCEEDED</constant></term>
         <listitem><para>Some limited resource has been
         exhausted.</para></listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_ACCESS_DENIED</varname></term>
+        <term><constant>SD_BUS_ERROR_ACCESS_DENIED</constant></term>
         <listitem><para>Access to a resource has been denied due to security restrictions.</para></listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_AUTH_FAILED</varname></term>
+        <term><constant>SD_BUS_ERROR_AUTH_FAILED</constant></term>
         <listitem><para>Authentication did not complete successfully.</para></listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_NO_SERVER</varname></term>
+        <term><constant>SD_BUS_ERROR_NO_SERVER</constant></term>
         <listitem><para>Unable to connect to the specified server.</para></listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_TIMEOUT</varname></term>
+        <term><constant>SD_BUS_ERROR_TIMEOUT</constant></term>
         <listitem><para>An operation timed out. Note that method calls
         which timeout generate a
-        <varname>SD_BUS_ERROR_NO_REPLY</varname>.</para></listitem>
+        <constant>SD_BUS_ERROR_NO_REPLY</constant>.</para></listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_NO_NETWORK</varname></term>
+        <term><constant>SD_BUS_ERROR_NO_NETWORK</constant></term>
         <listitem><para>No network available to execute requested network operation on.</para></listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_ADDRESS_IN_USE</varname></term>
+        <term><constant>SD_BUS_ERROR_ADDRESS_IN_USE</constant></term>
         <listitem><para>The specified network address is already being listened on.</para></listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_DISCONNECTED</varname></term>
+        <term><constant>SD_BUS_ERROR_DISCONNECTED</constant></term>
         <listitem><para>The connection has been terminated.</para></listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_INVALID_ARGS</varname></term>
+        <term><constant>SD_BUS_ERROR_INVALID_ARGS</constant></term>
         <listitem><para>One or more invalid arguments have been passed.</para></listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_FILE_NOT_FOUND</varname></term>
+        <term><constant>SD_BUS_ERROR_FILE_NOT_FOUND</constant></term>
         <listitem><para>The requested file could not be found.</para></listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_FILE_EXISTS</varname></term>
+        <term><constant>SD_BUS_ERROR_FILE_EXISTS</constant></term>
         <listitem><para>The requested file already exists.</para></listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_UNKNOWN_METHOD</varname></term>
+        <term><constant>SD_BUS_ERROR_UNKNOWN_METHOD</constant></term>
         <listitem><para>The requested method does not exist in the selected interface.</para></listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_UNKNOWN_OBJECT</varname></term>
+        <term><constant>SD_BUS_ERROR_UNKNOWN_OBJECT</constant></term>
         <listitem><para>The requested object does not exist in the selected service.</para></listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_UNKNOWN_INTERFACE</varname></term>
+        <term><constant>SD_BUS_ERROR_UNKNOWN_INTERFACE</constant></term>
         <listitem><para>The requested interface does not exist on the selected object.</para></listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_UNKNOWN_PROPERTY</varname></term>
+        <term><constant>SD_BUS_ERROR_UNKNOWN_PROPERTY</constant></term>
         <listitem><para>The requested property does not exist in the selected interface.</para></listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_PROPERTY_READ_ONLY</varname></term>
+        <term><constant>SD_BUS_ERROR_PROPERTY_READ_ONLY</constant></term>
         <listitem><para>A write operation was requested on a read-only property.</para></listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_UNIX_PROCESS_ID_UNKNOWN</varname></term>
+        <term><constant>SD_BUS_ERROR_UNIX_PROCESS_ID_UNKNOWN</constant></term>
         <listitem><para>The requested PID is not known.</para></listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_INVALID_SIGNATURE</varname></term>
+        <term><constant>SD_BUS_ERROR_INVALID_SIGNATURE</constant></term>
         <listitem><para>The specified message signature is not
         valid.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_INCONSISTENT_MESSAGE</varname></term>
+        <term><constant>SD_BUS_ERROR_INCONSISTENT_MESSAGE</constant></term>
         <listitem><para>The passed message does not validate
         correctly.</para></listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_MATCH_RULE_NOT_FOUND</varname></term>
+        <term><constant>SD_BUS_ERROR_MATCH_RULE_NOT_FOUND</constant></term>
         <listitem><para>The specified match rule does not exist.</para></listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_MATCH_RULE_INVALID</varname></term>
+        <term><constant>SD_BUS_ERROR_MATCH_RULE_INVALID</constant></term>
         <listitem><para>The specified match rule is invalid.</para></listitem>
       </varlistentry>
       <varlistentry>
-        <term><varname>SD_BUS_ERROR_INTERACTIVE_AUTHORIZATION_REQUIRED</varname></term>
+        <term><constant>SD_BUS_ERROR_INTERACTIVE_AUTHORIZATION_REQUIRED</constant></term>
         <listitem><para>Access to the requested operation is not
         permitted. However, it might be available after interactive
         authentication. This is usually returned by method calls
index 83ef0b7307a0c9e675bc931fedd2b6a928854ca0..374395726f3f72800d26426c8e6f99f4df8329a7 100644 (file)
     <para>Assignment of hardware devices to seats is managed inside the udev database, via
     settings on the devices:</para>
 
-    <variablelist>
+    <variablelist class='udev-directives'>
       <varlistentry>
         <term>Tag <literal>seat</literal></term>
 
index 3c98b60c6ac8a39ff4a74ca28a1e97d2edfd5ec5..cf0b5521164fce22e7fb8f2aaa495e7b29e5e02f 100644 (file)
 
     <variablelist>
       <varlistentry>
-        <term><varname>SD_BUS_NAME_ALLOW_REPLACEMENT</varname></term>
+        <term><constant>SD_BUS_NAME_ALLOW_REPLACEMENT</constant></term>
 
         <listitem><para>After acquiring the name successfully, permit other peers to take over the name when they try
-        to acquire it with the <varname>SD_BUS_NAME_REPLACE_EXISTING</varname> flag set. If
-        <varname>SD_BUS_NAME_ALLOW_REPLACEMENT</varname> is not set on the original request, such a request by other
+        to acquire it with the <constant>SD_BUS_NAME_REPLACE_EXISTING</constant> flag set. If
+        <constant>SD_BUS_NAME_ALLOW_REPLACEMENT</constant> is not set on the original request, such a request by other
         peers will be denied.</para></listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><varname>SD_BUS_NAME_REPLACE_EXISTING</varname></term>
+        <term><constant>SD_BUS_NAME_REPLACE_EXISTING</constant></term>
 
         <listitem><para>Take over the name if it is already acquired by another peer, and that other peer has permitted
-        takeover by setting <varname>SD_BUS_NAME_ALLOW_REPLACEMENT</varname> while acquiring it.</para></listitem>
+        takeover by setting <constant>SD_BUS_NAME_ALLOW_REPLACEMENT</constant> while acquiring it.</para></listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><varname>SD_BUS_NAME_QUEUE</varname></term>
+        <term><constant>SD_BUS_NAME_QUEUE</constant></term>
 
         <listitem><para>Queue the acquisition of the name when the name is already taken.</para></listitem>
       </varlistentry>
     <para>On success, these calls return 0 or a positive integer. On failure, these calls return a negative errno-style
     error code.</para>
 
-    <para>If <varname>SD_BUS_NAME_QUEUE</varname> is specified, <function>sd_bus_request_name()</function> will return
+    <para>If <constant>SD_BUS_NAME_QUEUE</constant> is specified, <function>sd_bus_request_name()</function> will return
     0 when the name is already taken by another peer and the client has been added to the queue for the name. In that
     case, the caller can subscribe to <literal>NameOwnerChanged</literal> signals to be notified when the name is
     successfully acquired.  <function>sd_bus_request_name()</function> returns &gt; 0 when the name has immediately
index 44b0f61f2222f097a8828bd27eee82510483a4c4..4c914e615664dc5b99e18e5c3af7c633d3dc72ec 100644 (file)
     UUID <literal>4a67b082-0a4c-41cf-b6c7-440b29bb8c4</literal>, for communication between the OS and the boot
     loader:</para>
 
-    <variablelist>
+    <variablelist class='efi-variables'>
       <varlistentry>
         <term><varname>LoaderBootCountPath</varname></term>
         <listitem><para>If boot counting is enabled, contains the path to the file in whose name the boot counters are
index 96e6d5e452369e95edc3190a5ac790a34e651928..af61947c5ca0185c84518937d52af5b851d24dbe 100644 (file)
     <filename>/etc/systemd/sleep.conf</filename> or a
     <filename>sleep.conf.d</filename> file:</para>
 
-    <variablelist class='systemd-directives'>
+    <variablelist class='config-directives'>
       <varlistentry>
         <term><varname>AllowSuspend=</varname></term>
         <term><varname>AllowHibernation=</varname></term>
index 73458fd5c7a2d415a7845de86ec703e5861362be..27242b3a569cf714daf19c83fdebeea93552bd53 100644 (file)
@@ -63,7 +63,7 @@
     <para>All options are configured in the
     <literal>[Manager]</literal> section:</para>
 
-    <variablelist class='systemd-directives'>
+    <variablelist class='config-directives'>
 
       <varlistentry>
         <term><varname>LogLevel=</varname></term>
index e8a3f77d54c1906e1ff6e63241528452b0205d34..d39149bd0c005a8cb83202ecd9e63896dffcc29c 100644 (file)
@@ -393,7 +393,7 @@ CapabilityBoundingSet=~CAP_B CAP_C</programlisting>
 
   <refsect1>
     <title>Mandatory Access Control</title>
-    <variablelist>
+    <variablelist class='unit-directives'>
 
       <varlistentry>
         <term><varname>SELinuxContext=</varname></term>
@@ -436,7 +436,7 @@ CapabilityBoundingSet=~CAP_B CAP_C</programlisting>
   <refsect1>
     <title>Process Properties</title>
 
-    <variablelist>
+    <variablelist class='unit-directives'>
 
       <varlistentry>
         <term><varname>LimitCPU=</varname></term>
@@ -671,7 +671,7 @@ CapabilityBoundingSet=~CAP_B CAP_C</programlisting>
   <refsect1>
     <title>Scheduling</title>
 
-    <variablelist>
+    <variablelist class='unit-directives'>
 
       <varlistentry>
         <term><varname>Nice=</varname></term>
@@ -764,7 +764,7 @@ CapabilityBoundingSet=~CAP_B CAP_C</programlisting>
     (such as <varname>ProtectSystem=</varname>) are not available, as the underlying kernel functionality is only
     accessible to privileged processes.</para>
 
-    <variablelist>
+    <variablelist class='unit-directives'>
 
       <varlistentry>
         <term><varname>ProtectSystem=</varname></term>
@@ -1388,7 +1388,7 @@ RestrictNamespaces=~cgroup net</programlisting>
 
   <refsect1>
     <title>System Call Filtering</title>
-    <variablelist>
+    <variablelist class='unit-directives'>
 
       <varlistentry>
         <term><varname>SystemCallFilter=</varname></term>
@@ -1627,7 +1627,7 @@ SystemCallErrorNumber=EPERM</programlisting>
   <refsect1>
     <title>Environment</title>
 
-    <variablelist>
+    <variablelist class='unit-directives'>
 
       <varlistentry>
         <term><varname>Environment=</varname></term>
@@ -1742,7 +1742,7 @@ SystemCallErrorNumber=EPERM</programlisting>
   <refsect1>
     <title>Logging and Standard Input/Output</title>
 
-    <variablelist>
+    <variablelist class='unit-directives'>
       <varlistentry>
 
         <term><varname>StandardInput=</varname></term>
@@ -2084,7 +2084,7 @@ StandardInputData=SWNrIHNpdHplIGRhIHVuJyBlc3NlIEtsb3BzLAp1ZmYgZWVtYWwga2xvcHAncy
 
   <refsect1>
     <title>System V Compatibility</title>
-    <variablelist>
+    <variablelist class='unit-directives'>
 
       <varlistentry>
         <term><varname>UtmpIdentifier=</varname></term>
@@ -2468,6 +2468,18 @@ StandardInputData=SWNrIHNpdHplIGRhIHVuJyBlc3NlIEtsb3BzLAp1ZmYgZWVtYWwga2xvcHAncy
 
         </listitem>
       </varlistentry>
+
+      <varlistentry>
+        <term><varname>$PIDFILE</varname></term>
+
+        <listitem><para>The path to the configured PID file, in case the process is forked off on behalf of a
+        service that uses the <varname>PIDFile=</varname> setting, see
+        <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+        for details. Service code may use this environment variable to automatically generate a PID file at
+        the location configured in the unit file. This field is set to an absolute path in the file
+        system.</para></listitem>
+      </varlistentry>
+
     </variablelist>
 
     <para>For system services, when <varname>PAMName=</varname> is enabled and <command>pam_systemd</command> is part
@@ -2884,7 +2896,8 @@ StandardInputData=SWNrIHNpdHplIGRhIHVuJyBlc3NlIEtsb3BzLAp1ZmYgZWVtYWwga2xvcHAncy
         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemd-analyze</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
index 9b264ecbf5869a62531a3ae8ec09c0c102d187df..1b4a4a84a0dedaaefd839b9bae5bbf36b8f897dc 100644 (file)
       <para>
         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-        <citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>journalctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
index 7355b135e972a46512da513b95981e8c6ba488a5..61e97b14f2a5b7148a0695456fe9917c034f23ea 100644 (file)
         <citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>.)
         Takes a unit-less value in seconds, or a time span value such
         as "5min 20s". Pass 0 to disable the timeout logic. The
-        default value is set from the manager configuration file's
-        <varname>DefaultTimeoutStartSec=</varname>
-        variable.</para></listitem>
+        default value is set from <varname>DefaultTimeoutStartSec=</varname> option in
+        <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+        </para></listitem>
       </varlistentry>
     </variablelist>
 
       <para>
         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
index e17c1e3fbefe0db6f238199813e7ca199c735346..74281f2d0b220eae43d9560fb4d73f6d6c113fd8 100644 (file)
         <varlistentry>
           <term><varname>MACAddress=</varname></term>
           <listitem>
-            <para>The MAC address to use for the device. If none is
-            given, one is generated based on the interface name and
-            the
-            <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
-            For <literal>tun</literal> or <literal>tap</literal> devices, <varname>MACAddress=</varname> setting
-            is not currently supported in <literal>[NetDev]</literal> section. Please specify it in
-            <literal>[Link]</literal> section of corresponding
+            <para>The MAC address to use for the device. For <literal>tun</literal> or <literal>tap</literal>
+            devices, setting <varname>MACAddress=</varname> in the <literal>[NetDev]</literal> section is not
+            supported. Please specify it in <literal>[Link]</literal> section of the corresponding
             <citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-            files.</para>
+            file. If this option is not set, <literal>vlan</literal> devices inherit the MAC address of the
+            physical interface. For other kind of netdevs, if this option is not set, then MAC address is
+            generated based on the interface name and the
+            <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
+            </para>
           </listitem>
         </varlistentry>
       </variablelist>
       <varlistentry>
         <term><varname>FOUDestinationPort=</varname></term>
         <listitem>
-          <para>The <varname>FOUDestinationPort=</varname> specifies the UDP destination port for encapsulation.
+          <para>This setting specifies the UDP destination port for encapsulation.
           This field is mandatory and is not set by default.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
         <term><varname>FOUSourcePort=</varname></term>
         <listitem>
-          <para>The <constant>FOUSourcePort=</constant> specifies the UDP source port for encapsulation. Defaults to <varname>0</varname>,
-          that is, the source port for packets is left to the network stack to decide.</para>
+          <para>This setting specifies the UDP source port for encapsulation. Defaults to <constant>0</constant>
+          — that is, the source port for packets is left to the network stack to decide.</para>
         </listitem>
       </varlistentry>
       <varlistentry>
index f978fef235ef3aafae55ce997a014232cc449a06..7924641df96749e533cfa18d380b45984997fe3b 100644 (file)
     <para>Settings files may include an <literal>[Exec]</literal>
     section, which carries various execution parameters:</para>
 
-    <variablelist>
+    <variablelist class='nspawn-directives'>
 
       <varlistentry>
         <term><varname>Boot=</varname></term>
     section, which carries various parameters configuring the file
     system of the container:</para>
 
-    <variablelist>
+    <variablelist class='nspawn-directives'>
 
       <varlistentry>
         <term><varname>ReadOnly=</varname></term>
     section, which carries various parameters configuring the network
     connectivity of the container:</para>
 
-    <variablelist>
+    <variablelist class='nspawn-directives'>
 
       <varlistentry>
         <term><varname>Private=</varname></term>
index aa7d9bcd59bff25e5d8d1c7e33b00383ddd12bfa..a4d793c32ee9c3ea7cb4cfea1cb4b1da2c52eab3 100644 (file)
     <title>See Also</title>
     <para>
       <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>systemd.slice</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
index ad04efeb342ac11055a4a8ca986a3f4e4ed40d17..f0f9aee1546da1de470bf5f96879d601c83ec90c 100644 (file)
@@ -1416,6 +1416,7 @@ WantedBy=multi-user.target</programlisting>
       <para>
         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
index fb51ef6658936463b95c263752bc335eb6cfbef5..7547071e9ef3c08ebc86481334ceae471f715ec1 100644 (file)
       <para>
         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
index 073c2b3a27c1412b3bc6b8d467322fe07c19b6bc..cf00451501058c7af68b1b2be27a0f30b2bf0be1 100644 (file)
       <para>
         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+        <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
         <citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
index 7e1b3cb7eb372a4dc8ad7f1aacce1d93a634bd46..f21f9eae443697f1581cd08da3407035099db95b 100644 (file)
@@ -1842,6 +1842,7 @@ PrivateTmp=yes</programlisting>
     <para>
       <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>systemctl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>systemd.special</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>systemd.socket</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
index 23a4595fa9bef14ff16572c96822749190b50029..d1878f8c6f67acea7a5097e96de323229bebac7d 100644 (file)
@@ -40,7 +40,7 @@
       ignored. The following variables can be set:
     </para>
 
-    <variablelist>
+    <variablelist class='config-directives'>
       <varlistentry>
         <term><varname>udev_log=</varname></term>
 
index fc8b2cb3efb1b33365b572e82a4bfcab81ab8f59..a0ca83507da35c3567d8a8afdf29124a3bd237b6 100644 (file)
@@ -68,7 +68,7 @@
 
     <para>The following options are understood:</para>
 
-    <variablelist>
+    <variablelist class='environment-variables'>
 
       <varlistentry>
         <term><varname>KEYMAP=</varname></term>
index a1458e91887f7efbf4ad1bf58a66e8177af34be3..491081f0b2bd7a4a8e58558fd137557552f130fa 100644 (file)
@@ -8,4 +8,4 @@ ACTION=="add", SUBSYSTEM=="module", KERNEL=="block", ATTR{parameters/events_dfl_
 ACTION=="change", SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST=="block", ATTR{block/*/uevent}="change"
 
 # watch metadata changes, caused by tools closing the device node which was opened for writing
-ACTION!="remove", SUBSYSTEM=="block", KERNEL=="loop*|nvme*|sd*|vd*|xvd*|pmem*|mmcblk*|dasd*", OPTIONS+="watch"
+ACTION!="remove", SUBSYSTEM=="block", KERNEL=="loop*|nvme*|sd*|vd*|xvd*|pmem*|mmcblk*|dasd*|nbd*", OPTIONS+="watch"
diff --git a/semaphoreci/gcc-compilation.sh b/semaphoreci/gcc-compilation.sh
new file mode 100755 (executable)
index 0000000..0e0c837
--- /dev/null
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -ex
+
+meson build -Dtests=unsafe -Dsplit-usr=true -Dslow-tests=true
+ninja -C build
+ninja -C build test
+DESTDIR=/var/tmp/inst1 ninja -C build install
diff --git a/semaphoreci/setup.sh b/semaphoreci/setup.sh
new file mode 100755 (executable)
index 0000000..d9a7b50
--- /dev/null
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -ex
+
+sudo add-apt-repository ppa:upstream-systemd-ci/systemd-ci -y
+sudo rm -rf /etc/apt/sources.list.d/beineri* /etc/apt/sources.list.d/google-chrome* /etc/apt/sources.list.d/heroku* /etc/apt/sources.list.d/mongodb* /etc/apt/sources.list.d/webupd8team* /etc/apt/sources.list.d/rwky* /etc/apt/sources.list.d/rethinkdb* /etc/apt/sources.list.d/cassandra* /etc/apt/sources.list.d/cwchien* /etc/apt/sources.list.d/rabbitmq* /etc/apt/sources.list.d/docker* /home/runner/{.npm,.phpbrew,.phpunit,.kerl,.kiex,.lein,.nvm,.npm,.phpbrew,.rbenv}
+sudo bash -c "echo 'deb-src http://de.archive.ubuntu.com/ubuntu/ xenial main restricted universe multiverse' >>/etc/apt/sources.list"
+sudo apt-get update -qq
+sudo apt-get build-dep systemd -y
+sudo apt-get install --force-yes -y util-linux libmount-dev libblkid-dev liblzma-dev libqrencode-dev libmicrohttpd-dev iptables-dev liblz4-dev libcurl4-gnutls-dev unifont clang-3.6 libasan0 itstool kbd cryptsetup-bin net-tools isc-dhcp-client iputils-ping strace qemu-system-x86 linux-image-virtual mount libgpg-error-dev libxkbcommon-dev python-lxml python3-lxml python3-pip libcap-dev
+# curl -s https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+# sudo add-apt-repository -y 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty main'
+# sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+sudo apt-get update
+sudo apt-get install --force-yes -y gettext python3-evdev python3-pyparsing libmount-dev
+# sudo apt-get install -y clang-6.0
+sudo sh -c 'echo 01010101010101010101010101010101 >/etc/machine-id'
+sudo mount -t tmpfs none /tmp
+test -d /run/mount || sudo mkdir /run/mount
+sudo adduser --system --no-create-home nfsnobody
+sudo rm -f /etc/mtab
+git clone https://github.com/ninja-build/ninja
+cd ninja
+./configure.py --bootstrap
+sudo cp ninja /usr/bin/
+cd ..
+pip3 install --user 'meson == 0.46.1'
index 3c732b712db8a8d48effa821d1a38c9f39546145..a007ed1da47021777d412a4168a204089d105307 100644 (file)
@@ -485,24 +485,24 @@ static bool syscall_names_in_filter(Set *s, bool whitelist, const SyscallFilterS
         const char *syscall;
 
         NULSTR_FOREACH(syscall, f->value) {
-                bool b;
+                int id;
 
                 if (syscall[0] == '@') {
                         const SyscallFilterSet *g;
-                        assert_se(g = syscall_filter_set_find(syscall));
-                        b = syscall_names_in_filter(s, whitelist, g);
-                } else {
-                        int id;
 
-                        /* Let's see if the system call actually exists on this platform, before complaining */
-                        id = seccomp_syscall_resolve_name(syscall);
-                        if (id < 0)
-                                continue;
+                        assert_se(g = syscall_filter_set_find(syscall));
+                        if (syscall_names_in_filter(s, whitelist, g))
+                                return true; /* bad! */
 
-                        b = set_contains(s, syscall);
+                        continue;
                 }
 
-                if (whitelist == b) {
+                /* Let's see if the system call actually exists on this platform, before complaining */
+                id = seccomp_syscall_resolve_name(syscall);
+                if (id < 0)
+                        continue;
+
+                if (set_contains(s, syscall) == whitelist) {
                         log_debug("Offending syscall filter item: %s", syscall);
                         return true; /* bad! */
                 }
index f2e33d22656389459f669d2015ef77ca351182e1..66e9e0046b959794c97d5930bfca692b4f541d9f 100644 (file)
@@ -888,7 +888,8 @@ void internal_hashmap_clear(HashmapBase *h, free_func_t default_free_key, free_f
                  * themselves from our hash table a second time, the entry is already gone. */
 
                 while (internal_hashmap_size(h) > 0) {
-                        void *v, *k;
+                        void *k = NULL;
+                        void *v;
 
                         v = internal_hashmap_first_key_and_value(h, true, &k);
 
@@ -1515,8 +1516,11 @@ void *internal_hashmap_first_key_and_value(HashmapBase *h, bool remove, void **r
         unsigned idx;
 
         idx = find_first_entry(h);
-        if (idx == IDX_NIL)
+        if (idx == IDX_NIL) {
+                if (ret_key)
+                        *ret_key = NULL;
                 return NULL;
+        }
 
         e = bucket_at(h, idx);
         key = (void*) e->key;
index 59a8cd2c60892f43b5791f781b0f3f96955053da..80ef13fd3ea0f7f450b6262c9352971ed54c5485 100644 (file)
 #endif
 
 /* netdevice.h */
+#ifndef NET_ADDR_PERM
+#define NET_ADDR_PERM 0
+#endif
+
 #ifndef NET_ADDR_RANDOM
 #define NET_ADDR_RANDOM 1
 #endif
 
+#ifndef NET_ADDR_STOLEN
+#define NET_ADDR_STOLEN 2
+#endif
+
+#ifndef NET_ADDR_SET
+#define NET_ADDR_SET 3
+#endif
+
 #ifndef NET_NAME_UNKNOWN
 #define NET_NAME_UNKNOWN 0
 #endif
index f009d37d4c6f1a9a03f8c14557a3478a98eccb3c..dc33d660674aeb51fea51b27005dac91cf653a40 100644 (file)
@@ -174,12 +174,21 @@ static inline void *mempset(void *s, int c, size_t n) {
 }
 
 static inline void _reset_errno_(int *saved_errno) {
+        if (*saved_errno < 0) /* Invalidated by UNPROTECT_ERRNO? */
+                return;
+
         errno = *saved_errno;
 }
 
 #define PROTECT_ERRNO                                                   \
         _cleanup_(_reset_errno_) _unused_ int _saved_errno_ = errno
 
+#define UNPROTECT_ERRNO                         \
+        do {                                    \
+                errno = _saved_errno_;          \
+                _saved_errno_ = -1;             \
+        } while (false)
+
 static inline int negative_errno(void) {
         /* This helper should be used to shut up gcc if you know 'errno' is
          * negative. Instead of "return -errno;", use "return negative_errno();"
index 9c0ae5ace1da8c8eca156e8c422b08028e5e2914..2140151844e7e2615c0ab56876cb4e4fe053f6a6 100644 (file)
@@ -194,9 +194,7 @@ if have_gnu_efi
                                    '-j', '.data',
                                    '-j', '.dynamic',
                                    '-j', '.dynsym',
-                                   '-j', '.rel',
-                                   '-j', '.rela',
-                                   '-j', '.reloc']
+                                   '-j', '.rel*']
                                   + efi_format +
                                   ['@INPUT@', '@OUTPUT@'],
                         install : true,
index 6db13ab08fa8becb9b81b1009c4f61c1da925281..6a8373920eac1d66ed01197ae4d52dee4def9107 100644 (file)
@@ -578,10 +578,13 @@ static void automount_enter_waiting(Automount *a) {
                 goto fail;
         }
 
-        if (pipe2(p, O_NONBLOCK|O_CLOEXEC) < 0) {
+        if (pipe2(p, O_CLOEXEC) < 0) {
                 r = -errno;
                 goto fail;
         }
+        r = fd_nonblock(p[0], true);
+        if (r < 0)
+                goto fail;
 
         xsprintf(options, "fd=%i,pgrp="PID_FMT",minproto=5,maxproto=5,direct", p[1], getpgrp());
         xsprintf(name, "systemd-"PID_FMT, getpid_cached());
index ec61ea2772f8651ef7389fc9409b3ed6f17c2a63..0904cc09c020e8ec536d2d9c30568d365234601f 100644 (file)
@@ -320,29 +320,35 @@ static int bus_service_set_transient_property(
                 if (r < 0)
                         return r;
 
-                n = path_make_absolute(v, u->manager->prefix[EXEC_DIRECTORY_RUNTIME]);
-                if (!n)
-                        return -ENOMEM;
+                if (!isempty(v)) {
+                        n = path_make_absolute(v, u->manager->prefix[EXEC_DIRECTORY_RUNTIME]);
+                        if (!n)
+                                return -ENOMEM;
 
-                path_simplify(n, true);
+                        path_simplify(n, true);
 
-                if (!path_is_normalized(n))
-                        return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "PIDFile= path '%s' is not valid", n);
+                        if (!path_is_normalized(n))
+                                return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "PIDFile= path '%s' is not valid", n);
 
-                e = path_startswith(n, "/var/run/");
-                if (e) {
-                        char *z;
+                        e = path_startswith(n, "/var/run/");
+                        if (e) {
+                                char *z;
 
-                        z = strjoin("/run/", e);
-                        if (!z)
-                                return log_oom();
+                                z = strjoin("/run/", e);
+                                if (!z)
+                                        return log_oom();
 
-                        if (!UNIT_WRITE_FLAGS_NOOP(flags))
-                                log_unit_notice(u, "Transient unit's PIDFile= property references path below legacy directory /var/run, updating %s → %s; please update client accordingly.", n, z);
+                                if (!UNIT_WRITE_FLAGS_NOOP(flags))
+                                        log_unit_notice(u, "Transient unit's PIDFile= property references path below legacy directory /var/run, updating %s → %s; please update client accordingly.", n, z);
 
-                        free_and_replace(s->pid_file, z);
-                } else
+                                free_and_replace(n, z);
+                        }
+                }
+
+                if (!UNIT_WRITE_FLAGS_NOOP(flags)) {
                         free_and_replace(s->pid_file, n);
+                        unit_write_settingf(u, flags, name, "%s=%s", name, strempty(s->pid_file));
+                }
 
                 return 1;
         }
index cc55bd01b8ee2879395db80e638318ccf62596d9..59bb9d2162c610a037d3f94f4ff7149c5d58ab6d 100644 (file)
@@ -151,6 +151,8 @@ void job_uninstall(Job *j) {
 
         unit_add_to_gc_queue(j->unit);
 
+        unit_add_to_dbus_queue(j->unit); /* The Job property of the unit has changed now */
+
         hashmap_remove_value(j->manager->jobs, UINT32_TO_PTR(j->id), j);
         j->installed = false;
 }
index 159e8d5050857f58288245b5c3cf837e7a9ed171..44f00a30460b10ae166969c7448fa9157be42248 100644 (file)
@@ -4254,6 +4254,12 @@ int config_parse_pid_file(
         assert(rvalue);
         assert(u);
 
+        if (isempty(rvalue)) {
+                /* An empty assignment removes already set value. */
+                *s = mfree(*s);
+                return 0;
+        }
+
         r = unit_full_printf(u, rvalue, &k);
         if (r < 0) {
                 log_syntax(unit, LOG_ERR, filename, line, r, "Failed to resolve unit specifiers in '%s', ignoring: %m", rvalue);
index 9ccad5ebfe8f8ff9a93f6b9658b49b013ee8d6f7..d9e7f573ba2612436711e11397849cf18273419f 100644 (file)
@@ -43,7 +43,7 @@ OrderWithRequires(postun): systemd \
 %systemd_post() \
 if [ $1 -eq 1 ] ; then \
         # Initial installation \
-        systemctl --no-reload preset %{?*} &>/dev/null || : \
+        systemctl --no-reload preset %{?*} >/dev/null 2>&1 || : \
 fi \
 %{nil}
 
@@ -52,14 +52,14 @@ fi \
 %systemd_preun() \
 if [ $1 -eq 0 ] ; then \
         # Package removal, not upgrade \
-        systemctl --no-reload disable --now %{?*} &>/dev/null || : \
+        systemctl --no-reload disable --now %{?*} >/dev/null 2>&1 || : \
 fi \
 %{nil}
 
 %systemd_user_preun() \
 if [ $1 -eq 0 ] ; then \
         # Package removal, not upgrade \
-        systemctl --global disable %{?*} &>/dev/null || : \
+        systemctl --global disable %{?*} >/dev/null 2>&1 || : \
 fi \
 %{nil}
 
@@ -70,7 +70,7 @@ fi \
 %systemd_postun_with_restart() \
 if [ $1 -ge 1 ] ; then \
         # Package upgrade, not uninstall \
-        systemctl try-restart %{?*} &>/dev/null || : \
+        systemctl try-restart %{?*} >/dev/null 2>&1 || : \
 fi \
 %{nil}
 
@@ -84,16 +84,16 @@ fi \
 
 # Deprecated. Use %tmpfiles_create_package instead
 %tmpfiles_create() \
-systemd-tmpfiles --create %{?*} &>/dev/null || : \
+systemd-tmpfiles --create %{?*} >/dev/null 2>&1 || : \
 %{nil}
 
 # Deprecated. Use %sysusers_create_package instead
 %sysusers_create() \
-systemd-sysusers %{?*} &>/dev/null || : \
+systemd-sysusers %{?*} >/dev/null 2>&1 || : \
 %{nil}
 
 %sysusers_create_inline() \
-systemd-sysusers - <<SYSTEMD_INLINE_EOF &>/dev/null || : \
+systemd-sysusers - <<SYSTEMD_INLINE_EOF >/dev/null 2>&1 || : \
 %{?*} \
 SYSTEMD_INLINE_EOF \
 %{nil}
@@ -112,7 +112,7 @@ SYSTEMD_INLINE_EOF \
 #   %files
 #   %{_sysusersdir}/%{name}.conf
 %sysusers_create_package() \
-systemd-sysusers --replace=%_sysusersdir/%1.conf - <<SYSTEMD_INLINE_EOF &>/dev/null || : \
+systemd-sysusers --replace=%_sysusersdir/%1.conf - <<SYSTEMD_INLINE_EOF >/dev/null 2>&1 || : \
 %(cat %2) \
 SYSTEMD_INLINE_EOF \
 %{nil}
@@ -131,15 +131,15 @@ SYSTEMD_INLINE_EOF \
 #   %files
 #   %{_tmpfilesdir}/%{name}.conf
 %tmpfiles_create_package() \
-systemd-tmpfiles --replace=%_tmpfilesdir/%1.conf --create - <<SYSTEMD_INLINE_EOF &>/dev/null || : \
+systemd-tmpfiles --replace=%_tmpfilesdir/%1.conf --create - <<SYSTEMD_INLINE_EOF >/dev/null 2>&1 || : \
 %(cat %2) \
 SYSTEMD_INLINE_EOF \
 %{nil}
 
 %sysctl_apply() \
-@rootlibexecdir@/systemd-sysctl %{?*} &>/dev/null || : \
+@rootlibexecdir@/systemd-sysctl %{?*} >/dev/null 2>&1 || : \
 %{nil}
 
 %binfmt_apply() \
-@rootlibexecdir@/systemd-binfmt %{?*} &>/dev/null || : \
+@rootlibexecdir@/systemd-binfmt %{?*} >/dev/null 2>&1 || : \
 %{nil}
index 6086531bab7a624617dd5a56aaabfb6bc3089810..fc6f89f85b928ba44e74b466826d3e577a4193ad 100644 (file)
@@ -587,6 +587,7 @@ static char** sanitize_environment(char **l) {
                         "MAINPID",
                         "MANAGERPID",
                         "NOTIFY_SOCKET",
+                        "PIDFILE",
                         "REMOTE_ADDR",
                         "REMOTE_PORT",
                         "SERVICE_RESULT",
index be02e05f09ac100f2f43cc34da38bed370939c97..8da818beeee685b8991a55f4621165ac1f1cc6c6 100644 (file)
@@ -101,20 +101,6 @@ static bool mount_is_bind(const MountParameters *p) {
         return false;
 }
 
-static bool mount_is_auto(const MountParameters *p) {
-        assert(p);
-
-        return !fstab_test_option(p->options, "noauto\0");
-}
-
-static bool mount_is_automount(const MountParameters *p) {
-        assert(p);
-
-        return fstab_test_option(p->options,
-                                 "comment=systemd.automount\0"
-                                 "x-systemd.automount\0");
-}
-
 static bool mount_is_bound_to_device(const Mount *m) {
         const MountParameters *p;
 
@@ -338,7 +324,6 @@ static int mount_add_mount_dependencies(Mount *m) {
 }
 
 static int mount_add_device_dependencies(Mount *m) {
-        bool device_wants_mount;
         UnitDependencyMask mask;
         MountParameters *p;
         UnitDependency dep;
@@ -368,9 +353,6 @@ static int mount_add_device_dependencies(Mount *m) {
         if (path_equal(m->where, "/"))
                 return 0;
 
-        device_wants_mount =
-                mount_is_auto(p) && !mount_is_automount(p) && MANAGER_IS_SYSTEM(UNIT(m)->manager);
-
         /* Mount units from /proc/self/mountinfo are not bound to devices
          * by default since they're subject to races when devices are
          * unplugged. But the user can still force this dep with an
@@ -381,7 +363,7 @@ static int mount_add_device_dependencies(Mount *m) {
         /* We always use 'what' from /proc/self/mountinfo if mounted */
         mask = m->from_proc_self_mountinfo ? UNIT_DEPENDENCY_MOUNTINFO_IMPLICIT : UNIT_DEPENDENCY_FILE;
 
-        r = unit_add_node_dependency(UNIT(m), p->what, device_wants_mount, dep, mask);
+        r = unit_add_node_dependency(UNIT(m), p->what, false, dep, mask);
         if (r < 0)
                 return r;
 
@@ -764,7 +746,7 @@ static void mount_dump(Unit *u, FILE *f, const char *prefix) {
                 "%sSloppyOptions: %s\n"
                 "%sLazyUnmount: %s\n"
                 "%sForceUnmount: %s\n"
-                "%sTimoutSec: %s\n",
+                "%sTimeoutSec: %s\n",
                 prefix, mount_state_to_string(m->state),
                 prefix, mount_result_to_string(m->result),
                 prefix, m->where,
index 324dcf2311081f3c6023ea35207aa3f97c259f84..fd9a809b3eba738112f1e93cf9ca0df8246c8c9b 100644 (file)
@@ -1458,7 +1458,7 @@ static int service_spawn(
         if (r < 0)
                 return r;
 
-        our_env = new0(char*, 9);
+        our_env = new0(char*, 10);
         if (!our_env)
                 return -ENOMEM;
 
@@ -1474,6 +1474,10 @@ static int service_spawn(
                 if (asprintf(our_env + n_env++, "MANAGERPID="PID_FMT, getpid_cached()) < 0)
                         return -ENOMEM;
 
+        if (s->pid_file)
+                if (asprintf(our_env + n_env++, "PIDFILE=%s", s->pid_file) < 0)
+                        return -ENOMEM;
+
         if (s->socket_fd >= 0) {
                 union sockaddr_union sa;
                 socklen_t salen = sizeof(sa);
index 24b14fbcd63759791cebea6882e3f1d1df1cbd10..f4888ff45016392090628d8b90e08819ad3c0c68 100644 (file)
@@ -1895,7 +1895,7 @@ int unit_reload(Unit *u) {
 
         state = unit_active_state(u);
         if (state == UNIT_RELOADING)
-                return -EALREADY;
+                return -EAGAIN;
 
         if (state != UNIT_ACTIVE) {
                 log_unit_warning(u, "Unit cannot be reloaded because it is inactive.");
index 8759a26148093c45aa0c1f56df94a5b26feb870c..ea18e84f31a56015ee16116691b4238925e13aad 100644 (file)
@@ -287,10 +287,6 @@ static int create_disk(
                 return log_error_errno(r, "Failed to write unit file %s: %m", n);
 
         if (!noauto) {
-                r = generator_add_symlink(arg_dest, d, "wants", n);
-                if (r < 0)
-                        return r;
-
                 r = generator_add_symlink(arg_dest,
                                           netdev ? "remote-cryptsetup.target" : "cryptsetup.target",
                                           nofail ? "wants" : "requires", n);
index 360628fe440a753fbd59f61b1ae873f5e9976bbd..7db03b291916524cd30ec9456cf154f18e54b2ca 100644 (file)
@@ -291,7 +291,7 @@ int curl_glue_make(CURL **ret, const char *url, void *userdata) {
         if (curl_easy_setopt(c, CURLOPT_FOLLOWLOCATION, 1L) != CURLE_OK)
                 return -EIO;
 
-        *ret = c;
+        *ret = TAKE_PTR(c);
         return 0;
 }
 
index a44e0a7eda9e305b4f6290cee36a4d89950ccd68..6881bd627f30453af52357621ddb07fefced6c7b 100644 (file)
@@ -537,7 +537,7 @@ int pull_job_new(PullJob **ret, const char *url, CurlGlue *glue, void *userdata)
         assert(ret);
 
         u = strdup(url);
-        if (u)
+        if (!u)
                 return -ENOMEM;
 
         j = new(PullJob, 1);
index 3556a101bf262a3ea29113c57fd4499a86e2c3b4..4062f12c2dfc574eae5d602602d180f29d8e5252 100644 (file)
@@ -46,7 +46,8 @@ typedef struct CatalogHeader {
 
 typedef struct CatalogItem {
         sd_id128_t id;
-        char language[32];
+        char language[32]; /* One byte is used for termination, so the maximum allowed
+                            * length of the string is actually 31 bytes. */
         le64_t offset;
 } CatalogItem;
 
@@ -556,25 +557,44 @@ static const char *find_id(void *p, sd_id128_t id) {
         const char *loc;
 
         loc = setlocale(LC_MESSAGES, NULL);
-        if (loc && loc[0] && !streq(loc, "C") && !streq(loc, "POSIX")) {
-                strncpy(key.language, loc, sizeof(key.language));
-                key.language[strcspn(key.language, ".@")] = 0;
-
-                f = bsearch(&key, (const uint8_t*) p + le64toh(h->header_size), le64toh(h->n_items), le64toh(h->catalog_item_size), (comparison_fn_t) catalog_compare_func);
-                if (!f) {
-                        char *e;
-
-                        e = strchr(key.language, '_');
-                        if (e) {
-                                *e = 0;
-                                f = bsearch(&key, (const uint8_t*) p + le64toh(h->header_size), le64toh(h->n_items), le64toh(h->catalog_item_size), (comparison_fn_t) catalog_compare_func);
+        if (!isempty(loc) && !STR_IN_SET(loc, "C", "POSIX")) {
+                size_t len;
+
+                len = strcspn(loc, ".@");
+                if (len > sizeof(key.language) - 1)
+                        log_debug("LC_MESSAGES value too long, ignoring: \"%.*s\"", (int) len, loc);
+                else {
+                        strncpy(key.language, loc, len);
+                        key.language[len] = '\0';
+
+                        f = bsearch(&key,
+                                    (const uint8_t*) p + le64toh(h->header_size),
+                                    le64toh(h->n_items),
+                                    le64toh(h->catalog_item_size),
+                                    (comparison_fn_t) catalog_compare_func);
+                        if (!f) {
+                                char *e;
+
+                                e = strchr(key.language, '_');
+                                if (e) {
+                                        *e = 0;
+                                        f = bsearch(&key,
+                                                    (const uint8_t*) p + le64toh(h->header_size),
+                                                    le64toh(h->n_items),
+                                                    le64toh(h->catalog_item_size),
+                                                    (comparison_fn_t) catalog_compare_func);
+                                }
                         }
                 }
         }
 
         if (!f) {
                 zero(key.language);
-                f = bsearch(&key, (const uint8_t*) p + le64toh(h->header_size), le64toh(h->n_items), le64toh(h->catalog_item_size), (comparison_fn_t) catalog_compare_func);
+                f = bsearch(&key,
+                            (const uint8_t*) p + le64toh(h->header_size),
+                            le64toh(h->n_items),
+                            le64toh(h->catalog_item_size),
+                            (comparison_fn_t) catalog_compare_func);
         }
 
         if (!f)
index e48260206f8fd4e7011cb32181365fab6a374191..d68ce3894b3d1a55312831a48fad462d0563ae75 100644 (file)
@@ -59,16 +59,20 @@ struct ObjectHeader {
         uint8_t payload[];
 } _packed_;
 
-struct DataObject {
-        ObjectHeader object;
-        le64_t hash;
-        le64_t next_hash_offset;
-        le64_t next_field_offset;
-        le64_t entry_offset; /* the first array entry we store inline */
-        le64_t entry_array_offset;
-        le64_t n_entries;
-        uint8_t payload[];
-} _packed_;
+#define DataObject__contents {                                          \
+        ObjectHeader object;                                            \
+        le64_t hash;                                                    \
+        le64_t next_hash_offset;                                        \
+        le64_t next_field_offset;                                       \
+        le64_t entry_offset; /* the first array entry we store inline */ \
+        le64_t entry_array_offset;                                      \
+        le64_t n_entries;                                               \
+        uint8_t payload[];                                              \
+        }
+
+struct DataObject DataObject__contents;
+struct DataObject__packed DataObject__contents _packed_;
+assert_cc(sizeof(struct DataObject) == sizeof(struct DataObject__packed));
 
 struct FieldObject {
         ObjectHeader object;
@@ -83,15 +87,20 @@ struct EntryItem {
         le64_t hash;
 } _packed_;
 
-struct EntryObject {
-        ObjectHeader object;
-        le64_t seqnum;
-        le64_t realtime;
-        le64_t monotonic;
-        sd_id128_t boot_id;
-        le64_t xor_hash;
-        EntryItem items[];
-} _packed_;
+#define EntryObject__contents { \
+        ObjectHeader object;    \
+        le64_t seqnum;          \
+        le64_t realtime;        \
+        le64_t monotonic;       \
+        sd_id128_t boot_id;     \
+        le64_t xor_hash;        \
+        EntryItem items[];      \
+        }
+
+struct EntryObject EntryObject__contents;
+struct EntryObject__packed EntryObject__contents _packed_;
+assert_cc(sizeof(struct EntryObject) == sizeof(struct EntryObject__packed));
+
 
 struct HashItem {
         le64_t head_hash_offset;
@@ -166,40 +175,43 @@ enum {
 
 #define HEADER_SIGNATURE ((char[]) { 'L', 'P', 'K', 'S', 'H', 'H', 'R', 'H' })
 
-struct Header {
-        uint8_t signature[8]; /* "LPKSHHRH" */
-        le32_t compatible_flags;
-        le32_t incompatible_flags;
-        uint8_t state;
-        uint8_t reserved[7];
-        sd_id128_t file_id;
-        sd_id128_t machine_id;
-        sd_id128_t boot_id;    /* last writer */
-        sd_id128_t seqnum_id;
-        le64_t header_size;
-        le64_t arena_size;
-        le64_t data_hash_table_offset;
-        le64_t data_hash_table_size;
-        le64_t field_hash_table_offset;
-        le64_t field_hash_table_size;
-        le64_t tail_object_offset;
-        le64_t n_objects;
-        le64_t n_entries;
-        le64_t tail_entry_seqnum;
-        le64_t head_entry_seqnum;
-        le64_t entry_array_offset;
-        le64_t head_entry_realtime;
-        le64_t tail_entry_realtime;
-        le64_t tail_entry_monotonic;
-        /* Added in 187 */
-        le64_t n_data;
-        le64_t n_fields;
-        /* Added in 189 */
-        le64_t n_tags;
-        le64_t n_entry_arrays;
-
-        /* Size: 240 */
-} _packed_;
+#define struct_Header__contents {                       \
+        uint8_t signature[8]; /* "LPKSHHRH" */          \
+        le32_t compatible_flags;                        \
+        le32_t incompatible_flags;                      \
+        uint8_t state;                                  \
+        uint8_t reserved[7];                            \
+        sd_id128_t file_id;                             \
+        sd_id128_t machine_id;                          \
+        sd_id128_t boot_id;    /* last writer */        \
+        sd_id128_t seqnum_id;                           \
+        le64_t header_size;                             \
+        le64_t arena_size;                              \
+        le64_t data_hash_table_offset;                  \
+        le64_t data_hash_table_size;                    \
+        le64_t field_hash_table_offset;                 \
+        le64_t field_hash_table_size;                   \
+        le64_t tail_object_offset;                      \
+        le64_t n_objects;                               \
+        le64_t n_entries;                               \
+        le64_t tail_entry_seqnum;                       \
+        le64_t head_entry_seqnum;                       \
+        le64_t entry_array_offset;                      \
+        le64_t head_entry_realtime;                     \
+        le64_t tail_entry_realtime;                     \
+        le64_t tail_entry_monotonic;                    \
+        /* Added in 187 */                              \
+        le64_t n_data;                                  \
+        le64_t n_fields;                                \
+        /* Added in 189 */                              \
+        le64_t n_tags;                                  \
+        le64_t n_entry_arrays;                          \
+        }
+
+struct Header struct_Header__contents;
+struct Header__packed struct_Header__contents _packed_;
+assert_cc(sizeof(struct Header) == sizeof(struct Header__packed));
+assert_cc(sizeof(struct Header) == 240);
 
 #define FSS_HEADER_SIGNATURE ((char[]) { 'K', 'S', 'H', 'H', 'R', 'H', 'L', 'P' })
 
index 0348e7fa9dabe93ce39f2bddc8c5f1c5300afa8b..a0209caf3a8163417e3eb2f04bf930a77cd09863 100644 (file)
@@ -10,6 +10,7 @@
 #include "alloc-util.h"
 #include "condition.h"
 #include "conf-parser.h"
+#include "device-util.h"
 #include "dhcp-lease-internal.h"
 #include "ether-addr-util.h"
 #include "hexdecoct.h"
@@ -40,31 +41,35 @@ const char *net_get_name(sd_device *device) {
 
 int net_get_unique_predictable_data(sd_device *device, uint64_t *result) {
         size_t l, sz = 0;
-        const char *name = NULL;
+        const char *name;
         int r;
         uint8_t *v;
 
         assert(device);
 
+        /* net_get_name() will return one of the device names based on stable information about the
+         * device. If this is not available, we fall back to using the device name. */
         name = net_get_name(device);
         if (!name)
-                return -ENOENT;
+                (void) sd_device_get_sysname(device, &name);
+        if (!name)
+                return log_device_debug_errno(device, SYNTHETIC_ERRNO(ENODATA),
+                                              "No stable identifying information found");
 
+        log_device_debug(device, "Using \"%s\" as stable identifying information", name);
         l = strlen(name);
         sz = sizeof(sd_id128_t) + l;
         v = newa(uint8_t, sz);
 
-        /* fetch some persistent data unique to this machine */
+        /* Fetch some persistent data unique to this machine */
         r = sd_id128_get_machine((sd_id128_t*) v);
         if (r < 0)
                  return r;
         memcpy(v + sizeof(sd_id128_t), name, l);
 
-        /* Let's hash the machine ID plus the device name. We
-        * use a fixed, but originally randomly created hash
-        * key here. */
+        /* Let's hash the machine ID plus the device name. We use
+         * a fixed, but originally randomly created hash key here. */
         *result = htole64(siphash24(v, sz, HASH_KEY.bytes));
-
         return 0;
 }
 
index cd4435230723d5d46a9f877445f60e4fd6a52de6..66f49ed44ec805656ef5c473a9ad22e810c1a93c 100644 (file)
@@ -63,19 +63,34 @@ struct sd_radv {
         struct sd_radv_opt_dns *dnssl;
 };
 
+#define radv_prefix_opt__contents {             \
+        uint8_t type;                           \
+        uint8_t length;                         \
+        uint8_t prefixlen;                      \
+        uint8_t flags;                          \
+        be32_t valid_lifetime;                  \
+        be32_t preferred_lifetime;              \
+        uint32_t reserved;                      \
+        struct in6_addr in6_addr;               \
+}
+
+struct radv_prefix_opt radv_prefix_opt__contents;
+
+/* We need the opt substructure to be packed, because we use it in send(). But
+ * if we use _packed_, this means that the structure cannot be used directly in
+ * normal code in general, because the fields might not be properly aligned.
+ * But in this particular case, the structure is defined in a way that gives
+ * proper alignment, even without the explicit _packed_ attribute. To appease
+ * the compiler we use the "unpacked" structure, but we also verify that
+ * structure contains no holes, so offsets are the same when _packed_ is used.
+ */
+struct radv_prefix_opt__packed radv_prefix_opt__contents _packed_;
+assert_cc(sizeof(struct radv_prefix_opt) == sizeof(struct radv_prefix_opt__packed));
+
 struct sd_radv_prefix {
         unsigned n_ref;
 
-        struct {
-                uint8_t type;
-                uint8_t length;
-                uint8_t prefixlen;
-                uint8_t flags;
-                be32_t valid_lifetime;
-                be32_t preferred_lifetime;
-                uint32_t reserved;
-                struct in6_addr in6_addr;
-        } _packed_ opt;
+        struct radv_prefix_opt opt;
 
         LIST_FIELDS(struct sd_radv_prefix, prefix);
 
index 30d6455b6fc76344ecdde97a402690e3e5548726..441b4a816f3af989459fc4024378fd0b413c2736 100644 (file)
@@ -1072,7 +1072,7 @@ static int bus_socket_read_message_need(sd_bus *bus, size_t *need) {
 }
 
 static int bus_socket_make_message(sd_bus *bus, size_t size) {
-        sd_bus_message *t;
+        sd_bus_message *t = NULL;
         void *b;
         int r;
 
@@ -1097,7 +1097,9 @@ static int bus_socket_make_message(sd_bus *bus, size_t size) {
                                     bus->fds, bus->n_fds,
                                     NULL,
                                     &t);
-        if (r < 0) {
+        if (r == -EBADMSG)
+                log_debug_errno(r, "Received invalid message from connection %s, dropping.", strna(bus->description));
+        else if (r < 0) {
                 free(b);
                 return r;
         }
@@ -1108,7 +1110,8 @@ static int bus_socket_make_message(sd_bus *bus, size_t size) {
         bus->fds = NULL;
         bus->n_fds = 0;
 
-        bus->rqueue[bus->rqueue_size++] = t;
+        if (t)
+                bus->rqueue[bus->rqueue_size++] = t;
 
         return 1;
 }
index 218210f234b49932f344d64fb49db27bf948e9b6..9e8f0a73f57c2825c084bf54163e5f39a844fa98 100644 (file)
@@ -604,7 +604,13 @@ _public_ int sd_booted(void) {
          * created. This takes place in mount-setup.c, so is
          * guaranteed to happen very early during boot. */
 
-        return laccess("/run/systemd/system/", F_OK) >= 0;
+        if (laccess("/run/systemd/system/", F_OK) >= 0)
+                return true;
+
+        if (errno == ENOENT)
+                return false;
+
+        return -errno;
 }
 
 _public_ int sd_watchdog_enabled(int unset_environment, uint64_t *usec) {
index 2daf4ddd57afaca48df312d03c7ee549145917d2..76267a1e748d8f48a50453bd1b9d9feda19347ef 100644 (file)
@@ -712,13 +712,13 @@ int device_copy_properties(sd_device *device_dst, sd_device *device_src) {
         if (r < 0)
                 return r;
 
-        ORDERED_HASHMAP_FOREACH_KEY(property, value, device_src->properties_db, i) {
+        ORDERED_HASHMAP_FOREACH_KEY(value, property, device_src->properties_db, i) {
                 r = device_add_property_aux(device_dst, property, value, true);
                 if (r < 0)
                         return r;
         }
 
-        ORDERED_HASHMAP_FOREACH_KEY(property, value, device_src->properties, i) {
+        ORDERED_HASHMAP_FOREACH_KEY(value, property, device_src->properties, i) {
                 r = device_add_property_aux(device_dst, property, value, false);
                 if (r < 0)
                         return r;
index 287100d5d3d6140e508333959a8c0086897924fe..aa1edaaf3c1eaa4a96b71cde89fd76e2eb2fa931 100644 (file)
@@ -157,6 +157,15 @@ static void test_sd_device_monitor_filter_remove(sd_device *device) {
         assert_se(sd_event_loop(sd_device_monitor_get_event(monitor_client)) == 100);
 }
 
+static void test_device_copy_properties(sd_device *device) {
+        _cleanup_(sd_device_unrefp) sd_device *copy = NULL;
+
+        assert_se(device_shallow_clone(device, &copy) >= 0);
+        assert_se(device_copy_properties(copy, device) >= 0);
+
+        test_send_receive_one(copy, false, false, false);
+}
+
 int main(int argc, char *argv[]) {
         _cleanup_(sd_device_unrefp) sd_device *loopback = NULL, *sda = NULL;
         int r;
@@ -186,6 +195,7 @@ int main(int argc, char *argv[]) {
 
         test_subsystem_filter(loopback);
         test_sd_device_monitor_filter_remove(loopback);
+        test_device_copy_properties(loopback);
 
         r = sd_device_new_from_subsystem_sysname(&sda, "block", "sda");
         if (r < 0) {
index b81786a64d42c08acb6adb3c071ed44fbb6a22ef..233944c0782013cc6d8764f574c2a11caa28d8fe 100644 (file)
@@ -240,7 +240,7 @@ static int trie_search_f(sd_hwdb *hwdb, const char *search) {
                 size_t p = 0;
 
                 if (node->prefix_off) {
-                        uint8_t c;
+                        char c;
 
                         for (; (c = trie_string(hwdb, node->prefix_off)[p]); p++) {
                                 if (IN_SET(c, '*', '?', '['))
index 8ab498fdc297af7e0c022b9fa332f71eb1f78540..b9ea370ec009ab9ccdf95c4440ddc2a8b9e93d9e 100644 (file)
@@ -790,7 +790,9 @@ static int method_create_session(sd_bus_message *message, void *userdata, sd_bus
                 goto fail;
 
         session_set_user(session, user);
-        session_set_leader(session, leader);
+        r = session_set_leader(session, leader);
+        if (r < 0)
+                goto fail;
 
         session->type = t;
         session->class = c;
index 1e7cfc64d47ad62ff2b9fd782b04a5695f6628bb..30f2e26a1e8cf89f897628d4ca6cad6c0b1fd502 100644 (file)
@@ -1739,7 +1739,7 @@ static int start_machine(int argc, char *argv[], void *userdata) {
                 if (r < 0)
                         return r;
                 if (r == 0) {
-                        log_error("Machine image '%s' does not exist.", argv[1]);
+                        log_error("Machine image '%s' does not exist.", argv[i]);
                         return -ENXIO;
                 }
 
@@ -1811,7 +1811,7 @@ static int enable_machine(int argc, char *argv[], void *userdata) {
                 if (r < 0)
                         return r;
                 if (r == 0) {
-                        log_error("Machine image '%s' does not exist.", argv[1]);
+                        log_error("Machine image '%s' does not exist.", argv[i]);
                         return -ENXIO;
                 }
 
index fa7f9b8d74ac2e54a0ea61a2265c0024266442c3..3cdbd9e37e776ae1dc4757fe9d08a2cdeed33a35 100644 (file)
@@ -5,6 +5,7 @@
 #include "alloc-util.h"
 #include "conf-parser.h"
 #include "firewall-util.h"
+#include "missing_network.h"
 #include "netlink-util.h"
 #include "networkd-address.h"
 #include "networkd-manager.h"
index 8f9103f1466d2a54bafa66021aea3214bb88b490..8377623da48168b6c820570591eebe3c89dec7eb 100644 (file)
@@ -9,6 +9,7 @@
 
 #include "alloc-util.h"
 #include "conf-parser.h"
+#include "missing_if_bridge.h"
 #include "netlink-util.h"
 #include "networkd-brvlan.h"
 #include "networkd-link.h"
index f9df26d75e08f029d4f41062dd2ae5f36cafa243..c1fba03f9fe3457e000befdb6b347181494719d3 100644 (file)
@@ -11,6 +11,7 @@
 
 #include "hashmap.h"
 #include "hostname-util.h"
+#include "missing_network.h"
 #include "network-internal.h"
 #include "networkd-link.h"
 #include "networkd-manager.h"
index 736373ae347d4bc71b97c29193dcdc804ffe9220..22392d70bc4790ca1e32851c03cb395dd3b45059 100644 (file)
@@ -1763,6 +1763,84 @@ bool link_has_carrier(Link *link) {
         return false;
 }
 
+static int link_address_genmode_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
+        int r;
+
+        assert(link);
+
+        if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
+                return 1;
+
+        r = sd_netlink_message_get_errno(m);
+        if (r < 0)
+                log_link_warning_errno(link, r, "Could not set address genmode for interface: %m");
+
+        return 1;
+}
+
+static int link_configure_addrgen_mode(Link *link) {
+        _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
+        uint8_t ipv6ll_mode;
+        int r;
+
+        assert(link);
+        assert(link->network);
+        assert(link->manager);
+        assert(link->manager->rtnl);
+
+        log_link_debug(link, "Setting address genmode for link");
+
+        r = sd_rtnl_message_new_link(link->manager->rtnl, &req, RTM_SETLINK, link->ifindex);
+        if (r < 0)
+                return log_link_error_errno(link, r, "Could not allocate RTM_SETLINK message: %m");
+
+        r = sd_netlink_message_open_container(req, IFLA_AF_SPEC);
+        if (r < 0)
+                return log_link_error_errno(link, r, "Could not open IFLA_AF_SPEC container: %m");
+
+        r = sd_netlink_message_open_container(req, AF_INET6);
+        if (r < 0)
+                return log_link_error_errno(link, r, "Could not open AF_INET6 container: %m");
+
+        if (!link_ipv6ll_enabled(link))
+                ipv6ll_mode = IN6_ADDR_GEN_MODE_NONE;
+        else {
+                const char *p = NULL;
+                _cleanup_free_ char *stable_secret = NULL;
+
+                p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/stable_secret");
+
+                /* The file may not exist. And event if it exists, when stable_secret is unset,
+                 * then reading the file fails and EIO is returned. */
+                r = read_one_line_file(p, &stable_secret);
+                if (r < 0)
+                        ipv6ll_mode = IN6_ADDR_GEN_MODE_EUI64;
+                else
+                        ipv6ll_mode = IN6_ADDR_GEN_MODE_STABLE_PRIVACY;
+        }
+
+        r = sd_netlink_message_append_u8(req, IFLA_INET6_ADDR_GEN_MODE, ipv6ll_mode);
+        if (r < 0)
+                return log_link_error_errno(link, r, "Could not append IFLA_INET6_ADDR_GEN_MODE: %m");
+
+        r = sd_netlink_message_close_container(req);
+        if (r < 0)
+                return log_link_error_errno(link, r, "Could not close AF_INET6 container: %m");
+
+        r = sd_netlink_message_close_container(req);
+        if (r < 0)
+                return log_link_error_errno(link, r, "Could not close IFLA_AF_SPEC container: %m");
+
+        r = netlink_call_async(link->manager->rtnl, NULL, req, link_address_genmode_handler,
+                               link_netlink_destroy_callback, link);
+        if (r < 0)
+                return log_link_error_errno(link, r, "Could not send rtnetlink message: %m");
+
+        link_ref(link);
+
+        return 0;
+}
+
 static int link_up_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link) {
         int r;
 
@@ -1781,7 +1859,6 @@ static int link_up_handler(sd_netlink *rtnl, sd_netlink_message *m, Link *link)
 
 static int link_up(Link *link) {
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
-        uint8_t ipv6ll_mode;
         int r;
 
         assert(link);
@@ -1812,34 +1889,16 @@ static int link_up(Link *link) {
                         return log_link_error_errno(link, r, "Could not set MAC address: %m");
         }
 
-        r = sd_netlink_message_open_container(req, IFLA_AF_SPEC);
-        if (r < 0)
-                return log_link_error_errno(link, r, "Could not open IFLA_AF_SPEC container: %m");
-
         if (link_ipv6_enabled(link)) {
+                r = sd_netlink_message_open_container(req, IFLA_AF_SPEC);
+                if (r < 0)
+                        return log_link_error_errno(link, r, "Could not open IFLA_AF_SPEC container: %m");
+
                 /* if the kernel lacks ipv6 support setting IFF_UP fails if any ipv6 options are passed */
                 r = sd_netlink_message_open_container(req, AF_INET6);
                 if (r < 0)
                         return log_link_error_errno(link, r, "Could not open AF_INET6 container: %m");
 
-                if (!link_ipv6ll_enabled(link))
-                        ipv6ll_mode = IN6_ADDR_GEN_MODE_NONE;
-                else {
-                        const char *p = NULL;
-                        _cleanup_free_ char *stable_secret = NULL;
-
-                        p = strjoina("/proc/sys/net/ipv6/conf/", link->ifname, "/stable_secret");
-                        r = read_one_line_file(p, &stable_secret);
-
-                        if (r < 0)
-                                ipv6ll_mode = IN6_ADDR_GEN_MODE_EUI64;
-                        else
-                                ipv6ll_mode = IN6_ADDR_GEN_MODE_STABLE_PRIVACY;
-                }
-                r = sd_netlink_message_append_u8(req, IFLA_INET6_ADDR_GEN_MODE, ipv6ll_mode);
-                if (r < 0)
-                        return log_link_error_errno(link, r, "Could not append IFLA_INET6_ADDR_GEN_MODE: %m");
-
                 if (!in_addr_is_null(AF_INET6, &link->network->ipv6_token)) {
                         r = sd_netlink_message_append_in6_addr(req, IFLA_INET6_TOKEN, &link->network->ipv6_token.in6);
                         if (r < 0)
@@ -1849,11 +1908,11 @@ static int link_up(Link *link) {
                 r = sd_netlink_message_close_container(req);
                 if (r < 0)
                         return log_link_error_errno(link, r, "Could not close AF_INET6 container: %m");
-        }
 
-        r = sd_netlink_message_close_container(req);
-        if (r < 0)
-                return log_link_error_errno(link, r, "Could not close IFLA_AF_SPEC container: %m");
+                r = sd_netlink_message_close_container(req);
+                if (r < 0)
+                        return log_link_error_errno(link, r, "Could not close IFLA_AF_SPEC container: %m");
+        }
 
         r = netlink_call_async(link->manager->rtnl, NULL, req, link_up_handler,
                                link_netlink_destroy_callback, link);
@@ -2942,6 +3001,12 @@ static int link_configure(Link *link) {
                         return r;
         }
 
+        if (socket_ipv6_is_supported()) {
+                r = link_configure_addrgen_mode(link);
+                if (r < 0)
+                        return r;
+        }
+
         return link_configure_after_setting_mtu(link);
 }
 
index 80bfd2cba1232a9aabb8d736365eb86d73d3589f..e5b8d115551b71f2edb57eb5978087fc1d778544 100644 (file)
@@ -8,6 +8,7 @@
 
 #include "sd-ndisc.h"
 
+#include "missing_network.h"
 #include "networkd-ndisc.h"
 #include "networkd-route.h"
 #include "strv.h"
index 5abc0c91bf29a5f568bcc4d8741af00428326f54..e491351deed28b6ef45ec31c76c726ee724859fd 100644 (file)
@@ -74,6 +74,7 @@ enum nss_status _nss_myhostname_gethostbyname4_r(
         } else {
                 hn = gethostname_malloc();
                 if (!hn) {
+                        UNPROTECT_ERRNO;
                         *errnop = ENOMEM;
                         *h_errnop = NO_RECOVERY;
                         return NSS_STATUS_TRYAGAIN;
@@ -96,6 +97,7 @@ enum nss_status _nss_myhostname_gethostbyname4_r(
         l = strlen(canonical);
         ms = ALIGN(l+1) + ALIGN(sizeof(struct gaih_addrtuple)) * (n_addresses > 0 ? n_addresses : 2);
         if (buflen < ms) {
+                UNPROTECT_ERRNO;
                 *errnop = ERANGE;
                 *h_errnop = NETDB_INTERNAL;
                 return NSS_STATUS_TRYAGAIN;
@@ -186,6 +188,8 @@ static enum nss_status fill_in_hostent(
         assert(errnop);
         assert(h_errnop);
 
+        PROTECT_ERRNO;
+
         alen = FAMILY_ADDRESS_SIZE(af);
 
         for (a = addresses, n = 0, c = 0; n < n_addresses; a++, n++)
@@ -202,6 +206,7 @@ static enum nss_status fill_in_hostent(
                 (c > 0 ? c+1 : 2) * sizeof(char*);
 
         if (buflen < ms) {
+                UNPROTECT_ERRNO;
                 *errnop = ERANGE;
                 *h_errnop = NETDB_INTERNAL;
                 return NSS_STATUS_TRYAGAIN;
@@ -321,6 +326,7 @@ enum nss_status _nss_myhostname_gethostbyname3_r(
                 af = AF_INET;
 
         if (!IN_SET(af, AF_INET, AF_INET6)) {
+                UNPROTECT_ERRNO;
                 *errnop = EAFNOSUPPORT;
                 *h_errnop = NO_DATA;
                 return NSS_STATUS_UNAVAIL;
@@ -343,6 +349,7 @@ enum nss_status _nss_myhostname_gethostbyname3_r(
         } else {
                 hn = gethostname_malloc();
                 if (!hn) {
+                        UNPROTECT_ERRNO;
                         *errnop = ENOMEM;
                         *h_errnop = NO_RECOVERY;
                         return NSS_STATUS_TRYAGAIN;
@@ -362,6 +369,8 @@ enum nss_status _nss_myhostname_gethostbyname3_r(
                 local_address_ipv4 = LOCALADDRESS_IPV4;
         }
 
+        UNPROTECT_ERRNO;
+
         return fill_in_hostent(
                         canonical, additional,
                         af,
@@ -401,12 +410,14 @@ enum nss_status _nss_myhostname_gethostbyaddr2_r(
         assert(h_errnop);
 
         if (!IN_SET(af, AF_INET, AF_INET6)) {
+                UNPROTECT_ERRNO;
                 *errnop = EAFNOSUPPORT;
                 *h_errnop = NO_DATA;
                 return NSS_STATUS_UNAVAIL;
         }
 
         if (len != FAMILY_ADDRESS_SIZE(af)) {
+                UNPROTECT_ERRNO;
                 *errnop = EINVAL;
                 *h_errnop = NO_RECOVERY;
                 return NSS_STATUS_UNAVAIL;
@@ -461,6 +472,7 @@ found:
         if (!canonical || additional_from_hostname) {
                 hn = gethostname_malloc();
                 if (!hn) {
+                        UNPROTECT_ERRNO;
                         *errnop = ENOMEM;
                         *h_errnop = NO_RECOVERY;
                         return NSS_STATUS_TRYAGAIN;
@@ -472,6 +484,7 @@ found:
                         additional = hn;
         }
 
+        UNPROTECT_ERRNO;
         return fill_in_hostent(
                         canonical, additional,
                         af,
index 3d1fc2835331b65835cc56106246455905c52f59..486a658958e96fd5663a126f877a0e3b82790e9d 100644 (file)
@@ -153,6 +153,7 @@ enum nss_status _nss_mymachines_gethostbyname4_r(
         l = strlen(name);
         ms = ALIGN(l+1) + ALIGN(sizeof(struct gaih_addrtuple)) * c;
         if (buflen < ms) {
+                UNPROTECT_ERRNO;
                 *errnop = ERANGE;
                 *h_errnop = NETDB_INTERNAL;
                 return NSS_STATUS_TRYAGAIN;
@@ -227,6 +228,7 @@ enum nss_status _nss_mymachines_gethostbyname4_r(
         return NSS_STATUS_SUCCESS;
 
 fail:
+        UNPROTECT_ERRNO;
         *errnop = -r;
         *h_errnop = NO_DATA;
         return NSS_STATUS_UNAVAIL;
@@ -313,6 +315,7 @@ enum nss_status _nss_mymachines_gethostbyname3_r(
         ms = ALIGN(l+1) + c * ALIGN(alen) + (c+2) * sizeof(char*);
 
         if (buflen < ms) {
+                UNPROTECT_ERRNO;
                 *errnop = ERANGE;
                 *h_errnop = NETDB_INTERNAL;
                 return NSS_STATUS_TRYAGAIN;
@@ -396,6 +399,7 @@ enum nss_status _nss_mymachines_gethostbyname3_r(
         return NSS_STATUS_SUCCESS;
 
 fail:
+        UNPROTECT_ERRNO;
         *errnop = -r;
         *h_errnop = NO_DATA;
         return NSS_STATUS_UNAVAIL;
@@ -484,6 +488,7 @@ enum nss_status _nss_mymachines_getpwnam_r(
 
         l = strlen(name);
         if (buflen < l+1) {
+                UNPROTECT_ERRNO;
                 *errnop = ERANGE;
                 return NSS_STATUS_TRYAGAIN;
         }
@@ -501,6 +506,7 @@ enum nss_status _nss_mymachines_getpwnam_r(
         return NSS_STATUS_SUCCESS;
 
 fail:
+        UNPROTECT_ERRNO;
         *errnop = -r;
         return NSS_STATUS_UNAVAIL;
 }
@@ -564,6 +570,7 @@ enum nss_status _nss_mymachines_getpwuid_r(
                 return NSS_STATUS_NOTFOUND;
 
         if (snprintf(buffer, buflen, "vu-%s-" UID_FMT, machine, (uid_t) mapped) >= (int) buflen) {
+                UNPROTECT_ERRNO;
                 *errnop = ERANGE;
                 return NSS_STATUS_TRYAGAIN;
         }
@@ -579,6 +586,7 @@ enum nss_status _nss_mymachines_getpwuid_r(
         return NSS_STATUS_SUCCESS;
 
 fail:
+        UNPROTECT_ERRNO;
         *errnop = -r;
         return NSS_STATUS_UNAVAIL;
 }
@@ -662,6 +670,7 @@ enum nss_status _nss_mymachines_getgrnam_r(
 
         l = sizeof(char*) + strlen(name) + 1;
         if (buflen < l) {
+                UNPROTECT_ERRNO;
                 *errnop = ERANGE;
                 return NSS_STATUS_TRYAGAIN;
         }
@@ -677,6 +686,7 @@ enum nss_status _nss_mymachines_getgrnam_r(
         return NSS_STATUS_SUCCESS;
 
 fail:
+        UNPROTECT_ERRNO;
         *errnop = -r;
         return NSS_STATUS_UNAVAIL;
 }
@@ -740,12 +750,14 @@ enum nss_status _nss_mymachines_getgrgid_r(
                 return NSS_STATUS_NOTFOUND;
 
         if (buflen < sizeof(char*) + 1) {
+                UNPROTECT_ERRNO;
                 *errnop = ERANGE;
                 return NSS_STATUS_TRYAGAIN;
         }
 
         memzero(buffer, sizeof(char*));
         if (snprintf(buffer + sizeof(char*), buflen - sizeof(char*), "vg-%s-" GID_FMT, machine, (gid_t) mapped) >= (int) buflen) {
+                UNPROTECT_ERRNO;
                 *errnop = ERANGE;
                 return NSS_STATUS_TRYAGAIN;
         }
@@ -758,6 +770,7 @@ enum nss_status _nss_mymachines_getgrgid_r(
         return NSS_STATUS_SUCCESS;
 
 fail:
+        UNPROTECT_ERRNO;
         *errnop = -r;
         return NSS_STATUS_UNAVAIL;
 }
index a28b5d8ba81db5a2bcf52e418649e17efe1d9b04..8370fed07608b30551e0ce3098351a85897826be 100644 (file)
@@ -186,6 +186,7 @@ enum nss_status _nss_resolve_gethostbyname4_r(
         l = strlen(canonical);
         ms = ALIGN(l+1) + ALIGN(sizeof(struct gaih_addrtuple)) * c;
         if (buflen < ms) {
+                UNPROTECT_ERRNO;
                 *errnop = ERANGE;
                 *h_errnop = NETDB_INTERNAL;
                 return NSS_STATUS_TRYAGAIN;
@@ -267,6 +268,7 @@ enum nss_status _nss_resolve_gethostbyname4_r(
         return NSS_STATUS_SUCCESS;
 
 fail:
+        UNPROTECT_ERRNO;
         *errnop = -r;
         *h_errnop = NO_RECOVERY;
         return ret;
@@ -364,6 +366,7 @@ enum nss_status _nss_resolve_gethostbyname3_r(
         ms = ALIGN(l+1) + c * ALIGN(alen) + (c+2) * sizeof(char*);
 
         if (buflen < ms) {
+                UNPROTECT_ERRNO;
                 *errnop = ERANGE;
                 *h_errnop = NETDB_INTERNAL;
                 return NSS_STATUS_TRYAGAIN;
@@ -455,6 +458,7 @@ enum nss_status _nss_resolve_gethostbyname3_r(
         return NSS_STATUS_SUCCESS;
 
 fail:
+        UNPROTECT_ERRNO;
         *errnop = -r;
         *h_errnop = NO_RECOVERY;
         return ret;
@@ -492,12 +496,14 @@ enum nss_status _nss_resolve_gethostbyaddr2_r(
         assert(h_errnop);
 
         if (!IN_SET(af, AF_INET, AF_INET6)) {
+                UNPROTECT_ERRNO;
                 *errnop = EAFNOSUPPORT;
                 *h_errnop = NO_DATA;
                 return NSS_STATUS_UNAVAIL;
         }
 
         if (len != FAMILY_ADDRESS_SIZE(af)) {
+                UNPROTECT_ERRNO;
                 *errnop = EINVAL;
                 *h_errnop = NO_RECOVERY;
                 return NSS_STATUS_UNAVAIL;
@@ -576,6 +582,7 @@ enum nss_status _nss_resolve_gethostbyaddr2_r(
               c * sizeof(char*);        /* pointers to aliases, plus trailing NULL */
 
         if (buflen < ms) {
+                UNPROTECT_ERRNO;
                 *errnop = ERANGE;
                 *h_errnop = NETDB_INTERNAL;
                 return NSS_STATUS_TRYAGAIN;
@@ -636,6 +643,7 @@ enum nss_status _nss_resolve_gethostbyaddr2_r(
         return NSS_STATUS_SUCCESS;
 
 fail:
+        UNPROTECT_ERRNO;
         *errnop = -r;
         *h_errnop = NO_RECOVERY;
         return ret;
index f554828d49a60963544a49b0db70696df983d713..f8db27ae2766d605cb0e535ad10736b67ef71d8b 100644 (file)
@@ -210,6 +210,7 @@ enum nss_status _nss_systemd_getpwnam_r(
 
         l = strlen(name);
         if (buflen < l+1) {
+                UNPROTECT_ERRNO;
                 *errnop = ERANGE;
                 return NSS_STATUS_TRYAGAIN;
         }
@@ -227,6 +228,7 @@ enum nss_status _nss_systemd_getpwnam_r(
         return NSS_STATUS_SUCCESS;
 
 fail:
+        UNPROTECT_ERRNO;
         *errnop = -r;
         return NSS_STATUS_UNAVAIL;
 }
@@ -310,6 +312,7 @@ enum nss_status _nss_systemd_getpwuid_r(
 
         l = strlen(translated) + 1;
         if (buflen < l) {
+                UNPROTECT_ERRNO;
                 *errnop = ERANGE;
                 return NSS_STATUS_TRYAGAIN;
         }
@@ -327,6 +330,7 @@ enum nss_status _nss_systemd_getpwuid_r(
         return NSS_STATUS_SUCCESS;
 
 fail:
+        UNPROTECT_ERRNO;
         *errnop = -r;
         return NSS_STATUS_UNAVAIL;
 }
@@ -408,6 +412,7 @@ enum nss_status _nss_systemd_getgrnam_r(
 
         l = sizeof(char*) + strlen(name) + 1;
         if (buflen < l) {
+                UNPROTECT_ERRNO;
                 *errnop = ERANGE;
                 return NSS_STATUS_TRYAGAIN;
         }
@@ -423,6 +428,7 @@ enum nss_status _nss_systemd_getgrnam_r(
         return NSS_STATUS_SUCCESS;
 
 fail:
+        UNPROTECT_ERRNO;
         *errnop = -r;
         return NSS_STATUS_UNAVAIL;
 }
@@ -506,6 +512,7 @@ enum nss_status _nss_systemd_getgrgid_r(
 
         l = sizeof(char*) + strlen(translated) + 1;
         if (buflen < l) {
+                UNPROTECT_ERRNO;
                 *errnop = ERANGE;
                 return NSS_STATUS_TRYAGAIN;
         }
@@ -521,6 +528,7 @@ enum nss_status _nss_systemd_getgrgid_r(
         return NSS_STATUS_SUCCESS;
 
 fail:
+        UNPROTECT_ERRNO;
         *errnop = -r;
         return NSS_STATUS_UNAVAIL;
 }
@@ -740,6 +748,7 @@ enum nss_status _nss_systemd_getpwent_r(struct passwd *result, char *buffer, siz
         LIST_FOREACH(entries, p, getpwent_data.position) {
                 len = strlen(p->name) + 1;
                 if (buflen < len) {
+                        UNPROTECT_ERRNO;
                         *errnop = ERANGE;
                         ret = NSS_STATUS_TRYAGAIN;
                         goto finalize;
@@ -791,6 +800,7 @@ enum nss_status _nss_systemd_getgrent_r(struct group *result, char *buffer, size
         LIST_FOREACH(entries, p, getgrent_data.position) {
                 len = sizeof(char*) + strlen(p->name) + 1;
                 if (buflen < len) {
+                        UNPROTECT_ERRNO;
                         *errnop = ERANGE;
                         ret = NSS_STATUS_TRYAGAIN;
                         goto finalize;
index 6f0657174cbe264f1e84bf3da226364a9057a4f1..96335145138e93d631437c7d1e1d6c1096efdd47 100644 (file)
@@ -220,10 +220,10 @@ int parse_acl(const char *text, acl_t *acl_access, acl_t *acl_default, bool want
                 char *p;
 
                 p = STARTSWITH_SET(*entry, "default:", "d:");
-                if (!p)
-                        p = *entry;
-
-                r = strv_push(&d, p);
+                if (p)
+                        r = strv_push(&d, p);
+                else
+                        r = strv_push(&a, *entry);
                 if (r < 0)
                         return r;
         }
index 3a46faf769ef3369f156cc2c662560ad4f6fa6cd..d3404870254d6fd1a96f7ce2479bd1f3c4acd7bb 100644 (file)
@@ -1178,7 +1178,6 @@ int dissected_image_decrypt_interactively(
 
 #if HAVE_LIBCRYPTSETUP
 static int deferred_remove(DecryptedPartition *p) {
-
         struct dm_ioctl dm = {
                 .version = {
                         DM_VERSION_MAJOR,
@@ -1199,6 +1198,9 @@ static int deferred_remove(DecryptedPartition *p) {
         if (fd < 0)
                 return -errno;
 
+        if (strlen(p->name) > sizeof(dm.name))
+                return -ENAMETOOLONG;
+
         strncpy(dm.name, p->name, sizeof(dm.name));
 
         if (ioctl(fd, DM_DEV_REMOVE, &dm))
index 23d38fb484be22c90f94d72f89045d38fef14f77..26f905bfaa6c2c39405e95846b7c2e4265458a21 100644 (file)
 #define END_ENTIRE_DEVICE_PATH_SUBTYPE      0xff
 #define EFI_OS_INDICATIONS_BOOT_TO_FW_UI    0x0000000000000001
 
-struct boot_option {
-        uint32_t attr;
-        uint16_t path_len;
-        uint16_t title[];
-} _packed_;
+#define boot_option__contents {                 \
+        uint32_t attr;                          \
+        uint16_t path_len;                      \
+        uint16_t title[];                       \
+        }
+
+struct boot_option boot_option__contents;
+struct boot_option__packed boot_option__contents _packed_;
+assert_cc(offsetof(struct boot_option, title) == offsetof(struct boot_option__packed, title));
+/* sizeof(struct boot_option) != sizeof(struct boot_option__packed), so
+ * the *size* of the structure should not be used anywhere below. */
 
 struct drive_path {
         uint32_t part_nr;
@@ -55,15 +61,19 @@ struct drive_path {
         uint8_t signature_type;
 } _packed_;
 
-struct device_path {
-        uint8_t type;
-        uint8_t sub_type;
-        uint16_t length;
-        union {
-                uint16_t path[0];
-                struct drive_path drive;
-        };
-} _packed_;
+#define device_path__contents {                 \
+        uint8_t type;                           \
+        uint8_t sub_type;                       \
+        uint16_t length;                        \
+        union {                                 \
+                uint16_t path[0];               \
+                struct drive_path drive;        \
+        };                                      \
+        }
+
+struct device_path device_path__contents;
+struct device_path__packed device_path__contents _packed_;
+assert_cc(sizeof(struct device_path) == sizeof(struct device_path__packed));
 
 bool is_efi_boot(void) {
         if (detect_container() > 0)
@@ -354,32 +364,46 @@ int efi_set_variable_string(sd_id128_t vendor, const char *name, const char *v)
         return efi_set_variable(vendor, name, u16, (char16_strlen(u16) + 1) * sizeof(char16_t));
 }
 
-static size_t utf16_size(const uint16_t *s) {
+static ssize_t utf16_size(const uint16_t *s, size_t buf_len_bytes) {
         size_t l = 0;
 
-        while (s[l] > 0)
+        /* Returns the size of the string in bytes without the terminating two zero bytes */
+
+        if (buf_len_bytes % sizeof(uint16_t) != 0)
+                return -EINVAL;
+
+        while (l < buf_len_bytes / sizeof(uint16_t)) {
+                if (s[l] == 0)
+                        return (l + 1) * sizeof(uint16_t);
                 l++;
+        }
 
-        return (l+1) * sizeof(uint16_t);
+        return -EINVAL; /* The terminator was not found */
 }
 
+struct guid {
+        uint32_t u1;
+        uint16_t u2;
+        uint16_t u3;
+        uint8_t u4[8];
+} _packed_;
+
 static void efi_guid_to_id128(const void *guid, sd_id128_t *id128) {
-        struct uuid {
-                uint32_t u1;
-                uint16_t u2;
-                uint16_t u3;
-                uint8_t u4[8];
-        } _packed_;
-        const struct uuid *uuid = guid;
-
-        id128->bytes[0] = (uuid->u1 >> 24) & 0xff;
-        id128->bytes[1] = (uuid->u1 >> 16) & 0xff;
-        id128->bytes[2] = (uuid->u1 >> 8) & 0xff;
-        id128->bytes[3] = (uuid->u1) & 0xff;
-        id128->bytes[4] = (uuid->u2 >> 8) & 0xff;
-        id128->bytes[5] = (uuid->u2) & 0xff;
-        id128->bytes[6] = (uuid->u3 >> 8) & 0xff;
-        id128->bytes[7] = (uuid->u3) & 0xff;
+        uint32_t u1;
+        uint16_t u2, u3;
+        const struct guid *uuid = guid;
+
+        memcpy(&u1, &uuid->u1, sizeof(uint32_t));
+        id128->bytes[0] = (u1 >> 24) & 0xff;
+        id128->bytes[1] = (u1 >> 16) & 0xff;
+        id128->bytes[2] = (u1 >> 8) & 0xff;
+        id128->bytes[3] = u1 & 0xff;
+        memcpy(&u2, &uuid->u2, sizeof(uint16_t));
+        id128->bytes[4] = (u2 >> 8) & 0xff;
+        id128->bytes[5] = u2 & 0xff;
+        memcpy(&u3, &uuid->u3, sizeof(uint16_t));
+        id128->bytes[6] = (u3 >> 8) & 0xff;
+        id128->bytes[7] = u3 & 0xff;
         memcpy(&id128->bytes[8], uuid->u4, sizeof(uuid->u4));
 }
 
@@ -394,7 +418,7 @@ int efi_get_boot_option(
         _cleanup_free_ uint8_t *buf = NULL;
         size_t l;
         struct boot_option *header;
-        size_t title_size;
+        ssize_t title_size;
         _cleanup_free_ char *s = NULL, *p = NULL;
         sd_id128_t p_uuid = SD_ID128_NULL;
         int r;
@@ -406,13 +430,13 @@ int efi_get_boot_option(
         r = efi_get_variable(EFI_VENDOR_GLOBAL, boot_id, NULL, (void **)&buf, &l);
         if (r < 0)
                 return r;
-        if (l < sizeof(struct boot_option))
+        if (l < offsetof(struct boot_option, title))
                 return -ENOENT;
 
         header = (struct boot_option *)buf;
-        title_size = utf16_size(header->title);
-        if (title_size > l - offsetof(struct boot_option, title))
-                return -EINVAL;
+        title_size = utf16_size(header->title, l - offsetof(struct boot_option, title));
+        if (title_size < 0)
+                return title_size;
 
         if (title) {
                 s = utf16_to_utf8(header->title, title_size);
@@ -494,20 +518,14 @@ static void to_utf16(uint16_t *dest, const char *src) {
         dest[i] = '\0';
 }
 
-struct guid {
-        uint32_t u1;
-        uint16_t u2;
-        uint16_t u3;
-        uint8_t u4[8];
-} _packed_;
-
 static void id128_to_efi_guid(sd_id128_t id, void *guid) {
-        struct guid *uuid = guid;
-
-        uuid->u1 = id.bytes[0] << 24 | id.bytes[1] << 16 | id.bytes[2] << 8 | id.bytes[3];
-        uuid->u2 = id.bytes[4] << 8 | id.bytes[5];
-        uuid->u3 = id.bytes[6] << 8 | id.bytes[7];
-        memcpy(uuid->u4, id.bytes+8, sizeof(uuid->u4));
+        struct guid uuid = {
+                .u1 = id.bytes[0] << 24 | id.bytes[1] << 16 | id.bytes[2] << 8 | id.bytes[3],
+                .u2 = id.bytes[4] << 8 | id.bytes[5],
+                .u3 = id.bytes[6] << 8 | id.bytes[7],
+        };
+        memcpy(uuid.u4, id.bytes+8, sizeof(uuid.u4));
+        memcpy(guid, &uuid, sizeof(uuid));
 }
 
 static uint16_t *tilt_slashes(uint16_t *s) {
@@ -541,7 +559,7 @@ int efi_add_boot_option(
         title_len = (strlen(title)+1) * 2;
         path_len = (strlen(path)+1) * 2;
 
-        buf = malloc0(sizeof(struct boot_option) + title_len +
+        buf = malloc0(offsetof(struct boot_option, title) + title_len +
                       sizeof(struct drive_path) +
                       sizeof(struct device_path) + path_len);
         if (!buf)
@@ -561,12 +579,12 @@ int efi_add_boot_option(
         devicep->type = MEDIA_DEVICE_PATH;
         devicep->sub_type = MEDIA_HARDDRIVE_DP;
         devicep->length = offsetof(struct device_path, drive) + sizeof(struct drive_path);
-        devicep->drive.part_nr = part;
-        devicep->drive.part_start = pstart;
-        devicep->drive.part_size = psize;
-        devicep->drive.signature_type = SIGNATURE_TYPE_GUID;
-        devicep->drive.mbr_type = MBR_TYPE_EFI_PARTITION_TABLE_HEADER;
+        memcpy(&devicep->drive.part_nr, &part, sizeof(uint32_t));
+        memcpy(&devicep->drive.part_start, &pstart, sizeof(uint64_t));
+        memcpy(&devicep->drive.part_size, &psize, sizeof(uint64_t));
         id128_to_efi_guid(part_uuid, devicep->drive.signature);
+        devicep->drive.mbr_type = MBR_TYPE_EFI_PARTITION_TABLE_HEADER;
+        devicep->drive.signature_type = SIGNATURE_TYPE_GUID;
         size += devicep->length;
 
         /* path to loader */
index d9d87e02c5659b330346fe2d5deb7b56f52980a9..08026ea8c491c2334d4b90963a2d15ed9c1c366f 100644 (file)
@@ -929,7 +929,8 @@ tests += [
 
         [['src/libsystemd/sd-resolve/test-resolve.c'],
          [],
-         [threads]],
+         [threads],
+         '', 'timeout=120'],
 
         [['src/libsystemd/sd-login/test-login.c'],
          [],
index 4c240fffdae1060a2df68b5f17c1d2844ca267bd..eb8f7c4effc9bf0f42f768c280e9944d939bc132 100644 (file)
@@ -770,6 +770,7 @@ int main(int argc, char *argv[]) {
         (void) unsetenv("USER");
         (void) unsetenv("LOGNAME");
         (void) unsetenv("SHELL");
+        (void) unsetenv("HOME");
 
         can_unshare = have_namespaces();
 
index b3a4b1749c23157a7dcdf427f2ed65c2a852a2b1..e049abc4a40b03ee66c6d55e7b249024112d477b 100644 (file)
@@ -361,11 +361,11 @@ static void test_unlink_noerrno(void) {
 
         {
                 PROTECT_ERRNO;
-                errno = -42;
+                errno = 42;
                 assert_se(unlink_noerrno(name) >= 0);
-                assert_se(errno == -42);
+                assert_se(errno == 42);
                 assert_se(unlink_noerrno(name) < 0);
-                assert_se(errno == -42);
+                assert_se(errno == 42);
         }
 }
 
index 9a9b01aa1832fb4f15cb211846435091fb2c8232..fdf1b4f40c09c9476b79b1f4956f72af275fee0c 100644 (file)
@@ -282,6 +282,7 @@ static void test_build(void) {
         a = json_variant_unref(a);
         b = json_variant_unref(b);
 
+        const char* arr_1234[] = {"one", "two", "three", "four", NULL};
         assert_se(json_build(&a, JSON_BUILD_ARRAY(JSON_BUILD_OBJECT(JSON_BUILD_PAIR("x", JSON_BUILD_BOOLEAN(true)),
                                                                     JSON_BUILD_PAIR("y", JSON_BUILD_OBJECT(JSON_BUILD_PAIR("this", JSON_BUILD_NULL)))),
                                                   JSON_BUILD_VARIANT(NULL),
@@ -289,8 +290,9 @@ static void test_build(void) {
                                                   JSON_BUILD_STRING(NULL),
                                                   JSON_BUILD_NULL,
                                                   JSON_BUILD_INTEGER(77),
-                                                  JSON_BUILD_ARRAY(JSON_BUILD_VARIANT(JSON_VARIANT_STRING_CONST("foobar")), JSON_BUILD_VARIANT(JSON_VARIANT_STRING_CONST("zzz"))),
-                                                  JSON_BUILD_STRV(STRV_MAKE("one", "two", "three", "four")))) >= 0);
+                                                  JSON_BUILD_ARRAY(JSON_BUILD_VARIANT(JSON_VARIANT_STRING_CONST("foobar")),
+                                                                   JSON_BUILD_VARIANT(JSON_VARIANT_STRING_CONST("zzz"))),
+                                                  JSON_BUILD_STRV((char**) arr_1234))) >= 0);
 
         assert_se(json_variant_format(a, 0, &s) >= 0);
         log_info("GOT: %s\n", s);
index 15c0f8853d43478a5e91a3bd348821415ea63d16..f634ca28dbdf29e49c899390e3ad849024bbe036 100644 (file)
 #include "libudev-list-internal.h"
 #include "libudev-util.h"
 #include "log.h"
+#include "main-func.h"
 #include "stdio-util.h"
 #include "string-util.h"
+#include "tests.h"
+
+static bool arg_monitor = false;
 
 static void print_device(struct udev_device *device) {
         const char *str;
@@ -23,7 +27,7 @@ static void print_device(struct udev_device *device) {
 
         log_info("*** device: %p ***", device);
         str = udev_device_get_action(device);
-        if (str != NULL)
+        if (str)
                 log_info("action:    '%s'", str);
 
         str = udev_device_get_syspath(device);
@@ -33,26 +37,26 @@ static void print_device(struct udev_device *device) {
         log_info("sysname:   '%s'", str);
 
         str = udev_device_get_sysnum(device);
-        if (str != NULL)
+        if (str)
                 log_info("sysnum:    '%s'", str);
 
         str = udev_device_get_devpath(device);
         log_info("devpath:   '%s'", str);
 
         str = udev_device_get_subsystem(device);
-        if (str != NULL)
+        if (str)
                 log_info("subsystem: '%s'", str);
 
         str = udev_device_get_devtype(device);
-        if (str != NULL)
+        if (str)
                 log_info("devtype:   '%s'", str);
 
         str = udev_device_get_driver(device);
-        if (str != NULL)
+        if (str)
                 log_info("driver:    '%s'", str);
 
         str = udev_device_get_devnode(device);
-        if (str != NULL)
+        if (str)
                 log_info("devname:   '%s'", str);
 
         devnum = udev_device_get_devnum(device);
@@ -78,30 +82,30 @@ static void print_device(struct udev_device *device) {
                 log_info("found %i properties", count);
 
         str = udev_device_get_property_value(device, "MAJOR");
-        if (str != NULL)
+        if (str)
                 log_info("MAJOR: '%s'", str);
 
         str = udev_device_get_sysattr_value(device, "dev");
-        if (str != NULL)
+        if (str)
                 log_info("attr{dev}: '%s'", str);
 }
 
 static void test_device(struct udev *udev, const char *syspath) {
         _cleanup_(udev_device_unrefp) struct udev_device *device;
 
-        log_info("looking at device: %s", syspath);
+        log_info("/* %s, device %s */", __func__, syspath);
         device = udev_device_new_from_syspath(udev, syspath);
-        if (device == NULL)
-                log_warning_errno(errno, "udev_device_new_from_syspath: %m");
-        else
+        if (device)
                 print_device(device);
+        else
+                log_warning_errno(errno, "udev_device_new_from_syspath: %m");
 }
 
 static void test_device_parents(struct udev *udev, const char *syspath) {
         _cleanup_(udev_device_unrefp) struct udev_device *device;
         struct udev_device *device_parent;
 
-        log_info("looking at device: %s", syspath);
+        log_info("/* %s, device %s */", __func__, syspath);
         device = udev_device_new_from_syspath(udev, syspath);
         if (device == NULL)
                 return;
@@ -125,12 +129,13 @@ static void test_device_devnum(struct udev *udev) {
         dev_t devnum = makedev(1, 3);
         _cleanup_(udev_device_unrefp) struct udev_device *device;
 
-        log_info("looking up device: %u:%u", major(devnum), minor(devnum));
+        log_info("/* %s, device %d:%d */", __func__, major(devnum), minor(devnum));
+
         device = udev_device_new_from_devnum(udev, 'c', devnum);
-        if (device == NULL)
-                log_warning_errno(errno, "udev_device_new_from_devnum: %m");
-        else
+        if (device)
                 print_device(device);
+        else
+                log_warning_errno(errno, "udev_device_new_from_devnum: %m");
 }
 
 static void test_device_subsys_name(struct udev *udev, const char *subsys, const char *dev) {
@@ -144,7 +149,7 @@ static void test_device_subsys_name(struct udev *udev, const char *subsys, const
                 print_device(device);
 }
 
-static int test_enumerate_print_list(struct udev_enumerate *enumerate) {
+static int enumerate_print_list(struct udev_enumerate *enumerate) {
         struct udev_list_entry *list_entry;
         int count = 0;
 
@@ -176,6 +181,8 @@ static void test_monitor(struct udev *udev) {
                 .data.fd = STDIN_FILENO,
         };
 
+        log_info("/* %s */", __func__);
+
         fd_ep = epoll_create1(EPOLL_CLOEXEC);
         assert_se(fd_ep >= 0);
 
@@ -225,8 +232,9 @@ static void test_queue(struct udev *udev) {
         struct udev_queue *udev_queue;
         bool empty;
 
-        udev_queue = udev_queue_new(udev);
-        assert_se(udev_queue);
+        log_info("/* %s */", __func__);
+
+        assert_se(udev_queue = udev_queue_new(udev));
 
         empty = udev_queue_get_queue_is_empty(udev_queue);
         log_info("queue is %s", empty ? "empty" : "not empty");
@@ -237,13 +245,15 @@ static int test_enumerate(struct udev *udev, const char *subsystem) {
         struct udev_enumerate *udev_enumerate;
         int r;
 
+        log_info("/* %s */", __func__);
+
         log_info("enumerate '%s'", subsystem == NULL ? "<all>" : subsystem);
         udev_enumerate = udev_enumerate_new(udev);
         if (udev_enumerate == NULL)
                 return -1;
         udev_enumerate_add_match_subsystem(udev_enumerate, subsystem);
         udev_enumerate_scan_devices(udev_enumerate);
-        test_enumerate_print_list(udev_enumerate);
+        enumerate_print_list(udev_enumerate);
         udev_enumerate_unref(udev_enumerate);
 
         log_info("enumerate 'net' + duplicated scan + null + zero");
@@ -263,7 +273,7 @@ static int test_enumerate(struct udev *udev, const char *subsystem) {
         udev_enumerate_add_syspath(udev_enumerate, "/sys/class/mem/zero");
         udev_enumerate_add_syspath(udev_enumerate, "/sys/class/mem/zero");
         udev_enumerate_scan_devices(udev_enumerate);
-        test_enumerate_print_list(udev_enumerate);
+        enumerate_print_list(udev_enumerate);
         udev_enumerate_unref(udev_enumerate);
 
         log_info("enumerate 'block'");
@@ -277,7 +287,7 @@ static int test_enumerate(struct udev *udev, const char *subsystem) {
                 return r;
         }
         udev_enumerate_scan_devices(udev_enumerate);
-        test_enumerate_print_list(udev_enumerate);
+        enumerate_print_list(udev_enumerate);
         udev_enumerate_unref(udev_enumerate);
 
         log_info("enumerate 'not block'");
@@ -286,7 +296,7 @@ static int test_enumerate(struct udev *udev, const char *subsystem) {
                 return -1;
         udev_enumerate_add_nomatch_subsystem(udev_enumerate, "block");
         udev_enumerate_scan_devices(udev_enumerate);
-        test_enumerate_print_list(udev_enumerate);
+        enumerate_print_list(udev_enumerate);
         udev_enumerate_unref(udev_enumerate);
 
         log_info("enumerate 'pci, mem, vc'");
@@ -297,7 +307,7 @@ static int test_enumerate(struct udev *udev, const char *subsystem) {
         udev_enumerate_add_match_subsystem(udev_enumerate, "mem");
         udev_enumerate_add_match_subsystem(udev_enumerate, "vc");
         udev_enumerate_scan_devices(udev_enumerate);
-        test_enumerate_print_list(udev_enumerate);
+        enumerate_print_list(udev_enumerate);
         udev_enumerate_unref(udev_enumerate);
 
         log_info("enumerate 'subsystem'");
@@ -305,7 +315,7 @@ static int test_enumerate(struct udev *udev, const char *subsystem) {
         if (udev_enumerate == NULL)
                 return -1;
         udev_enumerate_scan_subsystems(udev_enumerate);
-        test_enumerate_print_list(udev_enumerate);
+        enumerate_print_list(udev_enumerate);
         udev_enumerate_unref(udev_enumerate);
 
         log_info("enumerate 'property IF_FS_*=filesystem'");
@@ -314,7 +324,7 @@ static int test_enumerate(struct udev *udev, const char *subsystem) {
                 return -1;
         udev_enumerate_add_match_property(udev_enumerate, "ID_FS*", "filesystem");
         udev_enumerate_scan_devices(udev_enumerate);
-        test_enumerate_print_list(udev_enumerate);
+        enumerate_print_list(udev_enumerate);
         udev_enumerate_unref(udev_enumerate);
         return 0;
 }
@@ -323,7 +333,11 @@ static void test_hwdb(struct udev *udev, const char *modalias) {
         struct udev_hwdb *hwdb;
         struct udev_list_entry *entry;
 
+        log_info("/* %s */", __func__);
+
         hwdb = udev_hwdb_new(udev);
+        if (!hwdb)
+                log_warning_errno(errno, "Failed to open hwdb: %m");
 
         udev_list_entry_foreach(entry, udev_hwdb_get_properties_list_entry(hwdb, modalias, 0))
                 log_info("'%s'='%s'", udev_list_entry_get_name(entry), udev_list_entry_get_value(entry));
@@ -348,6 +362,8 @@ static void test_util_replace_whitespace_one(const char *str, const char *expect
 }
 
 static void test_util_replace_whitespace(void) {
+        log_info("/* %s */", __func__);
+
         test_util_replace_whitespace_one("hogehoge", "hogehoge");
         test_util_replace_whitespace_one("hoge  hoge", "hoge_hoge");
         test_util_replace_whitespace_one("  hoge  hoge  ", "hoge_hoge");
@@ -385,16 +401,19 @@ static void test_util_replace_whitespace(void) {
 }
 
 static void test_util_resolve_subsys_kernel_one(const char *str, bool read_value, int retval, const char *expected) {
-        char result[UTIL_PATH_SIZE];
+        char result[UTIL_PATH_SIZE] = "";
         int r;
 
         r = util_resolve_subsys_kernel(str, result, sizeof(result), read_value);
+        log_info("\"%s\" → expect: \"%s\", %d, actual: \"%s\", %d", str, strnull(expected), retval, result, r);
         assert_se(r == retval);
         if (r >= 0)
                 assert_se(streq(result, expected));
 }
 
 static void test_util_resolve_subsys_kernel(void) {
+        log_info("/* %s */", __func__);
+
         test_util_resolve_subsys_kernel_one("hoge", false, -EINVAL, NULL);
         test_util_resolve_subsys_kernel_one("[hoge", false, -EINVAL, NULL);
         test_util_resolve_subsys_kernel_one("[hoge/foo", false, -EINVAL, NULL);
@@ -471,9 +490,7 @@ static void test_list(void) {
         udev_list_cleanup(&list);
 }
 
-int main(int argc, char *argv[]) {
-        _cleanup_(udev_unrefp) struct udev *udev = NULL;
-        bool arg_monitor = false;
+static int parse_args(int argc, char *argv[], const char **syspath, const char **subsystem) {
         static const struct option options[] = {
                 { "syspath",   required_argument, NULL, 'p' },
                 { "subsystem", required_argument, NULL, 's' },
@@ -483,52 +500,59 @@ int main(int argc, char *argv[]) {
                 { "monitor",   no_argument,       NULL, 'm' },
                 {}
         };
-        const char *syspath = "/devices/virtual/mem/null";
-        const char *subsystem = NULL;
         int c;
 
-        udev = udev_new();
-        log_info("context: %p", udev);
-        if (udev == NULL) {
-                log_info("no context");
-                return 1;
-        }
-
         while ((c = getopt_long(argc, argv, "p:s:dhVm", options, NULL)) >= 0)
                 switch (c) {
-
                 case 'p':
-                        syspath = optarg;
+                        *syspath = optarg;
                         break;
 
                 case 's':
-                        subsystem = optarg;
+                        *subsystem = optarg;
                         break;
 
                 case 'd':
-                        if (log_get_max_level() < LOG_INFO)
-                                log_set_max_level(LOG_INFO);
+                        log_set_max_level(LOG_DEBUG);
                         break;
 
                 case 'h':
                         printf("--debug --syspath= --subsystem= --help\n");
-                        return EXIT_SUCCESS;
+                        return 0;
 
                 case 'V':
                         printf("%s\n", GIT_VERSION);
-                        return EXIT_SUCCESS;
+                        return 0;
 
                 case 'm':
                         arg_monitor = true;
                         break;
 
                 case '?':
-                        return EXIT_FAILURE;
+                        return -EINVAL;
 
                 default:
                         assert_not_reached("Unhandled option code.");
                 }
 
+        return 1;
+}
+
+static int run(int argc, char *argv[]) {
+        _cleanup_(udev_unrefp) struct udev *udev = NULL;
+
+        const char *syspath = "/devices/virtual/mem/null";
+        const char *subsystem = NULL;
+        int r;
+
+        test_setup_logging(LOG_INFO);
+
+        r = parse_args(argc, argv, &syspath, &subsystem);
+        if (r <= 0)
+                return r;
+
+        assert_se(udev = udev_new());
+
         /* add sys path if needed */
         if (!startswith(syspath, "/sys"))
                 syspath = strjoina("/sys/", syspath);
@@ -555,5 +579,7 @@ int main(int argc, char *argv[]) {
 
         test_list();
 
-        return EXIT_SUCCESS;
+        return 0;
 }
+
+DEFINE_MAIN_FUNCTION(run);
index 7a1e496ed2f5f5b7036e88aba0ea941f66c4bc72..35b087653ef030d1d6cd5b6e56937bafd8f4540c 100644 (file)
 
 #pragma GCC diagnostic ignored "-Wtype-limits"
 
-#define info(t)                                                 \
-        printf("%s → %zu bits%s\n", STRINGIFY(t),               \
-               sizeof(t)*CHAR_BIT,                              \
-               strstr(STRINGIFY(t), "signed") ? "" :            \
-               ((t)-1 < (t)0 ? ", signed" : ", unsigned"));
+#define info(t)                                                         \
+        printf("%s → %zu bits%s, %zu byte alignment\n", STRINGIFY(t),   \
+               sizeof(t)*CHAR_BIT,                                      \
+               strstr(STRINGIFY(t), "signed") ? "" :                    \
+               (t)-1 < (t)0 ? ", signed" : ", unsigned",                \
+               __alignof__(t))
 
 enum Enum {
         enum_value,
index 3c1b5f9b413d964506ab6600e253e25c5ba40836..ffacd6566972bbfb32f6cf153855824e843ea416 100644 (file)
@@ -139,11 +139,11 @@ static void test_container_of(void) {
                 uint64_t v1;
                 uint8_t pad2[2];
                 uint32_t v2;
-        } _packed_ myval = { };
+        } myval = { };
 
         log_info("/* %s */", __func__);
 
-        assert_cc(sizeof(myval) == 17);
+        assert_cc(sizeof(myval) >= 17);
         assert_se(container_of(&myval.v1, struct mytype, v1) == &myval);
         assert_se(container_of(&myval.v2, struct mytype, v2) == &myval);
         assert_se(container_of(&container_of(&myval.v2,
@@ -213,6 +213,30 @@ static void test_protect_errno(void) {
         assert_se(errno == 12);
 }
 
+static void test_unprotect_errno_inner_function(void) {
+        PROTECT_ERRNO;
+
+        errno = 2222;
+}
+
+static void test_unprotect_errno(void) {
+        log_info("/* %s */", __func__);
+
+        errno = 4711;
+
+        PROTECT_ERRNO;
+
+        errno = 815;
+
+        UNPROTECT_ERRNO;
+
+        assert_se(errno == 4711);
+
+        test_unprotect_errno_inner_function();
+
+        assert_se(errno == 4711);
+}
+
 static void test_in_set(void) {
         log_info("/* %s */", __func__);
 
@@ -383,6 +407,7 @@ int main(int argc, char *argv[]) {
         test_div_round_up();
         test_u64log2();
         test_protect_errno();
+        test_unprotect_errno();
         test_in_set();
         test_log2i();
         test_eqzero();
index eb2477cea418b37c07bcda5d7d3b6a079741cf15..60da08a86ff390c28e6cccbc7a34c118c0a88545 100644 (file)
@@ -187,19 +187,19 @@ static bool enable_name_policy(void) {
         return proc_cmdline_get_bool("net.ifnames", &b) <= 0 || b;
 }
 
-static int link_name_type(sd_device *device, unsigned *type) {
+static int link_unsigned_attribute(sd_device *device, const char *attr, unsigned *type) {
         const char *s;
         int r;
 
-        r = sd_device_get_sysattr_value(device, "name_assign_type", &s);
+        r = sd_device_get_sysattr_value(device, attr, &s);
         if (r < 0)
-                return log_device_debug_errno(device, r, "Failed to query name_assign_type: %m");
+                return log_device_debug_errno(device, r, "Failed to query %s: %m", attr);
 
         r = safe_atou(s, type);
         if (r < 0)
-                return log_device_warning_errno(device, r, "Failed to parse name_assign_type \"%s\": %m", s);
+                return log_device_warning_errno(device, r, "Failed to parse %s \"%s\": %m", attr, s);
 
-        log_device_debug(device, "Device has name_assign_type=%d", *type);
+        log_device_debug(device, "Device has %s=%u", attr, *type);
         return 0;
 }
 
@@ -265,11 +265,9 @@ int link_config_get(link_config_ctx *ctx, sd_device *device, link_config **ret)
                                      devtype,
                                      sysname)) {
                         if (link->match_name) {
-                                unsigned char name_assign_type = NET_NAME_UNKNOWN;
-                                const char *attr_value;
+                                unsigned name_assign_type = NET_NAME_UNKNOWN;
 
-                                if (sd_device_get_sysattr_value(device, "name_assign_type", &attr_value) >= 0)
-                                        (void) safe_atou8(attr_value, &name_assign_type);
+                                (void) link_unsigned_attribute(device, "name_assign_type", &name_assign_type);
 
                                 if (name_assign_type == NET_NAME_ENUM) {
                                         log_warning("Config file %s applies to device based on potentially unpredictable interface name '%s'",
@@ -297,34 +295,41 @@ int link_config_get(link_config_ctx *ctx, sd_device *device, link_config **ret)
         return -ENOENT;
 }
 
-static bool mac_is_random(sd_device *device) {
-        const char *s;
-        unsigned type;
+static int get_mac(sd_device *device, MACPolicy policy, struct ether_addr *mac) {
+        unsigned addr_type;
+        bool want_random = policy == MACPOLICY_RANDOM;
         int r;
 
-        /* if we can't get the assign type, assume it is not random */
-        if (sd_device_get_sysattr_value(device, "addr_assign_type", &s) < 0)
-                return false;
+        assert(IN_SET(policy, MACPOLICY_RANDOM, MACPOLICY_PERSISTENT));
 
-        r = safe_atou(s, &type);
+        r = link_unsigned_attribute(device, "addr_assign_type", &addr_type);
         if (r < 0)
-                return false;
-
-        return type == NET_ADDR_RANDOM;
-}
+                return r;
+        switch (addr_type) {
+        case NET_ADDR_SET:
+                return log_device_debug(device, "MAC on the device already set by userspace");
+        case NET_ADDR_STOLEN:
+                return log_device_debug(device, "MAC on the device already set based on another device");
+        case NET_ADDR_RANDOM:
+        case NET_ADDR_PERM:
+                break;
+        default:
+                return log_device_warning(device, "Unknown addr_assign_type %u, ignoring", addr_type);
+        }
 
-static int get_mac(sd_device *device, bool want_random,
-                   struct ether_addr *mac) {
-        int r;
+        if (want_random == (addr_type == NET_ADDR_RANDOM))
+                return log_device_debug(device, "MAC on the device already matches policy *%s*",
+                                        mac_policy_to_string(policy));
 
-        if (want_random)
+        if (want_random) {
+                log_device_debug(device, "Using random bytes to generate MAC");
                 random_bytes(mac->ether_addr_octet, ETH_ALEN);
-        else {
+        else {
                 uint64_t result;
 
                 r = net_get_unique_predictable_data(device, &result);
                 if (r < 0)
-                        return r;
+                        return log_device_warning_errno(device, r, "Could not generate persistent MAC: %m");
 
                 assert_cc(ETH_ALEN <= sizeof(result));
                 memcpy(mac->ether_addr_octet, &result, ETH_ALEN);
@@ -333,8 +338,7 @@ static int get_mac(sd_device *device, bool want_random,
         /* see eth_random_addr in the kernel */
         mac->ether_addr_octet[0] &= 0xfe;  /* clear multicast bit */
         mac->ether_addr_octet[0] |= 0x02;  /* set local assignment bit (IEEE802) */
-
-        return 0;
+        return 1;
 }
 
 int link_config_apply(link_config_ctx *ctx, link_config *config,
@@ -398,7 +402,7 @@ int link_config_apply(link_config_ctx *ctx, link_config *config,
                 return log_device_warning_errno(device, r, "Could not find ifindex: %m");
 
 
-        (void) link_name_type(device, &name_type);
+        (void) link_unsigned_attribute(device, "name_assign_type", &name_type);
 
         if (IN_SET(name_type, NET_NAME_USER, NET_NAME_RENAMED)
             && !naming_scheme_has(NAMING_ALLOW_RERENAMES)) {
@@ -455,33 +459,11 @@ int link_config_apply(link_config_ctx *ctx, link_config *config,
                 log_device_debug(device, "Policies didn't yield a name and Name= is not given, not renaming.");
  no_rename:
 
-        switch (config->mac_policy) {
-                case MACPOLICY_PERSISTENT:
-                        if (mac_is_random(device)) {
-                                r = get_mac(device, false, &generated_mac);
-                                if (r == -ENOENT) {
-                                        log_warning_errno(r, "Could not generate persistent MAC address for %s: %m", old_name);
-                                        break;
-                                } else if (r < 0)
-                                        return r;
-                                mac = &generated_mac;
-                        }
-                        break;
-                case MACPOLICY_RANDOM:
-                        if (!mac_is_random(device)) {
-                                r = get_mac(device, true, &generated_mac);
-                                if (r == -ENOENT) {
-                                        log_warning_errno(r, "Could not generate random MAC address for %s: %m", old_name);
-                                        break;
-                                } else if (r < 0)
-                                        return r;
-                                mac = &generated_mac;
-                        }
-                        break;
-                case MACPOLICY_NONE:
-                default:
-                        mac = config->mac;
-        }
+        if (IN_SET(config->mac_policy, MACPOLICY_PERSISTENT, MACPOLICY_RANDOM)) {
+                if (get_mac(device, config->mac_policy, &generated_mac) > 0)
+                        mac = &generated_mac;
+        } else
+                mac = config->mac;
 
         r = rtnl_set_link_properties(&ctx->rtnl, ifindex, config->alias, mac, config->mtu);
         if (r < 0)
index 739748532f205e24dc6a6fcf47b15a364f91cafc..bc9c6c26c51fe409bd81718c22865d43c9c938ba 100644 (file)
@@ -833,13 +833,15 @@ static const char *get_key_attribute(char *str) {
         return NULL;
 }
 
-static void rule_add_key(struct rule_tmp *rule_tmp, enum token_type type,
-                         enum operation_type op,
-                         const char *value, const void *data) {
+static int rule_add_key(struct rule_tmp *rule_tmp, enum token_type type,
+                        enum operation_type op,
+                        const char *value, const void *data) {
         struct token *token = rule_tmp->token + rule_tmp->token_cur;
         const char *attr = NULL;
 
-        assert(rule_tmp->token_cur < ELEMENTSOF(rule_tmp->token));
+        if (rule_tmp->token_cur >= ELEMENTSOF(rule_tmp->token))
+                return -E2BIG;
+
         memzero(token, sizeof(struct token));
 
         switch (type) {
@@ -970,6 +972,8 @@ static void rule_add_key(struct rule_tmp *rule_tmp, enum token_type type,
         token->key.type = type;
         token->key.op = op;
         rule_tmp->token_cur++;
+
+        return 0;
 }
 
 static int sort_token(UdevRules *rules, struct rule_tmp *rule_tmp) {
@@ -1011,6 +1015,7 @@ static int sort_token(UdevRules *rules, struct rule_tmp *rule_tmp) {
 #define LOG_RULE_WARNING(fmt, ...) LOG_RULE_FULL(LOG_WARNING, fmt, ##__VA_ARGS__)
 #define LOG_RULE_DEBUG(fmt, ...) LOG_RULE_FULL(LOG_DEBUG, fmt, ##__VA_ARGS__)
 #define LOG_AND_RETURN(fmt, ...) { LOG_RULE_ERROR(fmt, __VA_ARGS__); return; }
+#define LOG_AND_RETURN_ADD_KEY LOG_AND_RETURN("Temporary rule array too small, aborting event processing with %u items", rule_tmp.token_cur);
 
 static void add_rule(UdevRules *rules, char *line,
                      const char *filename, unsigned filename_off, unsigned lineno) {
@@ -1020,6 +1025,7 @@ static void add_rule(UdevRules *rules, char *line,
                 .rules = rules,
                 .rule.type = TK_RULE,
         };
+        int r;
 
         /* the offset in the rule is limited to unsigned short */
         if (filename_off < USHRT_MAX)
@@ -1053,26 +1059,26 @@ static void add_rule(UdevRules *rules, char *line,
                         break;
                 }
 
-                if (rule_tmp.token_cur >= ELEMENTSOF(rule_tmp.token))
-                        LOG_AND_RETURN("Temporary rule array too small, aborting event processing with %u items", rule_tmp.token_cur);
-
                 if (streq(key, "ACTION")) {
                         if (op > OP_MATCH_MAX)
                                 LOG_AND_RETURN("Invalid %s operation", key);
 
-                        rule_add_key(&rule_tmp, TK_M_ACTION, op, value, NULL);
+                        if (rule_add_key(&rule_tmp, TK_M_ACTION, op, value, NULL) < 0)
+                                LOG_AND_RETURN_ADD_KEY;
 
                 } else if (streq(key, "DEVPATH")) {
                         if (op > OP_MATCH_MAX)
                                 LOG_AND_RETURN("Invalid %s operation", key);
 
-                        rule_add_key(&rule_tmp, TK_M_DEVPATH, op, value, NULL);
+                        if (rule_add_key(&rule_tmp, TK_M_DEVPATH, op, value, NULL) < 0)
+                                LOG_AND_RETURN_ADD_KEY;
 
                 } else if (streq(key, "KERNEL")) {
                         if (op > OP_MATCH_MAX)
                                 LOG_AND_RETURN("Invalid %s operation", key);
 
-                        rule_add_key(&rule_tmp, TK_M_KERNEL, op, value, NULL);
+                        if (rule_add_key(&rule_tmp, TK_M_KERNEL, op, value, NULL) < 0)
+                                LOG_AND_RETURN_ADD_KEY;
 
                 } else if (streq(key, "SUBSYSTEM")) {
                         if (op > OP_MATCH_MAX)
@@ -1083,15 +1089,18 @@ static void add_rule(UdevRules *rules, char *line,
                                 if (!streq(value, "subsystem"))
                                         LOG_RULE_WARNING("'%s' must be specified as 'subsystem'; please fix", value);
 
-                                rule_add_key(&rule_tmp, TK_M_SUBSYSTEM, op, "subsystem|class|bus", NULL);
+                                r = rule_add_key(&rule_tmp, TK_M_SUBSYSTEM, op, "subsystem|class|bus", NULL);
                         } else
-                                rule_add_key(&rule_tmp, TK_M_SUBSYSTEM, op, value, NULL);
+                                r = rule_add_key(&rule_tmp, TK_M_SUBSYSTEM, op, value, NULL);
+                        if (r < 0)
+                                LOG_AND_RETURN_ADD_KEY;
 
                 } else if (streq(key, "DRIVER")) {
                         if (op > OP_MATCH_MAX)
                                 LOG_AND_RETURN("Invalid %s operation", key);
 
-                        rule_add_key(&rule_tmp, TK_M_DRIVER, op, value, NULL);
+                        if (rule_add_key(&rule_tmp, TK_M_DRIVER, op, value, NULL) < 0)
+                                LOG_AND_RETURN_ADD_KEY;
 
                 } else if (startswith(key, "ATTR{")) {
                         attr = get_key_attribute(key + STRLEN("ATTR"));
@@ -1102,9 +1111,11 @@ static void add_rule(UdevRules *rules, char *line,
                                 LOG_AND_RETURN("Invalid %s operation", "ATTR");
 
                         if (op < OP_MATCH_MAX)
-                                rule_add_key(&rule_tmp, TK_M_ATTR, op, value, attr);
+                                r = rule_add_key(&rule_tmp, TK_M_ATTR, op, value, attr);
                         else
-                                rule_add_key(&rule_tmp, TK_A_ATTR, op, value, attr);
+                                r = rule_add_key(&rule_tmp, TK_A_ATTR, op, value, attr);
+                        if (r < 0)
+                                LOG_AND_RETURN_ADD_KEY;
 
                 } else if (startswith(key, "SYSCTL{")) {
                         attr = get_key_attribute(key + STRLEN("SYSCTL"));
@@ -1115,9 +1126,11 @@ static void add_rule(UdevRules *rules, char *line,
                                 LOG_AND_RETURN("Invalid %s operation", "ATTR");
 
                         if (op < OP_MATCH_MAX)
-                                rule_add_key(&rule_tmp, TK_M_SYSCTL, op, value, attr);
+                                r = rule_add_key(&rule_tmp, TK_M_SYSCTL, op, value, attr);
                         else
-                                rule_add_key(&rule_tmp, TK_A_SYSCTL, op, value, attr);
+                                r = rule_add_key(&rule_tmp, TK_A_SYSCTL, op, value, attr);
+                        if (r < 0)
+                                LOG_AND_RETURN_ADD_KEY;
 
                 } else if (startswith(key, "SECLABEL{")) {
                         attr = get_key_attribute(key + STRLEN("SECLABEL"));
@@ -1127,25 +1140,29 @@ static void add_rule(UdevRules *rules, char *line,
                         if (op == OP_REMOVE)
                                 LOG_AND_RETURN("Invalid %s operation", "SECLABEL");
 
-                        rule_add_key(&rule_tmp, TK_A_SECLABEL, op, value, attr);
+                        if (rule_add_key(&rule_tmp, TK_A_SECLABEL, op, value, attr) < 0)
+                                LOG_AND_RETURN_ADD_KEY;
 
                 } else if (streq(key, "KERNELS")) {
                         if (op > OP_MATCH_MAX)
                                 LOG_AND_RETURN("Invalid %s operation", key);
 
-                        rule_add_key(&rule_tmp, TK_M_KERNELS, op, value, NULL);
+                        if (rule_add_key(&rule_tmp, TK_M_KERNELS, op, value, NULL) < 0)
+                                LOG_AND_RETURN_ADD_KEY;
 
                 } else if (streq(key, "SUBSYSTEMS")) {
                         if (op > OP_MATCH_MAX)
                                 LOG_AND_RETURN("Invalid %s operation", key);
 
-                        rule_add_key(&rule_tmp, TK_M_SUBSYSTEMS, op, value, NULL);
+                        if (rule_add_key(&rule_tmp, TK_M_SUBSYSTEMS, op, value, NULL) < 0)
+                                LOG_AND_RETURN_ADD_KEY;
 
                 } else if (streq(key, "DRIVERS")) {
                         if (op > OP_MATCH_MAX)
                                 LOG_AND_RETURN("Invalid %s operation", key);
 
-                        rule_add_key(&rule_tmp, TK_M_DRIVERS, op, value, NULL);
+                        if (rule_add_key(&rule_tmp, TK_M_DRIVERS, op, value, NULL) < 0)
+                                LOG_AND_RETURN_ADD_KEY;
 
                 } else if (startswith(key, "ATTRS{")) {
                         if (op > OP_MATCH_MAX)
@@ -1159,13 +1176,15 @@ static void add_rule(UdevRules *rules, char *line,
                                 LOG_RULE_WARNING("'device' link may not be available in future kernels; please fix");
                         if (strstr(attr, "../"))
                                 LOG_RULE_WARNING("Direct reference to parent sysfs directory, may break in future kernels; please fix");
-                        rule_add_key(&rule_tmp, TK_M_ATTRS, op, value, attr);
+                        if (rule_add_key(&rule_tmp, TK_M_ATTRS, op, value, attr) < 0)
+                                LOG_AND_RETURN_ADD_KEY;
 
                 } else if (streq(key, "TAGS")) {
                         if (op > OP_MATCH_MAX)
                                 LOG_AND_RETURN("Invalid %s operation", key);
 
-                        rule_add_key(&rule_tmp, TK_M_TAGS, op, value, NULL);
+                        if (rule_add_key(&rule_tmp, TK_M_TAGS, op, value, NULL) < 0)
+                                LOG_AND_RETURN_ADD_KEY;
 
                 } else if (startswith(key, "ENV{")) {
                         attr = get_key_attribute(key + STRLEN("ENV"));
@@ -1176,7 +1195,7 @@ static void add_rule(UdevRules *rules, char *line,
                                 LOG_AND_RETURN("Invalid %s operation", "ENV");
 
                         if (op < OP_MATCH_MAX)
-                                rule_add_key(&rule_tmp, TK_M_ENV, op, value, attr);
+                                r = rule_add_key(&rule_tmp, TK_M_ENV, op, value, attr);
                         else {
                                 if (STR_IN_SET(attr,
                                                "ACTION",
@@ -1192,26 +1211,32 @@ static void add_rule(UdevRules *rules, char *line,
                                                "TAGS"))
                                         LOG_AND_RETURN("Invalid ENV attribute, '%s' cannot be set", attr);
 
-                                rule_add_key(&rule_tmp, TK_A_ENV, op, value, attr);
+                                r = rule_add_key(&rule_tmp, TK_A_ENV, op, value, attr);
                         }
+                        if (r < 0)
+                                LOG_AND_RETURN_ADD_KEY;
 
                 } else if (streq(key, "TAG")) {
                         if (op < OP_MATCH_MAX)
-                                rule_add_key(&rule_tmp, TK_M_TAG, op, value, NULL);
+                                r = rule_add_key(&rule_tmp, TK_M_TAG, op, value, NULL);
                         else
-                                rule_add_key(&rule_tmp, TK_A_TAG, op, value, NULL);
+                                r = rule_add_key(&rule_tmp, TK_A_TAG, op, value, NULL);
+                        if (r < 0)
+                                LOG_AND_RETURN_ADD_KEY;
 
                 } else if (streq(key, "PROGRAM")) {
                         if (op == OP_REMOVE)
                                 LOG_AND_RETURN("Invalid %s operation", key);
 
-                        rule_add_key(&rule_tmp, TK_M_PROGRAM, op, value, NULL);
+                        if (rule_add_key(&rule_tmp, TK_M_PROGRAM, op, value, NULL) < 0)
+                                LOG_AND_RETURN_ADD_KEY;
 
                 } else if (streq(key, "RESULT")) {
                         if (op > OP_MATCH_MAX)
                                 LOG_AND_RETURN("Invalid %s operation", key);
 
-                        rule_add_key(&rule_tmp, TK_M_RESULT, op, value, NULL);
+                        if (rule_add_key(&rule_tmp, TK_M_RESULT, op, value, NULL) < 0)
+                                LOG_AND_RETURN_ADD_KEY;
 
                 } else if (startswith(key, "IMPORT")) {
                         attr = get_key_attribute(key + STRLEN("IMPORT"));
@@ -1229,28 +1254,34 @@ static void add_rule(UdevRules *rules, char *line,
 
                                         if (cmd >= 0) {
                                                 LOG_RULE_DEBUG("IMPORT found builtin '%s', replacing", value);
-                                                rule_add_key(&rule_tmp, TK_M_IMPORT_BUILTIN, op, value, &cmd);
+                                                if (rule_add_key(&rule_tmp, TK_M_IMPORT_BUILTIN, op, value, &cmd) < 0)
+                                                        LOG_AND_RETURN_ADD_KEY;
                                                 continue;
                                         }
                                 }
-                                rule_add_key(&rule_tmp, TK_M_IMPORT_PROG, op, value, NULL);
+                                r = rule_add_key(&rule_tmp, TK_M_IMPORT_PROG, op, value, NULL);
                         } else if (streq(attr, "builtin")) {
                                 const enum udev_builtin_cmd cmd = udev_builtin_lookup(value);
 
-                                if (cmd < 0)
-                                        LOG_RULE_WARNING("IMPORT{builtin} '%s' unknown", value);
-                                else
-                                        rule_add_key(&rule_tmp, TK_M_IMPORT_BUILTIN, op, value, &cmd);
+                                if (cmd < 0) {
+                                        LOG_RULE_WARNING("IMPORT{builtin} '%s' unknown, ignoring", value);
+                                        continue;
+                                } else
+                                        r = rule_add_key(&rule_tmp, TK_M_IMPORT_BUILTIN, op, value, &cmd);
                         } else if (streq(attr, "file"))
-                                rule_add_key(&rule_tmp, TK_M_IMPORT_FILE, op, value, NULL);
+                                r = rule_add_key(&rule_tmp, TK_M_IMPORT_FILE, op, value, NULL);
                         else if (streq(attr, "db"))
-                                rule_add_key(&rule_tmp, TK_M_IMPORT_DB, op, value, NULL);
+                                r = rule_add_key(&rule_tmp, TK_M_IMPORT_DB, op, value, NULL);
                         else if (streq(attr, "cmdline"))
-                                rule_add_key(&rule_tmp, TK_M_IMPORT_CMDLINE, op, value, NULL);
+                                r = rule_add_key(&rule_tmp, TK_M_IMPORT_CMDLINE, op, value, NULL);
                         else if (streq(attr, "parent"))
-                                rule_add_key(&rule_tmp, TK_M_IMPORT_PARENT, op, value, NULL);
-                        else
+                                r = rule_add_key(&rule_tmp, TK_M_IMPORT_PARENT, op, value, NULL);
+                        else {
                                 LOG_RULE_ERROR("Ignoring unknown %s{} type '%s'", "IMPORT", attr);
+                                continue;
+                        }
+                        if (r < 0)
+                                LOG_AND_RETURN_ADD_KEY;
 
                 } else if (startswith(key, "TEST")) {
                         mode_t mode = 0;
@@ -1261,9 +1292,11 @@ static void add_rule(UdevRules *rules, char *line,
                         attr = get_key_attribute(key + STRLEN("TEST"));
                         if (attr) {
                                 mode = strtol(attr, NULL, 8);
-                                rule_add_key(&rule_tmp, TK_M_TEST, op, value, &mode);
+                                r = rule_add_key(&rule_tmp, TK_M_TEST, op, value, &mode);
                         } else
-                                rule_add_key(&rule_tmp, TK_M_TEST, op, value, NULL);
+                                r = rule_add_key(&rule_tmp, TK_M_TEST, op, value, NULL);
+                        if (r < 0)
+                                LOG_AND_RETURN_ADD_KEY;
 
                 } else if (startswith(key, "RUN")) {
                         attr = get_key_attribute(key + STRLEN("RUN"));
@@ -1275,16 +1308,21 @@ static void add_rule(UdevRules *rules, char *line,
                         if (streq(attr, "builtin")) {
                                 const enum udev_builtin_cmd cmd = udev_builtin_lookup(value);
 
-                                if (cmd < 0)
-                                        LOG_RULE_ERROR("RUN{builtin}: '%s' unknown", value);
-                                else
-                                        rule_add_key(&rule_tmp, TK_A_RUN_BUILTIN, op, value, &cmd);
+                                if (cmd < 0) {
+                                        LOG_RULE_ERROR("RUN{builtin}: '%s' unknown, ignoring", value);
+                                        continue;
+                                } else
+                                        r = rule_add_key(&rule_tmp, TK_A_RUN_BUILTIN, op, value, &cmd);
                         } else if (streq(attr, "program")) {
                                 const enum udev_builtin_cmd cmd = _UDEV_BUILTIN_MAX;
 
-                                rule_add_key(&rule_tmp, TK_A_RUN_PROGRAM, op, value, &cmd);
-                        } else
+                                r = rule_add_key(&rule_tmp, TK_A_RUN_PROGRAM, op, value, &cmd);
+                        } else {
                                 LOG_RULE_ERROR("Ignoring unknown %s{} type '%s'", "RUN", attr);
+                                continue;
+                        }
+                        if (r < 0)
+                                LOG_AND_RETURN_ADD_KEY;
 
                 } else if (streq(key, "LABEL")) {
                         if (op == OP_REMOVE)
@@ -1296,14 +1334,15 @@ static void add_rule(UdevRules *rules, char *line,
                         if (op == OP_REMOVE)
                                 LOG_AND_RETURN("Invalid %s operation", key);
 
-                        rule_add_key(&rule_tmp, TK_A_GOTO, 0, value, NULL);
+                        if (rule_add_key(&rule_tmp, TK_A_GOTO, 0, value, NULL) < 0)
+                                LOG_AND_RETURN_ADD_KEY;
 
                 } else if (startswith(key, "NAME")) {
                         if (op == OP_REMOVE)
                                 LOG_AND_RETURN("Invalid %s operation", key);
 
                         if (op < OP_MATCH_MAX)
-                                rule_add_key(&rule_tmp, TK_M_NAME, op, value, NULL);
+                                r = rule_add_key(&rule_tmp, TK_M_NAME, op, value, NULL);
                         else {
                                 if (streq(value, "%k")) {
                                         LOG_RULE_WARNING("NAME=\"%%k\" is ignored, because it breaks kernel supplied names; please remove");
@@ -1313,8 +1352,10 @@ static void add_rule(UdevRules *rules, char *line,
                                         LOG_RULE_DEBUG("NAME=\"\" is ignored, because udev will not delete any device nodes; please remove");
                                         continue;
                                 }
-                                rule_add_key(&rule_tmp, TK_A_NAME, op, value, NULL);
+                                r = rule_add_key(&rule_tmp, TK_A_NAME, op, value, NULL);
                         }
+                        if (r < 0)
+                                LOG_AND_RETURN_ADD_KEY;
                         rule_tmp.rule.rule.can_set_name = true;
 
                 } else if (streq(key, "SYMLINK")) {
@@ -1322,9 +1363,11 @@ static void add_rule(UdevRules *rules, char *line,
                                 LOG_AND_RETURN("Invalid %s operation", key);
 
                         if (op < OP_MATCH_MAX)
-                                rule_add_key(&rule_tmp, TK_M_DEVLINK, op, value, NULL);
+                                r = rule_add_key(&rule_tmp, TK_M_DEVLINK, op, value, NULL);
                         else
-                                rule_add_key(&rule_tmp, TK_A_DEVLINK, op, value, NULL);
+                                r = rule_add_key(&rule_tmp, TK_A_DEVLINK, op, value, NULL);
+                        if (r < 0)
+                                LOG_AND_RETURN_ADD_KEY;
                         rule_tmp.rule.rule.can_set_name = true;
 
                 } else if (streq(key, "OWNER")) {
@@ -1336,12 +1379,18 @@ static void add_rule(UdevRules *rules, char *line,
 
                         uid = strtoul(value, &endptr, 10);
                         if (endptr[0] == '\0')
-                                rule_add_key(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid);
+                                r = rule_add_key(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid);
                         else if (rules->resolve_name_timing == RESOLVE_NAME_EARLY && !strchr("$%", value[0])) {
                                 uid = add_uid(rules, value);
-                                rule_add_key(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid);
+                                r = rule_add_key(&rule_tmp, TK_A_OWNER_ID, op, NULL, &uid);
                         } else if (rules->resolve_name_timing != RESOLVE_NAME_NEVER)
-                                rule_add_key(&rule_tmp, TK_A_OWNER, op, value, NULL);
+                                r = rule_add_key(&rule_tmp, TK_A_OWNER, op, value, NULL);
+                        else {
+                                LOG_RULE_ERROR("Invalid %s operation", key);
+                                continue;
+                        }
+                        if (r < 0)
+                                LOG_AND_RETURN_ADD_KEY;
 
                         rule_tmp.rule.rule.can_set_name = true;
 
@@ -1354,12 +1403,18 @@ static void add_rule(UdevRules *rules, char *line,
 
                         gid = strtoul(value, &endptr, 10);
                         if (endptr[0] == '\0')
-                                rule_add_key(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid);
+                                r = rule_add_key(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid);
                         else if ((rules->resolve_name_timing == RESOLVE_NAME_EARLY) && !strchr("$%", value[0])) {
                                 gid = add_gid(rules, value);
-                                rule_add_key(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid);
+                                r = rule_add_key(&rule_tmp, TK_A_GROUP_ID, op, NULL, &gid);
                         } else if (rules->resolve_name_timing != RESOLVE_NAME_NEVER)
-                                rule_add_key(&rule_tmp, TK_A_GROUP, op, value, NULL);
+                                r = rule_add_key(&rule_tmp, TK_A_GROUP, op, value, NULL);
+                        else {
+                                LOG_RULE_ERROR("Invalid %s operation", key);
+                                continue;
+                        }
+                        if (r < 0)
+                                LOG_AND_RETURN_ADD_KEY;
 
                         rule_tmp.rule.rule.can_set_name = true;
 
@@ -1372,9 +1427,12 @@ static void add_rule(UdevRules *rules, char *line,
 
                         mode = strtol(value, &endptr, 8);
                         if (endptr[0] == '\0')
-                                rule_add_key(&rule_tmp, TK_A_MODE_ID, op, NULL, &mode);
+                                r = rule_add_key(&rule_tmp, TK_A_MODE_ID, op, NULL, &mode);
                         else
-                                rule_add_key(&rule_tmp, TK_A_MODE, op, value, NULL);
+                                r = rule_add_key(&rule_tmp, TK_A_MODE, op, value, NULL);
+                        if (r < 0)
+                                LOG_AND_RETURN_ADD_KEY;
+
                         rule_tmp.rule.rule.can_set_name = true;
 
                 } else if (streq(key, "OPTIONS")) {
@@ -1387,37 +1445,48 @@ static void add_rule(UdevRules *rules, char *line,
                         if (pos) {
                                 int prio = atoi(pos + STRLEN("link_priority="));
 
-                                rule_add_key(&rule_tmp, TK_A_DEVLINK_PRIO, op, NULL, &prio);
+                                if (rule_add_key(&rule_tmp, TK_A_DEVLINK_PRIO, op, NULL, &prio) < 0)
+                                        LOG_AND_RETURN_ADD_KEY;
                         }
 
                         pos = strstr(value, "string_escape=");
                         if (pos) {
                                 pos += STRLEN("string_escape=");
                                 if (startswith(pos, "none"))
-                                        rule_add_key(&rule_tmp, TK_A_STRING_ESCAPE_NONE, op, NULL, NULL);
+                                        r = rule_add_key(&rule_tmp, TK_A_STRING_ESCAPE_NONE, op, NULL, NULL);
                                 else if (startswith(pos, "replace"))
-                                        rule_add_key(&rule_tmp, TK_A_STRING_ESCAPE_REPLACE, op, NULL, NULL);
+                                        r = rule_add_key(&rule_tmp, TK_A_STRING_ESCAPE_REPLACE, op, NULL, NULL);
+                                else {
+                                        LOG_RULE_ERROR("OPTIONS: unknown string_escape mode '%s', ignoring", pos);
+                                        r = 0;
+                                }
+                                if (r < 0)
+                                        LOG_AND_RETURN_ADD_KEY;
                         }
 
                         pos = strstr(value, "db_persist");
                         if (pos)
-                                rule_add_key(&rule_tmp, TK_A_DB_PERSIST, op, NULL, NULL);
+                                if (rule_add_key(&rule_tmp, TK_A_DB_PERSIST, op, NULL, NULL) < 0)
+                                        LOG_AND_RETURN_ADD_KEY;
 
                         pos = strstr(value, "nowatch");
                         if (pos) {
                                 static const int zero = 0;
-                                rule_add_key(&rule_tmp, TK_A_INOTIFY_WATCH, op, NULL, &zero);
+                                if (rule_add_key(&rule_tmp, TK_A_INOTIFY_WATCH, op, NULL, &zero) < 0)
+                                        LOG_AND_RETURN_ADD_KEY;
                         } else {
                                 static const int one = 1;
                                 pos = strstr(value, "watch");
                                 if (pos)
-                                        rule_add_key(&rule_tmp, TK_A_INOTIFY_WATCH, op, NULL, &one);
+                                        if (rule_add_key(&rule_tmp, TK_A_INOTIFY_WATCH, op, NULL, &one) < 0)
+                                                LOG_AND_RETURN_ADD_KEY;
                         }
 
                         pos = strstr(value, "static_node=");
                         if (pos) {
                                 pos += STRLEN("static_node=");
-                                rule_add_key(&rule_tmp, TK_A_STATIC_NODE, op, pos, NULL);
+                                if (rule_add_key(&rule_tmp, TK_A_STATIC_NODE, op, pos, NULL) < 0)
+                                        LOG_AND_RETURN_ADD_KEY;
                                 rule_tmp.rule.rule.has_static_node = true;
                         }
 
index 135a5e012076c68164c55aeaff1e38c6f84033ac..ebd15d384a815c0be63f82beae8510a711a87d20 100644 (file)
@@ -61,12 +61,15 @@ static bool skip_attribute(const char *name) {
 static void print_all_attributes(sd_device *device, const char *key) {
         const char *name, *value;
 
-        FOREACH_DEVICE_PROPERTY(device, name, value) {
+        FOREACH_DEVICE_SYSATTR(device, name) {
                 size_t len;
 
                 if (skip_attribute(name))
                         continue;
 
+                if (sd_device_get_sysattr_value(device, name, &value) < 0)
+                        continue;
+
                 /* skip any values that look like a path */
                 if (value[0] == '/')
                         continue;
index c637b98c7c7cebbc6ff6a566580ee33dd2f27d36..0303f36b4f2a93f49d6ff6f1cf36364f44ddc45b 100644 (file)
@@ -1798,10 +1798,10 @@ static int run(int argc, char *argv[]) {
 
         dev_setup(NULL, UID_INVALID, GID_INVALID);
 
-        if (getppid() == 1) {
-                /* get our own cgroup, we regularly kill everything udev has left behind
-                   we only do this on systemd systems, and only if we are directly spawned
-                   by PID1. otherwise we are not guaranteed to have a dedicated cgroup */
+        if (getppid() == 1 && sd_booted() > 0) {
+                /* Get our own cgroup, we regularly kill everything udev has left behind.
+                 * We only do this on systemd systems, and only if we are directly spawned
+                 * by PID1. Otherwise we are not guaranteed to have a dedicated cgroup. */
                 r = cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, 0, &cgroup);
                 if (r < 0) {
                         if (IN_SET(r, -ENOENT, -ENOMEDIUM))
index d8959187a1f215fe1b2cb369abba093d1a35aee7..c85433d7d33a6ee39517136c83c4215d9750fb48 100755 (executable)
@@ -17,7 +17,7 @@ test_setup() {
         eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
 
         setup_basic_environment
-        dracut_install true rm
+        dracut_install true rm socat
 
         # setup the testsuite service
         cat >$initdir/etc/systemd/system/testsuite.service <<'EOF'
@@ -28,13 +28,13 @@ Description=Testsuite service
 Type=oneshot
 StandardOutput=tty
 StandardError=tty
-ExecStart=/bin/sh -e -x -c 'rm -f /tmp/nonexistent; systemctl start test.socket; echo > /run/test.ctl; >/testok'
+ExecStart=/bin/sh -e -x -c 'rm -f /tmp/nonexistent; systemctl start test.socket; printf x > test.file; socat -t20 OPEN:test.file UNIX-CONNECT:/run/test.ctl; >/testok'
 TimeoutStartSec=10s
 EOF
 
        cat  >$initdir/etc/systemd/system/test.socket <<'EOF'
 [Socket]
-ListenFIFO=/run/test.ctl
+ListenStream=/run/test.ctl
 EOF
 
        cat > $initdir/etc/systemd/system/test.service <<'EOF'
diff --git a/test/fuzz/fuzz-udev-rules/oss-fuzz-12980 b/test/fuzz/fuzz-udev-rules/oss-fuzz-12980
new file mode 100644 (file)
index 0000000..37846f4
--- /dev/null
@@ -0,0 +1 @@
+     SUBSYSTEM=="   "  KERNEL=="   "  GROUP="   "  KERNEL=="    "  GROUP="   "  MODE ="   "  KERNEL=="  " GROUP="   "  KERNEL=="    "  GROUP="   "  MODE ="   "  KERNEL=="   "  GROUP="   "  MODE="   "  GROUP="   "  KERNEL=="   "  GROUP="   "  KERNEL=="   "GROUP="   "  KERNEL=="   " GROUP="   "  MODE ="   "KERNEL=="  "  GROUP="   "  KERNEL=="    "  GROUP="   "MODE ="   "  KERNEL=="  "  KERNEL=="    "  GROUP=" "  MODE ="   "  KERNEL=="  "  GROUP=" "  KERNEL=="    "  GROUP="   "  MODE ="   "  KERNEL=="   "  GROUP="   "  MODE="   "  GROUP="   "  KERNEL=="    " GROUP="   "  KERNEL=="  "  GROUP="   "  KERNEL=="    "  GROUP=" "  MODE ="  "  KERNEL=="  " GROUP="   "  MODE=""  MODE ="   "  KERNEL=="   "  GROUP="   "  KERNEL=="    "  GROUP="   "  MODE ="   "  KERNEL==""  GROUP=" "  KERNEL=="    "  GROUP="   "  MODE ="   "  KERNEL=="  "  KERNEL=="    "  OPTIONS ="    string_escape=replace            watch  " 
\ No newline at end of file
index dfb06d9ed987b6846beb6c414924f9238f39e7f7..8b26c988abb43f8322e4f08496968f53ef0641cd 100755 (executable)
@@ -17,6 +17,8 @@ if not rules_files:
 
 quoted_string_re = r'"(?:[^\\"]|\\.)*"'
 no_args_tests = re.compile(r'(ACTION|DEVPATH|KERNELS?|NAME|SYMLINK|SUBSYSTEMS?|DRIVERS?|TAG|PROGRAM|RESULT|TEST)\s*(?:=|!)=\s*' + quoted_string_re + '$')
+# PROGRAM can also be specified as an assignment.
+program_assign = re.compile(r'PROGRAM\s*=\s*' + quoted_string_re + '$')
 args_tests = re.compile(r'(ATTRS?|ENV|TEST){([a-zA-Z0-9/_.*%-]+)}\s*(?:=|!)=\s*' + quoted_string_re + '$')
 no_args_assign = re.compile(r'(NAME|SYMLINK|OWNER|GROUP|MODE|TAG|RUN|LABEL|GOTO|OPTIONS|IMPORT)\s*(?:\+=|:=|=)\s*' + quoted_string_re + '$')
 args_assign = re.compile(r'(ATTR|ENV|IMPORT|RUN){([a-zA-Z0-9/_.*%-]+)}\s*(=|\+=)\s*' + quoted_string_re + '$')
@@ -51,7 +53,8 @@ for path in rules_files:
         for clause_match in comma_separated_group_re.finditer(line):
             clause = clause_match.group().strip()
             if not (no_args_tests.match(clause) or args_tests.match(clause) or
-                    no_args_assign.match(clause) or args_assign.match(clause)):
+                    no_args_assign.match(clause) or args_assign.match(clause) or
+                    program_assign.match(clause)):
 
                 print('Invalid line {}:{}: {}'.format(path, lineno, line))
                 print('  clause:', clause)
index ded8d5512636cbe4ac3cc0c919c9a862c8bb7a26..8f5cbadf0408aa7d37541289a4091c6693c44895 100644 (file)
@@ -2,6 +2,6 @@
 Description=Test for PrivateNetwork
 
 [Service]
-ExecStart=/bin/sh -x -c '! ip link | grep ": " | grep -Ev ": (lo|(sit0|ip6tnl0|ip6gre0)@.*):"'
+ExecStart=/bin/sh -x -c '! ip link | grep -E "^[0-9]+: " | grep -Ev ": (lo|(erspan|gre|gretap|ip_vti|ip6_vti|ip6gre|ip6tnl|sit|tunl)0@.*):"'
 Type=oneshot
 PrivateNetwork=yes
index 3243a868b760efff264e69760630bc1604bc3d12..a936202e4a79baf3682b814fe6ce54b4ba3f0eb9 100644 (file)
@@ -120,7 +120,7 @@ run_qemu() {
 
     default_fedora_initrd=/boot/initramfs-${KERNEL_VER}.img
     default_debian_initrd=/boot/initrd.img-${KERNEL_VER}
-    default_arch_initrd=/boot/initramfs-linux.img
+    default_arch_initrd=/boot/initramfs-linux-fallback.img
     default_suse_initrd=/boot/initrd-${KERNEL_VER}
     if [[ ! "$INITRD" ]]; then
         if [[ -e "$default_fedora_initrd" ]]; then
diff --git a/test/test-network/conf/25-bind-carrier.network b/test/test-network/conf/25-bind-carrier.network
new file mode 100644 (file)
index 0000000..cf854d3
--- /dev/null
@@ -0,0 +1,8 @@
+[Match]
+Name=test1
+
+[Network]
+BindCarrier=dummy99 dummy98
+Address=192.168.10.30/24
+Gateway=192.168.10.1
+IPv6AcceptRA=no
diff --git a/test/test-network/conf/25-link-local-addressing-no.network b/test/test-network/conf/25-link-local-addressing-no.network
new file mode 100644 (file)
index 0000000..8320414
--- /dev/null
@@ -0,0 +1,5 @@
+[Match]
+Name=dummy98
+
+[Network]
+LinkLocalAddressing=no
diff --git a/test/test-network/conf/25-link-local-addressing-yes.network b/test/test-network/conf/25-link-local-addressing-yes.network
new file mode 100644 (file)
index 0000000..dcf2f2f
--- /dev/null
@@ -0,0 +1,5 @@
+[Match]
+Name=test1
+
+[Network]
+LinkLocalAddressing=yes
index 298683fe94e0de1c97156ac2f4a796c8b4816785..ad7ae9df63fe783225fb9a4ccb88f7d7e70e2721 100755 (executable)
@@ -9,7 +9,6 @@ import signal
 import socket
 import subprocess
 import sys
-import threading
 import time
 import unittest
 from shutil import copytree
@@ -47,6 +46,28 @@ def expectedFailureIfERSPANModuleIsNotAvailable():
 
     return f
 
+def expectedFailureIfRoutingPolicyPortRangeIsNotAvailable():
+    def f(func):
+        rc = subprocess.call(['ip', 'rule', 'add', 'from', '192.168.100.19', 'sport', '1123-1150', 'dport', '3224-3290', 'table', '7'])
+        if rc == 0:
+            subprocess.call(['ip', 'rule', 'del', 'from', '192.168.100.19', 'sport', '1123-1150', 'dport', '3224-3290', 'table', '7'])
+            return func
+        else:
+            return unittest.expectedFailure(func)
+
+    return f
+
+def expectedFailureIfRoutingPolicyIPProtoIsNotAvailable():
+    def f(func):
+        rc = subprocess.call(['ip', 'rule', 'add', 'not', 'from', '192.168.100.19', 'ipproto', 'tcp', 'table', '7'])
+        if rc == 0:
+            subprocess.call(['ip', 'rule', 'del', 'not', 'from', '192.168.100.19', 'ipproto', 'tcp', 'table', '7'])
+            return func
+        else:
+            return unittest.expectedFailure(func)
+
+    return f
+
 def setUpModule():
 
     os.makedirs(network_unit_file_path, exist_ok=True)
@@ -110,8 +131,9 @@ class Utilities():
                 if (os.path.exists(os.path.join(network_unit_file_path, unit + '.d'))):
                     shutil.rmtree(os.path.join(network_unit_file_path, unit + '.d'))
 
-    def start_dnsmasq(self):
-        subprocess.check_call('dnsmasq -8 /var/run/networkd-ci/test-dnsmasq-log-file --log-queries=extra --log-dhcp --pid-file=/var/run/networkd-ci/test-test-dnsmasq.pid --conf-file=/dev/null --interface=veth-peer --enable-ra --dhcp-range=2600::10,2600::20 --dhcp-range=192.168.5.10,192.168.5.200 -R --dhcp-leasefile=/var/run/networkd-ci/lease --dhcp-option=26,1492 --dhcp-option=option:router,192.168.5.1 --dhcp-option=33,192.168.5.4,192.168.5.5 --port=0', shell=True)
+    def start_dnsmasq(self, additional_options=''):
+        dnsmasq_command = 'dnsmasq -8 /var/run/networkd-ci/test-dnsmasq-log-file --log-queries=extra --log-dhcp --pid-file=/var/run/networkd-ci/test-test-dnsmasq.pid --conf-file=/dev/null --interface=veth-peer --enable-ra --dhcp-range=2600::10,2600::20 --dhcp-range=192.168.5.10,192.168.5.200 -R --dhcp-leasefile=/var/run/networkd-ci/lease --dhcp-option=26,1492 --dhcp-option=option:router,192.168.5.1 --dhcp-option=33,192.168.5.4,192.168.5.5 --port=0 ' + additional_options
+        subprocess.check_call(dnsmasq_command, shell=True)
 
         time.sleep(10)
 
@@ -154,33 +176,6 @@ class Utilities():
         time.sleep(5)
         print()
 
-global ip
-global port
-
-class DHCPServer(threading.Thread):
-    def __init__(self, name):
-        threading.Thread.__init__(self)
-        self.name = name
-
-    def run(self):
-        self.start_dhcp_server()
-
-    def start_dhcp_server(self):
-        sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-
-        server_address = ('0.0.0.0', 67)
-        sock.bind(server_address)
-
-        print('Starting DHCP Server ...\n')
-        data, addr = sock.recvfrom(1024) # buffer size is 1024 bytes
-
-        global ip
-        ip = addr[0]
-
-        global port
-        port = addr[1]
-        sock.close()
-
 class NetworkdNetDevTests(unittest.TestCase, Utilities):
 
     links =[
@@ -553,6 +548,7 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities):
     links = [
         'bond199',
         'dummy98',
+        'dummy99',
         'test1']
 
     units = [
@@ -565,11 +561,14 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities):
         '25-address-link-section.network',
         '25-address-section-miscellaneous.network',
         '25-address-section.network',
+        '25-bind-carrier.network',
         '25-bond-active-backup-slave.netdev',
         '25-fibrule-invert.network',
         '25-fibrule-port-range.network',
         '25-ipv6-address-label-section.network',
         '25-neighbor-section.network',
+        '25-link-local-addressing-no.network',
+        '25-link-local-addressing-yes.network',
         '25-link-section-unmanaged.network',
         '25-route-gateway.network',
         '25-route-gateway-on-link.network',
@@ -653,6 +652,7 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities):
 
         subprocess.call(['ip', 'rule', 'del', 'table', '7'])
 
+    @expectedFailureIfRoutingPolicyPortRangeIsNotAvailable()
     def test_routing_policy_rule_port_range(self):
         self.copy_unit_to_networkd_unit_path('25-fibrule-port-range.network', '11-dummy.netdev')
         self.start_networkd()
@@ -670,6 +670,7 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities):
 
         subprocess.call(['ip', 'rule', 'del', 'table', '7'])
 
+    @expectedFailureIfRoutingPolicyIPProtoIsNotAvailable()
     def test_routing_policy_rule_invert(self):
         self.copy_unit_to_networkd_unit_path('25-fibrule-invert.network', '11-dummy.netdev')
         self.start_networkd()
@@ -864,6 +865,66 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities):
         self.assertRegex(output, '192.168.10.1.*00:00:5e:00:02:65.*PERMANENT')
         self.assertRegex(output, '2004:da8:1::1.*00:00:5e:00:02:66.*PERMANENT')
 
+    def test_link_local_addressing(self):
+        self.copy_unit_to_networkd_unit_path('25-link-local-addressing-yes.network', '11-dummy.netdev',
+                                             '25-link-local-addressing-no.network', '12-dummy.netdev')
+        self.start_networkd()
+
+        self.assertTrue(self.link_exits('test1'))
+        self.assertTrue(self.link_exits('dummy98'))
+
+        time.sleep(10)
+
+        output = subprocess.check_output(['ip', 'address', 'show', 'dev', 'test1']).rstrip().decode('utf-8')
+        print(output)
+        self.assertRegex(output, 'inet .* scope link')
+        self.assertRegex(output, 'inet6 .* scope link')
+
+        output = subprocess.check_output(['ip', 'address', 'show', 'dev', 'dummy98']).rstrip().decode('utf-8')
+        print(output)
+        self.assertNotRegex(output, 'inet6* .* scope link')
+
+        output = subprocess.check_output(['networkctl', 'status', 'test1']).rstrip().decode('utf-8')
+        print(output)
+        self.assertRegex(output, 'State: degraded \(configured\)')
+
+        output = subprocess.check_output(['networkctl', 'status', 'dummy98']).rstrip().decode('utf-8')
+        print(output)
+        self.assertRegex(output, 'State: carrier \(configured\)')
+
+        '''
+        Documentation/networking/ip-sysctl.txt
+
+        addr_gen_mode - INTEGER
+        Defines how link-local and autoconf addresses are generated.
+
+        0: generate address based on EUI64 (default)
+        1: do no generate a link-local address, use EUI64 for addresses generated
+           from autoconf
+        2: generate stable privacy addresses, using the secret from
+           stable_secret (RFC7217)
+        3: generate stable privacy addresses, using a random secret if unset
+        '''
+
+        test1_addr_gen_mode = ''
+        if os.path.exists(os.path.join(os.path.join(network_sysctl_ipv6_path, 'test1'), 'stable_secret')):
+            with open(os.path.join(os.path.join(network_sysctl_ipv6_path, 'test1'), 'stable_secret')) as f:
+                try:
+                    f.readline()
+                except IOError:
+                    # if stable_secret is unset, then EIO is returned
+                    test1_addr_gen_mode = '0'
+                else:
+                    test1_addr_gen_mode = '2'
+        else:
+            test1_addr_gen_mode = '0'
+
+        if os.path.exists(os.path.join(os.path.join(network_sysctl_ipv6_path, 'test1'), 'addr_gen_mode')):
+            self.assertEqual(self.read_ipv6_sysctl_attr('test1', 'addr_gen_mode'), '0')
+
+        if os.path.exists(os.path.join(os.path.join(network_sysctl_ipv6_path, 'dummy98'), 'addr_gen_mode')):
+            self.assertEqual(self.read_ipv6_sysctl_attr('dummy98', 'addr_gen_mode'), '1')
+
     def test_sysctl(self):
         self.copy_unit_to_networkd_unit_path('25-sysctl.network', '12-dummy.netdev')
         self.start_networkd()
@@ -878,6 +939,64 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities):
         self.assertEqual(self.read_ipv4_sysctl_attr('dummy98', 'forwarding'),'1')
         self.assertEqual(self.read_ipv4_sysctl_attr('dummy98', 'proxy_arp'), '1')
 
+    def test_bind_carrier(self):
+        self.copy_unit_to_networkd_unit_path('25-bind-carrier.network', '11-dummy.netdev')
+        self.start_networkd()
+
+        self.assertTrue(self.link_exits('test1'))
+
+        output = subprocess.check_output(['ip', '-d', 'link', 'show', 'test1']).rstrip().decode('utf-8')
+        print(output)
+
+        self.assertEqual(subprocess.call(['ip', 'link', 'add', 'dummy98', 'type', 'dummy']), 0)
+        self.assertEqual(subprocess.call(['ip', 'link', 'set', 'dummy98', 'up']), 0)
+        time.sleep(2)
+        output = subprocess.check_output(['ip', 'address', 'show', 'test1']).rstrip().decode('utf-8')
+        print(output)
+        self.assertRegex(output, 'UP,LOWER_UP')
+        self.assertRegex(output, 'inet 192.168.10.30/24 brd 192.168.10.255 scope global test1')
+        output = subprocess.check_output(['networkctl', 'status', 'test1']).rstrip().decode('utf-8')
+        self.assertRegex(output, 'State: routable \(configured\)')
+
+        self.assertEqual(subprocess.call(['ip', 'link', 'add', 'dummy99', 'type', 'dummy']), 0)
+        self.assertEqual(subprocess.call(['ip', 'link', 'set', 'dummy99', 'up']), 0)
+        time.sleep(2)
+        output = subprocess.check_output(['ip', 'address', 'show', 'test1']).rstrip().decode('utf-8')
+        print(output)
+        self.assertRegex(output, 'UP,LOWER_UP')
+        self.assertRegex(output, 'inet 192.168.10.30/24 brd 192.168.10.255 scope global test1')
+        output = subprocess.check_output(['networkctl', 'status', 'test1']).rstrip().decode('utf-8')
+        self.assertRegex(output, 'State: routable \(configured\)')
+
+        self.assertEqual(subprocess.call(['ip', 'link', 'del', 'dummy98']), 0)
+        time.sleep(2)
+        output = subprocess.check_output(['ip', 'address', 'show', 'test1']).rstrip().decode('utf-8')
+        print(output)
+        self.assertRegex(output, 'UP,LOWER_UP')
+        self.assertRegex(output, 'inet 192.168.10.30/24 brd 192.168.10.255 scope global test1')
+        output = subprocess.check_output(['networkctl', 'status', 'test1']).rstrip().decode('utf-8')
+        self.assertRegex(output, 'State: routable \(configured\)')
+
+        self.assertEqual(subprocess.call(['ip', 'link', 'del', 'dummy99']), 0)
+        time.sleep(2)
+        output = subprocess.check_output(['ip', 'address', 'show', 'test1']).rstrip().decode('utf-8')
+        print(output)
+        self.assertNotRegex(output, 'UP,LOWER_UP')
+        self.assertRegex(output, 'DOWN')
+        self.assertNotRegex(output, '192.168.10')
+        output = subprocess.check_output(['networkctl', 'status', 'test1']).rstrip().decode('utf-8')
+        self.assertRegex(output, 'State: off \(configured\)')
+
+        self.assertEqual(subprocess.call(['ip', 'link', 'add', 'dummy98', 'type', 'dummy']), 0)
+        self.assertEqual(subprocess.call(['ip', 'link', 'set', 'dummy98', 'up']), 0)
+        time.sleep(2)
+        output = subprocess.check_output(['ip', 'address', 'show', 'test1']).rstrip().decode('utf-8')
+        print(output)
+        self.assertRegex(output, 'UP,LOWER_UP')
+        self.assertRegex(output, 'inet 192.168.10.30/24 brd 192.168.10.255 scope global test1')
+        output = subprocess.check_output(['networkctl', 'status', 'test1']).rstrip().decode('utf-8')
+        self.assertRegex(output, 'State: routable \(configured\)')
+
 class NetworkdNetWorkBridgeTests(unittest.TestCase, Utilities):
     links = [
         'bridge99',
@@ -1021,7 +1140,7 @@ class NetworkdNetworkDHCPServerTests(unittest.TestCase, Utilities):
         self.assertRegex(output, 'NTP: 192.168.5.1')
 
     def test_domain(self):
-        self.copy_unit_to_networkd_unit_path( '12-dummy.netdev', '24-search-domain.network')
+        self.copy_unit_to_networkd_unit_path('12-dummy.netdev', '24-search-domain.network')
         self.start_networkd()
 
         self.assertTrue(self.link_exits('dummy98'))
@@ -1061,7 +1180,7 @@ class NetworkdNetworkDHCPClientTests(unittest.TestCase, Utilities):
         'dhcp-client-listen-port.network',
         'dhcp-client-route-metric.network',
         'dhcp-client-route-table.network',
-        'dhcp-client.network'
+        'dhcp-client.network',
         'dhcp-server-veth-peer.network',
         'dhcp-v4-server-veth-peer.network',
         'static.network']
@@ -1078,7 +1197,7 @@ class NetworkdNetworkDHCPClientTests(unittest.TestCase, Utilities):
         self.remove_log_file()
 
     def test_dhcp_client_ipv6_only(self):
-        self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network','dhcp-client-ipv6-only.network')
+        self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client-ipv6-only.network')
         self.start_networkd()
 
         self.assertTrue(self.link_exits('veth99'))
@@ -1091,7 +1210,7 @@ class NetworkdNetworkDHCPClientTests(unittest.TestCase, Utilities):
         self.assertNotRegex(output, '192.168.5')
 
     def test_dhcp_client_ipv4_only(self):
-        self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network','dhcp-client-ipv4-only-ipv6-disabled.network')
+        self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client-ipv4-only-ipv6-disabled.network')
         self.start_networkd()
 
         self.assertTrue(self.link_exits('veth99'))
@@ -1180,21 +1299,15 @@ class NetworkdNetworkDHCPClientTests(unittest.TestCase, Utilities):
 
     def test_dhcp_client_listen_port(self):
         self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network', 'dhcp-client-listen-port.network')
-
-        dh_server = DHCPServer("dhcp_server")
-        dh_server.start()
-
         self.start_networkd()
 
         self.assertTrue(self.link_exits('veth99'))
 
-        global port
-        global ip
+        self.start_dnsmasq('--dhcp-alternate-port=67,5555')
 
-        self.assertRegex(str(port), '5555')
-        self.assertRegex(str(ip), '0.0.0.0')
-
-        dh_server.join()
+        output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'veth99']).rstrip().decode('utf-8')
+        print(output)
+        self.assertRegex(output, '192.168.5.* dynamic')
 
     def test_dhcp_route_table_id(self):
         self.copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-v4-server-veth-peer.network', 'dhcp-client-route-table.network')
index 8703c8a37bd073f6938f706bb36f8f12b4261749..9d9448703fb70bae0b70b31d9c8504235e74e39b 100755 (executable)
@@ -46,12 +46,22 @@ TEMPLATE = '''\
         <refsect1>
                 <title>Environment variables</title>
 
-                <para>Environment variables understood by the systemd
-                manager and other programs.</para>
+                <para>Environment variables understood by the systemd manager
+                and other programs and environment variable-compatible settings.</para>
 
                 <variablelist id='environment-variables' />
         </refsect1>
 
+        <refsect1>
+                <title>EFI variables</title>
+
+                <para>EFI variables understood by
+                <citerefentry><refentrytitle>systemd-boot</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+                and other programs.</para>
+
+                <variablelist id='efi-variables' />
+        </refsect1>
+
         <refsect1>
                 <title>UDEV directives</title>
 
@@ -98,16 +108,25 @@ TEMPLATE = '''\
         </refsect1>
 
         <refsect1>
-                <title>System manager directives</title>
+                <title><citerefentry><refentrytitle>systemd.nspawn</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+                directives</title>
+
+                <para>Directives for configuring systemd-nspawn containers.</para>
+
+                <variablelist id='nspawn-directives' />
+        </refsect1>
+
+        <refsect1>
+                <title>Program configuration options</title>
 
                 <para>Directives for configuring the behaviour of the
-                systemd process.</para>
+                systemd process and other tools through configuration files.</para>
 
-                <variablelist id='systemd-directives' />
+                <variablelist id='config-directives' />
         </refsect1>
 
         <refsect1>
-                <title>command line options</title>
+                <title>Command line options</title>
 
                 <para>Command-line options accepted by programs in the
                 systemd suite.</para>
index 65e44ab3a4d3bba6a2a9eeb80535c61f95ae5ce6..af60114d34d91855e236a840fdf9582bb2260de0 100755 (executable)
@@ -3,7 +3,6 @@
 set -e
 set -x
 
-add-apt-repository ppa:upstream-systemd-ci/systemd-ci -y
 apt-get update
 apt-get build-dep systemd -y
 apt-get install -y util-linux libmount-dev libblkid-dev liblzma-dev libqrencode-dev libmicrohttpd-dev iptables-dev liblz4-dev libcurl4-gnutls-dev unifont itstool kbd cryptsetup-bin net-tools isc-dhcp-client iputils-ping strace qemu-system-x86 linux-image-virtual mount libgpg-error-dev libxkbcommon-dev python-lxml python3-lxml python3-pip libcap-dev
@@ -12,6 +11,8 @@ pip3 install meson
 
 cd $REPO_ROOT
 
+sed -i 's/2\.30/2.27/' meson.build
+
 meson --werror -Db_sanitize=address,undefined -Dsplit-usr=true build
 ninja -v -C build
 make -C test/TEST-01-BASIC clean setup run TEST_NO_QEMU=yes NSPAWN_ARGUMENTS=--keep-unit RUN_IN_UNPRIVILEGED_CONTAINER=no