On 9/6/21 3:18 PM, Andrew Cooper wrote:
On 03/09/2021 20:06, Daniel P. Smith wrote:-static inline int xsm_memtype(xsm_default_t def, uint32_t access) +#if 0 +/* Could not find any usages */ +static inline int xsm_memtype(xsm_default_t action, uint32_t access) { return alternative_call(xsm_ops.memtype, access); } +#endifThere wants to be an earlier patch deleting dead code. We don't want to retain this if-0'd out.
I can transition this to a standalone patch at the beginning to drop the benign code.
diff --git a/xen/xsm/dummy.h b/xen/xsm/dummy.h new file mode 100644 index 0000000000..b9a7e8c40f --- /dev/null +++ b/xen/xsm/dummy.h @@ -0,0 +1,739 @@ +/* + * Default XSM hooks - IS_PRIV and IS_PRIV_FOR checks + * + * Author: Daniel De Graaf <dgde...@tyhco.nsa.gov> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2, + * as published by the Free Software Foundation. + * + * + * Dummy XSM hooks implementing the default access check. Each hook should + * have as its first line XSM_DEFAULT_ACTION declaring the privilege level + * required for this access. + */ + +#ifndef __XSM_DUMMY_H__ +#define __XSM_DUMMY_H__ + +#include <xen/sched.h> +#include <xsm/xsm-core.h> +#include <public/hvm/params.h> + +#define XSM_DEFAULT_ACTION(def) xsm_default_t action = def; (void)action + +static always_inline int xsm_default_action( + xsm_default_t action, struct domain *src, struct domain *target) +{ + switch ( action ) {Either here (because you're moving code), or in the style fix, the brace wants to be on the next line.
I will promote to the style patch and carry it through the move. v/r, dps
