Patchwork Fix build failure in assigned_device_pci_cap_init ()

login
register
mail settings
Submitter Kamalesh Babulal
Date Dec. 18, 2010, 1:01 p.m.
Message ID <20101218125646.GA13562@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/76070/
State New
Headers show

Comments

Kamalesh Babulal - Dec. 18, 2010, 1:01 p.m.
Hi,

	cb1983b880 build fails with

CC    x86_64-softmmu/device-assignment.o
/other/srcs/qemu-kvm/hw/device-assignment.c: In function 'assigned_device_pci_cap_init':
/other/srcs/qemu-kvm/hw/device-assignment.c:1463: error: 'PCI_PM_CTRL_NO_SOFT_RST' undeclared (first use in this function)
/other/srcs/qemu-kvm/hw/device-assignment.c:1463: error: (Each undeclared identifier is reported only once
/other/srcs/qemu-kvm/hw/device-assignment.c:1463: error: for each function it appears in.)

I was able to build successfully, with the attached patch.

Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
--
 hw/device-assignment.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)





			Kamalesh
Alex Williamson - Dec. 18, 2010, 1:34 p.m.
On Sat, 2010-12-18 at 18:31 +0530, Kamalesh Babulal wrote:
> Hi,
> 
> 	cb1983b880 build fails with
> 
> CC    x86_64-softmmu/device-assignment.o
> /other/srcs/qemu-kvm/hw/device-assignment.c: In function 'assigned_device_pci_cap_init':
> /other/srcs/qemu-kvm/hw/device-assignment.c:1463: error: 'PCI_PM_CTRL_NO_SOFT_RST' undeclared (first use in this function)
> /other/srcs/qemu-kvm/hw/device-assignment.c:1463: error: (Each undeclared identifier is reported only once
> /other/srcs/qemu-kvm/hw/device-assignment.c:1463: error: for each function it appears in.)
> 
> I was able to build successfully, with the attached patch.

Thanks.  This has already been fixed in the next branch and should show
up in master soon.

http://git.kernel.org/?p=virt/kvm/qemu-kvm.git;a=commitdiff;h=571a2b67f3d6986f768d0623df6d97847e4b153e;hp=9e8caf52f2e9976faf83bfc588102912160ce911

Thanks,

Alex

Patch

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);