diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2025-04-30 13:34:43 -0400 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2025-04-30 13:34:44 -0400 |
| commit | 5134cf9b5d3aee4475fe7e1c1c11b093731073cf (patch) | |
| tree | b8740d05d65a62672d2f274b296b14567f890cc8 | |
| parent | ffd642cb2ca25262342311a3bf2e8a77a00e6dfd (diff) | |
| parent | 71a30d54e6ab1d5c102a8bee2c263414697402ea (diff) | |
| download | focaccia-qemu-5134cf9b5d3aee4475fe7e1c1c11b093731073cf.tar.gz focaccia-qemu-5134cf9b5d3aee4475fe7e1c1c11b093731073cf.zip | |
Merge tag 'block-pull-request' of https://gitlab.com/stefanha/qemu into staging
Pull request Kevin's fix for the divide-by-zero in my recent discard commit, triggered when a host block device does not support discard. # -----BEGIN PGP SIGNATURE----- # # iQEzBAABCgAdFiEEhpWov9P5fNqsNXdanKSrs4Grc8gFAmgSRfsACgkQnKSrs4Gr # c8hGBwf8CBoDZzCJAE1sw2GSKnnd3J2qGf4Kg6CcMYOSZ8TLssDKQj6HG2gfWaJZ # it9g9zq7TsodWCyV/qXrzOy5aa7WX8Tsf10O/87baFqGOp82KMPX8jQK1csRnTTF # QyDocZhIvO+QJXnmnFjtvY7qfaxkzaT/8U+mWgaQM2zG83BNGg3uNyRPyz+RAfYl # tVM3xNf2ETbN3D8SIOcpr80/tiWP8dZ8xTLyTfBYPbIP59QX2+Iu8BtLFt9npwT6 # kABnFkqnE/pA6FJz0ZIVenduOBs7IUSQFNvmxAjYIwxowQKsk4WFfjJEKHIHzwwO # a64i43DcH8XgjCcueJ11DnmoB5RfAg== # =yODA # -----END PGP SIGNATURE----- # gpg: Signature made Wed 30 Apr 2025 11:47:07 EDT # gpg: using RSA key 8695A8BFD3F97CDAAC35775A9CA4ABB381AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [ultimate] # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" [ultimate] # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * tag 'block-pull-request' of https://gitlab.com/stefanha/qemu: file-posix: Fix crash on discard_granularity == 0 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | block/file-posix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/file-posix.c b/block/file-posix.c index 0d6e12f880..0d85123d0f 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1573,7 +1573,7 @@ static void raw_refresh_limits(BlockDriverState *bs, Error **errp) int ret; ret = hdev_get_pdiscard_alignment(&st, &dalign); - if (ret == 0) { + if (ret == 0 && dalign != 0) { uint32_t ralign = bs->bl.request_alignment; /* Probably never happens, but handle it just in case */ |