From: Frank Blaschka Date: Wed, 21 Jan 2015 15:50:29 +0000 (+0100) Subject: s390x/pci: avoid sign extension in stpcifc X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~209^2~364^2~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c0eb33ab5428edf85a29a4f91f64d6802b6cefaa;p=sdk%2Femulator%2Fqemu.git s390x/pci: avoid sign extension in stpcifc This patch avoids sign extension and fixes a data conversion bug in stpcifc. Both issues where found by Coverity. Reviewed-by: Markus Armbruster Signed-off-by: Frank Blaschka Signed-off-by: Cornelia Huck --- diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c index 5ea13e5d79..c2691841fd 100644 --- a/hw/s390x/s390-pci-inst.c +++ b/hw/s390x/s390-pci-inst.c @@ -784,10 +784,10 @@ int stpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba) stq_p(&fib.aisb, pbdev->routes.adapter.summary_addr); stq_p(&fib.fmb_addr, pbdev->fmb_addr); - data = (pbdev->isc << 28) | (pbdev->noi << 16) | - (pbdev->routes.adapter.ind_offset << 8) | (pbdev->sum << 7) | - pbdev->routes.adapter.summary_offset; - stw_p(&fib.data, data); + data = ((uint32_t)pbdev->isc << 28) | ((uint32_t)pbdev->noi << 16) | + ((uint32_t)pbdev->routes.adapter.ind_offset << 8) | + ((uint32_t)pbdev->sum << 7) | pbdev->routes.adapter.summary_offset; + stl_p(&fib.data, data); if (pbdev->fh >> ENABLE_BIT_OFFSET) { fib.fc |= 0x80;