falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pc_acpi_init(): don't bail as soon as failing to find default DSDT 

Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Message-id: 1363821803-3380-11-git-send-email-lersek@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Laszlo Ersek 2013-03-21 00:23:22 +01:00 committed by Anthony Liguori
parent 3a4a4697aa
commit c5a98cf333
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
hw/i386/pc.c
View File

@ -891,9 +891,7 @@ void pc_cpus_init(const char *cpu_model)
void pc_acpi_init(const char *default_dsdt)
{
char *filename = NULL, *arg = NULL;
QemuOpts *opts;
Error *err = NULL;
char *filename;
if (acpi_tables != NULL) {
/* manually set via -acpitable, leave it alone */
@ -903,23 +901,26 @@ void pc_acpi_init(const char *default_dsdt)
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, default_dsdt);
if (filename == NULL) {
fprintf(stderr, "WARNING: failed to find %s\n", default_dsdt);
return;
} else {
char *arg;
QemuOpts *opts;
Error *err = NULL;
arg = g_strdup_printf("file=%s", filename);
/* creates a deep copy of "arg" */
opts = qemu_opts_parse(qemu_find_opts("acpi"), arg, 0);
g_assert(opts != NULL);
acpi_table_add(opts, &err);
if (err) {
fprintf(stderr, "WARNING: failed to load %s: %s\n", filename,
error_get_pretty(err));
error_free(err);
}
g_free(arg);
g_free(filename);
}
arg = g_strdup_printf("file=%s", filename);
/* creates a deep copy of "arg" */
opts = qemu_opts_parse(qemu_find_opts("acpi"), arg, 0);
g_assert(opts != NULL);
acpi_table_add(opts, &err);
if (err) {
fprintf(stderr, "WARNING: failed to load %s: %s\n", filename,
error_get_pretty(err));
error_free(err);
}
g_free(arg);
g_free(filename);
}
void *pc_memory_init(MemoryRegion *system_memory,