From patchwork Fri Feb 1 16:35:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 157303 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp694604jaa; Fri, 1 Feb 2019 09:15:03 -0800 (PST) X-Google-Smtp-Source: ALg8bN5NbmjP+zZf5KSSshgy4BLNc1ZIDXrrImG7M5pnYSTaGWNrU5pEeHpZd/LUS6jB7/mPjLHf X-Received: by 2002:a25:9b01:: with SMTP id y1mr39711697ybn.465.1549041303585; Fri, 01 Feb 2019 09:15:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549041303; cv=none; d=google.com; s=arc-20160816; b=eo/uc6iG1b7Uj8C+gv//jVuLF8CCfFEwVNlEvnO5U/zGs5GKEIQ7DqjB8xKooQd9ii s2ZBaBSRWMIfg7FunUVH8PmX9NfiM1t2kEcFnWvZzxMBHb+rCE8fv+Bme11PsvOswbMl oTavkA8dqXDZEovceqjHKmgZMD88NxoABjxNStYLE9E/UBlAsa+j/Dj3vsFzQqAB5OmK +Cin64iWu7lnWY3Dp790bh+bj3dazDg7+zlheWieNxOGiAnt8IRRr3RQbUzfFEIqy0xD JKd+NU5AqCMECCSElXKhnZFuZSthC0tQigQIWNKKULZEZR3wga1ZG/544AdA0Bch5vRA vbSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=ENtRjPK3g3OBzzThpwMZSuEWLFXUKNOkenO56r/FKc0=; b=XhJ+k+SLnP0GZFQ2tRxN1a8ItWETxz1sUn9eEoRQ5gObhQV81qI41DEsg3CKistNWS xD/xbZxGSGI3RVDkxhT9Xe3pIONMYhDbo2IeruH/KH+K/lSLPWeR1+1sx2fYgC92rwPV Bvw6J7V9KB0cygkI/WT+TnBaV51lRsk5XvBGs4S/eaEL95591fZQMKcwvK9O/l5qb8dj /F/MYx71vZVwGo7rkRUipP8gfumtgKKt7gNb5KV0bvBDzuvSG+0oSP7Zec/VBvnvwP2x t7JOyNSo6RAkFsQk/i3QqFeqL9q5nAnK4kH2eh5mNkHTXLxHbCIQLFcgCon4m13iJ3B7 0kAQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b203si4834100ybc.447.2019.02.01.09.15.03 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 01 Feb 2019 09:15:03 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([127.0.0.1]:58393 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpcP8-0004yW-W2 for patch@linaro.org; Fri, 01 Feb 2019 12:15:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39416) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpboG-0007wW-IZ for qemu-devel@nongnu.org; Fri, 01 Feb 2019 11:36:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpboB-0000Cy-St for qemu-devel@nongnu.org; Fri, 01 Feb 2019 11:36:56 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43152) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpbo3-000892-Qn; Fri, 01 Feb 2019 11:36:45 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AB8D042BDA; Fri, 1 Feb 2019 16:35:53 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-95.ams2.redhat.com [10.36.117.95]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B264608C6; Fri, 1 Feb 2019 16:35:52 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 1 Feb 2019 17:35:06 +0100 Message-Id: <20190201163518.31157-16-kwolf@redhat.com> In-Reply-To: <20190201163518.31157-1-kwolf@redhat.com> References: <20190201163518.31157-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 01 Feb 2019 16:35:53 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 15/27] uuid: Make qemu_uuid_bswap() take and return a QemuUUID X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell 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 Reviewed-by: Michael S. Tsirkin Reviewed-by: Marc-André Lureau Signed-off-by: Kevin Wolf --- 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.20.1 diff --git a/include/qemu/uuid.h b/include/qemu/uuid.h index 09489ce5c5..037357d990 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 4cc726047c..0c34f6bae4 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 d78b579a20..02717a8b0d 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 52cdd83ec0..ae38ee5ac0 100644 --- a/tests/vmgenid-test.c +++ b/tests/vmgenid-test.c @@ -88,7 +88,7 @@ static void read_guid_from_memory(QTestState *qts, 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(QTestState *qts, QemuUUID *guid) diff --git a/util/uuid.c b/util/uuid.c index ebf06c049a..5787f0978c 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; }