From 0248098d38299125e868013d58fa8e0191185087 Mon Sep 17 00:00:00 2001 From: caoxinhua Date: Sat, 15 Jul 2017 14:42:39 +0800 Subject: [PATCH] Fix 1 << -1 in JOB_MASK macro Calling JOB_MASK(QEMU_JOB_NONE) would result in 1 << -1. Signed-off-by: Jiri Denemark --- src/libxl/libxl_domain.h | 2 +- src/qemu/qemu_domain.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index 3a3890b732..dc40139267 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -30,7 +30,7 @@ # include "libxl_conf.h" # include "virchrdev.h" -# define JOB_MASK(job) (1 << (job - 1)) +# define JOB_MASK(job) (job == 0 ? 0 : 1 << (job - 1)) # define DEFAULT_JOB_MASK \ (JOB_MASK(LIBXL_JOB_DESTROY) | \ JOB_MASK(LIBXL_JOB_ABORT)) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index c34cd37fc4..00226a3fc8 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -50,7 +50,7 @@ # define QEMU_DOMAIN_MIG_BANDWIDTH_MAX (INT64_MAX / (1024 * 1024)) # endif -# define JOB_MASK(job) (1 << (job - 1)) +# define JOB_MASK(job) (job == 0 ? 0 : 1 << (job - 1)) # define QEMU_JOB_DEFAULT_MASK \ (JOB_MASK(QEMU_JOB_QUERY) | \ JOB_MASK(QEMU_JOB_DESTROY) | \