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

[mirror_qemu.git] / hw / timer / m48t59.c

diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c
index be0592b53dcb8d4f0cb4bb18092faa262e66aa19..3cfb18a8b33b58ff3044084fd27a4df7b200d0b4 100644 (file)
--- a/hw/timer/m48t59.c
+++ b/hw/timer/m48t59.c
@@ -750,9 +750,10 @@ static void m48t59_isa_class_init(ObjectClass *klass, void *data)
     DeviceClass *dc = DEVICE_CLASS(klass);
 
     dc->realize = m48t59_isa_realize;
-    dc->no_user = 1;
     dc->reset = m48t59_reset_isa;
     dc->props = m48t59_isa_properties;
+    /* Reason: needs to be wired up by m48t59_init_isa() */
+    dc->cannot_instantiate_with_device_add_yet = true;
 }
 
 static const TypeInfo m48t59_isa_info = {