From patchwork Thu Dec 8 05:49:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hkran X-Patchwork-Id: 130097 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 5A6291007D7 for ; Thu, 8 Dec 2011 16:49:54 +1100 (EST) Received: from localhost ([::1]:57922 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RYWrT-0001lC-OU for incoming@patchwork.ozlabs.org; Thu, 08 Dec 2011 00:49:39 -0500 Received: from eggs.gnu.org ([140.186.70.92]:45199) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RYWrN-0001kv-Bw for qemu-devel@nongnu.org; Thu, 08 Dec 2011 00:49:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RYWrM-0005FR-7M for qemu-devel@nongnu.org; Thu, 08 Dec 2011 00:49:33 -0500 Received: from e28smtp03.in.ibm.com ([122.248.162.3]:57791) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RYWrL-0005F9-Hb for qemu-devel@nongnu.org; Thu, 08 Dec 2011 00:49:32 -0500 Received: from /spool/local by e28smtp03.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 8 Dec 2011 11:19:26 +0530 Received: from d28relay02.in.ibm.com (9.184.220.59) by e28smtp03.in.ibm.com (192.168.1.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 8 Dec 2011 11:19:24 +0530 Received: from d28av02.in.ibm.com (d28av02.in.ibm.com [9.184.220.64]) by d28relay02.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pB85nMHV1716286 for ; Thu, 8 Dec 2011 11:19:23 +0530 Received: from d28av02.in.ibm.com (loopback [127.0.0.1]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pB85nI3Z009135 for ; Thu, 8 Dec 2011 16:49:22 +1100 Received: from oc0100708617.ibm.com ([9.115.124.206]) by d28av02.in.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id pB85nG1x009035; Thu, 8 Dec 2011 16:49:16 +1100 From: hkran To: qemu-devel@nongnu.org Date: Thu, 8 Dec 2011 13:49:13 +0800 Message-Id: <1323323353-2098-1-git-send-email-hkran@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 x-cbid: 11120805-3864-0000-0000-0000006B5CF9 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 122.248.162.3 Cc: hkran Subject: [Qemu-devel] [PATCH] use pci macro in virtio 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: $YOUR_NAME Signed-off-by: Hui Kai Ran --- hw/virtio-pci.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) 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,