Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Adding breaktrace & disabling timer migration"
[kvmfornfv.git]
/
qemu
/
hw
/
ppc
/
ppc440_bamboo.c
diff --git
a/qemu/hw/ppc/ppc440_bamboo.c
b/qemu/hw/ppc/ppc440_bamboo.c
index
032fa80
..
5c535b1
100644
(file)
--- a/
qemu/hw/ppc/ppc440_bamboo.c
+++ b/
qemu/hw/ppc/ppc440_bamboo.c
@@
-11,7
+11,7
@@
*
*/
*
*/
-#include "
config
.h"
+#include "
qemu/osdep
.h"
#include "qemu-common.h"
#include "net/net.h"
#include "hw/hw.h"
#include "qemu-common.h"
#include "net/net.h"
#include "hw/hw.h"
@@
-256,7
+256,8
@@
static void bamboo_init(MachineState *machine)
NULL, NULL);
if (success < 0) {
success = load_elf(kernel_filename, NULL, NULL, &elf_entry,
NULL, NULL);
if (success < 0) {
success = load_elf(kernel_filename, NULL, NULL, &elf_entry,
- &elf_lowaddr, NULL, 1, ELF_MACHINE, 0);
+ &elf_lowaddr, NULL, 1, PPC_ELF_MACHINE,
+ 0, 0);
entry = elf_entry;
loadaddr = elf_lowaddr;
}
entry = elf_entry;
loadaddr = elf_lowaddr;
}
@@
-288,20
+289,12
@@
static void bamboo_init(MachineState *machine)
exit(1);
}
}
exit(1);
}
}
-
- if (kvm_enabled())
- kvmppc_init();
}
}
-static QEMUMachine bamboo_machine = {
- .name = "bamboo",
- .desc = "bamboo",
- .init = bamboo_init,
-};
-
-static void bamboo_machine_init(void)
+static void bamboo_machine_init(MachineClass *mc)
{
{
- qemu_register_machine(&bamboo_machine);
+ mc->desc = "bamboo";
+ mc->init = bamboo_init;
}
}
-machine_init(bamboo_machine_init);
+DEFINE_MACHINE("bamboo", bamboo_machine_init)