From patchwork Sun Aug 12 20:47:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 176804 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 066612C0087 for ; Mon, 13 Aug 2012 06:47:55 +1000 (EST) Received: from localhost ([::1]:41030 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T0f4i-00047L-Kx for incoming@patchwork.ozlabs.org; Sun, 12 Aug 2012 16:47:52 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34108) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T0f4Z-00045s-Vh for qemu-devel@nongnu.org; Sun, 12 Aug 2012 16:47:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T0f4Y-0002Gj-Fk for qemu-devel@nongnu.org; Sun, 12 Aug 2012 16:47:43 -0400 Received: from mail-ob0-f173.google.com ([209.85.214.173]:38794) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T0f4Y-0002GN-9b for qemu-devel@nongnu.org; Sun, 12 Aug 2012 16:47:42 -0400 Received: by obbta14 with SMTP id ta14so5512829obb.4 for ; Sun, 12 Aug 2012 13:47:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:in-reply-to:references:user-agent:date :message-id:mime-version:content-type:x-gm-message-state; bh=Zui42N79A4FqgPPi/aldgvTR99BttYD7yarAQuAGxvM=; b=FaOue6jzx6F0mz3IZ0y34znHzPOhmr2rK6fKAIYofJ5LINI9ke2wJ/FBdL4qA4y76O UaAoOc2PYzt7Emr/UvmZvqSSTbXvUN0vdLy6SemQ5akJYpeF59Ra/UI0muD4iUF0GNfk DmYhimj5gsbKnoGHREDFPDudYvCjgXjw+W9p/iaRLk8dWzGXhFl4bFGvrN318Q/VYLD2 5dvkRpBX39ShicewLIpXCOfq/OXhlWfKZnINSt02P6ukHfToBK0EcBTktjEeRY06ad+N F0PZpqyxH8GDCFPWXgmST35HnOzr2foonwD3xuhKuUosugk76n/Fg/ANePhQkyPrmkLo y91g== Received: by 10.182.116.2 with SMTP id js2mr7989113obb.38.1344804461266; Sun, 12 Aug 2012 13:47:41 -0700 (PDT) Received: from titi.smtp.gmail.com (cpe-70-123-145-39.austin.res.rr.com. [70.123.145.39]) by mx.google.com with ESMTPS id y6sm3323607oed.2.2012.08.12.13.47.39 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 12 Aug 2012 13:47:40 -0700 (PDT) From: Anthony Liguori To: Kevin Wolf In-Reply-To: <1344617249-6620-6-git-send-email-kwolf@redhat.com> References: <1344617249-6620-1-git-send-email-kwolf@redhat.com> <1344617249-6620-6-git-send-email-kwolf@redhat.com> User-Agent: Notmuch/0.13.2+93~ged93d79 (http://notmuchmail.org) Emacs/23.3.1 (x86_64-pc-linux-gnu) Date: Sun, 12 Aug 2012 15:47:21 -0500 Message-ID: <87wr13bzxi.fsf@codemonkey.ws> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQm3ybfuON3HHrWV6E3uMVmENbHi7Qt5k9XwIcvDMaKwR4UHLQ9g+QalsuvssxJTt+Gjf6Na X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.214.173 Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: Re: [Qemu-devel] [PATCH 05/11] virtio-blk: support VIRTIO_BLK_F_CONFIG_WCE 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 Kevin Wolf writes: > From: Paolo Bonzini > > Also rename VIRTIO_BLK_F_WCACHE to VIRTIO_BLK_F_WCE for consistency with > the spec. > > Signed-off-by: Paolo Bonzini > Signed-off-by: Kevin Wolf This broke qemu-test because it changed the pc-1.0 machine type: Setting guest RANDOM seed to 47167 *** Running tests *** Running test /tests/finger-print.sh... OK Guest fingerprint changed for pc-1.0! Need to make this a qdev-visible feature and then add compatibility properties for all of the old machine types. Regards, Anthony Liguori > --- > hw/virtio-blk.c | 16 ++++++++++++++-- > hw/virtio-blk.h | 4 +++- > 2 files changed, 17 insertions(+), 3 deletions(-) > > diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c > index 552b3b6..97bb4bd 100644 > --- a/hw/virtio-blk.c > +++ b/hw/virtio-blk.c > @@ -510,9 +510,19 @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config) > blkcfg.size_max = 0; > blkcfg.physical_block_exp = get_physical_block_exp(s->conf); > blkcfg.alignment_offset = 0; > + blkcfg.wce = bdrv_enable_write_cache(s->bs); > memcpy(config, &blkcfg, sizeof(struct virtio_blk_config)); > } > > +static void virtio_blk_set_config(VirtIODevice *vdev, const uint8_t *config) > +{ > + VirtIOBlock *s = to_virtio_blk(vdev); > + struct virtio_blk_config blkcfg; > + > + memcpy(&blkcfg, config, sizeof(blkcfg)); > + bdrv_set_enable_write_cache(s->bs, blkcfg.wce != 0); > +} > + > static uint32_t virtio_blk_get_features(VirtIODevice *vdev, uint32_t features) > { > VirtIOBlock *s = to_virtio_blk(vdev); > @@ -523,9 +533,10 @@ static uint32_t virtio_blk_get_features(VirtIODevice *vdev, uint32_t features) > features |= (1 << VIRTIO_BLK_F_BLK_SIZE); > features |= (1 << VIRTIO_BLK_F_SCSI); > > + features |= (1 << VIRTIO_BLK_F_CONFIG_WCE); > if (bdrv_enable_write_cache(s->bs)) > - features |= (1 << VIRTIO_BLK_F_WCACHE); > - > + features |= (1 << VIRTIO_BLK_F_WCE); > + > if (bdrv_is_read_only(s->bs)) > features |= 1 << VIRTIO_BLK_F_RO; > > @@ -610,6 +621,7 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, VirtIOBlkConf *blk) > sizeof(VirtIOBlock)); > > s->vdev.get_config = virtio_blk_update_config; > + s->vdev.set_config = virtio_blk_set_config; > s->vdev.get_features = virtio_blk_get_features; > s->vdev.reset = virtio_blk_reset; > s->bs = blk->conf.bs; > diff --git a/hw/virtio-blk.h b/hw/virtio-blk.h > index 79ebccc..35834cf 100644 > --- a/hw/virtio-blk.h > +++ b/hw/virtio-blk.h > @@ -31,8 +31,9 @@ > #define VIRTIO_BLK_F_BLK_SIZE 6 /* Block size of disk is available*/ > #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_WCE 9 /* write cache enabled */ > #define VIRTIO_BLK_F_TOPOLOGY 10 /* Topology information is available */ > +#define VIRTIO_BLK_F_CONFIG_WCE 11 /* write cache configurable */ > > #define VIRTIO_BLK_ID_BYTES 20 /* ID string length */ > > @@ -49,6 +50,7 @@ struct virtio_blk_config > uint8_t alignment_offset; > uint16_t min_io_size; > uint32_t opt_io_size; > + uint8_t wce; > } QEMU_PACKED; > > /* These two define direction. */ > -- > 1.7.6.5 --- fingerprints/pc-1.0.x86_64 2011-12-18 13:08:40.000000000 -0600 +++ fingerprint.txt 2012-08-12 13:30:48.000000000 -0500 @@ -55,7 +55,7 @@ /sys/bus/pci/devices/0000:00:06.0/subsystem_device=0x0002 /sys/bus/pci/devices/0000:00:06.0/class=0x010000 /sys/bus/pci/devices/0000:00:06.0/revision=0x00 -/sys/bus/pci/devices/0000:00:06.0/virtio/host-features=0x710006d4 +/sys/bus/pci/devices/0000:00:06.0/virtio/host-features=0x71000ed4 /sys/class/dmi/id/bios_vendor=Bochs /sys/class/dmi/id/bios_date=01/01/2007 /sys/class/dmi/id/bios_version=Bochs