From patchwork Thu Sep 19 13:54:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11152507 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 DD7E4195A for ; Thu, 19 Sep 2019 14:04:23 +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 BDB1C20882 for ; Thu, 19 Sep 2019 14:04:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BDB1C20882 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]:44650 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAx2j-0005uO-Q9 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 Sep 2019 10:04:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51590) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAwx0-00078M-JE for qemu-devel@nongnu.org; Thu, 19 Sep 2019 09:58:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAwtc-0003kg-CR for qemu-devel@nongnu.org; Thu, 19 Sep 2019 09:54:57 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:36437) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iAwtc-0003jo-3z; Thu, 19 Sep 2019 09:54:56 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N8nnU-1i75WL0mLW-015sVz; Thu, 19 Sep 2019 15:54:47 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 19 Sep 2019 15:54:36 +0200 Message-Id: <20190919135443.15164-2-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190919135443.15164-1-laurent@vivier.eu> References: <20190919135443.15164-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:LaU9Ntx8Wj5J6fYiZrKRMWlggqOfpZICtTyCp9Nnz0RauefgCEv Ogdyb7Yz7AU5GK6pSjEFruzj2wbVRURwbRTXwfIa1RlW0yOUvlKOtoo+kwjOA9BA6LsCzgr N1IgA90sS4zVNRXNvRGyU/hl43pp2LpdbCt0ITJz1M6RejfgY+cVe47SxoQqAyE6CMaFyyJ Rvdv0JA5GJlymXV2YhADQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:X1vlgRN4UyM=:2e+Dtd8xPf5AY60rjUTU6e /iO1upK5U38VY6htyEEEyUEQlCy4C6uKcd2nQZC2VNUG9Eku4EKu8Gj9kCdYPyU3WMt9KzQxo pq3Bn4lHDLRoYwjGo2WnmiuoTzE3liJALMhR3PdZ74tgnC/55XyRov/eHwAWJLeMzLtsB1gNL 1tIoLF0ksSpc6M42E0XkRUf/hx3sLMC4K1F/nPNPZb65M4QD5r1ndNPltX48diSAMpi2dDtm1 0o7Yijl0z8t1F/qtKqBX/yIXAleais34LEzpM07LsmEdlMQf7B2O3g7kqCkwY5yxFMvSlfo+f sR8iw2ZPOLR88yFl0ZDqeoz98EtLbECXaGHuR2vhTlKyYkMt+vdUI+34Zqb5l/THtjgqk1vqy 0n39uNaJ+mfNibgoknPSpbkzm9onGQo6dlo+82mTa6BjG2a0k8R48vLPc/NlibBsRjf0CMZ5l o5DK8JUWSjyaUt4so6XKbs7jGsfZ/PapzanLyGBtPIJk7cbJ4T9rEQb4KcDsK8RYrQIpk7azz oNEaUTMm0ik1BzemjCuWULtBCuWkyzx4atDDAFzgn0XL17Fe99PvaRhmCCblCP2x7RhpyBPHM L1jYEN7Jg3k1tBzq4V4klAbBixv4DBWUi07CRXnGncKepOiz7gAMWSz9IbfE3arm4q6bveZC1 IJbB1DwPjBSYhwxn3752A6P118pVjU6xuwXnTqGhwzO0Xj7ID7dsFgeES1ntYkw16dOujJmD1 qxWEim23dla9B5EnET89TYand+Zik40uQLQMe0kEVFkSjt4wsmK3NaRMQCHbYj6iGlShg+BnG V6VkBjGgv5QtN7hxBgWAPcUpVlOjTVD4KXc9F7C9/0aQG+7fddEtz6rkL3MADyDRjXZxEO9JQ im4GFMkBCfQIl6wUHenCp/GUEqhUeCnJN6AFQe0KM= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PULL 1/8] vfio: fix a typo 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 , Cornelia Huck , Li Qiang , Laurent Vivier , Chen Zhang , =?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: Chen Zhang Signed-off-by: Chen Zhang Reviewed-by: Li Qiang Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Cornelia Huck Message-Id: <8E5A9C27-C76D-46CF-85B0-79121A00B05F@me.com> Signed-off-by: Laurent Vivier --- hw/vfio/pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index dc3479c374e3..c5e6fe61cb3e 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -44,7 +44,7 @@ #define TYPE_VFIO_PCI "vfio-pci" #define PCI_VFIO(obj) OBJECT_CHECK(VFIOPCIDevice, obj, TYPE_VFIO_PCI) -#define TYPE_VIFO_PCI_NOHOTPLUG "vfio-pci-nohotplug" +#define TYPE_VFIO_PCI_NOHOTPLUG "vfio-pci-nohotplug" static void vfio_disable_interrupts(VFIOPCIDevice *vdev); static void vfio_mmap_set_enabled(VFIOPCIDevice *vdev, bool enabled); @@ -3199,7 +3199,7 @@ static void vfio_pci_nohotplug_dev_class_init(ObjectClass *klass, void *data) } static const TypeInfo vfio_pci_nohotplug_dev_info = { - .name = TYPE_VIFO_PCI_NOHOTPLUG, + .name = TYPE_VFIO_PCI_NOHOTPLUG, .parent = TYPE_VFIO_PCI, .instance_size = sizeof(VFIOPCIDevice), .class_init = vfio_pci_nohotplug_dev_class_init, From patchwork Thu Sep 19 13:54:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11152551 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 D532576 for ; Thu, 19 Sep 2019 14:09:22 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B65E22067B for ; Thu, 19 Sep 2019 14:09:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B65E22067B 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]:44692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAx7Y-0003DB-UA for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 Sep 2019 10:09:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51610) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAwx3-0007Cl-IG for qemu-devel@nongnu.org; Thu, 19 Sep 2019 09:58:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAwtY-0003hV-5e for qemu-devel@nongnu.org; Thu, 19 Sep 2019 09:54:53 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:36933) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iAwtX-0003gq-T1; Thu, 19 Sep 2019 09:54:52 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N0nSN-1hyWoc3a1V-00wq5c; Thu, 19 Sep 2019 15:54:48 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 19 Sep 2019 15:54:37 +0200 Message-Id: <20190919135443.15164-3-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190919135443.15164-1-laurent@vivier.eu> References: <20190919135443.15164-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:xPGho2GRX7EUlkypACv+yhmVOn2fdClQAwJzIDjJjLjjATUqouJ vLla1oVdC0qkTVDvRJKgpSM4TAuSy6/vtIhfQ7WZUppZ8ADYpwkNHRopgbUMxXst7uzAOJL 7Ue4TtvmfBhpON9eJqq4nH4n3NeKnS7aab6qJbUty+MffpIa0mkbTDsCbZIseYTOvHZaiH/ peTBvkTJb0rR3vgjk3wow== X-UI-Out-Filterresults: notjunk:1;V03:K0:6UpysBwUi7s=:qFJvhP7ChDJuzkdplyJBXt btnBqZHlyscHGi8D9l4QdbD/3LDRBz0npl9n4NzA4FtfkchkGAc9FQsp3hNJtyHBC/73Omu0K 67tlSh4S+SJu+ch3AjIUhUZFGNIZNcG9ctdkZurCxbl+cNPfrXCcX2pv0caWvfs/T2AimaJyz +4Scy5YSMVgl2GHB/PsHN2F3uQ0nlZVWTP4uvVogJSrMPviOR+BdBrBb8aUPaue410E5mfCEy O7Ywys9mxvJqMARgFqJ4R0V/ptrh14vIqVIUS7A2vp3UT2hwRMNDk5MqjUG1PfeXyClnKMXtj XPcuM7d2OthofGjhHCqTjrMt8tfgxTzMrOzw3rFtMwdwx1l0lluJeSCcWVImuH0g9OXiJ4Gfo AN7Qr+MEM7B+ip7ZdiT5IctNLOpY3gQTTCc7gc8zjSZOfX6Vj5KnU85SXGnxBUuKFjET4GmjS 8PU6Cw+e4dXVI0bTGT6nr5FwU/YNNvQDvf8x2HqT5i0PT0lb2v+B7GkAzLM0bwVrjMJXgFMGp KEjqB0EMKpnrTxY5VVHLXpsZyNw0sOhhJIM/XVQM0ufm7/nBikQP39QX8BaUE80Dt4K2g/AKd /EUtA52rYtPSFuspvi6mFXdq6BBzqmEzOQTwfK4mXmcT1nM7UHAjYcRFc6ScRLc3VyI+azWfQ wNYZUQ8DtcEC1wSsASTSxm9uE3nG1hrVp9timL2I+Mt2oprln3/zY2JGwdXbIdPEf46GL0UlG /JLUTlclH4q+FT6Dv07jemn4EepyMIRsC4jRfJTRhCVQ7jvL4apBGielLyV3hOcQo8fkJdC8v 6W1bDNwT+GZR5PpTwCgqec+QU+gkBuVrMEGLMG6g45b0aPruOm+3fcSxuveiFw4a1D4b/yy3R QeLfCGE3ovsnYYz0CTgdMbs3PfCAAVXxIonYpmKy8= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PULL 2/8] cutils: Move size_to_str() from "qemu-common.h" to "qemu/cutils.h" 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 Xu , =?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: Philippe Mathieu-Daudé "qemu/cutils.h" contains various qemu_strtosz_*() functions useful to convert strings to size. It seems natural to have the opposite usage (from size to string) there too. The function definition is already in util/cutils.c. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: John Snow Reviewed-by: Peter Xu Message-Id: <20190903120555.7551-1-philmd@redhat.com> Signed-off-by: Laurent Vivier --- block/qapi.c | 2 +- include/qemu-common.h | 1 - include/qemu/cutils.h | 2 ++ qapi/string-output-visitor.c | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/block/qapi.c b/block/qapi.c index 15f103026473..7ee2ee065d24 100644 --- a/block/qapi.c +++ b/block/qapi.c @@ -23,7 +23,7 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/cutils.h" #include "block/qapi.h" #include "block/block_int.h" #include "block/throttle-groups.h" diff --git a/include/qemu-common.h b/include/qemu-common.h index 0235cd3b912e..8d84db90b083 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -123,7 +123,6 @@ void qemu_hexdump(const char *buf, FILE *fp, const char *prefix, size_t size); int parse_debug_env(const char *name, int max, int initial); const char *qemu_ether_ntoa(const MACAddr *mac); -char *size_to_str(uint64_t val); void page_size_init(void); /* returns non-zero if dump is in progress, otherwise zero is diff --git a/include/qemu/cutils.h b/include/qemu/cutils.h index 12301340a474..b54c847e0fef 100644 --- a/include/qemu/cutils.h +++ b/include/qemu/cutils.h @@ -155,6 +155,8 @@ int qemu_strtosz(const char *nptr, const char **end, uint64_t *result); int qemu_strtosz_MiB(const char *nptr, const char **end, uint64_t *result); int qemu_strtosz_metric(const char *nptr, const char **end, uint64_t *result); +char *size_to_str(uint64_t val); + /* used to print char* safely */ #define STR_OR_NULL(str) ((str) ? (str) : "null") diff --git a/qapi/string-output-visitor.c b/qapi/string-output-visitor.c index 7ab64468d9a5..0d93605d77a7 100644 --- a/qapi/string-output-visitor.c +++ b/qapi/string-output-visitor.c @@ -11,7 +11,7 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/cutils.h" #include "qapi/string-output-visitor.h" #include "qapi/visitor-impl.h" #include "qemu/host-utils.h" From patchwork Thu Sep 19 13:54:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11152557 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 ED34776 for ; Thu, 19 Sep 2019 14:12:08 +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 CE908205F4 for ; Thu, 19 Sep 2019 14:12:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CE908205F4 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]:44726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAxAF-0007HJ-5u for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 Sep 2019 10:12:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51626) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAwx2-0007Dl-Mo for qemu-devel@nongnu.org; Thu, 19 Sep 2019 09:58:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAwtZ-0003iK-DR for qemu-devel@nongnu.org; Thu, 19 Sep 2019 09:54:54 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:39945) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iAwtZ-0003hb-4N; Thu, 19 Sep 2019 09:54:53 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Md6AP-1han871umB-00aCra; Thu, 19 Sep 2019 15:54:48 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 19 Sep 2019 15:54:38 +0200 Message-Id: <20190919135443.15164-4-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190919135443.15164-1-laurent@vivier.eu> References: <20190919135443.15164-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:SMeMu5RPOQoX5EG7ToWuGiXxNEBcKDlPdbYxiLnwkVN3lFN1LSn uXF7kLKM+XF86gBvQf3vs4DFsXwtg8XAJcOljG4E/bustw2tMSccVi5naAowVYf4GxCCFVb bGMkV3qlsXsEFs3S8XfL/qepbcGQCXXHhb8/9m15M+WzRm82fTqz5G7yC5hUGoJ+zjvJTHj y/8yShNLHqIVN8Wx3DlVQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:7LdlLPoGuBE=:Nz1hGprNHVO7pM05+Q61uZ T96JpsjGypEUo58Sjj17YSY8Vg5GXZqAZRjyovN2LH9DHFsu1dnIRGSjUggJ6YHGCRwTMb4JB hmQrEpFf9LqH9T2Hp/tvn+yeJwUM+1uBQuJX45QsIqBpA608z4JZJqDnzQ6yUI73aZnzKD2F1 eXfXJUmewIAqylRq9COD8m+NJepXW0y3vRn4fHDMGK/tgXzRjtvbqI10bKwq28/5TvQXs7DHX ywiVe7qaynAeOo4eNcGizpt5w5RyvM2kF18w8kTGIw3qIxCH9U6XQb8IAouKJV/k2GK0H2jtj T7eGkeE2fNyWEGYYBL7d7dlm7HZqjIoJFdt71fXUEMG+ovFS3Iu+Ctuw3wvw0Ewxt11pkfM4o /zlbiK0gr+rHooSpXVyJdFAuDaVm2EF+KFKkBdXxlr//WOxFmsmWLYOMH4rGXiXTWN8bPysQa PtL9nqiCIZCBeVP9UOHeBjMFiP5Ojq8BDVcWd2nyNt6Hm5deWgFs+4GDnky7O8U3XQKddNwqT mq2ky745Zhc9MtBxtR6JH2hDt5NH7HZqf2Hf+bVMel9kXXrFeq3ZtiJj71f2zibXELhuVPHDU HwBCtZApeGhPuEz9h8qIUIe8OQtDJMmCpow/YbwzuOqjxj5HxBoHFENtHHqkmPFBHarmr/1DY 6QTHuIjdQT69VXzLikW01etmH7EasoDJ8hrMwzOtUhVSmFsCHUe3y1sRYuoDnTD8FA/7cAQOG qrBFQoCK+FgCm7sBmtDjGoI631yYRuTwPtcK+VxqW1Ec0J3yge3WDQ591q8bzR1moeDIHuFVa Vll6hFlzb1ykya4fRkqgZAylZ8DQfrwtHVF/jsIU9KbzkaBioWw31yK6SuzF5RL4whHMnwoT/ hVW/8gDxikELBN/XJGjw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.74 Subject: [Qemu-devel] [PULL 3/8] Replace '-machine accel=xyz' with '-accel xyz' 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, Paolo Bonzini , Thomas Huth , Michael Tokarev , Laurent Vivier Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth We've got a separate option to configure the accelerator nowadays, which is shorter to type and the preferred way of specifying an accelerator. Use it in the source and examples to show that it is the favored option. (However, do not touch the places yet which also specify other machine options or multiple accelerators - these are currently still better handled with one single "-machine" statement instead) Signed-off-by: Thomas Huth Acked-by: Paolo Bonzini Message-Id: <20190904052739.22123-1-thuth@redhat.com> Signed-off-by: Laurent Vivier --- python/qemu/qtest.py | 2 +- qemu-deprecated.texi | 3 +-- qemu-options.hx | 2 +- tests/libqtest.c | 2 +- tests/migration/guestperf/engine.py | 2 +- tests/qemu-iotests/172 | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/python/qemu/qtest.py b/python/qemu/qtest.py index eebcc233ed5c..3f1d2cb32543 100644 --- a/python/qemu/qtest.py +++ b/python/qemu/qtest.py @@ -96,7 +96,7 @@ class QEMUQtestMachine(QEMUMachine): def _base_args(self): args = super(QEMUQtestMachine, self)._base_args() args.extend(['-qtest', 'unix:path=' + self._qtest_path, - '-machine', 'accel=qtest']) + '-accel', 'qtest']) return args def _pre_launch(self): diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 9d74a1cfc017..01245e0b1c4b 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -26,8 +26,7 @@ The @option{enforce-config-section} parameter is replaced by the @subsection -no-kvm (since 1.3.0) -The ``-no-kvm'' argument is now a synonym for setting -``-machine accel=tcg''. +The ``-no-kvm'' argument is now a synonym for setting ``-accel tcg''. @subsection -usbdevice (since 2.10.0) diff --git a/qemu-options.hx b/qemu-options.hx index bbfd936d29ec..80c16fa317e5 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4156,7 +4156,7 @@ STEXI Enable FIPS 140-2 compliance mode. ETEXI -HXCOMM Deprecated by -machine accel=tcg property +HXCOMM Deprecated by -accel tcg DEF("no-kvm", 0, QEMU_OPTION_no_kvm, "", QEMU_ARCH_I386) DEF("msg", HAS_ARG, QEMU_OPTION_msg, diff --git a/tests/libqtest.c b/tests/libqtest.c index 4a7556462d65..38e4f5b5871e 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -241,7 +241,7 @@ QTestState *qtest_init_without_qmp_handshake(const char *extra_args) "-qtest-log %s " "-chardev socket,path=%s,id=char0 " "-mon chardev=char0,mode=control " - "-machine accel=qtest " + "-accel qtest " "-display none " "%s", qemu_binary, socket_path, getenv("QTEST_LOG") ? "/dev/fd/2" : "/dev/null", diff --git a/tests/migration/guestperf/engine.py b/tests/migration/guestperf/engine.py index f13dbea8000d..1dd04ce33b72 100644 --- a/tests/migration/guestperf/engine.py +++ b/tests/migration/guestperf/engine.py @@ -287,7 +287,7 @@ class Engine(object): cmdline = "'" + cmdline + "'" argv = [ - "-machine", "accel=kvm", + "-accel", "kvm", "-cpu", "host", "-kernel", self._kernel, "-initrd", self._initrd, diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172 index ba7dad905751..d67997e5f62b 100755 --- a/tests/qemu-iotests/172 +++ b/tests/qemu-iotests/172 @@ -55,7 +55,7 @@ do_run_qemu() done fi echo quit - ) | $QEMU -machine accel=qtest -nographic -monitor stdio -serial none "$@" + ) | $QEMU -accel qtest -nographic -monitor stdio -serial none "$@" echo } From patchwork Thu Sep 19 13:54:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11152515 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 10ACB197C for ; Thu, 19 Sep 2019 14:04:37 +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 DE95D20882 for ; Thu, 19 Sep 2019 14:04:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DE95D20882 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]:44652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAx2x-00068R-6u for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 Sep 2019 10:04:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51626) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAwx0-0007Dl-Fy for qemu-devel@nongnu.org; Thu, 19 Sep 2019 09:58:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAwtc-0003l0-Ps for qemu-devel@nongnu.org; Thu, 19 Sep 2019 09:54:57 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:59585) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iAwtb-0003j5-A4; Thu, 19 Sep 2019 09:54:55 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Mqro7-1hoadM1XPd-00mqC0; Thu, 19 Sep 2019 15:54:49 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 19 Sep 2019 15:54:39 +0200 Message-Id: <20190919135443.15164-5-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190919135443.15164-1-laurent@vivier.eu> References: <20190919135443.15164-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:0kbdgrvWoaromifnmGUDSe91cfeXzXS8GwPBAzwU68BC5waGoM7 trP9/k7N+jk5acjocP+2K78wUfL+y8Q8EyQeh2Bhnj0xCH6Lt7ON7lUeZ5r/khAK7xUOHyO ZqE9+If6hgRNTqFa7ap0acnVsOceXys2bHNwISgqM4GPQ27XpKIuLexnKGOPDGOaU+ZAuS7 YYEvh6NW8niFTPw5bdhrQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:s29iUPYgn2A=:44CGhlphQwpD/Nij3XjO1W k8dYCEEKEs5pB7DhGuD5dBby7BGBi0f2lPfzMUorW0xsaMUmsTj34Rz/nTgvJKnevZ9a5A0Yy bzWsTgybkhdQYQlekg0F7sDoymX82EKYIBOuud1aGjUEQ9O3rVET2j1QKnZxYl8WtyoZXU3KR C/OHEg8Rl6rWFxqUDvV97FJOWP1SWGf2RFiNR8UB4q/8wyVpcetCGAbuuf5toFUHyJbZu08W5 USBY4Gu/tcjo4W/Xlhgj0spFf3xn+CQ8L1+L0njJ6zqfyWwDo5pTWsDol1HDrhaG3NawLZ9z2 WxgSCIq8JYXg28wSrEC/z6+D76YwC7GNNnnK7EUFwSD+6jhTYn5qhPPkDFruSZmhDsEfJNCVH 3EyapSDZAasa5arp8CZOua7b1LlKoF93bBas6AALvZMbf8bG4jIB1uKFE6CIEMf5Wf/8dFAOX LijVEIQxeRQ8ZNmqGNI4Qd4kN9o/I5MlqIUtZNdH7Q2NplGclZCy5YWDbtnViAJlbo2LVeLf/ qeyKDdIkz69FdmWQGNsXYOnfw03VvR7FfRH9EzMXaRLXSpU1DrsS/rtTWT+yCpu0+2RCAr4OU Gytji/pbr0VbXO04n+btEsQulVBh+3adgK5R9+VPt5XkFBD/nCD4nXK1tU3MXSTpmy9OPa056 P48wq/W3iNG7dmgfHwOoqtgpku0MkxxJfRVUbCr+LBop+pK60JaWatt8wSPuB7FY4p4VgS/At Oy7MqWg38+AZBBw83zpG6T976WYYP8L0SkuPFJ0T2IymHswpD/BBwrQ+NX3EN80gaZLfrSRaD lXU38NDkYobOA50ncHxQ49hupHLIjM9F3E3vz7qHkVpjyU3jZom1z+dzeC23pLE9qaeKRPFr1 rNd2lo/evVvt6FwdVXzTHbW2AIkz8Cwz1yrvy6xkY= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PULL 4/8] target/m68k/fpu_helper.c: rename the access arguments X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , KONRAD Frederic , Michael Tokarev , Laurent Vivier Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: KONRAD Frederic The "access" arguments clash with a macro under Windows with MinGW: CC m68k-softmmu/target/m68k/fpu_helper.o target/m68k/fpu_helper.c: In function 'fmovem_predec': target/m68k/fpu_helper.c:405:56: error: macro "access" passed 4 arguments, but takes just 2 size = access(env, addr, &env->fregs[i], ra); So this renames them access_fn. Tested with: ./configure --target-list=m68k-softmmu make -j8 Signed-off-by: KONRAD Frederic Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Laurent Vivier Message-Id: <1568296920-29939-1-git-send-email-frederic.konrad@adacore.com> Signed-off-by: Laurent Vivier --- target/m68k/fpu_helper.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/m68k/fpu_helper.c b/target/m68k/fpu_helper.c index 9b039c856df8..4137542ec03b 100644 --- a/target/m68k/fpu_helper.c +++ b/target/m68k/fpu_helper.c @@ -396,14 +396,14 @@ typedef int (*float_access)(CPUM68KState *env, uint32_t addr, FPReg *fp, uintptr_t ra); static uint32_t fmovem_predec(CPUM68KState *env, uint32_t addr, uint32_t mask, - float_access access) + float_access access_fn) { uintptr_t ra = GETPC(); int i, size; for (i = 7; i >= 0; i--, mask <<= 1) { if (mask & 0x80) { - size = access(env, addr, &env->fregs[i], ra); + size = access_fn(env, addr, &env->fregs[i], ra); if ((mask & 0xff) != 0x80) { addr -= size; } @@ -414,14 +414,14 @@ static uint32_t fmovem_predec(CPUM68KState *env, uint32_t addr, uint32_t mask, } static uint32_t fmovem_postinc(CPUM68KState *env, uint32_t addr, uint32_t mask, - float_access access) + float_access access_fn) { uintptr_t ra = GETPC(); int i, size; for (i = 0; i < 8; i++, mask <<= 1) { if (mask & 0x80) { - size = access(env, addr, &env->fregs[i], ra); + size = access_fn(env, addr, &env->fregs[i], ra); addr += size; } } From patchwork Thu Sep 19 13:54:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11152501 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 B3FC416B1 for ; Thu, 19 Sep 2019 14:02:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 94CB420882 for ; Thu, 19 Sep 2019 14:02:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 94CB420882 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]:44610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAx0Q-00036w-JH for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 Sep 2019 10:01:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51677) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAwx0-0007Ju-RD for qemu-devel@nongnu.org; Thu, 19 Sep 2019 09:58:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAwtc-0003kO-1L for qemu-devel@nongnu.org; Thu, 19 Sep 2019 09:54:56 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:49025) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iAwta-0003id-O0; Thu, 19 Sep 2019 09:54:54 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MhTt7-1hfCyv0523-00eciQ; Thu, 19 Sep 2019 15:54:50 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 19 Sep 2019 15:54:40 +0200 Message-Id: <20190919135443.15164-6-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190919135443.15164-1-laurent@vivier.eu> References: <20190919135443.15164-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:aCTxE/55gxbTEXoflVlPh1bltVT25udlMGvcJr7t/q40R7ThRgb H9aELoPdCdw3fzMls7LEHETnxZo30bLIp7ADV3kE/zD+kCZkXFVdWKV2UBWb00F+B44mog2 rTRee6KCrDi5mpqkPMcf/Yr8PlCXsl19JNdRgJ6ueh/TAGp4n/85rl6U1331qdsrgE50oYF nBkAVeA7eyA9SD5wQ4TUQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:LQh90LL5D1s=:7sJ6Ylpn3dSOlJk6yvb0ZQ s/CF4HeSaVxPPAlrGlHBVXYvtiBmLjM3j61nbARM2cTzm2NzuiK10EfWZDBCmbo4gl19W2/yf XIOtYeU8SFZW+DcWe4+dmaLGRx5mMbQSzmuFS9ya5xYfFzl2y0Hhm3N4eV/Z5AVQp9NHqfO/l z8SlSm7E6unDioBv25aWBBqPq8W0htevjkpXDsbtXWXe6hrMuvZ6feF90tRhVjvRn8PcbKkYb f/n7oMYC9lDgAod6BxcwbQaYqve752wzP59HP/cwEqgZvkmyTKMlXdIIb9894YciFFxq2rQZo s98DeTqWDZq2YnDzSM3Fkm4ZB3MKHxzChGhAxLGcwM5GkQpdBCvxUZ56yqzFhFe/n4KhJkJxL JaaqLK1sntyzXb1sErITgM/oEtsloSPhC4lcWDGvC7E38zEDD3E5TXsCHAtfa7Q9qxMVfyAus L8JD75UvzUCaI2/yC4SSqECqNQXFukg6S9XU4TLTPXHQ3yZaY1NjiECF/RYATf0V7UG3xihzQ usbQ3kJmvAospcGaca/Mc1+nd9M8h+280dBRmqwkCFKsARP3lzJ5bLWrakgGCvS5di2lxFumW 1Ify2qn9v3tKt2Wsy/0Aq++luMigKm34u8JVEYd048A29kLLaFF9ARPZRH2SmyeNwpb2YE/bo oE2iaZsxN81RRkxeOrQLn1Z/EFPMyyVWxuqvWugqshrGuPiMB8S/fBTWUckAoe80Sdb3KIKed +h8VikBrX9M/psSsbh5OaMRKO+kt1ZRrwg60zIIVjjYq0OL8YmhtCl3lZK+tC4UysovBLGYsU DcP6sZYGzLScw6VE0zM3LRz50QNZk0nBW+8OabE7gXfFC65Styn4LwyjxwgNv0I+6fdk/rkqU lwqM4Hf8SBWTCjU8lFaiM2kVvDrxlkJtR21vvuS/Y= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.73 Subject: [Qemu-devel] [PULL 5/8] build: Don't ignore qapi-visit-core.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , qemu-trivial@nongnu.org, =?utf-8?q?Phili?= =?utf-8?q?ppe_Mathieu-Daud=C3=A9?= , Michael Tokarev , Laurent Vivier Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Eric Blake This file is version-controlled, and not generated from a .json file. Fixes: bf582c3461b Reported-by: Thomas Huth Signed-off-by: Eric Blake Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20190912184607.3507-1-eblake@redhat.com> Signed-off-by: Laurent Vivier --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e9bbc006d39e..7de868d1eab4 100644 --- a/.gitignore +++ b/.gitignore @@ -41,6 +41,7 @@ /qapi/qapi-types-*.[ch] /qapi/qapi-types.[ch] /qapi/qapi-visit-*.[ch] +!/qapi/qapi-visit-core.c /qapi/qapi-visit.[ch] /qapi/qapi-doc.texi /qemu-doc.html From patchwork Thu Sep 19 13:54:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11152549 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 C920D76 for ; Thu, 19 Sep 2019 14:09:03 +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 A7D4F2067B for ; Thu, 19 Sep 2019 14:09:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A7D4F2067B 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]:44690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAx7F-0002g2-Ur for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 Sep 2019 10:09:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51610) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAwx2-0007Cl-Fq for qemu-devel@nongnu.org; Thu, 19 Sep 2019 09:58:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAwta-0003jN-Oc for qemu-devel@nongnu.org; Thu, 19 Sep 2019 09:54:55 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:60019) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iAwta-0003iX-Fg; Thu, 19 Sep 2019 09:54:54 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MMFZQ-1iTAnk2MjO-00JMT9; Thu, 19 Sep 2019 15:54:50 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 19 Sep 2019 15:54:41 +0200 Message-Id: <20190919135443.15164-7-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190919135443.15164-1-laurent@vivier.eu> References: <20190919135443.15164-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:gCTZpmtHKLAlM6ggkWLzXvYON9BoHi026y+wk0KHm8QZRP7kYEy ZL8liT5ljF3wjc08u826E2/CyWXT1JZLgfNwZzrJQKP9aGM4jRAq580962S/C2Ncor+OfYO OUWS4a8NwOLJKCbrMecHtNpzFcpk6Uh1/5iTj4E9C7NPJCpnVpjpo7cXaCMVUTtbL5TKplF 5xtxhHtw8LCsU0s1Qx7qA== X-UI-Out-Filterresults: notjunk:1;V03:K0:WgSDtJllvg4=:yrBBCCeexAKYmZaWEC/h1I cHf8DMSa2EAl6f0UA/lgLbtNfxi5TrpVKVY2N/KqAGsBQLbUCLeM+gckvzQUMs8Vo6cTRmjwm K0E1t216JasT+t0zcqs9ED5VW2aNUvDZsSKb35RQAjn7snZqYxM0lzjL40dr8XiUZZnfff3eK cNPgvX3NcPCGYGrVsXfc0hOcAfvSG2OJrN3w7iseUDo3Ncem1yJqFD6E+Kiw5EAueI8RHy+hO svdOkKn5EhiI4HeWc5VxIWEA6kFFBQl0F3onB/YJ51+LOoFpoEoXCvOg3+fGVAx5TzSL3HA7d TzZ3X/vlOlSvw89Rl8yXw/ZsMUBDUMacuuBR4FhwuB4j6RnAMUf6XhO0YugU6EyWioHD/tkJf wDL6l8jn75XFiIwcrvYwXh2hxtjG/D/TMTD5usrvXoN5F2WYRKmGiXFNhwMCj10WYeGWQt7uj MdU3IxQxQTYRp4dFM9fwCKNFsG18Np/qEyYy01sOeyknOaFs4whF8g9txnZ+6PjWpOaX7X37f Gqcgefpc/Yc4EpWX8LO4aaMpfUgf958VYN3s7PLenReFZ9wKW/yI0hKJ5XFTug7Y+tAt9/lrC 0C7vapVyrlIrK0KMrzZ3k+i12UWnzje18jQ7XtXk+QH/JiNgW8b9qArVroSsOOm+vCx6sHcds +gpUp0CA260wsX6ZYFbNDANF8OkQHfoIYCksr1ogyyUqs8Ji+DBFl2OObMnv9ohaS54lr6172 ZIYiyz3YIfIS1HU8HsbTgqIBIYE/guhGPqndJI3/a0IowoPsfFR1gmDKYEzJdksriguj+ByaU 7JIC5HpbEnsE2xXQkcIPw9NIherNNgTZeuxMIbIF7zgzPNDSh9yH4agkgsmkaTEeT3TAZTWTD fkBa1YNXGP2C9y0eZPJQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.10 Subject: [Qemu-devel] [PULL 6/8] Fix cacheline detection on FreeBSD/powerpc. 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 , Justin Hibbits Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Justin Hibbits machdep.cacheline_size is an integer, not a long. Since PowerPC is big-endian this causes sysctlbyname() to fill in the upper bits of the argument, rather than the correct 'lower bits' of the word. Specify the correct type to fix this. Fixes: b255b2c8a548 ("util: add cacheinfo") Signed-off-by: Justin Hibbits Signed-off-by: Laurent Vivier Tested-by: Justin Hibbits Message-Id: <20190821082546.5252-2-laurent@vivier.eu> --- util/cacheinfo.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/util/cacheinfo.c b/util/cacheinfo.c index eebe1ce9c5d2..ea6f3e99bf4a 100644 --- a/util/cacheinfo.c +++ b/util/cacheinfo.c @@ -65,25 +65,28 @@ static void sys_cache_info(int *isize, int *dsize) g_free(buf); } -#elif defined(__APPLE__) \ - || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#elif defined(__APPLE__) # include -# if defined(__APPLE__) -# define SYSCTL_CACHELINE_NAME "hw.cachelinesize" -# else -# define SYSCTL_CACHELINE_NAME "machdep.cacheline_size" -# endif - static void sys_cache_info(int *isize, int *dsize) { /* There's only a single sysctl for both I/D cache line sizes. */ long size; size_t len = sizeof(size); - if (!sysctlbyname(SYSCTL_CACHELINE_NAME, &size, &len, NULL, 0)) { + if (!sysctlbyname("hw.cachelinesize", &size, &len, NULL, 0)) { + *isize = *dsize = size; + } +} +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +# include +static void sys_cache_info(int *isize, int *dsize) +{ + /* There's only a single sysctl for both I/D cache line sizes. */ + int size; + size_t len = sizeof(size); + if (!sysctlbyname("machdep.cacheline_size", &size, &len, NULL, 0)) { *isize = *dsize = size; } } - #else /* POSIX */ From patchwork Thu Sep 19 13:54:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11152535 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 8AB9716B1 for ; Thu, 19 Sep 2019 14:05:52 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6C3C120882 for ; Thu, 19 Sep 2019 14:05:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6C3C120882 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]:44656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAx4A-0007Zv-PR for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 Sep 2019 10:05:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51677) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAwx3-0007Ju-8T for qemu-devel@nongnu.org; Thu, 19 Sep 2019 09:58:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAwtZ-0003iP-Dh for qemu-devel@nongnu.org; Thu, 19 Sep 2019 09:54:54 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:56749) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iAwtZ-0003hQ-4m; Thu, 19 Sep 2019 09:54:53 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MzQPe-1hxhL10WUC-00vTB3; Thu, 19 Sep 2019 15:54:51 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 19 Sep 2019 15:54:42 +0200 Message-Id: <20190919135443.15164-8-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190919135443.15164-1-laurent@vivier.eu> References: <20190919135443.15164-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:ylawjwZlxVZ4xVBU3x9HCZaGo5YuJfOAOxnCb0ZVuv0AJoxjbkz U8Cgosd3FNVmqSUgJGzNTjaNJ8S9Cy9Q37FYVsyMxeLuABZ7wJrxOvdt2H8v04pnSnZBjf3 2oeYXSo9uuv5b05Z0xs8XEzISF9KzYMpzPI1jn5LvdYZFIilLb29PjbYl8Y3w/5+n8X0l8k p/Rw0O3cLaujo5xBZ7V5Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:EXKRn/qhaHg=:JDyOyegwVGoyg+O/cBdeu3 R+IKDxm9Jbh55COAbIORwLTccQKnAr7RGAkvqsrXq5bk2HM+NzxB6CCjaA2SYB846Imsgszpl eiRmLUH9v1tvTXv98zG7rnmbGx8C1uHmhA/O4/BQdn1siAUKbTzn4nCbW8ddbp0kW5CxhH2Vn LPj+4TElH91zVlZhjaA8nyizQFqZA3Og8BKRInEQkminx3ZG3H1berIUnYUWHfefiGlQ/FtIC av0m0RhuVah1asidfG4DgtlGGSVTuTrFqIhhSDyGZd3VtY6INChH6ffCyuUgj4Rwd0TVB1l4v dR3AHVRBDDCUKfEuKtAq+ACSlSul+zMl6e7qgPY2Zu+Cb3p1jrbtDnMcqOrR7QDMXeex7x45i 4GrlsYxERtwSCK+r5Edza5B3kiSl9w3diqRhKONnBOfKCwrx8moDrZcTBri6c3wGo5TTLy3WE uY/M7h8nIJV/G3ygrlvww9mvZ3aTeZT9wbdgsYo096deFGFTJeeT9H0MCBEwRRUOri6IuBa+4 13/WsNb4V48LxhwoCwuGQHgq6XBZGjZVpNEe+KDBfEnp4pGHWTVZ11CS+xlbgevvVnHeZH6ep MRTs98zXMfqpEJ5ntwGUxJZyYxTvaB/ZhgSFzyb7ww8IrQu3RVx2QtLNwYdhQ0zd6+ISTAcmG V3zowd1xG1TEhOKNyCalfgOTWIqwOmQjqjCwbodauZ/Gq9Ni8fIjV6SW/zKhx9JQgB8fXrB5K SMeAx/7mEajIDHbD02spVpE8PCnnBkwyfV1X1dPCyux6loHrrtZf0jxrtbHVHP+FgqYpVnXv0 2AsirqpTc8coVUde7XoeEtsQdZuxQhQUtCaR4kQSVchDRkLLHECmY1QUcXtpMlyQUa9Dh2yuv az8fqaNrdnYGFfiYeWUQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.73 Subject: [Qemu-devel] [PULL 7/8] kvm: Fix typo in header of kvm_device_access() 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 , Greg Kurz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Greg Kurz Signed-off-by: Greg Kurz Message-Id: <156829664683.2070256.13400788010568373502.stgit@bahia.tls.ibm.com> Signed-off-by: Laurent Vivier --- include/sysemu/kvm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 909bcd77cf82..fd674772ab31 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -308,7 +308,7 @@ int kvm_vm_check_attr(KVMState *s, uint32_t group, uint64_t attr); int kvm_device_check_attr(int fd, uint32_t group, uint64_t attr); /** - * kvm_device_access - set or get value of a specific vm attribute + * kvm_device_access - set or get value of a specific device attribute * @fd: The device file descriptor * @group: the group * @attr: the attribute of that group to set or get From patchwork Thu Sep 19 13:54:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11152497 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 45A5413BD for ; Thu, 19 Sep 2019 14:00:03 +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 2455021D6C for ; Thu, 19 Sep 2019 14:00:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2455021D6C 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]:44590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAwyX-0001JK-I9 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 Sep 2019 10:00:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51590) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAwwz-00078M-HM for qemu-devel@nongnu.org; Thu, 19 Sep 2019 09:58:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAwti-0003ni-EF for qemu-devel@nongnu.org; Thu, 19 Sep 2019 09:55:03 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:50151) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iAwth-0003me-5G; Thu, 19 Sep 2019 09:55:01 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MfqGN-1hhwns0vNZ-00gGbg; Thu, 19 Sep 2019 15:54:53 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 19 Sep 2019 15:54:43 +0200 Message-Id: <20190919135443.15164-9-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190919135443.15164-1-laurent@vivier.eu> References: <20190919135443.15164-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:f+6zjxTbKi06c4tDhzzvg9koiK38E/wSTMmp6zkUdD6cg0MOIHA xnG+2TBfmoYe3oNcP0VTXUPBplYRXxiGpbwzz2W7Wgrux/2lS5efTH0qGT9HOgF7iKz0I/S OUiB3HYM4fIaBPDrCy1E8ZTL090aIG5e30PkIG6dll0wqPRoBg+3jt2XRBQ00QXoj5GWdFv hmw9qRWwxA+Ahxn3C6UfQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:zxUz0HElFP4=:odiie1ryMABIwcTj2eaOXM cgWVvlq/2FLpSdChEYD0nxvFOSAo8suACDHFziAdSmfMrjXgjNvDQ3Vdtc4zBLfWVgjMIzhWO i9JO7IdflhwbQ1p7TnkmNq7wuJWfWLtUVDJ/znwBWXXPQI5nIIPV9A82NeY8vJPKbJOpwOhJs 4uVg1s72byEkA1StZ4BkkjAAkpS4qyFKofm2RJFg7Cuff40ZpdpR3zmJKLlDKD41u4zzycumx Jvnk/WHEPRfpptogvsU27uB9iP4eN75Dv7mxAHjcwoWVH/1HmPsTZrDfZ/+V+5/ixa1zem8Yq oWvRU6vLHAQhbClHB2hHbK3eLQiODAp9jEMr3wbl2h3M0KVQ67r04RaB85/RQnZ/Nc6QmGmlQ h+sdYgDrmVr4ITp35b75J5Vy4/mMv3JzESEdJC4y72KafT/X7ZW6ZWBYEjXMdLxWE7UtItWah QA8w2NYMNiO5H5BoFfelqu5lWC44BeMaU2FdDi3pGkJUN3B7kGQM0rjni3aGGEx87AToMNRkd 0k7ZILyoJMYEl4SB2+7H9yWciVlWSpXE18Dp4XnU4+nVVDQRqpiczvZkA2QGGlqEm2+OXUM9B O1u0anT038KB2rdIMnXjfT7nynrs0GYw0iEtSJ4PNZY1ZaeTzYCg+Gfb/pofhRxwHbvyOQ570 /ihAUlYGxImsZ+dLoJAtw7mpGbYJgt52GLwh+gQozERi5jen6X5slrQjpEgBg7VANLCDvX5MC PM1Rt+NoB26N41R3MXQFOAy2vLd9JV+p6RVNZQlkj26/1CTry2Dyn/95Q+bp+XE/Ozn9ulcDO +2Ky0zW63FbQMk2Q8fkva5juGEQ8VPSuh8wpr97UfOtwNHSmGQgQgXmxzWAyK8Uzw9uafK2u4 PCPmUA+/0QUY4pqoAwZ8CCxQIO5jzXiw5rYjESFhI= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.74 Subject: [Qemu-devel] [PULL 8/8] configure: Add xkbcommon configure options 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: James Le Cuirot , qemu-trivial@nongnu.org, Michael Tokarev , Laurent Vivier , Gerd Hoffmann , =?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: James Le Cuirot This dependency is currently "automagic", which is bad for distributions. Signed-off-by: James Le Cuirot Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Gerd Hoffmann Message-Id: <20190914145155.19360-1-chewi@gentoo.org> Signed-off-by: Laurent Vivier --- configure | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configure b/configure index 30aad233d17c..30544f52e630 100755 --- a/configure +++ b/configure @@ -1521,6 +1521,10 @@ for opt do ;; --disable-libpmem) libpmem=no ;; + --enable-xkbcommon) xkbcommon=yes + ;; + --disable-xkbcommon) xkbcommon=no + ;; *) echo "ERROR: unknown option $opt" echo "Try '$0 --help' for more information" @@ -1804,6 +1808,7 @@ disabled with --disable-FEATURE, default is enabled if available: capstone capstone disassembler support debug-mutex mutex debugging support libpmem libpmem support + xkbcommon xkbcommon support NOTE: The object files are built at the place where configure is launched EOF