Commit 97374ce5 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'sstabellini/xen-170114' into staging 



* sstabellini/xen-170114:
  xen_pt: Fix passthrough of device with ROM.
  xen_pt: Fix debug output.
  xenfb: map framebuffer read-only and handle unmap errors

Message-id: alpine.DEB.2.02.1401171537140.21510@kaball.uk.xensource.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 8e02b359 794798e3

hw/display/xenfb.c

+6 −1
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ static int xenfb_map_fb(struct XenFB *xenfb) 
    munmap(map, n_fbdirs * XC_PAGE_SIZE);



    xenfb->pixels = xc_map_foreign_pages(xen_xc, xenfb->c.xendev.dom,

					 PROT_READ | PROT_WRITE, fbmfns, xenfb->fbpages);

            PROT_READ, fbmfns, xenfb->fbpages);

    if (xenfb->pixels == NULL)

	goto out;
@@ -903,6 +903,11 @@ static void fb_disconnect(struct XenDevice *xendev) 
    fb->pixels = mmap(fb->pixels, fb->fbpages * XC_PAGE_SIZE,

                      PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON,

                      -1, 0);

    if (fb->pixels == MAP_FAILED) {

        xen_be_printf(xendev, 0,

                "Couldn't replace the framebuffer with anonymous memory errno=%d\n",

                errno);

    }

    common_unbind(&fb->c);

    fb->feature_update = 0;

    fb->bug_trigger    = 0;

hw/xen/xen_pt.c

+4 −4
Original line number Diff line number Diff line
@@ -420,8 +420,8 @@ static int xen_pt_register_regions(XenPCIPassthroughState *s) 
                              "xen-pci-pt-bar", r->size);

        pci_register_bar(&s->dev, i, type, &s->bar[i]);



        XEN_PT_LOG(&s->dev, "IO region %i registered (size=0x%lx"PRIx64

                   " base_addr=0x%lx"PRIx64" type: %#x)\n",

        XEN_PT_LOG(&s->dev, "IO region %i registered (size=0x%08"PRIx64

                   " base_addr=0x%08"PRIx64" type: %#x)\n",

                   i, r->size, r->base_addr, type);

    }
@@ -440,7 +440,7 @@ static int xen_pt_register_regions(XenPCIPassthroughState *s) 


        s->bases[PCI_ROM_SLOT].access.maddr = d->rom.base_addr;



        memory_region_init_rom_device(&s->rom, OBJECT(s), NULL, NULL,

        memory_region_init_io(&s->rom, OBJECT(s), &ops, &s->dev,

                              "xen-pci-pt-rom", d->rom.size);

        pci_register_bar(&s->dev, PCI_ROM_SLOT, PCI_BASE_ADDRESS_MEM_PREFETCH,

                         &s->rom);