Skip to contentSkip to conversation

fix compile error of hw/device-assignment.c

PATCH Applied Wei Yongjun 3 participants 3 messages Dec 9, 2010 – Dec 13, 2010 KVM

lore
Share & tools
lore

Wei Yongjun

author
#0 lore raw

PATCH 1/1 fix compile error of hw/device-assignment.c

Fix the following compile error in next tree:
CC x86_64-softmmu/device-assignment.o
hw/device-assignment.c: In function ‘assigned_device_pci_cap_init’:
hw/device-assignment.c:1463: error: ‘PCI_PM_CTRL_NO_SOFT_RST’ undeclared (first use in this function) hw/device-assignment.c:1463: error: (Each undeclared identifier is reported only once hw/device-assignment.c:1463: error: for each function it appears in.)

Signed-off-by Wei Yongjun <[email protected]>
---
 hw/device-assignment.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
hw/device-assignment.c +1 -1
index 50c6408..8446cd4 100644
@@ -1460,7 +1460,7 @@ static int assigned_device_pci_cap_init(PCIDevice *pci_dev)
         /* assign_device will bring the device up to D0, so we don't need
          * to worry about doing that ourselves here. */
         pci_set_word(pci_dev->config + pos + PCI_PM_CTRL,
-                     PCI_PM_CTRL_NO_SOFT_RST);
+                     PCI_PM_CTRL_NO_SOFT_RESET);
 
         pci_set_byte(pci_dev->config + pos + PCI_PM_PPB_EXTENSIONS, 0);
         pci_set_byte(pci_dev->config + pos + PCI_PM_DATA_REGISTER, 0);
Signature · 1 line
1.7.0.4
Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · Wei Yongjun

Fix the following compile error in next tree:
CC x86_64-softmmu/device-assignment.o
hw/device-assignment.c: In function ‘assigned_device_pci_cap_init’:
hw/device-assignment.c:1463: error: ‘PCI_PM_CTRL_NO_SOFT_RST’ undeclared (first use in this function) hw/device-assignment.c:1463: error: (Each undeclared identifier is reported only once hw/device-assignment.c:1463: error: for each function it appears in.)

Signed-off-by Wei Yongjun <[email protected]>

Interesting, my build environment was finding RST somewhere. Thanks for the fix.

Acked-by Alex Williamson <[email protected]>
Quoted 17 lines
---
 hw/device-assignment.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
hw/device-assignment.c +1 -1
index 50c6408..8446cd4 100644
@@ -1460,7 +1460,7 @@ static int assigned_device_pci_cap_init(PCIDevice *pci_dev)
         /* assign_device will bring the device up to D0, so we don't need
          * to worry about doing that ourselves here. */
         pci_set_word(pci_dev->config + pos + PCI_PM_CTRL,
-                     PCI_PM_CTRL_NO_SOFT_RST);
+                     PCI_PM_CTRL_NO_SOFT_RESET);
 
         pci_set_byte(pci_dev->config + pos + PCI_PM_PPB_EXTENSIONS, 0);
         pci_set_byte(pci_dev->config + pos + PCI_PM_DATA_REGISTER, 0);
Applied
#2 lore raw
In reply to Wei Yongjun
Quoted 7 lines · Wei Yongjun

Fix the following compile error in next tree:
CC x86_64-softmmu/device-assignment.o
hw/device-assignment.c: In function ‘assigned_device_pci_cap_init’:
hw/device-assignment.c:1463: error: ‘PCI_PM_CTRL_NO_SOFT_RST’ undeclared (first use in this function) hw/device-assignment.c:1463: error: (Each undeclared identifier is reported only once hw/device-assignment.c:1463: error: for each function it appears in.)

Applied, thanks.

Signature · 1 line
error compiling committee.c: too many arguments to function