From patchwork Fri Jan 30 08:35:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nicholas A. Bellinger" X-Patchwork-Id: 5747911 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7C542BF440 for ; Fri, 30 Jan 2015 09:09:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B75982025A for ; Fri, 30 Jan 2015 09:09:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DD4B32024D for ; Fri, 30 Jan 2015 09:09:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751865AbbA3JJE (ORCPT ); Fri, 30 Jan 2015 04:09:04 -0500 Received: from mail-oi0-f54.google.com ([209.85.218.54]:55561 "EHLO mail-oi0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752753AbbA3JIu (ORCPT ); Fri, 30 Jan 2015 04:08:50 -0500 Received: by mail-oi0-f54.google.com with SMTP id v63so33780091oia.13 for ; Fri, 30 Jan 2015 01:08:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=l2G/cavdX5Znb9yknWx4j4HVaI1c1TRRMPOeawLuJN4=; b=m9TBuCB1hbIvcd8wiY8HuDbC6h4gsWp0Hh/MyK5yIYo1khm7Py3VXDfYG3n1k2QnJi EyP9WK1Gw6RsftufEs1tAjn0fqQ9NGOvovxdZ/3fedzbCm+zxvkTNtYMfZfy5fLkLZ54 9MdyauLw8FfBGqjr2NXAuXOrsW+L5ZqYfqFi/gg8s0LoXdHZlRjYhet1jlkqr4bX2+Yk 6mZTgPrQ7BbrDpWX0WWw5G9mYPKIdaDuhPBuZhzciLub3RmObKO3WAsiNtGi2w0qB0tB VgHK8vY5e7mO0NB9qNOeLRdjjNoDzxVRm5CWVUouAF0/dolG50bhza9o+UZD+zmKUkL+ 7DjA== X-Gm-Message-State: ALoCoQlo6qVJgzQZDsotpuO9tep6CyNDEQ3RZq5cLxGAhYW2+S697sExyyB/UksX0R6KiinwLSmF X-Received: by 10.182.246.105 with SMTP id xv9mr3135204obc.74.1422608929449; Fri, 30 Jan 2015 01:08:49 -0800 (PST) Received: from localhost.localdomain (mail.linux-iscsi.org. [67.23.28.174]) by mx.google.com with ESMTPSA id o5sm5069911obz.9.2015.01.30.01.08.48 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 30 Jan 2015 01:08:49 -0800 (PST) From: "Nicholas A. Bellinger" To: target-devel , qemu-devel Cc: kvm-devel , Paolo Bonzini , "Michael S. Tsirkin" , Nicholas Bellinger Subject: [PATCH 3/3] vhost/scsi: Add VIRTIO_F_ANY_LAYOUT host_feature bit Date: Fri, 30 Jan 2015 08:35:50 +0000 Message-Id: <1422606950-25291-4-git-send-email-nab@daterainc.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1422606950-25291-1-git-send-email-nab@daterainc.com> References: <1422606950-25291-1-git-send-email-nab@daterainc.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Nicholas Bellinger Signed-off-by: Nicholas Bellinger --- hw/scsi/vhost-scsi.c | 1 + hw/virtio/virtio-pci.c | 2 ++ include/hw/i386/pc.h | 5 +++++ 3 files changed, 8 insertions(+) diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c index 95f7b99..bfb7005 100644 --- a/hw/scsi/vhost-scsi.c +++ b/hw/scsi/vhost-scsi.c @@ -32,6 +32,7 @@ static const int kernel_feature_bits[] = { VIRTIO_RING_F_EVENT_IDX, VIRTIO_SCSI_F_HOTPLUG, VIRTIO_SCSI_F_T10_PI, + VIRTIO_F_ANY_LAYOUT, VHOST_INVALID_FEATURE_BIT }; diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 861ec95..7863dcc 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1198,6 +1198,8 @@ static const TypeInfo virtio_scsi_pci_info = { static Property vhost_scsi_pci_properties[] = { DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, DEV_NVECTORS_UNSPECIFIED), + DEFINE_PROP_BIT("any_layout", VirtIOPCIProxy, host_features, + VIRTIO_F_ANY_LAYOUT, true), DEFINE_PROP_BIT("hotplug", VirtIOPCIProxy, host_features, VIRTIO_SCSI_F_HOTPLUG, true), DEFINE_PROP_BIT("prot_info", VirtIOPCIProxy, host_features, diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index c81e2e9..16f52bd 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -322,6 +322,11 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); .value = "off",\ },\ {\ + .driver = "vhost-scsi-pci", \ + .property = "any_layout",\ + .value = "off",\ + },\ + {\ .driver = "vhost-scsi-pci",\ .property = "prot_info",\ .value = "off",\