diff options
| author | Martijn van den Broek <martijn.vdbrk@gmail.com> | 2013-08-06 20:45:39 +0200 |
|---|---|---|
| committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2013-08-13 09:30:50 -0500 |
| commit | 30c2463271806c2378d41b35ff626d1c0615d959 (patch) | |
| tree | b190154eaaf520541d6ef1091a42f5c058a6b886 | |
| parent | d55fc47517baed369ea1c5707386a2d720c04281 (diff) | |
| download | qemu-30c2463271806c2378d41b35ff626d1c0615d959.tar.gz | |
Bugfix for loading multiboot kernels
This patch fixes a bug in rom_copy introduced by
commit d60fa42e8bae39440f997ebfe8fe328269a57d16.
rom_copy failed to load roms with a "datasize" of 0.
As a result, multiboot kernels were not loaded correctly
when they contain a segment with a "file size" of 0.
https://bugs.launchpad.net/qemu/+bug/1208944
Signed-off-by: Martijn van den Broek <martijn.vdbrk@gmail.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: CAG1x_oET1u3TMPu3r_zzd3ZXsTWQLiaM0zAc+RkHFCwvJjGOvg@mail.gmail.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
(cherry picked from commit 0dd5ce38fbeb2fb97b01cc8c1c97292211e48ee6)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
| -rw-r--r-- | hw/core/loader.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/hw/core/loader.c b/hw/core/loader.c index 7507914297..8514eaf17b 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -779,9 +779,6 @@ int rom_copy(uint8_t *dest, hwaddr addr, size_t size) if (rom->addr > end) { break; } - if (!rom->data) { - continue; - } d = dest + (rom->addr - addr); s = rom->data; @@ -791,7 +788,9 @@ int rom_copy(uint8_t *dest, hwaddr addr, size_t size) l = dest - d; } - memcpy(d, s, l); + if (l > 0) { + memcpy(d, s, l); + } if (rom->romsize > rom->datasize) { /* If datasize is less than romsize, it means that we didn't |