Re: [Qemu-devel] [PATCH V5 3/5] libqblock API

[Paolo Bonzini <pbonzini@redhat.com>]

Il 29/09/2012 10:13, Wenchao Xia ha scritto:
> +static void qb_setup_info_addr(QBlockStaticInfo *info,
> +                               QBlockStaticInfoAddr *info_addr)
> +{
> +    uint64_t *virt_size = NULL;
> +    QBlockLocationInfo *backing_loc = NULL;
> +    bool *encrypt = NULL;
> +    QBlockFormatInfo *fmt = &(info->fmt);
> +
> +    switch (fmt->fmt_type) {
> +    case QB_FMT_COW:
> +        virt_size = &(fmt->o_cow.virt_size);
> +        backing_loc = &(fmt->o_cow.backing_loc);
> +        break;
> +    case QB_FMT_QED:
> +        virt_size = &(fmt->o_qed.virt_size);
> +        backing_loc = &(fmt->o_qed.backing_loc);
> +        break;
> +    case QB_FMT_QCOW:
> +        virt_size = &(fmt->o_qcow.virt_size);
> +        backing_loc = &(fmt->o_qcow.backing_loc);
> +        encrypt = &(fmt->o_qcow.encrypt);
> +        break;
> +    case QB_FMT_QCOW2:
> +        virt_size = &(fmt->o_qcow2.virt_size);
> +        backing_loc = &(fmt->o_qcow2.backing_loc);
> +        encrypt = &(fmt->o_qcow2.encrypt);
> +        break;
> +    case QB_FMT_RAW:
> +        virt_size = &(fmt->o_raw.virt_size);
> +        break;
> +    case QB_FMT_RBD:
> +        virt_size = &(fmt->o_rbd.virt_size);
> +        break;
> +    case QB_FMT_SHEEPDOG:
> +        virt_size = &(fmt->o_sd.virt_size);
> +        backing_loc = &(fmt->o_sd.backing_loc);
> +        break;
> +    case QB_FMT_VDI:
> +        virt_size = &(fmt->o_vdi.virt_size);
> +        break;
> +    case QB_FMT_VMDK:
> +        virt_size = &(fmt->o_vmdk.virt_size);
> +        backing_loc = &(fmt->o_vmdk.backing_loc);
> +        break;
> +    case QB_FMT_VPC:
> +        virt_size = &(fmt->o_vpc.virt_size);
> +        break;
> +    default:
> +        break;
> +    }
> +
> +    info_addr->virt_size = virt_size;
> +    info_addr->backing_loc = backing_loc;
> +    info_addr->encrypt = encrypt;
> +    return;
> +}
> +
> +const uint64_t *qb_get_virt_size(const QBlockStaticInfo *info)
> +{
> +    return info->member_addr->virt_size;

Please change this to:

     QBlockStaticInfoAddr addrs;
     qb_setup_info_addr(info, &addrs);
     return *addrs->virt_size;

and similarly for the others.

QBlockStaticInfoAddr should not be a public struct.  I'm sorry if this
wasn't clear.

I'll review the rest on Monday.

Paolo

> +}
> +
> +const QBlockLocationInfo *qb_get_backing_loc(const QBlockStaticInfo *info)
> +{
> +    return info->member_addr->backing_loc;
> +}
> +
> +const bool *qb_get_encrypt(const QBlockStaticInfo *info)
> +{
> +    return info->member_addr->encrypt;
> +}
> +