diff options
author | Richard Henderson <richard.henderson@linaro.org> | 2024-06-18 13:08:01 -0700 |
---|---|---|
committer | Richard Henderson <richard.henderson@linaro.org> | 2024-06-18 13:08:01 -0700 |
commit | 223696363bb117241ad9c2facbff0c474afa4104 (patch) | |
tree | db09550c4de038977e276978f0c09496fd49c794 /include/hw/i386/pc.h | |
parent | 900536d3e97aed7fdd9cb4dadd3bf7023360e819 (diff) | |
parent | 3a6d374b754b4b345195ff6846eeaffedc96a7c5 (diff) | |
download | qemu-223696363bb117241ad9c2facbff0c474afa4104.zip qemu-223696363bb117241ad9c2facbff0c474afa4104.tar.gz qemu-223696363bb117241ad9c2facbff0c474afa4104.tar.bz2 |
Merge tag 'edgar/xilinx-queue-2024-06-17.for-upstream' of https://gitlab.com/edgar.iglesias/qemu into staging
Xilinx queue:
hw/dma: Add error handling for loading descriptions failing (Fea Wang)
# -----BEGIN PGP SIGNATURE-----
#
# iQEzBAABCgAdFiEErET+3BT38evtv0FRKcWWeA9ryoMFAmZxg3oACgkQKcWWeA9r
# yoPMTAf/VwI/fJ/bK0LgDSaZbh+D+IowM1d/FyLslMSIsbXk+gEmVeQIOG448myl
# mpbm1ijlQieSHBeJhDb/Pa2HmUI6t60wtSPaQtTlOziu/2lXkp2WXb3Y7U9QIQpJ
# OrG6n0xrQse5tNYE4C+X4nvYXbCM0ij/W5+XV3yVTTc4qiLN73keJ1Idd7wONGqY
# igaYbsiT82FH61qUuYNm1t+vagSEj3jSFBe6BOdRCbkP9NSuqJg5HVkprUqRgGAW
# sG2ig99pHInNAlMKwNCLPU3nZcaeN+jy8DwGvsUFymu/wxEl7ZoBj9iv8aQUm+Tj
# 0Tl3XUTqzb+HAK66MkquYA83BIMfjQ==
# =bbD0
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue 18 Jun 2024 05:54:18 AM PDT
# gpg: using RSA key AC44FEDC14F7F1EBEDBF415129C596780F6BCA83
# gpg: Good signature from "Edgar E. Iglesias (Xilinx key) <edgar.iglesias@xilinx.com>" [unknown]
# gpg: aka "Edgar E. Iglesias <edgar.iglesias@gmail.com>" [full]
* tag 'edgar/xilinx-queue-2024-06-17.for-upstream' of https://gitlab.com/edgar.iglesias/qemu:
hw/net: Fix the transmission return size
hw/dma: Add a trace log for a description loading failure
hw/dma: Enhance error handling in loading description
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'include/hw/i386/pc.h')
0 files changed, 0 insertions, 0 deletions