From: Vikram Garhwal <vikram.garh...@amd.com>
Move struct range, rangeset and removed static from first_range and
next_range().
IRQs and IOMEMs for nodes are stored as rangeset in the dynamic node addition
part. While removing the nodes we need to access every IRQ and IOMEM ranges to
unmap IRQ and IOMEM from the domain.
Signed-off-by: Vikram Garhwal <vikram.garh...@amd.com>
Signed-off-by: Henry Wang <xin.wa...@amd.com>
---
xen/common/rangeset.c | 31 ++-----------------------------
xen/include/xen/rangeset.h | 32 +++++++++++++++++++++++++++++++-
2 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/xen/common/rangeset.c b/xen/common/rangeset.c
index b75590f907..d3f4297e41 100644
--- a/xen/common/rangeset.c
+++ b/xen/common/rangeset.c
@@ -12,31 +12,6 @@
#include <xen/rangeset.h>
#include <xsm/xsm.h>
-/* An inclusive range [s,e] and pointer to next range in ascending order. */
-struct range {
- struct list_head list;
- unsigned long s, e;
-};
-
-struct rangeset {
- /* Owning domain and threaded list of rangesets. */
- struct list_head rangeset_list;
- struct domain *domain;
-
- /* Ordered list of ranges contained in this set, and protecting lock. */
- struct list_head range_list;
-
- /* Number of ranges that can be allocated */
- long nr_ranges;
- rwlock_t lock;
-
- /* Pretty-printing name. */
- char name[32];
-
- /* RANGESETF flags. */
- unsigned int flags;
-};
-
/*****************************
* Private range functions hide the underlying linked-list implemnetation.
*/
@@ -57,8 +32,7 @@ static struct range *find_range(
return x;
}
-/* Return the lowest range in the set r, or NULL if r is empty. */
-static struct range *first_range(
+struct range *first_range(
struct rangeset *r)
{
if ( list_empty(&r->range_list) )
@@ -66,8 +40,7 @@ static struct range *first_range(
return list_entry(r->range_list.next, struct range, list);
}
-/* Return range following x in ascending order, or NULL if x is the highest. */
-static struct range *next_range(
+struct range *next_range(
struct rangeset *r, struct range *x)
{
if ( x->list.next == &r->range_list )
diff --git a/xen/include/xen/rangeset.h b/xen/include/xen/rangeset.h
index 96c9180825..cd80fd9179 100644
--- a/xen/include/xen/rangeset.h
+++ b/xen/include/xen/rangeset.h
@@ -13,7 +13,37 @@
#include <xen/types.h>
struct domain;
-struct rangeset;
+
+struct rangeset {
+ /* Owning domain and threaded list of rangesets. */
+ struct list_head rangeset_list;
+ struct domain *domain;
+
+ /* Ordered list of ranges contained in this set, and protecting lock. */
+ struct list_head range_list;
+
+ /* Number of ranges that can be allocated */
+ long nr_ranges;
+ rwlock_t lock;
+
+ /* Pretty-printing name. */
+ char name[32];
+
+ /* RANGESETF flags. */
+ unsigned int flags;
+};
+
+/* An inclusive range [s,e] and pointer to next range in ascending order. */
+struct range {
+ struct list_head list;
+ unsigned long s, e;
+};
+
+/* Return the lowest range in the set r, or NULL if r is empty. */
+struct range *first_range(struct rangeset *r);
+
+/* Return range following x in ascending order, or NULL if x is the highest. */
+struct range *next_range(struct rangeset *r, struct range *x);
/*
* Initialise/destroy per-domain rangeset information.
--
2.34.1
