haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'stefanha/trivial-patches' into staging

Browse source
This commit is contained in:
Anthony Liguori 2011-08-12 08:06:02 -05:00
parent eecaecedec 85d59fef9d
commit 9b024b5f96
4 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cpu-all.h
View file

@ -488,7 +488,7 @@ typedef struct RAMBlock {
typedef struct RAMList {
uint8_t *phys_dirty;
QLIST_HEAD(ram, RAMBlock) blocks;
QLIST_HEAD(, RAMBlock) blocks;
} RAMList;
extern RAMList ram_list;

2
exec.c
View file

@ -110,7 +110,7 @@ static uint8_t *code_gen_ptr;
int phys_ram_fd;
static int in_migration;
RAMList ram_list = { .blocks = QLIST_HEAD_INITIALIZER(ram_list) };
RAMList ram_list = { .blocks = QLIST_HEAD_INITIALIZER(ram_list.blocks) };
static MemoryRegion *system_memory;
static MemoryRegion *system_io;

7
hw/qdev.c
View file

@ -111,7 +111,12 @@ DeviceState *qdev_create(BusState *bus, const char *name)
dev = qdev_try_create(bus, name);
if (!dev) {
hw_error("Unknown device '%s' for bus '%s'\n", name, bus->info->name);
if (bus) {
hw_error("Unknown device '%s' for bus '%s'\n", name,
bus->info->name);
} else {
hw_error("Unknown device '%s' for default sysbus\n", name);
}
}
return dev;

2
hw/scsi-bus.c
View file

@ -725,7 +725,7 @@ void scsi_device_purge_requests(SCSIDevice *sdev)
static char *scsibus_get_fw_dev_path(DeviceState *dev)
{
SCSIDevice *d = (SCSIDevice*)dev;
SCSIDevice *d = DO_UPCAST(SCSIDevice, qdev, dev);
SCSIBus *bus = scsi_bus_from_device(d);
char path[100];
int i;