* [PATCH] x86/shadow: convert non-const statics
@ 2015-01-28 15:25 Jan Beulich
2015-01-28 15:38 ` Andrew Cooper
2015-01-29 10:55 ` Tim Deegan
0 siblings, 2 replies; 3+ messages in thread
From: Jan Beulich @ 2015-01-28 15:25 UTC (permalink / raw)
To: xen-devel; +Cc: Tim Deegan
[-- Attachment #1: Type: text/plain, Size: 1917 bytes --]
To make obvious that such statics are safe to use, they should be
const. In some of the cases, they don't even need to be static.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/mm/shadow/common.c
+++ b/xen/arch/x86/mm/shadow/common.c
@@ -2164,7 +2164,7 @@ int sh_remove_write_access(struct vcpu *
NULL /* unused */
};
- static unsigned int callback_mask =
+ const unsigned int callback_mask =
1 << SH_type_l1_32_shadow
| 1 << SH_type_fl1_32_shadow
| 1 << SH_type_l1_pae_shadow
@@ -2414,7 +2414,7 @@ int sh_remove_all_mappings(struct vcpu *
NULL /* unused */
};
- static unsigned int callback_mask =
+ const unsigned int callback_mask =
1 << SH_type_l1_32_shadow
| 1 << SH_type_fl1_32_shadow
| 1 << SH_type_l1_pae_shadow
@@ -2558,7 +2558,7 @@ void sh_remove_shadows(struct vcpu *v, m
};
/* Another lookup table, for choosing which mask to use */
- static unsigned int masks[SH_type_unused] = {
+ static const unsigned int masks[SH_type_unused] = {
0, /* none */
1 << SH_type_l2_32_shadow, /* l1_32 */
0, /* fl1_32 */
@@ -2685,7 +2685,7 @@ static int sh_clear_up_pointer(struct vc
void sh_reset_l3_up_pointers(struct vcpu *v)
{
- static hash_callback_t callbacks[SH_type_unused] = {
+ static const hash_callback_t callbacks[SH_type_unused] = {
NULL, /* none */
NULL, /* l1_32 */
NULL, /* fl1_32 */
@@ -2703,7 +2703,7 @@ void sh_reset_l3_up_pointers(struct vcpu
NULL, /* p2m */
NULL /* unused */
};
- static unsigned int callback_mask = 1 << SH_type_l3_64_shadow;
+ const unsigned int callback_mask = 1 << SH_type_l3_64_shadow;
hash_foreach(v, callback_mask, callbacks, _mfn(INVALID_MFN));
}
[-- Attachment #2: x86-shadow-static-const.patch --]
[-- Type: text/plain, Size: 1952 bytes --]
x86/shadow: convert non-const statics
To make obvious that such statics are safe to use, they should be
const. In some of the cases, they don't even need to be static.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/mm/shadow/common.c
+++ b/xen/arch/x86/mm/shadow/common.c
@@ -2164,7 +2164,7 @@ int sh_remove_write_access(struct vcpu *
NULL /* unused */
};
- static unsigned int callback_mask =
+ const unsigned int callback_mask =
1 << SH_type_l1_32_shadow
| 1 << SH_type_fl1_32_shadow
| 1 << SH_type_l1_pae_shadow
@@ -2414,7 +2414,7 @@ int sh_remove_all_mappings(struct vcpu *
NULL /* unused */
};
- static unsigned int callback_mask =
+ const unsigned int callback_mask =
1 << SH_type_l1_32_shadow
| 1 << SH_type_fl1_32_shadow
| 1 << SH_type_l1_pae_shadow
@@ -2558,7 +2558,7 @@ void sh_remove_shadows(struct vcpu *v, m
};
/* Another lookup table, for choosing which mask to use */
- static unsigned int masks[SH_type_unused] = {
+ static const unsigned int masks[SH_type_unused] = {
0, /* none */
1 << SH_type_l2_32_shadow, /* l1_32 */
0, /* fl1_32 */
@@ -2685,7 +2685,7 @@ static int sh_clear_up_pointer(struct vc
void sh_reset_l3_up_pointers(struct vcpu *v)
{
- static hash_callback_t callbacks[SH_type_unused] = {
+ static const hash_callback_t callbacks[SH_type_unused] = {
NULL, /* none */
NULL, /* l1_32 */
NULL, /* fl1_32 */
@@ -2703,7 +2703,7 @@ void sh_reset_l3_up_pointers(struct vcpu
NULL, /* p2m */
NULL /* unused */
};
- static unsigned int callback_mask = 1 << SH_type_l3_64_shadow;
+ const unsigned int callback_mask = 1 << SH_type_l3_64_shadow;
hash_foreach(v, callback_mask, callbacks, _mfn(INVALID_MFN));
}
[-- Attachment #3: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] x86/shadow: convert non-const statics
2015-01-28 15:25 [PATCH] x86/shadow: convert non-const statics Jan Beulich
@ 2015-01-28 15:38 ` Andrew Cooper
2015-01-29 10:55 ` Tim Deegan
1 sibling, 0 replies; 3+ messages in thread
From: Andrew Cooper @ 2015-01-28 15:38 UTC (permalink / raw)
To: Jan Beulich, xen-devel; +Cc: Tim Deegan
[-- Attachment #1.1: Type: text/plain, Size: 2201 bytes --]
On 28/01/15 15:25, Jan Beulich wrote:
> To make obvious that such statics are safe to use, they should be
> const. In some of the cases, they don't even need to be static.
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
>
> --- a/xen/arch/x86/mm/shadow/common.c
> +++ b/xen/arch/x86/mm/shadow/common.c
> @@ -2164,7 +2164,7 @@ int sh_remove_write_access(struct vcpu *
> NULL /* unused */
> };
>
> - static unsigned int callback_mask =
> + const unsigned int callback_mask =
> 1 << SH_type_l1_32_shadow
> | 1 << SH_type_fl1_32_shadow
> | 1 << SH_type_l1_pae_shadow
> @@ -2414,7 +2414,7 @@ int sh_remove_all_mappings(struct vcpu *
> NULL /* unused */
> };
>
> - static unsigned int callback_mask =
> + const unsigned int callback_mask =
> 1 << SH_type_l1_32_shadow
> | 1 << SH_type_fl1_32_shadow
> | 1 << SH_type_l1_pae_shadow
> @@ -2558,7 +2558,7 @@ void sh_remove_shadows(struct vcpu *v, m
> };
>
> /* Another lookup table, for choosing which mask to use */
> - static unsigned int masks[SH_type_unused] = {
> + static const unsigned int masks[SH_type_unused] = {
> 0, /* none */
> 1 << SH_type_l2_32_shadow, /* l1_32 */
> 0, /* fl1_32 */
> @@ -2685,7 +2685,7 @@ static int sh_clear_up_pointer(struct vc
>
> void sh_reset_l3_up_pointers(struct vcpu *v)
> {
> - static hash_callback_t callbacks[SH_type_unused] = {
> + static const hash_callback_t callbacks[SH_type_unused] = {
> NULL, /* none */
> NULL, /* l1_32 */
> NULL, /* fl1_32 */
> @@ -2703,7 +2703,7 @@ void sh_reset_l3_up_pointers(struct vcpu
> NULL, /* p2m */
> NULL /* unused */
> };
> - static unsigned int callback_mask = 1 << SH_type_l3_64_shadow;
> + const unsigned int callback_mask = 1 << SH_type_l3_64_shadow;
>
> hash_foreach(v, callback_mask, callbacks, _mfn(INVALID_MFN));
> }
>
>
>
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
[-- Attachment #1.2: Type: text/html, Size: 3077 bytes --]
[-- Attachment #2: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] x86/shadow: convert non-const statics
2015-01-28 15:25 [PATCH] x86/shadow: convert non-const statics Jan Beulich
2015-01-28 15:38 ` Andrew Cooper
@ 2015-01-29 10:55 ` Tim Deegan
1 sibling, 0 replies; 3+ messages in thread
From: Tim Deegan @ 2015-01-29 10:55 UTC (permalink / raw)
To: Jan Beulich; +Cc: xen-devel
At 15:25 +0000 on 28 Jan (1422455118), Jan Beulich wrote:
> To make obvious that such statics are safe to use, they should be
> const. In some of the cases, they don't even need to be static.
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
Happy to have the consts, but please keep the statics, to make it
clear that they are compile-time constants.
Cheers,
Tim.
> --- a/xen/arch/x86/mm/shadow/common.c
> +++ b/xen/arch/x86/mm/shadow/common.c
> @@ -2164,7 +2164,7 @@ int sh_remove_write_access(struct vcpu *
> NULL /* unused */
> };
>
> - static unsigned int callback_mask =
> + const unsigned int callback_mask =
> 1 << SH_type_l1_32_shadow
> | 1 << SH_type_fl1_32_shadow
> | 1 << SH_type_l1_pae_shadow
> @@ -2414,7 +2414,7 @@ int sh_remove_all_mappings(struct vcpu *
> NULL /* unused */
> };
>
> - static unsigned int callback_mask =
> + const unsigned int callback_mask =
> 1 << SH_type_l1_32_shadow
> | 1 << SH_type_fl1_32_shadow
> | 1 << SH_type_l1_pae_shadow
> @@ -2558,7 +2558,7 @@ void sh_remove_shadows(struct vcpu *v, m
> };
>
> /* Another lookup table, for choosing which mask to use */
> - static unsigned int masks[SH_type_unused] = {
> + static const unsigned int masks[SH_type_unused] = {
> 0, /* none */
> 1 << SH_type_l2_32_shadow, /* l1_32 */
> 0, /* fl1_32 */
> @@ -2685,7 +2685,7 @@ static int sh_clear_up_pointer(struct vc
>
> void sh_reset_l3_up_pointers(struct vcpu *v)
> {
> - static hash_callback_t callbacks[SH_type_unused] = {
> + static const hash_callback_t callbacks[SH_type_unused] = {
> NULL, /* none */
> NULL, /* l1_32 */
> NULL, /* fl1_32 */
> @@ -2703,7 +2703,7 @@ void sh_reset_l3_up_pointers(struct vcpu
> NULL, /* p2m */
> NULL /* unused */
> };
> - static unsigned int callback_mask = 1 << SH_type_l3_64_shadow;
> + const unsigned int callback_mask = 1 << SH_type_l3_64_shadow;
>
> hash_foreach(v, callback_mask, callbacks, _mfn(INVALID_MFN));
> }
>
>
>
> x86/shadow: convert non-const statics
>
> To make obvious that such statics are safe to use, they should be
> const. In some of the cases, they don't even need to be static.
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
>
> --- a/xen/arch/x86/mm/shadow/common.c
> +++ b/xen/arch/x86/mm/shadow/common.c
> @@ -2164,7 +2164,7 @@ int sh_remove_write_access(struct vcpu *
> NULL /* unused */
> };
>
> - static unsigned int callback_mask =
> + const unsigned int callback_mask =
> 1 << SH_type_l1_32_shadow
> | 1 << SH_type_fl1_32_shadow
> | 1 << SH_type_l1_pae_shadow
> @@ -2414,7 +2414,7 @@ int sh_remove_all_mappings(struct vcpu *
> NULL /* unused */
> };
>
> - static unsigned int callback_mask =
> + const unsigned int callback_mask =
> 1 << SH_type_l1_32_shadow
> | 1 << SH_type_fl1_32_shadow
> | 1 << SH_type_l1_pae_shadow
> @@ -2558,7 +2558,7 @@ void sh_remove_shadows(struct vcpu *v, m
> };
>
> /* Another lookup table, for choosing which mask to use */
> - static unsigned int masks[SH_type_unused] = {
> + static const unsigned int masks[SH_type_unused] = {
> 0, /* none */
> 1 << SH_type_l2_32_shadow, /* l1_32 */
> 0, /* fl1_32 */
> @@ -2685,7 +2685,7 @@ static int sh_clear_up_pointer(struct vc
>
> void sh_reset_l3_up_pointers(struct vcpu *v)
> {
> - static hash_callback_t callbacks[SH_type_unused] = {
> + static const hash_callback_t callbacks[SH_type_unused] = {
> NULL, /* none */
> NULL, /* l1_32 */
> NULL, /* fl1_32 */
> @@ -2703,7 +2703,7 @@ void sh_reset_l3_up_pointers(struct vcpu
> NULL, /* p2m */
> NULL /* unused */
> };
> - static unsigned int callback_mask = 1 << SH_type_l3_64_shadow;
> + const unsigned int callback_mask = 1 << SH_type_l3_64_shadow;
>
> hash_foreach(v, callback_mask, callbacks, _mfn(INVALID_MFN));
> }
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-01-29 10:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-28 15:25 [PATCH] x86/shadow: convert non-const statics Jan Beulich
2015-01-28 15:38 ` Andrew Cooper
2015-01-29 10:55 ` Tim Deegan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.