From patchwork Thu Jun 6 11:06:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1111049 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45KNMx68hyz9s3l for ; Thu, 6 Jun 2019 21:14:21 +1000 (AEST) Received: from localhost ([127.0.0.1]:58469 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqLb-0005n9-Kd for incoming@patchwork.ozlabs.org; Thu, 06 Jun 2019 07:14:19 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60674) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqFW-0000XB-HD for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:08:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYqFV-0003q8-KE for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:08:02 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:40507) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYqFV-0003o2-B3; Thu, 06 Jun 2019 07:08:01 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MVMJ7-1hAGYT2wEh-00SNSl; Thu, 06 Jun 2019 13:06:38 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 6 Jun 2019 13:06:10 +0200 Message-Id: <20190606110625.32127-2-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190606110625.32127-1-laurent@vivier.eu> References: <20190606110625.32127-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:p5QiGkDHYjVQOWvNLCE7ybZDVUE17nKGGpnu4Z0+6/3/EaA8R1N kYCdU4ffdWKbbeG8UT+wwPoddlRPgXX2pPoyn1Hng7oF8qkXvP/32CduU7RvYU674O3wCoY 1G2dlefckFC4MH2wLV5fm/02Vj8k1qm7eLypC94OHNXGtJyxDTTKJKnyy4S/UUQCBWIze+3 ewdiiZL7jTzS3LGW3YJpw== X-UI-Out-Filterresults: notjunk:1; V03:K0:ozra9I6ERoU=:x4oV6y93l2CwRU9PJYcolF 3A5uiIo3kKa/8t8YAqBEsxQDnvEqndEWdax/9TYtnM2HVXJinyAAulvY22Z17nKM1RA3Y4R9h zknpp7LUkrbCFsOSKYczaNY/GdJwj9E6mePR+yZEoGNC+2pK5v+NAvErVf/cAKOr0AgpDN/kJ k99yDgzGesi5KeX+hu2duTVcpQl1PFNVJSHUrlxVLOR6A0BvJNWAuVSYhCE+YrLdprAk3TKPM whzMnRoj/94MYNz7B2Zyid9VpjPYWQt/YjnoKh/TCHf+95qLjsXQhwrMkeuUOiIsM5LvCNvhk LdAhscXlGZQUQEF9j56+cIEFbCIynn5Dw9weq6BNQc/opicN3wkawuoT9MMWuoiLSk0YAv6qX 7yAWDJoEpRaBbKAbNygJuHuxe4Lcp2uL9fSeEx93zN/wAoP367ksL7EWamEe2ctpdVoFxIebn i2zdTnzS1AUN1koioi35GK3BnkCcctdQuGnW8WSMMsyO+3EuZAXO3PRINiFwfYbAqfizoAHxN rxvY3DaDzo+05RENj7SBDHLFgUngCfbjrdfk9lclmWE25/pfw3gDGTd7udQZi65SI0b0Ttm/o Al/wSq6yU5aT6EA1Z7de2WqeTlOMKGQitu7orCd/b+rg37i2BZcd8nxSxx+zuD5yVDLnOWO6J D4B5fRWkRYs/gS5cwgBac+yz87fQXlD73nzRYmwbSDHp6EMrzaf5yWXs0EgIfJ/os1HTIWB00 cWfe987/DDqyb1cAsH1i+yXw/+bnpICQHVE4XA== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.75 Subject: [Qemu-devel] [PULL 01/16] hw/rdma: Delete unused headers inclusion 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: Fam Zheng , Dmitry Fleytman , David Hildenbrand , Michael Tokarev , Gerd Hoffmann , Juan Quintela , Aleksandar Rikalo , "Michael S. Tsirkin" , Halil Pasic , Christian Borntraeger , "Dr. David Alan Gilbert" , Yuval Shaia , Alex Williamson , Richard Henderson , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?b?w6k=?= , qemu-s390x@nongnu.org, Cornelia Huck , Kamal Heib , Laurent Vivier , qemu-trivial@nongnu.org, Michael Walle , Aleksandar Markovic , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yuval Shaia This is a trivial cleanup patch. Signed-off-by: Yuval Shaia Reviewed-by: Kamal Heib Message-Id: <20190505105112.22691-1-yuval.shaia@oracle.com> Signed-off-by: Laurent Vivier --- hw/rdma/rdma_backend.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/hw/rdma/rdma_backend.c b/hw/rdma/rdma_backend.c index cf34874e9d2f..c39051068d1e 100644 --- a/hw/rdma/rdma_backend.c +++ b/hw/rdma/rdma_backend.c @@ -14,16 +14,9 @@ */ #include "qemu/osdep.h" -#include "sysemu/sysemu.h" -#include "qapi/error.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qnum.h" #include "qapi/qapi-events-rdma.h" #include -#include -#include -#include #include "contrib/rdmacm-mux/rdmacm-mux.h" #include "trace.h" From patchwork Thu Jun 6 11:06:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1111057 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45KNcH37HRz9s3l for ; Thu, 6 Jun 2019 21:25:02 +1000 (AEST) Received: from localhost ([127.0.0.1]:58665 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqVu-0006Q9-3y for incoming@patchwork.ozlabs.org; Thu, 06 Jun 2019 07:24:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34617) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqKh-0005aM-OF for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:13:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYqKg-0003R2-QG for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:13:23 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:51351) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYqKc-0003Ma-N0; Thu, 06 Jun 2019 07:13:18 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MbjBo-1gyxyw1siM-00dHVC; Thu, 06 Jun 2019 13:06:40 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 6 Jun 2019 13:06:11 +0200 Message-Id: <20190606110625.32127-3-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190606110625.32127-1-laurent@vivier.eu> References: <20190606110625.32127-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:wmpSPsS+7A5QbkzIuo4H2PZEXePK7qndfEAgPOgvQ2LxlfTvhw9 amvAiKaRxtLucqhiiRKRCyClQcMp60JYWMDX9M+QknvPxj0kNgOs8Peb19vAGcpshprcRxJ WcNPTGerQRJL+zpN8WiRua1Ve4iPwPaQSmZGJQpq9kftPb9yMfEDSixtCjVNxGsKMOTZjjX 7E2gfzmJo65wlVOPo5MUA== X-UI-Out-Filterresults: notjunk:1; V03:K0:X49tWX4nr2Y=:QcF6a7H8Yx79kAHKMB8+1R Cr9r+2MHZWPvUk3fRGmltvgPkeLVMQVr8vGjaOIRmd5IZTQfMWMwBr1K61OqZFuw7wQnHO2lz e9xnVQeTrDiwYNJez9xLMsM1g5HBIkCZqge/0hnqRomBNlraq6/EhLBuJcquFcXeLd6TV8rX7 C343+aRz3GQLS2ixo+VpDqJtvr7anT1tGtGN/rHgyN+nrzfuvHFEYx7ME7BEpsqM4rDTREAx6 fg8h7xnoykLDgkvJb3S4gyu25uyH4OMXMOjVSwVKC0YZcgt8Sm5NwEsJyOXe7UpSZ7ljqgo9l +R6LBuvMa5gCcBKgdWJFnefL04N/V2IdiPq1i04f4E0nDBmMmgxhWqQCpSXOg+1llT//0H2JZ VgiYKnBrpi7s5DGklyLAQD2ecH8GV5JdCMp/AYY59l/SYnmgYiU+ET6u1GTs5x7KD+bLadhvr 7Zycu0uRbBE2HI2SHxSjMgv+fw5dzPhFlRMgo6J13zx2euNYWzQyzVBT5Dzd3kLntNIz3NrIf PVdT12sjtKs1bAy6kMDmMf1cpuNllz+Ttj+1Lo2Sk38zz9b2VQoxZSIiV3cfzl81xd3Qs9X1D ikm4ad7bqEP38NHXtS5HE30q9/oKqugqMbM9iuP3+BSvmWkmwhp+Qrzh29jZ9J4Zxi9T58VZ7 TXCGXUeC75VQNdYvnJGsUeCBLudWknut+9FRy1qUNyp7A9hRtEVhQxPr0//Js3q3FYKLhr15l w9ZIvB82HSzCGM9FnAh2UQHCdMla+rNApNbDy6q7u98ZYJLKd+C+4zMVk5o= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PULL 02/16] migration: fix a typo 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: Fam Zheng , Dmitry Fleytman , David Hildenbrand , Michael Tokarev , Gerd Hoffmann , Juan Quintela , Aleksandar Rikalo , "Michael S. Tsirkin" , Li Qiang , Halil Pasic , Christian Borntraeger , "Dr. David Alan Gilbert" , Yuval Shaia , Alex Williamson , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?b?w6k=?= , qemu-s390x@nongnu.org, Cornelia Huck , Laurent Vivier , qemu-trivial@nongnu.org, Michael Walle , Aleksandar Markovic , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Li Qiang 'postocpy' should be 'postcopy'. CC: qemu-trivial@nongnu.org Signed-off-by: Li Qiang Reviewed-by: Alex Bennée Reviewed-by: Juan Quintela Message-Id: <20190525062832.18009-1-liq3ea@163.com> Signed-off-by: Laurent Vivier --- migration/ram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/ram.c b/migration/ram.c index 4c608692262e..359dc8f1bc44 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2236,7 +2236,7 @@ static RAMBlock *unqueue_page(RAMState *rs, ram_addr_t *offset) } /** - * get_queued_page: unqueue a page from the postocpy requests + * get_queued_page: unqueue a page from the postcopy requests * * Skips pages that are already sent (!dirty) * From patchwork Thu Jun 6 11:06:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1111045 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45KNJN0fy2z9sND for ; Thu, 6 Jun 2019 21:11:14 +1000 (AEST) Received: from localhost ([127.0.0.1]:58401 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqIa-0002jG-DU for incoming@patchwork.ozlabs.org; Thu, 06 Jun 2019 07:11:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60310) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqF8-0000BT-LB for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:07:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYqF5-0003FA-Oa for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:07:36 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:58621) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYqF1-0002z6-0o; Thu, 06 Jun 2019 07:07:31 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MauFB-1gy8V734dX-00cSgp; Thu, 06 Jun 2019 13:06:43 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 6 Jun 2019 13:06:12 +0200 Message-Id: <20190606110625.32127-4-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190606110625.32127-1-laurent@vivier.eu> References: <20190606110625.32127-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:CaPomUUU0ZJp2dT6eUq05+g7tIBXfeNTk8JnnR47rG4Bb3m2Amu FYawHFxHtEN6ZwcplHPtkRE8L99QdHTARU0DkOY5IX6Khlx0ZOP1VVSVn6jDU4cyT9rzXkh OXaCHxOgKUg+NpeQ/u4xYfYdSNT/lncnGfEUNJS7Sjt6PStGn1qP322oM4iT75BrRb6CBMO Cd9LcRhoU7u+7OHe0NImA== X-UI-Out-Filterresults: notjunk:1; V03:K0:41tRHKGJyP0=:4ymjpaXSKln4RHBYeKTaxe eHWyXozSKm/GfW/N7OJ1Zc3S0QRUoGie3/x2d9eHdXM8jgRb3Bpn9trcYMOS7x23oa2QC51eF rD3Ajl+Kko9qZVsUpoPb2ZCQe+ejJdBGwmLLeGP634ant7VNwHnNNv1z1zyhv/IkfdTWFzLDz 4fIOZ5dGwIBtoJSXHGGnfKMhaROJiy69Kc9jUQqIZKJRTuNAnGcYPSvagkCcwQ1WD8b3+6iAl c4eLCHB/4PBsauGmZRy2oA+6aczUWZrK1KUFML2K/dkFkF14ikiuRgve99MLwTYjw1IbRrG2t +xzLn7CXcojeu/kpbk+uqjJcSEMnzKm9iYey8ue05T0SV3y/5OKrYR8OZD1h9Kh7rZEnQvwd2 4+ZmV2UPrsTozj2CiuOeeF1bu5k4q9kRh0vJm6gxy82O+Ah3g1JLz+Fh/lAG5Qi3GJ1v6/bDo /febZbm//dL/wxA/uqOSKjnqXZbtRuRZN2voi9/nvCrVYjWgsr2tqM/ejh6p6QgqxzwtfX4la S1xjp5j6K0s0Bu6hRtGUkOQ+EOjKE1XhN8xuHiVi/eG0Bsl4Y6D3XyADr3sPb1tl1reywT2q/ sZpVLZwh6KWE/Kq735ggQAk+WI/Wy6QFC/5VYxHRGaxVp+Sd/8gGj/620fIP61ahFlb8rgyD5 XJliIqnJR5W0CtqVhKlNYvQp7uhZohjAuRTnMB7ZziPVyuVr8pSAvZOFErkNOY9nqB9KraFQr WpyhXhuuvVMmOi/PNpcTo7iMvda2OWyk6sfLQsXAQBy8pliKk02eM/6Jlb8= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.73 Subject: [Qemu-devel] [PULL 03/16] vhost: fix incorrect print type 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: Fam Zheng , Dmitry Fleytman , David Hildenbrand , Michael Tokarev , Gerd Hoffmann , Jie Wang , Juan Quintela , Aleksandar Rikalo , "Michael S. Tsirkin" , Halil Pasic , Christian Borntraeger , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "Dr. David Alan Gilbert" , Yuval Shaia , Alex Williamson , Richard Henderson , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-s390x@nongnu.org, Cornelia Huck , Laurent Vivier , qemu-trivial@nongnu.org, Michael Walle , Aleksandar Markovic , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Jie Wang fix incorrect print type in vhost_virtqueue_stop Signed-off-by: Jie Wang Reviewed-by: Philippe Mathieu-Daudé Message-Id: <1556605773-42019-1-git-send-email-wangjie88@huawei.com> Signed-off-by: Laurent Vivier --- hw/virtio/vhost.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 7f61018f2a3f..286bb27c6539 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -1081,7 +1081,7 @@ static void vhost_virtqueue_stop(struct vhost_dev *dev, r = dev->vhost_ops->vhost_get_vring_base(dev, &state); if (r < 0) { - VHOST_OPS_DEBUG("vhost VQ %d ring restore failed: %d", idx, r); + VHOST_OPS_DEBUG("vhost VQ %u ring restore failed: %d", idx, r); /* Connection to the backend is broken, so let's sync internal * last avail idx to the device used idx. */ From patchwork Thu Jun 6 11:06:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1111044 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45KNGY47wkz9sND for ; Thu, 6 Jun 2019 21:09:41 +1000 (AEST) Received: from localhost ([127.0.0.1]:58371 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqH5-0001Im-FH for incoming@patchwork.ozlabs.org; Thu, 06 Jun 2019 07:09:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60600) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqFS-0000Ua-VM for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:07:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYqFS-0003kc-1e for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:07:58 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:41725) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYqFM-0003Y5-4R; Thu, 06 Jun 2019 07:07:52 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MyKYE-1gcKlM29eO-00ydrs; Thu, 06 Jun 2019 13:06:44 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 6 Jun 2019 13:06:13 +0200 Message-Id: <20190606110625.32127-5-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190606110625.32127-1-laurent@vivier.eu> References: <20190606110625.32127-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:Sdcr+43MaEvgOFCLqoBVvN3f0eFhHJAHvIaumx6TwHBbk8Op53r mhRKmdzJb12QS3KddxUe1EtLseBs5xkd1SsXwA3+T9NO/kW9XTkRTTOzQes53BFDepWNqGa UESSp0MEJu5lf5G+XNU031f0o3i6XLWMYDa2rXelkiJ8HOl/LTYwUX2zHdgQMABfP9IBFXm crE91O+LUBQMfdFtDEzyQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:FhUQ6BSxQOE=:HEakt/fZUJwDEWxUrzBJhV IMUgGlIHLecx/vwK/4V6ODYNsPuQlHy01wVQ8XU58vvOw76/Syr6kJMSR1d7QdMnH57sAD/xL aYh4iUNm/UtwGhf8M6YyGyPsEyp6H73sEd4RixaMpugkcdJTonPxzt5xnTnPD6CGc3AxWJ6bK s9aRAC18kkyFc6u50hUu86enyjKpEQttOEGz4ErmMZOnHcYmxthr61OxYFCaFvzsaFxqOzzKq +VL2hAxkBPiiD03SHxi+iz59ofelXdQvM2O1c00rzsD7d6wYZY1vvmJduDJ1fOppQBLtOqVNi 3MXdercddxWOKg53OllPqCxVlbWh1oIQTQTbJ2U295amOlAuPlM9Za+XSB93oTShAacj+QurY ALee5rNrUsnP3M1KHREhYfZoCXjQIUGpH7lndAf3halW3pTCJNLeOpCmeroofyo6QdEbtZJBY fDB+epeCrqDnAdA5NnRHtlNq9+21tHIMpEgmPNcEZyuOLtbJu5ALgpsjC8A3vyY/2mW0MpLvQ 2R+9LzK43lETPlxySTTmj8FuJCNsz8SRcT8Zhjk24og4LEU/qwG94pWY+4cK6vUR6K9xXPrIi Zw38MhJk52TEmRfFCrvT21ZosID+Q1yhCW2UA4Rs5ELjkgfmkSakObIwGK0zL5ORTQGjmbINZ WET/FUhprHHrOp0t+Lnncq3uQvgZicKI3aI+uNxr1qq2BvMWioiiP7foW4PrJwXJp2IhkdLnY P1v7OFtu598stMsEU5eK6ZCRvOp2bauMzPluQySB6WlCrYkMoaZOxkMdMBc= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.75 Subject: [Qemu-devel] [PULL 04/16] util: Adjust qemu_guest_getrandom_nofail for Coverity 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: Fam Zheng , Peter Maydell , Dmitry Fleytman , David Hildenbrand , Michael Tokarev , Gerd Hoffmann , Juan Quintela , Aleksandar Rikalo , "Michael S. Tsirkin" , Halil Pasic , Christian Borntraeger , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , "Dr. David Alan Gilbert" , Yuval Shaia , Alex Williamson , Richard Henderson , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?b?w6k=?= , qemu-s390x@nongnu.org, Cornelia Huck , Laurent Vivier , qemu-trivial@nongnu.org, Michael Walle , Aleksandar Markovic , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Explicitly ignore the return value of qemu_guest_getrandom. Because we use error_fatal, all errors are already caught. Fixes: CID 1401701 Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20190530173824.30699-1-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- util/guest-random.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/guest-random.c b/util/guest-random.c index e8124a3cad48..00a08fd9819c 100644 --- a/util/guest-random.c +++ b/util/guest-random.c @@ -56,7 +56,7 @@ int qemu_guest_getrandom(void *buf, size_t len, Error **errp) void qemu_guest_getrandom_nofail(void *buf, size_t len) { - qemu_guest_getrandom(buf, len, &error_fatal); + (void)qemu_guest_getrandom(buf, len, &error_fatal); } uint64_t qemu_guest_random_seed_thread_part1(void) From patchwork Thu Jun 6 11:06:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1111051 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45KNRD3h3Fz9s3l for ; Thu, 6 Jun 2019 21:17:12 +1000 (AEST) Received: from localhost ([127.0.0.1]:58529 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqOM-00088Q-AZ for incoming@patchwork.ozlabs.org; Thu, 06 Jun 2019 07:17:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqFT-0000V3-BG for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:08:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYqFS-0003ks-90 for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:07:59 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:50607) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYqFM-0003Oe-0o; Thu, 06 Jun 2019 07:07:52 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N2VGj-1gYjrl13Wh-013vCt; Thu, 06 Jun 2019 13:06:46 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 6 Jun 2019 13:06:14 +0200 Message-Id: <20190606110625.32127-6-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190606110625.32127-1-laurent@vivier.eu> References: <20190606110625.32127-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:mdZyVMDlhLtgzFVkGMKPwhd1vTCTlJ2n6UQbcL+A7mXIwzLbgVv rdWaTvkzh9+ZGkjpPIEnoHOJoofHKJj03PiJSnWzmZUzqRXpOBY3jmF4C+vJZl5cnICB7cQ L7j1xb5jAz4it73StJCFXFaTOJbwctRdg49ymr5t30LvpGOdZYXf6TUgWyYtZ4NUA3WF/i3 PFB3LNVa1ATntBhgNggXg== X-UI-Out-Filterresults: notjunk:1; V03:K0:lGxVdu6POuc=:c8Pj8N5H0zrV72OzuTHYjr HvEThxZQTS39G9ir4HCYdnA/11jd7NfU2ekUEFMs2LPH87iAK/aQcoxTPBaVuvBRA2e7xbn+M A+Dhz9E9JjU8Ly+u8D7P9CesJcnFPStUgdvdhFZWm4HITMM1gXddx3RLjRGo3eqv30Nh8hAOE AQevROoOUgr53j5+TZv/2e425A0rT4KjV+RLjBGlB5L36Nq5bp/9+km5UAw4HtJvYAw2uvfYy 6Eb1QcFpWXBx3fosHlLdbiJpki7xj0CdfudtCd9f4wKfFnwIQyyISNeUB38zCmTfDlL89YoRo 72xZeDkiDORNcx/rW6EoHNAlkLZqEC7czmmo+ah/1ksqBYf69uuwgautN0at4fJtu8CI9/dAP qfApkM4XCf0s+qJ8514u4xAGK0k1taB6cFBViwyVW997GnTVXg+TGEfWHJbWyqP6eVB6HsQ6i MGzvxhkmrSLcmfGO4WNefexyU4sEabxATw+6LImE1Ff7/2a0eQGpAeKqM2lxxy1ICBWDe/tRN htjEx1O/AhrsL1Qmf35pqRERYdZPlYJRLFz43WIpaDzObwEiB4x2j36HmAt6UdcE8RzeVIqk6 /7mkNzzk+aEgQ9a7k1G4YnRaGsV7068KeylLJFPzWAyy1RSUqe+MhLdRV+BEf9XDGukK99tPW PrhGBgfsD9zRLt2wqcxudQvNaOmWVI+UU8TmCtGhf/gVMfqEY6NYvMihUaqPd9mKHbtHgC5I0 9xE614xtHBAUHPL7256GZLupxYmcWXuUR5ZkeXI1Qze5RIgg6WGIFD0YI4Y= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.10 Subject: [Qemu-devel] [PULL 05/16] test: Fix make target check-report.tap 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: Fam Zheng , Dmitry Fleytman , David Hildenbrand , Michael Tokarev , Gerd Hoffmann , Juan Quintela , Aleksandar Rikalo , "Michael S. Tsirkin" , Markus Armbruster , Halil Pasic , Christian Borntraeger , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "Dr. David Alan Gilbert" , Yuval Shaia , Alex Williamson , Richard Henderson , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-s390x@nongnu.org, Cornelia Huck , Laurent Vivier , qemu-trivial@nongnu.org, Michael Walle , Aleksandar Markovic , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Markus Armbruster Fix a fat-fingered invocation of tap-merge.pl in the recipe of target check-report.tap. Fixes: 9df43317b82 "test: replace gtester with a TAP driver" Signed-off-by: Markus Armbruster Reviewed-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-Id: <20190604080010.23186-1-armbru@redhat.com> Signed-off-by: Laurent Vivier --- tests/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 46a36c2c9527..34df040583dc 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -904,7 +904,7 @@ check-report-unit.tap: $(check-unit-y) # Reports and overall runs check-report.tap: $(patsubst %,check-report-qtest-%.tap, $(QTEST_TARGETS)) check-report-unit.tap - $(call quiet-command,./scripts/tap-merge.py $^ > $@,"GEN","$@") + $(call quiet-command, cat $^ | scripts/tap-merge.pl >$@,"GEN","$@") # FPU Emulation tests (aka softfloat) # From patchwork Thu Jun 6 11:06:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1111043 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45KNFc1V7hz9sND for ; Thu, 6 Jun 2019 21:08:52 +1000 (AEST) Received: from localhost ([127.0.0.1]:58347 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqGI-0000Oc-2t for incoming@patchwork.ozlabs.org; Thu, 06 Jun 2019 07:08:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60260) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqF4-00006V-6m for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:07:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYqF3-00038G-6V for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:07:34 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:48023) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYqEy-0002qn-9p; Thu, 06 Jun 2019 07:07:28 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1M9nAB-1hVnpS46PF-005qM5; Thu, 06 Jun 2019 13:06:48 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 6 Jun 2019 13:06:15 +0200 Message-Id: <20190606110625.32127-7-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190606110625.32127-1-laurent@vivier.eu> References: <20190606110625.32127-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:nK/Fel8Fvw4QdlnGmjvpi6hFRc+DYWG+wpknXymG0HExoDoxRW6 JS3z1safrDIU+v90zDCq1g0DuA6sgY8naaPZC4Kdg+QYG/paus5ngUBcl8fBX9ZOQBZGHev G56PlFm1o0lb1Rw9l3fsjenpypm0FBR69f29zjX29Q2vrj6FpvVDprWg2GWP61juNvRtBJI vWYwZpi4a7jsKmJdPq0eA== X-UI-Out-Filterresults: notjunk:1; V03:K0:FjzVW0+XTvw=:ij1DW/g9Jjm+H2Tqx+kc40 h9cNXbOKSs6xNcscx2nU69LmWbA5mfspAyUQ2ytl3gWBJCJwb4W2u2F6GAsJKCNMTO1IEvAtm pjPrx+WNe1qMCScrglUZoGi7BWcqpTD5faxZL15TVRtzwwYjKOl9N9cmh0XFsFu5s9V8Mgwta 24POEU9jWASXcu0Yn+sV3kySbEA7zcpX41P2tQQ1BjWs/SzPy6Vh1Bs6NB91DMrOG9LxooIga msi2KLQt4/9fOPkGzry7mKNc5CJBX61v9ySsCqUaWE3eU6JslwL+CukShHw0WztWEfbvqEfhz ta82I91QBudWfa9LycIrOj1IU6OCeKOZ8t2qVW9cTnRnkmxH2MgcU942QfETyIlBfoHFw/63Q ID5gu2fwxre0CTxTsRVjTeC/AkDdbws2mreHh7coqzWl/WS/4vK7CLdE63MjSCPjPeE3rwAeb 36EanCY2nPdkU2MN1+bK3Xp20jZxDWFGC3MWrU/Krb54ZUfEylwFY8Jm89Y47RiYvIVwNRlL9 gGroEb729ceCnHCNzrHrcDlrf++EZy7pR/+RecVlpbAGlAKjApmGQ8hmB/Ic1DkgYFrP3H+i4 5G8xxhHSIyz9dTEXeedUDK0hQfsWwgYhu3rknkFobaeolsuyiTkMaCi47kW2vtuj/tQzoSdRx FAnSU01oC9Rpq/Kpgs4r3DqZCJC236nBY3mm+RtBpeXtNihyeQQvQzVx3f7lMpuOmCiQZ0H+v IOjJiTbrPELxkPmq2UU6vEwobHDiprvUSReiRk+iXWmWYEYth9cHgREMZ2k= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.73 Subject: [Qemu-devel] [PULL 06/16] docs/devel/build-system: Update an example 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: Fam Zheng , Dmitry Fleytman , David Hildenbrand , Michael Tokarev , Gerd Hoffmann , Juan Quintela , Aleksandar Rikalo , "Michael S. Tsirkin" , Halil Pasic , Christian Borntraeger , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Thomas Huth , "Dr. David Alan Gilbert" , Yuval Shaia , Alex Williamson , Richard Henderson , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?b?w6k=?= , qemu-s390x@nongnu.org, Cornelia Huck , Laurent Vivier , qemu-trivial@nongnu.org, Michael Walle , Aleksandar Markovic , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé The default-configs/ example added in 717171bd2025 is no more accurate since fa212a2b8b60 (and various further other commits). The Kconfig build system is now in place. Use the aarch64-softmmu config as example. Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20190529140504.21580-1-philmd@redhat.com> Signed-off-by: Laurent Vivier --- docs/devel/build-system.txt | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/docs/devel/build-system.txt b/docs/devel/build-system.txt index addd274eebd9..41bd08ea3ab3 100644 --- a/docs/devel/build-system.txt +++ b/docs/devel/build-system.txt @@ -413,18 +413,13 @@ context. - default-configs/*.mak The files under default-configs/ control what emulated hardware is built -into each QEMU system and userspace emulator targets. They merely -contain a long list of config variable definitions. For example, -default-configs/x86_64-softmmu.mak has: - - include sound.mak - include usb.mak - CONFIG_QXL=$(CONFIG_SPICE) - CONFIG_VGA_ISA=y - CONFIG_VGA_CIRRUS=y - CONFIG_VMWARE_VGA=y - CONFIG_VIRTIO_VGA=y - ...snip... +into each QEMU system and userspace emulator targets. They merely contain +a list of config variable definitions like the machines that should be +included. For example, default-configs/aarch64-softmmu.mak has: + + include arm-softmmu.mak + CONFIG_XLNX_ZYNQMP_ARM=y + CONFIG_XLNX_VERSAL=y These files rarely need changing unless new devices / hardware need to be enabled for a particular system/userspace emulation target From patchwork Thu Jun 6 11:06:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1111041 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45KNFC6F6gz9sND for ; Thu, 6 Jun 2019 21:08:30 +1000 (AEST) Received: from localhost ([127.0.0.1]:58338 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqFu-00007g-SC for incoming@patchwork.ozlabs.org; Thu, 06 Jun 2019 07:08:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqF2-00005M-Ro for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:07:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYqF1-00033R-S7 for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:07:32 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:59695) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYqEz-0002uI-DY; Thu, 06 Jun 2019 07:07:29 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MTzOe-1h8t6B2imY-00R0Q2; Thu, 06 Jun 2019 13:06:49 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 6 Jun 2019 13:06:16 +0200 Message-Id: <20190606110625.32127-8-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190606110625.32127-1-laurent@vivier.eu> References: <20190606110625.32127-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:wUnOf9ABFcZPIdu6WP+ydyND6/T7AEWzdtKYRCuFesgdbDO+pWV bscKmJLVjodYrfN8t9iS1cRpPoCDfV+1mf45ZCBA0YdeGPvJXrr2kqU85fI/RCIAeKkf8Jg ubdzGz+CcwdO7d2x7jUoCesWsXskwq52BSz9noUg54VgWoR9cGbPPJseEril9oBCNCI+tRH L5CUmfTnWIO1Dy5v6GQ1w== X-UI-Out-Filterresults: notjunk:1; V03:K0:PsnsnShj0z4=:G7S6rys+wtd5sUWMA/PkgR lfvSW1K9nLgLNl/tGLs0aGnp4VvdO5/LOTBI0aiabPu9ARvuoatC6cxNPlW5n2z0hdcOiF9Wi y1VmiJAItG34MlcinYh2/E2kT57r0uQijv7//EeUn2E4FVTXESQy+iUq5U/5q1LLURaNQt/eF jARx/NawnA0BNvRlisSTiIVXVXW/1plgAcZWV/H9+9f63llE7F9EBkAwOIyDOP3ZQw2NEYNh/ 8WC9qhwe8/AT+IlPOmGwHXxA1ypI4vd71H29OBk58psaqnxXAld4uxl3HZpj7J5PhZaSS6HuM CICOud97dMRjjnYQSq5XcT3SYcjUMJt/h91bAy+c0501mrxy4f9ZOJoSZgS9ZrFubFmvsdll3 a1c8r4PkFOC9b2q1MTCIVlHrum3itWxporQBDjZaEFFEHjt6ircdnjEER5joOGy/O7ftMKfSJ wCumsZiJ2mIbgmq8pYX+hpZLh4l9K7Kuccs9OqqulUhLaZSmMhMzY2CmlUYmZ+CDbMpOKj14E nqTf3yKvwhXeEyAkzyNiP6ePbJjEN9GWYVGojba8P1RDcyM/PdAw0amdrd1xvfkKQoxWw10zf LfcnH118f4YeFKzp1IVc11aUosTNwp5wIvFxc9LzSENS2788Ds8eaeKl3xPbEePAPLy16Vxdk zTfn7zZKQl9NmPzhigTgU2ceoMBtj31vi+cA4U/ve8mvuRsFiqHqChRRvc0Q2G0+LkgJrOWnq jgzQMG2ERAx9l0yay8jw2bkWS6GaWZJU8Owp6sYvJm8+DFxaspYnn7KaQ8Y= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PULL 07/16] hw/scsi/vmw_pvscsi: Use qbus_reset_all() directly 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: Fam Zheng , Dmitry Fleytman , David Hildenbrand , Michael Tokarev , Gerd Hoffmann , Juan Quintela , Aleksandar Rikalo , "Michael S. Tsirkin" , Halil Pasic , Christian Borntraeger , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , "Dr. David Alan Gilbert" , Yuval Shaia , Alex Williamson , Richard Henderson , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-s390x@nongnu.org, Cornelia Huck , Laurent Vivier , qemu-trivial@nongnu.org, Michael Walle , Aleksandar Markovic , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Since the BusState is accesible from the SCSIBus object, it is pointless to use qbus_reset_all_fn. Use qbus_reset_all() directly. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Dmitry Fleytman Message-Id: <20190528164020.32250-2-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/scsi/vmw_pvscsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c index 584b4be07e79..c39e33fa3599 100644 --- a/hw/scsi/vmw_pvscsi.c +++ b/hw/scsi/vmw_pvscsi.c @@ -440,7 +440,7 @@ static void pvscsi_reset_adapter(PVSCSIState *s) { s->resetting++; - qbus_reset_all_fn(&s->bus); + qbus_reset_all(BUS(&s->bus)); s->resetting--; pvscsi_process_completion_queue(s); assert(QTAILQ_EMPTY(&s->pending_queue)); @@ -848,7 +848,7 @@ pvscsi_on_cmd_reset_bus(PVSCSIState *s) trace_pvscsi_on_cmd_arrived("PVSCSI_CMD_RESET_BUS"); s->resetting++; - qbus_reset_all_fn(&s->bus); + qbus_reset_all(BUS(&s->bus)); s->resetting--; return PVSCSI_COMMAND_PROCESSING_SUCCEEDED; } From patchwork Thu Jun 6 11:06:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1111047 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45KNKP3dy5z9sND for ; Thu, 6 Jun 2019 21:12:09 +1000 (AEST) Received: from localhost ([127.0.0.1]:58435 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqJT-0003fm-Dl for incoming@patchwork.ozlabs.org; Thu, 06 Jun 2019 07:12:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60373) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqFL-0000P7-Tk for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:07:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYqFI-0003X6-6V for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:07:50 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:38547) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYqF6-0003EB-FB; Thu, 06 Jun 2019 07:07:36 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MkIAB-1gokqY1WHJ-00kkA9; Thu, 06 Jun 2019 13:06:51 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 6 Jun 2019 13:06:17 +0200 Message-Id: <20190606110625.32127-9-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190606110625.32127-1-laurent@vivier.eu> References: <20190606110625.32127-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:hp5C+eRkhKhZrL9ujfcR5R1twR4hIZGd7hOEgFE+5WIY2q2d8lY kN/JEeng4lPu0Ecb53uf5a36SNII/prxc7ozqApBR4wgoSiD282kjxkkuv3171iGM7yuz+r hONn0dYWoQi/b5920YVliGTFHcx0mDmfK75CcNl6N3MlE3EcdEwG1ZCC6ecgj9m33FqnDAN jSJz3ir0wPZLxcfDxFnTw== X-UI-Out-Filterresults: notjunk:1; V03:K0:WFMkMbI5+Qk=:l7BrzmzlCtS/uryTbB9SRq UjqIEOfGTswngkSpPUcZpXPwpySk2vU3hbL4UIf8mB5WfpmlQlwPQGwchlNjb8lOnACSxA08F db7lwXFr1dnLD4BV0GFXZ1OnNkSFuXdZqzYizIGmh7R9q9qpibg6UOZHtPlzJ00ikH4tFF9sW zLAt1MzgY0vxILRJzrsVGA/eriWyAYUfh4FL+qpxqwngkunsk86+PmLmsRgjTGT/9AJxOgj3Y 3kksLEbdbBxR//IDg6AC2hGCheQ3LPYjQ4I9Lz5uNgchjdntKfhUm8R7LwB0rkqcIAB3jowY6 CoU4I6jA8iJ39VRflpFyobnM5jV642+W8kyU6YGKHnRbiV2QJJsvzg+V1uTxUmLVSQmF9aRZN b48wRQ3TbUFX2UNpbAdb99WR4z8aiq4oaeAw5jZVdocc36+seHz0CqiM/+D1DEw4bYYQZjB8z Z5oB7GN5hd13Av/VSaLpG0AjkT5tXYK4oFntOS93kDN6RacwFdD+p5iyg7s5mT8Ur5A77rQvP /dhIQPcRxJ/rIe7xQaieAEPDyZ/2f4dXXL2MH78x6aThvfOcc0rvHW/d0IMVQ4KDVnr0AJUZ/ 99+OKSg1ON+mDyPixOqeNQj94jgcU+k1nnfQHT2Uh8aaIihEqRVfdOYNP/Rye0bny4OOgYAFN Dg79EVs9kP+U01ZTdjx7HCPrWvLjNLpksR2v+kf2i1dQ9C2L1gZ7Dr8VTcuDYlQnnQLN4zCqo yxRFyOPap2hCxh5HggK7PmGcZp9NU16B4+zOrg0ppOewJ+GZCs5ebQoxs1A= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.13 Subject: [Qemu-devel] [PULL 08/16] hw/pci-bridge: Use the QOM BUS() macro to access BusState.qbus 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: Fam Zheng , Peter Maydell , Dmitry Fleytman , David Hildenbrand , Michael Tokarev , Gerd Hoffmann , Juan Quintela , Aleksandar Rikalo , "Michael S. Tsirkin" , Halil Pasic , Christian Borntraeger , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "Dr. David Alan Gilbert" , Yuval Shaia , Alex Williamson , Richard Henderson , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-s390x@nongnu.org, Cornelia Huck , Laurent Vivier , qemu-trivial@nongnu.org, Michael Walle , Aleksandar Markovic , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Rather than looking inside the definition of a BusState with "s->bus.qbus", use the QOM prefered style: "BUS(&s->bus)". This patch was generated using the following Coccinelle script: // Use BUS() macros to access BusState.qbus @use_bus_macro_to_access_qbus@ expression obj; identifier bus; @@ -&obj->bus.qbus +BUS(&obj->bus) Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Marcel Apfelbaum Message-Id: <20190528164020.32250-4-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/pci/pci_bridge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/pci/pci_bridge.c b/hw/pci/pci_bridge.c index c6d9ded3203c..8d954885c0a1 100644 --- a/hw/pci/pci_bridge.c +++ b/hw/pci/pci_bridge.c @@ -273,7 +273,7 @@ void pci_bridge_write_config(PCIDevice *d, newctl = pci_get_word(d->config + PCI_BRIDGE_CONTROL); if (~oldctl & newctl & PCI_BRIDGE_CTL_BUS_RESET) { /* Trigger hot reset on 0->1 transition. */ - qbus_reset_all(&s->sec_bus.qbus); + qbus_reset_all(BUS(&s->sec_bus)); } } From patchwork Thu Jun 6 11:06:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1111046 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45KNJv1qQrz9sND for ; Thu, 6 Jun 2019 21:11:43 +1000 (AEST) Received: from localhost ([127.0.0.1]:58426 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqJ3-0003AW-4W for incoming@patchwork.ozlabs.org; Thu, 06 Jun 2019 07:11:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60541) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqFR-0000Sj-6C for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:07:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYqFQ-0003fy-10 for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:07:57 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:60497) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYqFM-0003W7-7N; Thu, 06 Jun 2019 07:07:52 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N3KDM-1gZYHX0OdG-010LEk; Thu, 06 Jun 2019 13:06:53 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 6 Jun 2019 13:06:18 +0200 Message-Id: <20190606110625.32127-10-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190606110625.32127-1-laurent@vivier.eu> References: <20190606110625.32127-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:8FmYLJqd6nXvaOA8F8eP5aRFDi4xgKrj8Ckn7so07AqnFefxKJf bufSPAvf+aYwQgR9cG5GMvWhk1VEnOVUWd0r0yy8RSAQEFd+XSPDnGH2YOHjoODZstbDNBP hfir2+Nxzizz1I6FPy4HeD4KhyTRzZQpBeTn7NODDPVZ6v91buO68l2eGYdtrRQKQARrDoj ZwU3gVtBTmY/hY52GKerQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:TXGh83A+BFc=:ZlfeUp7i3lWhZ1IXQbS3vy U2Bk0DiMUdTX8F+CvMczxQV8EQC+3NNdMMqRxki0S8iDZUb7knNsz+RY0/MWSRcL3sFAH2Qgs iTMU5zsY/fRk++iZpKBsLf/77weaz/JLdHmuebICDCZr88+/f1h7z4njGpe2gMQQkbBXxDmiD 43VVnlr0AYXNUYcFubTEJHg1W+eBnaupuHDVbH5pKKfiKVZzYNukgrCyPJZHBSyC+o9dZMyh6 oZwo60W8Fh6nQ8NjKCYhVZq00OE9wAjuDOwxZbhrIMqBl4EfQ9e5XWXjBKIEP1erub0XdDOuq PtMRlIP+O4osYQ0btM/Enw+jNZreHIjHP1MOfomcLVY0rzBra3aRUmEAuxmN2ziLaarW5pBQ1 HnQYhQQ77S9QPuHVM/wHaeSQwgcWhW16lSy069RS9SHri6NHt4zNg21Xr+OSCuQo1YbbYjrnV BLXvD3MY2J3kPBmm+2lhDvjrxhKQajcLpQvHm72Ej49J7OXGtmD6UqPrlGxEM/Ny4hdVCZnSW 9NJULwNw9yPSrmCbPtK9Lvzxl/pstrBQ/0FRU3QxVF0kDCbQwTl8ORd5+gjT5lNq2s64yejtt AWDONfS94OE1iPefipkTyvEtgQ/CCP3exZKiMuGSWVsaj/iMrHAJWqSU89Jiez3PyUzEOu+GC ld7sutLLk9ni1LAGO0pUVF3YimlAScZs5LEFeM0miGuK+hAI3DPbw6/8Od+kPeNuTsuoTcjUn UegRD73Qo5OO0CgaqpZPVkLwc1zfqhKugZUSxEQK5r2x0aqrFOI8d/4r0c8= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.13 Subject: [Qemu-devel] [PULL 09/16] hw/s390x/event-facility: Use the QOM BUS() macro to access BusState.qbus 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: Fam Zheng , Peter Maydell , Dmitry Fleytman , David Hildenbrand , Michael Tokarev , Gerd Hoffmann , Juan Quintela , Aleksandar Rikalo , "Michael S. Tsirkin" , Halil Pasic , Christian Borntraeger , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "Dr. David Alan Gilbert" , Yuval Shaia , Alex Williamson , Richard Henderson , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-s390x@nongnu.org, Cornelia Huck , Laurent Vivier , qemu-trivial@nongnu.org, Michael Walle , Aleksandar Markovic , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Rather than looking inside the definition of a BusState with "s->bus.qbus", use the QOM prefered style: "BUS(&s->bus)". This patch was generated using the following Coccinelle script: // Use BUS() macros to access BusState.qbus @use_bus_macro_to_access_qbus@ expression obj; identifier bus; @@ -&obj->bus.qbus +BUS(&obj->bus) Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Cornelia Huck Message-Id: <20190528164020.32250-5-philmd@redhat.com> Signed-off-by: Laurent Vivier Reviewed-by: David Hildenbrand --- hw/s390x/event-facility.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c index ee5b83448b11..e574223a226b 100644 --- a/hw/s390x/event-facility.c +++ b/hw/s390x/event-facility.c @@ -466,12 +466,12 @@ static void init_event_facility(Object *obj) new = object_new(TYPE_SCLP_QUIESCE); object_property_add_child(obj, TYPE_SCLP_QUIESCE, new, NULL); object_unref(new); - qdev_set_parent_bus(DEVICE(new), &event_facility->sbus.qbus); + qdev_set_parent_bus(DEVICE(new), BUS(&event_facility->sbus)); new = object_new(TYPE_SCLP_CPU_HOTPLUG); object_property_add_child(obj, TYPE_SCLP_CPU_HOTPLUG, new, NULL); object_unref(new); - qdev_set_parent_bus(DEVICE(new), &event_facility->sbus.qbus); + qdev_set_parent_bus(DEVICE(new), BUS(&event_facility->sbus)); /* the facility will automatically realize the devices via the bus */ } From patchwork Thu Jun 6 11:06:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1111055 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45KNYf1qchz9s3l for ; Thu, 6 Jun 2019 21:22:46 +1000 (AEST) Received: from localhost ([127.0.0.1]:58623 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqTj-0004dY-Uo for incoming@patchwork.ozlabs.org; Thu, 06 Jun 2019 07:22:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqFf-0000fj-JG for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:08:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYqFe-00044t-Ks for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:08:11 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:41985) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYqFX-0003s4-Al; Thu, 06 Jun 2019 07:08:03 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Mjjvp-1gpIoP3RQB-00lIOV; Thu, 06 Jun 2019 13:06:55 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 6 Jun 2019 13:06:19 +0200 Message-Id: <20190606110625.32127-11-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190606110625.32127-1-laurent@vivier.eu> References: <20190606110625.32127-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:aAa1raASz8JOmSHlj+lCdaiafK8ieKWUPyy/UkUZ38PqO9+KY5j rycJ0oIdjZws5HBSsWNdb41aH1emLIY8VwJIOPyX0fx8uGumkPozjf5X2RcmUEJoIQIjzRP G/E4kNIwblA3p5Aki9SPJDiU/YiMBcHPigbIK8kcbAft51Zc2UqzB+SeoS8FV2pM1UFTR40 8O73Da6kZRsn9RxZAYLKQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:TaGw/BMz8Ds=:+RxgS5R5CEPEwcHSeBiEa9 6BPo33XP9pjQQDFUbXt5rUEFQ9qDhLHbSEj1s9e8h+ELqtsOuMgawgprMxGMFasq5bHCDhsrA rEGFmcOc4AcilUwmi9Il4f6Fhi0GkbwUkJxhTrO0AHiCkTC2k1LQv6YR3XsxFUBEUvernwNDM 7Kp5EGnUfUL1jJdLkur8cs1450ZBX6IMw3tlhgN7MB8waCcczeca8QrK2wHmnNvVINAW4C9VF 076o/oaWLs8OmHM2Ba3re/hyW1FNPnrQCmPkptAEkUc85M9rWNsZ30lBe4rbckpy3iqh6rNpS RQfbvd6ipvUbm3+68smisfzvAr2dbmsUanIvCHL+jnbfLNeKYdlT4OXVMucj3bOMGapK8qfLt 8SAbmK8h54US12l96MBh1ODXxnbS6KpIXdAb9IkO1P3rXJeV6tCKuZofYh/Qpe6Ak47bjt8Jf BG9qOPwhIyZKqbiZHYOh1axIK32ket6NzhSth8K15UDjjwTQhw+CKeIqEAv714AfbcdJAaQl6 9w54CcvGxgtkxjNhAUGDC6bmaiScLH+4MgKqIN13gIVfMUGdec86e8NhAyU/JDDd8IweA+MTW fj7nktBu9b91KA9Fo5MSZhL9lmtgcE+SBx4P73trB72Y308XOw3GczzjSDkWstiLcOI2v7u2y 9FWCw2gbZ1nUOcM9cdK4jh4ps/mRe18ZFymKmWvTVC9gO5Fs8lm9O9NY3hQfXNPZelfFU/1U6 Gedg7yXzCJiLGP2gjEfwPNBJnrI2qLuxUgxd0855y252S8K3lP5hzZCM2t4= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.74 Subject: [Qemu-devel] [PULL 10/16] hw/isa: Use the QOM DEVICE() macro to access DeviceState.qdev 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: Fam Zheng , Peter Maydell , Dmitry Fleytman , David Hildenbrand , Michael Tokarev , Gerd Hoffmann , Juan Quintela , Aleksandar Rikalo , "Michael S. Tsirkin" , Halil Pasic , Christian Borntraeger , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "Dr. David Alan Gilbert" , Yuval Shaia , Alex Williamson , Richard Henderson , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-s390x@nongnu.org, Cornelia Huck , Laurent Vivier , qemu-trivial@nongnu.org, Michael Walle , Aleksandar Markovic , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Rather than looking inside the definition of a DeviceState with "s->qdev", use the QOM prefered style: "DEVICE(s)". This patch was generated using the following Coccinelle script: // Use DEVICE() macros to access DeviceState.qdev @use_device_macro_to_access_qdev@ expression obj; identifier dev; @@ -&obj->dev.qdev +DEVICE(obj) Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Marcel Apfelbaum Message-Id: <20190528164020.32250-8-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/isa/lpc_ich9.c | 2 +- hw/isa/vt82c686.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 031ee9cd933d..35d17246e940 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -412,7 +412,7 @@ void ich9_lpc_pm_init(PCIDevice *lpc_pci, bool smm_enabled) true); } - ich9_lpc_reset(&lpc->d.qdev); + ich9_lpc_reset(DEVICE(lpc)); } /* APM */ diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 85d0532dd5b5..d46754f61cfb 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -369,7 +369,7 @@ static void vt82c686b_pm_realize(PCIDevice *dev, Error **errp) pci_conf[0x90] = s->smb_io_base | 1; pci_conf[0x91] = s->smb_io_base >> 8; pci_conf[0xd2] = 0x90; - pm_smbus_init(&s->dev.qdev, &s->smb, false); + pm_smbus_init(DEVICE(s), &s->smb, false); memory_region_add_subregion(get_system_io(), s->smb_io_base, &s->smb.io); apm_init(dev, &s->apm, NULL, s); From patchwork Thu Jun 6 11:06:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1111042 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45KNFH3hwzz9sND for ; Thu, 6 Jun 2019 21:08:35 +1000 (AEST) Received: from localhost ([127.0.0.1]:58343 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqG1-0000EM-Bo for incoming@patchwork.ozlabs.org; Thu, 06 Jun 2019 07:08:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqF8-0000BW-Lr for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:07:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYqF6-0003G2-8Z for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:07:38 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:59545) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYqF3-00037Y-JN; Thu, 06 Jun 2019 07:07:33 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N3KDM-1gZYHa2AiY-010LEk; Thu, 06 Jun 2019 13:06:56 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 6 Jun 2019 13:06:20 +0200 Message-Id: <20190606110625.32127-12-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190606110625.32127-1-laurent@vivier.eu> References: <20190606110625.32127-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:sJX7kOEASuUqzKMQ0rklS29mfRE7eUYEEoU/Bn7KIEsOMKwqJ2X YWBGxkVKP21No4MYqZEreaKD3SKmNr0IVXBWh40+U/9wjURMbjPqw8xeygGtw6C5ruUhURw 5PTP2d1ArFFy1tfPiZ2v60S3hEqYzBDPMVDYHsP6/bOT7MTQFtMBMFBnNyiu2k8qqxW4zGN d5/gMCNINInwKR1/la0Hw== X-UI-Out-Filterresults: notjunk:1; V03:K0:wzw5+xshbZk=:eOln+xl+YM9UAHFJYpiARo kMAa5EWoxeJf34xxDTgqQC7fOaimZY1Apa9qaRK20b2mH5uttdGv5MT0xv8KkiEvQwmXTKOrI G2w9K0lP2YVN4PKXr3HXSK0hfP1ilcrHsjdI9FfPWdj40yGFwONc+PLcvGlkcsaqIextT69My rWsilrh0PqEV/gOa+bSvsZmd2o6oXtWzcINnTA2TM2kyejnf5FaobVGleekLnqui3iiB3KDdm +mrthPjiRiF+4ZoRmeNyHoQJadUmb1D9jXvzXFpkSk2FIaa3V+e4pEwGFocsoa+5Qziid1dXL G/hSg2quGyzbJoQizY0Is1jXorDCvkW1jORInWTjiYN+eXsJ0JSH0xCf9bGlS4niFydQTqsRu NfNWtaSO09TbKrjupcwPheqsAkmieZoeh7OtLq0lvDQSWXVObbQbzxUQTOsB0u5F0tCEnNQ+x KnarwqmnqkOCRTaNrbJJ/iGOaFAaWo/Ok/3OcNTC30q6TnYKqgV5pzyP814fkUGLUVJ9AczkQ wMRWKKLAifJ1iX+FYEu5sfFCAM5mw6I8j6qsXaHiYS+WDrO28oOUmtqwZ1r+Ced6EkQhr9Tah 7OKszfHeqfKOaG7tEXrqVWN9gnCjLP1Lcr2AQ1KhdtQpCPZ437d1npzmQju6AyY11X2l4RDT2 lOZtGC96V3nZOncQEtpZptxJsmP4A3jVp0PxHXvfVRwUadEL9507lG4oScg+uHRfOhJQxiupc +21hzqQAGybZD2uXCflfJLXdq9D7qS8WmCZrFi5lKSxFoCg+NiVzEQWCFi8= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PULL 11/16] hw/usb-storage: Use the QOM DEVICE() macro to access DeviceState.qdev 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: Fam Zheng , Peter Maydell , Dmitry Fleytman , David Hildenbrand , Michael Tokarev , Gerd Hoffmann , Juan Quintela , Aleksandar Rikalo , "Michael S. Tsirkin" , Halil Pasic , Christian Borntraeger , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "Dr. David Alan Gilbert" , Yuval Shaia , Alex Williamson , Richard Henderson , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-s390x@nongnu.org, Cornelia Huck , Laurent Vivier , qemu-trivial@nongnu.org, Michael Walle , Aleksandar Markovic , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Rather than looking inside the definition of a DeviceState with "s->qdev", use the QOM prefered style: "DEVICE(s)". This patch was generated using the following Coccinelle script: // Use DEVICE() macros to access DeviceState.qdev @use_device_macro_to_access_qdev@ expression obj; identifier dev; @@ -&obj->dev.qdev +DEVICE(obj) Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Gerd Hoffmann Message-Id: <20190528164020.32250-9-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/usb/dev-storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c index cd5551d94f35..0e4e93ef1673 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -616,7 +616,7 @@ static void usb_msd_storage_realize(USBDevice *dev, Error **errp) * The hack is probably a bad idea. */ blk_ref(blk); - blk_detach_dev(blk, &s->dev.qdev); + blk_detach_dev(blk, DEVICE(s)); s->conf.blk = NULL; usb_desc_create_serial(dev); From patchwork Thu Jun 6 11:06:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1111052 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45KNRn1JQMz9sNf for ; Thu, 6 Jun 2019 21:17:39 +1000 (AEST) Received: from localhost ([127.0.0.1]:58541 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqOn-00009S-Eg for incoming@patchwork.ozlabs.org; Thu, 06 Jun 2019 07:17:37 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60804) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqFd-0000d2-E9 for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:08:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYqFc-00042R-Au for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:08:09 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:45529) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYqFU-0003nF-Ly; Thu, 06 Jun 2019 07:08:00 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MxVbb-1gbVHP18Jd-00xp3V; Thu, 06 Jun 2019 13:06:58 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 6 Jun 2019 13:06:21 +0200 Message-Id: <20190606110625.32127-13-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190606110625.32127-1-laurent@vivier.eu> References: <20190606110625.32127-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:tp+rYBTeSmojRMJaBdyBwiM6HZA7HXAoWJTNrbm/XbfsIZGyr5c bFYNMuwa8UFRYcuI0xeaWvVMG6ikGk+Tabzw/180r2IsFGYPc9kGQnqkFYJr3vvoCyA2Hmc O/SFmaoC+qo6bhpQJNqtzbQI16lQV2XRXTH8vDtSVLfm/gsHc9Oa1EXXSd9Ac/+2w6KOU9R AfXaqJjyRtyWkTYfZ0EpA== X-UI-Out-Filterresults: notjunk:1; V03:K0:UNc6Ohb4JzQ=:yLxa3ypR43F8VyTpKGx8Hz dDldjE5xQnZPw0Fr9CbW6skDAsDFZckP05CZoGNm0A4B8DhI0oW/K2uj3y9TPCkto3sFLTJFS 24vU6c/aVrik6hAec0EUbP/npG2hpttLjzrSiiEFLPgIsHSZz9tnLEq02Fyi9+AC7LamlgL8w iYMjNI43aEaHJ690EAWQXeU5zaUrH/rPh8XGxcPm+imaw1jFf8q2nckH1SHg6dbbdLaoBZfHh raxNvD1/YvwTtFk79ElS5PvIasEI/XlL3NvxqhLVNICsHwmX+bKnS6xx1/n4mqLBuDNTwUwWT eO9ZzAAwJxsk4lYdR17r2CwM2zaZVB+gmHOA8axs1Q9kcYPEgAh6bExU6aH9olCJnorA+x8OD atycWsH7UsSvMRv2mFd3SzQwOMGeH+VBj8jKgWjfcnLYfepxvXg2I+brl/ACHigfLFw8mnhSk 8fRxLEdVDchrQbNAFWN4DM3oxjyq5icy4GUGf3LFQHU5LvB/wh/F+uI0iHDJeDuhTQWLCu64c U+emYNHRcolYJqumF2AMK4cfkW6aN/Z1KZO609s0n83x3fKKTlRIpP/r6oRnK48EprgWAOSzr /XWF5gcQ+rVeNoJuYU+Xo6oICNNhtI63eVVNBsnoqNDdDasPDsid1Aerdg1AFmsKWKdiKVpih K5CKbsDT0WnkHrQb32/08g7WX3ru4WlJsqinxgIU4Vk6ZDsGJUjpU8x6AXyAFrxkvLIthpqc/ azZ7K1eMvzsAYX+1Wlv5lprGNq8rRlSBYbfwZVli2gl4bmmNhDp1jMFldDs= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.73 Subject: [Qemu-devel] [PULL 12/16] hw/vfio/pci: Use the QOM DEVICE() macro to access DeviceState.qdev 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: Fam Zheng , Peter Maydell , Dmitry Fleytman , David Hildenbrand , Michael Tokarev , Gerd Hoffmann , Juan Quintela , Aleksandar Rikalo , "Michael S. Tsirkin" , Halil Pasic , Christian Borntraeger , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "Dr. David Alan Gilbert" , Yuval Shaia , Alex Williamson , Richard Henderson , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-s390x@nongnu.org, Cornelia Huck , Laurent Vivier , qemu-trivial@nongnu.org, Michael Walle , Aleksandar Markovic , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Rather than looking inside the definition of a DeviceState with "s->qdev", use the QOM prefered style: "DEVICE(s)". This patch was generated using the following Coccinelle script: // Use DEVICE() macros to access DeviceState.qdev @use_device_macro_to_access_qdev@ expression obj; identifier dev; @@ -&obj->dev.qdev +DEVICE(obj) Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé Acked-by: Alex Williamson Message-Id: <20190528164020.32250-10-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/vfio/pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 8e555db12ec0..2a4091d216e2 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -2717,7 +2717,7 @@ static void vfio_req_notifier_handler(void *opaque) return; } - qdev_unplug(&vdev->pdev.qdev, &err); + qdev_unplug(DEVICE(vdev), &err); if (err) { warn_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name); } @@ -2839,7 +2839,7 @@ static void vfio_realize(PCIDevice *pdev, Error **errp) vdev->vbasedev.name = g_path_get_basename(vdev->vbasedev.sysfsdev); vdev->vbasedev.ops = &vfio_pci_ops; vdev->vbasedev.type = VFIO_DEVICE_TYPE_PCI; - vdev->vbasedev.dev = &vdev->pdev.qdev; + vdev->vbasedev.dev = DEVICE(vdev); tmp = g_strdup_printf("%s/iommu_group", vdev->vbasedev.sysfsdev); len = readlink(tmp, group_path, sizeof(group_path)); From patchwork Thu Jun 6 11:06:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1111050 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45KNNS4MWMz9sNT for ; Thu, 6 Jun 2019 21:14:48 +1000 (AEST) Received: from localhost ([127.0.0.1]:58475 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqM2-0006Bc-Fc for incoming@patchwork.ozlabs.org; Thu, 06 Jun 2019 07:14:46 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60539) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqFR-0000Sa-2T for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:07:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYqFP-0003fm-Vb for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:07:57 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:48335) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYqFM-0003XM-8B; Thu, 06 Jun 2019 07:07:52 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MF45G-1hJOpv4BHE-00FVwS; Thu, 06 Jun 2019 13:07:00 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 6 Jun 2019 13:06:22 +0200 Message-Id: <20190606110625.32127-14-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190606110625.32127-1-laurent@vivier.eu> References: <20190606110625.32127-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:fzaLTWynTwDqw6BjWmgpLb2j0IKt7+qM8X08zaQ6i9wGrXiov9X wSpTCy06OGdyElX7Nu4C3qjeTx82I/dXttSwj8u7Um3YjV8hbFFJFfij/5g9aVoTRZMBsgU qRFZL0xYRoujggCov1NFhZcDbnqII1+ueWrGKkHuP6rsAW5OyeZ+lG4bUnfHOe4LlnTqIjF O/l0SKuUv7l8LcvaDxYGg== X-UI-Out-Filterresults: notjunk:1; V03:K0:Hbvzz2t+sbA=:O/5Xg9ZXO9P0MYOLKekIUO 42O8iR3bR2OTpFSjE/mr0VGHbSNoL+DgTUJeZf8rtvpC2oqiQbZGMbj7L5TDfU9RPivEzId1S tQsl5ZlOhBnJQxMT80vywmOoJgoeLDLz32hbMu6fs2w+eOwu5I1Fee2Hc+FBS23MIYWTURf51 tmbHnhTWGWetV1ZmPRGamqojQNd8KznKwpt+le0Qmj0fnW7y+BFc4lxktjt3sDLSQsuYbhBN/ LGKbYA2X/dnvmILr1zYmyEAR/gzKAA5OzgwO1sGjr8suE3Evekh/qOLxDD3zEtE1Zm9q3pYGh 7ftFN6nvFnvZvN+wl5L2LdgZSBKhaX6m1VDIvKy6WWAdNIQWgeYNy4xxE5UhMKGLggTbdQD3o wZEppG7j7ZoVHJp9qw6gS1wtnNYsofIxKWDmnq3dke1b+vb3Qjz3eTuj7tSeDFI8XuqwQ9KEb 39v75ZQggF9F7r0UFwTd/ujaWqvQgzPe80YweWAEzxiZ6RLqkvHSmyxVtK+j+lA72H+8uRLoK w05IjZqJP4RXFYSNvkBHTu6+l8ppc/qG6e1NzPjJoDE8RHXjYWZjxoSSGcpV59W15K2pH6o22 ZTeMQK0dxgXX75rxPLRnqhvjOMlEyOnqasQ3/8+MH/s9mAkhptO2jmWN3SwWRWAhucN4hjCIB jUZYJ/HboaJs+kHcYLgD9NBDSRnwDL5YZucpvfmRZf5sQCcFcpFxgCO5hBqG+JBigvCWc0ZcR ngA0FWEl9uDMvfez9BUfX7onzPQB12WuPnCop8J1c+JrbzPVolK2NnTNJJk= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.10 Subject: [Qemu-devel] [PULL 13/16] hw/audio/ac97: Use the QOM DEVICE() macro to access DeviceState.qdev 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: Fam Zheng , Peter Maydell , Dmitry Fleytman , David Hildenbrand , Michael Tokarev , Gerd Hoffmann , Juan Quintela , Aleksandar Rikalo , "Michael S. Tsirkin" , Halil Pasic , Christian Borntraeger , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "Dr. David Alan Gilbert" , Yuval Shaia , Alex Williamson , Richard Henderson , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-s390x@nongnu.org, Cornelia Huck , Laurent Vivier , qemu-trivial@nongnu.org, Michael Walle , Aleksandar Markovic , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Rather than looking inside the definition of a DeviceState with "s->qdev", use the QOM prefered style: "DEVICE(s)". This patch was generated using the following Coccinelle script (with a bit of manual fix-up, removing an extra space to please checkpatch.pl): // Use DEVICE() macros to access DeviceState.qdev @use_device_macro_to_access_qdev@ expression obj; identifier dev; @@ -&obj->dev.qdev +DEVICE(obj) Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell . Message-Id: <20190528164020.32250-7-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/audio/ac97.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c index 2265622d44a2..a4e8d99e7775 100644 --- a/hw/audio/ac97.c +++ b/hw/audio/ac97.c @@ -1388,7 +1388,7 @@ static void ac97_realize(PCIDevice *dev, Error **errp) pci_register_bar (&s->dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->io_nam); pci_register_bar (&s->dev, 1, PCI_BASE_ADDRESS_SPACE_IO, &s->io_nabm); AUD_register_card ("ac97", &s->card); - ac97_on_reset (&s->dev.qdev); + ac97_on_reset(DEVICE(s)); } static void ac97_exit(PCIDevice *dev) From patchwork Thu Jun 6 11:06:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1111048 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45KNKp6n83z9sND for ; Thu, 6 Jun 2019 21:12:30 +1000 (AEST) Received: from localhost ([127.0.0.1]:58449 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqJn-00045w-Ol for incoming@patchwork.ozlabs.org; Thu, 06 Jun 2019 07:12:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60747) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqFZ-0000ad-BJ for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:08:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYqFY-0003uH-CQ for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:08:05 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:55263) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYqFV-0003op-VF; Thu, 06 Jun 2019 07:08:02 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MVMJ7-1hAGXq33Ul-00SNSl; Thu, 06 Jun 2019 13:07:02 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 6 Jun 2019 13:06:23 +0200 Message-Id: <20190606110625.32127-15-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190606110625.32127-1-laurent@vivier.eu> References: <20190606110625.32127-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:6yAVocbjKkdBthOG0ZynWAA9tjWYhTGgRctHDWFppOnRh6f2oMI /vBXPjYl9uytwxPm04GLkOO7j2odwptj220yrssmmYDeu0p6f+nOslYEn2YV9RLY0AFoTwk /Js5BQh+wgbFrluk1P3muu+XHFGrYBEikXnFBGguEjXFynE/RZr1ORbtbU3QrJfWVYTOjV3 XxNsfe0AepBWa+PepxPEQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:a7UhvE8kYu0=:HOw3Hj6Z+A6PP6wACCkwe9 h3cyl3LZAPts2BrmQ/Rcd31UoLU6jx31hJSCCGgbUC1g2CrBY3jegxvu8YVXXNBiuNwFUS+39 +NuWw015mgPDFwXEVPEDQM0ypqp17ulEa9LOzgTXqBnGEXujsQRncbHmWAAeU9ajurvchszGa otlD7e9F6Wle+N/jgjgTbrdiI1FAqDjzpnVcdJFjPrUYML2gGkEpliu6/V9KKCiLsVVEjqqgG HzIQj1xL6bTjDp2Ln2016N8dmg1pGMcD3crtSOn0qMabF/6cBezy2Ovo4eo1Rq2/rkZJlH0Hj 7BiMiuoDY3EAskoJj6l3nq1sHgVzkey3oEMXp4qpwCXbXbeqCouEsPouaEcVty5Wk2b/Ufoch csvi8lzHGBDMM/P8mLvfgzWvUS/ktbSVViNZ3c+8Fv/154D90h7Ix1pueVFBASTyqYHpsEEHe VPqnmuy1auUwIhcz2nFuXAFdwlS3VVPxMLRqkZKTdijfnRuXvDNPL7L5FvbAS28fCBa7d3xC2 UQkD52h9vNZ/hY5vcpFPJYPhOfC94ptFvolcAgB3XzHEoPmb3yQ5DiSPdHivRuQLV5hrnTYgE MchukZicxKLDe5d3WNrliGpf2W9gCpS8SrEaGVHRJsVIQ4eMlumt80ShKfLtSaS4zUSg0+CTG uxORGPOE3Ltsy+SEzjGF/g/YUfVh5miWlOLPcwaDgjtJ8KzS2swqtlLTDomgZ3x+JQ1vMPrAY Ca/fe1I+ZmBs0B/r1hl4T7LVpC1cCcFg2yTGFNqysDvF2zW/YQ18TTOUmvY= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.10 Subject: [Qemu-devel] [PULL 14/16] hw/sd: Use the QOM BUS() macro to access BusState.qbus 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: Fam Zheng , Peter Maydell , Dmitry Fleytman , David Hildenbrand , Michael Tokarev , Gerd Hoffmann , Juan Quintela , Aleksandar Rikalo , "Michael S. Tsirkin" , Halil Pasic , Christian Borntraeger , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "Dr. David Alan Gilbert" , Yuval Shaia , Alex Williamson , Richard Henderson , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-s390x@nongnu.org, Cornelia Huck , Laurent Vivier , qemu-trivial@nongnu.org, Michael Walle , Aleksandar Markovic , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Rather than looking inside the definition of a BusState with "s->bus.qbus", use the QOM prefered style: "BUS(&s->bus)". This patch was generated using the following Coccinelle script: // Use BUS() macros to access BusState.qbus @use_bus_macro_to_access_qbus@ expression obj; identifier bus; @@ -&obj->bus.qbus +BUS(&obj->bus) Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell Message-Id: <20190528164020.32250-6-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/sd/milkymist-memcard.c | 2 +- hw/sd/ssi-sd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/sd/milkymist-memcard.c b/hw/sd/milkymist-memcard.c index df42aa1c545b..dd1ba649d9c0 100644 --- a/hw/sd/milkymist-memcard.c +++ b/hw/sd/milkymist-memcard.c @@ -277,7 +277,7 @@ static void milkymist_memcard_realize(DeviceState *dev, Error **errp) /* FIXME use a qdev drive property instead of drive_get_next() */ dinfo = drive_get_next(IF_SD); blk = dinfo ? blk_by_legacy_dinfo(dinfo) : NULL; - carddev = qdev_create(&s->sdbus.qbus, TYPE_SD_CARD); + carddev = qdev_create(BUS(&s->sdbus), TYPE_SD_CARD); qdev_prop_set_drive(carddev, "drive", blk, &err); object_property_set_bool(OBJECT(carddev), true, "realized", &err); if (err) { diff --git a/hw/sd/ssi-sd.c b/hw/sd/ssi-sd.c index 623d0333e863..25e1009277ed 100644 --- a/hw/sd/ssi-sd.c +++ b/hw/sd/ssi-sd.c @@ -249,7 +249,7 @@ static void ssi_sd_realize(SSISlave *d, Error **errp) /* Create and plug in the sd card */ /* FIXME use a qdev drive property instead of drive_get_next() */ dinfo = drive_get_next(IF_SD); - carddev = qdev_create(&s->sdbus.qbus, TYPE_SD_CARD); + carddev = qdev_create(BUS(&s->sdbus), TYPE_SD_CARD); if (dinfo) { qdev_prop_set_drive(carddev, "drive", blk_by_legacy_dinfo(dinfo), &err); } From patchwork Thu Jun 6 11:06:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1111056 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45KNZR6Snzz9s3l for ; Thu, 6 Jun 2019 21:23:27 +1000 (AEST) Received: from localhost ([127.0.0.1]:58635 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqUP-0005Fr-TA for incoming@patchwork.ozlabs.org; Thu, 06 Jun 2019 07:23:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60875) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqFi-0000k7-Kl for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:08:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYqFh-00046k-25 for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:08:14 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:42439) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYqFc-000418-7N; Thu, 06 Jun 2019 07:08:08 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1M5gAG-1hSmUP1wPi-007ET8; Thu, 06 Jun 2019 13:07:03 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 6 Jun 2019 13:06:24 +0200 Message-Id: <20190606110625.32127-16-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190606110625.32127-1-laurent@vivier.eu> References: <20190606110625.32127-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:X7Pzqi/mv0dxQQiN8SxrwtJ1RIT5ZhWHO/wg8CR2AcU8Aqcjkys IQILE+MXIMIeW8OZvIlxp20ttU8zBKHg+OHVjimLpwVlLRzkTfABJ3EfPAqZJwvREjbWdgq 0G8lATPj2xwT3lND3J7dZNB0+TVgmZllAOYUegn0R5SO1uKnNG/ALrTPlNsL/kpIu7DghJK Cv57NpSdPF3BCnxkbospg== X-UI-Out-Filterresults: notjunk:1; V03:K0:UJwOZYeoFZE=:1naxc3Kh4Xt1rELgqCD5Bc jDG7R9YIyWEy448OTJSvwueso0oCcp1Wg+5dv9uljp/ODYIVIqYK3qrpoi9GrQ81eQ5e1JQ5Y boUwl/zJwrjii+TKWN7A3/dWo1mTH6/IMXKXRkMRwnaB4J/Lu+78m6yEa6pPlycVETr+IMCem T6u9ZmTGE/Y03DD3zU5XVyJA2c11ivHYZeozqFRepdC5yF+bsFPM/OLTs6L2s5AFMNksRAOx6 GP/HXXDpGfW0mWIY53D5CUbTejUgoZGvu0IiWTIF62btz3LM3huPtP9W0q7MUbPQns1/WpNQ9 FXnGs0gfu2EKEnsYgO3Pv78uaUnRAhSNWIn1eup0WsgqiQO+6TrQwPuPXc+mjzEelX4ZsyIbh IHMoMH55ERH403WeYncRip2pmilDrx4eL1y5OIjzA1IOOMq7XqzTze2es7uxv66wMEJh0HyvG yIb91fELUZP3Z+80NXDzbZFDv5JD665sEG6gPN6zKaKf9swcGkGotbf2zOa5kJc6XpburW5ol Chu8/hf2ZhTykZQcHHplN9ABAywYUaxWa8Z63MqAgCyINNbfFR9IITsdwt9xVF9WFvwVClMnB BeuyEtEARetrZfAVmXJkXiR2X6U897IUP9ISh8kBLqaAXT9NCpEHXBhyoG5V04ui9HfBTLZFc v+iZLp+lgDo1KPqmGN8O3ytdYp2FkPd8+nWadR6oXjG0snJpQonyP89VHgk2LRi7kuuqBE4FA bChtXKsN9soniAqqZ+lNz0Ur9RCX25vs6TVKdeD1WVdaM3ADRPG92BiIL94= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.74 Subject: [Qemu-devel] [PULL 15/16] hw/scsi: Use the QOM BUS() macro to access BusState.qbus 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: Fam Zheng , Peter Maydell , Dmitry Fleytman , David Hildenbrand , Michael Tokarev , Gerd Hoffmann , Juan Quintela , Aleksandar Rikalo , "Michael S. Tsirkin" , Halil Pasic , Christian Borntraeger , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "Dr. David Alan Gilbert" , Yuval Shaia , Alex Williamson , Richard Henderson , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-s390x@nongnu.org, Cornelia Huck , Laurent Vivier , qemu-trivial@nongnu.org, Michael Walle , Aleksandar Markovic , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Rather than looking inside the definition of a BusState with "s->bus.qbus", use the QOM prefered style: "BUS(&s->bus)". This patch was generated using the following Coccinelle script: // Use BUS() macros to access BusState.qbus @use_bus_macro_to_access_qbus@ expression obj; identifier bus; @@ -&obj->bus.qbus +BUS(&obj->bus) Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Laurent Vivier Message-Id: <20190528164020.32250-3-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/scsi/lsi53c895a.c | 2 +- hw/scsi/mptsas.c | 4 ++-- hw/scsi/virtio-scsi.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index da7239d94fcd..a8b7a199f960 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -1860,7 +1860,7 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val) } if (val & LSI_SCNTL1_RST) { if (!(s->sstat0 & LSI_SSTAT0_RST)) { - qbus_reset_all(&s->bus.qbus); + qbus_reset_all(BUS(&s->bus)); s->sstat0 |= LSI_SSTAT0_RST; lsi_script_scsi_interrupt(s, LSI_SIST0_RST, 0); } diff --git a/hw/scsi/mptsas.c b/hw/scsi/mptsas.c index 929404fb48c8..e800683e91e9 100644 --- a/hw/scsi/mptsas.c +++ b/hw/scsi/mptsas.c @@ -540,7 +540,7 @@ reply_maybe_async: break; case MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS: - qbus_reset_all(&s->bus.qbus); + qbus_reset_all(BUS(&s->bus)); break; default: @@ -803,7 +803,7 @@ static void mptsas_soft_reset(MPTSASState *s) s->intr_mask = MPI_HIM_DIM | MPI_HIM_RIM; mptsas_update_interrupt(s); - qbus_reset_all(&s->bus.qbus); + qbus_reset_all(BUS(&s->bus)); s->intr_status = 0; s->intr_mask = save_mask; diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c index 2994f0738fd8..12d21bbc613c 100644 --- a/hw/scsi/virtio-scsi.c +++ b/hw/scsi/virtio-scsi.c @@ -696,7 +696,7 @@ static void virtio_scsi_reset(VirtIODevice *vdev) assert(!s->dataplane_started); s->resetting++; - qbus_reset_all(&s->bus.qbus); + qbus_reset_all(BUS(&s->bus)); s->resetting--; vs->sense_size = VIRTIO_SCSI_SENSE_DEFAULT_SIZE; From patchwork Thu Jun 6 11:06:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1111054 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45KNWH4LL0z9s3l for ; Thu, 6 Jun 2019 21:20:43 +1000 (AEST) Received: from localhost ([127.0.0.1]:58563 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqRl-0002ZS-0f for incoming@patchwork.ozlabs.org; Thu, 06 Jun 2019 07:20:41 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60642) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYqFU-0000WS-B4 for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:08:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYqFT-0003mR-96 for qemu-devel@nongnu.org; Thu, 06 Jun 2019 07:08:00 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:40829) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hYqFS-0003kp-WE; Thu, 06 Jun 2019 07:07:59 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Mjjvp-1gpIoc0oep-00lIOV; Thu, 06 Jun 2019 13:07:05 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 6 Jun 2019 13:06:25 +0200 Message-Id: <20190606110625.32127-17-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190606110625.32127-1-laurent@vivier.eu> References: <20190606110625.32127-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:bl0xDPOBLSFyaA6yuciGO6yWHbSUzI/Taafs3MPVPDjQvSPq2FO n6XAL3not5uDhjPw7QdREwMHMqCv3HP2WfHkrW3kJZ0ay6L9pndG/dp1Dt4pPzTs5EeJw6u 1V+u6VXkuVastSw4iolcMlezkMrmvDF5WnpikF+fvoqBLA+wyljyEMTK3E9u4SO4wdbfSy3 XnHHHxVxZ1g5nQ0Uka1fQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:B/2HZW/kxEQ=:IBY9o2em4spVu6pcr0bD5N 4qbMMRjgEyOBMgFfTs8RKny4+saGSRYEv1xWFSYqFG5c13q0jtDJdNc1lDvFgk/wxM9G75xVu 1MzOz7WbfU35OEX8xX4SGzALQ1gBajW97yxYyX2HUfFUhTPgqPeHEOiHp7wbqEaG3yNBBZugy +FltJC6MifGu8Ebu8uHTliWZtsqmsxxB1cOzRVLwo++swCivYQsz9PS+bs9sUL6XmAa9EDACp I4gI2i5hWbmtWISlim8JXm2rVqpxqKMN54KHL2hwbys7e7wsil/54oUEBQJPu4gdVylrq0Nqy Ov1owG4ToUZOGq8iOce0wTHpcY16y1bywwLRLAfpBML42UHHlcvBMxVDwkSHar65sg3uvtKMi YtU5+GpjVmeaelGyfY43SNQCDXVWy+hRlCxo/vWM3EVIj3hf0qtxHx3EssyOD51iZ9kmstQgj qk+S+MEBV9/+cWr8Z90TZ4EixwcbpliQlyGCaSlvudNAgo9FuRsHd0p7lz2NCMRwYsyz2TsKN +flqumUZQnv3GhLb2M4D1em2avUDq3PCTXSX+0Tfe3+QnCCSwuV8VaRqz+uM+J6kQXP/YQaTz TnrdStmsQnynmKN3dWjmA2WfBAe82kIgiqTV8WfaA+d/U+2HSnt3ieRjs3YmDY4pNvppbOUr1 7oagnQw4SODMvXVuBxJVFlu+plQymHQX4iOCsC2uAcH+FJeE3BYbrlO1JF4B2DAA5IVowEdE6 EiR3ncUqoE/SMYsiect/LdiFieqFj8omHC6H+HJ2CAgchrjwbRiAGlGH1/c= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.10 Subject: [Qemu-devel] [PULL 16/16] hw/watchdog/wdt_i6300esb: Use DEVICE() macro to access DeviceState.qdev 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: Fam Zheng , Peter Maydell , Dmitry Fleytman , David Hildenbrand , Michael Tokarev , Gerd Hoffmann , Juan Quintela , Aleksandar Rikalo , "Michael S. Tsirkin" , Halil Pasic , Christian Borntraeger , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "Dr. David Alan Gilbert" , Yuval Shaia , Alex Williamson , Richard Henderson , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , qemu-s390x@nongnu.org, Cornelia Huck , Laurent Vivier , qemu-trivial@nongnu.org, Michael Walle , Aleksandar Markovic , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Rather than looking inside the definition of a DeviceState with "s->qdev", use the QOM prefered style: "DEVICE(s)". This patch was generated using the following Coccinelle script: // Use DEVICE() macros to access DeviceState.qdev @use_device_macro_to_access_qdev@ expression obj; identifier dev; @@ -&obj->dev.qdev +DEVICE(obj) Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Laurent Vivier Message-Id: <20190528164020.32250-11-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/watchdog/wdt_i6300esb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/watchdog/wdt_i6300esb.c b/hw/watchdog/wdt_i6300esb.c index 1c6eddf86aea..f2d1e86526f2 100644 --- a/hw/watchdog/wdt_i6300esb.c +++ b/hw/watchdog/wdt_i6300esb.c @@ -200,7 +200,7 @@ static void i6300esb_timer_expired(void *vp) if (d->reboot_enabled) { d->previous_reboot_flag = 1; watchdog_perform_action(); /* This reboots, exits, etc */ - i6300esb_reset(&d->dev.qdev); + i6300esb_reset(DEVICE(d)); } /* In "free running mode" we start stage 1 again. */