mbox

[PULL,v2,0/7] MIPS queue for Jan 24th, 2020

Message ID 1579889269-8122-1-git-send-email-aleksandar.markovic@rt-rk.com
State New
Headers show

Pull-request

https://github.com/AMarkovic/qemu tags/mips-queue-jan-24-2020

Message

Aleksandar Markovic Jan. 24, 2020, 6:07 p.m. UTC
From: Aleksandar Markovic <amarkovic@wavecomp.com>

The following changes since commit ba2ed84fe6a78f64b2da441750fc6e925d94106a:

  Merge remote-tracking branch 'remotes/palmer/tags/riscv-for-master-5.0-sf1' into staging (2020-01-24 12:34:04 +0000)

are available in the git repository at:

  https://github.com/AMarkovic/qemu tags/mips-queue-jan-24-2020

for you to fetch changes up to 6e128a2e792b316281f6f1409fe9ffaf522a5a38:

  mips/mips_r4k: use memdev for RAM (2020-01-24 19:01:19 +0100)

----------------------------------------------------------------

MIPS queue for Jan 24th, 2020

  History:

    - v2: Inserted one missing "Signed-off-by:"

  Content:

    - correct a detail on r4k deprecation
    - style cleanup in helper_do_semihosting()
    - improving passing data to disassembler
    - refactoring of memdev usage for RAM for four MIPS machines

----------------------------------------------------------------

Aleksandar Markovic (2):
  target/mips: Rectify documentation on deprecating r4k machine
  disas: Add a field for target-dependant data

Daniel Henrique Barboza (1):
  mips-semi.c: remove 'uhi_done' label in helper_do_semihosting()

Igor Mammedov (4):
  mips/mips_jazz: use memdev for RAM
  mips/mips_malta: use memdev for RAM
  mips/mips_mipssim: use memdev for RAM
  mips/mips_r4k: use memdev for RAM

 hw/mips/mips_jazz.c     |  7 +++----
 hw/mips/mips_malta.c    | 10 ++++------
 hw/mips/mips_mipssim.c  |  9 +++------
 hw/mips/mips_r4k.c      | 12 ++++--------
 include/disas/dis-asm.h |  3 +++
 qemu-deprecated.texi    |  2 +-
 target/mips/mips-semi.c | 15 +++++++--------
 7 files changed, 25 insertions(+), 33 deletions(-)

Comments

Peter Maydell Jan. 24, 2020, 6:33 p.m. UTC | #1
On Fri, 24 Jan 2020 at 18:07, Aleksandar Markovic
<aleksandar.markovic@rt-rk.com> wrote:
>
> From: Aleksandar Markovic <amarkovic@wavecomp.com>
>
> The following changes since commit ba2ed84fe6a78f64b2da441750fc6e925d94106a:
>
>   Merge remote-tracking branch 'remotes/palmer/tags/riscv-for-master-5.0-sf1' into staging (2020-01-24 12:34:04 +0000)
>
> are available in the git repository at:
>
>   https://github.com/AMarkovic/qemu tags/mips-queue-jan-24-2020
>
> for you to fetch changes up to 6e128a2e792b316281f6f1409fe9ffaf522a5a38:
>
>   mips/mips_r4k: use memdev for RAM (2020-01-24 19:01:19 +0100)
>
> ----------------------------------------------------------------
>
> MIPS queue for Jan 24th, 2020
>
>   History:
>
>     - v2: Inserted one missing "Signed-off-by:"
>
>   Content:
>
>     - correct a detail on r4k deprecation
>     - style cleanup in helper_do_semihosting()
>     - improving passing data to disassembler
>     - refactoring of memdev usage for RAM for four MIPS machines
>

Hi; this fails to compile for me:

/home/petmay01/linaro/qemu-for-merges/hw/mips/mips_r4k.c: In function
‘mips_r4k_init’:
/home/petmay01/linaro/qemu-for-merges/hw/mips/mips_r4k.c:209:62:
error: ‘MachineState {aka struct MachineState}’ has no member named
‘ram’
     memory_region_add_subregion(address_space_mem, 0, machine->ram);
                                                              ^~
/home/petmay01/linaro/qemu-for-merges/hw/mips/mips_r4k.c: In function
‘mips_machine_init’:
/home/petmay01/linaro/qemu-for-merges/hw/mips/mips_r4k.c:315:9: error:
‘MachineClass {aka struct MachineClass}’ has no member named
‘default_ram_id’; did you mean ‘default_ram_size’?
     mc->default_ram_id = "mips_r4k.ram";
         ^~~~~~~~~~~~~~
         default_ram_size
/home/petmay01/linaro/qemu-for-merges/rules.mak:69: recipe for target
'hw/mips/mips_r4k.o' failed

(similar sorts of errors for mips_malta and mips_mipssim)

I don't think the patches from Igor are suitable for cherry-picking
into your tree, because they depend on earlier patches from the
start of his series which haven't yet gone into master.

thanks
-- PMM
Aleksandar Markovic Jan. 24, 2020, 6:39 p.m. UTC | #2
> I don't think the patches from Igor are suitable for cherry-picking
> into your tree, because they depend on earlier patches from the
> start of his series which haven't yet gone into master.

Auch. Sorry. In that case, please ignore this pull request. I will send a new
one hopefully next week.

> thanks
> -- PMM