From: Cornelia Huck <cornelia.huck@de.ibm.com>
Date: Thu, 26 Mar 2015 09:41:45 +0000 (+0100)
Subject: s390x/ipl: avoid sign extension
X-Git-Tag: v2.3.0-rc2~12^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa92e218df1d;p=thirdparty%2Fqemu.git

s390x/ipl: avoid sign extension

Make s390_update_iplstate() return uint32_t to avoid sign extensions
for cssids > 127. While this doesn't matter in practice yet (as
nobody supports MCSS-E and thus won't see the real cssid), play safe.

Reported-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Jason J. Herne <jjherne@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---

diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index 5c8661347a9..2e26d2aa2c4 100644
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -218,7 +218,7 @@ static Property s390_ipl_properties[] = {
  * - -1 if no valid boot device was found
  * - ccw id of the boot device otherwise
  */
-static uint64_t s390_update_iplstate(CPUS390XState *env, S390IPLState *ipl)
+static uint32_t s390_update_iplstate(CPUS390XState *env, S390IPLState *ipl)
 {
     DeviceState *dev_st;