From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49043) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2qNS-0005Ck-Sd for qemu-devel@nongnu.org; Tue, 17 May 2016 21:34:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b2qNO-0004TZ-Lm for qemu-devel@nongnu.org; Tue, 17 May 2016 21:34:21 -0400 Received: from [59.151.112.132] (port=46129 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2qNO-0004QE-8K for qemu-devel@nongnu.org; Tue, 17 May 2016 21:34:18 -0400 References: <1458888577-12477-1-git-send-email-caoj.fnst@cn.fujitsu.com> <56F5041C.2060307@redhat.com> <5733DEDF.90606@cn.fujitsu.com> From: Cao jin Message-ID: <573BC79F.4070602@cn.fujitsu.com> Date: Wed, 18 May 2016 09:38:39 +0800 MIME-Version: 1.0 In-Reply-To: <5733DEDF.90606@cn.fujitsu.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] pci_register_bar: cleanup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini , mst@redhat.com Cc: qemu-devel@nongnu.org ping? On 05/12/2016 09:39 AM, Cao jin wrote: > Hi, > > Since it has been > > Reviewed-by: Paolo Bonzini > > for almost 2 months, is it forgot to put into upstream? > > On 03/25/2016 05:25 PM, Paolo Bonzini wrote: >> >> >> On 25/03/2016 07:49, Cao jin wrote: >>> place relevant code tegother, make the code easier to read >>> >>> Signed-off-by: Cao jin >>> --- >>> hw/pci/pci.c | 16 ++++++++-------- >>> 1 file changed, 8 insertions(+), 8 deletions(-) >>> >>> diff --git a/hw/pci/pci.c b/hw/pci/pci.c >>> index e67664d..f0f41dc 100644 >>> --- a/hw/pci/pci.c >>> +++ b/hw/pci/pci.c >>> @@ -974,7 +974,7 @@ void pci_register_bar(PCIDevice *pci_dev, int >>> region_num, >>> uint8_t type, MemoryRegion *memory) >>> { >>> PCIIORegion *r; >>> - uint32_t addr; >>> + uint32_t addr; /* offset in pci config space */ >>> uint64_t wmask; >>> pcibus_t size = memory_region_size(memory); >>> >>> @@ -990,15 +990,20 @@ void pci_register_bar(PCIDevice *pci_dev, int >>> region_num, >>> r->addr = PCI_BAR_UNMAPPED; >>> r->size = size; >>> r->type = type; >>> - r->memory = NULL; >>> + r->memory = memory; >>> + r->address_space = type & PCI_BASE_ADDRESS_SPACE_IO >>> + ? pci_dev->bus->address_space_io >>> + : pci_dev->bus->address_space_mem; >>> >>> wmask = ~(size - 1); >>> - addr = pci_bar(pci_dev, region_num); >>> if (region_num == PCI_ROM_SLOT) { >>> /* ROM enable bit is writable */ >>> wmask |= PCI_ROM_ADDRESS_ENABLE; >>> } >>> + >>> + addr = pci_bar(pci_dev, region_num); >>> pci_set_long(pci_dev->config + addr, type); >>> + >>> if (!(r->type & PCI_BASE_ADDRESS_SPACE_IO) && >>> r->type & PCI_BASE_ADDRESS_MEM_TYPE_64) { >>> pci_set_quad(pci_dev->wmask + addr, wmask); >>> @@ -1007,11 +1012,6 @@ void pci_register_bar(PCIDevice *pci_dev, int >>> region_num, >>> pci_set_long(pci_dev->wmask + addr, wmask & 0xffffffff); >>> pci_set_long(pci_dev->cmask + addr, 0xffffffff); >>> } >>> - pci_dev->io_regions[region_num].memory = memory; >>> - pci_dev->io_regions[region_num].address_space >>> - = type & PCI_BASE_ADDRESS_SPACE_IO >>> - ? pci_dev->bus->address_space_io >>> - : pci_dev->bus->address_space_mem; >>> } >>> >>> static void pci_update_vga(PCIDevice *pci_dev) >>> >> >> Reviewed-by: Paolo Bonzini >> >> >> > -- Yours Sincerely, Cao jin