From patchwork Mon Sep 8 14:40:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?ISO-8859-1?B?MjFH?= X-Patchwork-Id: 386960 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 360681400AA for ; Tue, 9 Sep 2014 00:41:34 +1000 (EST) Received: from localhost ([::1]:43909 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XR08J-0002Vj-ST for incoming@patchwork.ozlabs.org; Mon, 08 Sep 2014 10:41:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56223) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XR07t-00025n-7t for qemu-devel@nongnu.org; Mon, 08 Sep 2014 10:41:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XR07k-00006v-7A for qemu-devel@nongnu.org; Mon, 08 Sep 2014 10:41:05 -0400 Received: from mail-pd0-x230.google.com ([2607:f8b0:400e:c02::230]:37203) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XR07j-00006k-US for qemu-devel@nongnu.org; Mon, 08 Sep 2014 10:40:56 -0400 Received: by mail-pd0-f176.google.com with SMTP id y13so3164573pdi.35 for ; Mon, 08 Sep 2014 07:40:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=7WP4ZtCV7UyYArxlIkH/enOca3aGIIHYDWWwR06K+k4=; b=usPLV2qzY3UROrGr57Zhb0uh24jnEiXYXxUQ+CkVuTULCxonjIJxFeOGAiJD73D7po 9IPPSmE9+qqMEpXRpJ+dgLTB9DBIapQg7bok9GH5r0Kj9oF2IrCevzVagg58VCNqqGNx U/FAkhLBWd1gknC9wspmPch/uiWITIGJpDOMLgg69ZQLkyjXIqQvMQ20fXjVw+tbZcHA 8sjK0YMEWZmJckcVxk19jqj57dKbYFx3Chx1eU/ZLx8j8E7PUU1KCcPYKauq7P39n+f5 Kvud7aJ1dLg6HTUWy3t5QA64E1QcPKBr3TLJ+tu00XY3ms7y9RuuwH8LGK01hq6UlMEp gILA== X-Received: by 10.68.238.137 with SMTP id vk9mr1025424pbc.165.1410187254341; Mon, 08 Sep 2014 07:40:54 -0700 (PDT) Received: from localhost.localdomain ([117.36.5.250]) by mx.google.com with ESMTPSA id rw8sm9104506pbc.11.2014.09.08.07.40.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Sep 2014 07:40:53 -0700 (PDT) From: Xiaodong Gong X-Google-Original-From: Xiaodong Gong To: kwolf@redhat.com Date: Mon, 8 Sep 2014 22:40:44 +0800 Message-Id: <1410187244-8266-1-git-send-email-gordon@localhost.localdomain> X-Mailer: git-send-email 1.8.3.1 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c02::230 Cc: qemu-devel@nongnu.org, stefanha@redhat.com, Xiaodong Gong Subject: [Qemu-devel] [PATCH] Fix improper usage of cpu_to_be32 in vpc X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Xiaodong Gong cpu_to_be32() is wrong since vhd_type is an enum constant (just a regular CPU-endian integer). Signed-off-by: Xiaodong Gong --- block/vpc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/block/vpc.c b/block/vpc.c index 055efc4..c024b4c 100644 --- a/block/vpc.c +++ b/block/vpc.c @@ -489,7 +489,7 @@ static int vpc_get_info(BlockDriverState *bs, BlockDriverInfo *bdi) BDRVVPCState *s = (BDRVVPCState *)bs->opaque; VHDFooter *footer = (VHDFooter *) s->footer_buf; - if (cpu_to_be32(footer->type) != VHD_FIXED) { + if (be32_to_cpu(footer->type) != VHD_FIXED) { bdi->cluster_size = s->block_size; } @@ -506,7 +506,7 @@ static int vpc_read(BlockDriverState *bs, int64_t sector_num, int64_t sectors, sectors_per_block; VHDFooter *footer = (VHDFooter *) s->footer_buf; - if (cpu_to_be32(footer->type) == VHD_FIXED) { + if (be32_to_cpu(footer->type) == VHD_FIXED) { return bdrv_read(bs->file, sector_num, buf, nb_sectors); } while (nb_sectors > 0) { @@ -555,7 +555,7 @@ static int vpc_write(BlockDriverState *bs, int64_t sector_num, int ret; VHDFooter *footer = (VHDFooter *) s->footer_buf; - if (cpu_to_be32(footer->type) == VHD_FIXED) { + if (be32_to_cpu(footer->type) == VHD_FIXED) { return bdrv_write(bs->file, sector_num, buf, nb_sectors); } while (nb_sectors > 0) { @@ -857,7 +857,7 @@ static int vpc_has_zero_init(BlockDriverState *bs) BDRVVPCState *s = bs->opaque; VHDFooter *footer = (VHDFooter *) s->footer_buf; - if (cpu_to_be32(footer->type) == VHD_FIXED) { + if (be32_to_cpu(footer->type) == VHD_FIXED) { return bdrv_has_zero_init(bs->file); } else { return 1;