From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51412) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKlzZ-00049P-Sf for qemu-devel@nongnu.org; Mon, 09 Feb 2015 05:55:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YKlzW-0000l3-Iz for qemu-devel@nongnu.org; Mon, 09 Feb 2015 05:55:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44331) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKlzW-0000ks-AQ for qemu-devel@nongnu.org; Mon, 09 Feb 2015 05:54:58 -0500 From: Igor Mammedov Date: Mon, 9 Feb 2015 10:53:45 +0000 Message-Id: <1423479254-15342-24-git-send-email-imammedo@redhat.com> In-Reply-To: <1423479254-15342-1-git-send-email-imammedo@redhat.com> References: <1423479254-15342-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH v3 23/52] pc: acpi-build: drop unsupported PM1b_CNT.SLP_TYP List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: drjones@redhat.com, marcel.a@redhat.com, claudio.fontana@huawei.com, mst@redhat.com, zhaoshenglong@huawei.com QEMU doesn't implement/advertize PM1b_CNT_BLK register block so do not set/patch its \_Sx values to avoid confusion. Signed-off-by: Igor Mammedov --- hw/i386/acpi-build.c | 3 +-- hw/i386/ssdt-misc.dsl | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index b6626f5..7cc564a 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -781,8 +781,7 @@ build_ssdt(Aml *table_data, if (pm->s4_disabled) { ssdt_ptr[acpi_s4_name[0]] = 'X'; } else { - ssdt_ptr[acpi_s4_pkg[0] + 1] = ssdt_ptr[acpi_s4_pkg[0] + 3] = - pm->s4_val; + ssdt_ptr[acpi_s4_pkg[0] + 1] = pm->s4_val; } patch_pci_windows(pci, ssdt_ptr, sizeof(ssdp_misc_aml)); diff --git a/hw/i386/ssdt-misc.dsl b/hw/i386/ssdt-misc.dsl index 1e3baae..96382a6 100644 --- a/hw/i386/ssdt-misc.dsl +++ b/hw/i386/ssdt-misc.dsl @@ -54,7 +54,7 @@ DefinitionBlock ("ssdt-misc.aml", "SSDT", 0x01, "BXPC", "BXSSDTSUSP", 0x1) ACPI_EXTRACT_NAME_STRING acpi_s3_name Name(_S3, Package(0x04) { One, /* PM1a_CNT.SLP_TYP */ - One, /* PM1b_CNT.SLP_TYP */ + Zero, /* PM1b_CNT.SLP_TYP, QEMU doesn't provide it */ Zero, /* reserved */ Zero /* reserved */ }) @@ -62,7 +62,7 @@ DefinitionBlock ("ssdt-misc.aml", "SSDT", 0x01, "BXPC", "BXSSDTSUSP", 0x1) ACPI_EXTRACT_PKG_START acpi_s4_pkg Name(_S4, Package(0x04) { 0x2, /* PM1a_CNT.SLP_TYP */ - 0x2, /* PM1b_CNT.SLP_TYP */ + Zero, /* PM1b_CNT.SLP_TYP, QEMU doesn't provide it */ Zero, /* reserved */ Zero /* reserved */ }) -- 1.8.3.1