aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * upstream integrationDavid 'Digit' Turner2011-06-01160-11611/+12672
| |\ |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is a merge of a series of 42 upstream integration patches into the emulator's master branch. The individual patches come from the 'upstream-integrate' branch that was uploaded separately on kernel.org. The reference upstream sources used for this integration come from http://meego.gitorious.org/qemu-maemo/qemu using the following hash: 7243fbd089cce3c06ca24ed173a251f32644863c In a nutshell, the goal is to make our source tree closer to upstream in order to use various improvement there. Unfortunately, we're not to the point where we can use the upstream ARMv7-A / NEON translator, though we're getting close. Major changes are: - integrate upstream TCG and softfloat - target-arm: Move most Android-specific helper functions to helper-android.c and translate-android.h. This is in preparation of a _major_ integration of the upstream ARM translator. - moving various functions to different files (e.g. cpus.c, qemu-os-posix.c, qemu-os-win32.c, arch_init.c, etc) - qemu-char-android.c is now gone. We're using qemu-char.c with slight modifications embedded within CONFIG_ANDROID-guarded ifdef blocks. - rename "trace.h" to "android-trace.h". We still need to keep "trace.h" and "trace_common.h" until we also update sdk/emulator/tools/qtools/ to use the new header names. After this, we will integrate in a future integration the auto-generated trace.h used by upstream. - remove the OutputChannel hack. Instead, implement a "fake Monitor" object that can be used with any function that takes a Monitor as input. The fake Monitor is used to collect output into a dynamic buffer (e.g. during snapshot save/load). - convert to upstream QEMUTimer API changes. - implement physical memory with RAMBlock lists (instead of a single array). Short log of individual changes: 406a59b trace.h: rename to trace-android.h 288208c target-arm/translate.c: move Android-specific stuff out. f1d9bf1 tcg: integrate upstream version 280afa0 ramblocks: integrate upstream implementation (sophisticated) ae3098a vl-android.c: move arch-specific functions to arch_init.c 23ca2ae vl-android.c: move cpu functions to cpus.c c1ac40a vl-android.c: use os-specific setup routines e49c3f3 compatfd.c: minor integrate 4276038 cpu-exec.c: minor integrate 3b2846a qemu-char-android.c: rename to qemu-char.c f645f7d cpu_restore_state: remove un-necessary argument. f0753ac qjson.c: minor integrate 8354d2d vl-android.c: Move code to iohandler.c d3d4468 translate-all.c: minor integrate 1f9ec0f qemu-config.c: minor integrate d09775c monitor.c: minor integrate 9f64011 disas.c: minor integrate 69ed952 device_tree.c: minor integrate e1c0948 bswap.h + others: minor integrate 6b9236d buffered_file.c: minor integrate 95a83ce savevm: Remove OutputBuffer hack. 986acc9 savevm.c: minor integrate 39373b1 arm-semi.c: minor integrate fb955c7 README: minor integrate 8ee4e5e trace: simplify code and avoid conflicts 65d1521 acl.c: minor integrate c98cf7b arm-dis.c: minor integrate bfec547 fpu: upstream integrate 9bfb3d5 json-lexer.c, json-parser.c: minor integrate 6eaacfb trace.h: minor C compatibility fixes. 17410ee qemu-char.h, console.h: upstream integration 5973c77 qemu-timer.c: rename qemu_timer_new_scale() 317c9d5 qemu-timer.c: upstream integrate 47dc1f4 qerror: minor integrate 488bfd5 qemu-error: minor integrate 1646b4e posix-aio-compat.c: minor integrate 088edf8 os-posix.c + os-win32.c and dependencies 795bb19 qemu-common.h: other intergrates 45c3be0 integrate: qemu-common.h changes Change-Id: If5771dd4b030c602b99845d7489d1f55406bf159
| * trace.h: rename to trace-android.hDavid 'Digit' Turner2011-06-0112-213/+217
| | | | | | | | | | | | | | This is done to allow for future integration of the upstream auto-generated "trace.h" header file. Change-Id: I9d1bba3320d9e8acfd7359540d3ed6695773061e
| * target-arm/translate.c: move Android-specific stuff out.David 'Digit' Turner2011-06-017-260/+304
| | | | | | | | Change-Id: Id14c6b106dbac9b4016b7423327e9eb22e21fe75
| * tcg: integrate upstream versionDavid 'Digit' Turner2011-06-0124-2206/+4356
| | | | | | | | Change-Id: Ifcdebc2e7179fbc64b46a9150e6dae62f86eba3c
| * ramblocks: integrate upstream implementation (sophisticated)David 'Digit' Turner2011-06-0118-823/+449
| | | | | | | | Change-Id: I49e96e2d5ae571849b0b6fef0a30b41ecdee8d23
| * vl-android.c: move arch-specific functions to arch_init.cDavid 'Digit' Turner2011-06-016-400/+777
| | | | | | | | Change-Id: I4908006f3492aab199466c501dedff2bd835d647
| * vl-android.c: move cpu functions to cpus.cDavid 'Digit' Turner2011-06-015-1386/+675
| | | | | | | | Change-Id: Ib422f24224c2e75dd126689c67dbbb187d7c1670
| * vl-android.c: use os-specific setup routinesDavid 'Digit' Turner2011-06-013-565/+32
| | | | | | | | | | | | Also fixes a bug in os-posix.c Change-Id: If2c6fb94d3e48d1db051aa9141dc2f69bdca35a8
| * compatfd.c: minor integrateDavid 'Digit' Turner2011-06-012-60/+64
| | | | | | | | Change-Id: I93f921bfb2778bb592c9a4ce1e8c26ff5a5b6a97
| * cpu-exec.c: minor integrateDavid 'Digit' Turner2011-06-011-14/+39
| | | | | | | | Change-Id: Id8bef52e4cf42c4ca4e56d34d103ba09dba28b96
| * qemu-char-android.c: rename to qemu-char.cDavid 'Digit' Turner2011-06-018-2585/+183
| | | | | | | | | | | | + convert to QemuOpts* initialization functions. Change-Id: I5a245ed2de068af49fdc92de8e3e834d0f49aa27
| * cpu_restore_state: remove un-necessary argument.David 'Digit' Turner2011-06-016-72/+66
| | | | | | | | Change-Id: I01cef0743cc9db9d21c2b7feb9f2a877ac4d2b35
| * qjson.c: minor integrateDavid 'Digit' Turner2011-06-012-12/+51
| | | | | | | | Change-Id: Id2c8a26a772d7fe76b8ec6a339a32111946d1350
| * vl-android.c: Move code to iohandler.cDavid 'Digit' Turner2011-06-015-217/+215
| | | | | | | | Change-Id: I28d2025dfa1f7bfc1ab2318f5ff6c0fd56f4b658
| * translate-all.c: minor integrateDavid 'Digit' Turner2011-06-015-13/+6
| |
| * qemu-config.c: minor integrateDavid 'Digit' Turner2011-06-012-1/+120
| | | | | | | | Change-Id: I17546b84cc79151651cf663620a565fc485aa4c8
| * monitor.c: minor integrateDavid 'Digit' Turner2011-06-012-9/+12
| | | | | | | | Change-Id: I75b9f973655637234466725d7af94f2dd2281fa2
| * disas.c: minor integrateDavid 'Digit' Turner2011-06-012-18/+14
| | | | | | | | Change-Id: I35f0c5abbd89588d9d72168d5c03f428eedc7ea5
| * 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>
generated by cgit v1.1 at 2024-07-06 18:05:57 +0000