diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-29 12:57:28 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-29 12:57:28 -0600 |
| commit | 7c51c1aa03a52b9fd75ed1ade2e65d079ae4d50e (patch) | |
| tree | cb33d27b5397ee4ba6819e1914ef3e4819269e07 /qemu-tool.c | |
| parent | f06d0f0755dbd9fee2fd3f21eefd2b19105fa346 (diff) | |
| parent | 67d384e80471e91aa490d4573cac5a46f92f685f (diff) | |
| download | hqemu-7c51c1aa03a52b9fd75ed1ade2e65d079ae4d50e.zip hqemu-7c51c1aa03a52b9fd75ed1ade2e65d079ae4d50e.tar.gz | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
* kwolf/for-anthony: (27 commits)
qemu-img: fix segment fault when the image format is qed
qemu-io: fix segment fault when the image format is qed
qemu-tool: revert cpu_get_clock() abort(3)
qemu-iotests: Test rebase with short backing file
qemu-iotests: 026: Reduce output changes for cache=none qcow2
qemu-iotests: Filter out DOS line endings
test: add image streaming tests
qemu-iotests: add iotests Python module
qemu-iotests: export TEST_DIR for non-bash tests
QMP: Add qmp command for blockdev-group-snapshot-sync
qapi: Introduce blockdev-group-snapshot-sync command
qcow2: Reject too large header extensions
qcow2: Fix offset in qcow2_read_extensions
block: drop aio_multiwrite in BlockDriver
block: remove unused fields in BlockDriverState
qcow2: Fix build with DEBUG_EXT enabled
ide: fail I/O to empty disk
fdc: DIR (Digital Input Register) should return status of current drive...
fdc: fix seek command, which shouldn't check tracks
fdc: check if media rate is correct before doing any transfer
...
Diffstat (limited to 'qemu-tool.c')
| -rw-r--r-- | qemu-tool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qemu-tool.c b/qemu-tool.c index 183a583..edb84f5 100644 --- a/qemu-tool.c +++ b/qemu-tool.c @@ -61,7 +61,7 @@ void monitor_protocol_event(MonitorEvent event, QObject *data) int64_t cpu_get_clock(void) { - abort(); + return 0; } int64_t cpu_get_icount(void) |
