db47ea85b4
We backport some bug fixing patches form qemu-stable-4.1.1 branch of upstream. Signed-off-by: Ying Fang <fangying1@huawei.com>
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
From 026ef4aabd2d533d1d2f206bd3312fb1b1674058 Mon Sep 17 00:00:00 2001
|
|
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
Date: Wed, 14 Aug 2019 18:55:34 +0100
|
|
Subject: [PATCH] memory: Provide an equality function for MemoryRegionSections
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Provide a comparison function that checks all the fields are the same.
|
|
|
|
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
Message-Id: <20190814175535.2023-3-dgilbert@redhat.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
(cherry picked from commit 9366cf02e4e31c2a8128904d4d8290a0fad5f888)
|
|
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
---
|
|
include/exec/memory.h | 12 ++++++++++++
|
|
1 file changed, 12 insertions(+)
|
|
|
|
diff --git a/include/exec/memory.h b/include/exec/memory.h
|
|
index f0f0767..ba0ce25 100644
|
|
--- a/include/exec/memory.h
|
|
+++ b/include/exec/memory.h
|
|
@@ -493,6 +493,18 @@ struct MemoryRegionSection {
|
|
bool nonvolatile;
|
|
};
|
|
|
|
+static inline bool MemoryRegionSection_eq(MemoryRegionSection *a,
|
|
+ MemoryRegionSection *b)
|
|
+{
|
|
+ return a->mr == b->mr &&
|
|
+ a->fv == b->fv &&
|
|
+ a->offset_within_region == b->offset_within_region &&
|
|
+ a->offset_within_address_space == b->offset_within_address_space &&
|
|
+ int128_eq(a->size, b->size) &&
|
|
+ a->readonly == b->readonly &&
|
|
+ a->nonvolatile == b->nonvolatile;
|
|
+}
|
|
+
|
|
/**
|
|
* memory_region_init: Initialize a memory region
|
|
*
|
|
--
|
|
1.8.3.1
|
|
|