From patchwork Tue Jan 22 14:19:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 214561 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 17F0D2C0082 for ; Wed, 23 Jan 2013 01:20:40 +1100 (EST) Received: from localhost ([::1]:47235 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TxeiM-0006mi-39 for incoming@patchwork.ozlabs.org; Tue, 22 Jan 2013 09:20:38 -0500 Received: from eggs.gnu.org ([208.118.235.92]:49048) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Txehy-0006et-Hb for qemu-devel@nongnu.org; Tue, 22 Jan 2013 09:20:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Txehw-000622-Pl for qemu-devel@nongnu.org; Tue, 22 Jan 2013 09:20:14 -0500 Received: from mail-qc0-f170.google.com ([209.85.216.170]:35425) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Txehw-00061V-DI for qemu-devel@nongnu.org; Tue, 22 Jan 2013 09:20:12 -0500 Received: by mail-qc0-f170.google.com with SMTP id d42so3105150qca.1 for ; Tue, 22 Jan 2013 06:20:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=8qqubkWwilPkAx31EQPv1+pnb5otrkV0YL6FLN+XA00=; b=J0N1iR/Py4u39vH1RSMgp5P3NYfw9AeChGjXeerUwVKsMSWH1GPxvVsUYZmQT/UjDY TU1qJhXOZIFM3VcDy/NMffe+0hH+zUjIjXvM2xOFG6ZQLLKBIPYYhLYHZftUE1xVVoIy tUlVhIDqRhPc7gKKcAOvlqz+3RcKbxquDtOkfEyp0nuQSXxKLhstcmswMmG1hfwD1KXp ZbQyREqYKT4Gqbi+W5sX8unMbZ006prBLsLgnPilC9gUoyesJ8aYt17o3kkKx/+Gu35R TC5tmC6tErJm43esjcxWU6os4RUApy1QgnVzhj5unGkSYhusGCZrNhyPEw0/ZbVuiefW yHcw== X-Received: by 10.224.222.15 with SMTP id ie15mr23642077qab.75.1358864409886; Tue, 22 Jan 2013 06:20:09 -0800 (PST) Received: from yakj.usersys.redhat.com ([176.200.151.56]) by mx.google.com with ESMTPS id y1sm11101555qan.22.2013.01.22.06.20.07 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 22 Jan 2013 06:20:09 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 22 Jan 2013 15:19:51 +0100 Message-Id: <1358864396-3889-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1358864396-3889-1-git-send-email-pbonzini@redhat.com> References: <1358864396-3889-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.216.170 Cc: Peter Lieven , Peter Lieven Subject: [Qemu-devel] [PATCH 1/6] iscsi: add iscsi_create support 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 From: Peter Lieven This patch adds support for bdrv_create. This allows e.g. to use qemu-img to convert from any supported device to an iscsi backed storage as destination. Signed-off-by: Peter Lieven Signed-off-by: Paolo Bonzini --- block/iscsi.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/block/iscsi.c b/block/iscsi.c index 041ee07..d8382fd 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -957,6 +957,56 @@ static int iscsi_has_zero_init(BlockDriverState *bs) return 0; } +static int iscsi_create(const char *filename, QEMUOptionParameter *options) +{ + int ret = 0; + int64_t total_size = 0; + BlockDriverState bs; + IscsiLun *iscsilun = NULL; + + memset(&bs, 0, sizeof(BlockDriverState)); + + /* Read out options */ + while (options && options->name) { + if (!strcmp(options->name, "size")) { + total_size = options->value.n / BDRV_SECTOR_SIZE; + } + options++; + } + + bs.opaque = g_malloc0(sizeof(struct IscsiLun)); + iscsilun = bs.opaque; + + ret = iscsi_open(&bs, filename, 0); + if (ret != 0) { + goto out; + } + if (iscsilun->type != TYPE_DISK) { + ret = -ENODEV; + goto out; + } + if (bs.total_sectors < total_size) { + ret = -ENOSPC; + } + + ret = 0; +out: + if (iscsilun->iscsi != NULL) { + iscsi_destroy_context(iscsilun->iscsi); + } + g_free(bs.opaque); + return ret; +} + +static QEMUOptionParameter iscsi_create_options[] = { + { + .name = BLOCK_OPT_SIZE, + .type = OPT_SIZE, + .help = "Virtual disk size" + }, + { NULL } +}; + static BlockDriver bdrv_iscsi = { .format_name = "iscsi", .protocol_name = "iscsi", @@ -964,6 +1014,8 @@ static BlockDriver bdrv_iscsi = { .instance_size = sizeof(IscsiLun), .bdrv_file_open = iscsi_open, .bdrv_close = iscsi_close, + .bdrv_create = iscsi_create, + .create_options = iscsi_create_options, .bdrv_getlength = iscsi_getlength,