26 lines
1.2 KiB
Text
26 lines
1.2 KiB
Text
$NetBSD: patch-CVE-2014-3124,v 1.2 2015/12/29 04:04:32 dholland Exp $
|
|
|
|
--- xen/include/asm-x86/p2m.h.orig 2013-09-10 06:42:18.000000000 +0000
|
|
+++ xen/include/asm-x86/p2m.h 2014-04-30 13:11:30.000000000 +0000
|
|
@@ -134,6 +134,13 @@ typedef enum {
|
|
| p2m_to_mask(p2m_ram_paging_in) \
|
|
| p2m_to_mask(p2m_ram_shared))
|
|
|
|
+/* Types that represent a physmap hole. */
|
|
+#define P2M_HOLE_TYPES (p2m_to_mask(p2m_mmio_dm) \
|
|
+ | p2m_to_mask(p2m_invalid) \
|
|
+ | p2m_to_mask(p2m_ram_paging_in_start) \
|
|
+ | p2m_to_mask(p2m_ram_paging_in) \
|
|
+ | p2m_to_mask(p2m_ram_paged))
|
|
+
|
|
/* Grant mapping types, which map to a real machine frame in another
|
|
* VM */
|
|
#define P2M_GRANT_TYPES (p2m_to_mask(p2m_grant_map_rw) \
|
|
@@ -170,6 +177,7 @@ typedef enum {
|
|
|
|
/* Useful predicates */
|
|
#define p2m_is_ram(_t) (p2m_to_mask(_t) & P2M_RAM_TYPES)
|
|
+#define p2m_is_hole(_t) (p2m_to_mask(_t) & P2M_HOLE_TYPES)
|
|
#define p2m_is_mmio(_t) (p2m_to_mask(_t) & P2M_MMIO_TYPES)
|
|
#define p2m_is_readonly(_t) (p2m_to_mask(_t) & P2M_RO_TYPES)
|
|
#define p2m_is_magic(_t) (p2m_to_mask(_t) & P2M_MAGIC_TYPES)
|