From nobody Wed Nov 27 06:47:56 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1554921069; cv=none; d=zoho.com; s=zohoarc; b=Fnz4HnlE2fQvEIPiYynt+YG2q6+VtfRqswPLFwvssT9WqWzNlfpMJ1N1ECFLD8myGEfgO3Rmf53F61aKZ4xAZ7MGmFiY4hZJQQ2QPZmtOPyc29pjQlPcNnAPGinJamZ5QNtOrapN8VnFT4hxnPIpwalkykCrQ3/+xTMRgLzemXY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1554921069; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=x6fPR+gvwT8I5iI4oN5/FIUECEJtGz++SSBkH2TSRHo=; b=I+wTjZfs5Gh9Wd4atFo/pBScCHet8+pOBLiyBt9QjjbMT0D/Hh1g7y8Pv7i9zZnymYsidw8dacTXuOrFLEdQEQouHl6P0PJsIgp+wblzbRn3sfqDRi49VbM8g5qkf+cNMNT58AZ03vp2I+lrUls/h4N/nSZX3dV5j1MiuyK6zqI= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1554921069225883.4330626583568; Wed, 10 Apr 2019 11:31:09 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3CCB241104; Wed, 10 Apr 2019 18:31:04 +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 EF8D718258; Wed, 10 Apr 2019 18:31:03 +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 3EDA0181AC45; Wed, 10 Apr 2019 18:31:03 +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 x3AITlrs002702 for ; Wed, 10 Apr 2019 14:29:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id 791E71A915; Wed, 10 Apr 2019 18:29:47 +0000 (UTC) Received: from worklaptop.redhat.com (ovpn-123-233.rdu2.redhat.com [10.10.123.233]) by smtp.corp.redhat.com (Postfix) with ESMTP id 117BC19C6F; Wed, 10 Apr 2019 18:29:46 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Wed, 10 Apr 2019 14:29:36 -0400 Message-Id: <3dca227ff69081be71af1c52ac6283798fd50d24.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 2/3] qemu: monitor cleanup delvm 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 10 Apr 2019 18:31:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Drop redundant NULL checks, and add an error string prefix Signed-off-by: Cole Robinson --- src/qemu/qemu_monitor_text.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 414da0ca28..76095674ab 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -259,16 +259,17 @@ int qemuMonitorTextDeleteSnapshot(qemuMonitorPtr mon,= const char *name) if (qemuMonitorHMPCommand(mon, cmd, &reply)) goto cleanup; =20 - if (strstr(reply, "No block device supports snapshots") !=3D NULL) { + if (strstr(reply, "No block device supports snapshots")) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("this domain does not have a device to delete sna= pshots")); goto cleanup; - } else if (strstr(reply, "Snapshots not supported on device") !=3D NUL= L) { + } else if (strstr(reply, "Snapshots not supported on device")) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", reply); goto cleanup; - } else if (strstr(reply, "Error") !=3D NULL - && strstr(reply, "while deleting snapshot") !=3D NULL) { - virReportError(VIR_ERR_OPERATION_FAILED, "%s", reply); + } else if (strstr(reply, "Error") && + strstr(reply, "while deleting snapshot")) { + virReportError(VIR_ERR_OPERATION_FAILED, + _("Failed to delete snapshot: %s"), reply); goto cleanup; } =20 --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list