diff options
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/clock.h | 8 | ||||
| -rw-r--r-- | include/hw/i386/pc.h | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/include/hw/clock.h b/include/hw/clock.h index eb58599131..a279bd4ba5 100644 --- a/include/hw/clock.h +++ b/include/hw/clock.h @@ -142,14 +142,6 @@ void clock_set_callback(Clock *clk, ClockCallback *cb, void *opaque, unsigned int events); /** - * clock_clear_callback: - * @clk: the clock to delete the callback from - * - * Unregister the callback registered with clock_set_callback. - */ -void clock_clear_callback(Clock *clk); - -/** * clock_set_source: * @clk: the clock. * @src: the source clock diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 1b26a417bd..a558705cb9 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -319,7 +319,7 @@ extern const size_t pc_compat_2_3_len; }; \ static void pc_machine_init_##suffix(void) \ { \ - type_register(&pc_machine_type_##suffix); \ + type_register_static(&pc_machine_type_##suffix); \ } \ type_init(pc_machine_init_##suffix) @@ -349,7 +349,7 @@ extern const size_t pc_compat_2_3_len; static void MACHINE_VER_SYM(register, namesym, __VA_ARGS__)(void) \ { \ MACHINE_VER_DELETION(__VA_ARGS__); \ - type_register(&MACHINE_VER_SYM(info, namesym, __VA_ARGS__)); \ + type_register_static(&MACHINE_VER_SYM(info, namesym, __VA_ARGS__)); \ } \ type_init(MACHINE_VER_SYM(register, namesym, __VA_ARGS__)); |