From patchwork Mon Sep 17 10:00:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Voevodin X-Patchwork-Id: 184374 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DF6C12C0095 for ; Mon, 17 Sep 2012 20:45:13 +1000 (EST) Received: from localhost ([::1]:35363 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDY97-0007fE-5m for incoming@patchwork.ozlabs.org; Mon, 17 Sep 2012 06:01:41 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53088) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDY8O-00065z-0n for qemu-devel@nongnu.org; Mon, 17 Sep 2012 06:01:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TDY8M-00051x-Gg for qemu-devel@nongnu.org; Mon, 17 Sep 2012 06:00:55 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:23337) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDY8M-00050O-Az for qemu-devel@nongnu.org; Mon, 17 Sep 2012 06:00:54 -0400 Received: from eusync3.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MAH00HK1NU5JU80@mailout1.w1.samsung.com> for qemu-devel@nongnu.org; Mon, 17 Sep 2012 11:01:17 +0100 (BST) Received: from evvoevodinPC.rnd.samsung.ru ([106.109.8.14]) by eusync3.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0MAH00DV7NT8FQ90@eusync3.samsung.com> for qemu-devel@nongnu.org; Mon, 17 Sep 2012 11:00:52 +0100 (BST) From: Evgeny Voevodin To: qemu-devel@nongnu.org Date: Mon, 17 Sep 2012 14:00:35 +0400 Message-id: <1347876042-22609-6-git-send-email-e.voevodin@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1347876042-22609-1-git-send-email-e.voevodin@samsung.com> References: <1347876042-22609-1-git-send-email-e.voevodin@samsung.com> X-TM-AS-MML: No X-detected-operating-system: by eggs.gnu.org: Solaris 10 (1203?) X-Received-From: 210.118.77.11 Cc: peter.maydell@linaro.org, kyungmin.park@samsung.com, aliguori@us.ibm.com, Evgeny Voevodin Subject: [Qemu-devel] [RFC v2 05/12] hw/pci.c: Make pci_add_option_rom global visible 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 We need to use this function to load rom for virtio-net backend. Signed-off-by: Evgeny Voevodin --- hw/pci.c | 3 +-- hw/pci.h | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index f855cf3..bba69ef 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -77,7 +77,6 @@ static const TypeInfo pci_bus_info = { static PCIBus *pci_find_bus_nr(PCIBus *bus, int bus_num); static void pci_update_mappings(PCIDevice *d); static void pci_set_irq(void *opaque, int irq_num, int level); -static int pci_add_option_rom(PCIDevice *pdev, bool is_default_rom); static void pci_del_option_rom(PCIDevice *pdev); static uint16_t pci_default_sub_vendor_id = PCI_SUBVENDOR_ID_REDHAT_QUMRANET; @@ -1733,7 +1732,7 @@ static void pci_patch_ids(PCIDevice *pdev, uint8_t *ptr, int size) } /* Add an option rom for the device */ -static int pci_add_option_rom(PCIDevice *pdev, bool is_default_rom) +int pci_add_option_rom(PCIDevice *pdev, bool is_default_rom) { int size; char *path; diff --git a/hw/pci.h b/hw/pci.h index 4b6ab3d..5f47618 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -274,6 +274,8 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num, uint8_t attr, MemoryRegion *memory); pcibus_t pci_get_bar_addr(PCIDevice *pci_dev, int region_num); +int pci_add_option_rom(PCIDevice *pdev, bool is_default_rom); + int pci_add_capability(PCIDevice *pdev, uint8_t cap_id, uint8_t offset, uint8_t size);