]> git.proxmox.com Git - mirror_qemu.git/commit - hw/i386/pc.c
hw/i386/pc: run the multiboot loader before the PVH loader
authorStefano Garzarella <sgarzare@redhat.com>
Thu, 14 Feb 2019 18:02:16 +0000 (19:02 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 11 Mar 2019 15:33:49 +0000 (16:33 +0100)
commit5dc8ab361a6aed42560731eb9b4fdeff01ace948
tree834034c462e8c80ba1c92027c3e391f82f5c568b
parent944b96c61072d8b8dd6b253d4b1b80de1442cc1f
hw/i386/pc: run the multiboot loader before the PVH loader

Some multiboot images could be in the ELF format. In the current
implementation QEMU fails because we try to load these images
as a PVH image.

In order to fix this issue, we should try multiboot first (we
already check the multiboot magic header before to load it).
If it is not a multiboot image, we can try the PVH loader.

Fixes: ab969087da6 ("pvh: Boot uncompressed kernel using direct boot ABI", 2019-01-15)
Reported-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Message-Id: <20190214180216.246707-1-sgarzare@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
hw/i386/pc.c