From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45812) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdUaE-0001LY-JE for qemu-devel@nongnu.org; Mon, 04 Nov 2013 19:33:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VdUa8-0007n6-Io for qemu-devel@nongnu.org; Mon, 04 Nov 2013 19:33:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:11169) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdUa8-0007n2-Ba for qemu-devel@nongnu.org; Mon, 04 Nov 2013 19:33:20 -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 rA50XJNP005628 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 4 Nov 2013 19:33:19 -0500 From: Amos Kong Date: Tue, 5 Nov 2013 08:33:14 +0800 Message-Id: <1383611594-19632-1-git-send-email-akong@redhat.com> In-Reply-To: <1383610089-12168-1-git-send-email-akong@redhat.com> References: <1383610089-12168-1-git-send-email-akong@redhat.com> Subject: [Qemu-devel] [PATCH v2] iscsi: add error handling for qmp_query_uuid List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, lersek@redhat.com We can't assume that qmp_query_uuid() always returns available value. Signed-off-by: Amos Kong --- v2: free errp if it's set --- block/iscsi.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index a2a961e..4051bdd 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1059,6 +1059,7 @@ static char *parse_initiator_name(const char *target) const char *name; char *iscsi_name; UuidInfo *uuid_info; + Error *errp = NULL; list = qemu_find_opts("iscsi"); if (list) { @@ -1074,8 +1075,11 @@ static char *parse_initiator_name(const char *target) } } - uuid_info = qmp_query_uuid(NULL); - if (strcmp(uuid_info->UUID, UUID_NONE) == 0) { + uuid_info = qmp_query_uuid(&errp); + if (error_is_set(&errp)) { + name = qemu_get_vm_name(); + error_free(errp); + } else if (strcmp(uuid_info->UUID, UUID_NONE) == 0) { name = qemu_get_vm_name(); } else { name = uuid_info->UUID; -- 1.8.3.1