From patchwork Fri May 7 15:14:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 51931 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 94549B7D6D for ; Sat, 8 May 2010 01:29:49 +1000 (EST) Received: from localhost ([127.0.0.1]:49117 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OAPUo-0008Rq-DV for incoming@patchwork.ozlabs.org; Fri, 07 May 2010 11:29:46 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1OAPGw-0007SF-4u for qemu-devel@nongnu.org; Fri, 07 May 2010 11:15:26 -0400 Received: from [140.186.70.92] (port=54808 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OAPGs-0007Q2-Tl for qemu-devel@nongnu.org; Fri, 07 May 2010 11:15:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OAPGr-00070d-4a for qemu-devel@nongnu.org; Fri, 07 May 2010 11:15:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9789) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OAPGq-00070Q-So for qemu-devel@nongnu.org; Fri, 07 May 2010 11:15:21 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o47FF9nx008108 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 7 May 2010 11:15:09 -0400 Received: from localhost.localdomain (vpn2-10-135.ams2.redhat.com [10.36.10.135]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o47FETE1002113; Fri, 7 May 2010 11:15:03 -0400 From: Kevin Wolf To: aliguori@linux.vnet.ibm.com Date: Fri, 7 May 2010 17:14:03 +0200 Message-Id: <1273245247-24827-8-git-send-email-kwolf@redhat.com> In-Reply-To: <1273245247-24827-1-git-send-email-kwolf@redhat.com> References: <1273245247-24827-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 07/11] bochs: use qemu block API X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Christoph Hellwig 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 Signed-off-by: Kevin Wolf --- block/bochs.c | 30 +++++++++--------------------- 1 files changed, 9 insertions(+), 21 deletions(-) diff --git a/block/bochs.c b/block/bochs.c index b54f54d..5fe2fa3 100644 --- a/block/bochs.c +++ b/block/bochs.c @@ -80,8 +80,6 @@ struct bochs_header { }; typedef struct BDRVBochsState { - int fd; - uint32_t *catalog_bitmap; int catalog_size; @@ -109,23 +107,16 @@ static int bochs_probe(const uint8_t *buf, int buf_size, const char *filename) return 0; } -static int bochs_open(BlockDriverState *bs, const char *filename, int flags) +static int bochs_open(BlockDriverState *bs, int flags) { BDRVBochsState *s = bs->opaque; - int fd, i; + int i; struct bochs_header bochs; struct bochs_header_v1 header_v1; - fd = open(filename, O_RDONLY | O_BINARY); - if (fd < 0) { - return -1; - } - bs->read_only = 1; // no write support yet - s->fd = fd; - - if (pread(fd, &bochs, sizeof(bochs), 0) != sizeof(bochs)) { + if (bdrv_pread(bs->file, 0, &bochs, sizeof(bochs)) != sizeof(bochs)) { goto fail; } @@ -146,8 +137,8 @@ static int bochs_open(BlockDriverState *bs, const char *filename, int flags) s->catalog_size = le32_to_cpu(bochs.extra.redolog.catalog); s->catalog_bitmap = qemu_malloc(s->catalog_size * 4); - if (pread(s->fd, s->catalog_bitmap, s->catalog_size * 4, - le32_to_cpu(bochs.header)) != s->catalog_size * 4) + if (bdrv_pread(bs->file, le32_to_cpu(bochs.header), s->catalog_bitmap, + s->catalog_size * 4) != s->catalog_size * 4) goto fail; for (i = 0; i < s->catalog_size; i++) le32_to_cpus(&s->catalog_bitmap[i]); @@ -161,7 +152,6 @@ static int bochs_open(BlockDriverState *bs, const char *filename, int flags) return 0; fail: - close(fd); return -1; } @@ -184,8 +174,8 @@ static int64_t seek_to_sector(BlockDriverState *bs, int64_t sector_num) (s->extent_blocks + s->bitmap_blocks)); /* read in bitmap for current extent */ - if (pread(s->fd, &bitmap_entry, 1, bitmap_offset + (extent_offset / 8)) - != 1) { + if (bdrv_pread(bs->file, bitmap_offset + (extent_offset / 8), + &bitmap_entry, 1) != 1) { return -1; } @@ -199,13 +189,12 @@ static int64_t seek_to_sector(BlockDriverState *bs, int64_t sector_num) static int bochs_read(BlockDriverState *bs, int64_t sector_num, uint8_t *buf, int nb_sectors) { - BDRVBochsState *s = bs->opaque; int ret; while (nb_sectors > 0) { int64_t block_offset = seek_to_sector(bs, sector_num); if (block_offset >= 0) { - ret = pread(s->fd, buf, 512, block_offset); + ret = bdrv_pread(bs->file, block_offset, buf, 512); if (ret != 512) { return -1; } @@ -222,14 +211,13 @@ static void bochs_close(BlockDriverState *bs) { BDRVBochsState *s = bs->opaque; qemu_free(s->catalog_bitmap); - close(s->fd); } static BlockDriver bdrv_bochs = { .format_name = "bochs", .instance_size = sizeof(BDRVBochsState), .bdrv_probe = bochs_probe, - .bdrv_file_open = bochs_open, + .bdrv_open = bochs_open, .bdrv_read = bochs_read, .bdrv_close = bochs_close, };