aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Submit mergedVladimir Chtchetkine2010-12-0610-31/+808
| | | | | | | | | | | | | | Squashed commit of the following: commit aeefab810c6331e2f96e81f20e4408b39dd3a2ca Author: Vladimir Chtchetkine <vchtchetkine@google.com> Date: Thu Dec 2 07:40:34 2010 -0800 Implement -attach-core UI option Change-Id: I4168e2d707cab1b4873ee16d86d5126c1a316abf Change-Id: I2da1ef5d53641f3c60d83d8d5ddf3aff34b0c6c7
* Merge "Add -no-snapshot-load option to permit reboot."Tim Baverstock2010-12-034-12/+32
|\
| * Add -no-snapshot-load option to permit reboot.Tim Baverstock2010-12-024-12/+32
| | | | | | | | | | | | | | | | | | This is a workaround for the emulator not being able to detect the guest's power-down situation, and simply lingering like a zombie: on exit it's saved as a zombie, and is restored as a zombie which isn't useful. Denying autoload forces a reboot. Change-Id: I48f32600f5ce18cd5c71aa01d1b71b382102f227
* | Merge "Correct command arguments for 'geo fix', but support backward ↵Tim Baverstock2010-12-032-17/+26
|\ \ | |/ |/| | | compatible use."
| * Correct command arguments for 'geo fix', but support backward compatible use.Tim Baverstock2010-12-012-17/+26
| | | | | | | | Change-Id: Id4f427dfb918d69e3fb52725cbe88bce1666dddc
* | Merge "Augment the auto-loadvm behaviour with corresponding ↵Tim Baverstock2010-12-026-14/+49
|\ \ | | | | | | | | | auto-savevm-on-exit behaviour."
| * | Augment the auto-loadvm behaviour with corresponding auto-savevm-on-exit ↵Tim Baverstock2010-12-016-14/+49
| |/ | | | | | | | | | | | | | | | | | | | | | | behaviour. Autosave fires when loadvm would have been tried - whether it succeeded or not - in order to bootstrap from an empty snapshot file. - New autosave behaviour inhibited with -no_snapshot_save flag. - Underlying behaviour implemented with a new qemu option -savevm_on_exit Change-Id: If64d89f004565ecbb431bc7e96ecc37e27876d67
* | Merge "Implement line reading on syncsocket"Vladimir Chtchetkine2010-12-022-4/+139
|\ \
| * | Implement line reading on syncsocketVladimir Chtchetkine2010-12-022-4/+139
|/ / | | | | | | Change-Id: I1fa22c34203b163e1b0a78240be73a4a7473691e
* | Merge "Implement helper routines for syncronous socket operations"Vladimir Chtchetkine2010-12-013-0/+207
|\ \ | |/ |/|
| * Implement helper routines for syncronous socket operationsVladimir Chtchetkine2010-12-013-0/+207
|/ | | | Change-Id: I93af5f740decb1fb0f6e037a76223fa8dd5305ac
* Merge "Enable snapshot behaviour"Tim Baverstock2010-11-291-1/+1
|\
| * Enable snapshot behaviourTim Baverstock2010-11-251-1/+1
|/ | | | Change-Id: I383927c7805e840031d83ef7154c335519e1f5a4
* Merge "Replacement of padding with ftruncate."David Turner2010-11-251-33/+53
|\
| * Replacement of padding with ftruncate.Tim Baverstock2010-11-231-33/+53
| | | | | | | | | | | | | | | | Also stored some other parameters, speculatively. Guard ftruncate and lseek against EINTR Change-Id: I4237640318564db6c375a90415097c00e4fcafaa
* | Merge "Separate main.c used to build the emulator from main-ui.c used to ↵Vladimir Chtchetkine2010-11-243-109/+1809
|\ \ | | | | | | | | | build the UI"
| * | Separate main.c used to build the emulator from main-ui.c used to build the UIVladimir Chtchetkine2010-11-243-109/+1809
|/ / | | | | | | Change-Id: I1c7baeaa8447fe1df895869bfb6b74631b765845
* | Merge "Implement sock_address_list_create2 routine."Vladimir Chtchetkine2010-11-242-0/+49
|\ \ | |/ |/|
| * Implement sock_address_list_create2 routine.Vladimir Chtchetkine2010-11-242-0/+49
|/ | | | | | This routine takes socket address in the form of [host:]port and creates array of SockAddress for it. Change-Id: Ib2d4c1035d109d9d3df100961c4eec728d15e485
* Merge "Parallelize -list-cores implementation."David 'Digit' Turner2010-11-191-97/+63
|\
| * Parallelize -list-cores implementation.David 'Digit' Turner2010-11-191-97/+63
| | | | | | | | | | | | | | | | | | | | | | Modify the implementation of list_cores() to perform all 16 connection requests in parallel, using a generic looper and and asyncConsoleConnector per probed port, with a global timeout of half a second. This is also a demonstration of the new asynchronous helpers. Change-Id: Ib09adf44b00d0694ec29d7ed0b26b44eef77f88a
* | Merge "Introduce asynchronous operation helpers."David 'Digit' Turner2010-11-195-0/+665
|\ \ | |/
| * Introduce asynchronous operation helpers.David 'Digit' Turner2010-11-195-0/+665
| | | | | | | | | | | | | | | | | | | | <android/async-utils.h> contains generic helpers to read, write and connect to sockets. <android/async-console.h> contains a helper class to connect to Android console port asynchronously. Change-Id: I5d0a49a770ad974c5d4382438d75e9eb624368d1
* | Merge "Fix generic looper implementation"David 'Digit' Turner2010-11-194-24/+111
|\ \ | |/
| * Fix generic looper implementationDavid 'Digit' Turner2010-11-194-24/+111
|/ | | | | | | | | | | | | | | + allow looper_run() to return a value that indicates why it exited. + add looper_runWithDeadline() and looper_runWithTimeout() in the case where you want to run only for a limited time. looper_runWithTimeout(looper,0) can be used to poll the event state and return asap after firing all the callbacks. + fix iolooper_modify() Change-Id: Iba3b0385a7fd8d90f4f3334ebf313e79267f7b3d
* Merge "Allow safe deletion during iteration of an ARefSet."David 'Digit' Turner2010-11-193-15/+55
|\
| * Allow safe deletion during iteration of an ARefSet.David 'Digit' Turner2010-11-183-15/+55
|/ | | | | | | + make AREFSET_FOREACH take the name of an existing type variable which avoids an annoying type-cast in each statement. Change-Id: Icf9d886601a9876fa29c15eb0e60a9bf6c8ec163
* Merge "Implementation of event loop abstraction."David 'Digit' Turner2010-11-188-3/+1211
|\
| * Implementation of event loop abstraction.David 'Digit' Turner2010-11-188-3/+1211
|/ | | | | | | | | | | | | | | This patch adds "android/looper.h" which provides an abstraction for event loops: - android/looper-qemu.c implements it on top of the QEMU main event loop. - android/looper-generic.c implements it on top of an IoLooper object. The main idea is to move the UI-related code to use the abstraction to handle timers and asynchronous (network) i/o. NOTE: Code compiles but has not been heavily tested. Change-Id: Ib6820c1b9a9950dc22449a332bc1b066a07af203
* Merge "Update android/utils/ with misc. new features."David 'Digit' Turner2010-11-1814-130/+933
|\
| * Update android/utils/ with misc. new features.David 'Digit' Turner2010-11-1714-130/+933
| | | | | | | | | | | | | | | | | | | | | | | | This introduces a few new features to android/utils/ that will be used in later patches. + <android/utils/assert.h> to handle assertions + <android/utils/vector.h> to handle dynamic arrays + <android/utils/reflist.h> slightly updated (more docs) + <android/utils/refset.h> implements a set of pointers Change-Id: Iebc14cfefd1c0e8aaecda9958a980d40f0be610a
* | Merge "Add env var ANDROID_TMP to override /tmp/android location."Raphael2010-11-162-2/+5
|\ \
| * | 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
|\ \
generated by cgit v1.1 at 2024-09-28 06:34:13 +0000