Commit 1147bb15 authored by Jason Baron's avatar Jason Baron Committed by Kevin Wolf
Browse files

ahci: Remove unused AHCIDevice fields 



'dma_status' and 'dma_cb' are written to, but never read.
Remove these fields in preparation for AHCI migration bits.

Signed-off-by: default avatarJason Baron <jbaron@redhat.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 1b095244

hw/ide/ahci.c

+2 −6
Original line number Diff line number Diff line
@@ -1035,11 +1035,10 @@ out: 
static void ahci_start_dma(IDEDMA *dma, IDEState *s,

                           BlockDriverCompletionFunc *dma_cb)

{

#ifdef DEBUG_AHCI

    AHCIDevice *ad = DO_UPCAST(AHCIDevice, dma, dma);



#endif

    DPRINTF(ad->port_no, "\n");

    ad->dma_cb = dma_cb;

    ad->dma_status |= BM_STATUS_DMAING;

    s->io_buffer_offset = 0;

    dma_cb(s, 0);

}
@@ -1095,7 +1094,6 @@ static int ahci_dma_set_unit(IDEDMA *dma, int unit) 
static int ahci_dma_add_status(IDEDMA *dma, int status)

{

    AHCIDevice *ad = DO_UPCAST(AHCIDevice, dma, dma);

    ad->dma_status |= status;

    DPRINTF(ad->port_no, "set status: %x\n", status);



    if (status & BM_STATUS_INT) {
@@ -1114,8 +1112,6 @@ static int ahci_dma_set_inactive(IDEDMA *dma) 
    /* update d2h status */

    ahci_write_fis_d2h(ad, NULL);



    ad->dma_cb = NULL;



    if (!ad->check_bh) {

        /* maybe we still have something to process, check later */

        ad->check_bh = qemu_bh_new(ahci_check_cmd_bh, ad);

hw/ide/ahci.h

+0 −2
Original line number Diff line number Diff line
@@ -281,11 +281,9 @@ struct AHCIDevice { 
    QEMUBH *check_bh;

    uint8_t *lst;

    uint8_t *res_fis;

    int dma_status;

    int done_atapi_packet;

    int busy_slot;

    int init_d2h_sent;

    BlockDriverCompletionFunc *dma_cb;

    AHCICmdHdr *cur_cmd;

    NCQTransferState ncq_tfs[AHCI_MAX_CMDS];

};