Re: [Xen-devel] [PATCH] [incremental] xsm/build: Further build fixes following the DMop series

2017-01-26 Thread Daniel De Graaf 

On 01/25/2017 09:24 AM, Andrew Cooper wrote:

Signed-off-by: Andrew Cooper 
---
CC: Jan Beulich 
CC: Daniel De Graaf 
CC: Paul Durrant 
CC: Ian Jackson 

Might be better to merge into one single patch when committed?


Either way (combined with prior patch, original series, or alone):

Acked-by: Daniel De Graaf 


___
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [Xen-devel] [PATCH] [incremental] xsm/build: Further build fixes following the DMop series

2017-01-25 Thread Wei Liu 
On Wed, Jan 25, 2017 at 02:24:28PM +, Andrew Cooper wrote:
> Signed-off-by: Andrew Cooper 
> ---
> CC: Jan Beulich 
> CC: Daniel De Graaf 
> CC: Paul Durrant 
> CC: Ian Jackson 
> 
> Might be better to merge into one single patch when committed?

Yes, we should squash the two patches (the other one being mine posted
earlier this morning). 

___
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[Xen-devel] [PATCH] [incremental] xsm/build: Further build fixes following the DMop series

2017-01-25 Thread Andrew Cooper 
Signed-off-by: Andrew Cooper 
---
CC: Jan Beulich 
CC: Daniel De Graaf 
CC: Paul Durrant 
CC: Ian Jackson 

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