Failed in applying to current master (
apply log)
backends/cryptodev-lkcf.c | 2 +-
backends/spdm-socket.c | 4 ++--
backends/tpm/tpm_emulator.c | 13 +++++--------
block/blkdebug.c | 2 +-
block/file-win32.c | 2 +-
hw/9pfs/9p-local.c | 2 +-
hw/9pfs/9p.c | 3 +--
hw/acpi/core.c | 5 ++---
hw/audio/es1370.c | 2 +-
hw/core/loader.c | 2 +-
hw/intc/openpic_kvm.c | 3 +--
hw/intc/xics_kvm.c | 5 +++--
hw/pci-host/xen_igd_pt.c | 2 +-
hw/ppc/spapr.c | 6 +++---
hw/remote/vfio-user-obj.c | 18 +++++++++---------
hw/scsi/vhost-scsi.c | 3 +--
hw/sensor/emc141x.c | 4 ++--
hw/sensor/tmp421.c | 4 ++--
hw/smbios/smbios.c | 4 ++--
hw/usb/bus.c | 2 +-
hw/vfio/migration-multifd.c | 5 +++--
hw/virtio/vdpa-dev.c | 4 ++--
hw/virtio/vhost-vsock.c | 3 +--
migration/postcopy-ram.c | 10 +++++-----
migration/rdma.c | 3 +--
monitor/hmp-cmds-target.c | 2 +-
net/dump.c | 2 +-
net/l2tpv3.c | 6 ++----
net/slirp.c | 9 ++++++---
net/tap-bsd.c | 6 +++---
net/tap-linux.c | 2 +-
net/tap-solaris.c | 6 +++---
net/tap.c | 3 +--
qga/commands-linux.c | 11 ++++++-----
qga/commands-posix-ssh.c | 23 +++++++++++++----------
qga/commands-win32.c | 16 ++++++++--------
system/vl.c | 2 +-
target/i386/sev.c | 6 ++----
target/ppc/kvm.c | 5 ++---
target/riscv/kvm/kvm-cpu.c | 11 ++++++-----
ui/gtk.c | 2 +-
ui/ui-qmp-cmds.c | 3 +--
util/vfio-helpers.c | 5 ++---
43 files changed, 113 insertions(+), 120 deletions(-)