Revision 640f42e4 exec.c

b/exec.c
71 71
#define TARGET_VIRT_ADDR_SPACE_BITS 42
72 72
#elif defined(TARGET_PPC64)
73 73
#define TARGET_PHYS_ADDR_SPACE_BITS 42
74
#elif defined(TARGET_X86_64) && !defined(USE_KQEMU)
74
#elif defined(TARGET_X86_64) && !defined(CONFIG_KQEMU)
75 75
#define TARGET_PHYS_ADDR_SPACE_BITS 42
76
#elif defined(TARGET_I386) && !defined(USE_KQEMU)
76
#elif defined(TARGET_I386) && !defined(CONFIG_KQEMU)
77 77
#define TARGET_PHYS_ADDR_SPACE_BITS 36
78 78
#else
79 79
/* Note: for compatibility with kqemu, we use 32 bits for x86_64 */
......
1760 1760

  
1761 1761
    memset (env->tb_jmp_cache, 0, TB_JMP_CACHE_SIZE * sizeof (void *));
1762 1762

  
1763
#ifdef USE_KQEMU
1763
#ifdef CONFIG_KQEMU
1764 1764
    if (env->kqemu_enabled) {
1765 1765
        kqemu_flush(env, flush_global);
1766 1766
    }
......
1809 1809

  
1810 1810
    tlb_flush_jmp_cache(env, addr);
1811 1811

  
1812
#ifdef USE_KQEMU
1812
#ifdef CONFIG_KQEMU
1813 1813
    if (env->kqemu_enabled) {
1814 1814
        kqemu_flush_page(env, addr);
1815 1815
    }
......
1861 1861
    if (length == 0)
1862 1862
        return;
1863 1863
    len = length >> TARGET_PAGE_BITS;
1864
#ifdef USE_KQEMU
1864
#ifdef CONFIG_KQEMU
1865 1865
    /* XXX: should not depend on cpu context */
1866 1866
    env = first_cpu;
1867 1867
    if (env->kqemu_enabled) {
......
2328 2328
    ram_addr_t orig_size = size;
2329 2329
    void *subpage;
2330 2330

  
2331
#ifdef USE_KQEMU
2331
#ifdef CONFIG_KQEMU
2332 2332
    /* XXX: should not depend on cpu context */
2333 2333
    env = first_cpu;
2334 2334
    if (env->kqemu_enabled) {
......
2429 2429
        kvm_uncoalesce_mmio_region(addr, size);
2430 2430
}
2431 2431

  
2432
#ifdef USE_KQEMU
2432
#ifdef CONFIG_KQEMU
2433 2433
/* XXX: better than nothing */
2434 2434
static ram_addr_t kqemu_ram_alloc(ram_addr_t size)
2435 2435
{
......
2449 2449
{
2450 2450
    RAMBlock *new_block;
2451 2451

  
2452
#ifdef USE_KQEMU
2452
#ifdef CONFIG_KQEMU
2453 2453
    if (kqemu_phys_ram_base) {
2454 2454
        return kqemu_ram_alloc(size);
2455 2455
    }
......
2494 2494
    RAMBlock **prevp;
2495 2495
    RAMBlock *block;
2496 2496

  
2497
#ifdef USE_KQEMU
2497
#ifdef CONFIG_KQEMU
2498 2498
    if (kqemu_phys_ram_base) {
2499 2499
        return kqemu_phys_ram_base + addr;
2500 2500
    }
......
2532 2532
    RAMBlock *block;
2533 2533
    uint8_t *host = ptr;
2534 2534

  
2535
#ifdef USE_KQEMU
2535
#ifdef CONFIG_KQEMU
2536 2536
    if (kqemu_phys_ram_base) {
2537 2537
        return host - kqemu_phys_ram_base;
2538 2538
    }
......
2642 2642
#endif
2643 2643
    }
2644 2644
    stb_p(qemu_get_ram_ptr(ram_addr), val);
2645
#ifdef USE_KQEMU
2645
#ifdef CONFIG_KQEMU
2646 2646
    if (cpu_single_env->kqemu_enabled &&
2647 2647
        (dirty_flags & KQEMU_MODIFY_PAGE_MASK) != KQEMU_MODIFY_PAGE_MASK)
2648 2648
        kqemu_modify_page(cpu_single_env, ram_addr);
......
2667 2667
#endif
2668 2668
    }
2669 2669
    stw_p(qemu_get_ram_ptr(ram_addr), val);
2670
#ifdef USE_KQEMU
2670
#ifdef CONFIG_KQEMU
2671 2671
    if (cpu_single_env->kqemu_enabled &&
2672 2672
        (dirty_flags & KQEMU_MODIFY_PAGE_MASK) != KQEMU_MODIFY_PAGE_MASK)
2673 2673
        kqemu_modify_page(cpu_single_env, ram_addr);
......
2692 2692
#endif
2693 2693
    }
2694 2694
    stl_p(qemu_get_ram_ptr(ram_addr), val);
2695
#ifdef USE_KQEMU
2695
#ifdef CONFIG_KQEMU
2696 2696
    if (cpu_single_env->kqemu_enabled &&
2697 2697
        (dirty_flags & KQEMU_MODIFY_PAGE_MASK) != KQEMU_MODIFY_PAGE_MASK)
2698 2698
        kqemu_modify_page(cpu_single_env, ram_addr);
......
2993 2993

  
2994 2994
    io_mem_watch = cpu_register_io_memory(0, watch_mem_read,
2995 2995
                                          watch_mem_write, NULL);
2996
#ifdef USE_KQEMU
2996
#ifdef CONFIG_KQEMU
2997 2997
    if (kqemu_phys_ram_base) {
2998 2998
        /* alloc dirty bits array */
2999 2999
        phys_ram_dirty = qemu_vmalloc(kqemu_phys_ram_size >> TARGET_PAGE_BITS);

Also available in: Unified diff