Switched to a new branch '20241029085934.2799066-1-zhao1.liu@intel.com'
Applying: arm: Replace type_register() with type_register_static()
Using index info to reconstruct a base tree...
M	hw/arm/armsse.c
M	hw/arm/smmuv3.c
M	target/arm/cpu.c
M	target/arm/cpu64.c
Falling back to patching base and 3-way merge...
Auto-merging target/arm/cpu64.c
Auto-merging target/arm/cpu.c
Auto-merging hw/arm/smmuv3.c
Auto-merging hw/arm/armsse.c
No changes -- Patch already applied.
Applying: hw/block: Replace type_register() with type_register_static()
Using index info to reconstruct a base tree...
M	hw/block/m25p80.c
Falling back to patching base and 3-way merge...
Auto-merging hw/block/m25p80.c
No changes -- Patch already applied.
Applying: hw/net: Replace type_register() with type_register_static()
Using index info to reconstruct a base tree...
M	hw/net/e1000.c
M	hw/net/eepro100.c
Falling back to patching base and 3-way merge...
Auto-merging hw/net/eepro100.c
Auto-merging hw/net/e1000.c
No changes -- Patch already applied.
Applying: ppc: Replace type_register() with type_register_static()
Using index info to reconstruct a base tree...
M	hw/ppc/spapr.c
M	target/ppc/kvm.c
Falling back to patching base and 3-way merge...
Auto-merging target/ppc/kvm.c
Auto-merging hw/ppc/spapr.c
No changes -- Patch already applied.
Applying: hw/rtc: Replace type_register() with type_register_static()
Using index info to reconstruct a base tree...
M	hw/rtc/m48t59-isa.c
M	hw/rtc/m48t59.c
Falling back to patching base and 3-way merge...
Auto-merging hw/rtc/m48t59.c
Auto-merging hw/rtc/m48t59-isa.c
No changes -- Patch already applied.
Applying: hw/scsi: Replace type_register() with type_register_static()
Using index info to reconstruct a base tree...
M	hw/scsi/megasas.c
M	hw/scsi/mptsas.c
Falling back to patching base and 3-way merge...
Auto-merging hw/scsi/mptsas.c
Auto-merging hw/scsi/megasas.c
No changes -- Patch already applied.
Applying: hw/sensor: Replace type_register() with type_register_static()
Using index info to reconstruct a base tree...
M	hw/sensor/tmp421.c
Falling back to patching base and 3-way merge...
Auto-merging hw/sensor/tmp421.c
No changes -- Patch already applied.
Applying: hw/usb: Replace type_register() with type_register_static()
Using index info to reconstruct a base tree...
M	hw/usb/hcd-ehci-pci.c
M	hw/usb/hcd-uhci.c
Falling back to patching base and 3-way merge...
Auto-merging hw/usb/hcd-uhci.c
Auto-merging hw/usb/hcd-ehci-pci.c
No changes -- Patch already applied.
Applying: hw/virtio: Replace type_register() with type_register_static()
Using index info to reconstruct a base tree...
M	hw/virtio/virtio-pci.c
Falling back to patching base and 3-way merge...
Auto-merging hw/virtio/virtio-pci.c
No changes -- Patch already applied.
Applying: i386: Replace type_register() with type_register_static()
Using index info to reconstruct a base tree...
M	include/hw/i386/pc.h
M	target/i386/cpu.c
Falling back to patching base and 3-way merge...
Auto-merging target/i386/cpu.c
Auto-merging include/hw/i386/pc.h
No changes -- Patch already applied.
Applying: target/mips: Replace type_register() with type_register_static()
Using index info to reconstruct a base tree...
M	target/mips/cpu.c
Falling back to patching base and 3-way merge...
Auto-merging target/mips/cpu.c
No changes -- Patch already applied.
Applying: target/sparc: Replace type_register() with type_register_static()
Using index info to reconstruct a base tree...
M	target/sparc/cpu.c
Falling back to patching base and 3-way merge...
Auto-merging target/sparc/cpu.c
No changes -- Patch already applied.
Applying: target/xtensa: Replace type_register() with type_register_static()
Using index info to reconstruct a base tree...
M	target/xtensa/helper.c
Falling back to patching base and 3-way merge...
Auto-merging target/xtensa/helper.c
No changes -- Patch already applied.
Applying: ui: Replace type_register() with type_register_static()
Using index info to reconstruct a base tree...
M	ui/console-vc.c
M	ui/dbus.c
M	ui/gtk.c
M	ui/spice-app.c
Falling back to patching base and 3-way merge...
Auto-merging ui/spice-app.c
Auto-merging ui/gtk.c
Auto-merging ui/dbus.c
Auto-merging ui/console-vc.c
No changes -- Patch already applied.
Applying: script/codeconverter/qom_type_info: Deprecate MakeTypeRegisterStatic and MakeTypeRegisterNotStatic
Using index info to reconstruct a base tree...
M	scripts/codeconverter/codeconverter/qom_type_info.py
Falling back to patching base and 3-way merge...
Auto-merging scripts/codeconverter/codeconverter/qom_type_info.py
No changes -- Patch already applied.
Applying: qom/object: Deprecate type_register()
Using index info to reconstruct a base tree...
M	include/qom/object.h
M	qom/object.c
Falling back to patching base and 3-way merge...
Auto-merging qom/object.c
Auto-merging include/qom/object.h
No changes -- Patch already applied.
Warning: Permanently added 'github.com' (ED25519) to the list of known hosts.
To github.com:patchew-project/qemu
 * [new tag]               patchew/20241029085934.2799066-1-zhao1.liu@intel.com -> patchew/20241029085934.2799066-1-zhao1.liu@intel.com