On 06/17/2010 03:15 PM, Matthias Bolte wrote:
Also don't abuse the disk driver name to specify the SCSI controller model anymore:
<driver name='buslogic'/>
Use the newly added model attribute of the controller element for this:
<controller type='scsi' index='0' model='buslogic'/>
I don't see any change to docs/schemas/domain.rng for this new XML attribute. Am I missing something, or how do you write an xml file that uses this attribute and still passes validation?
The disk driver name approach is deprecated now, but still works for backward compatibility reasons.
Update the documentation and tests accordingly.
Fix usage of the words controller and id in the VMX handling code. Use controller, bus and unit properly. --- docs/drvesx.html.in | 25 +-
Is the xml addition ESX-specific, or should the new controller attribute also be documented in docs/formatdomain.html.in? Is anything other than model='lsilogic' supported?
@@ -1014,18 +1184,18 @@ esxVMX_ParseConfig(esxVI_Context *ctx, const char *vmx, continue; }
- for (id = 0; id < 16; ++id) { - if (id == 7) { + for (unit = 0; unit < 16; ++unit) { + if (unit == 7) { /* - * SCSI ID 7 is assigned to the SCSI controller and cannot be + * SCSI unit 7 is assigned to the SCSI controller and cannot be * used for disk devices. */ continue;
I've run out of time for reviewing the rest of the patch today (didn't spot anything else obvious above this point), but you may still want to answer my questions and/or respin accordingly. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org