| commit | 3c9618b764d368e5a52b6a17b7b5754e5d6e2407 | |
| author | Avi Kivity <avi@redhat.com> | |
| Wed, 9 Sep 2009 09:12:43 +0000 (9 12:12 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Wed, 9 Sep 2009 09:12:43 +0000 (9 12:12 +0300) | ||
| tree | 74eaf433acd7f8d81ab4640e8df5c4b5dc12ce01 | treesnapshot (tar.gz zip) |
| parent | ea571d06d8e39187663f255d62b886bf01371667 | commitdiff |
| parent | 4d76d2ba9d313a827012d72d8352459d3b7b8833 | commitdiff |
Merge commit '4d76d2ba9d313a827012d72d8352459d3b7b8833' into upstream-merge
* commit '4d76d2ba9d313a827012d72d8352459d3b7b8833':
monitor: New format for handlers argument types
Add wrappers to functions used by the Monitor
Introduce QDict
Introduce QString
Introduce QInt
Introduce QObject
ide: move cmd+irq from IDEState to IDEBus.
ide: pass down DriveInfo instead of BlockDriverState
Conflicts:
qemu-monitor.hx
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '4d76d2ba9d313a827012d72d8352459d3b7b8833':
monitor: New format for handlers argument types
Add wrappers to functions used by the Monitor
Introduce QDict
Introduce QString
Introduce QInt
Introduce QObject
ide: move cmd+irq from IDEState to IDEBus.
ide: pass down DriveInfo instead of BlockDriverState
Conflicts:
qemu-monitor.hx
Signed-off-by: Avi Kivity <avi@redhat.com>