static int aio_sig_num = SIGUSR2;
static BlockDriverAIOCB *first_aio; /* AIO issued */
+static int aio_initialized = 0;
-#ifndef QEMU_TOOL
static void aio_signal_handler(int signum)
{
+#ifndef QEMU_TOOL
CPUState *env = cpu_single_env;
if (env) {
/* stop the currently executing cpu because a timer occured */
}
#endif
}
+#endif
}
void qemu_aio_init(void)
{
struct sigaction act;
+
+ aio_initialized = 1;
sigfillset(&act.sa_mask);
act.sa_flags = 0; /* do not restart syscalls to interrupt select() */
aio_init(&ai);
}
}
-#endif /* !QEMU_TOOL */
void qemu_aio_poll(void)
{
void qemu_aio_wait_start(void)
{
sigset_t set;
+
+ if (!aio_initialized)
+ qemu_aio_init();
sigemptyset(&set);
sigaddset(&set, aio_sig_num);
sigprocmask(SIG_BLOCK, &set, &wait_oset);
} else {
access_flags = GENERIC_READ;
}
- if (flags & BDRV_O_CREATE) {
+ if (flags & BDRV_O_CREAT) {
create_flags = CREATE_ALWAYS;
} else {
create_flags = OPEN_EXISTING;
if (!acb1)
return -ENOMEM;
acb->opaque = acb1;
- s->hevent = CreateEvent(NULL, TRUE, FALSE, NULL);
- if (!s->hevent)
+ s->hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
+ if (!s->hEvent)
return -ENOMEM;
return 0;
}
static void raw_aio_cb(void *opaque)
{
- BlockDriverAIOCB *acb = acb1;
+ BlockDriverAIOCB *acb = opaque;
+ BlockDriverState *bs = acb->bs;
+ BDRVRawState *s = bs->opaque;
RawAIOCB *acb1 = acb->opaque;
DWORD ret_count;
int ret;
BlockDriverState *bs = acb->bs;
BDRVRawState *s = bs->opaque;
RawAIOCB *acb1 = acb->opaque;
- DWORD ret_count;
int ret;
int64_t offset;
BlockDriverState *bs = acb->bs;
BDRVRawState *s = bs->opaque;
RawAIOCB *acb1 = acb->opaque;
- DWORD ret_count;
int ret;
int64_t offset;
BDRVRawState *s = bs->opaque;
DWORD low, high;
- low = length;
- high = length >> 32;
+ low = offset;
+ high = offset >> 32;
if (!SetFilePointer(s->hfile, low, &high, FILE_BEGIN))
return -EIO;
if (!SetEndOfFile(s->hfile))