]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
kvm tools: Fix required boot protocol version
authorPekka Enberg <penberg@kernel.org>
Sun, 3 Apr 2011 09:42:12 +0000 (12:42 +0300)
committerPekka Enberg <penberg@kernel.org>
Sun, 3 Apr 2011 09:42:12 +0000 (12:42 +0300)
Cyrill has an old bzImage that SIGSEGVs when running under KVM because
'cmdline_size' is bogus. Reading Documentation/x86/boot.txt, it turns out
32-bit 'cmdline_size' requires boot protocol 2.06 or later so fix up
BOOT_PROTOCOL_REQUIRED.

Reported-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
tools/kvm/kvm.c

index ce87ed7c6233b85d7cb34ee83a7ea130bcfb55c6..49d550335910ddc007b329de7098b2f78e90e4d2 100644 (file)
@@ -250,7 +250,7 @@ void kvm__enable_singlestep(struct kvm *self)
 #define BOOT_LOADER_SP         0x8000
 #define BOOT_CMDLINE_OFFSET    0x20000
 
-#define BOOT_PROTOCOL_REQUIRED 0x202
+#define BOOT_PROTOCOL_REQUIRED 0x206
 #define LOAD_HIGH              0x01
 
 static int load_flat_binary(struct kvm *self, int fd)