Patchwork use pci macro in virtio

login
register
mail settings
Submitter hkran
Date Dec. 8, 2011, 5:49 a.m.
Message ID <1323323353-2098-1-git-send-email-hkran@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/130097/
State New
Headers show

Comments

hkran - Dec. 8, 2011, 5:49 a.m.
Signed-off-by: hkran <hkran@linux.vnet.ibm.com>
---
 hw/virtio-pci.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Stefan Hajnoczi - Dec. 8, 2011, 10:17 a.m.
On Thu, Dec 8, 2011 at 5:49 AM, hkran <hkran@linux.vnet.ibm.com> wrote:
>
> Signed-off-by: hkran <hkran@linux.vnet.ibm.com>

Anthony asked that you put your real name in the Signed-off-by.  You
don't need to resend the patch, please just reply to this mail with:
Signed-off-by: $YOUR_NAME <hkran@linux.vnet.ibm.com>

Thanks,
Stefan
Jan Kiszka - Dec. 8, 2011, 2:27 p.m.
On 2011-12-08 11:17, Stefan Hajnoczi wrote:
> On Thu, Dec 8, 2011 at 5:49 AM, hkran <hkran@linux.vnet.ibm.com> wrote:
>>
>> Signed-off-by: hkran <hkran@linux.vnet.ibm.com>
> 
> Anthony asked that you put your real name in the Signed-off-by.  You
> don't need to resend the patch, please just reply to this mail with:
> Signed-off-by: $YOUR_NAME <hkran@linux.vnet.ibm.com>

Resending would provide a chance to fix checkpatch.pl complaints. :)

Jan
hkran - Dec. 9, 2011, 3:24 a.m.
On 12/08/2011 06:17 PM, Stefan Hajnoczi wrote:
> On Thu, Dec 8, 2011 at 5:49 AM, hkran<hkran@linux.vnet.ibm.com>  wrote:
>> Signed-off-by: hkran<hkran@linux.vnet.ibm.com>
> Anthony asked that you put your real name in the Signed-off-by.  You
> don't need to resend the patch, please just reply to this mail with:
> Signed-off-by: $YOUR_NAME<hkran@linux.vnet.ibm.com>
>
> Thanks,
> Stefan
>

Signed-off-by: Hui Kai Ran<hkran@linux.vnet.ibm.com>
Stefan Hajnoczi - Dec. 9, 2011, 10:56 a.m.
On Thu, Dec 08, 2011 at 01:49:13PM +0800, hkran wrote:
> 
> Signed-off-by: hkran <hkran@linux.vnet.ibm.com>
> ---
>  hw/virtio-pci.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)

Thanks, applied to the trivial patches -next tree:
http://repo.or.cz/w/qemu/stefanha.git/shortlog/refs/heads/trivial-patches-next

I have updated author and signed-off-by with what you posted.  Also
fixed the 80 chars limit that Jan mentioned with checkpatch.pl.  Please
run checkpatch.pl on all patches you submit.

I wrote up how to automatically run checkpatch.pl here:
http://blog.vmsplice.net/2011/03/how-to-automatically-run-checkpatchpl.html

Stefan

Patch

diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index c665f5c..f8ee772 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -627,9 +627,9 @@  void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev)
     if (proxy->class_code) {
         pci_config_set_class(config, proxy->class_code);
     }
-    pci_set_word(config + 0x2c, pci_get_word(config + PCI_VENDOR_ID));
-    pci_set_word(config + 0x2e, vdev->device_id);
-    config[0x3d] = 1;
+    pci_set_word(config + PCI_SUBSYSTEM_VENDOR_ID, pci_get_word(config + PCI_VENDOR_ID));
+    pci_set_word(config + PCI_SUBSYSTEM_ID, vdev->device_id);
+    config[PCI_INTERRUPT_PIN] = 1;
 
     memory_region_init(&proxy->msix_bar, "virtio-msix", 4096);
     if (vdev->nvectors && !msix_init(&proxy->pci_dev, vdev->nvectors,