Commit 7b93d78a authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Miscellaenous bugfixes, including crash fixes from Alexey, Peter M. and
Thomas.

# gpg: Signature made Mon 26 Mar 2018 13:37:38 BST
# gpg:                using RSA key BFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream:
  qemu-pr-helper: Actually allow users to specify pidfile
  chardev/char-fe: Allow NULL chardev in qemu_chr_fe_init()
  iothread: fix breakage on windows
  scsi: turn "is this a SCSI device?" into a conditional hint
  chardev-socket: remove useless if
  tcg: Really fix cpu_io_recompile
  vhost-user-test: add back memfd check
  vhost-user-test: do not hang if chardev creation failed
  scripts/device-crash-test: Remove fixed isapc-with-iommu entry
  hw/audio: Fix crashes when devices are used on ISA bus without DMA
  fdc: Exit if ISA controller does not support DMA
  hw/net/can: Fix segfaults when using the devices without bus
  WHPX improve vcpu_post_run perf
  WHPX fix WHvSetPartitionProperty in PropertyCode
  WHPX fix WHvGetCapability out WrittenSizeInBytes
  scripts/get_maintainer.pl: Print proper error message for missing $file

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 2ffd221d f8e1a989

accel/tcg/translate-all.c

+10 −27
Original line number Diff line number Diff line
@@ -1728,8 +1728,7 @@ void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr) 
    CPUArchState *env = cpu->env_ptr;

#endif

    TranslationBlock *tb;

    uint32_t n, flags;

    target_ulong pc, cs_base;

    uint32_t n;



    tb_lock();

    tb = tb_find_pc(retaddr);
@@ -1737,44 +1736,33 @@ void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr) 
        cpu_abort(cpu, "cpu_io_recompile: could not find TB for pc=%p",

                  (void *)retaddr);

    }

    n = cpu->icount_decr.u16.low + tb->icount;

    cpu_restore_state_from_tb(cpu, tb, retaddr);

    /* Calculate how many instructions had been executed before the fault

       occurred.  */

    n = n - cpu->icount_decr.u16.low;

    /* Generate a new TB ending on the I/O insn.  */

    n++;



    /* On MIPS and SH, delay slot instructions can only be restarted if

       they were already the first instruction in the TB.  If this is not

       the first instruction in a TB then re-execute the preceding

       branch.  */

    n = 1;

#if defined(TARGET_MIPS)

    if ((env->hflags & MIPS_HFLAG_BMASK) != 0 && n > 1) {

    if ((env->hflags & MIPS_HFLAG_BMASK) != 0

        && env->active_tc.PC != tb->pc) {

        env->active_tc.PC -= (env->hflags & MIPS_HFLAG_B16 ? 2 : 4);

        cpu->icount_decr.u16.low++;

        env->hflags &= ~MIPS_HFLAG_BMASK;

        n = 2;

    }

#elif defined(TARGET_SH4)

    if ((env->flags & ((DELAY_SLOT | DELAY_SLOT_CONDITIONAL))) != 0

            && n > 1) {

        && env->pc != tb->pc) {

        env->pc -= 2;

        cpu->icount_decr.u16.low++;

        env->flags &= ~(DELAY_SLOT | DELAY_SLOT_CONDITIONAL);

        n = 2;

    }

#endif

    /* This should never happen.  */

    if (n > CF_COUNT_MASK) {

        cpu_abort(cpu, "TB too big during recompile");

    }



    pc = tb->pc;

    cs_base = tb->cs_base;

    flags = tb->flags;

    tb_phys_invalidate(tb, -1);



    /* Execute one IO instruction without caching

       instead of creating large TB. */

    cpu->cflags_next_tb = curr_cflags() | CF_LAST_IO | CF_NOCACHE | 1;

    /* Generate a new TB executing the I/O insn.  */

    cpu->cflags_next_tb = curr_cflags() | CF_LAST_IO | n;



    if (tb->cflags & CF_NOCACHE) {

        if (tb->orig_tb) {
@@ -1785,11 +1773,6 @@ void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr) 
        tb_remove(tb);

    }



    /* Generate new TB instead of the current one. */

    /* FIXME: In theory this could raise an exception.  In practice

       we have already translated the block once so it's probably ok.  */

    tb_gen_code(cpu, pc, cs_base, flags, curr_cflags() | CF_LAST_IO | n);



    /* TODO: If env->pc != tb->pc (i.e. the faulting instruction was not

     * the first in the TB) then we end up generating a whole new TB and

     *  repeating the fault, which is horribly inefficient.

chardev/char-fe.c

+12 −10
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ bool qemu_chr_fe_init(CharBackend *b, Chardev *s, Error **errp) 
{

    int tag = 0;



    if (s) {

        if (CHARDEV_IS_MUX(s)) {

            MuxChardev *d = MUX_CHARDEV(s);
@@ -212,6 +213,7 @@ bool qemu_chr_fe_init(CharBackend *b, Chardev *s, Error **errp) 
        } else {

            s->be = b;

        }

    }



    b->fe_open = false;

    b->tag = tag;

chardev/char-socket.c

+4 −6
Original line number Diff line number Diff line
@@ -550,12 +550,10 @@ static void tcp_chr_connect(void *opaque) 
        s->is_listen, s->is_telnet);



    s->connected = 1;

    if (s->ioc) {

    chr->gsource = io_add_watch_poll(chr, s->ioc,

                                       tcp_chr_read_poll,

                                       tcp_chr_read,

                                       chr, chr->gcontext);

    }



    s->hup_source = qio_channel_create_watch(s->ioc, G_IO_HUP);

    g_source_set_callback(s->hup_source, (GSourceFunc)tcp_chr_hup,

configure

+3 −1
Original line number Diff line number Diff line
@@ -2496,7 +2496,9 @@ if test "$whpx" != "no" ; then 
#include <WinHvEmulation.h>

int main(void) {

    WHV_CAPABILITY whpx_cap;

    WHvGetCapability(WHvCapabilityCodeFeatures, &whpx_cap, sizeof(whpx_cap));

    UINT32 writtenSize;

    WHvGetCapability(WHvCapabilityCodeFeatures, &whpx_cap, sizeof(whpx_cap),

                     &writtenSize);

    return 0;

}

EOF

hw/audio/cs4231a.c

+7 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include "hw/isa/isa.h"

#include "hw/qdev.h"

#include "qemu/timer.h"

#include "qapi/error.h"



/*

  Missing features:
@@ -663,8 +664,13 @@ static void cs4231a_realizefn (DeviceState *dev, Error **errp) 
    CSState *s = CS4231A (dev);

    IsaDmaClass *k;



    isa_init_irq (d, &s->pic, s->irq);

    s->isa_dma = isa_get_dma(isa_bus_from_device(d), s->dma);

    if (!s->isa_dma) {

        error_setg(errp, "ISA controller does not support DMA");

        return;

    }



    isa_init_irq(d, &s->pic, s->irq);

    k = ISADMA_GET_CLASS(s->isa_dma);

    k->register_channel(s->isa_dma, s->dma, cs_dma_read, s);