Commit 9e5319ca authored by Peter Maydell's avatar Peter Maydell
Browse files

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



* Compilation fix for KVM (Alex)
* SMM fix (Dmitry)
* VFIO error reporting (Eric)
* win32 fixes and workarounds (Marc-André)
* qemu-pr-helper crash bugfix (Maxim)
* Memory leak fixes (myself)
* VMX features (myself)
* Record-replay deadlock (Pavel)
* i386 CPUID bits (Sebastian)
* kconfig tweak (Thomas)
* Valgrind fix (Thomas)
* Autoconverge test (Yury)

# gpg: Signature made Fri 04 Oct 2019 17:57:48 BST
# gpg:                using RSA key BFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# 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: (29 commits)
  target/i386/kvm: Silence warning from Valgrind about uninitialized bytes
  target/i386: work around KVM_GET_MSRS bug for secondary execution controls
  target/i386: add VMX features
  vmxcap: correct the name of the variables
  target/i386: add VMX definitions
  target/i386: expand feature words to 64 bits
  target/i386: introduce generic feature dependency mechanism
  target/i386: handle filtered_features in a new function mark_unavailable_features
  tests/docker: only enable ubsan for test-clang
  win32: work around main-loop busy loop on socket/fd event
  tests: skip serial test on windows
  util: WSAEWOULDBLOCK on connect should map to EINPROGRESS
  Fix wrong behavior of cpu_memory_rw_debug() function in SMM
  memory: allow memory_region_register_iommu_notifier() to fail
  vfio: Turn the container error into an Error handle
  i386: Add CPUID bit for CLZERO and XSAVEERPTR
  docker: test-debug: disable LeakSanitizer
  lm32: do not leak memory on object_new/object_unref
  cris: do not leak struct cris_disasm_data
  mips: fix memory leaks in board initialization
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 4f591025 a1834d97

accel/kvm/kvm-all.c

+3 −3
Original line number Diff line number Diff line
@@ -712,11 +712,11 @@ static int kvm_physical_log_clear(KVMMemoryListener *kml, 
    KVMState *s = kvm_state;

    uint64_t start, size, offset, count;

    KVMSlot *mem;

    int ret, i;

    int ret = 0, i;



    if (!s->manual_dirty_log_protect) {

        /* No need to do explicit clear */

        return 0;

        return ret;

    }



    start = section->offset_within_address_space;
@@ -724,7 +724,7 @@ static int kvm_physical_log_clear(KVMMemoryListener *kml, 


    if (!size) {

        /* Nothing more we can do... */

        return 0;

        return ret;

    }



    kvm_slots_lock(kml);

disas/cris.c

+29 −30
Original line number Diff line number Diff line
@@ -1294,24 +1294,17 @@ static int cris_constraint 
/* Parse disassembler options and store state in info.  FIXME: For the

   time being, we abuse static variables.  */



static bfd_boolean

cris_parse_disassembler_options (disassemble_info *info,

static void

cris_parse_disassembler_options (struct cris_disasm_data *disdata,

				 char *disassembler_options,

				 enum cris_disass_family distype)

{

  struct cris_disasm_data *disdata;



  info->private_data = calloc (1, sizeof (struct cris_disasm_data));

  disdata = (struct cris_disasm_data *) info->private_data;

  if (disdata == NULL)

    return false;



  /* Default true.  */

  disdata->trace_case

    = (info->disassembler_options == NULL

       || (strcmp (info->disassembler_options, "nocase") != 0));

    = (disassembler_options == NULL

       || (strcmp (disassembler_options, "nocase") != 0));



  disdata->distype = distype;

  return true;

}



static const struct cris_spec_reg *
@@ -2736,9 +2729,10 @@ static int 
print_insn_cris_with_register_prefix (bfd_vma vma,

				      disassemble_info *info)

{

  if (info->private_data == NULL

      && !cris_parse_disassembler_options (info, cris_dis_v0_v10))

    return -1;

  struct cris_disasm_data disdata;

  info->private_data = &disdata;

  cris_parse_disassembler_options (&disdata, info->disassembler_options,

				   cris_dis_v0_v10);

  return print_insn_cris_generic (vma, info, true);

}

/* Disassemble, prefixing register names with `$'.  CRIS v32.  */
@@ -2747,9 +2741,10 @@ static int 
print_insn_crisv32_with_register_prefix (bfd_vma vma,

					 disassemble_info *info)

{

  if (info->private_data == NULL

      && !cris_parse_disassembler_options (info, cris_dis_v32))

    return -1;

  struct cris_disasm_data disdata;

  info->private_data = &disdata;

  cris_parse_disassembler_options (&disdata, info->disassembler_options,

				   cris_dis_v32);

  return print_insn_cris_generic (vma, info, true);

}
@@ -2761,9 +2756,10 @@ static int 
print_insn_crisv10_v32_with_register_prefix (bfd_vma vma,

					     disassemble_info *info)

{

  if (info->private_data == NULL

      && !cris_parse_disassembler_options (info, cris_dis_common_v10_v32))

    return -1;

  struct cris_disasm_data disdata;

  info->private_data = &disdata;

  cris_parse_disassembler_options (&disdata, info->disassembler_options,

				   cris_dis_common_v10_v32);

  return print_insn_cris_generic (vma, info, true);

}
@@ -2773,9 +2769,10 @@ static int 
print_insn_cris_without_register_prefix (bfd_vma vma,

					 disassemble_info *info)

{

  if (info->private_data == NULL

      && !cris_parse_disassembler_options (info, cris_dis_v0_v10))

    return -1;

  struct cris_disasm_data disdata;

  info->private_data = &disdata;

  cris_parse_disassembler_options (&disdata, info->disassembler_options,

				   cris_dis_v0_v10);

  return print_insn_cris_generic (vma, info, false);

}
@@ -2785,9 +2782,10 @@ static int 
print_insn_crisv32_without_register_prefix (bfd_vma vma,

					    disassemble_info *info)

{

  if (info->private_data == NULL

      && !cris_parse_disassembler_options (info, cris_dis_v32))

    return -1;

  struct cris_disasm_data disdata;

  info->private_data = &disdata;

  cris_parse_disassembler_options (&disdata, info->disassembler_options,

				   cris_dis_v32);

  return print_insn_cris_generic (vma, info, false);

}
@@ -2798,9 +2796,10 @@ static int 
print_insn_crisv10_v32_without_register_prefix (bfd_vma vma,

						disassemble_info *info)

{

  if (info->private_data == NULL

      && !cris_parse_disassembler_options (info, cris_dis_common_v10_v32))

    return -1;

  struct cris_disasm_data disdata;

  info->private_data = &disdata;

  cris_parse_disassembler_options (&disdata, info->disassembler_options,

				   cris_dis_common_v10_v32);

  return print_insn_cris_generic (vma, info, false);

}

#endif

exec.c

+19 −4
Original line number Diff line number Diff line
@@ -660,7 +660,8 @@ static void tcg_register_iommu_notifier(CPUState *cpu, 
     */

    MemoryRegion *mr = MEMORY_REGION(iommu_mr);

    TCGIOMMUNotifier *notifier;

    int i;

    Error *err = NULL;

    int i, ret;



    for (i = 0; i < cpu->iommu_notifiers->len; i++) {

        notifier = g_array_index(cpu->iommu_notifiers, TCGIOMMUNotifier *, i);
@@ -689,7 +690,12 @@ static void tcg_register_iommu_notifier(CPUState *cpu, 
                            0,

                            HWADDR_MAX,

                            iommu_idx);

        memory_region_register_iommu_notifier(notifier->mr, &notifier->n);

        ret = memory_region_register_iommu_notifier(notifier->mr, &notifier->n,

                                                    &err);

        if (ret) {

            error_report_err(err);

            exit(1);

        }

    }



    if (!notifier->active) {
@@ -2959,9 +2965,18 @@ static void tcg_log_global_after_sync(MemoryListener *listener) 
     * by pushing the migration thread's memory read after the vCPU thread has

     * written the memory.

     */

    if (replay_mode == REPLAY_MODE_NONE) {

        /*

         * VGA can make calls to this function while updating the screen.

         * In record/replay mode this causes a deadlock, because

         * run_on_cpu waits for rr mutex. Therefore no races are possible

         * in this case and no need for making run_on_cpu when

         * record/replay is not enabled.

         */

        cpuas = container_of(listener, CPUAddressSpace, tcg_as_listener);

        run_on_cpu(cpuas->cpu, do_nothing, RUN_ON_CPU_NULL);

    }

}



static void tcg_commit(MemoryListener *listener)

{

hw/arm/smmuv3.c

+10 −8
Original line number Diff line number Diff line
@@ -1469,20 +1469,21 @@ static void smmuv3_class_init(ObjectClass *klass, void *data) 
    dc->realize = smmu_realize;

}



static void smmuv3_notify_flag_changed(IOMMUMemoryRegion *iommu,

static int smmuv3_notify_flag_changed(IOMMUMemoryRegion *iommu,

                                      IOMMUNotifierFlag old,

                                       IOMMUNotifierFlag new)

                                      IOMMUNotifierFlag new,

                                      Error **errp)

{

    SMMUDevice *sdev = container_of(iommu, SMMUDevice, iommu);

    SMMUv3State *s3 = sdev->smmu;

    SMMUState *s = &(s3->smmu_state);



    if (new & IOMMU_NOTIFIER_MAP) {

        int bus_num = pci_bus_num(sdev->bus);

        PCIDevice *pcidev = pci_find_device(sdev->bus, bus_num, sdev->devfn);



        warn_report("SMMUv3 does not support notification on MAP: "

                     "device %s will not function properly", pcidev->name);

        error_setg(errp,

                   "device %02x.%02x.%x requires iommu MAP notifier which is "

                   "not currently supported", pci_bus_num(sdev->bus),

                   PCI_SLOT(sdev->devfn), PCI_FUNC(sdev->devfn));

        return -EINVAL;

    }



    if (old == IOMMU_NOTIFIER_NONE) {
@@ -1492,6 +1493,7 @@ static void smmuv3_notify_flag_changed(IOMMUMemoryRegion *iommu, 
        trace_smmuv3_notify_flag_del(iommu->parent_obj.name);

        QLIST_REMOVE(sdev, next);

    }

    return 0;

}



static void smmuv3_iommu_memory_region_class_init(ObjectClass *klass,

hw/hppa/dino.c

+1 −0
Original line number Diff line number Diff line
@@ -485,6 +485,7 @@ PCIBus *dino_init(MemoryRegion *addr_space, 
        memory_region_init_alias(&s->pci_mem_alias[i], OBJECT(s),

                                 name, &s->pci_mem, addr,

                                 DINO_MEM_CHUNK_SIZE);

        g_free(name);

    }



    /* Set up PCI view of memory: Bus master address space.  */