<div dir="ltr">Eric: No problem, I'll resubmit with git (sorry about that, it's been long enough since my last submit that I forgot about that), but I'll fix the issue that Doug pointed out first. As for the pointer comparison to NULL, I'm in complete agreement, but that particular source file uses the != NULL idiom everywhere. I'd be happy to remove it everywhere, but that should be done as a separate submit, I would think?<div> </div><div>Thanks, 2nd try soon. :)</div></div><div class="gmail_extra"> <div class="gmail_quote">On Thu, Oct 10, 2013 at 4:15 PM, Doug Goldstein <<a href="mailto:cardoe@gentoo.org" target="_blank">cardoe@gentoo.org</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">On Thu, Oct 10, 2013 at 2:21 PM, Eric Blake <<a href="mailto:eblake@redhat.com">eblake@redhat.com</a>> wrote: > On 10/09/2013 07:39 PM, Geoff Hickey wrote: >> The vmx file parsing code was reporting errors when parsing floppy.fileName >> entries if the filename didn't end in .flp. There is no such restriction in >> ESX; even using the GUI to configure floppy filenames you can specify any >> arbitrary file with any extension. >> >> Fix by changing the vmx parsing code so that it uses the floppy.fileType >> value to determine whether floppy.fileName refers to a block device or a >> regular file. >> --- >> src/vmx/vmx.c | 26 +++++--------------------- >> 1 file changed, 5 insertions(+), 21 deletions(-) >> >> diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c >> index 38b7cc0..ffe7e7a 100644 >> --- a/src/vmx/vmx.c >> +++ b/src/vmx/vmx.c >> @@ -2250,27 +2250,18 @@ virVMXParseDisk(virVMXContext *ctx, >> virDomainXMLOptionPtr xmlopt, virConfPtr con >> goto cleanup; >> } >> } else if (device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) { >> - if (virFileHasSuffix(fileName, ".flp")) { >> - if (fileType != NULL) { >> - if (STRCASENEQ(fileType, "file")) { >> - virReportError(VIR_ERR_INTERNAL_ERROR, >> - _("Expecting VMX entry '%s' to be >> 'file' but " > > Your mailer corrupted your patch. Would you mind resending it via 'git > send-email', or at a bare minimum as an attachment rather than inline, > so that maintainers can just 'git am' it? > > Applying: esx: Fix floppy.fileName handling in the vmx file parser > fatal: corrupt patch at line 10 > Repository lacks necessary blobs to fall back on 3-way merge. > Cannot fall back to three-way merge. > Patch failed at 0001 esx: Fix floppy.fileName handling in the vmx file > parser > > See also <a href="http://libvirt.org/hacking.html" target="_blank">http://libvirt.org/hacking.html</a> for hints. > >> + if (fileType != NULL && STRCASEEQ(fileType, "device")) { > > It's simpler to just use a pointer variable in boolean context instead > of explicit comparison against NULL (this isn't Java). As in: > > if (fileType && STRCASEEQ(fileType, "device")) { > > At any rate, your change looks reasonable to me; I wouldn't mind > applying it if you can resend to touch up those issues. > > -- > Eric Blake eblake redhat com <a href="tel:%2B1-919-301-3266" value="+19193013266">+1-919-301-3266</a> > Libvirt virtualization library <a href="http://libvirt.org" target="_blank">http://libvirt.org</a> > > </div></div>> -- > libvir-list mailing list > <a href="mailto:libvir-list@redhat.com">libvir-list@redhat.com</a> > <a href="https://www.redhat.com/mailman/listinfo/libvir-list" target="_blank">https://www.redhat.com/mailman/listinfo/libvir-list</a> FWIW, I've been fixing a number of these poor assumptions lately. There's no limitation that there must be a fileName specified either and the way the patch is formulated it will treat it as a fatal error that there is a floppy drive defined with no file name for the floppy image. -- Doug Goldstein </blockquote></div> </div>