Re: [Xen-devel] [PATCH] x86/pvh: Do not add DSDT and FACS to PVH dom0 XSDT

[Roger Pau Monné <roger.pau@xxxxxxxxxx>]

On Wed, Nov 08, 2017 at 03:19:27PM -0500, Boris Ostrovsky wrote:
> These tables are pointed to from FADT. Adding them will
> result in duplicate entries in the guest's tables.
> 
> Signed-off-by: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx>
> ---
>  xen/arch/x86/hvm/dom0_build.c | 17 +++++++++++++++--
>  1 file changed, 15 insertions(+), 2 deletions(-)
> 
> diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c
> index a67071c..c878bba 100644
> --- a/xen/arch/x86/hvm/dom0_build.c
> +++ b/xen/arch/x86/hvm/dom0_build.c
> @@ -818,6 +818,19 @@ static bool __init pvh_acpi_table_allowed(const char 
> *sig)
>      return true;
>  }
>  
> +static bool __init pvh_acpi_table_in_xsdt(const char *sig)
> +{
> +    /*
> +     * DSDT and FACS are pointed to from FADT and thus don't belong
> +     * in XSDT.
> +     */
> +    if ( !strncmp(sig, ACPI_SIG_DSDT, ACPI_NAME_SIZE) ||
> +         !strncmp(sig, ACPI_SIG_FACS, ACPI_NAME_SIZE) )
> +        return false;
> +
> +    return true;
> +}

What about adding something like:

static bool __init pvh_acpi_xsdt_table_allowed(const char *sig)
{
    return pvh_acpi_table_allowed(sig) &&
           strncmp(sig, ACPI_SIG_DSDT, ACPI_NAME_SIZE) &&
           strncmp(sig, ACPI_SIG_FACS, ACPI_NAME_SIZE);
}

And replacing the pvh_acpi_table_allowed calls in pvh_setup_acpi_xsdt
with that?

Thanks, Roger.

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