From patchwork Wed Apr 10 18:29:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 162035 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp6527247jan; Wed, 10 Apr 2019 11:30:10 -0700 (PDT) X-Google-Smtp-Source: APXvYqypaecgeq0vjsPIwWppvlLt1QWehdJ7E01lztgfx4G972oHwjx22dp1wsds4yLFSMyuil64 X-Received: by 2002:a0c:9666:: with SMTP id 35mr36514314qvy.30.1554921010353; Wed, 10 Apr 2019 11:30:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554921010; cv=none; d=google.com; s=arc-20160816; b=BITPyh4UpuyVnWBXBIlEz3OMW8VW2iUCdcMGFU2CndXMYwif1OduPl1CK6ifnaWq3F M2uFaZw7BNv3ex19RGVTBUWRL7OVqxWaZ5CoqGWIsbPeXOb+Q2h8WW8it9ic4AIsqSQl CRlvXxkieAC6pOaVrKTfvrcHHE3ab9x77pb+KUNjlgyoOj+tPG4EY8NeACJFrAKPWTAu GLxF522JzQl6/6yl9xb+01v/0JcFCpflV8ULrsbAhP2LBsLlXI2NrojETYyeaxdzDwxY k9DqiWihtG8fre+jNxFXnq7Faru9e7FBVpIj1wL/fCZUKnT5o0+nFCM//UvhWwQPAkcd KmtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :delivered-to; bh=HCmpm8gZd5AC1boo2myBuRvGrG+ypFh+kojBXdIbw9Q=; b=KuhgMMObc7gs9y0vFlqCtVEshzgRNSq8N9xnajC8xEMmhudezUye2CBaeu9cb54rJo lwt65qWsqTqVA3KvRQasUmZq28XiLl2CPhgesmwCiCh2xcL5c+MnIrhOfhRG6QwOtL/v Tyoi9gaGcGacG2H2re0QS1jAub8HtDge9O59mh6BRJKN3YvmoS/uRyrXOy7ee7fDH4xt qnQu1OdCuuP7igv5rO6fV1MtlwCSyPbslmR/RxczEG9JmMHXpJ7CyVQqkc0dq5kZ5Kxk 6eZ2S40sEuWT4DzYhpZwykYWdhZGMVetsLeF9rnQz1Tf3yqkqXDoFvMh3Kc7OhV39MTs /4XQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id v136si1572950qkb.162.2019.04.10.11.30.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Apr 2019 11:30:10 -0700 (PDT) Received-SPF: pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of libvir-list-bounces@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A963D3089EC3; Wed, 10 Apr 2019 18:30:08 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5B6DD5B6A3; Wed, 10 Apr 2019 18:30:08 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id F0D80181AC8E; Wed, 10 Apr 2019 18:30:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x3AITkYv002693 for ; Wed, 10 Apr 2019 14:29:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id D3CD21A915; Wed, 10 Apr 2019 18:29:46 +0000 (UTC) Delivered-To: libvirt-list@redhat.com Received: from worklaptop.redhat.com (ovpn-123-233.rdu2.redhat.com [10.10.123.233]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6BE8019C6F; Wed, 10 Apr 2019 18:29:46 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Wed, 10 Apr 2019 14:29:35 -0400 Message-Id: <05fe015e52f81def27c444ae323242d502bdf033.1554919494.git.crobinso@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/3] qemu: monitor: cleanup loadvm error handling X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Wed, 10 Apr 2019 18:30:09 +0000 (UTC) Drop redundant NULL checks, add error string prefixes, consolidate a few indentical reports. Signed-off-by: Cole Robinson --- src/qemu/qemu_monitor_text.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) -- 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 0b2c1a6aed..414da0ca28 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -215,28 +215,25 @@ int qemuMonitorTextLoadSnapshot(qemuMonitorPtr mon, const char *name) if (qemuMonitorHMPCommand(mon, cmd, &reply)) goto cleanup; - if (strstr(reply, "No block device supports snapshots") != NULL) { + if (strstr(reply, "No block device supports snapshots")) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("this domain does not have a device to load snapshots")); goto cleanup; - } else if (strstr(reply, "Could not find snapshot") != NULL) { + } else if (strstr(reply, "Could not find snapshot")) { virReportError(VIR_ERR_OPERATION_INVALID, _("the snapshot '%s' does not exist, and was not loaded"), name); goto cleanup; - } else if (strstr(reply, "Snapshots not supported on device") != NULL) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", reply); - goto cleanup; - } else if (strstr(reply, "Could not open VM state file") != NULL) { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", reply); - goto cleanup; - } else if (strstr(reply, "Error") != NULL - && strstr(reply, "while loading VM state") != NULL) { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", reply); + } else if (strstr(reply, "Snapshots not supported on device")) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("Failed to load snapshot: %s"), reply); goto cleanup; - } else if (strstr(reply, "Error") != NULL - && strstr(reply, "while activating snapshot on") != NULL) { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", reply); + } else if (strstr(reply, "Could not open VM state file") || + (strstr(reply, "Error") && + (strstr(reply, "while loading VM state") || + strstr(reply, "while activating snapshot on")))) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("Failed to load snapshot: %s"), reply); goto cleanup; }