diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2010-12-19 10:43:09 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2010-12-19 10:43:09 +0000 |
| commit | cdfe17df88b335269ddabc7ade7a6148a1a20f0d (patch) | |
| tree | c0ce20ad4aa3435b5c8d10d0adaae5525ff15c93 | |
| parent | 6a0ee36a47f5b0d090316fe10ceada83136338da (diff) | |
| download | qemu-cdfe17df88b335269ddabc7ade7a6148a1a20f0d.zip qemu-cdfe17df88b335269ddabc7ade7a6148a1a20f0d.tar.gz qemu-cdfe17df88b335269ddabc7ade7a6148a1a20f0d.tar.bz2 | |
ahci: delete write-only variables (v2)
Avoid these warnings with GCC 4.6.0:
/src/qemu/hw/ide/ahci.c: In function 'ahci_reset_port':
/src/qemu/hw/ide/ahci.c:810:14: error: variable 'tfd' set but not used [-Werror=unused-but-set-variable]
/src/qemu/hw/ide/ahci.c: In function 'handle_cmd':
/src/qemu/hw/ide/ahci.c:1103:19: error: variable 'pr' set but not used [-Werror=unused-but-set-variable]
In the tfd variable case, fix the logic also.
CC: Alexander Graf <agraf@suse.de>
CC: Kevin Wolf <kwolf@redhat.com>
Acked-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| -rw-r--r-- | hw/ide/ahci.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 8ae236a..968fdce 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -807,7 +807,6 @@ static void ahci_reset_port(AHCIState *s, int port) AHCIPortRegs *pr = &d->port_regs; IDEState *ide_state = &d->port.ifs[0]; uint8_t init_fis[0x20]; - uint32_t tfd; int i; DPRINTF(port, "reset port\n"); @@ -848,7 +847,7 @@ static void ahci_reset_port(AHCIState *s, int port) s->dev[port].port_state = STATE_RUN; if (!ide_state->bs) { s->dev[port].port_regs.sig = 0; - tfd = (1 << 8) | SEEK_STAT | WRERR_STAT; + ide_state->status = SEEK_STAT | WRERR_STAT; } else if (ide_state->drive_kind == IDE_CD) { s->dev[port].port_regs.sig = SATA_SIGNATURE_CDROM; ide_state->lcyl = 0x14; @@ -1100,7 +1099,6 @@ static void process_ncq_command(AHCIState *s, int port, uint8_t *cmd_fis, static int handle_cmd(AHCIState *s, int port, int slot) { IDEState *ide_state; - AHCIPortRegs *pr; uint32_t opts; uint64_t tbl_addr; AHCICmdHdr *cmd; @@ -1113,7 +1111,6 @@ static int handle_cmd(AHCIState *s, int port, int slot) return -1; } - pr = &s->dev[port].port_regs; cmd = &((AHCICmdHdr *)s->dev[port].lst)[slot]; if (!s->dev[port].lst) { |