|
@@ -974,7 +974,7 @@ static void sun4m_hw_init(MachineState *machine)
|
|
sysbus_mmio_map(s, 0, hwdef->ms_kb_base);
|
|
sysbus_mmio_map(s, 0, hwdef->ms_kb_base);
|
|
|
|
|
|
/* Logically OR both its IRQs together */
|
|
/* Logically OR both its IRQs together */
|
|
- ms_kb_orgate = DEVICE(object_new(TYPE_OR_IRQ));
|
|
|
|
|
|
+ ms_kb_orgate = qdev_new(TYPE_OR_IRQ);
|
|
object_property_set_int(OBJECT(ms_kb_orgate), "num-lines", 2, &error_fatal);
|
|
object_property_set_int(OBJECT(ms_kb_orgate), "num-lines", 2, &error_fatal);
|
|
qdev_realize_and_unref(ms_kb_orgate, NULL, &error_fatal);
|
|
qdev_realize_and_unref(ms_kb_orgate, NULL, &error_fatal);
|
|
sysbus_connect_irq(s, 0, qdev_get_gpio_in(ms_kb_orgate, 0));
|
|
sysbus_connect_irq(s, 0, qdev_get_gpio_in(ms_kb_orgate, 0));
|
|
@@ -995,7 +995,7 @@ static void sun4m_hw_init(MachineState *machine)
|
|
sysbus_mmio_map(s, 0, hwdef->serial_base);
|
|
sysbus_mmio_map(s, 0, hwdef->serial_base);
|
|
|
|
|
|
/* Logically OR both its IRQs together */
|
|
/* Logically OR both its IRQs together */
|
|
- serial_orgate = DEVICE(object_new(TYPE_OR_IRQ));
|
|
|
|
|
|
+ serial_orgate = qdev_new(TYPE_OR_IRQ);
|
|
object_property_set_int(OBJECT(serial_orgate), "num-lines", 2,
|
|
object_property_set_int(OBJECT(serial_orgate), "num-lines", 2,
|
|
&error_fatal);
|
|
&error_fatal);
|
|
qdev_realize_and_unref(serial_orgate, NULL, &error_fatal);
|
|
qdev_realize_and_unref(serial_orgate, NULL, &error_fatal);
|