On Fri, 2017-07-21 at 14:51 -0400, John Ferlan wrote:
> Not your fault of course, but the way this is done at the
> moment is *extremely* yucky.
>
> I just posted a patch[1] that makes it saner, and although I
> realize that's a bit more work I'd ask you to wait for it to
> land in master and then respin on top of it.
IMO: Probably should have had Dann's patch go first, then do the
adjustment. Water under the bridge though...
Either approach results in the same code at the end of the
day, but having my cleanup in first meant that the patch
adding AAVMF32 could be much shorter and to the point, and
that's a win in my book.
So in order to make progress and since it was a simple modification,
I
updated Dann's code to utilize the new model in qemu_conf.c from commit
id '6c2c04e75':
# define DEFAULT_LOADER_NVRAM \
"/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd:" \
"/usr/share/OVMF/OVMF_CODE.secboot.fd:/usr/share/OVMF/OVMF_VARS.fd:" \
"/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd:" \
"/usr/share/AAVMF/AAVMF32_CODE.fd:/usr/share/AAVMF/AAVMF32_VARS.fd"
Since there's another "looks good though" - I've pushed this to master
(and now pray that some CI build doesn't break ;-))
Thanks for that! And it looks like your prayers have been
heard: CI is covered in a beautiful shade of green today ;)
--
Andrea Bolognani / Red Hat / Virtualization