[libvirt] Patch to include arm variants in virsh capabilities

[Daniel P. Berrange]

On Thu, Jul 02, 2009 at 10:01:29AM -0700, C.J. Adams-Collier wrote:
> > On Wed, Jul 01, 2009 at 11:02:16AM -0700, C.J. Adams-Collier wrote:
> > > Hey folks,
> > > 
> > > I got an android and wanted to set up an armel debian vm to test out
> > > some code.  I had to launch it directly with qemu-system-arm, though,
> > > since virsh didn't have an arm option to select.
> > > 
> > > This is a patch against the debian version of the source after applying
> > > debian-specific changes.  If you'd like a patch against mainline, I'd be
> > > willing to do that.
> > > 
> > > http://karma.colliertech.org/~cjac/tmp/add-arm.patch
> > 
> >  Well, this list is really about upstream patches not distro specific
> > ones,
> 
> I just verified that it applies cleanly against CVS.
> 
> > and I could not access said patch [1].
> 
> That is weird.  I hope it was just a fluke!  Attached.
> 
> > Send a patch against the
> > latest version or CVS/git as an mail attachemnt and we will try to add
> > it.
> 
> Alrighty.  I see that the mips machines are separated into 'mips' and
> 'mipsel'.  I don't know anything about the endian-ness of the various
> machines (aside from versatilepb, which is little), so I just left them
> all in the generic qemu_arch_info.arch="arm" table entry.

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.


> --- ../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

Daniel
-- 
|: Red Hat, Engineering, London   -o-   http://people.redhat.com/berrange/ :|
|: http://libvirt.org  -o-  http://virt-manager.org  -o-  http://ovirt.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: GnuPG: 7D3B9505  -o-  F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|