From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33393) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMqB5-0007az-5H for qemu-devel@nongnu.org; Tue, 12 Jul 2016 01:24:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bMqB3-0006CF-8F for qemu-devel@nongnu.org; Tue, 12 Jul 2016 01:24:14 -0400 From: David Gibson Date: Tue, 12 Jul 2016 15:26:00 +1000 Message-Id: <1468301160-3027-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PATCH] vfio/spapr: Remove stale ioctl() call List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aik@ozlabs.ru, pbonzini@redhat.com Cc: agraf@suse.de, alex.williamson@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson This ioctl() call to VFIO_IOMMU_SPAPR_TCE_REMOVE was left over from an earlier version of the code and has since been folded into vfio_spapr_remove_window(). It wasn't caught because although the argument structure has been removed, the libc function remove() means this didn't trigger a compile failure. The ioctl() was also almost certain to fail silently and harmlessly with the bogus argument, so this wasn't caught in testing. Suggested-by: Paolo Bonzini Signed-off-by: David Gibson --- hw/vfio/spapr.c | 1 - 1 file changed, 1 deletion(-) Alexey, I've already put this tentatively into ppc-for-2.7, but I'd appreciate an ack before I send my next pull request. diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c index 0af3423..7443d34 100644 --- a/hw/vfio/spapr.c +++ b/hw/vfio/spapr.c @@ -177,7 +177,6 @@ int vfio_spapr_create_window(VFIOContainer *container, error_report("Host doesn't support DMA window at %"HWADDR_PRIx", must be %"PRIx64, section->offset_within_address_space, (uint64_t)create.start_addr); - ioctl(container->fd, VFIO_IOMMU_SPAPR_TCE_REMOVE, &remove); return -EINVAL; } trace_vfio_spapr_create_window(create.page_shift, -- 2.7.4