From patchwork Wed Dec 7 09:39:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hkran X-Patchwork-Id: 129924 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0E3EE1007D2 for ; Wed, 7 Dec 2011 20:40:11 +1100 (EST) Received: from localhost ([::1]:43844 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RYDyu-00059z-Fl for incoming@patchwork.ozlabs.org; Wed, 07 Dec 2011 04:40:04 -0500 Received: from eggs.gnu.org ([140.186.70.92]:54989) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RYDyn-00059m-BR for qemu-devel@nongnu.org; Wed, 07 Dec 2011 04:39:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RYDym-0000QW-Ew for qemu-devel@nongnu.org; Wed, 07 Dec 2011 04:39:57 -0500 Received: from e28smtp07.in.ibm.com ([122.248.162.7]:53471) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RYDyl-0000Q2-G3 for qemu-devel@nongnu.org; Wed, 07 Dec 2011 04:39:56 -0500 Received: from /spool/local by e28smtp07.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 7 Dec 2011 15:09:46 +0530 Received: from d28relay03.in.ibm.com (9.184.220.60) by e28smtp07.in.ibm.com (192.168.1.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 7 Dec 2011 15:09:43 +0530 Received: from d28av04.in.ibm.com (d28av04.in.ibm.com [9.184.220.66]) by d28relay03.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pB79dgoh3588318 for ; Wed, 7 Dec 2011 15:09:42 +0530 Received: from d28av04.in.ibm.com (loopback [127.0.0.1]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pB79df5l010463 for ; Wed, 7 Dec 2011 20:39:42 +1100 Received: from oc0100708617.ibm.com ([9.115.124.206]) by d28av04.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id pB79dftf010414; Wed, 7 Dec 2011 20:39:41 +1100 Message-ID: <4EDF345C.5060304@linux.vnet.ibm.com> Date: Wed, 07 Dec 2011 17:39:40 +0800 From: hkran User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.18) Gecko/20110617 Red Hat/3.1.11-2.el6_1 Thunderbird/3.1.11 MIME-Version: 1.0 To: qemu-devel x-cbid: 11120709-8878-0000-0000-0000007CDC7D X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 122.248.162.7 Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH] use PCI MACRO in virtio-pci X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: hkran Signed-off-by: Hui Kai Ran --- hw/virtio-pci.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) if (vdev->nvectors && !msix_init(&proxy->pci_dev, vdev->nvectors, 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);