aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 64-bit emulatorAndrew Hsieh2012-03-1321-159/+438
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch to allow emulator searches for emulator64-${ARCH} first on 64-bit OS. If none is found, the original behavior which searchs for 32-bit emulator-${ARCH} is performed as usual. 64-bit emulator (which still emulates Android built in 32-bit) offers up to 20% speedup compared to its 32-bit counterpart. Details: android/main-emulator.c 1) search emulator64 based on the OS 2) dlopen lib64OpenglRender in 64-bit Makefile.* 1) Rules to build 64-bit executable emulator64-{x86,arm} and libraries emulator64-{libui,libqemu,target-i386,target-arm,libelff,common} 2) remove -Wa,-32 3) Changes prebuit toolchain path android-configure.h android/build/common.h 1) no longer force 32-bit build (because now prebuilts/tools/gcc-sdk/gcc can now handle 64-bit 2) set ANDROID_PREBUILTS to correctly locate ccache android/config/*/config-host.h 1) Detect HOST_X86_64 and HOST_X86_64/HOST_I386 Misc 64-bit porting clean-up 1) use %zx to print variable of type size_t in hex 2) use %zu to print variable of type size_t in dec 3) Initialize query_parm to NULL 4) use PRIu64 to replace PDUd64 5) use PRId64/PRIu64/PRIX64 to print 64-bit 6) drop PRUx64 because PRIx64 does the same 7) cast pointer arith to intptr_t before casting to int 8) fixed 1ULL<<63 Change-Id: Ife62a20063a6ec38d4a9b23977e840af1fce149a
* Increase default partition size, and fix data partition size calculation.Vladimir Chtchetkine2012-03-081-2/+2
| | | | | | | | | | | There is a (reasonable) demand from android development comunity to increase default data partition size. It seems that 66MB doesn't match anymore user needs. So, with this CL default data partition size will be increased to 12MB. This CL also fixes a bug where data partition size set by the AVD manager has been wrongly treated as an MB value, while it was a byte value. Change-Id: I27c456a71299aff42bd4ca573d3660292a7d1d44
* Merge "Multi-touch emulation support"Vladimir Chtchetkine2012-03-0517-56/+1602
|\
| * Multi-touch emulation supportVladimir Chtchetkine2012-03-0517-56/+1602
| | | | | | | | Change-Id: I311dc55fe10f41637775baa330a7c732ff317f51
* | Merge "Set value of hw.keyboard "no"."Xavier Ducrohet2012-03-021-1/+1
|\ \
| * | Set value of hw.keyboard "no".SeongJae Park2012-03-021-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit for discuss at https://groups.google.com/forum/?fromgroups#!topic/android-contrib/H_oodJPngHo Because default value of hw.keyboard is "yes", emulator doesn't display soft keyboard although text input widget has focus. Developers can change value easily; But users who doesn't know about property setting such as non-developer can be confused a lot. And, most devices has no H/W keyboard(Galaxy Nexus too). So, set default value of hw.keyboard to "no". Change-Id: Id3a6af23fe0525e4b8f6ccd8bbde2d6dd26e5d7d Signed-off-by: SeongJae Park <sj38.park@gmail.com>
* | Merge "Corrects typo on comment."Andrew Hsieh2012-03-011-1/+1
|\ \ | |/ |/|
| * Corrects typo on comment.SeongJae Park2012-03-011-1/+1
|/ | | | | Change-Id: I34e8e71f6ca03d58676ac350d6558fec32e6e448 Signed-off-by: SeongJae Park <sj38.park@gmail.com>
* Enables ADBD tracing in emulator.Vladimir Chtchetkine2012-02-272-1/+99
| | | | | | | | | | When running inside the emulator, guest's adbd can connect to 'adb-debug' qemud service that can display adb trace messages on condition that emulator has been started with '-debug adb' option. This CL contains emulator code that enables that. Change-Id: I6720deef0833fd02e2fe80deeaafbcf517de0c33
* Merge "Check HAXM capability in QEMU"Jean-Baptiste Queru2012-02-239-1/+135
|\
| * Check HAXM capability in QEMUJiang, Yunhong2012-02-239-1/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Checking HAXM capability to check if emulator can use HAXM virtalization. Currently two possibility that HAXM not work. Firstly is VT/NX is not enabled in the system, seconly is HAXM have used up the memory quota. See code comemnts for the memry quota explaination. Checking the capability in advance can give user more information that why HAXM is not working and be more user friendly. Change-Id: I13f73734cf783398f485fabd19cce43364b571c3 Signed-off-by: Xin, Xiaohui <xiaohui.xin@intel.com> Signed-off-by: Gao, Fengqian <fengqian.gao@intel.com> Signed-off-by: Jiang, Yunhong <yunhong.jiang@intel.com>
* | Merge "Fix the vmid issue in HAX"Jean-Baptiste Queru2012-02-234-7/+8
|\ \ | |/ |/|
| * Fix the vmid issue in HAXJiang, Yunhong2012-02-234-7/+8
| | | | | | | | | | | | | | | | This patch is lost when submit the HAX patchset. Without this patch, only one emulator instance can use HAXM. Change-Id: Ia8e47ea471ae154036bb5721c51d6d099d9aff5f Signed-off-by: Xin, Xiaohui <xiaohui.xin@intel.com> Signed-off-by: Jiang, Yunhong <yunhong.jiang@intel.com>
* | Fixes camera RTE on WindowsVladimir Chtchetkine2012-02-221-1/+15
|/ | | | | | | | | The root of the issue was that some cameras / camera drivers don't set compression type in the bitmap header explicitly to a V4L2_XXX, but set it to BI_RGB, which is unknown value for frame converters. To fix this, this CL converts BI_RGB to an appropriate V4L2_XXX value. Change-Id: Ifd70aa44138ab38fe66e8c80806a7dbb91725cf2
* Enable RGB565 input color formatVladimir Chtchetkine2012-02-132-3/+69
| | | | | | | | | This change enables compression of RGB565 input to YCbCr (default) output format. Main intention for this change is to enable the emulator to directly compress RGB565 framebuffer without converting it into RGB888 prior to passing it to the compression routine. Change-Id: I86240a2481fd1904eb9b9140b18b372200a71093
* Stop emulator when both, gpu and snapshots are on.Vladimir Chtchetkine2012-02-101-0/+9
| | | | | | | This is a temporary solution fixing emulator crash due to the difficulties in implementing GPU state save to and reload from snapshot. Change-Id: Id62830d3447538472d3c7a83ade97f4f09dfaa06
* Fix an issue with loading multiple snapshots.Vladimir Chtchetkine2012-02-031-3/+3
| | | | | | This is a fix for a user reported issue #15922:Using multiple (named) snapshots does not work. Change-Id: I71989a99d182f9d84c6ee08414d35e2154ca4357
* Fix problem with using clipboard in Windows camera emulationVladimir Chtchetkine2012-02-021-20/+140
| | | | | | | | | | | | | | | This is a fix for a user reported issue #24794. In the nutshell, when emulator grabs a frame from webcam it leaves its bitmap in the clipboard (which is global). So, when user does a 'paste' somewhere else, that bitmap will be pasted there. Being bad by itself, it gets worst, because 'copy / paste' will be globally broken while camera application is running in the emulator. I.e, if you have camera app running in the emulator, and at the same time you're editing a Word file (for example), copy / paste will not work in Word. This CL contains a fix such as when possible, camera emulator on windows will not use clipboard to grab video frames, but will grab video frames using frame callback. Change-Id: I115a9c653b252620cf5407173c1e1eec69b4a2ee
* Include JPEG compression / decompression library into emulator buildVladimir Chtchetkine2012-02-01156-0/+60065
| | | | | | | | | | | | We are going to need JPEG compression for transferring emulator's framebuffers to the multi-touch supporting application running on an android device. The source for JPEG compressor has been copied over from external/jpeg To that I've added distrib/jpeg-6b/sources.make containing build instruction for JPEG compressor. That file gets included into Makefile.common to compile JPEG compressor sources along with the emulator sources. Change-Id: I7bfccb7a10f873f90edabab5d3b1b2ca4dd57449
* Implement asynchronous data send over 'event' socket.Vladimir Chtchetkine2012-01-302-2/+229
| | | | Change-Id: Ifce399aec98540fca4e1cca8c3599142d9ff6887
* Merge "Expand the ways how a query can be sent to Android device."Vladimir Chtchetkine2012-01-262-0/+70
|\
| * Expand the ways how a query can be sent to Android device.Vladimir Chtchetkine2012-01-252-0/+70
| | | | | | | | | | | | | | | | Contains new routines that allow sending multiple blocks of data within a single query. Also, these routines allow to avoid restriction on queries as zero-terminated strings. Change-Id: Ia5789a01a7eadbae5b1f5014a67864eea463af43
* | Merge "New files to add HAX support"Jean-Baptiste Queru2012-01-249-0/+2362
|\ \ | |/ |/|
| * New files to add HAX supportJun Nakajima2012-01-179-0/+2362
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QEMU emulator interacts with the HAX kernel module. A HAX (Hardware-based Accelerated eXecution) kernel module is required to use HAX support. Most guest instructions run in VMX non-root (i.e. in hardware) mode and achieve near-native (relative to the host) performance. QEMU still emulates PIO/MMIO instructions and non-PG (paging) mode operations. HAX is supported only on Mac OS X and Windows hosts when Intel VT is present. Change-Id: I8dd52a35e315437dc568f555742bb8ab7e9d8ab2 Signed-off-by: Zhang, Xiantao <xiantao.zhang@intel.com> Signed-off-by: Xin, Xiaohui <xiaohui.xin@intel.com> Signed-off-by: Jiang Yunhong <yunhong.jiang@intel.com> Signed-off-by: Nakajima, Jun <jun.nakajima@intel.com>
* | Refactor camera parameters parsing routinesVladimir Chtchetkine2012-01-233-170/+187
| | | | | | | | | | | | | | | | | | | | Move routines that pulls values out of the parameter string from camera-service.c to misc.c Those are general purpose routines that are also used in multitouch emulation, so it's better to keep it an an general utility file. Change-Id: I02978075b64b42ff07f5042cda770bbef8939e24
* | Merge "Check for data partition init path on snapshot load."Vladimir Chtchetkine2012-01-191-0/+8
|\ \
| * | Check for data partition init path on snapshot load.Vladimir Chtchetkine2012-01-191-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Makes sure that snapshots are not loaded if data partition for which the snapshot has been saved is overwritten (with -wipe-data option for example). We want the loaded snapshot to be consistent with the data underneath it. Change-Id: I605c9b5a66870aad76ffd97d641a08c75730de7f
* | | Fixed typo in emulator -help-build-imagesAndrew Hsieh2012-01-181-2/+2
|/ / | | | | | | | | | | | | 1. "<build-root>/prebuilt/android-arm/kernel/" -> "<build-root>/prebuilts/qemu-kernel/" 2. "<build-root>/sdk/emulator/skins/" -> "<build-root>/development/tools/emulator/skins/" Change-Id: I46cf9f805506753271bf4b88cebd47faa3775f45
* | Merge "Changes to existing files to add HAX support"Jean-Baptiste Queru2012-01-1711-6/+181
|\ \ | |/
| * Changes to existing files to add HAX supportJun Nakajima2012-01-1711-6/+181
|/ | | | | | | | | | | | | | | HAX (Hardware-based Accelerated eXecution) employes hardware virtualization technology to boost performance of the Android emulator on Mac OS X or Windows hosts. This changeset includes the changes required to the existing files. To pass the compilation, hax.h is added, but CONFIG_HAX is disabled so that no real changes added. Change-Id: Ifa5777e8788e6698747c1ec4cd91315161c2ca0b Signed-off-by: Zhang, Xiantao <xiantao.zhang@intel.com> Signed-off-by: Xin, Xiaohui <xiaohui.xin@intel.com> Signed-off-by: Jiang Yunhong <yunhong.jiang@intel.com> Signed-off-by: Nakajima, Jun <jun.nakajima@intel.com>
* Merge "Respect HW configs when loading VM from snapshots."Vladimir Chtchetkine2012-01-137-12/+294
|\
| * Respect HW configs when loading VM from snapshots.Vladimir Chtchetkine2012-01-137-12/+294
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing HW configuration properties may cause emulator / guest system crash on condition that VM has been loaded from a snapshot. This CL addresses this issue in the following way: 1. Each time a snapshot is saved, a backup copy of HW config is saved with it. 2. Each time a snapshot is loaded, emulator finds an appropriate HW config backup, and compares current HW config with the one that was saved in the backup, and if configs are different, emulator exits with an appropriate error. Change-Id: I730bec0afbe166e88189fdcc4804b76e109e4422
* | am a9fd5a14: Fix signal handling for GS_RESTORE hackJiang Yunhong2012-01-121-34/+77
|\ \ | | | | | | | | | | | | * commit 'a9fd5a1492276fe429eab8527fc425cee5c62ed8': Fix signal handling for GS_RESTORE hack
| * | Fix signal handling for GS_RESTORE hackJiang Yunhong2012-01-121-34/+77
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we hack QEMU's signal handler because of the GS_BASE MSR KVM bug. The reason of the hack is, when signal happens during KVM_RUN ioctl, the GS_BASE is broken, we have to restore the correct gs before run the signal handler. However, currently we take signal even when signal is set as SIG_DFL/SIG_IGN, or the signal is set with SIG_SIGINFO. Currently "kill -13" to emulator causes emulator crash. This patch fixed it as: 1) If the signal handler is set as SIG_DFL or SIG_IGN, we don't take the signal 2) If the signal handler is set with SIG_SIGINFO, we will use sa_sigaction 3) Cover all potential signals One thing left is, if the signal handler is setup dynamically, this method may still have issue because currently the signal handlers are taken statically when first KVM_RUN ioctl. Luckily this does not happen now. Change-Id: Icfbe43db665a11f2b6eaf9593075b3e643783ee7 Signed-off-by: Jiang Yunhong <yunhong.jiang@intel.com>
* | Merge "SDL: Call XInitThreads() after loading Xlib"Jesse Hall2012-01-112-0/+2
|\ \ | |/ |/|
| * SDL: Call XInitThreads() after loading XlibJesse Hall2012-01-112-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | XInitThreads() enables thread-safety in Xlib, so multiple threads can safely call into it concurrently. This happens with GLES passthrough enabled: the GLES system serializes its own Xlib and GLX calls, but there is no serialization between the GLES system and the SDL code running the main UI. This call must be the first Xlib call, so I put it here in the loading code rather than the multiple places that call XOpenDisplay(). Change-Id: I3cd3177fb8e0904a803a6b5c8f89a4ecda73bd1c
* | Revert "Reference new location of SDK toolchain"Jean-Baptiste Queru2012-01-112-10/+2
| | | | | | | | This reverts commit 6e8d9298782ce4d5a7d506638ced4de0396735f9.
* | Reference new location of SDK toolchainJean-Baptiste Queru2012-01-112-2/+10
| | | | | | | | Change-Id: Id28db802a5401141a5ec1052de81dbee5033577f
* | Don't display warning when emulator is unable to connect to device.Vladimir Chtchetkine2012-01-101-1/+3
|/ | | | | | | | | | Warning that is displayed when "realisting sensors emulation" component in emulator is not able to connect to an application streaming sensor changes from an actual device, that warning confuses users, making them think that emulator didn't initialize properly. To avoid that confusion, hide that warning under -verbose, displaying it only if -verbose option has been specified on emulator start. Change-Id: If40cc726db9bec4ab631dcbdcd02fb98cc30d93a
* Reference the new prebuilt ccache location.Ying Wang2012-01-091-1/+1
| | | | Change-Id: Id990e37b9d8803aa5a23c365076c4044ef4719af
* Fix emulator crash restoring pipes from snapshotJesse Hall2012-01-091-1/+1
| | | | | | | | | The emulator crashes when loading a goldfish pipe from snapshot if it was still in PipeConnection state when saved, since there is no service associated with the pipe. Check for service existence before dereferencing the service pointer. Change-Id: I9093bdf403fd3532e9fb6584b98994d9d4dc686c
* am d3ed299f: am 8edd3e9e: am 18006f77: Reference kernels from their new locationJean-Baptiste Queru2012-01-061-1/+1
|\ | | | | | | | | * commit 'd3ed299f15c993bda873cbd56648eedabc7f45c9': Reference kernels from their new location
| * am 8edd3e9e: am 18006f77: Reference kernels from their new locationJean-Baptiste Queru2012-01-061-1/+1
| |\ | | | | | | | | | | | | * commit '8edd3e9e2959868ec221a1f3c1d4f9f16eb91177': Reference kernels from their new location
| | * am 18006f77: Reference kernels from their new locationJean-Baptiste Queru2012-01-061-1/+1
| | |\ | | | | | | | | | | | | | | | | * commit '18006f77ef9e760c225d1aa0dbbbe9cf5401aa8e': Reference kernels from their new location
| | | * Reference kernels from their new locationJean-Baptiste Queru2012-01-051-1/+1
| | | |
* | | | Merge "Respect 'camera' flag in AVD"Vladimir Chtchetkine2012-01-063-2/+20
|\ \ \ \ | |/ / / |/| | |
| * | | Respect 'camera' flag in AVDVladimir Chtchetkine2012-01-063-2/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | Turns of webcam emulation on condition that 'camera' AVD property is set to 'false'. Note that command line options (-webcam) will enable webcam emulation even if 'camera' AVD property is set to 'false' Change-Id: I493446f1d12b732ed49f9a5a9967b87b31b180f6
* | | Merge "EmuGL: disable debug spam"Jesse Hall2012-01-061-1/+1
|\ \ \ | |/ / |/| |
| * | EmuGL: disable debug spamJesse Hall2012-01-051-1/+1
| | | | | | | | | | | | Change-Id: Idb86b2e8bbb396ee1bca606a32569b9b6b46dcb8
* | | Merge "Fix bug in Windows audio code"Vladimir Chtchetkine2012-01-061-2/+2
|\ \ \ | |_|/ |/| |
generated by cgit v1.1 at 2025-01-24 12:30:40 +0000