]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge tag 'mips-misc-20230308' of https://github.com/philmd/qemu into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 9 Mar 2023 10:22:49 +0000 (10:22 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 9 Mar 2023 10:22:50 +0000 (10:22 +0000)
MIPS (and few misc) patches

- MIPS
  - Remove obsolete "mips" board from target-mips.rst
  - Fix JALS32/J32/SWM32 instructions for microMIPS
  - Fix CP0.Config7.WII handling on pre-R6 cores

- HW
  - Revert "Remove intermediate IRQ forwarder" commits
  - Implement legacy LTIM Edge/Level Bank Select in Intel 8259 INTC
  - Improve PCI IRQ routing in VT82C686 / Pegasos II
  - Basic implementation of VIA AC97 audio playback
  - Implement 'resume on connection status change' in USB OHCI

- UI
  - Override windowDidResignKey

- memory
  - Dump HPA and access type in HMP 'info ramblock'

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEE+qvnXhKRciHc/Wuy4+MsLN6twN4FAmQHzH8ACgkQ4+MsLN6t
# wN4RbxAAtbsbJKHikHevCiE9Fi0E4HHI4su00m3anImogfU3CKIHA7WHgeUVCdVH
# aLoFKjvE3d45FA4YwMs13wIo89tv6btn1y8C9iy+yjktdABPUr8OJphuaDxU+yNf
# XhPm4WsS0tEg5KzzTHF7qotJGw7Zd0Aca8oezFVBSL8b73lqiJiWBEouFTK9j5Oi
# s1uvAOPG3oxSlT7IIbnLRIEff4hi5FZh+LxRDgE3ChcOyY2W/DhrpdVIazv9Cpki
# facQ0ozMG4uuZ+HvviuTkK1vLX1+BcS0P1fnDPkXEPAxqx9jdqsMqWHbbnseQPN3
# xcVhw+GOZ67x8qAWIBKDG7nfChbcXgJ2sHxQmvb2XlxnOYw1oO5aRlrnn7ZPEWYA
# NbqUHB8G88wDcrms+Y+xCfO8idnr7Kzf4/1R1J1+5yEjg8Y1wu4t0asqZvhXA2HL
# F1yhHDCRY8w9pLYmPFGBrINBCoosiDn61g+JTngPffq1zJttmWjSLe9BYOF8Kiw+
# 4YjkCx43wK6RLTZNhU8g7iuqoYbHCQcXx5ZnGEadk+UJcfGrLnOrQbtAhvysS2wo
# msyum0FNWhnx/IZ6bmhmbFC8F/hASgyiV9CDwU2oOZ2oAkRiFXYBfXruUAt+6uLT
# UnAihAEsyUjyg5YNb4r8ZNkdeCPN6p3s2xY8OHphqu717K6uJXw=
# =D/0W
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue 07 Mar 2023 23:45:03 GMT
# gpg:                using RSA key FAABE75E12917221DCFD6BB2E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD  6BB2 E3E3 2C2C DEAD C0DE

* tag 'mips-misc-20230308' of https://github.com/philmd/qemu:
  log: Remove unneeded new line
  memory: Dump HPA and access type of ramblocks
  ui/cocoa: Override windowDidResignKey
  hw/usb/ohci: Implement resume on connection status change
  hw/audio/via-ac97: Basic implementation of audio playback
  hw/usb/vt82c686-uhci-pci: Use PCI IRQ routing
  hw/ppc/pegasos2: Fix PCI interrupt routing
  hw/isa/vt82c686: Implement PCI IRQ routing
  hw/intc/i8259: Implement legacy LTIM Edge/Level Bank Select
  hw/display/sm501: Add debug property to control pixman usage
  Revert "hw/isa/vt82c686: Remove intermediate IRQ forwarder"
  Revert "hw/isa/i82378: Remove intermediate IRQ forwarder"
  hw/mips/itu: Pass SAAR using QOM link property
  hw/mips: Declare all length properties as unsigned
  target/mips: Set correct CP0.Config[4, 5] values for M14K(c)
  target/mips: Implement CP0.Config7.WII bit support
  target/mips: Fix SWM32 handling for microMIPS
  target/mips: Fix JALS32/J32 instruction handling for microMIPS
  target/mips: Replace [g_]assert(0) -> g_assert_not_reached()
  docs/system: Remove "mips" board from target-mips.rst

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
1  2 
softmmu/physmem.c

diff --combined softmmu/physmem.c
index a6efd8e8dd11e6ed574d138d7bba348140bf022b,085b3ca6d2b11d5f8ec845f1219fb64770c50cab..fb412a56e1572b7f52dfb90d570194a9d11df383
@@@ -1126,15 -1126,21 +1126,21 @@@ GString *ram_block_format(void
      GString *buf = g_string_new("");
  
      RCU_READ_LOCK_GUARD();
-     g_string_append_printf(buf, "%24s %8s  %18s %18s %18s\n",
-                            "Block Name", "PSize", "Offset", "Used", "Total");
+     g_string_append_printf(buf, "%24s %8s  %18s %18s %18s %18s %3s\n",
+                            "Block Name", "PSize", "Offset", "Used", "Total",
+                            "HVA", "RO");
      RAMBLOCK_FOREACH(block) {
          psize = size_to_str(block->page_size);
          g_string_append_printf(buf, "%24s %8s  0x%016" PRIx64 " 0x%016" PRIx64
-                                " 0x%016" PRIx64 "\n", block->idstr, psize,
+                                " 0x%016" PRIx64 " 0x%016" PRIx64 " %3s\n",
+                                block->idstr, psize,
                                 (uint64_t)block->offset,
                                 (uint64_t)block->used_length,
-                                (uint64_t)block->max_length);
+                                (uint64_t)block->max_length,
+                                (uint64_t)(uintptr_t)block->host,
+                                block->mr->readonly ? "ro" : "rw");
          g_free(psize);
      }
  
@@@ -2927,8 -2933,6 +2933,8 @@@ void cpu_register_map_client(QEMUBH *bh
      qemu_mutex_lock(&map_client_list_lock);
      client->bh = bh;
      QLIST_INSERT_HEAD(&map_client_list, client, link);
 +    /* Write map_client_list before reading in_use.  */
 +    smp_mb();
      if (!qatomic_read(&bounce.in_use)) {
          cpu_notify_map_clients_locked();
      }
@@@ -3118,7 -3122,6 +3124,7 @@@ void address_space_unmap(AddressSpace *
      qemu_vfree(bounce.buffer);
      bounce.buffer = NULL;
      memory_region_unref(bounce.mr);
 +    /* Clear in_use before reading map_client_list.  */
      qatomic_mb_set(&bounce.in_use, false);
      cpu_notify_map_clients();
  }