Failed in applying to current master (
apply log)
Maintainers: Peter Maydell <peter.maydell@linaro.org>, "Michael S. Tsirkin" <mst@redhat.com>, Igor Mammedov <imammedo@redhat.com>, Ani Sinha <anisinha@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Xiaojuan Yang <yangxiaojuan@loongson.cn>, Song Gao <gaosong@loongson.cn>, David Hildenbrand <david@redhat.com>, Xiao Guangrong <xiaoguangrong.eric@gmail.com>, Daniel Henrique Barboza <danielhb413@gmail.com>, "Cédric Le Goater" <clg@kaod.org>, David Gibson <david@gibson.dropbear.id.au>, Greg Kurz <groug@kaod.org>, Harsh Prateek Bora <harshpb@linux.ibm.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Yanan Wang <wangyanan55@huawei.com>, Juan Quintela <quintela@redhat.com>, Peter Xu <peterx@redhat.com>, Leonardo Bras <leobras@redhat.com>
MAINTAINERS | 7 ++
hw/arm/virt.c | 90 ++++-------------------
hw/i386/acpi-build.c | 9 +--
hw/i386/pc.c | 126 ++++---------------------------
hw/loongarch/virt.c | 12 +--
hw/mem/memory-device.c | 69 ++++++++---------
hw/ppc/spapr.c | 37 +++++-----
hw/ppc/spapr_hcall.c | 2 +-
hw/virtio/Kconfig | 8 +-
hw/virtio/meson.build | 1 +
hw/virtio/virtio-md-pci.c | 151 ++++++++++++++++++++++++++++++++++++++
hw/virtio/virtio-mem-pci.c | 54 ++++++++++++--
hw/virtio/virtio-mem-pci.h | 6 +-
hw/virtio/virtio-mem.c | 92 ++++++++++++++++++-----
hw/virtio/virtio-pmem-pci.c | 5 +-
hw/virtio/virtio-pmem-pci.h | 6 +-
include/hw/boards.h | 3 +
include/hw/i386/pc.h | 1 -
include/hw/virtio/virtio-md-pci.h | 44 +++++++++++
include/hw/virtio/virtio-mem.h | 1 +
include/migration/misc.h | 1 +
migration/postcopy-ram.c | 2 +-
migration/ram.c | 14 ++--
migration/ram.h | 3 +-
softmmu/physmem.c | 18 +++++
stubs/meson.build | 1 +
stubs/virtio-md-pci.c | 24 ++++++
27 files changed, 479 insertions(+), 308 deletions(-)
create mode 100644 hw/virtio/virtio-md-pci.c
create mode 100644 include/hw/virtio/virtio-md-pci.h
create mode 100644 stubs/virtio-md-pci.c