From patchwork Fri Dec 18 07:30:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shmulik Ladkani X-Patchwork-Id: 558765 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 6A71D140297 for ; Fri, 18 Dec 2015 18:30:55 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=ravellosystems-com.20150623.gappssmtp.com header.i=@ravellosystems-com.20150623.gappssmtp.com header.b=e6Cm9AMD; dkim-atps=neutral Received: from localhost ([::1]:58770 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9pV7-00089p-9h for incoming@patchwork.ozlabs.org; Fri, 18 Dec 2015 02:30:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59963) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9pUL-000723-Km for qemu-devel@nongnu.org; Fri, 18 Dec 2015 02:30:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9pUK-0003V9-PV for qemu-devel@nongnu.org; Fri, 18 Dec 2015 02:30:05 -0500 Received: from mail-wm0-x229.google.com ([2a00:1450:400c:c09::229]:33345) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9pUK-0003U6-Kl for qemu-devel@nongnu.org; Fri, 18 Dec 2015 02:30:04 -0500 Received: by mail-wm0-x229.google.com with SMTP id p187so53154386wmp.0 for ; Thu, 17 Dec 2015 23:30:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ravellosystems-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Wk3UPGNW4W6eUt3dlI5s/BHxotHtPfFzN/3aMCvVwso=; b=e6Cm9AMDBVvYgK6Dh9ivdnc6bSmgMRosFP06MzPlm4gCs/okhHeFI2qI0JkKvf/NtI zJ7IaZFGejpB5bF8pn6KQwQ1qVt5thR8MQs1apQbFagzd5XnAKBmEpjk5LmbK1TWorDV k4f6zvVuAfERf3kn505tBHWkM+unsmwgNNy+XqhrGkJURiS73OjH9i0uEoUeGlzyj0ks 5Sstv6dUjgarwzFxIDiWZ1orMbBNnyNdXjqAlvDl8ysjW2DjttqaqEKuPQUFq7R5H9ur PutqJ7sarZUwwD+zih74UFNd1wOyMqVkqR7Y62MygeQZH4MAbJWE/gCG5YV445oWaFYT PXQg== 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=Wk3UPGNW4W6eUt3dlI5s/BHxotHtPfFzN/3aMCvVwso=; b=CggzHGP4MeUurv03xQEVyip7PNQ4mF60lZWe4UDtYPdlVT0Hy7VuqSoEqB+m3NVL+C 9WUADGRuQbn13Ycl5GtDRko1aKk7ZEEVGR2Ck1KMMOAJzV4cp5pjme88ZsGKe3qquyyF rDA/92uwe69Dfm7PEvEAlpYtpHTu7xnaj+rSFlhnqZLr0ADePcfd1OlzT1vAyEy7t/fO xHeYdeTVt9r0bi50FtQMNczXaNHvymnKTRagUsX5Jw8Rr3DncAfqjsGwbBYbF1QxhGeL YGNOvTFNKuJcTv0m4dPAKUZh7dgOGMbTR0GER2msDi99ZwkL1B1tkrTl73iWSNyeSL4+ 5ZLg== X-Gm-Message-State: ALoCoQnevo2QTTwJaAPt+D5/M7gPTatcRkivBDRuezb4hzSrwn4XVwfae/0Ta0EhhAVCLcOStbSmNRPjTKrVKr96+oS/pAO9TQ== X-Received: by 10.194.112.74 with SMTP id io10mr2611531wjb.149.1450423804089; Thu, 17 Dec 2015 23:30:04 -0800 (PST) Received: from honey.ravello.local ([213.57.127.2]) by smtp.gmail.com with ESMTPSA id wh10sm13511522wjb.45.2015.12.17.23.30.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 Dec 2015 23:30:03 -0800 (PST) From: Shmulik Ladkani To: Paolo Bonzini Date: Fri, 18 Dec 2015 09:30:03 +0200 Message-Id: <1450423803-12839-3-git-send-email-shmulik.ladkani@ravellosystems.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1450423803-12839-1-git-send-email-shmulik.ladkani@ravellosystems.com> References: <1450423803-12839-1-git-send-email-shmulik.ladkani@ravellosystems.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::229 Cc: Jason Wang , idan.brown@ravellosystems.com, qemu-devel@nongnu.org, Dmitry Fleytman , Cornelia Huck , Shmulik Ladkani , David Gibson Subject: [Qemu-devel] [PATCH 2/2] 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 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 --- include/hw/compat.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/hw/compat.h b/include/hw/compat.h index 3aa35c9..a1bc65d 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -2,14 +2,7 @@ #define HW_COMPAT_H #define HW_COMPAT_2_5 \ - /* empty */ - -#define HW_COMPAT_2_4 \ {\ - .driver = "virtio-blk-device",\ - .property = "scsi",\ - .value = "true",\ - },{\ .driver = "pvscsi",\ .property = "x-old-pci-configuration",\ .value = "on",\ @@ -17,6 +10,13 @@ .driver = "pvscsi",\ .property = "x-disable-pcie",\ .value = "on",\ + }, + +#define HW_COMPAT_2_4 \ + {\ + .driver = "virtio-blk-device",\ + .property = "scsi",\ + .value = "true",\ },{\ .driver = "e1000",\ .property = "extra_mac_registers",\