[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 07/15] ahci: correct types in NCQTransferState
From: |
John Snow |
Subject: |
[Qemu-block] [PATCH v2 07/15] ahci: correct types in NCQTransferState |
Date: |
Wed, 1 Jul 2015 12:19:30 -0400 |
Signed-off-by: John Snow <address@hidden>
---
hw/ide/ahci.c | 10 +++++-----
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 d996f37..efd07ac 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 47a3122..c728e3a 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;
--
2.1.0
- [Qemu-block] [PATCH v2 00/15] ahci: ncq cleanup, part 2, John Snow, 2015/07/01
- [Qemu-block] [PATCH v2 03/15] ahci: assert is_ncq for process_ncq, John Snow, 2015/07/01
- [Qemu-block] [PATCH v2 04/15] ahci: refactor process_ncq_command, John Snow, 2015/07/01
- [Qemu-block] [PATCH v2 05/15] ahci: factor ncq_finish out of ncq_cb, John Snow, 2015/07/01
- [Qemu-block] [PATCH v2 07/15] ahci: correct types in NCQTransferState,
John Snow <=
- [Qemu-block] [PATCH v2 06/15] ahci: add rwerror=stop support for ncq, John Snow, 2015/07/01
- [Qemu-block] [PATCH v2 01/15] ide: add limit to .prepare_buf(), John Snow, 2015/07/01
- [Qemu-block] [PATCH v2 09/15] qtest/ahci: halted NCQ test, John Snow, 2015/07/01
- [Qemu-block] [PATCH v2 02/15] ahci: stash ncq command, John Snow, 2015/07/01
- [Qemu-block] [PATCH v2 10/15] ahci: add cmd header to ncq transfer state, John Snow, 2015/07/01
- [Qemu-block] [PATCH v2 08/15] ahci: correct ncq sector count, John Snow, 2015/07/01
- [Qemu-block] [PATCH v2 12/15] ahci: ncq migration, John Snow, 2015/07/01