Fix MoatLab#109

huaicheng · huaicheng · commit 4ec028b4aae7 · 2023-06-06T16:47:22.000-04:00
diff --git a/hw/femu/nvme.h b/hw/femu/nvme.h
@@ -1466,8 +1466,8 @@ static inline uint64_t ns_blks(NvmeNamespace *ns, uint8_t lba_idx)
     return ns_size / lba_sz;
 }
 
-static inline hwaddr nvme_discontig(uint64_t *dma_addr, uint16_t page_size,
-    uint16_t queue_idx, uint16_t entry_size)
+static inline hwaddr nvme_discontig(uint64_t *dma_addr, uint16_t queue_idx,
+                                    uint16_t page_size, uint16_t entry_size)
 {
     uint16_t entries_per_page = page_size / entry_size;
     uint16_t prp_index = queue_idx / entries_per_page;

Original file line number	Diff line number	Diff line change
`@@ -1466,8 +1466,8 @@ static inline uint64_t ns_blks(NvmeNamespace *ns, uint8_t lba_idx)`
`1466`	`1466`	`return ns_size / lba_sz;`
`1467`	`1467`	`}`
`1468`	`1468`
`1469`		`-static inline hwaddr nvme_discontig(uint64_t *dma_addr, uint16_t page_size,`
`1470`		`- uint16_t queue_idx, uint16_t entry_size)`
	`1469`	`+static inline hwaddr nvme_discontig(uint64_t *dma_addr, uint16_t queue_idx,`
	`1470`	`+ uint16_t page_size, uint16_t entry_size)`
`1471`	`1471`	`{`
`1472`	`1472`	`uint16_t entries_per_page = page_size / entry_size;`
`1473`	`1473`	`uint16_t prp_index = queue_idx / entries_per_page;`