reverted -translation option support

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3947 c046a42c-6fe2-441c-8c8c-71466251a162

1 files changed, 2 insertions, 24 deletions

diff --git a/vl.c b/vl.c
index 8c63ad953a..3ad3625b62 100644
--- a/vl.c
+++ b/vl.c
@@ -240,8 +240,6 @@ static CPUState *cur_cpu;
 static CPUState *next_cpu;
 static int event_pending = 1;
 
-extern char *logfilename;
-
 #define TFR(expr) do { if ((expr) != -1) break; } while (errno == EINTR)
 
 /***********************************************************/
@@ -7663,9 +7661,7 @@ static void help(int exitcode)
 #endif
            "-clock          force the use of the given methods for timer alarm.\n"
            "                To see what timers are available use -clock help\n"
-           "-startdate      select initial date of the Qemu clock\n"
-           "-translation setting1,... configures code translation\n"
-           "                (use -translation ? for a list of settings)\n"
+           "-startdate      select initial date of the clock\n"
            "\n"
            "During emulation, the following keys are useful:\n"
            "ctrl-alt-f      toggle full screen\n"
@@ -7681,7 +7677,7 @@ static void help(int exitcode)
            DEFAULT_NETWORK_DOWN_SCRIPT,
 #endif
            DEFAULT_GDBSTUB_PORT,
-           logfilename);
+           "/tmp/qemu.log");
     exit(exitcode);
 }
 
@@ -7768,7 +7764,6 @@ enum {
     QEMU_OPTION_old_param,
     QEMU_OPTION_clock,
     QEMU_OPTION_startdate,
-    QEMU_OPTION_translation,
 };
 
 typedef struct QEMUOption {
@@ -7877,7 +7872,6 @@ const QEMUOption qemu_options[] = {
 #endif
     { "clock", HAS_ARG, QEMU_OPTION_clock },
     { "startdate", HAS_ARG, QEMU_OPTION_startdate },
-    { "translation", HAS_ARG, QEMU_OPTION_translation },
     { NULL },
 };
 
@@ -8720,22 +8714,6 @@ int main(int argc, char **argv)
                     }
                 }
                 break;
-            case QEMU_OPTION_translation:
-                {
-                    int mask;
-                    CPUTranslationSetting *setting;
-
-                    mask = cpu_str_to_translation_mask(optarg);
-                    if (!mask) {
-                        printf("Translation settings (comma separated):\n");
-                        for(setting = cpu_translation_settings; setting->mask != 0; setting++) {
-                            printf("%-10s %s\n", setting->name, setting->help);
-                    }
-                    exit(1);
-                    }
-                    cpu_set_translation_settings(mask);
-                }
-                break;
             }
         }
     }