[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/11] pc_acpi_init(): don't bail as soon as failing
From: |
Laszlo Ersek |
Subject: |
[Qemu-devel] [PATCH 10/11] pc_acpi_init(): don't bail as soon as failing to find default DSDT |
Date: |
Thu, 21 Mar 2013 00:23:22 +0100 |
Signed-off-by: Laszlo Ersek <address@hidden>
---
hw/i386/pc.c | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 23f9800..0a5d4d4 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -888,9 +888,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 */
@@ -900,23 +898,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);
+ 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);
+ /* 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);
+ 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);
}
- g_free(arg);
- g_free(filename);
}
void *pc_memory_init(MemoryRegion *system_memory,
--
1.7.1
- [Qemu-devel] [PATCH 00/11] build ACPI MADT for fw_cfg clients, Laszlo Ersek, 2013/03/20
- [Qemu-devel] [PATCH 01/11] strip some whitespace, Laszlo Ersek, 2013/03/20
- [Qemu-devel] [PATCH 02/11] change element type from "char" to "unsigned char" in ACPI table data, Laszlo Ersek, 2013/03/20
- [Qemu-devel] [PATCH 03/11] acpi_table_add(): report fatal errors through an internal Error object, Laszlo Ersek, 2013/03/20
- [Qemu-devel] [PATCH 04/11] qapi schema: add AcpiTableOptions, Laszlo Ersek, 2013/03/20
- [Qemu-devel] [PATCH 05/11] acpi_table_add(): accept QemuOpts and parse it with OptsVisitor, Laszlo Ersek, 2013/03/20
- [Qemu-devel] [PATCH 07/11] like acpi_table_install(), acpi_table_add() should propagate Errors, Laszlo Ersek, 2013/03/20
- [Qemu-devel] [PATCH 06/11] acpi_table_add(): extract and reimplement internals, Laszlo Ersek, 2013/03/20
- [Qemu-devel] [PATCH 08/11] extract/unify the constant 0xfee00000 as APIC_DEFAULT_ADDRESS, Laszlo Ersek, 2013/03/20
- [Qemu-devel] [PATCH 10/11] pc_acpi_init(): don't bail as soon as failing to find default DSDT,
Laszlo Ersek <=
- [Qemu-devel] [PATCH 09/11] Introduce IO_APIC_DEFAULT_ADDRESS for 0xfec00000, Laszlo Ersek, 2013/03/20
- [Qemu-devel] [PATCH 11/11] i386/pc: build ACPI MADT for fw_cfg clients, Laszlo Ersek, 2013/03/20