aboutsummaryrefslogtreecommitdiff
path: root/linuxboot.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2015-05-21 12:53:25 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2015-05-21 13:19:59 +0200
commit630ddf38a2a32179c87656d3e1b80f45ce52d57f (patch)
treeabd596430fda45c4aa97b375678755a8106c627d /linuxboot.c
parent15c8f51a4762acf9e8cbf476f01be6b6af66caaa (diff)
downloadqboot-630ddf38a2a32179c87656d3e1b80f45ce52d57f.zip
qboot-630ddf38a2a32179c87656d3e1b80f45ce52d57f.tar.gz
qboot-630ddf38a2a32179c87656d3e1b80f45ce52d57f.tar.bz2
fix KVM e820 and initrd
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'linuxboot.c')
-rw-r--r--linuxboot.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/linuxboot.c b/linuxboot.c
index fc8b7fa..7ce07bc 100644
--- a/linuxboot.c
+++ b/linuxboot.c
@@ -64,6 +64,8 @@ bool parse_bzimage(struct linuxboot_args *args)
initrd_max = ldl_p(header+0x22c);
else
initrd_max = 0x37ffffff;
+ if (initrd_max > lowmem - 1)
+ initrd_max = lowmem - 1;
if (protocol >= 0x202)
stl_p(header+0x228, cmdline_addr);