Skip to content

Commit 1724f04

Browse files
awilliamAnthony Liguori
awilliam
authored and
Anthony Liguori
committed
qemu_ram_alloc: Add DeviceState and name parameters
These will be used to generate unique id strings for ramblocks. The name field is required, the device pointer is optional as most callers don't have a device. When there's no device or the device isn't a child of a bus implementing BusInfo.get_dev_path, the name should be unique for the platform. Signed-off-by: Alex Williamson <[email protected]> Signed-off-by: Anthony Liguori <[email protected]>
1 parent 01657c8 commit 1724f04

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+133
-100
lines changed

Diff for: ‎cpu-common.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ static inline void cpu_register_physical_memory(target_phys_addr_t start_addr,
4040
}
4141

4242
ram_addr_t cpu_get_physical_page_desc(target_phys_addr_t addr);
43-
ram_addr_t qemu_ram_alloc(ram_addr_t);
43+
ram_addr_t qemu_ram_alloc(DeviceState *dev, const char *name, ram_addr_t size);
4444
void qemu_ram_free(ram_addr_t addr);
4545
/* This should only be used for ram local to a device. */
4646
void *qemu_get_ram_ptr(ram_addr_t addr);

Diff for: ‎exec.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2778,7 +2778,7 @@ static ram_addr_t find_ram_offset(ram_addr_t size)
27782778
return last;
27792779
}
27802780

2781-
ram_addr_t qemu_ram_alloc(ram_addr_t size)
2781+
ram_addr_t qemu_ram_alloc(DeviceState *dev, const char *name, ram_addr_t size)
27822782
{
27832783
RAMBlock *new_block;
27842784

Diff for: ‎hw/an5206.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ static void an5206_init(ram_addr_t ram_size,
5454

5555
/* DRAM at address zero */
5656
cpu_register_physical_memory(0, ram_size,
57-
qemu_ram_alloc(ram_size) | IO_MEM_RAM);
57+
qemu_ram_alloc(NULL, "an5206.ram", ram_size) | IO_MEM_RAM);
5858

5959
/* Internal SRAM. */
6060
cpu_register_physical_memory(AN5206_RAMBAR_ADDR, 512,
61-
qemu_ram_alloc(512) | IO_MEM_RAM);
61+
qemu_ram_alloc(NULL, "an5206.sram", 512) | IO_MEM_RAM);
6262

6363
mcf5206_init(AN5206_MBAR_ADDR, env);
6464

Diff for: ‎hw/armv7m.c

+6-3
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,11 @@ qemu_irq *armv7m_init(int flash_size, int sram_size,
200200

201201
/* Flash programming is done via the SCU, so pretend it is ROM. */
202202
cpu_register_physical_memory(0, flash_size,
203-
qemu_ram_alloc(flash_size) | IO_MEM_ROM);
203+
qemu_ram_alloc(NULL, "armv7m.flash",
204+
flash_size) | IO_MEM_ROM);
204205
cpu_register_physical_memory(0x20000000, sram_size,
205-
qemu_ram_alloc(sram_size) | IO_MEM_RAM);
206+
qemu_ram_alloc(NULL, "armv7m.sram",
207+
sram_size) | IO_MEM_RAM);
206208
armv7m_bitband_init();
207209

208210
nvic = qdev_create(NULL, "armv7m_nvic");
@@ -236,7 +238,8 @@ qemu_irq *armv7m_init(int flash_size, int sram_size,
236238
space. This stops qemu complaining about executing code outside RAM
237239
when returning from an exception. */
238240
cpu_register_physical_memory(0xfffff000, 0x1000,
239-
qemu_ram_alloc(0x1000) | IO_MEM_RAM);
241+
qemu_ram_alloc(NULL, "armv7m.hack",
242+
0x1000) | IO_MEM_RAM);
240243

241244
qemu_register_reset(armv7m_reset, env);
242245
return pic;

Diff for: ‎hw/axis_dev88.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -268,12 +268,12 @@ void axisdev88_init (ram_addr_t ram_size,
268268
env = cpu_init(cpu_model);
269269

270270
/* allocate RAM */
271-
phys_ram = qemu_ram_alloc(ram_size);
271+
phys_ram = qemu_ram_alloc(NULL, "axisdev88.ram", ram_size);
272272
cpu_register_physical_memory(0x40000000, ram_size, phys_ram | IO_MEM_RAM);
273273

274274
/* The ETRAX-FS has 128Kb on chip ram, the docs refer to it as the
275275
internal memory. */
276-
phys_intmem = qemu_ram_alloc(INTMEM_SIZE);
276+
phys_intmem = qemu_ram_alloc(NULL, "axisdev88.chipram", INTMEM_SIZE);
277277
cpu_register_physical_memory(0x38000000, INTMEM_SIZE,
278278
phys_intmem | IO_MEM_RAM);
279279

Diff for: ‎hw/dummy_m68k.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ static void dummy_m68k_init(ram_addr_t ram_size,
3939

4040
/* RAM at address zero */
4141
cpu_register_physical_memory(0, ram_size,
42-
qemu_ram_alloc(ram_size) | IO_MEM_RAM);
42+
qemu_ram_alloc(NULL, "dummy_m68k.ram", ram_size) | IO_MEM_RAM);
4343

4444
/* Load kernel. */
4545
if (kernel_filename) {

Diff for: ‎hw/etraxfs.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,17 @@ void bareetraxfs_init (ram_addr_t ram_size,
6868
env = cpu_init(cpu_model);
6969

7070
/* allocate RAM */
71-
phys_ram = qemu_ram_alloc(ram_size);
71+
phys_ram = qemu_ram_alloc(NULL, "etraxfs.ram", ram_size);
7272
cpu_register_physical_memory(0x40000000, ram_size, phys_ram | IO_MEM_RAM);
7373

7474
/* The ETRAX-FS has 128Kb on chip ram, the docs refer to it as the
7575
internal memory. */
76-
phys_intmem = qemu_ram_alloc(INTMEM_SIZE);
76+
phys_intmem = qemu_ram_alloc(NULL, "etraxfs.chipram", INTMEM_SIZE);
7777
cpu_register_physical_memory(0x38000000, INTMEM_SIZE,
7878
phys_intmem | IO_MEM_RAM);
7979

8080

81-
phys_flash = qemu_ram_alloc(FLASH_SIZE);
81+
phys_flash = qemu_ram_alloc(NULL, "etraxfs.flash", FLASH_SIZE);
8282
dinfo = drive_get(IF_PFLASH, 0, 0);
8383
pflash_cfi02_register(0x0, phys_flash,
8484
dinfo ? dinfo->bdrv : NULL, (64 * 1024),

Diff for: ‎hw/g364fb.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ int g364fb_mm_init(target_phys_addr_t vram_base,
593593
s = qemu_mallocz(sizeof(G364State));
594594

595595
s->vram_size = 8 * 1024 * 1024;
596-
s->vram_offset = qemu_ram_alloc(s->vram_size);
596+
s->vram_offset = qemu_ram_alloc(NULL, "g364fb.vram", s->vram_size);
597597
s->vram = qemu_get_ram_ptr(s->vram_offset);
598598
s->irq = irq;
599599

Diff for: ‎hw/gumstix.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ static void connex_init(ram_addr_t ram_size,
6767
#else
6868
be = 0;
6969
#endif
70-
if (!pflash_cfi01_register(0x00000000, qemu_ram_alloc(connex_rom),
70+
if (!pflash_cfi01_register(0x00000000, qemu_ram_alloc(NULL, "connext.rom",
71+
connex_rom),
7172
dinfo->bdrv, sector_len, connex_rom / sector_len,
7273
2, 0, 0, 0, 0, be)) {
7374
fprintf(stderr, "qemu: Error registering flash memory.\n");
@@ -105,7 +106,8 @@ static void verdex_init(ram_addr_t ram_size,
105106
#else
106107
be = 0;
107108
#endif
108-
if (!pflash_cfi01_register(0x00000000, qemu_ram_alloc(verdex_rom),
109+
if (!pflash_cfi01_register(0x00000000, qemu_ram_alloc(NULL, "verdex.rom",
110+
verdex_rom),
109111
dinfo->bdrv, sector_len, verdex_rom / sector_len,
110112
2, 0, 0, 0, 0, be)) {
111113
fprintf(stderr, "qemu: Error registering flash memory.\n");

Diff for: ‎hw/ide/via.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ static int vt82c686b_ide_initfn(PCIDevice *dev)
157157
pci_register_bar((PCIDevice *)d, 4, 0x10,
158158
PCI_BASE_ADDRESS_SPACE_IO, bmdma_map);
159159

160-
vmstate_register(0, &vmstate_ide_pci, d);
160+
vmstate_register(&dev->qdev, 0, &vmstate_ide_pci, d);
161161

162162
ide_bus_new(&d->bus[0], &d->dev.qdev);
163163
ide_bus_new(&d->bus[1], &d->dev.qdev);

Diff for: ‎hw/integratorcp.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ static int integratorcm_init(SysBusDevice *dev)
253253
}
254254
memcpy(integrator_spd + 73, "QEMU-MEMORY", 11);
255255
s->cm_init = 0x00000112;
256-
s->flash_offset = qemu_ram_alloc(0x100000);
256+
s->flash_offset = qemu_ram_alloc(NULL, "integrator.flash", 0x100000);
257257

258258
iomemtype = cpu_register_io_memory(integratorcm_readfn,
259259
integratorcm_writefn, s);
@@ -467,7 +467,7 @@ static void integratorcp_init(ram_addr_t ram_size,
467467
fprintf(stderr, "Unable to find CPU definition\n");
468468
exit(1);
469469
}
470-
ram_offset = qemu_ram_alloc(ram_size);
470+
ram_offset = qemu_ram_alloc(NULL, "integrator.ram", ram_size);
471471
/* ??? On a real system the first 1Mb is mapped as SSRAM or boot flash. */
472472
/* ??? RAM should repeat to fill physical memory space. */
473473
/* SDRAM at address zero*/

Diff for: ‎hw/mainstone.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ static void mainstone_common_init(ram_addr_t ram_size,
8787
/* Setup CPU & memory */
8888
cpu = pxa270_init(mainstone_binfo.ram_size, cpu_model);
8989
cpu_register_physical_memory(0, MAINSTONE_ROM,
90-
qemu_ram_alloc(MAINSTONE_ROM) | IO_MEM_ROM);
90+
qemu_ram_alloc(NULL, "mainstone.rom",
91+
MAINSTONE_ROM) | IO_MEM_ROM);
9192

9293
#ifdef TARGET_WORDS_BIGENDIAN
9394
be = 1;
@@ -104,7 +105,8 @@ static void mainstone_common_init(ram_addr_t ram_size,
104105
}
105106

106107
if (!pflash_cfi01_register(mainstone_flash_base[i],
107-
qemu_ram_alloc(MAINSTONE_FLASH),
108+
qemu_ram_alloc(NULL, "mainstone.flash",
109+
MAINSTONE_FLASH),
108110
dinfo->bdrv, sector_len,
109111
MAINSTONE_FLASH / sector_len, 4, 0, 0, 0, 0,
110112
be)) {

Diff for: ‎hw/mcf5208.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -220,11 +220,11 @@ static void mcf5208evb_init(ram_addr_t ram_size,
220220

221221
/* DRAM at 0x40000000 */
222222
cpu_register_physical_memory(0x40000000, ram_size,
223-
qemu_ram_alloc(ram_size) | IO_MEM_RAM);
223+
qemu_ram_alloc(NULL, "mcf5208.ram", ram_size) | IO_MEM_RAM);
224224

225225
/* Internal SRAM. */
226226
cpu_register_physical_memory(0x80000000, 16384,
227-
qemu_ram_alloc(16384) | IO_MEM_RAM);
227+
qemu_ram_alloc(NULL, "mcf5208.sram", 16384) | IO_MEM_RAM);
228228

229229
/* Internal peripherals. */
230230
pic = mcf_intc_init(0xfc048000, env);

Diff for: ‎hw/mips_fulong2e.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,8 @@ static void mips_fulong2e_init(ram_addr_t ram_size, const char *boot_device,
292292
bios_size = 1024 * 1024;
293293

294294
/* allocate RAM */
295-
ram_offset = qemu_ram_alloc(ram_size);
296-
bios_offset = qemu_ram_alloc(bios_size);
295+
ram_offset = qemu_ram_alloc(NULL, "fulong2e.ram", ram_size);
296+
bios_offset = qemu_ram_alloc(NULL, "fulong2e.bios", bios_size);
297297

298298
cpu_register_physical_memory(0, ram_size, IO_MEM_RAM);
299299
cpu_register_physical_memory(0x1fc00000LL,

Diff for: ‎hw/mips_jazz.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,10 @@ void mips_jazz_init (ram_addr_t ram_size,
158158
qemu_register_reset(main_cpu_reset, env);
159159

160160
/* allocate RAM */
161-
ram_offset = qemu_ram_alloc(ram_size);
161+
ram_offset = qemu_ram_alloc(NULL, "mips_jazz.ram", ram_size);
162162
cpu_register_physical_memory(0, ram_size, ram_offset | IO_MEM_RAM);
163163

164-
bios_offset = qemu_ram_alloc(MAGNUM_BIOS_SIZE);
164+
bios_offset = qemu_ram_alloc(NULL, "mips_jazz.bios", MAGNUM_BIOS_SIZE);
165165
cpu_register_physical_memory(0x1fc00000LL,
166166
MAGNUM_BIOS_SIZE, bios_offset | IO_MEM_ROM);
167167
cpu_register_physical_memory(0xfff00000LL,

Diff for: ‎hw/mips_malta.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -831,8 +831,8 @@ void mips_malta_init (ram_addr_t ram_size,
831831
((unsigned int)ram_size / (1 << 20)));
832832
exit(1);
833833
}
834-
ram_offset = qemu_ram_alloc(ram_size);
835-
bios_offset = qemu_ram_alloc(BIOS_SIZE);
834+
ram_offset = qemu_ram_alloc(NULL, "mips_malta.ram", ram_size);
835+
bios_offset = qemu_ram_alloc(NULL, "mips_malta.bios", BIOS_SIZE);
836836

837837

838838
cpu_register_physical_memory(0, ram_size, ram_offset | IO_MEM_RAM);

Diff for: ‎hw/mips_mipssim.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ mips_mipssim_init (ram_addr_t ram_size,
144144
qemu_register_reset(main_cpu_reset, reset_info);
145145

146146
/* Allocate RAM. */
147-
ram_offset = qemu_ram_alloc(ram_size);
148-
bios_offset = qemu_ram_alloc(BIOS_SIZE);
147+
ram_offset = qemu_ram_alloc(NULL, "mips_mipssim.ram", ram_size);
148+
bios_offset = qemu_ram_alloc(NULL, "mips_mipssim.bios", BIOS_SIZE);
149149

150150
cpu_register_physical_memory(0, ram_size, ram_offset | IO_MEM_RAM);
151151

Diff for: ‎hw/mips_r4k.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ void mips_r4k_init (ram_addr_t ram_size,
198198
((unsigned int)ram_size / (1 << 20)));
199199
exit(1);
200200
}
201-
ram_offset = qemu_ram_alloc(ram_size);
201+
ram_offset = qemu_ram_alloc(NULL, "mips_r4k.ram", ram_size);
202202

203203
cpu_register_physical_memory(0, ram_size, ram_offset | IO_MEM_RAM);
204204

@@ -226,14 +226,14 @@ void mips_r4k_init (ram_addr_t ram_size,
226226
be = 0;
227227
#endif
228228
if ((bios_size > 0) && (bios_size <= BIOS_SIZE)) {
229-
bios_offset = qemu_ram_alloc(BIOS_SIZE);
229+
bios_offset = qemu_ram_alloc(NULL, "mips_r4k.bios", BIOS_SIZE);
230230
cpu_register_physical_memory(0x1fc00000, BIOS_SIZE,
231231
bios_offset | IO_MEM_ROM);
232232

233233
load_image_targphys(filename, 0x1fc00000, BIOS_SIZE);
234234
} else if ((dinfo = drive_get(IF_PFLASH, 0, 0)) != NULL) {
235235
uint32_t mips_rom = 0x00400000;
236-
bios_offset = qemu_ram_alloc(mips_rom);
236+
bios_offset = qemu_ram_alloc(NULL, "mips_r4k.bios", mips_rom);
237237
if (!pflash_cfi01_register(0x1fc00000, bios_offset,
238238
dinfo->bdrv, sector_len,
239239
mips_rom / sector_len,

Diff for: ‎hw/musicpal.c

+7-4
Original file line numberDiff line numberDiff line change
@@ -1506,9 +1506,10 @@ static void musicpal_init(ram_addr_t ram_size,
15061506

15071507
/* For now we use a fixed - the original - RAM size */
15081508
cpu_register_physical_memory(0, MP_RAM_DEFAULT_SIZE,
1509-
qemu_ram_alloc(MP_RAM_DEFAULT_SIZE));
1509+
qemu_ram_alloc(NULL, "musicpal.ram",
1510+
MP_RAM_DEFAULT_SIZE));
15101511

1511-
sram_off = qemu_ram_alloc(MP_SRAM_SIZE);
1512+
sram_off = qemu_ram_alloc(NULL, "musicpal.sram", MP_SRAM_SIZE);
15121513
cpu_register_physical_memory(MP_SRAM_BASE, MP_SRAM_SIZE, sram_off);
15131514

15141515
dev = sysbus_create_simple("mv88w8618_pic", MP_PIC_BASE,
@@ -1555,14 +1556,16 @@ static void musicpal_init(ram_addr_t ram_size,
15551556
* image is smaller than 32 MB.
15561557
*/
15571558
#ifdef TARGET_WORDS_BIGENDIAN
1558-
pflash_cfi02_register(0-MP_FLASH_SIZE_MAX, qemu_ram_alloc(flash_size),
1559+
pflash_cfi02_register(0-MP_FLASH_SIZE_MAX, qemu_ram_alloc(NULL,
1560+
"musicpal.flash", flash_size),
15591561
dinfo->bdrv, 0x10000,
15601562
(flash_size + 0xffff) >> 16,
15611563
MP_FLASH_SIZE_MAX / flash_size,
15621564
2, 0x00BF, 0x236D, 0x0000, 0x0000,
15631565
0x5555, 0x2AAA, 1);
15641566
#else
1565-
pflash_cfi02_register(0-MP_FLASH_SIZE_MAX, qemu_ram_alloc(flash_size),
1567+
pflash_cfi02_register(0-MP_FLASH_SIZE_MAX, qemu_ram_alloc(NULL,
1568+
"musicpal.flash", flash_size),
15661569
dinfo->bdrv, 0x10000,
15671570
(flash_size + 0xffff) >> 16,
15681571
MP_FLASH_SIZE_MAX / flash_size,

Diff for: ‎hw/omap1.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -3732,9 +3732,11 @@ struct omap_mpu_state_s *omap310_mpu_init(unsigned long sdram_size,
37323732

37333733
/* Memory-mapped stuff */
37343734
cpu_register_physical_memory(OMAP_EMIFF_BASE, s->sdram_size,
3735-
(emiff_base = qemu_ram_alloc(s->sdram_size)) | IO_MEM_RAM);
3735+
(emiff_base = qemu_ram_alloc(NULL, "omap1.dram",
3736+
s->sdram_size)) | IO_MEM_RAM);
37363737
cpu_register_physical_memory(OMAP_IMIF_BASE, s->sram_size,
3737-
(imif_base = qemu_ram_alloc(s->sram_size)) | IO_MEM_RAM);
3738+
(imif_base = qemu_ram_alloc(NULL, "omap1.sram",
3739+
s->sram_size)) | IO_MEM_RAM);
37383740

37393741
omap_clkm_init(0xfffece00, 0xe1008000, s);
37403742

Diff for: ‎hw/omap2.c

+4-2
Original file line numberDiff line numberDiff line change
@@ -2253,9 +2253,11 @@ struct omap_mpu_state_s *omap2420_mpu_init(unsigned long sdram_size,
22532253

22542254
/* Memory-mapped stuff */
22552255
cpu_register_physical_memory(OMAP2_Q2_BASE, s->sdram_size,
2256-
(q2_base = qemu_ram_alloc(s->sdram_size)) | IO_MEM_RAM);
2256+
(q2_base = qemu_ram_alloc(NULL, "omap2.dram",
2257+
s->sdram_size)) | IO_MEM_RAM);
22572258
cpu_register_physical_memory(OMAP2_SRAM_BASE, s->sram_size,
2258-
(sram_base = qemu_ram_alloc(s->sram_size)) | IO_MEM_RAM);
2259+
(sram_base = qemu_ram_alloc(NULL, "omap2.sram",
2260+
s->sram_size)) | IO_MEM_RAM);
22592261

22602262
s->l4 = omap_l4_init(OMAP2_L4_BASE, 54);
22612263

Diff for: ‎hw/omap_sx1.c

+8-4
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ static void sx1_init(ram_addr_t ram_size,
139139

140140
/* External Flash (EMIFS) */
141141
cpu_register_physical_memory(OMAP_CS0_BASE, flash_size,
142-
qemu_ram_alloc(flash_size) | IO_MEM_ROM);
142+
qemu_ram_alloc(NULL, "omap_sx1.flash0-0",
143+
flash_size) | IO_MEM_ROM);
143144

144145
io = cpu_register_io_memory(static_readfn, static_writefn, &cs0val);
145146
cpu_register_physical_memory(OMAP_CS0_BASE + flash_size,
@@ -157,7 +158,8 @@ static void sx1_init(ram_addr_t ram_size,
157158
#endif
158159

159160
if ((dinfo = drive_get(IF_PFLASH, 0, fl_idx)) != NULL) {
160-
if (!pflash_cfi01_register(OMAP_CS0_BASE, qemu_ram_alloc(flash_size),
161+
if (!pflash_cfi01_register(OMAP_CS0_BASE, qemu_ram_alloc(NULL,
162+
"omap_sx1.flash0-1", flash_size),
161163
dinfo->bdrv, sector_size,
162164
flash_size / sector_size,
163165
4, 0, 0, 0, 0, be)) {
@@ -170,12 +172,14 @@ static void sx1_init(ram_addr_t ram_size,
170172
if ((version == 1) &&
171173
(dinfo = drive_get(IF_PFLASH, 0, fl_idx)) != NULL) {
172174
cpu_register_physical_memory(OMAP_CS1_BASE, flash1_size,
173-
qemu_ram_alloc(flash1_size) | IO_MEM_ROM);
175+
qemu_ram_alloc(NULL, "omap_sx1.flash1-0",
176+
flash1_size) | IO_MEM_ROM);
174177
io = cpu_register_io_memory(static_readfn, static_writefn, &cs1val);
175178
cpu_register_physical_memory(OMAP_CS1_BASE + flash1_size,
176179
OMAP_CS1_SIZE - flash1_size, io);
177180

178-
if (!pflash_cfi01_register(OMAP_CS1_BASE, qemu_ram_alloc(flash1_size),
181+
if (!pflash_cfi01_register(OMAP_CS1_BASE, qemu_ram_alloc(NULL,
182+
"omap_sx1.flash1-1", flash1_size),
179183
dinfo->bdrv, sector_size,
180184
flash1_size / sector_size,
181185
4, 0, 0, 0, 0, be)) {

Diff for: ‎hw/onenand.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@ void *onenand_init(uint32_t id, int regshift, qemu_irq irq)
638638
s->bdrv = dinfo->bdrv;
639639
s->otp = memset(qemu_malloc((64 + 2) << PAGE_SHIFT),
640640
0xff, (64 + 2) << PAGE_SHIFT);
641-
s->ram = qemu_ram_alloc(0xc000 << s->shift);
641+
s->ram = qemu_ram_alloc(NULL, "onenand.ram", 0xc000 << s->shift);
642642
ram = qemu_get_ram_ptr(s->ram);
643643
s->boot[0] = ram + (0x0000 << s->shift);
644644
s->boot[1] = ram + (0x8000 << s->shift);

Diff for: ‎hw/palm.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,8 @@ static void palmte_init(ram_addr_t ram_size,
213213

214214
/* External Flash (EMIFS) */
215215
cpu_register_physical_memory(OMAP_CS0_BASE, flash_size,
216-
qemu_ram_alloc(flash_size) | IO_MEM_ROM);
216+
qemu_ram_alloc(NULL, "palmte.flash",
217+
flash_size) | IO_MEM_ROM);
217218

218219
io = cpu_register_io_memory(static_readfn, static_writefn, &cs0val);
219220
cpu_register_physical_memory(OMAP_CS0_BASE + flash_size,

0 commit comments

Comments
 (0)