[libvirt] [PATCH v2 06/10] qemu: Build qemu command line for scsi-generic

[Han Cheng]

On 04/01/2013 08:00 PM, Han Cheng wrote:

> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index eac72c2..e1af64f 100644
> --- a/src/qemu/qemu_command.c
> +++ b/src/qemu/qemu_command.c
> @@ -557,7 +557,7 @@ qemuAssignDeviceDiskAliasCustom(virDomainDefPtr def,
>       if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) {
>           if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) {
>               controllerModel =
> -                virDomainInfoFindControllerModel(def,&disk->info,
> +                virDomainDeviceFindControllerModel(def,&disk->info,
>                                                    VIR_DOMAIN_CONTROLLER_TYPE_SCSI);
>
>               if ((qemuSetScsiControllerModel(def, qemuCaps,&controllerModel))<  0)

Oh, God. I changed the reference place here. It must be a rebase mistake.

> @@ -3179,7 +3188,7 @@ qemuBuildDriveDevStr(virDomainDefPtr def,
>           }
>
>           controllerModel =
> -            virDomainInfoFindControllerModel(def,&disk->info,
> +            virDomainDeviceFindControllerModel(def,&disk->info,
>                                                VIR_DOMAIN_CONTROLLER_TYPE_SCSI);
>           if ((qemuSetScsiControllerModel(def, qemuCaps,&controllerModel))<  0)
>               goto error;

And here.