Re: [Qemu-devel] [PULL v3 00/18] pci,misc enhancements

[Anthony Liguori]

"Michael S. Tsirkin" <address@hidden> writes:

> Changes from v2:
>     - rebased to origin/master
>     - fixed up botched posting
>
> The following changes since commit ab8bf29078e0ab8347e2ff8b4e5542f7a0c751cf:
>
>   Merge remote-tracking branch 'qemu-kvm/uq/master' into staging (2013-07-03 
> 08:37:00 -0500)
>
> 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 e34cc4adf3106ff5bed9723b8f9b4730f1662f7d:
>
>   pci: Fold host_buses list into PCIHostState functionality (2013-07-04 
> 10:45:32 +0300)
>
> ----------------------------------------------------------------
> pci,misc enhancements
>
> This includes some pci enhancements:
>
> Better support for systems with multiple PCI root buses
> FW cfg interface for more robust pci programming in BIOS
> Minor fixes/cleanups for fw cfg and cross-version migration -
>     because of dependencies with other patches
>
> Signed-off-by: Michael S. Tsirkin <address@hidden>

Breaks the Xen build:

 CC    i386-softmmu/hw/i386/pc_piix.o
/home/aliguori/git/qemu/hw/i386/pc_piix.c: In function ‘pc_xen_hvm_init’:
/home/aliguori/git/qemu/hw/i386/pc_piix.c:345:5: error: implicit declaration of 
function ‘pci_find_root_bus’ [-Werror=implicit-function-declaration]
/home/aliguori/git/qemu/hw/i386/pc_piix.c:345:5: error: nested extern 
declaration of ‘pci_find_root_bus’ [-Werror=nested-externs]
/home/aliguori/git/qemu/hw/i386/pc_piix.c:345:9: error: assignment makes 
pointer from integer without a cast [-Werror]
cc1: all warnings being treated as errors
make[1]: *** [hw/i386/pc_piix.o] Error 1
make: *** [subdir-i386-softmmu] Error 2

Regards,

Anthony Liguori

> ----------------------------------------------------------------
> Andrew Jones (1):
>       e1000: cleanup process_tx_desc
>
> David Gibson (10):
>       pci: Cleanup configuration for pci-hotplug.c
>       pci: Move pci_read_devaddr to pci-hotplug-old.c
>       pci: Abolish pci_find_root_bus()
>       pci: Use helper to find device's root bus in pci_find_domain()
>       pci: Replace pci_find_domain() with more general pci_root_bus_path()
>       pci: Add root bus argument to pci_get_bus_devfn()
>       pci: Add root bus parameter to pci_nic_init()
>       pci: Simpler implementation of primary PCI bus
>       pci: Remove domain from PCIHostBus
>       pci: Fold host_buses list into PCIHostState functionality
>
> Michael S. Tsirkin (7):
>       range: add Range structure
>       pci: store PCI hole ranges in guestinfo structure
>       pc: pass PCI hole ranges to Guests
>       pc_piix: cleanup init compat handling
>       MAINTAINERS: s/Marcelo/Paolo/
>       pvpanic: initialization cleanup
>       pvpanic: fix fwcfg for big endian hosts
>
>  MAINTAINERS                                 |   2 +-
>  default-configs/i386-softmmu.mak            |   3 +-
>  default-configs/ppc64-softmmu.mak           |   2 -
>  default-configs/x86_64-softmmu.mak          |   3 +-
>  hmp-commands.hx                             |   4 +-
>  hw/alpha/dp264.c                            |   2 +-
>  hw/arm/realview.c                           |   6 +-
>  hw/arm/versatilepb.c                        |   2 +-
>  hw/i386/pc.c                                |  74 ++++++++++++++-
>  hw/i386/pc_piix.c                           |  40 +++++---
>  hw/i386/pc_q35.c                            |  18 +++-
>  hw/mips/mips_fulong2e.c                     |   6 +-
>  hw/mips/mips_malta.c                        |   6 +-
>  hw/misc/pvpanic.c                           |  31 ++++---
>  hw/net/e1000.c                              |  18 ++--
>  hw/pci-host/piix.c                          |   9 ++
>  hw/pci-host/q35.c                           |  17 ++++
>  hw/pci/Makefile.objs                        |   2 +-
>  hw/pci/{pci-hotplug.c => pci-hotplug-old.c} |  75 ++++++++++++---
>  hw/pci/pci.c                                | 137 
> ++++++++++++++--------------
>  hw/pci/pci_host.c                           |   1 +
>  hw/pci/pcie_aer.c                           |   9 +-
>  hw/ppc/e500.c                               |   2 +-
>  hw/ppc/mac_newworld.c                       |   2 +-
>  hw/ppc/mac_oldworld.c                       |   2 +-
>  hw/ppc/ppc440_bamboo.c                      |   2 +-
>  hw/ppc/prep.c                               |   2 +-
>  hw/ppc/spapr.c                              |   2 +-
>  hw/ppc/spapr_pci.c                          |  10 ++
>  hw/sh4/r2d.c                                |   5 +-
>  hw/sparc64/sun4u.c                          |   2 +-
>  include/hw/i386/pc.h                        |  22 ++++-
>  include/hw/pci-host/q35.h                   |   2 +
>  include/hw/pci/pci.h                        |  17 ++--
>  include/hw/pci/pci_host.h                   |  12 +++
>  include/qemu/range.h                        |  16 ++++
>  include/qemu/typedefs.h                     |   1 +
>  37 files changed, 404 insertions(+), 162 deletions(-)
>  rename hw/pci/{pci-hotplug.c => pci-hotplug-old.c} (78%)