diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-06-03 07:54:05 +0800 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-06-03 07:54:05 +0800 |
| commit | 2eb02f28269dc47b38aa3becbaff1cc6300210da (patch) | |
| tree | 39c8cd5408ae324d73798710e899c45897fc994d /hw/ide/ahci.c | |
| parent | a854972f8cdec0148087789d62777d8f7176933d (diff) | |
| parent | 4bb9c939a57103898f5a51aa6a7336eb3320d923 (diff) | |
| download | focaccia-qemu-2eb02f28269dc47b38aa3becbaff1cc6300210da.tar.gz focaccia-qemu-2eb02f28269dc47b38aa3becbaff1cc6300210da.zip | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
* kwolf/for-anthony: ahci: SATA FIS is 20 bytes, not 0x20 virtio-blk: Fix geometry sector calculation block: prevent snapshot mode $TMPDIR symlink attack sheepdog: fix return value of do_load_save_vm_state virtio: Fix compiler warning for non Linux hosts
Diffstat (limited to 'hw/ide/ahci.c')
| -rw-r--r-- | hw/ide/ahci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index a883a920be..2d7d03d772 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -462,7 +462,7 @@ static void ahci_check_cmd_bh(void *opaque) static void ahci_init_d2h(AHCIDevice *ad) { - uint8_t init_fis[0x20]; + uint8_t init_fis[20]; IDEState *ide_state = &ad->port.ifs[0]; memset(init_fis, 0, sizeof(init_fis)); @@ -619,7 +619,7 @@ static void ahci_write_fis_d2h(AHCIDevice *ad, uint8_t *cmd_fis) d2h_fis[11] = cmd_fis[11]; d2h_fis[12] = cmd_fis[12]; d2h_fis[13] = cmd_fis[13]; - for (i = 14; i < 0x20; i++) { + for (i = 14; i < 20; i++) { d2h_fis[i] = 0; } |