diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-05-19 09:27:28 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-05-19 09:27:28 +0100 |
| commit | 8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3 (patch) | |
| tree | 93a1691d7a5d90ddbb77a3210299089fcede4947 /accel.c | |
| parent | a257c741491ff1c3c192d13a89c136dd6401c54d (diff) | |
| parent | cb8d4c8f54b8271f642f02382eec29d468bb1c77 (diff) | |
| download | focaccia-qemu-8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3.tar.gz focaccia-qemu-8ec4fe0a4bed4fa27e6f28a746bcf77b27cd05a3.zip | |
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2016-05-18' into staging
trivial patches for 2016-05-18 # gpg: Signature made Wed 18 May 2016 13:04:43 BST 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-2016-05-18: Fix some typos found by codespell 9p: drop unused declaration from coth.h smbios: fix typo accel: make configure_accelerator return void configure: Use uniform description for devel packages ipack: Update e-mail address util: fix comment typos qdict: fix unbounded stack warning for qdict_array_entries Fix typo in variable name (found and fixed by codespell) vl: fix comment about when parsing cpu definitions loader: fix potential memory leak remove comment for nonexistent structure member s390: remove misleading comment Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'accel.c')
| -rw-r--r-- | accel.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/accel.c b/accel.c index 0510b90f67..403eb5e94d 100644 --- a/accel.c +++ b/accel.c @@ -77,7 +77,7 @@ static int accel_init_machine(AccelClass *acc, MachineState *ms) return ret; } -int configure_accelerator(MachineState *ms) +void configure_accelerator(MachineState *ms) { const char *p; char buf[10]; @@ -128,8 +128,6 @@ int configure_accelerator(MachineState *ms) if (init_failed) { fprintf(stderr, "Back to %s accelerator.\n", acc->name); } - - return !accel_initialised; } |