Skip to content
Snippets Groups Projects
  1. Jan 08, 2020
  2. Jan 07, 2020
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/vivier/tags/q800-for-5.0-pull-request' into staging · 035eed4c
      Peter Maydell authored
      
      m68k: fix CACR valid bits
      q800: add a fake mac rom reset (used by linux)
            fix and improve PRAM emulation
      
      # gpg: Signature made Tue 07 Jan 2020 13:25:50 GMT
      # gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
      # gpg:                issuer "laurent@vivier.eu"
      # gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
      # gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
      # gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
      # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C
      
      * remotes/vivier/tags/q800-for-5.0-pull-request:
        target/m68k: only change valid bits in CACR
        q800: implement mac rom reset function for BIOS-less mode
        q800: add a block backend to the PRAM
        q800: fix mac_via RTC PRAM commands
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      035eed4c
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging · 973d306d
      Peter Maydell authored
      
      virtio, pci, pc: fixes, features
      
      Bugfixes all over the place.
      HMAT support.
      New flags for vhost-user-blk utility.
      Auto-tuning of seg max for virtio storage.
      
      Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
      
      # gpg: Signature made Mon 06 Jan 2020 17:05:05 GMT
      # gpg:                using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469
      # gpg:                issuer "mst@redhat.com"
      # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full]
      # gpg:                 aka "Michael S. Tsirkin <mst@redhat.com>" [full]
      # Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
      #      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469
      
      * remotes/mst/tags/for_upstream: (32 commits)
        intel_iommu: add present bit check for pasid table entries
        intel_iommu: a fix to vtd_find_as_from_bus_num()
        virtio-net: delete also control queue when TX/RX deleted
        virtio: reset region cache when on queue deletion
        virtio-mmio: update queue size on guest write
        tests: add virtio-scsi and virtio-blk seg_max_adjust test
        virtio: make seg_max virtqueue size dependent
        hw: fix using 4.2 compat in 5.0 machine types for i440fx/q35
        vhost-user-scsi: reset the device if supported
        vhost-user: add VHOST_USER_RESET_DEVICE to reset devices
        hw/pci/pci_host: Let pci_data_[read/write] use unsigned 'size' argument
        hw/pci/pci_host: Remove redundant PCI_DPRINTF()
        virtio-mmio: Clear v2 transport state on soft reset
        ACPI: add expected files for HMAT tests (acpihmat)
        tests/bios-tables-test: add test cases for ACPI HMAT
        tests/numa: Add case for QMP build HMAT
        hmat acpi: Build Memory Side Cache Information Structure(s)
        hmat acpi: Build System Locality Latency and Bandwidth Information Structure(s)
        hmat acpi: Build Memory Proximity Domain Attributes Structure(s)
        numa: Extend CLI to provide memory side cache information
        ...
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      973d306d
    • Peter Maydell's avatar
      tests/iothread: Always connect iothread GSource to a GMainContext · 0cb04061
      Peter Maydell authored
      
      On older versions of glib (anything prior to glib commit 0f056ebe
      from May 2019), the implementation of g_source_ref() and
      g_source_unref() is not threadsafe for a GSource which is not
      attached to a GMainContext.
      
      QEMU's real iothread.c implementation always attaches its
      iothread->ctx's GSource to a GMainContext created for that iothread,
      so it is OK, but the simple test framework implementation in
      tests/iothread.c was not doing this.  This was causing intermittent
      assertion failures in the test-aio-multithread subtest
      "/aio/multi/mutex/contended" test on the BSD hosts.  (It's unclear
      why only BSD seems to have been affected -- perhaps a combination of
      the specific glib version being used in the VMs and their happening
      to run on a host with a lot of CPUs).
      
      Borrow the iothread_init_gcontext() from the real iothread.c
      and add the corresponding cleanup code and the calls to
      g_main_context_push/pop_thread_default() so we actually use
      the GMainContext we create.
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
      Reviewed-by: default avatarPeter Xu <peterx@redhat.com>
      Message-id: 20200106144552.7205-1-peter.maydell@linaro.org
      0cb04061
    • Laurent Vivier's avatar
      target/m68k: only change valid bits in CACR · 18b6102e
      Laurent Vivier authored
      
      This is used by netBSD (and MacOS ROM) to detect the MMU type
      
      Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
      Reviewed-by: default avatarThomas Huth <huth@tuxfamily.org>
      Message-Id: <20191220172415.35838-1-laurent@vivier.eu>
      [lv: add a comment before m680x0_cpu_common()]
      Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
      18b6102e
    • Jason A. Donenfeld's avatar
      q800: implement mac rom reset function for BIOS-less mode · e24e58e8
      Jason A. Donenfeld authored
      
      On Linux, calling `reboot(RB_AUTOBOOT);` will result in
      arch/m68k/mac/misc.c's mac_reset function being called. That in turn
      looks at the rombase (or uses 0x40800000 is there's no rombase), adds
      0xa, and jumps to that address. At the moment, there's nothing there, so
      the kernel just crashes when trying to reboot. So, this commit adds a
      very simple implementation at that location, which just writes to via2
      to power down. We also correct the value of ROMBASE while we're at it.
      
      Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
      Reviewed-by: default avatarLaurent Vivier <laurent@vivier.eu>
      Message-Id: <20200102120150.281082-1-Jason@zx2c4.com>
      Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
      e24e58e8
    • Laurent Vivier's avatar
      q800: add a block backend to the PRAM · eb064db9
      Laurent Vivier authored
      
      This allows to save and restore the content of the PRAM.
      It may be useful if we want to check the configuration or to change it.
      
      The backend is added using mtd interface, for instance:
      
          ... -drive file=pram.img,format=raw,if=mtd ...
      
      where pram.img is the file where the data will be stored, its size must
      be 256 bytes.
      
      Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
      Message-Id: <20191219201439.84804-3-laurent@vivier.eu>
      eb064db9
    • Laurent Vivier's avatar
      q800: fix mac_via RTC PRAM commands · b2619c15
      Laurent Vivier authored
      The command byte is not decoded correctly.
      
      This patch reworks the RTC/PRAM interface and fixes the problem.
      It adds a comment before the function to explain how are encoded commands
      and some trace-events to ease debugging.
      
      Bug: https://bugs.launchpad.net/qemu/+bug/1856549
      
      
      Fixes: 6dca62a0 ("hw/m68k: add VIA support")
      Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
      Reviewed-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
      Message-Id: <20191219201439.84804-2-laurent@vivier.eu>
      b2619c15
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/awilliam/tags/vfio-fixes-20200106.0' into staging · a8f2c60c
      Peter Maydell authored
      
      VFIO fixes 2020-01-06
      
       - Fix irqchip notifier de-registration if not registered (Peter Xu)
      
      # gpg: Signature made Mon 06 Jan 2020 21:58:17 GMT
      # gpg:                using RSA key 239B9B6E3BB08B22
      # gpg: Good signature from "Alex Williamson <alex.williamson@redhat.com>" [full]
      # gpg:                 aka "Alex Williamson <alex@shazbot.org>" [full]
      # gpg:                 aka "Alex Williamson <alwillia@redhat.com>" [full]
      # gpg:                 aka "Alex Williamson <alex.l.williamson@gmail.com>" [full]
      # Primary key fingerprint: 42F6 C04E 540B D1A9 9E7B  8A90 239B 9B6E 3BB0 8B22
      
      * remotes/awilliam/tags/vfio-fixes-20200106.0:
        vfio/pci: Don't remove irqchip notifier if not registered
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      a8f2c60c
    • Peter Maydell's avatar
      Merge remote-tracking branch 'remotes/xtensa/tags/20200106-xtensa' into staging · cdbc5c51
      Peter Maydell authored
      
      target/xtensa improvements for v5.0:
      
      - fix ps.ring use in MPU configs;
      - use MPU background map from the configuration overlay.
      
      # gpg: Signature made Mon 06 Jan 2020 20:00:33 GMT
      # gpg:                using RSA key 2B67854B98E5327DCDEB17D851F9CC91F83FA044
      # gpg:                issuer "jcmvbkbc@gmail.com"
      # gpg: Good signature from "Max Filippov <filippov@cadence.com>" [unknown]
      # gpg:                 aka "Max Filippov <max.filippov@cogentembedded.com>" [full]
      # gpg:                 aka "Max Filippov <jcmvbkbc@gmail.com>" [full]
      # Primary key fingerprint: 2B67 854B 98E5 327D CDEB  17D8 51F9 CC91 F83F A044
      
      * remotes/xtensa/tags/20200106-xtensa:
        target/xtensa: use MPU background map from core configuration
        target/xtensa: import xtensa/config/core-isa.h
        target/xtensa: fix ps.ring use in MPU configs
      
      Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
      cdbc5c51
  3. Jan 06, 2020
Loading