From nobody Sat May 4 15:26:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502709514970776.4333239620861; Mon, 14 Aug 2017 04:18:34 -0700 (PDT) Received: from localhost ([::1]:38390 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhDOD-0003q7-Kw for importer@patchew.org; Mon, 14 Aug 2017 07:18:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53761) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhDJE-0007Vg-Cw for qemu-devel@nongnu.org; Mon, 14 Aug 2017 07:13:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dhDJD-0007Z3-ER for qemu-devel@nongnu.org; Mon, 14 Aug 2017 07:13:24 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:46923) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhDJD-0007YQ-6F; Mon, 14 Aug 2017 07:13:23 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 9CAAE40D4E; Mon, 14 Aug 2017 14:13:22 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.corpit.ru (Postfix) with SMTP id CE876B79; Mon, 14 Aug 2017 14:07:44 +0300 (MSK) Received: (nullmailer pid 31399 invoked by uid 1000); Mon, 14 Aug 2017 11:07:45 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Mon, 14 Aug 2017 14:07:38 +0300 Message-Id: <0ac241bcf9f9d99a252a352a162f4b13b24732ab.1502708830.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 1/7] unicore32: abort when entering "x 0" on the monitor 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 , qemu-trivial@nongnu.org, Michael Tokarev Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Eduardo Otubo Starting Qemu with "qemu-system-unicore32 -M puv3,accel=3Dqtest -S -nograph= ic" and entering "x 0 " at the monitor prompt leads to abort(): $ ./unicore32-softmmu/qemu-system-unicore32 -M puv3,accel=3Dqtest -S -nog= raphic QEMU 2.9.90 monitor - type 'help' for more information (qemu) x 0 qemu: fatal: uc32_cpu_get_phys_page_debug not supported yet R00=3D00000000 R01=3D00000000 R02=3D00000000 R03=3D00000000 R04=3D00000000 R05=3D00000000 R06=3D00000000 R07=3D00000000 R08=3D00000000 R09=3D00000000 R10=3D00000000 R11=3D00000000 R12=3D00000000 R13=3D00000000 R14=3D00000000 R15=3D00000000 R16=3D00000000 R17=3D00000000 R18=3D00000000 R19=3D00000000 R20=3D00000000 R21=3D00000000 R22=3D00000000 R23=3D00000000 R24=3D00000000 R25=3D00000000 R26=3D00000000 R27=3D00000000 R28=3D00000000 R29=3D00000000 R30=3D00000000 R31=3D03000000 PSR=3D40000013 -Z-- PRIV Aborted (core dumped) This happens because uc32_cpu_get_phys_page_debug() is not implemented yet, this is a temporary workaround to avoid the crash. Signed-off-by: Eduardo Otubo Signed-off-by: Michael Tokarev --- target/unicore32/softmmu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/unicore32/softmmu.c b/target/unicore32/softmmu.c index e7152e72e0..d8d76968f3 100644 --- a/target/unicore32/softmmu.c +++ b/target/unicore32/softmmu.c @@ -15,6 +15,7 @@ #include "qemu/osdep.h" #include "cpu.h" #include "exec/exec-all.h" +#include "qemu/error-report.h" =20 #undef DEBUG_UC32 =20 @@ -271,8 +272,7 @@ int uc32_cpu_handle_mmu_fault(CPUState *cs, vaddr addre= ss, =20 hwaddr uc32_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) { - UniCore32CPU *cpu =3D UNICORE32_CPU(cs); - - cpu_abort(CPU(cpu), "%s not supported yet\n", __func__); - return addr; + error_report("function uc32_cpu_get_phys_page_debug not " + "implemented, aborting"); + return -1; } --=20 2.11.0 From nobody Sat May 4 15:26:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502709320048487.0523971490602; Mon, 14 Aug 2017 04:15:20 -0700 (PDT) Received: from localhost ([::1]:38262 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhDL4-0000dI-Lw for importer@patchew.org; Mon, 14 Aug 2017 07:15:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53673) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhDJA-0007QV-9t for qemu-devel@nongnu.org; Mon, 14 Aug 2017 07:13:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dhDJ7-0007VD-4n for qemu-devel@nongnu.org; Mon, 14 Aug 2017 07:13:20 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:57481) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhDJ6-0007UQ-T4; Mon, 14 Aug 2017 07:13:17 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 9BC3D40D50; Mon, 14 Aug 2017 14:07:46 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.corpit.ru (Postfix) with SMTP id 11451B79; Mon, 14 Aug 2017 14:07:44 +0300 (MSK) Received: (nullmailer pid 31401 invoked by uid 1000); Mon, 14 Aug 2017 11:07:46 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Mon, 14 Aug 2017 14:07:39 +0300 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 2/7] libqtest: Fix typo in comments 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: qemu-trivial@nongnu.org, Michael Tokarev Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Eric Blake s/continuosly/continuously/ Signed-off-by: Eric Blake Reviewed-by: Jeff Cody Signed-off-by: Michael Tokarev --- tests/libqtest.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/libqtest.h b/tests/libqtest.h index 38bc1e9953..3ae570927a 100644 --- a/tests/libqtest.h +++ b/tests/libqtest.h @@ -117,7 +117,7 @@ QDict *qtest_qmp_receive(QTestState *s); * @s: #QTestState instance to operate on. * @s: #event event to wait for. * - * Continuosly polls for QMP responses until it receives the desired event. + * Continuously polls for QMP responses until it receives the desired even= t. */ void qtest_qmp_eventwait(QTestState *s, const char *event); =20 @@ -126,7 +126,7 @@ void qtest_qmp_eventwait(QTestState *s, const char *eve= nt); * @s: #QTestState instance to operate on. * @s: #event event to wait for. * - * Continuosly polls for QMP responses until it receives the desired event. + * Continuously polls for QMP responses until it receives the desired even= t. * Returns a copy of the event for further investigation. */ QDict *qtest_qmp_eventwait_ref(QTestState *s, const char *event); @@ -571,7 +571,7 @@ static inline QDict *qmp_receive(void) * qmp_eventwait: * @s: #event event to wait for. * - * Continuosly polls for QMP responses until it receives the desired event. + * Continuously polls for QMP responses until it receives the desired even= t. */ static inline void qmp_eventwait(const char *event) { @@ -582,7 +582,7 @@ static inline void qmp_eventwait(const char *event) * qmp_eventwait_ref: * @s: #event event to wait for. * - * Continuosly polls for QMP responses until it receives the desired event. + * Continuously polls for QMP responses until it receives the desired even= t. * Returns a copy of the event for further investigation. */ static inline QDict *qmp_eventwait_ref(const char *event) --=20 2.11.0 From nobody Sat May 4 15:26:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502709320046536.9565384611391; Mon, 14 Aug 2017 04:15:20 -0700 (PDT) Received: from localhost ([::1]:38263 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhDL3-0000de-GT for importer@patchew.org; Mon, 14 Aug 2017 07:15:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53672) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhDJA-0007QU-9s for qemu-devel@nongnu.org; Mon, 14 Aug 2017 07:13:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dhDJ7-0007V7-4J for qemu-devel@nongnu.org; Mon, 14 Aug 2017 07:13:20 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:38287) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhDJ6-0007UR-T1; Mon, 14 Aug 2017 07:13:17 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 6EF2D40D4F; Mon, 14 Aug 2017 14:07:46 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.corpit.ru (Postfix) with SMTP id D7A49B78; Mon, 14 Aug 2017 14:07:43 +0300 (MSK) Received: (nullmailer pid 31403 invoked by uid 1000); Mon, 14 Aug 2017 11:07:46 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Mon, 14 Aug 2017 14:07:40 +0300 Message-Id: <88552b553b0f2d75f0f91a247f19c2e3b81ed5aa.1502708830.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 3/7] qemu-doc: Fix "-net van" typo 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: qemu-trivial@nongnu.org, Thomas Huth , Michael Tokarev Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Thomas Huth While Andrew S. Tanenbaum has a point by saying "Never underestimate the bandwidth of a station wagon full of tapes hurtling down the highway", we don't support that way of transportation in QEMU yet, so replace the typo with the correct word "vlan". Signed-off-by: Thomas Huth Reviewed-by: Eric Blake Reviewed-by: Laurent Vivier Signed-off-by: Michael Tokarev --- qemu-doc.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu-doc.texi b/qemu-doc.texi index aeb7bc52f5..4fc6b6f077 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -3243,7 +3243,7 @@ the ``-netdev user,guestfwd=3DARGS'' argument instead. =20 @subsection -net vlan (since 2.9.0) =20 -The ``-net van=3DNN'' argument is partially replaced with the +The ``-net vlan=3DNN'' argument is partially replaced with the new ``-netdev'' argument. The remaining use cases will no longer be directly supported in QEMU. =20 --=20 2.11.0 From nobody Sat May 4 15:26:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502709344674447.98858696794366; Mon, 14 Aug 2017 04:15:44 -0700 (PDT) Received: from localhost ([::1]:38270 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhDLT-00018f-Aw for importer@patchew.org; Mon, 14 Aug 2017 07:15:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53760) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhDJE-0007Ve-CY for qemu-devel@nongnu.org; Mon, 14 Aug 2017 07:13:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dhDJD-0007Yx-EE for qemu-devel@nongnu.org; Mon, 14 Aug 2017 07:13:24 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:57367) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhDJD-0007YP-6B; Mon, 14 Aug 2017 07:13:23 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 9ADF840D22; Mon, 14 Aug 2017 14:13:22 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.corpit.ru (Postfix) with SMTP id B41B3B78; Mon, 14 Aug 2017 14:07:44 +0300 (MSK) Received: (nullmailer pid 31405 invoked by uid 1000); Mon, 14 Aug 2017 11:07:46 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Mon, 14 Aug 2017 14:07:41 +0300 Message-Id: <657c572afe8dae393f2321db8866c02b4bf7bc77.1502708830.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 4/7] qemu-iotests: get rid of _full_imgproto_details() 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: qemu-trivial@nongnu.org, Michael Tokarev , Cleber Rosa Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Cleber Rosa Although this function is used, its implementation does nothing besides echoing a variable name. There's no need to wrap this functionality in a function, and based on the one usage it has, it's not even required to adhere to a convention or code style. Signed-off-by: Cleber Rosa Signed-off-by: Michael Tokarev --- tests/qemu-iotests/check | 3 +-- tests/qemu-iotests/common.rc | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index 2a55ec9ada..7a2e0d0119 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -228,7 +228,6 @@ rm -f check.full [ -f $TIMESTAMP_FILE ] || touch $TIMESTAMP_FILE =20 FULL_IMGFMT_DETAILS=3D`_full_imgfmt_details` -FULL_IMGPROTO_DETAILS=3D`_full_imgproto_details` FULL_HOST_DETAILS=3D`_full_platform_details` #FULL_MKFS_OPTIONS=3D`_scratch_mkfs_options` #FULL_MOUNT_OPTIONS=3D`_scratch_mount_options` @@ -239,7 +238,7 @@ QEMU_IMG -- "$QEMU_IMG_PROG" $QEMU_IMG_OPTIONS QEMU_IO -- "$QEMU_IO_PROG" $QEMU_IO_OPTIONS QEMU_NBD -- "$QEMU_NBD_PROG" $QEMU_NBD_OPTIONS IMGFMT -- $FULL_IMGFMT_DETAILS -IMGPROTO -- $FULL_IMGPROTO_DETAILS +IMGPROTO -- $IMGPROTO PLATFORM -- $FULL_HOST_DETAILS TEST_DIR -- $TEST_DIR SOCKET_SCM_HELPER -- $SOCKET_SCM_HELPER diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index bfbc80e5f6..8d486dbeb4 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -482,11 +482,6 @@ _full_imgfmt_details() fi } =20 -_full_imgproto_details() -{ - echo "$IMGPROTO" -} - _full_platform_details() { os=3D`uname -s` --=20 2.11.0 From nobody Sat May 4 15:26:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502709322421361.29602376098865; Mon, 14 Aug 2017 04:15:22 -0700 (PDT) Received: from localhost ([::1]:38264 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhDL7-0000hf-4b for importer@patchew.org; Mon, 14 Aug 2017 07:15:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53678) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhDJA-0007QY-BK for qemu-devel@nongnu.org; Mon, 14 Aug 2017 07:13:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dhDJ7-0007Ux-3n for qemu-devel@nongnu.org; Mon, 14 Aug 2017 07:13:20 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:33101) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhDJ6-0007UP-Sp; Mon, 14 Aug 2017 07:13:17 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id E7DC240D51; Mon, 14 Aug 2017 14:07:46 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.corpit.ru (Postfix) with SMTP id 3F23AB75; Mon, 14 Aug 2017 14:07:44 +0300 (MSK) Received: (nullmailer pid 31407 invoked by uid 1000); Mon, 14 Aug 2017 11:07:46 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Mon, 14 Aug 2017 14:07:42 +0300 Message-Id: <80758ec57d26bd2751f204ade356db094ce4b08c.1502708830.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 5/7] qemu-iotests: remove commented out variables 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: qemu-trivial@nongnu.org, Michael Tokarev , Cleber Rosa Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Cleber Rosa The variables FULL_MKFS_OPTIONS and FULL_MOUNT_OPTIONS are commented out, never used, and even refer to functions that do exist. The last time these were touched was around 8 years ago, so I guess it's safe to assume outputting such information on test execution is still on the radar. Signed-off-by: Cleber Rosa Reviewed-by: Stefan Hajnoczi Signed-off-by: Michael Tokarev --- tests/qemu-iotests/check | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index 7a2e0d0119..437ef65320 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -229,8 +229,6 @@ rm -f check.full =20 FULL_IMGFMT_DETAILS=3D`_full_imgfmt_details` FULL_HOST_DETAILS=3D`_full_platform_details` -#FULL_MKFS_OPTIONS=3D`_scratch_mkfs_options` -#FULL_MOUNT_OPTIONS=3D`_scratch_mount_options` =20 cat < Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502709006511555.535037546868; Mon, 14 Aug 2017 04:10:06 -0700 (PDT) Received: from localhost ([::1]:37930 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhDG1-0005CJ-8s for importer@patchew.org; Mon, 14 Aug 2017 07:10:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52235) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhDDx-0003g0-Al for qemu-devel@nongnu.org; Mon, 14 Aug 2017 07:07:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dhDDu-0004jn-4m for qemu-devel@nongnu.org; Mon, 14 Aug 2017 07:07:57 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:58101) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhDDt-0004gt-TN; Mon, 14 Aug 2017 07:07:54 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 432AF40D4E; Mon, 14 Aug 2017 14:07:46 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.corpit.ru (Postfix) with SMTP id BD2E5B77; Mon, 14 Aug 2017 14:07:43 +0300 (MSK) Received: (nullmailer pid 31409 invoked by uid 1000); Mon, 14 Aug 2017 11:07:46 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Mon, 14 Aug 2017 14:07:43 +0300 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 6/7] qemu-iotests: remove comment about root privileges requirement 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: qemu-trivial@nongnu.org, Michael Tokarev , Cleber Rosa Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Cleber Rosa The check script contains a commented out root user requirement, probably because of its xfstests heritage. This requirement doesn't apply to qemu-iotests, so it better be gone. Signed-off-by: Cleber Rosa Reviewed-by: Stefan Hajnoczi Signed-off-by: Michael Tokarev --- tests/qemu-iotests/check | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index 437ef65320..d504b6e455 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -123,12 +123,6 @@ fi # we need common . "$source_iotests/common" =20 -#if [ `id -u` -ne 0 ] -#then -# echo "check: QA must be run as root" -# exit 1 -#fi - TIMESTAMP_FILE=3Dcheck.time-$IMGPROTO-$IMGFMT =20 tmp=3D"${TEST_DIR}"/$$ --=20 2.11.0 From nobody Sat May 4 15:26:21 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1502709492077977.3723147000262; Mon, 14 Aug 2017 04:18:12 -0700 (PDT) Received: from localhost ([::1]:38377 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhDNq-0003TG-Oc for importer@patchew.org; Mon, 14 Aug 2017 07:18:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53674) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhDJA-0007QW-A4 for qemu-devel@nongnu.org; Mon, 14 Aug 2017 07:13:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dhDJ7-0007V0-48 for qemu-devel@nongnu.org; Mon, 14 Aug 2017 07:13:20 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:54363) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhDJ6-0007UT-T9; Mon, 14 Aug 2017 07:13:17 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 1BF1C40D52; Mon, 14 Aug 2017 14:07:47 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.corpit.ru (Postfix) with SMTP id 8BAA9B77; Mon, 14 Aug 2017 14:07:44 +0300 (MSK) Received: (nullmailer pid 31411 invoked by uid 1000); Mon, 14 Aug 2017 11:07:46 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Mon, 14 Aug 2017 14:07:44 +0300 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 7/7] hw/misc/mmio_interface: Return after error_setg() to avoid crash 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: qemu-trivial@nongnu.org, Thomas Huth , Michael Tokarev Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Thomas Huth QEMU currently abort()s if the user tries to specify the mmio_interface device without parameters: x86_64-softmmu/qemu-system-x86_64 -nographic -device mmio_interface qemu-system-x86_64: /home/thuth/devel/qemu/util/error.c:57: error_setv: Assertion `*errp =3D=3D ((void *)0)' failed. Aborted (core dumped) This happens because the realize function is trying to set the errp twice in this case. After setting an error, the realize function should immediately return instead. Signed-off-by: Thomas Huth Signed-off-by: Michael Tokarev --- hw/misc/mmio_interface.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/misc/mmio_interface.c b/hw/misc/mmio_interface.c index 6f004d2bab..da154e5c95 100644 --- a/hw/misc/mmio_interface.c +++ b/hw/misc/mmio_interface.c @@ -63,10 +63,12 @@ static void mmio_interface_realize(DeviceState *dev, Er= ror **errp) =20 if (!s->host_ptr) { error_setg(errp, "host_ptr property must be set"); + return; } =20 if (!s->subregion) { error_setg(errp, "subregion property must be set"); + return; } =20 memory_region_init_ram_ptr(&s->ram_mem, OBJECT(s), "ram", --=20 2.11.0