[Qemu-devel] [PULL] pci_prep fix

[Avi Kivity]

Please pull from

  git://github.com/avikivity/qemu.git memory/urgent

to receive for a fix which kills ppc_prep immediately after launch.

Avi Kivity (1):
      ppc_prep: fix pci config space initialization

 hw/prep_pci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/prep_pci.c b/hw/prep_pci.c
index 55e4e25..149807a 100644
--- a/hw/prep_pci.c
+++ b/hw/prep_pci.c
@@ -130,7 +130,7 @@ static void prep_set_irq(void *opaque, int irq_num, 
int level)
     memory_region_add_subregion(address_space_io, 0xcf8, &s->conf_mem);
     sysbus_init_ioports(&s->busdev, 0xcf8, 1);

-    memory_region_init_io(&s->conf_mem, &pci_host_data_be_ops, s,
+    memory_region_init_io(&s->data_mem, &pci_host_data_be_ops, s,
                           "pci-conf-data", 1);
     memory_region_add_subregion(address_space_io, 0xcfc, &s->data_mem);
     sysbus_init_ioports(&s->busdev, 0xcfc, 1);

--
error compiling committee.c: too many arguments to function