Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/scsi/megasas.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
index e24c12d7eed..d57402c9b09 100644
--- a/hw/scsi/megasas.c
+++ b/hw/scsi/megasas.c
@@ -2384,8 +2384,8 @@ static void megasas_scsi_realize(PCIDevice *dev, Error **errp)
if (!s->sas_addr) {
s->sas_addr = ((NAA_LOCALLY_ASSIGNED_ID << 24) |
IEEE_COMPANY_LOCALLY_ASSIGNED) << 36;
- s->sas_addr |= (pci_dev_bus_num(dev) << 16);
- s->sas_addr |= (PCI_SLOT(dev->devfn) << 8);
+ s->sas_addr |= pci_dev_bus_num(dev) << 16;
+ s->sas_addr |= PCI_SLOT(dev->devfn) << 8;
s->sas_addr |= PCI_FUNC(dev->devfn);
}
if (!s->hba_serial) {
--
2.26.2
Le 11/10/2020 à 21:50, Philippe Mathieu-Daudé a écrit : > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/scsi/megasas.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c > index e24c12d7eed..d57402c9b09 100644 > --- a/hw/scsi/megasas.c > +++ b/hw/scsi/megasas.c > @@ -2384,8 +2384,8 @@ static void megasas_scsi_realize(PCIDevice *dev, Error **errp) > if (!s->sas_addr) { > s->sas_addr = ((NAA_LOCALLY_ASSIGNED_ID << 24) | > IEEE_COMPANY_LOCALLY_ASSIGNED) << 36; > - s->sas_addr |= (pci_dev_bus_num(dev) << 16); > - s->sas_addr |= (PCI_SLOT(dev->devfn) << 8); > + s->sas_addr |= pci_dev_bus_num(dev) << 16; > + s->sas_addr |= PCI_SLOT(dev->devfn) << 8; > s->sas_addr |= PCI_FUNC(dev->devfn); > } > if (!s->hba_serial) { > Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Le 11/10/2020 à 21:50, Philippe Mathieu-Daudé a écrit : > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/scsi/megasas.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c > index e24c12d7eed..d57402c9b09 100644 > --- a/hw/scsi/megasas.c > +++ b/hw/scsi/megasas.c > @@ -2384,8 +2384,8 @@ static void megasas_scsi_realize(PCIDevice *dev, Error **errp) > if (!s->sas_addr) { > s->sas_addr = ((NAA_LOCALLY_ASSIGNED_ID << 24) | > IEEE_COMPANY_LOCALLY_ASSIGNED) << 36; > - s->sas_addr |= (pci_dev_bus_num(dev) << 16); > - s->sas_addr |= (PCI_SLOT(dev->devfn) << 8); > + s->sas_addr |= pci_dev_bus_num(dev) << 16; > + s->sas_addr |= PCI_SLOT(dev->devfn) << 8; > s->sas_addr |= PCI_FUNC(dev->devfn); > } > if (!s->hba_serial) { > Applied to my trivial-patches branch. Thanks, Laurent
© 2016 - 2024 Red Hat, Inc.