From patchwork Fri Jan 15 16:04:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 568193 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 03391140C04 for ; Sat, 16 Jan 2016 03:07:06 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=kF1jpNVx; dkim-atps=neutral Received: from localhost ([::1]:47793 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aK6tz-0003W8-Vm for incoming@patchwork.ozlabs.org; Fri, 15 Jan 2016 11:07:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aK6rl-0007XW-11 for qemu-devel@nongnu.org; Fri, 15 Jan 2016 11:04:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aK6rk-0003I8-0m for qemu-devel@nongnu.org; Fri, 15 Jan 2016 11:04:44 -0500 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:34155) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aK6rj-0003I3-PY for qemu-devel@nongnu.org; Fri, 15 Jan 2016 11:04:43 -0500 Received: by mail-wm0-x231.google.com with SMTP id u188so28953239wmu.1 for ; Fri, 15 Jan 2016 08:04:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=MGknIV1AwIKmvmKFxT+2GjTeveIwQAd7L+Hg3qZS0dM=; b=kF1jpNVxkiFx24BcVbPAU0tDghY6j+4dibt493RJ4udPXquYtu8iqPTp6UnxqZ1op3 AwGNIjTJnQVAAm3pBNDl/t90voUAwL26Pt4ULZO3XIy0cawN5D2Xv1xtjlM7LxFktPPG MSY+oN7GHfcvDm8KgF1mqXbZchv4UFbQL6fYXf2a2iIaxqMI8jv4I88rEaiSxph+8TOi 4Sq4XlLGpxdJI47BLBr41zKjgxNcmAzu4VXyeEEEX0euNYlIu8d51ij3Qc7Eu6mYycuA BQ0mi3sK9xmRz7iFYIYyaA6hUlCJCteeznCywYaJ1Xh5kpe9N1PeNxGYjBxUm9DARj7v W2Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=MGknIV1AwIKmvmKFxT+2GjTeveIwQAd7L+Hg3qZS0dM=; b=CksMUfafPpX7DMWPoohrYWM5ReEZvM7kOlalcS6mu6SY2Fpg7IIH85BlzSx9h2V4/w bMufGuRRZVvppvQRjUhmDuAylXJrcGIyvDcMF8XM8LS8Vdad4WG6gZG1o5iPYyuz3XLy YW31pyo+sw11KYc2K/jzqSnJMeaWu74Tbv7i4KPw9EvCoDon1vCZAOt0UEoSD6zsRUhk enbMKAmYlF5SEowqnx6IhonDQLATgXjAllcpyx9RA71TKjm72neeyoGKV9tAr/aUVemJ BdUp5rYSmNzJA25pZuvIm3E00hfgo8Tk9fJycLMJYie6uBys2DjsViutcgObpTI4XlKR wJgw== X-Gm-Message-State: ALoCoQmwQouDFUFQp2H0RGmR1zbQxsZ+VdNqHtAWKTJxwlN+qdUR12USaYl7dcOBTjzY3Xos5E0DbUZJ9NthhGbBqcc1yoqm0A== X-Received: by 10.194.103.164 with SMTP id fx4mr10854157wjb.56.1452873883171; Fri, 15 Jan 2016 08:04:43 -0800 (PST) Received: from 640k.lan (94-39-195-126.adsl-ull.clienti.tiscali.it. [94.39.195.126]) by smtp.gmail.com with ESMTPSA id c15sm3103036wmd.19.2016.01.15.08.04.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Jan 2016 08:04:42 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 15 Jan 2016 17:04:21 +0100 Message-Id: <1452873871-138914-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1452873871-138914-1-git-send-email-pbonzini@redhat.com> References: <1452873871-138914-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::231 Cc: Shmulik Ladkani Subject: [Qemu-devel] [PULL 05/15] vmw_pvscsi: x-disable-pcie, x-old-pci-configuration back-compat props are 2.5 specific 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 From: Shmulik Ladkani pvscsi's x-disable-pcie and x-old-pci-configuration backward compat properties were introduced in 952970b and d5da3ef: vmw_pvscsi: Introduce 'x-old-pci-configuration' backword compatability property vmw_pvscsi: Introduce 'x-disable-pcie' backword compatability property and were placed into HW_COMPAT_2_4. However since these commits were pulled post v2.5, move them to HW_COMPAT_2_5. Signed-off-by: Shmulik Ladkani Message-Id: <1450900558-20113-1-git-send-email-shmulik.ladkani@ravellosystems.com> Signed-off-by: Paolo Bonzini --- include/hw/compat.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/include/hw/compat.h b/include/hw/compat.h index 98df0dd..491884b 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -3,6 +3,15 @@ #define HW_COMPAT_2_5 \ {\ + .driver = "pvscsi",\ + .property = "x-old-pci-configuration",\ + .value = "on",\ + },{\ + .driver = "pvscsi",\ + .property = "x-disable-pcie",\ + .value = "on",\ + },\ + {\ .driver = "vmxnet3",\ .property = "x-old-msi-offsets",\ .value = "on",\ @@ -18,14 +27,6 @@ .property = "scsi",\ .value = "true",\ },{\ - .driver = "pvscsi",\ - .property = "x-old-pci-configuration",\ - .value = "on",\ - },{\ - .driver = "pvscsi",\ - .property = "x-disable-pcie",\ - .value = "on",\ - },{\ .driver = "e1000",\ .property = "extra_mac_registers",\ .value = "off",\