| commit | e9b8186e28d1fcbe8407e11d303fb4ab3298ca52 | |
| author | Avi Kivity <avi@redhat.com> | |
| Tue, 30 Jun 2009 12:23:36 +0000 (30 15:23 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Tue, 30 Jun 2009 12:23:36 +0000 (30 15:23 +0300) | ||
| tree | fcab36218c1fcf1bc466bd3a95f43143d3d1db59 | treesnapshot (tar.gz zip) |
| parent | 2ad032b85dcfc62976c326ddb79dd4d2b7426683 | commitdiff |
| parent | 3a31f36a07d8d6bf49a7da24c5570153de0fd79e | commitdiff |
Merge commit '3a31f36a07d8d6bf49a7da24c5570153de0fd79e' into upstream-merge
* commit '3a31f36a07d8d6bf49a7da24c5570153de0fd79e':
x86: Factor out pc_new_cpu
monitor: Refactor acl commnds
monitor: Add completion for help command
Conflicts:
hw/pc.c
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '3a31f36a07d8d6bf49a7da24c5570153de0fd79e':
x86: Factor out pc_new_cpu
monitor: Refactor acl commnds
monitor: Add completion for help command
Conflicts:
hw/pc.c
Signed-off-by: Avi Kivity <avi@redhat.com>
| hw/acpi.c | diff1 | diff2 | blobhistory |
| hw/pc.c | diff1 | diff2 | blobhistory |
| hw/pc.h | diff1 | diff2 | blobhistory |
| monitor.c | diff1 | diff2 | blobhistory |
| qemu-monitor.hx | diff1 | diff2 | blobhistory |