From nobody Thu May 16 01:40:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1556813914; cv=none; d=zoho.com; s=zohoarc; b=FDZXuNJr0uB1/vkSXL3okZ/5LnFtqxPQm9MkI+uL2G72Hce+7Fh5JGVz5GR2S8YbcuGT/vgIZwciwkuWsz7rm1M/xWfiymg0p7TH4u3D6uyNOlP+s2kqnU05IrOZYihIrAj8rEQGDgXoVcIw3rxQJxHsGI4J3JYZQUAzYAci0MI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556813914; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=31Cy2HWFKqlxjRC9wTkMlsS6SXv8tuCBYCCtibTWxW4=; b=jfjZzqpktCJf+Ec3Hiv+Xcupoggh/J/biP/MMO7+lzahPpOvCWyCsjQOaDcus03MT2bYoUCq5X9qJNe6JJ8VuFnWmHB3KBJ4kRumn1OIravvdGqYVlx5L1YvMgw+JxnYX90SYd+DbCdYUKQ70EvLrs9bjQUK0losH2PzR28k3HQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556813914565489.39294601533277; Thu, 2 May 2019 09:18:34 -0700 (PDT) Received: from localhost ([127.0.0.1]:54056 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMEPj-0008Ri-Du for importer@patchew.org; Thu, 02 May 2019 12:18:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43226) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMEKu-00048I-0V for qemu-devel@nongnu.org; Thu, 02 May 2019 12:13:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMEKt-0002JP-5V for qemu-devel@nongnu.org; Thu, 02 May 2019 12:13:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42520) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMEKt-0002JD-02 for qemu-devel@nongnu.org; Thu, 02 May 2019 12:13:27 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 45C233151C40; Thu, 2 May 2019 16:13:26 +0000 (UTC) Received: from thuth.com (ovpn-116-131.ams2.redhat.com [10.36.116.131]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B55E17D58; Thu, 2 May 2019 16:13:24 +0000 (UTC) From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Date: Thu, 2 May 2019 18:13:03 +0200 Message-Id: <20190502161310.15624-2-thuth@redhat.com> In-Reply-To: <20190502161310.15624-1-thuth@redhat.com> References: <20190502161310.15624-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Thu, 02 May 2019 16:13:26 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/8] gitlab-ci.yml: Test the TCG interpreter in a CI pipeline 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: Eduardo Otubo , Helge Deller , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" So far we do not have any test coverage for TCI (the TCG interpreter) yet. Thus let's add a CI pipeline that runs at least some basic TCG tests with a TCI build, to make sure that there are no further regressions. Message-Id: <20190410123550.2362-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- .gitlab-ci.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 79d02cf740..c63bf2f822 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -71,3 +71,18 @@ build-clang: ppc-softmmu s390x-softmmu x86_64-softmmu arm-linux-us= er" - make -j2 - make -j2 check + +build-tci: + script: + - TARGETS=3D"aarch64 alpha arm hppa m68k microblaze moxie ppc64 s390x x86= _64" + - ./configure --enable-tcg-interpreter + --target-list=3D"$(for tg in $TARGETS; do echo -n ${tg}'-softmmu '; = done)" + - make -j2 + - make tests/boot-serial-test tests/cdrom-test tests/pxe-test + - for tg in $TARGETS ; do + export QTEST_QEMU_BINARY=3D"${tg}-softmmu/qemu-system-${tg}" ; + ./tests/boot-serial-test || exit 1 ; + ./tests/cdrom-test || exit 1 ; + done + - QTEST_QEMU_BINARY=3D"x86_64-softmmu/qemu-system-x86_64" ./tests/pxe-test + - QTEST_QEMU_BINARY=3D"s390x-softmmu/qemu-system-s390x" ./tests/pxe-test = -m slow --=20 2.21.0 From nobody Thu May 16 01:40:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1556814078; cv=none; d=zoho.com; s=zohoarc; b=g4L3PVX/phxSysOxSWXNPyA5yGGBccfPZztXJIrfvtTOfyQxuBHcxa/lmnRaFNS6gqh2Za5lqc7bf+VZUVwoGkIiP6Qj22JKp/0LfnCZwc/316GTFvYbu8RMEveBaWaCXPFpG/b5MMSCUN79PAkhftXd4GcOAbMu2v4Ww7fJpPA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556814078; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=QcWk7/L0Qb49nB3TNhLavdByFP8qVMOcIuRmePisHB0=; b=iYdOaQMlEJXqLtVmw2F5UFzRHmy0P6lHHMwCGrntE9WXbV41d4o+fuUDGYmZmzGDsI38ZjzrjFlBYpkVToeHI2JV9gw90Mh2rG1Grwy1OIBnmVnmXXjr/sSmXALWnr90k3afp/V7iMZ3K7ojSg+xEIgcbcRu6gwMBxUzjBfL/nQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556814078110879.0191240279421; Thu, 2 May 2019 09:21:18 -0700 (PDT) Received: from localhost ([127.0.0.1]:54110 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMESP-0002Yn-R0 for importer@patchew.org; Thu, 02 May 2019 12:21:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43239) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMEKw-00049j-5c for qemu-devel@nongnu.org; Thu, 02 May 2019 12:13:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMEKv-0002Js-3P for qemu-devel@nongnu.org; Thu, 02 May 2019 12:13:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38856) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMEKu-0002Jk-Rn for qemu-devel@nongnu.org; Thu, 02 May 2019 12:13:29 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1F00459450; Thu, 2 May 2019 16:13:28 +0000 (UTC) Received: from thuth.com (ovpn-116-131.ams2.redhat.com [10.36.116.131]) by smtp.corp.redhat.com (Postfix) with ESMTP id A0F8D17D58; Thu, 2 May 2019 16:13:26 +0000 (UTC) From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Date: Thu, 2 May 2019 18:13:04 +0200 Message-Id: <20190502161310.15624-3-thuth@redhat.com> In-Reply-To: <20190502161310.15624-1-thuth@redhat.com> References: <20190502161310.15624-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 02 May 2019 16:13:28 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/8] qtest: Move accel code to accel/qtest.c 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: Eduardo Otubo , Helge Deller , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Eduardo Habkost QTest has two parts: the server (-qtest) and the accelerator (-machine accel=3Dqtest). The accelerator depends on CONFIG_POSIX due to its usage of sigwait(), but the server doesn't. Move the accel code to accel/qtest.c. Later we will disable compilation of accel/qtest.c on non-POSIX systems. Signed-off-by: Eduardo Habkost Message-Id: <20190422210448.2488-2-ehabkost@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 [thuth: added fixup for MAINTAINERS file] Signed-off-by: Thomas Huth --- MAINTAINERS | 1 + accel/Makefile.objs | 1 + accel/qtest.c | 55 +++++++++++++++++++++++++++++++++++++++++++++ qtest.c | 34 ---------------------------- 4 files changed, 57 insertions(+), 34 deletions(-) create mode 100644 accel/qtest.c diff --git a/MAINTAINERS b/MAINTAINERS index 7dd71e0a2d..66ddbda9c9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2035,6 +2035,7 @@ M: Laurent Vivier R: Paolo Bonzini S: Maintained F: qtest.c +F: accel/qtest.c F: tests/libqtest.* F: tests/libqos/ F: tests/*-test.c diff --git a/accel/Makefile.objs b/accel/Makefile.objs index c3718a10c5..2a5ed46940 100644 --- a/accel/Makefile.objs +++ b/accel/Makefile.objs @@ -1,4 +1,5 @@ obj-$(CONFIG_SOFTMMU) +=3D accel.o +obj-$(CONFIG_SOFTMMU) +=3D qtest.o obj-$(CONFIG_KVM) +=3D kvm/ obj-$(CONFIG_TCG) +=3D tcg/ obj-y +=3D stubs/ diff --git a/accel/qtest.c b/accel/qtest.c new file mode 100644 index 0000000000..a02b3c26c7 --- /dev/null +++ b/accel/qtest.c @@ -0,0 +1,55 @@ +/* + * QTest accelerator code + * + * Copyright IBM, Corp. 2011 + * + * Authors: + * Anthony Liguori + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + * + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qemu/module.h" +#include "qemu/option.h" +#include "qemu/config-file.h" +#include "sysemu/accel.h" +#include "sysemu/qtest.h" +#include "sysemu/cpus.h" + +static int qtest_init_accel(MachineState *ms) +{ + QemuOpts *opts =3D qemu_opts_create(qemu_find_opts("icount"), NULL, 0, + &error_abort); + qemu_opt_set(opts, "shift", "0", &error_abort); + configure_icount(opts, &error_abort); + qemu_opts_del(opts); + return 0; +} + +static void qtest_accel_class_init(ObjectClass *oc, void *data) +{ + AccelClass *ac =3D ACCEL_CLASS(oc); + ac->name =3D "QTest"; + ac->available =3D qtest_available; + ac->init_machine =3D qtest_init_accel; + ac->allowed =3D &qtest_allowed; +} + +#define TYPE_QTEST_ACCEL ACCEL_CLASS_NAME("qtest") + +static const TypeInfo qtest_accel_type =3D { + .name =3D TYPE_QTEST_ACCEL, + .parent =3D TYPE_ACCEL, + .class_init =3D qtest_accel_class_init, +}; + +static void qtest_type_init(void) +{ + type_register_static(&qtest_accel_type); +} + +type_init(qtest_type_init); diff --git a/qtest.c b/qtest.c index 527141785f..f2e2f27778 100644 --- a/qtest.c +++ b/qtest.c @@ -749,16 +749,6 @@ static void qtest_event(void *opaque, int event) } } =20 -static int qtest_init_accel(MachineState *ms) -{ - QemuOpts *opts =3D qemu_opts_create(qemu_find_opts("icount"), NULL, 0, - &error_abort); - qemu_opt_set(opts, "shift", "0", &error_abort); - configure_icount(opts, &error_abort); - qemu_opts_del(opts); - return 0; -} - void qtest_init(const char *qtest_chrdev, const char *qtest_log, Error **e= rrp) { Chardev *chr; @@ -791,27 +781,3 @@ bool qtest_driver(void) { return qtest_chr.chr !=3D NULL; } - -static void qtest_accel_class_init(ObjectClass *oc, void *data) -{ - AccelClass *ac =3D ACCEL_CLASS(oc); - ac->name =3D "QTest"; - ac->available =3D qtest_available; - ac->init_machine =3D qtest_init_accel; - ac->allowed =3D &qtest_allowed; -} - -#define TYPE_QTEST_ACCEL ACCEL_CLASS_NAME("qtest") - -static const TypeInfo qtest_accel_type =3D { - .name =3D TYPE_QTEST_ACCEL, - .parent =3D TYPE_ACCEL, - .class_init =3D qtest_accel_class_init, -}; - -static void qtest_type_init(void) -{ - type_register_static(&qtest_accel_type); -} - -type_init(qtest_type_init); --=20 2.21.0 From nobody Thu May 16 01:40:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1556813914; cv=none; d=zoho.com; s=zohoarc; b=NAopmzhvrLYkrfiM//tX/bsV6LbwyMEWroam6fB192/u6w9u1gY/rXu/ITkH66YP4mwh7I/BLY6FMeTxMocCj220FZIt8q5aipGvZKo4TaKNoK5ZpvtUg5dm+Q/9DrfrfpExTSKAc4LzyQefguEx0LSyor6fmDtROVl43z2TRNw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556813914; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=GR71Lrq/MQ90JlNk7CyLUda0fAw89paGzeE7f07I90A=; b=lCzECLSQ2b6OEIxdavfzydEjvRoqThsalgH9+a/I6RPsEfplG8qzqF7IFLZlo0QP7eUfhUvZwQPo/Srm8oDXMdioc9IAAdh767IV+TsXuC2O6hebeW/jf2z6+T6cZQFUx01Mk0DOukYDy9E7Mruh7oLRWJMFjmRxjHmyJh6Imjg= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556813914573984.1671318832208; Thu, 2 May 2019 09:18:34 -0700 (PDT) Received: from localhost ([127.0.0.1]:54058 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMEPn-00006l-5p for importer@patchew.org; Thu, 02 May 2019 12:18:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43257) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMEKx-0004Ay-NN for qemu-devel@nongnu.org; Thu, 02 May 2019 12:13:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMEKw-0002KT-Rn for qemu-devel@nongnu.org; Thu, 02 May 2019 12:13:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56400) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMEKw-0002KA-Mp for qemu-devel@nongnu.org; Thu, 02 May 2019 12:13:30 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EEA6C356F2; Thu, 2 May 2019 16:13:29 +0000 (UTC) Received: from thuth.com (ovpn-116-131.ams2.redhat.com [10.36.116.131]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B73817D58; Thu, 2 May 2019 16:13:28 +0000 (UTC) From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Date: Thu, 2 May 2019 18:13:05 +0200 Message-Id: <20190502161310.15624-4-thuth@redhat.com> In-Reply-To: <20190502161310.15624-1-thuth@redhat.com> References: <20190502161310.15624-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 02 May 2019 16:13:30 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 3/8] qtest: Don't compile qtest accel on non-POSIX systems 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: Eduardo Otubo , Helge Deller , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Eduardo Habkost qtest_available() will always return 0 on non-POSIX systems. It's simpler to just not compile the accelerator code on those systems instead of relying on the AccelClass::available function. Signed-off-by: Eduardo Habkost Message-Id: <20190422210448.2488-3-ehabkost@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 [on mingw64] Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- accel/Makefile.objs | 2 +- accel/qtest.c | 1 - include/sysemu/qtest.h | 9 --------- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/accel/Makefile.objs b/accel/Makefile.objs index 2a5ed46940..8b498d39d8 100644 --- a/accel/Makefile.objs +++ b/accel/Makefile.objs @@ -1,5 +1,5 @@ obj-$(CONFIG_SOFTMMU) +=3D accel.o -obj-$(CONFIG_SOFTMMU) +=3D qtest.o +obj-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_POSIX)) +=3D qtest.o obj-$(CONFIG_KVM) +=3D kvm/ obj-$(CONFIG_TCG) +=3D tcg/ obj-y +=3D stubs/ diff --git a/accel/qtest.c b/accel/qtest.c index a02b3c26c7..5b88f55921 100644 --- a/accel/qtest.c +++ b/accel/qtest.c @@ -34,7 +34,6 @@ static void qtest_accel_class_init(ObjectClass *oc, void = *data) { AccelClass *ac =3D ACCEL_CLASS(oc); ac->name =3D "QTest"; - ac->available =3D qtest_available; ac->init_machine =3D qtest_init_accel; ac->allowed =3D &qtest_allowed; } diff --git a/include/sysemu/qtest.h b/include/sysemu/qtest.h index 70aa40aa72..096ddfc20c 100644 --- a/include/sysemu/qtest.h +++ b/include/sysemu/qtest.h @@ -27,13 +27,4 @@ bool qtest_driver(void); =20 void qtest_init(const char *qtest_chrdev, const char *qtest_log, Error **e= rrp); =20 -static inline int qtest_available(void) -{ -#ifdef CONFIG_POSIX - return 1; -#else - return 0; -#endif -} - #endif --=20 2.21.0 From nobody Thu May 16 01:40:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1556814088; cv=none; d=zoho.com; s=zohoarc; b=Blr/6nTGWMYy3QaosgF3pZnJ/nLvDrOAMNKGTZoDyNvbhLbVo7sn0uvW04KFuChGt/ONa9i9SGBhTfUBgbjtySyJYv01AWbiUNkys8lQb2vwkggqgvJsGmU9b2GjodvL3tEgi7+s4kOR/spvH2zCCqanowouPhFdahX/bvb8I6A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556814088; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=w2Wztt0TS28owjj1bfah0zELKhnQrOHFW5h4wNr9ZRc=; b=g+ZQq3T1D8SKX2AtNiGMVeRqCIEPNNk7WAP/GKk5GCmgF1gk5UOuUPxpwXxIBAtckpmf4r1QQ2m+hZnALBFvP+gI5WlBuSBtLojzl89Oh7pTvJcgDPx119Pf/8yz3pqCdsLf3lKe6CCyixp75XMpJDmQ+YKuP122B3GP+pyKaTk= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556814088939937.3058973503609; Thu, 2 May 2019 09:21:28 -0700 (PDT) Received: from localhost ([127.0.0.1]:54112 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMESV-0002bg-TM for importer@patchew.org; Thu, 02 May 2019 12:21:19 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43274) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMEKz-0004Ck-RC for qemu-devel@nongnu.org; Thu, 02 May 2019 12:13:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMEKy-0002LA-VM for qemu-devel@nongnu.org; Thu, 02 May 2019 12:13:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50546) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMEKy-0002L2-Q0 for qemu-devel@nongnu.org; Thu, 02 May 2019 12:13:32 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1AF5183F4C; Thu, 2 May 2019 16:13:32 +0000 (UTC) Received: from thuth.com (ovpn-116-131.ams2.redhat.com [10.36.116.131]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6D50917D58; Thu, 2 May 2019 16:13:30 +0000 (UTC) From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Date: Thu, 2 May 2019 18:13:06 +0200 Message-Id: <20190502161310.15624-5-thuth@redhat.com> In-Reply-To: <20190502161310.15624-1-thuth@redhat.com> References: <20190502161310.15624-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 02 May 2019 16:13:32 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 4/8] accel: Remove unused AccelClass::available field 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: Eduardo Otubo , Helge Deller , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Eduardo Habkost The field is not used anymore, we can remove it. Signed-off-by: Eduardo Habkost Message-Id: <20190422210448.2488-4-ehabkost@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 [on mingw64] Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- accel/accel.c | 5 ----- include/sysemu/accel.h | 1 - 2 files changed, 6 deletions(-) diff --git a/accel/accel.c b/accel/accel.c index 454fef9d92..5fa31717b4 100644 --- a/accel/accel.c +++ b/accel/accel.c @@ -107,11 +107,6 @@ void configure_accelerator(MachineState *ms, const cha= r *progname) if (!acc) { continue; } - if (acc->available && !acc->available()) { - printf("%s not supported for this target\n", - acc->name); - continue; - } ret =3D accel_init_machine(acc, ms); if (ret < 0) { init_failed =3D true; diff --git a/include/sysemu/accel.h b/include/sysemu/accel.h index 5565e00a96..70e9e2f2a1 100644 --- a/include/sysemu/accel.h +++ b/include/sysemu/accel.h @@ -38,7 +38,6 @@ typedef struct AccelClass { =20 const char *opt_name; const char *name; - int (*available)(void); int (*init_machine)(MachineState *ms); void (*setup_post)(MachineState *ms, AccelState *accel); bool *allowed; --=20 2.21.0 From nobody Thu May 16 01:40:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1556813724; cv=none; d=zoho.com; s=zohoarc; b=XvJtunH7bQGkDfmBFwfjQ2CcUz2LpU88pZnx9hihKIurCr4cdDVw3ffGHdRuuxZQifU9rQGQVVlNlPiz8onxK/OkC7cgvsFsUgJ8cik+2u7d4lJQGZHV30rmbuD8jgxmRTbeHB758bphLRm+w1t1aewej9Sq4CzBv3LF1SOn/t0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556813724; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=7XBnt1cWLGa4v1aoUSX/9FwJlQ1G2qHisMyZGM23W+w=; b=M9Cn2RFYsRipCnoHoJwWkyrEV3Mdj6BkzL4Kyy9bVbDZqcPcPINeVa5/RPk8MVRAW0Wm/SGaJIGRx8ExugxrGWbMnow61Bd+SfwlRL7zScTG+4nC8LVq2gNXWfpFe5uyzqQdeC2roNYKAg1cia/gp+id9LgXwgOJ7VOtWtdwi6w= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556813724924721.0886297712832; Thu, 2 May 2019 09:15:24 -0700 (PDT) Received: from localhost ([127.0.0.1]:54004 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMEMl-0005UU-R9 for importer@patchew.org; Thu, 02 May 2019 12:15:23 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43287) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMEL1-0004E0-PH for qemu-devel@nongnu.org; Thu, 02 May 2019 12:13:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMEL0-0002LW-Sc for qemu-devel@nongnu.org; Thu, 02 May 2019 12:13:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46911) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMEL0-0002LO-Lq for qemu-devel@nongnu.org; Thu, 02 May 2019 12:13:34 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EDCD630024D2; Thu, 2 May 2019 16:13:33 +0000 (UTC) Received: from thuth.com (ovpn-116-131.ams2.redhat.com [10.36.116.131]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A88F17D58; Thu, 2 May 2019 16:13:32 +0000 (UTC) From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Date: Thu, 2 May 2019 18:13:07 +0200 Message-Id: <20190502161310.15624-6-thuth@redhat.com> In-Reply-To: <20190502161310.15624-1-thuth@redhat.com> References: <20190502161310.15624-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Thu, 02 May 2019 16:13:34 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 5/8] configure: Add -Wno-typedef-redefinition to CFLAGS (for Clang) 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: Eduardo Otubo , Helge Deller , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Without the -Wno-typedef-redefinition option, clang complains if a typedef gets redefined in gnu99 mode (since this is officially a C11 feature). This used to also happen with older versions of GCC, but since we've bumped our minimum GCC version to 4.8, all versions of GCC that we support do not seem to issue this warning in gnu99 mode anymore. So this has become a common problem for people who only test their code with GCC - they do not notice the issue until they submit their patches and suddenly patchew or a maintainer complains. Now that we do not urgently need to keep the code clean from typedef redefintions anymore with recent versions of GCC, we can ease the situation with clang, too, and simply shut these warnings off for good. Reviewed-by: Richard Henderson Message-Id: <20190427154539.11336-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 60719ddcc5..362bfef637 100755 --- a/configure +++ b/configure @@ -1908,7 +1908,7 @@ gcc_flags=3D"-Wformat-security -Wformat-y2k -Winit-se= lf -Wignored-qualifiers $gcc_ gcc_flags=3D"-Wno-missing-include-dirs -Wempty-body -Wnested-externs $gcc_= flags" gcc_flags=3D"-Wendif-labels -Wno-shift-negative-value $gcc_flags" gcc_flags=3D"-Wno-initializer-overrides -Wexpansion-to-defined $gcc_flags" -gcc_flags=3D"-Wno-string-plus-int $gcc_flags" +gcc_flags=3D"-Wno-string-plus-int -Wno-typedef-redefinition $gcc_flags" # Note that we do not add -Werror to gcc_flags here, because that would # enable it for all configure tests. If a configure test failed due # to -Werror this would just silently disable some features, --=20 2.21.0 From nobody Thu May 16 01:40:23 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1556813937; cv=none; d=zoho.com; s=zohoarc; b=OcWOV9CPdS+JsOUzmo82qiXtqV/g5L8OMKw6zFsrVCHhfCd1AfiZ1cRAJwAu2y83cNB9J21hqy6gHX3tspN0eO53QzDbmxhnN0b9etxmvouKUshxyecrO81w86bTya17nDi8/kUSCOEfS68Fn3pxfVzbrQUwqCsln4lajXhGuvY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556813937; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=lxd5dK5aq1fCdGt8l55RQz+A9D3Mb7WJ4ST/H0qPD+A=; b=VQ/XbKfbsUz8GcBSErp4uBk874Gj1rGHZnK0YKvUJrKZBjzwk0Z8gEpMPx12fVRO0fTudTvnnCWmoy97wIofkOmnWDKRNBXk1+3UDvGkQ7pW7DR4LtDLPBciubs5B3CNKfzyC/v0xK3ZGgq4L+ocZFGruFXnoP8/p26ncazXHX4= ARC-Authentication-Results: i=1; mx.zoho.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556813937238934.7610545098524; Thu, 2 May 2019 09:18:57 -0700 (PDT) Received: from localhost ([127.0.0.1]:54060 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMEQ1-0000NI-55 for importer@patchew.org; Thu, 02 May 2019 12:18:45 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43301) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMEL3-0004FI-Bn for qemu-devel@nongnu.org; Thu, 02 May 2019 12:13:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMEL2-0002Lp-Gu for qemu-devel@nongnu.org; Thu, 02 May 2019 12:13:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37030) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMEL2-0002Li-By for qemu-devel@nongnu.org; Thu, 02 May 2019 12:13:36 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A3C788830A; Thu, 2 May 2019 16:13:35 +0000 (UTC) Received: from thuth.com (ovpn-116-131.ams2.redhat.com [10.36.116.131]) by smtp.corp.redhat.com (Postfix) with ESMTP id 596BF17D58; Thu, 2 May 2019 16:13:34 +0000 (UTC) From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Date: Thu, 2 May 2019 18:13:08 +0200 Message-Id: <20190502161310.15624-7-thuth@redhat.com> In-Reply-To: <20190502161310.15624-1-thuth@redhat.com> References: <20190502161310.15624-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 02 May 2019 16:13:35 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 6/8] configure: Remove old *-config-devices.mak.d files when running configure 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: Eduardo Otubo , Helge Deller , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" When running "make" in a build directory from the pre-Kconfig merge time, the build process currently fails with: make: *** No rule to make target `.../default-configs/pci.mak', needed by `aarch64-softmmu/config-devices.mak'. Stop. To make sure that this problem at least goes away when the user runs "configure" (or "sh config.status") again, we have to make sure that we re-generate the .mak.d files. Thus remove the old stale files while running the configure script. Message-Id: <1552300145-12526-1-git-send-email-thuth@redhat.com> Signed-off-by: Thomas Huth --- configure | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure b/configure index 362bfef637..f14b25c49c 100755 --- a/configure +++ b/configure @@ -1818,6 +1818,9 @@ EOF exit 0 fi =20 +# Remove old dependency files to make sure that they get properly regenera= ted +rm -f *-config-devices.mak.d + if ! has $python; then error_exit "Python not found. Use --python=3D/path/to/python" fi --=20 2.21.0 From nobody Thu May 16 01:40:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1556813731; cv=none; d=zoho.com; s=zohoarc; b=G2nzmnXfd8jkOxl/BLBYpY8M8V0kHy5hN3wz1bRAJ4+g3yPZ3X+mz3u04G4lIF23R8UUBLeaSIbEsWcDKc239fM79fVU7Yf6iASz71SbYf7ODvrqsHHDTeDdsDsu0cButHxvtLjkhuWXL/K4QnrssMY39W/zJiFec/a07boVYs4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556813731; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=OmsdsOg0+ptiUQ7Ylsv9raUvBLQMAyhfjZoMq5TtMaA=; b=Xr8cVRkXf0tpcjy/nzNtqSn5RdEVadIr0Qfk1BarFYD4h2/B8kx56DRzYUIvxtDtgrtRwpdwYghpng/vcAXNushqS6oChotvquLtsXLa2uk3kunnJEESeQdudWk5N42aDTq8qgxkE0UDYkSNe2Ur8PZqRMg9bD7qqyUikn8Pkc0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556813731493163.13572230821057; Thu, 2 May 2019 09:15:31 -0700 (PDT) Received: from localhost ([127.0.0.1]:54006 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMEMq-0005Zs-BN for importer@patchew.org; Thu, 02 May 2019 12:15:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43317) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMEL5-0004H6-Cg for qemu-devel@nongnu.org; Thu, 02 May 2019 12:13:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMEL4-0002MP-Cm for qemu-devel@nongnu.org; Thu, 02 May 2019 12:13:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33760) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMEL4-0002MD-6v for qemu-devel@nongnu.org; Thu, 02 May 2019 12:13:38 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 80EF73086237; Thu, 2 May 2019 16:13:37 +0000 (UTC) Received: from thuth.com (ovpn-116-131.ams2.redhat.com [10.36.116.131]) by smtp.corp.redhat.com (Postfix) with ESMTP id 149BA1837B; Thu, 2 May 2019 16:13:35 +0000 (UTC) From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Date: Thu, 2 May 2019 18:13:09 +0200 Message-Id: <20190502161310.15624-8-thuth@redhat.com> In-Reply-To: <20190502161310.15624-1-thuth@redhat.com> References: <20190502161310.15624-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 02 May 2019 16:13:37 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 7/8] configure: Relax check for libseccomp 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: Eduardo Otubo , Helge Deller , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Helge Deller All major distributions do support libseccomp version >=3D 2.3.0, so there is no need to special-case on various architectures any longer. Signed-off-by: Helge Deller Message-Id: <20190404183923.GA22347@ls3530.dellerweb.de> Reviewed-by: Thomas Huth Acked-by: Eduardo Otubo Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- configure | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/configure b/configure index f14b25c49c..3a9bee2621 100755 --- a/configure +++ b/configure @@ -2374,36 +2374,16 @@ fi ########################################## # libseccomp check =20 -libseccomp_minver=3D"2.2.0" if test "$seccomp" !=3D "no" ; then - case "$cpu" in - i386|x86_64|mips) - ;; - arm|aarch64) - libseccomp_minver=3D"2.2.3" - ;; - ppc|ppc64|s390x) - libseccomp_minver=3D"2.3.0" - ;; - *) - libseccomp_minver=3D"" - ;; - esac - - if test "$libseccomp_minver" !=3D "" && - $pkg_config --atleast-version=3D$libseccomp_minver libseccomp ; then + libseccomp_minver=3D"2.3.0" + if $pkg_config --atleast-version=3D$libseccomp_minver libseccomp ; then seccomp_cflags=3D"$($pkg_config --cflags libseccomp)" seccomp_libs=3D"$($pkg_config --libs libseccomp)" seccomp=3D"yes" else if test "$seccomp" =3D "yes" ; then - if test "$libseccomp_minver" !=3D "" ; then - feature_not_found "libseccomp" \ - "Install libseccomp devel >=3D $libseccomp_minver" - else - feature_not_found "libseccomp" \ - "libseccomp is not supported for host cpu $cpu" - fi + feature_not_found "libseccomp" \ + "Install libseccomp devel >=3D $libseccomp_minver" fi seccomp=3D"no" fi --=20 2.21.0 From nobody Thu May 16 01:40:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1556814200; cv=none; d=zoho.com; s=zohoarc; b=nH/DUJ2n9Q5WtiGs0DYUyYfYPUC3pu/7x/b96N2cciIt/dOp0K24ot33OFxahcMSXTmLdAjiIhybS4tUk4qfTkQCUQK/dh49tekr7i6IOefrJ6qU7fr1kOpM0v1/h+EMBDRtvzEWzaPwVYES1kVn0NFaxKKijUmaPpRiB47/I4g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556814200; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=1OhOlz3h1UN+dm847TgM8QbNn5Oo/9mvm5xEq2goDhI=; b=R2KKR0zyRPaTVyGEQW/N6FoGtBeDK65xiEE7NHJzr2Oz/O0we8USjQxDiOJViuTaZ7387UZ0Vu88Skh2WMisIzhaIx+eBuJLrzIgDsxeafjALR8En7/4og7VRu2VGE60jgRCsujMQRQTYyZWtj2tY2B8XKuTwfUjp6olwxLutVw= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556814200837314.09276442461396; Thu, 2 May 2019 09:23:20 -0700 (PDT) Received: from localhost ([127.0.0.1]:54135 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMEUO-0004KY-SE for importer@patchew.org; Thu, 02 May 2019 12:23:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43335) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMEL8-0004Ky-WC for qemu-devel@nongnu.org; Thu, 02 May 2019 12:13:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMEL6-0002NH-Au for qemu-devel@nongnu.org; Thu, 02 May 2019 12:13:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56448) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMEL6-0002Mi-3C for qemu-devel@nongnu.org; Thu, 02 May 2019 12:13:40 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5F3CD356F6; Thu, 2 May 2019 16:13:39 +0000 (UTC) Received: from thuth.com (ovpn-116-131.ams2.redhat.com [10.36.116.131]) by smtp.corp.redhat.com (Postfix) with ESMTP id DCD7A17D58; Thu, 2 May 2019 16:13:37 +0000 (UTC) From: Thomas Huth To: Peter Maydell , qemu-devel@nongnu.org Date: Thu, 2 May 2019 18:13:10 +0200 Message-Id: <20190502161310.15624-9-thuth@redhat.com> In-Reply-To: <20190502161310.15624-1-thuth@redhat.com> References: <20190502161310.15624-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 02 May 2019 16:13:39 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 8/8] hw/pci-host: Use object_initialize_child for correct reference counting 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: Eduardo Otubo , Helge Deller , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Both functions, object_initialize() and object_property_add_child() increase the reference counter of the new object, so one of the references has to be dropped afterwards to get the reference counting right. Otherwise the child object might not be properly cleaned up when the parent gets destroyed. Some functions of the pci-host devices miss to drop one of the references. Fix it by using object_initialize_child() instead, which takes care of calling object_initialize(), object_property_add_child() and object_unref() in the right order. Suggested-by: Eduardo Habkost Message-Id: <20190430191552.4027-1-thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- hw/pci-host/designware.c | 4 ++-- hw/pci-host/gpex.c | 5 +++-- hw/pci-host/q35.c | 4 ++-- hw/pci-host/xilinx-pcie.c | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/hw/pci-host/designware.c b/hw/pci-host/designware.c index 29ea313798..64ad21d295 100644 --- a/hw/pci-host/designware.c +++ b/hw/pci-host/designware.c @@ -721,8 +721,8 @@ static void designware_pcie_host_init(Object *obj) DesignwarePCIEHost *s =3D DESIGNWARE_PCIE_HOST(obj); DesignwarePCIERoot *root =3D &s->root; =20 - object_initialize(root, sizeof(*root), TYPE_DESIGNWARE_PCIE_ROOT); - object_property_add_child(obj, "root", OBJECT(root), NULL); + object_initialize_child(obj, "root", root, sizeof(*root), + TYPE_DESIGNWARE_PCIE_ROOT, &error_abort, NULL); qdev_prop_set_int32(DEVICE(root), "addr", PCI_DEVFN(0, 0)); qdev_prop_set_bit(DEVICE(root), "multifunction", false); } diff --git a/hw/pci-host/gpex.c b/hw/pci-host/gpex.c index 2583b151a4..1bafffcc34 100644 --- a/hw/pci-host/gpex.c +++ b/hw/pci-host/gpex.c @@ -29,6 +29,7 @@ * http://www.firmware.org/1275/practice/imap/imap0_9d.pdf */ #include "qemu/osdep.h" +#include "qapi/error.h" #include "hw/hw.h" #include "hw/pci-host/gpex.h" =20 @@ -120,8 +121,8 @@ static void gpex_host_initfn(Object *obj) GPEXHost *s =3D GPEX_HOST(obj); GPEXRootState *root =3D &s->gpex_root; =20 - object_initialize(root, sizeof(*root), TYPE_GPEX_ROOT_DEVICE); - object_property_add_child(obj, "gpex_root", OBJECT(root), NULL); + object_initialize_child(obj, "gpex_root", root, sizeof(*root), + TYPE_GPEX_ROOT_DEVICE, &error_abort, NULL); qdev_prop_set_int32(DEVICE(root), "addr", PCI_DEVFN(0, 0)); qdev_prop_set_bit(DEVICE(root), "multifunction", false); } diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 7b871b5734..960939f5ed 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -216,8 +216,8 @@ static void q35_host_initfn(Object *obj) memory_region_init_io(&phb->data_mem, obj, &pci_host_data_le_ops, phb, "pci-conf-data", 4); =20 - object_initialize(&s->mch, sizeof(s->mch), TYPE_MCH_PCI_DEVICE); - object_property_add_child(OBJECT(s), "mch", OBJECT(&s->mch), NULL); + object_initialize_child(OBJECT(s), "mch", &s->mch, sizeof(s->mch), + TYPE_MCH_PCI_DEVICE, &error_abort, NULL); qdev_prop_set_int32(DEVICE(&s->mch), "addr", PCI_DEVFN(0, 0)); qdev_prop_set_bit(DEVICE(&s->mch), "multifunction", false); /* mch's object_initialize resets the default value, set it again */ diff --git a/hw/pci-host/xilinx-pcie.c b/hw/pci-host/xilinx-pcie.c index 60309afe9e..ceb00e23e6 100644 --- a/hw/pci-host/xilinx-pcie.c +++ b/hw/pci-host/xilinx-pcie.c @@ -149,8 +149,8 @@ static void xilinx_pcie_host_init(Object *obj) XilinxPCIEHost *s =3D XILINX_PCIE_HOST(obj); XilinxPCIERoot *root =3D &s->root; =20 - object_initialize(root, sizeof(*root), TYPE_XILINX_PCIE_ROOT); - object_property_add_child(obj, "root", OBJECT(root), NULL); + object_initialize_child(obj, "root", root, sizeof(*root), + TYPE_XILINX_PCIE_ROOT, &error_abort, NULL); qdev_prop_set_int32(DEVICE(root), "addr", PCI_DEVFN(0, 0)); qdev_prop_set_bit(DEVICE(root), "multifunction", false); } --=20 2.21.0