From patchwork Fri Aug 16 14:15:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 267666 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 59B902C0277 for ; Sat, 17 Aug 2013 00:17:34 +1000 (EST) Received: from localhost ([::1]:59345 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VAKqK-0006Hh-Ge for incoming@patchwork.ozlabs.org; Fri, 16 Aug 2013 10:17:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44371) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VAKlw-0008NF-SY for qemu-devel@nongnu.org; Fri, 16 Aug 2013 10:13:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VAKlp-00079g-Hx for qemu-devel@nongnu.org; Fri, 16 Aug 2013 10:13:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2831) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VAKlp-00079W-5p for qemu-devel@nongnu.org; Fri, 16 Aug 2013 10:12:53 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r7GECp8R017468 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 16 Aug 2013 10:12:51 -0400 Received: from lacos-laptop.usersys.redhat.com (vpn1-7-187.ams2.redhat.com [10.36.7.187]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r7GECcg9004916; Fri, 16 Aug 2013 10:12:49 -0400 From: Laszlo Ersek To: pbonzini@redhat.com, aliguori@us.ibm.com, hch@lst.de, qemu-devel@nongnu.org Date: Fri, 16 Aug 2013 16:15:06 +0200 Message-Id: <1376662507-5212-7-git-send-email-lersek@redhat.com> In-Reply-To: <1376662507-5212-1-git-send-email-lersek@redhat.com> References: <1376662507-5212-1-git-send-email-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 6/7] raw_bsd: register bdrv_raw X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On 08/05/13 15:03, Paolo Bonzini wrote: > > [...] > > 5) Formats are registered with bdrv_register (takes a BlockDriver*). You > also need to pass the caller of bdrv_register to block_init. Fill in the BlockDriver structure with the raw_*() functions that have been added to "block/raw_bsd.c", in the order the fields are defined in "include/block/block_int.h". I needed more explanation / naming examples for registering the driver than what Paolo gave me, so I copied / adapted from "block/qcow2.c". The parts I took as basis for modification are blamed on commit 5efa9d5a8b18841c9c62208a494d7f519238979a Author: Anthony Liguori Date: Sat May 9 17:03:42 2009 -0500 Convert block infrastructure to use new module init functionality commit 20d97356c9df6d68fbd37d6334fdb7063f24eab6 Author: Blue Swirl Date: Fri Apr 23 20:19:47 2010 +0000 Fix OpenBSD build Signed-off-by: Laszlo Ersek --- block/raw_bsd.c | 38 +++++++++++++++++++++++++++++++++----- 1 files changed, 33 insertions(+), 5 deletions(-) diff --git a/block/raw_bsd.c b/block/raw_bsd.c index 12debb2..79916c4 100644 --- a/block/raw_bsd.c +++ b/block/raw_bsd.c @@ -2,6 +2,7 @@ * * Copyright (C) 2010, 2013, Red Hat, Inc. * Copyright (C) 2010, Blue Swirl + * Copyright (C) 2009, Anthony Liguori * * Author: * Laszlo Ersek @@ -124,11 +125,6 @@ static TYPE raw_create(void) return bdrv_create_file(); } -static const char *raw_format_name(void) -{ - return "raw"; -} - static int raw_open(BlockDriverState *bs) { bs->sg = bs->file->sg; @@ -143,3 +139,35 @@ static int raw_probe(void) { return 1; } + +static BlockDriver bdrv_raw = { + .format_name = "raw", + .bdrv_probe = &raw_probe, + .bdrv_reopen_prepare = &raw_reopen_prepare, + .bdrv_open = &raw_open, + .bdrv_close = &raw_close, + .bdrv_create = &raw_create, + .bdrv_co_readv = &raw_co_readv, + .bdrv_co_writev = &raw_co_writev, + .bdrv_co_write_zeroes = &raw_co_write_zeroes, + .bdrv_co_discard = &raw_co_discard, + .bdrv_co_is_allocated = &raw_co_is_allocated, + .bdrv_truncate = &raw_truncate, + .bdrv_getlength = &raw_getlength, + .bdrv_get_info = &raw_get_info, + .bdrv_is_inserted = &raw_is_inserted, + .bdrv_media_changed = &raw_media_changed, + .bdrv_eject = &raw_eject, + .bdrv_lock_medium = &raw_lock_medium, + .bdrv_ioctl = &raw_ioctl, + .bdrv_aio_ioctl = &raw_aio_ioctl, + .create_options = &raw_create_options[0], + .bdrv_has_zero_init = &raw_has_zero_init +}; + +static void bdrv_raw_init(void) +{ + bdrv_register(&bdrv_raw); +} + +block_init(bdrv_raw_init);