motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-06 09:13:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/block/nvme: remove redundant cmbloc/cmbsz members

Browse source 
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Message-Id: <20200609190333.59390-10-its@irrelevant.dk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Klaus Jensen 2020-06-09 21:03:20 +02:00 • committed by Kevin Wolf
parent dce22c8646
commit e1731e816a
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
hw/block/nvme.c
View file

@ -76,7 +76,7 @@ static bool nvme_addr_is_cmb(NvmeCtrl *n, hwaddr addr)
static void nvme_addr_read(NvmeCtrl *n, hwaddr addr, void *buf, int size) static void nvme_addr_read(NvmeCtrl *n, hwaddr addr, void *buf, int size)
{ {
if (n->cmbsz && nvme_addr_is_cmb(n, addr)) { if (n->bar.cmbsz && nvme_addr_is_cmb(n, addr)) {
memcpy(buf, (void *)&n->cmbuf[addr - n->ctrl_mem.addr], size); memcpy(buf, (void *)&n->cmbuf[addr - n->ctrl_mem.addr], size);
return; return;
} }
@ -170,7 +170,7 @@ static uint16_t nvme_map_prp(QEMUSGList *qsg, QEMUIOVector *iov, uint64_t prp1,
if (unlikely(!prp1)) { if (unlikely(!prp1)) {
trace_pci_nvme_err_invalid_prp(); trace_pci_nvme_err_invalid_prp();
return NVME_INVALID_FIELD | NVME_DNR; return NVME_INVALID_FIELD | NVME_DNR;
} else if (n->cmbsz && prp1 >= n->ctrl_mem.addr && } else if (n->bar.cmbsz && prp1 >= n->ctrl_mem.addr &&
prp1 < n->ctrl_mem.addr + int128_get64(n->ctrl_mem.size)) { prp1 < n->ctrl_mem.addr + int128_get64(n->ctrl_mem.size)) {
qsg->nsg = 0; qsg->nsg = 0;
qemu_iovec_init(iov, num_prps); qemu_iovec_init(iov, num_prps);
@ -1485,9 +1485,6 @@ static void nvme_realize(PCIDevice *pci_dev, Error **errp)
NVME_CMBSZ_SET_SZU(n->bar.cmbsz, 2); /* MBs */ NVME_CMBSZ_SET_SZU(n->bar.cmbsz, 2); /* MBs */
NVME_CMBSZ_SET_SZ(n->bar.cmbsz, n->params.cmb_size_mb); NVME_CMBSZ_SET_SZ(n->bar.cmbsz, n->params.cmb_size_mb);
n->cmbloc = n->bar.cmbloc;
n->cmbsz = n->bar.cmbsz;
n->cmbuf = g_malloc0(NVME_CMBSZ_GETSIZE(n->bar.cmbsz)); n->cmbuf = g_malloc0(NVME_CMBSZ_GETSIZE(n->bar.cmbsz));
memory_region_init_io(&n->ctrl_mem, OBJECT(n), &nvme_cmb_ops, n, memory_region_init_io(&n->ctrl_mem, OBJECT(n), &nvme_cmb_ops, n,
"nvme-cmb", NVME_CMBSZ_GETSIZE(n->bar.cmbsz)); "nvme-cmb", NVME_CMBSZ_GETSIZE(n->bar.cmbsz));

2
hw/block/nvme.h
View file

@ -82,8 +82,6 @@ typedef struct NvmeCtrl {
uint32_t num_namespaces; uint32_t num_namespaces;
uint32_t max_q_ents; uint32_t max_q_ents;
uint64_t ns_size; uint64_t ns_size;
uint32_t cmbsz;
uint32_t cmbloc;
uint8_t *cmbuf; uint8_t *cmbuf;
uint32_t irq_status; uint32_t irq_status;
uint64_t host_timestamp; /* Timestamp sent by the host */ uint64_t host_timestamp; /* Timestamp sent by the host */