提交 c5a98cf3 编写于 作者: L Laszlo Ersek 提交者: Anthony Liguori

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

Signed-off-by: NLaszlo Ersek <lersek@redhat.com>
Reviewed-by: NAnthony Liguori <aliguori@us.ibm.com>
Message-id: 1363821803-3380-11-git-send-email-lersek@redhat.com
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>
上级 3a4a4697
......@@ -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,8 +901,10 @@ 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);
......@@ -920,6 +920,7 @@ void pc_acpi_init(const char *default_dsdt)
}
g_free(arg);
g_free(filename);
}
}
void *pc_memory_init(MemoryRegion *system_memory,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册