Re: [PULL 00/34] Error reporting patches for 2019-12-16

[Peter Maydell]

On Tue, 17 Dec 2019 at 06:33, Markus Armbruster <address@hidden> wrote:
>
> The following changes since commit cb88904a54903ef6ba21a68a61d9cd51e2166304:
>
>   Merge remote-tracking branch 
> 'remotes/amarkovic/tags/mips-queue-dec-16-2019' into staging (2019-12-16 
> 14:07:56 +0000)
>
> are available in the Git repository at:
>
>   git://repo.or.cz/qemu/armbru.git tags/pull-error-2019-12-16
>
> for you to fetch changes up to 0e7f83bab6559775cd71e418b12a49145e59faa7:
>
>   nbd: assert that Error** is not NULL in nbd_iter_channel_error (2019-12-16 
> 20:50:16 +0100)
>
> ----------------------------------------------------------------
> Error reporting patches for 2019-12-16
>
> ----------------------------------------------------------------

This gets conflicts:
diff --cc target/ppc/kvm.c
index 7406d18945,27ea3ce535..0000000000
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@@ -2076,7 -2076,7 +2076,11 @@@ int kvmppc_set_smt_threads(int smt
      return ret;
  }

++<<<<<<< HEAD
 +void kvmppc_error_append_smt_possible_hint(Error **errp_in)
++=======
+ void kvmppc_error_append_smt_possible_hint(Error *const *errp)
++>>>>>>> remotes/armbru/tags/pull-error-2019-12-16
  {
      int i;
      GString *g;
diff --cc target/ppc/kvm_ppc.h
index 47b08a4030,f22daabf51..0000000000
--- a/target/ppc/kvm_ppc.h
+++ b/target/ppc/kvm_ppc.h
@@@ -28,7 -28,7 +28,11 @@@ void kvmppc_set_papr(PowerPCCPU *cpu)
  int kvmppc_set_compat(PowerPCCPU *cpu, uint32_t compat_pvr);
  void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy);
  int kvmppc_smt_threads(void);
++<<<<<<< HEAD
 +void kvmppc_error_append_smt_possible_hint(Error **errp_in);
++=======
+ void kvmppc_error_append_smt_possible_hint(Error *const *errp);
++>>>>>>> remotes/armbru/tags/pull-error-2019-12-16
  int kvmppc_set_smt_threads(int smt);
  int kvmppc_clear_tsr_bits(PowerPCCPU *cpu, uint32_t tsr_bits);
  int kvmppc_or_tsr_bits(PowerPCCPU *cpu, uint32_t tsr_bits);
@@@ -164,7 -164,7 +168,11 @@@ static inline int kvmppc_smt_threads(vo
      return 1;
  }

++<<<<<<< HEAD
 +static inline void kvmppc_error_append_smt_possible_hint(Error **errp_in)
++=======
+ static inline void kvmppc_error_append_smt_possible_hint(Error *const *errp)
++>>>>>>> remotes/armbru/tags/pull-error-2019-12-16
  {
      return;
  }

Furthermore, it turns out that the conflicts are due to
different patches from the same author to the same function
("ppc: well form kvmppc_hint_smt_possible error hint helper"
and "ppc: make Error **errp const where it is appropriate")
which both seem to be addressing broadly the same thing
but conflict with each other and arrived via different
pull requests.

So I'm just bouncing this one back for you to fix and
figure out which version you want...

thanks
-- PMM