From patchwork Mon Oct 4 08:30: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: 1536000 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 4HNF4H1ySbz9sCD for ; Mon, 4 Oct 2021 19:58:23 +1100 (AEDT) Received: from localhost ([::1]:50504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mXJnh-0002E2-0V for incoming@patchwork.ozlabs.org; Mon, 04 Oct 2021 04:58:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXJNL-0000kj-Ob; Mon, 04 Oct 2021 04:31:07 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:38759) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXJNG-0003Nd-At; Mon, 04 Oct 2021 04:31:07 -0400 Received: from quad ([82.142.3.114]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MJnnV-1mDqY43stt-00K5xC; Mon, 04 Oct 2021 10:30:58 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 1/5] qemu-options: -chardev reconnect=seconds duplicated in help, tidy up Date: Mon, 4 Oct 2021 10:30:51 +0200 Message-Id: <20211004083055.3288583-2-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211004083055.3288583-1-laurent@vivier.eu> References: <20211004083055.3288583-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:NSwFYyndxpo26bv4xZYDLbAPPU6t3+ozi2a00x5tWkWhFwsi+bV ufaZVujMHh/vI+WzPcCr0tV3+s7dfsr35f25WXY8DFzeT7HoHbjmYNopSe3pYiW/zO1Qf96 Bqd9oVCn/SNBSe287weWlLuRZ7naaU25d21qXOTdGIrKAE89Yj4j6MZzI13XGTMqd+k02zD b7B1SfszRVrfuZjN9Pfvg== X-UI-Out-Filterresults: notjunk:1;V03:K0:zyDxUT+i+FE=:6/F23uucpGlWCpninbGW32 1CH0QRgl4MAjkoVqQPfbMj8/fL2x0iYqofoe2MCSxoQ2Zyr5pFV3Giai/42/6BCr0oCt8sHFh XLLPeClIZQ7V7q6o0NFyOpNPkpeqK5D1EgMLSBEYMkSpsv3CH6tzggdHuLtmVrrSXC+DK6//q r27YprjsDYUKie5WgiUPzCfNfKgvOatZ7nknuRU+zRQxqRt5igrBFUOl2faX7uedKDFzkd8Ln eR5u6iWkuhtt56cPDK77/cBzlGWoMATjg54uPM2onk/tZq8Xi7nwMyMahEEfKqf6GQnXSrdo6 Gtppx4zvP3EdUYrDy2VwSTJ18EBKdQ5QKHjvescZdoVRuYHO2lnI5BYzbfIQaoocStOzHAtlW CepfOPws3lM3PMb1w3G0+lnUVPj3ivAUWwhJY+jeSffu6CcaKNSmrfNUEqC3ylT+9HAynjv8m UwJ39bFHj9CttnfgbX9Yw/5gnResfg2JKYXx3ArWdpipuhUSsrlyku0V0HCina6BZZesOL7+w hl/l6LMEfZIChGC9Vlvpv06JcneMn6gpdmrAcd0+tiI7eTnp1tC09Q8XlerYHpjJf4ugXKVdv oKUubtjzhz0rR3V1/F6cxu12nM9jjm5W2Ekc+2R+MZv3UotbGyxHpaDez5iJkIUXrg5plXWI4 Onnwc6SYqAyjJYrDELZ4WvtGlhyJhwc+h2GUq/4gzZ9JOPnkpGDjIBe+pmykKhMpbkRIUt0MV rbztc6XyakNHihoIqbCZTiEai2tofFHIuTGGwQ== Received-SPF: none client-ip=212.227.126.130; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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?Daniel_P_=2E_Berrang=C3=A9?= , Markus Armbruster , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Markus Armbruster Fixes: 5dd1f02b4bc2f2c2ef3a2adfd8a412c8c8769085 Signed-off-by: Markus Armbruster Reviewed-by: Daniel P. Berrangé Message-Id: <20210928071449.1416022-1-armbru@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 8ef178180db6..4f2dc91e0b27 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3202,7 +3202,7 @@ DEFHEADING(Character device options:) DEF("chardev", HAS_ARG, QEMU_OPTION_chardev, "-chardev help\n" "-chardev null,id=id[,mux=on|off][,logfile=PATH][,logappend=on|off]\n" - "-chardev socket,id=id[,host=host],port=port[,to=to][,ipv4=on|off][,ipv6=on|off][,nodelay=on|off][,reconnect=seconds]\n" + "-chardev socket,id=id[,host=host],port=port[,to=to][,ipv4=on|off][,ipv6=on|off][,nodelay=on|off]\n" " [,server=on|off][,wait=on|off][,telnet=on|off][,websocket=on|off][,reconnect=seconds][,mux=on|off]\n" " [,logfile=PATH][,logappend=on|off][,tls-creds=ID][,tls-authz=ID] (tcp)\n" "-chardev socket,id=id,path=path[,server=on|off][,wait=on|off][,telnet=on|off][,websocket=on|off][,reconnect=seconds]\n" From patchwork Mon Oct 4 08:30: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: 1535995 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 4HNDzY4rg0z9t25 for ; Mon, 4 Oct 2021 19:54:17 +1100 (AEDT) Received: from localhost ([::1]:37470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mXJjj-0001fD-Fb for incoming@patchwork.ozlabs.org; Mon, 04 Oct 2021 04:54:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52396) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXJNW-00018W-Am; Mon, 04 Oct 2021 04:31:18 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:41775) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXJNQ-0003VJ-VN; Mon, 04 Oct 2021 04:31:18 -0400 Received: from quad ([82.142.3.114]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MCXhr-1mfnZA06XD-009l8y; Mon, 04 Oct 2021 10:30:59 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 2/5] qemu-options: Tweak [, maxcpus=cpus] to [, maxcpus=maxcpus] Date: Mon, 4 Oct 2021 10:30:52 +0200 Message-Id: <20211004083055.3288583-3-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211004083055.3288583-1-laurent@vivier.eu> References: <20211004083055.3288583-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:8iKZTuLqv2IRy5neIuQ8ighQ9u3RwE6JRrnPiRTuf8zkFQFI84N 7ukEfZ0aE+5hupzgGHAAHfzjMm6Ji9xIJX6w0JHaVTnG7OupQNtlIwV3EOHJwViBuuVIzCZ z051I7Yc6p5D6qrwudS9MDa9UQKt54aVdXXG2e+C78Wi1EqBpNRoL1eIWNGZkKCBTzE6HJp C6YTQGCXWfbnH/9UCXQkw== X-UI-Out-Filterresults: notjunk:1;V03:K0:aJQYa8RmOC0=:g/VEYDsxKKdyHxGDpXEUK+ oL0xsxmkxvwVMl/AmobTLUf7kil6tjDaiA4QfPAe0ebaoNO5Diu2N58arkLfx71psHI8eqBly OZaYmBHZsDgHDl3cxL9hRIB4r1xgcVtHLU131LFMDMGOYhmOB2RC0/Jw2iaoGERYObmE5bOPJ b69fKX/ObEdL/8lwKtAwssgikNZ1b+X6N28ZVq+KwPsDRJlheBAmh2BTspkXBhkkhxm79jWg9 BMJz2ZcdfgbTIiHU7vwhttuXSrqbsOGy4zncO0/BzriaC2EI1VKyzcbXDoDkiAEqwBDl0N9Sv oAZOx7HvOSZd7JFCUAOm9mPfBHuyOWhDvY4ASwAuq/RtARzKeOTttgBdSzGrpYH0QJ9G2+1nO fF1B8eqO2G6tDCJKfcBE9aZS/lbHeAXLASGzVowjrUp1FrjHozEx5s24sWiXZlDcdRt7/Y8q8 sH+Dt/Hms+HnO/GmRN7QCeHlvgnxeZY3zQ/xzJsbC/8et78YLs3L//feepbNXP3t/fQPFSDV+ Wwy4jt3OTsh7QUTTl8+obTbZtb8Bj8zDBWrnSoikCQFnkxLHoW46CB6tkxOxS3imEh7b8cn3O pLCzx10//Mn4b+QND/aNSgeiNAQvPjh6ey1Flt+8eJ3PBME3YxTuZhB6r50H7WpO7/CS+NoQP blv42OTdC0VvY7ndj9dDfsnC507eo76P4KL2mvNpEUeE70PJc7eoFWrsxVaEJAJ8QaFFTBx7k VX/X+XRzV2c/nYohmGh5mw74hy9/wSvy89YMEQ== 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, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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: Damien Hedde , Andrew Jones , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , qemu-trivial@nongnu.org, Laurent Vivier , Yanan Wang Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yanan Wang In qemu-option.hx, there is "-smp [[cpus=]n][,maxcpus=cpus]..." in the DEF part, and "-smp [[cpus=]n][,maxcpus=maxcpus]..." in the RST part. Obviously the later is right, let's fix the previous one. Signed-off-by: Yanan Wang Reviewed-by: Damien Hedde Reviewed-by: Daniel P. Berrangé Reviewed-by: Andrew Jones Message-Id: <20210928121134.21064-2-wangyanan55@huawei.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 4f2dc91e0b27..bba1ef973fec 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -206,7 +206,7 @@ SRST ERST DEF("smp", HAS_ARG, QEMU_OPTION_smp, - "-smp [[cpus=]n][,maxcpus=cpus][,sockets=sockets][,dies=dies][,cores=cores][,threads=threads]\n" + "-smp [[cpus=]n][,maxcpus=maxcpus][,sockets=sockets][,dies=dies][,cores=cores][,threads=threads]\n" " set the number of CPUs to 'n' [default=1]\n" " maxcpus= maximum number of total CPUs, including\n" " offline CPUs for hotplug, etc\n" From patchwork Mon Oct 4 08:30: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: 1535987 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 4HNDpB2qt0z9t25 for ; Mon, 4 Oct 2021 19:46:10 +1100 (AEDT) Received: from localhost ([::1]:46372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mXJbs-0004qc-5N for incoming@patchwork.ozlabs.org; Mon, 04 Oct 2021 04:46:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXJNP-0000y3-Oj; Mon, 04 Oct 2021 04:31:11 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:57977) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXJNN-0003Sz-VX; Mon, 04 Oct 2021 04:31:11 -0400 Received: from quad ([82.142.3.114]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N8n8I-1mtk1N2rLS-015pRt; Mon, 04 Oct 2021 10:30:59 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 3/5] qemu-options: Add missing "sockets=2, maxcpus=2" to CLI "-smp 2" Date: Mon, 4 Oct 2021 10:30:53 +0200 Message-Id: <20211004083055.3288583-4-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211004083055.3288583-1-laurent@vivier.eu> References: <20211004083055.3288583-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:+znkSTmwQK7jrUENj3wTiCxx+HnY6rkxtDVH2yuFsyrGiTlxdTL JogxXdvf2SUwG2q6H9oNMi7KlBfj9eRvsOnuLvXxTxuOYMlELcPpuBaBttsEjFTf1mmLGoI bmw7ke5swDN6mSNvAQQLECzgAbfzhQUqZWehhw3ZGOmjWVUJdRHRpj3F68u2OCpW/VRmK68 4My20gLsAB1NOCc9IxW3Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:XVfK7VzuVrY=:B0FDukSSKCIDQCJHw6m/IO 3QODWu9UOFKVkteg0MxFWTG7yTngU+krxYIR6Oi7ypLqhTLq4mM8zNZOoxPT7ulyjPeiANBNV n3rBwXMkCwxKmIPZybST6zR4Fp9K87mMvk3ML5NY43TuWXZXyQT5YrluRi0ZOkO9DUH7h8s/y EkUDNuvAk+sBZvYlQ6NtsbHzhLbNMklQwKT5I/JFfPtVpgB9nxcb9PUKKgA5zlVcPQ0VePgsZ h6ndHF+JssgGs5cUfjm9//bXe8y3UnMWJmc/Ggpn9CYzII+PbOJEDLrvzqszN0o6eHZ1Z+D52 im9gy3j3QUA9i/n9mVHA0YZaNkv3/oJtJSpZ+0j3XznokmpJ62vIiJJ2mdY3bNCURXBYFXwiL fvhS7S62DyeEbqIbIXV2Fj4CqZcijq8eznJd29zqkmpEmX4AIgWydCA3vKgpYlYcJoUWMgxdo fJI0t701ciuKR+yPPou4WkzBXT7qpq1OHLtUB2qTYijwL0cnR7ag4PWotOjKDqEwuwBM/9NnY k+Df5IwxP9QaNC6ynzU0nKfv5xibyL41fgeFmoom5w3oQky0DVlqJSabCLUmj/UUWdWWJr5Aw nBHIKgKfGMBsiLSfwKHozscBEwk/rleSW1rijezybwoRTkQ7TkoLE80YWhlhfBG9uuyVIeLHH 8xls08xXuSnRMVzu25We0hQ+HYnMR01Rc0ZqMcN9DHt6noz8fFlconHZ6cXz08CY7Z5yZb3oE od3+/lD+k90F3KiLpYJozuj3kyYXJP7F4H+cdg== Received-SPF: none client-ip=212.227.126.131; 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: Andrew Jones , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , qemu-trivial@nongnu.org, Laurent Vivier , Yanan Wang , Philippe Mathieu-Daude Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Yanan Wang There is one numa config example in qemu-options.hx currently using "-smp 2" and assuming that there will be 2 sockets and 2 cpus totally. However now the actual calculation logic of missing sockets and cores is not immutable and is considered liable to change. Although we will get maxcpus=2 finally based on current parser, it's always stable to specify it explicitly. So "-smp 2,sockets=2,maxcpus=2" will be optimal when we expect multiple sockets and 2 cpus totally. Signed-off-by: Yanan Wang Reviewed-by: Philippe Mathieu-Daude Reviewed-by: Daniel P. Berrangé Reviewed-by: Andrew Jones Message-Id: <20210928121134.21064-3-wangyanan55@huawei.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 bba1ef973fec..5f375bbfa666 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -401,7 +401,7 @@ SRST -m 2G \ -object memory-backend-ram,size=1G,id=m0 \ -object memory-backend-ram,size=1G,id=m1 \ - -smp 2 \ + -smp 2,sockets=2,maxcpus=2 \ -numa node,nodeid=0,memdev=m0 \ -numa node,nodeid=1,memdev=m1,initiator=0 \ -numa cpu,node-id=0,socket-id=0 \ From patchwork Mon Oct 4 08:30: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: 1536020 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 4HNFPb0Pwmz9sX3 for ; Mon, 4 Oct 2021 20:13:23 +1100 (AEDT) Received: from localhost ([::1]:54716 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mXK2C-00080t-Rx for incoming@patchwork.ozlabs.org; Mon, 04 Oct 2021 05:13:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52332) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXJNL-0000kz-Qd; Mon, 04 Oct 2021 04:31:07 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:51613) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXJNJ-0003PL-Rc; Mon, 04 Oct 2021 04:31:07 -0400 Received: from quad ([82.142.3.114]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MidPj-1n2mRf24Ix-00fjqG; Mon, 04 Oct 2021 10:31:00 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 4/5] target/sh4: Use lookup_symbol in sh4_tr_disas_log Date: Mon, 4 Oct 2021 10:30:54 +0200 Message-Id: <20211004083055.3288583-5-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211004083055.3288583-1-laurent@vivier.eu> References: <20211004083055.3288583-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:4uI2WHJk9zyqMIbJrZ9W7KItDwGSsCuYd+MssQ7tlhIWre6M5AV FxGokRYjXOUJN8IkIp/ubMvF/qTtcyH/HkcNauBoLSpAXR6VpCB5WmVQykDawu1Cg+amK6B gEAWYIN3nbtZ3A3bcj2vurkcag/6lI9ZEed6IgWQW6YXI3ALbAd5q/dPLpfdeSTlIEfDgyU OSBI6P/blIaN8IyAX/Lew== X-UI-Out-Filterresults: notjunk:1;V03:K0:wJoxhJ4bvkU=:NxIgQnvRuxUVZq94gkj/3R 1s0uyMuwgdup0L2dl7CuE3UQZeKvfNkF4r9Srp4zkrd/uDPpweRuF5ctzZjHjMCUyn/wDVRw2 RNZI6Ad+XAa9uB+6fUYfttfe79WmG6014RCGThZ57vMsSXn6M0YSGM0gy9CMxBhgM9ykc7dRE 5cnwRCcDnU+RJnrZNWZFcMKGI78CaTDKoolChrGGDxFN4kghT6F1/CbceCjMUr5o4U9HjP4pU 4QnOiSnbUtqRn9xhnLH9eN+eb5WKMvpWJeS/2I8fIupFIeeFwMZjquIUdKmQlfs11saBngvXD aSarjtRPKEd/clzYyvvnR8YX+DqukgEFlA0R0J6ycEILRPDk+84dplcqHDeFcS5HCXi823a3B jO/smKItspJpnke5d4gi+iZ60HNErc430HTqIGhrcxvD+FPvlJfrRNNrYhTNF+7L6dVDH5CEs m0CaoqZxKPN/naxkzgmhWpG4FnwkoujZ8nHvHJr2VBryAQp3UoWvqqIkRErwFznHufEUfJl1q tUOy1mVAumCFmhle67kFGDncoeCmTHA+lIPQdhEAPz0ThaNCjaDqvuiwK8hnCx/rB1wZ/4Hpb UV5o9I4ULsYph5R7F8jxdkrPJFaiQkTd1Vp2SFSnUMgKFSHlZ52F1YOPj0/YB9Stoc/pqxtpu nCsEUipIo3qQZvT5UZtU/5OmsqeseTvqkK9xjvdE/Z5gIFxqhkFChIH8Tg4GJUgeasLEuF9BB 3+UI03p46bDeaJjuKobxGoJcP6WzfuOmQHP4Vw== Received-SPF: none client-ip=212.227.126.130; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: 0 X-Spam_score: -0.0 X-Spam_bar: / X-Spam_report: (-0.0 / 5.0 requ) RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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 , =?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: Richard Henderson The correct thing to do has been present but commented out since the initial commit of the sh4 translator. Fixes: fdf9b3e831e Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210929130316.121330-1-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- target/sh4/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/sh4/translate.c b/target/sh4/translate.c index cf5fe9243d6c..d36305027240 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -2344,7 +2344,7 @@ static void sh4_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs) static void sh4_tr_disas_log(const DisasContextBase *dcbase, CPUState *cs) { - qemu_log("IN:\n"); /* , lookup_symbol(dcbase->pc_first)); */ + qemu_log("IN: %s\n", lookup_symbol(dcbase->pc_first)); log_target_disas(cs, dcbase->pc_first, dcbase->tb->size); } From patchwork Mon Oct 4 08:30: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: 1535990 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 4HNDtB2TV2z9sP7 for ; Mon, 4 Oct 2021 19:49:36 +1100 (AEDT) Received: from localhost ([::1]:55440 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mXJfB-0002ma-FI for incoming@patchwork.ozlabs.org; Mon, 04 Oct 2021 04:49:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52366) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXJNQ-0000zz-7a; Mon, 04 Oct 2021 04:31:12 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:55057) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mXJNO-0003T6-F8; Mon, 04 Oct 2021 04:31:11 -0400 Received: from quad ([82.142.3.114]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MP2zs-1mAGBV14Dk-00PIch; Mon, 04 Oct 2021 10:31:01 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 5/5] hw/remote/proxy: Categorize Wireless devices as 'Network' ones Date: Mon, 4 Oct 2021 10:30:55 +0200 Message-Id: <20211004083055.3288583-6-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211004083055.3288583-1-laurent@vivier.eu> References: <20211004083055.3288583-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:ijj8Jguyg4AO06sBIh6TEiMLxTsX3qu1gUgUmyVRsRntAWq3wf+ 2cJ4rly7J2y9brIHA1cg9545GvX6CLV8/DGR2ho9wL6f3YzBJO/oxLgKWtv9qiiqc4ev2aj PLIHFbSyNLSk9Z5heTsm3f73rYz0Nu2R1p4Rgnab8fsgXR/hZoc2qJPrYIzzq3sMdMN19OR ZEsObnODoI/zFzIjNWMoA== X-UI-Out-Filterresults: notjunk:1;V03:K0:myX44dPtxZc=:xN9SQD+/N6YJD6Qy7+ekal Ga3fuHtfnF+xbExoZb4LbsLmZbvtPa4LMBi5/qAcyNkhJdfxD7dgGx7dmbAB64YdDdWFL4YLz GGXZXI3lCDWBFD7pyr5A8Yalkv3B2sV7+Y4YToIZ7IMleL9tXwkbmO9WfqYKLM/mLspGJND4p y9Vvs/Njwvmo4RePD9POe8dX44EX/E3EyPJCAe7Qyt2HXn8dWYiWVZZxZwnRVu0iam4QSvzma xlGkPeVb/Eq9AsLZH/R7aPsUj5+oIdbYXW522iB8YVdfusro97S7cH9FlaW1JMFhuGjWqKYI7 rPIfnZGQewtVrAux4vud1YCg7gQHlMA/aqn2JLIJc4JsyjhvSkE+1jPXgCIHfopx0/VDX7Gkm hiulpWZAxUbZi9U/wwS4k2ikZNsLQu/+aZn6JAJaaJuUEdZzmnpoNEBrvlzVrJFhB2K6wxVEj xXwK7a82JTckvATbDhQDdI2Ak9TJDEPvKCKQGloVNJXHmk8vHMqCirEzL6ccz2qrxQ+reoneP ijxEyxudnqmN0fCpZP71BJvg2egwTmd3r6+pSlLYdeQC0ZYe13H9Cq4KgqaFLlpqV6gj98w75 8WAjuyejlGh39Jl5NCwD15HUC/x4WRrCOEwCXpvUdA7teuguG8fTu/hbjoKFU9WxTF9WbiZNe HKPXQ2CXtFlYiUaKTcwm7oE35q4Yc/V3W2VXB47gFe5CFur5Cb3F/vBUXUMcflvwkHDJUUCga lrzaWi93kqen+fbKxt+OwR5zQ85wcoqxME2AHQ== Received-SPF: none client-ip=212.227.126.135; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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, Jagannathan Raman , =?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é QEMU doesn't distinct network devices per link layer (Ethernet, Wi-Fi, CAN, ...). Categorize PCI Wireless cards as Network devices. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Jagannathan Raman Message-Id: <20210926201926.1690896-1-f4bug@amsat.org> Signed-off-by: Laurent Vivier --- hw/remote/proxy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c index 499f540c947d..bad164299dd4 100644 --- a/hw/remote/proxy.c +++ b/hw/remote/proxy.c @@ -324,6 +324,7 @@ static void probe_pci_info(PCIDevice *dev, Error **errp) set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); break; case PCI_BASE_CLASS_NETWORK: + case PCI_BASE_CLASS_WIRELESS: set_bit(DEVICE_CATEGORY_NETWORK, dc->categories); break; case PCI_BASE_CLASS_INPUT: