Kamala Narasimhan wrote:
> Stefano Stabellini wrote:
>> On Thu, 10 Feb 2011, Kamala Narasimhan wrote:
>>> Stefano - This includes a fix for empty cdrom case issue you found while testing.
>>>
>>> Description:
>>>
>>> This patch refactors xl disk specific interface to separate disk format and backend types, rename some variables, changes code that is impacted by this interface change.
>>>
>> you need to update the ocaml bindings, otherwise the patch will cause
>> build problems:
>>
>> make[7]: Entering directory `/local/scratch/sstabellini/xen-unstable.hg/tools/ocaml/libs/xl'
>>  CC       xl_stubs.o
>> xl_stubs.c: In function 'device_disk_val':
>> xl_stubs.c:195: error: 'libxl_device_disk' has no member named 'physpath'
>> xl_stubs.c:196: error: 'libxl_device_disk' has no member named 'phystype'
>> xl_stubs.c:196: error: 'PHYSTYPE_QCOW' undeclared (first use in this function)
>> xl_stubs.c:196: error: (Each undeclared identifier is reported only once
>> xl_stubs.c:196: error: for each function it appears in.)
>> xl_stubs.c:197: error: 'libxl_device_disk' has no member named 'virtpath'
>> make[7]: *** [xl_stubs.o] Error 1
>> make[7]: Leaving directory `/local/scratch/sstabellini/xen-unstable.hg/tools/ocaml/libs/xl'
>> make[6]: *** [subdir-install-xl] Error 2
>> make[6]: Leaving directory `/local/scratch/sstabellini/xen-unstable.hg/tools/ocaml/libs'
>> make[5]: *** [subdirs-install] Error 2
>> make[5]: Leaving directory `/local/scratch/sstabellini/xen-unstable.hg/tools/ocaml/libs'
>> make[4]: *** [subdir-install-libs] Error 2
>> make[4]: Leaving directory `/local/scratch/sstabellini/xen-unstable.hg/tools/ocaml'
>> make[3]: *** [subdirs-install] Error 2
>> make[3]: Leaving directory `/local/scratch/sstabellini/xen-unstable.hg/tools/ocaml'
>> make[2]: *** [subdir-install-ocaml] Error 2
>> make[2]: Leaving directory `/local/scratch/sstabellini/xen-unstable.hg/tools'
>> make[1]: *** [subdirs-install] Error 2
>> make[1]: Leaving directory `/local/scratch/sstabellini/xen-unstable.hg/tools'
>> make: *** [install-tools] Error 2
>>
>>
>> apart from this it looks OK to me.
> 
> Stefano - Here is a revised patch that fixes the ocaml bindings build issues.  While I confirmed that the build now works, I wouldn't even know where to start when it comes to testing it!
> 
> Signed-off-by: Kamala Narasimhan <kamala.narasimhan@citrix.com>
> 
Per suggestion, along with the latest patch is a more detailed description to add to the check-in message - 

Currently we pile all the backend and format information pertaining to disk option in a single enum.  This check-in separates the two and uses two enums, one for disk format and another for disk backend.  This helps clearly differentiate between disk format and backend within the implementation and also helps cleanup the code in this area in preparation for the impending parser revamping to be done post 4.1.  Along with separating format and backend, this check-in also removes unwanted types and renames variables in the disk interface and fixes the code affected by the interface changes.

In specific, here are the disk interface changes made - In libxl_device_disk structure physpath was renamed to pdev_path, virtpath was renamed to vdev, phystype was removed and replaced with backend and format enums.  Also previously a single enum libxl_disk_phystype held the values for qcow, qcow2, vhd, aio, file, phy, empty and that got refactored into two enums, libxl_disk_format to hold unknown, qcow, qcow2, vhd, raw, empty and libxl_disk_backend to hold unknown, phy, tap and qdisk.

Signed-off-by: Kamala Narasimhan <kamala.narasimhan@citrix.com>

Kamala