From nobody Fri Sep 20 22:14:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; 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=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1696818223; cv=none; d=zohomail.com; s=zohoarc; b=GmGa/V9d9S2sH2rbdvZCzkCtWdgh4BTALgzZxr7TkmQNmukx+k4kylI2ylN643ooKD77bTjRZTZbncucAv0m21iOOEHlYgHqRMDQXg4B8cN1k9IkDes/0vAOlJQNBuDuU0s91sIxZfvUZ+QkX+2NpVsFNKnowyQZ8A+OrDXxrsw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696818223; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=vR3XpUzB9NspBKgl6ie6O78QZ3pJAJrWJB3FB9BYOLE=; b=YPwCxiK1zSgMoPU/GCrcYksuUzD5vI2+gREPRq8JIdiYjZgV++b2+IlYXGqxXt1LKFlySAAWADykHBsObvZumEtBjO0SYcfNMkyr9SU2kS9r+r9ya9akTcMoJLWhLk9C6MJGdeH4Zamcqjmw955U5IVuL/SSnmIaW8ayXR4djoc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16968182233121023.2464749733238; Sun, 8 Oct 2023 19:23:43 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qpfus-00044h-VF; Sun, 08 Oct 2023 22:22:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qpfug-0003yI-9P; Sun, 08 Oct 2023 22:22:30 -0400 Received: from mgamail.intel.com ([134.134.136.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qpfud-0003d1-Jw; Sun, 08 Oct 2023 22:22:30 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Oct 2023 19:22:25 -0700 Received: from spr-s2600bt.bj.intel.com ([10.240.192.124]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Oct 2023 19:22:21 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696818147; x=1728354147; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=W3t+oZ2tvo7vonv10vitojnEdRzJxfPzOZNTQxOItU4=; b=I3h/fseDfpqcs0rdbtpFVyEi6T449VkOiqUVqPnEcfayR/LN8AwKDZNu 4ejckU+qfGrLDBkHmous9u7YYQiE7stlToz3rIRZrgQ8EIEDJSudgJwZa qv5V4FfQInlai5Y5T7aFKGUjScO8Nmclf0X9wwbZizt6jsVSUd/PTCisL Sq0j3ZZ5LM1ZA2hNqg0vLAkXKsFNJ5l8f71JRhc5Wnk5Tclzhw1ghyNbj uyVMq1pWkTDaFCfdOKu0PbwgqApVWpTXJB8UATyZvvBTH1Z0txfT7e0Gx FF4EF9s9waIVGihlJV+SRaSUuQG+e8XKuCFGPPpqOoTmGRpsLi3w2Sza9 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10857"; a="387916666" X-IronPort-AV: E=Sophos;i="6.03,209,1694761200"; d="scan'208";a="387916666" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10857"; a="752860840" X-IronPort-AV: E=Sophos;i="6.03,209,1694761200"; d="scan'208";a="752860840" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, thuth@redhat.com, akrowiak@linux.ibm.com, pasic@linux.ibm.com, jjherne@linux.ibm.com, farman@linux.ibm.com, mjrosato@linux.ibm.com, borntraeger@linux.ibm.com, aik@ozlabs.ru, eric.auger@redhat.com, yi.l.liu@intel.com, chao.p.peng@intel.com, qemu-s390x@nongnu.org Subject: [PATCH 1/3] vfio/pci: Fix a potential memory leak in vfio_listener_region_add Date: Mon, 9 Oct 2023 10:20:46 +0800 Message-Id: <20231009022048.35475-2-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231009022048.35475-1-zhenzhong.duan@intel.com> References: <20231009022048.35475-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=134.134.136.65; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1696818225419100003 Content-Type: text/plain; charset="utf-8" When there is an failure in vfio_listener_region_add() and the section belongs to a ram device, there is an inaccurate error report which should never be related to vfio_dma_map failure. The memory holding err is also incrementally leaked in each failure. Fix it by reporting the real error and free it. Fixes: 567b5b309ab ("vfio/pci: Relax DMA map errors for MMIO regions") Signed-off-by: Zhenzhong Duan --- hw/vfio/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index 9e61de03ee..5ff5acf1d8 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -763,7 +763,7 @@ static void vfio_listener_region_add(MemoryListener *li= stener, =20 fail: if (memory_region_is_ram_device(section->mr)) { - error_report("failed to vfio_dma_map. pci p2p may not work"); + error_reportf_err(err, "PCI p2p may not work: "); return; } /* --=20 2.34.1 From nobody Fri Sep 20 22:14:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; 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=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1696818197; cv=none; d=zohomail.com; s=zohoarc; b=YLqLn1U8nYvoiua1eObNYALtCNSERA+BIPkE5/Yxtx1myhpR2QmmJPgfDnikuRtd6/wnhcMmxhvGRjhytwxHEXlimXJJUVhtu0rH0OZuf0gRXZp6T683t4g8rDmKppkiBQmQ+1vIXhp3c3nXNr01G0nmM+PnIULVqHfntOmuSos= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696818197; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=UqCAtt4+sfIYIwL5sVZRzG8ZlwQEWb1RRl1S1lY7gmY=; b=CwfDqI+dMkV9uqX/ce3t31jbMA7QvPEyiMbJYxIu6UCwsD3R+g19ZbmwpHVtcQUg5AU0LdqSRQqIutM2pT5G6iteBpCmKPkXbcQAUktPC39P4vKMpl7hHBSB84XUFJZcPfy67KqsGKlyhK0+B1mpg5434+a3AhVoZqyfovBedsM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 169681819701010.90544423693541; Sun, 8 Oct 2023 19:23:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qpfuy-0004Ic-K6; Sun, 08 Oct 2023 22:22:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qpfuw-0004Go-Qe; Sun, 08 Oct 2023 22:22:46 -0400 Received: from mgamail.intel.com ([134.134.136.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qpfuh-0003cV-87; Sun, 08 Oct 2023 22:22:46 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Oct 2023 19:22:29 -0700 Received: from spr-s2600bt.bj.intel.com ([10.240.192.124]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Oct 2023 19:22:25 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696818151; x=1728354151; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bamSNKPwX38SaNOGbpA7g4VPeogmj9js2zOppJ2gwGg=; b=DsVx3UNTJzcsC4qU+ws7lA7vWAED8Z7e1a77m2xLhHVyqJgvfONZ1XGL Qi7SovkJXbwIdpcHgIwlhsBL5dEjpfZJOpSeaQxJnGh4nwJmHx1LQMH3o jykD27VVZUquxYCFo6UVfam1X3hXCSdu7HA4UYjOfvgWvMJDe+N4ZNbaH kzsJmG7QOcWRovVnGnrcgqOfPMs2i/HTbXQPwhjVNx5lrw5OxlrcPfJPz CNosTnJVDehUQFB67GffNQX+SK1G06D8Ob6s9IHLwZMGIPcnj+VbFXBoo eDOAr9w49tAwnKmKZ5Z7CfrngZIB/m8SBFItjDbFbkYfFQ3w0qLH/yqyZ w==; X-IronPort-AV: E=McAfee;i="6600,9927,10857"; a="387916672" X-IronPort-AV: E=Sophos;i="6.03,209,1694761200"; d="scan'208";a="387916672" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10857"; a="752860853" X-IronPort-AV: E=Sophos;i="6.03,209,1694761200"; d="scan'208";a="752860853" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, thuth@redhat.com, akrowiak@linux.ibm.com, pasic@linux.ibm.com, jjherne@linux.ibm.com, farman@linux.ibm.com, mjrosato@linux.ibm.com, borntraeger@linux.ibm.com, aik@ozlabs.ru, eric.auger@redhat.com, yi.l.liu@intel.com, chao.p.peng@intel.com, qemu-s390x@nongnu.org Subject: [PATCH 2/3] vfio/ap: Remove pointless apdev variable Date: Mon, 9 Oct 2023 10:20:47 +0800 Message-Id: <20231009022048.35475-3-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231009022048.35475-1-zhenzhong.duan@intel.com> References: <20231009022048.35475-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=134.134.136.65; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.intel.com 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, DKIMWL_WL_HIGH=-0.001, 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 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1696818198944100003 Content-Type: text/plain; charset="utf-8" No need to double-cast, call VFIO_AP_DEVICE() on DeviceState. No functional changes. Signed-off-by: Zhenzhong Duan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Tony Krowiak --- hw/vfio/ap.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c index 22e564f4f7..e083a19eac 100644 --- a/hw/vfio/ap.c +++ b/hw/vfio/ap.c @@ -156,8 +156,7 @@ static void vfio_ap_realize(DeviceState *dev, Error **e= rrp) { int ret; Error *err =3D NULL; - APDevice *apdev =3D AP_DEVICE(dev); - VFIOAPDevice *vapdev =3D VFIO_AP_DEVICE(apdev); + VFIOAPDevice *vapdev =3D VFIO_AP_DEVICE(dev); VFIODevice *vbasedev =3D &vapdev->vdev; =20 vbasedev->name =3D g_path_get_basename(vbasedev->sysfsdev); @@ -195,8 +194,7 @@ error: =20 static void vfio_ap_unrealize(DeviceState *dev) { - APDevice *apdev =3D AP_DEVICE(dev); - VFIOAPDevice *vapdev =3D VFIO_AP_DEVICE(apdev); + VFIOAPDevice *vapdev =3D VFIO_AP_DEVICE(dev); =20 vfio_ap_unregister_irq_notifier(vapdev, VFIO_AP_REQ_IRQ_INDEX); vfio_detach_device(&vapdev->vdev); @@ -211,8 +209,7 @@ static Property vfio_ap_properties[] =3D { static void vfio_ap_reset(DeviceState *dev) { int ret; - APDevice *apdev =3D AP_DEVICE(dev); - VFIOAPDevice *vapdev =3D VFIO_AP_DEVICE(apdev); + VFIOAPDevice *vapdev =3D VFIO_AP_DEVICE(dev); =20 ret =3D ioctl(vapdev->vdev.fd, VFIO_DEVICE_RESET); if (ret) { --=20 2.34.1 From nobody Fri Sep 20 22:14:47 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; 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=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1696818203; cv=none; d=zohomail.com; s=zohoarc; b=jRc+EQ6j+Fa7Ni8ab88tgg4hqvX7tNW9F48QVNQyiS4M4378FXIrqKkQvFsAc1NTjSYDe3w8ADJjpLSM1/H7lwNbhkmt9SOuBj3zC/ZVXGTomr4gIdshSuKGPyFQ4KxKY+T3fT/hvDUe0m/c/iucNlJ5tJxhIAGN0VdMVQaiJUw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696818203; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=C/lFK0YxcLNxrUBX+KszRMLOHoHbi1kaeqenE3nhYas=; b=iM/xFqxC0DPWZmRch/Lglva0ZDrj0DeFUyxDUeA69etVvGQFjqHT2w7BpVDoqzxH7XaNMUZAVIHzHZddmZyymYEWP7szuMmAaG9EV2bC/PS0diXI2lvrx5ezSjlU4DS6Zt6dcg+DJpMJk4g60LmQjmhU53QQKJzEEiv8HHkaX6Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1696818203737313.07459039517994; Sun, 8 Oct 2023 19:23:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qpfuv-0004C1-T7; Sun, 08 Oct 2023 22:22:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qpfun-00044U-6v; Sun, 08 Oct 2023 22:22:38 -0400 Received: from mgamail.intel.com ([134.134.136.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qpful-0003d1-2t; Sun, 08 Oct 2023 22:22:36 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Oct 2023 19:22:33 -0700 Received: from spr-s2600bt.bj.intel.com ([10.240.192.124]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Oct 2023 19:22:29 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696818155; x=1728354155; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WpD24aY/1O0I3X7nIIfb/SaSIgAF9Qk8sOfLfVoBqjY=; b=bWfhk5eTkoxjvc/45Hqo7eGnK1WD1EbMykfqpOEkziTxmxzPpJj7NoBq BODluolHLDlJibgiGTrBqDmJaX4ROWICW7vSTIfriBXfd6ZpwmsnKA7qP oXgvTBLoLLOu8nqLu3/gGJqGQSjr66blxqyDqcck0Tqj6vOsshJjlG7bH NyajqtvFCRJNPoCjWtR17jTUpPKfcJaF1oAYDCWHmq+nb+tF8ADmse+zs SotaRH/KazOZ9u66nxNBrNXISpCTIEU7zOV2xVcFZIYdAkAQJlGbTSzu1 Y8yO5EnXJ7Lb0o5xfvQHo3hsT4m9YJW3Hkf+1Xi+S2lT5k45StB8YQ5hB w==; X-IronPort-AV: E=McAfee;i="6600,9927,10857"; a="387916681" X-IronPort-AV: E=Sophos;i="6.03,209,1694761200"; d="scan'208";a="387916681" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10857"; a="752860875" X-IronPort-AV: E=Sophos;i="6.03,209,1694761200"; d="scan'208";a="752860875" From: Zhenzhong Duan To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, clg@redhat.com, thuth@redhat.com, akrowiak@linux.ibm.com, pasic@linux.ibm.com, jjherne@linux.ibm.com, farman@linux.ibm.com, mjrosato@linux.ibm.com, borntraeger@linux.ibm.com, aik@ozlabs.ru, eric.auger@redhat.com, yi.l.liu@intel.com, chao.p.peng@intel.com, qemu-s390x@nongnu.org Subject: [PATCH 3/3] vfio/ccw: Remove redundant definition of TYPE_VFIO_CCW Date: Mon, 9 Oct 2023 10:20:48 +0800 Message-Id: <20231009022048.35475-4-zhenzhong.duan@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231009022048.35475-1-zhenzhong.duan@intel.com> References: <20231009022048.35475-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=134.134.136.65; envelope-from=zhenzhong.duan@intel.com; helo=mgamail.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1696818205005100001 Content-Type: text/plain; charset="utf-8" No functional changes. Signed-off-by: Zhenzhong Duan Reviewed-by: Eric Farman Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/s390x/vfio-ccw.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/hw/s390x/vfio-ccw.h b/include/hw/s390x/vfio-ccw.h index 63a909eb7e..4209d27657 100644 --- a/include/hw/s390x/vfio-ccw.h +++ b/include/hw/s390x/vfio-ccw.h @@ -22,6 +22,4 @@ #define TYPE_VFIO_CCW "vfio-ccw" OBJECT_DECLARE_SIMPLE_TYPE(VFIOCCWDevice, VFIO_CCW) =20 -#define TYPE_VFIO_CCW "vfio-ccw" - #endif --=20 2.34.1