From nobody Wed Nov 27 14:20:33 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1698673124; cv=none; d=zohomail.com; s=zohoarc; b=IOTUkg99d3Hu00xiC8m0KNhPDDL/ht3jMzp2xchIGb9USioX/heOGbwzB8qaxBZAY7mVbbacF1MgKvv/F6tkT9fD4Gyi7kwYgx3f/g2nHYJ2vYuD208sAfgvSZ9RkWZZUr3wQggTLhziL0qkGsP06FQM669Vf0WvNl7cVlhHMmw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1698673124; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=DvVipr8Z3l451FNUoLiPJg94i3KgFBashzkt34tySl8=; b=jq5S1Tx9BARFUA4KJeOolhrE51x5Pfqu6LcO0vNIPlVfT+y5gc09wOgaASoUIk97YDHOeP0Hq6nVgtooXAuHxRnKADvp0qdN44uCqw+u9iNg1AHiWS6nFVN/FFOcWP8uoCt26FjIi/HNbe+jeiYpb2scOL+eIZRpgjlXMSe7hXo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1698673124851205.5443731381281; Mon, 30 Oct 2023 06:38:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxSSW-0003bq-Md; Mon, 30 Oct 2023 09:37:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qxSSO-0003bL-0M for qemu-devel@nongnu.org; Mon, 30 Oct 2023 09:37:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qxSSM-0005qq-FM for qemu-devel@nongnu.org; Mon, 30 Oct 2023 09:37:27 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-654-U918FyPgPwa3o203vVjbRA-1; Mon, 30 Oct 2023 09:37:14 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 114D53C000B4 for ; Mon, 30 Oct 2023 13:37:14 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.193.56]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E45D5C1596C for ; Mon, 30 Oct 2023 13:37:13 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id CEB7421E691F; Mon, 30 Oct 2023 14:37:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698673045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DvVipr8Z3l451FNUoLiPJg94i3KgFBashzkt34tySl8=; b=MtgbtSP1lwkfZKj2nRU52Z9WI+kSB1NUykIx23RVM6p9Io11gvmBxZZQ2X+rIuPyarlDVJ Yph/quX5EmGCmserpF/zhVmybTUdMPSvOh3pgTR7MU1lqa2kpMQ9ElcqR4jjRFP2ErDkx0 uAz6hzPriyUsIJt93885pKpkjkYv/3o= X-MC-Unique: U918FyPgPwa3o203vVjbRA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: marcandre.lureau@redhat.com Subject: [PATCH 4/5] dump: Improve some dump-guest-memory error messages Date: Mon, 30 Oct 2023 14:37:11 +0100 Message-ID: <20231030133712.2822276-5-armbru@redhat.com> In-Reply-To: <20231030133712.2822276-1-armbru@redhat.com> References: <20231030133712.2822276-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.483, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1698673125302100005 Content-Type: text/plain; charset="utf-8" Zero @length is rejected with "Invalid parameter 'length'". Improve to "Parameter 'length' expects a non-zero length". @protocol values not starting with "fd:" or "file:" are rejected with "Invalid parameter 'protocol'". Improve to "parameter 'protocol' must start with 'file:' or 'fd:'". While there, make the conditional checking @protocol a little more obvious. Signed-off-by: Markus Armbruster --- dump/dump.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dump/dump.c b/dump/dump.c index a5e9a06ef1..d888e4bd3c 100644 --- a/dump/dump.c +++ b/dump/dump.c @@ -1812,7 +1812,8 @@ static void dump_init(DumpState *s, int fd, bool has_= format, =20 s->fd =3D fd; if (has_filter && !length) { - error_setg(errp, QERR_INVALID_PARAMETER, "length"); + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "length", + "a non-zero size"); goto cleanup; } s->filter_area_begin =3D begin; @@ -2072,7 +2073,7 @@ void qmp_dump_guest_memory(bool paging, const char *p= rotocol, { ERRP_GUARD(); const char *p; - int fd =3D -1; + int fd; DumpState *s; bool detach_p =3D false; =20 @@ -2135,18 +2136,15 @@ void qmp_dump_guest_memory(bool paging, const char = *protocol, if (fd =3D=3D -1) { return; } - } - - if (strstart(protocol, "file:", &p)) { + } else if (strstart(protocol, "file:", &p)) { fd =3D qemu_open_old(p, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, S= _IRUSR); if (fd < 0) { error_setg_file_open(errp, errno, p); return; } - } - - if (fd =3D=3D -1) { - error_setg(errp, QERR_INVALID_PARAMETER, "protocol"); + } else { + error_setg(errp, + "parameter 'protocol' must start with 'file:' or 'fd:'"= ); return; } =20 --=20 2.41.0