From patchwork Thu Feb 28 18:17:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 10833571 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AC937139A for ; Thu, 28 Feb 2019 18:25:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9851A2F5C5 for ; Thu, 28 Feb 2019 18:25:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8C4062F5F1; Thu, 28 Feb 2019 18:25:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 30D012F5C5 for ; Thu, 28 Feb 2019 18:25:22 +0000 (UTC) Received: from localhost ([127.0.0.1]:44568 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzQMz-00052A-AE for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Feb 2019 13:25:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzQFk-0000Yu-8R for qemu-devel@nongnu.org; Thu, 28 Feb 2019 13:18:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzQFV-0002H7-2l for qemu-devel@nongnu.org; Thu, 28 Feb 2019 13:17:52 -0500 Received: from mail-oi1-x243.google.com ([2607:f8b0:4864:20::243]:33098) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzQFU-0002Br-PY for qemu-devel@nongnu.org; Thu, 28 Feb 2019 13:17:37 -0500 Received: by mail-oi1-x243.google.com with SMTP id z14so17318475oid.0 for ; Thu, 28 Feb 2019 10:17:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=EwSqbdRnTzTl3dmEwc+GEA5GXiTvpVaCpm03V40SbgQ=; b=h/f4yUDlskoACyDV1GLxPBrEm2BVPSuVNYy5ur5DR7k9CrUHbAHIdyBLjtHnsVjUxy o7H+ubD/8Ve5HNkhVR4a3I7fi+oc3rqFNYCgqmS4DgoQtaG/6+aB8gzrDQU4/J1AqCUe ieaBtay4Cd1H03mJEuqnalv12IWJQG5SXGMZplIlO+bQeKUWddYtQl8qe4kFktqAKQH0 dGPij+j4A57ZyN0ClhCfNPBS842xKkJAWBNxj0ivPdijfKY5n7lKr3pQk+A0oYaCO/p4 ZdNV1v2qRATpIbOk3IZojVX7rCLg2aoJx5WQfshedyQE9TaOHUAc2ePoBO8GhrXXtr0y weoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=EwSqbdRnTzTl3dmEwc+GEA5GXiTvpVaCpm03V40SbgQ=; b=DF09YYM/e3gDcQRVc9uMzl5r7AlaDCqIrWwDpdTDoFxqdg+zq1ZmusqSdG11/q3uck uhfmjhsFuie/nuE2N4QnCYjvl/9wFsZJLn1I/+EncSCjvr4crih9i3w6Hc6yFmjUiOwx 8vfoOgbO6icomXcmOwD7AzUWlJ1ufALEBU27v7N51h2jF6dBca5xes3cSHFRNhCrJf8B ZVfa6erw6qpsVOxlXpKrT+uwDiH0NM47l+4vLToR4RedpqzFbNz9f28hRYO4uLerFoZ5 gGrIWkokDd5P+KA3OdTuvoSRxOaYRwYgFq6UqV0zxdl9tom3te7JY/EWWwnCVJD2dmpy p/dA== X-Gm-Message-State: APjAAAXonglujilvTreC+8KO7Orhqy/fYZgFy7xLwml+0M2+PH2kbDp7 0uBW2WG0PS6GANqNRF3Ivw== X-Google-Smtp-Source: AHgI3IZZ9asAvy+tUBrpDeG7VEDcdv4OR0jTFaxUq3pE3Lb0fs8AYqOwlEYw8ng5Evt1zYhPJHxdsQ== X-Received: by 2002:aca:60c1:: with SMTP id u184mr667831oib.45.1551377843814; Thu, 28 Feb 2019 10:17:23 -0800 (PST) Received: from serve.minyard.net (serve.minyard.net. [2001:470:b8f6:1b::1]) by smtp.gmail.com with ESMTPSA id y19sm7513960oih.42.2019.02.28.10.17.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Feb 2019 10:17:17 -0800 (PST) Received: from t430.minyard.net (unknown [IPv6:2001:470:b8f6:1b:b89e:c7bf:12ab:ad14]) by serve.minyard.net (Postfix) with ESMTPA id 26FF01808FA; Thu, 28 Feb 2019 18:17:14 +0000 (UTC) Received: by t430.minyard.net (Postfix, from userid 1000) id 1729B3028D0; Thu, 28 Feb 2019 12:17:14 -0600 (CST) From: minyard@acm.org To: Peter Maydell Date: Thu, 28 Feb 2019 12:17:01 -0600 Message-Id: <20190228181710.2477-11-minyard@acm.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190228181710.2477-1-minyard@acm.org> References: <20190228181710.2477-1-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::243 Subject: [Qemu-devel] [PULL 10/19] boards.h: Ignore migration for SMBus devices on older machines X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Corey Minyard , QEMU Developers , minyard@acm.org, Eduardo Habkost Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Corey Minyard Migration capability is being added for pm_smbus and SMBus devices. This change will allow backwards compatibility to be kept when migrating back to an old qemu version. Add a bool to the machine class tho keep smbus migration from happening. Future changes will use this. Signed-off-by: Corey Minyard Cc: Eduardo Habkost Cc: Marcel Apfelbaum Reviewed-by: Dr. David Alan Gilbert --- hw/i386/pc_piix.c | 1 + hw/i386/pc_q35.c | 1 + include/hw/boards.h | 1 + 3 files changed, 3 insertions(+) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 3e9037a19a..8770ecada9 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -444,6 +444,7 @@ static void pc_i440fx_3_1_machine_options(MachineClass *m) pc_i440fx_4_0_machine_options(m); m->is_default = 0; + m->smbus_no_migration_support = true; m->alias = NULL; pcmc->pvh_enabled = false; compat_props_add(m->compat_props, hw_compat_3_1, hw_compat_3_1_len); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 503eeb46f5..cfb9043e12 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -380,6 +380,7 @@ static void pc_q35_3_1_machine_options(MachineClass *m) pc_q35_4_0_machine_options(m); m->default_kernel_irqchip_split = false; + m->smbus_no_migration_support = true; m->alias = NULL; pcmc->pvh_enabled = false; compat_props_add(m->compat_props, hw_compat_3_1, hw_compat_3_1_len); diff --git a/include/hw/boards.h b/include/hw/boards.h index 05f9f45c3d..21212f0859 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -206,6 +206,7 @@ struct MachineClass { void (*numa_auto_assign_ram)(MachineClass *mc, NodeInfo *nodes, int nb_nodes, ram_addr_t size); bool ignore_boot_device_suffixes; + bool smbus_no_migration_support; HotplugHandler *(*get_hotplug_handler)(MachineState *machine, DeviceState *dev);