summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-12-14 17:35:05 +0200
committerAvi Kivity <avi@redhat.com>2009-12-14 17:35:05 +0200
commitd5c7c9da2baea9f9e7bb5cea4479de6b92bf03a5 (patch)
treeddb9503c985a2064d801edac049539e98413d224
parentMerge commit '0014803d23acaccc15b31180f06784f5d6edfd3a' into stable-0.12-merge (diff)
parenttarget-i386: Update CPUID feature set for TCG (diff)
downloadqemu-kvm-d5c7c9da2baea9f9e7bb5cea4479de6b92bf03a5.tar.gz
qemu-kvm-d5c7c9da2baea9f9e7bb5cea4479de6b92bf03a5.tar.bz2
qemu-kvm-d5c7c9da2baea9f9e7bb5cea4479de6b92bf03a5.zip
Merge commit '910628f39676ee65211727245809eec7ca4d75f5' into stable-0.12-merge
* commit '910628f39676ee65211727245809eec7ca4d75f5': target-i386: Update CPUID feature set for TCG s390: typo fix s390: fix build on 32 bit host Update Changelog and VERSION for 0.12.0-rc2 Conflicts: target-i386/helper.c Signed-off-by: Avi Kivity <avi@redhat.com>
-rw-r--r--Changelog36
-rw-r--r--VERSION2
-rw-r--r--hw/s390-virtio.c4
-rw-r--r--target-i386/helper.c20
4 files changed, 50 insertions, 12 deletions
diff --git a/Changelog b/Changelog
index 2a3e37d2b..79cd934a4 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,39 @@
+version 0.12.0-rc2:
+
+ - v2: properly save kvm system time msr registers (Glauber Costa)
+ - convert more monitor commands to qmp (Luiz Capitulino)
+ - vnc: fix capslock tracking logic. (Gerd Hoffmann)
+ - QemuOpts: allow larger option values. (Gerd Hoffmann)
+ - scsi: fix drive hotplug. (Gerd Hoffmann)
+ - pci: don't hw_error() when no slot is available. (Gerd Hoffmann)
+ - pci: don't abort() when trying to hotplug with acpi off. (Gerd Hoffmann)
+ - allow default devices to be implemented in config file (Gerd Hoffman)
+ - vc: colorize chardev title line with blue background. (Gerd Hoffmann)
+ - chardev: make chardevs specified in config file work. (Gerd Hoffmann)
+ - qdev: also match bus name for global properties (Gerd Hoffmann)
+ - qdev: add command line option to set global defaults for properties. (Gerd Hoffmann)
+ - kvm: x86: Save/restore exception_index (Jan Kiszka)
+ - qdev: Replace device names containing whitespace (Markus Armbruster)
+ - fix rtc-td-hack on host without high-res timers (Gleb Natapov)
+ - virtio: verify features on load (Michael S. Tsirkin)
+ - vmware_vga: add rom file so that it boots. (Dave Airlie)
+ - Do not abort on qemu_malloc(0) in production builds (Anthony Liguori)
+ - Fix ARM userspace strex implementation. (Paul Brook)
+ - qemu: delete rule target on error (Michael S. Tsirkin)
+ - QMP: add human-readable description to error response (Markus Armbruster)
+ - convert more monitor commands to QError (Markus Armbruster)
+ - monitor: Fix double-prompt after "change vnc passwd BLA" (Markus Armbruster)
+ - monitor: do_cont(): Don't ask for passwords (Luiz Capitulino)
+ - monitor: Introduce 'block_passwd' command (Luiz Capitulino)
+ - pci: interrupt disable bit support (Michael S. Tsirkin)
+ - pci: interrupt status bit implementation (Michael S. Tsirkin)
+ - pci: prepare irq code for interrupt state (Michael S. Tsirkin)
+ - msix: function mask support (Michael S. Tsirkin)
+ - msix: macro rename for function mask support (Michael S. Tsirkin)
+ - cpuid: Fix multicore setup on Intel (Andre Przywara)
+ - kvm: x86: Fix initial kvm_has_msr_star (Jan Kiszka)
+ - Update OpenBIOS images to r640 (Aurelien Jarno)
+
version 0.10.2:
- fix savevm/loadvm (Anthony Liguori)
diff --git a/VERSION b/VERSION
index 568d15238..c25276499 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.11.91
+0.11.92
diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index 51c032adc..b56788652 100644
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -181,7 +181,7 @@ static void s390_init(ram_addr_t ram_size,
cpu_synchronize_state(env);
env->psw.addr = KERN_IMAGE_START;
- env->psw.mask = 0x0000000180000000UL;
+ env->psw.mask = 0x0000000180000000ULL;
}
if (initrd_filename) {
@@ -245,7 +245,7 @@ static QEMUMachine s390_machine = {
.init = s390_init,
.no_serial = 1,
.no_parallel = 1,
- .use_virtcon = 1.
+ .use_virtcon = 1,
.no_vga = 1,
.max_cpus = 255,
.is_default = 1,
diff --git a/target-i386/helper.c b/target-i386/helper.c
index 09ba5e9cf..9a50da64d 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -133,10 +133,11 @@ static x86_def_t x86_defs[] = {
CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA |
/* this feature is needed for Solaris and isn't fully implemented */
CPUID_PSE36,
- .ext_features = CPUID_EXT_SSE3,
+ .ext_features = CPUID_EXT_SSE3 | CPUID_EXT_CX16 | CPUID_EXT_POPCNT,
.ext2_features = (PPRO_FEATURES & 0x0183F3FF) |
CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX,
- .ext3_features = CPUID_EXT3_SVM,
+ .ext3_features = CPUID_EXT3_LAHF_LM | CPUID_EXT3_SVM |
+ CPUID_EXT3_ABM | CPUID_EXT3_SSE4A,
.xlevel = 0x8000000A,
.model_id = "QEMU Virtual CPU version " QEMU_VERSION,
},
@@ -153,18 +154,19 @@ static x86_def_t x86_defs[] = {
.features = PPRO_FEATURES |
CPUID_MTRR | CPUID_CLFLUSH | CPUID_MCA |
CPUID_PSE36,
- /* Missing: CPUID_EXT_CX16, CPUID_EXT_POPCNT */
- .ext_features = CPUID_EXT_SSE3 | CPUID_EXT_MONITOR,
+ .ext_features = CPUID_EXT_SSE3 | CPUID_EXT_MONITOR | CPUID_EXT_CX16 |
+ CPUID_EXT_POPCNT,
/* Missing: CPUID_EXT2_PDPE1GB, CPUID_EXT2_RDTSCP */
.ext2_features = (PPRO_FEATURES & 0x0183F3FF) |
CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX |
CPUID_EXT2_3DNOW | CPUID_EXT2_3DNOWEXT | CPUID_EXT2_MMXEXT |
CPUID_EXT2_FFXSR,
- /* Missing: CPUID_EXT3_LAHF_LM, CPUID_EXT3_CMP_LEG, CPUID_EXT3_EXTAPIC,
- CPUID_EXT3_CR8LEG, CPUID_EXT3_ABM, CPUID_EXT3_SSE4A,
+ /* Missing: CPUID_EXT3_CMP_LEG, CPUID_EXT3_EXTAPIC,
+ CPUID_EXT3_CR8LEG,
CPUID_EXT3_MISALIGNSSE, CPUID_EXT3_3DNOWPREFETCH,
CPUID_EXT3_OSVW, CPUID_EXT3_IBS */
- .ext3_features = CPUID_EXT3_SVM,
+ .ext3_features = CPUID_EXT3_LAHF_LM | CPUID_EXT3_SVM |
+ CPUID_EXT3_ABM | CPUID_EXT3_SSE4A,
.xlevel = 0x8000001A,
.model_id = "AMD Phenom(tm) 9550 Quad-Core Processor"
},
@@ -185,7 +187,7 @@ static x86_def_t x86_defs[] = {
CPUID_EXT_TM2, CPUID_EXT_CX16, CPUID_EXT_XTPR, CPUID_EXT_PDCM */
.ext_features = CPUID_EXT_SSE3 | CPUID_EXT_MONITOR | CPUID_EXT_SSSE3,
.ext2_features = CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX,
- /* Missing: .ext3_features = CPUID_EXT3_LAHF_LM */
+ .ext3_features = CPUID_EXT3_LAHF_LM,
.xlevel = 0x80000008,
.model_id = "Intel(R) Core(TM)2 Duo CPU T7700 @ 2.40GHz",
},
@@ -223,7 +225,7 @@ static x86_def_t x86_defs[] = {
.model = 3,
.stepping = 3,
.features = PPRO_FEATURES,
- .ext_features = CPUID_EXT_SSE3,
+ .ext_features = CPUID_EXT_SSE3 | CPUID_EXT_POPCNT,
.xlevel = 0,
.model_id = "QEMU Virtual CPU version " QEMU_VERSION,
},