aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add env var ANDROID_TMP to override /tmp/android location.Raphael2010-11-162-2/+5
| | | | | | | | | | | | This is needed if there's already a /tmp/android which the current user can't access on the system. It would prevent the emulator from starting with a cryptic error message: NAND: could not create temp file for system NAND disk image: Permission deniedemulator: User-config was not changed. SDK Bug: 3154431 Change-Id: Iefe7fd6a5139da545aaef5670fb7f42d210d0edc
* Merge "Fix build break"Vladimir Chtchetkine2010-11-161-0/+1
|\
| * Fix build breakVladimir Chtchetkine2010-11-161-0/+1
|/ | | | Change-Id: I5b7e0c0b09e97cbdc80636c4a55177a82ac5936b
* Merge "Implement absoule wait in iolooper"Vladimir Chtchetkine2010-11-162-0/+54
|\
| * Implement absoule wait in iolooperVladimir Chtchetkine2010-11-162-0/+54
| | | | | | | | Change-Id: I514ffe11bcdac2fe3c6b44998892d9a604b9966f
* | merge from tools_r8The Android Open Source Project2010-11-150-0/+0
|\ \ | |/ |/| | | Change-Id: Id2a031a0cb76aaf18b9c09bfba75f45045dde1de
| * Merge "Integrate 80bc5c8c into tools_r8. DO NOT MERGE." into tools_r8Xavier Ducrohet2010-11-157-27/+79
| |\
| | * Integrate 80bc5c8c into tools_r8. DO NOT MERGE.David 'Digit' Turner2010-11-127-27/+79
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix incorrect orientation at boot. The goldfish kernel's event driver is very picky about the state of the virtual device it talks to. Essentially, it can only listen to h/w events if the corresponding IRQ is raised _after_ it has completed some initial setup. If the IRQ is raised before, the driver will refuse to listen to events, and any interaction becomes impossible. We changed the way our UI windows are built and managed previously, and this had the unfortunate effect of sending one h/w event too soon, which, in the old code, would raise the IRQ prematurely. This resulted in an input freeze. To work around this the UI code was modified to not send the initial h/w event, but this resulted in bad orientation of the home screen at the end of the boot sequence. This change allows the virtual device to wait for the kernel driver before raising the IRQ, in the case any h/w event has been buffered. It also removes the hack in the UI code, allowing the send of the initial h/w event at startup. BONUS MINOR CHANGES: EsounD probe: fix error message. console: fix compiler warnings libpng: proper handling of MMX support. android-configure.sh: fix --ignore-audio handling The option didn't do anything if the audio development packages are properly installed on the system. Change-Id: I675d181abb662222bb03f264aa87238fd8edb8cc
* | Merge "Implement -list-cores UI option"Vladimir Chtchetkine2010-11-105-3/+163
|\ \
| * | Implement -list-cores UI optionVladimir Chtchetkine2010-11-105-3/+163
|/ / | | | | | | | | | | | | Also fixed a bug in iolooper-select.c (io_looper_del_write was buggy) Also switched iolooper-select.c to use malloc/free instead of qemu_xxx Change-Id: Ief47608f30a863d624af6363620e93e903cbdadc
* | Merge "Add command line flag to show list of snapshots."David Turner2010-10-286-3/+394
|\ \
| * | Add command line flag to show list of snapshots.Ot ten Thije2010-10-286-3/+394
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces the flag '-snapshot-list', which causes the emulator to output a table of snapshots in the currently mounted snapshot storage file. The snapshot file is accessed with a very simple driver for the Qcow2 file system, independent of Qemu's block driver framework. This way, the flag is available in the emulator-ui builds as well. Using Qemu's framework would have resulted in adding a lot of Qemu dependencies to the UI build, which we are explicitly trying to avoid. Change-Id: I059b9ac53e2f8e051757a5c637761eccf8ea17cb
* | | Merge "Control state snapshots from Android console."David Turner2010-10-288-44/+303
|\ \ \ | |/ /
| * | Control state snapshots from Android console.Ot ten Thije2010-10-288-44/+303
|/ / | | | | | | | | | | | | | | | | | | | | | | | | This patch exposes Qemu's save, load, delete and list commands for state snapshots on the Android console. A level of indirection is added by means of the OutputChannel construct. This allows us to show the output of the Qemu commands on the console rather than on the monitor, while minimizing the differences with the upstream codebase. The new commands are exposed only when the configuration constant CONFIG_ANDROID_SNAPSHOTS is not 0. Change-Id: I558d5cd505d321fe2da5835713d341d151f60534
* | merge from tools_r8The Android Open Source Project2010-10-270-0/+0
|\ \ | |/ | | | | Change-Id: Iccbb8fd9ddd10af227b55d77c4eb228891eb4db7
| * Merge "Cherry pick 631f2555 into tools_r8. DO NOT MERGE." into tools_r8Xavier Ducrohet2010-10-271-2/+2
| |\
| | * Cherry pick 631f2555 into tools_r8. DO NOT MERGE.David 'Digit' Turner2010-10-261-2/+2
| |/ | | | | | | | | | | | | | | | | Fix invalid "geo fix" formatting bug. See http://code.google.com/p/android/issues/detail?id=2928 for details. Change-Id: Id2a497b2f8ac35890e4670f7385fa393da692a90
* | Merge "Fix invalid "geo fix" formatting bug."David 'Digit' Turner2010-10-261-2/+2
|\ \
| * | Fix invalid "geo fix" formatting bug.David 'Digit' Turner2010-10-271-2/+2
| | | | | | | | | | | | | | | | | | | | | See http://code.google.com/p/android/issues/detail?id=2928 for details. Change-Id: If192fe2f8dba9e5bd11f0f7fdc6a7445a8573623
* | | Merge "Allow OS X emulator to open host /dev/ devices."David 'Digit' Turner2010-10-262-9/+4
|\ \ \ | |/ / |/| |
| * | Allow OS X emulator to open host /dev/ devices.David 'Digit' Turner2010-10-272-9/+4
| | | | | | | | | | | | | | | | | | | | | Only Win32 does not allow this, so simplify the tests in the source code + Remove compiler warning Change-Id: I100dd59e4477edcd24dd94becfa3e3b83a2b92ab
* | | Merge "Fix emulator build."Jean-Baptiste Queru2010-10-221-1/+1
|\ \ \
| * | | Fix emulator build.Jean-Baptiste Queru2010-10-221-1/+1
|/ / / | | | | | | | | | Change-Id: I87f1695d61654a09ef40fa883cbc73acd59ac4c8
* | | Merge "Fix ping version reporting."David 'Digit' Turner2010-10-221-20/+22
|\ \ \
| * | | Fix ping version reporting.David 'Digit' Turner2010-10-231-20/+22
| |/ / | | | | | | | | | | | | | | | | | | | | | The emulator version reported through ddms was incorrect in the SDK r7 emulator binary due to a previous change in our Makefiles. Change-Id: I16fc16739de8490c63d802567226b74db7f74e0f
* | | Merge "Load state snapshot rather than booting to start emulator."Ot ten Thije2010-10-226-35/+219
|\ \ \
| * | | Load state snapshot rather than booting to start emulator.Ot ten Thije2010-10-226-35/+219
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for an optional file "snapshots.img" in the data directory of an AVD. This file should be an image formatted with the qcow2 file system and will be mounted on -hdb when the emulator starts up. If present, the emulator will attempt to load the snapshot named "default-boot" from this image, rather than going through the full boot procedure. To control the behaviour of this functionality, this patch introduces the following new command line options for the emulator: -snapstorage <file>: override the default location of the snapshot storage file. -no-snapstorage: do not load the snapshots file, even if an explicit path is given. -snapshot <name>: instead of loading "default-boot", load the state snapshot with the given name. -no-snapshot: do not load a snapshot, but force a full boot sequence, even if a snapshots file is mounted. Useful for creating snapshots. Note that this functionality is experimental and will be enabled only if the constant CONFIG_ANDROID_SNAPSHOTS in android/config/config.h is set to "1" before building. It is turned off by default. Change-Id: Iee2e9096a27f3414bacfc271f90ef93a98730c82
* | | Merge "Added state snapshot support for QemuD service "boot properties"."Ot ten Thije2010-10-211-19/+177
|\ \ \ | |/ / |/| |
| * | Added state snapshot support for QemuD service "boot properties".Ot ten Thije2010-10-211-19/+177
| | | | | | | | | | | | Change-Id: I12383de77917c31d6227fc223753c1dcab31fb56
* | | Merge "Fix linux-x86_64 build."David 'Digit' Turner2010-10-2119-44/+165
|\ \ \
| * | | Fix linux-x86_64 build.David 'Digit' Turner2010-10-2119-44/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix various 64-bitness issues in the source code to make the --try-64 option work again on Linux. Note that the generated binary is not faster than its 32-bit variant when it comes to benchmarking the boot sequence. Change-Id: Iad248e033757d4cd25524a438a5dbe1cf3aca6cf
* | | | Merge "Make state snapshots compatible with SD cards."Ot ten Thije2010-10-213-22/+16
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Make state snapshots compatible with SD cards.Ot ten Thije2010-10-213-22/+16
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces a check such that only drives exporting a snapshot creation function are considered for storing snapshots. SD cards are mounted with a raw file system, which does not support snapshots. Since the SD card is now skipped, the actual snapshot image can be safely mounted on hdb rather than hda. The contents of the SD card itself are included in the snapshot however, since they are accessed with the NAND driver (which saves the contents of the underlying files). Change-Id: I4816b6e54e227aca356389c15ce9f5c1282d2464
* | Merge "Fix incorrect orientation at boot."David 'Digit' Turner2010-10-207-27/+79
|\ \
| * | Fix incorrect orientation at boot.David 'Digit' Turner2010-10-207-27/+79
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The goldfish kernel's event driver is very picky about the state of the virtual device it talks to. Essentially, it can only listen to h/w events if the corresponding IRQ is raised _after_ it has completed some initial setup. If the IRQ is raised before, the driver will refuse to listen to events, and any interaction becomes impossible. We changed the way our UI windows are built and managed previously, and this had the unfortunate effect of sending one h/w event too soon, which, in the old code, would raise the IRQ prematurely. This resulted in an input freeze. To work around this the UI code was modified to not send the initial h/w event, but this resulted in bad orientation of the home screen at the end of the boot sequence. This change allows the virtual device to wait for the kernel driver before raising the IRQ, in the case any h/w event has been buffered. It also removes the hack in the UI code, allowing the send of the initial h/w event at startup. BONUS MINOR CHANGES: EsounD probe: fix error message. console: fix compiler warnings libpng: proper handling of MMX support. android-configure.sh: fix --ignore-audio handling The option didn't do anything if the audio development packages are properly installed on the system. Change-Id: Ib134158873d5cb72290c9676d92d20233226c889
* | emulator-ui: Remove dependencies from qemu sources.David 'Digit' Turner2010-10-1912-716/+72
|/ | | | | | This change removes some QEMU-specifics that crept into the UI code. Change-Id: Ib1974dc64e54a35dc0cd01aec1eb547a9263a0c8
* Fix windows event loop handling.David 'Digit' Turner2010-10-184-57/+46
| | | | | | | | This change fixes the windows emulator binary which got stuck due to changes in the timer implementation that occured during the last upstream integration. Change-Id: I090ce4ac9c09b3b95e0df95513446922120b2d9a
* Merge "Added state snapshot support for QemuD."David Turner2010-10-159-49/+719
|\
| * Added state snapshot support for QemuD.Ot ten Thije2010-10-149-49/+719
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this patch, both modem and sensor functionality are correctly restored when a state snapshot is loaded. This was not the case previously because communication with either of these services is done using the qemud daemon, which did not support snapshots. The boot-properties and charpipe services have no specific save/load functionality yet, since the framework itself should be reviewed first. Adding support for bootproperties should not be difficult though, and charpipe may not need it. For a description of the high-level process for saving and loading, consult section IV "State snapshots" in docs/ANDROID-QEMUD.TXT. Change-Id: I5b06d88b911ca096e78060163174904c48a01c66
* | standalone builds: windows executables end in .exeDavid 'Digit' Turner2010-10-142-3/+13
|/ | | | | | | | | | | | | | | | This change only applies to the stand-alone build system. It ensures that when one does the following under Linux: ./android-configure.sh --mingw make then, the Windows executables that are generated have their name ending in .exe (e.g. objs/emulator.exe instead of objs/emulator) This does not affect the Android build system which already does the right thing (and is used to build SDK binaries). Change-Id: If9597e550f0bceec04d334eb84199a0f024a3fdf
* Merge "Permanent fix for workaround of timer issue (commit a7f114bc)."Ot ten Thije2010-10-141-2/+1
|\
| * Permanent fix for workaround of timer issue (commit a7f114bc).Ot ten Thije2010-09-241-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | The compiler generated incorrect instructions when loading timers, because qemu_get_be64 was used before it was declared. This caused the compiler to assume that a normal (32 bit) int would be returned, rather than a 64 bit one. Just including the "hw/hw.h" header is sufficient to correct this. The makefile for the project has recently been changed to build with -Wall, which should prevent this from going unnoticed again. Change-Id: I74c98183287cf26b767a36f7a6ff9ebf0b891826
* | Merge "Save NAND disk state in snapshots."Ot ten Thije2010-10-141-45/+206
|\ \
| * | Save NAND disk state in snapshots.Ot ten Thije2010-10-131-45/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes saving and restoring the state of the emulated NAND disks, by copying all contents of each disk into the snapshot file. During restore the disks are then entirely overwritten with the snapshot contents. The main issue with this approach is that the size of the disk snapshots is determined by the maximum capacity of the disk in question, rather than the actual size of the underlying file, which may be considerably smaller. The difference is filled with padding. Unfortunately, obvious approaches to avoid this padding result in incorrect state after restoring. Change-Id: I4abe329ff2cf2f159c3d6dfc206959614cc4ca35
* | | Merge "emulator-ui: Fix windows build (behaviour not tested)"David 'Digit' Turner2010-10-131-0/+11
|\ \ \
| * | | emulator-ui: Fix windows build (behaviour not tested)David 'Digit' Turner2010-10-131-0/+11
| | | | | | | | | | | | | | | | Change-Id: I76abd165b235dc3abeeb3a9676c0ef8097e54567
* | | | Merge "emulator-ui: fix crash on exit"David 'Digit' Turner2010-10-135-17/+14
|\ \ \ \ | |/ / /
| * | | emulator-ui: fix crash on exitDavid 'Digit' Turner2010-10-135-17/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | + remove net_cleanup() call in qemu_main(). It is not needed since the corresponding function only deals with the virtual LAN management and was causing build issues on some machines. Change-Id: I63896b9886c59259f75025277601711b450b2c0d
* | | Merge changes Ieab04778,Idb0e3c52,I3f426352,Ied07f9dbDavid Turner2010-10-134-2/+150
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | * changes: Don't build MMX stuff on PowerPC Add SDL_config.h for PPC (generated by android-configure.sh) Add config-host.h for PPC (generated by android-configure.sh) Fix detection of host endianness
| * | Don't build MMX stuff on PowerPCMarcus Comstedt2010-10-051-1/+5
| | | | | | | | | | | | Change-Id: Ieab047784761f8b9d0862b817319a903f26a4bf5
generated by cgit v1.1 at 2025-01-10 20:57:14 +0000