diff options
| author | Anthony Liguori <anthony@codemonkey.ws> | 2013-08-29 17:19:19 -0500 |
|---|---|---|
| committer | Anthony Liguori <anthony@codemonkey.ws> | 2013-08-29 17:19:19 -0500 |
| commit | 3e998a778846de4ea24188278f18e4191a56412e (patch) | |
| tree | 9e0ee981cd39c2649dfb5677ab9a53147d4e6da0 /arch_init.c | |
| parent | 584950fd4e4d6ca580800e46f1b41cf1b0b4236c (diff) | |
| parent | 1ae2757c6c4525c9b42f408c86818f843bad7418 (diff) | |
| download | qemu-3e998a778846de4ea24188278f18e4191a56412e.zip qemu-3e998a778846de4ea24188278f18e4191a56412e.tar.gz qemu-3e998a778846de4ea24188278f18e4191a56412e.tar.bz2 | |
Merge remote-tracking branch 'mst/tags/for_anthony' into stable-1.5
pc,pci,virtio fixes and cleanups
This includes pc and pci cleanups, future-proofing of ROM files,
and a virtio bugfix correcting splice on virtio console.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Mon 26 Aug 2013 01:34:20 AM CDT using RSA key ID D28D5469
# gpg: Can't check signature: public key not found
# By Markus Armbruster (5) and others
# Via Michael S. Tsirkin
* mst/tags/for_anthony:
virtio: virtqueue_get_avail_bytes: fix desc_pa when loop over the indirect descriptor table
pc_piix: Kill pc_init1() memory region args
pc: pc_compat_1_4() now can call pc_compat_1_5()
pc: Create pc_compat_*() functions
pc: Kill pc_init_pci_1_0()
pc: Don't explode QEMUMachineInitArgs into local variables needlessly
pc: Don't prematurely explode QEMUMachineInitArgs
ppc: Don't duplicate QEMUMachineInitArgs in PPCE500Params
ppc: Don't explode QEMUMachineInitArgs into local variables needlessly
sun4: Don't prematurely explode QEMUMachineInitArgs
q35: Add PCIe switch to example q35 configuration
loader: store FW CFG ROM files in RAM
arch_init: align MR size to target page size
pc: cleanup 1.4 compat support
Message-id: 1377535318-30491-1-git-send-email-mst@redhat.com
Diffstat (limited to 'arch_init.c')
| -rw-r--r-- | arch_init.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch_init.c b/arch_init.c index fdd5243..0471cd5 100644 --- a/arch_init.c +++ b/arch_init.c @@ -342,7 +342,8 @@ ram_addr_t migration_bitmap_find_and_reset_dirty(MemoryRegion *mr, { unsigned long base = mr->ram_addr >> TARGET_PAGE_BITS; unsigned long nr = base + (start >> TARGET_PAGE_BITS); - unsigned long size = base + (int128_get64(mr->size) >> TARGET_PAGE_BITS); + uint64_t mr_size = TARGET_PAGE_ALIGN(memory_region_size(mr)); + unsigned long size = base + (mr_size >> TARGET_PAGE_BITS); unsigned long next; |