From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51731) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwZr8-0005Ft-DT for qemu-devel@nongnu.org; Mon, 16 Jun 2014 12:34:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwZqy-0007J3-GW for qemu-devel@nongnu.org; Mon, 16 Jun 2014 12:34:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47328) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwZqy-0007Iw-8r for qemu-devel@nongnu.org; Mon, 16 Jun 2014 12:33:52 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5GGXpxk001560 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 16 Jun 2014 12:33:51 -0400 From: Igor Mammedov Date: Mon, 16 Jun 2014 18:33:43 +0200 Message-Id: <1402936423-25147-5-git-send-email-imammedo@redhat.com> In-Reply-To: <1402936423-25147-1-git-send-email-imammedo@redhat.com> References: <1402936423-25147-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 4/4] fixup! pc: implement pc-dimm device abstraction List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com fix typecheck error in DEFINE_PROP_UINT64 when building with with clang, on OS X ram_addr_t is uintptr_t with size 8 bytes but compiler still refuses to accept type_check() macro as valid. It's still fixing consequences of how ram_addr_t is defined but it's safer this way than to change ram_addr_t to uint64_t unconditionally last minute. TODO: is to fix ram_addr_t on 32-bit host so that it could represent 64-bit guest addresses which is broken now if --disable-xen configure option was used. Signed-off-by: Igor Mammedov --- include/hw/mem/pc-dimm.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h index 5f80d14..0f4a6ba 100644 --- a/include/hw/mem/pc-dimm.h +++ b/include/hw/mem/pc-dimm.h @@ -52,7 +52,7 @@ typedef struct PCDIMMDevice { DeviceState parent_obj; /* public */ - ram_addr_t addr; + uint64_t addr; uint32_t node; int32_t slot; HostMemoryBackend *hostmem; -- 1.7.1