| Message ID | 20230206172816.8201-10-Jonathan.Cameron@huawei.com |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/cxl: CXL emulation cleanups and minor fixes for upstream | expand |
On Mon, Feb 06, 2023 at 05:28:15PM +0000, Jonathan Cameron wrote: > From: Ira Weiny <ira.weiny@intel.com> > > UUID's are defined as network byte order fields. No static initializer > was available for UUID's in their standard big endian format. > > Define a big endian initializer for UUIDs. > > Reviewed-by: Gregory Price <gregory.price@memverge.com> > Tested-by: Gregory Price <gregory.price@memverge.com> > Signed-off-by: Ira Weiny <ira.weiny@intel.com> > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: Fan Ni <fan.ni@samsung.com> > --- > include/qemu/uuid.h | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/include/qemu/uuid.h b/include/qemu/uuid.h > index 9925febfa5..dc40ee1fc9 100644 > --- a/include/qemu/uuid.h > +++ b/include/qemu/uuid.h > @@ -61,6 +61,18 @@ typedef struct { > (clock_seq_hi_and_reserved), (clock_seq_low), (node0), (node1), (node2),\ > (node3), (node4), (node5) } > > +/* Normal (network byte order) UUID */ > +#define UUID(time_low, time_mid, time_hi_and_version, \ > + clock_seq_hi_and_reserved, clock_seq_low, node0, node1, node2, \ > + node3, node4, node5) \ > + { ((time_low) >> 24) & 0xff, ((time_low) >> 16) & 0xff, \ > + ((time_low) >> 8) & 0xff, (time_low) & 0xff, \ > + ((time_mid) >> 8) & 0xff, (time_mid) & 0xff, \ > + ((time_hi_and_version) >> 8) & 0xff, (time_hi_and_version) & 0xff, \ > + (clock_seq_hi_and_reserved), (clock_seq_low), \ > + (node0), (node1), (node2), (node3), (node4), (node5) \ > + } > + > #define UUID_FMT "%02hhx%02hhx%02hhx%02hhx-" \ > "%02hhx%02hhx-%02hhx%02hhx-" \ > "%02hhx%02hhx-" \ > -- > 2.37.2 > >
diff --git a/include/qemu/uuid.h b/include/qemu/uuid.h index 9925febfa5..dc40ee1fc9 100644 --- a/include/qemu/uuid.h +++ b/include/qemu/uuid.h @@ -61,6 +61,18 @@ typedef struct { (clock_seq_hi_and_reserved), (clock_seq_low), (node0), (node1), (node2),\ (node3), (node4), (node5) } +/* Normal (network byte order) UUID */ +#define UUID(time_low, time_mid, time_hi_and_version, \ + clock_seq_hi_and_reserved, clock_seq_low, node0, node1, node2, \ + node3, node4, node5) \ + { ((time_low) >> 24) & 0xff, ((time_low) >> 16) & 0xff, \ + ((time_low) >> 8) & 0xff, (time_low) & 0xff, \ + ((time_mid) >> 8) & 0xff, (time_mid) & 0xff, \ + ((time_hi_and_version) >> 8) & 0xff, (time_hi_and_version) & 0xff, \ + (clock_seq_hi_and_reserved), (clock_seq_low), \ + (node0), (node1), (node2), (node3), (node4), (node5) \ + } + #define UUID_FMT "%02hhx%02hhx%02hhx%02hhx-" \ "%02hhx%02hhx-%02hhx%02hhx-" \ "%02hhx%02hhx-" \