[Patch] Fix a bug in init_assigned_device

[Patch] Fix a bug in init_assigned_device

[Han, Weidong]

[-- Attachment #1: Type: text/plain, Size: 1152 bytes --]

>From 6eb40fddc2f09c3197c411f7ec56cf6034f833bd Mon Sep 17 00:00:00 2001
From: Weidong Han <weidong.han@intel.com>
Date: Mon, 3 Nov 2008 17:09:06 +0800
Subject: [PATCH] Fix a bug in init_assigned_device

e_devfn is undefined. When DEVICE_ASSIGNMENT_DEBUG is on, compilation fails.

Signed-off-by: Weidong Han <weidong.han@intel.com>
---
 qemu/hw/device-assignment.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qemu/hw/device-assignment.c b/qemu/hw/device-assignment.c
index 78b7e14..bab08fa 100644
--- a/qemu/hw/device-assignment.c
+++ b/qemu/hw/device-assignment.c
@@ -487,8 +487,8 @@ struct PCIDevice *init_assigned_device(AssignedDevInfo *adev, PCIBus *bus)
     uint8_t e_device, e_intx;
     struct kvm_assigned_pci_dev assigned_dev_data;
 
-    DEBUG("Registering real physical device %s (devfn=0x%x)\n",
-          adev->name, e_devfn);
+    DEBUG("Registering real physical device %s (bus=%x dev=%x func=%x)\n",
+          adev->name, adev->bus, adev->dev, adev->func);
 
     dev = (AssignedDevice *)
         pci_register_device(bus, adev->name, sizeof(AssignedDevice),
-- 
1.5.1


[-- Attachment #2: 0001-Fix-a-bug-in-init_assigned_device.patch --]
[-- Type: application/octet-stream, Size: 1121 bytes --]

From 6eb40fddc2f09c3197c411f7ec56cf6034f833bd Mon Sep 17 00:00:00 2001
From: Weidong Han <weidong.han@intel.com>
Date: Mon, 3 Nov 2008 17:09:06 +0800
Subject: [PATCH] Fix a bug in init_assigned_device

e_devfn is undefined. When DEVICE_ASSIGNMENT_DEBUG is on, compilation fails.

Signed-off-by: Weidong Han <weidong.han@intel.com>
---
 qemu/hw/device-assignment.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qemu/hw/device-assignment.c b/qemu/hw/device-assignment.c
index 78b7e14..bab08fa 100644
--- a/qemu/hw/device-assignment.c
+++ b/qemu/hw/device-assignment.c
@@ -487,8 +487,8 @@ struct PCIDevice *init_assigned_device(AssignedDevInfo *adev, PCIBus *bus)
     uint8_t e_device, e_intx;
     struct kvm_assigned_pci_dev assigned_dev_data;
 
-    DEBUG("Registering real physical device %s (devfn=0x%x)\n",
-          adev->name, e_devfn);
+    DEBUG("Registering real physical device %s (bus=%x dev=%x func=%x)\n",
+          adev->name, adev->bus, adev->dev, adev->func);
 
     dev = (AssignedDevice *)
         pci_register_device(bus, adev->name, sizeof(AssignedDevice),
-- 
1.5.1

Re: [Patch] Fix a bug in init_assigned_device

[Avi Kivity]

Han, Weidong wrote:
> From 6eb40fddc2f09c3197c411f7ec56cf6034f833bd Mon Sep 17 00:00:00 2001
> From: Weidong Han <weidong.han@intel.com>
> Date: Mon, 3 Nov 2008 17:09:06 +0800
> Subject: [PATCH] Fix a bug in init_assigned_device
>
> e_devfn is undefined. When DEVICE_ASSIGNMENT_DEBUG is on, compilation fails.
>
>   
Applied, thanks.

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