[libvirt] [PATCH v2 1/2] nodedev: Indent PCI express for future fix
Best viewed with '-w' as this is just an adjustment for future patch to
be readable without that.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
src/node_device/node_device_udev.c | 38 ++++++++++++++++++++------------------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index 100b44d20186..aaee0e503d7b 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -505,28 +505,30 @@ static int udevProcessPCI(struct udev_device *device,
goto out;
/* We need to be root to read PCI device configs */
- if (priv->privileged && virPCIDeviceIsPCIExpress(pciDev) > 0) {
- if (VIR_ALLOC(pci_express) < 0)
- goto out;
-
- if (virPCIDeviceHasPCIExpressLink(pciDev) > 0) {
- if (VIR_ALLOC(pci_express->link_cap) < 0 ||
- VIR_ALLOC(pci_express->link_sta) < 0)
+ if (priv->privileged) {
+ if (virPCIDeviceIsPCIExpress(pciDev) > 0) {
+ if (VIR_ALLOC(pci_express) < 0)
goto out;
- if (virPCIDeviceGetLinkCapSta(pciDev,
- &pci_express->link_cap->port,
- &pci_express->link_cap->speed,
- &pci_express->link_cap->width,
- &pci_express->link_sta->speed,
- &pci_express->link_sta->width) <
0)
- goto out;
+ if (virPCIDeviceHasPCIExpressLink(pciDev) > 0) {
+ if (VIR_ALLOC(pci_express->link_cap) < 0 ||
+ VIR_ALLOC(pci_express->link_sta) < 0)
+ goto out;
- pci_express->link_sta->port = -1; /* PCIe can't negotiate port. Yet
:) */
+ if (virPCIDeviceGetLinkCapSta(pciDev,
+ &pci_express->link_cap->port,
+ &pci_express->link_cap->speed,
+ &pci_express->link_cap->width,
+ &pci_express->link_sta->speed,
+ &pci_express->link_sta->width)
< 0)
+ goto out;
+
+ pci_express->link_sta->port = -1; /* PCIe can't negotiate port.
Yet :) */
+ }
+ data->pci_dev.flags |= VIR_NODE_DEV_CAP_FLAG_PCIE;
+ data->pci_dev.pci_express = pci_express;
+ pci_express = NULL;
}
- data->pci_dev.flags |= VIR_NODE_DEV_CAP_FLAG_PCIE;
- data->pci_dev.pci_express = pci_express;
- pci_express = NULL;
}
ret = 0;
--
2.7.3