Re: [Qemu-devel] [PATCH v9 15/24] hw/acpi/aml-build: Add ToUUID macro

[Michael S. Tsirkin]

On Mon, May 25, 2015 at 10:55:11AM +0800, Shannon Zhao wrote:
> From: Shannon Zhao <address@hidden>
> 
> Add ToUUID macro, this is useful for generating PCIe ACPI table.
> 
> Signed-off-by: Shannon Zhao <address@hidden>
> Signed-off-by: Shannon Zhao <address@hidden>
> Reviewed-by: Igor Mammedov <address@hidden>

Reviewed-by: Michael S. Tsirkin <address@hidden>

> ---
>  hw/acpi/aml-build.c         | 53 
> +++++++++++++++++++++++++++++++++++++++++++++
>  include/hw/acpi/aml-build.h |  1 +
>  2 files changed, 54 insertions(+)
> 
> diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
> index 22478c2..ebce504 100644
> --- a/hw/acpi/aml-build.c
> +++ b/hw/acpi/aml-build.c
> @@ -962,6 +962,59 @@ Aml *aml_qword_memory(AmlDecode dec, AmlMinFixed 
> min_fixed,
>                               addr_trans, len, flags);
>  }
>  
> +static uint8_t Hex2Byte(const char *src)
> +{
> +    int hi, lo;
> +
> +    hi = Hex2Digit(src[0]);
> +    assert(hi >= 0);
> +    assert(hi <= 15);
> +
> +    lo = Hex2Digit(src[1]);
> +    assert(lo >= 0);
> +    assert(lo <= 15);
> +    return (hi << 4) | lo;
> +}
> +
> +/*
> + * ACPI 3.0: 17.5.124 ToUUID (Convert String to UUID Macro)
> + * e.g. UUID: aabbccdd-eeff-gghh-iijj-kkllmmnnoopp
> + * call aml_touuid("aabbccdd-eeff-gghh-iijj-kkllmmnnoopp");
> + */
> +Aml *aml_touuid(const char *uuid)
> +{
> +    Aml *var = aml_bundle(0x11 /* BufferOp */, AML_BUFFER);
> +
> +    assert(strlen(uuid) == 36);
> +    assert(uuid[8] == '-');
> +    assert(uuid[13] == '-');
> +    assert(uuid[18] == '-');
> +    assert(uuid[23] == '-');
> +
> +    build_append_byte(var->buf, Hex2Byte(uuid + 6));  /* dd - at offset 00 */
> +    build_append_byte(var->buf, Hex2Byte(uuid + 4));  /* cc - at offset 01 */
> +    build_append_byte(var->buf, Hex2Byte(uuid + 2));  /* bb - at offset 02 */
> +    build_append_byte(var->buf, Hex2Byte(uuid + 0));  /* aa - at offset 03 */
> +
> +    build_append_byte(var->buf, Hex2Byte(uuid + 11)); /* ff - at offset 04 */
> +    build_append_byte(var->buf, Hex2Byte(uuid + 9));  /* ee - at offset 05 */
> +
> +    build_append_byte(var->buf, Hex2Byte(uuid + 16)); /* hh - at offset 06 */
> +    build_append_byte(var->buf, Hex2Byte(uuid + 14)); /* gg - at offset 07 */
> +
> +    build_append_byte(var->buf, Hex2Byte(uuid + 19)); /* ii - at offset 08 */
> +    build_append_byte(var->buf, Hex2Byte(uuid + 21)); /* jj - at offset 09 */
> +
> +    build_append_byte(var->buf, Hex2Byte(uuid + 24)); /* kk - at offset 10 */
> +    build_append_byte(var->buf, Hex2Byte(uuid + 26)); /* ll - at offset 11 */
> +    build_append_byte(var->buf, Hex2Byte(uuid + 28)); /* mm - at offset 12 */
> +    build_append_byte(var->buf, Hex2Byte(uuid + 30)); /* nn - at offset 13 */
> +    build_append_byte(var->buf, Hex2Byte(uuid + 32)); /* oo - at offset 14 */
> +    build_append_byte(var->buf, Hex2Byte(uuid + 34)); /* pp - at offset 15 */
> +
> +    return var;
> +}
> +
>  void
>  build_header(GArray *linker, GArray *table_data,
>               AcpiTableHeader *h, const char *sig, int len, uint8_t rev)
> diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
> index fac70ea..a873b46 100644
> --- a/include/hw/acpi/aml-build.h
> +++ b/include/hw/acpi/aml-build.h
> @@ -257,6 +257,7 @@ Aml *aml_buffer(int buffer_size, uint8_t *byte_list);
>  Aml *aml_resource_template(void);
>  Aml *aml_field(const char *name, AmlAccessType type, AmlUpdateRule rule);
>  Aml *aml_varpackage(uint32_t num_elements);
> +Aml *aml_touuid(const char *uuid);
>  
>  void
>  build_header(GArray *linker, GArray *table_data,
> -- 
> 2.0.4
>