From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1uN9Df-0002Rg-3Y for mharc-qemu-rust@gnu.org; Thu, 05 Jun 2025 07:57:15 -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 1uN9Dd-0002On-7e for qemu-rust@nongnu.org; Thu, 05 Jun 2025 07:57:13 -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 1uN9Db-0003Or-9D for qemu-rust@nongnu.org; Thu, 05 Jun 2025 07:57:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1749124629; 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: in-reply-to:in-reply-to:references:references; bh=vmFqnPN42T5qAk8PrXrD3/WAM9YrwPKq6My/rdFvGJo=; b=B5UykTDK5dLjC9nMEa3OAfyZBbrpvuc8b+HsS0NhfX7PMjFxCAlkkIT/AURSduq6w9OJZi Ns/VdkZM5c+eqSFClphba8dCf+NvzFkcFl3pgYrZh5/toroDdpcNCpQaIZbEnYlSM0LUMN 7HJ1KWg79rT7dzzmGaHAkT7+yuqoBZ8= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-160-bfI6f3u5OYynxh6h9cTLHg-1; Thu, 05 Jun 2025 07:57:06 -0400 X-MC-Unique: bfI6f3u5OYynxh6h9cTLHg-1 X-Mimecast-MFC-AGG-ID: bfI6f3u5OYynxh6h9cTLHg_1749124625 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6E7B019560AA; Thu, 5 Jun 2025 11:57:05 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.45.242.38]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EF67B180045C; Thu, 5 Jun 2025 11:57:04 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4324C21E6766; Thu, 05 Jun 2025 13:57:02 +0200 (CEST) From: Markus Armbruster To: Paolo Bonzini Cc: qemu-devel@nongnu.org, zhao1.liu@intel.com, qemu-rust@nongnu.org Subject: Re: [PATCH 04/14] util/error: allow non-NUL-terminated err->src In-Reply-To: <87a56mh08w.fsf@pond.sub.org> (Markus Armbruster's message of "Thu, 05 Jun 2025 13:54:39 +0200") References: <20250605101544.368953-1-pbonzini@redhat.com> <20250605101544.368953-5-pbonzini@redhat.com> <87a56mh08w.fsf@pond.sub.org> Date: Thu, 05 Jun 2025 13:57:02 +0200 Message-ID: <87y0u6flkh.fsf@pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.132, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-rust@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: QEMU Rust-related patches and discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jun 2025 11:57:14 -0000 Markus Armbruster writes: > Paolo Bonzini writes: > >> Rust makes the current file available as a statically-allocated string, >> but without a NUL terminator. Allow this by storing an optional maximum >> length in the Error. >> >> Signed-off-by: Paolo Bonzini >> --- >> include/qapi/error-internal.h | 9 ++++++++- >> util/error.c | 5 +++-- >> 2 files changed, 11 insertions(+), 3 deletions(-) >> >> diff --git a/include/qapi/error-internal.h b/include/qapi/error-internal.h >> index d5c3904adec..1ec3ceb40f0 100644 >> --- a/include/qapi/error-internal.h >> +++ b/include/qapi/error-internal.h >> @@ -18,7 +18,14 @@ struct Error >> { >> char *msg; >> ErrorClass err_class; >> - const char *src, *func; >> + const char *func; >> + >> + /* >> + * src might be NUL-terminated or not. If it is, src_len is negative. >> + * If it is not, src_len is the length. >> + */ > > I habitually prefix identifiers with @ in comments, like this: > > /* > * @src might be NUL-terminated or not. If it is, @src_len is > * negative. If it is not, @src_len is the length. > */ > > Can really help readability when identifiers are also common English > words. Not much of a difference here. Still nice for consistency with > error.h. > >> + const char *src; >> + int src_len; >> int line; >> GString *hint; >> }; >> diff --git a/util/error.c b/util/error.c >> index e5bcb7c0225..3449ecc0b92 100644 >> --- a/util/error.c >> +++ b/util/error.c >> @@ -24,8 +24,8 @@ Error *error_warn; >> static void error_handle(Error **errp, Error *err) >> { >> if (errp == &error_abort) { >> - fprintf(stderr, "Unexpected error in %s() at %s:%d:\n", >> - err->func, err->src, err->line); >> + fprintf(stderr, "Unexpected error in %s() at %.*s:%d:\n", >> + err->func, err->src_len, err->src, err->line); >> error_report("%s", error_get_pretty(err)); >> if (err->hint) { >> error_printf("%s", err->hint->str); >> @@ -67,6 +67,7 @@ static void error_setv(Error **errp, >> g_free(msg); >> } >> err->err_class = err_class; >> + err->src_len = -1; >> err->src = src; >> err->line = line; >> err->func = func; Almost forgot: Reviewed-by: Markus Armbruster