From patchwork Wed Mar 10 21:44:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12129483 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3C3DC433E0 for ; Wed, 10 Mar 2021 21:50:22 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 2B3D164FC8 for ; Wed, 10 Mar 2021 21:50:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2B3D164FC8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK6ie-0001Bd-1w for qemu-devel@archiver.kernel.org; Wed, 10 Mar 2021 16:50:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6dr-000344-74; Wed, 10 Mar 2021 16:45:19 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:56341) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6do-0004Jn-3m; Wed, 10 Mar 2021 16:45:18 -0500 Received: from localhost.localdomain ([82.142.6.26]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1M1IRY-1lIRwt35je-002log; Wed, 10 Mar 2021 22:45:10 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 01/22] Various spelling fixes Date: Wed, 10 Mar 2021 22:44:43 +0100 Message-Id: <20210310214504.1183162-2-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210310214504.1183162-1-laurent@vivier.eu> References: <20210310214504.1183162-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:arrOCt4FoApu72GQ/IP+zBdhMl76OX6myfWEP3/YPQjk38XEBm1 Cb3QirKe8lNZwdzN/w+gMTTcEyi4S1ioj/5FY+bCP4wspdP2hshrJayhRAjImGjkTE3t0xj 08w4r/klD1idKPBI5ypCwlMwo2ZDPC//kokW+5+2dFG5+4GXHCps/45fAN37daIq7gmGKm+ cHZjKMrRXiR/Y0wfq2dvw== X-UI-Out-Filterresults: notjunk:1;V03:K0:nZ232gMtGsY=:3/tR98DwHwiHYGTvyW5Iv6 QAReHkmzUfJYrbpn99EvoDxvRqynCxroJb2MgV0Z4D1Gm8FDEgSEnWB8TT/mZHcegCXLiKUWX 0GHwEOhXwBdGCLxesx6scDv4b0ZLK1A88EMlyfjgpj97AJzpqrZhgVyKDn+3eG6fYMfRxCYKr 9EAHK/N7TEBcfDm5gOb4e/MUMVlhZhwridt8NCu9VKScjJ9VH4F4EElIDO+7UYHTx5iuxcsEg QFLGzZOC23a/RNGkLAwLlfKhU6xTvXCKkIyr9qYXOzGC3WdGcaS/USXeKs+/SSyJSGZnsUju2 esGO+ZAISGe4vALXSHaBDV5Wqc+bhmdDA0S9a6hCKju13g0smpAdQy1AjkheTfijMedJJmgEC 5SOMt9yIGkCpxXodnmwiedgZNKbaQgj7jzJdD3wyABF9Hq0qG1gZzLmm4bjJuS+tRnZ3zXKHa uw9puwt0fA== Received-SPF: none client-ip=212.227.17.24; 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , qemu-trivial@nongnu.org, Stefan Weil , Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Michael Tokarev An assorted set of spelling fixes in various places. Signed-off-by: Michael Tokarev Reviewed-by: Stefan Weil Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell Message-Id: <20210309111510.79495-1-mjt@msgid.tls.msk.ru> Signed-off-by: Laurent Vivier --- disas/nanomips.cpp | 2 +- hw/misc/trace-events | 2 +- hw/net/allwinner-sun8i-emac.c | 2 +- hw/ppc/pnv_bmc.c | 2 +- hw/usb/ccid-card-emulated.c | 2 +- hw/usb/hcd-ohci.c | 2 +- hw/virtio/vhost.c | 2 +- include/hw/s390x/css.h | 2 +- qemu-options.hx | 4 ++-- target/i386/cpu.c | 2 +- target/i386/machine.c | 2 +- target/m68k/op_helper.c | 2 +- target/riscv/cpu.c | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp index 90e63b836746..2b0965527194 100644 --- a/disas/nanomips.cpp +++ b/disas/nanomips.cpp @@ -837,7 +837,7 @@ int NMD::Disassemble(const uint16 * data, std::string & dis, * an ASE attribute and the requested version * not having that attribute */ - dis = "ASE attribute missmatch"; + dis = "ASE attribute mismatch"; return -5; } disassembly_function dis_fn = table[i].disassembly; diff --git a/hw/misc/trace-events b/hw/misc/trace-events index d626b9d7a7c6..ef0a4de39d50 100644 --- a/hw/misc/trace-events +++ b/hw/misc/trace-events @@ -127,7 +127,7 @@ npcm7xx_pwm_update_freq(const char *id, uint8_t index, uint32_t old_value, uint3 npcm7xx_pwm_update_duty(const char *id, uint8_t index, uint32_t old_value, uint32_t new_value) "%s pwm[%u] Update Duty: old_duty: %u, new_duty: %u" # stm32f4xx_syscfg.c -stm32f4xx_syscfg_set_irq(int gpio, int line, int level) "Interupt: GPIO: %d, Line: %d; Level: %d" +stm32f4xx_syscfg_set_irq(int gpio, int line, int level) "Interrupt: GPIO: %d, Line: %d; Level: %d" stm32f4xx_pulse_exti(int irq) "Pulse EXTI: %d" stm32f4xx_syscfg_read(uint64_t addr) "reg read: addr: 0x%" PRIx64 " " stm32f4xx_syscfg_write(uint64_t addr, uint64_t data) "reg write: addr: 0x%" PRIx64 " val: 0x%" PRIx64 "" diff --git a/hw/net/allwinner-sun8i-emac.c b/hw/net/allwinner-sun8i-emac.c index 042768922c97..bf91803d65a8 100644 --- a/hw/net/allwinner-sun8i-emac.c +++ b/hw/net/allwinner-sun8i-emac.c @@ -579,7 +579,7 @@ static uint64_t allwinner_sun8i_emac_read(void *opaque, hwaddr offset, case REG_INT_STA: /* Interrupt Status */ value = s->int_sta; break; - case REG_INT_EN: /* Interupt Enable */ + case REG_INT_EN: /* Interrupt Enable */ value = s->int_en; break; case REG_TX_CTL_0: /* Transmit Control 0 */ diff --git a/hw/ppc/pnv_bmc.c b/hw/ppc/pnv_bmc.c index b9bf5735ea0f..75a22ce50b11 100644 --- a/hw/ppc/pnv_bmc.c +++ b/hw/ppc/pnv_bmc.c @@ -233,7 +233,7 @@ static void hiomap_cmd(IPMIBmcSim *ibs, uint8_t *cmd, unsigned int cmd_len, case HIOMAP_C_RESET: case HIOMAP_C_LOCK: default: - qemu_log_mask(LOG_GUEST_ERROR, "HIOMAP: unknow command %02X\n", cmd[2]); + qemu_log_mask(LOG_GUEST_ERROR, "HIOMAP: unknown command %02X\n", cmd[2]); break; } } diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c index 2d566f7db104..5c76bed77aa0 100644 --- a/hw/usb/ccid-card-emulated.c +++ b/hw/usb/ccid-card-emulated.c @@ -301,7 +301,7 @@ static void *event_thread(void *arg) } else { if (event->reader != card->reader) { fprintf(stderr, - "ERROR: wrong reader: quiting event_thread\n"); + "ERROR: wrong reader: quitting event_thread\n"); break; } } diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index f8c64c8b95bb..1cf2816772c5 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -1126,7 +1126,7 @@ static int ohci_service_td(OHCIState *ohci, struct ohci_ed *ed) OHCI_SET_BM(td.flags, TD_EC, 3); break; } - /* An error occured so we have to clear the interrupt counter. See + /* An error occurred so we have to clear the interrupt counter. See * spec at 6.4.4 on page 104 */ ohci->done_count = 0; } diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 2a01662b0882..e2163a0d63ed 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -909,7 +909,7 @@ check_dev_state: r = 0; } if (r) { - /* An error is occured. */ + /* An error occurred. */ dev->log_enabled = false; } diff --git a/include/hw/s390x/css.h b/include/hw/s390x/css.h index 08c869ab0afc..7901ab276ce9 100644 --- a/include/hw/s390x/css.h +++ b/include/hw/s390x/css.h @@ -133,7 +133,7 @@ struct SubchDev { bool ccw_fmt_1; bool thinint_active; uint8_t ccw_no_data_cnt; - uint16_t migrated_schid; /* used for missmatch detection */ + uint16_t migrated_schid; /* used for mismatch detection */ CcwDataStream cds; /* transport-provided data: */ int (*ccw_cb) (SubchDev *, CCW1); diff --git a/qemu-options.hx b/qemu-options.hx index 90801286c6e2..c324633fcaad 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -176,7 +176,7 @@ SRST ``thread=single|multi`` Controls number of TCG threads. When the TCG is multi-threaded - there will be one thread per vCPU therefor taking advantage of + there will be one thread per vCPU therefore taking advantage of additional host cores. The default is to enable multi-threading where both the back-end and front-ends support it and no incompatible TCG features have been enabled (e.g. @@ -2445,7 +2445,7 @@ DEF("netdev", HAS_ARG, QEMU_OPTION_netdev, " use 'vhostfd=h' to connect to an already opened vhost net device\n" " use 'vhostfds=x:y:...:z to connect to multiple already opened vhost net devices\n" " use 'queues=n' to specify the number of queues to be created for multiqueue TAP\n" - " use 'poll-us=n' to speciy the maximum number of microseconds that could be\n" + " use 'poll-us=n' to specify the maximum number of microseconds that could be\n" " spent on busy polling for vhost net\n" "-netdev bridge,id=str[,br=bridge][,helper=helper]\n" " configure a host TAP network backend with ID 'str' that is\n" diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 50008431c356..ae9fd9f31d68 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -7081,7 +7081,7 @@ static void x86_cpu_get_crash_info_qom(Object *obj, Visitor *v, GuestPanicInformation *panic_info; if (!cs->crash_occurred) { - error_setg(errp, "No crash occured"); + error_setg(errp, "No crash occurred"); return; } diff --git a/target/i386/machine.c b/target/i386/machine.c index 3768a753affb..3967dfc25763 100644 --- a/target/i386/machine.c +++ b/target/i386/machine.c @@ -1173,7 +1173,7 @@ static int nested_state_post_load(void *opaque, int version_id) return -EINVAL; } if (nested_state->size > max_nested_state_len) { - error_report("Recieved unsupported nested state size: " + error_report("Received unsupported nested state size: " "nested_state->size=%d, max=%d", nested_state->size, max_nested_state_len); return -EINVAL; diff --git a/target/m68k/op_helper.c b/target/m68k/op_helper.c index 202498deb51a..579a66373a86 100644 --- a/target/m68k/op_helper.c +++ b/target/m68k/op_helper.c @@ -117,7 +117,7 @@ static const char *m68k_exception_name(int index) case EXCP_FORMAT: return "Format Error"; case EXCP_UNINITIALIZED: - return "Unitialized Interruot"; + return "Uninitialized Interrupt"; case EXCP_SPURIOUS: return "Spurious Interrupt"; case EXCP_INT_LEVEL_1: diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c index ddea8fbeeb39..2a990f6253e0 100644 --- a/target/riscv/cpu.c +++ b/target/riscv/cpu.c @@ -506,7 +506,7 @@ static void riscv_cpu_realize(DeviceState *dev, Error **errp) return; } } else { - qemu_log("vector verison is not specified, " + qemu_log("vector version is not specified, " "use the default value v0.7.1\n"); } set_vext_version(env, vext_version); From patchwork Wed Mar 10 21:44:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12129477 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1C78C433E6 for ; Wed, 10 Mar 2021 21:47:05 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 867AC64FC4 for ; Wed, 10 Mar 2021 21:47:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 867AC64FC4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK6fY-0005I6-FU for qemu-devel@archiver.kernel.org; Wed, 10 Mar 2021 16:47:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6dt-00034a-5X; Wed, 10 Mar 2021 16:45:21 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:52493) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6do-0004K4-LT; Wed, 10 Mar 2021 16:45:20 -0500 Received: from localhost.localdomain ([82.142.6.26]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1M2ON6-1lJXsO2DrK-003sHO; Wed, 10 Mar 2021 22:45:10 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 02/22] scsi: Silence gcc warning Date: Wed, 10 Mar 2021 22:44:44 +0100 Message-Id: <20210310214504.1183162-3-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210310214504.1183162-1-laurent@vivier.eu> References: <20210310214504.1183162-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:j0OO5MDcVpq8axh+nn2BTPGKAWe0+9NM9lxKyWMAudwcOS60I4h Xlmy1yLfDIRwJyWVp7xFLkc+reDMgjadXZqqv2hX4vjBvoUK88laPv636KwQFqzxvEyuj3j 8V+Wd+J9pTkptAcxQMPLkRgXx4JE8tghKA17nOWRwVy6aHqpp8W5NSsFDK1ZsQQH1NWCFjn I/Ckep1YBBsUC9W+r2B8A== X-UI-Out-Filterresults: notjunk:1;V03:K0:yjP3yKyM5ho=:Hmq1W6r40TJcTvpwHxdbSf 10xMD8ykidQGhVoN0dwUydYyACziaeq4qqVI6ehMQKOyB2StULe0y1sjCq/lGo/CcbjbH3xHo Zxfei/4zQogCQF8iFcFdy/KLwSMfjMD2JAvPMzgZGJ+ejI5ebGH3P18s2AHOFb4hsYEYtr1ga crLixjwHr0bfPFucncVkk1oFAz3i6MPy0smTxdQhVF4PIosCGaidwPLMtc79jSNQn+Q6JCWEg /XRmPE0iDfb7naU2Vd/OIroOMCG/rHEyKsksRcyU6uGBvARyf5JESKynGRH6//NM6G1/Td3Se geGouqmaJiuZJvrDXI/SBqu56V/34539bvgiglZUcPISNtV0VeSYf9hs8VB+AbDaPFDiu8vbO jwBrbWZ/ZCbyiai/Gy04MBDlfyNy3gbPmDOQYGHK16VsoyfQayW6kyhSEQ7snbNYp5WTyyiQx 5MNs0B1D6Q== Received-SPF: none client-ip=212.227.17.13; 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Eric Blake On Fedora 33, gcc 10.2.1 notes that scsi_cdb_length(buf) can set len==-1, which in turn overflows g_malloc(): [5/5] Linking target qemu-system-x86_64 In function ‘scsi_disk_new_request_dump’, inlined from ‘scsi_new_request’ at ../hw/scsi/scsi-disk.c:2608:9: ../hw/scsi/scsi-disk.c:2582:19: warning: argument 1 value ‘18446744073709551612’ exceeds maximum object size 9223372036854775807 [-Walloc-size-larger-than=] 2582 | line_buffer = g_malloc(len * 5 + 1); | ^ Silence it with a decent assertion, since we only convert a buffer to bytes when we have a valid cdb length. Signed-off-by: Eric Blake Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210209152350.207958-1-eblake@redhat.com> Signed-off-by: Laurent Vivier --- hw/scsi/scsi-disk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index bd7103cd0e8a..2eaea7e637d8 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -2565,6 +2565,7 @@ static void scsi_disk_new_request_dump(uint32_t lun, uint32_t tag, uint8_t *buf) int len = scsi_cdb_length(buf); char *line_buffer, *p; + assert(len > 0 && len <= 16); line_buffer = g_malloc(len * 5 + 1); for (i = 0, p = line_buffer; i < len; i++) { From patchwork Wed Mar 10 21:44:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12129485 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28896C433DB for ; Wed, 10 Mar 2021 21:50:52 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 9F33064FC4 for ; Wed, 10 Mar 2021 21:50:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9F33064FC4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:32912 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK6jC-0001kj-Ig for qemu-devel@archiver.kernel.org; Wed, 10 Mar 2021 16:50:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33170) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6du-00035L-Iu; Wed, 10 Mar 2021 16:45:22 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:55883) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6dp-0004L7-Uv; Wed, 10 Mar 2021 16:45:22 -0500 Received: from localhost.localdomain ([82.142.6.26]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MauFB-1lrVaG22yB-00cNYB; Wed, 10 Mar 2021 22:45:11 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 03/22] hw/elf_ops: Fix a typo Date: Wed, 10 Mar 2021 22:44:45 +0100 Message-Id: <20210310214504.1183162-4-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210310214504.1183162-1-laurent@vivier.eu> References: <20210310214504.1183162-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:oZYpL/O2epG42axZBYuhHFuNIxfmOJPDnxM/QNmRkTpraJwK8qr 4HNnR7AyYp6YpMWLTLJtRhLxMEJkmf11pKl/SnwlKinkVp8L20oAuG1SFwDZlu3391SZTcG G8bHVTm19mRGD+VvnB+oC8UF8i4BxgNvPYJi9Z9+DeEi2W+97gsfkpF/1009la8BJr5O1W/ gLUaQ11OZBuyugtqRDQRQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:uCoz5OnCMjE=:2v9kWtJq0acGW8NtqKvRrh bEoMTC2UnSwVfRSpF/OJdCnUhGgXyP29V8tItiygA4z4xOVN8byzVv4t1fLA1tiUK9Xe4MO4G 4HkbtSMMOM5cMe3h3gL6lQFZDuO3euw+z1ahRG+s1wPl7WS11TrTZzeIWP8zGaFTPtuKSELbx u6UraQ3k+XzsGdTBPOnjLLGOVFXev86EmatQCsDpxYrfp7DTmmVofjdtkiG8UTj1mMOwug0WN NyfpA2rQ6p4OJZE3uvfsnJkaVWwge8NcC4Jcpo+XQleBWyBmfMmZ0i/8W9ajPh5ad7g/Um2nc UgmSwZCMr37EmRrF/bctGxLTU6/pazKKd/WhsRJwzpRJLF+jHhxLS5h9ap1pznDXbgOpxZmbX jX+f1ZYT+WMuAuyfTnD7QPzLJsJl+/iiI+SUobP7E2k8kgV3C3Il/vhCjf7V3lZqiT2CTtqJ9 U1IzcH9G/w== Received-SPF: none client-ip=217.72.192.75; 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Edmondson , qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefano Garzarella Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé g_mapped_file_new_from_fd()'s parameter is named 'writable'. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Stefano Garzarella Reviewed-by: David Edmondson Message-Id: <20210225181344.3623720-1-philmd@redhat.com> Signed-off-by: Laurent Vivier --- include/hw/elf_ops.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h index 78409ab34a9f..6ee458e7bc3c 100644 --- a/include/hw/elf_ops.h +++ b/include/hw/elf_ops.h @@ -417,7 +417,7 @@ static int glue(load_elf, SZ)(const char *name, int fd, /* * Since we want to be able to modify the mapped buffer, we set the - * 'writeble' parameter to 'true'. Modifications to the buffer are not + * 'writable' parameter to 'true'. Modifications to the buffer are not * written back to the file. */ mapped_file = g_mapped_file_new_from_fd(fd, true, NULL); From patchwork Wed Mar 10 21:44:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12129519 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24FCEC433E0 for ; Wed, 10 Mar 2021 22:00:00 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id ACE8B64E27 for ; Wed, 10 Mar 2021 21:59:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ACE8B64E27 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK6s2-0005xx-Mn for qemu-devel@archiver.kernel.org; Wed, 10 Mar 2021 16:59:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6e6-0003Bp-Vj; Wed, 10 Mar 2021 16:45:35 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:59397) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6dz-0004Ss-GH; Wed, 10 Mar 2021 16:45:34 -0500 Received: from localhost.localdomain ([82.142.6.26]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MpDa5-1m5ket1eTX-00qhPj; Wed, 10 Mar 2021 22:45:12 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 04/22] target/hexagon/gen_tcg_funcs: Fix a typo Date: Wed, 10 Mar 2021 22:44:46 +0100 Message-Id: <20210310214504.1183162-5-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210310214504.1183162-1-laurent@vivier.eu> References: <20210310214504.1183162-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:1HzP3T3i5x3/c3U0QIy+yUdr7gwAjaZFljgqVcu9j1yJDZqXcfS tL899QeJcbu4IqFP/8Hyhh3z1mcOYc70xagT4BaMDqt3AFpSkDAVRdJuRPQKkRpJ1c5b8yL rVHGY+3Zl0ByfUlnpZgc+4ASitvzW1QzfqPMbi2iKsBJPlJPXEkk19iIByoZVBZDoTW/fsn YcgU8xuS+W71wVjqIdCNg== X-UI-Out-Filterresults: notjunk:1;V03:K0:eiFzHUNU1rk=:s2IUdHCKg3+qW6nToRsJ2C eI+5epYVxfoeI2meTcF5X1RQRXzwebfB4FwTGNXsvf7eXvK5tBgFQSVYPYKiGt4H73jDVo5ud CnpiUdqTL+aC0T9Pz7Cd94Dk5tmtzlzYpa9QyDzSobhdwxvwIgT5DHjzLYSnEJuITx6E3PJ1b HuKkSASMLGh+RizUmHAYU79JczqOe2qv/eZI8uxYhLr/idc4Pj2+3GdmumaqN+dNO4Z8ncnN6 VgJAQexnn0MH2JGsQtsz8n0Gkmxd0lb4e2MwdhvDcSQRvRm1POksFvrwPZGQk1EKK5D99b8W0 4B5ZT8nRZ8l+i08Uzrlqis1O4js9NLzTQg2lZeFsoUzGN3yWM/HEEUyR8dtxbXtP2IfplCILx f931dLEBTPiznB6MEMptKE2m0WrPQjX0h0LgnmxD272Z7O4uACnMi0z3ueA7DGMxA46Qmqino 6Nc+BIHf4A== Received-SPF: none client-ip=217.72.192.73; 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, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Taylor Simpson , Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Taylor Simpson Message-Id: <20210225181507.3624509-1-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- target/hexagon/gen_tcg_funcs.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/target/hexagon/gen_tcg_funcs.py b/target/hexagon/gen_tcg_funcs.py index fe4d8e57303a..db9f663a778e 100755 --- a/target/hexagon/gen_tcg_funcs.py +++ b/target/hexagon/gen_tcg_funcs.py @@ -35,7 +35,7 @@ def gen_decl_ea_tcg(f, tag): def gen_free_ea_tcg(f): f.write(" tcg_temp_free(EA);\n") -def genptr_decl_pair_writeble(f, tag, regtype, regid, regno): +def genptr_decl_pair_writable(f, tag, regtype, regid, regno): regN="%s%sN" % (regtype,regid) f.write(" TCGv_i64 %s%sV = tcg_temp_local_new_i64();\n" % \ (regtype, regid)) @@ -54,7 +54,7 @@ def genptr_decl_pair_writeble(f, tag, regtype, regid, regno): (regN, regN)) f.write(" }\n") -def genptr_decl_writeble(f, tag, regtype, regid, regno): +def genptr_decl_writable(f, tag, regtype, regid, regno): regN="%s%sN" % (regtype,regid) f.write(" TCGv %s%sV = tcg_temp_local_new();\n" % \ (regtype, regid)) @@ -78,12 +78,12 @@ def genptr_decl(f, tag, regtype, regid, regno): f.write(" const int %s = insn->regno[%d];\n" % \ (regN, regno)) elif (regid in {"dd", "ee", "xx", "yy"}): - genptr_decl_pair_writeble(f, tag, regtype, regid, regno) + genptr_decl_pair_writable(f, tag, regtype, regid, regno) elif (regid in {"s", "t", "u", "v"}): f.write(" TCGv %s%sV = hex_gpr[insn->regno[%d]];\n" % \ (regtype, regid, regno)) elif (regid in {"d", "e", "x", "y"}): - genptr_decl_writeble(f, tag, regtype, regid, regno) + genptr_decl_writable(f, tag, regtype, regid, regno) else: print("Bad register parse: ", regtype, regid) elif (regtype == "P"): @@ -91,7 +91,7 @@ def genptr_decl(f, tag, regtype, regid, regno): f.write(" TCGv %s%sV = hex_pred[insn->regno[%d]];\n" % \ (regtype, regid, regno)) elif (regid in {"d", "e", "x"}): - genptr_decl_writeble(f, tag, regtype, regid, regno) + genptr_decl_writable(f, tag, regtype, regid, regno) else: print("Bad register parse: ", regtype, regid) elif (regtype == "C"): @@ -101,14 +101,14 @@ def genptr_decl(f, tag, regtype, regid, regno): f.write(" const int %s = insn->regno[%d] + HEX_REG_SA0;\n" % \ (regN, regno)) elif (regid == "dd"): - genptr_decl_pair_writeble(f, tag, regtype, regid, regno) + genptr_decl_pair_writable(f, tag, regtype, regid, regno) elif (regid == "s"): f.write(" TCGv %s%sV = tcg_temp_local_new();\n" % \ (regtype, regid)) f.write(" const int %s%sN = insn->regno[%d] + HEX_REG_SA0;\n" % \ (regtype, regid, regno)) elif (regid == "d"): - genptr_decl_writeble(f, tag, regtype, regid, regno) + genptr_decl_writable(f, tag, regtype, regid, regno) else: print("Bad register parse: ", regtype, regid) elif (regtype == "M"): From patchwork Wed Mar 10 21:44:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12129481 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94AF1C433E0 for ; Wed, 10 Mar 2021 21:47:47 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 0720464FC9 for ; Wed, 10 Mar 2021 21:47:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0720464FC9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK6gE-0006Gh-0N for qemu-devel@archiver.kernel.org; Wed, 10 Mar 2021 16:47:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33186) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6dv-00036a-Lf; Wed, 10 Mar 2021 16:45:23 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:54883) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6dr-0004Lo-6f; Wed, 10 Mar 2021 16:45:23 -0500 Received: from localhost.localdomain ([82.142.6.26]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MVMJ7-1lCiEA0jqR-00SST9; Wed, 10 Mar 2021 22:45:13 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 05/22] backends/dbus-vmstate: Fix short read error handling Date: Wed, 10 Mar 2021 22:44:47 +0100 Message-Id: <20210310214504.1183162-6-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210310214504.1183162-1-laurent@vivier.eu> References: <20210310214504.1183162-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:WjANhdw/2agENRN9J8Z7PO4tw24Gqhlpq3JP5DEEKsjsCGRttIN mq49Efs6ywmZxcr9ZqRKx56ZXERmCFWzHWMTzvWyEMpVrlbP+fW80YrpF8bOyjguBfRr9ok SPGQOducyjJyZVl8vbCVQTxcphPQVCDkTdZl7TVgKjR45AOEJigR5IyAD+AT9lXjRgX2dQw 6DQf2gx2ScRV3me1TF5NQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:2OwTnDDlQF8=:QGmsS9UFNanGL2IPZwRwGM 9G8krr8E0AHF8jLMdaq744JjzJJ4QYMUciiS2omA3YCrc9fMtH/O1Zihlvagd/oBmnYTnw6h1 1Vj63g0DJW1r0owXvabJ2aYHuKzDfm6iEK7FFjhP9TlffnLozvQHzvHIzDhqqmiXvMFODlVB0 +5/YglGpgrjdkEYgdUDXOFWVlH+9NuuqGXiOcpGo1a4IoFcr6GuQnOzm9k/qOodqke/HXG65a crH16CD2cC8L9LIBq1s9z6uP7EZXRzSEywsm1EWlUd84TzSDM32TzpWERNazWgW3xI43DmfgG syM+vluSIRHtQkr3fnCXSnkigrF68sV7ez/kxtsni4oqgR5a06iQEb+MvHmaetIyO2uXPgNV+ 8n38B7W47L2g1KsJXuJjJGVYc5WmexFXBGnA0jv9yudYP6CYge1T3vTX63nu8xPyCKC65aPsH 5D4kegT+dA== Received-SPF: none client-ip=217.72.192.74; 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, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Michael Tokarev , Laurent Vivier , Markus Armbruster Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Markus Armbruster When dbus_vmstate_post_load() fails, it complains to stderr. Except on short read, where it checks with g_return_val_if_fail(). This fails silently if G_DISABLE_CHECKS is undefined (it should be), or else pads the short read with uninitialized bytes. Replace g_return_val_if_fail() by a proper error check. Fixes: 5010cec2bc87dafab39b3913c8ca91f88df9c540 Signed-off-by: Markus Armbruster Reviewed-by: Marc-André Lureau Message-Id: <20210126124240.2081959-2-armbru@redhat.com> Signed-off-by: Laurent Vivier --- backends/dbus-vmstate.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/backends/dbus-vmstate.c b/backends/dbus-vmstate.c index bd050e8e9cab..2a0d2e4a31c0 100644 --- a/backends/dbus-vmstate.c +++ b/backends/dbus-vmstate.c @@ -229,7 +229,10 @@ static int dbus_vmstate_post_load(void *opaque, int version_id) &bytes_read, NULL, &err)) { goto error; } - g_return_val_if_fail(bytes_read == len, -1); + if (bytes_read != len) { + error_report("%s: Short read", __func__); + return -1; + } id[len] = 0; trace_dbus_vmstate_loading(id); From patchwork Wed Mar 10 21:44:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12129479 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B86FFC433DB for ; Wed, 10 Mar 2021 21:47:16 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 19D7164FC4 for ; Wed, 10 Mar 2021 21:47:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 19D7164FC4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52450 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK6fj-0005nb-3z for qemu-devel@archiver.kernel.org; Wed, 10 Mar 2021 16:47:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33174) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6dv-00036D-As; Wed, 10 Mar 2021 16:45:23 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:34755) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6ds-0004M3-Mj; Wed, 10 Mar 2021 16:45:23 -0500 Received: from localhost.localdomain ([82.142.6.26]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MxmJs-1lfjSm08eE-00zG7S; Wed, 10 Mar 2021 22:45:14 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 06/22] vhost_user_gpu: Drop dead check for g_malloc() failure Date: Wed, 10 Mar 2021 22:44:48 +0100 Message-Id: <20210310214504.1183162-7-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210310214504.1183162-1-laurent@vivier.eu> References: <20210310214504.1183162-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:joF+7Op07AnlQ2ARWcILEwHspJJyNNJB14om5MzuapInB4JfnvA k7FKzLTGb8yzljyN5Ob7TmUS3e3gH5XCqvt9vIxw43NbSHxh19XHi5YI72F2wPSIYW8R69K jvV0bGiamwHkINVOfnCaZzjG0cfq90eQ36WsGVFt521XE0EZKvC7xHBin4JdeMTzM8w+/3s t3a138Zs4GA2ltF4Pojzg== X-UI-Out-Filterresults: notjunk:1;V03:K0:zjYCjs1DAWA=:sAR3mfqVmCh5R40lAGMHE4 ImGemp3jPig0XKObzYPh4cjoyKPxtEmyxyJDrIY8G/xTE10or4WR5kKrO7a/8tSeISHFDgn1f d7N/G03sBCVs3UkhoKBjgLanMBdDjx3aib7mM89dwpTwsuFajAAMsV1w5r0xjzdUYR5TeSBro pvpYYoGINfsnK3ocQbNI5cflqtFOkJQTJwgYnFHOMFmoHhLloWtqWTlv/zdzBu3xnr8myKn+/ KUlvPMlYRyx/kEZuJJ3j/znqtUCzIu1YPYaEH2qi46p3SYyxsEGaIBk7+yjgM5z5ne6e+1B/M nKF7dxVMIM44nHvFhDcKe5VMydEx+QrN/8m8MbY8ncri+YaRaJYfFU4bpAW3eVciTT/QSS3+I 8/+62FIS8DEtVBhQi+izbeDZywnzgGNlwEop5wOicevEJiBELm8+fAIS2TOBIeTXGLzsFPn7w flaXwg73Sg== Received-SPF: none client-ip=217.72.192.74; 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, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S . Tsirkin" , qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , Markus Armbruster , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Markus Armbruster Signed-off-by: Markus Armbruster Reviewed-by: Marc-André Lureau Reviewed-by: Michael S. Tsirkin Message-Id: <20210126124240.2081959-3-armbru@redhat.com> Signed-off-by: Laurent Vivier --- hw/display/vhost-user-gpu.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c index a01f9315e199..6cdaa1c73b9b 100644 --- a/hw/display/vhost-user-gpu.c +++ b/hw/display/vhost-user-gpu.c @@ -325,7 +325,6 @@ vhost_user_gpu_chr_read(void *opaque) } msg = g_malloc(VHOST_USER_GPU_HDR_SIZE + size); - g_return_if_fail(msg != NULL); r = qemu_chr_fe_read_all(&g->vhost_chr, (uint8_t *)&msg->payload, size); From patchwork Wed Mar 10 21:44:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12129505 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-21.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27D71C433DB for ; Wed, 10 Mar 2021 21:53:35 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 8A36B64FC4 for ; Wed, 10 Mar 2021 21:53:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8A36B64FC4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK6lp-0006AS-Cd for qemu-devel@archiver.kernel.org; Wed, 10 Mar 2021 16:53:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33192) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6dv-00036p-Tw; Wed, 10 Mar 2021 16:45:24 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:51985) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6ds-0004MR-Or; Wed, 10 Mar 2021 16:45:23 -0500 Received: from localhost.localdomain ([82.142.6.26]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MBmI6-1lRl4Q3uxQ-00C9jg; Wed, 10 Mar 2021 22:45:15 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 07/22] MAINTAINERS: Fix the location of tools manuals Date: Wed, 10 Mar 2021 22:44:49 +0100 Message-Id: <20210310214504.1183162-8-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210310214504.1183162-1-laurent@vivier.eu> References: <20210310214504.1183162-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:5S3BHfmH+cZoCWU96j+1BtpSKXtNI6dbT54elfjsdSh/fumgHF3 yt/DrDmwXalxwHlsN+LT7j7PrNvqnWuUeyWwWLBKuchrS4rp7+MzXZSdUL/3RI8j6rF2f2m b7L4TZKWICfiQ7GADoYXQ5eqK4i43iC+alKEy82QdgW9VcXVy8WsoSNs71SNDFE0/pF+4Dy +PdOxUZYHQ6z0LadqtuAg== X-UI-Out-Filterresults: notjunk:1;V03:K0:gibBpayhKSM=:W+n62gAkJtQlMig62Ilgmy VGPow3u0OdPtL0Xrg6OWjgEw1vi/5rBr6b67bq0anH53OcLRtoFiQsA90NhlLwBCh76AefQhP APwqez9WT2zf6hS1jzqVxinSN4INcF/jUg/t5gHqIou058Wb7sEgOYvlGhaBG8KYiORlangbA 9yRQkUfCojcXRln3jlXV3jzdsxsGuBJ/4Bcs67qcwJNgujKdd8YYH+lgmS+Ou8yWbnaNQ/2jz n3VIF53JD+roiWKRW4lkRIWPecnSEgjCnLSg0hlKwQiRtbeWOwYZHWhHpvUv8oNtiLtTfDqWN uK/BzXjKBFT2EfHLEfBpnEyZg4NdhBjg4mfeeJKX+fQRDWt3PAq+4KxUNIHtP+Wa2pkH6StTg R1MvXFgEZl8mqF1RhDQxolaBHLDhuJpWVfMXDEqrEfNculNyefleAjhLscPM/QD/j3pAbuV3E tzF09s4Klw== Received-SPF: none client-ip=217.72.192.73; 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, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Wainer dos Santos Moschetta The qemu-img.rst, qemu-nbd.rst, virtfs-proxy-helper.rst, qemu-trace-stap.rst, and virtiofsd.rst manuals were moved to docs/tools, so this update MAINTAINERS accordingly. Fixes: a08b4a9fe6c ("docs: Move tools documentation to tools manual") Signed-off-by: Wainer dos Santos Moschetta Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Message-Id: <20210204135425.1380280-1-wainersm@redhat.com> Signed-off-by: Laurent Vivier --- MAINTAINERS | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index f22d83c17823..ad28f37bc5ff 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1862,7 +1862,7 @@ S: Odd Fixes F: hw/9pfs/ X: hw/9pfs/xen-9p* F: fsdev/ -F: docs/interop/virtfs-proxy-helper.rst +F: docs/tools/virtfs-proxy-helper.rst F: tests/qtest/virtio-9p-test.c T: git https://gitlab.com/gkurz/qemu.git 9p-next T: git https://github.com/cschoenebeck/qemu.git 9p.next @@ -1893,7 +1893,7 @@ S: Supported F: tools/virtiofsd/* F: hw/virtio/vhost-user-fs* F: include/hw/virtio/vhost-user-fs.h -F: docs/interop/virtiofsd.rst +F: docs/tools/virtiofsd.rst virtio-input M: Gerd Hoffmann @@ -2200,7 +2200,7 @@ F: block/ F: hw/block/ F: include/block/ F: qemu-img* -F: docs/interop/qemu-img.rst +F: docs/tools/qemu-img.rst F: qemu-io* F: tests/qemu-iotests/ F: util/qemu-progress.c @@ -2656,7 +2656,7 @@ F: qapi/trace.json F: scripts/tracetool.py F: scripts/tracetool/ F: scripts/qemu-trace-stap* -F: docs/interop/qemu-trace-stap.rst +F: docs/tools/qemu-trace-stap.rst F: docs/devel/tracing.txt T: git https://github.com/stefanha/qemu.git tracing @@ -3047,7 +3047,7 @@ F: include/block/nbd* F: qemu-nbd.* F: blockdev-nbd.c F: docs/interop/nbd.txt -F: docs/interop/qemu-nbd.rst +F: docs/tools/qemu-nbd.rst T: git https://repo.or.cz/qemu/ericb.git nbd NFS From patchwork Wed Mar 10 21:44:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12129487 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 415C8C433E0 for ; Wed, 10 Mar 2021 21:50:53 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id AA40E64FC4 for ; Wed, 10 Mar 2021 21:50:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AA40E64FC4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:32992 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK6jD-0001oA-I8 for qemu-devel@archiver.kernel.org; Wed, 10 Mar 2021 16:50:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33218) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6dx-00039E-6X; Wed, 10 Mar 2021 16:45:25 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:45505) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6ds-0004O8-NL; Wed, 10 Mar 2021 16:45:24 -0500 Received: from localhost.localdomain ([82.142.6.26]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N6szR-1loDm03Cn9-018Mn1; Wed, 10 Mar 2021 22:45:16 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 08/22] net: Use id_generate() in the network subsystem, too Date: Wed, 10 Mar 2021 22:44:50 +0100 Message-Id: <20210310214504.1183162-9-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210310214504.1183162-1-laurent@vivier.eu> References: <20210310214504.1183162-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:2THXLhKTv2m2BgJoW55y68cAsSqRCnshR9rWcogj8cZ2QsejhEX Iv32xErGmZJbEer5eTgZdSJK0Zx9v9khG73QfLqJV22lIJl2U77xE7FIosYZ1k4Jyh4yNbU A0gfGg74oVX4BBY0f5h8G12+dqKBPE+GfLOofmH8vmVTqX5sckdEkt8OthXNsPk2aM3X9MM GVwu8x9jBULzAk18QIM6g== X-UI-Out-Filterresults: notjunk:1;V03:K0:A8bqMzIaJNg=:49zAExsW9SdlGi7Phb0tx5 47PHl2JNLB74oFa2enEaQqdC9l/tuVLGOVaVtGKz2ME5g2vPfq6D6I2TfhzJtTe+qOvNOaCeS Kj67CXoAhOP1L9Sb1M7ZedV+VLdh08SFpcMXCRfV+cqpBRZ2zytAUehnLCdmL+0POIJV9/QM3 QxnODoAoLX6mS/5xFTevQL55AFyH/eX7YVB/8b/0GXXiQMGs3aUNuaYFbJobvMqf07/VUH/NK ciP92vaZU1GskEDHuKyB0BN60/FHAl+tpQvjCYEmFqOjDx2RPJAf5rP/lWyG6pacjYcr1cgEq wApIEGhfoDAj7ziFXMZUNY4v5c8UdXoWVFUpnBamek91lwQIyM5fkHfkdUIDrLBqCy8n/talV Jvjz1gx3HFyJXpcGaq0oKle4xi47P6IIR3pHlVdE/sMYCH/yBKgJoDhHzLfag5napJ1Ja+82D RiNXG5/Fsw== Received-SPF: none client-ip=217.72.192.73; 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, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Thomas Huth , Michael Tokarev , Laurent Vivier Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth We already got a global function called id_generate() to create unique IDs within QEMU. Let's use it in the network subsytem, too, instead of inventing our own ID scheme here. Signed-off-by: Thomas Huth Reviewed-by: Marc-André Lureau Message-Id: <20210215090225.1046239-1-thuth@redhat.com> Signed-off-by: Laurent Vivier --- include/qemu/id.h | 1 + net/net.c | 6 +++--- util/id.c | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/qemu/id.h b/include/qemu/id.h index b55c406e69db..46b759b284f3 100644 --- a/include/qemu/id.h +++ b/include/qemu/id.h @@ -5,6 +5,7 @@ typedef enum IdSubSystems { ID_QDEV, ID_BLOCK, ID_CHR, + ID_NET, ID_MAX /* last element, used as array size */ } IdSubSystems; diff --git a/net/net.c b/net/net.c index fb7b7dcc2528..ca30df963d77 100644 --- a/net/net.c +++ b/net/net.c @@ -43,6 +43,7 @@ #include "qemu/cutils.h" #include "qemu/config-file.h" #include "qemu/ctype.h" +#include "qemu/id.h" #include "qemu/iov.h" #include "qemu/qemu-print.h" #include "qemu/main-loop.h" @@ -1111,8 +1112,7 @@ static int net_client_init(QemuOpts *opts, bool is_netdev, Error **errp) /* Create an ID for -net if the user did not specify one */ if (!is_netdev && !qemu_opts_id(opts)) { - static int idx; - qemu_opts_set_id(opts, g_strdup_printf("__org.qemu.net%i", idx++)); + qemu_opts_set_id(opts, id_generate(ID_NET)); } if (visit_type_Netdev(v, NULL, &object, errp)) { @@ -1467,7 +1467,7 @@ static int net_param_nic(void *dummy, QemuOpts *opts, Error **errp) /* Create an ID if the user did not specify one */ nd_id = g_strdup(qemu_opts_id(opts)); if (!nd_id) { - nd_id = g_strdup_printf("__org.qemu.nic%i", idx); + nd_id = id_generate(ID_NET); qemu_opts_set_id(opts, nd_id); } diff --git a/util/id.c b/util/id.c index 5addb4460ea0..ded41c5025e4 100644 --- a/util/id.c +++ b/util/id.c @@ -35,6 +35,7 @@ static const char *const id_subsys_str[ID_MAX] = { [ID_QDEV] = "qdev", [ID_BLOCK] = "block", [ID_CHR] = "chr", + [ID_NET] = "net", }; /* From patchwork Wed Mar 10 21:44:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12129507 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89D17C433E0 for ; Wed, 10 Mar 2021 21:54:19 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id EB28F64FC4 for ; Wed, 10 Mar 2021 21:54:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EB28F64FC4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK6mX-00070J-Vw for qemu-devel@archiver.kernel.org; Wed, 10 Mar 2021 16:54:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33228) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6dz-0003Ax-FZ; Wed, 10 Mar 2021 16:45:29 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:54553) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6dw-0004Qw-BU; Wed, 10 Mar 2021 16:45:27 -0500 Received: from localhost.localdomain ([82.142.6.26]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MZT2u-1lHN3y3g7q-00WZCQ; Wed, 10 Mar 2021 22:45:17 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 09/22] fuzz-test: remove unneccessary debugging flags Date: Wed, 10 Mar 2021 22:44:51 +0100 Message-Id: <20210310214504.1183162-10-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210310214504.1183162-1-laurent@vivier.eu> References: <20210310214504.1183162-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:nXAHKnyD6SEU07yBox29oftFF+awKGYOyZC4cuEaHH0+zp++TcV Rk4gRbUo438rwpyC3WXRMZNsGUJCstY4/juB9tDw2IktVY0iNAU88pqrpOtGFfbIwEhwIrY 8L1PQ/AFdxGYotzLPYxHFHP08VUCCXwBVtP/RAAu4xrGk0ZqIYc9goRMEg0vpd1L6cY9l/4 WGABnHOPrH7N53w62HHgw== X-UI-Out-Filterresults: notjunk:1;V03:K0:OOOn84DPlhA=:h8ErCYu/jL3USHetXGL4dH nA8BL/AK58OHEv14bPaEXlTwdZTJNru8uSEZwnoAr3+eo27dRUAw47pugOOBs+xkpOvkag3t2 wUyZwg5DUGTD2U0xpqXbEieobCe5SkpkOlMFQEBETyaPXaqMIxeY8mnA3y9OK4MmVXWEignKq AGl+a5Hz6TAMsmwfaI3l+Bo9NYTqRjkm28N57yZTb+XAO1N2eNTk25hEjKW+mWjNunXKbgfSG 2sKymrRlRC0qm1qrJVhkcK9mCGthoFAndxSWdKB63x+iKZwjyeBqdhhbdJFB63+NcHN8Yz1ns OLJPAPV89kZwIn2kWX9s5ezcE+i6pKOf52kz2U9v+eFCURhYNmbIsIiB3vbaRFYWCBipTWpmB rsCuSAiwy5hfgyI4zngr/c0ewL9rwqcwoRbuJ0rUOmClctVVMoVAZ4rKlXMMp786cp0t3D1V8 myUbwQBCyQ== Received-SPF: none client-ip=212.227.17.10; 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , Alexander Bulekov , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Alexander Bulekov These flags cause the output to look strange for 'make check', and they aren't needed to reproduce bugs, if they reappear. Suggested-by: Peter Maydell Signed-off-by: Alexander Bulekov Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210216181316.794276-1-alxndr@bu.edu> Signed-off-by: Laurent Vivier --- tests/qtest/fuzz-test.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/qtest/fuzz-test.c b/tests/qtest/fuzz-test.c index cdb1100a0b81..6f161c93be71 100644 --- a/tests/qtest/fuzz-test.c +++ b/tests/qtest/fuzz-test.c @@ -39,8 +39,7 @@ static void test_lp1878642_pci_bus_get_irq_level_assert(void) QTestState *s; s = qtest_init("-M pc-q35-5.0 " - "-nographic -monitor none -serial none " - "-d guest_errors -trace pci*"); + "-nographic -monitor none -serial none"); qtest_outl(s, 0xcf8, 0x8400f841); qtest_outl(s, 0xcfc, 0xebed205d); From patchwork Wed Mar 10 21:44:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12129489 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D1C7C433DB for ; Wed, 10 Mar 2021 21:51:20 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 1775D64FC4 for ; Wed, 10 Mar 2021 21:51:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1775D64FC4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34890 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK6jf-0002vr-61 for qemu-devel@archiver.kernel.org; Wed, 10 Mar 2021 16:51:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33224) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6dx-0003AC-IY; Wed, 10 Mar 2021 16:45:27 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:54981) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6dv-0004QN-5z; Wed, 10 Mar 2021 16:45:25 -0500 Received: from localhost.localdomain ([82.142.6.26]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N3sRi-1lkfvy2o0e-00zrXk; Wed, 10 Mar 2021 22:45:19 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 10/22] exec/memory: Use struct Object typedef Date: Wed, 10 Mar 2021 22:44:52 +0100 Message-Id: <20210310214504.1183162-11-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210310214504.1183162-1-laurent@vivier.eu> References: <20210310214504.1183162-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:WhQLZoZb+tEUhE/CBKt37b13Wy6kRnwPZKJw3pJ3IEjnpo3KNZR lvQzGkb13x5UudryDHqiscKrxXhHt7vRSCYiPO4ItRRIce25735JZhV5TrEd9Tn96kjcP9w vZm2y7s2jhBOWLbEebALEFhxzs2FD4NrUK1RJEsfW24ePcpjj9amlaVlPGkSYQ5cuCGVZix ugLMnF9I6j/kdvipXEpJg== X-UI-Out-Filterresults: notjunk:1;V03:K0:3uoTwvzB7oU=:gBXjZhgIs40yzueKyvK/Fq X9r/2HOsbduIbT6gug0B7pa+kvzSHihA1KrVetw28OHMR7XieADcMoQOvOR45Y7Lzx4d3ajIn /Y0wOUyL5dzWSOWEFQWErT8MaDc+lh8SO44ofhIGExVSZDlR/2jIWiJQ736FLLoJ/kWZZ2HkS +uob8zfWkXoT77bwVpZHnaG9G57cgROPOfaAHscVE0HBGepLygTZZACw/7AKMMtvL+Gi26Emk fE1Ql5VXYx1iVtc6GXQYPa9yLnFtZsxH7Lk4Wy4/6NjZow3V5VxHN0tegk0Ny9pN2L0VJtwJI bxRv4llA6SpDz9mwmBvqRXkPV8I73ZZA3yzvfc85+JVmnDP6QMlwtY1lKfV1QSxaAJT2sZIVO Sts2mkL6dcQc4nEQrNk+CK/pU4g9X+IUh6OLIce92bvXwACHXnxmTcUsjd+B2 Received-SPF: none client-ip=217.72.192.74; 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, 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.23 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?= , Michael Tokarev , Laurent Vivier , David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé We forward-declare Object typedef in "qemu/typedefs.h" since commit ca27b5eb7cd ("qom/object: Move Object typedef to 'qemu/typedefs.h'"). Use it everywhere to make the code simpler. Signed-off-by: Philippe Mathieu-Daudé Acked-by: David Gibson Reviewed-by: Laurent Vivier Message-Id: <20210225182003.3629342-1-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/ppc/pnv_xscom.c | 2 +- include/exec/memory.h | 32 ++++++++++++++++---------------- include/hw/ppc/pnv_xscom.h | 2 +- softmmu/memory.c | 12 ++++++------ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/hw/ppc/pnv_xscom.c b/hw/ppc/pnv_xscom.c index e9ae1569ffcf..be7018e8ac59 100644 --- a/hw/ppc/pnv_xscom.c +++ b/hw/ppc/pnv_xscom.c @@ -308,7 +308,7 @@ void pnv_xscom_add_subregion(PnvChip *chip, hwaddr offset, MemoryRegion *mr) } void pnv_xscom_region_init(MemoryRegion *mr, - struct Object *owner, + Object *owner, const MemoryRegionOps *ops, void *opaque, const char *name, diff --git a/include/exec/memory.h b/include/exec/memory.h index c6fb714e499c..54ccf1a5f09b 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -828,7 +828,7 @@ static inline bool MemoryRegionSection_eq(MemoryRegionSection *a, * @size: size of the region; any subregions beyond this size will be clipped */ void memory_region_init(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size); @@ -876,7 +876,7 @@ void memory_region_unref(MemoryRegion *mr); * @size: size of the region. */ void memory_region_init_io(MemoryRegion *mr, - struct Object *owner, + Object *owner, const MemoryRegionOps *ops, void *opaque, const char *name, @@ -898,7 +898,7 @@ void memory_region_init_io(MemoryRegion *mr, * RAM memory region to be migrated; that is the responsibility of the caller. */ void memory_region_init_ram_nomigrate(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, Error **errp); @@ -920,7 +920,7 @@ void memory_region_init_ram_nomigrate(MemoryRegion *mr, * The only difference is part of the RAM region can be remapped. */ void memory_region_init_ram_shared_nomigrate(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, bool share, @@ -946,7 +946,7 @@ void memory_region_init_ram_shared_nomigrate(MemoryRegion *mr, * RAM memory region to be migrated; that is the responsibility of the caller. */ void memory_region_init_resizeable_ram(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, uint64_t max_size, @@ -979,7 +979,7 @@ void memory_region_init_resizeable_ram(MemoryRegion *mr, * RAM memory region to be migrated; that is the responsibility of the caller. */ void memory_region_init_ram_from_file(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, uint64_t align, @@ -1005,7 +1005,7 @@ void memory_region_init_ram_from_file(MemoryRegion *mr, * RAM memory region to be migrated; that is the responsibility of the caller. */ void memory_region_init_ram_from_fd(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, bool share, @@ -1030,7 +1030,7 @@ void memory_region_init_ram_from_fd(MemoryRegion *mr, * RAM memory region to be migrated; that is the responsibility of the caller. */ void memory_region_init_ram_ptr(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, void *ptr); @@ -1058,7 +1058,7 @@ void memory_region_init_ram_ptr(MemoryRegion *mr, * (For RAM device memory regions, migrating the contents rarely makes sense.) */ void memory_region_init_ram_device_ptr(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, void *ptr); @@ -1076,7 +1076,7 @@ void memory_region_init_ram_device_ptr(MemoryRegion *mr, * @size: size of the region. */ void memory_region_init_alias(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, MemoryRegion *orig, hwaddr offset, @@ -1101,7 +1101,7 @@ void memory_region_init_alias(MemoryRegion *mr, * @errp: pointer to Error*, to store an error if it happens. */ void memory_region_init_rom_nomigrate(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, Error **errp); @@ -1124,7 +1124,7 @@ void memory_region_init_rom_nomigrate(MemoryRegion *mr, * @errp: pointer to Error*, to store an error if it happens. */ void memory_region_init_rom_device_nomigrate(MemoryRegion *mr, - struct Object *owner, + Object *owner, const MemoryRegionOps *ops, void *opaque, const char *name, @@ -1183,7 +1183,7 @@ void memory_region_init_iommu(void *_iommu_mr, * If you pass a non-NULL non-device @owner then we will assert. */ void memory_region_init_ram(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, Error **errp); @@ -1210,7 +1210,7 @@ void memory_region_init_ram(MemoryRegion *mr, * @errp: pointer to Error*, to store an error if it happens. */ void memory_region_init_rom(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, Error **errp); @@ -1241,7 +1241,7 @@ void memory_region_init_rom(MemoryRegion *mr, * @errp: pointer to Error*, to store an error if it happens. */ void memory_region_init_rom_device(MemoryRegion *mr, - struct Object *owner, + Object *owner, const MemoryRegionOps *ops, void *opaque, const char *name, @@ -1254,7 +1254,7 @@ void memory_region_init_rom_device(MemoryRegion *mr, * * @mr: the memory region being queried. */ -struct Object *memory_region_owner(MemoryRegion *mr); +Object *memory_region_owner(MemoryRegion *mr); /** * memory_region_size: get a memory region's size. diff --git a/include/hw/ppc/pnv_xscom.h b/include/hw/ppc/pnv_xscom.h index 8578f5a207df..2ff9f7a8d6fe 100644 --- a/include/hw/ppc/pnv_xscom.h +++ b/include/hw/ppc/pnv_xscom.h @@ -139,7 +139,7 @@ int pnv_dt_xscom(PnvChip *chip, void *fdt, int root_offset, void pnv_xscom_add_subregion(PnvChip *chip, hwaddr offset, MemoryRegion *mr); void pnv_xscom_region_init(MemoryRegion *mr, - struct Object *owner, + Object *owner, const MemoryRegionOps *ops, void *opaque, const char *name, diff --git a/softmmu/memory.c b/softmmu/memory.c index 874a8fccdee4..91f1bf47c301 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -1581,7 +1581,7 @@ void memory_region_init_resizeable_ram(MemoryRegion *mr, #ifdef CONFIG_POSIX void memory_region_init_ram_from_file(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, uint64_t align, @@ -1607,7 +1607,7 @@ void memory_region_init_ram_from_file(MemoryRegion *mr, } void memory_region_init_ram_from_fd(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, bool share, @@ -1679,7 +1679,7 @@ void memory_region_init_alias(MemoryRegion *mr, } void memory_region_init_rom_nomigrate(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, Error **errp) @@ -3205,7 +3205,7 @@ void mtree_info(bool flatview, bool dispatch_tree, bool owner, bool disabled) } void memory_region_init_ram(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, Error **errp) @@ -3229,7 +3229,7 @@ void memory_region_init_ram(MemoryRegion *mr, } void memory_region_init_rom(MemoryRegion *mr, - struct Object *owner, + Object *owner, const char *name, uint64_t size, Error **errp) @@ -3253,7 +3253,7 @@ void memory_region_init_rom(MemoryRegion *mr, } void memory_region_init_rom_device(MemoryRegion *mr, - struct Object *owner, + Object *owner, const MemoryRegionOps *ops, void *opaque, const char *name, From patchwork Wed Mar 10 21:44:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12129513 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D120C433E0 for ; Wed, 10 Mar 2021 21:57:04 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 5CC0464FC9 for ; Wed, 10 Mar 2021 21:57:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5CC0464FC9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51910 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK6pC-0002QM-3O for qemu-devel@archiver.kernel.org; Wed, 10 Mar 2021 16:57:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33302) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6e6-0003Bh-PR; Wed, 10 Mar 2021 16:45:35 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:54173) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6dz-0004SD-EQ; Wed, 10 Mar 2021 16:45:31 -0500 Received: from localhost.localdomain ([82.142.6.26]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N6szR-1loDlw2LFP-018Mn1; Wed, 10 Mar 2021 22:45:19 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 11/22] virtio-gpu: Adjust code space style Date: Wed, 10 Mar 2021 22:44:53 +0100 Message-Id: <20210310214504.1183162-12-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210310214504.1183162-1-laurent@vivier.eu> References: <20210310214504.1183162-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:jtIHLvM0rzoNyJNruV+OaDD9miqzPrBvpDAa3meYeWE2QCyAvai BE+edA7l65OCnYH9RrrMwBRkIQmmoafpio5SDLrxCKBt/kpX8Uwnhn04p+M/FDk0D3Kfxzt RJGqODDW2a8p8Uwr5+rk2QzSvWt9SdHSPshjD+zRnvlhWxfZFDvpUIUGndz1jNXA7x3/hgW ydRTEYS3EEGqr6+31Q5PA== X-UI-Out-Filterresults: notjunk:1;V03:K0:gwvaEEdYeQ4=:q2EY8HjIijEeL0/1I3nlu4 6O9UxTmnfPLav4pcladrJ7cAtvS7eME7YKzAp0MvZvDdzmX5jGn7oTyTWfjN4/W4HICC1nHbJ pk17eCSrKqz1TKQGQ6GTx2etiWBH6wHNBR+9WDLsg3+PluCNxA7UsD0T0a8MKVElOkQU80P+z UVNovNfKCLPdx97INpYVVR+wrEJ29149JErz2JBEjG9RMM/qlGfCiqf2SzSJanwmc7eiml2eu BF+dBmy+9YBN4/Zkr1qNMbfgraqf1zXMgyK0khG04IJY5VSqvVUOeG3hSelKbTqbe4voEbwD8 bz4XOQxzaCgsDDpbLzI1AsP6N3FuqXj7c4VklbeP7T+l7zklfxR06d/XoQTBn1vOLRYoxPpB6 Gf1PZJA+S+hXzcGcSKLAw8IkZoonL5f4QlRt3RrCzQcr42E48J2KGwRbuZ62o Received-SPF: none client-ip=217.72.192.73; 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, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, lijiejun , Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: lijiejun Fix code style. Operator needs align with eight spaces, and delete line space. Signed-off-by: lijiejun Reviewed-by: Philippe Mathieu-Daudé Message-Id: <1615292050-108748-1-git-send-email-a_lijiejun@163.com> Signed-off-by: Laurent Vivier --- hw/display/virtio-gpu-3d.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/display/virtio-gpu-3d.c b/hw/display/virtio-gpu-3d.c index 9eb489077b17..d98964858e13 100644 --- a/hw/display/virtio-gpu-3d.c +++ b/hw/display/virtio-gpu-3d.c @@ -438,7 +438,7 @@ void virtio_gpu_virgl_process_cmd(VirtIOGPU *g, break; case VIRTIO_GPU_CMD_RESOURCE_FLUSH: virgl_cmd_resource_flush(g, cmd); - break; + break; case VIRTIO_GPU_CMD_RESOURCE_UNREF: virgl_cmd_resource_unref(g, cmd); break; @@ -456,7 +456,6 @@ void virtio_gpu_virgl_process_cmd(VirtIOGPU *g, case VIRTIO_GPU_CMD_GET_CAPSET: virgl_cmd_get_capset(g, cmd); break; - case VIRTIO_GPU_CMD_GET_DISPLAY_INFO: virtio_gpu_get_display_info(g, cmd); break; From patchwork Wed Mar 10 21:44:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12129517 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-21.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2874C433E0 for ; Wed, 10 Mar 2021 21:57:58 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 4303364FAB for ; Wed, 10 Mar 2021 21:57:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4303364FAB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK6q5-0003QT-9Q for qemu-devel@archiver.kernel.org; Wed, 10 Mar 2021 16:57:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6e7-0003CG-OT; Wed, 10 Mar 2021 16:45:37 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:59493) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6dy-0004Rz-V9; Wed, 10 Mar 2021 16:45:35 -0500 Received: from localhost.localdomain ([82.142.6.26]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MNtny-1l4kY424Do-00OGfo; Wed, 10 Mar 2021 22:45:20 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 12/22] ui: Replace the word 'whitelist' Date: Wed, 10 Mar 2021 22:44:54 +0100 Message-Id: <20210310214504.1183162-13-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210310214504.1183162-1-laurent@vivier.eu> References: <20210310214504.1183162-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:L/vv0OoqUw5KlydYVcs6xppIXMa53CcIZ9qKVc6zKeZ1pL5tUKH kSqRDJ95csz1HqlcIhNOoCo+53FmkdQfzIf/yjB0YyrI8q8Oelglfn0KisTb5xFzDk46YvF zukcImXjfbMtXJwpAyjcUKHEgVGq7Zq3tmtA7PoDpp1kefmOYnScfi0Hegl33vqZZq+PaGQ TA7lm9crJ0bYUmqwA6VaQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:9MikpEA61eY=:+pngVyoQht5OvdesxKOAJW K6s6un7LxbQgP0RnFmYZZm+H0X3wHPaHS/reELcZILfkeNPhJ6sMzkbc8vkr+tdGhuIDvqiJZ FP5xCJbJkYZFn+rrwThv859tYkMbn0FVaF4PP/tF2b4chRbprtJdGT0eSdiyfs41FJN3cy8iN dQEHkiml2bgMFxz3J2CH5uLOsGHRdO0ZKZG//5XvzJK4gv10+W4rlunwPiKy7Kmqt1CBcvQYo BvY1KncT38v9tVB4UVJ9rAOeft5gYjSZKQDK6XYOKwaZ6UaXPZq7WBF88FInTJ7o+8uW+h3wr QnHhuL4KLbulEo0zPkdGlD3FXvk2j5/6CbLObtpFZ5AUiEkipS4YBAUYiLaC2Tt8SAQ0G4eMx 4cAkWqN8qJHa08dOszmkXiy5uYpDp5E9JZMcmDTYaTd7K2noS+SsifMjOpj66hOhOBndi6LuS a0O7kdI9qg== Received-SPF: none client-ip=217.72.192.73; 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, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , qemu-trivial@nongnu.org, =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , Michael Tokarev , Laurent Vivier , Gerd Hoffmann , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Follow the inclusive terminology from the "Conscious Language in your Open Source Projects" guidelines [*] and replace the words "whitelist" appropriately. [*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md Reviewed-by: Gerd Hoffmann Reviewed-by: Alex Bennée Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20210303184644.1639691-2-philmd@redhat.com> Signed-off-by: Laurent Vivier --- ui/console.c | 2 +- ui/vnc-auth-sasl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/console.c b/ui/console.c index 171a7bf14b94..c2fdf975b6b3 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1724,7 +1724,7 @@ bool dpy_gfx_check_format(QemuConsole *con, return false; } } else { - /* default is to whitelist native 32 bpp only */ + /* default is to allow native 32 bpp only */ if (format != qemu_default_pixman_format(32, true)) { return false; } diff --git a/ui/vnc-auth-sasl.c b/ui/vnc-auth-sasl.c index f67111a3662a..df7dc08e9fc5 100644 --- a/ui/vnc-auth-sasl.c +++ b/ui/vnc-auth-sasl.c @@ -288,7 +288,7 @@ static int protocol_client_auth_sasl_step(VncState *vs, uint8_t *data, size_t le goto authreject; } - /* Check username whitelist ACL */ + /* Check the username access control list */ if (vnc_auth_sasl_check_access(vs) < 0) { goto authreject; } @@ -409,7 +409,7 @@ static int protocol_client_auth_sasl_start(VncState *vs, uint8_t *data, size_t l goto authreject; } - /* Check username whitelist ACL */ + /* Check the username access control list */ if (vnc_auth_sasl_check_access(vs) < 0) { goto authreject; } From patchwork Wed Mar 10 21:44:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12129575 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-21.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 20CB0C433DB for ; Wed, 10 Mar 2021 22:05:35 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 9637964F42 for ; Wed, 10 Mar 2021 22:05:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9637964F42 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK6xR-00025t-NF for qemu-devel@archiver.kernel.org; Wed, 10 Mar 2021 17:05:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33348) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6eA-0003Dt-TM; Wed, 10 Mar 2021 16:45:38 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:55577) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6dz-0004So-GE; Wed, 10 Mar 2021 16:45:38 -0500 Received: from localhost.localdomain ([82.142.6.26]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MEVqu-1lVb5f2Eji-00FzDW; Wed, 10 Mar 2021 22:45:21 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 13/22] scripts/tracetool: Replace the word 'whitelist' Date: Wed, 10 Mar 2021 22:44:55 +0100 Message-Id: <20210310214504.1183162-14-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210310214504.1183162-1-laurent@vivier.eu> References: <20210310214504.1183162-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:Qpitq5CgkFUqaFtQMka6uBMZKo6QhrEm9G9ozTr/r5gz+Nkocrw z3PnTzGgFnVi/SIOPhVMRS+gV3DxSuO6TAdO+Kw05k5mb/edCkkjlRcKEB5gqSRJN2Vgp4o BFOgpdt/0vkL64teTtQIS4lS9Huxq6/JIOApg/GxCTYV/M3AufKi+zGG0eXt0Pplbrd2MNa maUKZzAN9xtg1U2fcDf1w== X-UI-Out-Filterresults: notjunk:1;V03:K0:oCZP1Vi+dZ8=:IWS4c70WFN2MeUGXx6Ov3j wcTqMHuH7xzvVyvzknJBivnhD4/ZVz/lnkGX9txfFD1SiE8lKv7AhcADNi1RDnXirzGjpVKq1 JcZFK7SLDAooPk2AeWS+7fLk1ujPverSL66H1tmHt1t3fYtmUm0fZhX64xRn7e0CyuKs+RBUl KKeWV40ZOz0TDJauqc2gkfQo42PtNf9LeW1T2T5qo3o+9XaMBJ41jVLMnKP/MWBC17ISrTSLY 4G5dNou75xteIWRDw0C8l2RneUTITJWvVeS5xi7NItSq3rbvA5W+gopDnF1I//aXjhjfVT2F3 tfd2M6I01AGbPEF1531G99W1FAxAGPYW9xorTRNHp/ZB91kCx+HgAPF+Tcy76wanbKz9KWMYo inOv/5KzemTdREHzZO1ezYcI+JkOC/uur76Qc2EJnI/TbkVYtXZG/E0+p8Yl27JWVFcnIHsaH GDM1bwv1cQ== Received-SPF: none client-ip=217.72.192.74; 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, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , qemu-trivial@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Michael Tokarev , Laurent Vivier , Stefan Hajnoczi , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Follow the inclusive terminology from the "Conscious Language in your Open Source Projects" guidelines [*] and replace the words "whitelist" appropriately. [*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md Reviewed-by: Daniel P. Berrangé Reviewed-by: Stefan Hajnoczi Reviewed-by: Alex Bennée Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Stefan Hajnoczi Message-Id: <20210303184644.1639691-3-philmd@redhat.com> Signed-off-by: Laurent Vivier --- scripts/tracetool/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/tracetool/__init__.py b/scripts/tracetool/__init__.py index 96b1cd69a52c..5bc94d95cfc7 100644 --- a/scripts/tracetool/__init__.py +++ b/scripts/tracetool/__init__.py @@ -100,7 +100,7 @@ def validate_type(name): if bit == "const": continue if bit not in ALLOWED_TYPES: - raise ValueError("Argument type '%s' is not in whitelist. " + raise ValueError("Argument type '%s' is not allowed. " "Only standard C types and fixed size integer " "types should be used. struct, union, and " "other complex pointer types should be " From patchwork Wed Mar 10 21:44:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12129509 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-21.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7ABB8C433DB for ; Wed, 10 Mar 2021 21:54:20 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id EF38164FC4 for ; Wed, 10 Mar 2021 21:54:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EF38164FC4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK6mY-00071T-Vc for qemu-devel@archiver.kernel.org; Wed, 10 Mar 2021 16:54:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6e7-0003CF-NB; Wed, 10 Mar 2021 16:45:37 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:44459) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6e1-0004TD-EL; Wed, 10 Mar 2021 16:45:35 -0500 Received: from localhost.localdomain ([82.142.6.26]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1M8hEd-1lODEx2LJp-004gQL; Wed, 10 Mar 2021 22:45:22 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 14/22] seccomp: Replace the word 'blacklist' Date: Wed, 10 Mar 2021 22:44:56 +0100 Message-Id: <20210310214504.1183162-15-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210310214504.1183162-1-laurent@vivier.eu> References: <20210310214504.1183162-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:IXJGS9EI8WgLXbmOsxlnRBvT2P56A591zZZzaFDtFfZ4Js2MLGv WzWPCFw2AGFDcLcbiaDLjE3IfQdpfJmyqKhB6hes0AE6IG6USb47cDTLXpIw0Sf3u18k2tT hExGl54Qubc/EWNpc8N5W1KHznXZMFNiXkEo1XJbuS56M8+CBY9JA3cedgeWgcBYE5ervya 2V1a1NC8meCn119zxswZA== X-UI-Out-Filterresults: notjunk:1;V03:K0:ZcseplGej8o=:GpP4imbXUj1CRRqpZ8ormm 9oGGYEleqbVK8vkBmmrYJ7O8DgTaVhdkO4m3pX8LcYY/glCCMK6hSPOXW+17J+uEMa+fL1+kT MxP0g03U4dc2hyUOWmH8OX1TnwsdbhNPBMgH8b5LCjqcdNEdwFuAn+HuXLZZviczG623uB4l/ Pc2mq3RjLxkWB7xSFAactEbFoff1VMuMNmgr+6arUmwmjBkeEUH0l/Z+aOqLTW12lPPoJBFce xiNVUvwOHGfwwOHRZJyuxwt10L2bZNov7v3wd1GbJBLdF+41uZ5P7aRvxEywTcG2gpAr6YjkO fWmOoL5+ZRy+/JOUtrJDwk+mjHmO19dbXNvEly/ZP+hKwuioGh3lpYh0jnGsRKdcYSINUTGuD 71yJc/pY/O5OdZLdyEEsOcjDyIjX5pGFYoZjcHcFJPYuAL1hwuMRR6eddnSHuHMZiKktm7ihz Gi3Fgs/+3g== Received-SPF: none client-ip=212.227.17.10; 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Otubo , Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , qemu-trivial@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Follow the inclusive terminology from the "Conscious Language in your Open Source Projects" guidelines [*] and replace the word "blacklist" appropriately. [*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md Reviewed-by: Daniel P. Berrangé Acked-by: Eduardo Otubo Reviewed-by: Alex Bennée Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Message-Id: <20210303184644.1639691-4-philmd@redhat.com> Signed-off-by: Laurent Vivier --- softmmu/qemu-seccomp.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/softmmu/qemu-seccomp.c b/softmmu/qemu-seccomp.c index 377ef6937ca5..9c29d9cf007e 100644 --- a/softmmu/qemu-seccomp.c +++ b/softmmu/qemu-seccomp.c @@ -45,8 +45,8 @@ const struct scmp_arg_cmp sched_setscheduler_arg[] = { { .arg = 1, .op = SCMP_CMP_NE, .datum_a = SCHED_IDLE } }; -static const struct QemuSeccompSyscall blacklist[] = { - /* default set of syscalls to blacklist */ +static const struct QemuSeccompSyscall denylist[] = { + /* default set of syscalls that should get blocked */ { SCMP_SYS(reboot), QEMU_SECCOMP_SET_DEFAULT }, { SCMP_SYS(swapon), QEMU_SECCOMP_SET_DEFAULT }, { SCMP_SYS(swapoff), QEMU_SECCOMP_SET_DEFAULT }, @@ -175,18 +175,18 @@ static int seccomp_start(uint32_t seccomp_opts, Error **errp) goto seccomp_return; } - for (i = 0; i < ARRAY_SIZE(blacklist); i++) { + for (i = 0; i < ARRAY_SIZE(denylist); i++) { uint32_t action; - if (!(seccomp_opts & blacklist[i].set)) { + if (!(seccomp_opts & denylist[i].set)) { continue; } - action = qemu_seccomp_get_action(blacklist[i].set); - rc = seccomp_rule_add_array(ctx, action, blacklist[i].num, - blacklist[i].narg, blacklist[i].arg_cmp); + action = qemu_seccomp_get_action(denylist[i].set); + rc = seccomp_rule_add_array(ctx, action, denylist[i].num, + denylist[i].narg, denylist[i].arg_cmp); if (rc < 0) { error_setg_errno(errp, -rc, - "failed to add seccomp blacklist rules"); + "failed to add seccomp denylist rules"); goto seccomp_return; } } From patchwork Wed Mar 10 21:44:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12129515 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-21.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 73B93C433DB for ; Wed, 10 Mar 2021 21:57:04 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id B029D64FC8 for ; Wed, 10 Mar 2021 21:57:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B029D64FC8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51974 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK6pC-0002SX-J7 for qemu-devel@archiver.kernel.org; Wed, 10 Mar 2021 16:57:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33356) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6eB-0003EZ-3J; Wed, 10 Mar 2021 16:45:39 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:57163) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6e1-0004T1-C7; Wed, 10 Mar 2021 16:45:38 -0500 Received: from localhost.localdomain ([82.142.6.26]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MOAmt-1l4TQw1lJB-00OXej; Wed, 10 Mar 2021 22:45:23 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 15/22] qemu-options: Replace the word 'blacklist' Date: Wed, 10 Mar 2021 22:44:57 +0100 Message-Id: <20210310214504.1183162-16-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210310214504.1183162-1-laurent@vivier.eu> References: <20210310214504.1183162-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:kWnAYQYaet/ZldL1DFi/nwFUd7xildn1gGPJDlOWG25wYY8/Os4 XzZzU9QMMBFsq07r5i+u2udD2doSVul9lrMA5jvySxOys6a5P323XWMYifIF32g9AczRuSw /E3cUGYz5vR2I0YHZFIiJdN56ASn/JqpR5iZaKArf8bRbwL6ErEGum3rZtfxNgwJdxvsbab iI7NJLRbzcyCI4hcAeNUA== X-UI-Out-Filterresults: notjunk:1;V03:K0:mFCBEVc5Cj8=:lFy+5+ZAdVe3NaSDWS22r4 z7993fdUujOqeY3hHQwlKRFHQlOAv7/wARaDod8JJ4SF0IcBxe4rgQ47OGMv/hsR91UL57uJf IukCb2Muldg/rQvn1fhUvArVfXuD6V/ch/LDle4pxLfGFvoENUJySf9mV09a1JALV2FyVQNDr kGANvbvCSMMdtBjDuOLp39jMsIiUZ7r61T2s9T0Nx2Mlv9Frnpj7VcJ8FZycVnEBrTKU9yWla ca4z0ER5MzxC8alt/qou9y23OjrHZT6FLV19IspZY3qaS2fH23+39PXS4t0uFHLGuvAT4SWV7 wmJVTUEF1xEcIjW3OFW86bXb0Pp4K8bl83N+P2q+kurPS1CSaskRDNquhm3mt7Rh5mPVgM6lk DT/CGcAaOlOczwTSPKZPc7Oq9sNfPlNXcohLLVJdvsA0MIjIiq+EWUN27sENqpBKrpZ9g53kN YECtylXM+Q== Received-SPF: none client-ip=212.227.17.13; 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Follow the inclusive terminology from the "Conscious Language in your Open Source Projects" guidelines [*] and replace the word "blacklist" appropriately. [*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md Reviewed-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Message-Id: <20210303184644.1639691-5-philmd@redhat.com> Signed-off-by: Laurent Vivier --- qemu-options.hx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index c324633fcaad..622d3bfa5a7d 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4299,12 +4299,12 @@ DEF("sandbox", HAS_ARG, QEMU_OPTION_sandbox, \ " use 'obsolete' to allow obsolete system calls that are provided\n" \ " by the kernel, but typically no longer used by modern\n" \ " C library implementations.\n" \ - " use 'elevateprivileges' to allow or deny QEMU process to elevate\n" \ - " its privileges by blacklisting all set*uid|gid system calls.\n" \ + " use 'elevateprivileges' to allow or deny the QEMU process ability\n" \ + " to elevate privileges using set*uid|gid system calls.\n" \ " The value 'children' will deny set*uid|gid system calls for\n" \ " main QEMU process but will allow forks and execves to run unprivileged\n" \ " use 'spawn' to avoid QEMU to spawn new threads or processes by\n" \ - " blacklisting *fork and execve\n" \ + " blocking *fork and execve\n" \ " use 'resourcecontrol' to disable process affinity and schedular priority\n", QEMU_ARCH_ALL) SRST From patchwork Wed Mar 10 21:44:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12129573 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-21.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AAA6DC433DB for ; Wed, 10 Mar 2021 22:04:44 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 3DD5D64F42 for ; Wed, 10 Mar 2021 22:04:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3DD5D64F42 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK6wd-0001bk-Cz for qemu-devel@archiver.kernel.org; Wed, 10 Mar 2021 17:04:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33362) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6eB-0003FT-C0; Wed, 10 Mar 2021 16:45:39 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:37851) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6e3-0004TV-Qd; Wed, 10 Mar 2021 16:45:39 -0500 Received: from localhost.localdomain ([82.142.6.26]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Mr8SG-1m8Eh01aLO-00oEZi; Wed, 10 Mar 2021 22:45:24 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 16/22] tests/fp/fp-test: Replace the word 'blacklist' Date: Wed, 10 Mar 2021 22:44:58 +0100 Message-Id: <20210310214504.1183162-17-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210310214504.1183162-1-laurent@vivier.eu> References: <20210310214504.1183162-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:A+Q/w2Ck9Mm8oiHHM5SogxE2dKCRGjoNHmFPTCi8o35kVlzcMjs FM7K6a/sIsIOSniSWyAn2vpw+ECphvI3BmNQy3l9VfQMEm6mce6oIVQsbn71jWK1SOzVCqS p7Z+BcCqHQfruBcmYPFbn3gs7bXwX96k2GogX4vLzKGlPmV8T6AQpIkt1bdp2zocnvLOvNT sF3sz+eeHmHbCvu+KthGg== X-UI-Out-Filterresults: notjunk:1;V03:K0:7Q5m8vQbm1E=:toMlx6VYrvo7s6QFGTIl5u Zq8rZy+VA9eZ+OyGYQK8G7JGvgOsOtqGCXnMQJpM2MV3sPlKnvwbgIA37Ac45OfHpe0tiHt+s YkFY0N9uPP8UzBrT71bjIpifWTqQc4cOn+F5HCpoEx/Oj5WTdk6cBWpKwOKU06073uymgfTvE 3VR3iMx932XjeyAIqKOtrTVt5poTRoPNzPSQ4Ly1QkptFKztDrr5vRyCAivvdWO/Eh1cv6g5n g+VNEdb7VYDqgXlrDZ7DBWtTB8Arhl0Aal6D0FOVEO5P+FeAI/McEulaghsAkg+GWlPwQGHYf Mwi6r+cVVERrqIJ8ojTlgPkWKeaGThKDGAEDhEKHm++q5bRwsUAEuP8jxrJcPtjfWlzGpn48f V5SW6OilQfvyevmqaqO5T8O2nI/85Pw60Huf+J6Fx42mjYAaPO8R6G5P/eAGdKiHFGq0oUd19 PLYXguWGPg== Received-SPF: none client-ip=217.72.192.75; 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , qemu-trivial@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Follow the inclusive terminology from the "Conscious Language in your Open Source Projects" guidelines [*] and replace the word "blacklist" appropriately. [*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md Acked-by: Alex Bennée Reviewed-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Message-Id: <20210303184644.1639691-6-philmd@redhat.com> Signed-off-by: Laurent Vivier --- tests/fp/fp-test.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/fp/fp-test.c b/tests/fp/fp-test.c index 06ffebd6db17..5a4cad8c8b23 100644 --- a/tests/fp/fp-test.c +++ b/tests/fp/fp-test.c @@ -123,7 +123,7 @@ static void not_implemented(void) fprintf(stderr, "Not implemented.\n"); } -static bool blacklisted(unsigned op, int rmode) +static bool is_allowed(unsigned op, int rmode) { /* odd has not been implemented for any 80-bit ops */ if (rmode == softfloat_round_odd) { @@ -161,10 +161,10 @@ static bool blacklisted(unsigned op, int rmode) case F32_TO_EXTF80: case F64_TO_EXTF80: case F128_TO_EXTF80: - return true; + return false; } } - return false; + return true; } static void do_testfloat(int op, int rmode, bool exact) @@ -194,7 +194,7 @@ static void do_testfloat(int op, int rmode, bool exact) verCases_writeFunctionName(stderr); fputs("\n", stderr); - if (blacklisted(op, rmode)) { + if (!is_allowed(op, rmode)) { not_implemented(); return; } From patchwork Wed Mar 10 21:44:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12129523 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E8B5C433E6 for ; Wed, 10 Mar 2021 22:01:05 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 3FDCE64FB1 for ; Wed, 10 Mar 2021 22:01:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3FDCE64FB1 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK6t6-00072c-Bz for qemu-devel@archiver.kernel.org; Wed, 10 Mar 2021 17:01:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33338) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6eA-0003CV-5p; Wed, 10 Mar 2021 16:45:38 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:60819) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6e3-0004TP-Qe; Wed, 10 Mar 2021 16:45:37 -0500 Received: from localhost.localdomain ([82.142.6.26]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1M8hEd-1lODEy0nx3-004gQL; Wed, 10 Mar 2021 22:45:25 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 17/22] qemu-common.h: Update copyright string to 2021 Date: Wed, 10 Mar 2021 22:44:59 +0100 Message-Id: <20210310214504.1183162-18-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210310214504.1183162-1-laurent@vivier.eu> References: <20210310214504.1183162-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:KwmlUpqRcQzY4R/tRkHoVqRPTyi5mx0LYp0jJgzzutNPwWS5Uzt AaYqTJOwos4Fle+E8G12vP7ajNv68BPqk+1GHBEH1pANhw1BH2sfIWlWROMinyp0kmp4oLe AAUx66CYW7k2LKV1wZQAUG8yCFxPtphZuPEyCp5BWDABpPTnTEEny5BBkLFo9a6t87eUPjd tOC7za23EY5/zCZLhe1iQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:rNLk5RauKIU=:n6dyawkb6z9g40AC/2BqBU 482h3+nnv4KQmDKEQFpRudsgb+/BI425aSFYC/8xIc9iITpJe8olDhA8409uXZDNjvnuHofwe ZlJdK1+a0hDq6u3bYIcgmpz8wF4gAZC9eQ5kbp1p29AGdKGegcWhx4dh7JiYPaH0qgLw8bv+z q1H4U0kQIhWo1JZKzZ5qkYmKrH8Ql0r9PpXMlqbfN96CzwNf6YRIJOgqKQXOVWGpFeKfUa9z1 PMAQqY7iCcEMWYxcNWkV2wdLKb2jRBIghW/Iea3tqLRUC2iQHzEFw2+Hn5PhbzdhqUTzn0zba lQmCOJy9yIlMZesSQch5XcU/YqpdDwwIgIwHXdA2JesG/nRCpP3XW29wO0iJ+UvpmA7uMXb3h 1lwhA+ASe8Oa6UThX2d2FLePg16cQmTWh1XZH36NWiiNjMf3CM+Vse3f58Kfbwb1StlXpufCs hzHzQYZNKQ== Received-SPF: none client-ip=217.72.192.75; 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Peter Maydell , Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell Update the common copyright string that we use in -version reports, About dialogs, etc, to 2021. Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Laurent Vivier Message-Id: <20210309162258.28633-1-peter.maydell@linaro.org> Signed-off-by: Laurent Vivier --- include/qemu-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/qemu-common.h b/include/qemu-common.h index 654621444ecf..73bcf763ed82 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -13,7 +13,7 @@ #define TFR(expr) do { if ((expr) != -1) break; } while (errno == EINTR) /* Copyright string for -version arguments, About dialogs, etc */ -#define QEMU_COPYRIGHT "Copyright (c) 2003-2020 " \ +#define QEMU_COPYRIGHT "Copyright (c) 2003-2021 " \ "Fabrice Bellard and the QEMU Project developers" /* Bug reporting information for --help arguments, About dialogs, etc */ From patchwork Wed Mar 10 21:45:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12129521 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 893DEC433E0 for ; Wed, 10 Mar 2021 22:00:29 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 1967B64FAB for ; Wed, 10 Mar 2021 22:00:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1967B64FAB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:60874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK6sV-0006OJ-Uh for qemu-devel@archiver.kernel.org; Wed, 10 Mar 2021 17:00:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33372) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6eB-0003Gd-Qf; Wed, 10 Mar 2021 16:45:39 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:42857) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6e2-0004TM-9C; Wed, 10 Mar 2021 16:45:39 -0500 Received: from localhost.localdomain ([82.142.6.26]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MKc0o-1l1SlW00cO-00KzQK; Wed, 10 Mar 2021 22:45:26 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 18/22] hw/lm32/Kconfig: Introduce CONFIG_LM32_EVR for lm32-evr/uclinux boards Date: Wed, 10 Mar 2021 22:45:00 +0100 Message-Id: <20210310214504.1183162-19-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210310214504.1183162-1-laurent@vivier.eu> References: <20210310214504.1183162-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:ct+iw0tX67eaWDqE2ug6gbDbBjow/TT/waBA/swxsUtlgvcFUkf sp4Wpe1pm+z9KfkLtZMm5RXvIU/Or/DT5Ue604d4t9YFcfmk5Dz/IqE9wY2jcl3gKV+DbTd Qddv48QsoEsgTER4vRYC5u0j9YE0b9wy8XkTkya5qN0Mk+No6pevGK198vo6JdePAZqFVGn rMqHuftwx1fa4IsAx2GdA== X-UI-Out-Filterresults: notjunk:1;V03:K0:awrn5DEDePI=:KCBJxuv/kyvwBufu80I3D3 Rm+kcb/SK/GBWDH3zsdtVFXSvdLtce32BJDE18B+M1jIH7rHwYex4Wqvgqgs/xih12fJn2jr2 AlTqiH49Kfk+V68TYMWr9nV++PiDx5AnxzekivZrIcUuWEU/59kJWh8VloU1q+WewuO3dypUh ol8lWu/kZ0fCehgqfjzLxpK/qmFSWhijG/3KzkPzJv5Jb1CbNMFAX4g8c3fAXCYGM05eZ72L0 4Ey27g9g5sydUid8Bvl+m07ozFQ6oz66tRgCJd1LmR+G2Y/IYVKno1dJUpRW69ugkkHFtocpW zDfHQPmpRXBRSBfoh6nehFCPRmVq8RlGPrhfYAgUsHTPSYiK5a2qMbSPekVWe6NZvZQAqDb/4 4mmeJWRGU0LO55yu+25pvE8pzdZsJ0hPaG0wRAkV2ZA74DaFBGaEv3ensn7Hi1sSnfTsITkZ1 uTZbnC5TaQ== Received-SPF: none client-ip=217.72.192.73; 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé We want to be able to use the 'LM32' config for architecture specific features. Introduce CONFIG_LM32_EVR to select the lm32-evr / lm32-uclinux boards. Reviewed-by: Alex Bennée Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20210221225626.2589247-2-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- default-configs/devices/lm32-softmmu.mak | 2 +- hw/lm32/Kconfig | 6 +++++- hw/lm32/meson.build | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/default-configs/devices/lm32-softmmu.mak b/default-configs/devices/lm32-softmmu.mak index 115b3e34c983..1bce3f6e8b64 100644 --- a/default-configs/devices/lm32-softmmu.mak +++ b/default-configs/devices/lm32-softmmu.mak @@ -8,5 +8,5 @@ CONFIG_SEMIHOSTING=y # Boards: # -CONFIG_LM32=y +CONFIG_LM32_EVR=y CONFIG_MILKYMIST=y diff --git a/hw/lm32/Kconfig b/hw/lm32/Kconfig index ed2e3060b040..20c36edc402c 100644 --- a/hw/lm32/Kconfig +++ b/hw/lm32/Kconfig @@ -1,7 +1,6 @@ config LM32 bool select PTIMER - select PFLASH_CFI02 config MILKYMIST bool @@ -12,3 +11,8 @@ config MILKYMIST select FRAMEBUFFER select SD select USB_OHCI + +config LM32_EVR + bool + select LM32 + select PFLASH_CFI02 diff --git a/hw/lm32/meson.build b/hw/lm32/meson.build index 8caf0a727ff8..42d6f8db3d97 100644 --- a/hw/lm32/meson.build +++ b/hw/lm32/meson.build @@ -1,6 +1,6 @@ lm32_ss = ss.source_set() # LM32 boards -lm32_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_boards.c')) +lm32_ss.add(when: 'CONFIG_LM32_EVR', if_true: files('lm32_boards.c')) lm32_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist.c')) hw_arch += {'lm32': lm32_ss} From patchwork Wed Mar 10 21:45:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 12129571 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24847C433E0 for ; Wed, 10 Mar 2021 22:04:42 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id D13B264E27 for ; Wed, 10 Mar 2021 22:04:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D13B264E27 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40366 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lK6wa-0001ak-Un for qemu-devel@archiver.kernel.org; Wed, 10 Mar 2021 17:04:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33376) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6eC-0003HS-1w; Wed, 10 Mar 2021 16:45:40 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:49075) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lK6e5-0004U9-F2; Wed, 10 Mar 2021 16:45:39 -0500 Received: from localhost.localdomain ([82.142.6.26]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MvJjz-1lbdOZ3OYz-00rIq1; Wed, 10 Mar 2021 22:45:27 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 19/22] hw/lm32/Kconfig: Rename CONFIG_LM32 -> CONFIG_LM32_DEVICES Date: Wed, 10 Mar 2021 22:45:01 +0100 Message-Id: <20210310214504.1183162-20-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210310214504.1183162-1-laurent@vivier.eu> References: <20210310214504.1183162-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:a9WCaY+0nvu/siBpDQeu07bMY23HpZ82qMlhDL0DD15lHCKf26Y Ycxgs7YNoAck2yRBceJSlSWLynUrwfrMbZI2t+00bka1WrG/P368kEYBvnrWQ2xobKO/GvE pJuqmglK0Xy3YVPqOpCCh9k0mQTEjcnWxmI0lqO1YMADbHfBYxaataVBtEP2yIcQ6hjhELM uuFOc4X+2SnSqNZMZUp3g== X-UI-Out-Filterresults: notjunk:1;V03:K0:fHakgi4e9bI=:nlkfbfy90gpCYDMgQnHDUl cpI0hFdbcXwiA2G951mP9JA1X09Bm0sT3KTVuonI2TtLsK3t+drCozHLBeOst5faesF2CXmMA IVxB6FcvADbDOiSz71cvz5oY0uS6RkfoUYzTLkpH4SNGchsAQhY9cKVa6ZMRLZtaXRpzObxTd 0LKYppgMPJ6M5DNM+XY9vwpKxpbFFkgj44/zELViqEs4WthAqsl8HrRMHNoj8jq1xrI1E7vAt vklxdLufM+zktPiIPE3WdDWzHFNMDhcY+tN54XXBfMAG91z2oGCWQXltjEpfbtYwzsr/MbhzU +WP57N+/OdXzaPTVATfe8iBcBrU9wm8X96bi25agglpv9G33sbwbRP7fzpA1aZvyUdZPTlj11 8os/phRE0OHfQ2mnJj/QllR+bOfKv1/UfzmirzHYsALQDLz1PEhV48eoCGxi7bxRnN10ft1bR a3zQMmeiDA== Received-SPF: none client-ip=212.227.17.24; 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé We want to be able to use the 'LM32' config for architecture specific features. As CONFIG_LM32 is only used to select peripherals, rename it CONFIG_LM32_DEVICES. Reviewed-by: Alex Bennée Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20210221225626.2589247-3-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- hw/char/meson.build | 4 ++-- hw/intc/meson.build | 2 +- hw/lm32/Kconfig | 4 ++-- hw/timer/meson.build | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/char/meson.build b/hw/char/meson.build index afe9a0af88c1..7ba38dbd965f 100644 --- a/hw/char/meson.build +++ b/hw/char/meson.build @@ -8,8 +8,8 @@ softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_serial.c')) softmmu_ss.add(when: 'CONFIG_IPACK', if_true: files('ipoctal232.c')) softmmu_ss.add(when: 'CONFIG_ISA_BUS', if_true: files('parallel-isa.c')) softmmu_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugcon.c')) -softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_juart.c')) -softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_uart.c')) +softmmu_ss.add(when: 'CONFIG_LM32_DEVICES', if_true: files('lm32_juart.c')) +softmmu_ss.add(when: 'CONFIG_LM32_DEVICES', if_true: files('lm32_uart.c')) softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-uart.c')) softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_uart.c')) softmmu_ss.add(when: 'CONFIG_PARALLEL', if_true: files('parallel.c')) diff --git a/hw/intc/meson.build b/hw/intc/meson.build index b3d9345a0d2e..8df3656419e3 100644 --- a/hw/intc/meson.build +++ b/hw/intc/meson.build @@ -14,7 +14,7 @@ softmmu_ss.add(when: 'CONFIG_HEATHROW_PIC', if_true: files('heathrow_pic.c')) softmmu_ss.add(when: 'CONFIG_I8259', if_true: files('i8259_common.c', 'i8259.c')) softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_avic.c', 'imx_gpcv2.c')) softmmu_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic_common.c')) -softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_pic.c')) +softmmu_ss.add(when: 'CONFIG_LM32_DEVICES', if_true: files('lm32_pic.c')) softmmu_ss.add(when: 'CONFIG_OPENPIC', if_true: files('openpic.c')) softmmu_ss.add(when: 'CONFIG_PL190', if_true: files('pl190.c')) softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_intc.c')) diff --git a/hw/lm32/Kconfig b/hw/lm32/Kconfig index 20c36edc402c..518c84ed5084 100644 --- a/hw/lm32/Kconfig +++ b/hw/lm32/Kconfig @@ -1,4 +1,4 @@ -config LM32 +config LM32_DEVICES bool select PTIMER @@ -14,5 +14,5 @@ config MILKYMIST config LM32_EVR bool - select LM32 + select LM32_DEVICES select PFLASH_CFI02 diff --git a/hw/timer/meson.build b/hw/timer/meson.build index 26c2701fd78f..a2372629f001 100644 --- a/hw/timer/meson.build +++ b/hw/timer/meson.build @@ -19,7 +19,7 @@ softmmu_ss.add(when: 'CONFIG_HPET', if_true: files('hpet.c')) softmmu_ss.add(when: 'CONFIG_I8254', if_true: files('i8254_common.c', 'i8254.c')) softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_epit.c')) softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpt.c')) -softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_timer.c')) +softmmu_ss.add(when: 'CONFIG_LM32_DEVICES', if_true: files('lm32_timer.c')) softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-sysctl.c')) softmmu_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_gictimer.c')) softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('mss-timer.c'))