From patchwork Tue Nov 5 00:08:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amos Kong X-Patchwork-Id: 288337 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7F2462C0097 for ; Tue, 5 Nov 2013 11:08:46 +1100 (EST) Received: from localhost ([::1]:52582 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdUCJ-0003V3-Pq for incoming@patchwork.ozlabs.org; Mon, 04 Nov 2013 19:08:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41746) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdUBx-0003TY-SR for qemu-devel@nongnu.org; Mon, 04 Nov 2013 19:08:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VdUBr-0001ul-U4 for qemu-devel@nongnu.org; Mon, 04 Nov 2013 19:08:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:20531) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VdUBr-0001uc-MR for qemu-devel@nongnu.org; Mon, 04 Nov 2013 19:08:15 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rA508Epq018141 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 4 Nov 2013 19:08:15 -0500 Received: from amosk.info.com (vpn1-113-29.nay.redhat.com [10.66.113.29]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id rA508CPv028070; Mon, 4 Nov 2013 19:08:13 -0500 From: Amos Kong To: qemu-devel@nongnu.org Date: Tue, 5 Nov 2013 08:08:09 +0800 Message-Id: <1383610089-12168-1-git-send-email-akong@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, pbonzini@redhat.com, lersek@redhat.com Subject: [Qemu-devel] [PATCH] iscsi: add error handling for qmp_query_uuid 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 We can't assume that qmp_query_uuid() always returns available value. Signed-off-by: Amos Kong --- block/iscsi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index a2a961e..1fc1da4 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,10 @@ 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(); + } else if (strcmp(uuid_info->UUID, UUID_NONE) == 0) { name = qemu_get_vm_name(); } else { name = uuid_info->UUID;