Re: [Xen-devel] [PATCH v2 05/11] acpi: Power and Sleep ACPI buttons are not emulated for PVH guests
>>> On 09.11.16 at 15:39,wrote: > Signed-off-by: Boris Ostrovsky Acked-by: Jan Beulich ___ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel
Re: [Xen-devel] [PATCH v2 05/11] acpi: Power and Sleep ACPI buttons are not emulated for PVH guests
On Wed, Nov 09, 2016 at 09:39:53AM -0500, Boris Ostrovsky wrote: > Signed-off-by: Boris OstrovskyReviewed-by: Konrad Rzeszutek Wilk > --- > Changes in v2: > * HVM guests continue having the buttons > > tools/firmware/hvmloader/util.c | 3 ++- > tools/libacpi/build.c | 2 ++ > tools/libacpi/libacpi.h | 1 + > 3 files changed, 5 insertions(+), 1 deletion(-) > > diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c > index 1d78973..a3f12fe 100644 > --- a/tools/firmware/hvmloader/util.c > +++ b/tools/firmware/hvmloader/util.c > @@ -949,7 +949,8 @@ void hvmloader_acpi_build_tables(struct acpi_config > *config, > config->table_flags |= ACPI_HAS_SSDT_S4; > > config->table_flags |= (ACPI_HAS_TCPA | ACPI_HAS_IOAPIC | > -ACPI_HAS_WAET | ACPI_HAS_PMTIMER); > +ACPI_HAS_WAET | ACPI_HAS_PMTIMER | > +ACPI_HAS_BUTTONS); > > config->tis_hdr = (uint16_t *)ACPI_TIS_HDR_ADDRESS; > > diff --git a/tools/libacpi/build.c b/tools/libacpi/build.c > index 58822d3..5c4a818 100644 > --- a/tools/libacpi/build.c > +++ b/tools/libacpi/build.c > @@ -579,6 +579,8 @@ int acpi_build_tables(struct acpi_ctxt *ctxt, struct > acpi_config *config) > Fadt.pm_tmr_blk = 0; > memset(_pm_tmr_blk, 0, sizeof(Fadt.x_pm_tmr_blk)); > } > +if ( !(config->table_flags & ACPI_HAS_BUTTONS) ) > +Fadt.flags |= (ACPI_PWR_BUTTON | ACPI_SLP_BUTTON); > memcpy(fadt, , sizeof(struct acpi_20_fadt)); > fadt->dsdt = ctxt->mem_ops.v2p(ctxt, dsdt); > fadt->x_dsdt = ctxt->mem_ops.v2p(ctxt, dsdt); > diff --git a/tools/libacpi/libacpi.h b/tools/libacpi/libacpi.h > index bda692e..dd6ef8b 100644 > --- a/tools/libacpi/libacpi.h > +++ b/tools/libacpi/libacpi.h > @@ -31,6 +31,7 @@ > #define ACPI_HAS_IOAPIC (1<<8) > #define ACPI_HAS_WAET(1<<9) > #define ACPI_HAS_PMTIMER (1<<10) > +#define ACPI_HAS_BUTTONS (1<<11) > > struct xen_vmemrange; > struct acpi_numa { > -- > 2.7.4 > > > ___ > Xen-devel mailing list > Xen-devel@lists.xen.org > https://lists.xen.org/xen-devel ___ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel
[Xen-devel] [PATCH v2 05/11] acpi: Power and Sleep ACPI buttons are not emulated for PVH guests
Signed-off-by: Boris Ostrovsky--- Changes in v2: * HVM guests continue having the buttons tools/firmware/hvmloader/util.c | 3 ++- tools/libacpi/build.c | 2 ++ tools/libacpi/libacpi.h | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c index 1d78973..a3f12fe 100644 --- a/tools/firmware/hvmloader/util.c +++ b/tools/firmware/hvmloader/util.c @@ -949,7 +949,8 @@ void hvmloader_acpi_build_tables(struct acpi_config *config, config->table_flags |= ACPI_HAS_SSDT_S4; config->table_flags |= (ACPI_HAS_TCPA | ACPI_HAS_IOAPIC | -ACPI_HAS_WAET | ACPI_HAS_PMTIMER); +ACPI_HAS_WAET | ACPI_HAS_PMTIMER | +ACPI_HAS_BUTTONS); config->tis_hdr = (uint16_t *)ACPI_TIS_HDR_ADDRESS; diff --git a/tools/libacpi/build.c b/tools/libacpi/build.c index 58822d3..5c4a818 100644 --- a/tools/libacpi/build.c +++ b/tools/libacpi/build.c @@ -579,6 +579,8 @@ int acpi_build_tables(struct acpi_ctxt *ctxt, struct acpi_config *config) Fadt.pm_tmr_blk = 0; memset(_pm_tmr_blk, 0, sizeof(Fadt.x_pm_tmr_blk)); } +if ( !(config->table_flags & ACPI_HAS_BUTTONS) ) +Fadt.flags |= (ACPI_PWR_BUTTON | ACPI_SLP_BUTTON); memcpy(fadt, , sizeof(struct acpi_20_fadt)); fadt->dsdt = ctxt->mem_ops.v2p(ctxt, dsdt); fadt->x_dsdt = ctxt->mem_ops.v2p(ctxt, dsdt); diff --git a/tools/libacpi/libacpi.h b/tools/libacpi/libacpi.h index bda692e..dd6ef8b 100644 --- a/tools/libacpi/libacpi.h +++ b/tools/libacpi/libacpi.h @@ -31,6 +31,7 @@ #define ACPI_HAS_IOAPIC (1<<8) #define ACPI_HAS_WAET(1<<9) #define ACPI_HAS_PMTIMER (1<<10) +#define ACPI_HAS_BUTTONS (1<<11) struct xen_vmemrange; struct acpi_numa { -- 2.7.4 ___ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel