diff options
| author | John Snow <jsnow@redhat.com> | 2015-05-22 14:13:42 -0400 |
|---|---|---|
| committer | John Snow <jsnow@redhat.com> | 2015-05-22 15:58:22 -0400 |
| commit | 455e861cc625891baacf74e66c31a914883b80ca (patch) | |
| tree | 5b32cafc677f1ebf0ca011db453ae9e843fd571a /tests/libqos | |
| parent | 008b6e123ff2ee421112768e838b0b44bc7f6c45 (diff) | |
| download | qemu-455e861cc625891baacf74e66c31a914883b80ca.zip | |
libqos/ahci: Fix sector set method
|| probably does not mean the same thing as |.
Additionally, allow users to submit a prd_size of 0
to indicate that they'd like to continue using the default.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-id: 1430417242-11859-3-git-send-email-jsnow@redhat.com
Diffstat (limited to 'tests/libqos')
| -rw-r--r-- | tests/libqos/ahci.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c index 229409b353..8c8fd8967d 100644 --- a/tests/libqos/ahci.c +++ b/tests/libqos/ahci.c @@ -769,7 +769,7 @@ void ahci_command_set_offset(AHCICommand *cmd, uint64_t lba_sect) fis->lba_lo[1] = (lba_sect >> 8) & 0xFF; fis->lba_lo[2] = (lba_sect >> 16) & 0xFF; if (cmd->props->lba28) { - fis->device = (fis->device & 0xF0) || (lba_sect >> 24) & 0x0F; + fis->device = (fis->device & 0xF0) | ((lba_sect >> 24) & 0x0F); } fis->lba_hi[0] = (lba_sect >> 24) & 0xFF; fis->lba_hi[1] = (lba_sect >> 32) & 0xFF; @@ -787,7 +787,9 @@ void ahci_command_set_sizes(AHCICommand *cmd, uint64_t xbytes, /* Each PRD can describe up to 4MiB, and must not be odd. */ g_assert_cmphex(prd_size, <=, 4096 * 1024); g_assert_cmphex(prd_size & 0x01, ==, 0x00); - cmd->prd_size = prd_size; + if (prd_size) { + cmd->prd_size = prd_size; + } cmd->xbytes = xbytes; cmd->fis.count = (cmd->xbytes / AHCI_SECTOR_SIZE); cmd->header.prdtl = size_to_prdtl(cmd->xbytes, cmd->prd_size); |