[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/6] parallels: use qemu block API
From: |
Christoph Hellwig |
Subject: |
[Qemu-devel] [PATCH 6/6] parallels: use qemu block API |
Date: |
Tue, 4 May 2010 12:45:15 +0200 |
User-agent: |
Mutt/1.3.28i |
Use bdrv_pwrite to access the backing device instead of pread, and
convert the driver to implementing the bdrv_open method which gives
it an already opened BlockDriverState for the underlying device.
Signed-off-by: Christoph Hellwig <address@hidden>
Index: qemu-kevin/block/parallels.c
===================================================================
--- qemu-kevin.orig/block/parallels.c 2010-05-03 13:04:37.494261748 +0200
+++ qemu-kevin/block/parallels.c 2010-05-03 13:05:55.781255810 +0200
@@ -46,7 +46,6 @@ struct parallels_header {
} __attribute__((packed));
typedef struct BDRVParallelsState {
- int fd;
uint32_t *catalog_bitmap;
int catalog_size;
@@ -68,22 +67,15 @@ static int parallels_probe(const uint8_t
return 0;
}
-static int parallels_open(BlockDriverState *bs, const char *filename, int
flags)
+static int parallels_open(BlockDriverState *bs, int flags)
{
BDRVParallelsState *s = bs->opaque;
- int fd, i;
+ int i;
struct parallels_header ph;
- fd = open(filename, O_RDONLY | O_BINARY | O_LARGEFILE);
- if (fd < 0) {
- return -1;
- }
-
bs->read_only = 1; // no write support yet
- s->fd = fd;
-
- if (pread(fd, &ph, sizeof(ph), 0) != sizeof(ph))
+ if (bdrv_pread(bs->file, 0, &ph, sizeof(ph)) != sizeof(ph))
goto fail;
if (memcmp(ph.magic, HEADER_MAGIC, 16) ||
@@ -97,7 +89,7 @@ static int parallels_open(BlockDriverSta
s->catalog_size = le32_to_cpu(ph.catalog_entries);
s->catalog_bitmap = qemu_malloc(s->catalog_size * 4);
- if (pread(s->fd, s->catalog_bitmap, s->catalog_size * 4, 64) !=
+ if (bdrv_pread(bs->file, 64, s->catalog_bitmap, s->catalog_size * 4) !=
s->catalog_size * 4)
goto fail;
for (i = 0; i < s->catalog_size; i++)
@@ -107,7 +99,6 @@ static int parallels_open(BlockDriverSta
fail:
if (s->catalog_bitmap)
qemu_free(s->catalog_bitmap);
- close(fd);
return -1;
}
@@ -128,12 +119,10 @@ static int64_t seek_to_sector(BlockDrive
static int parallels_read(BlockDriverState *bs, int64_t sector_num,
uint8_t *buf, int nb_sectors)
{
- BDRVParallelsState *s = bs->opaque;
-
while (nb_sectors > 0) {
uint64_t position = seek_to_sector(bs, sector_num);
if (position >= 0) {
- if (pread(s->fd, buf, 512, position) != 512)
+ if (bdrv_pread(bs->file, position, buf, 512) != 512)
return -1;
} else {
memset(buf, 0, 512);
@@ -149,14 +138,13 @@ static void parallels_close(BlockDriverS
{
BDRVParallelsState *s = bs->opaque;
qemu_free(s->catalog_bitmap);
- close(s->fd);
}
static BlockDriver bdrv_parallels = {
.format_name = "parallels",
.instance_size = sizeof(BDRVParallelsState),
.bdrv_probe = parallels_probe,
- .bdrv_file_open = parallels_open,
+ .bdrv_open = parallels_open,
.bdrv_read = parallels_read,
.bdrv_close = parallels_close,
};
- [Qemu-devel] simple block driver cleanups, Christoph Hellwig, 2010/05/04
- [Qemu-devel] [PATCH 2/6] bochs: use qemu block API, Christoph Hellwig, 2010/05/04
- [Qemu-devel] [PATCH 3/6] cloop: use pread, Christoph Hellwig, 2010/05/04
- [Qemu-devel] [PATCH 4/6] cloop: use qemu block API, Christoph Hellwig, 2010/05/04
- [Qemu-devel] [PATCH 5/6] parallels: use pread, Christoph Hellwig, 2010/05/04
- [Qemu-devel] [PATCH 6/6] parallels: use qemu block API,
Christoph Hellwig <=
- Re: [Qemu-devel] simple block driver cleanups, Kevin Wolf, 2010/05/04