From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42404) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vapvh-0008B9-8u for qemu-devel@nongnu.org; Mon, 28 Oct 2013 12:44:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VapvY-0000Vx-Qh for qemu-devel@nongnu.org; Mon, 28 Oct 2013 12:44:37 -0400 Received: from mail-qc0-x236.google.com ([2607:f8b0:400d:c01::236]:61163) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VapvY-0000Vp-MK for qemu-devel@nongnu.org; Mon, 28 Oct 2013 12:44:28 -0400 Received: by mail-qc0-f182.google.com with SMTP id n7so4009506qcx.27 for ; Mon, 28 Oct 2013 09:44:28 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 28 Oct 2013 17:43:36 +0100 Message-Id: <1382978620-16641-21-git-send-email-pbonzini@redhat.com> In-Reply-To: <1382978620-16641-1-git-send-email-pbonzini@redhat.com> References: <1382978620-16641-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 20/24] ide: remove restart_cb callback List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com Signed-off-by: Paolo Bonzini --- hw/ide/ahci.c | 5 ----- hw/ide/core.c | 5 ----- hw/ide/internal.h | 1 - hw/ide/macio.c | 5 ----- 4 files changed, 16 deletions(-) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 1d4fb17..9cafee9 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1119,10 +1119,6 @@ static void ahci_irq_set(void *opaque, int n, int level) { } -static void ahci_dma_restart_cb(void *opaque, int running, RunState state) -{ -} - static const IDEDMAOps ahci_dma_ops = { .start_dma = ahci_start_dma, .start_transfer = ahci_start_transfer, @@ -1131,7 +1127,6 @@ static const IDEDMAOps ahci_dma_ops = { .set_unit = ahci_dma_set_unit, .trigger_irq = ahci_dma_trigger_irq, .async_cmd_done = ahci_async_cmd_done, - .restart_cb = ahci_dma_restart_cb, }; void ahci_init(AHCIState *s, DeviceState *qdev, AddressSpace *as, int ports) diff --git a/hw/ide/core.c b/hw/ide/core.c index 256f62a..c07c0d1 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2182,15 +2182,10 @@ static int ide_nop_int(IDEDMA *dma, int x) return 0; } -static void ide_nop_restart(void *opaque, int x, RunState y) -{ -} - static const IDEDMAOps ide_dma_nop_ops = { .prepare_buf = ide_nop_int, .rw_buf = ide_nop_int, .set_unit = ide_nop_int, - .restart_cb = ide_nop_restart, }; static void ide_restart_dma(IDEState *s, enum ide_dma_cmd dma_cmd) diff --git a/hw/ide/internal.h b/hw/ide/internal.h index e24f6cb..1c77ad9 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -436,7 +436,6 @@ struct IDEDMAOps { DMAVoidFunc *trigger_irq; DMAStopFunc *set_inactive; DMAVoidFunc *async_cmd_done; - DMARestartFunc *restart_cb; DMAVoidFunc *reset; }; diff --git a/hw/ide/macio.c b/hw/ide/macio.c index 3635ddf..d1d40d8 100644 --- a/hw/ide/macio.c +++ b/hw/ide/macio.c @@ -500,10 +500,6 @@ static int ide_nop_int(IDEDMA *dma, int x) return 0; } -static void ide_nop_restart(void *opaque, int x, RunState y) -{ -} - static void ide_dbdma_start(IDEDMA *dma, IDEState *s, BlockDriverCompletionFunc *cb) { @@ -519,7 +515,6 @@ static const IDEDMAOps dbdma_ops = { .prepare_buf = ide_nop_int, .rw_buf = ide_nop_int, .set_unit = ide_nop_int, - .restart_cb = ide_nop_restart, }; static void macio_ide_realizefn(DeviceState *dev, Error **errp) -- 1.8.3.1