[et-mgmt-tools] [PATCH] HVM 3rd disk name don't use "hdc"

[Daniel P. Berrange]

On Thu, Mar 22, 2007 at 08:23:41PM +0900, Tatsuro Enokura wrote:
> Hi
> 
> I try that making the HVM domain with 3+ disks by the virt-install command,
> but the command says following error message:
> # virt-install --name=HVM_3DISKS --file=/dev/sda6 --file=/dev/sda7 \
>  --file=/dev/sda8 --hvm --vnc --ram=376 --cdrom=/dev/cdrom

This is a ticky one ! We need to a) refuse to allow > 3 --file arguments
to be used with HVM guests, and b) make sure the 3rd file gets given
hdd as its device name.


> diff -r aec5777422c0 virtinst/Guest.py
> --- a/virtinst/Guest.py Wed Mar 21 13:46:29 2007 -0400
> +++ b/virtinst/Guest.py Thu Mar 22 15:34:06 2007 +0900
> @@ -552,8 +552,12 @@ class Guest(object):
>              if d.transient and not install:
>                  continue
>              if d.device == VirtualDisk.DEVICE_CDROM and count != 2:
> -                count = 2
> -            disknode = "%(disknode)s%(dev)c" % { "disknode":
> self.disknode, "dev": ord('a') + count }
> +                disknode = "%(disknode)s%(dev)c" % { "disknode":
> self.disknode, "dev": ord('a') + 2 }
> +            elif d.device != VirtualDisk.DEVICE_CDROM and self.disknode
> == "hd" and count == 2:
> +                count += 1
> +                disknode = "%(disknode)s%(dev)c" % { "disknode":
> self.disknode, "dev": ord('a') + count }
> +            else:
> +                disknode = "%(disknode)s%(dev)c" % { "disknode":
> self.disknode, "dev": ord('a') + count }
>              ret += d.get_xml_config(disknode)
>              count += 1
>          return ret

Your email client has totally mangled the patch, adding in a bunch of extra
line breaks :-(  Could you re-send it as a plain text attachment instead.

Regards,
Dan.
-- 
|=- Red Hat, Engineering, Emerging Technologies, Boston.  +1 978 392 2496 -=|
|=-           Perl modules: http://search.cpan.org/~danberr/              -=|
|=-               Projects: http://freshmeat.net/~danielpb/               -=|
|=-  GnuPG: 7D3B9505   F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505  -=|