diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-25 14:39:18 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-25 14:39:18 -0500 |
| commit | 01e0451a08e0afb9af04783c320d70084cf4e574 (patch) | |
| tree | 30dbbf868845acd99099c7165769f1762fa40e28 /hw/r2d.c | |
| parent | f065aa0a005ac539bf8ca556775e5cc4c3d2d3b7 (diff) | |
| download | focaccia-qemu-01e0451a08e0afb9af04783c320d70084cf4e574.tar.gz focaccia-qemu-01e0451a08e0afb9af04783c320d70084cf4e574.zip | |
Revert "Merge remote-tracking branch 'qemu-kvm/memory/batch' into staging"
This reverts commit 8ef9ea85a2cc1007eaefa53e6871f1f83bcef22d, reversing changes made to 444dc48298c480e42e15a8fe676be737d8a6b2a1. From Avi: Please revert the entire pull (git revert 8ef9ea85a2cc1) while I work this out - it isn't trivial. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/r2d.c')
| -rw-r--r-- | hw/r2d.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/hw/r2d.c b/hw/r2d.c index 41aa2c2bd2..96a7ff8c35 100644 --- a/hw/r2d.c +++ b/hw/r2d.c @@ -235,7 +235,6 @@ static void r2d_init(ram_addr_t ram_size, qemu_irq *irq; DriveInfo *dinfo; int i; - MemoryRegion *flash = g_new(MemoryRegion, 1); if (!cpu_model) cpu_model = "SH7751R"; @@ -268,13 +267,11 @@ static void r2d_init(ram_addr_t ram_size, /* onboard flash memory */ dinfo = drive_get(IF_PFLASH, 0, 0); - memory_region_init_rom_device(flash, &pflash_cfi02_ops_le, - NULL, "r2d.flash", FLASH_SIZE); - pflash_cfi02_register(0x0, flash, + pflash_cfi02_register(0x0, qemu_ram_alloc(NULL, "r2d.flash", FLASH_SIZE), dinfo ? dinfo->bdrv : NULL, (16 * 1024), FLASH_SIZE >> 16, 1, 4, 0x0000, 0x0000, 0x0000, 0x0000, - 0x555, 0x2aa); + 0x555, 0x2aa, 0); /* NIC: rtl8139 on-board, and 2 slots. */ for (i = 0; i < nb_nics; i++) |