From patchwork Fri Jan 29 19:05:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 44018 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 47523B7D21 for ; Sat, 30 Jan 2010 06:19:33 +1100 (EST) Received: from localhost ([127.0.0.1]:58667 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NawLC-0000cR-So for incoming@patchwork.ozlabs.org; Fri, 29 Jan 2010 14:17:14 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Naw9v-00031d-Ls for qemu-devel@nongnu.org; Fri, 29 Jan 2010 14:05:35 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Naw9u-00030I-17 for qemu-devel@nongnu.org; Fri, 29 Jan 2010 14:05:35 -0500 Received: from [199.232.76.173] (port=41743 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Naw9t-00030B-Ud for qemu-devel@nongnu.org; Fri, 29 Jan 2010 14:05:33 -0500 Received: from verein.lst.de ([213.95.11.210]:49406) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60) (envelope-from ) id 1Naw9s-0004MB-Pq for qemu-devel@nongnu.org; Fri, 29 Jan 2010 14:05:33 -0500 Received: from verein.lst.de (localhost [127.0.0.1]) by verein.lst.de (8.12.3/8.12.3/Debian-7.1) with ESMTP id o0TJ5VWY025467 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Fri, 29 Jan 2010 20:05:31 +0100 Received: (from hch@localhost) by verein.lst.de (8.12.3/8.12.3/Debian-7.2) id o0TJ5Vff025466; Fri, 29 Jan 2010 20:05:31 +0100 Date: Fri, 29 Jan 2010 20:05:31 +0100 From: Christoph Hellwig To: qemu-devel@nongnu.org Message-ID: <20100129190531.GD25287@lst.de> References: <20100129190417.GA25237@lst.de> Mime-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100129190417.GA25237@lst.de> User-Agent: Mutt/1.3.28i X-Spam-Score: 0 () X-Scanned-By: MIMEDefang 2.39 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: "Martin K. Petersen" Subject: [Qemu-devel] [PATCH 5/5] virtio-blk: add topology support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Export all topology information in the block config structure, guarded by a new VIRTIO_BLK_F_TOPOLOGY config flag. Note that there is no savevm support for the new information yet, as it would be a pain without the table driven savevm format. Juan has promised to send out a new version of the table driven vmstate patches for virto next week. Signed-off-by: Christoph Hellwig Index: qemu/hw/virtio-blk.c =================================================================== --- qemu.orig/hw/virtio-blk.c 2010-01-29 19:42:11.853022001 +0100 +++ qemu/hw/virtio-blk.c 2010-01-29 19:45:14.735253918 +0100 @@ -380,6 +380,10 @@ static void virtio_blk_update_config(Vir blkcfg.heads = heads; blkcfg.sectors = secs; blkcfg.size_max = 0; + blkcfg.physical_block_exp = bdrv_get_physical_block_exp(s->bs); + blkcfg.alignment_offset = 0; + blkcfg.min_io_size = bdrv_get_min_io_size(s->bs); + blkcfg.opt_io_size = bdrv_get_opt_io_size(s->bs); memcpy(config, &blkcfg, sizeof(struct virtio_blk_config)); } @@ -389,6 +393,7 @@ static uint32_t virtio_blk_get_features( features |= (1 << VIRTIO_BLK_F_SEG_MAX); features |= (1 << VIRTIO_BLK_F_GEOMETRY); + features |= (1 << VIRTIO_BLK_F_TOPOLOGY); if (bdrv_enable_write_cache(s->bs)) features |= (1 << VIRTIO_BLK_F_WCACHE); Index: qemu/hw/virtio-blk.h =================================================================== --- qemu.orig/hw/virtio-blk.h 2010-01-29 19:45:17.996022961 +0100 +++ qemu/hw/virtio-blk.h 2010-01-29 19:45:39.253318328 +0100 @@ -32,6 +32,7 @@ #define VIRTIO_BLK_F_SCSI 7 /* Supports scsi command passthru */ /* #define VIRTIO_BLK_F_IDENTIFY 8 ATA IDENTIFY supported, DEPRECATED */ #define VIRTIO_BLK_F_WCACHE 9 /* write cache enabled */ +#define VIRTIO_BLK_F_TOPOLOGY 10 /* Topology information is available */ struct virtio_blk_config { @@ -42,6 +43,10 @@ struct virtio_blk_config uint8_t heads; uint8_t sectors; uint32_t _blk_size; /* structure pad, currently unused */ + uint8_t physical_block_exp; + uint8_t alignment_offset; + uint16_t min_io_size; + uint32_t opt_io_size; } __attribute__((packed)); /* These two define direction. */