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 <gorcunov@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>

diff --git a/tools/kvm/kvm.c b/tools/kvm/kvm.c
index 49d550335910ddc007b329de7098b2f78e90e4d2..63ffc5b03a4e80e00ca23781074b51a00c96c410 100644 (file)
--- a/tools/kvm/kvm.c
+++ b/tools/kvm/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/tools/kvm/main.c b/tools/kvm/main.c
index ec729c03eb5c988fafa0a78b7f00f6c64d697d1e..f755804397edbbfb375e49bfba4701b2ad8406fe 100644 (file)
--- a/tools/kvm/main.c
+++ b/tools/kvm/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)