From patchwork Mon May 23 10:34:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Egger X-Patchwork-Id: 96932 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DEBFDB6EDF for ; Mon, 23 May 2011 20:46:44 +1000 (EST) Received: from localhost ([::1]:52704 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOSem-0001oL-K7 for incoming@patchwork.ozlabs.org; Mon, 23 May 2011 06:46:40 -0400 Received: from eggs.gnu.org ([140.186.70.92]:40303) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOSeW-0001o0-Qn for qemu-devel@nongnu.org; Mon, 23 May 2011 06:46:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QOSeV-0000CS-Jb for qemu-devel@nongnu.org; Mon, 23 May 2011 06:46:24 -0400 Received: from tx2ehsobe001.messaging.microsoft.com ([65.55.88.11]:6642 helo=TX2EHSOBE001.bigfish.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QOSeV-0000CN-Ds for qemu-devel@nongnu.org; Mon, 23 May 2011 06:46:23 -0400 Received: from mail120-tx2-R.bigfish.com (10.9.14.251) by TX2EHSOBE001.bigfish.com (10.9.40.21) with Microsoft SMTP Server id 14.1.225.22; Mon, 23 May 2011 10:46:22 +0000 Received: from mail120-tx2 (localhost.localdomain [127.0.0.1]) by mail120-tx2-R.bigfish.com (Postfix) with ESMTP id DAE27158A31 for ; Mon, 23 May 2011 10:46:21 +0000 (UTC) X-SpamScore: 6 X-BigFish: VPS6(z489cmzzz1202hzz8275bh8275dhz32i668h839h62h) X-Forefront-Antispam-Report: CIP:163.181.249.108; KIP:(null); UIP:(null); IPVD:NLI; H:ausb3twp01.amd.com; RD:none; EFVD:NLI Received: from mail120-tx2 (localhost.localdomain [127.0.0.1]) by mail120-tx2 (MessageSwitch) id 1306147581670125_23304; Mon, 23 May 2011 10:46:21 +0000 (UTC) Received: from TX2EHSMHS018.bigfish.com (unknown [10.9.14.248]) by mail120-tx2.bigfish.com (Postfix) with ESMTP id A0644D50054 for ; Mon, 23 May 2011 10:46:21 +0000 (UTC) Received: from ausb3twp01.amd.com (163.181.249.108) by TX2EHSMHS018.bigfish.com (10.9.99.118) with Microsoft SMTP Server id 14.1.225.22; Mon, 23 May 2011 10:46:19 +0000 X-WSS-ID: 0LLN9X4-01-0DB-02 X-M-MSG: Received: from sausexedgep01.amd.com (sausexedgep01-ext.amd.com [163.181.249.72]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by ausb3twp01.amd.com (Axway MailGate 3.8.1) with ESMTP id 2BAD3102840D for ; Mon, 23 May 2011 05:46:15 -0500 (CDT) Received: from sausexhtp02.amd.com (163.181.3.152) by sausexedgep01.amd.com (163.181.36.54) with Microsoft SMTP Server (TLS) id 8.3.106.1; Mon, 23 May 2011 05:46:21 -0500 Received: from storexhtp01.amd.com (172.24.4.3) by sausexhtp02.amd.com (163.181.3.152) with Microsoft SMTP Server (TLS) id 8.3.83.0; Mon, 23 May 2011 05:46:17 -0500 Received: from rhodium.osrc.amd.com (165.204.15.173) by storexhtp01.amd.com (172.24.4.3) with Microsoft SMTP Server id 8.3.83.0; Mon, 23 May 2011 06:46:15 -0400 Message-ID: <4DDA383F.7080908@amd.com> Date: Mon, 23 May 2011 12:34:39 +0200 From: Christoph Egger User-Agent: Mozilla/5.0 (X11; U; NetBSD amd64; en-US; rv:1.9.2.13) Gecko/20110202 Lightning/1.0b3pre Thunderbird/3.1.7 MIME-Version: 1.0 To: "qemu-devel@nongnu.org" References: <4DDA3153.4070003@amd.com> In-Reply-To: <4DDA3153.4070003@amd.com> X-OriginatorOrg: amd.com X-detected-operating-system: by eggs.gnu.org: Windows 2000 SP2+, XP SP1+ (seldom 98) X-Received-From: 65.55.88.11 Subject: [Qemu-devel] [PATCH] block/raw-posix: get right size of partition size 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 This does 2 things: - use the correct way to get the size of a disk device or partition (from haad@NetBSD.org) - if given a block device, use the character device instead. (from bouyer@NetBSD.org) From: Adam Hamsik From: Manuel Bouyer Signed-off-by: Christoph Egger s->open_flags &= ~O_ACCMODE; if (bdrv_flags & BDRV_O_RDWR) { @@ -603,7 +635,7 @@ static int raw_truncate(BlockDriverState *bs, int64_t offset) return 0; } -#ifdef __OpenBSD__ +#if defined(__OpenBSD__) || defined(__NetBSD__) static int64_t raw_getlength(BlockDriverState *bs) { BDRVRawState *s = bs->opaque; @@ -613,12 +645,22 @@ static int64_t raw_getlength(BlockDriverState *bs) if (fstat(fd, &st)) return -1; if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode)) { - struct disklabel dl; +#if defined(__NetBSD__) + struct dkwedge_info dkw; - if (ioctl(fd, DIOCGDINFO, &dl)) - return -1; - return (uint64_t)dl.d_secsize * - dl.d_partitions[DISKPART(st.st_rdev)].p_size; + if (ioctl(fd, DIOCGWEDGEINFO, &dkw) != -1) { + return dkw.dkw_size * 512; + } else { +#endif + struct disklabel dl; + + if (ioctl(fd, DIOCGDINFO, &dl)) + return -1; + return (uint64_t)dl.d_secsize * + dl.d_partitions[DISKPART(st.st_rdev)].p_size; +#if defined(__NetBSD__) + } +#endif } else return st.st_size; } diff --git a/block/raw-posix.c b/block/raw-posix.c index 6b72470..7cf6461 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -64,6 +64,13 @@ #include #endif +#ifdef __NetBSD__ +#include +#include +#include +#include +#endif + #ifdef __DragonFly__ #include #include @@ -141,7 +148,32 @@ static int raw_open_common(BlockDriverState *bs, const char *filename, { BDRVRawState *s = bs->opaque; int fd, ret; + struct stat sb; + if (lstat(filename, &sb) < 0) { + fprintf(stderr, "%s: stat failed: %s\n", filename, strerror(errno)); + return -errno; + } + if (S_ISLNK(sb.st_mode)) { + fprintf(stderr, "%s: symbolic link not supported\n", filename); + return -EINVAL; + } +#if defined(__NetBSD__) + if (S_ISBLK(sb.st_mode)) { + static char namebuf[PATH_MAX]; + const char *dp = strrchr(filename, '/'); + + if (dp == NULL) { + snprintf(namebuf, PATH_MAX, "r%s", filename); + } else { + snprintf(namebuf, PATH_MAX, "%.*s/r%s", + (int)(dp - filename), filename, dp + 1); + } + fprintf(stderr, "%s is a block device", filename); + filename = namebuf; + fprintf(stderr, ", using %s\n", filename); + } +#endif s->open_flags = open_flags | O_BINARY;