diff options
| author | Esteban de la Canal <estebandlc@google.com> | 2015-07-24 23:50:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-07-24 23:50:52 +0000 |
| commit | f12249def772d4cc5e176b0534a5a5e9d2eab79b (patch) | |
| tree | ad76c23ca6a22d0fa833ad1ee30d235b3add17d3 | |
| parent | dd6391c5eb6f0773de608800517d324c120f3a3d (diff) | |
| parent | 55587f2ba2ccfc87303c4820f00f98702be77f5c (diff) | |
| download | qemu-f12249def772d4cc5e176b0534a5a5e9d2eab79b.tar.gz | |
Merge "If HAX is running, don't print to stderr" into studio-1.4-dev
| -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 |