summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksandr Bezzubikov2017-07-29 01:37:49 +0200
committerMichael S. Tsirkin2017-08-07 23:31:09 +0200
commita41c78c135eb1850826e96b2154690323ff66719 (patch)
tree27b19936aff581d31829a99eef3c5db954007f61
parentbuild-sys: add --disable-vhost-user (diff)
downloadqemu-a41c78c135eb1850826e96b2154690323ff66719.tar.gz
qemu-a41c78c135eb1850826e96b2154690323ff66719.tar.xz
qemu-a41c78c135eb1850826e96b2154690323ff66719.zip
hw/i386: allow SHPC for Q35 machine
Unmask previously masked SHPC feature in _OSC method. Signed-off-by: Aleksandr Bezzubikov <zuban32s@gmail.com> Reviewed-by: Marcel Apfelbaum <marcel@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-rw-r--r--hw/i386/acpi-build.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index b9c245c9bb..98dd424678 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1862,9 +1862,9 @@ static Aml *build_q35_osc_method(void)
/*
* Always allow native PME, AER (no dependencies)
- * Never allow SHPC (no SHPC controller in this system)
+ * Allow SHPC (PCI bridges can have SHPC controller)
*/
- aml_append(if_ctx, aml_and(a_ctrl, aml_int(0x1D), a_ctrl));
+ aml_append(if_ctx, aml_and(a_ctrl, aml_int(0x1F), a_ctrl));
if_ctx2 = aml_if(aml_lnot(aml_equal(aml_arg(1), aml_int(1))));
/* Unknown revision */