From patchwork Thu Oct 20 05:11:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 9385915 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 6B0C8607F0 for ; Thu, 20 Oct 2016 05:13:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 604EA29A96 for ; Thu, 20 Oct 2016 05:13:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 54A4029A9E; Thu, 20 Oct 2016 05:13:05 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 51D3129A96 for ; Thu, 20 Oct 2016 05:13:03 +0000 (UTC) Received: from localhost ([::1]:52431 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bx5f4-0005eA-6U for patchwork-qemu-devel@patchwork.kernel.org; Thu, 20 Oct 2016 01:13:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39032) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bx5eV-0005dh-92 for qemu-devel@nongnu.org; Thu, 20 Oct 2016 01:12:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bx5eU-0007WC-9v for qemu-devel@nongnu.org; Thu, 20 Oct 2016 01:12:27 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:39421) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bx5eS-0007T7-Hx; Thu, 20 Oct 2016 01:12:26 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3szxkm3D9Qz9s5w; Thu, 20 Oct 2016 16:12:16 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1476940336; bh=snDk0P+Wx9lY6h3qFLzcJFYBE3BBMzY7sqG5JevmgMo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E7+RUpBnTyRa5lqOKhC4L2T4LOJQcY84j0W2jJKD59GPwwTvc5wVA3uze2AR3Mq06 spsytKeTMANcTYDqpNnffcNTal2ZC93Rykbw7kQt+t2Yyd5eQk88fASMIAqH26+hGh 15ux+2+iuQqCbOoFxFueXCViWxaPTrzjAwS02+z8= From: David Gibson To: aik@ozlabs.ru, mdroth@linux.vnet.ibm.com, groug@kaod.org Date: Thu, 20 Oct 2016 16:11:58 +1100 Message-Id: <1476940330-27705-2-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1476940330-27705-1-git-send-email-david@gibson.dropbear.id.au> References: <1476940330-27705-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PATCH 01/13] pseries: Remove unused callbacks from sPAPR VIO bus state X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, thuth@redhat.com, agraf@suse.de, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The original QOMification of the spapr VIO devices in 3954d33 "spapr: convert to QEMU Object Model (v2)" moved some callbacks from the VIOsPAPRBus structure to the VIOsPAPRDeviceClass. Except, that it forgot to actually remove them from the VIOsPAPRBus structure (which still exists, though it doesn't fulfill quite the same function as it did pre-QOM). This patch removes those now unused callback fields. Signed-off-by: David Gibson Reviewed-by: Alexey Kardashevskiy Reviewed-by: Thomas Huth --- include/hw/ppc/spapr_vio.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/hw/ppc/spapr_vio.h b/include/hw/ppc/spapr_vio.h index 40d0e5f..0b025fd 100644 --- a/include/hw/ppc/spapr_vio.h +++ b/include/hw/ppc/spapr_vio.h @@ -76,8 +76,6 @@ struct VIOsPAPRDevice { struct VIOsPAPRBus { BusState bus; uint32_t next_reg; - int (*init)(VIOsPAPRDevice *dev); - int (*devnode)(VIOsPAPRDevice *dev, void *fdt, int node_off); }; extern VIOsPAPRBus *spapr_vio_bus_init(void);