diff options
| author | Esteban de la Canal <estebandlc@google.com> | 2015-08-01 00:29:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-08-01 00:29:41 +0000 |
| commit | b68b0762ccd4ad9f43ab8c790f76c21db959a364 (patch) | |
| tree | b7cdd69e734acc6d565434204b20c9f09aa40a85 | |
| parent | 22844a8954d205a20afdf33dffea6c52f07677d5 (diff) | |
| parent | aee4137bd1270737d85ad772dafae21451fb0295 (diff) | |
| download | qemu-b68b0762ccd4ad9f43ab8c790f76c21db959a364.tar.gz | |
Merge "If HAX is running, don\'t print to stderr" into studio-1.4-dev automerge: f12249d
automerge: aee4137
* commit 'aee4137bd1270737d85ad772dafae21451fb0295':
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 |