From patchwork Tue Jan 18 12:28:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1581265 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JdTTn3vgbz9sXM for ; Wed, 19 Jan 2022 00:03:09 +1100 (AEDT) Received: from localhost ([::1]:37312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n9o8h-0006W5-2f for incoming@patchwork.ozlabs.org; Tue, 18 Jan 2022 08:03:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55612) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9nbd-0004ZN-Lo; Tue, 18 Jan 2022 07:28:57 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:48717) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9nbb-0001uc-7F; Tue, 18 Jan 2022 07:28:57 -0500 Received: from quad ([82.142.13.186]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Ma0HM-1mmirF3ZOm-00Vug9; Tue, 18 Jan 2022 13:28:50 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 1/9] hw/timer/etraxfs_timer: Add vmstate for ETRAX timers Date: Tue, 18 Jan 2022 13:28:39 +0100 Message-Id: <20220118122847.636461-2-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118122847.636461-1-laurent@vivier.eu> References: <20220118122847.636461-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:09/ZkVTYnpu/etwWOM/PzWTt8OgRgTrKqNdcfTEpKIFcgu+sbK5 a+lE71QBba1DFIwCvdcM6yFRQ8IrDhEErw7LAvN7VCVnCagXy8avKtQrqMmA4v5PS+oCzGv yriCgKf02ntipqBq2YJAuE3XBCQ/laXcclY9pXrcN1TR8cd60QcndB3Hs2N3/Bft8aOHiRb iJMwlW9owwzA/p+d7qMKQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:pIkXajQg0Sw=:ihKi2+w8QBCInaq6Tw/iw3 vTQ6tcblsykIL7oqIXSvFN1dFlj4Aze9cDjvPOu5Cvxntco1MEIJqJt0dx5oiT1+Nvz27gTgs hD8jLJp1l5VWhYV/Qt8yosc4q5wRezbzLrAY2PVCXJvLQO6+tZEwi/6vi9/KhKPtWTr58MwF/ d7S3fC185E/Dy/UK84344kaz+pBVGG8Dnsq/EMDuCBMEiEB6X2IVpCXky9PNWbBq9GUnwyguG bH/a/X3aE/YsJKULOq3OWMDI/J+QWQZdzA1rhslDTkCRuI9+z9WfYgNOgQ7Uz010zIPhG6TbR pYH37M4lHKGtia6ItDpXEubRPMwacozF+4VuLJ0h3yMZL3djfufZQ6E8ubKNZsLJo++CfDtcT E1ZZEhusd51gEZFCNuyCUKOVq04wjbpEWBPnvo1jLBhevK71TOQ0TCv51NABdd3ELbVdEkrsG fhUKGdPvSFb2bfiYn4EdSLnqnpHLImaqRfQoBQUahFKxql3Ngd4TFFaH2s+YBGv8aS0snfBaS hjHE5UZdvrunSBkUvOBcqkrBoLAIDEiHNpNYDGGk/fJJ52QM/O+iEyNYRuZ+AhAUb7/ZmAS/P gIkEufSaWVmcb3dRN6MJE6DE4tjx9JjyMZsAxbVwqsr9fsZvnXpy512DtFH1F43d+U+J19wgr 1VxyqeUw8bOAFRF2R6qvQfCbVq3ynvBW93LsKOGzdgu402Xan8nQzDs1NL0fmmybQHxs= Received-SPF: none client-ip=212.227.126.135; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=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: , Cc: qemu-trivial@nongnu.org, Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Add the vmstate for the ETRAX timers. This is in theory a migration compatibility break for the 'AXIS devboard 88' CRIS machine. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20211106105623.510868-1-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- hw/timer/etraxfs_timer.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/hw/timer/etraxfs_timer.c b/hw/timer/etraxfs_timer.c index 4ba662190de3..139e5b86a447 100644 --- a/hw/timer/etraxfs_timer.c +++ b/hw/timer/etraxfs_timer.c @@ -26,6 +26,7 @@ #include "hw/sysbus.h" #include "sysemu/reset.h" #include "sysemu/runstate.h" +#include "migration/vmstate.h" #include "qemu/module.h" #include "qemu/timer.h" #include "hw/irq.h" @@ -64,7 +65,7 @@ struct ETRAXTimerState { ptimer_state *ptimer_t1; ptimer_state *ptimer_wd; - int wd_hits; + uint32_t wd_hits; /* Control registers. */ uint32_t rw_tmr0_div; @@ -83,6 +84,36 @@ struct ETRAXTimerState { uint32_t r_masked_intr; }; +static const VMStateDescription vmstate_etraxfs = { + .name = "etraxfs", + .version_id = 0, + .minimum_version_id = 0, + .fields = (VMStateField[]) { + VMSTATE_PTIMER(ptimer_t0, ETRAXTimerState), + VMSTATE_PTIMER(ptimer_t1, ETRAXTimerState), + VMSTATE_PTIMER(ptimer_wd, ETRAXTimerState), + + VMSTATE_UINT32(wd_hits, ETRAXTimerState), + + VMSTATE_UINT32(rw_tmr0_div, ETRAXTimerState), + VMSTATE_UINT32(r_tmr0_data, ETRAXTimerState), + VMSTATE_UINT32(rw_tmr0_ctrl, ETRAXTimerState), + + VMSTATE_UINT32(rw_tmr1_div, ETRAXTimerState), + VMSTATE_UINT32(r_tmr1_data, ETRAXTimerState), + VMSTATE_UINT32(rw_tmr1_ctrl, ETRAXTimerState), + + VMSTATE_UINT32(rw_wd_ctrl, ETRAXTimerState), + + VMSTATE_UINT32(rw_intr_mask, ETRAXTimerState), + VMSTATE_UINT32(rw_ack_intr, ETRAXTimerState), + VMSTATE_UINT32(r_intr, ETRAXTimerState), + VMSTATE_UINT32(r_masked_intr, ETRAXTimerState), + + VMSTATE_END_OF_LIST() + } +}; + static uint64_t timer_read(void *opaque, hwaddr addr, unsigned int size) { @@ -357,6 +388,7 @@ static void etraxfs_timer_class_init(ObjectClass *klass, void *data) ResettableClass *rc = RESETTABLE_CLASS(klass); dc->realize = etraxfs_timer_realize; + dc->vmsd = &vmstate_etraxfs; rc->phases.enter = etraxfs_timer_reset_enter; rc->phases.hold = etraxfs_timer_reset_hold; } From patchwork Tue Jan 18 12:28:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1581263 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JdTD73dqxz9sRR for ; Tue, 18 Jan 2022 23:51:19 +1100 (AEDT) Received: from localhost ([::1]:56414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n9nxE-0007oz-NZ for incoming@patchwork.ozlabs.org; Tue, 18 Jan 2022 07:51:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55596) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9nbc-0004Yi-UW; Tue, 18 Jan 2022 07:28:57 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:37711) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9nba-0001uZ-OW; Tue, 18 Jan 2022 07:28:56 -0500 Received: from quad ([82.142.13.186]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MQy0N-1mvHQj1fVv-00NyCU; Tue, 18 Jan 2022 13:28:50 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 2/9] hw/scsi/megasas: Simplify using the ldst API Date: Tue, 18 Jan 2022 13:28:40 +0100 Message-Id: <20220118122847.636461-3-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118122847.636461-1-laurent@vivier.eu> References: <20220118122847.636461-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:kA5fMoXBa0wB00HzZofVdfTi95TE04Gb1A9HDOUdB+QwUMk041L 6vcjl53WEmxp0F7uvkffuL+guM2LpNAfmF07WIDXOMMWCA5nZQ6+8eN0Mx1Tf7Q0g5LZ4Oz +PUCKlBuRq/FIX64LGMOIxxq+Dr6WyucEdqUNYS4HhrlZOtWwzC9wWXSj2QLTtq+dFzPKSW UMbgHwjafKi96atA8J3Vw== X-UI-Out-Filterresults: notjunk:1;V03:K0:iUAunBZy8rg=:kvDIGkbx3hSWv05mOfGb8v GGWlCnB1vBNjQx8vsUjDX6x7sRxltLyMY7xj3KkWccjLKdYtDGXJQeDkmrtpCCngmbj3ajgGT KvoOT9PN3I74jJALA+gV8lc47Td9/Nya5B9UxQITCP6zOAfy9TD99uiA8CBQMCk6dmD0BJLuO dyGqB8qkWFKCoEPIezvJCMBeuSAk7j1O0tuWNaUPzsxfB7Pmo8rP4copQoArur5uSXUtSptKr dtGY4tgduX+L2DD6VHaJguy21AWRrKjGKQPCF6BlQKfuIEs9tWreVOulF9e6L9+iUOUjkFVEf XpVw/vl66uuA36cvterlJqL/3UzPt7UYpCfOE5LKZaQZXxl6Rf5ovEwsW8sH/yBPBVkUy5ysM 6kZ15+IYnCOEPrgWiX9+QmevyRi8WdQIbd/XHfeatTMIny1lQgIb50xciGar8GSgi8GQl5vsD UutNvnwek2T//gmJbTP6B9GC/QPCafri6NNnLU3jFQgv7M3WBpwifJZ/83AsMH+tGCu3xUlxf SO1MK4MCheyuqOSTpFLErnikuoz0v1DtTLpmIz3iuyyy5hvA8a9w2NhotzugYNlspdnku1cUn 7dlkVEiURD+yXRv2lVh54QsFW4sEZkKnBZIGkxUbdbhOka6Los+KvbIJwkzpFE1iOWThNvI6U 0oIZug3TkaPtmesCJdF3aWcdQ9USQBuH0Xnuasf+5efobhfokwSAHGicEX2ZqVKZSCco= Received-SPF: none client-ip=212.227.126.130; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=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: , Cc: qemu-trivial@nongnu.org, Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé This code is easier to review using the load/store API. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20211218111912.1499377-1-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/scsi/megasas.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index dc9bbdb740e7..83c321ec208a 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -383,8 +383,7 @@ static int megasas_setup_inquiry(uint8_t *cdb, int pg, int len) cdb[1] = 0x1; cdb[2] = pg; } - cdb[3] = (len >> 8) & 0xff; - cdb[4] = (len & 0xff); + stw_be_p(&cdb[3], len); return len; } @@ -400,18 +399,8 @@ static void megasas_encode_lba(uint8_t *cdb, uint64_t lba, } else { cdb[0] = READ_16; } - cdb[2] = (lba >> 56) & 0xff; - cdb[3] = (lba >> 48) & 0xff; - cdb[4] = (lba >> 40) & 0xff; - cdb[5] = (lba >> 32) & 0xff; - cdb[6] = (lba >> 24) & 0xff; - cdb[7] = (lba >> 16) & 0xff; - cdb[8] = (lba >> 8) & 0xff; - cdb[9] = (lba) & 0xff; - cdb[10] = (len >> 24) & 0xff; - cdb[11] = (len >> 16) & 0xff; - cdb[12] = (len >> 8) & 0xff; - cdb[13] = (len) & 0xff; + stq_be_p(&cdb[2], lba); + stl_be_p(&cdb[2 + 8], len); } /* From patchwork Tue Jan 18 12:28:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1581275 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JdV5D19Bcz9sXM for ; Wed, 19 Jan 2022 00:30:22 +1100 (AEDT) Received: from localhost ([::1]:45836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n9oYx-0007gP-J1 for incoming@patchwork.ozlabs.org; Tue, 18 Jan 2022 08:30:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55562) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9nbb-0004YO-53; Tue, 18 Jan 2022 07:28:56 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:40733) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9nbZ-0001uL-GS; Tue, 18 Jan 2022 07:28:54 -0500 Received: from quad ([82.142.13.186]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MSI6i-1mldzW3q6y-00ScLp; Tue, 18 Jan 2022 13:28:51 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 3/9] qdev-core.h: Fix wrongly named reference to TYPE_SPLIT_IRQ Date: Tue, 18 Jan 2022 13:28:41 +0100 Message-Id: <20220118122847.636461-4-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118122847.636461-1-laurent@vivier.eu> References: <20220118122847.636461-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:MQnKmRB8npa5YEAAaH3uoiCps7zArtRaxuKPOlKKbmIA/OPMg7g l0sS2p8Jep5tk45dGPh90u96Z2/IiMd1440xdqsy5pIhaeCYoxKZPYnsd06y4ykn3W82Lji ouxjgs4/KOPB4IsIbWXVkyZX5W08zmF7bO1o7t7WYQPAxoo78Y0aex2mJ72XZmxneVB5g/k ycbKAgCDuCpr+lprrdbcQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:dJGRwbSZHh4=:o1UcgT2c3RTll2I26kqHwZ sYWwpM6JbB2CrMl0gOwABAmXrPpkxGPli+yJk72MXYFZdswj7dFDist9kBYSsDZOPLxFMqTuZ iCqlEIjyayn1pqA3oq5iH3s3n2FvQAo38ETZzh/cblN2AXaRQg/ZRvutd9Lq3GF2w6oFjYo4k X36LDHEdxxbBrQKGZJELmF6mcS1LIw9vtUkJpN4okVfeqm/spNGYBRSqh6hgJmhnwl64NdAxN Up5bHlgKVI+eLjxcV0skrGRwGvrRxUW9O3EQiUSM1tUsACQ/txsB3la8U845ohBnlS+PmY6RO t5wgDbxc0GjyISM8BNhYm1kQwxK4B7KI9FcmofGaU5Xe2LX0hqIziy3LVBDtCnrlfcH3OMz6c /O1zWovhtFd6qnU1DE4N16uOQOdKaFzcpW9LdPPY9r1Uyy4o73Opypr6Sx48hGgT1w/ToORIV dgNTiJzHAP8nPfqaj3n32CRqhq85NbnUA+JYMhmWJ5Vdr7ZaMaV8HOwFMyK7Jg78sKcouIuTc 9UnzZPOCyjyA0II1REA8gyVDdQgj3YCmfHCTueZmwcW1ggV84SFrqTDIjvzJSolo4xyJkfwrf SO9EXrMWEGk9oTpQQ4U7b1P9DcuUyoEk92onviD7ddzRlN1eiZzg1Pa/uQIHcGNzH6fX0KLzp q2bCfRpmn7+zOtp1lqBCKgp/Zzo2+VRWRYD8CTD1dNJg5A1MM1H/d20pfWjkMrIHLuJY= Received-SPF: none client-ip=212.227.126.135; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=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: , Cc: qemu-trivial@nongnu.org, Peter Maydell , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell Fix a comment in qdev-core.h where we incorrectly referred to TYPE_IRQ_SPLIT when we meant TYPE_SPLIT_IRQ. Signed-off-by: Peter Maydell Message-Id: <20220111172655.3546766-1-peter.maydell@linaro.org> Signed-off-by: Laurent Vivier --- include/hw/qdev-core.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index d19c94175203..92c3d6520866 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -493,7 +493,7 @@ qemu_irq qdev_get_gpio_in_named(DeviceState *dev, const char *name, int n); * qemu_irqs at once, or to connect multiple outbound GPIOs to the * same qemu_irq. (Warning: there is no assertion or other guard to * catch this error: the model will just not do the right thing.) - * Instead, for fan-out you can use the TYPE_IRQ_SPLIT device: connect + * Instead, for fan-out you can use the TYPE_SPLIT_IRQ device: connect * a device's outbound GPIO to the splitter's input, and connect each * of the splitter's outputs to a different device. For fan-in you * can use the TYPE_OR_IRQ device, which is a model of a logical OR From patchwork Tue Jan 18 12:28:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1581279 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JdVFL2Xd6z9sXM for ; Wed, 19 Jan 2022 00:37:26 +1100 (AEDT) Received: from localhost ([::1]:54544 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n9ofr-0005j2-FH for incoming@patchwork.ozlabs.org; Tue, 18 Jan 2022 08:37:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55620) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9nbd-0004ZV-RZ; Tue, 18 Jan 2022 07:28:57 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:51291) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9nbb-0001ui-RX; Tue, 18 Jan 2022 07:28:57 -0500 Received: from quad ([82.142.13.186]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M3VAI-1n9FNB1tHG-000gBP; Tue, 18 Jan 2022 13:28:51 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 4/9] tests: Fix typo in check-help output Date: Tue, 18 Jan 2022 13:28:42 +0100 Message-Id: <20220118122847.636461-5-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118122847.636461-1-laurent@vivier.eu> References: <20220118122847.636461-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:i6PYalnVU2B2ycDWxlaBzav/aWen7xXrmyb15vd3e3gWxsJuWvq M/6ncqwhCw/OLAvx8QET447iEO/OW2Yum9vN37JuXoTfE9Xzw6iPlHyCkpFXHCtK0cSMFhY +by/oXo9t3mxYBe7SDjnRtoSiEk1vtU4WdvxK7lAX5AvSeFFHZdSHm43blnSFJ7meQSRz46 rdqzocIheiU6icnlxobnw== X-UI-Out-Filterresults: notjunk:1;V03:K0:on+rD648Jcs=:MojisKvTT3W39aEIZKwlnL JVMNiKOc/BQppiJWustL2Bou2Dli8Xv8OJU+/WjfWKqLywI4ZyxzLwkuzGNDKLOCHjhb7HzbW n05ldfDJzCyVXKj6MfqWpdX1qHiDrwDHChjWXggoeGKXxamXK+a3JexmvX80h8XJF6vxPNisC tjtXedTuDPWMmhaiQH81onCKgjlyyLs07KUIp3dhaQMRIo5Gcl4BXDhEghi2S8WOZJmWmg45Y lo/GVKibwugYPGqF1cTboHmSg24ILiNx7+yU7RHbLy8AGM372sfpkVxkMQd2lMXe8EM41bBcQ Q0VGnZuim68iOH0a3KN4L4zxydycy2Q/eKK6dcZDDMsqb5LPccUUuBsfRnrU5skh5RuX0vgK6 ZygdCzg1ES1xQnF1FxvxCuhgeYqVHmor38i2qbze9nqhF/nCYpcSp4d0XHkWTcHGsbLpyceBz vNhiczfxVZFQOw7uEqel9ss+Nb/RBdvISlUZXuvzec8h25kpv9l6BHFWUkaY7EE6NDdrWcWP+ Zyrgtlc9J92zAq1cL2BElqJJ9c1YrSmA+gDPz6g7zshc1RK2iOqeVoLaae/+O4ZwP46CUf5FY uSMjo5LLfJRFqLObOa2k8iYISqsQqAtcnzKjhPbfigEUGIwLTZE6Qe7C9tL6f50oyKFY0Gsar Ks+tyDGTZ03qMxW1r4i7dYCffWkMuMDtGk2XTH6UC7psvZ8+NIjcAi/iepp5bIxd7vUE= Received-SPF: none client-ip=212.227.126.130; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=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: , Cc: qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Fix typo in 'make check-help' output. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20220111175528.22294-1-f4bug@amsat.org> 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 4c564cf7899e..3aba62240099 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -23,7 +23,7 @@ endif @echo " $(MAKE) check-clean Clean the tests and related data" @echo @echo "The following are useful for CI builds" - @echo " $(MAKE) check-build Build most test binaris" + @echo " $(MAKE) check-build Build most test binaries" @echo " $(MAKE) get-vm-images Downloads all images used by avocado tests, according to configured targets (~350 MB each, 1.5 GB max)" @echo @echo From patchwork Tue Jan 18 12:28:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1581274 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JdV2s5j1Yz9sXM for ; Wed, 19 Jan 2022 00:28:21 +1100 (AEDT) Received: from localhost ([::1]:42586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n9oX5-0005NR-7U for incoming@patchwork.ozlabs.org; Tue, 18 Jan 2022 08:28:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55772) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9nbz-0004px-Aq; Tue, 18 Jan 2022 07:29:19 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:43051) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9nbw-0001wm-OP; Tue, 18 Jan 2022 07:29:18 -0500 Received: from quad ([82.142.13.186]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N2BQM-1mAf0t0S6A-013bb5; Tue, 18 Jan 2022 13:28:53 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 5/9] softmmu: Provide a clue as to why device tree loading failed Date: Tue, 18 Jan 2022 13:28:43 +0100 Message-Id: <20220118122847.636461-6-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118122847.636461-1-laurent@vivier.eu> References: <20220118122847.636461-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:FmmG+CKTpvo/5jEj8swnrjyejv81D0GmNPY47wdn4u0pt4CkhIF NYwHVr62qfnoeDJ704mBjQDPyajyysAHtqt/O7Y4bgV0Edf67IEGXkSzvU/+KfEZPfgWTQT /h+gMFrHJsbHm9R7bz3AtYzWanbZz99TZlNsKcIU56nIyoCuskWzxt4xoLiWZULGcVJwhKC wlRjXtG2ZGZx5hPOLnZoQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:4DWjIaCnvgc=:ERHdBs68Qvtv0pIHiawS/2 7g85dZNSHSNnGP7M1Lx1n86Y8GGYq+Eu4jqgyPeE+fjHvZQ4OQoXXNcUPfPA2qUImg6fGVwrM THarRWo8S57RVFkTwNaNO9T6cAOgpm9pFmGPH1EDD//FnKBSFCtp8WbuWudl3xg6UOC0jiAdM b3DczNMG4Kq2lXIZzhqRPKwxbZrT/wghVt5B9gtRPdxbk4X2Rm65Mvb/x7XRW/HK4S0GhByGh gkVAOFv73LHHmNTQ568cpFkOtZiJ8jsCk6A0Byx4cwSZpx8j/CpGLFL8WYVKmCpoouFdYi7tf W6Cboyd635tZzs9Z3qbP3csDz8P5rUUbI1IrDRkVlAKTOZKulTLIE4hWO1mofSat0cy8hgymG hNHoBniKDqA9zA2nc9Pmrlpe0u1eCnRmsEVUb3WQBwD7dJmGURFdHdyw7AEbqrYgEgY+6YQs8 j3D/t+nS7hHzd2xgVFiePN7XI24qpUKnUi31teJaKRqj9K0t/Uq+cwxZc88GZ0EhCQv169jA+ VrBxxui6bltdtNFZOFlsfECYMvJ1Z7dJDU0cXjd6clXSXE3sy2zto9L3Wuco2QsyvpNTa5T8d 9Dw8wvsZ+uac6+QkNEO1GNBls90zHIWbw/9ajUARsope4r+J5PLYpXRofDqdbOQTd86WMJ2Zk hpjSAXQjmm0zaZxUC+PRROA4WYJBxPLeOd9rfs6cgNLoSxEL9XkWDBRjip8NtiSZEMDk= Received-SPF: none client-ip=212.227.126.187; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=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: , Cc: qemu-trivial@nongnu.org, Laurent Vivier , =?utf-8?q?P?= =?utf-8?q?hilippe_Mathieu-Daud=C3=A9?= , Alistair Francis , Bernhard Beschow , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Bernhard Beschow fdt_open_into() obligingly returns an error code in case the operation failed. So be obliging as well and use it in the error message. Signed-off-by: Bernhard Beschow Reviewed-by: David Gibson Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220116114649.40859-1-shentey@gmail.com> Signed-off-by: Laurent Vivier --- softmmu/device_tree.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/softmmu/device_tree.c b/softmmu/device_tree.c index 3965c834ca62..31d106694048 100644 --- a/softmmu/device_tree.c +++ b/softmmu/device_tree.c @@ -60,7 +60,8 @@ void *create_device_tree(int *sizep) } ret = fdt_open_into(fdt, fdt, *sizep); if (ret) { - error_report("Unable to copy device tree in memory"); + error_report("%s: Unable to copy device tree into memory: %s", + __func__, fdt_strerror(ret)); exit(1); } @@ -104,7 +105,8 @@ void *load_device_tree(const char *filename_path, int *sizep) ret = fdt_open_into(fdt, fdt, dt_size); if (ret) { - error_report("Unable to copy device tree in memory"); + error_report("%s: Unable to copy device tree into memory: %s", + __func__, fdt_strerror(ret)); goto fail; } From patchwork Tue Jan 18 12:28:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1581278 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JdVDH0HFDz9sXM for ; Wed, 19 Jan 2022 00:36:29 +1100 (AEDT) Received: from localhost ([::1]:52596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n9oew-0004UX-8X for incoming@patchwork.ozlabs.org; Tue, 18 Jan 2022 08:36:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9nbe-0004aa-Pd; Tue, 18 Jan 2022 07:28:58 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:33739) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9nbc-0001uy-Pz; Tue, 18 Jan 2022 07:28:58 -0500 Received: from quad ([82.142.13.186]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MFJfN-1n7pgC49wf-00FkCe; Tue, 18 Jan 2022 13:28:54 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 6/9] linux-user: Fix comment typo in arm cpu_loop code Date: Tue, 18 Jan 2022 13:28:44 +0100 Message-Id: <20220118122847.636461-7-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118122847.636461-1-laurent@vivier.eu> References: <20220118122847.636461-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:9Sc1dsPggki8oCQV/stELrG0WWdFAZR6OrITScov03rS0sg+LB1 3DVM2jASnUM4HSVNclCIQOzWU042+FWraeGPlhpftGBHYLgba9Je2Yp59hWkSNibEIZQdi4 oG0mozj/xeCh+MXy0Jl6j/9+tbbGLQm1MAd7RiyvDvyojS0A0SSJVlvT0ZUOdzSHklG7qET DLf8WoGXOgklSmd/kjttg== X-UI-Out-Filterresults: notjunk:1;V03:K0:cj7vib6NnAA=:UKcKDejVukRreBu+SWx8fb Nw0OsbCY4vNXbjefyCRWbI9IsUH14yf+xB/1TqRmQHPsVsGigs/WooayH03HYn9zOiapn2wqs /HErHrDGMPMascDp+pM/9B5/sYmF7lGerLZITdkLMOTp4IK1T1HIjKD6upksxpt7Ht93rxgL8 aHkocoWTUEGLJqr8IsEtrXiEgLcNlVvcdmqcRbe0GZ3Bv2xNzzUc4tcARIFIK7YBJ7sd0fmyY FCPP/tjizar5XESl2ZVFLx10sgV3RDuK2CSZbPBryHk//lLjuPRgWyfb7KrE4nscR7NeACdOP 4f9t+pZjPvLcT8gUB3pjIgsUsOglhaMKqx4ODHvMRSbOMzUIBajHgJ/UoJrc34dSSjUa6MHaJ eT1wcV8ZjFReFmWytt9dSep6SajPmMENd3BrQjzr28QDEiPtCflNzi/XGyK5dF27OkBga8/1S AZMsA8qhRAQ/GobKR6gsxI1wXb6KK5DfpmTDXH2w4l2xk21bIaVFDsJycAtGXZe3D6IWra2PH baO9qLu8XpDolnZSRdztvCQ6tQ/D2LOM25c2ZWv6e8NgTk1C7NKzHy9nN9Iv/HW7O1A7FNkxT RMxYhM1Y/S8W8d9vWI+qkWSpZOt40CVhip9uDPQksmkrgwOSfBbIC3UTYGpwbFMMEQP0nNHNj d1aRJHC39trpx3jHhRiDtyuz2pG/hylQogDNVob9BL+Bjy6wS0FUXdOXL0/iJR5HE1iQ= Received-SPF: none client-ip=212.227.126.130; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=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: , Cc: qemu-trivial@nongnu.org, Peter Maydell , Laurent Vivier , Warner Losh Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell Fix a typo in a comment in the arm cpu_loop code. Signed-off-by: Peter Maydell Reviewed-by: Warner Losh Message-Id: <20220114182535.3804783-1-peter.maydell@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/arm/cpu_loop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-user/arm/cpu_loop.c b/linux-user/arm/cpu_loop.c index f153ab503a8a..032e1ffddfbd 100644 --- a/linux-user/arm/cpu_loop.c +++ b/linux-user/arm/cpu_loop.c @@ -434,8 +434,8 @@ void cpu_loop(CPUARMState *env) case 0x6: /* Access flag fault, level 2 */ case 0x9: /* Domain fault, level 1 */ case 0xb: /* Domain fault, level 2 */ - case 0xd: /* Permision fault, level 1 */ - case 0xf: /* Permision fault, level 2 */ + case 0xd: /* Permission fault, level 1 */ + case 0xf: /* Permission fault, level 2 */ si_signo = TARGET_SIGSEGV; si_code = TARGET_SEGV_ACCERR; break; From patchwork Tue Jan 18 12:28:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1581268 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JdTf06MQqz9sXM for ; Wed, 19 Jan 2022 00:10:16 +1100 (AEDT) Received: from localhost ([::1]:47038 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n9oFa-0005VN-MT for incoming@patchwork.ozlabs.org; Tue, 18 Jan 2022 08:10:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55642) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9nbg-0004dK-AM; Tue, 18 Jan 2022 07:29:00 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:43741) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9nbe-0001vF-HW; Tue, 18 Jan 2022 07:28:59 -0500 Received: from quad ([82.142.13.186]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MN67J-1mrRwJ27sb-00J2Vw; Tue, 18 Jan 2022 13:28:54 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 7/9] linux-user: Rename user_force_sig tracepoint to match function name Date: Tue, 18 Jan 2022 13:28:45 +0100 Message-Id: <20220118122847.636461-8-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118122847.636461-1-laurent@vivier.eu> References: <20220118122847.636461-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:Tsl2Q16fvXB8FNfFf/v1PpOY2UMUt9fOCM4ty45DVnz1nkd6cae YlNfvO/fFe5BP9rIkJrs8qcFP2dJ9g6pNtXrccv7ZFyYNlH8QmTd3gcw31E9jLrL2KgIyv4 WA45vBcI/8o743Ommt3fiPVy5qglfZmppucjymAeul0JJsf4dLgU3IIanKrp1D+vTMWfjXx XDatr/NxQa19zro6IZIHg== X-UI-Out-Filterresults: notjunk:1;V03:K0:Thhiw20/mDc=:NwpC8qjD6mZxjPKDsN93Vm DkUBSd06aswz96tV0Fhf5kVaLhRA04DGe6SSFOx0FNmOSgXPlpC+L4vGK6oMH7+y9WsaSSAHG wYc23djdC6TKUmuvT8tBJKEPX3XqqEwllLAR2QROizuAOssRkXK1//qyCr945iORSdG28okc0 QG+akhWqVsYNMkbi4G/zOX+x1T7rk7MvfwOvCZcimWzd8zyizT2z4pw69zcvQId0GRkbjUzjA Suceq2X6c3Am9dmcaES/NMAfbp6ksgGuSSOYIF1P1hs5mVpWQnIH0YV/UKeepgX2EJa4+5kxn vJIfNUUjGWPFSF5wERH3rMiYMFHNMG0PmF/CQIwBGK/ngAjFqGC7dshxukJUfKY13z5ostCUf O+w7E296X2+3t9QQ7YJXGHWXCNyDz6j3lMNm63FQmHZGPf3Rx3hGygOA/X7FhsB5xAOEgzRuG tdWUGC/wZhG4GkeIQSoc/0Z5eOimCVQv1KNp/66I4YNYmYm7XeKvGzScNJazyvU+XLxDGm3QB EnovDAjsDH8W0MhqdGeCtGYh02xpsGzq3uxRstvSxFD+jcle28vnLGeKlbrDwmEtik49L3mB8 k72P5vXUnjDo9TyOzlKfbKAOCVYWiXmlwISLSQalQyw2bTf47g0NY2lS1+5lQkF3NuCZjhNr9 aCZOokwaYQvrJROzayiUL5/7tCqqiv6c4fATDkLK29CASQGgVHflifkAZBTW8kgzv24E= Received-SPF: none client-ip=212.227.126.135; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=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: , Cc: qemu-trivial@nongnu.org, Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell In commit c599d4d6d6e9bfdb64 in 2016 we renamed the old force_sig() function to dump_core_and_abort(), but we forgot to rename the associated tracepoint. Rename the tracepoint to to match the function it's called from. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220114153732.3767229-3-peter.maydell@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/signal.c | 2 +- linux-user/trace-events | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-user/signal.c b/linux-user/signal.c index f813b4f18e44..bfbbeab9ad2e 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -734,7 +734,7 @@ static void QEMU_NORETURN dump_core_and_abort(int target_sig) struct sigaction act; host_sig = target_to_host_signal(target_sig); - trace_user_force_sig(env, target_sig, host_sig); + trace_user_dump_core_and_abort(env, target_sig, host_sig); gdb_signalled(env, target_sig); /* dump core if supported by target binary format */ diff --git a/linux-user/trace-events b/linux-user/trace-events index e7d2f54e9401..f33717f248af 100644 --- a/linux-user/trace-events +++ b/linux-user/trace-events @@ -9,7 +9,7 @@ user_setup_frame(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64 user_setup_rt_frame(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64 user_do_rt_sigreturn(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64 user_do_sigreturn(void *env, uint64_t frame_addr) "env=%p frame_addr=0x%"PRIx64 -user_force_sig(void *env, int target_sig, int host_sig) "env=%p signal %d (host %d)" +user_dump_core_and_abort(void *env, int target_sig, int host_sig) "env=%p signal %d (host %d)" user_handle_signal(void *env, int target_sig) "env=%p signal %d" user_host_signal(void *env, int host_sig, int target_sig) "env=%p signal %d (target %d)" user_queue_signal(void *env, int target_sig) "env=%p signal %d" From patchwork Tue Jan 18 12:28:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1581284 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JdVbj74qVz9ssD for ; Wed, 19 Jan 2022 00:53:21 +1100 (AEDT) Received: from localhost ([::1]:46210 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n9ovH-0003n9-RA for incoming@patchwork.ozlabs.org; Tue, 18 Jan 2022 08:53:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55734) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9nby-0004oo-6u; Tue, 18 Jan 2022 07:29:18 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:41033) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9nbm-0001wV-Ml; Tue, 18 Jan 2022 07:29:17 -0500 Received: from quad ([82.142.13.186]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mcpz0-1mZuYX0CQ6-00a107; Tue, 18 Jan 2022 13:28:55 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 8/9] linux-user: Return void from queue_signal() Date: Tue, 18 Jan 2022 13:28:46 +0100 Message-Id: <20220118122847.636461-9-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118122847.636461-1-laurent@vivier.eu> References: <20220118122847.636461-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:QeG1eFTRE/Urk2aR/twAVOiLDrXveYNtkX83aKc3lzNNpiVafgg vGTzMGI9AacC43fObbFJ4wtX5zBTFgF3sfALPvye9CRBB1ohZocvr1/a/xdDreApwMWEJbx zb3kP11EF/tzb8iaSmernm7qfD7lGX/YNjs8JWdSli/DB3tHR05Wkoq3XgwHTQV8afRECSk biTHv/IuBM8VDDKZi6cSA== X-UI-Out-Filterresults: notjunk:1;V03:K0:3LWQsXjGBMs=:eH32QqGWHM/h+loKzlHWmj BnqsRjyvIX3xHiEQObpSPI0uAcaOaqo7hHQR3GshWJlnbU9oVe4qbwU5Po8qzBKJAbucoD4rR VCm/KM1xr7xrNRNWKK/UYiQewTrZgsUB6YscM0/m2b+UNaEgKp7OEqa2/bj7sa8rYWGPvNAlI GnWBTFamP0DB2waLJVJIP+Xwimy/yZ3LIZZTgaPVMbn5ylPf0JJ2bheXqO0gNTCFJYoFzU2AA dCtxnMiYk8wVLTOKRNUcFCLAqflAh9EAYszN6ifJQnih0lPgxHCYtd2xyuFQDs6o7XTBFGm7Y m2T7K8XIHJMR3fUayWpoUZoZdMecdsyGIeAEOPT0KL3zKiD1GNvJ7358hzd1ks71xD9vsxd7z EkfLFlVKQ58zjdyguzIDmpdD0fo9VEpeSblVZne3qdq45JmGa2/5LdQG8ZGzHaYub4Rt6ywph 1ZJSbhQp7i0T55cIMbCUXOO8Nlf2L0Qye5/shiJn75bjlhwsuXp+3SsG7SwH69eJVAdoyWu2W vlx9E8n4ww4Z5oUsIx4zbW4NhSxezYTgD5B+GLdmFw1Tjz3xpKIiswsfZQlNjU8P40VJASxs1 Gd2ZbBnZ1sNM90Wz5j53dzNNWhDlsYBgwCLte+zwJtMVSvEObFcGM/Tw3WsHf9URYD/DDtOza t4GsL5r9TwT1FlkS15I6MrZU2xolR/d6Gy61fFamxyKtwWsVEv4TxZFwkZ2j/mc0tWF4= Received-SPF: none client-ip=212.227.126.187; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=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: , Cc: qemu-trivial@nongnu.org, Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell The linux-user queue_signal() function always returns 1, and none of its callers check the return value. Give it a void return type instead. The return value is a leftover from the old pre-2016 linux-user signal handling code, which really did have a queue of signals and so might return a failure indication if too many signals were queued at once. The current design avoids having to ever have more than one signal queued via queue_signal() at once, so it can never fail. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220114153732.3767229-4-peter.maydell@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/signal-common.h | 4 ++-- linux-user/signal.c | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/linux-user/signal-common.h b/linux-user/signal-common.h index 42aa479080b8..2113165a7583 100644 --- a/linux-user/signal-common.h +++ b/linux-user/signal-common.h @@ -59,8 +59,8 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, void process_pending_signals(CPUArchState *cpu_env); void signal_init(void); -int queue_signal(CPUArchState *env, int sig, int si_type, - target_siginfo_t *info); +void queue_signal(CPUArchState *env, int sig, int si_type, + target_siginfo_t *info); void host_to_target_siginfo(target_siginfo_t *tinfo, const siginfo_t *info); void target_to_host_siginfo(siginfo_t *info, const target_siginfo_t *tinfo); int target_to_host_signal(int sig); diff --git a/linux-user/signal.c b/linux-user/signal.c index bfbbeab9ad2e..32854bb3752d 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -780,8 +780,8 @@ static void QEMU_NORETURN dump_core_and_abort(int target_sig) /* queue a signal so that it will be send to the virtual CPU as soon as possible */ -int queue_signal(CPUArchState *env, int sig, int si_type, - target_siginfo_t *info) +void queue_signal(CPUArchState *env, int sig, int si_type, + target_siginfo_t *info) { CPUState *cpu = env_cpu(env); TaskState *ts = cpu->opaque; @@ -794,7 +794,6 @@ int queue_signal(CPUArchState *env, int sig, int si_type, ts->sync_signal.pending = sig; /* signal that a new signal is pending */ qatomic_set(&ts->signal_pending, 1); - return 1; /* indicates that the signal was queued */ } From patchwork Tue Jan 18 12:28:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1581281 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JdVRk1SvHz9sXM for ; Wed, 19 Jan 2022 00:46:26 +1100 (AEDT) Received: from localhost ([::1]:36586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n9ooZ-0005FB-Bu for incoming@patchwork.ozlabs.org; Tue, 18 Jan 2022 08:46:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9nbh-0004eV-QF; Tue, 18 Jan 2022 07:29:01 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:60835) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n9nbg-0001vo-1d; Tue, 18 Jan 2022 07:29:01 -0500 Received: from quad ([82.142.13.186]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mm9NA-1mRd6F2hjU-00iESf; Tue, 18 Jan 2022 13:28:55 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 9/9] linux-user: Remove MAX_SIGQUEUE_SIZE Date: Tue, 18 Jan 2022 13:28:47 +0100 Message-Id: <20220118122847.636461-10-laurent@vivier.eu> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118122847.636461-1-laurent@vivier.eu> References: <20220118122847.636461-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:xVDWO0rOo6tfbtHhb3fszSbSPP5GxI+CQBOPheU3fF5nIT1OfL9 OfHbQymYf7T1ZIhh95s+bYWhhXe04CYmawJve25pGZFwqmLwXdoAJvG/7JchS4dGPWRNUOg 4FjzBqmkKJbyTNPgP30DsiOSHf4LbNeviGinKnCVk55CHxit4FUBqoxee/NX73fLyP8zgoJ lvkCH1226Rxb8K4FoAZgg== X-UI-Out-Filterresults: notjunk:1;V03:K0:5GdSVSHQYOc=:vrZE+AfRjeDTZI9hBBpx1b 4xjbmCFVNpE+twVMIcqjXYxX1HbWtkvtI/bdrSQAasGVQp9Iq08OMDwtTYnDA192IkY2wpljb PRWiNk96oJe2jjlNoqMbf1Ue1evES4EHghde2gtqCc4CElAEOYJTgyliwReEkNg6HoBRfhuLo VcrXmf9hEzIcZDZW0K9kKWwkKYxUuqiAuI2JxLaS0xVOohZIHDs1ZTK3xMpZOfLq2VVxmUTYB 2IiA3VhXsVDobnSTZH6G6U+NX7Ndi2i0mfTQl5cIpGh4G5mla1/ijVbemHsv8CLjCAmfKM2wn Wc5kHpsD5EmTFvKy+0MG7xTHLzfEelVfN0vp5RWlm3Rdu23I1Fyd8weF4NmXXl/sQt3iX8bxe coNgVF0Xlk7mr2eZarpbF8nMEkITCmyA4EZlvypjIitd/U31YpVP68mDBH4gKexA3Dg1Km4yh EKamPGx9FCsCNh0IdHIjb8UwizKUDEGCqRNdogZvEf9Yb/iiWZ2DZOxyIdgM4HwCmHMynpUZK I1ALHxvyOEj3iNHjqmL6C0vk3xuYeH6VuWhhQT/NyROq1O/Dt7t02MgD1d6pFBeOLXzeTQO/Q 3dWb8tPGbFHgT7PcXRzhOokqAAebsxIhFsIUMsKZ7iE1ZasMTS/woaQcTrnh4SYvJsiFbLKxP FbiaSX8tGSBd1ArzKpmBdJIze/LDxcsVv6b0F2wMR8gE8zZQa2+b65E8b2t5nXBsAQU8= Received-SPF: none client-ip=212.227.126.130; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=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: , Cc: qemu-trivial@nongnu.org, Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Warner Losh , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Warner Losh It's been unused for 7 years since 907f5fddaa67 when linux-user stopped queueing any signals. Signed-off-by: Warner Losh Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220116204423.16133-2-imp@bsdimp.com> Signed-off-by: Laurent Vivier --- linux-user/qemu.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 5c713fa8ab26..7910ce59cc8c 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -89,8 +89,6 @@ struct vm86_saved_state { #include "nwfpe/fpa11.h" #endif -#define MAX_SIGQUEUE_SIZE 1024 - struct emulated_sigtable { int pending; /* true if signal is pending */ target_siginfo_t info;