Commit 317e4db6 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 



Small patches, without the one that introduces -fwrapv.

# gpg: Signature made Thu 26 Nov 2015 15:48:53 GMT using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"

* remotes/bonzini/tags/for-upstream:
  target-i386: kvm: Print warning when clearing mcg_cap bits
  target-i386: kvm: Use env->mcg_cap when setting up MCE
  target-i386: kvm: Abort if MCE bank count is not supported by host
  virtio-scsi: don't crash without a valid device
  target-sparc: fix 32-bit truncation in fpackfix
  exec: remove warning about mempath and hugetlbfs
  Revert "exec: silence hugetlbfs warning under qtest"
  call bdrv_drain_all() even if the vm is stopped
  MAINTAINERS: Update TCG CPU cores section

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents fe4cf57d 5120901a

MAINTAINERS

+13 −4
Original line number Diff line number Diff line
@@ -62,14 +62,22 @@ Guest CPU cores (TCG): 
----------------------

Overall

L: qemu-devel@nongnu.org

S: Odd fixes

M: Paolo Bonzini <pbonzini@redhat.com>

M: Peter Crosthwaite <crosthwaite.peter@gmail.com>

M: Richard Henderson <rth@twiddle.net>

S: Maintained

F: cpu-exec.c

F: cpu-exec-common.c

F: cpus.c

F: cputlb.c

F: exec.c

F: softmmu_template.h

F: translate-all.c

F: include/exec/cpu_ldst.h

F: include/exec/cpu_ldst_template.h

F: translate-all.*

F: translate-common.c

F: include/exec/cpu*.h

F: include/exec/exec-all.h

F: include/exec/helper*.h

F: include/exec/tb-hash.h



Alpha

M: Richard Henderson <rth@twiddle.net>
@@ -1042,6 +1050,7 @@ S: Supported 
F: include/exec/ioport.h

F: ioport.c

F: include/exec/memory.h

F: include/exec/ram_addr.h

F: memory.c

F: include/exec/memory-internal.h

F: exec.c

cpus.c

+2 −0
Original line number Diff line number Diff line
@@ -1415,6 +1415,8 @@ int vm_stop_force_state(RunState state) 
        return vm_stop(state);

    } else {

        runstate_set(state);



        bdrv_drain_all();

        /* Make sure to return an error if the flush in a previous vm_stop()

         * failed. */

        return bdrv_flush_all();

exec.c

+0 −6
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 
#include "qemu/main-loop.h"

#include "translate-all.h"

#include "sysemu/replay.h"

#include "sysemu/qtest.h"



#include "exec/memory-internal.h"

#include "exec/ram_addr.h"
@@ -1197,11 +1196,6 @@ static long gethugepagesize(const char *path, Error **errp) 
        return 0;

    }



    if (!qtest_driver() &&

        fs.f_type != HUGETLBFS_MAGIC) {

        fprintf(stderr, "Warning: path not on HugeTLBFS: %s\n", path);

    }



    return fs.f_bsize;

}

hw/scsi/virtio-scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static int virtio_scsi_do_tmf(VirtIOSCSI *s, VirtIOSCSIReq *req) 
    int target;

    int ret = 0;



    if (s->dataplane_started) {

    if (s->dataplane_started && d) {

        assert(blk_get_aio_context(d->conf.blk) == s->ctx);

    }

    /* Here VIRTIO_SCSI_S_OK means "FUNCTION COMPLETE".  */

target-i386/cpu.h

+2 −0
Original line number Diff line number Diff line
@@ -286,6 +286,8 @@ 
#define MCE_CAP_DEF     (MCG_CTL_P|MCG_SER_P)

#define MCE_BANKS_DEF   10



#define MCG_CAP_BANKS_MASK 0xff



#define MCG_STATUS_RIPV (1ULL<<0)   /* restart ip valid */

#define MCG_STATUS_EIPV (1ULL<<1)   /* ip points to correct instruction */

#define MCG_STATUS_MCIP (1ULL<<2)   /* machine check in progress */