[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 25/27] qemu-tool: revert cpu_get_clock() abort(3)
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 25/27] qemu-tool: revert cpu_get_clock() abort(3) |
Date: |
Wed, 29 Feb 2012 16:18:06 +0100 |
From: Stefan Hajnoczi <address@hidden>
Despite the fact that the qemu-tool environment has no guest running and
vm_clock therefore does not make sense, there is code that gets the
vm_clock time even in qemu-tool. Therefore, revert the abort(3) call
and just return 0 like we used to. This unbreaks qemu-img/qemu-io with
QED and Kevin has also expressed interest in this for qcow2.
Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
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)
--
1.7.6.5
- [Qemu-devel] [PATCH 22/27] qemu-iotests: Filter out DOS line endings, (continued)
- [Qemu-devel] [PATCH 22/27] qemu-iotests: Filter out DOS line endings, Kevin Wolf, 2012/02/29
- [Qemu-devel] [PATCH 13/27] block: remove unused fields in BlockDriverState, Kevin Wolf, 2012/02/29
- [Qemu-devel] [PATCH 15/27] qcow2: Fix offset in qcow2_read_extensions, Kevin Wolf, 2012/02/29
- [Qemu-devel] [PATCH 06/27] block: add a transfer rate for floppy types, Kevin Wolf, 2012/02/29
- [Qemu-devel] [PATCH 07/27] fdc: add a 'check media rate' property. Not used yet, Kevin Wolf, 2012/02/29
- [Qemu-devel] [PATCH 19/27] qemu-iotests: export TEST_DIR for non-bash tests, Kevin Wolf, 2012/02/29
- [Qemu-devel] [PATCH 27/27] qemu-img: fix segment fault when the image format is qed, Kevin Wolf, 2012/02/29
- [Qemu-devel] [PATCH 05/27] fdc: add CCR (Configuration Control Register) write register, Kevin Wolf, 2012/02/29
- [Qemu-devel] [PATCH 23/27] qemu-iotests: 026: Reduce output changes for cache=none qcow2, Kevin Wolf, 2012/02/29
- [Qemu-devel] [PATCH 26/27] qemu-io: fix segment fault when the image format is qed, Kevin Wolf, 2012/02/29
- [Qemu-devel] [PATCH 25/27] qemu-tool: revert cpu_get_clock() abort(3),
Kevin Wolf <=
- [Qemu-devel] [PATCH 21/27] test: add image streaming tests, Kevin Wolf, 2012/02/29
- [Qemu-devel] [PATCH 20/27] qemu-iotests: add iotests Python module, Kevin Wolf, 2012/02/29
- [Qemu-devel] [PATCH 24/27] qemu-iotests: Test rebase with short backing file, Kevin Wolf, 2012/02/29
- [Qemu-devel] [PATCH 17/27] qapi: Introduce blockdev-group-snapshot-sync command, Kevin Wolf, 2012/02/29
- Re: [Qemu-devel] [PULL 00/27] Block patches, Anthony Liguori, 2012/02/29