Signed-off-by: Andrew Cooper <andrew.coop...@citrix.com>
---
CC: Jan Beulich <jbeul...@suse.com>
CC: George Dunlap <george.dun...@eu.citrix.com>
CC: Konrad Rzeszutek Wilk <konrad.w...@oracle.com>
CC: Stefano Stabellini <sstabell...@kernel.org>
CC: Tim Deegan <t...@xen.org>
---
xen/common/domctl.c | 2 +-
xen/common/xmalloc_tlsf.c | 4 ++--
xen/include/xen/sched.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/xen/common/domctl.c b/xen/common/domctl.c
index 8f25131..cf7928c 100644
--- a/xen/common/domctl.c
+++ b/xen/common/domctl.c
@@ -188,7 +188,7 @@ void getdomaininfo(struct domain *d, struct
xen_domctl_getdomaininfo *info)
(d->controller_pause_count > 0 ? XEN_DOMINF_paused : 0) |
(d->debugger_attached ? XEN_DOMINF_debugged : 0) |
(d->is_xenstore ? XEN_DOMINF_xs_domain : 0) |
- d->shutdown_code << XEN_DOMINF_shutdownshift;
+ (unsigned int)d->shutdown_code << XEN_DOMINF_shutdownshift;
switch ( d->guest_type )
{
diff --git a/xen/common/xmalloc_tlsf.c b/xen/common/xmalloc_tlsf.c
index b13317e..6c1b882 100644
--- a/xen/common/xmalloc_tlsf.c
+++ b/xen/common/xmalloc_tlsf.c
@@ -177,7 +177,7 @@ static inline void MAPPING_INSERT(unsigned long r, int *fl,
int *sl)
static inline struct bhdr *FIND_SUITABLE_BLOCK(struct xmem_pool *p, int *fl,
int *sl)
{
- u32 tmp = p->sl_bitmap[*fl] & (~0 << *sl);
+ u32 tmp = p->sl_bitmap[*fl] & (~0u << *sl);
struct bhdr *b = NULL;
if ( tmp )
@@ -187,7 +187,7 @@ static inline struct bhdr *FIND_SUITABLE_BLOCK(struct
xmem_pool *p, int *fl,
}
else
{
- *fl = ffs(p->fl_bitmap & (~0 << (*fl + 1))) - 1;
+ *fl = ffs(p->fl_bitmap & (~0u << (*fl + 1))) - 1;
if ( likely(*fl > 0) )
{
*sl = ffs(p->sl_bitmap[*fl]) - 1;
diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
index 888bc19..bb4ee4e 100644
--- a/xen/include/xen/sched.h
+++ b/xen/include/xen/sched.h
@@ -483,7 +483,7 @@ extern struct vcpu *idle_vcpu[NR_CPUS];
#define is_idle_domain(d) ((d)->domain_id == DOMID_IDLE)
#define is_idle_vcpu(v) (is_idle_domain((v)->domain))
-#define DOMAIN_DESTROYED (1<<31) /* assumes atomic_t is >= 32 bits */
+#define DOMAIN_DESTROYED (1u << 31) /* assumes atomic_t is >= 32 bits */
#define put_domain(_d) \
if ( atomic_dec_and_test(&(_d)->refcnt) ) domain_destroy(_d)
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
