Commit bdf8752f authored by Michael Tokarev's avatar Michael Tokarev
Browse files

removed retry-pxe-after-efi.patch and depend on ipxe-qemu which introduced efi boot roms

parent 2b0dc585
......@@ -14,6 +14,9 @@ qemu (2.1+dfsg-3) UNRELEASED; urgency=medium
blobs in several (arch-specific) data directories instead of just one.
* removed all blob/firmware symlinks from qemu-system-x86, using
arch-specific datapath instead (/usr/share/seabios:/usr/lib/ipxe/qemu)
* removed retry-pxe-after-efi.patch and depend on ipxe-qemu which
introduced efi boot roms. qemu should not try to load "wrong"
ROM, or else migration will fail due to rom size mismatch.
-- Michael Tokarev <mjt@tls.msk.ru> Sat, 02 Aug 2014 13:47:26 +0400
......
......@@ -337,7 +337,7 @@ Package: qemu-system-x86
Architecture: amd64 arm arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 ppc64el s390x sparc sparc64
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}, qemu-system-common (>> 2.0.0+dfsg-7~),
seabios (>= 1.7.5~), ipxe-qemu
seabios (>= 1.7.5~), ipxe-qemu (>= 1.0.0+git-20131111.c3d1e78-1~)
Recommends: qemu-utils,
:ubuntu: cpu-checker
Suggests: samba, vde2, kmod [linux-any], sgabios, ovmf
......
Subject: retry pxe- after loading efi-
From: Michael Tokarev <mjt@tls.msk.ru>
Forwarded: no
Debian-Specific: yes
As of version 1.5, qemu now uses efi-XXXX.rom for network boot ROMS
instead of previously used pxe-XXXX.rom. This (hackish) patch, after
an attempt to load efi-XXXX.rom fails, tries again now searching for
pxe-XXXX.rom instead. This way we can still use old pxe-qemu package
which does not provide efi roms.
The patch is debian-specific, since upstream ships all necessary ROMs
in the source tarball and so always uses the right ROMs.
/mjt
--- a/vl.c
+++ b/vl.c
@@ -2365,6 +2365,7 @@ char *qemu_find_file(int type, const cha
abort();
}
+retry:
for (i = 0; i < data_dir_idx; i++) {
buf = g_strdup_printf("%s/%s%s", data_dir[i], subdir, name);
if (access(buf, R_OK) == 0) {
@@ -2373,6 +2374,16 @@ char *qemu_find_file(int type, const cha
}
g_free(buf);
}
+
+ if (memcmp(name, "efi-", 4) == 0 && type == QEMU_FILE_TYPE_BIOS) {
+ /* if not found but requested efi-*, retry with pxe-* */
+ buf = alloca(strlen(name) + 1);
+ strcpy(buf, "pxe");
+ strcpy(buf + 3, name + 3);
+ name = buf;
+ goto retry;
+ }
+
return NULL;
}
02_kfreebsd.patch
retry-pxe-after-efi.patch
use-fixed-data-path.patch
use-arch-data-path.patch
mjt-set-oem-in-rsdt-like-slic.diff
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment