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>

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;
 }
 

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)