From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45100) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQDaw-00087H-RX for qemu-devel@nongnu.org; Thu, 21 Jul 2016 09:00:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bQDat-0001Yy-Nf for qemu-devel@nongnu.org; Thu, 21 Jul 2016 09:00:53 -0400 Date: Thu, 21 Jul 2016 22:59:08 +1000 From: David Gibson Message-ID: <20160721125908.GA12120@voom.fritz.box> References: <146908535036.20978.9694390851067824300.stgit@bahia.lan> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="6TrnltStXW4iwmi0" Content-Disposition: inline In-Reply-To: <146908535036.20978.9694390851067824300.stgit@bahia.lan> Subject: Re: [Qemu-devel] [PATCH] xics_kvm: drop extra checking of kernel_xics_fd List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Greg Kurz Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org --6TrnltStXW4iwmi0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jul 21, 2016 at 09:15:50AM +0200, Greg Kurz wrote: > We abort a few lines above if kernel_xics_fd =3D=3D -1. >=20 > This is only code cleanup. >=20 > Signed-off-by: Greg Kurz Applied to ppc-for-2.8 (newly created). > --- > hw/intc/xics_kvm.c | 20 ++++++++------------ > 1 file changed, 8 insertions(+), 12 deletions(-) >=20 > diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c > index edbd62fd1bae..c9caefcf2b0b 100644 > --- a/hw/intc/xics_kvm.c > +++ b/hw/intc/xics_kvm.c > @@ -329,6 +329,7 @@ static void xics_kvm_cpu_setup(XICSState *xics, Power= PCCPU *cpu) > CPUState *cs; > ICPState *ss; > KVMXICSState *xicskvm =3D XICS_SPAPR_KVM(xics); > + int ret; > =20 > cs =3D CPU(cpu); > ss =3D &xics->ss[cs->cpu_index]; > @@ -347,19 +348,14 @@ static void xics_kvm_cpu_setup(XICSState *xics, Pow= erPCCPU *cpu) > return; > } > =20 > - if (xicskvm->kernel_xics_fd !=3D -1) { > - int ret; > - > - ret =3D kvm_vcpu_enable_cap(cs, KVM_CAP_IRQ_XICS, 0, > - xicskvm->kernel_xics_fd, > - kvm_arch_vcpu_id(cs)); > - if (ret < 0) { > - error_report("Unable to connect CPU%ld to kernel XICS: %s", > - kvm_arch_vcpu_id(cs), strerror(errno)); > - exit(1); > - } > - ss->cap_irq_xics_enabled =3D true; > + ret =3D kvm_vcpu_enable_cap(cs, KVM_CAP_IRQ_XICS, 0, xicskvm->kernel= _xics_fd, > + kvm_arch_vcpu_id(cs)); > + if (ret < 0) { > + error_report("Unable to connect CPU%ld to kernel XICS: %s", > + kvm_arch_vcpu_id(cs), strerror(errno)); > + exit(1); > } > + ss->cap_irq_xics_enabled =3D true; > } > =20 > static void xics_kvm_set_nr_irqs(XICSState *xics, uint32_t nr_irqs, >=20 --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --6TrnltStXW4iwmi0 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJXkMccAAoJEGw4ysog2bOSi9EP/Ap+3bP5oyki64nvGu1EVQqO DI4aiqEdndodMfihsBICfHjhb6MDTscjzcyG601zsoPJV7zgBCihuOyQrvkL8EeY T4t/KSqPeQi6pW+V63CLjkFhhviyTBK+4nLZIKoJqMK7NIzXKmYHoLg4Y4PEI+cm lxspQVbZ+2APBfWM1dDwAA3AtKX+rgffyOH4Il3XTDhQN3lncZcv1C7x3I8Aw1YJ ebE9YaN9PYdfu6L5YuV7mlvURQNAsBmmpWUtwRMXsYCGF07kBF18w6loAzZ/5MvD YoJOiHkyzyxn1rMsT/1ekyAv75aoyaVoWwGRL+qQeZ5/dIiYzuQ9h+BE0vDv/ODT 1MVNS0AMrjsoXuViqUaKvPKxOPk5APU5JbGTG/18fW7wKKpEnjcQuFiF5MW6p0eh HX5sQqnoK/67OBJ+2pxQRF2me23gufg/441PWo1CqmebZ6BLJG1WKvhdG7gAAQW9 /3vmDF8sn/V3DRzvoopkLgmkb9Q4V+iWZMflwuybv71mdxvtAcrS7239kRUnuJbj bpL5f4YrClcIM5R3oCh/RcAcTRXfhlA9wMjo7Aiork978bdHm1Iq+BZ3MtuGZsVu rIQawHbtaJK26+wIRWtyhFt3Iv5wPp5Fa25YUl15legrbAZ1VJOO8dS/tONrIgag 1xmC5kjmH85hTfnvudn8 =DOff -----END PGP SIGNATURE----- --6TrnltStXW4iwmi0--