Commit 6388acc8 authored by Liang Li's avatar Liang Li Committed by Paolo Bonzini
Browse files

Revert "Introduce cpu_clean_all_dirty" 



This reverts commit de9d61e8.

Now 'cpu_clean_all_dirty' is useless, we can revert the related code.

Conflicts:
	include/sysemu/kvm.h

Signed-off-by: default avatarLiang Li <liang.z.li@intel.com>
Message-Id: <1446695464-27116-3-git-send-email-liang.z.li@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 0fd7e098

cpus.c

+0 −9
Original line number Diff line number Diff line
@@ -694,15 +694,6 @@ void cpu_synchronize_all_post_init(void) 
    }

}



void cpu_clean_all_dirty(void)

{

    CPUState *cpu;



    CPU_FOREACH(cpu) {

        cpu_clean_state(cpu);

    }

}



static int do_vm_stop(RunState state)

{

    int ret = 0;

include/sysemu/cpus.h

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ void cpu_stop_current(void); 
void cpu_synchronize_all_states(void);

void cpu_synchronize_all_post_reset(void);

void cpu_synchronize_all_post_init(void);

void cpu_clean_all_dirty(void);



void qtest_clock_warp(int64_t dest);

include/sysemu/kvm.h

+0 −8
Original line number Diff line number Diff line
@@ -417,7 +417,6 @@ int kvm_physical_memory_addr_from_host(KVMState *s, void *ram_addr, 
void kvm_cpu_synchronize_state(CPUState *cpu);

void kvm_cpu_synchronize_post_reset(CPUState *cpu);

void kvm_cpu_synchronize_post_init(CPUState *cpu);

void kvm_cpu_clean_state(CPUState *cpu);



/* generic hooks - to be moved/refactored once there are more users */
@@ -442,13 +441,6 @@ static inline void cpu_synchronize_post_init(CPUState *cpu) 
    }

}



static inline void cpu_clean_state(CPUState *cpu)

{

    if (kvm_enabled()) {

        kvm_cpu_clean_state(cpu);

    }

}



int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg, PCIDevice *dev);

int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg,

                                 PCIDevice *dev);

kvm-all.c

+0 −5
Original line number Diff line number Diff line
@@ -1766,11 +1766,6 @@ void kvm_cpu_synchronize_post_init(CPUState *cpu) 
    run_on_cpu(cpu, do_kvm_cpu_synchronize_post_init, cpu);

}



void kvm_cpu_clean_state(CPUState *cpu)

{

    cpu->kvm_vcpu_dirty = false;

}



int kvm_cpu_exec(CPUState *cpu)

{

    struct kvm_run *run = cpu->kvm_run;