From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ur2nR-0001eS-Id for qemu-devel@nongnu.org; Mon, 24 Jun 2013 05:10:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ur2nO-0007Eb-Gr for qemu-devel@nongnu.org; Mon, 24 Jun 2013 05:10:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50592) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ur2nO-0007ES-7g for qemu-devel@nongnu.org; Mon, 24 Jun 2013 05:10:46 -0400 From: Stefan Hajnoczi Date: Mon, 24 Jun 2013 11:10:14 +0200 Message-Id: <1372065035-19601-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1372065035-19601-1-git-send-email-stefanha@redhat.com> References: <1372065035-19601-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 02/23] ide: Convert WIN_DSM to ide_cmd_table handler List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Anthony Liguori , Stefan Hajnoczi From: Kevin Wolf Signed-off-by: Kevin Wolf Signed-off-by: Stefan Hajnoczi --- hw/ide/core.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index cd9de14..567515e 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -1004,6 +1004,21 @@ void ide_ioport_write(void *opaque, uint32_t addr, uint32_t val) } } +static bool cmd_data_set_management(IDEState *s, uint8_t cmd) +{ + switch (s->feature) { + case DSM_TRIM: + if (s->bs) { + ide_sector_start_dma(s, IDE_DMA_TRIM); + return false; + } + break; + } + + ide_abort_command(s); + return true; +} + #define HD_OK (1u << IDE_HD) #define CD_OK (1u << IDE_CD) #define CFA_OK (1u << IDE_CFATA) @@ -1021,7 +1036,7 @@ static const struct { } ide_cmd_table[0x100] = { /* NOP not implemented, mandatory for CD */ [CFA_REQ_EXT_ERROR_CODE] = { NULL, CFA_OK }, - [WIN_DSM] = { NULL, ALL_OK }, + [WIN_DSM] = { cmd_data_set_management, ALL_OK }, [WIN_DEVICE_RESET] = { NULL, CD_OK }, [WIN_RECAL] = { NULL, HD_CFA_OK }, [WIN_READ] = { NULL, ALL_OK }, @@ -1129,18 +1144,6 @@ void ide_exec_cmd(IDEBus *bus, uint32_t val) } switch(val) { - case WIN_DSM: - switch (s->feature) { - case DSM_TRIM: - if (!s->bs) { - goto abort_cmd; - } - ide_sector_start_dma(s, IDE_DMA_TRIM); - break; - default: - goto abort_cmd; - } - break; case WIN_IDENTIFY: if (s->bs && s->drive_kind != IDE_CD) { if (s->drive_kind != IDE_CFATA) -- 1.8.1.4