On 04/21/17 19:59, Ben Warren wrote: > Hi, > >> On Apr 21, 2017, at 3:14 AM, Marc-André Lureau <[email protected]> >> wrote: >> >> Hi, >> >> Was this patch intentionally dropped from the series? >> > > Good question. I thought the whole patch series was pulled in, but it looks > like this one was not. I guess we’ll see what Michael has to say.
Unfortunately, the patch was lost due to a race condition in maintenance. (1) The VMGENID unit test, added in this patch, can only succeed if the SeaBIOS binary bundled with QEMU contains VMGENID patches as well. When this v8 patch series was originally posted (Feb 16th), the SeaBIOS binary bundled with QEMU wasn't ready for this patch. So the patch was delayed / postponed. (2) For that reason, Michael sent the PULL req with the *rest* of the patches, on March 1st: http://mid.mail-archive.com/[email protected] (3) Gerd updated the SeaBIOS binary meanwhile, to a revision that contained Ben's matching bios patches: $ git log v2.8.0..v2.9.0 -- pc-bios/bios.bin commit 8779fccbef0c2e97fd6564ddf9f1df9fc724f2f0 Author: Gerd Hoffmann <[email protected]> Date: Tue Feb 28 09:52:32 2017 +0100 seabios: update to 1.10.2 release git shortlog rel-1.10.1..rel-1.10.2 =================================== Ben Warren (5): QEMU DMA: Add DMA write capability romfile-loader: Switch to using named structs QEMU fw_cfg: Add command to write back address of file QEMU fw_cfg: Add functions for accessing files by key QEMU fw_cfg: Write fw_cfg back on S3 resume Kevin O'Connor (1): ps2port: Disable keyboard/mouse prior to resetting ps2 controller Ladi Prosek (1): ahci: Set upper 32-bit registers to zero Paul Menzel (1): vgasrc: Increase debug level Signed-off-by: Gerd Hoffmann <[email protected]> (4) In the end, the BIOS update commit, and the VMGENID v8 commits, are *not* in an ancestor/descandant relationship either way -- they are siblings: $ git-contains 42697d88de6b 8779fccbef0c 42697d88de6b [42697d88de6b MAINTAINERS: Add VM Generation ID entries] NEITHER CONTAINS NOR IS CONTAINED BY 8779fccbef0c [8779fccbef0c seabios: update to 1.10.2 release] And then the patch missed v2.9.0. I suggest to repost the patch now, and then maybe include it in 2.9.1 stable. Thanks Laszlo
