diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-08 09:03:57 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-09-08 09:03:57 -0500 |
| commit | d8ac46d950451a722fd6b1d5d0768c72bee87d47 (patch) | |
| tree | c6eaff53ce4ba99ff8c93b71a8346db2c91b2f1d /hw/r2d.c | |
| parent | 9d0baba1104c51f5d95d632ff41406e5aca83216 (diff) | |
| parent | c50a6def965d2e5144557af447825c9875f48a6f (diff) | |
| download | focaccia-qemu-d8ac46d950451a722fd6b1d5d0768c72bee87d47.tar.gz focaccia-qemu-d8ac46d950451a722fd6b1d5d0768c72bee87d47.zip | |
Merge remote-tracking branch 'qemu-kvm-tmp/memory/batch' into staging
Diffstat (limited to 'hw/r2d.c')
| -rw-r--r-- | hw/r2d.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/r2d.c b/hw/r2d.c index 771f3d0733..b8b0df3bb6 100644 --- a/hw/r2d.c +++ b/hw/r2d.c @@ -267,7 +267,7 @@ static void r2d_init(ram_addr_t ram_size, /* onboard flash memory */ dinfo = drive_get(IF_PFLASH, 0, 0); - pflash_cfi02_register(0x0, qemu_ram_alloc(NULL, "r2d.flash", FLASH_SIZE), + pflash_cfi02_register(0x0, NULL, "r2d.flash", FLASH_SIZE, dinfo ? dinfo->bdrv : NULL, (16 * 1024), FLASH_SIZE >> 16, 1, 4, 0x0000, 0x0000, 0x0000, 0x0000, |