From nobody Mon Apr 29 16:39:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517729498430960.5945170182562; Sat, 3 Feb 2018 23:31:38 -0800 (PST) Received: from localhost ([::1]:43291 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eiEly-0004Wi-3C for importer@patchew.org; Sun, 04 Feb 2018 02:31:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44554) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eiEkH-0003Us-J4 for qemu-devel@nongnu.org; Sun, 04 Feb 2018 02:29:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eiEkG-0002vM-NY for qemu-devel@nongnu.org; Sun, 04 Feb 2018 02:29:49 -0500 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:39014) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eiEkG-0002vD-HG for qemu-devel@nongnu.org; Sun, 04 Feb 2018 02:29:48 -0500 Received: by mail-wm0-x241.google.com with SMTP id b21so20016267wme.4 for ; Sat, 03 Feb 2018 23:29:48 -0800 (PST) Received: from localhost.localdomain ([172.94.69.122]) by smtp.gmail.com with ESMTPSA id x37sm5748043edx.3.2018.02.03.23.29.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 03 Feb 2018 23:29:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9md0eljbea3aikQGBmzU0iGLADPKiPu0wkzTX0mkv7A=; b=W3A/7rkMAXEOzhcZuFegmEDpVA+N+bI6LUiTP+4p/GpN0Snw3QBSXvYClECPi3ivg0 DSf1s92mKdSp9btytLfuQsJ8PkpNWVEDVWApK9s4t4dxkgYMFAfGz0x0spAVOKVLJMY+ 3GMaUh9qwmrY2cxW3MPqozTwLZw2zw4jBTe1D0RTExzuam+Sm23zVCco7hP2wBopiIQe 8AMiImRngv0EJDw3YsqXtNi3pg3SevwJOrDnb+hqlCSoumA14OxEWfaPlAqnSqV1t1uZ Ym+YsUk7W1mqikaSzpmBrSUgFduMr6VVxS2t8GY8q6v/hOjtKAOWKE+JdLUXE94FdWW3 54xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9md0eljbea3aikQGBmzU0iGLADPKiPu0wkzTX0mkv7A=; b=p5O+OOSfQO+l96JxkgbBWnEE9FaW/1uVd6d2lweifSll8D82TdLnQVcJ1Yes5XuUji tDgdLXHsxdg0qp6orBR0AcbQdiGnkSpfZAa/wFoTCBGxghX3sx/eo/u89701fT6b6c/1 DTDe0d/N04vwdDXfQ8+mfEVysnfHeHIuds8WnWzwLH0iSPIQQpIwiP/G3nVX/0fXgf9Q V4cixTgqGzRdQDBzZ/U8WrVYqyW06YgmAUti3gNM9z2b4ZXXLln2pISizgQiTd/smQhN 7HdceaqEI5v8fBmgv5KBGkI1N6b/GDzbMJi1UQCBjhFH52yBX4DUTWbL/+6+goeez828 eAew== X-Gm-Message-State: AKwxyte9SeGUMzAa6OqD6lA+vYdoo9llyfPZnvQCVPzUPgnQHV1cyNFZ DWweqBV+Hk+lOiUYfPy9BFy2v8TyWdQ= X-Google-Smtp-Source: AH8x224tKFHB6BuM4zKwPgInxkOKfZDICqLFNzTU41CfUDXi1yFZJq7paLpSkwgJ9it2dgCzFABoqw== X-Received: by 10.80.213.94 with SMTP id f30mr19015990edj.38.1517729387533; Sat, 03 Feb 2018 23:29:47 -0800 (PST) From: Zihan Yang To: qemu-devel@nongnu.org Date: Sun, 4 Feb 2018 15:28:22 +0800 Message-Id: <1517729303-32043-2-git-send-email-whois.zihan.yang@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517729303-32043-1-git-send-email-whois.zihan.yang@gmail.com> References: <1517729303-32043-1-git-send-email-whois.zihan.yang@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PATCH 1/2] hw/input/pckdb: put TYPE_I8042 into a single header file 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: Paolo Bonzini , Zihan Yang , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This allows the macro to be used elsewhere, for example, when adding link property to vmmouse object. Signed-off-by: Zihan Yang --- hw/input/pckbd.c | 2 +- hw/input/pckbd.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 hw/input/pckbd.h diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c index c479f82..d517938 100644 --- a/hw/input/pckbd.c +++ b/hw/input/pckbd.c @@ -27,6 +27,7 @@ #include "hw/i386/pc.h" #include "hw/input/ps2.h" #include "sysemu/sysemu.h" +#include "pckbd.h" =20 /* debug PC keyboard */ //#define DEBUG_KBD @@ -480,7 +481,6 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq, qemu_register_reset(kbd_reset, s); } =20 -#define TYPE_I8042 "i8042" #define I8042(obj) OBJECT_CHECK(ISAKBDState, (obj), TYPE_I8042) =20 typedef struct ISAKBDState { diff --git a/hw/input/pckbd.h b/hw/input/pckbd.h new file mode 100644 index 0000000..9cacd0a --- /dev/null +++ b/hw/input/pckbd.h @@ -0,0 +1,6 @@ +#ifndef QEMU_PCKCD_H +#define QEMU_PCKCD_H + +#define TYPE_I8042 "i8042" + +#endif --=20 2.7.4 From nobody Mon Apr 29 16:39:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1517729509370560.6654019941964; Sat, 3 Feb 2018 23:31:49 -0800 (PST) Received: from localhost ([::1]:43295 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eiEmC-0004fV-K7 for importer@patchew.org; Sun, 04 Feb 2018 02:31:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44580) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eiEkR-0003cX-LS for qemu-devel@nongnu.org; Sun, 04 Feb 2018 02:30:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eiEkO-00031E-Ff for qemu-devel@nongnu.org; Sun, 04 Feb 2018 02:29:59 -0500 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:40888) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eiEkO-0002zd-8c for qemu-devel@nongnu.org; Sun, 04 Feb 2018 02:29:56 -0500 Received: by mail-wm0-x242.google.com with SMTP id v123so20011431wmd.5 for ; Sat, 03 Feb 2018 23:29:56 -0800 (PST) Received: from localhost.localdomain ([172.94.69.122]) by smtp.gmail.com with ESMTPSA id x37sm5748043edx.3.2018.02.03.23.29.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 03 Feb 2018 23:29:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hJZn2cGxAl/YifO3bl97rwtlZiv5W6L2kamFYXP8+8Y=; b=k5INbrcQwO3cv/zWNnV0VDvkC0ix3mczv+nK4J5BeYQHds+afFh3+cTDUdLXz9u0Oe 1UBo0NS0w5QoCYk446Iy+smS80SDzYcxLflbw/bCkrxqErsfioqSp5Pstsy+1IpAyCwU pATUH3A0vhYf2ZEfQUKygpE4H7QDvA3JPqDbEXUs4cnAiU/SaWpKM/BylWvLfuutAOq1 x9bbTV/3p4LEMtvDJI2ouG2E0HYKl+3WLOOV1/ctWTRzH72HtiUlXcXIZJMji3lZVjFT AA9WKWu2Q6wJwVsdKhPswMjKXJy+Y40edgb2uC1doQ70CfGfTfmvf646uHGdNhRta4kU CZVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hJZn2cGxAl/YifO3bl97rwtlZiv5W6L2kamFYXP8+8Y=; b=h2l8JIUKaTbmUeI9TIqzVnjxfK18HduoW9mV61jQBYCPFuEoZW3He5a3Fyu5ujGj7U 9rWDYDRf1pmcVD2rSQHecLnKIniITKN3b0dspORUDw5cOzs7FFfI1HyEqt/iAeZAcE/O lcTz6c7j3DHNV3I20epFxiGdptDmkkvQNmzAAwAhvg0jt1StMfPDJEXyvufiS5ETJ65h IR6KVFHejwTdlcbYULJe2b0SS2/imb/Zdr/GtaeG1udA+SQ8FLwR/DPwTv8ury9RgPJV fmkwnlo3r3XIhViYL+N8P4NYbq+DtY+vBOav7KFE2Sou/wqDDKHu+dVHMiRgW9/yQdmf fJcQ== X-Gm-Message-State: AKwxytew4fTV1gI0uAfDq5HDjpi17cR44j8tSECqOP37sm4MEqjTVlI9 6jUja/gxpPLHtcP2FwhE9CWnh8b8/U8= X-Google-Smtp-Source: AH8x225PXV3BUMXq4sfz8NSV/uoR6I2BKWp8VZsPUUDjWaQ3nd+7aqLohgEkCuBO3649XJCE3YPFPA== X-Received: by 10.80.181.85 with SMTP id z21mr74217192edd.150.1517729395158; Sat, 03 Feb 2018 23:29:55 -0800 (PST) From: Zihan Yang To: qemu-devel@nongnu.org Date: Sun, 4 Feb 2018 15:28:23 +0800 Message-Id: <1517729303-32043-3-git-send-email-whois.zihan.yang@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1517729303-32043-1-git-send-email-whois.zihan.yang@gmail.com> References: <1517729303-32043-1-git-send-email-whois.zihan.yang@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PATCH 2/2] vmmouse: change qdev pointer property to qom link 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: Eduardo Habkost , Zihan Yang , "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The ps2_mouse property of vmmouse is still pointer type which is defined by DEFINE_PROP_PTR. But qdev pointer property should be avoided. Convert it into QOM link relationship Signed-off-by: Zihan Yang --- hw/i386/pc.c | 2 +- hw/i386/vmmouse.c | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index ccc50ba..63f49b2 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1598,7 +1598,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *= gsi, } if (vmmouse) { DeviceState *dev =3D DEVICE(vmmouse); - qdev_prop_set_ptr(dev, "ps2_mouse", i8042); + object_property_set_link(OBJECT(dev), OBJECT(i8042), "ps2_mouse", = NULL); qdev_init_nofail(dev); } port92 =3D isa_create_simple(isa_bus, "port92"); diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c index 65ef553..49d4170 100644 --- a/hw/i386/vmmouse.c +++ b/hw/i386/vmmouse.c @@ -26,6 +26,8 @@ #include "ui/console.h" #include "hw/i386/pc.h" #include "hw/qdev.h" +#include "hw/input/pckbd.h" +#include "qapi/error.h" =20 /* debug only vmmouse */ //#define DEBUG_VMMOUSE @@ -271,10 +273,15 @@ static void vmmouse_realizefn(DeviceState *dev, Error= **errp) vmport_register(VMMOUSE_DATA, vmmouse_ioport_read, s); } =20 -static Property vmmouse_properties[] =3D { - DEFINE_PROP_PTR("ps2_mouse", VMMouseState, ps2_mouse), - DEFINE_PROP_END_OF_LIST(), -}; +static void vmmouse_initfn(Object *obj) +{ + VMMouseState *s =3D VMMOUSE(obj); + + object_property_add_link(obj, "ps2_mouse", TYPE_I8042, + (Object **)&s->ps2_mouse, + qdev_prop_allow_set_link_before_realize, + 0, &error_abort); +} =20 static void vmmouse_class_initfn(ObjectClass *klass, void *data) { @@ -283,15 +290,13 @@ static void vmmouse_class_initfn(ObjectClass *klass, = void *data) dc->realize =3D vmmouse_realizefn; dc->reset =3D vmmouse_reset; dc->vmsd =3D &vmstate_vmmouse; - dc->props =3D vmmouse_properties; - /* Reason: pointer property "ps2_mouse" */ - dc->user_creatable =3D false; } =20 static const TypeInfo vmmouse_info =3D { .name =3D TYPE_VMMOUSE, .parent =3D TYPE_ISA_DEVICE, .instance_size =3D sizeof(VMMouseState), + .instance_init =3D vmmouse_initfn, .class_init =3D vmmouse_class_initfn, }; =20 --=20 2.7.4