From nobody Sun Feb 8 23:26:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604402769; cv=none; d=zohomail.com; s=zohoarc; b=F++GaIjPd/e9fj5uGdZIRIV6Ap4YDaLiJqyXppl/EeAl8cnBjtdShdbJz2os3/w6JGADhkCuCk6w7iLRW4NS9VRqImIFBN5mmO7nz1K3mxoeh8nI0gg0Se6hRX9VVPebi3eYORsel+nHtAXK0rK+U9V0aVAuHpTu4QQ/dd802xs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604402769; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=/AHR77zRKAMCmRWgdDl0ch1BMwO1MYz9I/QcKMgp7y4=; b=PKI1EHoCJsOqlIl2RecRIY8qEP4QvEwkv6U5dXhLOfMc6Pw0icOdKn0GZ6dUXlEQm+mzcfSXGQa3iWWsLkr28pW48pbHSgaA7ZoxUfhmMa/r0WEDV1tCyMtb1RgtPwA3YI1AG0TMPj17/1FfEaZXip8QyKsffB88+8+kI4pg0Vc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1604402769656846.5268488690724; Tue, 3 Nov 2020 03:26:09 -0800 (PST) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-15-jPBssPfxN2iLaB-wq4iQbg-1; Tue, 03 Nov 2020 06:26:07 -0500 Received: by mail-wm1-f72.google.com with SMTP id y26so184078wmj.7 for ; Tue, 03 Nov 2020 03:26:06 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id f17sm2613658wmf.41.2020.11.03.03.26.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 03:26:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604402768; 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=/AHR77zRKAMCmRWgdDl0ch1BMwO1MYz9I/QcKMgp7y4=; b=P0JqHWKfaXkn2ZEgoExLSTvmrVXxyNdr6Z/DdQS48LTAdg+sfmgUfjFAT9h/X5J62QBcrj o04OPbTO4lncx8bzJbEMS9DQjUssCrzdn9HEgfnAMEAkrkr5QrBqOjp9ZQG232tLybwUOP zZCArrVcFgEp20TltAa0TxUSP0P9gAY= X-MC-Unique: jPBssPfxN2iLaB-wq4iQbg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/AHR77zRKAMCmRWgdDl0ch1BMwO1MYz9I/QcKMgp7y4=; b=QGLPwTECyORx25dAsFGUKv6AN05xa31CyVNz3z0co6RyIXW7exVz+qi689EBNE/dJF T4Nsn1WgXJo38ckZPjqb8+7E3s8SBWN5HKjsrW1j7Rixo+4SLGEXL65GbQNFrGtTltQU 4frHuHgRrV9qfyyQ+JcH0s7zMg70IQIuobnUdJsJvzM93bTQdi8Jm/2BakNNIfmQak2/ 3MZ1E4+Gi7tWZ8ypWVTyK5d7KF6vgiEC7zH1Z+yHhogW/Ghuc9wiFo+pk2xRRrWi0JXJ JQdXzRHwYmQhWd0VnAK33HDtBtvLhBJTFZc1ARnQX/ceRtCZkxa5tVz1RISsSXy5505c 56UA== X-Gm-Message-State: AOAM530jJoXy63kVmMCmZsc+pLg3gFuwvgLxbqVm2i3L6Z6n/Ks2TT+c V3KqgXxIxj1/rLX2Msd7O3k3PSoPR4oTHfzJH/rTCWViuoFoN3CuX3uQ2JrFbaYvR29JZqLQISf 9AFHfzndmWXA2iw== X-Received: by 2002:a05:6000:10c:: with SMTP id o12mr27240279wrx.81.1604402766017; Tue, 03 Nov 2020 03:26:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJxNtFqqbhhJg/UDzhJNPIs3iD3sg/7LZUKn8zxMUfFHWwoa8kiWvjsDbedhDS+L53Y4ttNBZw== X-Received: by 2002:a05:6000:10c:: with SMTP id o12mr27240251wrx.81.1604402765817; Tue, 03 Nov 2020 03:26:05 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Juan Quintela , qemu-ppc@nongnu.org, Laurent Vivier , David Gibson , Gerd Hoffmann , Dov Murik , "Dr. David Alan Gilbert" , qemu-trivial@nongnu.org, Michael Tokarev , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-5.2 1/4] hw/display/cirrus_vga: Remove debugging code commented out Date: Tue, 3 Nov 2020 12:25:55 +0100 Message-Id: <20201103112558.2554390-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103112558.2554390-1-philmd@redhat.com> References: <20201103112558.2554390-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Commit ec87f206d70 ("cirrus: replace debug printf with trace points") forgot to remove this code once replaced. Do it now. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Dr. David Alan Gilbert --- hw/display/cirrus_vga.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index 722b9e7004c..e14096deb46 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -2532,9 +2532,6 @@ static uint64_t cirrus_vga_ioport_read(void *opaque, = hwaddr addr, case 0x3c5: val =3D cirrus_vga_read_sr(c); break; -#ifdef DEBUG_VGA_REG - printf("vga: read SR%x =3D 0x%02x\n", s->sr_index, val); -#endif break; case 0x3c6: val =3D cirrus_read_hidden_dac(c); @@ -2560,9 +2557,6 @@ static uint64_t cirrus_vga_ioport_read(void *opaque, = hwaddr addr, break; case 0x3cf: val =3D cirrus_vga_read_gr(c, s->gr_index); -#ifdef DEBUG_VGA_REG - printf("vga: read GR%x =3D 0x%02x\n", s->gr_index, val); -#endif break; case 0x3b4: case 0x3d4: @@ -2571,9 +2565,6 @@ static uint64_t cirrus_vga_ioport_read(void *opaque, = hwaddr addr, case 0x3b5: case 0x3d5: val =3D cirrus_vga_read_cr(c, s->cr_index); -#ifdef DEBUG_VGA_REG - printf("vga: read CR%x =3D 0x%02x\n", s->cr_index, val); -#endif break; case 0x3ba: case 0x3da: @@ -2645,9 +2636,6 @@ static void cirrus_vga_ioport_write(void *opaque, hwa= ddr addr, uint64_t val, s->sr_index =3D val; break; case 0x3c5: -#ifdef DEBUG_VGA_REG - printf("vga: write SR%x =3D 0x%02" PRIu64 "\n", s->sr_index, val); -#endif cirrus_vga_write_sr(c, val); break; case 0x3c6: @@ -2670,9 +2658,6 @@ static void cirrus_vga_ioport_write(void *opaque, hwa= ddr addr, uint64_t val, s->gr_index =3D val; break; case 0x3cf: -#ifdef DEBUG_VGA_REG - printf("vga: write GR%x =3D 0x%02" PRIu64 "\n", s->gr_index, val); -#endif cirrus_vga_write_gr(c, s->gr_index, val); break; case 0x3b4: @@ -2681,9 +2666,6 @@ static void cirrus_vga_ioport_write(void *opaque, hwa= ddr addr, uint64_t val, break; case 0x3b5: case 0x3d5: -#ifdef DEBUG_VGA_REG - printf("vga: write CR%x =3D 0x%02"PRIu64"\n", s->cr_index, val); -#endif cirrus_vga_write_cr(c, val); break; case 0x3ba: --=20 2.26.2 From nobody Sun Feb 8 23:26:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604402776; cv=none; d=zohomail.com; s=zohoarc; b=FrieMpzihLd1Z5B8sgr3aDDtEu6x81kkzmWIbw5y/ZsCpm+WrUqwNYoEN5zxSpWxXBpE51xbocndtG3qt7nCRIrnqJmahg257T0Iy3Rlv5f2NgNJLzuhrZ6AogctM5SbtaTHOm1XTuDmVlB9BpZOiWM/bfIq+rE3CIq/kGPNGGk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604402776; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=jsldW9KcK6vt6+l44bfLcLh5QfAWQnVBXAW4qRe393k=; b=AhEUxZsBDHWeDbcfyaMUuaflwxg211pkBonDROnbDiKfXv6i8XiofjSCXHYfJ/Sa3RRSGwZnOEf3ZxmFfMAxqawEKt9/84LGrh0CEBSiRxQL6L+elw6yDCpSM8k5E53SuBwD0sNakpt6KNVgOTXix1JFoMEJc4KKLwaSKvyyMJ8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1604402776795188.8348942906499; Tue, 3 Nov 2020 03:26:16 -0800 (PST) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-385-bvXdIP6aM_GVVAOqq_pTgw-1; Tue, 03 Nov 2020 06:26:12 -0500 Received: by mail-wr1-f69.google.com with SMTP id x16so7661355wrg.7 for ; Tue, 03 Nov 2020 03:26:12 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id n22sm2083018wmk.40.2020.11.03.03.26.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 03:26:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604402775; 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=jsldW9KcK6vt6+l44bfLcLh5QfAWQnVBXAW4qRe393k=; b=Zxnz3WJYBJYtxUx/PEAxeHxjBXDNy5BoYUZOKcpk0Nvm9Zwv45+WmBV/Yn7xzEEUs9C1pB 6iCx/9NP37Wv6/tw34LNy8rNDZrNAFlzxDTwJJZ5Eiuf2ZgQMyKBevgQ/S2ZWuWJvSwR7z YXuO4P+lVnZCa9c6ZTdaFUAJu+cz/kY= X-MC-Unique: bvXdIP6aM_GVVAOqq_pTgw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jsldW9KcK6vt6+l44bfLcLh5QfAWQnVBXAW4qRe393k=; b=V8owzY0roqI8M3uGsotTeSUYU0C7CJPaARU+C1ZNjdlgEGO6Nfa5pflgsu4U4WRcXR YSSukKgT34eFS7YjA3LV0kc6gk9upHX5eYrvZ/QVKN9NhnbfGfiFjeHKgXp/KM52OmxQ +c0Ep6QH5IRVkgkbjffYU9TO6jc94VNc60QFC45E4ESeoUkXsLyIM86JrRDyqEQU9bPx 4xO/a60V66CgXPz88+eSTQcmgw45ij5qxgFQfRS1h2SVuZCPSK5rKd7GBqRLwDckBJGK v+bqNPGHxW69QKO37mum8GstXtSXEwz7eDkibwPl3P8Nq9Op7iTTtQVlnhL3DU642Z5p u7YQ== X-Gm-Message-State: AOAM532VAZZRDGeH4gSu/cX8KcpTOOuZJaPtj3eQpP1f7hoqVhGn1kST lxEJR2FFNsgIgHBklDv+kg6U99ZZkOzNQ6sQl/kfRSiK/hbGpGTMUfPGYroEoevhSaGplpLf0um fT+PLzqXkvQyRHw== X-Received: by 2002:a7b:c2ef:: with SMTP id e15mr3229470wmk.180.1604402771192; Tue, 03 Nov 2020 03:26:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJwl52Ds1oRu6dTtUZhGm8AV0CHCxfu1jIdltfQr0X/jECQCS5/5xrlI7Ccy0qyfSva7NILQ9Q== X-Received: by 2002:a7b:c2ef:: with SMTP id e15mr3229451wmk.180.1604402771044; Tue, 03 Nov 2020 03:26:11 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Juan Quintela , qemu-ppc@nongnu.org, Laurent Vivier , David Gibson , Gerd Hoffmann , Dov Murik , "Dr. David Alan Gilbert" , qemu-trivial@nongnu.org, Michael Tokarev , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-5.2 2/4] hw/display/cirrus_vga: Fix hexadecimal format string specifier Date: Tue, 3 Nov 2020 12:25:56 +0100 Message-Id: <20201103112558.2554390-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103112558.2554390-1-philmd@redhat.com> References: <20201103112558.2554390-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The '%u' conversion specifier is for decimal notation. When prefixing a format with '0x', we want the hexadecimal specifier ('%x'). Inspired-by: Dov Murik Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Dr. David Alan Gilbert --- hw/display/cirrus_vga.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index e14096deb46..fdca6ca659f 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -2105,7 +2105,7 @@ static void cirrus_vga_mem_write(void *opaque, } else { qemu_log_mask(LOG_GUEST_ERROR, "cirrus: mem_writeb 0x" TARGET_FMT_plx " " - "value 0x%02" PRIu64 "\n", addr, mem_value); + "value 0x%02" PRIx64 "\n", addr, mem_value); } } =20 --=20 2.26.2 From nobody Sun Feb 8 23:26:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604402779; cv=none; d=zohomail.com; s=zohoarc; b=ncUrwXGyxjh/l97yMGeOsQvr80D3lyxiq6XnkqDk3y+HUre5MrN7DxHfMFfUp5RTybiFaew6/4oPRuiS3oM+yqn9+vw06x9x6c3dHMi43Yu5ISyMO18YQncs1bBErLT92MX3JvLrzVeCB+mUJSI5qfBKbg7BjeXYOmOYKy7su+Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604402779; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=J/WriUkAF5WQqVMHWgQv1QLJ6c0DsVi572s0W42JyGk=; b=HLaKdg3GuZOSwODUuIxf0TSQdP/SFIXEWSuDKwW1G9jvOoOW2f19XWA7hmENkstEjUo0Ftel0XAlj8BMygCuGQURZufLtRvgCgBc9jhJiVArBnJCfWFbGaQc8ySLNBbYbTazAXv7MqQRnck4MdfVw9FkyELX9tPFBGrUruVDAA0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1604402779941727.1934867221792; Tue, 3 Nov 2020 03:26:19 -0800 (PST) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-298-h0ngeeahOPurXrw94dB-0Q-1; Tue, 03 Nov 2020 06:26:17 -0500 Received: by mail-wm1-f72.google.com with SMTP id e15so2540061wme.4 for ; Tue, 03 Nov 2020 03:26:17 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id l3sm2990672wmg.32.2020.11.03.03.26.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 03:26:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604402778; 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=J/WriUkAF5WQqVMHWgQv1QLJ6c0DsVi572s0W42JyGk=; b=YhqaQjJbixZonkQfLcB6WsJSlerp8HqiRmh9Avrv4GF6R/0c0cbWBH+6u1xZzW6bJ3dkVQ rqRXY2rZUWjQ1Z3VpBS3FoJBVrWun4xj//NK23lI2+dWLTtr4L15DiB5XPoSzyS9Zma6nl CKwKYjEvwB/s1O3EM7AdfAS2TbJROdk= X-MC-Unique: h0ngeeahOPurXrw94dB-0Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=J/WriUkAF5WQqVMHWgQv1QLJ6c0DsVi572s0W42JyGk=; b=Q9avCDOwvsBZM5iObpHdc0alXIOBHZJktXFcwrkWG7mcM9fl31AHJswDpB2pHJjeEF iZzRkGIZsnvSVywcLiDjwqV1kR0x24hoZ4f4mKM5IzHKR1QxddfpKXh/nC4vuCx0wO6A +SG+5NdTFUmnPC2MIdKohLmV0JSCOJTk/alN9Ynl/qQvegMuY4YeHPC7plHIcl6ijkhq QRXieLIiD5T1U//lxKmCAeP+21B7ZNXjJuZceD+r2i07UY1FlsyzIHT0lsAUHZVvRzXi C9T+w32fLpVUNTBDHAsC3FelEbhPJxv+D2kpSkUHMvEYTM+CGNBtVrn8/3T45HPzXyMQ EvhQ== X-Gm-Message-State: AOAM530+9It4TAPVR+bBI5IFEdgaYzE+hejjMVqJEHO6ubgzfKnPXoB8 FrENED3qDoRWdB2naBVcXY2cGElVMApz09247Nfv6VOp0jO7LHupaov/GfHAhfxO3nO5sbwDnDZ ADD2YjiW5PTD94g== X-Received: by 2002:adf:dc4c:: with SMTP id m12mr12923489wrj.177.1604402776126; Tue, 03 Nov 2020 03:26:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJzTl+t5I9FpG8/KLS8m1QoHOaFWtqY+CTqoUmfuR/B2d6DVdY+/+PfSoNgEgI7cecNbPe3uAQ== X-Received: by 2002:adf:dc4c:: with SMTP id m12mr12923461wrj.177.1604402775992; Tue, 03 Nov 2020 03:26:15 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Juan Quintela , qemu-ppc@nongnu.org, Laurent Vivier , David Gibson , Gerd Hoffmann , Dov Murik , "Dr. David Alan Gilbert" , qemu-trivial@nongnu.org, Michael Tokarev , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-5.2 3/4] hw/ppc/spapr_tpm_proxy: Fix hexadecimal format string specifier Date: Tue, 3 Nov 2020 12:25:57 +0100 Message-Id: <20201103112558.2554390-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103112558.2554390-1-philmd@redhat.com> References: <20201103112558.2554390-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The '%u' conversion specifier is for decimal notation. When prefixing a format with '0x', we want the hexadecimal specifier ('%x'). Inspired-by: Dov Murik Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: David Gibson Reviewed-by: Greg Kurz --- hw/ppc/trace-events | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ppc/trace-events b/hw/ppc/trace-events index dcc06d49b5a..6d8d095aa28 100644 --- a/hw/ppc/trace-events +++ b/hw/ppc/trace-events @@ -19,7 +19,7 @@ spapr_update_dt_failed_size(unsigned cbold, unsigned cbne= w, unsigned magic) "Old spapr_update_dt_failed_check(unsigned cbold, unsigned cbnew, unsigned magi= c) "Old blob %u bytes, new blob %u bytes, magic 0x%x" =20 # spapr_tpm_proxy.c -spapr_h_tpm_comm(const char *device_path, uint64_t operation) "tpm_device_= path=3D%s operation=3D0x%"PRIu64 +spapr_h_tpm_comm(const char *device_path, uint64_t operation) "tpm_device_= path=3D%s operation=3D0x%"PRIx64 spapr_tpm_execute(uint64_t data_in, uint64_t data_in_sz, uint64_t data_out= , uint64_t data_out_sz) "data_in=3D0x%"PRIx64", data_in_sz=3D%"PRIu64", dat= a_out=3D0x%"PRIx64", data_out_sz=3D%"PRIu64 =20 # spapr_iommu.c --=20 2.26.2 From nobody Sun Feb 8 23:26:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604402788; cv=none; d=zohomail.com; s=zohoarc; b=eyDUes/Lv4qT3WkyKm61G8h6IItzQl/f7/4zfOLHUuWyrrjrli38v+/zNHGW4s44CQqYJgL/D4wHYk9BoT/XGnAe6sGrXmGD6ZPQUlZPLESm3/3UHbSyO/Jz/IZd6AU2WBlrtxwyJrcmEzYeYTEcA7s05qs3HRa2hDVEN+tHrR0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604402788; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Ms9/MqSjQ1PZDOJSmQXaPdJqLuT/XwivS769IUm5axs=; b=TmRa1ilE4U6M7lJ3ooQlL8qlvTNckeb3wxFztCO8MxblO5m37zts6F1EtywvtOQf7SJqXsLfgSJwVXBKIky+/g+8ECSNGafR0/vjXorpTG/3GbggWO+R5+7VTCRoGGMChxAFs7Ewp6fpBglfwj/sU5j7WuZZ2RehTVGR94YQaB4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1604402788202997.4513642050239; Tue, 3 Nov 2020 03:26:28 -0800 (PST) Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-186-10b6iMCoPmy8FqL9EZN-Ug-1; Tue, 03 Nov 2020 06:26:22 -0500 Received: by mail-wr1-f71.google.com with SMTP id h8so7737155wrt.9 for ; Tue, 03 Nov 2020 03:26:22 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id y187sm2554418wmg.33.2020.11.03.03.26.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 03:26:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604402786; 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=Ms9/MqSjQ1PZDOJSmQXaPdJqLuT/XwivS769IUm5axs=; b=PdBFAwnM/UXLtUKVhkjGzRXCTVhK8wGkXusA/QjUBOtzQd8EBia14mmKxz/N4MpDdBsH5P N/9YEyKWlCwvTeadu0FjpYecF7FFmShcYaLmPKsr4S+IbvR4zLlMMEJMvzhoSlFjIqLcO2 lxFwbbkVrPJLZ7gfx5Q+eiPqmflKIhk= X-MC-Unique: 10b6iMCoPmy8FqL9EZN-Ug-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ms9/MqSjQ1PZDOJSmQXaPdJqLuT/XwivS769IUm5axs=; b=LE6wN6WqrPmF/Ky1NCynV0BFUMYdY/R1u3pRlNxwgKKJVvTmRPaL/ZAw2cg8c61lw1 HQfuAcHGGthBwtei8+NXSA15W9W3OSlSLrhFuEITxhX3Apy8ew3R88uVmbAil7wSp3WK hAFMJKI9YEZGjZKSD6a17IDGWk3xl1+F/KEbzqtbGH5eEvWH+zPmRb3UKbuFYGzLiFja lufnoOOuXyyRPajDRelm25+/goDCq3laehzzjXrX7OvjHQKBHtO6rsxrGymYykySTnev ze43J2lEmIWtbabIu/bq6YI1gsdx/inZYDc3dvpXFyY4J/ZGnMVUQKDB4Kvk1SL92Rq5 hmJA== X-Gm-Message-State: AOAM533sz2UkrFIasCmDm1b3uC4+5wNEiZqHMKrEtgaTD6bCLsgM+lCk yUddBQDZSgjd8oPKE5FQ78h/OPRjCkb/xs9OQWWabSQdJV/us5YcBIo47XiokFILgdYhALNkOFb ieiCUPzkd1LMw8Q== X-Received: by 2002:adf:e807:: with SMTP id o7mr14149492wrm.303.1604402781198; Tue, 03 Nov 2020 03:26:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJwlWuAW9vhsOwtH2y6J/QpafR8zIjFMv/LxT9xs1kOwxJmpSiiXn3skvqGO5xgOSpeA0rt8mQ== X-Received: by 2002:adf:e807:: with SMTP id o7mr14149483wrm.303.1604402781080; Tue, 03 Nov 2020 03:26:21 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Juan Quintela , qemu-ppc@nongnu.org, Laurent Vivier , David Gibson , Gerd Hoffmann , Dov Murik , "Dr. David Alan Gilbert" , qemu-trivial@nongnu.org, Michael Tokarev , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-5.2 4/4] migration/ram: Fix hexadecimal format string specifier Date: Tue, 3 Nov 2020 12:25:58 +0100 Message-Id: <20201103112558.2554390-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201103112558.2554390-1-philmd@redhat.com> References: <20201103112558.2554390-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) The '%u' conversion specifier is for decimal notation. When prefixing a format with '0x', we want the hexadecimal specifier ('%x'). Inspired-by: Dov Murik Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Dr. David Alan Gilbert --- migration/ram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/ram.c b/migration/ram.c index 2da2b622ab2..23dcfb3ac38 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3729,7 +3729,7 @@ int ram_dirty_bitmap_reload(MigrationState *s, RAMBlo= ck *block) } =20 if (end_mark !=3D RAMBLOCK_RECV_BITMAP_ENDING) { - error_report("%s: ramblock '%s' end mark incorrect: 0x%"PRIu64, + error_report("%s: ramblock '%s' end mark incorrect: 0x%"PRIx64, __func__, block->idstr, end_mark); ret =3D -EINVAL; goto out; --=20 2.26.2