From: Richard Henderson Date: Thu, 30 Oct 2025 08:24:15 +0000 (+0100) Subject: Merge tag 'for-upstream' of https://repo.or.cz/qemu/kevin into staging X-Git-Tag: v10.2.0-rc1~38 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=097966704932ee28dadbf75243108097b0f3e123;p=thirdparty%2Fqemu.git Merge tag 'for-upstream' of https://repo.or.cz/qemu/kevin into staging Block layer patches - Expose block limits in monitor and qemu-img info - Resize: Refresh filter node size when its child was resized - Support configuring stats-intervals in -device (instead of only -drive) - luks: Fix QMP x-blockdev-amend crash and image creation with detached-header - iotests: Several test case fixes - Code cleanups # -----BEGIN PGP SIGNATURE----- # # iQJFBAABCgAvFiEE3D3rFZqa+V09dFb+fwmycsiPL9YFAmkCAkIRHGt3b2xmQHJl # ZGhhdC5jb20ACgkQfwmycsiPL9a3bA/+MMS9ocOyEiE4u66XbhQ4KgqxECtD/uzg # 3lYQJbfVpphizq0QQn1pAno9rpjdWnkwPv9TasAEM/9R/wz/ygjmXM9GyQDvNLoB # t6dTyWKpsi4lVB7FNPBNQvyz7mHqWQULrhI/mNGLsbiss32SMiE08amjOzSrFSZJ # zn8TsEzDB218Bv8OBH/eI1mMvZ2gG6+yzPf7znA5nSOtJkG1kGLPInZuRgeN7e7W # DUl5EeiP3sGZh4pF/IyRc8BNMsvPR7Lk31PrPEXAz+7g0y8dfPukrcR0nY6nwekT # omPhbIBfDOEKpYdBxheOdh9TkT40Fo2Oc7DIhzY4at3O02BKy60kJSZaqoWj+80L # A3yJ1K7wgiwqzOw0VaHU56Y5awnD5cculciwHxrfc6OHnG9cotvCSxsU2qr/UMd2 # N/cPhUDKfWcilVoRNy+yYiubQsp2s4amF2uGDn/QjjZx0c3dgfXc9BCNmu9nbAMr # UsmzZBH9GCpaTajVIsX8RdnaovMTxGr4UFyuSQ2jWYWp3k2BR89jkBpXReGGOYr6 # SuEOOnx/E1duTZUPq1gdSkQm9uGxxq5FSGIWR+rWMdFkZS09HStmq5hcY+Zx0pSg # JzDaLgPATV65y0VswFVUj6NemmNU983DwKPACwVCpemeBETtVuoU/CydzEPPwiL6 # Kl5ISmjZz3I= # =v2BI # -----END PGP SIGNATURE----- # gpg: Signature made Wed 29 Oct 2025 01:02:10 PM CET # gpg: using RSA key DC3DEB159A9AF95D3D7456FE7F09B272C88F2FD6 # gpg: issuer "kwolf@redhat.com" # gpg: Good signature from "Kevin Wolf " [unknown] # gpg: WARNING: The key's User ID is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6 * tag 'for-upstream' of https://repo.or.cz/qemu/kevin: qemu-img info: Add cache mode option qemu-img info: Optionally show block limits block: Expose block limits for images in QMP block: Improve comments in BlockLimits iotests: add test for resizing a 'file' node below a 'raw' node iotests: add test for resizing a node below filters block: implement 'resize' callback for child_of_bds class block: make bdrv_co_parent_cb_resize() a proper IO API function include/block/block_int-common: document when resize callback is used MAINTAINERS: Mark VHDX block driver as "Odd Fixes" block: enable stats-intervals for storage devices iotests: Adjust fuse-allow-other expected output iotests: Adjust nbd expected outputs to match current behavior block/curl.c: Fix CURLOPT_VERBOSE parameter type block/monitor: Use hmp_handle_error to report error block: fix luks 'amend' when run in coroutine block: remove 'detached-header' option from opts after use tests/qemu-iotests: Mark the 'inactive-node-nbd' as unsupported with -luks Signed-off-by: Richard Henderson --- 097966704932ee28dadbf75243108097b0f3e123