aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * device_tree.c: minor integrateDavid 'Digit' Turner2011-06-012-3/+2
| | | | | | | | Change-Id: Icdf8faee825c68ab572311d74c981b07495c4875
| * bswap.h + others: minor integrateDavid 'Digit' Turner2011-06-014-3/+16
| | | | | | | | Change-Id: I8706d2e3f2d722bae368e70d3adf6bd335dd8e58
| * buffered_file.c: minor integrateDavid 'Digit' Turner2011-06-011-1/+0
| | | | | | | | Change-Id: Ibe4acc763527d5323a06b8254190cabc990c67ce
| * savevm: Remove OutputBuffer hack.David 'Digit' Turner2011-06-0110-211/+147
| | | | | | | | | | | | It's easier to provide a fake Monitor object instead. Change-Id: Ia45267061d489b147497add6120d3caa9234ac11
| * savevm.c: minor integrateDavid 'Digit' Turner2011-06-013-108/+167
| | | | | | | | Change-Id: I16103c65ac7b15b2dc58dcc7dd6b3052004aa31a
| * arm-semi.c: minor integrateDavid 'Digit' Turner2011-06-011-31/+49
| | | | | | | | Change-Id: I85eee449af2f990bb95028efd5db59c1e8618280
| * README: minor integrateDavid 'Digit' Turner2011-06-011-22/+2
| | | | | | | | Change-Id: I36267e0f78a0d27903c13d0ac306461793bd5425
| * trace: simplify code and avoid conflictsDavid 'Digit' Turner2011-06-017-471/+103
| | | | | | | | Change-Id: I8f93e06038bd6e35a2972e3fef351046c247e4ee
| * acl.c: minor integrateDavid 'Digit' Turner2011-06-011-1/+0
| | | | | | | | Change-Id: Id1e6f7848a2286a9595442279261b8b06674780b
| * arm-dis.c: minor integrateDavid 'Digit' Turner2011-06-012-58/+76
| | | | | | | | Change-Id: Ib97f8ceed7563bdfaa772eb1b865b46b3ee81781
| * fpu: upstream integrateDavid 'Digit' Turner2011-06-016-791/+1888
| | | | | | | | Change-Id: Ifadcfe209b1d0891a6a81a60bcc1f0ab76dedc11
| * json-lexer.c, json-parser.c: minor integrateDavid 'Digit' Turner2011-06-012-8/+5
| | | | | | | | Change-Id: Id7a703f5c93c9a9cbd47a5f44bfdf900080e7430
| * trace.h: minor C compatibility fixes.David 'Digit' Turner2011-06-011-3/+3
| | | | | | | | Change-Id: I8f60bd9a4c691845c8e697ddc667de70147895de
| * qemu-char.h, console.h: upstream integrationDavid 'Digit' Turner2011-06-019-125/+409
| | | | | | | | Change-Id: Ibd11e84a4d48c1d6c4a168056869a7480bc89930
| * qemu-timer.c: rename qemu_timer_new_scale()David 'Digit' Turner2011-06-0127-150/+130
| | | | | | | | | | | | | | | | | | | | | | Get rid of qemu_timer_new() implementation, and update all callers to use qemu_timer_new_ms() or qemu_timer_new_ns() instead. Rename qemu_new_timer_scale() to qemu_new_timer() to follow upstream conventions. Change-Id: Id2c04f8597ec5026e02f87b3e2c5507920eb688e
| * qemu-timer.c: upstream integrateDavid 'Digit' Turner2011-06-017-195/+463
| | | | | | | | Change-Id: I6856ded73b4dcd10fe4831697c8518f958aeffbb
| * qerror: minor integrateDavid 'Digit' Turner2011-06-012-5/+24
| | | | | | | | Change-Id: I8d33798952dfdbab5f1e996bd8cd40d82eb129da
| * qemu-error: minor integrateDavid 'Digit' Turner2011-06-016-28/+25
| | | | | | | | Change-Id: Ic6bc807b98e4dba0f2fcba046cd9a91a5d96f2cb
| * posix-aio-compat.c: minor integrateDavid 'Digit' Turner2011-06-011-2/+10
| | | | | | | | Change-Id: Iccf0a0794e55546dd538e362a4b5837ee8b2c1d7
| * os-posix.c + os-win32.c and dependenciesDavid 'Digit' Turner2011-06-0115-272/+1063
| | | | | | | | | | | | + Generate qemu-options.def instead of qemu-options.h Change-Id: I043e6b0c1c58e5cc2e96d05465f39b42f9054b5a
| * qemu-common.h: other intergratesDavid 'Digit' Turner2011-06-017-283/+346
| | | | | | | | Change-Id: Iaf5221814247d7686ec3d57abeab097b09c6a5dd
| * integrate: qemu-common.h changesDavid 'Digit' Turner2011-06-0113-138/+316
|/ | | | Change-Id: I4620b4560465ed105202332b59f91b708d91a525
* Merge "vl-android.c: Fix PC Bios search order."David 'Digit' Turner2011-06-011-46/+30
|\
| * vl-android.c: Fix PC Bios search order.David 'Digit' Turner2011-06-011-46/+30
|/ | | | | | | | This fixes the algorithm used to search the PC Bios files. Moreover, this makes standalone builds under external/qemu just work by looking under prebuilt/common/pc-bios Change-Id: I4619565d57dc5a5b75333f6459f5bfc32b81e918
* Merge "android-rebuild.sh: Better parallel builds."David 'Digit' Turner2011-06-011-3/+17
|\
| * android-rebuild.sh: Better parallel builds.David 'Digit' Turner2011-06-011-3/+17
| | | | | | | | | | | | | | This patch computes the number of CPUs on the host to automatically used it with 'make -j<number>'. Change-Id: If4e2d8b159662f5b7f02e8e48447b9916e7051b2
* | Merge "android-configure.sh: fix KVM-enabled builds."David 'Digit' Turner2011-06-011-1/+16
|\ \ | |/
| * android-configure.sh: fix KVM-enabled builds.David 'Digit' Turner2011-06-011-1/+16
|/ | | | | | | | This patch ensures that CONFIG_KVM_GS_RESTORE is defined in the auto-generated config-host.h. Does not affect normal platform builds. Change-Id: Ib064fd44d73e9b6e9b3e9349c1e72c060a83f38c
* Merge "kvm: Fix KVM auto-detection"David 'Digit' Turner2011-05-311-28/+2
|\
| * kvm: Fix KVM auto-detectionDavid 'Digit' Turner2011-05-301-28/+2
|/ | | | | | | | Now that we have a work-around for the bug that caused KVM to crash when the 32-bit emulator was running under a 64-bit kernel, we can simplify the auto-detection logic. Change-Id: Ia06908aa947cc3865451a04c38a7782cf4c7b831
* Merge "x86: Workaorund for the KVM GS_BASE MSR save/restore issue."David Turner2011-05-307-1/+182
|\
| * x86: Workaorund for the KVM GS_BASE MSR save/restore issue.Jun Nakajima2011-05-277-1/+182
|/ | | | | | | | | | In some versions of the kvm module in Ubuntu, the host's GS_BASE MSR is not save/restored correctly when running guests on 64-bit hosts if the qemu/emulator is 32-bit. This patch implements a workaround in the emulator code. Change-Id: If3ebe3cb49f377c5d0547c75f6ac3a3ceacdc375 Signed-off-by: Yunhong Jiang <yunhong.jiang@intel.com> Signed-off-by: Jun Nakajima <jun.nakajima@intel.com>
* Merge "Fix Mac and Windows builds."David 'Digit' Turner2011-05-251-0/+3
|\
| * Fix Mac and Windows builds.David 'Digit' Turner2011-05-261-0/+3
|/ | | | | | Silly me, KVM is only available on Linux hosts. Change-Id: I983c87b1f5473e92823398b7812a574f56fc3a68
* Merge "x86: kvm: fix KVM build + enable auto-detection."David 'Digit' Turner2011-05-2512-13/+2033
|\
| * x86: kvm: fix KVM build + enable auto-detection.David 'Digit' Turner2011-05-2612-13/+2033
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the build of KVM support in the x86 emulator by copying official Ubuntu Lucid KVM headers into android/config/linux-*/ This removes the need to rely on the build machine's versions of these headers, which caused various issues. Also, by default, the emulator will now probe the system to see if it can start in KVM mode automatically. See android-kvm.c for details. You can see the result of the probing with the -verbose option. IMPORTANT NOTE: It looks like there is a bug in the KVM code when the emulator is built as a 32-bit binary, running on a 64-bit kernel, so we explicitely disable KVM when we detect this case. It's hard to tell whether this is a bug in QEMU or some versions of the KVM driver. As such, KVM only works when building the emulator as a 64-bit program. For now, this is only possible with "android-configure.sh --try-64", not the Android build system. + Add a new QEMU option (-disable-kvm) to explicitely disable KVM if needed. This is an addition to -enable-kvm which already exists (and forces usage of KVM). Change-Id: I6a397cae29ab62b1c56fce95c1ee75a4664d6688
* Merge "fix audio backend handling"David 'Digit' Turner2011-05-241-0/+3
|\
| * fix audio backend handlingDavid 'Digit' Turner2011-05-211-0/+3
| | | | | | | | | | | | | | | | | | | | This patch fixes a small bug where the audio backend given with the -audio <name> option was ignored. The bug was introduced during a previous integration of upstream audio changes. The old code always used the same default backend (PulseAudio). Change-Id: I7bc68df3fd3025f8a8bd1f0fd868872b7eee2017
* | Reconcile with honeycomb-mr1-releaseThe Android Open Source Project2011-05-200-0/+0
|\ \ | |/ |/| | | Change-Id: Id7ed4b392060d34981e51f60b5b407b6989737e6
| * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-070-0/+0
| |\
| | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-050-0/+0
| | |\ | |/ /
| | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-050-0/+0
| | |\ | |/ /
| | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-040-0/+0
| | |\
| | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-05-030-0/+0
| | | |\
| | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-290-0/+0
| | | | |\
| | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-280-0/+0
| | | | | |\
| | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-270-0/+0
| | | | | | |\
| | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-250-0/+0
| | | | | | | |\
| | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-210-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in honeycomb-mr1-release history after reset to honeycomb-mr1The Android Automerger2011-04-190-0/+0
| | | | | | | | | |\ | | | | | | | | |/ /
generated by cgit v1.1 at 2025-09-14 21:34:54 +0000