Commit f71e769d authored by Peter Maydell's avatar Peter Maydell
Browse files

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



QOM CPUState refactorings / X86CPU

* Fix pointer type mismatch

# gpg: Signature made Wed 19 Mar 2014 18:51:47 GMT using RSA key ID 3E7E013F
# gpg: Good signature from "Andreas Färber <afaerber@suse.de>"
# gpg:                 aka "Andreas Färber <afaerber@suse.com>"

* remotes/afaerber/tags/qom-cpu-for-2.0:
  exec: Fix CPU rework fallout

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ec864874 c01a71c1

exec.c

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ static int cpu_common_post_load(void *opaque, int version_id) 
    /* 0x01 was CPU_INTERRUPT_EXIT. This line can be removed when the

       version_id is increased. */

    cpu->interrupt_request &= ~0x01;

    tlb_flush(cpu->env_ptr, 1);

    tlb_flush(cpu, 1);



    return 0;

}