From patchwork Tue Nov 12 10:04:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11238979 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4E6A115AB for ; Tue, 12 Nov 2019 10:07:16 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2F29621783 for ; Tue, 12 Nov 2019 10:07:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2F29621783 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:32776 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUT4s-0004tH-ST for patchwork-qemu-devel@patchwork.kernel.org; Tue, 12 Nov 2019 05:07:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53478) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUT3h-0003Sj-I4 for qemu-devel@nongnu.org; Tue, 12 Nov 2019 05:06:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iUT3g-0002us-Ff for qemu-devel@nongnu.org; Tue, 12 Nov 2019 05:06:01 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:42235) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iUT3e-0002tt-5d; Tue, 12 Nov 2019 05:05:58 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1M4aEC-1iV1Ge40TW-001ecg; Tue, 12 Nov 2019 11:04:35 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 1/5] Makefile: install bios-microvm like other binary blobs Date: Tue, 12 Nov 2019 11:04:25 +0100 Message-Id: <20191112100429.11957-2-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191112100429.11957-1-laurent@vivier.eu> References: <20191112100429.11957-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:wQcXvqEXPICCirYZlSZvjkx3LuTDZcRc7s3EElSKSd+fTn7WzjT tUJ9zljPWfz5aMWi3rs+SoDAmdCC/bZQ4x/SpUhhX77RNGYG+PCzYF9ZnnHixvcKUwzaMwE 5d0cdrYbzoE7lIKbYcr571PYuFyokWRATEBcXNSP7ufz0mMvNzO2EZb8XSyl9NqMgOTP6/9 69+Rh4blqz60h5hYjpyTw== X-UI-Out-Filterresults: notjunk:1;V03:K0:FGgFTlr4xOU=:wDyAspUSsh4YfTI6HTFB9R VNYU9RD9vF8qMTNjSx9XJOsLQKVM4IzAN/bW1Vfl2JBdynV+POi4z4FMRvYLboRkPZ/pvcnvB h3or7UMQtFSImsQ72GuW5nN/WkRWfsUDEePcXpqRdXh+2eh/JxQLCLNyOJAgKPscIGOLoPjMy KgG6GcYZhy5sHZNpwJeJJnepDlMZCTBqfgL3geTaAX5yCh/S89Gb9TSxpKmHEn8doWRlTEm6n ve+lEI7WR+gYtzEkF1yWa1rt3xOr68TBJFRF26w4L6oIPOvpN0+QZrWIdZ0/nCLOwl0/NEUfQ imosS59MLihzFYg71GbYD96x+ePViPlalP1ztBcUAzEW3mgaSgEjX+cIU6tLHnbsbsDPtmaqZ Zj6xF2S5EUfpKdl7VPG4C3VtQK4p1tNIx5FQHad6cT/QUPnhgrD9kAory8TfmvMymKB2OtAE0 Wncnr36ZpGMyntxii9i8ItUseyuYhfZck5tCR60TQnZlEtG1k08yt8rKgbZlCnwJtjovj37OY QFz3Ha6rEnq2gmIKRN3oOa4KjfQweDA4wUjoTl3ULeUdFpIeowu/chnoE2nqk+7JXYgj4wWVL bJQh4z3lgjdm5tXiDibVooBZBl5vzKknp1+UMA5Y+VaGrsZ73B0nvoMa2XvTgcApjLcPEBPoH y+GzFKb3qFy3KfBiV7FYzMyLyxDgOqOmDBtIgGOU9HsR2ijCyy8HDnAse/dI3cQG8qJCZOoho uvSOumj+jyfJsltD6+8BR8kYuc9bSSeMFxQM7s6IFOOEVSGsACzd67HuAN9eryjuLSgyNUGuf HMZEWJPPeTRdX6QCp7nYUsaf4GFI9gKKJLvHWMTGI64wRirobcKvAB8iANNRZ8fnP0Yu1n1ke UD4bsp88Lkb8N4gD9pguj1SZDQCI+j6TZRAgsY0vo= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.10 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: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Sergio Lopez , qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , Bruce Rogers , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefano Garzarella Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Bruce Rogers Commit 0d5fae3e52e introduced bios-microvm.bin but forgot to add it to the list of blobs being installed. Add it to the list of BLOBS that get installed. Fixes: 0d5fae3e52e "roms: add microvm-bios (qboot) as binary" Signed-off-by: Bruce Rogers [PMD: Reworded description] Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Stefano Garzarella Reviewed-by: Sergio Lopez Message-Id: <20191102114346.6445-1-philmd@redhat.com> Signed-off-by: Laurent Vivier --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index aa9d1a42aa91..a8998fe5cf79 100644 --- a/Makefile +++ b/Makefile @@ -771,7 +771,7 @@ de-ch es fo fr-ca hu ja mk pt sl tr \ bepo cz ifdef INSTALL_BLOBS -BLOBS=bios.bin bios-256k.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \ +BLOBS=bios.bin bios-256k.bin bios-microvm.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \ vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin vgabios-virtio.bin \ vgabios-ramfb.bin vgabios-bochs-display.bin vgabios-ati.bin \ ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin QEMU,cgthree.bin \ From patchwork Tue Nov 12 10:04:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11238981 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 35D4015AB for ; Tue, 12 Nov 2019 10:08:09 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 162A821783 for ; Tue, 12 Nov 2019 10:08:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 162A821783 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:32826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUT5k-0006HI-5j for patchwork-qemu-devel@patchwork.kernel.org; Tue, 12 Nov 2019 05:08:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53170) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUT2h-00028d-RZ for qemu-devel@nongnu.org; Tue, 12 Nov 2019 05:05:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iUT2c-0002OU-TL for qemu-devel@nongnu.org; Tue, 12 Nov 2019 05:04:59 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:43395) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iUT2T-0002JA-VE; Tue, 12 Nov 2019 05:04:47 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MxVbb-1hg6Kw39aL-00xuCv; Tue, 12 Nov 2019 11:04:35 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 2/5] qom: Fix error message in object_class_property_add() Date: Tue, 12 Nov 2019 11:04:26 +0100 Message-Id: <20191112100429.11957-3-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191112100429.11957-1-laurent@vivier.eu> References: <20191112100429.11957-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:hX1f7s63XHJxMWSr5PchMTIHafeabkAwtI4hoBiSZ5QXMyKtAer X2UKJqRWIo6NXVLXwz/h8uweUuWlWu33WSp1rUDSFn8ijibTl0lFCnAfCJs8N8tqSpJ8eWy NkEb0TWaz8ATXYNLm+D11KKn7PJRmcETbyNpN6It4xJC3xDA/fQ+cWbW81CBLRQJhixS+K8 g532jwT1jCvo+odXhVbWA== X-UI-Out-Filterresults: notjunk:1;V03:K0:64ac703U+FM=:2YlQaI0vSx53LtyOdP59kL haq7UVuVseDBBO36Rqv3mqiLyV31y/5VWewA0z++vBGRD80XYYnrbr+vL8zyHxGr122NmjvQf hDDTLf/e6SO6ylLUSdGw8ngkjvVVFpi1123DltrTc0MpNojfECNz0V7DXf2U/OB+tyWPPEM2g WbIBUQH1YQTC1ruOnDgzDmitqn8/ut+LmU1bCf+6a3B+GiqgfdQY4JuotcvDduTGceF5KSUfC l2sfSKQhmptvZXcPOLl4tEXd66yVvRaZ9BjFkzqvkGfT5vkUhIGQTEPXMT2zE/xERwZoYtY5u 4pd+Epox79AxTqDprTcwpM4b2IksOjfGBjGj5T3fZ8tdapWAeO03VCFY0UpGyLQtdCqKV9upe JRbcCU3ef7kfHjTuvnSuN11GOCmy4xjca09rKc8ywXwRgAVgW8K4WsxMmEYsci15EFXPg2awG vnoLppBo7PyehOnGR47IVgzZ6lgc1dE/UUfpUPzkPJLcdrytotr/fY/4RGPtyB3DK42Kpzamu 5RoAY28vUmryHjxsJvNoJvXjiGj9MWafqwqSsqQxjT0HerDUq7CJSTmR+T7Fdp190Fk65rz4u zXLiREeQB8tQPtwUahMAeVf2Ee95zHFQgQ/MmAbexBdcGsth+UlucbwRBZUHVS+kafV+79l1J uBZLkdUBSlPQBUNC2q88fnzKe77Yv3xJ111rpLd1iCjEs2ojLd9jbNeeyNcqQPFXdKPTT+zNL G3P5jGdiLOlOK6mhcA9RTAzcD4jy3v3B2T77BGNic50fMPYKHV/sBpcdp0NNNRl3nZSWVD1v2 tFkv3NHJJml6ZcD3LxxmWYWcXsC1cCwp6FSKm72+H4PKgmiCzzTtIlNrREdV/oagzWF5ZMUTA OrtNXN6vxRmu3/ob1uNQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.24 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: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , Greg Kurz , Paolo Bonzini Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Greg Kurz The error message in object_class_property_add() was copied from object_property_add() in commit 16bf7f522a2ff. Clarify that it is about a class, not an object. While here, have the format string in both functions to fit in a single line for better grep-ability, despite the checkpatch warning. Signed-off-by: Greg Kurz Reviewed-by: Laurent Vivier Message-Id: <157287383591.234942.311840593519058490.stgit@bahia.tlslab.ibm.com> Signed-off-by: Laurent Vivier --- qom/object.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/qom/object.c b/qom/object.c index 6fa9c619fac4..d51b57fba11e 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1106,9 +1106,8 @@ object_property_add(Object *obj, const char *name, const char *type, } if (object_property_find(obj, name, NULL) != NULL) { - error_setg(errp, "attempt to add duplicate property '%s'" - " to object (type '%s')", name, - object_get_typename(obj)); + error_setg(errp, "attempt to add duplicate property '%s' to object (type '%s')", + name, object_get_typename(obj)); return NULL; } @@ -1139,9 +1138,8 @@ object_class_property_add(ObjectClass *klass, ObjectProperty *prop; if (object_class_property_find(klass, name, NULL) != NULL) { - error_setg(errp, "attempt to add duplicate property '%s'" - " to object (type '%s')", name, - object_class_get_name(klass)); + error_setg(errp, "attempt to add duplicate property '%s' to class (type '%s')", + name, object_class_get_name(klass)); return NULL; } From patchwork Tue Nov 12 10:04:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11238975 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6199815AB for ; Tue, 12 Nov 2019 10:06:04 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 40E3C21783 for ; Tue, 12 Nov 2019 10:06:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 40E3C21783 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:60996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUT3j-0003TY-7n for patchwork-qemu-devel@patchwork.kernel.org; Tue, 12 Nov 2019 05:06:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53120) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUT2b-0001xA-3z for qemu-devel@nongnu.org; Tue, 12 Nov 2019 05:04:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iUT2Z-0002N3-T5 for qemu-devel@nongnu.org; Tue, 12 Nov 2019 05:04:53 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:39405) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iUT2T-0002Jc-Tv; Tue, 12 Nov 2019 05:04:47 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N94qX-1hrg712Gut-016BOh; Tue, 12 Nov 2019 11:04:36 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 3/5] numa: Add missing \n to error message Date: Tue, 12 Nov 2019 11:04:27 +0100 Message-Id: <20191112100429.11957-4-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191112100429.11957-1-laurent@vivier.eu> References: <20191112100429.11957-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:1vcYrg0+LvVV941g910cFpeztGR7BbLAIO4J2uy2+wndIDdXaqX QQrjHxwlfvMTyxg5ZHj7I6FD8ugA72K1CyyF3hdKSNfJvri6dhS0lWF42+ECl2VvoDnBaEU 858sIynsaHEflh3H8tkIP/UBhFDJFsMUb8l9Np3rUAZ59VmfVMwQDzlxT+GdbklddAW+GHQ 0SdzzT/ZHB4EmowG/MDcQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:RSABOG9S6a4=:a++67xUUz3yi+zUuQ4SHMl 5A9bYM1q3ecd02KSjezcnWNuNWs995RQcYwi7nhXafur6+Bl0OkpuM41yLSpey4VOthrKR1eO TlRe7oYjLjAMh3kcdHtZACpp5guZt4OFhJm03HXhXpnWjIINR2FzxLdproVH2pq1POFbQjbbX DLQw8QVE35bFb+XPQzHWOXm5uAUpZmKzZaSvpllxABSU7PUoZ/SC6pBUeDnKbCnro1gNMUrPe mj7LmAUxOcq9f9Xgwck2JJ7n7lP/0mtzBJsklYOi3V4kAxrHrBZCn+Q699Ctj1XYOUySUHF8q jrGMqzm8Kg7o/ds/3xJNQEyphgwfYf5bGPzHPqZJh5xtouUQrO3Z6P8gvtJ9DLQwlzDKBkOXr dvcxOT+Ukz7tWjQt8MtWj16ffMXggfKLVWPI79SmL4nJI7dLe1Eg5VO96C6n3zhY8iciDgNMA /vurNAi4++vWlQwsuJguV1rJMIG+KdGZHZL9L/Lf/a0CoAzDG00N+jUryaIdKqacjwbKJiqMc HWmy2EsQ3efU2TKgnYzMxv63OmXJo3MVYHVfoBx0IfKl0klAnqotpoaEdZWLuEja38kwZ2Tef s+OkGNCGUb2BXyJ51qXs2XMYXvtS30KGaZiZwf5ZE1b4aL4NTw/bK+5NYscouaeVNJELjjcIj YjGd3vSM+RWHcPwurSVNHo723tpMpLb0yO1Zcw+d/uVn1tJbf7R45S9f54XzLQfDGkch0cEhb wvWUH/B5zVtKrvLAg0cBCGiG4MmOllUpisTBJ/cqecK2SVnv8gnWTEg/8o7C3CkOFQvL/1bmU 5yuds2xffULaULGc69vW8tk7vm/f5RJ0808OolE41Mp4gXwgRtnj+LDuGDsTTXaIn8Goe3GWF Pyk3kqXJcdc9HXmkXORaGFdKP9iOk3fJt0qt6vtGc= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.75 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: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , Greg Kurz , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Greg Kurz If memory allocation fails when using -mem-path, QEMU is supposed to print out a message to indicate that fallback to anonymous RAM is deprecated. This is done with error_printf() which does output buffering. As a consequence, the message is only printed at the next flush, eg. when quiting QEMU, and it also lacks a trailing newline: qemu-system-ppc64: unable to map backing store for guest RAM: Cannot allocate memory qemu-system-ppc64: warning: falling back to regular RAM allocation QEMU 4.1.50 monitor - type 'help' for more information (qemu) q This is deprecated. Make sure that -mem-path specified path has sufficient resources to allocate -m specified RAM amountgreg@boss02:~/Work/qemu/qemu-spapr$ Add the missing \n to fix both issues. Fixes: cb79224b7e4b "deprecate -mem-path fallback to anonymous RAM" Signed-off-by: Greg Kurz Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Message-Id: <157304440026.351774.14607704217028190097.stgit@bahia.lan> Signed-off-by: Laurent Vivier --- hw/core/numa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/core/numa.c b/hw/core/numa.c index 038c96d4abc6..e3332a984f7c 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -503,7 +503,7 @@ static void allocate_system_memory_nonnuma(MemoryRegion *mr, Object *owner, warn_report("falling back to regular RAM allocation"); error_printf("This is deprecated. Make sure that -mem-path " " specified path has sufficient resources to allocate" - " -m specified RAM amount"); + " -m specified RAM amount\n"); /* Legacy behavior: if allocation failed, fall back to * regular RAM allocation. */ From patchwork Tue Nov 12 10:04:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11238987 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9100C15AB for ; Tue, 12 Nov 2019 10:10:44 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 71DF521783 for ; Tue, 12 Nov 2019 10:10:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 71DF521783 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:32900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUT8E-0001wS-Jb for patchwork-qemu-devel@patchwork.kernel.org; Tue, 12 Nov 2019 05:10:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53747) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUT4s-0004uT-Mg for qemu-devel@nongnu.org; Tue, 12 Nov 2019 05:07:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iUT4r-0003Gv-Ix for qemu-devel@nongnu.org; Tue, 12 Nov 2019 05:07:14 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:49925) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iUT4p-0003Fk-6M; Tue, 12 Nov 2019 05:07:11 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MnIxu-1i54Mr1TPg-00jH64; Tue, 12 Nov 2019 11:04:37 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 4/5] ivshmem-server: Clean up shmem on shutdown Date: Tue, 12 Nov 2019 11:04:28 +0100 Message-Id: <20191112100429.11957-5-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191112100429.11957-1-laurent@vivier.eu> References: <20191112100429.11957-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:yLDYQSxCQhgDFCTR/0qu35xiPvOF8VZbC2a+Ebcv0epbuMBNkmx CP1zi4n5zQjav7AqnIWomZZz/quxwTZKg0/+qD2wWDu/u9pGpZ2iAUvUB0/43juXi39RWqX SDrm04iLaFFDF7n6vOA6zB/sGi+XuoEXdXZPsZgA74bx3vyYWIBOxXu7kIONW+FI444zeTj j0M7ggTQpem9C8IU1Yngw== X-UI-Out-Filterresults: notjunk:1;V03:K0:Q0vKXxH5xSE=:dJQhLkVNwmWdEel8iZ9YYr JEfpHyETccKomt3HrInEOi7QBk5ZB9mn5bYlI3eQSZk6q5Je8q3kVlDNdDgbP+uY3Ik0TlOFD GC6UQoDMt0uyqqhKZyspZS4rCnURVlVP3Wz8Mgk5VycU2QoZUpDLOmwOP6X6gi93Fxrk1YTTI gaNdOG9KtJ04OqKU0KfeitYXzIysUyOa4qlrty3wWgTADpy5gZ0SQ11DvRNbtcoXC0ruE/HJ0 8qQRV/R1q8QMNNG1CMRCBq88Nkaz5DgAK9L5lR/aK3TSCAaC6IjqUrsazMo1pI0ub+A/LF9nE ExZf7sYfAmUfqCQOXCj6UGRNNPbiii2+0s93V3rDV5X1PFRCGjtkVOz04G15AC5749RnhC1RM ywY7VCykZlwBO7BCmYUnSWa1YLvSL/l6IGZDC5UGBKkQbX4pO5TRbS92ppunkWgVFVvIUi2Op emiVWWP4f/kMr0pl5CuM36a6h8IzR5FHnuYf1rWCM3bR9NWtUi7iW5pBd6vdLj+v8NUBv7ojE GpxZYrODM3zKzL+I5AG6PBN2xA1UDZ2GC9cbFTaNjlm8B7i4ejY4T65hqXBSmUl/AlN76TW/J +URqP/41GhWjiDkKMRy0qvCf9hBmUnUmDadSoGh+c2roRN3JkGB5E01PpoH1TLfaVDHI1ct90 6iKgxSc3xDQa9G494ly+b9nSZuEpH700UXyBn7d4DR/TE6enVCKM2K61DZqgjZXkU7biYPhDF +gtetCICcapJl7rkAWaV5we9NqzbGXcs9Jxmr4iiTKX7Yd0alYU9EZTqFeQTzaJHjxlcJoxqC mPXJSlURWeSDjTKbj1HgcCZ9NO54hsz8jYf4YODPa72kiw88hUay9qY6EJczBFMvbqCmOfR3a /MZ/h3sTb11BWBTsP12g== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.10 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: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , qemu-trivial@nongnu.org, Jan Kiszka , Michael Tokarev , Laurent Vivier , Claudio Fontana , Paolo Bonzini Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Jan Kiszka So far, the server leaves the posix shared memory object behind when terminating, requiring the user to explicitly remove it in order to start a new instance. Signed-off-by: Jan Kiszka Reviewed-by: Claudio Fontana Message-Id: Signed-off-by: Laurent Vivier --- contrib/ivshmem-server/ivshmem-server.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contrib/ivshmem-server/ivshmem-server.c b/contrib/ivshmem-server/ivshmem-server.c index 77f97b209cb9..88daee812d65 100644 --- a/contrib/ivshmem-server/ivshmem-server.c +++ b/contrib/ivshmem-server/ivshmem-server.c @@ -353,6 +353,9 @@ ivshmem_server_start(IvshmemServer *server) err_close_sock: close(sock_fd); err_close_shm: + if (server->use_shm_open) { + shm_unlink(server->shm_path); + } close(shm_fd); return -1; } @@ -370,6 +373,9 @@ ivshmem_server_close(IvshmemServer *server) } unlink(server->unix_sock_path); + if (server->use_shm_open) { + shm_unlink(server->shm_path); + } close(server->sock_fd); close(server->shm_fd); server->sock_fd = -1; From patchwork Tue Nov 12 10:04:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11238985 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D1AA214E5 for ; Tue, 12 Nov 2019 10:08:49 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6E8AA21783 for ; Tue, 12 Nov 2019 10:08:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6E8AA21783 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:32842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUT6N-0007NU-Gj for patchwork-qemu-devel@patchwork.kernel.org; Tue, 12 Nov 2019 05:08:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53715) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUT4n-0004lp-IW for qemu-devel@nongnu.org; Tue, 12 Nov 2019 05:07:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iUT4m-0003FE-Ig for qemu-devel@nongnu.org; Tue, 12 Nov 2019 05:07:09 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:48959) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iUT4g-0003DP-By; Tue, 12 Nov 2019 05:07:02 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MILru-1iip1u0vUC-00EMBo; Tue, 12 Nov 2019 11:04:38 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 5/5] ivshmem-server: Terminate also on SIGINT Date: Tue, 12 Nov 2019 11:04:29 +0100 Message-Id: <20191112100429.11957-6-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191112100429.11957-1-laurent@vivier.eu> References: <20191112100429.11957-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:lCdy1/ah0HDEBjmlm8KfY2Kri3NDqzdrhbdMmkirTMD8Q241Yy+ kOMsT65UfB/3jxREvRcwDw7V4uLVkqBaXGhxLk9V471bqaFEzwl8gMsgDz2p9/2QN4Xj34O Oq5T4xpd13/C+CsAGdYIPamYPPd7/uEdn9JKIKasJ7XT3w7CbEvL9+Wg6vSncFb9bhGXz4X yVsio5+nEL+cgE4SdJ6pg== X-UI-Out-Filterresults: notjunk:1;V03:K0:nT1R0aW2zw0=:O4k4rXb9MR9LTPv9YHBj4s b4x5FJmGzhdxoUZiZZDrP7+gyKr88c3Ig01yAtSBXdqXcgQlukE+/UoW4mHQQ3Y7UjWgLfJvQ UsFk6wYYpuWTg/71cV68IVzTSFSAtQj8667WL2XzgQ8CJ1LtQaoFlzSI72i8MmthitoOXAUzd XMKOgt72E0Nq6xo2wOYMJfCRuqbId03vDxjyNcI+KT+bVvmS4mtqYYST0g1iMvZG/M+UT2zVQ 6UFtvfIoeVnYRh4u62KhHo3lgWLqYybbWgtDp0n1T1gbb7tlnXgbgH5Pa0gvChvGv07cqXdNC x0ahzoDwiueTt2hUpl6wH031/YiSAK5Xor03kBah1NyHrwx4sO06HnhQWWZj7GNKlOGAozQta rPkQ5foSAikwhUsf9ButLiKYMOYEJJfQP5RXwmoP0CjIvjPxJdecULMmBFiHeEAuVWGE+83km gBQPsIfuVEv1v9B32tXmeiLtFADfpTRM1cnNgIuDNwX+YIK2RatG4OQO4d8kGhppSqnrs8T0O hY5xijT90G4D0cqR07lnVGP/cqjsCV9vssEaRZ0I0YNWopaUSdIDZ4yQleKyv6I2Jo3PzGfji ADw7e8si9ehBJfxkvdA6mXXIBHwcl1qzcT84yrHxB4JUCxnIwDx+wko+nfwbjGzE9T2vBTUHl xoqozdn91LoSvFCc5bAUJP6xX2Yf7mlPYmRbZqmoXwDLbHmbpw9mUfMNsA+SXlwcl/cisM2cJ Dzoju9spqmcPE/RlA7bXBVE0CuMgGzkcAMQH7qM9bFDKSBEOp3U7oJlkgsci3nFmwgiYUw8Kx ssE9N1bAGZeVTx0pzsp1gBX8hUK1ZaY5OPDTEra4N5Z90kzvG02nNBchJeNjXEUIPxUZPfgOa ooKQAZzZSmpeeP1cjh8A== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.75 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: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , qemu-trivial@nongnu.org, Jan Kiszka , Michael Tokarev , Laurent Vivier , Claudio Fontana , Paolo Bonzini , Stefano Garzarella Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Jan Kiszka Allows to shutdown a foreground session via ctrl-c. Signed-off-by: Jan Kiszka Reviewed-by: Claudio Fontana Reviewed-by: Stefano Garzarella Message-Id: <99c1a7bd-1876-66a2-4b8e-d5bc86116fe7@web.de> Signed-off-by: Laurent Vivier --- contrib/ivshmem-server/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/ivshmem-server/main.c b/contrib/ivshmem-server/main.c index 197c79c57ec2..e4cd35f74c61 100644 --- a/contrib/ivshmem-server/main.c +++ b/contrib/ivshmem-server/main.c @@ -223,8 +223,9 @@ main(int argc, char *argv[]) sa_quit.sa_handler = ivshmem_server_quit_cb; sa_quit.sa_flags = 0; if (sigemptyset(&sa_quit.sa_mask) == -1 || - sigaction(SIGTERM, &sa_quit, 0) == -1) { - perror("failed to add SIGTERM handler; sigaction"); + sigaction(SIGTERM, &sa_quit, 0) == -1 || + sigaction(SIGINT, &sa_quit, 0) == -1) { + perror("failed to add signal handler; sigaction"); goto err; }