[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/7] qemu-io: use main_loop_wait
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 1/7] qemu-io: use main_loop_wait |
Date: |
Mon, 12 Mar 2012 19:22:22 +0100 |
This will let timers run during aio_read and aio_write commands,
though not during synchronous commands.
Signed-off-by: Paolo Bonzini <address@hidden>
---
cmd.c | 10 +++++-----
qemu-io.c | 7 ++++---
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/cmd.c b/cmd.c
index 0806e18..7ffbb71 100644
--- a/cmd.c
+++ b/cmd.c
@@ -25,6 +25,7 @@
#include "cmd.h"
#include "qemu-aio.h"
+#include "main-loop.h"
#define _(x) x /* not gettext support yet */
@@ -146,7 +147,7 @@ static void prep_fetchline(void *opaque)
{
int *fetchable = opaque;
- qemu_aio_set_fd_handler(STDIN_FILENO, NULL, NULL, NULL, NULL, NULL);
+ qemu_set_fd_handler(STDIN_FILENO, NULL, NULL, NULL);
*fetchable= 1;
}
@@ -193,12 +194,11 @@ void command_loop(void)
if (!prompted) {
printf("%s", get_prompt());
fflush(stdout);
- qemu_aio_set_fd_handler(STDIN_FILENO, prep_fetchline, NULL, NULL,
- NULL, &fetchable);
+ qemu_set_fd_handler(STDIN_FILENO, prep_fetchline, NULL,
&fetchable);
prompted = 1;
}
- qemu_aio_wait();
+ main_loop_wait(false);
if (!fetchable) {
continue;
@@ -221,7 +221,7 @@ void command_loop(void)
prompted = 0;
fetchable = 0;
}
- qemu_aio_set_fd_handler(STDIN_FILENO, NULL, NULL, NULL, NULL, NULL);
+ qemu_set_fd_handler(STDIN_FILENO, NULL, NULL, NULL);
}
/* from libxcmd/input.c */
diff --git a/qemu-io.c b/qemu-io.c
index 3189530..e9b7369 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -15,6 +15,7 @@
#include <libgen.h>
#include "qemu-common.h"
+#include "main-loop.h"
#include "block_int.h"
#include "cmd.h"
@@ -294,7 +295,7 @@ static int do_aio_readv(QEMUIOVector *qiov, int64_t offset,
int *total)
bdrv_aio_readv(bs, offset >> 9, qiov, qiov->size >> 9,
aio_rw_done, &async_ret);
while (async_ret == NOT_DONE) {
- qemu_aio_wait();
+ main_loop_wait(false);
}
*total = qiov->size;
@@ -308,7 +309,7 @@ static int do_aio_writev(QEMUIOVector *qiov, int64_t
offset, int *total)
bdrv_aio_writev(bs, offset >> 9, qiov, qiov->size >> 9,
aio_rw_done, &async_ret);
while (async_ret == NOT_DONE) {
- qemu_aio_wait();
+ main_loop_wait(false);
}
*total = qiov->size;
@@ -351,7 +352,7 @@ static int do_aio_multiwrite(BlockRequest* reqs, int
num_reqs, int *total)
}
while (async_ret.num_done < num_reqs) {
- qemu_aio_wait();
+ main_loop_wait(false);
}
return async_ret.error < 0 ? async_ret.error : 1;
--
1.7.7.6
- [Qemu-devel] [PATCH 0/7] AIO nested loop and bdrv_drain_all changes, Paolo Bonzini, 2012/03/12
- [Qemu-devel] [PATCH 1/7] qemu-io: use main_loop_wait,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 3/7] posix-aio: merge posix_aio_process_queue and posix_aio_read, Paolo Bonzini, 2012/03/12
- [Qemu-devel] [PATCH 7/7] block: add the support to drain throttled requests, Paolo Bonzini, 2012/03/12
- [Qemu-devel] [PATCH 4/7] aio: remove process_queue callback and qemu_aio_process_queue, Paolo Bonzini, 2012/03/12
- [Qemu-devel] [PATCH 5/7] aio: return "AIO in progress" state from qemu_aio_wait, Paolo Bonzini, 2012/03/12
- [Qemu-devel] [PATCH 2/7] qemu-tool: map vm_clock to rt_clock, Paolo Bonzini, 2012/03/12
- [Qemu-devel] [PATCH 6/7] aio: simplify qemu_aio_wait, Paolo Bonzini, 2012/03/12