From nobody Sun Nov 16 07:17:50 2025 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=1599140721; cv=none; d=zohomail.com; s=zohoarc; b=lOJtu36UMFIK1C328AgxgNqpZbHEZHUB7nZK8PNdM3ZW6ekT6AEFKf/WZVuu+4Kbh2tmXy1g7/ILULejMODfpYbP+M4I9TbqgF0TQkerKZ8sMrQ83efiOj3RuBWdNEIiUl70bN1HQiM7Vlp5of/wJqDO71J29Xv2IRd1lfZx4Eo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599140721; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=+YUUeHxvSt9jEklOFUg4RIRBjPJnNhhCKhpJOO59Oy0=; b=V5jT6Mz61EjtVFgxcvlyLAWrQY+habG3KvEDOuL/HLFMldcdthHTmLDaPjlmOh73h+Bvxs80SiBAhS/GfjDFWBQ4H8XKQ9/yt9As0kQ3xnPjIzGznT4pp4uKZ3Lz7Grjq0SKbLdNEcxxpBBQkuT1F2vWZnFfr5sqiJ5tcgTDru0= 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 1599140721954268.1224731624312; Thu, 3 Sep 2020 06:45:21 -0700 (PDT) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-266-go5JjK3LO-6M8x14GuKZMg-1; Thu, 03 Sep 2020 09:45:19 -0400 Received: by mail-wr1-f72.google.com with SMTP id l15so1100626wro.10 for ; Thu, 03 Sep 2020 06:45:19 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (50.red-83-52-54.dynamicip.rima-tde.net. [83.52.54.50]) by smtp.gmail.com with ESMTPSA id v9sm4335201wru.37.2020.09.03.06.45.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Sep 2020 06:45:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599140721; 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=+YUUeHxvSt9jEklOFUg4RIRBjPJnNhhCKhpJOO59Oy0=; b=NEVm9hHVW7ofv+OW2V5TiOT5ojesxTqbbiYduC2sp89UU3pqAVGJ8GKo0Ue/LmIyFqyYLV vQ7QNI9aKf99CaMjZE5x+5oFKRTgQPhppQXdPaB3c2UnUOQ73esi1356B8UFWOVIhQeXzA 2He50fkv4E/RlfpEaaFJI10Xyp1f4Sg= X-MC-Unique: go5JjK3LO-6M8x14GuKZMg-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=+YUUeHxvSt9jEklOFUg4RIRBjPJnNhhCKhpJOO59Oy0=; b=caWQ+UVXyD+YE+obVHE5/WwM32vrcwriZiY8bW8YJQJWgBJJVHeHSkVrqfSamI7kGF H4FrgRtBIpwNJUoSDUhTxR/5uIWYmAgo3ULWuWNjXAS2HBduyfRTWBeNfnBSWfA2aRSQ T6ASXuQc/TOk3DIS40+R0GEQHFFaCgSABGrwZAFFWUxFO35LLOyiZUp8EQcbjQji8++r o6w2CMQcbIZgsOm9FhBoRBQgXZDgl2MAtJ/seZenGMNlqq9eooZEse3GzSrFFCJxPnjK XNgZByf0aUSIIFBhZBCKr1JDkT/GSKsGwKysXdwTeijrrehSBdn5Bzaisem1lpgseEOE 9hQA== X-Gm-Message-State: AOAM530H9+5gq7U1559ATxmxtV0nZyduwUPnkLrLtMYR4NJ2jXtF5PXz rPI1hO47/arP+NuLXjK4obpPJz2E5fu/GD+W8tzYqJ1I/IKj/S7OnuU35WtB40+JjvcPja1zCOk jSos6v2MSpuQ4ag== X-Received: by 2002:adf:dd82:: with SMTP id x2mr2688401wrl.419.1599140718160; Thu, 03 Sep 2020 06:45:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz96avQHw1qZ0wMhowdR4rn+BD2EEJsYAj6f04bkCr/VLxYQWgXqOoKV6BpEHsLzXKeBnnSRA== X-Received: by 2002:adf:dd82:: with SMTP id x2mr2688384wrl.419.1599140717997; Thu, 03 Sep 2020 06:45:17 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , qemu-trivial@nongnu.org, "Michael S. Tsirkin" , Michael Tokarev , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/2] hw/timer/hpet: Fix DPRINTF format string Date: Thu, 3 Sep 2020 15:45:06 +0200 Message-Id: <20200903134506.440082-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200903134506.440082-1-philmd@redhat.com> References: <20200903134506.440082-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.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8"; text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Fix building with HPET_DEBUG enabled: hw/timer/hpet.c:512:73: error: format specifies type 'unsigned int' but t= he argument has type 'uint64_t' (aka 'unsigned long') [-Werror,-Wformat] DPRINTF("qemu: Enter hpet_ram_writel at %" PRIx64 " =3D %#x\n", addr,= value); ~~~ ^= ~~~~ %#lx hw/timer/hpet.c:655:21: error: format specifies type 'unsigned int' but t= he argument has type 'uint64_t' (aka 'unsigned long') [-Werror,-Wformat] value, s->hpet_counter); ^~~~~ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- Keep trace-events conversion as ByteSizeTask. --- hw/timer/hpet.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index b683f64f1d3..8115e42cff3 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -495,7 +495,7 @@ static void hpet_ram_write(void *opaque, hwaddr addr, HPETState *s =3D opaque; uint64_t old_val, new_val, val, index; =20 - DPRINTF("qemu: Enter hpet_ram_writel at %" PRIx64 " =3D %#x\n", addr, = value); + DPRINTF("qemu: Enter hpet_ram_writel at 0x%" HWADDR_PRIx " =3D 0x%#"PR= Ix64"\n", addr, value); index =3D addr; old_val =3D hpet_ram_read(opaque, addr, 4); new_val =3D value; @@ -637,7 +637,7 @@ static void hpet_ram_write(void *opaque, hwaddr addr, } s->hpet_counter =3D (s->hpet_counter & 0xffffffff00000000ULL) | value; - DPRINTF("qemu: HPET counter written. ctr =3D %#x -> %" PRIx64 = "\n", + DPRINTF("qemu: HPET counter written. ctr =3D %#" PRIx64 " -> %= " PRIx64 "\n", value, s->hpet_counter); break; case HPET_COUNTER + 4: @@ -646,7 +646,7 @@ static void hpet_ram_write(void *opaque, hwaddr addr, } s->hpet_counter =3D (s->hpet_counter & 0xffffffffULL) | (((uint64_t)value) << = 32); - DPRINTF("qemu: HPET counter + 4 written. ctr =3D %#x -> %" PRI= x64 "\n", + DPRINTF("qemu: HPET counter + 4 written. ctr =3D %#" PRIx64 " = -> %" PRIx64 "\n", value, s->hpet_counter); break; default: --=20 2.26.2