On 2/8/21 3:10 PM, Klaus Jensen wrote: > From: Gollu Appalanaidu <anaidu.go...@samsung.com> > > Commit 6eb7a071292a ("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. > > Signed-off-by: Gollu Appalanaidu <anaidu.go...@samsung.com> > Signed-off-by: Klaus Jensen <k.jen...@samsung.com> > --- > hw/block/nvme.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/block/nvme.c b/hw/block/nvme.c > index c2f0c88fbf39..547a3073ef1b 100644 > --- a/hw/block/nvme.c > +++ b/hw/block/nvme.c > @@ -4686,8 +4686,8 @@ static void nvme_init_ctrl(NvmeCtrl *n, PCIDevice > *pci_dev) > > id->rab = 6; > id->ieee[0] = 0x00; > - id->ieee[1] = 0x02; > - id->ieee[2] = 0xb3; > + id->ieee[1] = 0x54; > + id->ieee[2] = 0x52;
Shouldn't this be conditional on 'use-intel-id'? > id->mdts = n->params.mdts; > id->ver = cpu_to_le32(NVME_SPEC_VER); > id->oacs = cpu_to_le16(0); >