From patchwork Fri Feb 1 16:35:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 157301 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp680352jaa; Fri, 1 Feb 2019 09:03:43 -0800 (PST) X-Google-Smtp-Source: ALg8bN62Rvto9bF4NmwQ9d4uvVhPRupMptDWN50s5Xch6oCBjoyjiY5e7ipB5Uw1Nvi6EKa903py X-Received: by 2002:a81:2209:: with SMTP id i9mr38591135ywi.2.1549040623485; Fri, 01 Feb 2019 09:03:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549040623; cv=none; d=google.com; s=arc-20160816; b=PiOacxkGMkGXVkXThq+/utydsFNUDoKhkmcwZEp8O5ejs6KFfAGs2oVkT0mEUs+hhB 539lBrJB+FGX1DvyGd65M/2KeJlbzm8tBWjO3sThyAy1asTsL0B/QJtNALy1sqRrbpI1 XijsMLcQbpxs4P3DqtLtys8RrOzDBAiK9weY6B/pTva7oe//txvgbpccdegHrgKZVtDh Wc1RGf2wveOvpfnuzyRE2qXPXYG1FYagQrHAaOrTpP+8msdy5JcMBrwhWtZiSIE2Gjj5 /d3D+O2q/BZ+z3qU0LQtMvhnZyyHS2t2s3fbrN6zZ75d7e3gpKnC0LieK4NWm9fpcAdf kx4w== 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=LGTXOTjT4lgn9+PyEEIyf/9L3ose16SvxyARTpwcWCo=; b=SvL9dxf/Ne4Ga9apex5+FNqrpvxhGf9bD3ch3kXTVM1JbD/q/sqpLMyTEb42mAleMT d9A1y+MyuhfwTcMYiPB4gvVkEQR7xX16KX+PW1EYuBfFxTS8DL+08lGz1Jn+tzTw5NyP jr92gn6oFNqb+VUeJbcxllVgJUbJGOvt3MgKT1fiX1URBMGTurQnaZwJfbjHK5HIgu8s lwGfYDObg8gcqqsBtUBTp7cbcquO2x5Gpfaktt2Q+9/eXEAc3mKhhOw4vIAxZT6LOk9V tO6BC7C15vbzm8kPrBLaLoxIVrNogxsAXHBykkqaqLeW7sDApWLzGuIJGD9erlUnN9jC rgaQ== 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 d185si4984748ywb.95.2019.02.01.09.03.43 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 01 Feb 2019 09:03:43 -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]:58141 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpcEA-0003LH-Us for patch@linaro.org; Fri, 01 Feb 2019 12:03:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39111) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpbo5-0007nC-Q7 for qemu-devel@nongnu.org; Fri, 01 Feb 2019 11:36:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpbo3-0008W9-Le for qemu-devel@nongnu.org; Fri, 01 Feb 2019 11:36:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37631) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpbnt-000884-4F; Fri, 01 Feb 2019 11:36:33 -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 C4B1C796E0; Fri, 1 Feb 2019 16:35:50 +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 B2505608C8; Fri, 1 Feb 2019 16:35:49 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 1 Feb 2019 17:35:04 +0100 Message-Id: <20190201163518.31157-14-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.25]); Fri, 01 Feb 2019 16:35:50 +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 13/27] block/vpc: Don't take address of fields in packed structs 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 Taking the address of a field in a packed struct is a bad idea, because it might not be actually aligned enough for that pointer type (and thus cause a crash on dereference on some host architectures). Newer versions of clang warn about this. Avoid the bug by generating the UUID into a local variable which is definitely safely aligned and then copying it into place. Signed-off-by: Peter Maydell Signed-off-by: Kevin Wolf --- block/vpc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/block/vpc.c b/block/vpc.c index d886465b7e..52ab717642 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -979,6 +979,7 @@ static int coroutine_fn vpc_co_create(BlockdevCreateOptions *opts, int64_t total_size; int disk_type; int ret = -EIO; + QemuUUID uuid; assert(opts->driver == BLOCKDEV_DRIVER_VPC); vpc_opts = &opts->u.vpc; @@ -1062,7 +1063,8 @@ static int coroutine_fn vpc_co_create(BlockdevCreateOptions *opts, footer->type = cpu_to_be32(disk_type); - qemu_uuid_generate(&footer->uuid); + qemu_uuid_generate(&uuid); + footer->uuid = uuid; footer->checksum = cpu_to_be32(vpc_checksum(buf, HEADER_SIZE)); From patchwork Fri Feb 1 16:35:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 157300 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp677976jaa; Fri, 1 Feb 2019 09:01:50 -0800 (PST) X-Google-Smtp-Source: AHgI3IbaUD67o8Z4nq31IzR9UeQuGukm4BFopLf9IwXRQZqlSpAPQnkLBRFxQW7/nIfM17knG0/E X-Received: by 2002:a25:c7cd:: with SMTP id w196mr22476284ybe.108.1549040510848; Fri, 01 Feb 2019 09:01:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549040510; cv=none; d=google.com; s=arc-20160816; b=o09RYh/x4vPNR/iUuH7nf3GeCjNp7sHS1gd7cmS21D4j65BhjF/YRDFbnII9CZ5Hjy akyuAQOs7QxF8fGLBr1PCI2wlxBktM/TfAbK2VGOnWsoDhOwHdx+EbU81htpJSLmc51N OLEVDtly49JbpIGhpzBCx8SwuGdmB1BzXJp9AQ9eN/jq4P7DipXV9fZULsBIyZY3CzPR ZNlbA6NEON10spMa2v8W/sNltiN6iCN0VdU3E34fKC8ISWZBHjiYsijIYSZpIK17fmxx XFFjkicu5yc+BuuHfq7knaljo4HyrcMaHOtECAR9DqRbfN9WbBHM4d55DYXbwzPjOFhn t+dA== 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=kZ16yPMCXFzDjr3Y3zBPeCclUsrnxR7/5zM9/MGGX38=; b=TkCY/Rz48V/asVw1BFznWysoZyVZUwrehaJwICACEOo5f8WUYBtRDmg10rOn1tnoC3 xNANoXudqPfm6eKA40J/o1yeyQDAApDp9un4uOPhgpHBhzT2qSm9c6KNRgUp/p1w/DU9 1glnKkY7SQ2cAfPpIwpa8XxV6Tx1IBGrj+58OLbtwofsIRKruuhedirQSTiWdxso7e8/ qfUs4W5Gy+B2GpzPtrKHFnrR4BU3NPQzFfYiPsoVQ8xY0iLyYuw2MSK9hpcavU3iZDWu 6Pdo88ei2l/LIsVMTYUQtVNX9txZh0wg2mL3XlhZhF22lRFJLgRb1UF3k7O2ZUxLvtHR Duag== 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 m7si603275ywf.351.2019.02.01.09.01.50 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 01 Feb 2019 09:01:50 -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]:58089 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpcCM-0001sI-BY for patch@linaro.org; Fri, 01 Feb 2019 12:01:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39540) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpboN-00084I-S0 for qemu-devel@nongnu.org; Fri, 01 Feb 2019 11:37:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpboK-0000IR-Dq for qemu-devel@nongnu.org; Fri, 01 Feb 2019 11:37:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40388) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gpbo8-00088L-4i; Fri, 01 Feb 2019 11:36:48 -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 32A3FA329C; Fri, 1 Feb 2019 16:35:52 +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 1E037608C6; Fri, 1 Feb 2019 16:35:50 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 1 Feb 2019 17:35:05 +0100 Message-Id: <20190201163518.31157-15-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.39]); Fri, 01 Feb 2019 16:35:52 +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 14/27] block/vdi: Don't take address of fields in packed structs 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 Taking the address of a field in a packed struct is a bad idea, because it might not be actually aligned enough for that pointer type (and thus cause a crash on dereference on some host architectures). Newer versions of clang warn about this. Instead of passing UUID related functions the address of a possibly unaligned QemuUUID struct, use local variables and then copy to/from the struct field as appropriate. Signed-off-by: Peter Maydell Signed-off-by: Kevin Wolf --- block/vdi.c | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) -- 2.20.1 diff --git a/block/vdi.c b/block/vdi.c index 2380daa583..4cc726047c 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -235,7 +235,8 @@ static void vdi_header_to_le(VdiHeader *header) static void vdi_header_print(VdiHeader *header) { - char uuid[37]; + char uuidstr[37]; + QemuUUID uuid; logout("text %s", header->text); logout("signature 0x%08x\n", header->signature); logout("header size 0x%04x\n", header->header_size); @@ -254,14 +255,18 @@ static void vdi_header_print(VdiHeader *header) logout("block extra 0x%04x\n", header->block_extra); logout("blocks tot. 0x%04x\n", header->blocks_in_image); logout("blocks all. 0x%04x\n", header->blocks_allocated); - qemu_uuid_unparse(&header->uuid_image, uuid); - logout("uuid image %s\n", uuid); - qemu_uuid_unparse(&header->uuid_last_snap, uuid); - logout("uuid snap %s\n", uuid); - qemu_uuid_unparse(&header->uuid_link, uuid); - logout("uuid link %s\n", uuid); - qemu_uuid_unparse(&header->uuid_parent, uuid); - logout("uuid parent %s\n", uuid); + uuid = header->uuid_image; + qemu_uuid_unparse(&uuid, uuidstr); + logout("uuid image %s\n", uuidstr); + uuid = header->uuid_last_snap; + qemu_uuid_unparse(&uuid, uuidstr); + logout("uuid snap %s\n", uuidstr); + uuid = header->uuid_link; + qemu_uuid_unparse(&uuid, uuidstr); + logout("uuid link %s\n", uuidstr); + uuid = header->uuid_parent; + qemu_uuid_unparse(&uuid, uuidstr); + logout("uuid parent %s\n", uuidstr); } static int coroutine_fn vdi_co_check(BlockDriverState *bs, BdrvCheckResult *res, @@ -368,6 +373,7 @@ static int vdi_open(BlockDriverState *bs, QDict *options, int flags, size_t bmap_size; int ret; Error *local_err = NULL; + QemuUUID uuid_link, uuid_parent; bs->file = bdrv_open_child(NULL, options, "file", bs, &child_file, false, errp); @@ -395,6 +401,9 @@ static int vdi_open(BlockDriverState *bs, QDict *options, int flags, goto fail; } + uuid_link = header.uuid_link; + uuid_parent = header.uuid_parent; + if (header.disk_size % SECTOR_SIZE != 0) { /* 'VBoxManage convertfromraw' can create images with odd disk sizes. We accept them but round the disk size to the next multiple of @@ -444,11 +453,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 (!qemu_uuid_is_null(&header.uuid_link)) { + } else if (!qemu_uuid_is_null(&uuid_link)) { error_setg(errp, "unsupported VDI image (non-NULL link UUID)"); ret = -ENOTSUP; goto fail; - } else if (!qemu_uuid_is_null(&header.uuid_parent)) { + } else if (!qemu_uuid_is_null(&uuid_parent)) { error_setg(errp, "unsupported VDI image (non-NULL parent UUID)"); ret = -ENOTSUP; goto fail; @@ -733,6 +742,7 @@ static int coroutine_fn vdi_co_do_create(BlockdevCreateOptions *create_options, BlockDriverState *bs_file = NULL; BlockBackend *blk = NULL; uint32_t *bmap = NULL; + QemuUUID uuid; assert(create_options->driver == BLOCKDEV_DRIVER_VDI); vdi_opts = &create_options->u.vdi; @@ -819,8 +829,10 @@ static int coroutine_fn vdi_co_do_create(BlockdevCreateOptions *create_options, if (image_type == VDI_TYPE_STATIC) { header.blocks_allocated = blocks; } - qemu_uuid_generate(&header.uuid_image); - qemu_uuid_generate(&header.uuid_last_snap); + qemu_uuid_generate(&uuid); + header.uuid_image = uuid; + qemu_uuid_generate(&uuid); + header.uuid_last_snap = uuid; /* There is no need to set header.uuid_link or header.uuid_parent here. */ if (VDI_DEBUG) { vdi_header_print(&header); 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; }