diff options
| author | Esteban de la Canal <estebandlc@google.com> | 2015-08-01 00:00:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-08-01 00:00:59 +0000 |
| commit | aee4137bd1270737d85ad772dafae21451fb0295 (patch) | |
| tree | 31fb8d86d7d238dced02c12753472b0452c3d761 | |
| parent | 7fbbbcf1ac6946c5ab944c1b739a9468a86e1378 (diff) | |
| parent | f12249def772d4cc5e176b0534a5a5e9d2eab79b (diff) | |
| download | qemu-aee4137bd1270737d85ad772dafae21451fb0295.tar.gz | |
Merge "If HAX is running, don\'t print to stderr" into studio-1.4-dev
automerge: f12249d
* commit 'f12249def772d4cc5e176b0534a5a5e9d2eab79b':
If HAX is running, don't print to stderr
| -rw-r--r-- | vl-android.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/vl-android.c b/vl-android.c index 72f683db1c..d9c3dc82f3 100644 --- a/vl-android.c +++ b/vl-android.c @@ -3720,8 +3720,11 @@ int main(int argc, char **argv, char **envp) hax_set_ramsize(ram_size); ret = hax_init(smp_cpus); - fprintf(stderr, "HAX is %s and emulator runs in %s mode\n", - !ret ? "working" :"not working", !ret ? "fast virt" : "emulation"); + if (ret) { + fprintf(stderr, "HAXM is not working and emulator runs in emulation mode\n"); + } else { + fprintf(stdout, "HAXM is working and emulator runs in fast virt mode\n"); + } } #endif |