[libvirt] Still in freeze, third rc tarball available

[Jim Fehlig]

Daniel P. Berrange wrote:
> On Wed, Feb 16, 2011 at 05:10:10PM -0700, Jim Fehlig wrote:
>   
>
>> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
>> index 05f427c..9186707 100644
>> --- a/src/qemu/qemu_command.c
>> +++ b/src/qemu/qemu_command.c
>> @@ -3112,7 +3112,7 @@ qemuBuildCommandLine(virConnectPtr conn,
>>      }
>>  
>>      /* If QEMU supports -drive param instead of old -hda, -hdb, -cdrom .. */
>> -    if (qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE) {
>> +    if (qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE && !def->os.kernel) {
>>          int bootCD = 0, bootFloppy = 0, bootDisk = 0;
>>  
>>          /* If QEMU supports boot=on for -drive param... */
>>     
>
> This patch prevents libvirt actually creating any disks at all. Your
> idea sounds good though. I think if you put the '&& !def->os.kernel'
> bit in the next conditional it will work, eg try
>
>        /* If QEMU supports boot=on for -drive param... */
>         if ((qemuCmdFlags & QEMUD_CMD_FLAG_DRIVE_BOOT) &&
>             !def->os.kernel) {
>   

Err, right.  That's the patch I actually tested.  I doubt many of the
tck tests would have passed with the version I posted here :-).

The correct patch has been sent ...

Thanks,
Jim