Commit a14c7492 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'sstabellini/xen-2012-10-03' into staging 

* sstabellini/xen-2012-10-03:
  xen: Set the vram dirty when an error occur.
  exec, memory: Call to xen_modified_memory.
  exec: Introduce helper to set dirty flags.
  xen: Introduce xen_modified_memory.
  QMP, Introduce xen-set-global-dirty-log command.
  qemu/xen: Add 64 bits big bar support on qemu
  xen: Fix, no unplug of pt device by platform device.
parents 05d4f2f2 8aba7dc0

exec-obsolete.h

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#endif



#ifndef CONFIG_USER_ONLY

#include "hw/xen.h"



ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host,

                                   MemoryRegion *mr);
@@ -111,6 +112,7 @@ static inline void cpu_physical_memory_set_dirty_range(ram_addr_t start, 
    for (addr = start; addr < end; addr += TARGET_PAGE_SIZE) {

        cpu_physical_memory_set_dirty_flags(addr, dirty_flags);

    }

    xen_modified_memory(addr, length);

}



static inline void cpu_physical_memory_mask_dirty_range(ram_addr_t start,

exec.c

+18 −35
Original line number Diff line number Diff line
@@ -3417,6 +3417,19 @@ int cpu_memory_rw_debug(CPUArchState *env, target_ulong addr, 
}



#else



static void invalidate_and_set_dirty(target_phys_addr_t addr,

                                     target_phys_addr_t length)

{

    if (!cpu_physical_memory_is_dirty(addr)) {

        /* invalidate code */

        tb_invalidate_phys_page_range(addr, addr + length, 0);

        /* set dirty bit */

        cpu_physical_memory_set_dirty_flags(addr, (0xff & ~CODE_DIRTY_FLAG));

    }

    xen_modified_memory(addr, length);

}



void cpu_physical_memory_rw(target_phys_addr_t addr, uint8_t *buf,

                            int len, int is_write)

{
@@ -3462,13 +3475,7 @@ void cpu_physical_memory_rw(target_phys_addr_t addr, uint8_t *buf, 
                /* RAM case */

                ptr = qemu_get_ram_ptr(addr1);

                memcpy(ptr, buf, l);

                if (!cpu_physical_memory_is_dirty(addr1)) {

                    /* invalidate code */

                    tb_invalidate_phys_page_range(addr1, addr1 + l, 0);

                    /* set dirty bit */

                    cpu_physical_memory_set_dirty_flags(

                        addr1, (0xff & ~CODE_DIRTY_FLAG));

                }

                invalidate_and_set_dirty(addr1, l);

                qemu_put_ram_ptr(ptr);

            }

        } else {
@@ -3534,13 +3541,7 @@ void cpu_physical_memory_write_rom(target_phys_addr_t addr, 
            /* ROM/RAM case */

            ptr = qemu_get_ram_ptr(addr1);

            memcpy(ptr, buf, l);

            if (!cpu_physical_memory_is_dirty(addr1)) {

                /* invalidate code */

                tb_invalidate_phys_page_range(addr1, addr1 + l, 0);

                /* set dirty bit */

                cpu_physical_memory_set_dirty_flags(

                    addr1, (0xff & ~CODE_DIRTY_FLAG));

            }

            invalidate_and_set_dirty(addr1, l);

            qemu_put_ram_ptr(ptr);

        }

        len -= l;
@@ -3666,13 +3667,7 @@ void cpu_physical_memory_unmap(void *buffer, target_phys_addr_t len, 
                l = TARGET_PAGE_SIZE;

                if (l > access_len)

                    l = access_len;

                if (!cpu_physical_memory_is_dirty(addr1)) {

                    /* invalidate code */

                    tb_invalidate_phys_page_range(addr1, addr1 + l, 0);

                    /* set dirty bit */

                    cpu_physical_memory_set_dirty_flags(

                        addr1, (0xff & ~CODE_DIRTY_FLAG));

                }

                invalidate_and_set_dirty(addr1, l);

                addr1 += l;

                access_len -= l;

            }
@@ -3978,13 +3973,7 @@ static inline void stl_phys_internal(target_phys_addr_t addr, uint32_t val, 
            stl_p(ptr, val);

            break;

        }

        if (!cpu_physical_memory_is_dirty(addr1)) {

            /* invalidate code */

            tb_invalidate_phys_page_range(addr1, addr1 + 4, 0);

            /* set dirty bit */

            cpu_physical_memory_set_dirty_flags(addr1,

                (0xff & ~CODE_DIRTY_FLAG));

        }

        invalidate_and_set_dirty(addr1, 4);

    }

}
@@ -4051,13 +4040,7 @@ static inline void stw_phys_internal(target_phys_addr_t addr, uint32_t val, 
            stw_p(ptr, val);

            break;

        }

        if (!cpu_physical_memory_is_dirty(addr1)) {

            /* invalidate code */

            tb_invalidate_phys_page_range(addr1, addr1 + 2, 0);

            /* set dirty bit */

            cpu_physical_memory_set_dirty_flags(addr1,

                (0xff & ~CODE_DIRTY_FLAG));

        }

        invalidate_and_set_dirty(addr1, 2);

    }

}

hw/xen.h

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ void xenstore_store_pv_console_info(int i, struct CharDriverState *chr); 
struct MemoryRegion;

void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size,

                   struct MemoryRegion *mr);

void xen_modified_memory(ram_addr_t start, ram_addr_t length);

#endif



struct MemoryRegion;

hw/xen_platform.c

+6 −2
Original line number Diff line number Diff line
@@ -85,8 +85,10 @@ static void log_writeb(PCIXenPlatformState *s, char val) 


static void unplug_nic(PCIBus *b, PCIDevice *d, void *o)

{

    /* We have to ignore passthrough devices */

    if (pci_get_word(d->config + PCI_CLASS_DEVICE) ==

            PCI_CLASS_NETWORK_ETHERNET) {

            PCI_CLASS_NETWORK_ETHERNET

            && strcmp(d->name, "xen-pci-passthrough") != 0) {

        qdev_free(&d->qdev);

    }

}
@@ -98,8 +100,10 @@ static void pci_unplug_nics(PCIBus *bus) 


static void unplug_disks(PCIBus *b, PCIDevice *d, void *o)

{

    /* We have to ignore passthrough devices */

    if (pci_get_word(d->config + PCI_CLASS_DEVICE) ==

            PCI_CLASS_STORAGE_IDE) {

            PCI_CLASS_STORAGE_IDE

            && strcmp(d->name, "xen-pci-passthrough") != 0) {

        qdev_unplug(&(d->qdev), NULL);

    }

}

hw/xen_pt.c

+5 −2
Original line number Diff line number Diff line
@@ -410,14 +410,17 @@ static int xen_pt_register_regions(XenPCIPassthroughState *s) 
            if (r->type & XEN_HOST_PCI_REGION_TYPE_PREFETCH) {

                type |= PCI_BASE_ADDRESS_MEM_PREFETCH;

            }

            if (r->type & XEN_HOST_PCI_REGION_TYPE_MEM_64) {

                type |= PCI_BASE_ADDRESS_MEM_TYPE_64;

            }

        }



        memory_region_init_io(&s->bar[i], &ops, &s->dev,

                              "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%08"PRIx64

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

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

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

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

    }