From patchwork Mon Sep 21 12:25:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 520266 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 941711401DE for ; Mon, 21 Sep 2015 22:28:40 +1000 (AEST) Received: from localhost ([::1]:58124 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ze0Cz-0001PO-P3 for incoming@patchwork.ozlabs.org; Mon, 21 Sep 2015 08:28:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57695) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ze0An-0000zn-BM for qemu-devel@nongnu.org; Mon, 21 Sep 2015 08:26:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ze0Ai-0003uL-7y for qemu-devel@nongnu.org; Mon, 21 Sep 2015 08:26:21 -0400 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:40736 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ze0Ah-0003tz-U5 for qemu-devel@nongnu.org; Mon, 21 Sep 2015 08:26:16 -0400 Received: (qmail 26030 invoked by uid 89); 21 Sep 2015 12:26:14 -0000 Received: from [82.141.1.145] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2010/03/19-MF (clamdscan: 0.98.7/20927. hbedv: 8.3.34.26/7.12.12.28. spamassassin: 3.4.0. Clear:RC:1(82.141.1.145):SA:0(-1.2/5.0):. Processed in 1.25182 secs); 21 Sep 2015 12:26:14 -0000 Received: from ns.kamp-intra.net (HELO dns.kamp-intra.net) ([82.141.1.145]) by mx01.kamp.de with SMTP; 21 Sep 2015 12:26:12 -0000 X-GL_Whitelist: yes Received: from lieven-pc (lieven-pc.kamp-intra.net [172.21.12.60]) by dns.kamp-intra.net (Postfix) with ESMTP id 1238EE006B; Mon, 21 Sep 2015 14:25:32 +0200 (CEST) Received: by lieven-pc (Postfix, from userid 1000) id B21EB20B34; Mon, 21 Sep 2015 14:25:31 +0200 (CEST) From: Peter Lieven To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Mon, 21 Sep 2015 14:25:27 +0200 Message-Id: <1442838328-23117-5-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1442838328-23117-1-git-send-email-pl@kamp.de> References: <1442838328-23117-1-git-send-email-pl@kamp.de> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a02:248:0:51::16 Cc: kwolf@redhat.com, stefanha@gmail.com, jcody@redhat.com, jsnow@redhat.com, Peter Lieven Subject: [Qemu-devel] [PATCH 4/5] ide/atapi: enable cancelable requests X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Peter Lieven --- hw/ide/atapi.c | 4 ++-- hw/ide/core.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c index b209ed9..ab45495 100644 --- a/hw/ide/atapi.c +++ b/hw/ide/atapi.c @@ -141,7 +141,7 @@ static int cd_read_sector(IDEState *s, int lba, void *buf, int sector_size) s->iov.iov_len = 4 * BDRV_SECTOR_SIZE; qemu_iovec_init_external(&s->qiov, &s->iov, 1); - if (blk_aio_readv(s->blk, (int64_t)lba << 2, &s->qiov, 4, + if (ide_readv_cancelable(s, (int64_t)lba << 2, &s->qiov, 4, cd_read_sector_cb, s) == NULL) { return -EIO; } @@ -368,7 +368,7 @@ static void ide_atapi_cmd_read_dma_cb(void *opaque, int ret) s->bus->dma->iov.iov_len = n * 4 * 512; qemu_iovec_init_external(&s->bus->dma->qiov, &s->bus->dma->iov, 1); - s->bus->dma->aiocb = blk_aio_readv(s->blk, (int64_t)s->lba << 2, + s->bus->dma->aiocb = ide_readv_cancelable(s, (int64_t)s->lba << 2, &s->bus->dma->qiov, n * 4, ide_atapi_cmd_read_dma_cb, s); if (s->bus->dma->aiocb == NULL) { diff --git a/hw/ide/core.c b/hw/ide/core.c index 24547ce..5c7a346 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2330,6 +2330,7 @@ int ide_init_drive(IDEState *s, BlockBackend *blk, IDEDriveKind kind, if (kind == IDE_CD) { blk_set_dev_ops(blk, &ide_cd_block_ops, s); blk_set_guest_block_size(blk, 2048); + s->requests_cancelable = true; } else { if (!blk_is_inserted(s->blk)) { error_report("Device needs media, but drive is empty");