From: Wei Liu Date: Wed, 25 Jan 2017 10:43:11 +0000 (+0000) Subject: flask: fix build after the introduction of DMOP X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~2885 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f71628bc159309d264a63fcf3134a702fe04ff69;p=xen.git flask: fix build after the introduction of DMOP In 58cbc034 send_irq permission was removed but there was still reference to it in policy file. Remove the stale reference. And now we also need dm permission. Add that. Signed-off-by: Wei Liu Reviewed-by: Paul Durrant xsm/build: Further build fixes following the DMop series Signed-off-by: Andrew Cooper --- diff --git a/tools/flask/policy/modules/xen.if b/tools/flask/policy/modules/xen.if index 45e5cea04f..f5d254f053 100644 --- a/tools/flask/policy/modules/xen.if +++ b/tools/flask/policy/modules/xen.if @@ -58,7 +58,7 @@ define(`create_domain_common', ` allow $1 $2:mmu { map_read map_write adjust memorymap physmap pinpage mmuext_op updatemp }; allow $1 $2:grant setup; allow $1 $2:hvm { cacheattr getparam hvmctl sethvmc - setparam nested altp2mhvm altp2mhvm_op send_irq }; + setparam nested altp2mhvm altp2mhvm_op }; ') # create_domain(priv, target) diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index 1f659c79de..3cb5492dd3 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 9332ca1af8..4baed39890 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, diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index 36a7df9394..1f7eb35fc8 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -284,6 +284,8 @@ class hvm # HVMOP_altp2m_destroy_p2m HVMOP_altp2m_switch_p2m # HVMOP_altp2m_set_mem_access HVMOP_altp2m_change_gfn altp2mhvm_op +# DMOP + dm } # Class event describes event channels. Interdomain event channels have their