From patchwork Wed Dec 3 15:30:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Cody X-Patchwork-Id: 417476 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 566AD1400DD for ; Thu, 4 Dec 2014 02:31:10 +1100 (AEDT) Received: from localhost ([::1]:42105 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwBtU-000160-0D for incoming@patchwork.ozlabs.org; Wed, 03 Dec 2014 10:31:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41748) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwBsm-0000WY-4X for qemu-devel@nongnu.org; Wed, 03 Dec 2014 10:30:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XwBsd-0000uI-S2 for qemu-devel@nongnu.org; Wed, 03 Dec 2014 10:30:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:33939) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwBsd-0000uA-K4 for qemu-devel@nongnu.org; Wed, 03 Dec 2014 10:30:15 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sB3FUE6v031013 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 3 Dec 2014 10:30:14 -0500 Received: from localhost (ovpn-112-73.phx2.redhat.com [10.3.112.73]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sB3FUCAG031370 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NO); Wed, 3 Dec 2014 10:30:13 -0500 From: Jeff Cody To: qemu-devel@nongnu.org Date: Wed, 3 Dec 2014 10:30:07 -0500 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, sw@weilnetz.de, armbru@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH 1/2] block: remove BLOCK_OPT_NOCOW from vdi_create_opts 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 In commit 7074786, the need for NOCOW was removed from the vdi driver, as we removed the the posix calls. However, the BLOCK_OPT_NOCOW was not removed from vdi_create_opts. This was a mistake - remove the opt from there as well. Signed-off-by: Jeff Cody --- block/vdi.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/block/vdi.c b/block/vdi.c index 39070b7..74030c6 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -852,11 +852,6 @@ static QemuOptsList vdi_create_opts = { .def_value_str = "off" }, #endif - { - .name = BLOCK_OPT_NOCOW, - .type = QEMU_OPT_BOOL, - .help = "Turn off copy-on-write (valid only on btrfs)" - }, /* TODO: An additional option to set UUID values might be useful. */ { /* end of list */ } }