|
@@ -3618,7 +3618,7 @@ bool memory_region_init_rom(MemoryRegion *mr,
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
|
|
|
|
-void memory_region_init_rom_device(MemoryRegion *mr,
|
|
|
|
|
|
+bool memory_region_init_rom_device(MemoryRegion *mr,
|
|
Object *owner,
|
|
Object *owner,
|
|
const MemoryRegionOps *ops,
|
|
const MemoryRegionOps *ops,
|
|
void *opaque,
|
|
void *opaque,
|
|
@@ -3630,7 +3630,7 @@ void memory_region_init_rom_device(MemoryRegion *mr,
|
|
|
|
|
|
if (!memory_region_init_rom_device_nomigrate(mr, owner, ops, opaque,
|
|
if (!memory_region_init_rom_device_nomigrate(mr, owner, ops, opaque,
|
|
name, size, errp)) {
|
|
name, size, errp)) {
|
|
- return;
|
|
|
|
|
|
+ return false;
|
|
}
|
|
}
|
|
/* This will assert if owner is neither NULL nor a DeviceState.
|
|
/* This will assert if owner is neither NULL nor a DeviceState.
|
|
* We only want the owner here for the purposes of defining a
|
|
* We only want the owner here for the purposes of defining a
|
|
@@ -3640,6 +3640,8 @@ void memory_region_init_rom_device(MemoryRegion *mr,
|
|
*/
|
|
*/
|
|
owner_dev = DEVICE(owner);
|
|
owner_dev = DEVICE(owner);
|
|
vmstate_register_ram(mr, owner_dev);
|
|
vmstate_register_ram(mr, owner_dev);
|
|
|
|
+
|
|
|
|
+ return true;
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
/*
|