diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-01-15 10:08:46 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-01-15 10:08:46 +0000 |
| commit | df58887b20fab8fe8a6dcca4db30cd4e4077d53a (patch) | |
| tree | f4831cf96c57d4974e6fe6d61b5ee98114de72e0 /vl.c | |
| parent | b629a38a13745d62d44de8ebb00f4e38ec6d8f7e (diff) | |
| parent | 99efa84d5c02e33bcca7be83dd7cabc4b0f22f14 (diff) | |
| download | focaccia-qemu-df58887b20fab8fe8a6dcca4db30cd4e4077d53a.tar.gz focaccia-qemu-df58887b20fab8fe8a6dcca4db30cd4e4077d53a.zip | |
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-01-15' into staging
trivial patches for 2015-01-15 # gpg: Signature made Thu 15 Jan 2015 08:26:26 GMT using RSA key ID A4C3D7DB # gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>" # gpg: aka "Michael Tokarev <mjt@corpit.ru>" # gpg: aka "Michael Tokarev <mjt@debian.org>" * remotes/mjt/tags/pull-trivial-patches-2015-01-15: vl.c: fix some alignment issues blizzard: do not depend on VGA internals Makefile: Remove config.status and common.env during 'make distclean' target-openrisc: bugfix for dec_sys to decode instructions correctly Do not hang on full PTY misc: Fix new typos in comments target-arm: Fix typo in comment (seperately -> separately) target-tricore: Fix new typos migration/qemu-file.c: Don't shift left into sign bit translate-all: Mark map_exec() with the 'unused' attribute tests/hd-geo-test.c: Remove unused test_image variable vt82c686: avoid out-of-bounds read Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'vl.c')
| -rw-r--r-- | vl.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/vl.c b/vl.c index 6adb36ecd4..fbf4240145 100644 --- a/vl.c +++ b/vl.c @@ -2873,7 +2873,7 @@ int main(int argc, char **argv, char **envp) if (optind >= argc) break; if (argv[optind][0] != '-') { - hda_opts = drive_add(IF_DEFAULT, 0, argv[optind++], HD_OPTS); + hda_opts = drive_add(IF_DEFAULT, 0, argv[optind++], HD_OPTS); } else { const QEMUOption *popt; @@ -2918,15 +2918,15 @@ int main(int argc, char **argv, char **envp) if (drive_def(optarg) == NULL) { exit(1); } - break; + break; case QEMU_OPTION_set: if (qemu_set_option(optarg) != 0) exit(1); - break; + break; case QEMU_OPTION_global: if (qemu_global_option(optarg) != 0) exit(1); - break; + break; case QEMU_OPTION_mtdblock: drive_add(IF_MTD, -1, optarg, MTD_OPTS); break; @@ -2978,7 +2978,7 @@ int main(int argc, char **argv, char **envp) fprintf(stderr, "qemu: invalid physical CHS format\n"); exit(1); } - if (hda_opts != NULL) { + if (hda_opts != NULL) { char num[16]; snprintf(num, sizeof(num), "%d", cyls); qemu_opt_set(hda_opts, "cyls", num); @@ -3152,9 +3152,9 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_S: autostart = 0; break; - case QEMU_OPTION_k: - keyboard_layout = optarg; - break; + case QEMU_OPTION_k: + keyboard_layout = optarg; + break; case QEMU_OPTION_localtime: rtc_utc = 0; break; @@ -3362,9 +3362,9 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_debugcon: add_device_config(DEV_DEBUGCON, optarg); break; - case QEMU_OPTION_loadvm: - loadvm = optarg; - break; + case QEMU_OPTION_loadvm: + loadvm = optarg; + break; case QEMU_OPTION_full_screen: full_screen = 1; break; @@ -3476,7 +3476,7 @@ int main(int argc, char **argv, char **envp) exit(1); } break; - case QEMU_OPTION_vnc: + case QEMU_OPTION_vnc: #ifdef CONFIG_VNC display_remote++; vnc_display = optarg; @@ -3514,11 +3514,11 @@ int main(int argc, char **argv, char **envp) } qemu_uuid_set = true; break; - case QEMU_OPTION_option_rom: - if (nb_option_roms >= MAX_OPTION_ROMS) { - fprintf(stderr, "Too many option ROMs\n"); - exit(1); - } + case QEMU_OPTION_option_rom: + if (nb_option_roms >= MAX_OPTION_ROMS) { + fprintf(stderr, "Too many option ROMs\n"); + exit(1); + } opts = qemu_opts_parse(qemu_find_opts("option-rom"), optarg, 1); if (!opts) { exit(1); @@ -3530,8 +3530,8 @@ int main(int argc, char **argv, char **envp) fprintf(stderr, "Option ROM file is not specified\n"); exit(1); } - nb_option_roms++; - break; + nb_option_roms++; + break; case QEMU_OPTION_semihosting: semihosting_enabled = 1; semihosting_target = SEMIHOSTING_TARGET_AUTO; |