Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to qemu-2.6.
[kvmfornfv.git]
/
qemu
/
hw
/
arm
/
cubieboard.c
diff --git
a/qemu/hw/arm/cubieboard.c
b/qemu/hw/arm/cubieboard.c
index
1582250
..
fbd78ed
100644
(file)
--- a/
qemu/hw/arm/cubieboard.c
+++ b/
qemu/hw/arm/cubieboard.c
@@
-15,6
+15,10
@@
* for more details.
*/
* for more details.
*/
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "qemu-common.h"
+#include "cpu.h"
#include "hw/sysbus.h"
#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/sysbus.h"
#include "hw/devices.h"
#include "hw/boards.h"
@@
-39,27
+43,26
@@
static void cubieboard_init(MachineState *machine)
object_property_set_int(OBJECT(&s->a10->emac), 1, "phy-addr", &err);
if (err != NULL) {
object_property_set_int(OBJECT(&s->a10->emac), 1, "phy-addr", &err);
if (err != NULL) {
- error_report
("Couldn't set phy address: %s", error_get_pretty(err)
);
+ error_report
f_err(err, "Couldn't set phy address: "
);
exit(1);
}
object_property_set_int(OBJECT(&s->a10->timer), 32768, "clk0-freq", &err);
if (err != NULL) {
exit(1);
}
object_property_set_int(OBJECT(&s->a10->timer), 32768, "clk0-freq", &err);
if (err != NULL) {
- error_report
("Couldn't set clk0 frequency: %s", error_get_pretty(err)
);
+ error_report
f_err(err, "Couldn't set clk0 frequency: "
);
exit(1);
}
object_property_set_int(OBJECT(&s->a10->timer), 24000000, "clk1-freq",
&err);
if (err != NULL) {
exit(1);
}
object_property_set_int(OBJECT(&s->a10->timer), 24000000, "clk1-freq",
&err);
if (err != NULL) {
- error_report
("Couldn't set clk1 frequency: %s", error_get_pretty(err)
);
+ error_report
f_err(err, "Couldn't set clk1 frequency: "
);
exit(1);
}
object_property_set_bool(OBJECT(s->a10), true, "realized", &err);
if (err != NULL) {
exit(1);
}
object_property_set_bool(OBJECT(s->a10), true, "realized", &err);
if (err != NULL) {
- error_report("Couldn't realize Allwinner A10: %s",
- error_get_pretty(err));
+ error_reportf_err(err, "Couldn't realize Allwinner A10: ");
exit(1);
}
exit(1);
}
@@
-74,16
+77,10
@@
static void cubieboard_init(MachineState *machine)
arm_load_kernel(&s->a10->cpu, &cubieboard_binfo);
}
arm_load_kernel(&s->a10->cpu, &cubieboard_binfo);
}
-static QEMUMachine cubieboard_machine = {
- .name = "cubieboard",
- .desc = "cubietech cubieboard",
- .init = cubieboard_init,
-};
-
-
-static void cubieboard_machine_init(void)
+static void cubieboard_machine_init(MachineClass *mc)
{
{
- qemu_register_machine(&cubieboard_machine);
+ mc->desc = "cubietech cubieboard";
+ mc->init = cubieboard_init;
}
}
-
machine_init(
cubieboard_machine_init)
+
DEFINE_MACHINE("cubieboard",
cubieboard_machine_init)