aboutsummaryrefslogtreecommitdiff
path: root/tpm.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2013-07-29 12:22:11 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2013-07-29 10:37:10 -0500
commit8cdd2e0abbf593a38a146d8dfc998754cefbc27a (patch)
tree8252d47bb077e7d7453b79ed99ec343643a517a9 /tpm.c
parent125ee0ed9cad04307498ac2b7b0d51ad8a807360 (diff)
downloadqemu-arm-8cdd2e0abbf593a38a146d8dfc998754cefbc27a.tar.gz
tpm.c: Don't try to put -1 in a variable of type TpmModel
The TpmModel type is an enum (valid values 0 and 1), which means the compiler can legitimately decide that comparisons like 'tpm_models[i] == -1' are never true. (For example it could pick 'unsigned char' as its type for representing the enum.) Avoid this issue by using TPM_MODEL_MAX to mark entries in the tpm_models[] array which aren't filled in, instead of -1. This silences a clang warning: tpm.c:43:27: error: comparison of constant -1 with expression of type 'enum TpmModel' is always false [-Werror,-Wtautological-constant-out-of-range-compare] if (tpm_models[i] == -1) { ~~~~~~~~~~~~~ ^ ~~ Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Message-id: 1375096931-13842-1-git-send-email-peter.maydell@linaro.org Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'tpm.c')
-rw-r--r--tpm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tpm.c b/tpm.c
index f13c9bc80c..d68d69fe39 100644
--- a/tpm.c
+++ b/tpm.c
@@ -32,7 +32,7 @@ static TPMDriverOps const *be_drivers[TPM_MAX_DRIVERS] = {
};
static enum TpmModel tpm_models[TPM_MAX_MODELS] = {
- -1,
+ TPM_MODEL_MAX,
};
int tpm_register_model(enum TpmModel model)
@@ -40,7 +40,7 @@ int tpm_register_model(enum TpmModel model)
int i;
for (i = 0; i < TPM_MAX_MODELS; i++) {
- if (tpm_models[i] == -1) {
+ if (tpm_models[i] == TPM_MODEL_MAX) {
tpm_models[i] = model;
return 0;
}