| commit | 5ce1ef2fdc46694a2ff1ffddf5ff9568a420c4ba | |
| author | Mark McLoughlin <markmc@redhat.com> | |
| Thu, 11 Jun 2009 09:12:16 +0000 (11 10:12 +0100) | ||
| committer | Mark McLoughlin <markmc@redhat.com> | |
| Thu, 11 Jun 2009 09:24:45 +0000 (11 10:24 +0100) | ||
| tree | aa20e842e400af87128dfc8a5cc5adb580a15a07 | treesnapshot (tar.gz zip) |
| parent | 911bc17eef923e45969a52fb37d705fc35fb6b9a | commitdiff |
| parent | 2313086addaf609c5f64636591818eebc213fd53 | commitdiff |
Merge branch 'master' of git://git.sv.gnu.org/qemu
* 'master' of git://git.sv.gnu.org/qemu: (11 commits)
Use hxtool to generate monitor documentation and C structures
Use correct type for SPARC cpu_cc_op
Fix typo
qdev: add monitor command to dump the tree.
Record device property types
Fix elf loader range checking
Remove ARM NVIC initialization hack
Add --enable-debug
qdev: kill DeviceState->name
fix gdbstub support for multiple threads in usermode, v3
CRIS: Remove duplicated flag defines.
Conflicts:
monitor.c
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
* 'master' of git://git.sv.gnu.org/qemu: (11 commits)
Use hxtool to generate monitor documentation and C structures
Use correct type for SPARC cpu_cc_op
Fix typo
qdev: add monitor command to dump the tree.
Record device property types
Fix elf loader range checking
Remove ARM NVIC initialization hack
Add --enable-debug
qdev: kill DeviceState->name
fix gdbstub support for multiple threads in usermode, v3
CRIS: Remove duplicated flag defines.
Conflicts:
monitor.c
Signed-off-by: Mark McLoughlin <markmc@redhat.com>