Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

[mirror_qemu.git] / hw / dma / pl330.c

diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c
index 64519971ef9161de1531f63df9f60aa7ecfd629f..0bd63a43f50319d9c29ee8ab9239a7e84e0b22d2 100644 (file)
--- a/hw/dma/pl330.c
+++ b/hw/dma/pl330.c
@@ -1664,7 +1664,7 @@ static void pl330_class_init(ObjectClass *klass, void *data)
 
     dc->realize = pl330_realize;
     dc->reset = pl330_reset;
-    dc->props = pl330_properties;
+    device_class_set_props(dc, pl330_properties);
     dc->vmsd = &vmstate_pl330;
 }