From patchwork Tue Jan 23 22:44:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 10181119 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1CD69601D5 for ; Tue, 23 Jan 2018 22:44:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 06AB928811 for ; Tue, 23 Jan 2018 22:44:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EEF6128816; Tue, 23 Jan 2018 22:44:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 37BDC28811 for ; Tue, 23 Jan 2018 22:44:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932327AbeAWWoR (ORCPT ); Tue, 23 Jan 2018 17:44:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40702 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932267AbeAWWoQ (ORCPT ); Tue, 23 Jan 2018 17:44:16 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0E0C6A842; Tue, 23 Jan 2018 22:44:16 +0000 (UTC) Received: from redhat.com (ovpn-120-26.rdu2.redhat.com [10.10.120.26]) by smtp.corp.redhat.com (Postfix) with SMTP id 41F9D17AF8; Tue, 23 Jan 2018 22:44:15 +0000 (UTC) Date: Wed, 24 Jan 2018 00:44:14 +0200 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Jose Ricardo Ziviani , Anton Blanchard , Daniel Henrique Barboza , Paolo Bonzini , kvm@vger.kernel.org Subject: [PULL 1/1] kvm-all: Partially reverts 4fe6d78b2e to remove the cleanup call Message-ID: <1516747387-31760-2-git-send-email-mst@redhat.com> References: <1516747387-31760-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1516747387-31760-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 23 Jan 2018 22:44:16 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jose Ricardo Ziviani This commit partially reverts the commit 4fe6d78b2e because of issues reported in the virtio. Examples: $ qemu-system-ppc64 -cpu POWER8 -nographic -vga none -m 4G \ -M pseries,accel=kvm -netdev type=user,id=net0 \ -device virtio-net-pci,netdev=net0 -drive file=../disk.qcow2,if=virtio Populating /vdevice/nvram@71000001 Populating /vdevice/v-scsi@71000002 SCSI: Looking for devices 8200000000000000 CD-ROM : "QEMU QEMU CD-ROM 2.5+" Populating /pci@800000020000000 00 0000 (D) : 1af4 1000 virtio [ net ] Aborted $ qemu-system-x86_64 -m 4G -enable-kvm -drive file=util.qcow2,if=virtio Running QEMU with GTK 2.x is deprecated, and will be removed in a future release. Please switch to GTK 3.x instead [1] 5282 abort Reference http://lists.nongnu.org/archive/html/qemu-devel/2018-01/msg05457.html Reported-by: Anton Blanchard Signed-off-by: Jose Ricardo Ziviani Reviewed-by: Daniel Henrique Barboza Tested-by: Daniel Henrique Barboza Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- accel/kvm/kvm-all.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 071f4f5..f290f48 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -812,10 +812,6 @@ static void kvm_mem_ioeventfd_del(MemoryListener *listener, if (r < 0) { abort(); } - - if (e->cleanup) { - e->cleanup(e); - } } static void kvm_io_ioeventfd_add(MemoryListener *listener,