From patchwork Sun Jul 29 16:41:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 173929 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 4721B2C0098 for ; Mon, 30 Jul 2012 02:41:08 +1000 (EST) Received: from localhost ([::1]:33538 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SvWYE-0003aG-0P for incoming@patchwork.ozlabs.org; Sun, 29 Jul 2012 12:41:06 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35406) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SvWY7-0003a7-5R for qemu-devel@nongnu.org; Sun, 29 Jul 2012 12:41:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SvWY5-0002VS-3f for qemu-devel@nongnu.org; Sun, 29 Jul 2012 12:40:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15388) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SvWY4-0002VG-Rr for qemu-devel@nongnu.org; Sun, 29 Jul 2012 12:40:57 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q6TGerFC022464 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Sun, 29 Jul 2012 12:40:54 -0400 Received: from redhat.com (vpn1-5-7.ams2.redhat.com [10.36.5.7]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id q6TGeoV8024165; Sun, 29 Jul 2012 12:40:50 -0400 Date: Sun, 29 Jul 2012 19:41:35 +0300 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org, Anthony Liguori Message-ID: <20120729164135.GA14721@redhat.com> MIME-Version: 1.0 Content-Disposition: inline X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: aik@ozlabs.ru, jan.kiszka@siemens.com, alex.williamson@redhat.com, mst@redhat.com Subject: [Qemu-devel] [PULL resend] pci,msi,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 The following changes since commit 7162ab21fe8e82f924002951cd8e87f69358f8b5: x86: Fixed incorrect segment base address addition in 64-bits mode (2012-07-29 08:45:57 +0000) are available in the git repository at: git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_anthony for you to fetch changes up to 5e59b024351f827f903f98ae522687ea53dc4f23: Merge branch pci into master (2012-07-29 17:05:35 +0300) ---------------------------------------------------------------- pci,msi,virtio This pull includes preparation patches mostly by Jan and Alex that should help merge device assignment down the road. And there's a new API needed for emulating POWER firmware. So no new functionality and some unused APIs but it looks like merging will help people make progress. This is the same as my previous pull request but I merged in upstream master and resolved the resulting breakage. Signed-off-by: Michael S. Tsirkin ---------------------------------------------------------------- Alex Williamson (11): msix: fix PCIDevice naming inconsistency msix: Add simple BAR allocation MSIX setup functions ivshmem: Convert to msix_init_exclusive_bar() interface virtio: Convert to msix_init_exclusive_bar() interface msix: Move msix_mmio_read msix: Note endian TODO item msix: Split PBA into it's own MemoryRegion msix: Allow full specification of MSIX layout msix: Switch msix_uninit to return void pci: convert PCIUnregisterFunc to void pci: Unregister BARs before device exit Alexey Kardashevskiy (1): msi/msix: added API to set MSI message address and data Jan Kiszka (2): msix: drop unused msix_bar_size, require valid bar_size pci: Add INTx routing notifier Michael S. Tsirkin (2): pci: Add pci_device_route_intx_to_irq Merge branch pci into master hw/ac97.c | 3 +- hw/e1000.c | 3 +- hw/eepro100.c | 3 +- hw/es1370.c | 3 +- hw/esp.c | 4 +- hw/ide/cmd646.c | 4 +- hw/ide/ich.c | 4 +- hw/ide/piix.c | 4 +- hw/ide/via.c | 4 +- hw/intel-hda.c | 3 +- hw/ioh3420.c | 8 +- hw/ivshmem.c | 14 +-- hw/lsi53c895a.c | 4 +- hw/msi.c | 17 +++ hw/msi.h | 1 + hw/msix.c | 290 ++++++++++++++++++++++++++---------------------- hw/msix.h | 19 ++-- hw/ne2000.c | 3 +- hw/pci.c | 54 ++++++++- hw/pci.h | 35 ++++-- hw/pci_bridge.c | 3 +- hw/pci_bridge.h | 2 +- hw/pci_bridge_dev.c | 13 +-- hw/pci_internals.h | 1 + hw/pcnet-pci.c | 3 +- hw/piix_pci.c | 20 ++++ hw/rtl8139.c | 3 +- hw/usb/hcd-uhci.c | 3 +- hw/virtio-pci.c | 36 +++--- hw/virtio-pci.h | 1 - hw/wdt_i6300esb.c | 4 +- hw/xio3130_downstream.c | 8 +- hw/xio3130_upstream.c | 8 +- 33 files changed, 337 insertions(+), 248 deletions(-)