* [PATCH 0/2] hw/timer/hpet: Trivial format string fix
@ 2020-09-03 13:45 Philippe Mathieu-Daudé
2020-09-03 13:45 ` [PATCH 1/2] hw/timer/hpet: Remove dead code Philippe Mathieu-Daudé
2020-09-03 13:45 ` [PATCH 2/2] hw/timer/hpet: Fix DPRINTF format string Philippe Mathieu-Daudé
0 siblings, 2 replies; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-09-03 13:45 UTC (permalink / raw)
To: qemu-devel
Cc: Michael S. Tsirkin, qemu-trivial, Michael Tokarev,
Laurent Vivier, Paolo Bonzini, Philippe Mathieu-Daudé
Fix a format string and remove dead code.
Philippe Mathieu-Daudé (2):
hw/timer/hpet: Remove dead code
hw/timer/hpet: Fix DPRINTF format string
hw/timer/hpet.c | 20 +++-----------------
1 file changed, 3 insertions(+), 17 deletions(-)
--
2.26.2
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] hw/timer/hpet: Remove dead code
2020-09-03 13:45 [PATCH 0/2] hw/timer/hpet: Trivial format string fix Philippe Mathieu-Daudé
@ 2020-09-03 13:45 ` Philippe Mathieu-Daudé
2020-09-03 13:59 ` Thomas Huth
2020-09-09 13:34 ` Laurent Vivier
2020-09-03 13:45 ` [PATCH 2/2] hw/timer/hpet: Fix DPRINTF format string Philippe Mathieu-Daudé
1 sibling, 2 replies; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-09-03 13:45 UTC (permalink / raw)
To: qemu-devel
Cc: Michael S. Tsirkin, qemu-trivial, Michael Tokarev,
Laurent Vivier, Paolo Bonzini, Philippe Mathieu-Daudé
This code was never compiled/used, remove it.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/timer/hpet.c | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
index 380acfa7c8a..b683f64f1d3 100644
--- a/hw/timer/hpet.c
+++ b/hw/timer/hpet.c
@@ -416,20 +416,6 @@ static void hpet_del_timer(HPETTimer *t)
update_irq(t, 0);
}
-#ifdef HPET_DEBUG
-static uint32_t hpet_ram_readb(void *opaque, hwaddr addr)
-{
- printf("qemu: hpet_read b at %" PRIx64 "\n", addr);
- return 0;
-}
-
-static uint32_t hpet_ram_readw(void *opaque, hwaddr addr)
-{
- printf("qemu: hpet_read w at %" PRIx64 "\n", addr);
- return 0;
-}
-#endif
-
static uint64_t hpet_ram_read(void *opaque, hwaddr addr,
unsigned size)
{
--
2.26.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] hw/timer/hpet: Fix DPRINTF format string
2020-09-03 13:45 [PATCH 0/2] hw/timer/hpet: Trivial format string fix Philippe Mathieu-Daudé
2020-09-03 13:45 ` [PATCH 1/2] hw/timer/hpet: Remove dead code Philippe Mathieu-Daudé
@ 2020-09-03 13:45 ` Philippe Mathieu-Daudé
2020-09-03 14:04 ` Thomas Huth
2020-09-09 13:34 ` Laurent Vivier
1 sibling, 2 replies; 7+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-09-03 13:45 UTC (permalink / raw)
To: qemu-devel
Cc: Michael S. Tsirkin, qemu-trivial, Michael Tokarev,
Laurent Vivier, Paolo Bonzini, Philippe Mathieu-Daudé
Fix building with HPET_DEBUG enabled:
hw/timer/hpet.c:512:73: error: format specifies type 'unsigned int' but the argument has type 'uint64_t' (aka 'unsigned long') [-Werror,-Wformat]
DPRINTF("qemu: Enter hpet_ram_writel at %" PRIx64 " = %#x\n", addr, value);
~~~ ^~~~~
%#lx
hw/timer/hpet.c:655:21: error: format specifies type 'unsigned int' but the argument has type 'uint64_t' (aka 'unsigned long') [-Werror,-Wformat]
value, s->hpet_counter);
^~~~~
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
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 = opaque;
uint64_t old_val, new_val, val, index;
- DPRINTF("qemu: Enter hpet_ram_writel at %" PRIx64 " = %#x\n", addr, value);
+ DPRINTF("qemu: Enter hpet_ram_writel at 0x%" HWADDR_PRIx " = 0x%#"PRIx64"\n", addr, value);
index = addr;
old_val = hpet_ram_read(opaque, addr, 4);
new_val = value;
@@ -637,7 +637,7 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
}
s->hpet_counter =
(s->hpet_counter & 0xffffffff00000000ULL) | value;
- DPRINTF("qemu: HPET counter written. ctr = %#x -> %" PRIx64 "\n",
+ DPRINTF("qemu: HPET counter written. ctr = %#" 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 =
(s->hpet_counter & 0xffffffffULL) | (((uint64_t)value) << 32);
- DPRINTF("qemu: HPET counter + 4 written. ctr = %#x -> %" PRIx64 "\n",
+ DPRINTF("qemu: HPET counter + 4 written. ctr = %#" PRIx64 " -> %" PRIx64 "\n",
value, s->hpet_counter);
break;
default:
--
2.26.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] hw/timer/hpet: Remove dead code
2020-09-03 13:45 ` [PATCH 1/2] hw/timer/hpet: Remove dead code Philippe Mathieu-Daudé
@ 2020-09-03 13:59 ` Thomas Huth
2020-09-09 13:34 ` Laurent Vivier
1 sibling, 0 replies; 7+ messages in thread
From: Thomas Huth @ 2020-09-03 13:59 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: qemu-trivial, Paolo Bonzini, Michael Tokarev, Laurent Vivier,
Michael S. Tsirkin
On 03/09/2020 15.45, Philippe Mathieu-Daudé wrote:
> This code was never compiled/used, remove it.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> hw/timer/hpet.c | 14 --------------
> 1 file changed, 14 deletions(-)
>
> diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
> index 380acfa7c8a..b683f64f1d3 100644
> --- a/hw/timer/hpet.c
> +++ b/hw/timer/hpet.c
> @@ -416,20 +416,6 @@ static void hpet_del_timer(HPETTimer *t)
> update_irq(t, 0);
> }
>
> -#ifdef HPET_DEBUG
> -static uint32_t hpet_ram_readb(void *opaque, hwaddr addr)
> -{
> - printf("qemu: hpet_read b at %" PRIx64 "\n", addr);
> - return 0;
> -}
> -
> -static uint32_t hpet_ram_readw(void *opaque, hwaddr addr)
> -{
> - printf("qemu: hpet_read w at %" PRIx64 "\n", addr);
> - return 0;
> -}
> -#endif
> -
> static uint64_t hpet_ram_read(void *opaque, hwaddr addr,
> unsigned size)
> {
>
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] hw/timer/hpet: Fix DPRINTF format string
2020-09-03 13:45 ` [PATCH 2/2] hw/timer/hpet: Fix DPRINTF format string Philippe Mathieu-Daudé
@ 2020-09-03 14:04 ` Thomas Huth
2020-09-09 13:34 ` Laurent Vivier
1 sibling, 0 replies; 7+ messages in thread
From: Thomas Huth @ 2020-09-03 14:04 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: qemu-trivial, Paolo Bonzini, Michael Tokarev, Laurent Vivier,
Michael S. Tsirkin
On 03/09/2020 15.45, Philippe Mathieu-Daudé wrote:
> Fix building with HPET_DEBUG enabled:
>
> hw/timer/hpet.c:512:73: error: format specifies type 'unsigned int' but the argument has type 'uint64_t' (aka 'unsigned long') [-Werror,-Wformat]
> DPRINTF("qemu: Enter hpet_ram_writel at %" PRIx64 " = %#x\n", addr, value);
> ~~~ ^~~~~
> %#lx
> hw/timer/hpet.c:655:21: error: format specifies type 'unsigned int' but the argument has type 'uint64_t' (aka 'unsigned long') [-Werror,-Wformat]
> value, s->hpet_counter);
> ^~~~~
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> 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 = opaque;
> uint64_t old_val, new_val, val, index;
>
> - DPRINTF("qemu: Enter hpet_ram_writel at %" PRIx64 " = %#x\n", addr, value);
> + DPRINTF("qemu: Enter hpet_ram_writel at 0x%" HWADDR_PRIx " = 0x%#"PRIx64"\n", addr, value);
> index = addr;
> old_val = hpet_ram_read(opaque, addr, 4);
> new_val = value;
> @@ -637,7 +637,7 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
> }
> s->hpet_counter =
> (s->hpet_counter & 0xffffffff00000000ULL) | value;
> - DPRINTF("qemu: HPET counter written. ctr = %#x -> %" PRIx64 "\n",
> + DPRINTF("qemu: HPET counter written. ctr = %#" 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 =
> (s->hpet_counter & 0xffffffffULL) | (((uint64_t)value) << 32);
> - DPRINTF("qemu: HPET counter + 4 written. ctr = %#x -> %" PRIx64 "\n",
> + DPRINTF("qemu: HPET counter + 4 written. ctr = %#" PRIx64 " -> %" PRIx64 "\n",
> value, s->hpet_counter);
> break;
> default:
>
Reviewed-by: Thomas Huth <thuth@redhat.com>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] hw/timer/hpet: Fix DPRINTF format string
2020-09-03 13:45 ` [PATCH 2/2] hw/timer/hpet: Fix DPRINTF format string Philippe Mathieu-Daudé
2020-09-03 14:04 ` Thomas Huth
@ 2020-09-09 13:34 ` Laurent Vivier
1 sibling, 0 replies; 7+ messages in thread
From: Laurent Vivier @ 2020-09-09 13:34 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: qemu-trivial, Paolo Bonzini, Michael Tokarev, Michael S. Tsirkin
Le 03/09/2020 à 15:45, Philippe Mathieu-Daudé a écrit :
> Fix building with HPET_DEBUG enabled:
>
> hw/timer/hpet.c:512:73: error: format specifies type 'unsigned int' but the argument has type 'uint64_t' (aka 'unsigned long') [-Werror,-Wformat]
> DPRINTF("qemu: Enter hpet_ram_writel at %" PRIx64 " = %#x\n", addr, value);
> ~~~ ^~~~~
> %#lx
> hw/timer/hpet.c:655:21: error: format specifies type 'unsigned int' but the argument has type 'uint64_t' (aka 'unsigned long') [-Werror,-Wformat]
> value, s->hpet_counter);
> ^~~~~
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> 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 = opaque;
> uint64_t old_val, new_val, val, index;
>
> - DPRINTF("qemu: Enter hpet_ram_writel at %" PRIx64 " = %#x\n", addr, value);
> + DPRINTF("qemu: Enter hpet_ram_writel at 0x%" HWADDR_PRIx " = 0x%#"PRIx64"\n", addr, value);
> index = addr;
> old_val = hpet_ram_read(opaque, addr, 4);
> new_val = value;
> @@ -637,7 +637,7 @@ static void hpet_ram_write(void *opaque, hwaddr addr,
> }
> s->hpet_counter =
> (s->hpet_counter & 0xffffffff00000000ULL) | value;
> - DPRINTF("qemu: HPET counter written. ctr = %#x -> %" PRIx64 "\n",
> + DPRINTF("qemu: HPET counter written. ctr = %#" 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 =
> (s->hpet_counter & 0xffffffffULL) | (((uint64_t)value) << 32);
> - DPRINTF("qemu: HPET counter + 4 written. ctr = %#x -> %" PRIx64 "\n",
> + DPRINTF("qemu: HPET counter + 4 written. ctr = %#" PRIx64 " -> %" PRIx64 "\n",
> value, s->hpet_counter);
> break;
> default:
>
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] hw/timer/hpet: Remove dead code
2020-09-03 13:45 ` [PATCH 1/2] hw/timer/hpet: Remove dead code Philippe Mathieu-Daudé
2020-09-03 13:59 ` Thomas Huth
@ 2020-09-09 13:34 ` Laurent Vivier
1 sibling, 0 replies; 7+ messages in thread
From: Laurent Vivier @ 2020-09-09 13:34 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel
Cc: qemu-trivial, Paolo Bonzini, Michael Tokarev, Michael S. Tsirkin
Le 03/09/2020 à 15:45, Philippe Mathieu-Daudé a écrit :
> This code was never compiled/used, remove it.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> hw/timer/hpet.c | 14 --------------
> 1 file changed, 14 deletions(-)
>
> diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
> index 380acfa7c8a..b683f64f1d3 100644
> --- a/hw/timer/hpet.c
> +++ b/hw/timer/hpet.c
> @@ -416,20 +416,6 @@ static void hpet_del_timer(HPETTimer *t)
> update_irq(t, 0);
> }
>
> -#ifdef HPET_DEBUG
> -static uint32_t hpet_ram_readb(void *opaque, hwaddr addr)
> -{
> - printf("qemu: hpet_read b at %" PRIx64 "\n", addr);
> - return 0;
> -}
> -
> -static uint32_t hpet_ram_readw(void *opaque, hwaddr addr)
> -{
> - printf("qemu: hpet_read w at %" PRIx64 "\n", addr);
> - return 0;
> -}
> -#endif
> -
> static uint64_t hpet_ram_read(void *opaque, hwaddr addr,
> unsigned size)
> {
>
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-09-09 13:36 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-03 13:45 [PATCH 0/2] hw/timer/hpet: Trivial format string fix Philippe Mathieu-Daudé
2020-09-03 13:45 ` [PATCH 1/2] hw/timer/hpet: Remove dead code Philippe Mathieu-Daudé
2020-09-03 13:59 ` Thomas Huth
2020-09-09 13:34 ` Laurent Vivier
2020-09-03 13:45 ` [PATCH 2/2] hw/timer/hpet: Fix DPRINTF format string Philippe Mathieu-Daudé
2020-09-03 14:04 ` Thomas Huth
2020-09-09 13:34 ` Laurent Vivier
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.