* [Qemu-devel] [PATCH v8 01/12] util: Add UUID API
2016-09-18 4:25 [Qemu-devel] [PATCH v8 00/12] UUID clean ups for 2.8 Fam Zheng
@ 2016-09-18 4:25 ` Fam Zheng
2016-09-19 3:30 ` Jeff Cody
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 02/12] uuid: Make null_uuid static Fam Zheng
` (10 subsequent siblings)
11 siblings, 1 reply; 28+ messages in thread
From: Fam Zheng @ 2016-09-18 4:25 UTC (permalink / raw)
To: qemu-devel
Cc: kwolf, qemu-block, sw, jcody, mdroth, armbru, pbonzini, mreitz,
eblake, rth
A number of different places across the code base use CONFIG_UUID. Some
of them are soft dependency, some are not built if libuuid is not
available, some come with dummy fallback, some throws runtime error.
It is hard to maintain, and hard to reason for users.
Since UUID is a simple standard with only a small number of operations,
it is cleaner to have a central support in libqemuutil. This patch adds
qemu_uuid_* functions that all uuid users in the code base can
rely on. Except for qemu_uuid_generate which is new code, all other
functions are just copy from existing fallbacks from other files.
Note that qemu_uuid_parse is moved without updating the function
signature to use QemuUUID, to keep this patch simple.
Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
arch_init.c | 19 -----------
block/iscsi.c | 2 +-
hw/smbios/smbios.c | 1 +
include/qemu/uuid.h | 59 ++++++++++++++++++++++++++++++++
include/sysemu/sysemu.h | 4 ---
qmp.c | 1 +
stubs/uuid.c | 2 +-
util/Makefile.objs | 1 +
util/uuid.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++
vl.c | 1 +
10 files changed, 156 insertions(+), 25 deletions(-)
create mode 100644 include/qemu/uuid.h
create mode 100644 util/uuid.c
diff --git a/arch_init.c b/arch_init.c
index fa05973..5cc58b2 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -235,25 +235,6 @@ void audio_init(void)
}
}
-int qemu_uuid_parse(const char *str, uint8_t *uuid)
-{
- int ret;
-
- if (strlen(str) != 36) {
- return -1;
- }
-
- ret = sscanf(str, UUID_FMT, &uuid[0], &uuid[1], &uuid[2], &uuid[3],
- &uuid[4], &uuid[5], &uuid[6], &uuid[7], &uuid[8], &uuid[9],
- &uuid[10], &uuid[11], &uuid[12], &uuid[13], &uuid[14],
- &uuid[15]);
-
- if (ret != 16) {
- return -1;
- }
- return 0;
-}
-
void do_acpitable_option(const QemuOpts *opts)
{
#ifdef TARGET_I386
diff --git a/block/iscsi.c b/block/iscsi.c
index 95ce9e1..961ac76 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -36,7 +36,7 @@
#include "block/block_int.h"
#include "block/scsi.h"
#include "qemu/iov.h"
-#include "sysemu/sysemu.h"
+#include "qemu/uuid.h"
#include "qmp-commands.h"
#include "qapi/qmp/qstring.h"
#include "crypto/secret.h"
diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
index 74c7102..0705eb1 100644
--- a/hw/smbios/smbios.c
+++ b/hw/smbios/smbios.c
@@ -20,6 +20,7 @@
#include "qemu/config-file.h"
#include "qemu/error-report.h"
#include "sysemu/sysemu.h"
+#include "qemu/uuid.h"
#include "sysemu/cpus.h"
#include "hw/smbios/smbios.h"
#include "hw/loader.h"
diff --git a/include/qemu/uuid.h b/include/qemu/uuid.h
new file mode 100644
index 0000000..bc0601e
--- /dev/null
+++ b/include/qemu/uuid.h
@@ -0,0 +1,59 @@
+/*
+ * QEMU UUID functions
+ *
+ * Copyright 2016 Red Hat, Inc.
+ *
+ * Authors:
+ * Fam Zheng <famz@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ */
+
+#ifndef QEMU_UUID_H
+#define QEMU_UUID_H
+
+#include "qemu-common.h"
+
+/* Version 4 UUID (pseudo random numbers), RFC4122 4.4. */
+
+typedef struct {
+ union {
+ unsigned char data[16];
+ struct {
+ /* Generated in BE endian, can be swapped with qemu_uuid_bswap. */
+ uint32_t time_low;
+ uint16_t time_mid;
+ uint16_t time_high_and_version;
+ uint8_t clock_seq_and_reserved;
+ uint8_t clock_seq_low;
+ uint8_t node[6];
+ } fields;
+ };
+} QemuUUID;
+
+#define UUID_FMT "%02hhx%02hhx%02hhx%02hhx-" \
+ "%02hhx%02hhx-%02hhx%02hhx-" \
+ "%02hhx%02hhx-" \
+ "%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx"
+
+#define UUID_FMT_LEN 36
+
+#define UUID_NONE "00000000-0000-0000-0000-000000000000"
+
+void qemu_uuid_generate(QemuUUID *out);
+
+int qemu_uuid_is_null(const QemuUUID *uu);
+
+void qemu_uuid_unparse(const QemuUUID *uuid, char *out);
+
+char *qemu_uuid_unparse_strdup(const QemuUUID *uuid);
+
+int qemu_uuid_parse(const char *str, uint8_t *uuid);
+
+void qemu_uuid_bswap(QemuUUID *uuid);
+
+#endif
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index ee7c760..6111950 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -18,10 +18,6 @@ extern const char *bios_name;
extern const char *qemu_name;
extern uint8_t qemu_uuid[];
extern bool qemu_uuid_set;
-int qemu_uuid_parse(const char *str, uint8_t *uuid);
-
-#define UUID_FMT "%02hhx%02hhx%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx"
-#define UUID_NONE "00000000-0000-0000-0000-000000000000"
bool runstate_check(RunState state);
void runstate_set(RunState new_state);
diff --git a/qmp.c b/qmp.c
index dea8f81..c47c3a3 100644
--- a/qmp.c
+++ b/qmp.c
@@ -18,6 +18,7 @@
#include "qemu/cutils.h"
#include "monitor/monitor.h"
#include "sysemu/sysemu.h"
+#include "qemu/uuid.h"
#include "qmp-commands.h"
#include "sysemu/char.h"
#include "ui/qemu-spice.h"
diff --git a/stubs/uuid.c b/stubs/uuid.c
index 92ad717..a880de8 100644
--- a/stubs/uuid.c
+++ b/stubs/uuid.c
@@ -1,6 +1,6 @@
#include "qemu/osdep.h"
#include "qemu-common.h"
-#include "sysemu/sysemu.h"
+#include "qemu/uuid.h"
#include "qmp-commands.h"
UuidInfo *qmp_query_uuid(Error **errp)
diff --git a/util/Makefile.objs b/util/Makefile.objs
index ffca8f3..36c7dcc 100644
--- a/util/Makefile.objs
+++ b/util/Makefile.objs
@@ -21,6 +21,7 @@ util-obj-y += iov.o qemu-config.o qemu-sockets.o uri.o notify.o
util-obj-y += qemu-option.o qemu-progress.o
util-obj-y += hexdump.o
util-obj-y += crc32c.o
+util-obj-y += uuid.o
util-obj-y += throttle.o
util-obj-y += getauxval.o
util-obj-y += readline.o
diff --git a/util/uuid.c b/util/uuid.c
new file mode 100644
index 0000000..6815904
--- /dev/null
+++ b/util/uuid.c
@@ -0,0 +1,91 @@
+/*
+ * QEMU UUID functions
+ *
+ * Copyright 2016 Red Hat, Inc.
+ *
+ * Authors:
+ * Fam Zheng <famz@redhat.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ */
+
+#include "qemu/osdep.h"
+#include "qemu-common.h"
+#include "qemu/uuid.h"
+#include "qemu/bswap.h"
+
+void qemu_uuid_generate(QemuUUID *uuid)
+{
+ int i;
+ uint32_t tmp[4];
+
+ QEMU_BUILD_BUG_ON(sizeof(QemuUUID) != 16);
+
+ for (i = 0; i < 4; ++i) {
+ tmp[i] = g_random_int();
+ }
+ memcpy(uuid, tmp, sizeof(tmp));
+ /* Set the two most significant bits (bits 6 and 7) of the
+ clock_seq_hi_and_reserved to zero and one, respectively. */
+ uuid->data[8] = (uuid->data[8] & 0x3f) | 0x80;
+ /* Set the four most significant bits (bits 12 through 15) of the
+ time_hi_and_version field to the 4-bit version number.
+ */
+ uuid->data[6] = (uuid->data[6] & 0xf) | 0x40;
+}
+
+int qemu_uuid_is_null(const QemuUUID *uu)
+{
+ QemuUUID null_uuid = { 0 };
+ return memcmp(uu, &null_uuid, sizeof(QemuUUID)) == 0;
+}
+
+void qemu_uuid_unparse(const QemuUUID *uuid, char *out)
+{
+ const unsigned char *uu = &uuid->data[0];
+ snprintf(out, UUID_FMT_LEN + 1, UUID_FMT,
+ uu[0], uu[1], uu[2], uu[3], uu[4], uu[5], uu[6], uu[7],
+ uu[8], uu[9], uu[10], uu[11], uu[12], uu[13], uu[14], uu[15]);
+}
+
+char *qemu_uuid_unparse_strdup(const QemuUUID *uuid)
+{
+ const unsigned char *uu = &uuid->data[0];
+ return g_strdup_printf(UUID_FMT,
+ uu[0], uu[1], uu[2], uu[3], uu[4], uu[5], uu[6],
+ uu[7], uu[8], uu[9], uu[10], uu[11], uu[12],
+ uu[13], uu[14], uu[15]);
+}
+
+int qemu_uuid_parse(const char *str, uint8_t *uuid)
+{
+ int ret;
+
+ if (strlen(str) != 36) {
+ return -1;
+ }
+
+ ret = sscanf(str, UUID_FMT, &uuid[0], &uuid[1], &uuid[2], &uuid[3],
+ &uuid[4], &uuid[5], &uuid[6], &uuid[7], &uuid[8], &uuid[9],
+ &uuid[10], &uuid[11], &uuid[12], &uuid[13], &uuid[14],
+ &uuid[15]);
+
+ if (ret != 16) {
+ return -1;
+ }
+ return 0;
+}
+
+/* Swap from UUID format endian (BE) to the opposite or vice versa.
+ */
+void qemu_uuid_bswap(QemuUUID *uuid)
+{
+ assert(QEMU_PTR_IS_ALIGNED(uuid, sizeof(uint32_t)));
+ bswap32s(&uuid->fields.time_low);
+ bswap16s(&uuid->fields.time_mid);
+ bswap16s(&uuid->fields.time_high_and_version);
+}
diff --git a/vl.c b/vl.c
index ad2664b..1e787a0 100644
--- a/vl.c
+++ b/vl.c
@@ -25,6 +25,7 @@
#include "qemu-version.h"
#include "qemu/cutils.h"
#include "qemu/help_option.h"
+#include "qemu/uuid.h"
#ifdef CONFIG_SECCOMP
#include "sysemu/seccomp.h"
--
2.7.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [Qemu-devel] [PATCH v8 01/12] util: Add UUID API
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 01/12] util: Add UUID API Fam Zheng
@ 2016-09-19 3:30 ` Jeff Cody
0 siblings, 0 replies; 28+ messages in thread
From: Jeff Cody @ 2016-09-19 3:30 UTC (permalink / raw)
To: Fam Zheng
Cc: qemu-devel, kwolf, qemu-block, sw, mdroth, armbru, pbonzini,
mreitz, rth
On Sun, Sep 18, 2016 at 12:25:21PM +0800, Fam Zheng wrote:
> A number of different places across the code base use CONFIG_UUID. Some
> of them are soft dependency, some are not built if libuuid is not
> available, some come with dummy fallback, some throws runtime error.
>
> It is hard to maintain, and hard to reason for users.
>
> Since UUID is a simple standard with only a small number of operations,
> it is cleaner to have a central support in libqemuutil. This patch adds
> qemu_uuid_* functions that all uuid users in the code base can
> rely on. Except for qemu_uuid_generate which is new code, all other
> functions are just copy from existing fallbacks from other files.
>
> Note that qemu_uuid_parse is moved without updating the function
> signature to use QemuUUID, to keep this patch simple.
>
> Signed-off-by: Fam Zheng <famz@redhat.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> ---
> arch_init.c | 19 -----------
> block/iscsi.c | 2 +-
> hw/smbios/smbios.c | 1 +
> include/qemu/uuid.h | 59 ++++++++++++++++++++++++++++++++
> include/sysemu/sysemu.h | 4 ---
> qmp.c | 1 +
> stubs/uuid.c | 2 +-
> util/Makefile.objs | 1 +
> util/uuid.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++
> vl.c | 1 +
> 10 files changed, 156 insertions(+), 25 deletions(-)
> create mode 100644 include/qemu/uuid.h
> create mode 100644 util/uuid.c
>
> diff --git a/arch_init.c b/arch_init.c
> index fa05973..5cc58b2 100644
> --- a/arch_init.c
> +++ b/arch_init.c
> @@ -235,25 +235,6 @@ void audio_init(void)
> }
> }
>
> -int qemu_uuid_parse(const char *str, uint8_t *uuid)
> -{
> - int ret;
> -
> - if (strlen(str) != 36) {
> - return -1;
> - }
> -
> - ret = sscanf(str, UUID_FMT, &uuid[0], &uuid[1], &uuid[2], &uuid[3],
> - &uuid[4], &uuid[5], &uuid[6], &uuid[7], &uuid[8], &uuid[9],
> - &uuid[10], &uuid[11], &uuid[12], &uuid[13], &uuid[14],
> - &uuid[15]);
> -
> - if (ret != 16) {
> - return -1;
> - }
> - return 0;
> -}
> -
> void do_acpitable_option(const QemuOpts *opts)
> {
> #ifdef TARGET_I386
> diff --git a/block/iscsi.c b/block/iscsi.c
> index 95ce9e1..961ac76 100644
> --- a/block/iscsi.c
> +++ b/block/iscsi.c
> @@ -36,7 +36,7 @@
> #include "block/block_int.h"
> #include "block/scsi.h"
> #include "qemu/iov.h"
> -#include "sysemu/sysemu.h"
> +#include "qemu/uuid.h"
> #include "qmp-commands.h"
> #include "qapi/qmp/qstring.h"
> #include "crypto/secret.h"
> diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
> index 74c7102..0705eb1 100644
> --- a/hw/smbios/smbios.c
> +++ b/hw/smbios/smbios.c
> @@ -20,6 +20,7 @@
> #include "qemu/config-file.h"
> #include "qemu/error-report.h"
> #include "sysemu/sysemu.h"
> +#include "qemu/uuid.h"
> #include "sysemu/cpus.h"
> #include "hw/smbios/smbios.h"
> #include "hw/loader.h"
> diff --git a/include/qemu/uuid.h b/include/qemu/uuid.h
> new file mode 100644
> index 0000000..bc0601e
> --- /dev/null
> +++ b/include/qemu/uuid.h
> @@ -0,0 +1,59 @@
> +/*
> + * QEMU UUID functions
> + *
> + * Copyright 2016 Red Hat, Inc.
> + *
> + * Authors:
> + * Fam Zheng <famz@redhat.com>
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms of the GNU General Public License as published by the Free
> + * Software Foundation; either version 2 of the License, or (at your option)
> + * any later version.
> + *
> + */
> +
> +#ifndef QEMU_UUID_H
> +#define QEMU_UUID_H
> +
> +#include "qemu-common.h"
> +
> +/* Version 4 UUID (pseudo random numbers), RFC4122 4.4. */
> +
> +typedef struct {
> + union {
> + unsigned char data[16];
> + struct {
> + /* Generated in BE endian, can be swapped with qemu_uuid_bswap. */
> + uint32_t time_low;
> + uint16_t time_mid;
> + uint16_t time_high_and_version;
> + uint8_t clock_seq_and_reserved;
> + uint8_t clock_seq_low;
> + uint8_t node[6];
> + } fields;
> + };
> +} QemuUUID;
> +
> +#define UUID_FMT "%02hhx%02hhx%02hhx%02hhx-" \
> + "%02hhx%02hhx-%02hhx%02hhx-" \
> + "%02hhx%02hhx-" \
> + "%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx"
> +
> +#define UUID_FMT_LEN 36
> +
> +#define UUID_NONE "00000000-0000-0000-0000-000000000000"
> +
> +void qemu_uuid_generate(QemuUUID *out);
> +
> +int qemu_uuid_is_null(const QemuUUID *uu);
> +
> +void qemu_uuid_unparse(const QemuUUID *uuid, char *out);
> +
> +char *qemu_uuid_unparse_strdup(const QemuUUID *uuid);
> +
> +int qemu_uuid_parse(const char *str, uint8_t *uuid);
> +
> +void qemu_uuid_bswap(QemuUUID *uuid);
> +
> +#endif
> diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
> index ee7c760..6111950 100644
> --- a/include/sysemu/sysemu.h
> +++ b/include/sysemu/sysemu.h
> @@ -18,10 +18,6 @@ extern const char *bios_name;
> extern const char *qemu_name;
> extern uint8_t qemu_uuid[];
> extern bool qemu_uuid_set;
> -int qemu_uuid_parse(const char *str, uint8_t *uuid);
> -
> -#define UUID_FMT "%02hhx%02hhx%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx-%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx"
> -#define UUID_NONE "00000000-0000-0000-0000-000000000000"
>
> bool runstate_check(RunState state);
> void runstate_set(RunState new_state);
> diff --git a/qmp.c b/qmp.c
> index dea8f81..c47c3a3 100644
> --- a/qmp.c
> +++ b/qmp.c
> @@ -18,6 +18,7 @@
> #include "qemu/cutils.h"
> #include "monitor/monitor.h"
> #include "sysemu/sysemu.h"
> +#include "qemu/uuid.h"
> #include "qmp-commands.h"
> #include "sysemu/char.h"
> #include "ui/qemu-spice.h"
> diff --git a/stubs/uuid.c b/stubs/uuid.c
> index 92ad717..a880de8 100644
> --- a/stubs/uuid.c
> +++ b/stubs/uuid.c
> @@ -1,6 +1,6 @@
> #include "qemu/osdep.h"
> #include "qemu-common.h"
> -#include "sysemu/sysemu.h"
> +#include "qemu/uuid.h"
> #include "qmp-commands.h"
>
> UuidInfo *qmp_query_uuid(Error **errp)
> diff --git a/util/Makefile.objs b/util/Makefile.objs
> index ffca8f3..36c7dcc 100644
> --- a/util/Makefile.objs
> +++ b/util/Makefile.objs
> @@ -21,6 +21,7 @@ util-obj-y += iov.o qemu-config.o qemu-sockets.o uri.o notify.o
> util-obj-y += qemu-option.o qemu-progress.o
> util-obj-y += hexdump.o
> util-obj-y += crc32c.o
> +util-obj-y += uuid.o
> util-obj-y += throttle.o
> util-obj-y += getauxval.o
> util-obj-y += readline.o
> diff --git a/util/uuid.c b/util/uuid.c
> new file mode 100644
> index 0000000..6815904
> --- /dev/null
> +++ b/util/uuid.c
> @@ -0,0 +1,91 @@
> +/*
> + * QEMU UUID functions
> + *
> + * Copyright 2016 Red Hat, Inc.
> + *
> + * Authors:
> + * Fam Zheng <famz@redhat.com>
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms of the GNU General Public License as published by the Free
> + * Software Foundation; either version 2 of the License, or (at your option)
> + * any later version.
> + *
> + */
> +
> +#include "qemu/osdep.h"
> +#include "qemu-common.h"
> +#include "qemu/uuid.h"
> +#include "qemu/bswap.h"
> +
> +void qemu_uuid_generate(QemuUUID *uuid)
> +{
> + int i;
> + uint32_t tmp[4];
> +
> + QEMU_BUILD_BUG_ON(sizeof(QemuUUID) != 16);
> +
> + for (i = 0; i < 4; ++i) {
> + tmp[i] = g_random_int();
> + }
> + memcpy(uuid, tmp, sizeof(tmp));
> + /* Set the two most significant bits (bits 6 and 7) of the
> + clock_seq_hi_and_reserved to zero and one, respectively. */
> + uuid->data[8] = (uuid->data[8] & 0x3f) | 0x80;
> + /* Set the four most significant bits (bits 12 through 15) of the
> + time_hi_and_version field to the 4-bit version number.
> + */
> + uuid->data[6] = (uuid->data[6] & 0xf) | 0x40;
> +}
> +
> +int qemu_uuid_is_null(const QemuUUID *uu)
> +{
> + QemuUUID null_uuid = { 0 };
> + return memcmp(uu, &null_uuid, sizeof(QemuUUID)) == 0;
> +}
> +
> +void qemu_uuid_unparse(const QemuUUID *uuid, char *out)
> +{
> + const unsigned char *uu = &uuid->data[0];
> + snprintf(out, UUID_FMT_LEN + 1, UUID_FMT,
> + uu[0], uu[1], uu[2], uu[3], uu[4], uu[5], uu[6], uu[7],
> + uu[8], uu[9], uu[10], uu[11], uu[12], uu[13], uu[14], uu[15]);
> +}
> +
> +char *qemu_uuid_unparse_strdup(const QemuUUID *uuid)
> +{
> + const unsigned char *uu = &uuid->data[0];
> + return g_strdup_printf(UUID_FMT,
> + uu[0], uu[1], uu[2], uu[3], uu[4], uu[5], uu[6],
> + uu[7], uu[8], uu[9], uu[10], uu[11], uu[12],
> + uu[13], uu[14], uu[15]);
> +}
> +
> +int qemu_uuid_parse(const char *str, uint8_t *uuid)
> +{
> + int ret;
> +
> + if (strlen(str) != 36) {
> + return -1;
> + }
> +
> + ret = sscanf(str, UUID_FMT, &uuid[0], &uuid[1], &uuid[2], &uuid[3],
> + &uuid[4], &uuid[5], &uuid[6], &uuid[7], &uuid[8], &uuid[9],
> + &uuid[10], &uuid[11], &uuid[12], &uuid[13], &uuid[14],
> + &uuid[15]);
> +
> + if (ret != 16) {
> + return -1;
> + }
> + return 0;
> +}
> +
> +/* Swap from UUID format endian (BE) to the opposite or vice versa.
> + */
> +void qemu_uuid_bswap(QemuUUID *uuid)
> +{
> + assert(QEMU_PTR_IS_ALIGNED(uuid, sizeof(uint32_t)));
> + bswap32s(&uuid->fields.time_low);
> + bswap16s(&uuid->fields.time_mid);
> + bswap16s(&uuid->fields.time_high_and_version);
> +}
> diff --git a/vl.c b/vl.c
> index ad2664b..1e787a0 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -25,6 +25,7 @@
> #include "qemu-version.h"
> #include "qemu/cutils.h"
> #include "qemu/help_option.h"
> +#include "qemu/uuid.h"
>
> #ifdef CONFIG_SECCOMP
> #include "sysemu/seccomp.h"
> --
> 2.7.4
>
>
Reviewed-by: Jeff Cody <jcody@redhat.com>
^ permalink raw reply [flat|nested] 28+ messages in thread
* [Qemu-devel] [PATCH v8 02/12] uuid: Make null_uuid static
2016-09-18 4:25 [Qemu-devel] [PATCH v8 00/12] UUID clean ups for 2.8 Fam Zheng
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 01/12] util: Add UUID API Fam Zheng
@ 2016-09-18 4:25 ` Fam Zheng
2016-09-19 3:31 ` Jeff Cody
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 03/12] vhdx: Use QEMU UUID API Fam Zheng
` (9 subsequent siblings)
11 siblings, 1 reply; 28+ messages in thread
From: Fam Zheng @ 2016-09-18 4:25 UTC (permalink / raw)
To: qemu-devel
Cc: kwolf, qemu-block, sw, jcody, mdroth, armbru, pbonzini, mreitz,
eblake, rth
So that it doesn't have to be zeroed at each call.
Suggested-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
util/uuid.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/util/uuid.c b/util/uuid.c
index 6815904..f0c1eeb 100644
--- a/util/uuid.c
+++ b/util/uuid.c
@@ -40,7 +40,7 @@ void qemu_uuid_generate(QemuUUID *uuid)
int qemu_uuid_is_null(const QemuUUID *uu)
{
- QemuUUID null_uuid = { 0 };
+ static QemuUUID null_uuid;
return memcmp(uu, &null_uuid, sizeof(QemuUUID)) == 0;
}
--
2.7.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [Qemu-devel] [PATCH v8 02/12] uuid: Make null_uuid static
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 02/12] uuid: Make null_uuid static Fam Zheng
@ 2016-09-19 3:31 ` Jeff Cody
0 siblings, 0 replies; 28+ messages in thread
From: Jeff Cody @ 2016-09-19 3:31 UTC (permalink / raw)
To: Fam Zheng
Cc: qemu-devel, kwolf, qemu-block, sw, mdroth, armbru, pbonzini,
mreitz, eblake, rth
On Sun, Sep 18, 2016 at 12:25:22PM +0800, Fam Zheng wrote:
> So that it doesn't have to be zeroed at each call.
>
> Suggested-by: Eric Blake <eblake@redhat.com>
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
> util/uuid.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/util/uuid.c b/util/uuid.c
> index 6815904..f0c1eeb 100644
> --- a/util/uuid.c
> +++ b/util/uuid.c
> @@ -40,7 +40,7 @@ void qemu_uuid_generate(QemuUUID *uuid)
>
> int qemu_uuid_is_null(const QemuUUID *uu)
> {
> - QemuUUID null_uuid = { 0 };
> + static QemuUUID null_uuid;
> return memcmp(uu, &null_uuid, sizeof(QemuUUID)) == 0;
> }
>
> --
> 2.7.4
>
Reviewed-by: Jeff Cody <jcody@redhat.com>
^ permalink raw reply [flat|nested] 28+ messages in thread
* [Qemu-devel] [PATCH v8 03/12] vhdx: Use QEMU UUID API
2016-09-18 4:25 [Qemu-devel] [PATCH v8 00/12] UUID clean ups for 2.8 Fam Zheng
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 01/12] util: Add UUID API Fam Zheng
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 02/12] uuid: Make null_uuid static Fam Zheng
@ 2016-09-18 4:25 ` Fam Zheng
2016-09-19 3:33 ` Jeff Cody
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 04/12] vdi: " Fam Zheng
` (8 subsequent siblings)
11 siblings, 1 reply; 28+ messages in thread
From: Fam Zheng @ 2016-09-18 4:25 UTC (permalink / raw)
To: qemu-devel
Cc: kwolf, qemu-block, sw, jcody, mdroth, armbru, pbonzini, mreitz,
eblake, rth
This removes our dependency to libuuid, so that the driver can always be
built.
Similar to how we handled data plane configure options, --enable-vhdx
and --disable-vhdx are also changed to a nop with a message saying it's
obsolete.
Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
block/Makefile.objs | 2 +-
block/vhdx-endian.c | 3 ---
block/vhdx.c | 9 ++++-----
configure | 27 +++------------------------
4 files changed, 8 insertions(+), 33 deletions(-)
diff --git a/block/Makefile.objs b/block/Makefile.objs
index 55da626..f23ee18 100644
--- a/block/Makefile.objs
+++ b/block/Makefile.objs
@@ -2,7 +2,7 @@ block-obj-y += raw_bsd.o qcow.o vdi.o vmdk.o cloop.o bochs.o vpc.o vvfat.o
block-obj-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o qcow2-cache.o
block-obj-y += qed.o qed-gencb.o qed-l2-cache.o qed-table.o qed-cluster.o
block-obj-y += qed-check.o
-block-obj-$(CONFIG_VHDX) += vhdx.o vhdx-endian.o vhdx-log.o
+block-obj-y += vhdx.o vhdx-endian.o vhdx-log.o
block-obj-y += quorum.o
block-obj-y += parallels.o blkdebug.o blkverify.o blkreplay.o
block-obj-y += block-backend.o snapshot.o qapi.o
diff --git a/block/vhdx-endian.c b/block/vhdx-endian.c
index c306b90..429d755 100644
--- a/block/vhdx-endian.c
+++ b/block/vhdx-endian.c
@@ -21,9 +21,6 @@
#include "qemu/bswap.h"
#include "block/vhdx.h"
-#include <uuid/uuid.h>
-
-
/*
* All the VHDX formats on disk are little endian - the following
* are helper import/export functions to correctly convert
diff --git a/block/vhdx.c b/block/vhdx.c
index 75ef2b1..0ba2f0a 100644
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -25,8 +25,7 @@
#include "qemu/bswap.h"
#include "block/vhdx.h"
#include "migration/migration.h"
-
-#include <uuid/uuid.h>
+#include "qemu/uuid.h"
/* Options for VHDX creation */
@@ -213,11 +212,11 @@ bool vhdx_checksum_is_valid(uint8_t *buf, size_t size, int crc_offset)
*/
void vhdx_guid_generate(MSGUID *guid)
{
- uuid_t uuid;
+ QemuUUID uuid;
assert(guid != NULL);
- uuid_generate(uuid);
- memcpy(guid, uuid, sizeof(MSGUID));
+ qemu_uuid_generate(&uuid);
+ memcpy(guid, &uuid, sizeof(MSGUID));
}
/* Check for region overlaps inside the VHDX image */
diff --git a/configure b/configure
index 7d083bd..b71b80a 100755
--- a/configure
+++ b/configure
@@ -317,7 +317,6 @@ vte=""
virglrenderer=""
tpm="yes"
libssh2=""
-vhdx=""
numa=""
tcmalloc="no"
jemalloc="no"
@@ -1103,6 +1102,9 @@ for opt do
--disable-virtio-blk-data-plane|--enable-virtio-blk-data-plane)
echo "$0: $opt is obsolete, virtio-blk data-plane is always on" >&2
;;
+ --enable-vhdx|--disable-vhdx)
+ echo "$0: $opt is obsolete, VHDX driver is always built" >&2
+ ;;
--disable-gtk) gtk="no"
;;
--enable-gtk) gtk="yes"
@@ -1143,10 +1145,6 @@ for opt do
;;
--enable-libssh2) libssh2="yes"
;;
- --enable-vhdx) vhdx="yes"
- ;;
- --disable-vhdx) vhdx="no"
- ;;
--disable-numa) numa="no"
;;
--enable-numa) numa="yes"
@@ -1389,7 +1387,6 @@ disabled with --disable-FEATURE, default is enabled if available:
archipelago Archipelago backend
tpm TPM support
libssh2 ssh block device support
- vhdx support for the Microsoft VHDX image format
numa libnuma support
tcmalloc tcmalloc support
jemalloc jemalloc support
@@ -2690,19 +2687,6 @@ EOF
fi
fi
-if test "$vhdx" = "yes" ; then
- if test "$uuid" = "no" ; then
- error_exit "uuid required for VHDX support"
- fi
-elif test "$vhdx" != "no" ; then
- if test "$uuid" = "yes" ; then
- vhdx=yes
- else
- vhdx=no
- fi
-fi
-
-##########################################
# xfsctl() probe, used for raw-posix
if test "$xfs" != "no" ; then
cat > $TMPC << EOF
@@ -4918,7 +4902,6 @@ echo "TPM support $tpm"
echo "libssh2 support $libssh2"
echo "TPM passthrough $tpm_passthrough"
echo "QOM debugging $qom_cast_debug"
-echo "vhdx $vhdx"
echo "lzo support $lzo"
echo "snappy support $snappy"
echo "bzip2 support $bzip2"
@@ -5443,10 +5426,6 @@ if test "$libssh2" = "yes" ; then
echo "LIBSSH2_LIBS=$libssh2_libs" >> $config_host_mak
fi
-if test "$vhdx" = "yes" ; then
- echo "CONFIG_VHDX=y" >> $config_host_mak
-fi
-
# USB host support
if test "$libusb" = "yes"; then
echo "HOST_USB=libusb legacy" >> $config_host_mak
--
2.7.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [Qemu-devel] [PATCH v8 03/12] vhdx: Use QEMU UUID API
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 03/12] vhdx: Use QEMU UUID API Fam Zheng
@ 2016-09-19 3:33 ` Jeff Cody
0 siblings, 0 replies; 28+ messages in thread
From: Jeff Cody @ 2016-09-19 3:33 UTC (permalink / raw)
To: Fam Zheng
Cc: qemu-devel, kwolf, qemu-block, sw, mdroth, armbru, pbonzini,
mreitz, eblake, rth
On Sun, Sep 18, 2016 at 12:25:23PM +0800, Fam Zheng wrote:
> This removes our dependency to libuuid, so that the driver can always be
> built.
>
> Similar to how we handled data plane configure options, --enable-vhdx
> and --disable-vhdx are also changed to a nop with a message saying it's
> obsolete.
>
> Signed-off-by: Fam Zheng <famz@redhat.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> ---
> block/Makefile.objs | 2 +-
> block/vhdx-endian.c | 3 ---
> block/vhdx.c | 9 ++++-----
> configure | 27 +++------------------------
> 4 files changed, 8 insertions(+), 33 deletions(-)
>
> diff --git a/block/Makefile.objs b/block/Makefile.objs
> index 55da626..f23ee18 100644
> --- a/block/Makefile.objs
> +++ b/block/Makefile.objs
> @@ -2,7 +2,7 @@ block-obj-y += raw_bsd.o qcow.o vdi.o vmdk.o cloop.o bochs.o vpc.o vvfat.o
> block-obj-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o qcow2-cache.o
> block-obj-y += qed.o qed-gencb.o qed-l2-cache.o qed-table.o qed-cluster.o
> block-obj-y += qed-check.o
> -block-obj-$(CONFIG_VHDX) += vhdx.o vhdx-endian.o vhdx-log.o
> +block-obj-y += vhdx.o vhdx-endian.o vhdx-log.o
> block-obj-y += quorum.o
> block-obj-y += parallels.o blkdebug.o blkverify.o blkreplay.o
> block-obj-y += block-backend.o snapshot.o qapi.o
> diff --git a/block/vhdx-endian.c b/block/vhdx-endian.c
> index c306b90..429d755 100644
> --- a/block/vhdx-endian.c
> +++ b/block/vhdx-endian.c
> @@ -21,9 +21,6 @@
> #include "qemu/bswap.h"
> #include "block/vhdx.h"
>
> -#include <uuid/uuid.h>
> -
> -
> /*
> * All the VHDX formats on disk are little endian - the following
> * are helper import/export functions to correctly convert
> diff --git a/block/vhdx.c b/block/vhdx.c
> index 75ef2b1..0ba2f0a 100644
> --- a/block/vhdx.c
> +++ b/block/vhdx.c
> @@ -25,8 +25,7 @@
> #include "qemu/bswap.h"
> #include "block/vhdx.h"
> #include "migration/migration.h"
> -
> -#include <uuid/uuid.h>
> +#include "qemu/uuid.h"
>
> /* Options for VHDX creation */
>
> @@ -213,11 +212,11 @@ bool vhdx_checksum_is_valid(uint8_t *buf, size_t size, int crc_offset)
> */
> void vhdx_guid_generate(MSGUID *guid)
> {
> - uuid_t uuid;
> + QemuUUID uuid;
> assert(guid != NULL);
>
> - uuid_generate(uuid);
> - memcpy(guid, uuid, sizeof(MSGUID));
> + qemu_uuid_generate(&uuid);
> + memcpy(guid, &uuid, sizeof(MSGUID));
> }
>
> /* Check for region overlaps inside the VHDX image */
> diff --git a/configure b/configure
> index 7d083bd..b71b80a 100755
> --- a/configure
> +++ b/configure
> @@ -317,7 +317,6 @@ vte=""
> virglrenderer=""
> tpm="yes"
> libssh2=""
> -vhdx=""
> numa=""
> tcmalloc="no"
> jemalloc="no"
> @@ -1103,6 +1102,9 @@ for opt do
> --disable-virtio-blk-data-plane|--enable-virtio-blk-data-plane)
> echo "$0: $opt is obsolete, virtio-blk data-plane is always on" >&2
> ;;
> + --enable-vhdx|--disable-vhdx)
> + echo "$0: $opt is obsolete, VHDX driver is always built" >&2
> + ;;
> --disable-gtk) gtk="no"
> ;;
> --enable-gtk) gtk="yes"
> @@ -1143,10 +1145,6 @@ for opt do
> ;;
> --enable-libssh2) libssh2="yes"
> ;;
> - --enable-vhdx) vhdx="yes"
> - ;;
> - --disable-vhdx) vhdx="no"
> - ;;
> --disable-numa) numa="no"
> ;;
> --enable-numa) numa="yes"
> @@ -1389,7 +1387,6 @@ disabled with --disable-FEATURE, default is enabled if available:
> archipelago Archipelago backend
> tpm TPM support
> libssh2 ssh block device support
> - vhdx support for the Microsoft VHDX image format
> numa libnuma support
> tcmalloc tcmalloc support
> jemalloc jemalloc support
> @@ -2690,19 +2687,6 @@ EOF
> fi
> fi
>
> -if test "$vhdx" = "yes" ; then
> - if test "$uuid" = "no" ; then
> - error_exit "uuid required for VHDX support"
> - fi
> -elif test "$vhdx" != "no" ; then
> - if test "$uuid" = "yes" ; then
> - vhdx=yes
> - else
> - vhdx=no
> - fi
> -fi
> -
> -##########################################
> # xfsctl() probe, used for raw-posix
> if test "$xfs" != "no" ; then
> cat > $TMPC << EOF
> @@ -4918,7 +4902,6 @@ echo "TPM support $tpm"
> echo "libssh2 support $libssh2"
> echo "TPM passthrough $tpm_passthrough"
> echo "QOM debugging $qom_cast_debug"
> -echo "vhdx $vhdx"
> echo "lzo support $lzo"
> echo "snappy support $snappy"
> echo "bzip2 support $bzip2"
> @@ -5443,10 +5426,6 @@ if test "$libssh2" = "yes" ; then
> echo "LIBSSH2_LIBS=$libssh2_libs" >> $config_host_mak
> fi
>
> -if test "$vhdx" = "yes" ; then
> - echo "CONFIG_VHDX=y" >> $config_host_mak
> -fi
> -
> # USB host support
> if test "$libusb" = "yes"; then
> echo "HOST_USB=libusb legacy" >> $config_host_mak
> --
> 2.7.4
>
Reviewed-by: Jeff Cody <jcody@redhat.com>
^ permalink raw reply [flat|nested] 28+ messages in thread
* [Qemu-devel] [PATCH v8 04/12] vdi: Use QEMU UUID API
2016-09-18 4:25 [Qemu-devel] [PATCH v8 00/12] UUID clean ups for 2.8 Fam Zheng
` (2 preceding siblings ...)
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 03/12] vhdx: Use QEMU UUID API Fam Zheng
@ 2016-09-18 4:25 ` Fam Zheng
2016-09-19 3:33 ` Jeff Cody
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 05/12] vpc: " Fam Zheng
` (7 subsequent siblings)
11 siblings, 1 reply; 28+ messages in thread
From: Fam Zheng @ 2016-09-18 4:25 UTC (permalink / raw)
To: qemu-devel
Cc: kwolf, qemu-block, sw, jcody, mdroth, armbru, pbonzini, mreitz,
eblake, rth
The UUID operations we need from libuuid are fully supported by QEMU UUID
implementation. Use it, and remove the unused code.
Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
block/vdi.c | 73 ++++++++++++++-----------------------------------------------
1 file changed, 17 insertions(+), 56 deletions(-)
diff --git a/block/vdi.c b/block/vdi.c
index 8a1cf97..96b78d5 100644
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -58,14 +58,7 @@
#include "migration/migration.h"
#include "qemu/coroutine.h"
#include "qemu/cutils.h"
-
-#if defined(CONFIG_UUID)
-#include <uuid/uuid.h>
-#else
-/* TODO: move uuid emulation to some central place in QEMU. */
-#include "sysemu/sysemu.h" /* UUID_FMT */
-typedef unsigned char uuid_t[16];
-#endif
+#include "qemu/uuid.h"
/* Code configuration options. */
@@ -140,28 +133,6 @@ typedef unsigned char uuid_t[16];
#define VDI_DISK_SIZE_MAX ((uint64_t)VDI_BLOCKS_IN_IMAGE_MAX * \
(uint64_t)DEFAULT_CLUSTER_SIZE)
-#if !defined(CONFIG_UUID)
-static inline void uuid_generate(uuid_t out)
-{
- memset(out, 0, sizeof(uuid_t));
-}
-
-static inline int uuid_is_null(const uuid_t uu)
-{
- uuid_t null_uuid = { 0 };
- return memcmp(uu, null_uuid, sizeof(uuid_t)) == 0;
-}
-
-# if defined(CONFIG_VDI_DEBUG)
-static inline void uuid_unparse(const uuid_t uu, char *out)
-{
- snprintf(out, 37, UUID_FMT,
- uu[0], uu[1], uu[2], uu[3], uu[4], uu[5], uu[6], uu[7],
- uu[8], uu[9], uu[10], uu[11], uu[12], uu[13], uu[14], uu[15]);
-}
-# endif
-#endif
-
typedef struct {
char text[0x40];
uint32_t signature;
@@ -182,10 +153,10 @@ typedef struct {
uint32_t block_extra; /* unused here */
uint32_t blocks_in_image;
uint32_t blocks_allocated;
- uuid_t uuid_image;
- uuid_t uuid_last_snap;
- uuid_t uuid_link;
- uuid_t uuid_parent;
+ QemuUUID uuid_image;
+ QemuUUID uuid_last_snap;
+ QemuUUID uuid_link;
+ QemuUUID uuid_parent;
uint64_t unused2[7];
} QEMU_PACKED VdiHeader;
@@ -206,16 +177,6 @@ typedef struct {
Error *migration_blocker;
} BDRVVdiState;
-/* Change UUID from little endian (IPRT = VirtualBox format) to big endian
- * format (network byte order, standard, see RFC 4122) and vice versa.
- */
-static void uuid_convert(uuid_t uuid)
-{
- bswap32s((uint32_t *)&uuid[0]);
- bswap16s((uint16_t *)&uuid[4]);
- bswap16s((uint16_t *)&uuid[6]);
-}
-
static void vdi_header_to_cpu(VdiHeader *header)
{
le32_to_cpus(&header->signature);
@@ -234,10 +195,10 @@ static void vdi_header_to_cpu(VdiHeader *header)
le32_to_cpus(&header->block_extra);
le32_to_cpus(&header->blocks_in_image);
le32_to_cpus(&header->blocks_allocated);
- uuid_convert(header->uuid_image);
- uuid_convert(header->uuid_last_snap);
- uuid_convert(header->uuid_link);
- uuid_convert(header->uuid_parent);
+ qemu_uuid_bswap(&header->uuid_image);
+ qemu_uuid_bswap(&header->uuid_last_snap);
+ qemu_uuid_bswap(&header->uuid_link);
+ qemu_uuid_bswap(&header->uuid_parent);
}
static void vdi_header_to_le(VdiHeader *header)
@@ -258,10 +219,10 @@ static void vdi_header_to_le(VdiHeader *header)
cpu_to_le32s(&header->block_extra);
cpu_to_le32s(&header->blocks_in_image);
cpu_to_le32s(&header->blocks_allocated);
- uuid_convert(header->uuid_image);
- uuid_convert(header->uuid_last_snap);
- uuid_convert(header->uuid_link);
- uuid_convert(header->uuid_parent);
+ qemu_uuid_bswap(&header->uuid_image);
+ qemu_uuid_bswap(&header->uuid_last_snap);
+ qemu_uuid_bswap(&header->uuid_link);
+ qemu_uuid_bswap(&header->uuid_parent);
}
#if defined(CONFIG_VDI_DEBUG)
@@ -469,11 +430,11 @@ static int vdi_open(BlockDriverState *bs, QDict *options, int flags,
(uint64_t)header.blocks_in_image * header.block_size);
ret = -ENOTSUP;
goto fail;
- } else if (!uuid_is_null(header.uuid_link)) {
+ } else if (!qemu_uuid_is_null(&header.uuid_link)) {
error_setg(errp, "unsupported VDI image (non-NULL link UUID)");
ret = -ENOTSUP;
goto fail;
- } else if (!uuid_is_null(header.uuid_parent)) {
+ } else if (!qemu_uuid_is_null(&header.uuid_parent)) {
error_setg(errp, "unsupported VDI image (non-NULL parent UUID)");
ret = -ENOTSUP;
goto fail;
@@ -821,8 +782,8 @@ static int vdi_create(const char *filename, QemuOpts *opts, Error **errp)
if (image_type == VDI_TYPE_STATIC) {
header.blocks_allocated = blocks;
}
- uuid_generate(header.uuid_image);
- uuid_generate(header.uuid_last_snap);
+ qemu_uuid_generate(&header.uuid_image);
+ qemu_uuid_generate(&header.uuid_last_snap);
/* There is no need to set header.uuid_link or header.uuid_parent here. */
#if defined(CONFIG_VDI_DEBUG)
vdi_header_print(&header);
--
2.7.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [Qemu-devel] [PATCH v8 04/12] vdi: Use QEMU UUID API
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 04/12] vdi: " Fam Zheng
@ 2016-09-19 3:33 ` Jeff Cody
0 siblings, 0 replies; 28+ messages in thread
From: Jeff Cody @ 2016-09-19 3:33 UTC (permalink / raw)
To: Fam Zheng
Cc: qemu-devel, kwolf, qemu-block, sw, mdroth, armbru, pbonzini,
mreitz, rth
On Sun, Sep 18, 2016 at 12:25:24PM +0800, Fam Zheng wrote:
> The UUID operations we need from libuuid are fully supported by QEMU UUID
> implementation. Use it, and remove the unused code.
>
> Signed-off-by: Fam Zheng <famz@redhat.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> ---
> block/vdi.c | 73 ++++++++++++++-----------------------------------------------
> 1 file changed, 17 insertions(+), 56 deletions(-)
>
> diff --git a/block/vdi.c b/block/vdi.c
> index 8a1cf97..96b78d5 100644
> --- a/block/vdi.c
> +++ b/block/vdi.c
> @@ -58,14 +58,7 @@
> #include "migration/migration.h"
> #include "qemu/coroutine.h"
> #include "qemu/cutils.h"
> -
> -#if defined(CONFIG_UUID)
> -#include <uuid/uuid.h>
> -#else
> -/* TODO: move uuid emulation to some central place in QEMU. */
> -#include "sysemu/sysemu.h" /* UUID_FMT */
> -typedef unsigned char uuid_t[16];
> -#endif
> +#include "qemu/uuid.h"
>
> /* Code configuration options. */
>
> @@ -140,28 +133,6 @@ typedef unsigned char uuid_t[16];
> #define VDI_DISK_SIZE_MAX ((uint64_t)VDI_BLOCKS_IN_IMAGE_MAX * \
> (uint64_t)DEFAULT_CLUSTER_SIZE)
>
> -#if !defined(CONFIG_UUID)
> -static inline void uuid_generate(uuid_t out)
> -{
> - memset(out, 0, sizeof(uuid_t));
> -}
> -
> -static inline int uuid_is_null(const uuid_t uu)
> -{
> - uuid_t null_uuid = { 0 };
> - return memcmp(uu, null_uuid, sizeof(uuid_t)) == 0;
> -}
> -
> -# if defined(CONFIG_VDI_DEBUG)
> -static inline void uuid_unparse(const uuid_t uu, char *out)
> -{
> - snprintf(out, 37, UUID_FMT,
> - uu[0], uu[1], uu[2], uu[3], uu[4], uu[5], uu[6], uu[7],
> - uu[8], uu[9], uu[10], uu[11], uu[12], uu[13], uu[14], uu[15]);
> -}
> -# endif
> -#endif
> -
> typedef struct {
> char text[0x40];
> uint32_t signature;
> @@ -182,10 +153,10 @@ typedef struct {
> uint32_t block_extra; /* unused here */
> uint32_t blocks_in_image;
> uint32_t blocks_allocated;
> - uuid_t uuid_image;
> - uuid_t uuid_last_snap;
> - uuid_t uuid_link;
> - uuid_t uuid_parent;
> + QemuUUID uuid_image;
> + QemuUUID uuid_last_snap;
> + QemuUUID uuid_link;
> + QemuUUID uuid_parent;
> uint64_t unused2[7];
> } QEMU_PACKED VdiHeader;
>
> @@ -206,16 +177,6 @@ typedef struct {
> Error *migration_blocker;
> } BDRVVdiState;
>
> -/* Change UUID from little endian (IPRT = VirtualBox format) to big endian
> - * format (network byte order, standard, see RFC 4122) and vice versa.
> - */
> -static void uuid_convert(uuid_t uuid)
> -{
> - bswap32s((uint32_t *)&uuid[0]);
> - bswap16s((uint16_t *)&uuid[4]);
> - bswap16s((uint16_t *)&uuid[6]);
> -}
> -
> static void vdi_header_to_cpu(VdiHeader *header)
> {
> le32_to_cpus(&header->signature);
> @@ -234,10 +195,10 @@ static void vdi_header_to_cpu(VdiHeader *header)
> le32_to_cpus(&header->block_extra);
> le32_to_cpus(&header->blocks_in_image);
> le32_to_cpus(&header->blocks_allocated);
> - uuid_convert(header->uuid_image);
> - uuid_convert(header->uuid_last_snap);
> - uuid_convert(header->uuid_link);
> - uuid_convert(header->uuid_parent);
> + qemu_uuid_bswap(&header->uuid_image);
> + qemu_uuid_bswap(&header->uuid_last_snap);
> + qemu_uuid_bswap(&header->uuid_link);
> + qemu_uuid_bswap(&header->uuid_parent);
> }
>
> static void vdi_header_to_le(VdiHeader *header)
> @@ -258,10 +219,10 @@ static void vdi_header_to_le(VdiHeader *header)
> cpu_to_le32s(&header->block_extra);
> cpu_to_le32s(&header->blocks_in_image);
> cpu_to_le32s(&header->blocks_allocated);
> - uuid_convert(header->uuid_image);
> - uuid_convert(header->uuid_last_snap);
> - uuid_convert(header->uuid_link);
> - uuid_convert(header->uuid_parent);
> + qemu_uuid_bswap(&header->uuid_image);
> + qemu_uuid_bswap(&header->uuid_last_snap);
> + qemu_uuid_bswap(&header->uuid_link);
> + qemu_uuid_bswap(&header->uuid_parent);
> }
>
> #if defined(CONFIG_VDI_DEBUG)
> @@ -469,11 +430,11 @@ static int vdi_open(BlockDriverState *bs, QDict *options, int flags,
> (uint64_t)header.blocks_in_image * header.block_size);
> ret = -ENOTSUP;
> goto fail;
> - } else if (!uuid_is_null(header.uuid_link)) {
> + } else if (!qemu_uuid_is_null(&header.uuid_link)) {
> error_setg(errp, "unsupported VDI image (non-NULL link UUID)");
> ret = -ENOTSUP;
> goto fail;
> - } else if (!uuid_is_null(header.uuid_parent)) {
> + } else if (!qemu_uuid_is_null(&header.uuid_parent)) {
> error_setg(errp, "unsupported VDI image (non-NULL parent UUID)");
> ret = -ENOTSUP;
> goto fail;
> @@ -821,8 +782,8 @@ static int vdi_create(const char *filename, QemuOpts *opts, Error **errp)
> if (image_type == VDI_TYPE_STATIC) {
> header.blocks_allocated = blocks;
> }
> - uuid_generate(header.uuid_image);
> - uuid_generate(header.uuid_last_snap);
> + qemu_uuid_generate(&header.uuid_image);
> + qemu_uuid_generate(&header.uuid_last_snap);
> /* There is no need to set header.uuid_link or header.uuid_parent here. */
> #if defined(CONFIG_VDI_DEBUG)
> vdi_header_print(&header);
> --
> 2.7.4
>
>
Reviewed-by: Jeff Cody <jcody@redhat.com>
^ permalink raw reply [flat|nested] 28+ messages in thread
* [Qemu-devel] [PATCH v8 05/12] vpc: Use QEMU UUID API
2016-09-18 4:25 [Qemu-devel] [PATCH v8 00/12] UUID clean ups for 2.8 Fam Zheng
` (3 preceding siblings ...)
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 04/12] vdi: " Fam Zheng
@ 2016-09-18 4:25 ` Fam Zheng
2016-09-19 3:33 ` Jeff Cody
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 06/12] crypto: Switch to " Fam Zheng
` (6 subsequent siblings)
11 siblings, 1 reply; 28+ messages in thread
From: Fam Zheng @ 2016-09-18 4:25 UTC (permalink / raw)
To: qemu-devel
Cc: kwolf, qemu-block, sw, jcody, mdroth, armbru, pbonzini, mreitz,
eblake, rth
Previously we conditionally generated footer->uuid, when libuuid was
available. Now that we have a built-in implementation, we can switch to
it.
Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
block/vpc.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/block/vpc.c b/block/vpc.c
index 43707ed..8d5886f 100644
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -30,9 +30,7 @@
#include "qemu/module.h"
#include "migration/migration.h"
#include "qemu/bswap.h"
-#if defined(CONFIG_UUID)
-#include <uuid/uuid.h>
-#endif
+#include "qemu/uuid.h"
/**************************************************************/
@@ -89,7 +87,7 @@ typedef struct vhd_footer {
uint32_t checksum;
/* UUID used to identify a parent hard disk (backing file) */
- uint8_t uuid[16];
+ QemuUUID uuid;
uint8_t in_saved_state;
} QEMU_PACKED VHDFooter;
@@ -980,9 +978,7 @@ static int vpc_create(const char *filename, QemuOpts *opts, Error **errp)
footer->type = cpu_to_be32(disk_type);
-#if defined(CONFIG_UUID)
- uuid_generate(footer->uuid);
-#endif
+ qemu_uuid_generate(&footer->uuid);
footer->checksum = cpu_to_be32(vpc_checksum(buf, HEADER_SIZE));
--
2.7.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [Qemu-devel] [PATCH v8 05/12] vpc: Use QEMU UUID API
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 05/12] vpc: " Fam Zheng
@ 2016-09-19 3:33 ` Jeff Cody
0 siblings, 0 replies; 28+ messages in thread
From: Jeff Cody @ 2016-09-19 3:33 UTC (permalink / raw)
To: Fam Zheng
Cc: qemu-devel, kwolf, qemu-block, sw, mdroth, armbru, pbonzini,
mreitz, rth
On Sun, Sep 18, 2016 at 12:25:25PM +0800, Fam Zheng wrote:
> Previously we conditionally generated footer->uuid, when libuuid was
> available. Now that we have a built-in implementation, we can switch to
> it.
>
> Signed-off-by: Fam Zheng <famz@redhat.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> ---
> block/vpc.c | 10 +++-------
> 1 file changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/block/vpc.c b/block/vpc.c
> index 43707ed..8d5886f 100644
> --- a/block/vpc.c
> +++ b/block/vpc.c
> @@ -30,9 +30,7 @@
> #include "qemu/module.h"
> #include "migration/migration.h"
> #include "qemu/bswap.h"
> -#if defined(CONFIG_UUID)
> -#include <uuid/uuid.h>
> -#endif
> +#include "qemu/uuid.h"
>
> /**************************************************************/
>
> @@ -89,7 +87,7 @@ typedef struct vhd_footer {
> uint32_t checksum;
>
> /* UUID used to identify a parent hard disk (backing file) */
> - uint8_t uuid[16];
> + QemuUUID uuid;
>
> uint8_t in_saved_state;
> } QEMU_PACKED VHDFooter;
> @@ -980,9 +978,7 @@ static int vpc_create(const char *filename, QemuOpts *opts, Error **errp)
>
> footer->type = cpu_to_be32(disk_type);
>
> -#if defined(CONFIG_UUID)
> - uuid_generate(footer->uuid);
> -#endif
> + qemu_uuid_generate(&footer->uuid);
>
> footer->checksum = cpu_to_be32(vpc_checksum(buf, HEADER_SIZE));
>
> --
> 2.7.4
>
>
Reviewed-by: Jeff Cody <jcody@redhat.com>
^ permalink raw reply [flat|nested] 28+ messages in thread
* [Qemu-devel] [PATCH v8 06/12] crypto: Switch to QEMU UUID API
2016-09-18 4:25 [Qemu-devel] [PATCH v8 00/12] UUID clean ups for 2.8 Fam Zheng
` (4 preceding siblings ...)
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 05/12] vpc: " Fam Zheng
@ 2016-09-18 4:25 ` Fam Zheng
2016-09-19 3:34 ` Jeff Cody
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 07/12] tests: No longer dependent on CONFIG_UUID Fam Zheng
` (5 subsequent siblings)
11 siblings, 1 reply; 28+ messages in thread
From: Fam Zheng @ 2016-09-18 4:25 UTC (permalink / raw)
To: qemu-devel
Cc: kwolf, qemu-block, sw, jcody, mdroth, armbru, pbonzini, mreitz,
eblake, rth
The uuid generation doesn't return error, so update the function
signature and calling code accordingly.
Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
crypto/block-luks.c | 26 +++++++-------------------
1 file changed, 7 insertions(+), 19 deletions(-)
diff --git a/crypto/block-luks.c b/crypto/block-luks.c
index aba4455..da65dc0 100644
--- a/crypto/block-luks.c
+++ b/crypto/block-luks.c
@@ -29,10 +29,7 @@
#include "crypto/pbkdf.h"
#include "crypto/secret.h"
#include "crypto/random.h"
-
-#ifdef CONFIG_UUID
-#include <uuid/uuid.h>
-#endif
+#include "qemu/uuid.h"
#include "qemu/coroutine.h"
@@ -877,18 +874,12 @@ qcrypto_block_luks_open(QCryptoBlock *block,
}
-static int
-qcrypto_block_luks_uuid_gen(uint8_t *uuidstr, Error **errp)
+static void
+qcrypto_block_luks_uuid_gen(uint8_t *uuidstr)
{
-#ifdef CONFIG_UUID
- uuid_t uuid;
- uuid_generate(uuid);
- uuid_unparse(uuid, (char *)uuidstr);
- return 0;
-#else
- error_setg(errp, "Unable to generate uuids on this platform");
- return -1;
-#endif
+ QemuUUID uuid;
+ qemu_uuid_generate(&uuid);
+ qemu_uuid_unparse(&uuid, (char *)uuidstr);
}
static int
@@ -961,10 +952,7 @@ qcrypto_block_luks_create(QCryptoBlock *block,
* it out to disk
*/
luks->header.version = QCRYPTO_BLOCK_LUKS_VERSION;
- if (qcrypto_block_luks_uuid_gen(luks->header.uuid,
- errp) < 0) {
- goto error;
- }
+ qcrypto_block_luks_uuid_gen(luks->header.uuid);
cipher_alg = qcrypto_block_luks_cipher_alg_lookup(luks_opts.cipher_alg,
errp);
--
2.7.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [Qemu-devel] [PATCH v8 06/12] crypto: Switch to QEMU UUID API
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 06/12] crypto: Switch to " Fam Zheng
@ 2016-09-19 3:34 ` Jeff Cody
0 siblings, 0 replies; 28+ messages in thread
From: Jeff Cody @ 2016-09-19 3:34 UTC (permalink / raw)
To: Fam Zheng
Cc: qemu-devel, kwolf, qemu-block, sw, mdroth, armbru, pbonzini,
mreitz, eblake, rth
On Sun, Sep 18, 2016 at 12:25:26PM +0800, Fam Zheng wrote:
> The uuid generation doesn't return error, so update the function
> signature and calling code accordingly.
>
> Signed-off-by: Fam Zheng <famz@redhat.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> ---
> crypto/block-luks.c | 26 +++++++-------------------
> 1 file changed, 7 insertions(+), 19 deletions(-)
>
> diff --git a/crypto/block-luks.c b/crypto/block-luks.c
> index aba4455..da65dc0 100644
> --- a/crypto/block-luks.c
> +++ b/crypto/block-luks.c
> @@ -29,10 +29,7 @@
> #include "crypto/pbkdf.h"
> #include "crypto/secret.h"
> #include "crypto/random.h"
> -
> -#ifdef CONFIG_UUID
> -#include <uuid/uuid.h>
> -#endif
> +#include "qemu/uuid.h"
>
> #include "qemu/coroutine.h"
>
> @@ -877,18 +874,12 @@ qcrypto_block_luks_open(QCryptoBlock *block,
> }
>
>
> -static int
> -qcrypto_block_luks_uuid_gen(uint8_t *uuidstr, Error **errp)
> +static void
> +qcrypto_block_luks_uuid_gen(uint8_t *uuidstr)
> {
> -#ifdef CONFIG_UUID
> - uuid_t uuid;
> - uuid_generate(uuid);
> - uuid_unparse(uuid, (char *)uuidstr);
> - return 0;
> -#else
> - error_setg(errp, "Unable to generate uuids on this platform");
> - return -1;
> -#endif
> + QemuUUID uuid;
> + qemu_uuid_generate(&uuid);
> + qemu_uuid_unparse(&uuid, (char *)uuidstr);
> }
>
> static int
> @@ -961,10 +952,7 @@ qcrypto_block_luks_create(QCryptoBlock *block,
> * it out to disk
> */
> luks->header.version = QCRYPTO_BLOCK_LUKS_VERSION;
> - if (qcrypto_block_luks_uuid_gen(luks->header.uuid,
> - errp) < 0) {
> - goto error;
> - }
> + qcrypto_block_luks_uuid_gen(luks->header.uuid);
>
> cipher_alg = qcrypto_block_luks_cipher_alg_lookup(luks_opts.cipher_alg,
> errp);
> --
> 2.7.4
>
Reviewed-by: Jeff Cody <jcody@redhat.com>
^ permalink raw reply [flat|nested] 28+ messages in thread
* [Qemu-devel] [PATCH v8 07/12] tests: No longer dependent on CONFIG_UUID
2016-09-18 4:25 [Qemu-devel] [PATCH v8 00/12] UUID clean ups for 2.8 Fam Zheng
` (5 preceding siblings ...)
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 06/12] crypto: Switch to " Fam Zheng
@ 2016-09-18 4:25 ` Fam Zheng
2016-09-19 3:34 ` Jeff Cody
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 08/12] configure: Remove detection code for UUID Fam Zheng
` (4 subsequent siblings)
11 siblings, 1 reply; 28+ messages in thread
From: Fam Zheng @ 2016-09-18 4:25 UTC (permalink / raw)
To: qemu-devel
Cc: kwolf, qemu-block, sw, jcody, mdroth, armbru, pbonzini, mreitz,
eblake, rth
crypto now uses built-in uuid implementation, so this check is not
needed.
Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
tests/test-crypto-block.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/test-crypto-block.c b/tests/test-crypto-block.c
index a38110d..1957a86 100644
--- a/tests/test-crypto-block.c
+++ b/tests/test-crypto-block.c
@@ -28,7 +28,7 @@
#include <sys/resource.h>
#endif
-#if defined(CONFIG_UUID) && (defined(_WIN32) || defined RUSAGE_THREAD)
+#if (defined(_WIN32) || defined RUSAGE_THREAD)
#define TEST_LUKS
#else
#undef TEST_LUKS
--
2.7.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [Qemu-devel] [PATCH v8 07/12] tests: No longer dependent on CONFIG_UUID
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 07/12] tests: No longer dependent on CONFIG_UUID Fam Zheng
@ 2016-09-19 3:34 ` Jeff Cody
0 siblings, 0 replies; 28+ messages in thread
From: Jeff Cody @ 2016-09-19 3:34 UTC (permalink / raw)
To: Fam Zheng
Cc: qemu-devel, kwolf, qemu-block, sw, mdroth, armbru, pbonzini,
mreitz, eblake, rth
On Sun, Sep 18, 2016 at 12:25:27PM +0800, Fam Zheng wrote:
> crypto now uses built-in uuid implementation, so this check is not
> needed.
>
> Signed-off-by: Fam Zheng <famz@redhat.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> ---
> tests/test-crypto-block.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/test-crypto-block.c b/tests/test-crypto-block.c
> index a38110d..1957a86 100644
> --- a/tests/test-crypto-block.c
> +++ b/tests/test-crypto-block.c
> @@ -28,7 +28,7 @@
> #include <sys/resource.h>
> #endif
>
> -#if defined(CONFIG_UUID) && (defined(_WIN32) || defined RUSAGE_THREAD)
> +#if (defined(_WIN32) || defined RUSAGE_THREAD)
> #define TEST_LUKS
> #else
> #undef TEST_LUKS
> --
> 2.7.4
>
Reviewed-by: Jeff Cody <jcody@redhat.com>
^ permalink raw reply [flat|nested] 28+ messages in thread
* [Qemu-devel] [PATCH v8 08/12] configure: Remove detection code for UUID
2016-09-18 4:25 [Qemu-devel] [PATCH v8 00/12] UUID clean ups for 2.8 Fam Zheng
` (6 preceding siblings ...)
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 07/12] tests: No longer dependent on CONFIG_UUID Fam Zheng
@ 2016-09-18 4:25 ` Fam Zheng
2016-09-19 3:34 ` Jeff Cody
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 09/12] vl: Switch qemu_uuid to QemuUUID Fam Zheng
` (3 subsequent siblings)
11 siblings, 1 reply; 28+ messages in thread
From: Fam Zheng @ 2016-09-18 4:25 UTC (permalink / raw)
To: qemu-devel
Cc: kwolf, qemu-block, sw, jcody, mdroth, armbru, pbonzini, mreitz,
eblake, rth
All code now uses built-in UUID implementation. Remove the code of
libuuid and make --enable-uuid and --disable-uuid only print a message.
Signed-off-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
configure | 43 ++++---------------------------------------
1 file changed, 4 insertions(+), 39 deletions(-)
diff --git a/configure b/configure
index b71b80a..f12e809 100755
--- a/configure
+++ b/configure
@@ -212,7 +212,6 @@ sdlabi=""
virtfs=""
vnc="yes"
sparse="no"
-uuid=""
vde=""
vnc_sasl=""
vnc_jpeg=""
@@ -886,10 +885,6 @@ for opt do
;;
--disable-slirp) slirp="no"
;;
- --disable-uuid) uuid="no"
- ;;
- --enable-uuid) uuid="yes"
- ;;
--disable-vde) vde="no"
;;
--enable-vde) vde="yes"
@@ -1105,6 +1100,9 @@ for opt do
--enable-vhdx|--disable-vhdx)
echo "$0: $opt is obsolete, VHDX driver is always built" >&2
;;
+ --enable-uuid|--disable-uuid)
+ echo "$0: $opt is obsolete, UUID support is always built" >&2
+ ;;
--disable-gtk) gtk="no"
;;
--enable-gtk) gtk="yes"
@@ -1363,7 +1361,6 @@ disabled with --disable-FEATURE, default is enabled if available:
bluez bluez stack connectivity
kvm KVM acceleration support
rdma RDMA-based migration support
- uuid uuid support
vde support for vde network
netmap support for netmap network
linux-aio Linux AIO support
@@ -2659,34 +2656,6 @@ if compile_prog "" "" ; then
fi
##########################################
-# uuid_generate() probe, used for vdi block driver
-# Note that on some systems (notably MacOSX) no extra library
-# need be linked to get the uuid functions.
-if test "$uuid" != "no" ; then
- uuid_libs="-luuid"
- cat > $TMPC << EOF
-#include <uuid/uuid.h>
-int main(void)
-{
- uuid_t my_uuid;
- uuid_generate(my_uuid);
- return 0;
-}
-EOF
- if compile_prog "" "" ; then
- uuid="yes"
- elif compile_prog "" "$uuid_libs" ; then
- uuid="yes"
- libs_softmmu="$uuid_libs $libs_softmmu"
- libs_tools="$uuid_libs $libs_tools"
- else
- if test "$uuid" = "yes" ; then
- feature_not_found "uuid" "Install libuuid devel"
- fi
- uuid=no
- fi
-fi
-
# xfsctl() probe, used for raw-posix
if test "$xfs" != "no" ; then
cat > $TMPC << EOF
@@ -4059,7 +4028,7 @@ EOF
if compile_prog "$vss_win32_include" "" ; then
guest_agent_with_vss="yes"
QEMU_CFLAGS="$QEMU_CFLAGS $vss_win32_include"
- libs_qga="-lole32 -loleaut32 -lshlwapi -luuid -lstdc++ -Wl,--enable-stdcall-fixup $libs_qga"
+ libs_qga="-lole32 -loleaut32 -lshlwapi -lstdc++ -Wl,--enable-stdcall-fixup $libs_qga"
qga_vss_provider="qga/vss-win32/qga-vss.dll qga/vss-win32/qga-vss.tlb"
else
if test "$vss_win32_sdk" != "" ; then
@@ -4868,7 +4837,6 @@ echo "preadv support $preadv"
echo "fdatasync $fdatasync"
echo "madvise $madvise"
echo "posix_madvise $posix_madvise"
-echo "uuid support $uuid"
echo "libcap-ng support $cap_ng"
echo "vhost-net support $vhost_net"
echo "vhost-scsi support $vhost_scsi"
@@ -5058,9 +5026,6 @@ fi
if test "$fnmatch" = "yes" ; then
echo "CONFIG_FNMATCH=y" >> $config_host_mak
fi
-if test "$uuid" = "yes" ; then
- echo "CONFIG_UUID=y" >> $config_host_mak
-fi
if test "$xfs" = "yes" ; then
echo "CONFIG_XFS=y" >> $config_host_mak
fi
--
2.7.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [Qemu-devel] [PATCH v8 08/12] configure: Remove detection code for UUID
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 08/12] configure: Remove detection code for UUID Fam Zheng
@ 2016-09-19 3:34 ` Jeff Cody
0 siblings, 0 replies; 28+ messages in thread
From: Jeff Cody @ 2016-09-19 3:34 UTC (permalink / raw)
To: Fam Zheng
Cc: qemu-devel, kwolf, qemu-block, sw, mdroth, armbru, pbonzini,
mreitz, eblake, rth
On Sun, Sep 18, 2016 at 12:25:28PM +0800, Fam Zheng wrote:
> All code now uses built-in UUID implementation. Remove the code of
> libuuid and make --enable-uuid and --disable-uuid only print a message.
>
> Signed-off-by: Fam Zheng <famz@redhat.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> ---
> configure | 43 ++++---------------------------------------
> 1 file changed, 4 insertions(+), 39 deletions(-)
>
> diff --git a/configure b/configure
> index b71b80a..f12e809 100755
> --- a/configure
> +++ b/configure
> @@ -212,7 +212,6 @@ sdlabi=""
> virtfs=""
> vnc="yes"
> sparse="no"
> -uuid=""
> vde=""
> vnc_sasl=""
> vnc_jpeg=""
> @@ -886,10 +885,6 @@ for opt do
> ;;
> --disable-slirp) slirp="no"
> ;;
> - --disable-uuid) uuid="no"
> - ;;
> - --enable-uuid) uuid="yes"
> - ;;
> --disable-vde) vde="no"
> ;;
> --enable-vde) vde="yes"
> @@ -1105,6 +1100,9 @@ for opt do
> --enable-vhdx|--disable-vhdx)
> echo "$0: $opt is obsolete, VHDX driver is always built" >&2
> ;;
> + --enable-uuid|--disable-uuid)
> + echo "$0: $opt is obsolete, UUID support is always built" >&2
> + ;;
> --disable-gtk) gtk="no"
> ;;
> --enable-gtk) gtk="yes"
> @@ -1363,7 +1361,6 @@ disabled with --disable-FEATURE, default is enabled if available:
> bluez bluez stack connectivity
> kvm KVM acceleration support
> rdma RDMA-based migration support
> - uuid uuid support
> vde support for vde network
> netmap support for netmap network
> linux-aio Linux AIO support
> @@ -2659,34 +2656,6 @@ if compile_prog "" "" ; then
> fi
>
> ##########################################
> -# uuid_generate() probe, used for vdi block driver
> -# Note that on some systems (notably MacOSX) no extra library
> -# need be linked to get the uuid functions.
> -if test "$uuid" != "no" ; then
> - uuid_libs="-luuid"
> - cat > $TMPC << EOF
> -#include <uuid/uuid.h>
> -int main(void)
> -{
> - uuid_t my_uuid;
> - uuid_generate(my_uuid);
> - return 0;
> -}
> -EOF
> - if compile_prog "" "" ; then
> - uuid="yes"
> - elif compile_prog "" "$uuid_libs" ; then
> - uuid="yes"
> - libs_softmmu="$uuid_libs $libs_softmmu"
> - libs_tools="$uuid_libs $libs_tools"
> - else
> - if test "$uuid" = "yes" ; then
> - feature_not_found "uuid" "Install libuuid devel"
> - fi
> - uuid=no
> - fi
> -fi
> -
> # xfsctl() probe, used for raw-posix
> if test "$xfs" != "no" ; then
> cat > $TMPC << EOF
> @@ -4059,7 +4028,7 @@ EOF
> if compile_prog "$vss_win32_include" "" ; then
> guest_agent_with_vss="yes"
> QEMU_CFLAGS="$QEMU_CFLAGS $vss_win32_include"
> - libs_qga="-lole32 -loleaut32 -lshlwapi -luuid -lstdc++ -Wl,--enable-stdcall-fixup $libs_qga"
> + libs_qga="-lole32 -loleaut32 -lshlwapi -lstdc++ -Wl,--enable-stdcall-fixup $libs_qga"
> qga_vss_provider="qga/vss-win32/qga-vss.dll qga/vss-win32/qga-vss.tlb"
> else
> if test "$vss_win32_sdk" != "" ; then
> @@ -4868,7 +4837,6 @@ echo "preadv support $preadv"
> echo "fdatasync $fdatasync"
> echo "madvise $madvise"
> echo "posix_madvise $posix_madvise"
> -echo "uuid support $uuid"
> echo "libcap-ng support $cap_ng"
> echo "vhost-net support $vhost_net"
> echo "vhost-scsi support $vhost_scsi"
> @@ -5058,9 +5026,6 @@ fi
> if test "$fnmatch" = "yes" ; then
> echo "CONFIG_FNMATCH=y" >> $config_host_mak
> fi
> -if test "$uuid" = "yes" ; then
> - echo "CONFIG_UUID=y" >> $config_host_mak
> -fi
> if test "$xfs" = "yes" ; then
> echo "CONFIG_XFS=y" >> $config_host_mak
> fi
> --
> 2.7.4
>
Reviewed-by: Jeff Cody <jcody@redhat.com>
^ permalink raw reply [flat|nested] 28+ messages in thread
* [Qemu-devel] [PATCH v8 09/12] vl: Switch qemu_uuid to QemuUUID
2016-09-18 4:25 [Qemu-devel] [PATCH v8 00/12] UUID clean ups for 2.8 Fam Zheng
` (7 preceding siblings ...)
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 08/12] configure: Remove detection code for UUID Fam Zheng
@ 2016-09-18 4:25 ` Fam Zheng
2016-09-19 3:34 ` Jeff Cody
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 10/12] uuid: Tighten uuid parse Fam Zheng
` (2 subsequent siblings)
11 siblings, 1 reply; 28+ messages in thread
From: Fam Zheng @ 2016-09-18 4:25 UTC (permalink / raw)
To: qemu-devel
Cc: kwolf, qemu-block, sw, jcody, mdroth, armbru, pbonzini, mreitz,
eblake, rth
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: Fam Zheng <famz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
hw/ipmi/ipmi_bmc_sim.c | 2 +-
hw/nvram/fw_cfg.c | 2 +-
hw/ppc/spapr.c | 7 +------
hw/ppc/spapr_rtas.c | 3 ++-
hw/smbios/smbios.c | 12 ++++++------
hw/xenpv/xen_domainbuild.c | 6 +-----
include/qemu/uuid.h | 2 +-
include/sysemu/sysemu.h | 3 ++-
qmp.c | 10 ++--------
ui/spice-core.c | 2 +-
util/uuid.c | 11 ++++++-----
vl.c | 6 +++---
12 files changed, 27 insertions(+), 39 deletions(-)
diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c
index dc9c14c..17c7c0e 100644
--- a/hw/ipmi/ipmi_bmc_sim.c
+++ b/hw/ipmi/ipmi_bmc_sim.c
@@ -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);
}
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index 1776b1b..92aa563 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -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);
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index ca77bb0..bdb689c 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -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) {
diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c
index 27b5ad4..02ce273 100644
--- a/hw/ppc/spapr_rtas.c
+++ b/hw/ppc/spapr_rtas.c
@@ -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;
diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
index 0705eb1..9a6552a 100644
--- a/hw/smbios/smbios.c
+++ b/hw/smbios/smbios.c
@@ -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);
}
diff --git a/hw/xenpv/xen_domainbuild.c b/hw/xenpv/xen_domainbuild.c
index 5a9f5ac..b439b0e 100644
--- a/hw/xenpv/xen_domainbuild.c
+++ b/hw/xenpv/xen_domainbuild.c
@@ -53,11 +53,7 @@ int xenstore_domain_init1(const char *kernel, const char *ramdisk,
char *dom, uuid_string[42], vm[256], path[256];
int i;
- snprintf(uuid_string, sizeof(uuid_string), 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]);
+ qemu_uuid_unparse(&qemu_uuid, uuid_string);
dom = xs_get_domain_path(xenstore, xen_domid);
snprintf(vm, sizeof(vm), "/vm/%s", uuid_string);
diff --git a/include/qemu/uuid.h b/include/qemu/uuid.h
index bc0601e..afe4840 100644
--- a/include/qemu/uuid.h
+++ b/include/qemu/uuid.h
@@ -52,7 +52,7 @@ void qemu_uuid_unparse(const QemuUUID *uuid, char *out);
char *qemu_uuid_unparse_strdup(const QemuUUID *uuid);
-int qemu_uuid_parse(const char *str, uint8_t *uuid);
+int qemu_uuid_parse(const char *str, QemuUUID *uuid);
void qemu_uuid_bswap(QemuUUID *uuid);
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 6111950..ef2c50b 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -9,6 +9,7 @@
#include "qemu/notify.h"
#include "qemu/main-loop.h"
#include "qemu/bitmap.h"
+#include "qemu/uuid.h"
#include "qom/object.h"
/* vl.c */
@@ -16,7 +17,7 @@
extern const char *bios_name;
extern const char *qemu_name;
-extern uint8_t qemu_uuid[];
+extern QemuUUID qemu_uuid;
extern bool qemu_uuid_set;
bool runstate_check(RunState state);
diff --git a/qmp.c b/qmp.c
index c47c3a3..660339f 100644
--- a/qmp.c
+++ b/qmp.c
@@ -36,6 +36,7 @@
#include "qom/object_interfaces.h"
#include "hw/mem/pc-dimm.h"
#include "hw/acpi/acpi_dev_interface.h"
+#include "qemu/uuid.h"
NameInfo *qmp_query_name(Error **errp)
{
@@ -85,15 +86,8 @@ KvmInfo *qmp_query_kvm(Error **errp)
UuidInfo *qmp_query_uuid(Error **errp)
{
UuidInfo *info = g_malloc0(sizeof(*info));
- char uuid[64];
- snprintf(uuid, sizeof(uuid), 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]);
-
- info->UUID = g_strdup(uuid);
+ info->UUID = qemu_uuid_unparse_strdup(&qemu_uuid);
return info;
}
diff --git a/ui/spice-core.c b/ui/spice-core.c
index da05054..1452e77 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -796,7 +796,7 @@ void qemu_spice_init(void)
qemu_opt_foreach(opts, add_channel, &tls_port, NULL);
spice_server_set_name(spice_server, qemu_name);
- spice_server_set_uuid(spice_server, qemu_uuid);
+ spice_server_set_uuid(spice_server, (unsigned char *)&qemu_uuid);
seamless_migration = qemu_opt_get_bool(opts, "seamless-migration", 0);
spice_server_set_seamless_migration(spice_server, seamless_migration);
diff --git a/util/uuid.c b/util/uuid.c
index f0c1eeb..4701903 100644
--- a/util/uuid.c
+++ b/util/uuid.c
@@ -61,18 +61,19 @@ char *qemu_uuid_unparse_strdup(const QemuUUID *uuid)
uu[13], uu[14], uu[15]);
}
-int qemu_uuid_parse(const char *str, uint8_t *uuid)
+int qemu_uuid_parse(const char *str, QemuUUID *uuid)
{
+ unsigned char *uu = &uuid->data[0];
int ret;
if (strlen(str) != 36) {
return -1;
}
- ret = sscanf(str, UUID_FMT, &uuid[0], &uuid[1], &uuid[2], &uuid[3],
- &uuid[4], &uuid[5], &uuid[6], &uuid[7], &uuid[8], &uuid[9],
- &uuid[10], &uuid[11], &uuid[12], &uuid[13], &uuid[14],
- &uuid[15]);
+ ret = sscanf(str, UUID_FMT, &uu[0], &uu[1], &uu[2], &uu[3],
+ &uu[4], &uu[5], &uu[6], &uu[7], &uu[8], &uu[9],
+ &uu[10], &uu[11], &uu[12], &uu[13], &uu[14],
+ &uu[15]);
if (ret != 16) {
return -1;
diff --git a/vl.c b/vl.c
index 1e787a0..a12170f 100644
--- a/vl.c
+++ b/vl.c
@@ -183,10 +183,10 @@ uint8_t qemu_extra_params_fw[2];
int icount_align_option;
-/* The bytes in qemu_uuid[] are in the order specified by RFC4122, _not_ in the
+/* The bytes in qemu_uuid are in the order specified by RFC4122, _not_ in the
* little-endian "wire format" described in the SMBIOS 2.6 specification.
*/
-uint8_t qemu_uuid[16];
+QemuUUID qemu_uuid;
bool qemu_uuid_set;
static NotifierList exit_notifiers =
@@ -3739,7 +3739,7 @@ int main(int argc, char **argv, char **envp)
cursor_hide = 0;
break;
case QEMU_OPTION_uuid:
- if(qemu_uuid_parse(optarg, qemu_uuid) < 0) {
+ if (qemu_uuid_parse(optarg, &qemu_uuid) < 0) {
error_report("failed to parse UUID string: wrong format");
exit(1);
}
--
2.7.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [Qemu-devel] [PATCH v8 09/12] vl: Switch qemu_uuid to QemuUUID
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 09/12] vl: Switch qemu_uuid to QemuUUID Fam Zheng
@ 2016-09-19 3:34 ` Jeff Cody
0 siblings, 0 replies; 28+ messages in thread
From: Jeff Cody @ 2016-09-19 3:34 UTC (permalink / raw)
To: Fam Zheng
Cc: qemu-devel, kwolf, qemu-block, sw, mdroth, armbru, pbonzini,
mreitz, rth
On Sun, Sep 18, 2016 at 12:25:29PM +0800, Fam Zheng wrote:
> 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: Fam Zheng <famz@redhat.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> ---
> hw/ipmi/ipmi_bmc_sim.c | 2 +-
> hw/nvram/fw_cfg.c | 2 +-
> hw/ppc/spapr.c | 7 +------
> hw/ppc/spapr_rtas.c | 3 ++-
> hw/smbios/smbios.c | 12 ++++++------
> hw/xenpv/xen_domainbuild.c | 6 +-----
> include/qemu/uuid.h | 2 +-
> include/sysemu/sysemu.h | 3 ++-
> qmp.c | 10 ++--------
> ui/spice-core.c | 2 +-
> util/uuid.c | 11 ++++++-----
> vl.c | 6 +++---
> 12 files changed, 27 insertions(+), 39 deletions(-)
>
> diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c
> index dc9c14c..17c7c0e 100644
> --- a/hw/ipmi/ipmi_bmc_sim.c
> +++ b/hw/ipmi/ipmi_bmc_sim.c
> @@ -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);
> }
> diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
> index 1776b1b..92aa563 100644
> --- a/hw/nvram/fw_cfg.c
> +++ b/hw/nvram/fw_cfg.c
> @@ -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);
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index ca77bb0..bdb689c 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -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) {
> diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c
> index 27b5ad4..02ce273 100644
> --- a/hw/ppc/spapr_rtas.c
> +++ b/hw/ppc/spapr_rtas.c
> @@ -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;
> diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
> index 0705eb1..9a6552a 100644
> --- a/hw/smbios/smbios.c
> +++ b/hw/smbios/smbios.c
> @@ -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);
> }
> diff --git a/hw/xenpv/xen_domainbuild.c b/hw/xenpv/xen_domainbuild.c
> index 5a9f5ac..b439b0e 100644
> --- a/hw/xenpv/xen_domainbuild.c
> +++ b/hw/xenpv/xen_domainbuild.c
> @@ -53,11 +53,7 @@ int xenstore_domain_init1(const char *kernel, const char *ramdisk,
> char *dom, uuid_string[42], vm[256], path[256];
> int i;
>
> - snprintf(uuid_string, sizeof(uuid_string), 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]);
> + qemu_uuid_unparse(&qemu_uuid, uuid_string);
> dom = xs_get_domain_path(xenstore, xen_domid);
> snprintf(vm, sizeof(vm), "/vm/%s", uuid_string);
>
> diff --git a/include/qemu/uuid.h b/include/qemu/uuid.h
> index bc0601e..afe4840 100644
> --- a/include/qemu/uuid.h
> +++ b/include/qemu/uuid.h
> @@ -52,7 +52,7 @@ void qemu_uuid_unparse(const QemuUUID *uuid, char *out);
>
> char *qemu_uuid_unparse_strdup(const QemuUUID *uuid);
>
> -int qemu_uuid_parse(const char *str, uint8_t *uuid);
> +int qemu_uuid_parse(const char *str, QemuUUID *uuid);
>
> void qemu_uuid_bswap(QemuUUID *uuid);
>
> diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
> index 6111950..ef2c50b 100644
> --- a/include/sysemu/sysemu.h
> +++ b/include/sysemu/sysemu.h
> @@ -9,6 +9,7 @@
> #include "qemu/notify.h"
> #include "qemu/main-loop.h"
> #include "qemu/bitmap.h"
> +#include "qemu/uuid.h"
> #include "qom/object.h"
>
> /* vl.c */
> @@ -16,7 +17,7 @@
> extern const char *bios_name;
>
> extern const char *qemu_name;
> -extern uint8_t qemu_uuid[];
> +extern QemuUUID qemu_uuid;
> extern bool qemu_uuid_set;
>
> bool runstate_check(RunState state);
> diff --git a/qmp.c b/qmp.c
> index c47c3a3..660339f 100644
> --- a/qmp.c
> +++ b/qmp.c
> @@ -36,6 +36,7 @@
> #include "qom/object_interfaces.h"
> #include "hw/mem/pc-dimm.h"
> #include "hw/acpi/acpi_dev_interface.h"
> +#include "qemu/uuid.h"
>
> NameInfo *qmp_query_name(Error **errp)
> {
> @@ -85,15 +86,8 @@ KvmInfo *qmp_query_kvm(Error **errp)
> UuidInfo *qmp_query_uuid(Error **errp)
> {
> UuidInfo *info = g_malloc0(sizeof(*info));
> - char uuid[64];
>
> - snprintf(uuid, sizeof(uuid), 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]);
> -
> - info->UUID = g_strdup(uuid);
> + info->UUID = qemu_uuid_unparse_strdup(&qemu_uuid);
> return info;
> }
>
> diff --git a/ui/spice-core.c b/ui/spice-core.c
> index da05054..1452e77 100644
> --- a/ui/spice-core.c
> +++ b/ui/spice-core.c
> @@ -796,7 +796,7 @@ void qemu_spice_init(void)
> qemu_opt_foreach(opts, add_channel, &tls_port, NULL);
>
> spice_server_set_name(spice_server, qemu_name);
> - spice_server_set_uuid(spice_server, qemu_uuid);
> + spice_server_set_uuid(spice_server, (unsigned char *)&qemu_uuid);
>
> seamless_migration = qemu_opt_get_bool(opts, "seamless-migration", 0);
> spice_server_set_seamless_migration(spice_server, seamless_migration);
> diff --git a/util/uuid.c b/util/uuid.c
> index f0c1eeb..4701903 100644
> --- a/util/uuid.c
> +++ b/util/uuid.c
> @@ -61,18 +61,19 @@ char *qemu_uuid_unparse_strdup(const QemuUUID *uuid)
> uu[13], uu[14], uu[15]);
> }
>
> -int qemu_uuid_parse(const char *str, uint8_t *uuid)
> +int qemu_uuid_parse(const char *str, QemuUUID *uuid)
> {
> + unsigned char *uu = &uuid->data[0];
> int ret;
>
> if (strlen(str) != 36) {
> return -1;
> }
>
> - ret = sscanf(str, UUID_FMT, &uuid[0], &uuid[1], &uuid[2], &uuid[3],
> - &uuid[4], &uuid[5], &uuid[6], &uuid[7], &uuid[8], &uuid[9],
> - &uuid[10], &uuid[11], &uuid[12], &uuid[13], &uuid[14],
> - &uuid[15]);
> + ret = sscanf(str, UUID_FMT, &uu[0], &uu[1], &uu[2], &uu[3],
> + &uu[4], &uu[5], &uu[6], &uu[7], &uu[8], &uu[9],
> + &uu[10], &uu[11], &uu[12], &uu[13], &uu[14],
> + &uu[15]);
>
> if (ret != 16) {
> return -1;
> diff --git a/vl.c b/vl.c
> index 1e787a0..a12170f 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -183,10 +183,10 @@ uint8_t qemu_extra_params_fw[2];
>
> int icount_align_option;
>
> -/* The bytes in qemu_uuid[] are in the order specified by RFC4122, _not_ in the
> +/* The bytes in qemu_uuid are in the order specified by RFC4122, _not_ in the
> * little-endian "wire format" described in the SMBIOS 2.6 specification.
> */
> -uint8_t qemu_uuid[16];
> +QemuUUID qemu_uuid;
> bool qemu_uuid_set;
>
> static NotifierList exit_notifiers =
> @@ -3739,7 +3739,7 @@ int main(int argc, char **argv, char **envp)
> cursor_hide = 0;
> break;
> case QEMU_OPTION_uuid:
> - if(qemu_uuid_parse(optarg, qemu_uuid) < 0) {
> + if (qemu_uuid_parse(optarg, &qemu_uuid) < 0) {
> error_report("failed to parse UUID string: wrong format");
> exit(1);
> }
> --
> 2.7.4
>
>
Reviewed-by: Jeff Cody <jcody@redhat.com>
^ permalink raw reply [flat|nested] 28+ messages in thread
* [Qemu-devel] [PATCH v8 10/12] uuid: Tighten uuid parse
2016-09-18 4:25 [Qemu-devel] [PATCH v8 00/12] UUID clean ups for 2.8 Fam Zheng
` (8 preceding siblings ...)
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 09/12] vl: Switch qemu_uuid to QemuUUID Fam Zheng
@ 2016-09-18 4:25 ` Fam Zheng
2016-09-19 3:44 ` Jeff Cody
2016-09-19 20:30 ` Eric Blake
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 11/12] tests: Add uuid tests Fam Zheng
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 12/12] Add UUID files to MAINTAINERS Fam Zheng
11 siblings, 2 replies; 28+ messages in thread
From: Fam Zheng @ 2016-09-18 4:25 UTC (permalink / raw)
To: qemu-devel
Cc: kwolf, qemu-block, sw, jcody, mdroth, armbru, pbonzini, mreitz,
eblake, rth
sscanf is relatively loose (tolerate) on some invalid formats that we
should fail instead of generating a wrong uuid structure, like with
whitespaces and short strings.
Add and use a helper function to first check the format.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
util/uuid.c | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/util/uuid.c b/util/uuid.c
index 4701903..dd6b5fd 100644
--- a/util/uuid.c
+++ b/util/uuid.c
@@ -61,12 +61,34 @@ char *qemu_uuid_unparse_strdup(const QemuUUID *uuid)
uu[13], uu[14], uu[15]);
}
+static bool qemu_uuid_is_valid(const char *str)
+{
+ int i;
+
+ for (i = 0; i < strlen(str); i++) {
+ const char c = str[i];
+ if (i == 8 || i == 13 || i == 18 || i == 23) {
+ if (str[i] != '-') {
+ return false;
+ }
+ } else {
+ if ((c >= '0' && c <= '9') ||
+ (c >= 'A' && c <= 'F') ||
+ (c >= 'a' && c <= 'f')) {
+ continue;
+ }
+ return false;
+ }
+ }
+ return i == 36;
+}
+
int qemu_uuid_parse(const char *str, QemuUUID *uuid)
{
unsigned char *uu = &uuid->data[0];
int ret;
- if (strlen(str) != 36) {
+ if (!qemu_uuid_is_valid(str)) {
return -1;
}
--
2.7.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [Qemu-devel] [PATCH v8 10/12] uuid: Tighten uuid parse
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 10/12] uuid: Tighten uuid parse Fam Zheng
@ 2016-09-19 3:44 ` Jeff Cody
2016-09-19 20:30 ` Eric Blake
1 sibling, 0 replies; 28+ messages in thread
From: Jeff Cody @ 2016-09-19 3:44 UTC (permalink / raw)
To: Fam Zheng
Cc: qemu-devel, kwolf, qemu-block, sw, mdroth, armbru, pbonzini,
mreitz, rth
On Sun, Sep 18, 2016 at 12:25:30PM +0800, Fam Zheng wrote:
> sscanf is relatively loose (tolerate) on some invalid formats that we
> should fail instead of generating a wrong uuid structure, like with
> whitespaces and short strings.
>
> Add and use a helper function to first check the format.
>
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
> util/uuid.c | 24 +++++++++++++++++++++++-
> 1 file changed, 23 insertions(+), 1 deletion(-)
>
> diff --git a/util/uuid.c b/util/uuid.c
> index 4701903..dd6b5fd 100644
> --- a/util/uuid.c
> +++ b/util/uuid.c
> @@ -61,12 +61,34 @@ char *qemu_uuid_unparse_strdup(const QemuUUID *uuid)
> uu[13], uu[14], uu[15]);
> }
>
> +static bool qemu_uuid_is_valid(const char *str)
> +{
> + int i;
> +
> + for (i = 0; i < strlen(str); i++) {
> + const char c = str[i];
> + if (i == 8 || i == 13 || i == 18 || i == 23) {
> + if (str[i] != '-') {
> + return false;
> + }
> + } else {
> + if ((c >= '0' && c <= '9') ||
> + (c >= 'A' && c <= 'F') ||
> + (c >= 'a' && c <= 'f')) {
> + continue;
> + }
> + return false;
> + }
> + }
> + return i == 36;
> +}
> +
Doesn't verify variant / version, but it is a lot better than what was
before.
Reviewed-by: Jeff Cody <jcody@redhat.com>
> int qemu_uuid_parse(const char *str, QemuUUID *uuid)
> {
> unsigned char *uu = &uuid->data[0];
> int ret;
>
> - if (strlen(str) != 36) {
> + if (!qemu_uuid_is_valid(str)) {
> return -1;
> }
>
> --
> 2.7.4
>
>
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [Qemu-devel] [PATCH v8 10/12] uuid: Tighten uuid parse
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 10/12] uuid: Tighten uuid parse Fam Zheng
2016-09-19 3:44 ` Jeff Cody
@ 2016-09-19 20:30 ` Eric Blake
1 sibling, 0 replies; 28+ messages in thread
From: Eric Blake @ 2016-09-19 20:30 UTC (permalink / raw)
To: Fam Zheng, qemu-devel
Cc: kwolf, qemu-block, sw, jcody, mdroth, armbru, pbonzini, mreitz,
rth
[-- Attachment #1: Type: text/plain, Size: 1911 bytes --]
On 09/17/2016 11:25 PM, Fam Zheng wrote:
> sscanf is relatively loose (tolerate) on some invalid formats that we
> should fail instead of generating a wrong uuid structure, like with
> whitespaces and short strings.
>
> Add and use a helper function to first check the format.
>
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
> util/uuid.c | 24 +++++++++++++++++++++++-
> 1 file changed, 23 insertions(+), 1 deletion(-)
>
>
> +static bool qemu_uuid_is_valid(const char *str)
> +{
> + int i;
> +
> + for (i = 0; i < strlen(str); i++) {
> + const char c = str[i];
> + if (i == 8 || i == 13 || i == 18 || i == 23) {
> + if (str[i] != '-') {
> + return false;
> + }
> + } else {
> + if ((c >= '0' && c <= '9') ||
> + (c >= 'A' && c <= 'F') ||
> + (c >= 'a' && c <= 'f')) {
> + continue;
> + }
> + return false;
> + }
> + }
> + return i == 36;
> +}
Quite verbose, compared to my earlier suggestion of just checking that
all bytes in the string are valid (but not worrying about positions,
because sscanf mostly does that):
strspn(str, "0123456789abcdefABCDEF-") == 36 && !str[36]
and then tightening sscanf() (now that we've rejected whitespace via
strspn(), all that remains is to ensure we parsed as much as we were
expecting), as in:
sscanf(str, UUID_FMT "%n", &uuid[0], ... &uuid[15], &len)
and then validating that len == 36.
But while my approach is a (cryptic) three-line change, yours is easier
to check that it is obviously correct. So unless you want to respin
because you like playing golf when writing C expressions,
Reviewed-by: Eric Blake <eblake@redhat.com>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread
* [Qemu-devel] [PATCH v8 11/12] tests: Add uuid tests
2016-09-18 4:25 [Qemu-devel] [PATCH v8 00/12] UUID clean ups for 2.8 Fam Zheng
` (9 preceding siblings ...)
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 10/12] uuid: Tighten uuid parse Fam Zheng
@ 2016-09-18 4:25 ` Fam Zheng
2016-09-19 3:44 ` Jeff Cody
2016-09-20 15:37 ` Eric Blake
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 12/12] Add UUID files to MAINTAINERS Fam Zheng
11 siblings, 2 replies; 28+ messages in thread
From: Fam Zheng @ 2016-09-18 4:25 UTC (permalink / raw)
To: qemu-devel
Cc: kwolf, qemu-block, sw, jcody, mdroth, armbru, pbonzini, mreitz,
eblake, rth
Signed-off-by: Fam Zheng <famz@redhat.com>
---
tests/Makefile.include | 2 +
tests/test-uuid.c | 177 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 179 insertions(+)
create mode 100644 tests/test-uuid.c
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 2f11064..15e7f8f 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -115,6 +115,7 @@ check-unit-y += tests/test-logging$(EXESUF)
check-unit-$(CONFIG_REPLICATION) += tests/test-replication$(EXESUF)
check-unit-y += tests/test-bufferiszero$(EXESUF)
gcov-files-check-bufferiszero-y = util/bufferiszero.c
+check-unit-y += tests/test-uuid$(EXESUF)
check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh
@@ -658,6 +659,7 @@ tests/test-filter-mirror$(EXESUF): tests/test-filter-mirror.o $(qtest-obj-y)
tests/test-filter-redirector$(EXESUF): tests/test-filter-redirector.o $(qtest-obj-y)
tests/ivshmem-test$(EXESUF): tests/ivshmem-test.o contrib/ivshmem-server/ivshmem-server.o $(libqos-pc-obj-y)
tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o
+tests/test-uuid$(EXESUF): tests/test-uuid.o $(test-util-obj-y)
tests/migration/stress$(EXESUF): tests/migration/stress.o
$(call quiet-command, $(LINKPROG) -static -O3 $(PTHREAD_LIB) -o $@ $< ," LINK $(TARGET_DIR)$@")
diff --git a/tests/test-uuid.c b/tests/test-uuid.c
new file mode 100644
index 0000000..77dcdc4
--- /dev/null
+++ b/tests/test-uuid.c
@@ -0,0 +1,177 @@
+/*
+ * QEMU UUID Library
+ *
+ * Copyright (c) 2016 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "qemu/osdep.h"
+#include "qemu/uuid.h"
+
+struct {
+ const char *uuidstr;
+ QemuUUID uuid;
+ bool uuidstr_is_valid;
+ bool check_unparse;
+} uuid_test_data[] = {
+ { /* Normal */
+ "586ece27-7f09-41e0-9e74-e901317e9d42",
+ { { {
+ 0x58, 0x6e, 0xce, 0x27, 0x7f, 0x09, 0x41, 0xe0,
+ 0x9e, 0x74, 0xe9, 0x01, 0x31, 0x7e, 0x9d, 0x42,
+ } } },
+ true, true,
+ }, { /* NULL */
+ "00000000-0000-0000-0000-000000000000",
+ { },
+ true, true,
+ }, { /* Upper case */
+ "0CC6C752-3961-4028-A286-C05CC616D396",
+ { { {
+ 0x0c, 0xc6, 0xc7, 0x52, 0x39, 0x61, 0x40, 0x28,
+ 0xa2, 0x86, 0xc0, 0x5c, 0xc6, 0x16, 0xd3, 0x96,
+ } } },
+ true, false,
+ }, { /* Mixed case */
+ "0CC6C752-3961-4028-a286-c05cc616D396",
+ { { {
+ 0x0c, 0xc6, 0xc7, 0x52, 0x39, 0x61, 0x40, 0x28,
+ 0xa2, 0x86, 0xc0, 0x5c, 0xc6, 0x16, 0xd3, 0x96,
+ } } },
+ true, false,
+ }, { /* Empty */
+ ""
+ }, { /* Too short */
+ "abc",
+ }, { /* Non-hex */
+ "abcdefgh-0000-0000-0000-000000000000",
+ }, { /* No '-' */
+ "0cc6c75239614028a286c05cc616d396",
+ }, { /* '-' in wrong position */
+ "0cc6c-7523961-4028-a286-c05cc616d396",
+ }, { /* Double '-' */
+ "0cc6c752--3961-4028-a286-c05cc616d396",
+ }, { /* Too long */
+ "0000000000000000000000000000000000000000000000",
+ }, { /* Invalid char in the beginning */
+ ")cc6c752-3961-4028-a286-c05cc616d396",
+ }, { /* Invalid char in the beginning, in extra */
+ ")0cc6c752-3961-4028-a286-c05cc616d396",
+ }, { /* Invalid char in the middle */
+ "0cc6c752-39*1-4028-a286-c05cc616d396",
+ }, { /* Invalid char in the middle, in extra */
+ "0cc6c752-39*61-4028-a286-c05cc616d396",
+ }, { /* Invalid char in the end */
+ "0cc6c752-3961-4028-a286-c05cc616d39&",
+ }, { /* Invalid char in the end, in extra */
+ "0cc6c752-3961-4028-a286-c05cc616d396&",
+ }, { /* Short end and trailing space */
+ "0cc6c752-3961-4028-a286-c05cc616d39 ",
+ }, { /* Leading space and short end */
+ " 0cc6c752-3961-4028-a286-c05cc616d39",
+ },
+};
+
+static inline bool uuid_is_valid(QemuUUID *uuid)
+{
+ return qemu_uuid_is_null(uuid) ||
+ ((uuid->data[6] & 0xf0) == 0x40 && (uuid->data[8] & 0xc0) == 0x80);
+}
+
+static void test_uuid_generate(void)
+{
+ QemuUUID uuid;
+ int i;
+
+ for (i = 0; i < 100; ++i) {
+ qemu_uuid_generate(&uuid);
+ g_assert(uuid_is_valid(&uuid));
+ }
+}
+
+static void test_uuid_is_null(void)
+{
+ QemuUUID uuid_null = { };
+ QemuUUID uuid_not_null = { { {
+ 0x58, 0x6e, 0xce, 0x27, 0x7f, 0x09, 0x41, 0xe0,
+ 0x9e, 0x74, 0xe9, 0x01, 0x31, 0x7e, 0x9d, 0x42
+ } } };
+ QemuUUID uuid_not_null_2 = { { { 1 } } };
+
+ g_assert(qemu_uuid_is_null(&uuid_null));
+ g_assert_false(qemu_uuid_is_null(&uuid_not_null));
+ g_assert_false(qemu_uuid_is_null(&uuid_not_null_2));
+}
+
+static void test_uuid_parse(void)
+{
+ int i, r;
+
+ for (i = 0; i < ARRAY_SIZE(uuid_test_data); i++) {
+ QemuUUID uuid;
+ bool is_valid = uuid_test_data[i].uuidstr_is_valid;
+
+ r = qemu_uuid_parse(uuid_test_data[i].uuidstr, &uuid);
+ g_assert_cmpint(!r, ==, is_valid);
+ if (is_valid) {
+ g_assert_cmpint(is_valid, ==, uuid_is_valid(&uuid));
+ g_assert_cmpmem(&uuid_test_data[i].uuid, sizeof(uuid),
+ &uuid, sizeof(uuid));
+ }
+ }
+}
+
+static void test_uuid_unparse(void)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(uuid_test_data); i++) {
+ char out[37];
+
+ if (!uuid_test_data[i].check_unparse) {
+ continue;
+ }
+ qemu_uuid_unparse(&uuid_test_data[i].uuid, out);
+ g_assert_cmpstr(uuid_test_data[i].uuidstr, ==, out);
+ }
+}
+
+static void test_uuid_unparse_strdup(void)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(uuid_test_data); i++) {
+ char *out;
+
+ if (!uuid_test_data[i].check_unparse) {
+ continue;
+ }
+ out = qemu_uuid_unparse_strdup(&uuid_test_data[i].uuid);
+ g_assert_cmpstr(uuid_test_data[i].uuidstr, ==, out);
+ }
+}
+
+int main(int argc, char **argv)
+{
+ g_test_init(&argc, &argv, NULL);
+ g_test_add_func("/uuid/generate", test_uuid_generate);
+ g_test_add_func("/uuid/is_null", test_uuid_is_null);
+ g_test_add_func("/uuid/parse", test_uuid_parse);
+ g_test_add_func("/uuid/unparse", test_uuid_unparse);
+ g_test_add_func("/uuid/unparse_strdup", test_uuid_unparse_strdup);
+
+ return g_test_run();
+}
--
2.7.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [Qemu-devel] [PATCH v8 11/12] tests: Add uuid tests
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 11/12] tests: Add uuid tests Fam Zheng
@ 2016-09-19 3:44 ` Jeff Cody
2016-09-20 15:37 ` Eric Blake
1 sibling, 0 replies; 28+ messages in thread
From: Jeff Cody @ 2016-09-19 3:44 UTC (permalink / raw)
To: Fam Zheng
Cc: qemu-devel, kwolf, qemu-block, sw, mdroth, armbru, pbonzini,
mreitz, eblake, rth
On Sun, Sep 18, 2016 at 12:25:31PM +0800, Fam Zheng wrote:
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
> tests/Makefile.include | 2 +
> tests/test-uuid.c | 177 +++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 179 insertions(+)
> create mode 100644 tests/test-uuid.c
>
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 2f11064..15e7f8f 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -115,6 +115,7 @@ check-unit-y += tests/test-logging$(EXESUF)
> check-unit-$(CONFIG_REPLICATION) += tests/test-replication$(EXESUF)
> check-unit-y += tests/test-bufferiszero$(EXESUF)
> gcov-files-check-bufferiszero-y = util/bufferiszero.c
> +check-unit-y += tests/test-uuid$(EXESUF)
>
> check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh
>
> @@ -658,6 +659,7 @@ tests/test-filter-mirror$(EXESUF): tests/test-filter-mirror.o $(qtest-obj-y)
> tests/test-filter-redirector$(EXESUF): tests/test-filter-redirector.o $(qtest-obj-y)
> tests/ivshmem-test$(EXESUF): tests/ivshmem-test.o contrib/ivshmem-server/ivshmem-server.o $(libqos-pc-obj-y)
> tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o
> +tests/test-uuid$(EXESUF): tests/test-uuid.o $(test-util-obj-y)
>
> tests/migration/stress$(EXESUF): tests/migration/stress.o
> $(call quiet-command, $(LINKPROG) -static -O3 $(PTHREAD_LIB) -o $@ $< ," LINK $(TARGET_DIR)$@")
> diff --git a/tests/test-uuid.c b/tests/test-uuid.c
> new file mode 100644
> index 0000000..77dcdc4
> --- /dev/null
> +++ b/tests/test-uuid.c
> @@ -0,0 +1,177 @@
> +/*
> + * QEMU UUID Library
> + *
> + * Copyright (c) 2016 Red Hat, Inc.
> + *
> + * This library is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU Lesser General Public
> + * License as published by the Free Software Foundation; either
> + * version 2 of the License, or (at your option) any later version.
> + *
> + * This library is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * Lesser General Public License for more details.
> + *
> + * You should have received a copy of the GNU Lesser General Public
> + * License along with this library; if not, see <http://www.gnu.org/licenses/>.
> + *
> + */
> +
> +#include "qemu/osdep.h"
> +#include "qemu/uuid.h"
> +
> +struct {
> + const char *uuidstr;
> + QemuUUID uuid;
> + bool uuidstr_is_valid;
> + bool check_unparse;
> +} uuid_test_data[] = {
> + { /* Normal */
> + "586ece27-7f09-41e0-9e74-e901317e9d42",
> + { { {
> + 0x58, 0x6e, 0xce, 0x27, 0x7f, 0x09, 0x41, 0xe0,
> + 0x9e, 0x74, 0xe9, 0x01, 0x31, 0x7e, 0x9d, 0x42,
> + } } },
> + true, true,
> + }, { /* NULL */
> + "00000000-0000-0000-0000-000000000000",
> + { },
> + true, true,
> + }, { /* Upper case */
> + "0CC6C752-3961-4028-A286-C05CC616D396",
> + { { {
> + 0x0c, 0xc6, 0xc7, 0x52, 0x39, 0x61, 0x40, 0x28,
> + 0xa2, 0x86, 0xc0, 0x5c, 0xc6, 0x16, 0xd3, 0x96,
> + } } },
> + true, false,
> + }, { /* Mixed case */
> + "0CC6C752-3961-4028-a286-c05cc616D396",
> + { { {
> + 0x0c, 0xc6, 0xc7, 0x52, 0x39, 0x61, 0x40, 0x28,
> + 0xa2, 0x86, 0xc0, 0x5c, 0xc6, 0x16, 0xd3, 0x96,
> + } } },
> + true, false,
> + }, { /* Empty */
> + ""
> + }, { /* Too short */
> + "abc",
> + }, { /* Non-hex */
> + "abcdefgh-0000-0000-0000-000000000000",
> + }, { /* No '-' */
> + "0cc6c75239614028a286c05cc616d396",
> + }, { /* '-' in wrong position */
> + "0cc6c-7523961-4028-a286-c05cc616d396",
> + }, { /* Double '-' */
> + "0cc6c752--3961-4028-a286-c05cc616d396",
> + }, { /* Too long */
> + "0000000000000000000000000000000000000000000000",
> + }, { /* Invalid char in the beginning */
> + ")cc6c752-3961-4028-a286-c05cc616d396",
> + }, { /* Invalid char in the beginning, in extra */
> + ")0cc6c752-3961-4028-a286-c05cc616d396",
> + }, { /* Invalid char in the middle */
> + "0cc6c752-39*1-4028-a286-c05cc616d396",
> + }, { /* Invalid char in the middle, in extra */
> + "0cc6c752-39*61-4028-a286-c05cc616d396",
> + }, { /* Invalid char in the end */
> + "0cc6c752-3961-4028-a286-c05cc616d39&",
> + }, { /* Invalid char in the end, in extra */
> + "0cc6c752-3961-4028-a286-c05cc616d396&",
> + }, { /* Short end and trailing space */
> + "0cc6c752-3961-4028-a286-c05cc616d39 ",
> + }, { /* Leading space and short end */
> + " 0cc6c752-3961-4028-a286-c05cc616d39",
> + },
> +};
> +
> +static inline bool uuid_is_valid(QemuUUID *uuid)
> +{
> + return qemu_uuid_is_null(uuid) ||
> + ((uuid->data[6] & 0xf0) == 0x40 && (uuid->data[8] & 0xc0) == 0x80);
> +}
> +
> +static void test_uuid_generate(void)
> +{
> + QemuUUID uuid;
> + int i;
> +
> + for (i = 0; i < 100; ++i) {
> + qemu_uuid_generate(&uuid);
> + g_assert(uuid_is_valid(&uuid));
> + }
> +}
> +
> +static void test_uuid_is_null(void)
> +{
> + QemuUUID uuid_null = { };
> + QemuUUID uuid_not_null = { { {
> + 0x58, 0x6e, 0xce, 0x27, 0x7f, 0x09, 0x41, 0xe0,
> + 0x9e, 0x74, 0xe9, 0x01, 0x31, 0x7e, 0x9d, 0x42
> + } } };
> + QemuUUID uuid_not_null_2 = { { { 1 } } };
> +
> + g_assert(qemu_uuid_is_null(&uuid_null));
> + g_assert_false(qemu_uuid_is_null(&uuid_not_null));
> + g_assert_false(qemu_uuid_is_null(&uuid_not_null_2));
> +}
> +
> +static void test_uuid_parse(void)
> +{
> + int i, r;
> +
> + for (i = 0; i < ARRAY_SIZE(uuid_test_data); i++) {
> + QemuUUID uuid;
> + bool is_valid = uuid_test_data[i].uuidstr_is_valid;
> +
> + r = qemu_uuid_parse(uuid_test_data[i].uuidstr, &uuid);
> + g_assert_cmpint(!r, ==, is_valid);
> + if (is_valid) {
> + g_assert_cmpint(is_valid, ==, uuid_is_valid(&uuid));
> + g_assert_cmpmem(&uuid_test_data[i].uuid, sizeof(uuid),
> + &uuid, sizeof(uuid));
> + }
> + }
> +}
> +
> +static void test_uuid_unparse(void)
> +{
> + int i;
> +
> + for (i = 0; i < ARRAY_SIZE(uuid_test_data); i++) {
> + char out[37];
> +
> + if (!uuid_test_data[i].check_unparse) {
> + continue;
> + }
> + qemu_uuid_unparse(&uuid_test_data[i].uuid, out);
> + g_assert_cmpstr(uuid_test_data[i].uuidstr, ==, out);
> + }
> +}
> +
> +static void test_uuid_unparse_strdup(void)
> +{
> + int i;
> +
> + for (i = 0; i < ARRAY_SIZE(uuid_test_data); i++) {
> + char *out;
> +
> + if (!uuid_test_data[i].check_unparse) {
> + continue;
> + }
> + out = qemu_uuid_unparse_strdup(&uuid_test_data[i].uuid);
> + g_assert_cmpstr(uuid_test_data[i].uuidstr, ==, out);
> + }
> +}
> +
> +int main(int argc, char **argv)
> +{
> + g_test_init(&argc, &argv, NULL);
> + g_test_add_func("/uuid/generate", test_uuid_generate);
> + g_test_add_func("/uuid/is_null", test_uuid_is_null);
> + g_test_add_func("/uuid/parse", test_uuid_parse);
> + g_test_add_func("/uuid/unparse", test_uuid_unparse);
> + g_test_add_func("/uuid/unparse_strdup", test_uuid_unparse_strdup);
> +
> + return g_test_run();
> +}
> --
> 2.7.4
>
Reviewed-by: Jeff Cody <jcody@redhat.com>
^ permalink raw reply [flat|nested] 28+ messages in thread* Re: [Qemu-devel] [PATCH v8 11/12] tests: Add uuid tests
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 11/12] tests: Add uuid tests Fam Zheng
2016-09-19 3:44 ` Jeff Cody
@ 2016-09-20 15:37 ` Eric Blake
2016-09-21 3:32 ` Fam Zheng
1 sibling, 1 reply; 28+ messages in thread
From: Eric Blake @ 2016-09-20 15:37 UTC (permalink / raw)
To: Fam Zheng, qemu-devel
Cc: kwolf, qemu-block, sw, jcody, mdroth, armbru, pbonzini, mreitz,
rth
[-- Attachment #1: Type: text/plain, Size: 477 bytes --]
On 09/17/2016 11:25 PM, Fam Zheng wrote:
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
> tests/Makefile.include | 2 +
> tests/test-uuid.c | 177 +++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 179 insertions(+)
> create mode 100644 tests/test-uuid.c
>
Please also update tests/.gitignore to ignore the new executable.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [Qemu-devel] [PATCH v8 11/12] tests: Add uuid tests
2016-09-20 15:37 ` Eric Blake
@ 2016-09-21 3:32 ` Fam Zheng
0 siblings, 0 replies; 28+ messages in thread
From: Fam Zheng @ 2016-09-21 3:32 UTC (permalink / raw)
To: Eric Blake
Cc: qemu-devel, kwolf, qemu-block, sw, jcody, mdroth, armbru,
pbonzini, mreitz, rth
On Tue, 09/20 10:37, Eric Blake wrote:
> On 09/17/2016 11:25 PM, Fam Zheng wrote:
> > Signed-off-by: Fam Zheng <famz@redhat.com>
> > ---
> > tests/Makefile.include | 2 +
> > tests/test-uuid.c | 177 +++++++++++++++++++++++++++++++++++++++++++++++++
> > 2 files changed, 179 insertions(+)
> > create mode 100644 tests/test-uuid.c
> >
>
> Please also update tests/.gitignore to ignore the new executable.
OK, will add a patch to.
Fam
^ permalink raw reply [flat|nested] 28+ messages in thread
* [Qemu-devel] [PATCH v8 12/12] Add UUID files to MAINTAINERS
2016-09-18 4:25 [Qemu-devel] [PATCH v8 00/12] UUID clean ups for 2.8 Fam Zheng
` (10 preceding siblings ...)
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 11/12] tests: Add uuid tests Fam Zheng
@ 2016-09-18 4:25 ` Fam Zheng
2016-09-19 3:44 ` Jeff Cody
11 siblings, 1 reply; 28+ messages in thread
From: Fam Zheng @ 2016-09-18 4:25 UTC (permalink / raw)
To: qemu-devel
Cc: kwolf, qemu-block, sw, jcody, mdroth, armbru, pbonzini, mreitz,
eblake, rth
I understand that we've been keeping eyes on the uncovered files. Since
I'm adding some more files I volunteer to look after them in the futuer.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
MAINTAINERS | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 7d43026..764d2e4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1333,6 +1333,12 @@ F: include/qemu/throttle.h
F: util/throttle.c
L: qemu-block@nongnu.org
+UUID
+M: Fam Zheng <famz@redhat.com>
+S: Supported
+F: util/uuid.c
+F: include/qemu/uuid.h
+
Usermode Emulation
------------------
Overall
--
2.7.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [Qemu-devel] [PATCH v8 12/12] Add UUID files to MAINTAINERS
2016-09-18 4:25 ` [Qemu-devel] [PATCH v8 12/12] Add UUID files to MAINTAINERS Fam Zheng
@ 2016-09-19 3:44 ` Jeff Cody
0 siblings, 0 replies; 28+ messages in thread
From: Jeff Cody @ 2016-09-19 3:44 UTC (permalink / raw)
To: Fam Zheng
Cc: qemu-devel, kwolf, qemu-block, sw, mdroth, armbru, pbonzini,
mreitz, eblake, rth
On Sun, Sep 18, 2016 at 12:25:32PM +0800, Fam Zheng wrote:
> I understand that we've been keeping eyes on the uncovered files. Since
> I'm adding some more files I volunteer to look after them in the futuer.
>
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
> MAINTAINERS | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 7d43026..764d2e4 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1333,6 +1333,12 @@ F: include/qemu/throttle.h
> F: util/throttle.c
> L: qemu-block@nongnu.org
>
> +UUID
> +M: Fam Zheng <famz@redhat.com>
> +S: Supported
> +F: util/uuid.c
> +F: include/qemu/uuid.h
> +
> Usermode Emulation
> ------------------
> Overall
> --
> 2.7.4
>
Reviewed-by: Jeff Cody <jcody@redhat.com>
^ permalink raw reply [flat|nested] 28+ messages in thread