Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com>
---
CC: Jan Beulich <jbeul...@suse.com>
CC: Daniel De Graaf <dgde...@tycho.nsa.gov>
CC: Paul Durrant <paul.durr...@citrix.com>
CC: Ian Jackson <ian.jack...@eu.citrix.com>
Might be better to merge into one single patch when committed?
---
xen/xsm/dummy.c | 1 +
xen/xsm/flask/hooks.c | 3 ---
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c
index 1f659c7..3cb5492 100644
--- a/xen/xsm/dummy.c
+++ b/xen/xsm/dummy.c
@@ -156,6 +156,7 @@ void __init xsm_fixup_ops (struct xsm_operations *ops)
set_to_dummy_if_null(ops, ioport_permission);
set_to_dummy_if_null(ops, ioport_mapping);
set_to_dummy_if_null(ops, pmu_op);
+ set_to_dummy_if_null(ops, dm_op);
#endif
set_to_dummy_if_null(ops, xen_version);
}
diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c
index 9332ca1..4baed39 100644
--- a/xen/xsm/flask/hooks.c
+++ b/xen/xsm/flask/hooks.c
@@ -1776,9 +1776,6 @@ static struct xsm_operations flask_ops = {
#ifdef CONFIG_X86
.do_mca = flask_do_mca,
.shadow_control = flask_shadow_control,
- .hvm_set_pci_intx_level = flask_hvm_set_pci_intx_level,
- .hvm_set_isa_irq_level = flask_hvm_set_isa_irq_level,
- .hvm_set_pci_link_route = flask_hvm_set_pci_link_route,
.mem_sharing_op = flask_mem_sharing_op,
.apic = flask_apic,
.machine_memory_map = flask_machine_memory_map,
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
