Commit 4ac557c8 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

ahci: Change data types in preparation for migration 



The size of an int depends on the host, so in order to be able to
migrate these fields, make them either int32_t or bool, depending on the
use.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 1147bb15

hw/ide/ahci.c

+4 −4
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ static void ahci_port_write(AHCIState *s, int port, int offset, uint32_t val) 
            if ((pr->cmd & PORT_CMD_FIS_ON) &&

                !s->dev[port].init_d2h_sent) {

                ahci_init_d2h(&s->dev[port]);

                s->dev[port].init_d2h_sent = 1;

                s->dev[port].init_d2h_sent = true;

            }



            check_cmd(s, port);
@@ -494,7 +494,7 @@ static void ahci_reset_port(AHCIState *s, int port) 
    pr->scr_err = 0;

    pr->scr_act = 0;

    d->busy_slot = -1;

    d->init_d2h_sent = 0;

    d->init_d2h_sent = false;



    ide_state = &s->dev[port].port.ifs[0];

    if (!ide_state->bs) {
@@ -946,7 +946,7 @@ static int handle_cmd(AHCIState *s, int port, int slot) 
            ide_state->hcyl = 0xeb;

            debug_print_fis(ide_state->io_buffer, 0x10);

            ide_state->feature = IDE_FEATURE_DMA;

            s->dev[port].done_atapi_packet = 0;

            s->dev[port].done_atapi_packet = false;

            /* XXX send PIO setup FIS */

        }
@@ -991,7 +991,7 @@ static int ahci_start_transfer(IDEDMA *dma) 


    if (is_atapi && !ad->done_atapi_packet) {

        /* already prepopulated iobuffer */

        ad->done_atapi_packet = 1;

        ad->done_atapi_packet = true;

        goto out;

    }

hw/ide/ahci.h

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

    uint8_t *lst;

    uint8_t *res_fis;

    int done_atapi_packet;

    int busy_slot;

    int init_d2h_sent;

    bool done_atapi_packet;

    int32_t busy_slot;

    bool init_d2h_sent;

    AHCICmdHdr *cur_cmd;

    NCQTransferState ncq_tfs[AHCI_MAX_CMDS];

};
@@ -295,7 +295,7 @@ typedef struct AHCIState { 
    MemoryRegion idp;       /* Index-Data Pair I/O port space */

    unsigned idp_offset;    /* Offset of index in I/O port space */

    uint32_t idp_index;     /* Current IDP index */

    int ports;

    int32_t ports;

    qemu_irq irq;

    DMAContext *dma;

} AHCIState;