diff options
| author | Peter Maydell | 2015-01-13 19:32:42 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-01-13 19:32:42 +0100 |
| commit | 3a7f560fa612610822727f7647ed6bc10bccd6ec (patch) | |
| tree | 78a897864685c195660b181f1fe8249a028d190e /hw | |
| parent | Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into ... (diff) | |
| parent | xen-hvm: increase maxmem before calling xc_domain_populate_physmap (diff) | |
| download | qemu-3a7f560fa612610822727f7647ed6bc10bccd6ec.tar.gz qemu-3a7f560fa612610822727f7647ed6bc10bccd6ec.tar.xz qemu-3a7f560fa612610822727f7647ed6bc10bccd6ec.zip | |
Merge remote-tracking branch 'remotes/sstabellini/xen-2015-01-13' into staging
* remotes/sstabellini/xen-2015-01-13:
xen-hvm: increase maxmem before calling xc_domain_populate_physmap
xen-pt: Fix PCI devices re-attach failed
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xen/xen_pt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index c1bf357154..f2893b28aa 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -736,7 +736,7 @@ static int xen_pt_initfn(PCIDevice *d) } out: - memory_listener_register(&s->memory_listener, &address_space_memory); + memory_listener_register(&s->memory_listener, &s->dev.bus_master_as); memory_listener_register(&s->io_listener, &address_space_io); XEN_PT_LOG(d, "Real physical device %02x:%02x.%d registered successfully!\n", |