From patchwork Fri Jan 23 01:53:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julio Faracco X-Patchwork-Id: 432039 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 BF5BC14011D for ; Fri, 23 Jan 2015 12:57:13 +1100 (AEDT) Received: from localhost ([::1]:56771 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YETUk-0003ur-Ev for incoming@patchwork.ozlabs.org; Thu, 22 Jan 2015 20:57:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50772) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YETUU-0003dR-1m for qemu-devel@nongnu.org; Thu, 22 Jan 2015 20:56:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YETUQ-0003kn-1I for qemu-devel@nongnu.org; Thu, 22 Jan 2015 20:56:53 -0500 Received: from mail-qa0-x229.google.com ([2607:f8b0:400d:c00::229]:51405) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YETUP-0003kh-U4; Thu, 22 Jan 2015 20:56:49 -0500 Received: by mail-qa0-f41.google.com with SMTP id bm13so4033816qab.0; Thu, 22 Jan 2015 17:56:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=fz/eyWL+vMms/2VcmyKf6L9AHQxZ73NVM59VlUlxi+c=; b=IoMKgsZDsAIBypVY297zK7DCw1TyYUmpqHplFYhttao0Z/61LhKC7EfhX9+d24fZQn T/SsIIA9z4V0shoa91ch8lTpRU1Zxk+QFWPLuyA/a515UBnsXpr77aDbjDSpqqIf+5uY DVHYIy4mIyFi3hL215sgKSDnXMr/ktSoxcAebmE/4KsFILAfbosnNzH3jG+VAd6vu+b5 6szb2Ozvwwq/G3L94xpbDd5NS6fPv3ew15ZSWodbLT375KobMqM1kcqGfzqgrj35BTb6 +TK5leixFZkqH8d5VVT2ANGCBcTTtUu9YDHpUE1LcQw6B7eCgBYWAUmzRh7g/jVn6yRP XAMA== X-Received: by 10.224.43.10 with SMTP id u10mr9291202qae.20.1421978209205; Thu, 22 Jan 2015 17:56:49 -0800 (PST) Received: from localhost.localdomain (200-161-251-224.dsl.telesp.net.br. [200.161.251.224]) by mx.google.com with ESMTPSA id t36sm175312qge.35.2015.01.22.17.56.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 22 Jan 2015 17:56:48 -0800 (PST) From: Julio Faracco To: qemu-devel@nongnu.org Date: Thu, 22 Jan 2015 23:53:40 -0200 Message-Id: <1421978021-3609-1-git-send-email-jcfaracco@gmail.com> X-Mailer: git-send-email 1.9.1 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c00::229 Cc: qemu-trivial@nongnu.org, kwolf@redhat.com, Julio Faracco Subject: [Qemu-devel] [PATCH 1/2] qcow2-snapshot: Change filter function to avoid NULL parameter when a snapshot will be created. 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 This is a trivial patch to change the filter 'find_snapshot_by_id_and_name' to 'find_snapshot_by_id_or_name'. The field 'Name' is not required. So this change avoid NULL parameters. And use the correct function to filter. Signed-off-by: Julio Faracco --- block/qcow2-snapshot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c index 5b3903c..c7d4cfe 100644 --- a/block/qcow2-snapshot.c +++ b/block/qcow2-snapshot.c @@ -357,7 +357,7 @@ int qcow2_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info) } /* Check that the ID is unique */ - if (find_snapshot_by_id_and_name(bs, sn_info->id_str, NULL) >= 0) { + if (find_snapshot_by_id_or_name(bs, sn_info->id_str) >= 0) { return -EEXIST; }