[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 15/23] Fix block migration when the device size is n
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 15/23] Fix block migration when the device size is not a multiple of 1 MB |
Date: |
Mon, 24 Jan 2011 22:10:44 +0100 |
From: Pierre Riteau <address@hidden>
b02bea3a85cc939f09aa674a3f1e4f36d418c007 added a check on the return
value of bdrv_write and aborts migration when it fails. However, if the
size of the block device to migrate is not a multiple of BLOCK_SIZE
(currently 1 MB), the last bdrv_write will fail with -EIO.
Fixed by calling bdrv_write with the correct size of the last block.
Signed-off-by: Pierre Riteau <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block-migration.c | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/block-migration.c b/block-migration.c
index 60b9fc0..c9d3e81 100644
--- a/block-migration.c
+++ b/block-migration.c
@@ -638,8 +638,10 @@ static int block_load(QEMUFile *f, void *opaque, int
version_id)
int len, flags;
char device_name[256];
int64_t addr;
- BlockDriverState *bs;
+ BlockDriverState *bs, *bs_prev = NULL;
uint8_t *buf;
+ int64_t total_sectors = 0;
+ int nr_sectors;
do {
addr = qemu_get_be64(f);
@@ -661,10 +663,26 @@ static int block_load(QEMUFile *f, void *opaque, int
version_id)
return -EINVAL;
}
+ if (bs != bs_prev) {
+ bs_prev = bs;
+ total_sectors = bdrv_getlength(bs) >> BDRV_SECTOR_BITS;
+ if (total_sectors <= 0) {
+ error_report("Error getting length of block device %s\n",
+ device_name);
+ return -EINVAL;
+ }
+ }
+
+ if (total_sectors - addr < BDRV_SECTORS_PER_DIRTY_CHUNK) {
+ nr_sectors = total_sectors - addr;
+ } else {
+ nr_sectors = BDRV_SECTORS_PER_DIRTY_CHUNK;
+ }
+
buf = qemu_malloc(BLOCK_SIZE);
qemu_get_buffer(f, buf, BLOCK_SIZE);
- ret = bdrv_write(bs, addr, buf, BDRV_SECTORS_PER_DIRTY_CHUNK);
+ ret = bdrv_write(bs, addr, buf, nr_sectors);
qemu_free(buf);
if (ret < 0) {
--
1.7.2.3
- [Qemu-devel] [PATCH 05/23] Avoid divide by zero when there is no block device to migrate, (continued)
- [Qemu-devel] [PATCH 05/23] Avoid divide by zero when there is no block device to migrate, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 06/23] ide: factor dma handling helpers, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 07/23] ide: also reset io_buffer_index for writes, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 08/23] ide: kill ide_dma_submit_check, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 09/23] qcow2: Add QcowCache, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 11/23] qcow2: Batch flushes for COW, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 10/23] qcow2: Use QcowCache, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 12/23] ide: Remove unneeded null pointer check, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 13/23] Documentation: Add qemu-img check/rebase, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 14/23] qed: Refuse to create images on block devices, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 15/23] Fix block migration when the device size is not a multiple of 1 MB,
Kevin Wolf <=
- [Qemu-devel] [PATCH 16/23] blockdev: Fix error message for invalid -drive CHS, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 17/23] blockdev: Make drive_init() use error_report(), Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 18/23] blockdev: Fix drive_del not to crash when drive is not in use, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 19/23] block: Use backing format driver during image creation, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 22/23] usb-msd: Propagate removable bit to SCSI device, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 20/23] scsi-disk: Allow overriding SCSI INQUIRY removable bit, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 23/23] docs: Document scsi-disk and usb-storage removable parameter, Kevin Wolf, 2011/01/24
- [Qemu-devel] [PATCH 21/23] scsi: Allow scsi_bus_legacy_add_drive() to set removable bit, Kevin Wolf, 2011/01/24
- [Qemu-devel] Re: [PULL 00/23] Block patches, Anthony Liguori, 2011/01/24