From nobody Tue Feb 10 19:53:12 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1656267243767733.3604859302606; Sun, 26 Jun 2022 11:14:03 -0700 (PDT) Received: from localhost ([::1]:57430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o5Wlm-0002EO-Mx for importer@patchew.org; Sun, 26 Jun 2022 14:14:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o5WML-0003au-9f for qemu-devel@nongnu.org; Sun, 26 Jun 2022 13:47:46 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:45152) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o5WMJ-00009E-O2 for qemu-devel@nongnu.org; Sun, 26 Jun 2022 13:47:44 -0400 Received: from [2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab] (helo=kentang.home) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1o5WKs-0007KY-P1; Sun, 26 Jun 2022 18:46:18 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=LXmH14SVZ8DJV3hrf0A4042X6H2IoarjKDLcJ5ibVWA=; b=tGJ0ESUmCR5pzGGZ6n3a669buN DnhW+sQfMkd1VxmpMprHEoPA8DRqe0UrmSc6sk60mylCyG0tmJ8SJWUqAiW9HvOZMK+l8YzGQw0yL AElldg9Sfi5X368Wm/DxwvVd6QexDEJlk9LZIFBt5x9IoT3/t6euIHpL+moaQoEYQBEtdedr3nfZm DNLa2dkIFfZmX8eTE/KwiJ47YoJY6brbqZ70H49Dvhjq5DBQJ+WwAiEkt+++3kYnVksCk+tfbEbhG lEyBqAAMGcahZC838JRWfNSb4c9qjRVEq68q95OIjr2BX/rzXcg8gps3VNF0e+RHIOGEWbDcTYvTL ZNgyGH7ffMI/KkXpigOqkZIIMUmKUmztNApkIBnlEy01aa7P336jJzchU9MSybGyZ19WvBWYZ2H6T 5B8XBxGllF3na5uC3YtiIQ7ZN1lb9owwaqi3MhirV6O54p4Z623lAhzv1hPxpL9Sn6cdmVpINEzPf 19C2JCwTtDxwQvRjIzND2fTw1YQf6tYg4dHF40JqkufLOOZCPbAYuiWOEc72XhAbimQiY0t24esxC nrkcAQsCg85a5BqHOR6vSfmOSMbmJS3V/mGUBqxeBy0uN5DNFUucjIuagJcFjGY4iDzQL7dOIcQGT QrXoW7ioO9tmntMZ7SqJ88wQvD/TK3jjmTv+1Mor0=; From: Mark Cave-Ayland To: richard.henderson@linaro.org, qemu-devel@nongnu.org Date: Sun, 26 Jun 2022 18:45:05 +0100 Message-Id: <20220626174531.969187-30-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220626174531.969187-1-mark.cave-ayland@ilande.co.uk> References: <20220626174531.969187-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8ba4:e500:b82f:56f9:46d7:80ab X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PULL 29/55] pckbd: more vmstate_register() from i8042_mm_init() to i8042_mmio_realize() X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1656267245101100001 Content-Type: text/plain; charset="utf-8" Note in this case it is not possible to register a (new) VMStateDescription= in the DeviceClass without breaking migration compatibility for the MIPS magnum machine. Signed-off-by: Mark Cave-Ayland Acked-by: Helge Deller Message-Id: <20220624134109.881989-30-mark.cave-ayland@ilande.co.uk> Reviewed-by: Peter Maydell --- hw/input/pckbd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index 8708595eed..1ab76793ea 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -682,6 +682,9 @@ static void i8042_mmio_realize(DeviceState *dev, Error = **errp) "i8042", s->size); =20 sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->region); + + /* Note we can't use dc->vmsd without breaking migration compatibility= */ + vmstate_register(NULL, 0, &vmstate_kbd, ks); } =20 static void i8042_mmio_init(Object *obj) @@ -723,8 +726,6 @@ MMIOKBDState *i8042_mm_init(qemu_irq kbd_irq, qemu_irq = mouse_irq, s->irq_kbd =3D kbd_irq; s->irq_mouse =3D mouse_irq; =20 - vmstate_register(NULL, 0, &vmstate_kbd, s); - s->kbd =3D ps2_kbd_init(kbd_update_kbd_irq, s); s->mouse =3D ps2_mouse_init(kbd_update_aux_irq, s); =20 --=20 2.30.2