From patchwork Thu Feb 23 10:48:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= X-Patchwork-Id: 9588151 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9956D604A2 for ; Thu, 23 Feb 2017 10:51:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 85BA328609 for ; Thu, 23 Feb 2017 10:51:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7A81B28695; Thu, 23 Feb 2017 10:51:26 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EB8C828610 for ; Thu, 23 Feb 2017 10:51:23 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgqxC-0005qY-Ke; Thu, 23 Feb 2017 10:48:54 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cgqxB-0005pu-H4 for xen-devel@lists.xen.org; Thu, 23 Feb 2017 10:48:53 +0000 Received: from [193.109.254.147] by server-11.bemta-6.messagelabs.com id 5B/9E-04971-41EBEA85; Thu, 23 Feb 2017 10:48:52 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrKIsWRWlGSWpSXmKPExsXilM8ioyuyb12 EQeczHoslHxezODB6HN39mymAMYo1My8pvyKBNWPBzp/MBXM5K1a2/mFsYGzm6GLk4hASWMUo cWDOU5YuRg4gJ1vix+ISkDiLwCVmid4/B5m7GDk5JAQ8JXbevMkOYTtL9Ew5wgTRfIhR4nzrM iaQBJtAqET79hmsILaIgLTEtc+XGUGKmAXmMkp8/rcNrFtYIFziZN8PFhCbRUBV4v6tU2DNvA L+Erf+dUNtk5O4ea4TzOYUCJB42dcGNlQIqGbi1FmMEPWCEidnPgG7mllAXWL9PCGQML+AksS 29ZfBSpgF5CWat85mnsAoPAtJxyyEjllIqhYwMq9iVC9OLSpLLdI10UsqykzPKMlNzMzRNTQw 08tNLS5OTE/NSUwq1kvOz93ECAxyBiDYwdh92f8QoyQHk5Ior8+edRFCfEn5KZUZicUZ8UWlO anFhxhlODiUJHifguQEi1LTUyvSMnOA8QaTluDgURLh7QVJ8xYXJOYWZ6ZDpE4x6nLMmb37DZ MQS15+XqqUOO9XkCIBkKKM0jy4EbDYv8QoKyXMywh0lBBPQWpRbmYJqvwrRnEORiVhXsG9QFN 4MvNK4Da9AjqCCegIS+e1IEeUJCKkpBoYW16sOntA8G/wQn6JN1W6vEXCXD+7tvW/3s6lP+t/ oNi2SVZTnTme3v2TIRXy67FV1fETW7+7nNlgvvXwDf05eTwPF/4xnZT0wOfj7F1hpsd8X9kav 91xULqr6G0x9weepuXbf/yMvRv/X2/Wt9dZZ3x2Sp1tu3r7qFy2TaLuU721LjoPmPQ8fyixFG ckGmoxFxUnAgDrCFBg+AIAAA== X-Env-Sender: marmarek@invisiblethingslab.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1487846931!35632702!1 X-Originating-IP: [66.111.4.28] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8121 invoked from network); 23 Feb 2017 10:48:52 -0000 Received: from out4-smtp.messagingengine.com (HELO out4-smtp.messagingengine.com) (66.111.4.28) by server-15.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 23 Feb 2017 10:48:52 -0000 Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 6DA3C20B0E; Thu, 23 Feb 2017 05:48:51 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute7.internal (MEProxy); Thu, 23 Feb 2017 05:48:51 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc:x-sasl-enc; s= smtpout; bh=EMWjlRWQ/1qwYzPdjYAWdt/ukZc=; b=nFQXLcMDRQfB48wskp32 Km8XNmBNoIsrA1+BR3byymAnfJJJrzxVV7ZVm5kcLhLJK2YjQb/YqvZTe8XElAUC iqRpTLO8SnQoo2U5x5/GiCl+ddXLMSYz4yFBJQyH6jLPRquo32MfyuZ/bPolX14n QqcUV3DFJfdUy8kjLZ2kdNo= X-ME-Sender: X-Sasl-enc: mqeB8wxKChrxd0ZTSOXYWdUmt1Ii7fze1MltQjUlQaXn 1487846931 Received: from devel-3rdparty.localdomain (89-70-103-23.dynamic.chello.pl [89.70.103.23]) by mail.messagingengine.com (Postfix) with ESMTPA id 783C124357; Thu, 23 Feb 2017 05:48:50 -0500 (EST) From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xen.org Date: Thu, 23 Feb 2017 11:48:23 +0100 Message-Id: <1487846908-21462-4-git-send-email-marmarek@invisiblethingslab.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487846908-21462-1-git-send-email-marmarek@invisiblethingslab.com> References: <1487846908-21462-1-git-send-email-marmarek@invisiblethingslab.com> MIME-Version: 1.0 Organization: Invisible Things Lab Cc: Wei Liu , Ian Jackson , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Subject: [Xen-devel] [PATCH 3/8] python: use Py_TYPE instead of looking directly into PyObject_HEAD X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Py_TYPE works on both Python2 and Python3, while internals of PyObject_HEAD have changed. Signed-off-by: Marek Marczykowski-Górecki --- tools/python/xen/lowlevel/xc/xc.c | 2 +- tools/python/xen/lowlevel/xs/xs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index 109ef57..75842ef 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -2670,7 +2670,7 @@ static void PyXc_dealloc(XcObject *self) self->xc_handle = NULL; } - self->ob_type->tp_free((PyObject *)self); + Py_TYPE(self)->tp_free((PyObject *)self); } static PyTypeObject PyXcType = { diff --git a/tools/python/xen/lowlevel/xs/xs.c b/tools/python/xen/lowlevel/xs/xs.c index e9eef73..74a80ca 100644 --- a/tools/python/xen/lowlevel/xs/xs.c +++ b/tools/python/xen/lowlevel/xs/xs.c @@ -922,7 +922,7 @@ static void xshandle_dealloc(XsHandle *self) Py_XDECREF(self->watches); - self->ob_type->tp_free((PyObject *)self); + Py_TYPE(self)->tp_free((PyObject *)self); } static PyTypeObject xshandle_type = {