[PATCH] hvmloader: Load proper ACPI tables with OVMF

[PATCH] hvmloader: Load proper ACPI tables with OVMF

[Anthony PERARD]

This patch loads the ACPI tables associated with QEMU instead of the one
for qemu-traditional.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
---
 tools/firmware/hvmloader/ovmf.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/firmware/hvmloader/ovmf.c b/tools/firmware/hvmloader/ovmf.c
index bb3da93..db9fa7a 100644
--- a/tools/firmware/hvmloader/ovmf.c
+++ b/tools/firmware/hvmloader/ovmf.c
@@ -47,8 +47,8 @@
 #define LOWCHUNK_END            (OVMF_BEGIN + OVMF_SIZE)
 #define OVMF_INFO_PHYSICAL_ADDRESS 0x00001000
 
-extern unsigned char dsdt_anycpu[];
-extern int dsdt_anycpu_len;
+extern unsigned char dsdt_anycpu_qemu_xen[];
+extern int dsdt_anycpu_qemu_xen_len;
 
 #define OVMF_INFO_MAX_TABLES 4
 struct ovmf_info {
@@ -119,8 +119,8 @@ static void ovmf_load(const struct bios_config *config)
 static void ovmf_acpi_build_tables(void)
 {
     struct acpi_config config = {
-        .dsdt_anycpu = dsdt_anycpu,
-        .dsdt_anycpu_len = dsdt_anycpu_len,
+        .dsdt_anycpu = dsdt_anycpu_qemu_xen,
+        .dsdt_anycpu_len = dsdt_anycpu_qemu_xen_len,
         .dsdt_15cpu = NULL, 
         .dsdt_15cpu_len = 0
     };
-- 
Anthony PERARD

Re: [PATCH] hvmloader: Load proper ACPI tables with OVMF

[Ian Campbell]

On Mon, 2015-12-14 at 16:08 +0000, Anthony PERARD wrote:
> This patch loads the ACPI tables associated with QEMU instead of the one
> for qemu-traditional.

I'd add "... we only support OVMF with qemu-xen" or something, just to make
it clear why this is correct.

> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>

Acked-by: Ian Campbell <ian.campbell@citrix.com>

> ---
>  tools/firmware/hvmloader/ovmf.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/tools/firmware/hvmloader/ovmf.c
> b/tools/firmware/hvmloader/ovmf.c
> index bb3da93..db9fa7a 100644
> --- a/tools/firmware/hvmloader/ovmf.c
> +++ b/tools/firmware/hvmloader/ovmf.c
> @@ -47,8 +47,8 @@
>  #define LOWCHUNK_END            (OVMF_BEGIN + OVMF_SIZE)
>  #define OVMF_INFO_PHYSICAL_ADDRESS 0x00001000
>  
> -extern unsigned char dsdt_anycpu[];
> -extern int dsdt_anycpu_len;
> +extern unsigned char dsdt_anycpu_qemu_xen[];
> +extern int dsdt_anycpu_qemu_xen_len;
>  
>  #define OVMF_INFO_MAX_TABLES 4
>  struct ovmf_info {
> @@ -119,8 +119,8 @@ static void ovmf_load(const struct bios_config
> *config)
>  static void ovmf_acpi_build_tables(void)
>  {
>      struct acpi_config config = {
> -        .dsdt_anycpu = dsdt_anycpu,
> -        .dsdt_anycpu_len = dsdt_anycpu_len,
> +        .dsdt_anycpu = dsdt_anycpu_qemu_xen,
> +        .dsdt_anycpu_len = dsdt_anycpu_qemu_xen_len,
>          .dsdt_15cpu = NULL, 
>          .dsdt_15cpu_len = 0
>      };

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

Re: [PATCH] hvmloader: Load proper ACPI tables with OVMF

[Andrew Cooper]

On 14/12/15 16:17, Ian Campbell wrote:
> On Mon, 2015-12-14 at 16:08 +0000, Anthony PERARD wrote:
>> This patch loads the ACPI tables associated with QEMU instead of the one
>> for qemu-traditional.
> I'd add "... we only support OVMF with qemu-xen" or something, just to make
> it clear why this is correct.

Seconded.

>
>> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
> Acked-by: Ian Campbell <ian.campbell@citrix.com>

With that fixed, Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

Re: [PATCH] hvmloader: Load proper ACPI tables with OVMF

[Jan Beulich]

>>> On 14.12.15 at 17:23, <andrew.cooper3@citrix.com> wrote:
> On 14/12/15 16:17, Ian Campbell wrote:
>> On Mon, 2015-12-14 at 16:08 +0000, Anthony PERARD wrote:
>>> This patch loads the ACPI tables associated with QEMU instead of the one
>>> for qemu-traditional.
>> I'd add "... we only support OVMF with qemu-xen" or something, just to make
>> it clear why this is correct.
> 
> Seconded.
> 
>>
>>> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
>> Acked-by: Ian Campbell <ian.campbell@citrix.com>
> 
> With that fixed, Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

I'll take care of extending the description upon commit; no need
to re-submit.

Jan