[Xen-devel] [PATCH 02 of 11] tools: hvmloader: move e820 definitions into rombios

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1302013751 -3600
# Node ID 13625a078b2a757662c5d89737cefab11247e270
# Parent  fb358af97eebe1eb7536fc2812357c9d936eb792
tools: hvmloader: move e820 definitions into rombios

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

diff -r fb358af97eeb -r 13625a078b2a tools/firmware/hvmloader/config.h
--- a/tools/firmware/hvmloader/config.h Tue Apr 05 15:29:11 2011 +0100
+++ b/tools/firmware/hvmloader/config.h Tue Apr 05 15:29:11 2011 +0100
@@ -29,5 +29,6 @@ extern unsigned long pci_mem_start, pci_
 #define ROMBIOS_END            (ROMBIOS_BEGIN + ROMBIOS_SIZE)
 
 #include "../rombios/config.h"
+#include "../rombios/e820.h"
 
 #endif /* __HVMLOADER_CONFIG_H__ */
diff -r fb358af97eeb -r 13625a078b2a tools/firmware/hvmloader/e820.h
--- a/tools/firmware/hvmloader/e820.h   Tue Apr 05 15:29:11 2011 +0100
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-#ifndef __HVMLOADER_E820_H__
-#define __HVMLOADER_E820_H__
-
-#include <xen/hvm/e820.h>
-
-/*
- * PC BIOS standard E820 types and structure.
- */
-#define E820_RAM          1
-#define E820_RESERVED     2
-#define E820_ACPI         3
-#define E820_NVS          4
-
-struct e820entry {
-    uint64_t addr;
-    uint64_t size;
-    uint32_t type;
-} __attribute__((packed));
-
-#define E820_NR ((uint16_t *)(E820_PHYSICAL_ADDRESS + E820_NR_OFFSET))
-#define E820    ((struct e820entry *)(E820_PHYSICAL_ADDRESS + E820_OFFSET))
-
-#endif /* __HVMLOADER_E820_H__ */
diff -r fb358af97eeb -r 13625a078b2a tools/firmware/hvmloader/hvmloader.c
--- a/tools/firmware/hvmloader/hvmloader.c      Tue Apr 05 15:29:11 2011 +0100
+++ b/tools/firmware/hvmloader/hvmloader.c      Tue Apr 05 15:29:11 2011 +0100
@@ -27,7 +27,6 @@
 #include "config.h"
 #include "apic_regs.h"
 #include "pci_regs.h"
-#include "e820.h"
 #include "option_rom.h"
 #include <xen/version.h>
 #include <xen/hvm/params.h>
diff -r fb358af97eeb -r 13625a078b2a tools/firmware/hvmloader/smbios.c
--- a/tools/firmware/hvmloader/smbios.c Tue Apr 05 15:29:11 2011 +0100
+++ b/tools/firmware/hvmloader/smbios.c Tue Apr 05 15:29:11 2011 +0100
@@ -26,7 +26,6 @@
 #include "smbios_types.h"
 #include "util.h"
 #include "hypercall.h"
-#include "e820.h"
 
 static int
 write_smbios_tables(void *start,
diff -r fb358af97eeb -r 13625a078b2a tools/firmware/hvmloader/util.c
--- a/tools/firmware/hvmloader/util.c   Tue Apr 05 15:29:11 2011 +0100
+++ b/tools/firmware/hvmloader/util.c   Tue Apr 05 15:29:11 2011 +0100
@@ -20,7 +20,6 @@
 
 #include "util.h"
 #include "config.h"
-#include "e820.h"
 #include "hypercall.h"
 #include <stdint.h>
 #include <xen/xen.h>
diff -r fb358af97eeb -r 13625a078b2a tools/firmware/rombios/32bit/pmm.c
--- a/tools/firmware/rombios/32bit/pmm.c        Tue Apr 05 15:29:11 2011 +0100
+++ b/tools/firmware/rombios/32bit/pmm.c        Tue Apr 05 15:29:11 2011 +0100
@@ -66,7 +66,7 @@
 #include <stdint.h>
 #include <stddef.h>
 #include "config.h"
-#include <../hvmloader/e820.h>
+#include "e820.h"
 #include "util.h"
 
 #define DEBUG_PMM 0
diff -r fb358af97eeb -r 13625a078b2a tools/firmware/rombios/e820.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/firmware/rombios/e820.h     Tue Apr 05 15:29:11 2011 +0100
@@ -0,0 +1,23 @@
+#ifndef __ROMBIOS_E820_H__
+#define __ROMBIOS_E820_H__
+
+#include <xen/hvm/e820.h>
+
+/*
+ * PC BIOS standard E820 types and structure.
+ */
+#define E820_RAM          1
+#define E820_RESERVED     2
+#define E820_ACPI         3
+#define E820_NVS          4
+
+struct e820entry {
+    uint64_t addr;
+    uint64_t size;
+    uint32_t type;
+} __attribute__((packed));
+
+#define E820_NR ((uint16_t *)(E820_PHYSICAL_ADDRESS + E820_NR_OFFSET))
+#define E820    ((struct e820entry *)(E820_PHYSICAL_ADDRESS + E820_OFFSET))
+
+#endif /* __ROMBIOS_E820_H__ */

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