From patchwork Mon Oct 28 16:43:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 286611 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CDA152C00B1 for ; Tue, 29 Oct 2013 03:54:24 +1100 (EST) Received: from localhost ([::1]:42248 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vaq58-0005WB-WC for incoming@patchwork.ozlabs.org; Mon, 28 Oct 2013 12:54:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42373) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vapvd-00083E-8D for qemu-devel@nongnu.org; Mon, 28 Oct 2013 12:44:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VapvU-0000V4-RY for qemu-devel@nongnu.org; Mon, 28 Oct 2013 12:44:33 -0400 Received: from mail-qa0-x230.google.com ([2607:f8b0:400d:c00::230]:34886) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VapvU-0000Uz-L1 for qemu-devel@nongnu.org; Mon, 28 Oct 2013 12:44:24 -0400 Received: by mail-qa0-f48.google.com with SMTP id k4so2254019qaq.0 for ; Mon, 28 Oct 2013 09:44:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=tCnvMrDgBL3fVjeawXh9ZSzd1vZwRpKFAXEKdL4pZ+E=; b=OWbmSqud6im/39Kxc+3l72QA0kyNojrxPPcIYqgmD6VF+NtaFjApo0sMYpqfubQOGF FW+8COCovSz8ZOQKENog4nQ4oPB3bqY5G8GTgFvkz2xmgHssocatGGdMG3lVHe7HXhWv 5BwIPZC9D1KdB8Mwfzueup1Ox7ftn40U+1UGmtpjPcNUO364hk91uTxGzlMm1CC/FsD+ YMWaRwWjSy3yiLorUQCgoxveRpf8HvLkYL4F1zmm5f7IBF4MwNRpGXyvwx+OA2g89090 gmrLVx8U6yDRk7uVRytE7C86HH27bhUFxQlTbLl89oASGJg7bW2ysGp0+bsjLvtIuxJ1 JqBQ== X-Received: by 10.224.66.5 with SMTP id l5mr26592189qai.31.1382978664296; Mon, 28 Oct 2013 09:44:24 -0700 (PDT) Received: from yakj.usersys.redhat.com (net-37-117-137-113.cust.dsl.vodafone.it. [37.117.137.113]) by mx.google.com with ESMTPSA id x1sm54751857qai.6.2013.10.28.09.44.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Oct 2013 09:44:23 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 28 Oct 2013 17:43:34 +0100 Message-Id: <1382978620-16641-19-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1382978620-16641-1-git-send-email-pbonzini@redhat.com> References: <1382978620-16641-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c00::230 Cc: mst@redhat.com Subject: [Qemu-devel] [PATCH 18/24] ide: pass IDEBus to the restart_cb X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- hw/ide/core.c | 2 +- hw/ide/pci.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 93cfd46..5820fad 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2195,7 +2195,7 @@ static const IDEDMAOps ide_dma_nop_ops = { void ide_register_restart_cb(IDEBus *bus) { - qemu_add_vm_change_state_handler(bus->dma->ops->restart_cb, bus->dma); + qemu_add_vm_change_state_handler(bus->dma->ops->restart_cb, bus); } static IDEDMA ide_dma_nop = { diff --git a/hw/ide/pci.c b/hw/ide/pci.c index 4df50dc..9d26a26 100644 --- a/hw/ide/pci.c +++ b/hw/ide/pci.c @@ -199,8 +199,8 @@ static void ide_restart_dma(IDEState *s, enum ide_dma_cmd dma_cmd) /* TODO This should be common IDE code */ static void bmdma_restart_bh(void *opaque) { - BMDMAState *bm = opaque; - IDEBus *bus = bm->bus; + IDEBus *bus = opaque; + BMDMAState *bm = DO_UPCAST(BMDMAState, dma, bus->dma); IDEState *s; bool is_read; int error_status; @@ -240,8 +240,8 @@ static void bmdma_restart_bh(void *opaque) static void bmdma_restart_cb(void *opaque, int running, RunState state) { - IDEDMA *dma = opaque; - BMDMAState *bm = DO_UPCAST(BMDMAState, dma, dma); + IDEBus *bus = opaque; + BMDMAState *bm = DO_UPCAST(BMDMAState, dma, bus->dma); if (!running) return;