From 9d850b37601e63c7cd6daf5608b21fc80460314a Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Tue, 5 Apr 2011 20:43:39 +0300 Subject: [PATCH] kvm tools: Setup BIOS for both bzImage and flat image There is no differences in terms of BIOS what kind of kernel is loaded so we have to setup BIOS for both bzImage and flat image. Signed-off-by: Cyrill Gorcunov Signed-off-by: Pekka Enberg --- kvm.c | 5 ----- main.c | 2 ++ 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/kvm.c b/kvm.c index 49d5503..63ffc5b 100644 --- a/kvm.c +++ b/kvm.c @@ -384,11 +384,6 @@ static bool load_bzimage(struct kvm *self, int fd_kernel, self->boot_ip = BOOT_LOADER_IP + 0x200; self->boot_sp = BOOT_LOADER_SP; - /* - * Drum roll, BIOS is coming to live, oh dear... - */ - setup_bios(self); - return true; } diff --git a/main.c b/main.c index ec729c0..f755804 100644 --- a/main.c +++ b/main.c @@ -162,6 +162,8 @@ int main(int argc, char *argv[]) kvm__reset_vcpu(kvm); + setup_bios(kvm); + kvm__setup_mem(kvm); if (single_step)