From patchwork Tue Aug 13 04:31:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Wang X-Patchwork-Id: 266699 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (unknown [IPv6:2001:4830:134:3::12]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7C0B82C010A for ; Tue, 13 Aug 2013 14:41:21 +1000 (EST) Received: from localhost ([::1]:35857 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V96Q3-00075z-MB for incoming@patchwork.ozlabs.org; Tue, 13 Aug 2013 00:41:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55032) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V96Id-0007W6-2F for qemu-devel@nongnu.org; Tue, 13 Aug 2013 00:33:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V96IU-0000Ul-Ab for qemu-devel@nongnu.org; Tue, 13 Aug 2013 00:33:38 -0400 Received: from mail-pa0-x22a.google.com ([2607:f8b0:400e:c03::22a]:61077) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V96IU-0000Tb-0l for qemu-devel@nongnu.org; Tue, 13 Aug 2013 00:33:30 -0400 Received: by mail-pa0-f42.google.com with SMTP id lj1so8283560pab.1 for ; Mon, 12 Aug 2013 21:33:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=G2JTAD3ddo7WyZich/T7cFwWr7UWveTzVeAe3H8zcrs=; b=YmKEDYzu96yT/8OFm3nA2UqWIH67iM5BJgLb/9TOdjRuJQdxNfCO+ljWNvrFJRtalY /KAmAr4lN0edHAgQVFZZ1vToCjFsVBdJAp8gjoHNRW/3dM9CBsIiGd8L8E9t075fOOlW LG8fBBmD6TRrjHzjLCR2CvPD15ilrwEVNj18bqbHVMI9BdlqEzPUtiy7T8xuLiX4vvwM y2Xhmb/TA8pj8IBGWCUJiWL9okzQUduLgJ6PzMxjcHQouWoF6XBWkRNvf5mMQm9CBFuI L5ApXDBiF5ZOMNcXRpT2RkTret7TeWcZS97R/z5z73slDP9gg9y8I5179BmR7dZq0DY9 bdCA== X-Received: by 10.66.186.79 with SMTP id fi15mr916003pac.160.1376368409278; Mon, 12 Aug 2013 21:33:29 -0700 (PDT) Received: from 11.wdongxu.kvm58 ([202.108.130.153]) by mx.google.com with ESMTPSA id mz5sm10285023pbc.18.2013.08.12.21.33.26 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 12 Aug 2013 21:33:28 -0700 (PDT) From: Dong Xu Wang To: qemu-devel@nongnu.org Date: Tue, 13 Aug 2013 12:31:54 +0800 Message-Id: <1376368326-7433-14-git-send-email-wdongxu@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1376368326-7433-1-git-send-email-wdongxu@linux.vnet.ibm.com> References: <1376368326-7433-1-git-send-email-wdongxu@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::22a Cc: kwolf@redhat.com, wdongxu@cn.ibm.com, stefanha@redhat.com, Dong Xu Wang Subject: [Qemu-devel] [PATCH V18 13/25] block: add QemuOpts support for raw-posix.c 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 Signed-off-by: Dong Xu Wang --- block/raw-posix.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/block/raw-posix.c b/block/raw-posix.c index ba721d3..528b3d1 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -1069,6 +1069,29 @@ static int raw_create(const char *filename, QEMUOptionParameter *options) return result; } +static int raw_create_new(const char *filename, QemuOpts *opts) +{ + int fd; + int result = 0; + int64_t total_size = 0; + + total_size = + qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0) / BDRV_SECTOR_SIZE; + fd = qemu_open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, + 0644); + if (fd < 0) { + result = -errno; + } else { + if (ftruncate(fd, total_size * BDRV_SECTOR_SIZE) != 0) { + result = -errno; + } + if (qemu_close(fd) != 0) { + result = -errno; + } + } + return result; +} + /* * Returns true iff the specified sector is present in the disk image. Drivers * not implementing the functionality are assumed to not support backing files, @@ -1188,6 +1211,19 @@ static QEMUOptionParameter raw_create_options[] = { { NULL } }; +static QemuOptsList raw_create_opts = { + .name = "raw-create-opts", + .head = QTAILQ_HEAD_INITIALIZER(raw_create_opts.head), + .desc = { + { + .name = BLOCK_OPT_SIZE, + .type = QEMU_OPT_SIZE, + .help = "Virtual disk size" + }, + { /* end of list */ } + } +}; + static BlockDriver bdrv_file = { .format_name = "file", .protocol_name = "file", @@ -1199,6 +1235,7 @@ static BlockDriver bdrv_file = { .bdrv_reopen_abort = raw_reopen_abort, .bdrv_close = raw_close, .bdrv_create = raw_create, + .bdrv_create_new = raw_create_new, .bdrv_has_zero_init = bdrv_has_zero_init_1, .bdrv_co_is_allocated = raw_co_is_allocated, @@ -1213,6 +1250,7 @@ static BlockDriver bdrv_file = { = raw_get_allocated_file_size, .create_options = raw_create_options, + .bdrv_create_opts = &raw_create_opts, }; /***********************************************/ @@ -1528,6 +1566,33 @@ static int hdev_create(const char *filename, QEMUOptionParameter *options) return ret; } +static int hdev_create_new(const char *filename, QemuOpts *opts) +{ + int fd; + int ret = 0; + struct stat stat_buf; + int64_t total_size = 0; + + total_size = + qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0) / BDRV_SECTOR_SIZE; + + fd = qemu_open(filename, O_WRONLY | O_BINARY); + if (fd < 0) { + return -errno; + } + + if (fstat(fd, &stat_buf) < 0) { + ret = -errno; + } else if (!S_ISBLK(stat_buf.st_mode) && !S_ISCHR(stat_buf.st_mode)) { + ret = -ENODEV; + } else if (lseek(fd, 0, SEEK_END) < total_size * BDRV_SECTOR_SIZE) { + ret = -ENOSPC; + } + + qemu_close(fd); + return ret; +} + static BlockDriver bdrv_host_device = { .format_name = "host_device", .protocol_name = "host_device", @@ -1539,7 +1604,9 @@ static BlockDriver bdrv_host_device = { .bdrv_reopen_commit = raw_reopen_commit, .bdrv_reopen_abort = raw_reopen_abort, .bdrv_create = hdev_create, + .bdrv_create_new = hdev_create_new, .create_options = raw_create_options, + .bdrv_create_opts = &raw_create_opts, .bdrv_aio_readv = raw_aio_readv, .bdrv_aio_writev = raw_aio_writev, @@ -1663,7 +1730,9 @@ static BlockDriver bdrv_host_floppy = { .bdrv_reopen_commit = raw_reopen_commit, .bdrv_reopen_abort = raw_reopen_abort, .bdrv_create = hdev_create, + .bdrv_create_new = hdev_create_new, .create_options = raw_create_options, + .bdrv_create_opts = &raw_create_opts, .bdrv_aio_readv = raw_aio_readv, .bdrv_aio_writev = raw_aio_writev, @@ -1764,7 +1833,9 @@ static BlockDriver bdrv_host_cdrom = { .bdrv_reopen_commit = raw_reopen_commit, .bdrv_reopen_abort = raw_reopen_abort, .bdrv_create = hdev_create, + .bdrv_create_new = hdev_create_new, .create_options = raw_create_options, + .bdrv_create_opts = &raw_create_opts, .bdrv_aio_readv = raw_aio_readv, .bdrv_aio_writev = raw_aio_writev, @@ -1885,7 +1956,9 @@ static BlockDriver bdrv_host_cdrom = { .bdrv_reopen_commit = raw_reopen_commit, .bdrv_reopen_abort = raw_reopen_abort, .bdrv_create = hdev_create, + .bdrv_create_new = hdev_create_new, .create_options = raw_create_options, + .bdrv_create_opts = &raw_create_opts .bdrv_aio_readv = raw_aio_readv, .bdrv_aio_writev = raw_aio_writev,