diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-09-22 15:42:23 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-09-22 15:42:23 +0100 |
| commit | 834b9273d5cdab68180dc8c84d641aaa4344b057 (patch) | |
| tree | c6be3eb86a2fa267d85f16122592b6e3c868fd98 /qemu-img.c | |
| parent | 4dad0a9aa818698e0735c8352bf7925a1660df6f (diff) | |
| parent | 639b090df52a4952262615328a3fdfae81234ea8 (diff) | |
| download | focaccia-qemu-834b9273d5cdab68180dc8c84d641aaa4344b057.tar.gz focaccia-qemu-834b9273d5cdab68180dc8c84d641aaa4344b057.zip | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-5.2-pull-request' into staging
Pull request trivial patches 20200919 # gpg: Signature made Sat 19 Sep 2020 19:43:35 BST # gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C # gpg: issuer "laurent@vivier.eu" # gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full] # gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full] # gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full] # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C * remotes/vivier2/tags/trivial-branch-for-5.2-pull-request: contrib/: fix some comment spelling errors qapi/: fix some comment spelling errors disas/: fix some comment spelling errors linux-user/: fix some comment spelling errors util/: fix some comment spelling errors scripts/: fix some comment spelling errors docs/: fix some comment spelling errors migration/: fix some comment spelling errors qemu/: fix some comment spelling errors scripts/git.orderfile: Display meson files along with buildsys ones hw/timer/hpet: Fix debug format strings hw/timer/hpet: Remove unused functions hpet_ram_readb, hpet_ram_readw meson: remove empty else and duplicated gio deps manual: escape backslashes in "parsed-literal" blocks ui/spice-input: Remove superfluous forward declaration hw/ppc/ppc4xx_pci: Replace magic value by the PCI_NUM_PINS definition hw/gpio/max7310: Remove impossible check Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-img.c')
| -rw-r--r-- | qemu-img.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qemu-img.c b/qemu-img.c index 1d8c5cd778..3b7700c780 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1188,7 +1188,7 @@ static int64_t find_nonzero(const uint8_t *buf, int64_t n) * 'pnum' is set to the number of sectors (including and immediately following * the first one) that are known to be in the same allocated/unallocated state. * The function will try to align the end offset to alignment boundaries so - * that the request will at least end aligned and consequtive requests will + * that the request will at least end aligned and consecutive requests will * also start at an aligned offset. */ static int is_allocated_sectors(const uint8_t *buf, int n, int *pnum, |