From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:36444) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qyqlb-0003AX-Do for qemu-devel@nongnu.org; Wed, 31 Aug 2011 15:48:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QyqlQ-0008GT-74 for qemu-devel@nongnu.org; Wed, 31 Aug 2011 15:48:07 -0400 Received: from e7.ny.us.ibm.com ([32.97.182.137]:37405) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QyqlP-0008Aa-Tz for qemu-devel@nongnu.org; Wed, 31 Aug 2011 15:47:56 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by e7.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p7VIRWuq007259 for ; Wed, 31 Aug 2011 14:27:32 -0400 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p7VJkHil142910 for ; Wed, 31 Aug 2011 15:46:18 -0400 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p7VDjjbV008127 for ; Wed, 31 Aug 2011 07:45:49 -0600 Message-Id: <20110831194606.061560852@linux.vnet.ibm.com> Date: Wed, 31 Aug 2011 15:45:43 -0400 From: Stefan Berger References: <20110831194540.700948503@linux.vnet.ibm.com> Content-Disposition: inline; filename=acpi_get_rsdp.diff Subject: [Qemu-devel] [PATCH V7 3/9] Add public get_rsdp function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: stefanb@linux.vnet.ibm.com, seabios@seabios.org Cc: chrisw@redhat.com, qemu-devel@nongnu.org This patch adds a global get_rsdp() function call and refactors find_resume_vector() to call it. Signed-off-by: Stefan Berger --- src/acpi.c | 12 ++++++++++-- src/acpi.h | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) Index: seabios/src/acpi.c =================================================================== --- seabios.orig/src/acpi.c +++ seabios/src/acpi.c @@ -719,11 +719,19 @@ acpi_bios_init(void) dprintf(1, "ACPI tables: RSDP=%p RSDT=%p\n", rsdp, rsdt); } -u32 -find_resume_vector(void) +struct rsdp_descriptor * +get_rsdp(void) { dprintf(4, "rsdp=%p\n", RsdpAddr); if (!RsdpAddr || RsdpAddr->signature != RSDP_SIGNATURE) + return 0; + return RsdpAddr; +} + +u32 +find_resume_vector(void) +{ + if (!get_rsdp()) return 0; struct rsdt_descriptor_rev1 *rsdt = (void*)RsdpAddr->rsdt_physical_address; dprintf(4, "rsdt=%p\n", rsdt); Index: seabios/src/acpi.h =================================================================== --- seabios.orig/src/acpi.h +++ seabios/src/acpi.h @@ -4,6 +4,7 @@ #include "types.h" // u32 void acpi_bios_init(void); +struct rsdp_descriptor *get_rsdp(); u32 find_resume_vector(void); #define RSDP_SIGNATURE 0x2052545020445352LL // "RSD PTR "