[PATCH] [qemu-kvm-next-tree] fix compile error of hw/device-assignment.c

[PATCH] [qemu-kvm-next-tree] fix compile error of hw/device-assignment.c

[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 <yjwei@cn.fujitsu.com>
---
 hw/device-assignment.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/device-assignment.c b/hw/device-assignment.c
index 50c6408..8446cd4 100644
--- a/hw/device-assignment.c
+++ b/hw/device-assignment.c
@@ -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);
-- 
1.7.0.4

Re: [PATCH] [qemu-kvm-next-tree] fix compile error of hw/device-assignment.c

[Alex Williamson]

On Thu, 2010-12-09 at 14:43 +0800, Wei Yongjun wrote:
> 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 <yjwei@cn.fujitsu.com>

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

Acked-by: Alex Williamson <alex.williamson@redhat.com>

> ---
>  hw/device-assignment.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/hw/device-assignment.c b/hw/device-assignment.c
> index 50c6408..8446cd4 100644
> --- a/hw/device-assignment.c
> +++ b/hw/device-assignment.c
> @@ -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);

Re: [PATCH] [qemu-kvm-next-tree] fix compile error of hw/device-assignment.c

[Avi Kivity]

On 12/09/2010 08:43 AM, Wei Yongjun wrote:
> 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.

-- 
error compiling committee.c: too many arguments to function