Commit 9c5ce8db authored by Fam Zheng's avatar Fam Zheng
Browse files

vl: Switch qemu_uuid to QemuUUID 



Update all qemu_uuid users as well, especially get rid of the duplicated
low level g_strdup_printf, sscanf and snprintf calls with QEMU UUID API.

Since qemu_uuid_parse is quite tangled with qemu_uuid, its switching to
QemuUUID is done here too to keep everything in sync and avoid code
churn.

Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarJeff Cody <jcody@redhat.com>
Message-Id: <1474432046-325-10-git-send-email-famz@redhat.com>
parent 315d3184

hw/ipmi/ipmi_bmc_sim.c

+1 −1
Original line number Diff line number Diff line
@@ -1773,7 +1773,7 @@ static void ipmi_sim_realize(DeviceState *dev, Error **errp) 
    ibs->acpi_power_state[1] = 0;



    if (qemu_uuid_set) {

        memcpy(&ibs->uuid, qemu_uuid, 16);

        memcpy(&ibs->uuid, &qemu_uuid, 16);

    } else {

        memset(&ibs->uuid, 0, 16);

    }

hw/nvram/fw_cfg.c

+1 −1
Original line number Diff line number Diff line
@@ -883,7 +883,7 @@ static void fw_cfg_init1(DeviceState *dev) 
    qdev_init_nofail(dev);



    fw_cfg_add_bytes(s, FW_CFG_SIGNATURE, (char *)"QEMU", 4);

    fw_cfg_add_bytes(s, FW_CFG_UUID, qemu_uuid, 16);

    fw_cfg_add_bytes(s, FW_CFG_UUID, &qemu_uuid, 16);

    fw_cfg_add_i16(s, FW_CFG_NOGRAPHIC, (uint16_t)!machine->enable_graphics);

    fw_cfg_add_i16(s, FW_CFG_NB_CPUS, (uint16_t)smp_cpus);

    fw_cfg_add_i16(s, FW_CFG_BOOT_MENU, (uint16_t)boot_menu);

hw/ppc/spapr.c

+1 −6
Original line number Diff line number Diff line
@@ -332,12 +332,7 @@ static void *spapr_create_fdt_skel(hwaddr initrd_base, 
        g_free(buf);

    }



    buf = g_strdup_printf(UUID_FMT, qemu_uuid[0], qemu_uuid[1],

                          qemu_uuid[2], qemu_uuid[3], qemu_uuid[4],

                          qemu_uuid[5], qemu_uuid[6], qemu_uuid[7],

                          qemu_uuid[8], qemu_uuid[9], qemu_uuid[10],

                          qemu_uuid[11], qemu_uuid[12], qemu_uuid[13],

                          qemu_uuid[14], qemu_uuid[15]);

    buf = qemu_uuid_unparse_strdup(&qemu_uuid);



    _FDT((fdt_property_string(fdt, "vm,uuid", buf)));

    if (qemu_uuid_set) {

hw/ppc/spapr_rtas.c

+2 −1
Original line number Diff line number Diff line
@@ -303,7 +303,8 @@ static void rtas_ibm_get_system_parameter(PowerPCCPU *cpu, 
        break;

    }

    case RTAS_SYSPARM_UUID:

        ret = sysparm_st(buffer, length, qemu_uuid, (qemu_uuid_set ? 16 : 0));

        ret = sysparm_st(buffer, length, (unsigned char *)&qemu_uuid,

                         (qemu_uuid_set ? 16 : 0));

        break;

    default:

        ret = RTAS_OUT_NOT_SUPPORTED;

hw/smbios/smbios.c

+6 −6
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static struct { 


static struct {

    const char *manufacturer, *product, *version, *serial, *sku, *family;

    /* uuid is in qemu_uuid[] */

    /* uuid is in qemu_uuid */

} type1;



static struct {
@@ -409,7 +409,7 @@ static void smbios_build_type_1_fields(void) 
         * BIOS.

         */

        smbios_add_field(1, offsetof(struct smbios_type_1, uuid),

                         qemu_uuid, 16);

                         &qemu_uuid, 16);

    }

}
@@ -484,9 +484,9 @@ static void smbios_build_type_0_table(void) 
/* Encode UUID from the big endian encoding described on RFC4122 to the wire

 * format specified by SMBIOS version 2.6.

 */

static void smbios_encode_uuid(struct smbios_uuid *uuid, const uint8_t *buf)

static void smbios_encode_uuid(struct smbios_uuid *uuid, QemuUUID *in)

{

    memcpy(uuid, buf, 16);

    memcpy(uuid, &in, 16);

    if (smbios_uuid_encoded) {

        uuid->time_low = bswap32(uuid->time_low);

        uuid->time_mid = bswap16(uuid->time_mid);
@@ -503,7 +503,7 @@ static void smbios_build_type_1_table(void) 
    SMBIOS_TABLE_SET_STR(1, version_str, type1.version);

    SMBIOS_TABLE_SET_STR(1, serial_number_str, type1.serial);

    if (qemu_uuid_set) {

        smbios_encode_uuid(&t->uuid, qemu_uuid);

        smbios_encode_uuid(&t->uuid, &qemu_uuid);

    } else {

        memset(&t->uuid, 0, 16);

    }
@@ -1002,7 +1002,7 @@ void smbios_entry_add(QemuOpts *opts) 


            val = qemu_opt_get(opts, "uuid");

            if (val) {

                if (qemu_uuid_parse(val, qemu_uuid) != 0) {

                if (qemu_uuid_parse(val, &qemu_uuid) != 0) {

                    error_report("Invalid UUID");

                    exit(1);

                }