diff options
| author | John Snow <jsnow@redhat.com> | 2015-07-04 02:06:05 -0400 |
|---|---|---|
| committer | John Snow <jsnow@redhat.com> | 2015-07-04 02:06:05 -0400 |
| commit | 9364384de0e3b8a5bdea67ba49bee9ea7f1b8f26 (patch) | |
| tree | 6964a5916fd93ba941985f3f4bc15b153e030acf /hw/ide | |
| parent | 7c03a691077e71a08bbca06568cd97f09537458c (diff) | |
ahci: correct types in NCQTransferState
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1435767578-32743-8-git-send-email-jsnow@redhat.com
Diffstat (limited to 'hw/ide')
| -rw-r--r-- | hw/ide/ahci.c | 10 | ||||
| -rw-r--r-- | hw/ide/ahci.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index d996f37b36..efd07ac804 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -45,7 +45,7 @@ do { \ } while (0) static void check_cmd(AHCIState *s, int port); -static int handle_cmd(AHCIState *s,int port,int slot); +static int handle_cmd(AHCIState *s, int port, uint8_t slot); static void ahci_reset_port(AHCIState *s, int port); static void ahci_write_fis_d2h(AHCIDevice *ad, uint8_t *cmd_fis); static void ahci_init_d2h(AHCIDevice *ad); @@ -506,7 +506,7 @@ static void ahci_reg_init(AHCIState *s) static void check_cmd(AHCIState *s, int port) { AHCIPortRegs *pr = &s->dev[port].port_regs; - int slot; + uint8_t slot; if ((pr->cmd & PORT_CMD_START) && pr->cmd_issue) { for (slot = 0; (slot < 32) && pr->cmd_issue; slot++) { @@ -1039,7 +1039,7 @@ static void execute_ncq_command(NCQTransferState *ncq_tfs) static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis, - int slot) + uint8_t slot) { AHCIDevice *ad = &s->dev[port]; IDEState *ide_state = &ad->port.ifs[0]; @@ -1114,7 +1114,7 @@ static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis, } static void handle_reg_h2d_fis(AHCIState *s, int port, - int slot, uint8_t *cmd_fis) + uint8_t slot, uint8_t *cmd_fis) { IDEState *ide_state = &s->dev[port].port.ifs[0]; AHCICmdHdr *cmd = s->dev[port].cur_cmd; @@ -1198,7 +1198,7 @@ static void handle_reg_h2d_fis(AHCIState *s, int port, ide_exec_cmd(&s->dev[port].port, cmd_fis[2]); } -static int handle_cmd(AHCIState *s, int port, int slot) +static int handle_cmd(AHCIState *s, int port, uint8_t slot) { IDEState *ide_state; uint64_t tbl_addr; diff --git a/hw/ide/ahci.h b/hw/ide/ahci.h index 47a3122270..c728e3a07d 100644 --- a/hw/ide/ahci.h +++ b/hw/ide/ahci.h @@ -260,8 +260,8 @@ typedef struct NCQTransferState { uint64_t lba; uint8_t tag; uint8_t cmd; - int slot; - int used; + uint8_t slot; + bool used; bool halt; } NCQTransferState; |