[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 15/23] ide: Complete conversion from BlockDriverS
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 15/23] ide: Complete conversion from BlockDriverState to BlockBackend |
Date: |
Sat, 13 Sep 2014 17:00:19 +0200 |
Add a BlockBackend member to TrimAIOCB, so ide_issue_trim_cb() can use
blk_aio_discard() instead of bdrv_aio_discard().
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/ide/core.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/ide/core.c b/hw/ide/core.c
index fe12145..c043dbe 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -362,6 +362,7 @@ static void ide_set_signature(IDEState *s)
typedef struct TrimAIOCB {
BlockAIOCB common;
+ BlockBackend *blk;
QEMUBH *bh;
int ret;
QEMUIOVector *qiov;
@@ -423,8 +424,8 @@ static void ide_issue_trim_cb(void *opaque, int ret)
}
/* Got an entry! Submit and exit. */
- iocb->aiocb = bdrv_aio_discard(iocb->common.bs, sector, count,
- ide_issue_trim_cb, opaque);
+ iocb->aiocb = blk_aio_discard(iocb->blk, sector, count,
+ ide_issue_trim_cb, opaque);
return;
}
@@ -448,6 +449,7 @@ BlockAIOCB *ide_issue_trim(BlockBackend *blk,
TrimAIOCB *iocb;
iocb = blk_aio_get(&trim_aiocb_info, blk, cb, opaque);
+ iocb->blk = blk;
iocb->bh = qemu_bh_new(ide_trim_bh_cb, iocb);
iocb->ret = 0;
iocb->qiov = qiov;
--
1.9.3
- [Qemu-devel] [PATCH v2 06/23] block: Make BlockBackend own its BlockDriverState, (continued)
- [Qemu-devel] [PATCH v2 06/23] block: Make BlockBackend own its BlockDriverState, Markus Armbruster, 2014/09/13
- [Qemu-devel] [PATCH v2 10/23] block: Eliminate DriveInfo member bdrv, use blk_by_legacy_dinfo(), Markus Armbruster, 2014/09/13
- [Qemu-devel] [PATCH v2 07/23] block: Eliminate bdrv_iterate(), use bdrv_next(), Markus Armbruster, 2014/09/13
- [Qemu-devel] [PATCH v2 05/23] block: Code motion to get rid of stubs/blockdev.c, Markus Armbruster, 2014/09/13
- [Qemu-devel] [PATCH v2 16/23] pc87312: Drop unused members of PC87312State, Markus Armbruster, 2014/09/13
- [Qemu-devel] [PATCH v2 15/23] ide: Complete conversion from BlockDriverState to BlockBackend,
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 17/23] blockdev: Drop superfluous DriveInfo member id, Markus Armbruster, 2014/09/13
- [Qemu-devel] [PATCH v2 21/23] blockdev: Convert qmp_eject(), qmp_change_blockdev() to BlockBackend, Markus Armbruster, 2014/09/13
- [Qemu-devel] [PATCH v2 20/23] block/qapi: Convert qmp_query_block() to BlockBackend, Markus Armbruster, 2014/09/13
- [Qemu-devel] [PATCH v2 23/23] block: Make device model's references to BlockBackend strong, Markus Armbruster, 2014/09/13
- [Qemu-devel] [PATCH v2 19/23] blockdev: Drop DriveInfo member enable_auto_del, Markus Armbruster, 2014/09/13
- [Qemu-devel] [PATCH v2 11/23] block: Rename BlockDriverAIOCB* to BlockAIOCB*, Markus Armbruster, 2014/09/13
- [Qemu-devel] [PATCH v2 18/23] blockdev: Fix blockdev-add not to create IDE drive (0, 0), Markus Armbruster, 2014/09/13
- [Qemu-devel] [PATCH v2 22/23] block: Lift device model API into BlockBackend, Markus Armbruster, 2014/09/13