From patchwork Mon Jun 7 18:57:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1488903 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FzN7t3fBjz9sVm for ; Tue, 8 Jun 2021 05:03:54 +1000 (AEST) Received: from localhost ([::1]:57368 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqKXP-0000WN-Hm for incoming@patchwork.ozlabs.org; Mon, 07 Jun 2021 15:03:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqKRm-00041d-HM; Mon, 07 Jun 2021 14:58:03 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:38239) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqKRY-0005rD-5w; Mon, 07 Jun 2021 14:58:00 -0400 Received: from quad ([82.142.12.38]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MDhV1-1lg7RK36wR-00ApZL; Mon, 07 Jun 2021 20:57:33 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 01/11] target/riscv: Do not include 'pmp.h' in user emulation Date: Mon, 7 Jun 2021 20:57:20 +0200 Message-Id: <20210607185730.346641-2-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210607185730.346641-1-laurent@vivier.eu> References: <20210607185730.346641-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:QbBK+DAwqqb5iS6m76eXQ5QRQ7wkFI5GTnLMrBXPPjaONlCmtae cfsMU1oUCwqw+I8vv+SMSbU6U/3pZN0xw90biY5CTJI3Sfbvq1r4RF+avrPR1PBaeGXBAUf pkK3QV+1K4dV0B14RdIhfPemcD5sjMzksaPeYXiNmabvFTOboeVp6EcMaMihy+bJiXid4ZE nmUK8vU1Y/2SWA9eNJNTg== X-UI-Out-Filterresults: notjunk:1;V03:K0:bLliPhQbR1A=:aTB7GfM+xTbyFyHCoLmN44 bizWkT1izq/oRe2tg9lbDGubszLHtAqDUvOQMg2ZMPv1UEgQclnhDDSToezgp9SxXrFTLJP71 GLCgd3k7AOZrGNKA9A3mmRixAWlZfT6Mgc3LWhSsnYvNUFOV+trdigJ4EN8m+HMqLlCx+3+av w2xBiPjggsXDWlHCTvt2TlYzdGxSRgvFOADQe3PLeaO0A3Bv+OIw/DoWcNaAQ9mTp2M5lscl8 1U7eJQ2aSYgRLPQP0txauoc6Qv0tmE9itjvbGhUkE0jOhx1j+woYhzS+xAO64qcUVLUScnoYj 6CM7A1m5La0ofEkW/Ye7kksTaEmIgaZoRCGMJ+y9z1SgOIYlm7S7CK3AxY4Or3Mq1CN2hHKiI yYqONzScN652OOCRgKDbPepoFofKJNc6fheg15g6SaWbMmV8ApvSG6MweJbHPCbKGI/W39YrF NvHoeJufM1+MS50RDCeP4woJeTXsY1nLOoMUmrR/9JFuykRdeEfaozuAggnMXU/5zxV1snfUm 30A8IkkaAWa1NWj26kfQCI= Received-SPF: none client-ip=212.227.126.134; 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=unavailable 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?= , Alistair Francis , Bin Meng Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Physical Memory Protection is a system feature. Avoid polluting the user-mode emulation by its definitions. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis Reviewed-by: Bin Meng Reviewed-by: Alistair Francis Message-Id: <20210516205333.696094-1-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- target/riscv/cpu.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 7e879fb9ca58..0619b491a423 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -97,7 +97,9 @@ enum { typedef struct CPURISCVState CPURISCVState; +#if !defined(CONFIG_USER_ONLY) #include "pmp.h" +#endif #define RV_VLEN_MAX 256 From patchwork Mon Jun 7 18:57:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1488894 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FzN1w3J90z9sVm for ; Tue, 8 Jun 2021 04:58:44 +1000 (AEST) Received: from localhost ([::1]:36960 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqKSQ-0003fM-Cp for incoming@patchwork.ozlabs.org; Mon, 07 Jun 2021 14:58:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53538) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqKRR-0003bz-JN; Mon, 07 Jun 2021 14:57:41 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:45159) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqKRP-0005m5-Hx; Mon, 07 Jun 2021 14:57:41 -0400 Received: from quad ([82.142.12.38]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N8oKc-1lJvmi1sLG-015q8o; Mon, 07 Jun 2021 20:57:34 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 02/11] i386/kvm: The value passed to strerror should be positive Date: Mon, 7 Jun 2021 20:57:21 +0200 Message-Id: <20210607185730.346641-3-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210607185730.346641-1-laurent@vivier.eu> References: <20210607185730.346641-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:eO/zs/LosSB4wBzM0aA4r3tRMdSTwdd0Km/ye9zr9e4RcmFCEZ/ NG94Ksy4W1PrBJweqYF3JG2UiN+V6FX/TGXnIx27dXBfQY6onmT/h/c0M4vvYuT8Rb+1YQm PKyi8/sgTVwJMn5U7mWHtVkl94pLdNIu7mcFgw699wHj3GR/49n/z5iMyj1WdKz6ccVs/rH I5+ioLyCLLPFdJs5/KCMg== X-UI-Out-Filterresults: notjunk:1;V03:K0:+BMpj+m2zGc=:BQbTUC3F7O/lmeqJB8nRCU Jka3c1Zglaiq3uj4tFs/qMaqC6/xKiR5Bpauw63U40XPKq63BrfAGxuTG8E06VMePHGN0S2pO vWHwhW4IExJEtUALwEJZMr09edEfTgVojT1Ijn38IWfLequoZeWbJv9TQYGh4EEF83yNA8a/S 5Uj7RZnMKFi4zSc7/jsng+wQnpVFlnVfCgMkmEv3HZ+cOMyCX3+UczQhe+Terep681zqRuAUZ zPAALbLzONpm3IePw69+vB4AUXRUT498EOl4/Ms0gvUCPOjXiKqzZolZlPRZbP4xJ9En7FVCR 5NNQW7+IKMPSHHv8WZdM98FFUv/wnKFI0M770G7TwgLTGN66wSed7z3iDSFWzodi9qQPRriY+ KFQGKid/1isTof5ezi8iW2UFXo/cEsIniNM/XxLrw3U7boeJk9C3BI6AHZpngBdPiVrmAMXTf NgRNRlrKODjNhZ+xU8tuHCtMFnOxVKdMiGGqoZqF2DBZKW42YMu9wcq0/jpoDrH6WM2Da/AdD jXqS8PBkgLtfjVXVgK67uU= Received-SPF: none client-ip=212.227.126.133; 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, Dmitry Voronetskiy , Michael Tokarev , Laurent Vivier , Markus Armbruster Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Dmitry Voronetskiy Signed-off-by: Dmitry Voronetskiy Reviewed-by: Markus Armbruster Message-Id: <20210519113528.12474-1-davoronetskiy@gmail.com> Signed-off-by: Laurent Vivier --- hw/i386/kvm/apic.c | 2 +- hw/i386/kvm/clock.c | 4 ++-- hw/i386/kvm/i8254.c | 10 +++++----- hw/i386/kvm/i8259.c | 4 ++-- hw/i386/kvm/ioapic.c | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/hw/i386/kvm/apic.c b/hw/i386/kvm/apic.c index 52ff49091000..1e89ca0899c2 100644 --- a/hw/i386/kvm/apic.c +++ b/hw/i386/kvm/apic.c @@ -145,7 +145,7 @@ static void kvm_apic_put(CPUState *cs, run_on_cpu_data data) ret = kvm_vcpu_ioctl(CPU(s->cpu), KVM_SET_LAPIC, &kapic); if (ret < 0) { - fprintf(stderr, "KVM_SET_LAPIC failed: %s\n", strerror(ret)); + fprintf(stderr, "KVM_SET_LAPIC failed: %s\n", strerror(-ret)); abort(); } } diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c index efbc1e0d12c2..df70b4a0338a 100644 --- a/hw/i386/kvm/clock.c +++ b/hw/i386/kvm/clock.c @@ -105,7 +105,7 @@ static void kvm_update_clock(KVMClockState *s) ret = kvm_vm_ioctl(kvm_state, KVM_GET_CLOCK, &data); if (ret < 0) { - fprintf(stderr, "KVM_GET_CLOCK failed: %s\n", strerror(ret)); + fprintf(stderr, "KVM_GET_CLOCK failed: %s\n", strerror(-ret)); abort(); } s->clock = data.clock; @@ -189,7 +189,7 @@ static void kvmclock_vm_state_change(void *opaque, bool running, data.clock = s->clock; ret = kvm_vm_ioctl(kvm_state, KVM_SET_CLOCK, &data); if (ret < 0) { - fprintf(stderr, "KVM_SET_CLOCK failed: %s\n", strerror(ret)); + fprintf(stderr, "KVM_SET_CLOCK failed: %s\n", strerror(-ret)); abort(); } diff --git a/hw/i386/kvm/i8254.c b/hw/i386/kvm/i8254.c index c558893961ba..fa68669e8a59 100644 --- a/hw/i386/kvm/i8254.c +++ b/hw/i386/kvm/i8254.c @@ -104,7 +104,7 @@ static void kvm_pit_get(PITCommonState *pit) if (kvm_has_pit_state2()) { ret = kvm_vm_ioctl(kvm_state, KVM_GET_PIT2, &kpit); if (ret < 0) { - fprintf(stderr, "KVM_GET_PIT2 failed: %s\n", strerror(ret)); + fprintf(stderr, "KVM_GET_PIT2 failed: %s\n", strerror(-ret)); abort(); } pit->channels[0].irq_disabled = kpit.flags & KVM_PIT_FLAGS_HPET_LEGACY; @@ -115,7 +115,7 @@ static void kvm_pit_get(PITCommonState *pit) */ ret = kvm_vm_ioctl(kvm_state, KVM_GET_PIT, &kpit); if (ret < 0) { - fprintf(stderr, "KVM_GET_PIT failed: %s\n", strerror(ret)); + fprintf(stderr, "KVM_GET_PIT failed: %s\n", strerror(-ret)); abort(); } } @@ -180,7 +180,7 @@ static void kvm_pit_put(PITCommonState *pit) if (ret < 0) { fprintf(stderr, "%s failed: %s\n", kvm_has_pit_state2() ? "KVM_SET_PIT2" : "KVM_SET_PIT", - strerror(ret)); + strerror(-ret)); abort(); } } @@ -272,7 +272,7 @@ static void kvm_pit_realizefn(DeviceState *dev, Error **errp) } if (ret < 0) { error_setg(errp, "Create kernel PIC irqchip failed: %s", - strerror(ret)); + strerror(-ret)); return; } switch (s->lost_tick_policy) { @@ -286,7 +286,7 @@ static void kvm_pit_realizefn(DeviceState *dev, Error **errp) if (ret < 0) { error_setg(errp, "Can't disable in-kernel PIT reinjection: %s", - strerror(ret)); + strerror(-ret)); return; } } diff --git a/hw/i386/kvm/i8259.c b/hw/i386/kvm/i8259.c index 3f8bf69e9ca4..d61bae4dc359 100644 --- a/hw/i386/kvm/i8259.c +++ b/hw/i386/kvm/i8259.c @@ -43,7 +43,7 @@ static void kvm_pic_get(PICCommonState *s) chip.chip_id = s->master ? KVM_IRQCHIP_PIC_MASTER : KVM_IRQCHIP_PIC_SLAVE; ret = kvm_vm_ioctl(kvm_state, KVM_GET_IRQCHIP, &chip); if (ret < 0) { - fprintf(stderr, "KVM_GET_IRQCHIP failed: %s\n", strerror(ret)); + fprintf(stderr, "KVM_GET_IRQCHIP failed: %s\n", strerror(-ret)); abort(); } @@ -96,7 +96,7 @@ static void kvm_pic_put(PICCommonState *s) ret = kvm_vm_ioctl(kvm_state, KVM_SET_IRQCHIP, &chip); if (ret < 0) { - fprintf(stderr, "KVM_SET_IRQCHIP failed: %s\n", strerror(ret)); + fprintf(stderr, "KVM_SET_IRQCHIP failed: %s\n", strerror(-ret)); abort(); } } diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c index 71a563181e03..ee7c8ef68bea 100644 --- a/hw/i386/kvm/ioapic.c +++ b/hw/i386/kvm/ioapic.c @@ -62,7 +62,7 @@ static void kvm_ioapic_get(IOAPICCommonState *s) chip.chip_id = KVM_IRQCHIP_IOAPIC; ret = kvm_vm_ioctl(kvm_state, KVM_GET_IRQCHIP, &chip); if (ret < 0) { - fprintf(stderr, "KVM_GET_IRQCHIP failed: %s\n", strerror(ret)); + fprintf(stderr, "KVM_GET_IRQCHIP failed: %s\n", strerror(-ret)); abort(); } @@ -95,7 +95,7 @@ static void kvm_ioapic_put(IOAPICCommonState *s) ret = kvm_vm_ioctl(kvm_state, KVM_SET_IRQCHIP, &chip); if (ret < 0) { - fprintf(stderr, "KVM_SET_IRQCHIP failed: %s\n", strerror(ret)); + fprintf(stderr, "KVM_SET_IRQCHIP failed: %s\n", strerror(-ret)); abort(); } } From patchwork Mon Jun 7 18:57:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1488900 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FzN595zgkz9sVm for ; Tue, 8 Jun 2021 05:01:33 +1000 (AEST) Received: from localhost ([::1]:47708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqKV9-0002V4-Pv for incoming@patchwork.ozlabs.org; Mon, 07 Jun 2021 15:01:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53668) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqKRf-0003yX-7H; Mon, 07 Jun 2021 14:57:55 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:36131) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqKRX-0005r7-MF; Mon, 07 Jun 2021 14:57:54 -0400 Received: from quad ([82.142.12.38]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mbiak-1lDPNp0Lsc-00dGde; Mon, 07 Jun 2021 20:57:35 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 03/11] misc: Correct relative include path Date: Mon, 7 Jun 2021 20:57:22 +0200 Message-Id: <20210607185730.346641-4-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210607185730.346641-1-laurent@vivier.eu> References: <20210607185730.346641-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:jw3HQtxNiKPDJMtUHxgYRSZuZy7t4+BPFfUmvx00JH26+BANwLa aPyRtu4y30IciCY4W4tbQ3AO3X/rsQxUVb5fU0tKI5jCWCfIFqXXaYiqcB+SsjdMI35WQSZ CLF8J5G3i+b/Tt1mseAo5LD4JvtwL0oSddfzPZ4fKwcgzJJSpOUK4PItLObHTmkovj2ge44 Ro6pw0c1W4etxh7aVow0A== X-UI-Out-Filterresults: notjunk:1;V03:K0:idTwRSoV58s=:5Wc+ZHyt5fX+vyutrhVQnD jCFXJh1GPTDPUU8VEIiFHbPsiH9M2/lBCY5RNe9ZOpg87OWJVprhiYyxrcH0FD6da0zaroRwm fmr1kaLMXmr0BQuQLETzRtcqhx+VXWkFI2AICJQK5Z2E0zglBXsPRcNjOwjh9QwCvGGjjF1qW L+zg9Y836pRalEvqpwGgSL3YcVDZIw5QgY+4kYgiXqrWfvD48OF76+GXI0zcoGflpF9t6F1oI SeZxjOzlBmaCJ4Rn46nZUm1MBXNBScoiWwKNzJ63JpduMhn8a0B3id+hx9UeQOLR0q/PZNQgm SZfYrAnnhLKGuzbl0kCQnjNUHNWV096aFFQ2WnBkMuh/3oS2idwV53eL5DesPw3VPuutgHVYR 7abj2fcHHUwYghDGPH4XfqGoOA1gv91cQJdLSxurRPbgnA8wTJ8lWqlGpikFCdj/2Gj+ruIt0 BADa36FDIF891qnY+bgxU59cO9qxqABcrqPoIMCH5LiGcNdIMjrbF7vGfWgSlSOjHJHjqoS/Z XRziy91CUNoj6aFlnGwIhM= Received-SPF: none client-ip=212.227.126.135; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, 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, Bin Meng , Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Headers should be included from the 'include/' directory, not from the root directory. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Bin Meng Message-Id: <20210516205034.694788-1-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- hw/gpio/aspeed_gpio.c | 2 +- hw/i386/acpi-common.h | 6 +++--- hw/intc/ppc-uic.c | 2 +- include/monitor/monitor.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/gpio/aspeed_gpio.c b/hw/gpio/aspeed_gpio.c index 34d8acb0e37a..6ae0116be70b 100644 --- a/hw/gpio/aspeed_gpio.c +++ b/hw/gpio/aspeed_gpio.c @@ -10,7 +10,7 @@ #include "qemu/host-utils.h" #include "qemu/log.h" #include "hw/gpio/aspeed_gpio.h" -#include "include/hw/misc/aspeed_scu.h" +#include "hw/misc/aspeed_scu.h" #include "qapi/error.h" #include "qapi/visitor.h" #include "hw/irq.h" diff --git a/hw/i386/acpi-common.h b/hw/i386/acpi-common.h index b12cd73ea5de..a68825acf50b 100644 --- a/hw/i386/acpi-common.h +++ b/hw/i386/acpi-common.h @@ -1,9 +1,9 @@ #ifndef HW_I386_ACPI_COMMON_H #define HW_I386_ACPI_COMMON_H -#include "include/hw/acpi/acpi_dev_interface.h" -#include "include/hw/acpi/bios-linker-loader.h" -#include "include/hw/i386/x86.h" +#include "hw/acpi/acpi_dev_interface.h" +#include "hw/acpi/bios-linker-loader.h" +#include "hw/i386/x86.h" /* Default IOAPIC ID */ #define ACPI_BUILD_IOAPIC_ID 0x0 diff --git a/hw/intc/ppc-uic.c b/hw/intc/ppc-uic.c index 7171de7b3558..60013f2dde34 100644 --- a/hw/intc/ppc-uic.c +++ b/hw/intc/ppc-uic.c @@ -23,7 +23,7 @@ */ #include "qemu/osdep.h" -#include "include/hw/intc/ppc-uic.h" +#include "hw/intc/ppc-uic.h" #include "hw/irq.h" #include "cpu.h" #include "hw/ppc/ppc.h" diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h index af3887bb71d5..1211d6e6d69f 100644 --- a/include/monitor/monitor.h +++ b/include/monitor/monitor.h @@ -4,7 +4,7 @@ #include "block/block.h" #include "qapi/qapi-types-misc.h" #include "qemu/readline.h" -#include "include/exec/hwaddr.h" +#include "exec/hwaddr.h" typedef struct MonitorHMP MonitorHMP; typedef struct MonitorOptions MonitorOptions; From patchwork Mon Jun 7 18:57:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1488902 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FzN7c1q75z9sVm for ; Tue, 8 Jun 2021 05:03:40 +1000 (AEST) Received: from localhost ([::1]:56242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqKXC-0008Bk-8t for incoming@patchwork.ozlabs.org; Mon, 07 Jun 2021 15:03:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53638) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqKRb-0003vT-Bs; Mon, 07 Jun 2021 14:57:52 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:37875) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqKRX-0005r5-MB; Mon, 07 Jun 2021 14:57:51 -0400 Received: from quad ([82.142.12.38]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MPGFZ-1m0RKU3B1B-00PbZh; Mon, 07 Jun 2021 20:57:36 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 04/11] linux-user/syscall: Constify bitmask_transtbl fcntl/mmap flags_tlb[] Date: Mon, 7 Jun 2021 20:57:23 +0200 Message-Id: <20210607185730.346641-5-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210607185730.346641-1-laurent@vivier.eu> References: <20210607185730.346641-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:yZTy0uTycdsMYsP4FhFiZpMOCMxuJYoBaI1yti5is/bVfIf+56A YG/oW6AJvkx+VW+kCg/NxE/IfSPzSZLLbwRSMw3F4R9mbQUvHlZxwGUuDFSc3f+z8gJ0hHb 3n/n339B8R5Gyghf3UR5NTR1ab/jgCsx1IDWUBsYMUKpZVb/W6KjAW6fDoIeYUFFh88+78E E/HEP7nb0qXg+K2owZPhw== X-UI-Out-Filterresults: notjunk:1;V03:K0:d/nVhIzL8+g=:/q5g+SacHT/HPSE9Vs7xZ3 b+GrZ17Wez35h0b8ziyhcEZYzt+smdxtlLBAGjQUofdAy3cVvsWpEl1AqphDqW0yDE3+Ah8X7 YReJv/JfdFQuji7p580pmVy7pG4/ld26178cZ7WTfCieDA5nR1TC6MYJQ+w+muddsEco80uJc l3ou7BR7rs/S0GEfjyA0WVTNOdPEjLttLSf3NII0/xaozZbbURZzlRX9hhzA7AEOzR04fZJv2 mQVBcIFb/p+wVkXpg3uYBMMq7puqZsd4NLpg0pN47TbDwDSg/ZLwTRzQp6PErbUh7//CzYezo VDl1+RzHhupRvqXhPeDvKti+YfPW5THxzz1K8N7GQ4v40mkoN8XZsqnsUTJvfuB5lXCvvDPKI e2wC+4kKObfmzOXuzLt/LHWIFBZMz7B1Vk3RJMRiVlYE+9EmF6cbAoQvEuRivBUi05I2zZbyn xP3WtA76ASM9OZNJPTtCQz0qFzU3TKutU3XdLfmxeJxyzyK+8SmgnQuZwJeDVc2600yDtwawQ 1AWPfkXi96JKvFH7uOIqig= Received-SPF: none client-ip=212.227.126.134; 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, Michael Tokarev , Richard Henderson , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Bin Meng Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Keep bitmask_transtbl in .rodata by marking the arrays const. Reviewed-by: Laurent Vivier Reviewed-by: Richard Henderson Reviewed-by: Bin Meng Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20210517055243.830491-1-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- linux-user/syscall.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index c9f812091c3f..974dd46c9a17 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -365,7 +365,7 @@ _syscall5(int, sys_statx, int, dirfd, const char *, pathname, int, flags, _syscall2(int, membarrier, int, cmd, int, flags) #endif -static bitmask_transtbl fcntl_flags_tbl[] = { +static const bitmask_transtbl fcntl_flags_tbl[] = { { TARGET_O_ACCMODE, TARGET_O_WRONLY, O_ACCMODE, O_WRONLY, }, { TARGET_O_ACCMODE, TARGET_O_RDWR, O_ACCMODE, O_RDWR, }, { TARGET_O_CREAT, TARGET_O_CREAT, O_CREAT, O_CREAT, }, @@ -6062,7 +6062,7 @@ static const StructEntry struct_termios_def = { .print = print_termios, }; -static bitmask_transtbl mmap_flags_tbl[] = { +static const bitmask_transtbl mmap_flags_tbl[] = { { TARGET_MAP_SHARED, TARGET_MAP_SHARED, MAP_SHARED, MAP_SHARED }, { TARGET_MAP_PRIVATE, TARGET_MAP_PRIVATE, MAP_PRIVATE, MAP_PRIVATE }, { TARGET_MAP_FIXED, TARGET_MAP_FIXED, MAP_FIXED, MAP_FIXED }, From patchwork Mon Jun 7 18:57:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1488897 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FzN4D36rHz9s5R for ; Tue, 8 Jun 2021 05:00:43 +1000 (AEST) Received: from localhost ([::1]:45146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqKUK-0000lc-3v for incoming@patchwork.ozlabs.org; Mon, 07 Jun 2021 15:00:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53560) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqKRT-0003fy-1T; Mon, 07 Jun 2021 14:57:43 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:59729) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqKRR-0005mp-0h; Mon, 07 Jun 2021 14:57:42 -0400 Received: from quad ([82.142.12.38]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MdvVu-1lFcJS1kJy-00b3iU; Mon, 07 Jun 2021 20:57:36 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 05/11] docs: fix broken reference Date: Mon, 7 Jun 2021 20:57:24 +0200 Message-Id: <20210607185730.346641-6-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210607185730.346641-1-laurent@vivier.eu> References: <20210607185730.346641-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:ac47I72vAYias3vxwkfOxCfTUZrBwOUBhhz10yjGO4VU07XNXNe shTSTi4XDCP31Xmpyt56u3slGp+aRLwflKYgj8F5dlK2pnVSBbGQCETQHDE1dPx51GWrB9O SpCHys90UvuvqdSFbw2P3lKuLmFkgfogsM41wcHVxXnJlQEUV79/qkubQKIcnmQ4lCAKrcs PgJLBzTaI0DdwJ3wc8yZg== X-UI-Out-Filterresults: notjunk:1;V03:K0:1CcYzfhaukg=:g1D7Qq7qc2Qx4MCs3COb4f 43OOh4p8Alz6c8e40mUitNqLs4eDF+q78mLJtQqeKTLzZv4cOv6NAyp+yHKIlFTfNSzG7xpLY mkjO+32SL/O3u60ochLRut3etylHHgQvwxgW045GzZ900uchqk3amJ/hJ7WwKBZeT23jXikJq i22QNRx1DfdzAv0GUgZkt/RSwskQ6zPjrW4Ovld23UjENlSpu0FOiT1gp7Q0vCTpv350LOQpT GG7qrsdeulz/grxtzDa1G8TmbMqs69oOMZM20RgEoeLTlZAAu6NQQeAxowIYkjlpneTwDFX5p I6OEbnaXwD9wKGHwQFG3w50xJWBr+9+hQE6ynN1gbksB+ooxdPTBJOJsgIDOf77OQmbmDNIWQ jDh/6rj0X8KavcV+zchbuOlF2GATLACmBUreenA/rqJJD5WriZcWMBFWTlS//hHb7jC7rE40v x1JHnVtbqkuBHblBIONcg7LoutrfdOEAZH5Pqfkl839vuobfgW1hMPRMFXjp02feKM58NRzMv kXz08+jOSfq2PoFgv0dJgs= Received-SPF: none client-ip=212.227.126.133; 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, John Snow , Michael Tokarev , Laurent Vivier , Peter Maydell Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: John Snow Long story short, we need a space here for the reference to work correctly. Longer story: Without the space, kerneldoc generates a line like this: one of :c:type:`MemoryListener.region_add\(\) `,:c:type:`MemoryListener.region_del\(\) Sphinx does not process the role information correctly, so we get this (my pseudo-notation) construct: ,:c:type: MemoryListener.region_del() which does not reference the desired entity, and leaves some extra junk in the rendered output. See https://qemu-project.gitlab.io/qemu/devel/memory.html#c.MemoryListener member log_start for an example of the broken output as it looks today. Signed-off-by: John Snow Reviewed-by: Peter Maydell Message-Id: <20210511192950.2061326-1-jsnow@redhat.com> Signed-off-by: Laurent Vivier --- include/exec/memory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index c158fd708455..b114f5454b15 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -571,7 +571,7 @@ struct MemoryListener { * @log_start: * * Called during an address space update transaction, after - * one of #MemoryListener.region_add(),#MemoryListener.region_del() or + * one of #MemoryListener.region_add(), #MemoryListener.region_del() or * #MemoryListener.region_nop(), if dirty memory logging clients have * become active since the last transaction. * From patchwork Mon Jun 7 18:57:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1488899 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FzN4n3Y9dz9sWD for ; Tue, 8 Jun 2021 05:01:13 +1000 (AEST) Received: from localhost ([::1]:46610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqKUp-0001kA-Fp for incoming@patchwork.ozlabs.org; Mon, 07 Jun 2021 15:01:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqKRS-0003fO-SR; Mon, 07 Jun 2021 14:57:42 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:36973) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqKRR-0005mr-0L; Mon, 07 Jun 2021 14:57:42 -0400 Received: from quad ([82.142.12.38]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MoOIi-1l1qOo1rC4-00orki; Mon, 07 Jun 2021 20:57:38 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 06/11] target/nios2: fix page-fit instruction count Date: Mon, 7 Jun 2021 20:57:25 +0200 Message-Id: <20210607185730.346641-7-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210607185730.346641-1-laurent@vivier.eu> References: <20210607185730.346641-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:Qti/glrBGreblZP2l7D4vt7BXufqSCEhA2CneSHO3YIK3wSgHJ7 1hhvqbI0PdpLXR1CX7UMXCEoQPoICXGbR0wPVeXr+32+bU1SSzsIHyh7C+4xxReNbObIV4s Pu0Ff/OzGc/LAlixaaSH1513vp7Njthqa0LEnruNT9nniCSPLTguQXqTYTG8sL/HFN+yW/U ZtAz7MXolds2PYFUyZswg== X-UI-Out-Filterresults: notjunk:1;V03:K0:X2IhJ3l9ZmU=:sIsIGbTeg6AI84OFu6nF9l sdO23cXN3Us5M4u9eNjuFj0C9wG/c9bukLXjqHXYpZ93vhSirM6EHX7rgZP2sSB2cRCCYZiW/ XiVAW2S5qsybm8kWZdJXY85YIlnj4iEZSJgBfb9h1YFtg2fSXGWRlhdFDwZJVdqNAk5GuONrP Clc7ETsr9TXM6kEBUvwDh8HQfNnJozDaVGlzWUA2JC9nNQoDLpQ/ErKIwJBgeBQUTsVlyt5Ra /MVq5k42ZUcgfd1NnAU+R+s0pErGieFDcWvhJ/5v3d3G2/jmA2rBGwaBPwd77DnW5IdI9rxMJ 5N66ZjWcrurAv+SW8R6v2bIfUKIRVDLLKSv2gDw5HMARwABmt5C0Dp+rvKqPBbMhxocuuI1LR YTXF32GyfAdb+YUm4p3Wvxx00J+K/8bt+gSAIwaIEgeJPc6bFqEI6Hv91ZLkwJbBCjb7LXQi8 5HjM2nTNVe5TXuNTOxlKA+VvYOlmT0s2yfWjBh2F3zEYtnNatkHbejqU8a9deOjdAGu0n0TAZ SpIDlHIQGBC75R1dew+1uk= Received-SPF: none client-ip=212.227.126.135; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, 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, Pavel Dovgalyuk , Richard Henderson , Michael Tokarev , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Pavel Dovgalyuk This patch fixes calculation of number of the instructions that fit the current page. It prevents creation of the translation blocks that cross the page boundaries. It is required for deterministic exception generation in icount mode. Signed-off-by: Pavel Dovgalyuk Reviewed-by: Richard Henderson Message-Id: <162072241046.823357.10485774346114851009.stgit@pasha-ThinkPad-X280> Signed-off-by: Laurent Vivier --- target/nios2/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/nios2/translate.c b/target/nios2/translate.c index 9824544eb37c..399f22d93862 100644 --- a/target/nios2/translate.c +++ b/target/nios2/translate.c @@ -829,7 +829,7 @@ void gen_intermediate_code(CPUState *cs, TranslationBlock *tb, int max_insns) /* Set up instruction counts */ num_insns = 0; if (max_insns > 1) { - int page_insns = (TARGET_PAGE_SIZE - (tb->pc & TARGET_PAGE_MASK)) / 4; + int page_insns = (TARGET_PAGE_SIZE - (tb->pc & ~TARGET_PAGE_MASK)) / 4; if (max_insns > page_insns) { max_insns = page_insns; } From patchwork Mon Jun 7 18:57:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1488896 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FzN2d6bd0z9s5R for ; Tue, 8 Jun 2021 04:59:21 +1000 (AEST) Received: from localhost ([::1]:39072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqKT1-0005Am-Qw for incoming@patchwork.ozlabs.org; Mon, 07 Jun 2021 14:59:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqKRd-0003wj-BR; Mon, 07 Jun 2021 14:57:54 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:48269) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqKRb-0005sb-13; Mon, 07 Jun 2021 14:57:53 -0400 Received: from quad ([82.142.12.38]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MHGPA-1ld71X0cls-00DK0q; Mon, 07 Jun 2021 20:57:39 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 07/11] hw/display/macfb: Classify the "nubus-macfb" as display device Date: Mon, 7 Jun 2021 20:57:26 +0200 Message-Id: <20210607185730.346641-8-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210607185730.346641-1-laurent@vivier.eu> References: <20210607185730.346641-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:tt0sc0LtYllA4S0x/3XzCfB9OK25thfRDOssunvbP1YPrAfwu35 xNWTHFOTtQWOCAdgyR7vpHB8eVtLC4/PS9bqn/ovVh/bXQNF8sx8qdO0Qm6mjZvY87d8pyn B8VhZrVkmrQAGUSnvHhZBA0mJdAy8J2kNCMPlq4QxsDCfu7jPR5GA5S3wtJR4jsJLn1BJ5j FAovq/ea/pohFxJBytY8A== X-UI-Out-Filterresults: notjunk:1;V03:K0:ikvEsHSB+/A=:iDqJJPwszZDLAyT+VrFYF2 vK79gTB1Y7kjjqu/yKoI2KMAVgmIbZeycwqiETstKcO67QjrPdo26Os2sy+3tQWerzEBvtWNN /R4WzALW1ovlwU2sFXcULanF8th86ZHS9KrndpOyZLbT605sZGZDlwtCzOAdv1Wj7g6pDup1a /hE8J22Pe8lN/xcVHor5DMz4bhymJGZyJYTC1OIrrkzHLVeEMNzDAQ0XtUFNnlFDolrWRQYZ2 6H3VMvXzqUnmZzMxIm4v3daLl5a2uNwBft3HUKlP/L0FC36bKJN3bfAWvLKGXtd2DUThzexme fRoRBTAqA3ubhHFOHWF/7z4p/JSuNj/BV0UwRd8Qkg55G98B9mpIY4PA/h3E8gXoUY72HnkfD kNSsohZ+nL9A24e/Ha4mf308572hUVFlTaZObkM6P4RUTvl65vcc0oseXDBtWm1pYGBWwWnft flN9MwppfSAbZlQFxvr2ehkiDAEKlnXjUxRQtE/8zkrdn5S72Qjw7Z3P4bTOk1U7swtSCaF/h +t+M9kkhsm83CwRa2qrRB8= Received-SPF: none client-ip=212.227.126.134; 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, Thomas Huth , Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth The "nubus-macfb" currently shows up as uncategorized device in the output of "-device help". Put it into the display category to fix this ugliness. Signed-off-by: Thomas Huth Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210531073255.46286-1-thuth@redhat.com> Signed-off-by: Laurent Vivier --- hw/display/macfb.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/display/macfb.c b/hw/display/macfb.c index ff8bdb846b97..d8183b9bbde6 100644 --- a/hw/display/macfb.c +++ b/hw/display/macfb.c @@ -450,6 +450,7 @@ static void macfb_nubus_class_init(ObjectClass *klass, void *data) dc->desc = "Nubus Macintosh framebuffer"; dc->reset = macfb_nubus_reset; dc->vmsd = &vmstate_macfb; + set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories); device_class_set_props(dc, macfb_nubus_properties); } From patchwork Mon Jun 7 18:57:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1488904 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FzN9V1hr2z9sW8 for ; Tue, 8 Jun 2021 05:05:18 +1000 (AEST) Received: from localhost ([::1]:60774 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqKYm-0002n0-6V for incoming@patchwork.ozlabs.org; Mon, 07 Jun 2021 15:05:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqKRi-00040M-Un; Mon, 07 Jun 2021 14:57:59 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:60763) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqKRZ-0005rV-07; Mon, 07 Jun 2021 14:57:58 -0400 Received: from quad ([82.142.12.38]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M5Q2f-1lpV5y37X3-001Rur; Mon, 07 Jun 2021 20:57:40 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 08/11] target/hppa: Remove unused 'memory.h' header Date: Mon, 7 Jun 2021 20:57:27 +0200 Message-Id: <20210607185730.346641-9-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210607185730.346641-1-laurent@vivier.eu> References: <20210607185730.346641-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:5/ZTWBZ9zAd0mzTGRurjdrlH7asa+gUjGnBVnooo+27LlUvYP7v LBO++eJFfsbNZoIElngccompMTldzS+JZZ+rQ10D13dZFoHSyoYSjodtv3MMGPgRyhUBFRW 3Yn4eUUCi5pkfBBJdchn5lAO+VJzNEWQolbTzeyk8yF67xRNdKsb/5yDFyzWU2ntV7+39OX BANbV6ztHeHjhUBzTQpXg== X-UI-Out-Filterresults: notjunk:1;V03:K0:KNAJpkMwrk0=:GsMR7edSKFwW+hEp2mjdzl 85qohKRPYrejAyFlpbCeybaqnPWw9YRk9woAO/mVFJuWlIFDsbnKRRNVq9dgMoccHw9OMNZjX wmF6GTURGovLjAbGzq+Gj2VBlzXDHbYqJ1QJFYqVpM7v63GJUjWSX1T3JjN3qxe933BtRS23m Js3QIueuu7nPdIRDhL59j0Lnav7U3uy+f6b12K55M+ptZvp5URLcVIT3mOeQBjKxP/imGgPYC o2hwxY4wbZNP3ScCJyXHes392QCxkmvhHW2vSvgFYjs2t2mg+0GRFhUAmD1TjvqVzPWliyHm5 lm6NX8rzpUcs03fCsFix0GbSUdhkosP9Rpd8WgmfyOoz/BQxkMiF5fN1f/+cLD0oGkAnCkNpa wyQp7U4w7769JILvrSLZAybEVltcV6Ivm2D7U7tToUS30DQ6Fq1DAadyGRAkktvMhl/b4Gnxx c8CQV36oa6lthdeivqYmhp2jQsmjyd31hfsqLC+xrdKRy4axelqrIZZoGAre/mhBACbeAN7SE jrYNUZMLrYxzbstET5AN74= Received-SPF: none client-ip=212.227.126.134; 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, Richard Henderson , Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20210517101558.1040191-1-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- target/hppa/cpu.h | 1 - 1 file changed, 1 deletion(-) diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 61178fa6a2a5..748270bfa31e 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -22,7 +22,6 @@ #include "cpu-qom.h" #include "exec/cpu-defs.h" -#include "exec/memory.h" /* PA-RISC 1.x processors have a strong memory model. */ /* ??? While we do not yet implement PA-RISC 2.0, those processors have From patchwork Mon Jun 7 18:57:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1488901 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FzN5r5K38z9sVm for ; Tue, 8 Jun 2021 05:02:08 +1000 (AEST) Received: from localhost ([::1]:49414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqKVi-0003e6-MY for incoming@patchwork.ozlabs.org; Mon, 07 Jun 2021 15:02:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqKRg-0003zZ-J7; Mon, 07 Jun 2021 14:57:56 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:49381) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqKRd-0005tv-Ah; Mon, 07 Jun 2021 14:57:56 -0400 Received: from quad ([82.142.12.38]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MsqIi-1lWahY2Cm8-00t964; Mon, 07 Jun 2021 20:57:40 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 09/11] target/mips: Fix 'Uncoditional' typo Date: Mon, 7 Jun 2021 20:57:28 +0200 Message-Id: <20210607185730.346641-10-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210607185730.346641-1-laurent@vivier.eu> References: <20210607185730.346641-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:/eqKLFFWMtqvP7f34pFrlSEeeprZqU1BSJNzfJBGsKB9W6QP6h6 HI7QQeJ9LLMd3luS+zv2r/JsZ7DAfngEpThAkCCbf8bXs/ZoHRHLXh1gVHETbGQ5TgOb7E+ F/powcSGk7hzn8zhMXO5V47UVOGFnidU/L/Nbkz0mgxph66Uk0wt52UmcYIIOYeksJR8P+E +d4je0oIBom7bWk0hhEWA== X-UI-Out-Filterresults: notjunk:1;V03:K0:5pLnGTTIw4Q=:Qelr1qLYzkqqauKb+uW3YD sRBwKojDAZAE5M4gPG+ygeq4W6lHKZ78JUvAev1XYYOL6BEKB//A7xSIBK6tmZxXbvdyD+zOL n9mKHoa6tTG3dIUVJL6KbsNveV7JLKSgzDVLOdoaEbAFvamc5ol2NKudYeXlgMiXc+HNzPXDK WS7CKRwQxWVFdz2IAiBOfupw9QjwX/VUjBfAxoyyereOgAZezX9YJyR8+asctXkCWyLT74SWy Y1ghJN8duaJvZpi7AyfJgCeA6Q3jSxdjCYBK8LuZR4LOVl11LS8yszsgcq7AAAApJSbwcbyOm In5Z9kX2AZY6dIBUGq1ivSCjnclXOKGLMtf5z3iZXTx1FFitTHWL2Y+0tL34+KwrMG3gryxDH kPHTZgASIXZVGCNbWxh0zUiR5PjnizsEjYys8txhfqedwQ2ux4fgDkQJdNut/BvVxzAYZqvnI ZQSKPyCW420JwQu1nx9Xf3P1SEuBBmzA1Kt4QRL/BVuOi4u3jl1UJs3OnFHR7pMH1Qu/OVYOL Busw0/H5u2iqd1ZHtJ0RAo= Received-SPF: none client-ip=212.227.126.133; 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, Luis Pires , Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Fix Uncoditional -> Unconditional typo. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Luis Pires Message-Id: <20210602170759.2500248-3-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- target/mips/tcg/translate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index c03a8ae1fed8..797eba443470 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -12238,7 +12238,7 @@ static void gen_compute_compact_branch(DisasContext *ctx, uint32_t opc, } if (bcond_compute == 0) { - /* Uncoditional compact branch */ + /* Unconditional compact branch */ switch (opc) { case OPC_JIALC: tcg_gen_movi_tl(cpu_gpr[31], ctx->base.pc_next + 4 + m16_lowbit); @@ -19092,7 +19092,7 @@ static void gen_compute_imm_branch(DisasContext *ctx, uint32_t opc, ctx->base.is_jmp = DISAS_NORETURN; if (cond == TCG_COND_ALWAYS) { - /* Uncoditional compact branch */ + /* Unconditional compact branch */ gen_goto_tb(ctx, 0, ctx->btarget); } else { /* Conditional compact branch */ @@ -19201,7 +19201,7 @@ static void gen_compute_compact_branch_nm(DisasContext *ctx, uint32_t opc, } if (bcond_compute == 0) { - /* Uncoditional compact branch */ + /* Unconditional compact branch */ switch (opc) { case OPC_BC: gen_goto_tb(ctx, 0, ctx->btarget); From patchwork Mon Jun 7 18:57:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1488905 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FzN9m4nTsz9sVm for ; Tue, 8 Jun 2021 05:05:32 +1000 (AEST) Received: from localhost ([::1]:33432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqKZ0-0003Mm-Db for incoming@patchwork.ozlabs.org; Mon, 07 Jun 2021 15:05:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqKRm-00041e-J2; Mon, 07 Jun 2021 14:58:03 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:45197) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqKRd-0005ty-Cx; Mon, 07 Jun 2021 14:58:02 -0400 Received: from quad ([82.142.12.38]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MqK6l-1l3mTO112x-00nTmJ; Mon, 07 Jun 2021 20:57:41 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 10/11] scripts/oss-fuzz: Fix typo in documentation Date: Mon, 7 Jun 2021 20:57:29 +0200 Message-Id: <20210607185730.346641-11-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210607185730.346641-1-laurent@vivier.eu> References: <20210607185730.346641-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:I9xFAEYF+3TsFN2VupcjDmCP9XvMvQpe6BpzprfP7VLNa91dcsO 59XDXfBb1G0WGvCqKIYyrnhjK/PPyKnIv25MXhNcEaEQd8VqzZxhqbFgTMpAor5JlTQl6rb JlB+2VIytq56eXrdOhQAWmCJC3roPyQYGx7L83ugvqvWMaTSry/3f7hLUDFPKFavVIseoRP xIpO3gTKBLchtoGMaVqmg== X-UI-Out-Filterresults: notjunk:1;V03:K0:L+wD6ylS7i0=:62x8guH/5HMWFHSNZnHB58 wwyCpORxejsj8Bgio6y+EDZc69Rp2ubnVw1DCS6OGUxDd7ms2heD0AzU4SUUc+E9F4Sbej02U kRpGz5AFsnFyZ1wWrYnAYPUzmomvpZX0weviZuiTxyB+/fY4i4mPNLpnv78eOCEs7F68K8BS/ 1hk2XEG+uIhCd9m9v38W88WZG+0NNGL2UgtZhHTtC9aiK4Blpt5ekhc290wGtXtb/c0zUXQb1 giyVm9ClvB1MopAliXUoeiIPUg+CPedpM6bGm4MevpxcrQkLui5RKi7sWLAm47ahS5o1HA3Rr kb4+uqs9FOIKq9zmNgDXTs94YgZg/p0Ms2vJ/Lg5cKmJ0cL1fD5M2fNaGYWkV9fLa04lmBhBH 3YfUk2/vTNaDqCR3zBlPf58lYzAP3gzBFULOcyvWPNSeXkENHacRdrgXIXMHIvtUGcBqoAfcP PjGM6RNCitxOeInzkIwC+diIy2C2y6eGOFPcFgge7Rjb/Zq5CGqzjSXTOnNGtu7bFAQZDSGXP WFhO5GrfdeD9kYS39xuPCE= Received-SPF: none client-ip=212.227.126.133; 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, Alexander Bulekov , Michael Tokarev , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé While we only use stdin, the chardev is named 'stdio'. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alexander Bulekov Message-Id: <20210602170759.2500248-4-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py b/scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py index 890e1def856b..b154a25508f7 100755 --- a/scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py +++ b/scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py @@ -14,7 +14,7 @@ /path/to/crash 2> qtest_log_output scripts/oss-fuzz/reorder_fuzzer_qtest_trace.py qtest_log_output > qtest_trace ./i386-softmmu/qemu-fuzz-i386 -machine q35,accel=qtest \ - -qtest stdin < qtest_trace + -qtest stdio < qtest_trace ### Details ### From patchwork Mon Jun 7 18:57:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1488895 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FzN2c2ZJpz9s5R for ; Tue, 8 Jun 2021 04:59:20 +1000 (AEST) Received: from localhost ([::1]:38894 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqKT0-00053x-AH for incoming@patchwork.ozlabs.org; Mon, 07 Jun 2021 14:59:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53600) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqKRZ-0003st-Fr; Mon, 07 Jun 2021 14:57:50 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:54449) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqKRX-0005r3-LT; Mon, 07 Jun 2021 14:57:49 -0400 Received: from quad ([82.142.12.38]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MkpOZ-1l4qnh0kSl-00mNJD; Mon, 07 Jun 2021 20:57:42 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 11/11] vhost-vdpa: Remove redundant declaration of address_space_memory Date: Mon, 7 Jun 2021 20:57:30 +0200 Message-Id: <20210607185730.346641-12-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210607185730.346641-1-laurent@vivier.eu> References: <20210607185730.346641-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:+v8rA2j1TSMGgb5AoUeRwyrc0fkuy0oOkqepYIkULWKDgsrcfCY fh4kzddffD9rZxvXq39Qtrqto2uLpxCydLqex+UUEJXWfncTjormHPnAogFo+shlj17R1jB BnSsBAYBD/O/Dlg//YKeWy5P5NMMxmMxCoXW0bLrzkCqOyMB1zzrTEf6R7NJjHK/7t0iSs1 eDgODFspXAPKJIhNAVR6Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:uFo91fTMo7g=:/RLajVqPBBEkob9siHuGtT 52gphaI3vm9bMoP2YT0YPKGXkZTPhuTafu5b2jhOYebmoHmop8T6hENJobs78bGB874nZZPqj gMbTGiSP+e3Z06/6Alay04IzSEQlIuVT/eWykE4Dlc2eMcfWYlumyt5/2zHn4pH0/6rEYRMcJ w3kfwDMT15L2j1o1eIS5pwKsIohgeZWH/G2ISXUkmIqhCAqeAgjuwjV4pChMQYVZD4YkKGsHZ T+Rof553ykwacP0VW3dibeNtdoZCnGu6k03Lx1I7Jv2A4ot1IBG/rKjjk+lPfIP7wXa0CYfKq jVfWgy6/avDdHs3hwu4X5R1J3eqUDh94vFG6ehmDvz/v7Bokro67WeRdwuiJVcpoQvnvS0te6 IUW/eVt7z57g8PJTgUGNpAJPpbg45PG5jknolTVRx+F2rdMgbqB59cq4gVICYoEnJJ5Dgwu7o OSh2kCCyBTWNtGIkREdbd7V+XVif9tp7dj+P46EHd6sUINLvTj9HbedbvKX4aHhcpRow3rbGE HD5OKZ4AsRUqIB51o6fMuQ= Received-SPF: none client-ip=212.227.126.135; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, 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 , Xie Yongji , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefano Garzarella Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Xie Yongji The symbol address_space_memory are already declared in include/exec/address-spaces.h. So let's add this header file and remove the redundant declaration in include/hw/virtio/vhost-vdpa.h. Signed-off-by: Xie Yongji Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Stefano Garzarella Message-Id: <20210517123246.999-1-xieyongji@bytedance.com> Signed-off-by: Laurent Vivier --- hw/virtio/vhost-vdpa.c | 1 + include/hw/virtio/vhost-vdpa.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 8f2fb9f10b2a..ee51863d280b 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -18,6 +18,7 @@ #include "hw/virtio/vhost-backend.h" #include "hw/virtio/virtio-net.h" #include "hw/virtio/vhost-vdpa.h" +#include "exec/address-spaces.h" #include "qemu/main-loop.h" #include "cpu.h" #include "trace.h" diff --git a/include/hw/virtio/vhost-vdpa.h b/include/hw/virtio/vhost-vdpa.h index 28ca65018ed7..ae9ee7adb2d0 100644 --- a/include/hw/virtio/vhost-vdpa.h +++ b/include/hw/virtio/vhost-vdpa.h @@ -21,5 +21,4 @@ typedef struct vhost_vdpa { struct vhost_dev *dev; } VhostVDPA; -extern AddressSpace address_space_memory; #endif