From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Mon, 27 Feb 2017 11:47:10 +0000 (+0000)
Subject: x86/shadow: Fix build with CONFIG_SHADOW_PAGING=n following c/s 45ac805
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~2673
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3564f9e400c417fc3d47b732f474019c494434f9;p=xen.git

x86/shadow: Fix build with CONFIG_SHADOW_PAGING=n following c/s 45ac805

c/s 45ac805 "x86/paging: Package up the log dirty function pointers" neglected
the case when CONFIG_SHADOW_PAGING is disabled.  Make a similar adjustment to
the none stubs.

Spotted by a Travis RANDCONFIG run.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by:  Tim Deegan <tim@xen.org>
---

diff --git a/xen/arch/x86/mm/shadow/none.c b/xen/arch/x86/mm/shadow/none.c
index 69e56c5c4e..41ce5931f7 100644
--- a/xen/arch/x86/mm/shadow/none.c
+++ b/xen/arch/x86/mm/shadow/none.c
@@ -20,8 +20,13 @@ static void _clean_dirty_bitmap(struct domain *d)
 
 int shadow_domain_init(struct domain *d, unsigned int domcr_flags)
 {
-    paging_log_dirty_init(d, _enable_log_dirty,
-                          _disable_log_dirty, _clean_dirty_bitmap);
+    static const struct log_dirty_ops sh_none_ops = {
+        .enable  = _enable_log_dirty,
+        .disable = _disable_log_dirty,
+        .clean   = _clean_dirty_bitmap,
+    };
+
+    paging_log_dirty_init(d, &sh_none_ops);
     return is_pv_domain(d) ? 0 : -EOPNOTSUPP;
 }