From owner-svn-src-all@FreeBSD.ORG Sun Oct 10 20:54:01 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C8311065673; Sun, 10 Oct 2010 20:54:01 +0000 (UTC) (envelope-from randi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5BEA98FC14; Sun, 10 Oct 2010 20:54:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9AKs1n0092895; Sun, 10 Oct 2010 20:54:01 GMT (envelope-from randi@svn.freebsd.org) Received: (from randi@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9AKs1hO092893; Sun, 10 Oct 2010 20:54:01 GMT (envelope-from randi@svn.freebsd.org) Message-Id: <201010102054.o9AKs1hO092893@svn.freebsd.org> From: Randi Harper Date: Sun, 10 Oct 2010 20:54:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r213674 - head/usr.sbin/mfiutil X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Oct 2010 20:54:01 -0000 Author: randi Date: Sun Oct 10 20:54:01 2010 New Revision: 213674 URL: http://svn.freebsd.org/changeset/base/213674 Log: Fix compile with -DDEBUG by using the correct mfi_pd_ref union definition in mfireg.h. Submitted by: gcooper Reviewed by: jhb Approved by: cperciva (mentor) MFC after: 1 week Modified: head/usr.sbin/mfiutil/mfi_config.c Modified: head/usr.sbin/mfiutil/mfi_config.c ============================================================================== --- head/usr.sbin/mfiutil/mfi_config.c Sun Oct 10 20:49:33 2010 (r213673) +++ head/usr.sbin/mfiutil/mfi_config.c Sun Oct 10 20:54:01 2010 (r213674) @@ -1024,7 +1024,7 @@ dump_config(int fd, struct mfi_config_da ar->num_drives); printf(" size = %ju\n", (uintmax_t)ar->size); for (j = 0; j < ar->num_drives; j++) { - device_id = ar->pd[j].ref.device_id; + device_id = ar->pd[j].ref.v.device_id; if (device_id == 0xffff) printf(" drive MISSING\n"); else { @@ -1080,7 +1080,7 @@ dump_config(int fd, struct mfi_config_da sp = (struct mfi_spare *)p; printf(" %s spare %u ", sp->spare_type & MFI_SPARE_DEDICATED ? "dedicated" : - "global", sp->ref.device_id); + "global", sp->ref.v.device_id); printf("%s", mfi_pdstate(MFI_PD_STATE_HOT_SPARE)); printf(" backs:\n"); for (j = 0; j < sp->array_count; j++)