From owner-freebsd-hackers@FreeBSD.ORG Mon Oct 4 02:33:19 2010 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 27F521065672; Mon, 4 Oct 2010 02:33:19 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id BBD268FC0A; Mon, 4 Oct 2010 02:33:18 +0000 (UTC) Received: by iwn10 with SMTP id 10so1741516iwn.13 for ; Sun, 03 Oct 2010 19:33:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:date:message-id :subject:from:to:cc:content-type; bh=ldcL971yTjEN8/KnZIsClufVTDv7Zo9gFzP3yKQUnAM=; b=O8oRCE0bbtS6oNA/rv3/VzSUYwS3wrzAr+/ey7Dn2IOazzcHxROPJXFi9mQe6oEGsP 4Ww3RfYyyXZqDsD56UlNvrKWFz/PBYx/lJnSfSHj04RIM9CtkzWR/I15eiaXNZPDcPW3 HK5M+edLx2lyRoAI8lSjGn0wKAcjm+x0V+QHo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type; b=RC0ZGiQNXUxqioJ/utTHukwEBglrVv8ddW8VFOVinXrH3mUi2kE6VOsa3Mtdl7vF6u 5ffmmYu2hMjlKcpXQRCSfcfi0lbljaKNyOt0XayQRdwbHuQDpWJAlOPhx6ehuz1KSEx3 WUUdUFi4eIRH0zVdDgeZeevS3U9RAutMFfFKk= MIME-Version: 1.0 Received: by 10.231.162.13 with SMTP id t13mr9331231ibx.160.1286159597965; Sun, 03 Oct 2010 19:33:17 -0700 (PDT) Received: by 10.231.190.68 with HTTP; Sun, 3 Oct 2010 19:33:17 -0700 (PDT) Date: Sun, 3 Oct 2010 19:33:17 -0700 Message-ID: From: Garrett Cooper To: John Baldwin , scottl@freebsd.org, sbruno@freebsd.org Content-Type: multipart/mixed; boundary=00504501400cf612690491c15d0f X-Mailman-Approved-At: Mon, 04 Oct 2010 03:05:37 +0000 Cc: freebsd-hackers@freebsd.org Subject: Fix mfiutil compile with -DDEBUG X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Oct 2010 02:33:19 -0000 --00504501400cf612690491c15d0f Content-Type: text/plain; charset=ISO-8859-1 make -DDEBUG is broken in mfiutil: $ make -DDEBUG cc -O2 -pipe -fno-strict-aliasing -pipe -O2 -march=nocona -fno-builtin-strftime -DDEBUG -Wall -Wcast-align -Woverflow -Wsign-compare -Wunused -std=gnu99 -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wno-uninitialized -Wno-pointer-sign -c /usr/src/usr.sbin/mfiutil/mfi_config.c /usr/src/usr.sbin/mfiutil/mfi_config.c: In function 'dump_config': /usr/src/usr.sbin/mfiutil/mfi_config.c:1027: error: 'union mfi_pd_ref' has no member named 'device_id' /usr/src/usr.sbin/mfiutil/mfi_config.c:1083: error: 'union mfi_pd_ref' has no member named 'device_id' *** Error code 1 Stop in /usr/src/usr.sbin/mfiutil. $ device_id is a field in the v field in the mfi_pd_ref union (/sys/dev/mfi/mfireg.h): union mfi_pd_ref { struct { uint16_t device_id; uint16_t seq_num; } v; uint32_t ref; } __packed; The attached patch fixes the compile (and produces logical results) with make -DDEBUG: $ sudo /usr/obj/usr/src/usr.sbin/mfiutil/mfiutil debug mfi0 Configuration (Debug): 1 arrays, 1 volumes, 0 spares array size: 288 volume size: 256 spare size: 40 array 0 of 4 drives: size = 1951170560 drive 4 ONLINE raw size: 1953525168 non-coerced size: 1952476592 coerced size: 1951170560 drive 5 ONLINE raw size: 1953525168 non-coerced size: 1952476592 coerced size: 1951170560 drive 6 ONLINE raw size: 1953525168 non-coerced size: 1952476592 coerced size: 1951170560 drive 7 ONLINE raw size: 1953525168 non-coerced size: 1952476592 coerced size: 1951170560 volume mfid0 RAID-6 OPTIMAL primary raid level: 6 raid level qualifier: 3 secondary raid level: 0 stripe size: 7 num drives: 4 init state: 0 consistent: 1 no bgi: 0 spans: array 0 @ 0 : 1951170560 Thanks! -Garrett --00504501400cf612690491c15d0f Content-Type: application/octet-stream; name="fix-mfiutil-debug.diff" Content-Disposition: attachment; filename="fix-mfiutil-debug.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_geupz4eb0 SW5kZXg6IHVzci5zYmluL21maXV0aWwvbWZpX2NvbmZpZy5jCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHVzci5z YmluL21maXV0aWwvbWZpX2NvbmZpZy5jCShyZXZpc2lvbiAyMTMzNzcpCisrKyB1c3Iuc2Jpbi9t Zml1dGlsL21maV9jb25maWcuYwkod29ya2luZyBjb3B5KQpAQCAtMTAyNCw3ICsxMDI0LDcgQEAK IAkJICAgIGFyLT5udW1fZHJpdmVzKTsKIAkJcHJpbnRmKCIgICAgICBzaXplID0gJWp1XG4iLCAo dWludG1heF90KWFyLT5zaXplKTsKIAkJZm9yIChqID0gMDsgaiA8IGFyLT5udW1fZHJpdmVzOyBq KyspIHsKLQkJCWRldmljZV9pZCA9IGFyLT5wZFtqXS5yZWYuZGV2aWNlX2lkOworCQkJZGV2aWNl X2lkID0gYXItPnBkW2pdLnJlZi52LmRldmljZV9pZDsKIAkJCWlmIChkZXZpY2VfaWQgPT0gMHhm ZmZmKQogCQkJCXByaW50ZigiICAgICAgICBkcml2ZSBNSVNTSU5HXG4iKTsKIAkJCWVsc2UgewpA QCAtMTA4MCw3ICsxMDgwLDcgQEAKIAkJc3AgPSAoc3RydWN0IG1maV9zcGFyZSAqKXA7CiAJCXBy aW50ZigiICAgICVzIHNwYXJlICV1ICIsCiAJCSAgICBzcC0+c3BhcmVfdHlwZSAmIE1GSV9TUEFS RV9ERURJQ0FURUQgPyAiZGVkaWNhdGVkIiA6Ci0JCSAgICAiZ2xvYmFsIiwgc3AtPnJlZi5kZXZp Y2VfaWQpOworCQkgICAgImdsb2JhbCIsIHNwLT5yZWYudi5kZXZpY2VfaWQpOwogCQlwcmludGYo IiVzIiwgbWZpX3Bkc3RhdGUoTUZJX1BEX1NUQVRFX0hPVF9TUEFSRSkpOwogCQlwcmludGYoIiBi YWNrczpcbiIpOwogCQlmb3IgKGogPSAwOyBqIDwgc3AtPmFycmF5X2NvdW50OyBqKyspCg== --00504501400cf612690491c15d0f--