[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 06/14] sd: Switch to byte-based block access
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v5 06/14] sd: Switch to byte-based block access |
Date: |
Tue, 3 May 2016 09:42:38 -0600 |
Sector-based blk_write() should die; switch to byte-based
blk_pwrite() instead. Likewise for blk_read().
Greatly simplifies the code, now that we let the block layer
take care of alignment and read-modify-write on our behalf :)
In fact, we no longer need to include 'buf' in the migration
stream (although we do have to ensure that the stream remains
compatible).
Signed-off-by: Eric Blake <address@hidden>
---
v5: fix bug in sd_blk_write, drop sd->buf
---
hw/sd/sd.c | 51 ++++-----------------------------------------------
1 file changed, 4 insertions(+), 47 deletions(-)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index b66e5d2..87e3d23 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -123,7 +123,6 @@ struct SDState {
qemu_irq readonly_cb;
qemu_irq inserted_cb;
BlockBackend *blk;
- uint8_t *buf;
bool enable;
};
@@ -551,7 +550,7 @@ static const VMStateDescription sd_vmstate = {
VMSTATE_UINT64(data_start, SDState),
VMSTATE_UINT32(data_offset, SDState),
VMSTATE_UINT8_ARRAY(data, SDState, 512),
- VMSTATE_BUFFER_POINTER_UNSAFE(buf, SDState, 1, 512),
+ VMSTATE_UNUSED_V(1, 512),
VMSTATE_BOOL(enable, SDState),
VMSTATE_END_OF_LIST()
},
@@ -1577,57 +1576,17 @@ send_response:
static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len)
{
- uint64_t end = addr + len;
-
DPRINTF("sd_blk_read: addr = 0x%08llx, len = %d\n",
(unsigned long long) addr, len);
- if (!sd->blk || blk_read(sd->blk, addr >> 9, sd->buf, 1) < 0) {
+ if (!sd->blk || blk_pread(sd->blk, addr, sd->data, len) < 0) {
fprintf(stderr, "sd_blk_read: read error on host side\n");
- return;
}
-
- if (end > (addr & ~511) + 512) {
- memcpy(sd->data, sd->buf + (addr & 511), 512 - (addr & 511));
-
- if (blk_read(sd->blk, end >> 9, sd->buf, 1) < 0) {
- fprintf(stderr, "sd_blk_read: read error on host side\n");
- return;
- }
- memcpy(sd->data + 512 - (addr & 511), sd->buf, end & 511);
- } else
- memcpy(sd->data, sd->buf + (addr & 511), len);
}
static void sd_blk_write(SDState *sd, uint64_t addr, uint32_t len)
{
- uint64_t end = addr + len;
-
- if ((addr & 511) || len < 512)
- if (!sd->blk || blk_read(sd->blk, addr >> 9, sd->buf, 1) < 0) {
- fprintf(stderr, "sd_blk_write: read error on host side\n");
- return;
- }
-
- if (end > (addr & ~511) + 512) {
- memcpy(sd->buf + (addr & 511), sd->data, 512 - (addr & 511));
- if (blk_write(sd->blk, addr >> 9, sd->buf, 1) < 0) {
- fprintf(stderr, "sd_blk_write: write error on host side\n");
- return;
- }
-
- if (blk_read(sd->blk, end >> 9, sd->buf, 1) < 0) {
- fprintf(stderr, "sd_blk_write: read error on host side\n");
- return;
- }
- memcpy(sd->buf, sd->data + 512 - (addr & 511), end & 511);
- if (blk_write(sd->blk, end >> 9, sd->buf, 1) < 0) {
- fprintf(stderr, "sd_blk_write: write error on host side\n");
- }
- } else {
- memcpy(sd->buf + (addr & 511), sd->data, len);
- if (!sd->blk || blk_write(sd->blk, addr >> 9, sd->buf, 1) < 0) {
- fprintf(stderr, "sd_blk_write: write error on host side\n");
- }
+ if (!sd->blk || blk_pwrite(sd->blk, addr, sd->data, len, 0) < 0) {
+ fprintf(stderr, "sd_blk_write: write error on host side\n");
}
}
@@ -1925,8 +1884,6 @@ static void sd_realize(DeviceState *dev, Error **errp)
return;
}
- sd->buf = blk_blockalign(sd->blk, 512);
-
if (sd->blk) {
blk_set_dev_ops(sd->blk, &sd_block_ops, sd);
}
--
2.5.5
- [Qemu-devel] [PATCH v5 12/14] block: Switch blk_read_unthrottled() to byte interface, (continued)
- [Qemu-devel] [PATCH v5 12/14] block: Switch blk_read_unthrottled() to byte interface, Eric Blake, 2016/05/03
- [Qemu-devel] [PATCH v5 14/14] block: Kill blk_write(), blk_read(), Eric Blake, 2016/05/03
- [Qemu-devel] [PATCH v5 10/14] qemu-img: Switch to byte-based block access, Eric Blake, 2016/05/03
- [Qemu-devel] [PATCH v5 13/14] block: Switch blk_write_zeroes() to byte interface, Eric Blake, 2016/05/03
- [Qemu-devel] [PATCH v5 11/14] qemu-io: Switch to byte-based block access, Eric Blake, 2016/05/03
- [Qemu-devel] [PATCH v5 05/14] pflash: Switch to byte-based block access, Eric Blake, 2016/05/03
- [Qemu-devel] [PATCH v5 08/14] atapi: Switch to byte-based block access, Eric Blake, 2016/05/03
- [Qemu-devel] [PATCH v5 09/14] nbd: Switch to byte-based block access, Eric Blake, 2016/05/03
- [Qemu-devel] [PATCH v5 06/14] sd: Switch to byte-based block access,
Eric Blake <=
- [Qemu-devel] [PATCH v5 07/14] m25p80: Switch to byte-based block access, Eric Blake, 2016/05/03
- [Qemu-devel] [PATCH v5 01/14] block: Allow BDRV_REQ_FUA through blk_pwrite(), Eric Blake, 2016/05/03
- [Qemu-devel] [PATCH v5 04/14] onenand: Switch to byte-based block access, Eric Blake, 2016/05/03
- [Qemu-devel] [PATCH v5 03/14] nand: Switch to byte-based block access, Eric Blake, 2016/05/03