diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-03-10 11:44:59 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-03-10 11:44:59 +0000 |
| commit | 8437f7be3b1c49631e435c652707f2cee477149d (patch) | |
| tree | 0ee51a4ec9a966a780e414f823599aa183865ae7 /hw/ide | |
| parent | 277263e1b320d759a760ba6c5ea75ec268f929e5 (diff) | |
| parent | 438940cbc2eabbe9e403e5249dfa0be6c792c93b (diff) | |
| download | qemu-8437f7be3b1c49631e435c652707f2cee477149d.zip qemu-8437f7be3b1c49631e435c652707f2cee477149d.tar.gz qemu-8437f7be3b1c49631e435c652707f2cee477149d.tar.bz2 | |
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-03-04' into staging
trivial patches for 2015-03-04
# gpg: Signature made Tue Mar 10 05:16:59 2015 GMT using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
* remotes/mjt/tags/pull-trivial-patches-2015-03-04: (44 commits)
9pfs: remove useless return
gdbstub: avoid possible NULL pointer dereference
milkymist-pfpu: fix GCC 5.0.0 aggressive-loop-optimizations warning
fix GCC 5.0.0 logical-not-parentheses warnings
migration: Fix coding style (whitespace issues)
oslib-posix: Fix compiler warning (-Wclobbered) and simplify the code
disas/microblaze: Fix warnings caused by missing 'static' attribute
disas/arm: Fix warnings caused by missing 'static' attribute
vhost_net: Add missing 'static' attribute
e500: fix memory leak
gitignore: Ignore new tests
gitignore: Track common.env in iotests gitignore
sysbus: fix memory leak
milkymist.c: fix memory leak
macio: fix possible memory leak
sparc/leon3.c: fix memory leak
nbd: fix resource leak
qemu-char: add cyrillic key 'numerosign' to Russian keymap
qemu-char: add cyrillic characters 'numerosign' to VNC keysyms
qapi-schema: Fix SpiceChannel docs
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/ide')
| -rw-r--r-- | hw/ide/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/ide/pci.c b/hw/ide/pci.c index e3f2054..913a976 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -99,7 +99,7 @@ static int32_t bmdma_prepare_buf(IDEDMA *dma, int is_write) * This should accommodate the largest ATA transaction * for LBA48 (65,536 sectors) and 32K sector sizes. */ if (s->sg.size > INT32_MAX) { - error_report("IDE: sglist describes more than 2GiB.\n"); + error_report("IDE: sglist describes more than 2GiB."); break; } bm->cur_prd_addr += l; |