From patchwork Fri Dec 18 07:30:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shmulik Ladkani X-Patchwork-Id: 558764 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 99ACD140297 for ; Fri, 18 Dec 2015 18:30:51 +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=wzhnnMdY; dkim-atps=neutral Received: from localhost ([::1]:58769 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9pV3-000835-Gz for incoming@patchwork.ozlabs.org; Fri, 18 Dec 2015 02:30:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59938) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9pUG-0006uy-Hi for qemu-devel@nongnu.org; Fri, 18 Dec 2015 02:30:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9pUD-0003P9-Bo for qemu-devel@nongnu.org; Fri, 18 Dec 2015 02:30:00 -0500 Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]:37164) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9pUD-0003P0-37 for qemu-devel@nongnu.org; Fri, 18 Dec 2015 02:29:57 -0500 Received: by mail-wm0-x234.google.com with SMTP id p187so52291498wmp.0 for ; Thu, 17 Dec 2015 23:29:56 -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=z0r10JXvUCKNDU+X5qEw9lnwUqRb9NZvzvwbCrzP43s=; b=wzhnnMdY2xvl+38KitzkH20lxr6F1vnOOyFkVc3toWy449KFg6XdG5TeUWYizt6pvb QakyXd+tIc1qJ1yc4XctwoHeGPY8ukewem353q9B8fyEAXz7wVp5XllVHvdUKPJ8JuBG rGP9p507AbB+icKp8HRRsNQHM/kBJ7hyJgS/QG+vB8T6EFTuuaQaI8TSbtyxgib1SYkq lIBWW2h/CKb+1ZRFGlw5+y/Uyx8LEKT+7BWTNgcQy35HJw8yvsr3hLBXn0sV4rkrhgyZ 5doUXeNk63zME6Z831Xtldajxc9fjkLaAqm4wdFbYkW2pL12AvqGFuekE8XOrujdP5Va xPGw== 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=z0r10JXvUCKNDU+X5qEw9lnwUqRb9NZvzvwbCrzP43s=; b=j1YNOgeKoMSsnYUcJgxtE7TJkhsqKOwv4gH+HwNuuLD+22lbYlMIejuzE6HM+yb8x1 1v2lS65HtOIdtxfG8HbBh3Qrowe1P2ZOU9GZ0ZXrsCpgS4kcgugrtXoYDDCzViCa+sU5 z1D5nWiWHQt26p9SL2yTK1cunaY4sZeWxOGv/LbO/pDoIIILcNi2u2/HovLY63mvMpFr qR9ToQwx5ovzgH70DUfYLQgmHYJahRIaAla1g1lKQcWzM99Pdd2XCVU/bUyyt+yddk5X 8Mv/ptuXRIQInraLWvDUv9fzw+hSXigjULhyaEyr8CJPlVAenyHn6w63rmhE4zBinU9M KDAQ== X-Gm-Message-State: ALoCoQl7N/dLpmU/vLjpf7hc6blYIVmsRPScYfbgYUf8JjkHy2cMQfENR4hcLg3/mwg6wQ0lSQR/Jv8LyaT/myO2y2uImUe81w== X-Received: by 10.28.68.213 with SMTP id r204mr1168546wma.35.1450423796387; Thu, 17 Dec 2015 23:29:56 -0800 (PST) Received: from honey.ravello.local ([213.57.127.2]) by smtp.gmail.com with ESMTPSA id wh10sm13511522wjb.45.2015.12.17.23.29.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 Dec 2015 23:29:55 -0800 (PST) From: Shmulik Ladkani To: Paolo Bonzini Date: Fri, 18 Dec 2015 09:30:02 +0200 Message-Id: <1450423803-12839-2-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::234 Cc: Jason Wang , idan.brown@ravellosystems.com, qemu-devel@nongnu.org, Dmitry Fleytman , Cornelia Huck , Shmulik Ladkani , David Gibson Subject: [Qemu-devel] [PATCH 1/2] compat: Introduce HW_COMPAT_2_5 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 Introduce the place-holder for 2.5 back-compat properties, and the accompanying PC_COMPAT_2_5, CCW_COMPAT_2_5, SPAPR_COMPAT_2_5. Signed-off-by: Shmulik Ladkani Acked-by: Cornelia Huck Acked-by: David Gibson --- hw/i386/pc_piix.c | 1 + hw/i386/pc_q35.c | 1 + hw/ppc/spapr.c | 9 +++++++++ hw/s390x/s390-virtio-ccw.c | 9 +++++++++ include/hw/compat.h | 3 +++ include/hw/i386/pc.h | 4 ++++ 6 files changed, 27 insertions(+) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 319497e..f34b0fd 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -475,6 +475,7 @@ static void pc_i440fx_2_5_machine_options(MachineClass *m) pc_i440fx_machine_options(m); m->alias = "pc"; m->is_default = 1; + SET_MACHINE_COMPAT(m, PC_COMPAT_2_5); } DEFINE_I440FX_MACHINE(v2_5, "pc-i440fx-2.5", NULL, diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 9a12068..b3585e0 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -374,6 +374,7 @@ static void pc_q35_2_5_machine_options(MachineClass *m) { pc_q35_machine_options(m); m->alias = "q35"; + SET_MACHINE_COMPAT(m, PC_COMPAT_2_5); } DEFINE_Q35_MACHINE(v2_5, "pc-q35-2.5", NULL, diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 6bfb908..6a0bfd7 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2298,7 +2298,11 @@ static const TypeInfo spapr_machine_info = { }, }; +#define SPAPR_COMPAT_2_5 \ + HW_COMPAT_2_5 + #define SPAPR_COMPAT_2_4 \ + SPAPR_COMPAT_2_5 \ HW_COMPAT_2_4 #define SPAPR_COMPAT_2_3 \ @@ -2434,6 +2438,10 @@ static const TypeInfo spapr_machine_2_4_info = { static void spapr_machine_2_5_class_init(ObjectClass *oc, void *data) { + static GlobalProperty compat_props[] = { + SPAPR_COMPAT_2_5 + { /* end of list */ } + }; MachineClass *mc = MACHINE_CLASS(oc); sPAPRMachineClass *smc = SPAPR_MACHINE_CLASS(oc); @@ -2442,6 +2450,7 @@ static void spapr_machine_2_5_class_init(ObjectClass *oc, void *data) mc->alias = "pseries"; mc->is_default = 1; smc->dr_lmb_enabled = true; + mc->compat_props = compat_props; } static const TypeInfo spapr_machine_2_5_info = { diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 5a52ff2..3d79654 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -235,7 +235,11 @@ static const TypeInfo ccw_machine_info = { }, }; +#define CCW_COMPAT_2_5 \ + HW_COMPAT_2_5 + #define CCW_COMPAT_2_4 \ + CCW_COMPAT_2_5 \ HW_COMPAT_2_4 \ {\ .driver = TYPE_S390_SKEYS,\ @@ -296,10 +300,15 @@ static const TypeInfo ccw_machine_2_4_info = { static void ccw_machine_2_5_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); + static GlobalProperty compat_props[] = { + CCW_COMPAT_2_5 + { /* end of list */ } + }; mc->alias = "s390-ccw-virtio"; mc->desc = "VirtIO-ccw based S390 machine v2.5"; mc->is_default = 1; + mc->compat_props = compat_props; } static const TypeInfo ccw_machine_2_5_info = { diff --git a/include/hw/compat.h b/include/hw/compat.h index bcb36ef..3aa35c9 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -1,6 +1,9 @@ #ifndef HW_COMPAT_H #define HW_COMPAT_H +#define HW_COMPAT_2_5 \ + /* empty */ + #define HW_COMPAT_2_4 \ {\ .driver = "virtio-blk-device",\ diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 4bf4faf..3b445e4 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -309,7 +309,11 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); int e820_get_num_entries(void); bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); +#define PC_COMPAT_2_5 \ + HW_COMPAT_2_5 + #define PC_COMPAT_2_4 \ + PC_COMPAT_2_5 \ HW_COMPAT_2_4 \ {\ .driver = "Haswell-" TYPE_X86_CPU,\