|
 |
9ae3a8 |
From bc610d00154bcd6548c84554d7b647a64834a807 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
Message-Id: <bc610d00154bcd6548c84554d7b647a64834a807.1387298827.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
In-Reply-To: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
References: <3ed0fb61a3dc912ef036d7ef450bed192090709e.1387298827.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
From: "Michael S. Tsirkin" <mst@redhat.com>
|
|
|
9ae3a8 |
Date: Tue, 17 Dec 2013 15:19:05 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 47/56] pc: use new api to add builtin tables
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Michael S. Tsirkin <mst@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1387293161-4085-48-git-send-email-mst@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 56352
|
|
|
9ae3a8 |
O-Subject: [PATCH qemu-kvm RHEL7.0 v2 47/57] pc: use new api to add builtin tables
|
|
|
9ae3a8 |
Bugzilla: 1034876
|
|
|
9ae3a8 |
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
At this point the only builtin table we have is
|
|
|
9ae3a8 |
the DSDT used for Q35.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 1a4b2666dfbd6fbd9b5623a8e0ed6035cd0854fe)
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/i386/pc.c | 2 +-
|
|
|
9ae3a8 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Michal Novotny <minovotn@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/i386/pc.c | 2 +-
|
|
|
9ae3a8 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
|
|
|
9ae3a8 |
index 4d54c0b..041e537 100644
|
|
|
9ae3a8 |
--- a/hw/i386/pc.c
|
|
|
9ae3a8 |
+++ b/hw/i386/pc.c
|
|
|
9ae3a8 |
@@ -1109,7 +1109,7 @@ void pc_acpi_init(const char *default_dsdt)
|
|
|
9ae3a8 |
opts = qemu_opts_parse(qemu_find_opts("acpi"), arg, 0);
|
|
|
9ae3a8 |
g_assert(opts != NULL);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
- acpi_table_add(opts, &err;;
|
|
|
9ae3a8 |
+ acpi_table_add_builtin(opts, &err;;
|
|
|
9ae3a8 |
if (err) {
|
|
|
9ae3a8 |
error_report("WARNING: failed to load %s: %s", filename,
|
|
|
9ae3a8 |
error_get_pretty(err));
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.11.7
|
|
|
9ae3a8 |
|