Thanks for the comments, Laszlo. I could look into optimizing SetBootOrderFromQemu()->Match() by using EfiBootManagerGetNextLoadOptionDevicePath() instead of EfiBootManagerGetLoadOptionBuffer(). Makes sense to me and at first glance seems like it would work. My main concern is some unforeseen change in behavior that manifests in a regression somehow. Would require lots of testing beyond what I am capable of doing. However, I'd prefer to do this as a separate task from this PR as it's not really related, right? i.e. EfiBootManagerGetNextLoadOptionDevicePath() still ends up calling ConnectAll. just making sure I understand. Also, I can look into amending the PR commit to add the call chain for ConnectDevicesFromQemu that you menioned above. thanks again! -Aaron -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109526): https://edk2.groups.io/g/devel/message/109526 Mute This Topic: https://groups.io/mt/101876973/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-