diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-28 14:48:03 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-28 14:48:03 -0600 |
| commit | ec9466ff2e50213c8318ffdd7003f345278ab795 (patch) | |
| tree | 5c0b3431f709e8958858385e5aacd7cf28858250 /hw/virtio-net.c | |
| parent | 503cb22e055dcf477f9147fa1a3b8ae17c86c9b0 (diff) | |
| parent | 290adf38967787bd985a5ec67dc4717e83c29eaa (diff) | |
| download | focaccia-qemu-ec9466ff2e50213c8318ffdd7003f345278ab795.tar.gz focaccia-qemu-ec9466ff2e50213c8318ffdd7003f345278ab795.zip | |
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 <aliguori@us.ibm.com>
Diffstat (limited to 'hw/virtio-net.c')
0 files changed, 0 insertions, 0 deletions