From patchwork Wed Nov 5 09:50:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hu Tao X-Patchwork-Id: 406927 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7EE14140098 for ; Wed, 5 Nov 2014 20:56:40 +1100 (AEDT) Received: from localhost ([::1]:45401 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlxKQ-0003Qp-Hd for incoming@patchwork.ozlabs.org; Wed, 05 Nov 2014 04:56:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58735) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlxI6-0008Nz-Ub for qemu-devel@nongnu.org; Wed, 05 Nov 2014 04:54:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XlxI0-0003gk-3k for qemu-devel@nongnu.org; Wed, 05 Nov 2014 04:54:14 -0500 Received: from [59.151.112.132] (port=8369 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlxHz-0003fI-Lq for qemu-devel@nongnu.org; Wed, 05 Nov 2014 04:54:08 -0500 X-IronPort-AV: E=Sophos;i="5.04,848,1406563200"; d="scan'208";a="42888419" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 05 Nov 2014 17:50:51 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id sA59rp2l031630 for ; Wed, 5 Nov 2014 17:53:51 +0800 Received: from localhost.localdomain (10.167.226.102) by G08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Wed, 5 Nov 2014 17:54:04 +0800 From: Hu Tao To: Date: Wed, 5 Nov 2014 17:50:41 +0800 Message-ID: <8e9a17192b12aea2124eda6bf9643f7b8e1a789e.1415179427.git.hutao@cn.fujitsu.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.167.226.102] X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH 1/6] pci: remove pci_config_set_vendor_id 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 Use pci_set_word() instead. The main purpose is for API consistency. Detailed reasons: - pci_config_set_* are not complete. 1) Only part of registers in predefined header portion of PCI Configuration Space are supported. 2) Lack of get_ counterparts. - pci_set_word() and friends are extensively used in qemu. They are used both for predefined registers and device specific registers. - another option is to complete the pci_config_set_* for all predefined registers (though they will co-exist with pci_set_*). Hence the RFC. Signed-off-by: Hu Tao --- hw/pci/pci.c | 2 +- include/hw/pci/pci.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 371699c..6c544ed 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -840,7 +840,7 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus, pci_dev->irq_state = 0; pci_config_alloc(pci_dev); - pci_config_set_vendor_id(pci_dev->config, pc->vendor_id); + pci_set_word(pci_dev->config + PCI_VENDOR_ID, pc->vendor_id); pci_config_set_device_id(pci_dev->config, pc->device_id); pci_config_set_revision(pci_dev->config, pc->revision); pci_config_set_class(pci_dev->config, pc->class_id); diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index c352c7b..390aa83 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -462,12 +462,6 @@ pci_get_quad(const uint8_t *config) } static inline void -pci_config_set_vendor_id(uint8_t *pci_config, uint16_t val) -{ - pci_set_word(&pci_config[PCI_VENDOR_ID], val); -} - -static inline void pci_config_set_device_id(uint8_t *pci_config, uint16_t val) { pci_set_word(&pci_config[PCI_DEVICE_ID], val);