Branch: refs/heads/staging Home: https://github.com/qemu/qemu Commit: 2220e8189fb94068dbad333228659fbac819abb0 https://github.com/qemu/qemu/commit/2220e8189fb94068dbad333228659fbac819abb0 Author: Jason Wang <jasow...@redhat.com> Date: 2024-01-25 (Thu, 25 Jan 2024)
Changed paths: M hw/net/virtio-net.c Log Message: ----------- virtio-net: correctly copy vnet header when flushing TX When HASH_REPORT is negotiated, the guest_hdr_len might be larger than the size of the mergeable rx buffer header. Using virtio_net_hdr_mrg_rxbuf during the header swap might lead a stack overflow in this case. Fixing this by using virtio_net_hdr_v1_hash instead. Reported-by: Xiao Lei <leixiao....@zju.edu.cn> Cc: Yuri Benditovich <yuri.benditov...@daynix.com> Cc: qemu-sta...@nongnu.org Cc: Mauro Matteo Cascella <mcasc...@redhat.com> Fixes: CVE-2023-6693 Fixes: e22f0603fb2f ("virtio-net: reference implementation of hash report") Reviewed-by: Michael Tokarev <m...@tls.msk.ru> Signed-off-by: Jason Wang <jasow...@redhat.com> Commit: 61f6e1509de2cef9df1c649f6b318c36288c119b https://github.com/qemu/qemu/commit/61f6e1509de2cef9df1c649f6b318c36288c119b Author: Bibo Mao <maob...@loongson.cn> Date: 2024-01-25 (Thu, 25 Jan 2024) Changed paths: M target/loongarch/kvm/kvm.c Log Message: ----------- target/loongarch: Set cpuid CSR register only once with kvm mode CSR cpuid register is used for routing irq to different vcpus, its value is kept unchanged since poweron. So it is not necessary to set CSR cpuid register after system resets, and it is only set at vm creation stage. Signed-off-by: Bibo Mao <maob...@loongson.cn> Reviewed-by: Song Gao <gaos...@loongson.cn> Message-Id: <20240115085121.180524-1-maob...@loongson.cn> Signed-off-by: Song Gao <gaos...@loongson.cn> Commit: fc70099621fe7002d30fc1509456d1ae57264aa6 https://github.com/qemu/qemu/commit/fc70099621fe7002d30fc1509456d1ae57264aa6 Author: Song Gao <gaos...@loongson.cn> Date: 2024-01-25 (Thu, 25 Jan 2024) Changed paths: M linux-headers/asm-loongarch/kvm.h M target/loongarch/kvm/kvm.c Log Message: ----------- target/loongarch/kvm: Enable LSX/LASX extension The kernel had already support LSX and LASX [1], but QEMU is disable LSX/LASX for kvm. This patch adds kvm_check_cpucfg2() to check CPUCFG2. [1]: https://lore.kernel.org/all/cabgobfzhrf7e_7jk4uprmsyxty3eiuuywhc35jqncnl9s-z...@mail.gmail.com/ Signed-off-by: Song Gao <gaos...@loongson.cn> Reviewed-by: Bibo Mao <maob...@loongson.cn> Message-Id: <20240122090206.1083584-1-gaos...@loongson.cn> Commit: 1110fbc35fab45b0b73eebd33a75fb792895eeb1 https://github.com/qemu/qemu/commit/1110fbc35fab45b0b73eebd33a75fb792895eeb1 Author: Markus Armbruster <arm...@redhat.com> Date: 2024-01-26 (Fri, 26 Jan 2024) Changed paths: M docs/devel/qapi-code-gen.rst Log Message: ----------- docs/devel/qapi-code-gen: Don't reserve types ending with 'Kind' We reserved type names ending with 'Kind' because a simple union 'SomeSimpleUnion' generated both a struct type SomeSimpleUnion and an enum type SomeSimpleUnionKind. Gone since commit 4e99f4b12c0 (qapi: Drop simple unions). The commit neglected to update the documentation not to reserve type names ending with 'Kind'. Do that now. Signed-off-by: Markus Armbruster <arm...@redhat.com> Message-ID: <20231221145727.835905-1-arm...@redhat.com> Reviewed-by: Eric Blake <ebl...@redhat.com> Commit: 1defab08740e403d7cfdc84005b76744392f723d https://github.com/qemu/qemu/commit/1defab08740e403d7cfdc84005b76744392f723d Author: Markus Armbruster <arm...@redhat.com> Date: 2024-01-26 (Fri, 26 Jan 2024) Changed paths: M docs/devel/qapi-code-gen.rst Log Message: ----------- docs/devel/qapi-code-gen: Fix missing ':' in tagged section docs Signed-off-by: Markus Armbruster <arm...@redhat.com> Message-ID: <20240120095327.666239-2-arm...@redhat.com> Reviewed-by: Eric Blake <ebl...@redhat.com> Commit: 3bc8dc8aa81d9d651d2559d96efca7ef0ee1731c https://github.com/qemu/qemu/commit/3bc8dc8aa81d9d651d2559d96efca7ef0ee1731c Author: Markus Armbruster <arm...@redhat.com> Date: 2024-01-26 (Fri, 26 Jan 2024) Changed paths: M docs/devel/writing-monitor-commands.rst M docs/interop/bitmaps.rst Log Message: ----------- docs: Replace dangling references to docs/interop/qmp-intro.txt Deletion of docs/interop/qmp-intro.txt left two dangling references behind. Replace them by references to docs/interop/qmp-spec.rst. Fixes: 0ec4468f233c (docs/interop: Delete qmp-intro.txt) Signed-off-by: Markus Armbruster <arm...@redhat.com> Message-ID: <20240120095327.666239-3-arm...@redhat.com> Reviewed-by: Eric Blake <ebl...@redhat.com> Commit: b0b1313eb2a95a3c0676f46dbaecc68478cb631d https://github.com/qemu/qemu/commit/b0b1313eb2a95a3c0676f46dbaecc68478cb631d Author: Markus Armbruster <arm...@redhat.com> Date: 2024-01-26 (Fri, 26 Jan 2024) Changed paths: M docs/devel/writing-monitor-commands.rst M include/qapi/visitor.h M include/qemu/yank.h M qapi/introspect.json M qapi/qapi-util.c M scripts/qapi/parser.py M util/yank.c Log Message: ----------- qapi: Fix dangling references to docs/devel/qapi-code-gen.txt Conversion of docs/devel/qapi-code-gen.txt to ReST left several dangling references behind. Fix them to point to docs/devel/qapi-code-gen.rst. Fixes: f7aa076dbdfc (docs: convert qapi-code-gen.txt to ReST) Signed-off-by: Markus Armbruster <arm...@redhat.com> Message-ID: <20240120095327.666239-4-arm...@redhat.com> Reviewed-by: Eric Blake <ebl...@redhat.com> Commit: 7cbdabb5d688f9d616d6e609a12642a3a91e1888 https://github.com/qemu/qemu/commit/7cbdabb5d688f9d616d6e609a12642a3a91e1888 Author: Markus Armbruster <arm...@redhat.com> Date: 2024-01-26 (Fri, 26 Jan 2024) Changed paths: M docs/interop/bitmaps.rst M qapi/introspect.json Log Message: ----------- docs/interop/bitmaps: Clean up a reference to qemu-qmp-ref docs/interop/bitmaps.rst uses references like `qemu-qmp-ref <qemu-qmp-ref.html>`_ `query-block <qemu-qmp-ref.html#index-query_002dblock>`_ to refer to and into docs/interop/qemu-qmp-ref.rst. Clean up the former: use :doc:`qemu-qmp-ref`. I don't know how to clean up the latter. Signed-off-by: Markus Armbruster <arm...@redhat.com> Message-ID: <20240120095327.666239-5-arm...@redhat.com> Reviewed-by: Eric Blake <ebl...@redhat.com> Commit: ae7ccd50c37d1154acb0d1ed4b67388e3dd69061 https://github.com/qemu/qemu/commit/ae7ccd50c37d1154acb0d1ed4b67388e3dd69061 Author: Markus Armbruster <arm...@redhat.com> Date: 2024-01-26 (Fri, 26 Jan 2024) Changed paths: M qapi/net.json M qapi/qdev.json M qapi/qom.json Log Message: ----------- qapi: Fix mangled "Returns" sections in documentation Commit e050e426782e (qapi: Use explicit bulleted lists) added list markup to correct bad rendering: A JSON block comment like this: Returns: nothing on success If @node is not a valid block device, DeviceNotFound If @name is not found, GenericError with an explanation renders like this: Returns: nothing on success If node is not a valid block device, DeviceNotFound If name is not found, GenericError with an explanation because whitespace is not significant. Use an actual bulleted list, so that the formatting is correct. It missed a few instances. Commit a937b6aa739 (qapi: Reformat doc comments to conform to current conventions) then reflowed them. Revert the reflowing, and add list markup. Signed-off-by: Markus Armbruster <arm...@redhat.com> Message-ID: <20240120095327.666239-6-arm...@redhat.com> Reviewed-by: Eric Blake <ebl...@redhat.com> Commit: e6ab40fee0ef70ee3d159b1b23caf1a05630e97a https://github.com/qemu/qemu/commit/e6ab40fee0ef70ee3d159b1b23caf1a05630e97a Author: Markus Armbruster <arm...@redhat.com> Date: 2024-01-26 (Fri, 26 Jan 2024) Changed paths: M qapi/char.json M qapi/machine.json M qapi/misc-target.json M qapi/misc.json M qapi/yank.json Log Message: ----------- qapi: Indent tagged doc comment sections properly docs/devel/qapi-code-gen demands that the "second and subsequent lines of sections other than "Example"/"Examples" should be indented". Commit a937b6aa739 (qapi: Reformat doc comments to conform to current conventions) missed a few instances, and a few more have crept in since. Indent them. Signed-off-by: Markus Armbruster <arm...@redhat.com> Message-ID: <20240120095327.666239-7-arm...@redhat.com> Reviewed-by: Eric Blake <ebl...@redhat.com> Commit: 37507c14a6f562036fce98453de3e869b9c0684f https://github.com/qemu/qemu/commit/37507c14a6f562036fce98453de3e869b9c0684f Author: Markus Armbruster <arm...@redhat.com> Date: 2024-01-26 (Fri, 26 Jan 2024) Changed paths: M qapi/block-core.json M qapi/migration.json Log Message: ----------- qapi: Fix malformed "Since:" section tags (again) "Since X.Y" is not recognized as a tagged section, and therefore not formatted as such in generated documentation. Fix by adding the required colon. Previously fixed in commit 433a4fdc420 (qapi: Fix malformed "Since:" section tags) Signed-off-by: Markus Armbruster <arm...@redhat.com> Message-ID: <20240120095327.666239-8-arm...@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org> Reviewed-by: Eric Blake <ebl...@redhat.com> Commit: 4f584163c0178240e5f15aed465c1575a653925e https://github.com/qemu/qemu/commit/4f584163c0178240e5f15aed465c1575a653925e Author: Peter Maydell <peter.mayd...@linaro.org> Date: 2024-01-26 (Fri, 26 Jan 2024) Changed paths: M linux-headers/asm-loongarch/kvm.h M target/loongarch/kvm/kvm.c Log Message: ----------- Merge tag 'pull-loongarch-20240125' of https://gitlab.com/gaosong/qemu into staging pull-loongarch-20240125 # -----BEGIN PGP SIGNATURE----- # # iLMEAAEKAB0WIQS4/x2g0v3LLaCcbCxAov/yOSY+3wUCZbINEAAKCRBAov/yOSY+ # 3yVsBACz0E5gVPc5Fp5hgQsAiiZPga/Pr565BOypIw8iAPs0RNxMMnywinFsOi1w # A6euynZTEW9lxx5cq/O5j7yaXUmgfChcJ1OkS/IEZaUtiG25ksOIqvoeYvuROfuV # nYrM0nuOMNwJzkOJy+qZAwGaUbyWdiqUTkP369V2xxngTneDkw== # =1YQg # -----END PGP SIGNATURE----- # gpg: Signature made Thu 25 Jan 2024 07:26:08 GMT # gpg: using RSA key B8FF1DA0D2FDCB2DA09C6C2C40A2FFF239263EDF # gpg: Good signature from "Song Gao <m17746591...@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-20240125' of https://gitlab.com/gaosong/qemu: target/loongarch/kvm: Enable LSX/LASX extension target/loongarch: Set cpuid CSR register only once with kvm mode Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> Commit: 839c2597dc75df9f05ef7b872d8b156c97971353 https://github.com/qemu/qemu/commit/839c2597dc75df9f05ef7b872d8b156c97971353 Author: Peter Maydell <peter.mayd...@linaro.org> Date: 2024-01-26 (Fri, 26 Jan 2024) Changed paths: M hw/net/virtio-net.c Log Message: ----------- Merge tag 'net-pull-request' of https://github.com/jasowang/qemu into staging # -----BEGIN PGP SIGNATURE----- # # iQEzBAABCAAdFiEEIV1G9IJGaJ7HfzVi7wSWWzmNYhEFAmWyBtIACgkQ7wSWWzmN # YhHWDgf+P9Jnlt8tCmOV6oKYrhKBbNZ5mZGmd83LpgFpn0YTdBQrauje2DziQ6u8 # KSVO6VGK/yzFLe8+xIIZXT0pFTbr8KuGhpKwqU8hq33dZtkRPUM6psirGgh2Z94K # zWvBt/gL8DaO4ywShqwTZxhNBke1WduZpwzd/2XehmfT2SM/krpWeI2CjistQTBe # IVbD7QioVuolh4Vq3W8On14NhwMp85Z/POh0kIAYHq5eDp2U6uYfK+1O8KHsRV4j # Ae0Comul3YvNj9t3WPB6i1fLAzHvSfc1vO18CHKnznRONBLuhfnm9HKU7PtT/BC0 # JY59tU1lGYaQ9Ok3fDtxkaU41gkBWQ== # =FHOd # -----END PGP SIGNATURE----- # gpg: Signature made Thu 25 Jan 2024 06:59:30 GMT # gpg: using RSA key 215D46F48246689EC77F3562EF04965B398D6211 # gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasow...@redhat.com>" [marginal] # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211 * tag 'net-pull-request' of https://github.com/jasowang/qemu: virtio-net: correctly copy vnet header when flushing TX Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> Commit: e029fe22caad9b75c7ab69bd4e84853c11fb71e0 https://github.com/qemu/qemu/commit/e029fe22caad9b75c7ab69bd4e84853c11fb71e0 Author: Peter Maydell <peter.mayd...@linaro.org> Date: 2024-01-26 (Fri, 26 Jan 2024) Changed paths: M docs/devel/qapi-code-gen.rst M docs/devel/writing-monitor-commands.rst M docs/interop/bitmaps.rst M include/qapi/visitor.h M include/qemu/yank.h M qapi/block-core.json M qapi/char.json M qapi/introspect.json M qapi/machine.json M qapi/migration.json M qapi/misc-target.json M qapi/misc.json M qapi/net.json M qapi/qapi-util.c M qapi/qdev.json M qapi/qom.json M qapi/yank.json M scripts/qapi/parser.py M util/yank.c Log Message: ----------- Merge tag 'pull-qapi-2024-01-26' of https://repo.or.cz/qemu/armbru into staging QAPI patches patches for 2024-01-26 # -----BEGIN PGP SIGNATURE----- # # iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmWzT/QSHGFybWJydUBy # ZWRoYXQuY29tAAoJEDhwtADrkYZTznQQALpsbanZR+gfTDOI/kvFuoLtOdhibtxW # /5IwAP68Hdj2unHyHRBaNQIwyAfnHlyks1ywNyv0JCAqoyLuoa/ertir3zKc/1xP # hOer7C76jrWiL2Gg4EMxl1oWussyHLq7XtQQEmL4aLV+EnnoytUfnosUpO0Ee5Pg # Fz1EwJi74LEfYtrZjfX/YXZrX+3PJpYywtSWlyDluER0xfjh5d3JAsrjpgcPHZKc # fwD2W7myxnW8IRyHdIgbu6Spv0vcM39PMrIK0ZlnVKgUz+/YcMgeK0eSXd6y+FjX # Wehd7Ik5YE8el+SvGDPEMSTCkA2CP7dEnKt9Fk1pn+N8YhPGnQxDSBQOIae5Tnbf # rrlOrCWXqW2a5FtbG/E4SwtXZlOo1BjkSy6+xP86YwXr23DSafVaeJp4CUls+ABZ # LX6vR0p6bxPxOwVhoYeqxv+TpdA206g0yhN7bknoIp42DG4oj81toD5Ki3fedfwC # pPl2sxniBm4MaO57YXxFgSN0lrur5vCcPadRppGbrGEO8XaX7F+9c5OWsPh+jt1x # /l+A7RakrTg39NR2X46D1clPj3NQHwMVNIoSJek4+nCnM7eKVhMSm9YjpQEPupt0 # Aa+5QdiKcgjYEoSljE6ZsYJIrxd0OoaSpP1BWl4P+NcjgyUGcUkQ2X3AEL8Xkm6H # wLv5U6ob99eL # =nXml # -----END PGP SIGNATURE----- # gpg: Signature made Fri 26 Jan 2024 06:23:48 GMT # gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653 # gpg: issuer "arm...@redhat.com" # gpg: Good signature from "Markus Armbruster <arm...@redhat.com>" [full] # gpg: aka "Markus Armbruster <arm...@pond.sub.org>" [full] # Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653 * tag 'pull-qapi-2024-01-26' of https://repo.or.cz/qemu/armbru: qapi: Fix malformed "Since:" section tags (again) qapi: Indent tagged doc comment sections properly qapi: Fix mangled "Returns" sections in documentation docs/interop/bitmaps: Clean up a reference to qemu-qmp-ref qapi: Fix dangling references to docs/devel/qapi-code-gen.txt docs: Replace dangling references to docs/interop/qmp-intro.txt docs/devel/qapi-code-gen: Fix missing ':' in tagged section docs docs/devel/qapi-code-gen: Don't reserve types ending with 'Kind' Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> Compare: https://github.com/qemu/qemu/compare/5bab95dc74d4...e029fe22caad