Re: [Patch 0/3] Disable ACPI SRAT, SLIT on dom0 <take 3>

[Akio Takebe <takebe_akio@jp.fujitsu.com>]

[-- Attachment #1: Mail message body --]
[-- Type: text/plain, Size: 156 bytes --]

Hi,

This patch move generate_acpi_checksum() from ia64 code to common.

Signed-off-by: Akio Takebe <takebe_akio@jp.fujitsu.com>

Best Regards,

Akio Takebe

[-- Attachment #2: move_generate_acpi_checksum.v3.patch --]
[-- Type: application/octet-stream, Size: 3701 bytes --]

# HG changeset patch
# User root@localhost.localdomain
# Date 1185747444 -32400
# Node ID 7e81d7ec1bb9d5cb32332011d2c3eb27d70c635b
# Parent  4492a0285bae734ee18f6acbb6b3f9c80f153be7
Move generate_acpi_checksum() from ia64 code to common.

Signed-off-by: Akio Takebe <takebe_akio@jp.fujitsu.com>

diff -r 4492a0285bae -r 7e81d7ec1bb9 tools/libxc/ia64/Makefile
--- a/tools/libxc/ia64/Makefile	Fri Jul 27 08:15:16 2007 -0600
+++ b/tools/libxc/ia64/Makefile	Mon Jul 30 07:17:24 2007 +0900
@@ -5,7 +5,7 @@ GUEST_SRCS-y += ia64/xc_ia64_linux_resto
 GUEST_SRCS-y += ia64/xc_ia64_linux_restore.c
 
 GUEST_SRCS-y += ia64/xc_dom_ia64_util.c
-DOMFW_SRCS_BASE := dom_fw_common.c dom_fw_domu.c dom_fw_asm.S
+DOMFW_SRCS_BASE := dom_fw_common.c dom_fw_domu.c dom_fw_asm.S dom_fw_acpi.c
 DOMFW_SRCS := $(addprefix ia64/, $(DOMFW_SRCS_BASE))
 $(DOMFW_SRCS):
 	ln -sf ../$(XEN_ROOT)/xen/arch/ia64/xen/$(@F) $@
diff -r 4492a0285bae -r 7e81d7ec1bb9 tools/libxc/ia64/dom_fw_acpi.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/libxc/ia64/dom_fw_acpi.c	Mon Jul 30 07:17:24 2007 +0900
@@ -0,0 +1,14 @@
+#include <inttypes.h>
+#include <xen/acpi.h>
+
+uint8_t
+generate_acpi_checksum(void *tbl, unsigned long len)
+{
+	uint8_t *ptr, sum = 0;
+
+	for (ptr = tbl; len > 0 ; len--, ptr++)
+		sum += *ptr;
+
+	return 0 - sum;
+}
+
diff -r 4492a0285bae -r 7e81d7ec1bb9 xen/arch/ia64/xen/dom_fw_common.c
--- a/xen/arch/ia64/xen/dom_fw_common.c	Fri Jul 27 08:15:16 2007 -0600
+++ b/xen/arch/ia64/xen/dom_fw_common.c	Mon Jul 30 07:17:24 2007 +0900
@@ -207,17 +207,6 @@ print_md(efi_memory_desc_t *md)
 		printk("(%luKB)\n", size >> 10);
 }
 
-uint8_t
-generate_acpi_checksum(void *tbl, unsigned long len)
-{
-	uint8_t *ptr, sum = 0;
-
-	for (ptr = tbl; len > 0 ; len--, ptr++)
-		sum += *ptr;
-
-	return 0 - sum;
-}
-
 struct fake_acpi_tables {
 	struct acpi20_table_rsdp rsdp;
 	struct xsdt_descriptor_rev2 xsdt;
diff -r 4492a0285bae -r 7e81d7ec1bb9 xen/drivers/acpi/tables.c
--- a/xen/drivers/acpi/tables.c	Fri Jul 27 08:15:16 2007 -0600
+++ b/xen/drivers/acpi/tables.c	Mon Jul 30 07:17:24 2007 +0900
@@ -227,6 +227,17 @@ void acpi_table_print_madt_entry(acpi_ta
 	}
 }
 
+uint8_t
+generate_acpi_checksum(void *tbl, unsigned long len)
+{
+	uint8_t *ptr, sum = 0;
+
+	for (ptr = tbl; len > 0 ; len--, ptr++)
+		sum += *ptr;
+
+	return 0 - sum;
+}
+
 static int
 acpi_table_compute_checksum(void *table_pointer, unsigned long length)
 {
diff -r 4492a0285bae -r 7e81d7ec1bb9 xen/include/asm-ia64/dom_fw_common.h
--- a/xen/include/asm-ia64/dom_fw_common.h	Fri Jul 27 08:15:16 2007 -0600
+++ b/xen/include/asm-ia64/dom_fw_common.h	Mon Jul 30 07:17:24 2007 +0900
@@ -85,7 +85,6 @@ xen_ia64_efi_make_md(efi_memory_desc_t *
 xen_ia64_efi_make_md(efi_memory_desc_t *md,
                      uint32_t type, uint64_t attr, 
                      uint64_t start, uint64_t end);
-uint8_t generate_acpi_checksum(void *tbl, unsigned long len);
 struct fake_acpi_tables;
 void dom_fw_fake_acpi(domain_t *d, struct fake_acpi_tables *tables);
 int efi_mdt_cmp(const void *a, const void *b); 
diff -r 4492a0285bae -r 7e81d7ec1bb9 xen/include/xen/acpi.h
--- a/xen/include/xen/acpi.h	Fri Jul 27 08:15:16 2007 -0600
+++ b/xen/include/xen/acpi.h	Mon Jul 30 07:17:24 2007 +0900
@@ -390,6 +390,7 @@ void acpi_table_print (struct acpi_table
 void acpi_table_print (struct acpi_table_header *header, unsigned long phys_addr);
 void acpi_table_print_madt_entry (acpi_table_entry_header *madt);
 void acpi_table_print_srat_entry (acpi_table_entry_header *srat);
+uint8_t generate_acpi_checksum(void *tbl, unsigned long len);
 
 /* the following four functions are architecture-dependent */
 void acpi_numa_slit_init (struct acpi_table_slit *slit);

[-- Attachment #3: Type: text/plain, Size: 152 bytes --]

_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@lists.xensource.com
http://lists.xensource.com/xen-ia64-devel