The following changes since commit 7bc8e0c967a4ef77657174d28af775691e18b4ce:
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
(2015-10-29 09:49:52 +0000)
are available in the git repository at:
git://github.com/bonzini/qemu.git tags/for-upstream
for you to fetch changes up to e01dd3da5cf9aa90ae844d3b86c2c2762066edac:
iscsi: Translate scsi sense into error code (2015-11-05 14:42:19 +0100)
----------------------------------------------------------------
* Guest ABI fixes for PC machines (hw_version)
* Fixes for recent Perl
* John Snow's configure fixes
* file-backed RAM improvements (Igor, Pavel)
* -Werror=clobbered fixes (Stefan)
* Kill -d ioport
* Fix qemu-system-s390x
* Performance improvement for kvmclock migration
----------------------------------------------------------------
Eduardo Habkost (3):
pc: Set hw_version on all machine classes
osdep: Rename qemu_{get, set}_version() to qemu_{, set_}hw_version()
megasas: Use qemu_hw_version() instead of QEMU_VERSION
Fam Zheng (2):
scripts/text2pod.pl: Escape left brace
iscsi: Translate scsi sense into error code
Igor Mammedov (1):
file_ram_alloc: propagate error to caller instead of terminating QEMU
John Snow (2):
configure: disallow ccache during compile tests
configure: disable FORTIFY_SOURCE under clang
Liang Li (2):
kvmclock: add a new function to update env->tsc.
Revert "Introduce cpu_clean_all_dirty"
Paolo Bonzini (4):
target-i386: fix pcmpxstrx equal-ordered (strstr) mode
ioport: do not use CPU_LOG_IOPORT
qemu-log: remove -d ioport
memory: call begin, log_start and commit when registering a new listener
Pavel Fedin (1):
backends/hostmem-file: Allow to specify full pathname for backing file
Stefan Weil (1):
cpu-exec: Fix compiler warning (-Werror=clobbered)
block/iscsi.c | 93 +++++++++++++++++++++++++++++++++++++++-----------
configure | 21 +++++++++++-
cpu-exec.c | 18 ++++++++--
cpus.c | 9 -----
exec.c | 40 ++++++++++++----------
hw/arm/nseries.c | 2 +-
hw/i386/kvm/clock.c | 18 ++--------
hw/i386/pc_piix.c | 13 +++++++
hw/i386/pc_q35.c | 10 ++++++
hw/ide/core.c | 2 +-
hw/scsi/megasas.c | 2 +-
hw/scsi/scsi-bus.c | 2 +-
hw/scsi/scsi-disk.c | 2 +-
include/qemu/log.h | 1 -
include/qemu/osdep.h | 4 +--
include/sysemu/cpus.h | 1 -
include/sysemu/kvm.h | 8 -----
ioport.c | 26 ++++----------
kvm-all.c | 5 ---
memory.c | 9 +++++
qemu-doc.texi | 2 +-
qemu-log.c | 2 --
scripts/texi2pod.pl | 2 +-
target-i386/cpu.c | 2 +-
target-i386/kvm.c | 45 ++++++++++++++++++++++++
target-i386/kvm_i386.h | 1 +
target-i386/ops_sse.h | 4 +--
trace-events | 4 +--
util/osdep.c | 10 +++---
vl.c | 2 +-
30 files changed, 236 insertions(+), 124 deletions(-)
--
1.8.3.1
From: Paolo Bonzini <pbonz...@redhat.com>
Date: Mon, 12 Oct 2015 11:50:27 +0200
Subject: [PULL 03/16] target-i386: fix pcmpxstrx equal-ordered (strstr) mode
In this mode, referring an invalid element of the source forces the
result to false (table 4-7, last column) but referring an invalid
element of the destination forces the result to true, so the outer
loop should still be run even if some elements of the destination
will be invalid. They will be avoided in the inner loop, which
correctly bounds "i" to validd, but they will still contribute to a
positive outcome of the search.
This fixes tst_strstr in glibc 2.17.
Reported-by: Florian Weimer <fwei...@redhat.com>
Cc: Richard Henderson <r...@twiddle.net>
Cc: Eduardo Habkost <ehabk...@redhat.com>
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
target-i386/ops_sse.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/target-i386/ops_sse.h b/target-i386/ops_sse.h
index 7aa693a..1780d1d 100644
--- a/target-i386/ops_sse.h
+++ b/target-i386/ops_sse.h
@@ -2037,10 +2037,10 @@ static inline unsigned pcmpxstrx(CPUX86State *env, Reg
*d, Reg *s,
}
break;
case 3:
- for (j = valids - validd; j >= 0; j--) {
+ for (j = valids; j >= 0; j--) {
res <<= 1;
v = 1;
- for (i = MIN(upper - j, validd); i >= 0; i--) {
+ for (i = MIN(valids - j, validd); i >= 0; i--) {
v &= (pcmp_val(s, ctrl, i + j) == pcmp_val(d, ctrl, i));
}
res |= v;
--
1.8.3.1
