From patchwork Tue Feb 22 16:16:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1596225 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4K34851YwSz9sFq for ; Wed, 23 Feb 2022 03:17:40 +1100 (AEDT) Received: from localhost ([::1]:33308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMXr6-00082J-OH for incoming@patchwork.ozlabs.org; Tue, 22 Feb 2022 11:17:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40924) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMXq8-0007y3-H4; Tue, 22 Feb 2022 11:16:36 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:53079) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMXq6-0005Y3-OS; Tue, 22 Feb 2022 11:16:36 -0500 Received: from quad ([82.142.17.50]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N0nOF-1o7mrm1QUn-00wpmZ; Tue, 22 Feb 2022 17:16:27 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 1/7] configure: Disable capstone and slirp in the --without-default-features mode Date: Tue, 22 Feb 2022 17:16:18 +0100 Message-Id: <20220222161624.382218-2-laurent@vivier.eu> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222161624.382218-1-laurent@vivier.eu> References: <20220222161624.382218-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:jmiTSf0P/ZR2i25ZYJVT5r+IhDLNzMuFV+yrUmRkkmJAIoJ01nO C5W0hSdwu43PbJctNt7yjvm8eN+IBflsyfkAWSCz+xAXDY1oJjO7ALI5ugat2E1GUBRzu0B vWUk0GPL2T0eIuk19joHWl1erCKlb78mtAuBpUUBc1tXrrFOGnXsTevYpGVZvgZxAhS0qcf VslxWW3YLEprh2wdKpVEw== X-UI-Out-Filterresults: notjunk:1;V03:K0:2hJqmHtnbFk=:W5YJ4YAvU3LvPWOhFCl2QO iaEHRX19T57IA/pIGF+usD3Wa4Bp8BTBxOAEGQTdKfUF4fqhpGszG8O0KBRu061zOuUkQ5fmN cKUkpeG7VszAhGCKTtarHhWwV4od+bg3zmKc+x4AHU0rBS1pG5meK7sdQsH6q6W3vSxn1Chdz T1djLgAnXkzZ1KEztVqjw1ciohApntV0wj0BvlS84u2lvhXkq2RTHI6RNDi+ehol6HMEsJZqN wljxs2XTla9FqxGIQptqGyetXVnx1Hi4lLd9QNVyR9ezV2PNLZQTyO9v4hWeNLBukwkCB7SdT x77KeVwhLnd4/8+7fF5lp1IGGZJQXfM9DrQ2NfVeEJ46VU8QneEHOSJa5yoTNCpWv1Ql2G85A da6BqFWI1PKxgJt0eELD6fw7ArN4Y484wvy06WoqnLCxCi4GSiuo14o7O9uq8mulPW8Z5ox3A jdxSiFFvPvj4LhKuJWTEdgBLp4lj4Y2ZQC0O+J+XwzX6EltzJNQwmyo8NmcQ9a7as1KvjwrL4 //Y7l5XRNIgxB73y43lixZv4SnvJzFUSGBDlfsi6VTHQer9SJJZumDZ6IfI2Qass6l12soJQx LdxR1yQzDzePN2ouYekqJ4e9sDGqWOPeOGIZ48yakAADVNb7BBjPk/cME8YKJXLlig//Nf6ey eWRLe3Uc22nlQVNNUfkW08mQrpscIKvP4QZej2j1N1/btqJhPejXyXakW+HTX+lF8Mgg= 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_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Samuel Thibault , Thomas Huth , Laurent Vivier , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth For the users, it looks a little bit weird that capstone and slirp are not disabled automatically if they run the configure script with the "--without-default-features" option, so let's do that now. Note: fdt is *not* changed accordingly since this affects the targets that we can build, so disabling fdt automatically here might have unexpected side-effects for the users. Signed-off-by: Thomas Huth Acked-by: Samuel Thibault Acked-by: Paolo Bonzini Message-Id: <20220221090647.150184-1-thuth@redhat.com> Signed-off-by: Laurent Vivier --- configure | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 3a29eff5cc16..36d10d95bba8 100755 --- a/configure +++ b/configure @@ -361,9 +361,14 @@ slirp_smbd="$default_feature" # are included in the automatically generated help message) # 1. Track which submodules are needed -capstone="auto" +if test "$default_feature" = no ; then + capstone="disabled" + slirp="disabled" +else + capstone="auto" + slirp="auto" +fi fdt="auto" -slirp="auto" # 2. Support --with/--without option default_devices="true" From patchwork Tue Feb 22 16:16:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1596235 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4K34Pl4ZQkz9sFx for ; Wed, 23 Feb 2022 03:29:31 +1100 (AEDT) Received: from localhost ([::1]:59698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMY2b-0000aU-D6 for incoming@patchwork.ozlabs.org; Tue, 22 Feb 2022 11:29:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40882) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMXq6-0007tD-S5; Tue, 22 Feb 2022 11:16:34 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:59329) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMXq5-0005XO-6j; Tue, 22 Feb 2022 11:16:34 -0500 Received: from quad ([82.142.17.50]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MBV2f-1nWkBY42cJ-00CwJZ; Tue, 22 Feb 2022 17:16:28 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 2/7] target/avr: Correct AVRCPUClass docstring Date: Tue, 22 Feb 2022 17:16:19 +0100 Message-Id: <20220222161624.382218-3-laurent@vivier.eu> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222161624.382218-1-laurent@vivier.eu> References: <20220222161624.382218-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:zKvTuSac4jMVLlJ5S6oKT/YwhaVtsL3Wirc5MKLVFVHh+aUK9iE t94PZyIPnGwGOb0RSunqRuhPHcp5OJUAkl1OvYNuEqHA5FIg7y9cHP6emqE+pFI12EPmcxB iLAZcy5NTmy5hlZe/SXchHnAT0wGc5fK19L2e1LtAQJojr8LRqNt36KE7bWemYbWdXEO2R4 noFeGmmG7MVD7eVqcrLpA== X-UI-Out-Filterresults: notjunk:1;V03:K0:v6mkg8znzLw=:vtUIVWMKT85hl8HYO7pF6X znRjX+FwDt6co2quGifjWLN6pGkpPqHmWMzMRT/tgR/dRjUdbAkhgtnFyNDFycJxc34dIgv4d Bz+D4v5/OlwmsjmV4m7IokIuYACPCbx2tmR6qV7FxwPxILCyyxPA/42T9UQ3tiqiUwDn7VZcj dG6LMAi5ZpG4FUQyluitEFU6ZN61GUVM1kH0lQbdXwARndo+YYfzrG2jdNXLyPt78VWNwNEDZ hQXDRLwyKnIn10VIF4bV+n6WplayRCxE4oucJwEL9MnDMoW/H6jCu8rnqPveCZ2qWYD40LDNW 4exYqOj3yTGMXM1lkx9/GkVNaokYIHhtBWNjV0B4tBKNdag+6056mDKBsFAWWr6ES2ZkslTz7 25JXAqJrwiuzlYEhlqw7srxkGlh73FnNEmN1Vl/XLZpMb2isk4nax0gV/AAbGUpeketKXdXMu RG5FiYNoA4SxzpzVauK7sL7uwdm8GRAjrSqnosj2VJ2UOO51H+HRL+WlmdxvD2ZwoeTGgj3Jh 9WRxXpQfJ6x47h5UnLT9aWDPej6WKAAn/LBQVSh4pZ0R7yXQLdqq+v5dSCWGfZ5VNapUOOt0M YBq/sO/EemVIb6Tb5r/866AeEbput4LbbPcuUD8SZ8RdLkZpRuR70M3yopkqPDSdZwIfauymH PRc697yrZw7HqMF3Af/AmFY5ibIMNdv0gz1vAmqJPNYg7CShtX090BW39RCrMotMXP8s= 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé There is no 'vr' field in AVRCPUClass. Likely a copy/paste typo from CRISCPUClass ;) Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20220122001036.83267-1-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- target/avr/cpu-qom.h | 1 - 1 file changed, 1 deletion(-) diff --git a/target/avr/cpu-qom.h b/target/avr/cpu-qom.h index 9fa6989c1882..14e5b3ce72ff 100644 --- a/target/avr/cpu-qom.h +++ b/target/avr/cpu-qom.h @@ -33,7 +33,6 @@ OBJECT_DECLARE_TYPE(AVRCPU, AVRCPUClass, * AVRCPUClass: * @parent_realize: The parent class' realize handler. * @parent_reset: The parent class' reset handler. - * @vr: Version Register value. * * A AVR CPU model. */ From patchwork Tue Feb 22 16:16:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1596263 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4K34sK3N88z9sG7 for ; Wed, 23 Feb 2022 03:49:57 +1100 (AEDT) Received: from localhost ([::1]:45298 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMYMM-00033R-2W for incoming@patchwork.ozlabs.org; Tue, 22 Feb 2022 11:49:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41078) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMXqU-0008H7-3y; Tue, 22 Feb 2022 11:17:01 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:34303) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMXqR-0005e6-0Y; Tue, 22 Feb 2022 11:16:57 -0500 Received: from quad ([82.142.17.50]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1M9nAB-1nGmfh3aVR-005paZ; Tue, 22 Feb 2022 17:16:29 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 3/7] target/rx: Remove unused ENV_OFFSET definition Date: Tue, 22 Feb 2022 17:16:20 +0100 Message-Id: <20220222161624.382218-4-laurent@vivier.eu> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222161624.382218-1-laurent@vivier.eu> References: <20220222161624.382218-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:tOLTymzmv1rc+r+k7Jio9ZzNAhcV4CW/jkaYD4Dll2BsYXr/DJr i6Fqc4ypsAerqmMr0fdO1ST2RmPIP7gg7Po0FL3lJaLWddUionBC9/qq470Go+Yab7lGzGU BPL6r5+x7aqAefjg8CsI5lebyqGmyQqYsYT8wgFnunCxAb1ZG6aAsQ4MoAG4fZLM3S9HjZY +Z34tUJlhp3mqSYJwRtWA== X-UI-Out-Filterresults: notjunk:1;V03:K0:GzvL5ChLAVc=:dtPDQCLp2KEzMQUcUNKK/c Z24b9LnxkDhO45L0cMGPCmPqbVBxD+48kQx2zfSkeiGGu+KbbozyvjGSSAsXVxtiwD9d+MNvs siRWQ9bS0DSYLtAT9TCltdNozb5U1zbePCexEBVO1vVkNUha12KYcuPNDxPkLvZiXCjCcIXE0 1mk/9DxRbyEV3mjvn9+Tx7KSqS0fauoWIPwcluE52tNMOEQty75LyeEapqW8P/1zym9VGGG81 ngNEtY4qTX8DaoBkMYIYmR2HkdrbLbpwcZwgV05QEx2TI6k+yhEhmANHUgi1FuDU04WBjk7ST nUf2Jw/+RI42bEEJjbGNZUZhVwFjD+nuwYpF2fYycn/mpNfMAZhBmTF0J15Q/sswk0tiT36qN gokPX0PNazeko1A4rXn5VXks9MPoEzhG4sffkyCIWs+9XhgJlE9K9RXLjkWHdGIfOEZ3yc4Bv igNZPpI9omCEaDSSvjwTzRMt0YGVQ9ZFXV2oWNYpulXjmxZGpPXsXIJXpkAohsosT+KVKh/hg jaQ0ceFmZzodqsU+ex3mrXZPII9snL9deyArF01v/tlZAE4D1+co6Bvru5+6NO+wHHtyFOPAp CcvtZVKGN3BpkxcfSP8T1bdkdg6JszXWJ0OAXWpaJxfwyYz8ZB6bkEX5Hwk24V6Jqi3+CKQC2 IG3zM3DwqxX3iUauHvWmvyBYWYvztNOL3IQxq4nAmSmLdZJMykEjb8ntp3jIn1dBq4BQ= 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_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Yoshinori Sato , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé The last use of ENV_OFFSET was removed in 5e1401969b ("cpu: Move icount_decr to CPUNegativeOffsetState"); the commit of target/rx came in just afterward. Reviewed-by: Richard Henderson Reviewed-by: Yoshinori Sato Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20220203001252.37982-1-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- target/rx/cpu.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/target/rx/cpu.h b/target/rx/cpu.h index 657db84ef0a5..58adf9edf692 100644 --- a/target/rx/cpu.h +++ b/target/rx/cpu.h @@ -116,8 +116,6 @@ struct RXCPU { typedef RXCPU ArchCPU; -#define ENV_OFFSET offsetof(RXCPU, env) - #define RX_CPU_TYPE_SUFFIX "-" TYPE_RX_CPU #define RX_CPU_TYPE_NAME(model) model RX_CPU_TYPE_SUFFIX #define CPU_RESOLVING_TYPE TYPE_RX_CPU From patchwork Tue Feb 22 16:16:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1596260 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4K34nq1kZZz9sG7 for ; Wed, 23 Feb 2022 03:46:55 +1100 (AEDT) Received: from localhost ([::1]:37046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMYJQ-0005nH-PV for incoming@patchwork.ozlabs.org; Tue, 22 Feb 2022 11:46:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMXqE-00085w-BB; Tue, 22 Feb 2022 11:16:43 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:43053) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMXqC-0005cv-Ph; Tue, 22 Feb 2022 11:16:42 -0500 Received: from quad ([82.142.17.50]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Mdv2u-1nvKQN1XfS-00b1fY; Tue, 22 Feb 2022 17:16:29 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 4/7] hw/nvram: use at24 macro Date: Tue, 22 Feb 2022 17:16:21 +0100 Message-Id: <20220222161624.382218-5-laurent@vivier.eu> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222161624.382218-1-laurent@vivier.eu> References: <20220222161624.382218-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:i6YXL2oOuSspIHI9tjBbj2CB3SS0ph6p4gtrAyOii/ZfInlyAAR BXq/Y43MfmmGeWa4rYqTFByS3runjoTtLJ/nmX9aYPnn1+DUN10BYkWu4ny+si9lsRYanvf 10X8jOnnyr2asKzJSjOicugXFZ0oHE2eD9tcBnMkawHzRSqv09Ir7gLggSYeQc59U+gGH2b qUzq/YXKkjUt0xTHivicQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:v+knrSGZsUc=:yEjVVl5omTtj/RO95Uv7lW p1RqHZUrbDiqveS3TmrLPY4qRtalpD/3YPTNOuYrdJHU6Xqm8OOd2sQGHBL9ledqs3pgkYfJ/ TWmMLL+5V4MWSEB8ebdnZwYyizQM87LVltTItBKKnAZNngBtCxjYv3J3ZyCmJiMzpANfKP9ek GsUQ6I15skYr5eF3bmM6apt5OG61Q8hC2rd6Q4nJZgjmTWjnie4FKwSPUW8NnR/6v2TAY3V5o bAiSCl9Gk+hAT0iPgYotAamFKVIixq3DA8+/P0czhGRJObLnKDe5OU1gfqPgOvVu08MH5FpYw wyZjaBUbjweoyfOKWCjA5pV/VI/bhvV/o2lvz7btEVDjiuZP7LueYiUXP4ZkqIdGzHXFYrxOi TukgfAzToMZhrEYVrhrrQA1PoapG55CuyZIcCgtD9Ip0em4T+6KVAgN1528hV4CuxJNDbTFGj 0aWRbbe1gXqLl4orXO0kYsyECh90HxQuMVQr6WHJ4C7kuQpakUs7m39wkHRmZRQczakK2GUzE N7ThBK8kXjQZMdPtDjdcqZtqldfXiwr33dSwMsTRF9uHAzb4xMq79Ziz03i0D8XlOcTi6dhHk lM5cELO450acdZ+1Zb8aFY9PnO7XhbQeZfTCbbAZRjmV7323+DUPVd+28AdRLgDhULtvKJc0B QFy0UCfKdbE+M2JOoVBWtNA0RX5Ym0LF5047izYrUlWgLKwFnzOLzdaZVTrPzmtq9+Rk= 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_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Patrick Venture , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Patrick Venture Use the macro for going from I2CSlave to EEPROMState. Signed-off-by: Patrick Venture Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220119214329.2557049-1-venture@google.com> Signed-off-by: Laurent Vivier --- hw/nvram/eeprom_at24c.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c index af6f5dbb9984..da435500baca 100644 --- a/hw/nvram/eeprom_at24c.c +++ b/hw/nvram/eeprom_at24c.c @@ -54,7 +54,7 @@ struct EEPROMState { static int at24c_eeprom_event(I2CSlave *s, enum i2c_event event) { - EEPROMState *ee = container_of(s, EEPROMState, parent_obj); + EEPROMState *ee = AT24C_EE(s); switch (event) { case I2C_START_SEND: From patchwork Tue Feb 22 16:16:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1596250 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4K34bC3crXz9sFt for ; Wed, 23 Feb 2022 03:37:43 +1100 (AEDT) Received: from localhost ([::1]:47814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMYAX-0002SZ-9l for incoming@patchwork.ozlabs.org; Tue, 22 Feb 2022 11:37:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40926) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMXq8-0007yC-Hf; Tue, 22 Feb 2022 11:16:36 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:59401) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMXq5-0005Xn-S3; Tue, 22 Feb 2022 11:16:36 -0500 Received: from quad ([82.142.17.50]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MfqCF-1ntPoC3cnx-00gGrj; Tue, 22 Feb 2022 17:16:30 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 5/7] qemu-options: fix incorrect description for '-drive index=' Date: Tue, 22 Feb 2022 17:16:22 +0100 Message-Id: <20220222161624.382218-6-laurent@vivier.eu> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222161624.382218-1-laurent@vivier.eu> References: <20220222161624.382218-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:W3be25eMGrIwj+ZQIR8oJ2BZ2AfhUMIDi7sSacHu7CJYPovVnGx jFdAZluKcjSouI9Pi1QjnLNU648IbcCldljXW686ZRxV8ePwI38yn5iDqwVTUpkIz2P2N2h E0qo3xDaU2Q9gjEws2NWak+xtbTHlryb/7StUWaL0PumctfTazoU5rweDe24zqazhVY/uvt X6tgtgcBIpwhFKaYqA7UQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:9hxDYsm8f/s=:D2kqxTlZZxWjVIDaCAZG/l UPxdcPlTLMdBs9iNzquwDjWZg+59n85enF5PgZBnB9HRKB1pdl8UYnFdyTUQ4IuZVpJojQ47/ INKtJnb6bALX0IMFRjqOZX01wirfOElDvw3kvagM4a6sohfRRMMUgC+0LpMtjejxGOJU6sqGt ztwfNLl926qWpd7DrIpIVL4eB1v4nbwW7T1BuZh5RaOKscRaXit7rgOQaQfIwwD/tIPy4gqot /MmQqe0eFT5UGmMFcOwTBADI7EmHCWTnTQbV+kEsx4VDGZtz0IVOAt2GKhKklko9VaRXgeYny EgWnPzzqQzs4UTtnjTht/DL22gTax6yjiP8pTT8I+g2silAcX2dd34/m7yUZKJCmDfqdI0Ghu Hhm/RyNfEpsjDQaSMYootZkrcqERPCmqfAW6jpCNqOJV6OFGEP4AQiVDjmRBClPWKwsPcoDAI 67O5xhapmgtMHVyQZT2l4LQ39l2cJOWGAmjDiuHzjjAtKZ4FIpW43+0Q1X7OX1AepimptWGlp nMBhMlyFioHOElcaL8q/ZmjSq85kqlG3aoI+5GZaP+vHg7Hk650cfJ4U5ARJMkOrluFcxIB3e sWrmG1hAkw01qzzUV2CabKXOAm3IA/Pzb48ANrhU2qOGxGe1HAUUbkZTSOhJNeUa2qE/TXiQi VGE8q4zcXqKMhExKVeSFVL3/SSy7k1TQTqHtTPEgMr82GO7D8wtHlKsPvZR9Odcc37NQ= 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, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Laurent Vivier , Thomas Huth , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Laurent Vivier qemu-options.hx contains grammar that a native English-speaking person would never use. Replace "This option defines where is connected the drive" by "This option defines where the drive is connected". Fixes: https://gitlab.com/qemu-project/qemu/-/issues/853 Signed-off-by: Laurent Vivier Reviewed-by: Thomas Huth Message-Id: <20220202143422.912070-1-lvivier@redhat.com> Signed-off-by: Laurent Vivier --- qemu-options.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu-options.hx b/qemu-options.hx index ba3ae6a42aa3..094a6c1d7c28 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1377,7 +1377,7 @@ SRST the bus number and the unit id. ``index=index`` - This option defines where is connected the drive by using an + This option defines where the drive is connected by using an index in the list of available connectors of a given interface type. From patchwork Tue Feb 22 16:16:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1596252 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4K34fb0Nl4z9sG2 for ; Wed, 23 Feb 2022 03:40:39 +1100 (AEDT) Received: from localhost ([::1]:54246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMYDM-0006kV-RR for incoming@patchwork.ozlabs.org; Tue, 22 Feb 2022 11:40:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41044) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMXqR-0008EF-Dn; Tue, 22 Feb 2022 11:16:55 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:39911) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMXqG-0005e2-6U; Tue, 22 Feb 2022 11:16:54 -0500 Received: from quad ([82.142.17.50]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MStT6-1nogXg2TbK-00UKZg; Tue, 22 Feb 2022 17:16:30 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 6/7] vdpa: Make ncs autofree Date: Tue, 22 Feb 2022 17:16:23 +0100 Message-Id: <20220222161624.382218-7-laurent@vivier.eu> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222161624.382218-1-laurent@vivier.eu> References: <20220222161624.382218-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:rmVM5WGWPKasarRE3cpUe12de7fpmIbq4i52tAPE+lQ15mx1sYF UWDj/tDHZ3fhK28aDqJGrTRZkirUd2FB/CR0yNT01m5H/iVlndvH+777gOVUga5cpERCQTb uAMdwmAt6Fn43wN6B2QxyRcPicY09HxcPjIK+i97wnGdZpMeqbzRSK48gmV+JF3UPwZ9xFj EPD9D3QKJ+00cnEu3q8xg== X-UI-Out-Filterresults: notjunk:1;V03:K0:izCHUsKb+jU=:I7vHYsEujlmpe5AxNd5JCS 7Mlw7tvd8n62z4pRvS4tclfSzQUxDHmU0XzuvYblLS5bUSs6zv6SVBoTz04+J1WWaxZHX9H0f T/QGyaCU6lAXlXcyxzTVMpB38KfoWdzbBaFwubfRHicFuH4zb3XqQ5zhfuCkrglwvBotq8/nd FYtFlmnmYIup0JyjiN/rr9Hc44bQ6MteB7+SNryyD890JEL3MBNKBs9pWuf9B+4lFChS4yD/D +oEkAUf2A38IWcRYvILTUHWJ+hH2+PW7AgQ4I0WFq8SxyTCGe5UFFW600lIMlrhQs2hn1DxXy hTpcd+Y8/cSME0BnSzPHX5Uczk8T889I9IC8OmcT7SBy8WlCe5lu3jEThZDs0iEcFOtT19Lzz el+JsoPCXyuHI+ph5xwN/mHRWbdO8YxNzYzALqHUd/29pby88jboERCKu4j3N+4VZ9rDpNnC1 X/yKbQZysjye0It0+xSqLY4a9QJbdGX93JJXnplJVhlfeSbvvODuo29ax03UYQrOXayG1WggA Ehglax6x2JdoOxBRUwnTTEQntTzeEVn4lMwVDyQ0xYGHQI0nPnHRVIAv9ZTtz+48OEcmM7JKZ DsEbvD0ndOJGc2Bw1eX6La3h31HhcYATe31xUi1maM1p3Am31/7RJFmBTWErM56sMAzcjHK5I 95ZUYmdyGwwiKTt2MQLM0JFhIxOIqWQqlMoK/SMV9RTdDP0SXv2NcBT0GU8uLQymSs4M= 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, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Jason Wang , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Eugeni?= =?utf-8?q?o_P=C3=A9rez?= , Stefano Garzarella Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Eugenio Pérez Simplifying memory management. Signed-off-by: Eugenio Pérez Acked-by: Jason Wang Reviewed-by: Stefano Garzarella Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220214193415.1606752-2-eperezma@redhat.com> Signed-off-by: Laurent Vivier --- net/vhost-vdpa.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 25dd6dd97547..1e9fe47c033d 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -263,7 +263,8 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name, { const NetdevVhostVDPAOptions *opts; int vdpa_device_fd; - NetClientState **ncs, *nc; + g_autofree NetClientState **ncs = NULL; + NetClientState *nc; int queue_pairs, i, has_cvq = 0; assert(netdev->type == NET_CLIENT_DRIVER_VHOST_VDPA); @@ -301,7 +302,6 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name, goto err; } - g_free(ncs); return 0; err: @@ -309,7 +309,6 @@ err: qemu_del_net_client(ncs[0]); } qemu_close(vdpa_device_fd); - g_free(ncs); return -1; } From patchwork Tue Feb 22 16:16:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1596254 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4K34g72bFmz9sG2 for ; Wed, 23 Feb 2022 03:41:07 +1100 (AEDT) Received: from localhost ([::1]:55850 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nMYDp-0007pY-6N for incoming@patchwork.ozlabs.org; Tue, 22 Feb 2022 11:41:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMXqA-00083f-V0; Tue, 22 Feb 2022 11:16:38 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:52993) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nMXq8-0005Yv-Tk; Tue, 22 Feb 2022 11:16:38 -0500 Received: from quad ([82.142.17.50]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Mz9EL-1o9RYi393D-00wHY9; Tue, 22 Feb 2022 17:16:32 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 7/7] hid: Implement support for side and extra buttons Date: Tue, 22 Feb 2022 17:16:24 +0100 Message-Id: <20220222161624.382218-8-laurent@vivier.eu> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220222161624.382218-1-laurent@vivier.eu> References: <20220222161624.382218-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:OzCb64N2cYd1R9aWeQovsMhFwuGsr/13GRgXaFfJYXJoFhxThrH JBHEklgBYyJkEffxRB9zW764V8htsJiuuKeshRViz8bwmf7fuGVjnKkQllO5Qw6r7PN5G02 0MI9R49vKzaBDBChcT2cA4eIICvpib7XhMnrxBVo8gS4FXvqoMit+y5JYOvsnid/xb6Chp5 e9AyO6yLFgYowlwrmTNLg== X-UI-Out-Filterresults: notjunk:1;V03:K0:Xe0ZHh8ssmU=:XVy3KHCi1zIk0bvocYY72n dbtF8IPX0Zfj9Z20bXzeqgOBeFOpzOLw37JRZcHWzzd+ml81yjeQLPVQ2myPTaFyWyBicvD78 e4O2VUMA2dGHI6GCx15CDPl3fP84bGSCphEdoqQqQ3bqn1ybJev98hN2Q/li5WD8thUTE8Bf7 0NhCdKbZldPMp71Pgm3XY3zUI4M7mo2E1VaR+rkICYUojlzcPYo39XadlWodoiS++J3kfb8lu hqG2w4rfBt0ACmIvSMSXj+Gc08yNrowmZTZz6TsFm+V4JqOApEE81Y/BLGv2poP+dj2kDfbrA cXjfqz8+NRf2cZl36fnmc0ismBoAK6Fu9yN7aMq9YeJVHhhoSVPItwJj7mzxE2u+jJWnCosxV zR3dY8m22LoNWEWRP4rGbu3hzTsU7vmOPRVpcZIhUXeoKAromKIrnBAqggYBjUd6xXbSX9+fR QcUFR8Fg0z62UOlO1qa9rcKt9RPfX87k7JvoUHqcE5IT5PIFKjT9eKZcoHuOFo733tD5ytsa5 VD+3hnFlJnJWV2JEUAefyxdcJsGPblaSQ1bQsEVwsMQWFbTwbZK1kXjUCi59gyEYFbrhE42mi oxeX6KcFeMTPgFZLcIh+NzjHUjEuZLPuOz4VP1WD1elJvAhdbpqhgNa5VNCP7+NUeFFL0lmfc CMmuk0YBcOO2gYZqAK89Se1jeEcbEluBFn0/8IB7yuQ/+FOC4I20V/ZfGZZU3OQ+SB18= 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Laurent Vivier , Gerd Hoffmann , Noah Bergbauer Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Noah Bergbauer Simply set the respective bits and update the descriptor accordingly. Signed-off-by: Noah Bergbauer Acked-by: Gerd Hoffmann Message-Id: <20211126140437.79745-1-noah@statshelix.com> Signed-off-by: Laurent Vivier --- hw/input/hid.c | 2 ++ hw/usb/dev-hid.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/input/hid.c b/hw/input/hid.c index 8aab0521f405..e7ecebdf8f88 100644 --- a/hw/input/hid.c +++ b/hw/input/hid.c @@ -114,6 +114,8 @@ static void hid_pointer_event(DeviceState *dev, QemuConsole *src, [INPUT_BUTTON_LEFT] = 0x01, [INPUT_BUTTON_RIGHT] = 0x02, [INPUT_BUTTON_MIDDLE] = 0x04, + [INPUT_BUTTON_SIDE] = 0x08, + [INPUT_BUTTON_EXTRA] = 0x10, }; HIDState *hs = (HIDState *)dev; HIDPointerEvent *e; diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c index 1c7ae97c3033..bdd6d1ffafe4 100644 --- a/hw/usb/dev-hid.c +++ b/hw/usb/dev-hid.c @@ -461,14 +461,14 @@ static const uint8_t qemu_mouse_hid_report_descriptor[] = { 0xa1, 0x00, /* Collection (Physical) */ 0x05, 0x09, /* Usage Page (Button) */ 0x19, 0x01, /* Usage Minimum (1) */ - 0x29, 0x03, /* Usage Maximum (3) */ + 0x29, 0x05, /* Usage Maximum (5) */ 0x15, 0x00, /* Logical Minimum (0) */ 0x25, 0x01, /* Logical Maximum (1) */ - 0x95, 0x03, /* Report Count (3) */ + 0x95, 0x05, /* Report Count (5) */ 0x75, 0x01, /* Report Size (1) */ 0x81, 0x02, /* Input (Data, Variable, Absolute) */ 0x95, 0x01, /* Report Count (1) */ - 0x75, 0x05, /* Report Size (5) */ + 0x75, 0x03, /* Report Size (3) */ 0x81, 0x01, /* Input (Constant) */ 0x05, 0x01, /* Usage Page (Generic Desktop) */ 0x09, 0x30, /* Usage (X) */