From patchwork Fri Oct 28 01:37:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 688025 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 ozlabs.org (Postfix) with ESMTPS id 3t4nGB553Zz9snk for ; Fri, 28 Oct 2016 13:07:46 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b=nPF4exd6; dkim-atps=neutral Received: from localhost ([::1]:45634 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzwa8-0000y6-GN for incoming@patchwork.ozlabs.org; Thu, 27 Oct 2016 22:07:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzw8z-0002TY-Qn for qemu-devel@nongnu.org; Thu, 27 Oct 2016 21:39:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzw8y-0003De-Tc for qemu-devel@nongnu.org; Thu, 27 Oct 2016 21:39:41 -0400 Received: from ozlabs.org ([103.22.144.67]:33693) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bzw8y-0003BY-IT; Thu, 27 Oct 2016 21:39:40 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3t4mcR26B7z9vF9; Fri, 28 Oct 2016 12:38:28 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1477618711; bh=RBLTQj3HwrwEz3uy5Dwha80VUWhzZ0zXyfvvOmE8jNY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nPF4exd64sBpzRy4MIsaVikBNcBled4wdB4TZ9qKLAl+gmotIELFq+U0ozSUuuWZn 5LvCf2eO2whwYUDKnZqgLXTP8TERLEF90eOlI5xPfbMJvK4iJlZHAvgw1pdjK3aGs3 FDyrFG7Yh2GTJsG4TJKVy/+gthT4yj3Xid3UCIXo= From: David Gibson To: peter.maydell@linaro.org Date: Fri, 28 Oct 2016 12:37:21 +1100 Message-Id: <1477618694-21019-21-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477618694-21019-1-git-send-email-david@gibson.dropbear.id.au> References: <1477618694-21019-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 20/73] 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, qemu-devel@nongnu.org, aik@ozlabs.ru, mark.cave-ayland@ilande.co.uk, agraf@suse.de, mdroth@linux.vnet.ibm.com, qemu-ppc@nongnu.org, clg@kaod.org, bharata@linux.vnet.ibm.com, David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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);