From nobody Thu May 2 07:31:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) client-ip=209.85.128.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1638397982; cv=none; d=zohomail.com; s=zohoarc; b=CwJC/rzbQEJiD28BRRhxLqUYAZWS3t9k/LgYN38TEkOtR6GbPlObsjJm7uDWRq8waFgVQOrdUpJoOlXcgqQ6bTr41dPwyJVgtHxK6ScneTLPHyB8Vt9F3ewmcEQA2b/Rynbyv8R+VFxtsVy6mdq42hHJcYdnYsxhIspHmyx6+nk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638397982; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Sender:Subject:To; bh=Mj9lZ7gqkUw1Cr+nKPUfdX+IjUX4zFOLlyujuK8+hVE=; b=iBWmh4g8tMon+20YJ9BpSd8gXjlYt82GuJWnkezykM4Bh2Kbau+2B9u/7t5nDVPyB+Xd4p8t7keddG5AZQbBL6O8OUqaNwu/KwhdZRm27TcPmqSElidU3dAU2AlHA+2wxEmoIMkET+FYUYE3qBL4TCFQNQelLHweVMbvH8ETq0E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.zohomail.com with SMTPS id 163839798229131.483671722202416; Wed, 1 Dec 2021 14:33:02 -0800 (PST) Received: by mail-wm1-f54.google.com with SMTP id k37-20020a05600c1ca500b00330cb84834fso919472wms.2 for ; Wed, 01 Dec 2021 14:33:01 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (abayonne-654-1-79-213.w86-222.abo.wanadoo.fr. [86.222.222.213]) by smtp.gmail.com with ESMTPSA id p5sm906988wrd.13.2021.12.01.14.32.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Dec 2021 14:32:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Mj9lZ7gqkUw1Cr+nKPUfdX+IjUX4zFOLlyujuK8+hVE=; b=KMppG0Bqg5nOGgf6Z0ESG/Q3ZKhlQfYyt+vLZ9Wgn5NrVcZohZqhwitTXHKkkdGoln FApoXnAnr8SnjT/6LfsLXocyhUseWueWDTda2cY7qul+T7Km+izkOybhQ5BTEr6FNKyE kJqxVGUSRpv9PWwyN7MfJwYQhSzJmNtSuWt589wwcwo9vbkKzwV/saTSYQZ4Rwdl46FV etscUUL0WmH0WSt/3qmG1ZdefEwC125FgE78JDFXK860VdvHPkxusEN0Rx9fCI7poM7z MP8dBCrCeV+0iCn5HRpCzzX+dgAOdi6qP1dh691kuSN3jULEkPEPAtELLjEMPYRCYVqk 3+yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=Mj9lZ7gqkUw1Cr+nKPUfdX+IjUX4zFOLlyujuK8+hVE=; b=Tp/cKOLcPqci5yuM1SU7CWJq+23KUsbGUwHy5zuDZgIy7mrp/af5F4BjHnswQP/K2X tohVYPsl93C7Luv2FSRpxOJ2pbejKW2XWOaFhmW6PpM+ThYoTWRq8zbiYLZufTNPzOWF MWjhKFW6L9imvsrmL67nSnA27G/XTqZP9x8UME72iMfS/OmCrwi+99sO+kfk7XggdAcg 4Fvud931TdVp+Gr6kgTH0kgP0PxJc+BzQIusaUv4fsMhj6yyEWadY3W+YcykDYl6TT1O QSLjcjcGLDzBOFoKtXThR9zMchzHOmlJ54+VUBbs5tKIHZHJpAnryzCPlhN8+UY8OvKl sE+Q== X-Gm-Message-State: AOAM5311zwRt3hMya6akhEUbhdXAcDUezM+mrtqe8E+z3ZfBYWDZEA7W 63LdX+KMZAYX+Bnjtj7sK5w= X-Google-Smtp-Source: ABdhPJz60Kh7m98LGFE576B/yRABI3tF/VfbVMz7pH6c4UAPcJv2EXEqohpFpCkFP/ZAs4zGe/gvug== X-Received: by 2002:a05:600c:4104:: with SMTP id j4mr1325815wmi.178.1638397980374; Wed, 01 Dec 2021 14:33:00 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Marcel Apfelbaum , Eduardo Habkost , "Michael S. Tsirkin" , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Calvin Buckley Subject: [PATCH] hw/i386/vmmouse: Require 'i8042' property to be set Date: Wed, 1 Dec 2021 23:32:53 +0100 Message-Id: <20211201223253.36080-1-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1638397984741100001 If the 'i8042' property is not set, mouse events handled by vmmouse_mouse_event() end calling i8042_isa_mouse_fake_event() with a NULL argument, resulting in ps2_mouse_fake_event() being called with invalid PS2MouseState pointer. Fix by requiring the 'i8042' property to be always set: $ qemu-system-x86_64 -device vmmouse qemu-system-x86_64: -device vmmouse: 'i8042' link is not set Fixes: 91c9e09147b ("vmmouse: convert to qdev") Reported-by: Calvin Buckley Resolves: https://gitlab.com/qemu-project/qemu/-/issues/752 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Amusingly 'qemu-system-x86_64 -device vmmouse,i8042=3Di8042' now works. --- hw/i386/vmmouse.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c index 3d663682863..a56c185f159 100644 --- a/hw/i386/vmmouse.c +++ b/hw/i386/vmmouse.c @@ -286,6 +286,10 @@ static void vmmouse_realizefn(DeviceState *dev, Error = **errp) =20 DPRINTF("vmmouse_init\n"); =20 + if (!s->i8042) { + error_setg(errp, "'i8042' link is not set"); + return; + } if (!object_resolve_path_type("", TYPE_VMPORT, NULL)) { error_setg(errp, "vmmouse needs a machine with vmport"); return; --=20 2.33.1