[Qemu-commits] [qemu/qemu] 828d01: hw/sparc/sun4m: Have sun4m machines i

qemu-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 828d01: hw/sparc/sun4m: Have sun4m machines i

From:	Peter Maydell
Subject:	[Qemu-commits] [qemu/qemu] 828d01: hw/sparc/sun4m: Have sun4m machines inherit new TY...
Date:	Mon, 10 May 2021 04:39:45 -0700
  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 828d01b7c5ea567cfc9cdb1b66605f9855bc948a
      
https://github.com/qemu/qemu/commit/828d01b7c5ea567cfc9cdb1b66605f9855bc948a
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-05-04 (Tue, 04 May 2021)

  Changed paths:
    M hw/sparc/sun4m.c

  Log Message:
  -----------
  hw/sparc/sun4m: Have sun4m machines inherit new TYPE_SUN4M_MACHINE

Introduce the TYPE_SUN4M_MACHINE and have all sun4m
machines inherit it.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20210503171303.822501-2-f4bug@amsat.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: 95bc47dec8385e78d6a92c64f25c9f380d95e669
      
https://github.com/qemu/qemu/commit/95bc47dec8385e78d6a92c64f25c9f380d95e669
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-05-04 (Tue, 04 May 2021)

  Changed paths:
    M hw/sparc/sun4m.c

  Log Message:
  -----------
  hw/sparc/sun4m: Introduce Sun4mMachineClass

Instead of passing the sun4m_hwdef structure via
machine_init(), store it into the MachineClass.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20210503171303.822501-3-f4bug@amsat.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: f55e8977ec54e8272f6209e7376a9ca153a74121
      
https://github.com/qemu/qemu/commit/f55e8977ec54e8272f6209e7376a9ca153a74121
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-05-04 (Tue, 04 May 2021)

  Changed paths:
    M hw/sparc/sun4m.c

  Log Message:
  -----------
  hw/sparc/sun4m: Factor out sun4m_machine_class_init()

Factor out the class_init code common to all machines
to sun4m_machine_class_init().

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20210503171303.822501-4-f4bug@amsat.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: 355eb81af1617633249eddf5640719e17af1b194
      
https://github.com/qemu/qemu/commit/355eb81af1617633249eddf5640719e17af1b194
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-05-04 (Tue, 04 May 2021)

  Changed paths:
    M hw/sparc/sun4m.c

  Log Message:
  -----------
  hw/sparc/sun4m: Register machine types in sun4m_machine_types[]

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20210503171303.822501-5-f4bug@amsat.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: 41db3b77e3c3d6869a4994877eab90d9bcf5657b
      
https://github.com/qemu/qemu/commit/41db3b77e3c3d6869a4994877eab90d9bcf5657b
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-05-04 (Tue, 04 May 2021)

  Changed paths:
    M hw/sparc/sun4m.c

  Log Message:
  -----------
  hw/sparc/sun4m: Fix code style for checkpatch.pl

We are going to move this code, fix its style first.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20210503171303.822501-6-f4bug@amsat.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: bcdd781ff8c695920fe5534a34c6ab77889601c1
      
https://github.com/qemu/qemu/commit/bcdd781ff8c695920fe5534a34c6ab77889601c1
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-05-04 (Tue, 04 May 2021)

  Changed paths:
    M hw/sparc/sun4m.c

  Log Message:
  -----------
  hw/sparc/sun4m: Move each sun4m_hwdef definition in its class_init

Remove the sun4m_hwdefs[] array by moving assigning the
structure fields directly in each machine class_init()
function.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20210503171303.822501-7-f4bug@amsat.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: 12841199918cc78890de99b4d0edddfd8e1fa484
      
https://github.com/qemu/qemu/commit/12841199918cc78890de99b4d0edddfd8e1fa484
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-05-04 (Tue, 04 May 2021)

  Changed paths:
    M hw/sparc/leon3.c
    M hw/sparc/trace-events
    M target/sparc/cpu.h
    M target/sparc/int32_helper.c
    M target/sparc/trace-events

  Log Message:
  -----------
  hw/sparc: Allow building without the leon3 machine

When building without the leon3 machine, we get this link failure:

  /usr/bin/ld: target_sparc_int32_helper.c.o: in function `leon3_irq_manager':
  target/sparc/int32_helper.c:172: undefined reference to `leon3_irq_ack'

This is because the leon3_irq_ack() is declared in hw/sparc/leon3.c,
which is only build when CONFIG_LEON3 is selected.

Fix by moving the leon3_cache_control_int() / leon3_irq_manager()
(which are specific to the leon3 machine) to hw/sparc/leon3.c.
Move the trace events along (but don't rename them).

leon3_irq_ack() is now locally used, declare it static to reduce
its scope.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: KONRAD Frederic <frederic.konrad@adacore.com>
Tested-by: KONRAD Frederic <frederic.konrad@adacore.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20210428141655.387430-2-f4bug@amsat.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: ef19ddfbf473d2e57239bfb160405cf9dd464cd1
      
https://github.com/qemu/qemu/commit/ef19ddfbf473d2e57239bfb160405cf9dd464cd1
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-05-04 (Tue, 04 May 2021)

  Changed paths:
    M hw/sparc64/sparc64.c

  Log Message:
  -----------
  hw/sparc64: Remove unused "hw/char/serial.h" header

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: KONRAD Frederic <frederic.konrad@adacore.com>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210428141655.387430-3-f4bug@amsat.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: 5aa7f68a2df9604dbd7f95e9ecece6d553e46e32
      
https://github.com/qemu/qemu/commit/5aa7f68a2df9604dbd7f95e9ecece6d553e46e32
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-05-04 (Tue, 04 May 2021)

  Changed paths:
    M hw/sparc64/sparc64.c

  Log Message:
  -----------
  hw/sparc64: Fix code style for checkpatch.pl

We are going to move this code, fix its style first.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: KONRAD Frederic <frederic.konrad@adacore.com>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210428141655.387430-4-f4bug@amsat.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: 10fb1340b161682d64320a5976f88f68472410bf
      
https://github.com/qemu/qemu/commit/10fb1340b161682d64320a5976f88f68472410bf
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-05-04 (Tue, 04 May 2021)

  Changed paths:
    M hw/sparc/sun4m.c
    M hw/sparc/trace-events
    M hw/sparc64/sparc64.c
    M hw/sparc64/trace-events
    M target/sparc/int32_helper.c
    M target/sparc/int64_helper.c
    M target/sparc/trace-events

  Log Message:
  -----------
  hw/sparc*: Move cpu_check_irqs() to target/sparc/

Since cpu_check_irqs() doesn't reference to anything outside
of CPUSPARCState, it better belongs to the architectural code
in target/, rather than the hardware specific code in hw/.

Note: while we moved the trace events, we don't rename them.

Remark: this allows us to build the leon3 machine stand alone,
fixing this link failure (because cpu_check_irqs is defined in
hw/sparc/sun4m.c which is only built when CONFIG_SUN4M is selected):

  /usr/bin/ld: target_sparc_win_helper.c.o: in function `cpu_put_psr':
  target/sparc/win_helper.c:91: undefined reference to `cpu_check_irqs'

Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210428141655.387430-5-f4bug@amsat.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


  Commit: 74e31681ba05ed1876818df30c581bc530554fb3
      
https://github.com/qemu/qemu/commit/74e31681ba05ed1876818df30c581bc530554fb3
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-05-10 (Mon, 10 May 2021)

  Changed paths:
    M hw/sparc/leon3.c
    M hw/sparc/sun4m.c
    M hw/sparc/trace-events
    M hw/sparc64/sparc64.c
    M hw/sparc64/trace-events
    M target/sparc/cpu.h
    M target/sparc/int32_helper.c
    M target/sparc/int64_helper.c
    M target/sparc/trace-events

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-20210505' into 
staging

qemu-sparc queue

# gpg: Signature made Wed 05 May 2021 08:29:13 BST
# gpg:                using RSA key CC621AB98E82200D915CC9C45BC2C56FAE0F321F
# gpg:                issuer "mark.cave-ayland@ilande.co.uk"
# gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>" 
[full]
# Primary key fingerprint: CC62 1AB9 8E82 200D 915C  C9C4 5BC2 C56F AE0F 321F

* remotes/mcayland/tags/qemu-sparc-20210505:
  hw/sparc*: Move cpu_check_irqs() to target/sparc/
  hw/sparc64: Fix code style for checkpatch.pl
  hw/sparc64: Remove unused "hw/char/serial.h" header
  hw/sparc: Allow building without the leon3 machine
  hw/sparc/sun4m: Move each sun4m_hwdef definition in its class_init
  hw/sparc/sun4m: Fix code style for checkpatch.pl
  hw/sparc/sun4m: Register machine types in sun4m_machine_types[]
  hw/sparc/sun4m: Factor out sun4m_machine_class_init()
  hw/sparc/sun4m: Introduce Sun4mMachineClass
  hw/sparc/sun4m: Have sun4m machines inherit new TYPE_SUN4M_MACHINE

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/4cc10cae64c5...74e31681ba05
[Prev in Thread]
Current Thread
[Next in Thread]
[Qemu-commits] [qemu/qemu] 828d01: hw/sparc/sun4m: Have sun4m machines inherit new TY..., Peter Maydell <=
- [Qemu-commits] [qemu/qemu] 828d01: hw/sparc/sun4m: Have sun4m machines inherit new TY..., Peter Maydell, 2021/05/10
Prev by Date: [Qemu-commits] [qemu/qemu] 62cbfd: oslib-win32: do not rely on macro to get redefined...
Next by Date: [Qemu-commits] [qemu/qemu] 828d01: hw/sparc/sun4m: Have sun4m machines inherit new TY...
Previous by thread: [Qemu-commits] [qemu/qemu] 62cbfd: oslib-win32: do not rely on macro to get redefined...
Next by thread: [Qemu-commits] [qemu/qemu] 828d01: hw/sparc/sun4m: Have sun4m machines inherit new TY...
Index(es):
- Date
- Thread