diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-11-22 12:50:34 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-11-22 12:50:34 +0200 |
| commit | 5d968c942adbc48188dbbcf7d85e69c2e0d7cd8a (patch) | |
| tree | 9f26712ac1ad260074d5aea7d60c37d467eb4210 /target-i386 | |
| parent | Revert bios to last qemu-kvm version of pcbios.bin (diff) | |
| parent | Added readonly flag to -drive command (diff) | |
| download | qemu-kvm-5d968c942adbc48188dbbcf7d85e69c2e0d7cd8a.tar.gz qemu-kvm-5d968c942adbc48188dbbcf7d85e69c2e0d7cd8a.tar.bz2 qemu-kvm-5d968c942adbc48188dbbcf7d85e69c2e0d7cd8a.zip | |
Merge commit '59f2689d9082f2f631253c810f73cd22290144a9' into upstream-merge
* commit '59f2689d9082f2f631253c810f73cd22290144a9':
Added readonly flag to -drive command
qcow2: Allow qcow2 disk images with size zero
(x86/Sparc/PPC)-user: fix cpu_copy
IDE: Fix reset handling
user: move CPU reset call to main.c for x86/PPC/Sparc
PPC: rename cpu_ppc_reset to cpu_reset for consistency
Sparc64/x86: remove unneeded calls to device reset
PPC: remove unneeded calls to device reset
sparc32 (mostly): remove unneeded calls to device reset
v3: don't call reset functions on cpu initialization
vga: fix line comparison
vga: Respect Line Compare Register in text modes
Conflicts:
qemu-config.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/helper.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/target-i386/helper.c b/target-i386/helper.c index 492070882..fd32b2ee9 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -1913,7 +1913,6 @@ CPUX86State *cpu_x86_init(const char *cpu_model) return NULL; } mce_init(env); - cpu_reset(env); return env; } |