From: Peter Maydell <peter.maydell@linaro.org>
Date: Sat, 12 Sep 2020 13:23:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-5.2-pull-reques... 
X-Git-Tag: v5.2.0-rc0~121
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=842038f55c69673d2983f269be2845e8e18cda05;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-5.2-pull-request' into staging

trivial patches pull request 20200911

# gpg: Signature made Fri 11 Sep 2020 20:32:27 BST
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/trivial-branch-for-5.2-pull-request:
  target/i386/kvm: Add missing fallthrough comment
  util/hexdump: Reorder qemu_hexdump() arguments
  util/hexdump: Convert to take a void pointer argument
  hw/arm/pxa2xx: Add missing fallthrough comment
  target/i386/kvm: Rename host_tsx_blacklisted() as host_tsx_broken()
  test-vmstate: remove unnecessary code in match_interval_mapping_node
  hw: hyperv: vmbus: Fix 32bit compilation
  kconfig: fix comment referring to old Makefiles
  meson.build: tweak sdl-image error message
  hw/net/e1000e: Remove duplicated write handler for FLSWDATA register
  hw/net/e1000e: Remove overwritten read handler for STATUS register
  Makefile: Skip the meson subdir in cscope/TAGS/ctags
  Makefile: Drop extra phony cscope
  hw/gpio/max7310: Replace disabled printf() by qemu_log_mask(UNIMP)
  hw/gpio/omap_gpio: Replace fprintf() by qemu_log_mask(GUEST_ERROR)
  hw/acpi/tco: Remove unused definitions
  hw/isa/isa-bus: Replace hw_error() by assert()
  hw/mips/fuloong2e: Convert pointless error message to an assert()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

# Conflicts:
#	net/colo-compare.c
---

842038f55c69673d2983f269be2845e8e18cda05
diff --cc hw/gpio/max7310.c
index 5511047f353,3e298c2d349..2888d071ac6
--- a/hw/gpio/max7310.c
+++ b/hw/gpio/max7310.c
@@@ -13,15 -13,13 +13,16 @@@
  #include "hw/hw.h"
  #include "hw/irq.h"
  #include "migration/vmstate.h"
+ #include "qemu/log.h"
  #include "qemu/module.h"
 +#include "qom/object.h"
  
  #define TYPE_MAX7310 "max7310"
 -#define MAX7310(obj) OBJECT_CHECK(MAX7310State, (obj), TYPE_MAX7310)
 +typedef struct MAX7310State MAX7310State;
 +DECLARE_INSTANCE_CHECKER(MAX7310State, MAX7310,
 +                         TYPE_MAX7310)
  
 -typedef struct MAX7310State {
 +struct MAX7310State {
      I2CSlave parent_obj;
  
      int i2c_command_byte;
diff --cc net/colo-compare.c
index 0b1201d2bad,4a5ed642e9a..3a45d64175f
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@@ -496,12 -493,12 +496,10 @@@ sec
          g_queue_push_head(&conn->primary_list, ppkt);
          g_queue_push_head(&conn->secondary_list, spkt);
  
 -        if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
 -            qemu_hexdump(stderr, "colo-compare ppkt",
 -                         ppkt->data, ppkt->size);
 -            qemu_hexdump(stderr, "colo-compare spkt",
 -                         spkt->data, spkt->size);
 -        }
 +#ifdef DEBUG_COLO_PACKETS
-         qemu_hexdump((char *)ppkt->data, stderr,
-                      "colo-compare ppkt", ppkt->size);
-         qemu_hexdump((char *)spkt->data, stderr,
-                      "colo-compare spkt", spkt->size);
++        qemu_hexdump(stderr, "colo-compare ppkt", ppkt->data, ppkt->size);
++        qemu_hexdump(stderr, "colo-compare spkt", spkt->data, spkt->size);
 +#endif
  
          colo_compare_inconsistency_notify(s);
      }
@@@ -537,12 -534,12 +535,10 @@@ static int colo_packet_compare_udp(Pack
                                      ppkt->size - offset)) {
          trace_colo_compare_udp_miscompare("primary pkt size", ppkt->size);
          trace_colo_compare_udp_miscompare("Secondary pkt size", spkt->size);
 -        if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
 -            qemu_hexdump(stderr, "colo-compare pri pkt",
 -                         ppkt->data, ppkt->size);
 -            qemu_hexdump(stderr, "colo-compare sec pkt",
 -                         spkt->data, spkt->size);
 -        }
 +#ifdef DEBUG_COLO_PACKETS
-         qemu_hexdump((char *)ppkt->data, stderr, "colo-compare pri pkt",
-                      ppkt->size);
-         qemu_hexdump((char *)spkt->data, stderr, "colo-compare sec pkt",
-                      spkt->size);
++        qemu_hexdump(stderr, "colo-compare pri pkt", ppkt->data, ppkt->size);
++        qemu_hexdump(stderr, "colo-compare sec pkt", spkt->data, spkt->size);
 +#endif
          return -1;
      } else {
          return 0;
@@@ -580,12 -577,12 +576,10 @@@ static int colo_packet_compare_icmp(Pac
                                             ppkt->size);
          trace_colo_compare_icmp_miscompare("Secondary pkt size",
                                             spkt->size);
 -        if (trace_event_get_state_backends(TRACE_COLO_COMPARE_MISCOMPARE)) {
 -            qemu_hexdump(stderr, "colo-compare pri pkt",
 -                         ppkt->data, ppkt->size);
 -            qemu_hexdump(stderr, "colo-compare sec pkt",
 -                         spkt->data, spkt->size);
 -        }
 +#ifdef DEBUG_COLO_PACKETS
-         qemu_hexdump((char *)ppkt->data, stderr, "colo-compare pri pkt",
-                      ppkt->size);
-         qemu_hexdump((char *)spkt->data, stderr, "colo-compare sec pkt",
-                      spkt->size);
++        qemu_hexdump(stderr, "colo-compare pri pkt", ppkt->data, ppkt->size);
++        qemu_hexdump(stderr, "colo-compare sec pkt", spkt->data, spkt->size);
 +#endif
          return -1;
      } else {
          return 0;