diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-02-09 15:20:55 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-15 09:39:21 -0600 |
| commit | 83f7d43a9ef70b1b91e465173e18c845420e931e (patch) | |
| tree | c34cbc9d6f7986f2d643a9e7077a519386dbb55a /hw/kvm | |
| parent | 59f971d451fbabee3194bb565f40846398ee6e6f (diff) | |
| download | qemu-83f7d43a9ef70b1b91e465173e18c845420e931e.tar.gz | |
qom: Unify type registration
Replace device_init() with generalized type_init().
While at it, unify naming convention: type_init([$prefix_]register_types)
Also, type_init() is a function, so add preceding blank line where
necessary and don't put a semicolon after the closing brace.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Cc: Anthony Liguori <anthony@codemonkey.ws>
Cc: malc <av1474@comtv.ru>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/kvm')
| -rw-r--r-- | hw/kvm/apic.c | 4 | ||||
| -rw-r--r-- | hw/kvm/clock.c | 4 | ||||
| -rw-r--r-- | hw/kvm/i8259.c | 4 | ||||
| -rw-r--r-- | hw/kvm/ioapic.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/hw/kvm/apic.c b/hw/kvm/apic.c index dfc2ab3b03..5bb0a4b9fd 100644 --- a/hw/kvm/apic.c +++ b/hw/kvm/apic.c @@ -139,9 +139,9 @@ static TypeInfo kvm_apic_info = { .class_init = kvm_apic_class_init, }; -static void kvm_apic_register_device(void) +static void kvm_apic_register_types(void) { type_register_static(&kvm_apic_info); } -device_init(kvm_apic_register_device) +type_init(kvm_apic_register_types) diff --git a/hw/kvm/clock.c b/hw/kvm/clock.c index d5a53869b3..2157340326 100644 --- a/hw/kvm/clock.c +++ b/hw/kvm/clock.c @@ -119,11 +119,11 @@ void kvmclock_create(void) } } -static void kvmclock_register_device(void) +static void kvmclock_register_types(void) { if (kvm_enabled()) { type_register_static(&kvmclock_info); } } -device_init(kvmclock_register_device); +type_init(kvmclock_register_types) diff --git a/hw/kvm/i8259.c b/hw/kvm/i8259.c index 14bd427518..eb98889329 100644 --- a/hw/kvm/i8259.c +++ b/hw/kvm/i8259.c @@ -130,9 +130,9 @@ static TypeInfo kvm_i8259_info = { .class_init = kvm_i8259_class_init, }; -static void kvm_pic_register(void) +static void kvm_pic_register_types(void) { type_register_static(&kvm_i8259_info); } -device_init(kvm_pic_register) +type_init(kvm_pic_register_types) diff --git a/hw/kvm/ioapic.c b/hw/kvm/ioapic.c index b316933a96..3ae3175403 100644 --- a/hw/kvm/ioapic.c +++ b/hw/kvm/ioapic.c @@ -117,9 +117,9 @@ static TypeInfo kvm_ioapic_info = { .class_init = kvm_ioapic_class_init, }; -static void kvm_ioapic_register_device(void) +static void kvm_ioapic_register_types(void) { type_register_static(&kvm_ioapic_info); } -device_init(kvm_ioapic_register_device) +type_init(kvm_ioapic_register_types) |