From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41303) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSgHL-0002dx-PT for qemu-devel@nongnu.org; Tue, 12 Jun 2018 06:11:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSgHG-0001xb-S0 for qemu-devel@nongnu.org; Tue, 12 Jun 2018 06:11:55 -0400 Received: from 8.mo2.mail-out.ovh.net ([188.165.52.147]:51034) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fSgHG-0001x7-Ka for qemu-devel@nongnu.org; Tue, 12 Jun 2018 06:11:50 -0400 Received: from player735.ha.ovh.net (unknown [10.109.120.10]) by mo2.mail-out.ovh.net (Postfix) with ESMTP id 6C01813BE66 for ; Tue, 12 Jun 2018 12:11:49 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Date: Tue, 12 Jun 2018 12:11:35 +0200 Message-Id: <20180612101135.23852-1-clg@kaod.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2] xics_kvm: fix a build break List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-ppc@nongnu.org Cc: qemu-devel@nongnu.org, David Gibson , Greg Kurz , Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= On CentOS 7.5, gcc-4.8.5-28.el7_5.1.ppc64le fails to build QEMU due to : hw/intc/xics_kvm.c: In function =E2=80=98ics_set_kvm_state=E2=80=99: hw/intc/xics_kvm.c:281:13: error: =E2=80=98ret=E2=80=99 may be used uni= nitialized in this function [-Werror=3Dmaybe-uninitialized] return ret; Fix the breakage and also remove the extra error reporting as kvm_device_access() already provides a substantial error message. Signed-off-by: C=C3=A9dric Le Goater --- Greg, can you please test ? RHEL7.5 does not catch the issue with the same compiler level :/ I don't understand why. hw/intc/xics_kvm.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c index 8bdf6afe82a0..8dba2f84e71e 100644 --- a/hw/intc/xics_kvm.c +++ b/hw/intc/xics_kvm.c @@ -186,8 +186,7 @@ static void ics_get_kvm_state(ICSState *ics) kvm_device_access(kernel_xics_fd, KVM_DEV_XICS_GRP_SOURCES, i + ics->offset, &state, false, &local_err); if (local_err) { - error_report("Unable to retrieve KVM interrupt controller st= ate" - " for IRQ %d: %s", i + ics->offset, strerror(errno))= ; + error_report_err(local_err); exit(1); } =20 @@ -273,11 +272,10 @@ static int ics_set_kvm_state(ICSState *ics, int ver= sion_id) state |=3D KVM_XICS_QUEUED; } =20 - kvm_device_access(kernel_xics_fd, KVM_DEV_XICS_GRP_SOURCES, - i + ics->offset, &state, true, &local_err); + ret =3D kvm_device_access(kernel_xics_fd, KVM_DEV_XICS_GRP_SOURC= ES, + i + ics->offset, &state, true, &local_er= r); if (local_err) { - error_report("Unable to restore KVM interrupt controller sta= te" - " for IRQs %d: %s", i + ics->offset, strerror(errno)= ); + error_report_err(local_err); return ret; } } --=20 2.13.6