v2:
* New PATCH 20: Resolve conflict with David Gibson's pull request

The following changes since commit aceeaa69d28e6f08a24395d0aa6915b687d0a681:

  Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-12-17' into staging (2019-12-17 15:55:20 +0000)

are available in the Git repository at:

  git://repo.or.cz/qemu/armbru.git tags/pull-error-2019-12-17-v2

for you to fetch changes up to d936613547aec49b0b80193cee0b9df05cd8a2ae:

  nbd: assert that Error** is not NULL in nbd_iter_channel_error (2019-12-18 08:43:19 +0100)

----------------------------------------------------------------
Error reporting patches for 2019-12-17

----------------------------------------------------------------
Markus Armbruster (15):
      error: Fix -msg timestamp default
      crypto: Fix certificate file error handling crash bug
      crypto: Fix typo in QCryptoTLSSession's <example> comment
      io: Fix Error usage in a comment <example>
      tests: Clean up initialization of Error *err variables
      exec: Fix file_ram_alloc() error API violations
      hw/acpi: Fix legacy CPU plug error API violations
      hw/core: Fix fit_load_fdt() error API violations
      hw/ipmi: Fix realize() error API violations
      qga: Fix guest-get-fsinfo error API violations
      memory-device: Fix memory pre-plug error API violations
      error: Clean up unusual names of Error * variables
      hw/intc/s390: Simplify error handling in kvm_s390_flic_realize()
      tests-blockjob: Use error_free_or_abort()
      Revert "ppc: well form kvmppc_hint_smt_possible error hint helper"

Vladimir Sementsov-Ogievskiy (20):
      net/net: Clean up variable shadowing in net_client_init()
      error: make Error **errp const where it is appropriate
      hmp: drop Error pointer indirection in hmp_handle_error
      vnc: drop Error pointer indirection in vnc_client_io_error
      qdev-monitor: make Error **errp const where it is appropriate
      ppc: make Error **errp const where it is appropriate
      9pfs: make Error **errp const where it is appropriate
      hw/core/qdev: cleanup Error ** variables
      block/snapshot: rename Error ** parameter to more common errp
      hw/i386/amd_iommu: rename Error ** parameter to more common errp
      qga: rename Error ** parameter to more common errp
      monitor/qmp-cmds: rename Error ** parameter to more common errp
      hw/s390x: rename Error ** parameter to more common errp
      hw/sd: drop extra whitespace in sdhci_sysbus_realize() header
      hw/tpm: rename Error ** parameter to more common errp
      hw/usb: rename Error ** parameter to more common errp
      include/qom/object.h: rename Error ** parameter to more common errp
      backends/cryptodev: drop local_err from cryptodev_backend_complete()
      hw/vfio/ap: drop local_err from vfio_ap_realize
      nbd: assert that Error** is not NULL in nbd_iter_channel_error

 include/block/snapshot.h            |   2 +-
 include/crypto/tlssession.h         |   2 +-
 include/io/task.h                   |   2 +-
 include/monitor/hmp.h               |   2 +-
 include/qapi/error.h                |   6 +-
 include/qemu/error-report.h         |   3 +-
 include/qom/object.h                |   4 +-
 target/ppc/kvm_ppc.h                |   4 +-
 ui/vnc.h                            |   2 +-
 backends/cryptodev.c                |  11 +--
 block/nbd.c                         |   1 +
 block/snapshot.c                    |   4 +-
 crypto/tlscredsx509.c               |   2 +-
 dump/dump-hmp-cmds.c                |   4 +-
 exec.c                              |   6 +-
 hw/9pfs/9p-local.c                  |   2 +-
 hw/9pfs/9p-proxy.c                  |   2 +-
 hw/acpi/cpu_hotplug.c               |  10 +--
 hw/core/loader-fit.c                |  15 ++--
 hw/core/machine-hmp-cmds.c          |   6 +-
 hw/core/qdev.c                      |  28 +++----
 hw/i386/amd_iommu.c                 |  14 ++--
 hw/intc/s390_flic_kvm.c             |  16 ++--
 hw/ipmi/isa_ipmi_bt.c               |   7 +-
 hw/ipmi/isa_ipmi_kcs.c              |   7 +-
 hw/ipmi/pci_ipmi_bt.c               |   6 +-
 hw/ipmi/pci_ipmi_kcs.c              |   6 +-
 hw/mem/memory-device.c              |   6 +-
 hw/ppc/spapr_pci.c                  |  16 ++--
 hw/ppc/spapr_pci_nvlink2.c          |  10 +--
 hw/s390x/event-facility.c           |   2 +-
 hw/s390x/s390-stattrib.c            |   3 +-
 hw/sd/sdhci.c                       |   2 +-
 hw/tpm/tpm_emulator.c               |   8 +-
 hw/usb/dev-network.c                |   2 +-
 hw/vfio/ap.c                        |   9 +--
 monitor/hmp-cmds.c                  | 155 ++++++++++++++++++------------------
 monitor/qmp-cmds.c                  |   2 +-
 net/net.c                           |  17 ++--
 qdev-monitor.c                      |  16 ++--
 qga/commands-posix.c                |   8 +-
 qga/commands-win32.c                |   2 +-
 qga/commands.c                      |  12 +--
 qom/qom-hmp-cmds.c                  |   4 +-
 target/ppc/kvm.c                    |   6 +-
 tests/test-blockjob.c               |  15 ++--
 tests/test-qobject-output-visitor.c |   8 +-
 tests/test-string-output-visitor.c  |   4 +-
 ui/vnc.c                            |  20 ++---
 util/error.c                        |   6 +-
 util/qemu-error.c                   |   6 +-
 vl.c                                |   2 +-
 qemu-options.hx                     |  10 ++-
 53 files changed, 261 insertions(+), 264 deletions(-)

-- 
2.21.0

On Wed, 18 Dec 2019 at 08:19, Markus Armbruster <armbru@redhat.com> wrote:
>
> v2:
> * New PATCH 20: Resolve conflict with David Gibson's pull request
>
> The following changes since commit aceeaa69d28e6f08a24395d0aa6915b687d0a681:
>
>   Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-12-17' into staging (2019-12-17 15:55:20 +0000)
>
> are available in the Git repository at:
>
>   git://repo.or.cz/qemu/armbru.git tags/pull-error-2019-12-17-v2
>
> for you to fetch changes up to d936613547aec49b0b80193cee0b9df05cd8a2ae:
>
>   nbd: assert that Error** is not NULL in nbd_iter_channel_error (2019-12-18 08:43:19 +0100)
>
> ----------------------------------------------------------------
> Error reporting patches for 2019-12-17
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.0
for any user-visible changes.

-- PMM