Commit 39c153b8 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'afaerber/tags/qom-cpu-for-anthony' into staging 

QOM CPUState refactorings / X86CPU

* Fix for X86CPU model field of qemu32/qemu64 CPU models
* Bug fix for longjmp on FreeBSD
* Removal of unused function
* Confinement of clone syscall infrastructure to linux-user

# gpg: Signature made Wed 09 Oct 2013 03:40:51 AM PDT using RSA key ID 3E7E013F
# gpg: Can't check signature: public key not found

# By Andreas Färber (2) and others
# Via Andreas Färber
* afaerber/tags/qom-cpu-for-anthony:
  cpu: Drop cpu_model_str from CPU_COMMON
  cpu: Move cpu_copy() into linux-user
  cputlb: Remove dead function tlb_update_dirty()
  cpu-exec: Also reload CPUClass *cc after longjmp return in cpu_exec()
  target-i386: Set model=6 on qemu64 & qemu32 CPU models
parents e8f2f59a 51fb256a

cpu-exec.c

+4 −0
Original line number Diff line number Diff line
@@ -681,6 +681,10 @@ int cpu_exec(CPUArchState *env) 
             * local variables as longjmp is marked 'noreturn'. */

            cpu = current_cpu;

            env = cpu->env_ptr;

#if !(defined(CONFIG_USER_ONLY) && \

      (defined(TARGET_M68K) || defined(TARGET_PPC) || defined(TARGET_S390X)))

            cc = CPU_GET_CLASS(cpu);

#endif

        }

    } /* for(;;) */

cputlb.c

+0 −15
Original line number Diff line number Diff line
@@ -169,21 +169,6 @@ static inline ram_addr_t qemu_ram_addr_from_host_nofail(void *ptr) 
    return ram_addr;

}



static inline void tlb_update_dirty(CPUTLBEntry *tlb_entry)

{

    ram_addr_t ram_addr;

    void *p;



    if (tlb_is_dirty_ram(tlb_entry)) {

        p = (void *)(uintptr_t)((tlb_entry->addr_write & TARGET_PAGE_MASK)

            + tlb_entry->addend);

        ram_addr = qemu_ram_addr_from_host_nofail(p);

        if (!cpu_physical_memory_is_dirty(ram_addr)) {

            tlb_entry->addr_write |= TLB_NOTDIRTY;

        }

    }

}



void cpu_tlb_reset_dirty_all(ram_addr_t start1, ram_addr_t length)

{

    CPUState *cpu;

exec.c

+0 −32
Original line number Diff line number Diff line
@@ -625,38 +625,6 @@ void cpu_abort(CPUArchState *env, const char *fmt, ...) 
    abort();

}



CPUArchState *cpu_copy(CPUArchState *env)

{

    CPUArchState *new_env = cpu_init(env->cpu_model_str);

#if defined(TARGET_HAS_ICE)

    CPUBreakpoint *bp;

    CPUWatchpoint *wp;

#endif



    /* Reset non arch specific state */

    cpu_reset(ENV_GET_CPU(new_env));



    /* Copy arch specific state into the new CPU */

    memcpy(new_env, env, sizeof(CPUArchState));



    /* Clone all break/watchpoints.

       Note: Once we support ptrace with hw-debug register access, make sure

       BP_CPU break/watchpoints are handled correctly on clone. */

    QTAILQ_INIT(&env->breakpoints);

    QTAILQ_INIT(&env->watchpoints);

#if defined(TARGET_HAS_ICE)

    QTAILQ_FOREACH(bp, &env->breakpoints, entry) {

        cpu_breakpoint_insert(new_env, bp->pc, bp->flags, NULL);

    }

    QTAILQ_FOREACH(wp, &env->watchpoints, entry) {

        cpu_watchpoint_insert(new_env, wp->vaddr, (~wp->len_mask) + 1,

                              wp->flags, NULL);

    }

#endif



    return new_env;

}



#if !defined(CONFIG_USER_ONLY)

static void tlb_reset_dirty_range_all(ram_addr_t start, ram_addr_t end,

                                      uintptr_t length)

include/exec/cpu-defs.h

+0 −2
Original line number Diff line number Diff line
@@ -178,7 +178,5 @@ typedef struct CPUWatchpoint { 
                                                                        \

    /* user data */                                                     \

    void *opaque;                                                       \

                                                                        \

    const char *cpu_model_str;



#endif

include/hw/i386/pc.h

+8 −0
Original line number Diff line number Diff line
@@ -230,6 +230,14 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); 
            .driver   = "e1000",\

            .property = "mitigation",\

            .value    = "off",\

        },{\

            .driver   = "qemu64-" TYPE_X86_CPU,\

            .property = "model",\

            .value    = stringify(2),\

        },{\

            .driver   = "qemu32-" TYPE_X86_CPU,\

            .property = "model",\

            .value    = stringify(3),\

        }



#define PC_COMPAT_1_5 \