Kamala Narasimhan
2011-Feb-10 17:16 UTC
[xen-devel][PATCH] xl - Special case vhd images validation
Description - Special case how we validate vhd image files. Without this patch when tap:aio:vhd prefixed image files are specified in the config file, disk validation and thus vm creation will fail. IanJ - Since we decided to not merge disk changes patch 3-5, we need this. IanC - This patch has the change you suggested to look for DISK_FORMAT_EMPTY. Signed-off-by: Kamala Narasimhan <kamala.narasimhan@citrix.com> Kamala _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Ian Jackson
2011-Feb-10 19:31 UTC
Re: [xen-devel][PATCH] xl - Special case vhd images validation
Kamala Narasimhan writes ("[xen-devel][PATCH] xl - Special case vhd images validation"):> Description - Special case how we validate vhd image files. Without this patch when tap:aio:vhd prefixed image files are specified in the config file, disk validation and thus vm creation will fail.> + if (disk->format == DISK_FORMAT_RAW) { > + delimiter = strchr(file_name, '':''); > + if (delimiter) { > + if (!strncmp(file_name, "vhd:", sizeof("vhd:")-1)) { > + disk->format = DISK_FORMAT_VHD; > + file_name = ++delimiter; > + } > + } > + }This seems to suggest that if you say "tap:raw:" with a filename starting "vhd:" you get vhd instead. This is a bit perverse but I guess acceptable for 4.1 at least.> LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "failed to stat %s", file_name); > return ERROR_INVAL; > } > - if (backend_type == DISK_BACKEND_PHY) { > + if (disk->backend == DISK_BACKEND_PHY) {Is this change stray in this patch, or should it be included in one of the others ? I''m not sure I follow it, anyway. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Kamala Narasimhan
2011-Feb-10 19:55 UTC
Re: [xen-devel][PATCH] xl - Special case vhd images validation
Ian Jackson wrote:> Kamala Narasimhan writes ("[xen-devel][PATCH] xl - Special case vhd images validation"): >> Description - Special case how we validate vhd image files. Without this patch when tap:aio:vhd prefixed image files are specified in the config file, disk validation and thus vm creation will fail. > >> + if (disk->format == DISK_FORMAT_RAW) { >> + delimiter = strchr(file_name, '':''); >> + if (delimiter) { >> + if (!strncmp(file_name, "vhd:", sizeof("vhd:")-1)) { >> + disk->format = DISK_FORMAT_VHD; >> + file_name = ++delimiter; >> + } >> + } >> + } > > This seems to suggest that if you say "tap:raw:" with a filename > starting "vhd:" you get vhd instead. This is a bit perverse but I > guess acceptable for 4.1 at least. >We won''t need this change if we have gone with patch 3 and further but since we chose to move those post 4.1, we will need this.> >> LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "failed to stat %s", file_name); >> return ERROR_INVAL; >> } >> - if (backend_type == DISK_BACKEND_PHY) { >> + if (disk->backend == DISK_BACKEND_PHY) { > > Is this change stray in this patch, or should it be included in one of > the others ? I''m not sure I follow it, anyway. >I switched the input param for the method as I had to, so we need this as well. Kamala _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Kamala Narasimhan
2011-Feb-14 20:34 UTC
Re: [xen-devel][PATCH] xl - Special case vhd images validation
Resending this patch as the one I sent earlier won''t apply given the changes we just made to "[PATCH 2/5] Xl interface change plus changes to code it impacts". Description - Special case how we validate vhd image files. Without this patch when tap:aio:vhd prefixed image files are specified in the config file, disk validation and thus vm creation will fail. Signed-off-by: Kamala Narasimhan <kamala.narasimhan@citrix.com> Kamala _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Ian Jackson
2011-Feb-15 19:23 UTC
Re: [xen-devel][PATCH] xl - Special case vhd images validation
Kamala Narasimhan writes ("Re: [xen-devel][PATCH] xl - Special case vhd images validation"):> Description - Special case how we validate vhd image files. Without this patch when tap:aio:vhd prefixed image files are specified in the config file, disk validation and thus vm creation will fail.Thanks. This one looks good to me (although the special case is a bit unpleasant, I don''t think we want to do something more intrusive now) so I''m happy with it as a followup to your disk interface change patch. Ian. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel