* [Qemu-devel] [PATCH 1/2] gt64xxx.c: fix length modifier in DPRINTF format string
@ 2011-09-25 20:02 Antony Pavlov
2011-09-25 20:02 ` [Qemu-devel] [PATCH 2/2] gt64xxx.c: remove reference to non-existing ISD_handle field Antony Pavlov
2011-09-25 20:56 ` [Qemu-devel] [PATCH 1/2] gt64xxx.c: fix length modifier in DPRINTF format string Peter Maydell
0 siblings, 2 replies; 6+ messages in thread
From: Antony Pavlov @ 2011-09-25 20:02 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Antony Pavlov, Aurelien Jarno
The commit fc2bf44972349b078d8310466c3866615500e67f
changed the type of val argument of the function gt64120_writel()
from uint32_t to uint64_t, so we need to change the corresponding
length modifier from '%x' to '%llx'.
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
hw/gt64xxx.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/gt64xxx.c b/hw/gt64xxx.c
index c7df8c4..1defb6d 100644
--- a/hw/gt64xxx.c
+++ b/hw/gt64xxx.c
@@ -543,19 +543,19 @@ static void gt64120_writel (void *opaque, target_phys_addr_t addr,
/* not really implemented */
s->regs[saddr] = ~(~(s->regs[saddr]) | ~(val & 0xfffffffe));
s->regs[saddr] |= !!(s->regs[saddr] & 0xfffffffe);
- DPRINTF("INTRCAUSE %x\n", val);
+ DPRINTF("INTRCAUSE %" PRIx64 "\n", val);
break;
case GT_INTRMASK:
s->regs[saddr] = val & 0x3c3ffffe;
- DPRINTF("INTRMASK %x\n", val);
+ DPRINTF("INTRMASK %" PRIx64 "\n", val);
break;
case GT_PCI0_ICMASK:
s->regs[saddr] = val & 0x03fffffe;
- DPRINTF("ICMASK %x\n", val);
+ DPRINTF("ICMASK %" PRIx64 "\n", val);
break;
case GT_PCI0_SERR0MASK:
s->regs[saddr] = val & 0x0000003f;
- DPRINTF("SERR0MASK %x\n", val);
+ DPRINTF("SERR0MASK %" PRIx64 "\n", val);
break;
/* Reserved when only PCI_0 is configured. */
--
1.7.5.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Qemu-devel] [PATCH 2/2] gt64xxx.c: remove reference to non-existing ISD_handle field
2011-09-25 20:02 [Qemu-devel] [PATCH 1/2] gt64xxx.c: fix length modifier in DPRINTF format string Antony Pavlov
@ 2011-09-25 20:02 ` Antony Pavlov
2011-09-25 20:56 ` [Qemu-devel] [PATCH 1/2] gt64xxx.c: fix length modifier in DPRINTF format string Peter Maydell
1 sibling, 0 replies; 6+ messages in thread
From: Antony Pavlov @ 2011-09-25 20:02 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Antony Pavlov, Aurelien Jarno
The commit fc2bf44972349b078d8310466c3866615500e67f
removed ISD_handle field from struct GT64120State,
so remove the field from DPRINTF too.
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
hw/gt64xxx.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/gt64xxx.c b/hw/gt64xxx.c
index 1defb6d..35dc1cd 100644
--- a/hw/gt64xxx.c
+++ b/hw/gt64xxx.c
@@ -275,8 +275,9 @@ static void gt64120_isd_mapping(GT64120State *s)
check_reserved_space(&start, &length);
length = 0x1000;
/* Map new address */
- DPRINTF("ISD: "TARGET_FMT_plx"@"TARGET_FMT_plx" -> "TARGET_FMT_plx"@"TARGET_FMT_plx", %x\n", s->ISD_length, s->ISD_start,
- length, start, s->ISD_handle);
+ DPRINTF("ISD: "TARGET_FMT_plx"@"TARGET_FMT_plx
+ " -> "TARGET_FMT_plx"@"TARGET_FMT_plx"\n",
+ s->ISD_length, s->ISD_start, length, start);
s->ISD_start = start;
s->ISD_length = length;
memory_region_add_subregion(get_system_memory(), s->ISD_start, &s->ISD_mem);
--
1.7.5.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [Qemu-devel] [PATCH 1/2] gt64xxx.c: fix length modifier in DPRINTF format string
2011-09-25 20:02 [Qemu-devel] [PATCH 1/2] gt64xxx.c: fix length modifier in DPRINTF format string Antony Pavlov
2011-09-25 20:02 ` [Qemu-devel] [PATCH 2/2] gt64xxx.c: remove reference to non-existing ISD_handle field Antony Pavlov
@ 2011-09-25 20:56 ` Peter Maydell
2011-09-26 5:02 ` Antony Pavlov
1 sibling, 1 reply; 6+ messages in thread
From: Peter Maydell @ 2011-09-25 20:56 UTC (permalink / raw)
To: Antony Pavlov; +Cc: qemu-trivial, qemu-devel, Aurelien Jarno
On 25 September 2011 21:02, Antony Pavlov <antonynpavlov@gmail.com> wrote:
> The commit fc2bf44972349b078d8310466c3866615500e67f
> changed the type of val argument of the function gt64120_writel()
> from uint32_t to uint64_t, so we need to change the corresponding
> length modifier from '%x' to '%llx'.
Revised patch looks OK but you forgot to update the commit message :-)
-- PMM
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH 1/2] gt64xxx.c: fix length modifier in DPRINTF format string
@ 2011-09-26 5:02 Antony Pavlov
2011-09-26 5:02 ` [Qemu-devel] [PATCH 2/2] gt64xxx.c: remove reference to non-existing ISD_handle field Antony Pavlov
0 siblings, 1 reply; 6+ messages in thread
From: Antony Pavlov @ 2011-09-26 5:02 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Antony Pavlov, Aurelien Jarno
The commit fc2bf44972349b078d8310466c3866615500e67f
changed the type of val argument of the function gt64120_writel()
from uint32_t to uint64_t, so we need to change the corresponding
length modifier from "%x" to "%" PRIx64.
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
hw/gt64xxx.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/gt64xxx.c b/hw/gt64xxx.c
index c7df8c4..1defb6d 100644
--- a/hw/gt64xxx.c
+++ b/hw/gt64xxx.c
@@ -543,19 +543,19 @@ static void gt64120_writel (void *opaque, target_phys_addr_t addr,
/* not really implemented */
s->regs[saddr] = ~(~(s->regs[saddr]) | ~(val & 0xfffffffe));
s->regs[saddr] |= !!(s->regs[saddr] & 0xfffffffe);
- DPRINTF("INTRCAUSE %x\n", val);
+ DPRINTF("INTRCAUSE %" PRIx64 "\n", val);
break;
case GT_INTRMASK:
s->regs[saddr] = val & 0x3c3ffffe;
- DPRINTF("INTRMASK %x\n", val);
+ DPRINTF("INTRMASK %" PRIx64 "\n", val);
break;
case GT_PCI0_ICMASK:
s->regs[saddr] = val & 0x03fffffe;
- DPRINTF("ICMASK %x\n", val);
+ DPRINTF("ICMASK %" PRIx64 "\n", val);
break;
case GT_PCI0_SERR0MASK:
s->regs[saddr] = val & 0x0000003f;
- DPRINTF("SERR0MASK %x\n", val);
+ DPRINTF("SERR0MASK %" PRIx64 "\n", val);
break;
/* Reserved when only PCI_0 is configured. */
--
1.7.5.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Qemu-devel] [PATCH 2/2] gt64xxx.c: remove reference to non-existing ISD_handle field
2011-09-26 5:02 Antony Pavlov
@ 2011-09-26 5:02 ` Antony Pavlov
0 siblings, 0 replies; 6+ messages in thread
From: Antony Pavlov @ 2011-09-26 5:02 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Antony Pavlov, Aurelien Jarno
The commit fc2bf44972349b078d8310466c3866615500e67f
removed ISD_handle field from struct GT64120State,
so remove the field from DPRINTF too.
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
hw/gt64xxx.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/gt64xxx.c b/hw/gt64xxx.c
index 1defb6d..35dc1cd 100644
--- a/hw/gt64xxx.c
+++ b/hw/gt64xxx.c
@@ -275,8 +275,9 @@ static void gt64120_isd_mapping(GT64120State *s)
check_reserved_space(&start, &length);
length = 0x1000;
/* Map new address */
- DPRINTF("ISD: "TARGET_FMT_plx"@"TARGET_FMT_plx" -> "TARGET_FMT_plx"@"TARGET_FMT_plx", %x\n", s->ISD_length, s->ISD_start,
- length, start, s->ISD_handle);
+ DPRINTF("ISD: "TARGET_FMT_plx"@"TARGET_FMT_plx
+ " -> "TARGET_FMT_plx"@"TARGET_FMT_plx"\n",
+ s->ISD_length, s->ISD_start, length, start);
s->ISD_start = start;
s->ISD_length = length;
memory_region_add_subregion(get_system_memory(), s->ISD_start, &s->ISD_mem);
--
1.7.5.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH 1/2] gt64xxx.c: fix length modifier in DPRINTF format string
@ 2011-09-25 18:14 Antony Pavlov
2011-09-25 18:14 ` [Qemu-devel] [PATCH 2/2] gt64xxx.c: remove reference to non-existing ISD_handle field Antony Pavlov
0 siblings, 1 reply; 6+ messages in thread
From: Antony Pavlov @ 2011-09-25 18:14 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Antony Pavlov, Aurelien Jarno
The commit fc2bf44972349b078d8310466c3866615500e67f
changed the type of val argument of the function gt64120_writel()
from uint32_t to uint64_t, so we need to change the corresponding
length modifier from '%x' to '%llx'.
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
hw/gt64xxx.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/gt64xxx.c b/hw/gt64xxx.c
index c7df8c4..0baa320 100644
--- a/hw/gt64xxx.c
+++ b/hw/gt64xxx.c
@@ -543,19 +543,19 @@ static void gt64120_writel (void *opaque, target_phys_addr_t addr,
/* not really implemented */
s->regs[saddr] = ~(~(s->regs[saddr]) | ~(val & 0xfffffffe));
s->regs[saddr] |= !!(s->regs[saddr] & 0xfffffffe);
- DPRINTF("INTRCAUSE %x\n", val);
+ DPRINTF("INTRCAUSE %llx\n", val);
break;
case GT_INTRMASK:
s->regs[saddr] = val & 0x3c3ffffe;
- DPRINTF("INTRMASK %x\n", val);
+ DPRINTF("INTRMASK %llx\n", val);
break;
case GT_PCI0_ICMASK:
s->regs[saddr] = val & 0x03fffffe;
- DPRINTF("ICMASK %x\n", val);
+ DPRINTF("ICMASK %llx\n", val);
break;
case GT_PCI0_SERR0MASK:
s->regs[saddr] = val & 0x0000003f;
- DPRINTF("SERR0MASK %x\n", val);
+ DPRINTF("SERR0MASK %llx\n", val);
break;
/* Reserved when only PCI_0 is configured. */
--
1.7.5.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Qemu-devel] [PATCH 2/2] gt64xxx.c: remove reference to non-existing ISD_handle field
2011-09-25 18:14 [Qemu-devel] [PATCH 1/2] gt64xxx.c: fix length modifier in DPRINTF format string Antony Pavlov
@ 2011-09-25 18:14 ` Antony Pavlov
0 siblings, 0 replies; 6+ messages in thread
From: Antony Pavlov @ 2011-09-25 18:14 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Antony Pavlov, Aurelien Jarno
The commit fc2bf44972349b078d8310466c3866615500e67f
removed ISD_handle field from struct GT64120State,
so remove the field from DPRINTF too.
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
hw/gt64xxx.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/gt64xxx.c b/hw/gt64xxx.c
index 0baa320..36919fa 100644
--- a/hw/gt64xxx.c
+++ b/hw/gt64xxx.c
@@ -275,8 +275,9 @@ static void gt64120_isd_mapping(GT64120State *s)
check_reserved_space(&start, &length);
length = 0x1000;
/* Map new address */
- DPRINTF("ISD: "TARGET_FMT_plx"@"TARGET_FMT_plx" -> "TARGET_FMT_plx"@"TARGET_FMT_plx", %x\n", s->ISD_length, s->ISD_start,
- length, start, s->ISD_handle);
+ DPRINTF("ISD: "TARGET_FMT_plx"@"TARGET_FMT_plx
+ " -> "TARGET_FMT_plx"@"TARGET_FMT_plx"\n",
+ s->ISD_length, s->ISD_start, length, start);
s->ISD_start = start;
s->ISD_length = length;
memory_region_add_subregion(get_system_memory(), s->ISD_start, &s->ISD_mem);
--
1.7.5.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-09-26 5:02 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-25 20:02 [Qemu-devel] [PATCH 1/2] gt64xxx.c: fix length modifier in DPRINTF format string Antony Pavlov
2011-09-25 20:02 ` [Qemu-devel] [PATCH 2/2] gt64xxx.c: remove reference to non-existing ISD_handle field Antony Pavlov
2011-09-25 20:56 ` [Qemu-devel] [PATCH 1/2] gt64xxx.c: fix length modifier in DPRINTF format string Peter Maydell
2011-09-26 5:02 ` Antony Pavlov
-- strict thread matches above, loose matches on Subject: below --
2011-09-26 5:02 Antony Pavlov
2011-09-26 5:02 ` [Qemu-devel] [PATCH 2/2] gt64xxx.c: remove reference to non-existing ISD_handle field Antony Pavlov
2011-09-25 18:14 [Qemu-devel] [PATCH 1/2] gt64xxx.c: fix length modifier in DPRINTF format string Antony Pavlov
2011-09-25 18:14 ` [Qemu-devel] [PATCH 2/2] gt64xxx.c: remove reference to non-existing ISD_handle field Antony Pavlov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).