On Thu, 2009-07-02 at 18:27 +0100, Daniel P. Berrange wrote:
The reason the mips ones are separate, is that it had 2 separate
qemu binaries for each. If arm is all done by one binary what
you have is fine.
Yep, they're all handled with qemu-system-arm
> --- ../libvirt-0.6.1/src/qemu_conf.c 2009-06-30
13:06:17.000000000 -0700
> +++ src/qemu_conf.c 2009-06-30 20:06:33.000000000 -0700
> @@ -170,6 +170,12 @@
> static const char *const arch_info_hvm_x86_machines[] = {
> "pc", "isapc"
> };
> +static const char *const arch_info_hvm_arm_machines[] = {
> +
"integratorcp","versatilepb","versatileab","realview",
> +
"akita","spitz","borzoi","terrier","sx1-v1","sx1",
> +
"cheetah","n800","n810","lm3s811evb","lm3s6965evb",
> +
"connex","verdex","mainstone","musicpal","tosa",
> +};
> static const char *const arch_info_hvm_mips_machines[] = {
> "mips"
> };
> @@ -220,6 +226,8 @@
> "/usr/bin/qemu", "/usr/bin/qemu-system-x86_64",
arch_info_i686_flags, 4 },
> { "x86_64", 64, arch_info_hvm_x86_machines, 2,
> "/usr/bin/qemu-system-x86_64", NULL, arch_info_x86_64_flags, 2 },
> + { "arm", 32, arch_info_hvm_arm_machines, 20,
> + "/usr/bin/qemu-system-arm", NULL, NULL, 0 },
> { "mips", 32, arch_info_hvm_mips_machines, 1,
> "/usr/bin/qemu-system-mips", NULL, NULL, 0 },
> { "mipsel", 32, arch_info_hvm_mips_machines, 1,
ACK,
NB, the first machine type listed is the default, so in this case users
will get 'intergratorcp' by default unless requesting something different.
If this isn't what you expect then re-arrange the order for best
default
Alrighty. I use 'versatilepb', so I've put it at the head of the list
in the attached patch.
Daniel
Cheers,
C.J.