« Previous | Next » 

Revision ec9466ff

IDec9466ff2e50213c8318ffdd7003f345278ab795

Added by Anthony Liguori about 11 years ago

Merge remote-tracking branch 'afaerber/qom-cpu' into staging

  • afaerber/qom-cpu: (37 commits)
    kvm: Pass CPUState to kvm_on_sigbus_vcpu()
    cpu: Unconditionalize CPUState fields
    target-m68k: Use type_register() instead of type_register_static()
    target-unicore32: Use type_register() instead of type_register_static()
    target-openrisc: Use type_register() instead of type_register_static()
    target-unicore32: Catch attempt to instantiate abstract type in cpu_init()
    target-openrisc: Catch attempt to instantiate abstract type in cpu_init()
    target-m68k: Catch attempt to instantiate abstract type in cpu_init()
    target-arm: Catch attempt to instantiate abstract type in cpu_init()
    target-alpha: Catch attempt to instantiate abstract type in cpu_init()
    qom: Introduce object_class_is_abstract()
    target-unicore32: Detect attempt to instantiate non-CPU type in cpu_init()
    target-openrisc: Detect attempt to instantiate non-CPU type in cpu_init()
    target-m68k: Detect attempt to instantiate non-CPU type in cpu_init()
    target-alpha: Detect attempt to instantiate non-CPU type in cpu_init()
    target-arm: Detect attempt to instantiate non-CPU type in cpu_init()
    cpu: Add model resolution support to CPUClass
    target-i386: Remove setting tsc-frequency from x86_def_t
    target-i386: Set custom features/properties without intermediate x86_def_t
    target-i386: Remove vendor_override field from CPUX86State
    ...

Conflicts:
tests/Makefile

Resolved simple conflict caused by lack of context in Makefile

Signed-off-by: Anthony Liguori <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted