mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/block/nvme: use locally assigned QEMU IEEE OUI

Browse Source 
Commit 6eb7a07129 ("hw/block/nvme: change controller pci id") changed
the controller to use a Red Hat assigned PCI Device and Vendor ID, but
did not change the IEEE OUI away from the Intel IEEE OUI.

Fix that and use the locally assigned QEMU IEEE OUI instead if the
`use-intel-id` parameter is not explicitly set. Also reverse the Intel
IEEE OUI bytes.

Signed-off-by: Gollu Appalanaidu <anaidu.gollu@samsung.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
Gollu Appalanaidu 2021-02-08 18:40:31 +05:30 committed by Klaus Jensen
parent 2c7e2ad243
commit 594a2b742b
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/block/nvme.c
View File

@ -4707,9 +4707,17 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice *pci_dev)
id->cntlid = cpu_to_le16(n->cntlid); id->cntlid = cpu_to_le16(n->cntlid);
id->rab = 6; id->rab = 6;
id->ieee[0] = 0x00;
if (n->params.use_intel_id) {
id->ieee[0] = 0xb3;
id->ieee[1] = 0x02; id->ieee[1] = 0x02;
id->ieee[2] = 0xb3; id->ieee[2] = 0x00;
} else {
id->ieee[0] = 0x00;
id->ieee[1] = 0x54;
id->ieee[2] = 0x52;
}
id->mdts = n->params.mdts; id->mdts = n->params.mdts;
id->ver = cpu_to_le32(NVME_SPEC_VER); id->ver = cpu_to_le32(NVME_SPEC_VER);
id->oacs = cpu_to_le16(0); id->oacs = cpu_to_le16(0);