diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-01-10 21:02:23 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-01-10 21:02:23 +0000 |
| commit | aaf03019175949eda5087329448b8a0033b89479 (patch) | |
| tree | 5e83271283bc2c67171c5ffd8e50e1ee4b977711 /hw/lm32/lm32_hwsetup.h | |
| parent | 97052d64e4fb934bcf25f4a6b42dc06f6ecbf9eb (diff) | |
| parent | a1666142db623365b2e7619f01c1cbb72d62b514 (diff) | |
| download | focaccia-qemu-aaf03019175949eda5087329448b8a0033b89479.tar.gz focaccia-qemu-aaf03019175949eda5087329448b8a0033b89479.zip | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pc: resizeable ROM blocks This makes ROM blocks resizeable. This infrastructure is required for other functionality we have queued. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> # gpg: Signature made Thu 08 Jan 2015 11:19:24 GMT using RSA key ID D28D5469 # gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" # gpg: aka "Michael S. Tsirkin <mst@redhat.com>" * remotes/mst/tags/for_upstream: acpi-build: make ROMs RAM blocks resizeable memory: API to allocate resizeable RAM MR arch_init: support resizing on incoming migration exec: qemu_ram_alloc_resizeable, qemu_ram_resize exec: split length -> used_length/max_length exec: cpu_physical_memory_set/clear_dirty_range memory: add memory_region_set_size Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/lm32/lm32_hwsetup.h')
| -rw-r--r-- | hw/lm32/lm32_hwsetup.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/lm32/lm32_hwsetup.h b/hw/lm32/lm32_hwsetup.h index 9fd5e697a7..838754d5d8 100644 --- a/hw/lm32/lm32_hwsetup.h +++ b/hw/lm32/lm32_hwsetup.h @@ -73,7 +73,8 @@ static inline void hwsetup_free(HWSetup *hw) static inline void hwsetup_create_rom(HWSetup *hw, hwaddr base) { - rom_add_blob("hwsetup", hw->data, TARGET_PAGE_SIZE, base, NULL, NULL, NULL); + rom_add_blob("hwsetup", hw->data, TARGET_PAGE_SIZE, + TARGET_PAGE_SIZE, base, NULL, NULL, NULL); } static inline void hwsetup_add_u8(HWSetup *hw, uint8_t u) |