diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-11-22 15:01:01 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-11-22 15:01:01 +0200 |
| commit | bf0720cc18479a69fa41789b5a2691376b6809d3 (patch) | |
| tree | 2e16f79a9e006d45e5f0e8a2fedf441b65834dd3 /block | |
| parent | Merge commit 'f527c57935e22b56952d1ed1af36070b682ecf70' into upstream-merge (diff) | |
| parent | pci: Fix function pci_default_write_config (diff) | |
| download | qemu-kvm-bf0720cc18479a69fa41789b5a2691376b6809d3.tar.gz qemu-kvm-bf0720cc18479a69fa41789b5a2691376b6809d3.tar.bz2 qemu-kvm-bf0720cc18479a69fa41789b5a2691376b6809d3.zip | |
Merge commit '91011d4f3b7c311a42b842f6682ac64a2372d2b7' into upstream-merge
* commit '91011d4f3b7c311a42b842f6682ac64a2372d2b7':
pci: Fix function pci_default_write_config
mips: fix CPU reset
Fix PPC crash
ARM MPCore tweaks
Realview/EB procid hacks
pci: fix the conversion of config field from array to pointer
qemu_system_reset: we need to call it before loadvm/migration
fdc: fix vmstate variable passed
vnc: improve capslock handling.
e1000 fix: read access to some registers is missing.
Fix 32-bit overflow in parallels image support
kvm ppc: Remove unused label
kvm: Move KVM mp_state accessors to i386-specific code
virtio-blk: Pass read errors to the guest
savevm: Delete existing snapshots in all images
Fix incoming migration
fix type in CFLAGS name
Conflicts:
hw/pci.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/parallels.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/block/parallels.c b/block/parallels.c index 0b64a5c62..63b67380a 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -119,7 +119,8 @@ fail: static inline int seek_to_sector(BlockDriverState *bs, int64_t sector_num) { BDRVParallelsState *s = bs->opaque; - uint32_t index, offset, position; + uint32_t index, offset; + uint64_t position; index = sector_num / s->tracks; offset = sector_num % s->tracks; @@ -128,7 +129,7 @@ static inline int seek_to_sector(BlockDriverState *bs, int64_t sector_num) if ((index > s->catalog_size) || (s->catalog_bitmap[index] == 0)) return -1; - position = (s->catalog_bitmap[index] + offset) * 512; + position = (uint64_t)(s->catalog_bitmap[index] + offset) * 512; // fprintf(stderr, "sector: %llx index=%x offset=%x pointer=%x position=%x\n", // sector_num, index, offset, s->catalog_bitmap[index], position); |