From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54566) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQwR6-00064B-N7 for qemu-devel@nongnu.org; Fri, 21 Mar 2014 06:12:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQwQy-0007UH-RN for qemu-devel@nongnu.org; Fri, 21 Mar 2014 06:12:24 -0400 Received: from victor.provo.novell.com ([137.65.250.26]:45416) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQwQy-0007Ti-Jz for qemu-devel@nongnu.org; Fri, 21 Mar 2014 06:12:16 -0400 From: Chunyan Liu Date: Fri, 21 Mar 2014 18:12:23 +0800 Message-Id: <1395396763-26081-13-git-send-email-cyliu@suse.com> In-Reply-To: <1395396763-26081-1-git-send-email-cyliu@suse.com> References: <1395396763-26081-1-git-send-email-cyliu@suse.com> Subject: [Qemu-devel] [PATCH v23 12/32] qcow2.c: remove 'assigned' check in amend List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: stefanha@redhat.com In QEMUOptionParameter and QemuOptsList conversion, 'assigned' info is lost. In current code, only qcow2 amend uses 'assigned' for a check. It will be broken after next patch. So, remove 'assigned' check. If it's really a must that amend is valid only to explicitly defined options, we could add it TODO later. And for 'prealloc', it's not support amend, since nowhere to compare it is changed or not, simply ignore it. Signed-off-by: Chunyan Liu --- block/qcow2.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index b9dc960..92d3327 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2088,11 +2088,6 @@ static int qcow2_amend_options(BlockDriverState *bs, for (i = 0; options[i].name; i++) { - if (!options[i].assigned) { - /* only change explicitly defined options */ - continue; - } - if (!strcmp(options[i].name, "compat")) { if (!options[i].value.s) { /* preserve default */ @@ -2106,8 +2101,7 @@ static int qcow2_amend_options(BlockDriverState *bs, return -EINVAL; } } else if (!strcmp(options[i].name, "preallocation")) { - fprintf(stderr, "Cannot change preallocation mode.\n"); - return -ENOTSUP; + /* Cannot change preallocation mode. Ignore it. */ } else if (!strcmp(options[i].name, "size")) { new_size = options[i].value.n; } else if (!strcmp(options[i].name, "backing_file")) { -- 1.7.12.4