From patchwork Mon Dec 10 11:26:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 153257 Delivered-To: patches@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3447075ljp; Mon, 10 Dec 2018 03:26:55 -0800 (PST) X-Google-Smtp-Source: AFSGD/XF0JLcvWFvCjOFIRk56VGtwdCcA+GJcVid6KJ1Km8QX3ID2gjD9CmDn80iZqo4YQzXJPi+ X-Received: by 2002:a62:4b4d:: with SMTP id y74mr11893313pfa.186.1544441214932; Mon, 10 Dec 2018 03:26:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544441214; cv=none; d=google.com; s=arc-20160816; b=wZ7hIWqX9Cij4aWUNjp/0E3cTJ1zlmDcQcHvUu3vjZHA0DoUbZwppQqEWouh1xSytY 7BLA43xN2wQETuyKTkUrXpWhn6sYez0+CI6NfjMKQYRThMP6U0oWIshbdIQ+MTQrw9D4 8815nCOzz2ptLY23S/WWeXla89xZr2vPfwiBNrmIcSpEOzOwNv5uBICZbKAU6BFZsdbv fbuqZWDLIdRknU7tyQfy3xkP93xn/6279HHmPMoepVXo3oOalfzaIc+7Vr4zfhwW/YQA HdhhKvMkOfXPA0BqKTf1YVJHkIIA/VyHAesEZIyGL9TWHTCHvnGswW/OZ5N5XgD+jQ2T YlMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=DLM5JPSElEAUPMAVXOpVdYJOU3U5BXPwlF09QqthE1w=; b=kZCDTE4RkzDBAtfAfwCwzGcvEId7fR8ywtsP8YKlscLsAckiX/NimknD3aDulp6sAG ApLQOKbCS1/fSX/melHEzhyKwUcLYmTkw+3KUN3VCAO/s2AzSBkzCvbSU9EvNYDZr6iu 0CPLN24HXYmNrERfCD7vCkd7UkbrQ3zKlamhDg3W63aYJJUHZSLsCSF/pTlUCbGjMce5 aSykFszrYCOS+qpxq6ntSyAhzDtxJpG+G32RW05E4qDpPcEDSpqK4yKYGPrT5IB3RQ16 /QXM0MLnzsPeI3b8rJ1vCNat9sDbi1AbpnRQjXgeigSJjcYQKXXbse+fPMObuVcXZob4 YTKw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id f65si10767400pfb.194.2018.12.10.03.26.54 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Dec 2018 03:26:54 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1gWJi8-0008D0-5Y; Mon, 10 Dec 2018 11:26:52 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, qemu-block@nongnu.org, Fam Zheng , Igor Mammedov , "Michael S. Tsirkin" , Ben Warren , Max Reitz , Kevin Wolf , Stefan Weil Subject: [PATCH 3/3] uuid: Make qemu_uuid_bswap() take and return a QemuUUID Date: Mon, 10 Dec 2018 11:26:49 +0000 Message-Id: <20181210112649.11581-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181210112649.11581-1-peter.maydell@linaro.org> References: <20181210112649.11581-1-peter.maydell@linaro.org> MIME-Version: 1.0 Currently qemu_uuid_bswap() takes a pointer to the QemuUUID to be byte-swapped. This means it can't be used when the UUID to be swapped is in a packed member of a struct. It's also out of line with the general bswap*() functions we provide in bswap.h, which take the value to be swapped and return it. Make qemu_uuid_bswap() take a QemuUUID and return the swapped version. This fixes some clang warnings about taking the address of a packed struct member in block/vdi.c. Signed-off-by: Peter Maydell --- include/qemu/uuid.h | 2 +- block/vdi.c | 16 ++++++++-------- hw/acpi/vmgenid.c | 6 ++---- tests/vmgenid-test.c | 2 +- util/uuid.c | 10 +++++----- 5 files changed, 17 insertions(+), 19 deletions(-) -- 2.19.2 Reviewed-by: Marc-André Lureau Reviewed-by: Michael S. Tsirkin diff --git a/include/qemu/uuid.h b/include/qemu/uuid.h index 09489ce5c5e..037357d990b 100644 --- a/include/qemu/uuid.h +++ b/include/qemu/uuid.h @@ -56,6 +56,6 @@ char *qemu_uuid_unparse_strdup(const QemuUUID *uuid); int qemu_uuid_parse(const char *str, QemuUUID *uuid); -void qemu_uuid_bswap(QemuUUID *uuid); +QemuUUID qemu_uuid_bswap(QemuUUID uuid); #endif diff --git a/block/vdi.c b/block/vdi.c index 4cc726047c3..0c34f6bae46 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -203,10 +203,10 @@ static void vdi_header_to_cpu(VdiHeader *header) header->block_extra = le32_to_cpu(header->block_extra); header->blocks_in_image = le32_to_cpu(header->blocks_in_image); header->blocks_allocated = le32_to_cpu(header->blocks_allocated); - 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); + header->uuid_image = qemu_uuid_bswap(header->uuid_image); + header->uuid_last_snap = qemu_uuid_bswap(header->uuid_last_snap); + header->uuid_link = qemu_uuid_bswap(header->uuid_link); + header->uuid_parent = qemu_uuid_bswap(header->uuid_parent); } static void vdi_header_to_le(VdiHeader *header) @@ -227,10 +227,10 @@ static void vdi_header_to_le(VdiHeader *header) header->block_extra = cpu_to_le32(header->block_extra); header->blocks_in_image = cpu_to_le32(header->blocks_in_image); header->blocks_allocated = cpu_to_le32(header->blocks_allocated); - 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); + header->uuid_image = qemu_uuid_bswap(header->uuid_image); + header->uuid_last_snap = qemu_uuid_bswap(header->uuid_last_snap); + header->uuid_link = qemu_uuid_bswap(header->uuid_link); + header->uuid_parent = qemu_uuid_bswap(header->uuid_parent); } static void vdi_header_print(VdiHeader *header) diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c index d78b579a201..02717a8b0dc 100644 --- a/hw/acpi/vmgenid.c +++ b/hw/acpi/vmgenid.c @@ -30,8 +30,7 @@ void vmgenid_build_acpi(VmGenIdState *vms, GArray *table_data, GArray *guid, * first, since that's what the guest expects */ g_array_set_size(guid, VMGENID_FW_CFG_SIZE - ARRAY_SIZE(guid_le.data)); - guid_le = vms->guid; - qemu_uuid_bswap(&guid_le); + guid_le = qemu_uuid_bswap(vms->guid); /* The GUID is written at a fixed offset into the fw_cfg file * in order to implement the "OVMF SDT Header probe suppressor" * see docs/specs/vmgenid.txt for more details @@ -149,8 +148,7 @@ static void vmgenid_update_guest(VmGenIdState *vms) * however, will expect the fields to be little-endian. * Perform a byte swap immediately before writing. */ - guid_le = vms->guid; - qemu_uuid_bswap(&guid_le); + guid_le = qemu_uuid_bswap(vms->guid); /* The GUID is written at a fixed offset into the fw_cfg file * in order to implement the "OVMF SDT Header probe suppressor" * see docs/specs/vmgenid.txt for more details. diff --git a/tests/vmgenid-test.c b/tests/vmgenid-test.c index 0a6fb55f2eb..98db43f5a65 100644 --- a/tests/vmgenid-test.c +++ b/tests/vmgenid-test.c @@ -110,7 +110,7 @@ static void read_guid_from_memory(QemuUUID *guid) /* The GUID is in little-endian format in the guest, while QEMU * uses big-endian. Swap after reading. */ - qemu_uuid_bswap(guid); + *guid = qemu_uuid_bswap(*guid); } static void read_guid_from_monitor(QemuUUID *guid) diff --git a/util/uuid.c b/util/uuid.c index ebf06c049ad..5787f0978c1 100644 --- a/util/uuid.c +++ b/util/uuid.c @@ -110,10 +110,10 @@ int qemu_uuid_parse(const char *str, QemuUUID *uuid) /* Swap from UUID format endian (BE) to the opposite or vice versa. */ -void qemu_uuid_bswap(QemuUUID *uuid) +QemuUUID 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); + bswap32s(&uuid.fields.time_low); + bswap16s(&uuid.fields.time_mid); + bswap16s(&uuid.fields.time_high_and_version); + return uuid; }