From b9dfd5f6588b2abfe4757ae3ef34ac6438f2f8f7 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 --- tools/kvm/kvm.c | 5 ----- tools/kvm/main.c | 2 ++ 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/tools/kvm/kvm.c b/tools/kvm/kvm.c index 49d550335910..63ffc5b03a4e 100644 --- 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 ec729c03eb5c..f755804397ed 100644 --- 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) -- 2.39.5