On 16/01/19 19:31, Paolo Bonzini wrote: > On 16/01/19 18:49, Stefano Garzarella wrote: >> This patch series is based on "[PATCH v3 0/4] QEMU changes to do PVH boot" >> and >> provides a PVH option rom that can be used with SeaBIOS to boot uncompressed >> kernel using the x86/HVM direct boot ABI. >> >> Patches 1 and 2 are to prepare the PVH option rom, moving common functions in >> the new headers. Patch 3 adds the new PVH option rom. Patch 4 uses it when >> we >> are booting an uncompressed kernel using the x86/HVM direct boot ABI. Patch 5 >> adds the support of loading the initrd in the PVH option rom. >> >> Based-on: <1547554687-12687-1-git-send-email-liam.merw...@oracle.com> > > I get this: > > CC optionrom/pvh_main.o > /tmp/ccoel69H.s: Assembler messages: > /tmp/ccoel69H.s:171: Error: attempt to move .org backwards > > when applying this series on CentOS 7.
Oops, the issue was actaually in linux_dma - I was confused by make -j reordering the output. The fix is trivial --- a/pc-bios/optionrom/linuxboot_dma.c +++ b/pc-bios/optionrom/linuxboot_dma.c @@ -20,10 +20,6 @@ * Richard W.M. Jones <rjo...@redhat.com> */ -#include <stdint.h> -#include "optrom.h" -#include "optrom_fw_cfg.h" - asm( ".text\n" ".global _start\n" @@ -62,6 +58,10 @@ asm( " jmp load_kernel\n" ); +#include <stdint.h> +#include "optrom.h" +#include "optrom_fw_cfg.h" + static inline void set_es(void *addr) { uint32_t seg = (uint32_t)addr >> 4; Also, the $? in the new rule should be $^. I wouldn't use a pattern rule for that, writing it explicitly as "pvh.img: pvh.S pvh_main.c" Thanks, Paolo