Usually this might be set by loader but since
we're the loader lets allow to specify vesa
mode as well.

Signed-off-by: Cyrill Gorcunov <[email protected]>
---
 tools/kvm/kvm-run.c |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

Index: linux-2.6.git/tools/kvm/kvm-run.c
===================================================================
--- linux-2.6.git.orig/tools/kvm/kvm-run.c
+++ linux-2.6.git/tools/kvm/kvm-run.c
@@ -80,6 +80,7 @@ extern int  active_console;
 bool do_debug_print = false;
 
 static int nrcpus;
+static int vidmode = 0x312;
 
 static const char * const run_usage[] = {
        "kvm run [<options>] [<kernel image>]",
@@ -139,6 +140,10 @@ static const struct option options[] = {
        OPT_STRING('\0', "tapscript", &script, "Script path",
                         "Assign a script to process created tap device"),
 
+       OPT_GROUP("BIOS options:"),
+       OPT_INTEGER('\0', "vidmode", &vidmode,
+                   "Video mode"),
+
        OPT_GROUP("Debug options:"),
        OPT_BOOLEAN('\0', "debug", &do_debug_print,
                        "Enable debug messages"),
@@ -434,7 +439,6 @@ int kvm_cmd_run(int argc, const char **a
        struct framebuffer *fb = NULL;
        unsigned int nr_online_cpus;
        int exit_code = 0;
-       u16 vidmode = 0;
        int max_cpus;
        char *hi;
        int i;
@@ -541,12 +545,10 @@ int kvm_cmd_run(int argc, const char **a
 
        memset(real_cmdline, 0, sizeof(real_cmdline));
        strcpy(real_cmdline, "notsc noapic noacpi pci=conf1");
-       if (vnc || sdl) {
+       if (vnc || sdl)
                strcat(real_cmdline, " video=vesafb console=tty0");
-               vidmode = 0x312;
-       } else {
+       else
                strcat(real_cmdline, " console=ttyS0 earlyprintk=serial");
-       }
        strcat(real_cmdline, " ");
        if (kernel_cmdline)
                strlcat(real_cmdline, kernel_cmdline, sizeof(real_cmdline));

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to