qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH for 2.10] hw/mps2_scc: fix incorrect properties
@ 2017-07-29 23:49 Philippe Mathieu-Daudé
  2017-07-31 12:13 ` Peter Maydell
  0 siblings, 1 reply; 2+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-07-29 23:49 UTC (permalink / raw)
  To: Peter Maydell; +Cc: Philippe Mathieu-Daudé, qemu-devel, qemu-arm

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
sorry, I missed them in my review :(

 hw/misc/mps2-scc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/misc/mps2-scc.c b/hw/misc/mps2-scc.c
index cc58d26f29..32be2a9df1 100644
--- a/hw/misc/mps2-scc.c
+++ b/hw/misc/mps2-scc.c
@@ -270,9 +270,9 @@ static Property mps2_scc_properties[] = {
     /* Values for various read-only ID registers (which are specific
      * to the board model or FPGA image)
      */
-    DEFINE_PROP_UINT32("scc-cfg4", MPS2SCC, aid, 0),
+    DEFINE_PROP_UINT32("scc-cfg4", MPS2SCC, cfg4, 0),
     DEFINE_PROP_UINT32("scc-aid", MPS2SCC, aid, 0),
-    DEFINE_PROP_UINT32("scc-id", MPS2SCC, aid, 0),
+    DEFINE_PROP_UINT32("scc-id", MPS2SCC, id, 0),
     /* These are the initial settings for the source clocks on the board.
      * In hardware they can be configured via a config file read by the
      * motherboard configuration controller to suit the FPGA image.
-- 
2.13.3

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Qemu-devel] [PATCH for 2.10] hw/mps2_scc: fix incorrect properties
  2017-07-29 23:49 [Qemu-devel] [PATCH for 2.10] hw/mps2_scc: fix incorrect properties Philippe Mathieu-Daudé
@ 2017-07-31 12:13 ` Peter Maydell
  0 siblings, 0 replies; 2+ messages in thread
From: Peter Maydell @ 2017-07-31 12:13 UTC (permalink / raw)
  To: Philippe Mathieu-Daudé; +Cc: QEMU Developers, qemu-arm

On 30 July 2017 at 00:49, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> sorry, I missed them in my review :(
>
>  hw/misc/mps2-scc.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/misc/mps2-scc.c b/hw/misc/mps2-scc.c
> index cc58d26f29..32be2a9df1 100644
> --- a/hw/misc/mps2-scc.c
> +++ b/hw/misc/mps2-scc.c
> @@ -270,9 +270,9 @@ static Property mps2_scc_properties[] = {
>      /* Values for various read-only ID registers (which are specific
>       * to the board model or FPGA image)
>       */
> -    DEFINE_PROP_UINT32("scc-cfg4", MPS2SCC, aid, 0),
> +    DEFINE_PROP_UINT32("scc-cfg4", MPS2SCC, cfg4, 0),
>      DEFINE_PROP_UINT32("scc-aid", MPS2SCC, aid, 0),
> -    DEFINE_PROP_UINT32("scc-id", MPS2SCC, aid, 0),
> +    DEFINE_PROP_UINT32("scc-id", MPS2SCC, id, 0),
>      /* These are the initial settings for the source clocks on the board.
>       * In hardware they can be configured via a config file read by the
>       * motherboard configuration controller to suit the FPGA image.
> --
> 2.13.3

Oops, nice catch. Applied to target-arm.next for 2.10.

thanks
-- PMM

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-07-31 12:21 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-29 23:49 [Qemu-devel] [PATCH for 2.10] hw/mps2_scc: fix incorrect properties Philippe Mathieu-Daudé
2017-07-31 12:13 ` Peter Maydell

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).