317485 2013-03-28 12:06:53 +0000 Solid::Device::listFromQuery( query ) returns fewer devices than `solid-hardware query $query` 2013-08-10 14:10:22 +0000 1 1 10 Unmaintained solid libsolid-udisks2 4.10.1 Other Linux RESOLVED FIXED https://bugs.kde.org/show_bug.cgi?id=322980 regression NOR normal 4.11 1 matej lukas afiestas mattia.verga myriam http://commits.kde.org/kdelibs/9d7a02f3af96551eaed0bd97e9fb9ccd03d54650 4.11 0 oldest_to_newest 1355135 0 matej 2013-03-28 12:06:53 +0000 Hi Lukáš, in Amarok, I do the following: > QString query( "[IS StorageAccess OR IS PortableMediaPlayer]" ); > QList<Solid::Device> ipodDevices = Solid::Device::listFromQuery( query ); > foreach( const Solid::Device &device, ipodDevices ) { debug() << device.udi(); } with the result "/org/kde/solid/udev/sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.2/1-1.2:1.0/host6/target6:0:0/6:0:0:0/block/sdc/sdc1" "/org/kde/solid/udev/sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.2/1-1.2:1.0/host6/target6:0:0/6:0:0:0/block/sdc/sdc2" "/org/kde/solid/udev/sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.2/1-1.2:1.0/host6/target6:0:0/6:0:0:0/block/sdc" "/org/kde/fstab/esprimo.local:/" "/org/kde/fstab/roundy.local:/" But when I issue `solid-hardware query "[IS StorageAccess OR IS PortableMediaPlayer]"`, I get: udi = '/org/kde/solid/udev/sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.2/1-1.2:1.0/host6/target6:0:0/6:0:0:0/block/sdc/sdc1' udi = '/org/kde/solid/udev/sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.2/1-1.2:1.0/host6/target6:0:0/6:0:0:0/block/sdc/sdc2' udi = '/org/kde/solid/udev/sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.2/1-1.2:1.0/host6/target6:0:0/6:0:0:0/block/sdc' udi = '/org/freedesktop/UDisks2/block_devices/sdb1' udi = '/org/freedesktop/UDisks2/block_devices/sda1' udi = '/org/freedesktop/UDisks2/block_devices/sdb2' udi = '/org/freedesktop/UDisks2/block_devices/sda2' udi = '/org/freedesktop/UDisks2/block_devices/sdb3' udi = '/org/freedesktop/UDisks2/block_devices/sda3' udi = '/org/freedesktop/UDisks2/block_devices/sdc2' udi = '/org/kde/fstab/esprimo.local:/' udi = '/org/kde/fstab/roundy.local:/' Notice how UDisks2 devices are not returned in Amarok code. This causes that iPod devices that are connected at the time Amarok is started aren't recognized any more (when iPod is plugged in *while* Amarok is running, Solid emits deviceAdded() and it is recognized correctly); the exact code worked well with KDE 4.9 & udisks1. At this point I don't know what I'm doing wrong in Amarok code. 1356939 1 afiestas 2013-04-02 20:14:55 +0000 Uh, this is really weird, is that bug reproducible all the times? if so, can you point us tot he file where this code comes from? If you list all devices, are udisk2 devices included? 1356954 2 matej 2013-04-02 20:46:34 +0000 (In reply to comment #1) > Uh, this is really weird, is that bug reproducible all the times? Yes. > if so, can you point us tot he file where this code comes from? http://quickgit.kde.org/?p=amarok.git&a=blob&f=src%2Fcore-impl%2Fcollections%2Fipodcollection%2FIpodCollectionFactory.cpp#45 - for debugging I apply patch below. > If you list all devices, are udisk2 devices included? Yes. Solid::Device::allDevices() includes UDisks2 devices; I get following ouput using the debugging patch below: BEGIN: virtual void IpodCollectionFactory::init() [IpodCollectionFactory] ::allDevices(): [IpodCollectionFactory] "/org/kde/solid/udev/sys/devices/LNXSYSTM:00/LNXCPU:00" (...) [IpodCollectionFactory] "/org/freedesktop/UDisks2/block_devices/sdc1" [IpodCollectionFactory] "/org/freedesktop/UDisks2/block_devices/sdc2" (...) [IpodCollectionFactory] ::listFromQuery(): [IpodCollectionFactory] "/org/kde/solid/udev/sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.1/1-1.1.1/1-1.1.1:1.0/host6/target6:0:0/6:0:0:0/block/sdc/sdc1" [IpodCollectionFactory] "/org/kde/solid/udev/sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.1/1-1.1.1/1-1.1.1:1.0/host6/target6:0:0/6:0:0:0/block/sdc/sdc2" [IpodCollectionFactory] "/org/kde/solid/udev/sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.1/1-1.1.1/1-1.1.1:1.0/host6/target6:0:0/6:0:0:0/block/sdc" [IpodCollectionFactory] "/org/kde/fstab/esprimo.local:/" [IpodCollectionFactory] "/org/kde/fstab/roundy.local:/" END__: virtual void IpodCollectionFactory::init() [Took: 0.33s] The same thing also happens USB Mass Storage Collection which uses nearly identical code with simpler query: "IS StorageAccess" diff --git a/src/core-impl/collections/ipodcollection/IpodCollectionFactory.cpp b/src/core-impl/collections/ipodcollection/IpodCollectionFactory.cpp index 7ecdcfa..bb6f12b 100644 --- a/src/core-impl/collections/ipodcollection/IpodCollectionFactory.cpp +++ b/src/core-impl/collections/ipodcollection/IpodCollectionFactory.cpp @@ -16,6 +16,8 @@ #include "IpodCollectionFactory.h" +#define DEBUG_PREFIX "IpodCollectionFactory" + #include "IpodCollection.h" #include "core/support/Debug.h" @@ -42,14 +44,20 @@ IpodCollectionFactory::~IpodCollectionFactory() void IpodCollectionFactory::init() { + DEBUG_BLOCK connect( Solid::DeviceNotifier::instance(), SIGNAL(deviceAdded(QString)), SLOT(slotAddSolidDevice(QString)) ); connect( Solid::DeviceNotifier::instance(), SIGNAL(deviceRemoved(QString)), SLOT(slotRemoveSolidDevice(QString)) ); + debug() << "::allDevices():"; + foreach( const Solid::Device &d, Solid::Device::allDevices() ) { debug() << d.udi(); } + // detect iPods that were already connected on startup QString query( "[IS StorageAccess OR IS PortableMediaPlayer]" ); QList<Solid::Device> ipodDevices = Solid::Device::listFromQuery( query ); + debug() << "::listFromQuery():"; + foreach( const Solid::Device &d, ipodDevices ) { debug() << d.udi(); } foreach( Solid::Device device, ipodDevices ) { if( identifySolidDevice( device.udi() ) ) 1356985 3 afiestas 2013-04-02 22:55:38 +0000 I'm quite certain that the bug is in udisk2 backend, method: devicemanager.cpp QStringList Manager::devicesFromQuery Can you do some debugging around there? Since parenetUdi is empty, I'm thinking that either: deviceCache() is returning an empty stringlist or we are failing to detect the type properly for some weird reason :/ 1368834 4 mattia.verga 2013-05-14 19:03:47 +0000 Udisks2 backend do weird things also when detecting hard disks: see bug 311408 , could be related? 1385217 5 81261 matej 2013-07-22 11:20:19 +0000 Created attachment 81261 amarok-debugging-for-afiestas.patch 1385218 6 81262 matej 2013-07-22 11:20:46 +0000 Created attachment 81262 kdelibs-debugging-for-afiestas.patch 1385219 7 matej 2013-07-22 11:30:38 +0000 Hi Àlex, please find the 2 debugging patches to identify the problem we've worked on at Akademy on bug https://bugs.kde.org/show_bug.cgi?id=317485 After applying both amarok and kdelibs patch, reproducing is as easy as plugging in and mounting a USB drive, starting Amarok from console as amarok --debug --nofork and watching for UmsCollection string. Interesting observations: * The exact solid device is instantiated earlier and in that case it prints out product just fine. * Messages like `"/org/freedesktop/UDisks2/drives/Corsair_Flash_Voyager_A400000000025639" : property "Drive" does not exist` seem to be root of the cause * my udisks version is 2.1.0 Matěj 1386997 8 matej 2013-07-30 12:57:11 +0000 *** Bug 322980 has been marked as a duplicate of this bug. *** 1387058 9 matej 2013-07-30 17:56:06 +0000 Git commit cfaa48278274f70fab3f6e1b610660edafbf7bbc by Matěj Laitl. Committed on 30/07/2013 at 17:51. Pushed by laitl into branch 'master'. MediaDeviceCache: work-around Solid UDisks2 bug by not calling allDevices() Kudos go to Alex Fiestas for extensive debugging and finding out the root of the problem. BUGFIXES: * Work-around Solid UDisks2 backend bug that caused USB Mass Storage devices and iPods not being recognized when connected before Amarok was started. Also fixes a bug where blank devices would appear in Play Media dialog. (BR 322980) We don't need to call Solid::Device::allDevices() at all because that was only needed for Apple iPhone support for the *old* iPod collection that was replaced in Amarok 2.6. Related: bug 322980 FIXED-IN: 2.8 M +3 -0 ChangeLog M +0 -23 src/MediaDeviceCache.cpp http://commits.kde.org/amarok/cfaa48278274f70fab3f6e1b610660edafbf7bbc 1387480 10 afiestas 2013-08-01 19:46:47 +0000 Git commit b92df2769477f48102ccc215f5d5eae5c4a6e5a5 by Àlex Fiestas. Committed on 01/08/2013 at 19:24. Pushed by afiestas into branch 'master'. Do not clean the cache in UDisks2 backend By deleting DeviceBackend we are invalidating all UDisks2::Devices that are in libsolid frontend, since their m_backend will be 0 Related: bug 314544 REVIEW:111802 M +0 -6 solid/solid/backends/udisks2/udisksmanager.cpp http://commits.kde.org/kdelibs/b92df2769477f48102ccc215f5d5eae5c4a6e5a5 1388051 11 afiestas 2013-08-05 13:32:16 +0000 Git commit 9d7a02f3af96551eaed0bd97e9fb9ccd03d54650 by Àlex Fiestas. Committed on 01/08/2013 at 19:24. Pushed by afiestas into branch 'KDE/4.11'. Do not clean the cache in UDisks2 backend By deleting DeviceBackend we are invalidating all UDisks2::Devices that are in libsolid frontend, since their m_backend will be 0 Related: bug 314544 REVIEW:111802 (cherry picked from commit b92df2769477f48102ccc215f5d5eae5c4a6e5a5) M +0 -6 solid/solid/backends/udisks2/udisksmanager.cpp http://commits.kde.org/kdelibs/9d7a02f3af96551eaed0bd97e9fb9ccd03d54650 81261 2013-07-22 11:20:19 +0000 2013-07-22 11:20:19 +0000 amarok-debugging-for-afiestas.patch amarok-debugging-for-afiestas.patch text/plain 2806 matej ZGlmZiAtLWdpdCBhL3NyYy9jb3JlLWltcGwvY29sbGVjdGlvbnMvaXBvZGNvbGxlY3Rpb24vSXBv ZENvbGxlY3Rpb25GYWN0b3J5LmNwcCBiL3NyYy9jb3JlLWltcGwvY29sbGVjdGlvbnMvaXBvZGNv bGxlY3Rpb24vSXBvZENvbGxlY3Rpb25GYWN0b3J5LmNwcAppbmRleCA3ZWNkY2ZhLi43MWI2YThj IDEwMDY0NAotLS0gYS9zcmMvY29yZS1pbXBsL2NvbGxlY3Rpb25zL2lwb2Rjb2xsZWN0aW9uL0lw b2RDb2xsZWN0aW9uRmFjdG9yeS5jcHAKKysrIGIvc3JjL2NvcmUtaW1wbC9jb2xsZWN0aW9ucy9p cG9kY29sbGVjdGlvbi9JcG9kQ29sbGVjdGlvbkZhY3RvcnkuY3BwCkBAIC0xNCw2ICsxNCw4IEBA CiAgKiB0aGlzIHByb2dyYW0uICBJZiBub3QsIHNlZSA8aHR0cDovL3d3dy5nbnUub3JnL2xpY2Vu c2VzLz4uICAgICAgICAgICAgICAgICAgICAgICAgICAgKgogICoqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKiovCiAKKyNkZWZpbmUgREVCVUdfUFJFRklYICJJcG9kQ29sbGVjdGlvbkZhY3Rv cnkiCisKICNpbmNsdWRlICJJcG9kQ29sbGVjdGlvbkZhY3RvcnkuaCIKIAogI2luY2x1ZGUgIklw b2RDb2xsZWN0aW9uLmgiCkBAIC00MiwxNCArNDQsMjAgQEAgSXBvZENvbGxlY3Rpb25GYWN0b3J5 Ojp+SXBvZENvbGxlY3Rpb25GYWN0b3J5KCkKIHZvaWQKIElwb2RDb2xsZWN0aW9uRmFjdG9yeTo6 aW5pdCgpCiB7CisgICAgREVCVUdfQkxPQ0sKICAgICBjb25uZWN0KCBTb2xpZDo6RGV2aWNlTm90 aWZpZXI6Omluc3RhbmNlKCksIFNJR05BTChkZXZpY2VBZGRlZChRU3RyaW5nKSksCiAgICAgICAg ICAgICAgU0xPVChzbG90QWRkU29saWREZXZpY2UoUVN0cmluZykpICk7CiAgICAgY29ubmVjdCgg U29saWQ6OkRldmljZU5vdGlmaWVyOjppbnN0YW5jZSgpLCBTSUdOQUwoZGV2aWNlUmVtb3ZlZChR U3RyaW5nKSksCiAgICAgICAgICAgICAgU0xPVChzbG90UmVtb3ZlU29saWREZXZpY2UoUVN0cmlu ZykpICk7CiAKKyAgICBkZWJ1ZygpIDw8ICI6OmFsbERldmljZXMoKToiOworICAgIGZvcmVhY2go IGNvbnN0IFNvbGlkOjpEZXZpY2UgJmQsIFNvbGlkOjpEZXZpY2U6OmFsbERldmljZXMoKSApIHsg ZGVidWcoKSA8PCBkLnVkaSgpOyB9CisKICAgICAvLyBkZXRlY3QgaVBvZHMgdGhhdCB3ZXJlIGFs cmVhZHkgY29ubmVjdGVkIG9uIHN0YXJ0dXAKICAgICBRU3RyaW5nIHF1ZXJ5KCAiW0lTIFN0b3Jh Z2VBY2Nlc3MgT1IgSVMgUG9ydGFibGVNZWRpYVBsYXllcl0iICk7CiAgICAgUUxpc3Q8U29saWQ6 OkRldmljZT4gaXBvZERldmljZXMgPSBTb2xpZDo6RGV2aWNlOjpsaXN0RnJvbVF1ZXJ5KCBxdWVy eSApOworICAgIGRlYnVnKCkgPDwgIjo6bGlzdEZyb21RdWVyeSgpOiI7CisgICAgZm9yZWFjaCgg Y29uc3QgU29saWQ6OkRldmljZSAmZCwgaXBvZERldmljZXMgKSB7IGRlYnVnKCkgPDwgZC51ZGko KTsgfQogICAgIGZvcmVhY2goIFNvbGlkOjpEZXZpY2UgZGV2aWNlLCBpcG9kRGV2aWNlcyApCiAg ICAgewogICAgICAgICBpZiggaWRlbnRpZnlTb2xpZERldmljZSggZGV2aWNlLnVkaSgpICkgKQpk aWZmIC0tZ2l0IGEvc3JjL2NvcmUtaW1wbC9jb2xsZWN0aW9ucy91bXNjb2xsZWN0aW9uL1Vtc0Nv bGxlY3Rpb24uY3BwIGIvc3JjL2NvcmUtaW1wbC9jb2xsZWN0aW9ucy91bXNjb2xsZWN0aW9uL1Vt c0NvbGxlY3Rpb24uY3BwCmluZGV4IDAyODk2NmUuLjYyYmY5YzkgMTAwNjQ0Ci0tLSBhL3NyYy9j b3JlLWltcGwvY29sbGVjdGlvbnMvdW1zY29sbGVjdGlvbi9VbXNDb2xsZWN0aW9uLmNwcAorKysg Yi9zcmMvY29yZS1pbXBsL2NvbGxlY3Rpb25zL3Vtc2NvbGxlY3Rpb24vVW1zQ29sbGVjdGlvbi5j cHAKQEAgLTY2LDE0ICs2NiwyMCBAQCBVbXNDb2xsZWN0aW9uRmFjdG9yeTo6flVtc0NvbGxlY3Rp b25GYWN0b3J5KCkKIHZvaWQKIFVtc0NvbGxlY3Rpb25GYWN0b3J5Ojppbml0KCkKIHsKKyAgICBE RUJVR19CTE9DSwogICAgIGNvbm5lY3QoIFNvbGlkOjpEZXZpY2VOb3RpZmllcjo6aW5zdGFuY2Uo KSwgU0lHTkFMKGRldmljZUFkZGVkKFFTdHJpbmcpKSwKICAgICAgICAgICAgICBTTE9UKHNsb3RB ZGRTb2xpZERldmljZShRU3RyaW5nKSkgKTsKICAgICBjb25uZWN0KCBTb2xpZDo6RGV2aWNlTm90 aWZpZXI6Omluc3RhbmNlKCksIFNJR05BTChkZXZpY2VSZW1vdmVkKFFTdHJpbmcpKSwKICAgICAg ICAgICAgICBTTE9UKHNsb3RSZW1vdmVTb2xpZERldmljZShRU3RyaW5nKSkgKTsKIAorICAgIGRl YnVnKCkgPDwgIjo6YWxsRGV2aWNlcygpOiI7CisgICAgZm9yZWFjaCggY29uc3QgU29saWQ6OkRl dmljZSAmZCwgU29saWQ6OkRldmljZTo6YWxsRGV2aWNlcygpICkgeyBkZWJ1ZygpIDw8IGQudWRp KCk7IH0KKwogICAgIC8vIGRldGVjdCBVTVMgZGV2aWNlcyB0aGF0IHdlcmUgYWxyZWFkeSBjb25u ZWN0ZWQgb24gc3RhcnR1cAogICAgIFFTdHJpbmcgcXVlcnkoICJJUyBTdG9yYWdlQWNjZXNzIiAp OwogICAgIFFMaXN0PFNvbGlkOjpEZXZpY2U+IGRldmljZXMgPSBTb2xpZDo6RGV2aWNlOjpsaXN0 RnJvbVF1ZXJ5KCBxdWVyeSApOworICAgIGRlYnVnKCkgPDwgIjo6bGlzdEZyb21RdWVyeSgpOiI7 CisgICAgZm9yZWFjaCggY29uc3QgU29saWQ6OkRldmljZSAmZCwgZGV2aWNlcyApIHsgZGVidWco KSA8PCBkLnVkaSgpOyB9CiAgICAgZm9yZWFjaCggY29uc3QgU29saWQ6OkRldmljZSAmZGV2aWNl LCBkZXZpY2VzICkKICAgICB7CiAgICAgICAgIGlmKCBpZGVudGlmeVNvbGlkRGV2aWNlKCBkZXZp Y2UudWRpKCkgKSApCg== 81262 2013-07-22 11:20:46 +0000 2013-07-22 11:20:46 +0000 kdelibs-debugging-for-afiestas.patch kdelibs-debugging-for-afiestas.patch text/plain 4542 matej ZGlmZiAtLWdpdCBhL3NvbGlkL3NvbGlkL2JhY2tlbmRzL3VkaXNrczIvdWRpc2tzZGV2aWNlLmNw cCBiL3NvbGlkL3NvbGlkL2JhY2tlbmRzL3VkaXNrczIvdWRpc2tzZGV2aWNlLmNwcAppbmRleCAx YWE3YjZkLi4xMTVhNzZmIDEwMDY0NAotLS0gYS9zb2xpZC9zb2xpZC9iYWNrZW5kcy91ZGlza3My L3VkaXNrc2RldmljZS5jcHAKKysrIGIvc29saWQvc29saWQvYmFja2VuZHMvdWRpc2tzMi91ZGlz a3NkZXZpY2UuY3BwCkBAIC04MjksNSArODI5LDYgQEAgYm9vbCBEZXZpY2U6OmlzTG9vcCgpIGNv bnN0CiAKIFFTdHJpbmcgRGV2aWNlOjpkcml2ZVBhdGgoKSBjb25zdAogeworICAgIHFEZWJ1Zygp IDw8IFFfRlVOQ19JTkZPIDw8ICJEcml2ZSBwcm9wZXJ0eSB2YWx1ZToiIDw8IHByb3AoIkRyaXZl Iik7CiAgICAgcmV0dXJuIHByb3AoIkRyaXZlIikudmFsdWU8UURCdXNPYmplY3RQYXRoPigpLnBh dGgoKTsKIH0KZGlmZiAtLWdpdCBhL3NvbGlkL3NvbGlkL2JhY2tlbmRzL3VkaXNrczIvdWRpc2tz bWFuYWdlci5jcHAgYi9zb2xpZC9zb2xpZC9iYWNrZW5kcy91ZGlza3MyL3VkaXNrc21hbmFnZXIu Y3BwCmluZGV4IGU3NmRmZDEuLmQ4ZDViOGIgMTAwNjQ0Ci0tLSBhL3NvbGlkL3NvbGlkL2JhY2tl bmRzL3VkaXNrczIvdWRpc2tzbWFuYWdlci5jcHAKKysrIGIvc29saWQvc29saWQvYmFja2VuZHMv dWRpc2tzMi91ZGlza3NtYW5hZ2VyLmNwcApAQCAtMTAyLDEwICsxMDIsMTIgQEAgUU9iamVjdCog TWFuYWdlcjo6Y3JlYXRlRGV2aWNlKGNvbnN0IFFTdHJpbmcmIHVkaSkKIAogUVN0cmluZ0xpc3Qg TWFuYWdlcjo6ZGV2aWNlc0Zyb21RdWVyeShjb25zdCBRU3RyaW5nJiBwYXJlbnRVZGksIFNvbGlk OjpEZXZpY2VJbnRlcmZhY2U6OlR5cGUgdHlwZSkKIHsKKyAgICBxRGVidWcoKSA8PCBRX0ZVTkNf SU5GTzsKICAgICBRU3RyaW5nTGlzdCByZXN1bHQ7CiAKICAgICBpZiAoIXBhcmVudFVkaS5pc0Vt cHR5KCkpCiAgICAgeworICAgICAgICBxRGVidWcoKSA8PCAibm9uLWVtcHR5IHBhcmVudFVkaSBj YXNlIjsKICAgICAgICAgUV9GT1JFQUNIIChjb25zdCBRU3RyaW5nICZ1ZGksIGRldmljZUNhY2hl KCkpCiAgICAgICAgIHsKICAgICAgICAgICAgIERldmljZSBkZXZpY2UodWRpKTsKQEAgLTExNyw2 ICsxMTksNyBAQCBRU3RyaW5nTGlzdCBNYW5hZ2VyOjpkZXZpY2VzRnJvbVF1ZXJ5KGNvbnN0IFFT dHJpbmcmIHBhcmVudFVkaSwgU29saWQ6OkRldmljZUludAogICAgIH0KICAgICBlbHNlIGlmICh0 eXBlICE9IFNvbGlkOjpEZXZpY2VJbnRlcmZhY2U6OlVua25vd24pCiAgICAgeworICAgICAgICBx RGVidWcoKSA8PCAibm9uLVVua25vd24gZGV2aWNlIGludGVyZmFjZSB0eXBlIGNhc2UiOwogICAg ICAgICBRX0ZPUkVBQ0ggKGNvbnN0IFFTdHJpbmcgJnVkaSwgZGV2aWNlQ2FjaGUoKSkKICAgICAg ICAgewogICAgICAgICAgICAgRGV2aWNlIGRldmljZSh1ZGkpOwpkaWZmIC0tZ2l0IGEvc29saWQv c29saWQvZGV2aWNlbWFuYWdlci5jcHAgYi9zb2xpZC9zb2xpZC9kZXZpY2VtYW5hZ2VyLmNwcApp bmRleCBhNDY1MTY5Li4yYWRlMjg3IDEwMDY0NAotLS0gYS9zb2xpZC9zb2xpZC9kZXZpY2VtYW5h Z2VyLmNwcAorKysgYi9zb2xpZC9zb2xpZC9kZXZpY2VtYW5hZ2VyLmNwcApAQCAtODIsOSArODIs MTEgQEAgUUxpc3Q8U29saWQ6OkRldmljZT4gU29saWQ6OkRldmljZTo6YWxsRGV2aWNlcygpCiAg ICAgcmV0dXJuIGxpc3Q7CiB9CiAKKyNpbmNsdWRlIDxRRGVidWc+CiBRTGlzdDxTb2xpZDo6RGV2 aWNlPiBTb2xpZDo6RGV2aWNlOjpsaXN0RnJvbVF1ZXJ5KGNvbnN0IFFTdHJpbmcgJnByZWRpY2F0 ZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29u c3QgUVN0cmluZyAmcGFyZW50VWRpKQogeworICAgIHFEZWJ1ZygpIDw8IFFfRlVOQ19JTkZPOwog ICAgIFByZWRpY2F0ZSBwID0gUHJlZGljYXRlOjpmcm9tU3RyaW5nKHByZWRpY2F0ZSk7CiAKICAg ICBpZiAocC5pc1ZhbGlkKCkpCkBAIC0xMjIsMTEgKzEyNCwxNCBAQCBRTGlzdDxTb2xpZDo6RGV2 aWNlPiBTb2xpZDo6RGV2aWNlOjpsaXN0RnJvbVR5cGUoY29uc3QgRGV2aWNlSW50ZXJmYWNlOjpU eXBlICZ0eQogUUxpc3Q8U29saWQ6OkRldmljZT4gU29saWQ6OkRldmljZTo6bGlzdEZyb21RdWVy eShjb25zdCBQcmVkaWNhdGUgJnByZWRpY2F0ZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgUVN0cmluZyAmcGFyZW50VWRpKQogeworICAg IHFEZWJ1ZygpIDw8IFFfRlVOQ19JTkZPOwogICAgIFFMaXN0PERldmljZT4gbGlzdDsKICAgICBR TGlzdDxRT2JqZWN0Kj4gYmFja2VuZHMgPSBnbG9iYWxEZXZpY2VTdG9yYWdlLT5tYW5hZ2VyQmFj a2VuZHMoKTsKICAgICBRU2V0PERldmljZUludGVyZmFjZTo6VHlwZT4gdXNlZFR5cGVzID0gcHJl ZGljYXRlLnVzZWRUeXBlcygpOwogCiAgICAgZm9yZWFjaCAoUU9iamVjdCAqYmFja2VuZE9iaiwg YmFja2VuZHMpIHsKKyAgICAgICAgcURlYnVnKCkgPDwgIiAgcHJvY2VzaW5nIiA8PCBiYWNrZW5k T2JqOworCiAgICAgICAgIElmYWNlczo6RGV2aWNlTWFuYWdlciAqYmFja2VuZCA9IHFvYmplY3Rf Y2FzdDxJZmFjZXM6OkRldmljZU1hbmFnZXIgKj4oYmFja2VuZE9iaik7CiAKICAgICAgICAgaWYg KGJhY2tlbmQgPT0gMCkgY29udGludWU7CkBAIC0xMzUsNiArMTQwLDcgQEAgUUxpc3Q8U29saWQ6 OkRldmljZT4gU29saWQ6OkRldmljZTo6bGlzdEZyb21RdWVyeShjb25zdCBQcmVkaWNhdGUgJnBy ZWRpY2F0ZSwKICAgICAgICAgaWYgKHByZWRpY2F0ZS5pc1ZhbGlkKCkpIHsKICAgICAgICAgICAg IFFTZXQ8RGV2aWNlSW50ZXJmYWNlOjpUeXBlPiBzdXBwb3J0ZWRUeXBlcyA9IGJhY2tlbmQtPnN1 cHBvcnRlZEludGVyZmFjZXMoKTsKICAgICAgICAgICAgIGlmIChzdXBwb3J0ZWRUeXBlcy5pbnRl cnNlY3QodXNlZFR5cGVzKS5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAgICAgICBxRGVidWcoKSA8 PCAiICAgIHNraXBwaW5nIHRoaXMgYmFja2VuZCBiZWNhdXNlIG9mIG5vIGludGVyc2VjdCBpbiBk ZXYgdHlwZXMiOwogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgfQogCkBA IC0xNDUsOSArMTUxLDExIEBAIFFMaXN0PFNvbGlkOjpEZXZpY2U+IFNvbGlkOjpEZXZpY2U6Omxp c3RGcm9tUXVlcnkoY29uc3QgUHJlZGljYXRlICZwcmVkaWNhdGUsCiAgICAgICAgICAgICB1ZGlz Kz0gUVNldDxRU3RyaW5nPjo6ZnJvbUxpc3QoYmFja2VuZC0+YWxsRGV2aWNlcygpKTsKICAgICAg ICAgfQogCisgICAgICAgIHFEZWJ1ZygpIDw8ICIgICAgdWRpcyBiZWZvcmUgZmlsdGVyaW5nOiIg PDwgdWRpczsKICAgICAgICAgZm9yZWFjaCAoY29uc3QgUVN0cmluZyAmdWRpLCB1ZGlzKQogICAg ICAgICB7CiAgICAgICAgICAgICBEZXZpY2UgZGV2KHVkaSk7CisgICAgICAgICAgICBxRGVidWco KSA8PCBkZXYucHJvZHVjdCgpOwogCiAgICAgICAgICAgICBib29sIG1hdGNoZXMgPSBmYWxzZTsK IApAQCAtMjE2LDE0ICsyMjQsMjIgQEAgdm9pZCBTb2xpZDo6RGV2aWNlTWFuYWdlclByaXZhdGU6 Ol9rX2Rlc3Ryb3llZChRT2JqZWN0ICpvYmplY3QpCiAgICAgfQogfQogCisjaW5jbHVkZSA8UVRo cmVhZD4KIFNvbGlkOjpEZXZpY2VQcml2YXRlICpTb2xpZDo6RGV2aWNlTWFuYWdlclByaXZhdGU6 OmZpbmRSZWdpc3RlcmVkRGV2aWNlKGNvbnN0IFFTdHJpbmcgJnVkaSkKIHsKKyAgICBxRGVidWco KSA8PCBRX0ZVTkNfSU5GTyA8PCAidGhyZWFkOiIgPDwgUVRocmVhZDo6Y3VycmVudFRocmVhZCgp IDw8ICJ1ZGk6IiA8PCB1ZGk7CiAgICAgaWYgKHVkaS5pc0VtcHR5KCkpIHsKKyAgICAgICAgcURl YnVnKCkgPDwgIiAgZW1wdHkgdWRpLCByZXR1cm5pbmcgbnVsbCBkZXZpY2UiOwogICAgICAgICBy ZXR1cm4gbV9udWxsRGV2aWNlLmRhdGEoKTsKICAgICB9IGVsc2UgaWYgKG1fZGV2aWNlc01hcC5j b250YWlucyh1ZGkpKSB7CisgICAgICAgIGlmKCBtX2RldmljZXNNYXBbdWRpXS5kYXRhKCkgKQor ICAgICAgICAgICAgcURlYnVnKCkgPDwgIiAgY2FjaGVkIGluIG1fZGV2aWNlc01hcCwgICAgIGJh Y2tlbmQgb2JqZWN0OiIgPDwgbV9kZXZpY2VzTWFwW3VkaV0uZGF0YSgpLT5iYWNrZW5kT2JqZWN0 KCk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHFXYXJuaW5nKCkgPDwgIiAgY2FjaGVkIGlu IG1fZGV2aWNlc01hcCwgYnV0IG51bGwhIjsKICAgICAgICAgcmV0dXJuIG1fZGV2aWNlc01hcFt1 ZGldLmRhdGEoKTsKICAgICB9IGVsc2UgewogICAgICAgICBJZmFjZXM6OkRldmljZSAqaWZhY2Ug PSBjcmVhdGVCYWNrZW5kT2JqZWN0KHVkaSk7CisgICAgICAgIHFEZWJ1ZygpIDw8ICIgIGNyZWF0 aW5nIG5ldyBEZXZpY2VQcml2YXRlLCBiYWNrZW5kIG9iamVjdDoiIDw8IGlmYWNlOwogCiAgICAg ICAgIERldmljZVByaXZhdGUgKmRldkRhdGEgPSBuZXcgRGV2aWNlUHJpdmF0ZSh1ZGkpOwogICAg ICAgICBkZXZEYXRhLT5zZXRCYWNrZW5kT2JqZWN0KGlmYWNlKTsK