From patchwork Wed Mar 6 11:07:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 10840907 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DC5FA1390 for ; Wed, 6 Mar 2019 11:18:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C4DE12D506 for ; Wed, 6 Mar 2019 11:18:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B57212D69E; Wed, 6 Mar 2019 11:18:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 702482D506 for ; Wed, 6 Mar 2019 11:18:41 +0000 (UTC) Received: from localhost ([127.0.0.1]:59492 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1UZM-0005HA-Px for patchwork-qemu-devel@patchwork.kernel.org; Wed, 06 Mar 2019 06:18:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35890) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1UQ6-0005jj-RX for qemu-devel@nongnu.org; Wed, 06 Mar 2019 06:09:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1UQ0-0002gA-9s for qemu-devel@nongnu.org; Wed, 06 Mar 2019 06:09:06 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:45211) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1UPQ-0002DB-6B; Wed, 06 Mar 2019 06:08:24 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Mg6mG-1hSJYz1dCY-00hcbj; Wed, 06 Mar 2019 12:07:23 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 6 Mar 2019 12:07:02 +0100 Message-Id: <20190306110711.309-2-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190306110711.309-1-laurent@vivier.eu> References: <20190306110711.309-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:Q3hk8qijD5KUlzCX23w0FWN0YpKiKd/7xr6qFZcEo8PLB8u8yfX vwCU01TcPv4ex5BZ7A+BddktVxYRMFof/lQqi/2RhrLTxAZExppSELttcY/aR4S88vFEbA8 gwsmlRgnqlsBBOxTx0F0eLIsSbkKUgkWyHOixueqLu3CfMbhpd8yC4ww1zAgFBVfhrfL3np usahS5fOCRRfPavkpW29A== X-UI-Out-Filterresults: notjunk:1;V03:K0:qpDPq41EuXc=:8F4TerVI713vWXfl+T7WWE KvuD7Suq9FYNPM0fBIYJUX45lmGIY5/Brj9PeshcFybRtT1VN+FoV3KHJNxP1bpVxTm3XsnPT XxyMXVLilr0Z/iou/CD1Gwf0ZDhjgKNW65TsIUoRVjEPxXxLG25QxSR48QlY+vw5pfRtAkQOp V2wyxoYZlWYLMWyVlBfIoUuv4ko6NxmapVeqUcTJpcxzuTAvTEOSDlsxEgDeTOlNmJt1aWHIs q+s2dyEIIVfTrC0EeZ4ZuVcmarkwVg3jXlnMych1msYbfjgLWnFhdeNSpwU8iUFup5qp/Bp1l ELp9JG8FO/51hDHWNPhAiA9yD8A6uJvtpTmw4HGGsctWuGSizRRFRRdSeCT4LxB7SY75CKWwm MS5rb4lnJcuBKK9wVfleu093GCz6mHSJDLomCaSh+B0I/8YtNLKv4o6wkbQikWBdXcY/XDQXB R/ZaI/N54Z5eVy5F72mDLaDbAksMEbg0SOJZduSItLBZa66N5BSY9sAN/ZVY6WriUDlVlUDlL YHeAthu9gSxQsWz9XpsF6HX+NZQaqVq2i/4L1tHxkUZgHqtnLC/KjxCmdVOkPLBkANEzzjTgV IWwmftVZZZXePgkGGtBBtf4P4sYHPnZEHyHwy2N8zQZFrRSzuKPEKpQgg1h5kDHczZO9U1V2a N/EHWaB2b4PruEFoF0N/kH495/TySkmCNMgMfSFf81cKlWNUOfalb/CLeADAhExbHCB0q3EfM 7iJ/5mGRpno964KYVum9ueWkof9lwVqME7DhKQ== 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 01/10] tests: Remove (mostly) useless architecture checks X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Corey Minyard , Li Zhijian , "Michael S. Tsirkin" , Michael Tokarev , Paolo Bonzini , zhanghailiang , qemu-block@nongnu.org, qemu-trivial@nongnu.org, Halil Pasic , Christian Borntraeger , Laurent Vivier , Tony Krowiak , Thomas Huth , Eduardo Habkost , Corey Minyard , Riku Voipio , qemu-s390x@nongnu.org, Pavel Dovgalyuk , Zhang Chen , John Snow , Richard Henderson , Kevin Wolf , Pierre Morel , Cornelia Huck , Laurent Vivier , Max Reitz , Igor Mammedov Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Thomas Huth These checks at the beginning of some of the tests are mostly useless: We only run the tests on x86 anyway, and g_test_message() does not print anything unless you call g_test_init() first. Signed-off-by: Thomas Huth Acked-by: John Snow Acked-by: Corey Minyard Message-Id: <1551456970-463-1-git-send-email-thuth@redhat.com> Signed-off-by: Laurent Vivier --- tests/fdc-test.c | 7 ------- tests/ide-test.c | 7 ------- tests/ipmi-bt-test.c | 7 ------- tests/ipmi-kcs-test.c | 7 ------- 4 files changed, 28 deletions(-) diff --git a/tests/fdc-test.c b/tests/fdc-test.c index 88f1abfa10e2..31cd3295c102 100644 --- a/tests/fdc-test.c +++ b/tests/fdc-test.c @@ -548,16 +548,9 @@ static void fuzz_registers(void) int main(int argc, char **argv) { - const char *arch = qtest_get_arch(); int fd; int ret; - /* Check architecture */ - if (strcmp(arch, "i386") && strcmp(arch, "x86_64")) { - g_test_message("Skipping test for non-x86\n"); - return 0; - } - /* Create a temporary raw image */ fd = mkstemp(test_image); g_assert(fd >= 0); diff --git a/tests/ide-test.c b/tests/ide-test.c index f0280e636b5d..300d64e77ddf 100644 --- a/tests/ide-test.c +++ b/tests/ide-test.c @@ -1009,16 +1009,9 @@ static void test_cdrom_dma(void) int main(int argc, char **argv) { - const char *arch = qtest_get_arch(); int fd; int ret; - /* Check architecture */ - if (strcmp(arch, "i386") && strcmp(arch, "x86_64")) { - g_test_message("Skipping test for non-x86\n"); - return 0; - } - /* Create temporary blkdebug instructions */ fd = mkstemp(debug_path); g_assert(fd >= 0); diff --git a/tests/ipmi-bt-test.c b/tests/ipmi-bt-test.c index f4a81b526505..fc4c83b5db7c 100644 --- a/tests/ipmi-bt-test.c +++ b/tests/ipmi-bt-test.c @@ -400,15 +400,8 @@ static void open_socket(void) int main(int argc, char **argv) { - const char *arch = qtest_get_arch(); int ret; - /* Check architecture */ - if (strcmp(arch, "i386") && strcmp(arch, "x86_64")) { - g_test_message("Skipping test for non-x86\n"); - return 0; - } - open_socket(); /* Run the tests */ diff --git a/tests/ipmi-kcs-test.c b/tests/ipmi-kcs-test.c index 178ffc179734..a2354c10c7fe 100644 --- a/tests/ipmi-kcs-test.c +++ b/tests/ipmi-kcs-test.c @@ -263,16 +263,9 @@ static void test_enable_irq(void) int main(int argc, char **argv) { - const char *arch = qtest_get_arch(); char *cmdline; int ret; - /* Check architecture */ - if (strcmp(arch, "i386") && strcmp(arch, "x86_64")) { - g_test_message("Skipping test for non-x86\n"); - return 0; - } - /* Run the tests */ g_test_init(&argc, &argv, NULL); From patchwork Wed Mar 6 11:07:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 10840903 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EFB3817E9 for ; Wed, 6 Mar 2019 11:16:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D71B82D4F3 for ; Wed, 6 Mar 2019 11:16:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C8D562D506; Wed, 6 Mar 2019 11:16:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9A2D62D4F3 for ; Wed, 6 Mar 2019 11:16:52 +0000 (UTC) Received: from localhost ([127.0.0.1]:59458 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1UXb-00041O-G0 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 06 Mar 2019 06:16:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1UPb-0005GN-GG for qemu-devel@nongnu.org; Wed, 06 Mar 2019 06:08:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1UPX-0002Pa-Gw for qemu-devel@nongnu.org; Wed, 06 Mar 2019 06:08:33 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:57765) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1UPS-0002I1-Gy; Wed, 06 Mar 2019 06:08:26 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1McpW8-1ha08F3JYI-00Zx6t; Wed, 06 Mar 2019 12:07:26 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 6 Mar 2019 12:07:03 +0100 Message-Id: <20190306110711.309-3-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190306110711.309-1-laurent@vivier.eu> References: <20190306110711.309-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:K8jwCMHpr/yeiE8L8NfUcyrgc47rLyjNuppYIMES66UEazF+X75 qvM8ThwuP0nvoQG9DTv30NRha9/M2yx/4t1K16W5V2eb4BeoU5xqGXlzeTLs1AqJnB3pL9h Mu7ElDgQdOOCmulTdrDDX5m7sgvZqc1/rCLDPkdXzH10d4CMxYLLBKL6blUR7CRYNQ+cuOF JRq0JGycH4HkI+znqZR+w== X-UI-Out-Filterresults: notjunk:1;V03:K0:AExTLNaBz7Q=:mVd6j+Hz/Oxsn9aQqBfQrz lX0Re+u+n/9kqwSeLegFhKl/tfXnTF04TS+0x4Ya6HuOFeqp/Ee2Hqt7kOEQ9k3cbsZ9lxuCS qSqYklIa2VGi09aTx75Is+70hpOi5KKwyp5SMRoPyeDf1KjYTvMVLF3XZbp1dST17fGzOAjpM 6sxLsaWknXUedxYfoP0q3d2tyUxvTG3sv4W3qVucwTWSOXJxAd6E8B7qTSg2z2uE5WkQ3pMPZ /WLriKIFq7NxuBYxeJpizbT02sIejpMvu6MdswjCwoOk7YOOwT2LXnTemwHzm87ZQcqEVYesR X5ojBDy6UKFXkHitbbIGMlvyYQIukqjd9XFZmovZCxrmvx4WquNEyoxyrhXGCqJQo0lCltWzJ J+4dGoSzp3e+fAvz8nxIMhS3kxryO5+hDmLXS810d7sufJwfnX8C0XKpSVWfUQN/B6udA3FDU DYdu9SubvMZJ6gtdH8qxZUn0zdU2mG8l1HseidzWy4dqmCXRJcbbXVtxhOxzUwn7GCoG+RKPG TN315nI/ZFFA3oM/vWR4GV3XFDnFCMk4BfslEZdS1pxOPfeb2C/aWY4/1W2LMGYR2wjOm6xxl p0wravFSiXswAfqUPB3aQIzjt4pJF2fwrhNhbugMlZQOCrjWEC3TfPMsQzm0LBidJGefz6kgz KD1/1sftMf3AI76vawOKDaiXr3XzJFbco4nQg/6tTQfsHCrWSwayYKUH8XwUd+XWx/zqfzAUG DV/oIO3T4y2zF+HEPzyaYNhHe9GmUzjttoehe2Q/jT3Qwh16weA1LeC+Ypw= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.13 Subject: [Qemu-devel] [PULL 02/10] hw/i386/pc.c: remove unused function pc_acpi_init() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Li Zhijian , "Michael S. Tsirkin" , Michael Tokarev , Paolo Bonzini , zhanghailiang , qemu-block@nongnu.org, qemu-trivial@nongnu.org, Halil Pasic , Christian Borntraeger , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Laurent Vivier , Tony Krowiak , Thomas Huth , Eduardo Habkost , Corey Minyard , Riku Voipio , qemu-s390x@nongnu.org, Pavel Dovgalyuk , Zhang Chen , John Snow , Richard Henderson , Kevin Wolf , Pierre Morel , Cornelia Huck , Laurent Vivier , Max Reitz , Wei Yang , Igor Mammedov Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Wei Yang Function pc_acpi_init() is not used anymore. Remove the definition and declaration. Signed-off-by: Wei Yang Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Igor Mammedov Reviewed-by: Thomas Huth Message-Id: <20190214084939.20640-2-richardw.yang@linux.intel.com> Signed-off-by: Laurent Vivier --- hw/i386/pc.c | 27 --------------------------- include/hw/i386/pc.h | 1 - 2 files changed, 28 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 3889eccdc322..578f772e7ce2 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1688,33 +1688,6 @@ void pc_pci_as_mapping_init(Object *owner, MemoryRegion *system_memory, pci_address_space, -1); } -void pc_acpi_init(const char *default_dsdt) -{ - char *filename; - - if (acpi_tables != NULL) { - /* manually set via -acpitable, leave it alone */ - return; - } - - filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, default_dsdt); - if (filename == NULL) { - warn_report("failed to find %s", default_dsdt); - } else { - QemuOpts *opts = qemu_opts_create(qemu_find_opts("acpi"), NULL, 0, - &error_abort); - Error *err = NULL; - - qemu_opt_set(opts, "file", filename, &error_abort); - - acpi_table_add_builtin(opts, &err); - if (err) { - warn_reportf_err(err, "failed to load %s: ", filename); - } - g_free(filename); - } -} - void xen_load_linux(PCMachineState *pcms) { int i; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 3ff127ebd037..54222a202d33 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -189,7 +189,6 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int level); void pc_cpus_init(PCMachineState *pcms); void pc_hot_add_cpu(const int64_t id, Error **errp); -void pc_acpi_init(const char *default_dsdt); void pc_guest_info_init(PCMachineState *pcms); From patchwork Wed Mar 6 11:07:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 10840885 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DA47C1515 for ; Wed, 6 Mar 2019 11:13:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C35B82D69C for ; Wed, 6 Mar 2019 11:13:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B58102D6AD; Wed, 6 Mar 2019 11:13:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7ACBA2D69C for ; Wed, 6 Mar 2019 11:13:04 +0000 (UTC) Received: from localhost ([127.0.0.1]:59352 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1UTv-0008A8-Kc for patchwork-qemu-devel@patchwork.kernel.org; Wed, 06 Mar 2019 06:13:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35539) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1UPV-00056U-G3 for qemu-devel@nongnu.org; Wed, 06 Mar 2019 06:08:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1UPU-0002Kx-DO for qemu-devel@nongnu.org; Wed, 06 Mar 2019 06:08:29 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:45995) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1UPH-0002Aj-4U; Wed, 06 Mar 2019 06:08:18 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1M3DBb-1gxuQE3AnV-003ctU; Wed, 06 Mar 2019 12:07:28 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 6 Mar 2019 12:07:04 +0100 Message-Id: <20190306110711.309-4-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190306110711.309-1-laurent@vivier.eu> References: <20190306110711.309-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:wh6GayCPI6nM17UeUAPbFHS9HiPp3093y6KyLqBtaaGlY9ssMFj DVfXq1yaO11oeJZadsFbUYXD+dlhfGhzV1LX7CCtguWE7A0CICqoqeJtu83ul8TWgHBq6vL PaLebjuhXPyH5ZTWGoFyqhEK+zhK8xFbbj5rrjFPt2bSGr58nppPBEsghdmJnWDVnvAjeG1 tqw9D7/OQMAsKyKbXc/tw== X-UI-Out-Filterresults: notjunk:1;V03:K0:OgBW/YWqUOg=:tWQfodoHEesAgF7NpC2ILO lYG9tvaDbluhBdh1gtIqkOfJcPd+YM/TQInZ3JuNWGN7m1ZdX3gdrLAo/7GdpanK0ZgOVuJtc DcrIMzEBSPiPQYdxE9O+0C0LLgf2WOhE+QGT46Bf9AcQYg6pfezh925qTVogbc4T4gZytaBgh oPll2ruDKg0jZ+yzR4CcRSoIELrDxzzdpiBPzBh8amD+osqW8J+Zc6OchwAPk5WUXEdOU0Myh sf0sUAbsNJm6QcNEci9C3x9tKuP6XGvlXDke/d+ee0rx3Oe8M0As3JQKU4w3YU05S9E6Fh1vy QHj/Hk5YzauI33lf69ePGlNW6w7aDzrO7ThhvKWug9ywTU+3lBxX61jF8Sac4ec1nk9VgQylH 5EoH6eiCV2gwFNfbrEgWJz0Bi1kFPUWmX3n/7XPLCiqAG51sptDA9k3yOfksjmh1VeIG9f420 KfTikNn4DEAchU1PX4diN6kLN3+tVyv/y9cTXMk0lJbK92F3yOy9gGgIS6X0XBhSilMwSBIxb o/A23Uh/Pu3UIlOc64DKwlu7yTV9/VlYQb1QZDbcMvlWhYrFSR8KyjVSvV95AWiTTm9fMkZ88 d77alk/H+2yV/Z9FpZ36bYLq6I7dtlOA2ackmZobBOEnFKum3FIiKbeOj1zWukk35iheLZHDi ObF3HYDvIzhecjp3QBJ6mEMbidlK4S8xP6Yi5b7rDoKgVWKJoQ5ncQ3sSUw4N/UxUsd8X1vjc DGAb/I4mbrpTWfy4T0TJUmibKErtpO9gmfBtKf7Z678wSGTMambIxg1Lxco= 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 03/10] hw/acpi: remove unused function acpi_table_add_builtin() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Li Zhijian , "Michael S. Tsirkin" , Michael Tokarev , Paolo Bonzini , zhanghailiang , qemu-block@nongnu.org, qemu-trivial@nongnu.org, Halil Pasic , Christian Borntraeger , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Laurent Vivier , Tony Krowiak , Thomas Huth , Eduardo Habkost , Corey Minyard , Riku Voipio , qemu-s390x@nongnu.org, Pavel Dovgalyuk , Zhang Chen , John Snow , Richard Henderson , Kevin Wolf , Pierre Morel , Cornelia Huck , Laurent Vivier , Max Reitz , Wei Yang , Igor Mammedov Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Wei Yang Function acpi_table_add_builtin() is not used anymore. Remove the definition and declaration. Signed-off-by: Wei Yang Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Igor Mammedov Message-Id: <20190214084939.20640-3-richardw.yang@linux.intel.com> Signed-off-by: Laurent Vivier --- hw/acpi/core.c | 6 ------ include/hw/acpi/acpi.h | 1 - 2 files changed, 7 deletions(-) diff --git a/hw/acpi/core.c b/hw/acpi/core.c index 47877c0ec196..9f22b86fa9b1 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -309,12 +309,6 @@ out: static bool acpi_table_builtin = false; -void acpi_table_add_builtin(const QemuOpts *opts, Error **errp) -{ - acpi_table_builtin = true; - acpi_table_add(opts, errp); -} - unsigned acpi_table_len(void *current) { struct acpi_table_header *hdr = current - sizeof(hdr->_length); diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h index bbf541263a19..c91e2b9df28b 100644 --- a/include/hw/acpi/acpi.h +++ b/include/hw/acpi/acpi.h @@ -190,7 +190,6 @@ uint8_t *acpi_table_first(void); uint8_t *acpi_table_next(uint8_t *current); unsigned acpi_table_len(void *current); void acpi_table_add(const QemuOpts *opts, Error **errp); -void acpi_table_add_builtin(const QemuOpts *opts, Error **errp); typedef struct AcpiSlicOem AcpiSlicOem; struct AcpiSlicOem { From patchwork Wed Mar 6 11:07:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 10840901 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EDD8217E9 for ; Wed, 6 Mar 2019 11:15:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D49CA2D4F3 for ; Wed, 6 Mar 2019 11:15:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C23BE2D506; Wed, 6 Mar 2019 11:15:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5D97D2D4F3 for ; Wed, 6 Mar 2019 11:15:39 +0000 (UTC) Received: from localhost ([127.0.0.1]:59450 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1UWQ-00038q-MQ for patchwork-qemu-devel@patchwork.kernel.org; Wed, 06 Mar 2019 06:15:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35697) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1UPf-0005KT-HZ for qemu-devel@nongnu.org; Wed, 06 Mar 2019 06:08:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1UPZ-0002Qq-KN for qemu-devel@nongnu.org; Wed, 06 Mar 2019 06:08:35 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:37983) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1UPO-0002Cm-Qi; Wed, 06 Mar 2019 06:08:24 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MBltK-1gpLqA0qM8-00C7Kz; Wed, 06 Mar 2019 12:07:30 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 6 Mar 2019 12:07:05 +0100 Message-Id: <20190306110711.309-5-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190306110711.309-1-laurent@vivier.eu> References: <20190306110711.309-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:dcj3jzsg2nLHNGpxFgIRqxVnWZJR0nOrv43RLnYFAu8XvNaGhm/ DTzj5ky+Lj1ZVRXXWeo71WsnmUj7KTkxHkuqd+Ubi02XaOKM8CEzcmk5LQdCB9kMqpZpeHl JkPiC0p45Vh7zgxu32Eahe6XvDAMVav3yxWsavEyVx0+3AwrobJMIqzy5/Uf0ZCSUbqOqKz +wPQUk4+0tGCAhbrDyKeA== X-UI-Out-Filterresults: notjunk:1;V03:K0:fJ4cdu6Gp6I=:ZdZPZc3HGqRSTzl9cAwiF+ INvtqi4Y3xxkpU4X2diqFeqtda9wc/dNX2J5wqwflyX71GZ2pmAHe0vq2cP9zGgTzaBWGmMnr 7w32YIRjmEFAfjbdOaj/7gu9huMXTln3zol6KM8zbHufpWr8DMTCEc/aGgWOgDnVySsIXEgvk OUwjQfH2Tw+6+XtIx/lD/434TgblZC4dcZDs4q/lrtBKyanF8oQGdU80fcK2JKQ8rsKXHPEOS nQzNvqZ9g/7wLciJszL5wzhxVl7OwjSgozxERn5EjE99MDH4ctIcQxQ+YTKxUcpmHkg/VSpUX kKYSHBwxYSrOjOhg5AOltAkgbRjd1B9VIrgKQBIkg/kZdoDTJgxV5P56yo0DILU5Go4HP/cKL n/hdnBzqBX0RWTlXQc0HOu4w4fYj5qehlha7qLPnJLQsWo5+XXA5dezFuCE0AVOTXEecmFh50 GOV+ipOCa5ku/lth9kKdhmAGMsbdxRO6UQY74zuYdfGubd+TiEk7imEQvVkAkmPotuzqv0ddT U9QYAkOYXnTDlHPI/6dHapeG/IOfyjFqfQ6GJSD2COe6mIA8bc8RB4ZynuL+M9sDzJ/wUAZXQ spDjLraYGudrBcKIw3b/OF4lH9F/ynf9Z/zRh5g81Sw8Z1jaiT1CBmYdgrC9Q0QmNakSDlonO 5Zle+rNNB4jO9yDGAw1ProutaRVmznmgGZzQZ7RgN2xUJzz4ff/e5BPhbqM8KqVfbBIr4SqAq BAzYItVDwvgUve+42yF0EVZnvHHP9v03nD0B2j2UQlWyPZ6y7M6PDiM3VHY= 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 04/10] hw/acpi: remove unnecessary variable acpi_table_builtin X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Li Zhijian , "Michael S. Tsirkin" , Michael Tokarev , Paolo Bonzini , zhanghailiang , qemu-block@nongnu.org, qemu-trivial@nongnu.org, Halil Pasic , Christian Borntraeger , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Laurent Vivier , Tony Krowiak , Thomas Huth , Eduardo Habkost , Corey Minyard , Riku Voipio , qemu-s390x@nongnu.org, Pavel Dovgalyuk , Zhang Chen , John Snow , Richard Henderson , Kevin Wolf , Pierre Morel , Cornelia Huck , Laurent Vivier , Max Reitz , Wei Yang , Igor Mammedov Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Wei Yang acpi_table_builtin is now always false, it is not necessary to check it again. This patch just removes it. Signed-off-by: Wei Yang Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Igor Mammedov Message-Id: <20190214084939.20640-4-richardw.yang@linux.intel.com> Signed-off-by: Laurent Vivier --- hw/acpi/core.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/acpi/core.c b/hw/acpi/core.c index 9f22b86fa9b1..9ed1629f3671 100644 --- a/hw/acpi/core.c +++ b/hw/acpi/core.c @@ -307,8 +307,6 @@ out: error_propagate(errp, err); } -static bool acpi_table_builtin = false; - unsigned acpi_table_len(void *current) { struct acpi_table_header *hdr = current - sizeof(hdr->_length); @@ -324,7 +322,7 @@ void *acpi_table_hdr(void *h) uint8_t *acpi_table_first(void) { - if (acpi_table_builtin || !acpi_tables) { + if (!acpi_tables) { return NULL; } return acpi_table_hdr(acpi_tables + ACPI_TABLE_PFX_SIZE); From patchwork Wed Mar 6 11:07:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 10840861 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BDC791515 for ; Wed, 6 Mar 2019 11:09:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED0A92D558 for ; Wed, 6 Mar 2019 11:09:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E0FBB2D568; Wed, 6 Mar 2019 11:09:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 68A572D558 for ; Wed, 6 Mar 2019 11:09:56 +0000 (UTC) Received: from localhost ([127.0.0.1]:59300 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1UQt-0006R7-Ip for patchwork-qemu-devel@patchwork.kernel.org; Wed, 06 Mar 2019 06:09:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35309) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1UPD-0004uC-D8 for qemu-devel@nongnu.org; Wed, 06 Mar 2019 06:08:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1UPB-00029N-AK for qemu-devel@nongnu.org; Wed, 06 Mar 2019 06:08:11 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:52477) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1UP8-00027U-Py; Wed, 06 Mar 2019 06:08:07 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MlNgx-1hO8QT1yyz-00lj4S; Wed, 06 Mar 2019 12:07:32 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 6 Mar 2019 12:07:06 +0100 Message-Id: <20190306110711.309-6-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190306110711.309-1-laurent@vivier.eu> References: <20190306110711.309-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:s071umxow7gW3bvndjA7oh42MFeQuqJhqDtONzEWjTpO/qN/ykg iKC6R+Jo8hBEhR37tckqu/fSHwvJ33/xkvo/ErRhZa/LWeqCoOsIEUgoO3PVg4Yeu8TCb/F 5AWiyU7iFTj6EdpqMu6TL7npMtVcOwEB33ANvjKalvKUBy+h5a6GU+RUnszrzGLICNcZ9fq EJtzh6iZWV8zk/HzF42LA== X-UI-Out-Filterresults: notjunk:1;V03:K0:r9JSroEDBPw=:E63HMxcj/JCD427e3URLqA plene3L/E/zw7OxUACamFbq3TTqL7TcNHVkLHTFhD+Vh5OwoPow0F1zbjGs1RV5yZ9igF1cYF OKh6nTP88HgmzU1TJIg2yoeIuM9ewsYdGDjK3wIr9p/GtA8F46GaR+9U0fXi8ZOXMnnfKbU5z gv4i3Ct+DMlOLZpZWoylJH2CEI5ZQNwUPUzXdH2UbQmqe4hiJBPBIdgRURWYYKQntnYr2bNP7 nvRWnxi5IsSYWQA4qJ+Qx+Sx/RXwXvDHR1EjBqWqbhX4RQ0Dw6ZysBHgiPXGvVTFk3e6vcq2j tEm6eiBsU4tYJ/sHvkMJHhFWCSbQXCKLkkUvSk/tMgz92dWg0jHFM1DWSCNeOeuUWBJ5WvX94 l1/L2a5y52niX0URUMnrUsFEUm9GtcDtBc/puLBXllHLd/tvqvnfOwemzyrc48rg3n75PxXYe NDPGQ9AHtJ8uk24n3iU1zz8NxquA4CgxVAaMlHQJpMRGPPfYSBaF4inIkfBbAjH9lvSZygF7y qa8NP7Vfqs5tJ5wh76KwJvWxar2NfnGnUPf9eQ+238uyjvUQSLaK2NgIECw07EMFZNdC2Jb16 91vHbuSeKxvKJiv9Z7+D7iXVs3helO2of/bNPOCErIiRvGzYKHFJcsis9M3AS9whz77aSYQjs 7zEOS4WT4siZR5NPNWD+1jUBZd5IqttedqCuVoyGyYA7MoWO4VjV4hJ1OJc5A28usHvf5yKHP ejSy2r7okbP7qFXQ9vH4oU8wJ4wuxD/h8CklURPVkbJEX3Wk62mfeQ6p6v4= 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 05/10] block/pflash_cfi02: Fix memory leak and potential use-after-free X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stephen Checkoway , Li Zhijian , "Michael S. Tsirkin" , Michael Tokarev , Paolo Bonzini , zhanghailiang , qemu-block@nongnu.org, qemu-trivial@nongnu.org, Halil Pasic , Christian Borntraeger , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Laurent Vivier , Tony Krowiak , Thomas Huth , Eduardo Habkost , Corey Minyard , Riku Voipio , qemu-s390x@nongnu.org, Pavel Dovgalyuk , Zhang Chen , John Snow , Richard Henderson , Kevin Wolf , Pierre Morel , Cornelia Huck , Laurent Vivier , Max Reitz , Wei Yang , Igor Mammedov Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Stephen Checkoway Don't dynamically allocate the pflash's timer. But do use timer_del in an unrealize function to make sure that the timer can't fire after the pflash_t has been freed. Signed-off-by: Stephen Checkoway Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Wei Yang Message-Id: <20190219153727.62279-1-stephen.checkoway@oberlin.edu> Signed-off-by: Laurent Vivier --- hw/block/pflash_cfi02.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c index 0f8b7b8c7b36..1588aeff5a95 100644 --- a/hw/block/pflash_cfi02.c +++ b/hw/block/pflash_cfi02.c @@ -84,7 +84,7 @@ struct pflash_t { uint16_t unlock_addr0; uint16_t unlock_addr1; uint8_t cfi_table[0x52]; - QEMUTimer *timer; + QEMUTimer timer; /* The device replicates the flash memory across its memory space. Emulate * that by having a container (.mem) filled with an array of aliases * (.mem_mappings) pointing to the flash memory (.orig_mem). @@ -429,7 +429,7 @@ static void pflash_write (pflash_t *pfl, hwaddr offset, } pfl->status = 0x00; /* Let's wait 5 seconds before chip erase is done */ - timer_mod(pfl->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + + timer_mod(&pfl->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + (NANOSECONDS_PER_SECOND * 5)); break; case 0x30: @@ -444,7 +444,7 @@ static void pflash_write (pflash_t *pfl, hwaddr offset, } pfl->status = 0x00; /* Let's wait 1/2 second before sector erase is done */ - timer_mod(pfl->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + + timer_mod(&pfl->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + (NANOSECONDS_PER_SECOND / 2)); break; default: @@ -596,7 +596,7 @@ static void pflash_cfi02_realize(DeviceState *dev, Error **errp) pfl->rom_mode = 1; sysbus_init_mmio(SYS_BUS_DEVICE(dev), &pfl->mem); - pfl->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, pflash_timer, pfl); + timer_init_ns(&pfl->timer, QEMU_CLOCK_VIRTUAL, pflash_timer, pfl); pfl->wcycle = 0; pfl->cmd = 0; pfl->status = 0; @@ -695,11 +695,18 @@ static Property pflash_cfi02_properties[] = { DEFINE_PROP_END_OF_LIST(), }; +static void pflash_cfi02_unrealize(DeviceState *dev, Error **errp) +{ + pflash_t *pfl = CFI_PFLASH02(dev); + timer_del(&pfl->timer); +} + static void pflash_cfi02_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); dc->realize = pflash_cfi02_realize; + dc->unrealize = pflash_cfi02_unrealize; dc->props = pflash_cfi02_properties; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); } From patchwork Wed Mar 6 11:07:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 10840899 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 613951515 for ; Wed, 6 Mar 2019 11:14:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 461BF2D4F3 for ; Wed, 6 Mar 2019 11:14:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 36D342D506; Wed, 6 Mar 2019 11:14:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 331032D4F3 for ; Wed, 6 Mar 2019 11:14:44 +0000 (UTC) Received: from localhost ([127.0.0.1]:59405 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1UVX-0002IB-GQ for patchwork-qemu-devel@patchwork.kernel.org; Wed, 06 Mar 2019 06:14:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35725) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1UPh-0005ML-CI for qemu-devel@nongnu.org; Wed, 06 Mar 2019 06:08:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1UPZ-0002Qy-L6 for qemu-devel@nongnu.org; Wed, 06 Mar 2019 06:08:36 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:50677) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1UPU-0002KE-9V; Wed, 06 Mar 2019 06:08:28 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MRmsG-1gYMv629UI-00TF15; Wed, 06 Mar 2019 12:07:35 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 6 Mar 2019 12:07:07 +0100 Message-Id: <20190306110711.309-7-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190306110711.309-1-laurent@vivier.eu> References: <20190306110711.309-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:MXo0nWgczG8hFMjAG+m9lolAhqLup/TW4UKIlZExh0IDaqcZ+DM BfL51ZR4iLLpAXO4zYKFK8Tpsqgn8XbzP9ntS8/G8Sv+IVKOzlfTJmO1b/DYERPqiD5NSFZ eWxnw2Zaj6WaGX73yg1+AW8RqWkid+ZxbSUMNrDf//OMgBliRXCGHFVgWJoaETqe0QArF/T 53qygLzP0KMaKl16bojuQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:t1zTfUrOd4w=:GM+RaEqSjP8STNxN/PnapQ qlDiqm+uVZSyRgxWqdHNeukaNkOEqEFzOxLsQx3+ELHagyaY/ZKWPFK2wBuEf7UX7/EAjiwc9 Q8/ssmv+lOTuDB+0HFWrBJ8PRmIJftjh+lSy390srKfIIbg57NnOyYMy9PVY30ctr5K7i32eZ a8p2hFY6VirPdewTTb69VOlr+V1ZhZDFaiqCrFR7sV2NkBa196xBKc5I211s2YugehquezZdY drXvrB78XdiS9+xOH5reczUOjjNS1xbkq4vOOTKTP9s1uOnlajcXOUJAOdZSGBvEtKNsuRlfS QOiMdGqCNCA5Ezze4Z9mE0lTUmFuzSfzAI5IexbymnuBJfTYS86kBEUjq9KuBV+Ge06XL419P 7JKOplR9/pr0aSURujSNaFAzqBi66xkrdY1PrguhSSfmDXQumjwH2gGmjwep4F//0DI8JZluS ytyXvyfxQXjFGehrx504McbAwZBM9TSZMgKpk9BwxhMTZxsMbMQ6/BxslsiFxLLaEsA1pfnvw 2ccCHbwwtX2UEiCT7/rToeySRvYyh4+tIqyB6CeLaxy7zFtwjlPONG/e81rsWsy8T3pd7Nb8G p/zRbKuTKEwYaR8fkvLwzU68hyphxiHYj7lQ0vpMd8ufkeuFE2/Xfo8DWuujYEyIDQUFQYtrh CGbEFrNR3K/4JQmF7fCSG8U8RuQK4Tzkt8ltWetFRpyIHi7zbMQII6NI3nTkQkwYX4HlNMWfk imcEtcRDzDlnRUzayoxSo8iVHBlwofEseyUScQ== 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 06/10] doc: fix typos for documents in tree X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Li Zhijian , "Michael S. Tsirkin" , Michael Tokarev , Paolo Bonzini , zhanghailiang , qemu-block@nongnu.org, qemu-trivial@nongnu.org, Like Xu , Halil Pasic , Christian Borntraeger , Laurent Vivier , Tony Krowiak , Thomas Huth , Eduardo Habkost , Corey Minyard , Riku Voipio , qemu-s390x@nongnu.org, Pavel Dovgalyuk , Zhang Chen , John Snow , Richard Henderson , Kevin Wolf , Pierre Morel , Cornelia Huck , Laurent Vivier , Max Reitz , Igor Mammedov Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Like Xu Signed-off-by: Like Xu Reviewed-by: Eric Blake Message-Id: <1550640446-18788-1-git-send-email-like.xu@linux.intel.com> Signed-off-by: Laurent Vivier --- docs/COLO-FT.txt | 2 +- docs/amd-memory-encryption.txt | 2 +- docs/can.txt | 2 +- docs/colo-proxy.txt | 6 +++--- docs/cpu-hotplug.rst | 2 +- docs/qcow2-cache.txt | 2 +- docs/qemu-block-drivers.texi | 2 +- docs/qemu-cpu-models.texi | 8 ++++---- docs/rdma.txt | 4 ++-- docs/replay.txt | 2 +- docs/vfio-ap.txt | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/COLO-FT.txt b/docs/COLO-FT.txt index e2686bb33882..ad24680d130e 100644 --- a/docs/COLO-FT.txt +++ b/docs/COLO-FT.txt @@ -102,7 +102,7 @@ to make sure the state of VM in Secondary side is always consistent with VM in Primary side. COLO Proxy: -Delivers packets to Primary and Seconday, and then compare the responses from +Delivers packets to Primary and Secondary, and then compare the responses from both side. Then decide whether to start a checkpoint according to some rules. Please refer to docs/colo-proxy.txt for more information. diff --git a/docs/amd-memory-encryption.txt b/docs/amd-memory-encryption.txt index f483795eaafe..43bf3ee6a5a9 100644 --- a/docs/amd-memory-encryption.txt +++ b/docs/amd-memory-encryption.txt @@ -97,7 +97,7 @@ References AMD Memory Encryption whitepaper: http://amd-dev.wpengine.netdna-cdn.com/wordpress/media/2013/12/AMD_Memory_Encryption_Whitepaper_v7-Public.pdf -Secure Encrypted Virutualization Key Management: +Secure Encrypted Virtualization Key Management: [1] http://support.amd.com/TechDocs/55766_SEV-KM API_Specification.pdf KVM Forum slides: diff --git a/docs/can.txt b/docs/can.txt index 7ba23b259a48..9fa6ed51c823 100644 --- a/docs/can.txt +++ b/docs/can.txt @@ -99,7 +99,7 @@ Links to other resources https://gitlab.fel.cvut.cz/canbus/qemu-canbus (3) RTEMS page describing project https://devel.rtems.org/wiki/Developer/Simulators/QEMU/CANEmulation - (4) RTLWS 2015 article about the projevt and its use with CANopen emulation + (4) RTLWS 2015 article about the project and its use with CANopen emulation http://rtime.felk.cvut.cz/publications/public/rtlws2015-qemu-can.pdf Slides http://rtime.felk.cvut.cz/publications/public/rtlws2015-qemu-can-slides.pdf diff --git a/docs/colo-proxy.txt b/docs/colo-proxy.txt index 1f8e4b4e7716..fa1cef0278a5 100644 --- a/docs/colo-proxy.txt +++ b/docs/colo-proxy.txt @@ -41,7 +41,7 @@ Below is a COLO proxy ascii figure: | | +------------------------------------------------------+ | | | | |netfilter| | | | | | netfilter | | | | +----------+ +----------------------------+ | | | +-----------------------------------------------------------+ | -| | | | | | out | | | | | | filter excute order | | +| | | | | | out | | | | | | filter execute order | | | | | | +-----------------------------+ | | | | | | +-------------------> | | | | | | | | | | | | | | | | TCP | | | | +-----+--+-+ +-----v----+ +-----v----+ |pri +----+----+sec| | | | +------------+ +---+----+---v+rewriter++ +------------+ | | @@ -53,7 +53,7 @@ Below is a COLO proxy ascii figure: | | | tx | rx rx | | | | | tx all | rx | | | | | | | | | | +-----------------------------------------------------------+ | | | | +--------------+ | | | | | | -| | | filter excute order | | | | | | | +| | | filter execute order | | | | | | | | | | +----------------> | | | +--------------------------------------------------------+ | | +-----------------------------------------+ | | | | | | | | | @@ -92,7 +92,7 @@ but do nothing, just pass to next filter. Redirect Server Filter --> COLO-Compare COLO-compare receive primary guest packet then -waiting scondary redirect packet to compare it. +waiting secondary redirect packet to compare it. If packet same,send queued primary packet and clear queued secondary packet, Otherwise send primary packet and do checkpoint. diff --git a/docs/cpu-hotplug.rst b/docs/cpu-hotplug.rst index 1c268e00b41a..cfeb79f57111 100644 --- a/docs/cpu-hotplug.rst +++ b/docs/cpu-hotplug.rst @@ -137,6 +137,6 @@ From the 'qmp-shell', invoke the QMP ``device_del`` command:: vCPU hot-unplug requires guest cooperation; so the ``device_del`` command above does not guarantee vCPU removal -- it's a "request to unplug". At this point, the guest will get a System Control - Interupt (SCI) and calls the ACPI handler for the affected vCPU + Interrupt (SCI) and calls the ACPI handler for the affected vCPU device. Then the guest kernel will bring the vCPU offline and tell QEMU to unplug it. diff --git a/docs/qcow2-cache.txt b/docs/qcow2-cache.txt index c459bf5dd3b5..c1e7751feae6 100644 --- a/docs/qcow2-cache.txt +++ b/docs/qcow2-cache.txt @@ -55,7 +55,7 @@ value can improve the I/O performance significantly. The refcount blocks ------------------- -The qcow2 format also mantains a reference count for each cluster. +The qcow2 format also maintains a reference count for each cluster. Reference counts are used for cluster allocation and internal snapshots. The data is stored in a two-level structure similar to the L1/L2 tables described above. diff --git a/docs/qemu-block-drivers.texi b/docs/qemu-block-drivers.texi index 38e9f34cc9b8..da06a9bc838d 100644 --- a/docs/qemu-block-drivers.texi +++ b/docs/qemu-block-drivers.texi @@ -632,7 +632,7 @@ qemu-system-i386 -drive file=iscsi://127.0.0.1/iqn.qemu.test/1 \ @end example -Howto set up a simple iSCSI target on loopback and accessing it via QEMU: +How to set up a simple iSCSI target on loopback and access it via QEMU: @example This example shows how to set up an iSCSI target with one CDROM and one DISK using the Linux STGT software target. This target is available on Red Hat based diff --git a/docs/qemu-cpu-models.texi b/docs/qemu-cpu-models.texi index 475d434d52f3..1b725841616b 100644 --- a/docs/qemu-cpu-models.texi +++ b/docs/qemu-cpu-models.texi @@ -49,7 +49,7 @@ live migration safe. The information that follows provides recommendations for configuring CPU models on x86 hosts. The goals are to maximise performance, while protecting guest OS against various CPU hardware flaws, and optionally -enabling live migration between hosts with hetergeneous CPU models. +enabling live migration between hosts with heterogeneous CPU models. @menu * preferred_cpu_models_intel_x86:: Preferred CPU models for Intel x86 hosts @@ -287,7 +287,7 @@ Must be explicitly turned on for all AMD CPU models. This provides higher performance than virt-ssbd so should be exposed to guests whenever available in the host. virt-ssbd should none the less also be exposed for maximum guest -compatability as some kernels only know about virt-ssbd. +compatibility as some kernels only know about virt-ssbd. @item @code{amd-no-ssb} @@ -296,7 +296,7 @@ Recommended to indicate the host is not vulnerable CVE-2018-3639 Not included by default in any AMD CPU model. -Future hardware genarations of CPU will not be vulnerable to +Future hardware generations of CPU will not be vulnerable to CVE-2018-3639, and thus the guest should be told not to enable its mitigations, by exposing amd-no-ssb. This is mutually exclusive with virt-ssbd and amd-ssbd. @@ -451,7 +451,7 @@ MIPS64 Processor (Release 6, 2014) @item @code{Loongson-2F} -MIPS64 Processor (Longsoon 2, 2008) +MIPS64 Processor (Loongson 2, 2008) @item @code{Loongson-2E} diff --git a/docs/rdma.txt b/docs/rdma.txt index e6f990261751..a86e992c8453 100644 --- a/docs/rdma.txt +++ b/docs/rdma.txt @@ -30,7 +30,7 @@ of the significantly lower latency and higher throughput over TCP/IP. This is because the RDMA I/O architecture reduces the number of interrupts and data copies by bypassing the host networking stack. In particular, a TCP-based migration, under certain types of memory-bound workloads, may take a more -unpredicatable amount of time to complete the migration if the amount of +unpredictable amount of time to complete the migration if the amount of memory tracked during each live migration iteration round cannot keep pace with the rate of dirty memory produced by the workload. @@ -408,7 +408,7 @@ socket is broken during a non-RDMA based migration. TODO: ===== 1. Currently, 'ulimit -l' mlock() limits as well as cgroups swap limits - are not compatible with infinband memory pinning and will result in + are not compatible with infiniband memory pinning and will result in an aborted migration (but with the source VM left unaffected). 2. Use of the recent /proc//pagemap would likely speed up the use of KSM and ballooning while using RDMA. diff --git a/docs/replay.txt b/docs/replay.txt index 3497585f5a39..ee6aee9861e7 100644 --- a/docs/replay.txt +++ b/docs/replay.txt @@ -290,7 +290,7 @@ E.g., '-serial stdio' in record mode, and '-serial null' in replay mode. Replay log format ----------------- -Record/replay log consits of the header and the sequence of execution +Record/replay log consists of the header and the sequence of execution events. The header includes 4-byte replay version id and 8-byte reserved field. Version is updated every time replay log format changes to prevent using replay log created by another build of qemu. diff --git a/docs/vfio-ap.txt b/docs/vfio-ap.txt index 8cd060a01e10..b1eb2deeaf2f 100644 --- a/docs/vfio-ap.txt +++ b/docs/vfio-ap.txt @@ -671,7 +671,7 @@ These are the steps: -> IOMMU Hardware Support select S390 AP IOMMU Support -> VFIO Non-Privileged userspace driver framework - -> Mediated device driver frramework + -> Mediated device driver framework -> VFIO driver for Mediated devices -> I/O subsystem -> VFIO support for AP devices From patchwork Wed Mar 6 11:07:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 10840863 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B890017E9 for ; Wed, 6 Mar 2019 11:10:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA0712D57A for ; Wed, 6 Mar 2019 11:10:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D78182D663; Wed, 6 Mar 2019 11:10:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 816E42D57A for ; Wed, 6 Mar 2019 11:10:16 +0000 (UTC) Received: from localhost ([127.0.0.1]:59332 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1URD-0006lw-Lm for patchwork-qemu-devel@patchwork.kernel.org; Wed, 06 Mar 2019 06:10:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35415) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1UPS-00054S-Fq for qemu-devel@nongnu.org; Wed, 06 Mar 2019 06:08:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1UPQ-0002HC-4V for qemu-devel@nongnu.org; Wed, 06 Mar 2019 06:08:26 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:44943) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1UP7-00025X-23; Wed, 06 Mar 2019 06:08:05 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N2E9Y-1h6Kgw3aIQ-013fhD; Wed, 06 Mar 2019 12:07:37 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 6 Mar 2019 12:07:08 +0100 Message-Id: <20190306110711.309-8-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190306110711.309-1-laurent@vivier.eu> References: <20190306110711.309-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:iy9Fh4p9H/qBwx7KAA3FjBD/7mcP34RChIlch90zwVuNjpMHBiR VpyRCXmdKUUhW8/x4XWCFI5DVMeTKyM76C+5ut5aCOsSsQRXM2i2AH0BL3JTsVmlDp/976a iy85M1UuDtWYgmq8NwzYvUVYm/q8MKpEYuMey095OFgAikjulSvrk1ejgWp0dW3YuZn9VN+ ZDdZ9hHXKcvkGotEiXJGw== X-UI-Out-Filterresults: notjunk:1;V03:K0:zkhO5HToiJE=:htkmcj3pW7ulyvj2jdrrV6 FJW28DBRH2+ifVJKKz/wBolclcr0OSCbJ0BjAhY9N1ucSH0+grPm9VXAg4Wkzmz+IVmHnRsLF dFxXn4IsRHgnCqJC4GrAlLxWl7zPb2BTsw8iKID2bjwpIDlNSWJv04fujrus3NCcCKT6+zmyg A4jYNlsL7pBHkVOyW7siCsgFbewX19hOHM0ECyEKldUrLIEejhG7rnajGZDRc9dWuHdQNGWlf so4NiAd0niVpCAtqjxfrl2p+6uT+QDbp8kUJ7d8TEoRdtYYJkKLTWYrt7JqV+XbVJpYLEbKh0 G4DnAfX7wAg5keBJ5gg+erakooBV+83OP2aKYdYx7bPVNdubVKyHt1sPNIvzqjs2dPr6ZDscJ LzESynRko1Fv0Of/OIP65IKo9fChFfIGRGMMTvc8G+Ch87ySSnWlszQYboOzBHarLKQ4sxbwN wU8HOn19h9y4FhkHzs5u+NpQBFf0ampLz7imaUQtIIGn23U8QG12GZ/2S2d0adGdLioks2Q2n k36PFt41NBh/YLjKKBGNlQVZG0o+bRxhnfhv34+a/48bX9ongLuxE8Dyo7/yfRsI/5WtFWY2v V/ePs463vZKKwr+Ewfy3zmr+rTpn/oaxB12+s0ZXYExRMVIrYuutYs/llgZhwHfF2jXgbnwQ5 WKjXFDev+7QUQfwS8ci7Dt9NFlPRYXHSBRuqX3LUwgwf5ZoEKNcd+xmDHgV+UUBUGFJ/f1y1K 7zI38N0ElM5H75NtVYBpGyY+n+zmCvu7Rx/1XqNUHNyB9CySyuXS4Xt3snY= 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 07/10] bswap: Fix accessors syntax in comment X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Li Zhijian , "Michael S. Tsirkin" , Michael Tokarev , Paolo Bonzini , zhanghailiang , qemu-block@nongnu.org, qemu-trivial@nongnu.org, Halil Pasic , Christian Borntraeger , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= , Laurent Vivier , Tony Krowiak , Thomas Huth , Eduardo Habkost , Corey Minyard , Riku Voipio , Richard Henderson , Greg Kurz , qemu-s390x@nongnu.org, Pavel Dovgalyuk , Zhang Chen , John Snow , Richard Henderson , Kevin Wolf , Pierre Morel , Cornelia Huck , Laurent Vivier , Max Reitz , Igor Mammedov Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Greg Kurz All accessors that have an endian infix DO have an underscore between {size} and {endian}. Signed-off-by: Greg Kurz Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Message-Id: <155119086741.1037569.12734854713022304642.stgit@bahia.lan> Signed-off-by: Laurent Vivier --- include/qemu/bswap.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/qemu/bswap.h b/include/qemu/bswap.h index a684c1a7a298..5a70f78c0ba4 100644 --- a/include/qemu/bswap.h +++ b/include/qemu/bswap.h @@ -255,9 +255,9 @@ typedef union { /* * the generic syntax is: * - * load: ld{type}{sign}{size}{endian}_p(ptr) + * load: ld{type}{sign}{size}_{endian}_p(ptr) * - * store: st{type}{size}{endian}_p(ptr, val) + * store: st{type}{size}_{endian}_p(ptr, val) * * Note there are small differences with the softmmu access API! * @@ -293,10 +293,10 @@ typedef union { * * For cases where the size to be used is not fixed at compile time, * there are - * stn{endian}_p(ptr, sz, val) + * stn_{endian}_p(ptr, sz, val) * which stores @val to @ptr as an @endian-order number @sz bytes in size * and - * ldn{endian}_p(ptr, sz) + * ldn_{endian}_p(ptr, sz) * which loads @sz bytes from @ptr as an unsigned @endian-order number * and returns it in a uint64_t. */ From patchwork Wed Mar 6 11:07:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 10840897 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 752801515 for ; Wed, 6 Mar 2019 11:14:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5B31228714 for ; Wed, 6 Mar 2019 11:14:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4AA2628745; Wed, 6 Mar 2019 11:14:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E0E4928714 for ; Wed, 6 Mar 2019 11:14:03 +0000 (UTC) Received: from localhost ([127.0.0.1]:59392 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1UUt-0001iM-3a for patchwork-qemu-devel@patchwork.kernel.org; Wed, 06 Mar 2019 06:14:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35549) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1UPV-00056t-Rk for qemu-devel@nongnu.org; Wed, 06 Mar 2019 06:08:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1UPU-0002LX-Te for qemu-devel@nongnu.org; Wed, 06 Mar 2019 06:08:29 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:58869) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1UPS-0002GH-EL; Wed, 06 Mar 2019 06:08:26 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1M6URj-1gucdO0iYj-006ug8; Wed, 06 Mar 2019 12:07:39 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 6 Mar 2019 12:07:09 +0100 Message-Id: <20190306110711.309-9-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190306110711.309-1-laurent@vivier.eu> References: <20190306110711.309-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:hjaQkpKldsVQqqSyoP/A6VJEXiFYEub3RFFZIk/3U9ajXyMmlXa itzP1bfoNPqxEnI9bgLOepcUpapseOtcETA9IhtDmJMAXxIDw387AQyS+ZIneKMr5Zk1Ld8 xaUJFUwvHjyupxWHPUh8P8X0xYWwbPxr9Uduz1rov1Did4d4Z+LZUxL518aPIrsgd/0ZdfS 5JzoeaYzoDq6xoh9MR4OA== X-UI-Out-Filterresults: notjunk:1;V03:K0:LiOeqshHkeU=:Enu8CMiWNETvPLIwdI6mOz hTTHPIy8JMf0kXKKz4wEjtK+THIBERFVHMiBDU3Cxy5puHoJnLDcNfwtxklPZJD3G1KKNbwUN ytVjDjmqhGxPrCx9XyiLbAeLga/Eu+RPDK864DxgvftmMI4/a1bdGHGc1HFY1aMIKV2Ynmbmj 2vAq5pWvQX+p0cH50nqYzB+uvHw0UR4x4a/K57U0hFGjTBJ7xvGC/NyMwRNy1RD2wjUQDMVKC eW8/lIMJsLvad7RfauaribvISsNxHPaz+YbvHklcUsNnf42fq8RCd0NIDUFscU+6MW3zVsz3M MNoMDpkUHpmlnwPo/e2KmTiD2+r6L70AYaTOOfGuQVUO119/KRwNovvvNRTpSl0KhE6IamTiO yP9L8ZBmQeF97PheiTTqKLopXS1JgxijPslHkaCQE7xdqyifdHp+k7X0LaV/Aa3qmSPANITG2 DjHkl4PpZZ9o1b4Y4MRSfMXqZNaU9Ncu7qM2km+FyoGrmCq1VmXNhQKtMqMN3Ct8UScZIOtZs Idsp3GlAS4LJZpkvjaiE5z6sFmFtyvThv80a0Coz7G30GpomG2fevASJIVW06vNrVNid42Iuw n2imytAe8bTy9yPO/kDwo3oeTBhQM1dGYwQp0/G67dy+ldGcB+UX7ayxSovNy8P4TUtaXTWXH dXvGKiJk+5L+8R1WdgzxSo2lSB7YJG61NwSO8gP3jgerZg/lLdxIxERE4aGJVX7TW2MAy5bkb RjqUaTUmRlSwcHvtzScb5cDimRJaXFQ0mdpTPg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.13 Subject: [Qemu-devel] [PULL 08/10] build: Correct explanation of unnest-vars example X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Li Zhijian , "Michael S. Tsirkin" , Michael Tokarev , Paolo Bonzini , zhanghailiang , qemu-block@nongnu.org, qemu-trivial@nongnu.org, Markus Armbruster , Halil Pasic , Christian Borntraeger , Laurent Vivier , Tony Krowiak , Thomas Huth , Eduardo Habkost , Corey Minyard , Riku Voipio , qemu-s390x@nongnu.org, Pavel Dovgalyuk , Zhang Chen , John Snow , Richard Henderson , Kevin Wolf , Pierre Morel , Cornelia Huck , Laurent Vivier , Max Reitz , Igor Mammedov Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Armbruster Cc: Fam Zheng Signed-off-by: Markus Armbruster Message-Id: <20190213130240.15492-1-armbru@redhat.com> Signed-off-by: Laurent Vivier --- rules.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules.mak b/rules.mak index 86e033d81565..19f3d2c1261d 100644 --- a/rules.mak +++ b/rules.mak @@ -327,7 +327,7 @@ endef # ../water/ice.mo-libs = -licemaker # ../water/ice.mo-objs = ../water/ice1.o ../water/ice2.o # -# Note that 'hot' didn't include 'season/' in the input, so 'summer.o' is not +# Note that 'hot' didn't include 'water/' in the input, so 'steam.o' is not # included. # define unnest-vars From patchwork Wed Mar 6 11:07:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 10840905 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AEF2617E9 for ; Wed, 6 Mar 2019 11:17:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 96B2A2D506 for ; Wed, 6 Mar 2019 11:17:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 893312D69D; Wed, 6 Mar 2019 11:17:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2BC342D506 for ; Wed, 6 Mar 2019 11:17:22 +0000 (UTC) Received: from localhost ([127.0.0.1]:59466 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1UY5-0004LL-Fi for patchwork-qemu-devel@patchwork.kernel.org; Wed, 06 Mar 2019 06:17:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35806) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1UPr-0005Ve-Qb for qemu-devel@nongnu.org; Wed, 06 Mar 2019 06:08:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1UPr-0002ZK-33 for qemu-devel@nongnu.org; Wed, 06 Mar 2019 06:08:51 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:34575) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1UPU-0002Kh-T6; Wed, 06 Mar 2019 06:08:29 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MYNW8-1gWC7j0UWw-00VQsB; Wed, 06 Mar 2019 12:07:41 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 6 Mar 2019 12:07:10 +0100 Message-Id: <20190306110711.309-10-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190306110711.309-1-laurent@vivier.eu> References: <20190306110711.309-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:EIQ2MrmTkDMjQDlxKKFoQHKCip2VxS79yw3nG/bZ7V1n5Rr+kLE HTEMToeoh2ik437K2rRTUXpWRZMoMPU5Iww1wszPUi2/lZLJI9rcv8v6VOuK0JC0q5ozGOz f/o3RI9aruUlmKK4zxMCa17jwGNUGLkxdDD1mJPXM/y0IvvcB1fCOmVwZNHdvEX3NeeRWmT 414lPK51Mi7sruoUoY7bA== X-UI-Out-Filterresults: notjunk:1;V03:K0:8SWa3ZNamPQ=:rc0koxLwhQkQA8WoouhueW IseJO9a4QVonALTfNzYmNkrW7BiSMKrlOhp17GI197eUEz/sI4pFnlO+l6T8LhLUZUvAxQX9u 9kaOAX1E23iIsAImBwSBwCtXrrtcFlxp7UvuydGAMFI00/AreFcW8r7DPRnzg0EYYfBFhGIIN 3Gg4I9gfNETKF7AqF8cfYDvCEcufFDRijudLU3w1loaG6NNxp/od8JSHGtaSuycc5AxXcYWJ8 o6Hk/PG3jIjjr7quHJslvianQjewrD6EQmdYCGWSzGxAC0HoTlHFxpYKzppTyBHsUQx+zaf0w gd3PaQhvYb7uIXASbcnS+WyzTgfZH8WBgM1U/KQ9AU1eYAs+NdDLRMPsYdgOwCtpyEfmvL2Oy imku7StHcguVt7ZaQFuvZTSfzjRJ1tPqXX6I18mnz9+zgCY+Tzkn35Puw2U3nXn/dEmIuOTG2 XnaB7cmqpUMoK7gp7e8xQrIdfAuuXnWujq1sEp7qc9qhC9uI/ftJKSAKIyyUWMUxtzoyOVJq8 bS+/NtIJkKbARdEHzH/OSxmjAs/lGK+Pah9vk0uflUDaD0KoK5AxlvhbpF5GZOiBZgxJ2xdAs BQAaY6Qlx+8z2L8KpgrgaFr3J1mA7pgEFvP18NNykHlNms5iphiu19Y9DFkPT9mBvtNefiqqg e7eZAxGvsg8hntb+lVoMC6te5NsKXmTWMwMIycKgP8738UWVLfYJ0bF42j2mVar1Gt7istfwC 9oCUmpMchm1lJvsDjzxIDSnrOW8+mgT81HrO1Q== 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 09/10] hostmem-file: simplify ifdef-s in file_backend_memory_alloc() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Hajnoczi , Li Zhijian , "Michael S. Tsirkin" , Michael Tokarev , Paolo Bonzini , zhanghailiang , qemu-block@nongnu.org, qemu-trivial@nongnu.org, Halil Pasic , Christian Borntraeger , Laurent Vivier , Tony Krowiak , Thomas Huth , Eduardo Habkost , Corey Minyard , Riku Voipio , qemu-s390x@nongnu.org, Pavel Dovgalyuk , Zhang Chen , John Snow , Richard Henderson , Kevin Wolf , Pierre Morel , Cornelia Huck , Laurent Vivier , Max Reitz , Wei Yang , Igor Mammedov Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Igor Mammedov cleanup file_backend_memory_alloc() by using one CONFIG_POSIX ifdef instead of several ones within the function to make it simpler to follow. Signed-off-by: Igor Mammedov Suggested-by: Wei Yang Reviewed-by: Wei Yang Message-Id: <20190213123858.24620-1-imammedo@redhat.com> Signed-off-by: Stefan Hajnoczi Message-Id: <20190214031004.32522-2-stefanha@redhat.com> [lv: s/hostmem/hostmem-file/] Signed-off-by: Laurent Vivier --- backends/hostmem-file.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c index ba601ce94088..ce5478804804 100644 --- a/backends/hostmem-file.c +++ b/backends/hostmem-file.c @@ -41,10 +41,12 @@ struct HostMemoryBackendFile { static void file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) { +#ifndef CONFIG_POSIX + error_setg(errp, "backend '%s' not supported on this host", + object_get_typename(OBJECT(backend))); +#else HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(backend); -#ifdef CONFIG_POSIX gchar *name; -#endif if (!backend->size) { error_setg(errp, "can't create backend with size 0"); @@ -54,9 +56,6 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) error_setg(errp, "mem-path property not set"); return; } -#ifndef CONFIG_POSIX - error_setg(errp, "-mem-path not supported on this host"); -#else backend->force_prealloc = mem_prealloc; name = host_memory_backend_get_name(backend); memory_region_init_ram_from_file(&backend->mr, OBJECT(backend), From patchwork Wed Mar 6 11:07:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 10840865 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C9ECB1515 for ; Wed, 6 Mar 2019 11:11:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B63DA2D698 for ; Wed, 6 Mar 2019 11:11:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AA2A22D6A0; Wed, 6 Mar 2019 11:11:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4B3012D6A3 for ; Wed, 6 Mar 2019 11:11:05 +0000 (UTC) Received: from localhost ([127.0.0.1]:59338 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1US0-0007e4-6k for patchwork-qemu-devel@patchwork.kernel.org; Wed, 06 Mar 2019 06:11:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35461) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1UPT-00054Z-E3 for qemu-devel@nongnu.org; Wed, 06 Mar 2019 06:08:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1UPS-0002Ir-GX for qemu-devel@nongnu.org; Wed, 06 Mar 2019 06:08:27 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:50005) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1UPQ-0002Be-4M; Wed, 06 Mar 2019 06:08:24 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MmDAc-1hRiOd0R96-00iAIv; Wed, 06 Mar 2019 12:07:43 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 6 Mar 2019 12:07:11 +0100 Message-Id: <20190306110711.309-11-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190306110711.309-1-laurent@vivier.eu> References: <20190306110711.309-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:ON5ZP15R6OYg6VTcqclWhyvlSDa7ZXb7fi8pmRnWMfe+21rMKa7 kK3YBDCnZrSW1Qel06ezhdzr9yWFI/Wl7i7ChTBxu4ZROr11eOEd6KeV10OyAei9iH1i6yD e1NvY/mTXIuj+fcEkY0efPBEw8FyE8YLNgl/hvWw47mOrCAC8BaaHwzM3D1vyzhyKOFd/Uw QOKwL9B0j2QFC5URxaTGQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:lnGteihNptM=:K1xmbRsqeZgjdyeI2f8zEg 0ZEP6WafoiDpZ45BM5JWC9nSVzIRt4NH1wMIUGk1l4JKcGQUgbDBzn0urHLLaEjZVDkLRe9Ti gjFizHkKMmRfcvFgrrgASpeZOGG2B9NhkE1i0TPWuc+GdLJ9KYE0Bvevo8BxeyNcjACjNZjYL 5nJTS38aAPfQtZftuYGY07aB3n9c5rTacACr1jnUCv+GvCpEx9w/GdPoLZySEc+XhxErGhssz igMHJKd9kCLuPqdVOYYsi0uiUFc5vZl5X2WzeLx1PmRRMGaY+1DQRKjpod4q8TtivZKnXM1jm 7eNxkdG7tAuuhDiLI9xI3BmfFKpOqOYGptrR+webIxayKcxX9QqgbTXdOmYjvs04i90RoK/fc ASXiXN7rWPwS1fJQ2jmJCWmjKBGQ4kz40Fb9FCXaeaHbmXNa1J1XIXNS1NjxjZ/uF+ztE7j4M wZKtZrCDu2VORq2dErQY4sZMgR1Zw5NMC+GmOituzO8TAtEjAuRbdEgOUkfnjNE/bY1cU1/Yu DhzS8gJXdIJd7skQ4qn0d9YlfDHsGvVSBECMK3w14cgwKizRP+6PyB2ng0zB/REbiTmoJXWxg ivCF1K+YPHDg4SlvOc7OsYKU4ncRAcJq/Ai6ddjVLjaz3nUKuLjuzJ6TE/ViVDjCgyVpD227v lzzAKrLV0szDqxQXc7PHNSZJ/UHrUwphSDYh1CmPPq9eyw/UfsRsRdgmG/njzJW35nOoDqcIK SeZJMOq7KJNpK15R3TcB9pwWYsihHiqrMgxbUA== 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 10/10] thunk: fix of malloc to g_new X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Hajnoczi , Li Zhijian , "Michael S. Tsirkin" , Michael Tokarev , Paolo Bonzini , zhanghailiang , qemu-block@nongnu.org, qemu-trivial@nongnu.org, Halil Pasic , Christian Borntraeger , Laurent Vivier , Tony Krowiak , Thomas Huth , Eduardo Habkost , Corey Minyard , Riku Voipio , qemu-s390x@nongnu.org, Pavel Dovgalyuk , Zhang Chen , John Snow , Aarushi Mehta , Richard Henderson , Kevin Wolf , Pierre Morel , Cornelia Huck , Laurent Vivier , Max Reitz , Igor Mammedov Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Aarushi Mehta Note that since thunking occurs throughout the lifetime of the QEMU instance, there is no matching 'free' to correct. Signed-off-by: Aarushi Mehta Reviewed-by: Eric Blake Reviewed-by: Stefan Hajnoczi Message-Id: <5310bd5d152fa36c1828a7cbd19fc893739d1609.camel@gmail.com> Signed-off-by: Laurent Vivier --- thunk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thunk.c b/thunk.c index d5d8645cd4f1..17f3d320bb8e 100644 --- a/thunk.c +++ b/thunk.c @@ -89,7 +89,7 @@ void thunk_register_struct(int id, const char *name, const argtype *types) for(i = 0;i < 2; i++) { offset = 0; max_align = 1; - se->field_offsets[i] = malloc(nb_fields * sizeof(int)); + se->field_offsets[i] = g_new(int, nb_fields); type_ptr = se->field_types; for(j = 0;j < nb_fields; j++) { size = thunk_type_size(type_ptr, i);