From patchwork Tue Oct 22 16:48:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 837558 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1f12:b0:37d:45d0:187 with SMTP id hh18csp30672wrb; Tue, 22 Oct 2024 09:51:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV+yZdaSP9Z6SEQk08Op+ocDl/lIiDdi460GL/PxglEPADdf2U6v9Xzh2+3SnagA2G3HsntZg==@linaro.org X-Google-Smtp-Source: AGHT+IG0X8obSAI3580Ox6m7UF1m1LNqeb0Xub+szi+o5XuDlJ5/NRJ2ViXWyR8F2UCiyHKMLBzk X-Received: by 2002:a05:620a:1a0a:b0:7af:c47b:4d78 with SMTP id af79cd13be357-7b17dd545afmr7352685a.65.1729615869821; Tue, 22 Oct 2024 09:51:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729615869; cv=none; d=google.com; s=arc-20240605; b=Nv3DrUz25Ww1SNAJFOCaDXjPlK5K1d8Q4Q5xQJqtT+87AM/A50U8ST/z99uZVwWoq4 E21WDinLG2lPCy+Z+cZFNtkJc4EUrbR1n9/IIlD1zILEmsdHLKe+5Tc/WoMIJz0jjOnO AjPAryn4aaatoK/glA+NnAsufc8W3+xL3EUCfLiCCLGqvJ52t9oWVrwaLvAV+kx/mqGQ 8gV/lCke7iWNgeveqy/0dQc1Qt34B5FGvct/D6llShhT4+/5hjWmow0JBkdgCH8uvqGJ WEbu1d+bkK+jOzQBRIOOo/t+DPNLoJxss/EPurrD9od419mAmZWFwsosLCoQ+fQzmPA1 xVqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=HrwhFD+yJwwRK0vf/7Ph/1BLKTn0dL60XtkUPqjTahc=; fh=DkMPhUKd9sPH54E787Eo1un9xTCJDQ1/hOBahn/sEPI=; b=H38X5twX7ElPqhbRWTf6OzhiwW9Fr2JMcTMCsLsnT7EyQtZkFIsYUmZlY4uT1VDDr5 KIJ4p//GHfq6+EXGfe15jIEXuXxwlqRSJpLNBq7JxwkypiTPb2QN7q9g4gIqlbwQ5946 ru0O0LJJCA5j8bkWqWOqISTEW7IvNzGe+doB+bZb9+P+BMVwtG3g3gI9Q+Y8iJiKdBlZ O6RyVNF2ZJNjr9KPqDHoFisxrJwQtIJIx1bNWVq3T30ZWM5Sjh0/QhKfpcw0lkgo9qG/ J2z21tMe+cNAeRgVjJqqNUIio9QwxBkKqX6yBSKHV2rl5qfdYxyPB/iiegNwqOvL4KaJ rqjA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=E0rn3F7h; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7b1659fa248si754417785a.175.2024.10.22.09.51.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Oct 2024 09:51:09 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=E0rn3F7h; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t3I4d-0000PF-Fw; Tue, 22 Oct 2024 12:49:35 -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 1t3I4a-0000Hv-1H for qemu-devel@nongnu.org; Tue, 22 Oct 2024 12:49:32 -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 1t3I4X-00064a-8j for qemu-devel@nongnu.org; Tue, 22 Oct 2024 12:49:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729615759; 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=HrwhFD+yJwwRK0vf/7Ph/1BLKTn0dL60XtkUPqjTahc=; b=E0rn3F7hq+7ZFw4p38azUOIKsyUuKYDyU0WXotKPGSuvdgrjcT0xMVqjTzqlVXNM6on4cv eM2x9bDYZB4Na8R6Yh0h7dtVvPXainfDqPWVxCpqCTJmpoeHXDk0dsW5dwzUm0UAZMS/Wd bx5CL4RipIADEryaIRWZnJormXftyhg= Received: from mx-prod-mc-05.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-536-WRJkCBd6NyuXEFf1vxyxyQ-1; Tue, 22 Oct 2024 12:49:16 -0400 X-MC-Unique: WRJkCBd6NyuXEFf1vxyxyQ-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0DA2B1956046; Tue, 22 Oct 2024 16:49:15 +0000 (UTC) Received: from merkur.fritz.box (unknown [10.39.194.70]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C0C3A1956056; Tue, 22 Oct 2024 16:49:12 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [PULL 1/9] block/gluster: Use g_autofree for string in qemu_gluster_parse_json() Date: Tue, 22 Oct 2024 18:48:55 +0200 Message-ID: <20241022164903.282174-2-kwolf@redhat.com> In-Reply-To: <20241022164903.282174-1-kwolf@redhat.com> References: <20241022164903.282174-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass client-ip=170.10.133.124; envelope-from=kwolf@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.519, 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Peter Maydell In the loop in qemu_gluster_parse_json() we do: char *str = NULL; for(...) { str = g_strdup_printf(...); ... if (various errors) { goto out; } ... g_free(str); str = NULL; } return 0; out: various cleanups; g_free(str); ... return -errno; Coverity correctly complains that the assignment "str = NULL" at the end of the loop is unnecessary, because we will either go back to the top of the loop and overwrite it, or else we will exit the loop and then exit the function without ever reading str again. The assignment is there as defensive coding to ensure that str is only non-NULL if it's a live allocation, so this is intentional. We can make Coverity happier and simplify the code here by using g_autofree, since we never need 'str' outside the loop. Resolves: Coverity CID 1527385 Signed-off-by: Peter Maydell Reviewed-by: Kevin Wolf Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20241008164708.2966400-2-peter.maydell@linaro.org> Reviewed-by: Richard Henderson Signed-off-by: Kevin Wolf --- block/gluster.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/block/gluster.c b/block/gluster.c index f03d05251e..e9c038042b 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -514,7 +514,6 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf, SocketAddressList **tail; QDict *backing_options = NULL; Error *local_err = NULL; - char *str = NULL; const char *ptr; int i, type, num_servers; @@ -547,7 +546,8 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf, tail = &gconf->server; for (i = 0; i < num_servers; i++) { - str = g_strdup_printf(GLUSTER_OPT_SERVER_PATTERN"%d.", i); + g_autofree char *str = g_strdup_printf(GLUSTER_OPT_SERVER_PATTERN"%d.", + i); qdict_extract_subqdict(options, &backing_options, str); /* create opts info from runtime_type_opts list */ @@ -658,8 +658,6 @@ static int qemu_gluster_parse_json(BlockdevOptionsGluster *gconf, qobject_unref(backing_options); backing_options = NULL; - g_free(str); - str = NULL; } return 0; @@ -668,7 +666,6 @@ out: error_propagate(errp, local_err); qapi_free_SocketAddress(gsconf); qemu_opts_del(opts); - g_free(str); qobject_unref(backing_options); errno = EINVAL; return -errno; From patchwork Tue Oct 22 16:48:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 837557 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1f12:b0:37d:45d0:187 with SMTP id hh18csp30406wrb; Tue, 22 Oct 2024 09:50:34 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXD7AxR460VSd8Tc2crWEaEbN/2X2AjNncGEjKZ4BshTzU3+ZrexS+waR+OafETI1GTV3uVJw==@linaro.org X-Google-Smtp-Source: AGHT+IEmJyFeXjIfzCueq+VQxAFMeMzKxDDLrgYDUOXZ6rbg+Jur1/USkrp8AYGXZdRyRaltctw4 X-Received: by 2002:ac8:5f96:0:b0:460:854f:a1c with SMTP id d75a77b69052e-460ff66e5f2mr72420251cf.27.1729615833861; Tue, 22 Oct 2024 09:50:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729615833; cv=none; d=google.com; s=arc-20240605; b=k0FyGvCY7QCNf6B0rGbEMALN5K+8NOUtC3jESjT2AvlkEmSj2xbaq76OaZEMOKfgVH rx/OfSer/iFLxjpJYDOE3Pj2S+XzgEuLRInFX+jg5X9wxlEsGgU3hw39yPF2L+Fn9wkR h7iwcDNnzhVWMUKZaedsF2a4ORoxqZfcyxwBghWDkaXvG3HmYw1s7eOrBjbKNEYkCkFS 9915+bv88EvEdCTr4TqVj5Mi/lDzWHVhcwF/oNBY2hZpkMmRy6hP7hQeWKRq9IPwML+Y VI6rZAuZ9GkMYuPTgEkDlW0M7Jky3jbN5ITU6Aq/rF0IbsA8RygjVEUyGDr3KbLKt6o9 k65w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=VDoKVxzboEyOZx7JDyIdlXgX6eUiunNnXmtg/ZwTIlk=; fh=DkMPhUKd9sPH54E787Eo1un9xTCJDQ1/hOBahn/sEPI=; b=agf5rFXTlJ2EO+xW4EkpAc22vsC/xHO/VtM1OqDDOUU5Rf8FC2KJ0GRw+b9J6kKz0N IwRu55ztr1jgiMQJfcy1tgoTkZVw4NK+qkSFmN0tOb4II0Y/7bSrRXlpTJTN5TzRi6Ct 05sZsBHX9zgVTKsOMnlm+V+ZM2kVYvtpPnGZuzrAPQb8iiwsLfkaPMIGi05EJM4Q+xPw YHWvUIj+wYh6cmIKZV3X4O/Ukxs3sa4T8SpWujg0b8m+ERvNUgd7DT5mhIck6PrOeOIC oXiYF0LeU474S0rW/6VZGRkdow4TXQHfkGuv79U1X+w8WO1MCpSc0AE9FqiiQCElpixI hM6g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=f13coFq2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-460d3b3455fsi71766511cf.96.2024.10.22.09.50.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Oct 2024 09:50:33 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=f13coFq2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t3I4a-0000Hx-B9; Tue, 22 Oct 2024 12:49:32 -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 1t3I4X-0000GF-IF for qemu-devel@nongnu.org; Tue, 22 Oct 2024 12:49:30 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t3I4R-00064Y-B4 for qemu-devel@nongnu.org; Tue, 22 Oct 2024 12:49:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729615758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VDoKVxzboEyOZx7JDyIdlXgX6eUiunNnXmtg/ZwTIlk=; b=f13coFq2pK+lN51b2J3str8kjypkK+h4JwQPM03ZVlDyDh9B6h6f7xuV0drKAvU9asRfQ1 IYLzml8rxhyzrrRegNfSTPulKcbeAg08mdVpDjC2EZhCWISs9bzaPETeKMg25AiF45dN6E gK+t0qpjYzlywBGawCkyKa8dUlo/8js= Received: from mx-prod-mc-01.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-613-jp-gYhGgONWmZrwZfF9gGQ-1; Tue, 22 Oct 2024 12:49:17 -0400 X-MC-Unique: jp-gYhGgONWmZrwZfF9gGQ-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A59E7195608C; Tue, 22 Oct 2024 16:49:16 +0000 (UTC) Received: from merkur.fritz.box (unknown [10.39.194.70]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 745541956056; Tue, 22 Oct 2024 16:49:15 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [PULL 2/9] block/ssh.c: Don't double-check that characters are hex digits Date: Tue, 22 Oct 2024 18:48:56 +0200 Message-ID: <20241022164903.282174-3-kwolf@redhat.com> In-Reply-To: <20241022164903.282174-1-kwolf@redhat.com> References: <20241022164903.282174-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass client-ip=170.10.129.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.519, 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_H2=-1.697, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Peter Maydell In compare_fingerprint() we effectively check whether the characters in the fingerprint are valid hex digits twice: first we do so with qemu_isxdigit(), but then the hex2decimal() function also has a code path where it effectively detects an invalid digit and returns -1. This causes Coverity to complain because it thinks that we might use that -1 value in an expression where it would be an integer overflow. Avoid the double-check of hex digit validity by testing the return values from hex2decimal() rather than doing separate calls to qemu_isxdigit(). Since this means we now use the illegal-character return value from hex2decimal(), rewrite it from "-1" to "UINT_MAX", which has the same effect since the return type is "unsigned" but looks less confusing at the callsites when we detect it with "c0 > 0xf". Resolves: Coverity CID 1547813 Signed-off-by: Peter Maydell Reviewed-by: Kevin Wolf Message-ID: <20241008164708.2966400-3-peter.maydell@linaro.org> Reviewed-by: Richard Henderson Signed-off-by: Kevin Wolf --- block/ssh.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/block/ssh.c b/block/ssh.c index 871e1d4753..9f8140bcb6 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -364,7 +364,7 @@ static unsigned hex2decimal(char ch) return 10 + (ch - 'A'); } - return -1; + return UINT_MAX; } /* Compare the binary fingerprint (hash of host key) with the @@ -376,13 +376,15 @@ static int compare_fingerprint(const unsigned char *fingerprint, size_t len, unsigned c; while (len > 0) { + unsigned c0, c1; while (*host_key_check == ':') host_key_check++; - if (!qemu_isxdigit(host_key_check[0]) || - !qemu_isxdigit(host_key_check[1])) + c0 = hex2decimal(host_key_check[0]); + c1 = hex2decimal(host_key_check[1]); + if (c0 > 0xf || c1 > 0xf) { return 1; - c = hex2decimal(host_key_check[0]) * 16 + - hex2decimal(host_key_check[1]); + } + c = c0 * 16 + c1; if (c - *fingerprint != 0) return c - *fingerprint; fingerprint++; From patchwork Tue Oct 22 16:48:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 837556 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1f12:b0:37d:45d0:187 with SMTP id hh18csp30092wrb; Tue, 22 Oct 2024 09:50:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW/8xue+UKZlJkJEJylOBHdtEpcW1az0ul77er+KstFJUNM/pA+1bk0BWSH9YXoeq/TOqb1/Q==@linaro.org X-Google-Smtp-Source: AGHT+IF1CGOpPBw+vJfJsbHyJpFU1WNbDuJ/gCU/znFF6en3MPZN+KSexUlf4f0jJ+r+vFeEZem3 X-Received: by 2002:a05:6214:3a01:b0:6cb:ce17:e80d with SMTP id 6a1803df08f44-6ce23da75c9mr29621306d6.18.1729615800068; Tue, 22 Oct 2024 09:50:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729615800; cv=none; d=google.com; s=arc-20240605; b=kyJogUlPwt/F2niLzfbD9OK1IAaX9ZIPh3iqgwY2k4CuJxXk1ewh78MDAzbIYWt4zg jtq9yxyqo8UpndsMdE6EWXWjmNYPxiEKzYA2+NwZcarEROyUcLK2E4RD60NrYllPzB1I OB7jFxOAecUrlKWUFE2pJ7EKRc5ZaOwSzgDZp0Pcy3lcsfwfLKR4lRnoyY2fxlu5HoAZ tdQpVoP30TuIvjWVq+BrCCMhvUk/H49BT72JfnZ4xpP3yylMyLSzQMyLaZY6Ms3pe29Q 1NBT8j1fe+nJ2sSPxNTQVLWXtNzOOMpznrgIDR6HhyDCVqgro5K+lsgs6y0LWvfCJn2i whGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=S0ZiwsCWhMmJcdocwXil0ov8/vtrwY/088vJRb2QPCQ=; fh=DkMPhUKd9sPH54E787Eo1un9xTCJDQ1/hOBahn/sEPI=; b=M9vsEJiZCK7WHtMff91OU2M1gmo9+9h8eTm6UvJkj6DFuJ857KXDA7bQY/VlD6erny mFeuAngoJata6IksJZToil/DcvJFuMaMXLEkCUKR/RrdpG3QP7uilOuL80Wzt3TK7AvC Q05pfLm1CmZVfII8DBty611318r1LG/1nWFA+jaZtZ/k+IzvjAuUCRjwYXe8dX7fa/+V W9+Je8E4y+00WJmJ5Y8r/ouxorC3RuvIqQkJTn01ltzZtB4wijeoF5sh+zVlaiQSYDRs qw+bi6ObnTj3aubH0bh8OUvzVKkL5tLaYCe/YYbwAePr5tdv5f32vbNDC3ZE7Y41uWY/ +1Wg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=KIUZVatu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6ce009ff45esi67901956d6.455.2024.10.22.09.49.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Oct 2024 09:50:00 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=KIUZVatu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t3I4c-0000Me-Nl; Tue, 22 Oct 2024 12:49:34 -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 1t3I4a-0000Hw-1H for qemu-devel@nongnu.org; Tue, 22 Oct 2024 12:49:32 -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 1t3I4X-00065E-8W for qemu-devel@nongnu.org; Tue, 22 Oct 2024 12:49:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729615764; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=S0ZiwsCWhMmJcdocwXil0ov8/vtrwY/088vJRb2QPCQ=; b=KIUZVatu1fV6QBgV6r1D3qBOJ5jvCf1RxDbClCRJJbHfsaFWJTX10ywfEqyCgZomKDMUYY E1E9HTY3jV8L/uZTBw8+S7dRhBMxYOLd2SkSHOj3pRSyHuNUrquk8ImTz/LM5UXUo4Gaqs wHwbZX8J4GcZ7Gp6dooarUNueFCxXos= 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-256-eaeCG3_vPfKwkkCpa8PRIA-1; Tue, 22 Oct 2024 12:49:20 -0400 X-MC-Unique: eaeCG3_vPfKwkkCpa8PRIA-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 926D31955F65; Tue, 22 Oct 2024 16:49:19 +0000 (UTC) Received: from merkur.fritz.box (unknown [10.39.194.70]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 199AA1956056; Tue, 22 Oct 2024 16:49:16 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [PULL 3/9] tests/qemu-iotests/211.out: Update to expect MapEntry 'compressed' field Date: Tue, 22 Oct 2024 18:48:57 +0200 Message-ID: <20241022164903.282174-4-kwolf@redhat.com> In-Reply-To: <20241022164903.282174-1-kwolf@redhat.com> References: <20241022164903.282174-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass client-ip=170.10.133.124; envelope-from=kwolf@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.519, 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Peter Maydell In commit 52b10c9c0c68e90f in 2023 the QAPI MapEntry struct was updated to add a 'compressed' field. That commit updated a number of iotest expected-output files, but missed 211, which is vdi specific. The result is that ./check -vdi and more specifically ./check -vdi 211 fails because the expected and actual output don't match. Update the reference output. Cc: qemu-stable@nongnu.org Fixes: 52b10c9c0c68e90f ("qemu-img: map: report compressed data blocks") Signed-off-by: Peter Maydell Message-ID: <20241008164708.2966400-4-peter.maydell@linaro.org> Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- tests/qemu-iotests/211.out | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/211.out b/tests/qemu-iotests/211.out index f02c75409c..ff9f9a6913 100644 --- a/tests/qemu-iotests/211.out +++ b/tests/qemu-iotests/211.out @@ -17,7 +17,7 @@ file format: IMGFMT virtual size: 128 MiB (134217728 bytes) cluster_size: 1048576 -[{"data": false, "depth": 0, "length": 134217728, "present": true, "start": 0, "zero": true}] +[{"compressed": false, "data": false, "depth": 0, "length": 134217728, "present": true, "start": 0, "zero": true}] === Successful image creation (explicit defaults) === {"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"driver": "file", "filename": "TEST_DIR/PID-t.vdi", "size": 0}}} @@ -35,7 +35,7 @@ file format: IMGFMT virtual size: 64 MiB (67108864 bytes) cluster_size: 1048576 -[{"data": false, "depth": 0, "length": 67108864, "present": true, "start": 0, "zero": true}] +[{"compressed": false, "data": false, "depth": 0, "length": 67108864, "present": true, "start": 0, "zero": true}] === Successful image creation (with non-default options) === {"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"driver": "file", "filename": "TEST_DIR/PID-t.vdi", "size": 0}}} @@ -53,7 +53,7 @@ file format: IMGFMT virtual size: 32 MiB (33554432 bytes) cluster_size: 1048576 -[{"data": true, "depth": 0, "length": 3072, "offset": 1024, "present": true, "start": 0, "zero": false}, {"data": true, "depth": 0, "length": 33551360, "offset": 4096, "present": true, "start": 3072, "zero": true}] +[{"compressed": false, "data": true, "depth": 0, "length": 3072, "offset": 1024, "present": true, "start": 0, "zero": false}, {"compressed": false, "data": true, "depth": 0, "length": 33551360, "offset": 4096, "present": true, "start": 3072, "zero": true}] === Invalid BlockdevRef === {"execute": "blockdev-create", "arguments": {"job-id": "job0", "options": {"driver": "vdi", "file": "this doesn't exist", "size": 33554432}}} From patchwork Tue Oct 22 16:48:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 837559 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:1f12:b0:37d:45d0:187 with SMTP id hh18csp30776wrb; Tue, 22 Oct 2024 09:51:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVt1OHLplAYNxI6sCkN98t8aLINddNkQlUAuI38l7p1s2ROFJLKGKDu6bmnqwU4wjXPSf54xA==@linaro.org X-Google-Smtp-Source: AGHT+IF/NCDgxwPCP0GIVk0D5J4VkfB63w+ud1qX6ymJgmGPZa75yfeazqX9pBLq+aKdcp80HcW+ X-Received: by 2002:a05:620a:46a0:b0:7b1:14ee:2948 with SMTP id af79cd13be357-7b176888bc5mr395977985a.41.1729615882142; Tue, 22 Oct 2024 09:51:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729615882; cv=none; d=google.com; s=arc-20240605; b=TI+eAJDTKQf7pNhJsgpaZflWUszfwclYE4r/8idWisqWGr+fhI3/+sP1MiEWX4oTE2 ZeN+yhxpkne6Uzee0SYE0exjNPA+9DKb2G20Z56STTIMt8qRrB0XblpHSYYeYnbgEr2p zGHNzBEyylYpFfMvzsfH/gFJV7wiLGVypjXjagM2gSdDyvhW2mmzhpbHjZqxYQ+LWDjz DJCBFJGssMugU8peO5MZQi7kO2SCri1RDH1MtR44avAWjEGscIcMLaefzp8Bp32amPX/ 81Q2lALTp0L+hEmwNVVBuPksxnz/Y1xNMAzNQKJcyk7cs+3AhOdxcJ8eosPDTrgsvn6r YLlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=0s2NzQAkVXUXjzpQCMdLxQHeBTEoVVx/FCeKoPNe9Qw=; fh=DkMPhUKd9sPH54E787Eo1un9xTCJDQ1/hOBahn/sEPI=; b=iFqTsttyXQ3qyfzZkWxV7fbh4TvHOE3zLAbpfKDsmBNqAhETO4thALDP11iWKyH8Fb W9E2OwpWspzGpgrObR9P3gBn1Fx2RdbyRjPHshHOQuU65muQpRHWQ12vt9cl8WVLlOQw hUnIQ4FOyOKVj2b8sFachdEvsq/w4sWkBqU9mQKoZG4lzNdY5LIjKvO1efvFnUjYl9jf Bsk0qbcuRauypjdDxgVvSPmLr/0yB4QVTXAx3JtJcOfRC7dYh0W1Eq4b+sCN5xILkTtW TOay3LHHJLv/tevWpiLv8Tfx675gEQj05f7hixwOE69L3gtE5JoRn8R4r0yuU+rbYnek KbjQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=a8qJcXMc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7b165a9c677si692820385a.652.2024.10.22.09.51.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Oct 2024 09:51:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=a8qJcXMc; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t3I4e-0000QX-01; Tue, 22 Oct 2024 12:49: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 1t3I4b-0000KE-5t for qemu-devel@nongnu.org; Tue, 22 Oct 2024 12:49:33 -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 1t3I4X-00065n-9M for qemu-devel@nongnu.org; Tue, 22 Oct 2024 12:49:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729615767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0s2NzQAkVXUXjzpQCMdLxQHeBTEoVVx/FCeKoPNe9Qw=; b=a8qJcXMcpAlFAhYrlqQ+y9xFRfghZuI2tOtFdlxsjuUkVDG7Q3nLX490RJXttpTnh8BKjd JWHMgioEeXa3DuNuGeM2GdiZPnRgzKnA+mhc9O5QbU7xGVrJX4VLfUdmolfesA4A84w2Dy 5M8B5yANXX27YOpTYNudFlflPM/Buck= Received: from mx-prod-mc-03.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-10-X46m07fuMb-7huM5XCIdmg-1; Tue, 22 Oct 2024 12:49:23 -0400 X-MC-Unique: X46m07fuMb-7huM5XCIdmg-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 011A419560BA; Tue, 22 Oct 2024 16:49:22 +0000 (UTC) Received: from merkur.fritz.box (unknown [10.39.194.70]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D463A1955EA3; Tue, 22 Oct 2024 16:49:19 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [PULL 4/9] block/vdi.c: Make SECTOR_SIZE constant 64-bits Date: Tue, 22 Oct 2024 18:48:58 +0200 Message-ID: <20241022164903.282174-5-kwolf@redhat.com> In-Reply-To: <20241022164903.282174-1-kwolf@redhat.com> References: <20241022164903.282174-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass client-ip=170.10.133.124; envelope-from=kwolf@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.519, 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Peter Maydell Make the VDI SECTOR_SIZE define be a 64-bit constant; this matches how we define BDRV_SECTOR_SIZE. The benefit is that it means that we don't need to carefully cast to 64-bits when doing operations like "n_sectors * SECTOR_SIZE" to avoid doing a 32x32->32 multiply, which might overflow, and which Coverity and other static analysers tend to warn about. The specific potential overflow Coverity is highlighting is the one at the end of vdi_co_pwritev() where we write out n_sectors sectors to the block map. This is very unlikely to actually overflow, since the block map has 4 bytes per block and the maximum number of blocks in the image must fit into a 32-bit integer. So this commit is not fixing a real-world bug. An inspection of all the places currently using SECTOR_SIZE in the file shows none which care about the change in its type, except for one call to error_setg() which needs the format string adjusting. Resolves: Coverity CID 1508076 Suggested-by: Kevin Wolf Message-ID: <20241008164708.2966400-5-peter.maydell@linaro.org> Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- block/vdi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/vdi.c b/block/vdi.c index 149e15c831..26f7638f1f 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -87,7 +87,7 @@ /* Command line option for static images. */ #define BLOCK_OPT_STATIC "static" -#define SECTOR_SIZE 512 +#define SECTOR_SIZE 512ULL #define DEFAULT_CLUSTER_SIZE 1048576 /* Note: can't use 1 * MiB, because it's passed to stringify() */ @@ -442,7 +442,7 @@ static int vdi_open(BlockDriverState *bs, QDict *options, int flags, goto fail; } else if (header.sector_size != SECTOR_SIZE) { error_setg(errp, "unsupported VDI image (sector size %" PRIu32 - " is not %u)", header.sector_size, SECTOR_SIZE); + " is not %llu)", header.sector_size, SECTOR_SIZE); ret = -ENOTSUP; goto fail; } else if (header.block_size != DEFAULT_CLUSTER_SIZE) {