aboutsummaryrefslogtreecommitdiffstats
path: root/block/qcow2.c
Commit message (Collapse)AuthorAgeFilesLines
* upstream: integrate block changesDavid 'Digit' Turner2011-01-021-213/+457
| | | | | | | | This large patch upgrades the block support code to the upstream version available in ba5e7f82169f32ab8163c707d97c799ca09f8924 dated 2010-08-08 Change-Id: I8b24df0c287e72f6620650a4d6a62e1bb315453e
* Remove compiler warnings when building the emulator.David 'Digit' Turner2010-09-221-13/+55
| | | | | | | This forces -Wall during the build. Note that this patch doesn't remove all warnings, but most of the remaining ones are from upstream anyway. Change-Id: I8808d8495e99866e156ce5780d2e3c305eab491f
* Fixed rudimentary suspend/resume.Ot ten Thije2010-07-291-6/+64
| | | | | | | | | | | | | | | | | | | | | | This patch replaces the failing asynchronous I/O code in the qcow2 driver with a working synchronous implementation and fixes another minor bug in iteration over QField structs. As a result, the VM can now be suspended and resumed with the savevm and loadvm commands, albeit with the following (major) caveats: 1. The ADBd and other network services do not resume correctly. 2. Normal SD card usage is blocked, since snapshots are written to a qcow2 image that must (for now) be mounted on hda. 3. Resume only works after the emulator is fully booted. It is not (yet) possible to load an image immediately after the machine started. The synchronous I/O code is ported from commit ef845c3b in mainline QEMU, which addresses a similar issue. Further upstream mainline also introduces a fix for the async I/O, but that patch is quite involved, and for now this relatively simple fix works. Change-Id: I660c19c22316aecdd7dcae357e66da20e0ab6d80
* Merge upstream QEMU 10.0.50 into the Android source tree.David 'Digit' Turner2009-09-141-0/+1027
This change integrates many changes from the upstream QEMU sources. Its main purpose is to enable correct ARMv6 and ARMv7 support to the Android emulator. Due to the nature of the upstream code base, this unfortunately also required changes to many other parts of the source. Note that to ensure easier integrations in the future, some source files and directories that have heavy Android-specific customization have been renamed with an -android suffix. The original files are still there for easier integration tracking, but *never* compiled. For example: net.c net-android.c qemu-char.c qemu-char-android.c slirp/ slirp-android/ etc... Tested on linux-x86, darwin-x86 and windows host machines.