Commit 83c83f9a authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

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



Small fixes for hard freeze.

# gpg: Signature made Thu 10 Nov 2016 03:34:24 PM GMT
# gpg:                using RSA key 0xBFFBD25F78C7AE83
# 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

* bonzini/tags/for-upstream:
  nbd: Don't inf-loop on early EOF
  target-i386: document how x86 gdb_num_core_regs is computed.
  qdev: fix use-after-free regression from becdfa00
  target-i386/machine: fix migrate faile because of Hyper-V HV_X64_MSR_VP_RUNTIME
  vl.c: move pidfile creation up the line
  target-i386: fix typo

Message-id: 1478800362-18138-1-git-send-email-pbonzini@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parents 6bbcb763 a5068244

hw/core/qdev-properties-system.c

+2 −6
Original line number Diff line number Diff line
@@ -200,18 +200,14 @@ static void set_chr(Object *obj, Visitor *v, const char *name, void *opaque, 
    }



    s = qemu_chr_find(str);

    g_free(str);

    if (s == NULL) {

        error_setg(errp, "Property '%s.%s' can't find value '%s'",

                   object_get_typename(obj), prop->name, str);

        return;

    }



    if (!qemu_chr_fe_init(be, s, errp)) {

    } else if (!qemu_chr_fe_init(be, s, errp)) {

        error_prepend(errp, "Property '%s.%s' can't take value '%s': ",

                      object_get_typename(obj), prop->name, str);

        return;

    }

    g_free(str);

}



static void release_chr(Object *obj, const char *name, void *opaque)

nbd/client.c

+7 −6
Original line number Diff line number Diff line
@@ -90,20 +90,21 @@ static QTAILQ_HEAD(, NBDExport) exports = QTAILQ_HEAD_INITIALIZER(exports); 
 * the amount of bytes consumed. */

static ssize_t drop_sync(QIOChannel *ioc, size_t size)

{

    ssize_t ret, dropped = size;

    ssize_t ret = 0;

    char small[1024];

    char *buffer;



    buffer = sizeof(small) < size ? small : g_malloc(MIN(65536, size));

    while (size > 0) {

        ret = read_sync(ioc, buffer, MIN(65536, size));

        if (ret < 0) {

        ssize_t count = read_sync(ioc, buffer, MIN(65536, size));



        if (count <= 0) {

            goto cleanup;

        }

        assert(ret <= size);

        size -= ret;

        assert(count <= size);

        size -= count;

        ret += count;

    }

    ret = dropped;



 cleanup:

    if (buffer != small) {

target-i386/cpu.c

+3 −0
Original line number Diff line number Diff line
@@ -3721,6 +3721,9 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) 
    cc->write_elf32_qemunote = x86_cpu_write_elf32_qemunote;

    cc->vmsd = &vmstate_x86_cpu;

#endif

    /* CPU_NB_REGS * 2 = general regs + xmm regs

     * 25 = eip, eflags, 6 seg regs, st[0-7], fctrl,...,fop, mxcsr.

     */

    cc->gdb_num_core_regs = CPU_NB_REGS * 2 + 25;

#ifndef CONFIG_USER_ONLY

    cc->debug_excp_handler = breakpoint_handler;

target-i386/kvm.c

+1 −1
Original line number Diff line number Diff line
@@ -2855,7 +2855,7 @@ MemTxAttrs kvm_arch_post_run(CPUState *cpu, struct kvm_run *run) 
    if (run->flags & KVM_RUN_X86_SMM) {

        env->hflags |= HF_SMM_MASK;

    } else {

        env->hflags &= HF_SMM_MASK;

        env->hflags &= ~HF_SMM_MASK;

    }

    if (run->if_flag) {

        env->eflags |= IF_MASK;

target-i386/machine.c

+4 −0
Original line number Diff line number Diff line
@@ -709,6 +709,10 @@ static bool hyperv_runtime_enable_needed(void *opaque) 
    X86CPU *cpu = opaque;

    CPUX86State *env = &cpu->env;



    if (!cpu->hyperv_runtime) {

        return false;

    }



    return env->msr_hv_runtime != 0;

}