| Message ID | 4E5A60C1.3050900@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 08/28/2011 10:37 AM, Avi Kivity wrote: > Anthony, please pull from > > git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git memory/urgent > > to receive a fix for boundless recursion in the sh target, due to a bug > in the memory API conversion. Pulled. Thanks. Regards, Anthony Liguori > > Avi Kivity (1): > sh_pci: Fix sh_pci memory alias confusion > > hw/sh_pci.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/hw/sh_pci.c b/hw/sh_pci.c > index 76061bb..36f3930 100644 > --- a/hw/sh_pci.c > +++ b/hw/sh_pci.c > @@ -150,7 +150,7 @@ static int sh_pci_init_device(SysBusDevice *dev) > PCI_DEVFN(0, 0), 4); > memory_region_init_io(&s->memconfig_p4, &sh_pci_reg_ops, s, > "sh_pci", 0x224); > - memory_region_init_alias(&s->memconfig_a7, "sh_pci.2", &s->memconfig_a7, > + memory_region_init_alias(&s->memconfig_a7, "sh_pci.2", &s->memconfig_p4, > 0, 0x224); > isa_mmio_setup(&s->isa, 0x40000); > sysbus_init_mmio_cb2(dev, sh_pci_map, sh_pci_unmap); >
diff --git a/hw/sh_pci.c b/hw/sh_pci.c index 76061bb..36f3930 100644 --- a/hw/sh_pci.c +++ b/hw/sh_pci.c @@ -150,7 +150,7 @@ static int sh_pci_init_device(SysBusDevice *dev) PCI_DEVFN(0, 0), 4); memory_region_init_io(&s->memconfig_p4, &sh_pci_reg_ops, s, "sh_pci", 0x224); - memory_region_init_alias(&s->memconfig_a7, "sh_pci.2", &s->memconfig_a7, + memory_region_init_alias(&s->memconfig_a7, "sh_pci.2", &s->memconfig_p4, 0, 0x224);
Anthony, please pull from git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git memory/urgent to receive a fix for boundless recursion in the sh target, due to a bug in the memory API conversion. Avi Kivity (1): sh_pci: Fix sh_pci memory alias confusion hw/sh_pci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) isa_mmio_setup(&s->isa, 0x40000); sysbus_init_mmio_cb2(dev, sh_pci_map, sh_pci_unmap);