qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 5cb0e7: target/riscv: Fix mcycle/minstret inc


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 5cb0e7: target/riscv: Fix mcycle/minstret increment behavior
Date: Mon, 08 Jan 2024 05:16:24 -0800

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 5cb0e7abe1635cb82e0033260dac2b910d142f8c
      
https://github.com/qemu/qemu/commit/5cb0e7abe1635cb82e0033260dac2b910d142f8c
  Author: Xu Lu <luxu.kernel@bytedance.com>
  Date:   2024-01-05 (Fri, 05 Jan 2024)

  Changed paths:
    M target/riscv/csr.c

  Log Message:
  -----------
  target/riscv: Fix mcycle/minstret increment behavior

The mcycle/minstret counter's stop flag is mistakenly updated on a copy
on stack. Thus the counter increments even when the CY/IR bit in the
mcountinhibit register is set. This commit corrects its behavior.

Fixes: 3780e33732f88 (target/riscv: Support mcycle/minstret write operation)
Signed-off-by: Xu Lu <luxu.kernel@bytedance.com>
Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>


  Commit: 4ad87cd4b2254197b7ac12e3da824854e6a90f8f
      
https://github.com/qemu/qemu/commit/4ad87cd4b2254197b7ac12e3da824854e6a90f8f
  Author: Michael Tokarev <mjt@tls.msk.ru>
  Date:   2024-01-05 (Fri, 05 Jan 2024)

  Changed paths:
    M chardev/char.c

  Log Message:
  -----------
  chardev/char.c: fix "abstract device type" error message

Current error message:

 qemu-system-x86_64: -chardev spice,id=foo: Parameter 'driver' expects an 
abstract device type

while in fact the meaning is in reverse, -chardev expects
a non-abstract device type.

Fixes: 777357d758d9 ("chardev: qom-ify" 2016-12-07)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>


  Commit: 09a36158c283f7448d1b00fdbb6634f05d27f922
      
https://github.com/qemu/qemu/commit/09a36158c283f7448d1b00fdbb6634f05d27f922
  Author: Michael Tokarev <mjt@tls.msk.ru>
  Date:   2024-01-05 (Fri, 05 Jan 2024)

  Changed paths:
    M audio/audio.c

  Log Message:
  -----------
  audio/audio.c: remove trailing newline in error_setg

error_setg() appends newline to the formatted message.
Fixes: cb94ff5f80c5 ("audio: propagate Error * out of audio_init")

Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>


  Commit: 0c7ffc977195c1f71c8132eb5616827e589d4a0f
      
https://github.com/qemu/qemu/commit/0c7ffc977195c1f71c8132eb5616827e589d4a0f
  Author: Bin Meng <bmeng@tinylab.org>
  Date:   2024-01-05 (Fri, 05 Jan 2024)

  Changed paths:
    M hw/net/cadence_gem.c

  Log Message:
  -----------
  hw/net: cadence_gem: Fix MDIO_OP_xxx values

Testing upstream U-Boot with 'sifive_u' machine we see:

  => dhcp
  ethernet@10090000: PHY present at 0
  Could not get PHY for ethernet@10090000: addr 0
  phy_connect failed

This has been working till QEMU 8.1 but broken since QEMU 8.2.

Fixes: 1b09eeb122aa ("hw/net/cadence_gem: use FIELD to describe PHYMNTNC 
register fields")
Reported-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Bin Meng <bmeng@tinylab.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>


  Commit: 2c5107e1b455d4a157124f021826ead4e04b4aea
      
https://github.com/qemu/qemu/commit/2c5107e1b455d4a157124f021826ead4e04b4aea
  Author: Max Erenberg <merenber@uwaterloo.ca>
  Date:   2024-01-05 (Fri, 05 Jan 2024)

  Changed paths:
    M hw/misc/edu.c

  Log Message:
  -----------
  edu: fix DMA range upper bound check

The edu_check_range function checks that start <= end1 < end2, where
end1 is the upper bound (exclusive) of the guest-supplied DMA range and
end2 is the upper bound (exclusive) of the device's allowed DMA range.
When the guest tries to transfer exactly DMA_SIZE (4096) bytes, end1
will be equal to end2, so the check fails and QEMU aborts with this
puzzling error message (newlines added for formatting):

  qemu: hardware error: EDU: DMA range
    0x0000000000040000-0x0000000000040fff out of bounds
   (0x0000000000040000-0x0000000000040fff)!

By checking end1 <= end2 instead, guests will be allowed to transfer
exactly 4096 bytes. It is not necessary to explicitly check for
start <= end1 because the previous two checks (within(addr, start, end2)
and end1 > addr) imply start < end1.

Fixes: b30934cb52a7 ("hw: misc, add educational driver", 2015-01-21)
Signed-off-by: Max Erenberg <merenber@uwaterloo.ca>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>


  Commit: 8a780cd212647a6013c8ea59e0929dad996e2c54
      
https://github.com/qemu/qemu/commit/8a780cd212647a6013c8ea59e0929dad996e2c54
  Author: Samuel Tardieu <sam@rfc1149.net>
  Date:   2024-01-05 (Fri, 05 Jan 2024)

  Changed paths:
    M docs/system/arm/palm.rst
    M docs/system/arm/xscale.rst
    M docs/system/devices/can.rst

  Log Message:
  -----------
  docs: use "buses" rather than "busses"

If "busses" might be encountered as a plural of "bus" (5 instances),
the correct spelling is "buses" (26 instances). Fixing those 5
instances makes the doc more consistent.

Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>


  Commit: 001a013ea3f125d2ec0e709b5765754149d8d968
      
https://github.com/qemu/qemu/commit/001a013ea3f125d2ec0e709b5765754149d8d968
  Author: Cédric Le Goater <clg@redhat.com>
  Date:   2024-01-05 (Fri, 05 Jan 2024)

  Changed paths:
    M hw/vfio/container.c
    M hw/vfio/spapr.c
    M include/hw/vfio/vfio-container-base.h

  Log Message:
  -----------
  vfio/spapr: Extend VFIOIOMMUOps with a release handler

This allows to abstract a bit more the sPAPR IOMMU support in the
legacy IOMMU backend.

Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Tested-by: Eric Farman <farman@linux.ibm.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>


  Commit: d3764db87531cd53849ccee9b2f72aede90ccf5b
      
https://github.com/qemu/qemu/commit/d3764db87531cd53849ccee9b2f72aede90ccf5b
  Author: Cédric Le Goater <clg@redhat.com>
  Date:   2024-01-05 (Fri, 05 Jan 2024)

  Changed paths:
    M hw/vfio/container.c

  Log Message:
  -----------
  vfio/container: Introduce vfio_legacy_setup() for further cleanups

This will help subsequent patches to unify the initialization of type1
and sPAPR IOMMU backends.

Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Tested-by: Eric Farman <farman@linux.ibm.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>


  Commit: bffe92af0e7571868d47a1d1cd2205e13054d492
      
https://github.com/qemu/qemu/commit/bffe92af0e7571868d47a1d1cd2205e13054d492
  Author: Cédric Le Goater <clg@redhat.com>
  Date:   2024-01-05 (Fri, 05 Jan 2024)

  Changed paths:
    M hw/vfio/container.c

  Log Message:
  -----------
  vfio/container: Initialize VFIOIOMMUOps under vfio_init_container()

vfio_init_container() already defines the IOMMU type of the container.
Do the same for the VFIOIOMMUOps struct. This prepares ground for the
following patches that will deduce the associated VFIOIOMMUOps struct
from the IOMMU type.

Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Tested-by: Eric Farman <farman@linux.ibm.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>


  Commit: fdaa774e67435a328c0e28006c4d749f2198294a
      
https://github.com/qemu/qemu/commit/fdaa774e67435a328c0e28006c4d749f2198294a
  Author: Cédric Le Goater <clg@redhat.com>
  Date:   2024-01-05 (Fri, 05 Jan 2024)

  Changed paths:
    M hw/vfio/common.c
    M hw/vfio/container-base.c
    M hw/vfio/pci.c
    M include/hw/vfio/vfio-container-base.h

  Log Message:
  -----------
  vfio/container: Introduce a VFIOIOMMU QOM interface

VFIOContainerBase was not introduced as an abstract QOM object because
it felt unnecessary to expose all the IOMMU backends to the QEMU
machine and human interface. However, we can still abstract the IOMMU
backend handlers using a QOM interface class. This provides more
flexibility when referencing the various implementations.

Simply transform the VFIOIOMMUOps struct in an InterfaceClass and do
some initial name replacements. Next changes will start converting
VFIOIOMMUOps.

Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Tested-by: Eric Farman <farman@linux.ibm.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>


  Commit: 9812feefab3a4ff95a6cfd73aecb120b406bc98c
      
https://github.com/qemu/qemu/commit/9812feefab3a4ff95a6cfd73aecb120b406bc98c
  Author: Cédric Le Goater <clg@redhat.com>
  Date:   2024-01-05 (Fri, 05 Jan 2024)

  Changed paths:
    M hw/vfio/common.c
    M hw/vfio/container.c
    M include/hw/vfio/vfio-common.h
    M include/hw/vfio/vfio-container-base.h

  Log Message:
  -----------
  vfio/container: Introduce a VFIOIOMMU legacy QOM interface

Convert the legacy VFIOIOMMUOps struct to the new VFIOIOMMU QOM
interface. The set of of operations for this backend can be referenced
with a literal typename instead of a C struct. This will simplify
support of multiple backends.

Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Tested-by: Eric Farman <farman@linux.ibm.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>


  Commit: 61d893f2cdb34a2b0255f9b5fbba6b49b94ff730
      
https://github.com/qemu/qemu/commit/61d893f2cdb34a2b0255f9b5fbba6b49b94ff730
  Author: Cédric Le Goater <clg@redhat.com>
  Date:   2024-01-05 (Fri, 05 Jan 2024)

  Changed paths:
    M hw/vfio/container.c
    M include/hw/vfio/vfio-container-base.h

  Log Message:
  -----------
  vfio/container: Intoduce a new VFIOIOMMUClass::setup handler

This will help in converting the sPAPR IOMMU backend to a QOM interface.

Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Tested-by: Eric Farman <farman@linux.ibm.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>


  Commit: f221f641a2fe69c2ca3857759551470664b0bec8
      
https://github.com/qemu/qemu/commit/f221f641a2fe69c2ca3857759551470664b0bec8
  Author: Cédric Le Goater <clg@redhat.com>
  Date:   2024-01-05 (Fri, 05 Jan 2024)

  Changed paths:
    M hw/vfio/container.c
    M hw/vfio/spapr.c
    M include/hw/vfio/vfio-container-base.h

  Log Message:
  -----------
  vfio/spapr: Introduce a sPAPR VFIOIOMMU QOM interface

Move vfio_spapr_container_setup() to a VFIOIOMMUClass::setup handler
and convert the sPAPR VFIOIOMMUOps struct to a QOM interface. The
sPAPR QOM interface inherits from the legacy QOM interface because
because both have the same basic needs. The sPAPR interface is then
extended with the handlers specific to the sPAPR IOMMU.

This allows reuse and provides better abstraction of the backends. It
will be useful to avoid compiling the sPAPR IOMMU backend on targets
not supporting it.

Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Tested-by: Eric Farman <farman@linux.ibm.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>


  Commit: ce5f6d49f5845c3b9955cc377a5223c3f8d7ba1e
      
https://github.com/qemu/qemu/commit/ce5f6d49f5845c3b9955cc377a5223c3f8d7ba1e
  Author: Cédric Le Goater <clg@redhat.com>
  Date:   2024-01-05 (Fri, 05 Jan 2024)

  Changed paths:
    M hw/vfio/common.c
    M hw/vfio/iommufd.c
    M include/hw/vfio/vfio-common.h
    M include/hw/vfio/vfio-container-base.h

  Log Message:
  -----------
  vfio/iommufd: Introduce a VFIOIOMMU iommufd QOM interface

As previously done for the sPAPR and legacy IOMMU backends, convert
the VFIOIOMMUOps struct to a QOM interface. The set of of operations
for this backend can be referenced with a literal typename instead of
a C struct.

Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Tested-by: Eric Farman <farman@linux.ibm.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>


  Commit: 10164df6ed3d41cbf67105dcd954a663ef4cc3e9
      
https://github.com/qemu/qemu/commit/10164df6ed3d41cbf67105dcd954a663ef4cc3e9
  Author: Cédric Le Goater <clg@redhat.com>
  Date:   2024-01-05 (Fri, 05 Jan 2024)

  Changed paths:
    M hw/vfio/meson.build

  Log Message:
  -----------
  vfio/spapr: Only compile sPAPR IOMMU support when needed

sPAPR IOMMU support is only needed for pseries machines. Compile out
support when CONFIG_PSERIES is not set. This saves ~7K of text.

Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Tested-by: Eric Farman <farman@linux.ibm.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>


  Commit: c1139fa4feba8c320e4bd0a4e34af55caa5ffbb9
      
https://github.com/qemu/qemu/commit/c1139fa4feba8c320e4bd0a4e34af55caa5ffbb9
  Author: Cédric Le Goater <clg@redhat.com>
  Date:   2024-01-05 (Fri, 05 Jan 2024)

  Changed paths:
    M hw/vfio/common.c

  Log Message:
  -----------
  vfio/iommufd: Remove CONFIG_IOMMUFD usage

Availability of the IOMMUFD backend can now be fully determined at
runtime and the ifdef check was a build time protection (for PPC not
supporting it mostly).

Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Tested-by: Eric Farman <farman@linux.ibm.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>


  Commit: 213ae3ffda463c0503e39e0cf827511b5298c314
      
https://github.com/qemu/qemu/commit/213ae3ffda463c0503e39e0cf827511b5298c314
  Author: Cédric Le Goater <clg@redhat.com>
  Date:   2024-01-05 (Fri, 05 Jan 2024)

  Changed paths:
    M hw/vfio/container.c

  Log Message:
  -----------
  vfio/container: Replace basename with g_path_get_basename

g_path_get_basename() is a portable utility function that has the
advantage of not modifing the string argument. It also fixes a compile
breakage with the Musl C library reported in [1].

[1] https://lore.kernel.org/all/20231212010228.2701544-1-raj.khem@gmail.com/

Reported-by: Khem Raj <raj.khem@gmail.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>


  Commit: 9353b6da430f90e47f352dbf6dc31120c8914da6
      
https://github.com/qemu/qemu/commit/9353b6da430f90e47f352dbf6dc31120c8914da6
  Author: Volker Rümelin <vr_qemu@t-online.de>
  Date:   2024-01-05 (Fri, 05 Jan 2024)

  Changed paths:
    M hw/vfio/common.c

  Log Message:
  -----------
  hw/vfio: fix iteration over global VFIODevice list

Commit 3d779abafe ("vfio/common: Introduce a global VFIODevice list")
introduced a global VFIODevice list, but forgot to update the list
element field name when iterating over the new list. Change the code
to use the correct list element field.

Fixes: 3d779abafe ("vfio/common: Introduce a global VFIODevice list")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2061
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>


  Commit: 6ba254801f6bc7f3ef68a6414f1b107237c7eb26
      
https://github.com/qemu/qemu/commit/6ba254801f6bc7f3ef68a6414f1b107237c7eb26
  Author: Cédric Le Goater <clg@redhat.com>
  Date:   2024-01-05 (Fri, 05 Jan 2024)

  Changed paths:
    M hw/vfio/iommufd.c

  Log Message:
  -----------
  vfio/iommufd: Remove the use of stat() to check file existence

Using stat() before opening a file or a directory can lead to a
time-of-check to time-of-use (TOCTOU) filesystem race, which is
reported by coverity as a Security best practices violations. The
sequence could be replaced by open and fdopendir but it doesn't add
much in this case. Simply use opendir to avoid the race.

Fixes: CID 1531551
Signed-off-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Zhenzhong Duan <Zhenzhong.duan@intel.com>


  Commit: 9f734a117cbf63b03577b46c8cad8ad88ec6dced
      
https://github.com/qemu/qemu/commit/9f734a117cbf63b03577b46c8cad8ad88ec6dced
  Author: Zhenzhong Duan <zhenzhong.duan@intel.com>
  Date:   2024-01-05 (Fri, 05 Jan 2024)

  Changed paths:
    M hw/vfio/container.c

  Log Message:
  -----------
  vfio/container: Rename vfio_init_container to vfio_set_iommu

vfio_container_init() and vfio_init_container() names are confusing
especially when we see vfio_init_container() calls vfio_container_init().

vfio_container_init() operates on base container which is consistent
with all routines handling 'VFIOContainerBase *' ops.

vfio_init_container() operates on legacy container and setup IOMMU
context with ioctl(VFIO_SET_IOMMU).

So choose to rename vfio_init_container to vfio_set_iommu to avoid
the confusion.

No functional change intended.

Suggested-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>


  Commit: c817e5a377a334241eed149e35760aca58bdeb34
      
https://github.com/qemu/qemu/commit/c817e5a377a334241eed149e35760aca58bdeb34
  Author: Avihai Horon <avihaih@nvidia.com>
  Date:   2024-01-05 (Fri, 05 Jan 2024)

  Changed paths:
    M hw/vfio/migration.c

  Log Message:
  -----------
  vfio/migration: Add helper function to set state or reset device

There are several places where failure in setting the device state leads
to a device reset, which is done by setting ERROR as the recover state.

Add a helper function that sets the device state and resets the device
in case of failure. This will make the code cleaner and remove duplicate
comments.

Signed-off-by: Avihai Horon <avihaih@nvidia.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>


  Commit: c2ab3a6f7411c895e538e8350fee8948ac07c1a0
      
https://github.com/qemu/qemu/commit/c2ab3a6f7411c895e538e8350fee8948ac07c1a0
  Author: Cédric Le Goater <clg@redhat.com>
  Date:   2024-01-05 (Fri, 05 Jan 2024)

  Changed paths:
    M backends/iommufd.c

  Log Message:
  -----------
  backends/iommufd: Remove check on number of backend users

QOM already has a ref count on objects and it will assert much
earlier, when INT_MAX is reached.

Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>


  Commit: 19368b1905b4b917e915526fcbd5bfa3f7439451
      
https://github.com/qemu/qemu/commit/19368b1905b4b917e915526fcbd5bfa3f7439451
  Author: Cédric Le Goater <clg@redhat.com>
  Date:   2024-01-05 (Fri, 05 Jan 2024)

  Changed paths:
    M backends/iommufd.c
    M include/sysemu/iommufd.h

  Log Message:
  -----------
  backends/iommufd: Remove mutex

Coverity reports a concurrent data access violation because be->users
is being accessed in iommufd_backend_can_be_deleted() without holding
the mutex.

However, these routines are called from the QEMU main thread when a
device is created. In this case, the code paths should be protected by
the BQL lock and it should be safe to drop the IOMMUFD backend mutex.
Simply remove it.

Fixes: CID 1531550
Fixes: CID 1531549
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>


  Commit: beb60920a1f7ffbf82b5ac72d5fc2b1ea0a65c66
      
https://github.com/qemu/qemu/commit/beb60920a1f7ffbf82b5ac72d5fc2b1ea0a65c66
  Author: Song Gao <gaosong@loongson.cn>
  Date:   2024-01-06 (Sat, 06 Jan 2024)

  Changed paths:
    M target/loongarch/meson.build

  Log Message:
  -----------
  target/loongarch/meson: move gdbstub.c to loongarch.ss

gdbstub.c is not specific to TCG and can be used by
other accelerators, such as KVM accelerator

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20240102020200.3462097-1-gaosong@loongson.cn>


  Commit: 5c23704e4725f935b3171787f00e9922a7fc58cb
      
https://github.com/qemu/qemu/commit/5c23704e4725f935b3171787f00e9922a7fc58cb
  Author: Song Gao <gaosong@loongson.cn>
  Date:   2024-01-06 (Sat, 06 Jan 2024)

  Changed paths:
    R target/loongarch/constant_timer.c
    R target/loongarch/csr_helper.c
    R target/loongarch/fpu_helper.c
    R target/loongarch/insn_trans/trans_arith.c.inc
    R target/loongarch/insn_trans/trans_atomic.c.inc
    R target/loongarch/insn_trans/trans_bit.c.inc
    R target/loongarch/insn_trans/trans_branch.c.inc
    R target/loongarch/insn_trans/trans_extra.c.inc
    R target/loongarch/insn_trans/trans_farith.c.inc
    R target/loongarch/insn_trans/trans_fcmp.c.inc
    R target/loongarch/insn_trans/trans_fcnv.c.inc
    R target/loongarch/insn_trans/trans_fmemory.c.inc
    R target/loongarch/insn_trans/trans_fmov.c.inc
    R target/loongarch/insn_trans/trans_memory.c.inc
    R target/loongarch/insn_trans/trans_privileged.c.inc
    R target/loongarch/insn_trans/trans_shift.c.inc
    R target/loongarch/insn_trans/trans_vec.c.inc
    R target/loongarch/iocsr_helper.c
    M target/loongarch/meson.build
    R target/loongarch/op_helper.c
    A target/loongarch/tcg/constant_timer.c
    A target/loongarch/tcg/csr_helper.c
    A target/loongarch/tcg/fpu_helper.c
    A target/loongarch/tcg/insn_trans/trans_arith.c.inc
    A target/loongarch/tcg/insn_trans/trans_atomic.c.inc
    A target/loongarch/tcg/insn_trans/trans_bit.c.inc
    A target/loongarch/tcg/insn_trans/trans_branch.c.inc
    A target/loongarch/tcg/insn_trans/trans_extra.c.inc
    A target/loongarch/tcg/insn_trans/trans_farith.c.inc
    A target/loongarch/tcg/insn_trans/trans_fcmp.c.inc
    A target/loongarch/tcg/insn_trans/trans_fcnv.c.inc
    A target/loongarch/tcg/insn_trans/trans_fmemory.c.inc
    A target/loongarch/tcg/insn_trans/trans_fmov.c.inc
    A target/loongarch/tcg/insn_trans/trans_memory.c.inc
    A target/loongarch/tcg/insn_trans/trans_privileged.c.inc
    A target/loongarch/tcg/insn_trans/trans_shift.c.inc
    A target/loongarch/tcg/insn_trans/trans_vec.c.inc
    A target/loongarch/tcg/iocsr_helper.c
    A target/loongarch/tcg/meson.build
    A target/loongarch/tcg/op_helper.c
    A target/loongarch/tcg/tlb_helper.c
    A target/loongarch/tcg/translate.c
    A target/loongarch/tcg/vec_helper.c
    R target/loongarch/tlb_helper.c
    R target/loongarch/translate.c
    R target/loongarch/vec_helper.c

  Log Message:
  -----------
  target/loongarch: move translate modules to tcg/

Introduce the target/loongarch/tcg directory. Its purpose is to hold the TCG
code that is selected by CONFIG_TCG

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20240102020200.3462097-2-gaosong@loongson.cn>


  Commit: 8188c3cda586dc445cac875b7d21c0c960dbe97e
      
https://github.com/qemu/qemu/commit/8188c3cda586dc445cac875b7d21c0c960dbe97e
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2024-01-08 (Mon, 08 Jan 2024)

  Changed paths:
    R target/loongarch/constant_timer.c
    R target/loongarch/csr_helper.c
    R target/loongarch/fpu_helper.c
    R target/loongarch/insn_trans/trans_arith.c.inc
    R target/loongarch/insn_trans/trans_atomic.c.inc
    R target/loongarch/insn_trans/trans_bit.c.inc
    R target/loongarch/insn_trans/trans_branch.c.inc
    R target/loongarch/insn_trans/trans_extra.c.inc
    R target/loongarch/insn_trans/trans_farith.c.inc
    R target/loongarch/insn_trans/trans_fcmp.c.inc
    R target/loongarch/insn_trans/trans_fcnv.c.inc
    R target/loongarch/insn_trans/trans_fmemory.c.inc
    R target/loongarch/insn_trans/trans_fmov.c.inc
    R target/loongarch/insn_trans/trans_memory.c.inc
    R target/loongarch/insn_trans/trans_privileged.c.inc
    R target/loongarch/insn_trans/trans_shift.c.inc
    R target/loongarch/insn_trans/trans_vec.c.inc
    R target/loongarch/iocsr_helper.c
    M target/loongarch/meson.build
    R target/loongarch/op_helper.c
    A target/loongarch/tcg/constant_timer.c
    A target/loongarch/tcg/csr_helper.c
    A target/loongarch/tcg/fpu_helper.c
    A target/loongarch/tcg/insn_trans/trans_arith.c.inc
    A target/loongarch/tcg/insn_trans/trans_atomic.c.inc
    A target/loongarch/tcg/insn_trans/trans_bit.c.inc
    A target/loongarch/tcg/insn_trans/trans_branch.c.inc
    A target/loongarch/tcg/insn_trans/trans_extra.c.inc
    A target/loongarch/tcg/insn_trans/trans_farith.c.inc
    A target/loongarch/tcg/insn_trans/trans_fcmp.c.inc
    A target/loongarch/tcg/insn_trans/trans_fcnv.c.inc
    A target/loongarch/tcg/insn_trans/trans_fmemory.c.inc
    A target/loongarch/tcg/insn_trans/trans_fmov.c.inc
    A target/loongarch/tcg/insn_trans/trans_memory.c.inc
    A target/loongarch/tcg/insn_trans/trans_privileged.c.inc
    A target/loongarch/tcg/insn_trans/trans_shift.c.inc
    A target/loongarch/tcg/insn_trans/trans_vec.c.inc
    A target/loongarch/tcg/iocsr_helper.c
    A target/loongarch/tcg/meson.build
    A target/loongarch/tcg/op_helper.c
    A target/loongarch/tcg/tlb_helper.c
    A target/loongarch/tcg/translate.c
    A target/loongarch/tcg/vec_helper.c
    R target/loongarch/tlb_helper.c
    R target/loongarch/translate.c
    R target/loongarch/vec_helper.c

  Log Message:
  -----------
  Merge tag 'pull-loongarch-20240106' of https://gitlab.com/gaosong/qemu into 
staging

pull-loongarch-20240106

Fixs patch conflict

# -----BEGIN PGP SIGNATURE-----
#
# iLMEAAEKAB0WIQS4/x2g0v3LLaCcbCxAov/yOSY+3wUCZZi5pAAKCRBAov/yOSY+
# 35iIA/4uXw92i0HJ3KK9NxzZlP9gwld6dATvincKNUpUgplK3NtBpRlVKm9NzLH8
# Jdg84k7D5pNXfWAfomT+R3UMnL8R/zZZqeCCd60JE0Kbn4gCyCou2QuLKuWxPvNM
# Jklf4mifq+gplg7lDF0GTLo8MUzhAmV8AuG7lUZb6IQJ68ui8A==
# =NnLa
# -----END PGP SIGNATURE-----
# gpg: Signature made Sat 06 Jan 2024 02:23:32 GMT
# gpg:                using RSA key B8FF1DA0D2FDCB2DA09C6C2C40A2FFF239263EDF
# gpg: Good signature from "Song Gao <m17746591750@163.com>" [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: B8FF 1DA0 D2FD CB2D A09C  6C2C 40A2 FFF2 3926 3EDF

* tag 'pull-loongarch-20240106' of https://gitlab.com/gaosong/qemu:
  target/loongarch: move translate modules to tcg/
  target/loongarch/meson: move gdbstub.c to loongarch.ss

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


  Commit: 33252ebde15a238a1dbf07104aa0e5d5d487143c
      
https://github.com/qemu/qemu/commit/33252ebde15a238a1dbf07104aa0e5d5d487143c
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2024-01-08 (Mon, 08 Jan 2024)

  Changed paths:
    M audio/audio.c
    M chardev/char.c
    M docs/system/arm/palm.rst
    M docs/system/arm/xscale.rst
    M docs/system/devices/can.rst
    M hw/misc/edu.c
    M hw/net/cadence_gem.c
    M target/riscv/csr.c

  Log Message:
  -----------
  Merge tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu into staging

trivial patches for 2024-01-05

# -----BEGIN PGP SIGNATURE-----
#
# iQFDBAABCAAtFiEEe3O61ovnosKJMUsicBtPaxppPlkFAmWYWJEPHG1qdEB0bHMu
# bXNrLnJ1AAoJEHAbT2saaT5Z4PEH/2vA3XIPf96IlrZilBFIOYfb8wkw6AGI7BG8
# R3xps+j4ih/RreQdJzswFzfCDaBZvdEPlHtu3YFsIKqfa/svLdVU6GKqjNiDq6XY
# FvoQAUZCSg6NaF8Xgd4AETcw7FedW0nodDzpE/jBj5WQjd1eJoD26uF4cYicVzIt
# gtb6tJJ3LtYc0pNIzxk2hPFTUrXTpfA5kdIADmd6Tg1sH87JJpWnmR49/a89Kpst
# mU/j2KtmqL94YFH93qbkNQ2jkcnQ6DimsOpgPBNVMmKdXSUA9eF3DHo54nzIbhnN
# rvWXiUp6d7EjyqTI0IquuajFnlRBRyn4VvtJPbxuzr78GH8XJ9o=
# =Iz+M
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 05 Jan 2024 19:29:21 GMT
# gpg:                using RSA key 7B73BAD68BE7A2C289314B22701B4F6B1A693E59
# gpg:                issuer "mjt@tls.msk.ru"
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>" [full]
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>" [full]
# gpg:                 aka "Michael Tokarev <mjt@debian.org>" [full]
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
#      Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931  4B22 701B 4F6B 1A69 3E59

* tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu:
  docs: use "buses" rather than "busses"
  edu: fix DMA range upper bound check
  hw/net: cadence_gem: Fix MDIO_OP_xxx values
  audio/audio.c: remove trailing newline in error_setg
  chardev/char.c: fix "abstract device type" error message
  target/riscv: Fix mcycle/minstret increment behavior

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


  Commit: ffd454c67e38cc6df792733ebc5d967eee28ac0d
      
https://github.com/qemu/qemu/commit/ffd454c67e38cc6df792733ebc5d967eee28ac0d
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2024-01-08 (Mon, 08 Jan 2024)

  Changed paths:
    M backends/iommufd.c
    M hw/vfio/common.c
    M hw/vfio/container-base.c
    M hw/vfio/container.c
    M hw/vfio/iommufd.c
    M hw/vfio/meson.build
    M hw/vfio/migration.c
    M hw/vfio/pci.c
    M hw/vfio/spapr.c
    M include/hw/vfio/vfio-common.h
    M include/hw/vfio/vfio-container-base.h
    M include/sysemu/iommufd.h

  Log Message:
  -----------
  Merge tag 'pull-vfio-20240107' of https://github.com/legoater/qemu into 
staging

vfio queue:

* Minor cleanups
* Fix for a regression in device reset introduced in 8.2
* Coverity fixes, including the removal of the iommufd backend mutex
* Introduced VFIOIOMMUClass, to avoid compiling spapr when !CONFIG_PSERIES

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEEoPZlSPBIlev+awtgUaNDx8/77KEFAmWbIrcACgkQUaNDx8/7
# 7KFtPRAAxWcH9uh4tjJe4CgL+wXC+JOgviiNaI3AS6KmxdTHXcAvXMNAiGJfTBo4
# y/lJg+PYNgcDWrOqZqp1jj6ulWpO8ekLD9Nxv03e6o3kaArX/o2MtsrndOtWYnG/
# CUrr+/kTNeEw9008OaOca9vuh03xh3AnSwb3DzjHTvpMkj5LTXzuE1mU50DTUkn9
# GZjuN3rqHcdjJ/fXpiS6IgJbxcxLdo2aSykmyuq+TZmGf02lTES94PRef3Btr7Q6
# sKQZpv+A+gcZ8DHDJqfOEzEgu1OSa257q4ic47O1X3CeSyiGTGQ7rVKHtX6bK7xP
# mB9WOVqzzdH/g+kHNG+kVXMCQXZ0qo7VlIkHabYD220RryZBCqMecQ4aKPLFULQE
# e7C5ZaEvb7TLe/EaEQUSFrLCns7Nq6ciurcoAmP0cn2Ef1Sr1luNQVAR9LWRH1pc
# 1TeNmHy4nQygT0dQtFBXwNUZfnTuGcKdr43twReiCjX1ViPBU4lrcajVQH4rAuoe
# K/bBak2Kyi1LsFn8AzIwKXZZl83L57EyL+XEW8i5GN1jFSAHFx4ocUq8NQBa//kS
# xei9LV3HEJbAMOQsPO8HEK40mg5WR17s22AUClMqtD2DAQbPUrmcLbZ6Ttq6hTuV
# BqL56JFjbfML5RGjxwF9G8v5mdLmLlNRCGF2KI3NsT7dkMbVh24=
# =zvPi
# -----END PGP SIGNATURE-----
# gpg: Signature made Sun 07 Jan 2024 22:16:23 GMT
# gpg:                using RSA key A0F66548F04895EBFE6B0B6051A343C7CFFBECA1
# gpg: Good signature from "Cédric Le Goater <clg@kaod.org>" [undefined]
# 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: A0F6 6548 F048 95EB FE6B  0B60 51A3 43C7 CFFB ECA1

* tag 'pull-vfio-20240107' of https://github.com/legoater/qemu:
  backends/iommufd: Remove mutex
  backends/iommufd: Remove check on number of backend users
  vfio/migration: Add helper function to set state or reset device
  vfio/container: Rename vfio_init_container to vfio_set_iommu
  vfio/iommufd: Remove the use of stat() to check file existence
  hw/vfio: fix iteration over global VFIODevice list
  vfio/container: Replace basename with g_path_get_basename
  vfio/iommufd: Remove CONFIG_IOMMUFD usage
  vfio/spapr: Only compile sPAPR IOMMU support when needed
  vfio/iommufd: Introduce a VFIOIOMMU iommufd QOM interface
  vfio/spapr: Introduce a sPAPR VFIOIOMMU QOM interface
  vfio/container: Intoduce a new VFIOIOMMUClass::setup handler
  vfio/container: Introduce a VFIOIOMMU legacy QOM interface
  vfio/container: Introduce a VFIOIOMMU QOM interface
  vfio/container: Initialize VFIOIOMMUOps under vfio_init_container()
  vfio/container: Introduce vfio_legacy_setup() for further cleanups
  vfio/spapr: Extend VFIOIOMMUOps with a release handler

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


Compare: https://github.com/qemu/qemu/compare/0c1eccd368af...ffd454c67e38



reply via email to

[Prev in Thread] Current Thread [Next in Thread]