From nobody Sun May 5 14:29:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605007891; cv=none; d=zohomail.com; s=zohoarc; b=JVYP3sft41Ij0qIUgFTRW+IjHz4bhgKUa9olmQXRuCs5kB2a6jPmTd7drLn9CpgdHDUoBnHIx2OqlX7gDGHAc9zyu4Z14MP38v9V6syRMFjYfC0DUwy3PDVBjT0hd+PvgOjp7bXs1ZeFu1Oob7VuDPL5QykH5FokdlvJ6n45Q7I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605007891; 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; bh=ddD/ZstzLTM2Z5hxDWAdMQx4IoUNra+sEV0fic8ElD0=; b=Qx4zkvFJy8x1VBckFYQcQaU64yldimaFdQeYgQxBMO49VVFWGsJQBVHDw/XMDBgBRqdAu/VBv1NcAERUQUqf5SYFzaAj+l6mz3khcxVSZ9GghQbHMQnGPEps0uhTSNOWfTUbeMee6C61zktip/cP5qd9TrSjjl3g+yoRFe1HJkM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass 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 1605007891140563.3544306911805; Tue, 10 Nov 2020 03:31:31 -0800 (PST) Received: from localhost ([::1]:57796 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcRs2-0000i9-1I for importer@patchew.org; Tue, 10 Nov 2020 06:31:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48338) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcRpt-0007BS-G0 for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:29:17 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:22504) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kcRpr-0001bK-Eo for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:29:16 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-258-RB4r12XdNNWFlopOmCJ1Kw-1; Tue, 10 Nov 2020 06:29:12 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3114A1074656 for ; Tue, 10 Nov 2020 11:29:11 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id E3992277D5; Tue, 10 Nov 2020 11:29:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605007753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ddD/ZstzLTM2Z5hxDWAdMQx4IoUNra+sEV0fic8ElD0=; b=WnGnUV5ybBU/kT+u1JI8n3sUv5KW9wVAvfzoyetHEV90pbIMhCdJmnZWyOdnjYrSJ6teI0 zEyNpf6qQvWzyaG7cW/RQ9ER8NpdXjGO4H22AmckAnWBHocVYmIFHIlRZz9yJsNMZhoxGS Cp6dq4AM1rfIKU7uDui4h0BAuzrZhKs= X-MC-Unique: RB4r12XdNNWFlopOmCJ1Kw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 1/6] meson: Clarify the confusing vhost-user vs. vhost-kernel output Date: Tue, 10 Nov 2020 06:29:04 -0500 Message-Id: <20201110112909.1103518-2-pbonzini@redhat.com> In-Reply-To: <20201110112909.1103518-1-pbonzini@redhat.com> References: <20201110112909.1103518-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/10 00:21:06 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Thomas Huth The configuration summary prints a line with "vhost-user: YES/NO", but the value is currently the vhost-kernel setting instead which looks wrong. Print the kernel setting in a separate line and switch the "vhost-user:" line to CONFIG_VHOST_USER instead. Signed-off-by: Thomas Huth Message-Id: <20201109085906.87921-1-thuth@redhat.com> Signed-off-by: Paolo Bonzini --- meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index f5175010df..b7f91cb08d 100644 --- a/meson.build +++ b/meson.build @@ -2102,11 +2102,12 @@ summary_info +=3D {'madvise': config_host= .has_key('CONFIG_MADVISE')} summary_info +=3D {'posix_madvise': config_host.has_key('CONFIG_POSIX_= MADVISE')} summary_info +=3D {'posix_memalign': config_host.has_key('CONFIG_POSIX_= MEMALIGN')} summary_info +=3D {'libcap-ng support': config_host.has_key('CONFIG_LIBCAP= _NG')} +summary_info +=3D {'vhost-kernel support': config_host.has_key('CONFIG_VHO= ST_KERNEL')} summary_info +=3D {'vhost-net support': config_host.has_key('CONFIG_VHOST_= NET')} summary_info +=3D {'vhost-crypto support': config_host.has_key('CONFIG_VHO= ST_CRYPTO')} summary_info +=3D {'vhost-scsi support': config_host.has_key('CONFIG_VHOST= _SCSI')} summary_info +=3D {'vhost-vsock support': config_host.has_key('CONFIG_VHOS= T_VSOCK')} -summary_info +=3D {'vhost-user support': config_host.has_key('CONFIG_VHOST= _KERNEL')} +summary_info +=3D {'vhost-user support': config_host.has_key('CONFIG_VHOST= _USER')} summary_info +=3D {'vhost-user-fs support': config_host.has_key('CONFIG_VH= OST_USER_FS')} summary_info +=3D {'vhost-vdpa support': config_host.has_key('CONFIG_VHOST= _VDPA')} summary_info +=3D {'Trace backends': config_host['TRACE_BACKENDS']} --=20 2.26.2 From nobody Sun May 5 14:29:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605008447; cv=none; d=zohomail.com; s=zohoarc; b=JQB/avpFwyNDCSP+7JgI0/bnfyYUHM1rFnXsalx9COezsfMcxuKHXmgpMBGtYGCSSZ6HkDEeRA7ZqbVHTWdApSMuQMHj9G6/QARPv8JI3Q96yMPjv73xIPyzNDXN7WuTt2VXUmasY25sBEuD76SvcEWdSEIjXxFYh4/hfsQki+4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605008447; 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; bh=jeydQsbzsN/f2AyLMpjaPG+5uLUDep+F8RuQ+t/UpG8=; b=INZyE4Sv8Z3RHGDjPOPcnSBzDXntdzTDBhdJwsDpFvbP8vB5huCFd1bQcdAUDeJ5VnBy/t8g1km0/LvpWR0yYui+dBlqqVWQnzBUQTUs801f3VKdik5+v5en+C1DJmpmCCA8jc9Au/+YLwF5ReCZHOuhT2OmU2t0P1RZAOzRoMw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass 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 1605008447095128.88643964783887; Tue, 10 Nov 2020 03:40:47 -0800 (PST) Received: from localhost ([::1]:54012 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcS0z-0002UU-Vc for importer@patchew.org; Tue, 10 Nov 2020 06:40:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48400) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcRpw-0007Gx-2A for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:29:20 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:57013) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kcRpr-0001bT-FB for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:29:19 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-409-HFBID5mtPY2l5qq-TqS7hQ-1; Tue, 10 Nov 2020 06:29:12 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9F605186DD3D; Tue, 10 Nov 2020 11:29:11 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4B777277D5; Tue, 10 Nov 2020 11:29:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605007754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jeydQsbzsN/f2AyLMpjaPG+5uLUDep+F8RuQ+t/UpG8=; b=W4B7QWA6antEvX4oogIxooyTJ6IE9CvL6L4pL83NIPJvo6ncZ8X1GohsxnE2rzCrTKhQuX bsivRC8fOnXHRgu+pajpmDxsBj5empu7iCJ25lZRedVBloxsSJhT31TFzmvOXlTb/xypIP d0Jy+wety9GR69aByHjtEgNoiKNF0Qk= X-MC-Unique: HFBID5mtPY2l5qq-TqS7hQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 2/6] fix make clean/distclean Date: Tue, 10 Nov 2020 06:29:05 -0500 Message-Id: <20201110112909.1103518-3-pbonzini@redhat.com> In-Reply-To: <20201110112909.1103518-1-pbonzini@redhat.com> References: <20201110112909.1103518-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/10 02:00:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) A misplaced $(quiet-@) meant that "make clean" and "make distclean" did not work properly. Reported-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9465720696..6f2da3e7dc 100644 --- a/Makefile +++ b/Makefile @@ -212,8 +212,8 @@ recurse-clean: $(addsuffix /clean, $(ROM_DIRS)) ###################################################################### =20 clean: recurse-clean - -@test -f build.ninja && $(quiet-@)$(NINJA) $(NINJAFLAGS) -t clean || : - -@test -f build.ninja && $(NINJA) $(NINJAFLAGS) clean-ctlist || : + -$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean || : + -$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) clean-ctlist || : # avoid old build problems by removing potentially incorrect old files rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h ge= n-op-arm.h find . \( -name '*.so' -o -name '*.dll' -o -name '*.[oda]' \) -type f \ @@ -231,7 +231,7 @@ qemu-%.tar.bz2: $(SRC_PATH)/scripts/make-release "$(SRC_PATH)" "$(patsubst qemu-%.tar.bz2= ,%,$@)" =20 distclean: clean - -@test -f build.ninja && $(quiet-@)$(NINJA) $(NINJAFLAGS) -t clean -g || : + -$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean -g || : rm -f config-host.mak config-host.h* rm -f tests/tcg/config-*.mak rm -f config-all-disas.mak config.status --=20 2.26.2 From nobody Sun May 5 14:29:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1605008868; cv=none; d=zohomail.com; s=zohoarc; b=lqDBkzI7BHR/BlNRB87hnSbGvD6dd4uKL2B/g8YgcNljJwn/qON+GUI+RGLfiRf4COq6d+ZzOMx1yc9o90MQjw9Qtcx6jPWdT/2bO27z7hjOZcVxgL7jcK4cSrzoqLDw1wi05kpPX+IXz6qkbf05cPukwgHU73MEQyTrSPxbBvc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605008868; 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; bh=//Az4ERp8yyXlWNcKo63DhWsemnd2oKmdKT/iH/voHo=; b=CSu7mJigNIPggeXGo+hn8aMVn1EopcY1b7pGuHE7Kg1C+wpSG1hhKcRKzXWeSaCUlcocDZCnOe/A4f1DhTVRN5UxaGrgwFV1V3Xptoc8cgpaY8H+KRWAjY2OykQ4E2xwXLG/8N6NaZ9FwDcgl7jg8Ajm9eG4BekAdLJCl1GoWWk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1605008868118670.1160978131929; Tue, 10 Nov 2020 03:47:48 -0800 (PST) Received: from localhost ([::1]:41050 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcS7m-0000u7-V7 for importer@patchew.org; Tue, 10 Nov 2020 06:47:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48416) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcRpx-0007LN-KP for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:29:21 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:59811) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kcRpr-0001bY-T6 for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:29:21 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-278-IoIW3iTBMcC6mZBnown7gg-1; Tue, 10 Nov 2020 06:29:13 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 15C2A809DE0; Tue, 10 Nov 2020 11:29:12 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id B980626345; Tue, 10 Nov 2020 11:29:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605007755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=//Az4ERp8yyXlWNcKo63DhWsemnd2oKmdKT/iH/voHo=; b=iITIFkZRDK1XrNRhCw5zLxQTuS6jL332JxpwUKrD8r9+kl3GigmzXaMT2u6RDfFic28xU+ +xwCiLiPWwiK9gOY9YmMF4/pmP38KD+h52Dku1siNsvaZCmMqRNdxTLNw6PHUGD2NAtJZH Gx7/kks/kHUBMoVdsSDaIrzGOAVVxws= X-MC-Unique: IoIW3iTBMcC6mZBnown7gg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 3/6] replay: remove some dead code Date: Tue, 10 Nov 2020 06:29:06 -0500 Message-Id: <20201110112909.1103518-4-pbonzini@redhat.com> In-Reply-To: <20201110112909.1103518-1-pbonzini@redhat.com> References: <20201110112909.1103518-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/10 00:21:06 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pavel Dovgalyuk Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Pavel Dovgalyuk This patch removes dead code in replay_continue_stop() function. Signed-off-by: Pavel Dovgalyuk Reported-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <160455661411.3455.4177953912304752892.stgit@pasha-ThinkPad-X28= 0> Signed-off-by: Paolo Bonzini --- replay/replay-debugging.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/replay/replay-debugging.c b/replay/replay-debugging.c index ee9e86daa9..1d6a968406 100644 --- a/replay/replay-debugging.c +++ b/replay/replay-debugging.c @@ -278,7 +278,6 @@ static void replay_continue_stop(void *opaque) replay_continue_end(); } replay_last_snapshot =3D replay_get_current_icount(); - return; } else { /* Seek to the very first step */ replay_seek(0, replay_stop_vm_debug, &err); @@ -286,9 +285,7 @@ static void replay_continue_stop(void *opaque) error_free(err); replay_continue_end(); } - return; } - replay_continue_end(); } =20 bool replay_reverse_continue(void) --=20 2.26.2 From nobody Sun May 5 14:29:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605008597; cv=none; d=zohomail.com; s=zohoarc; b=diY2P/VzFeRqj8OAE/rRwl/r0lp6rNJfmgbUPDKOab8spj/G8Q4Id9RQ2lNm1jP5JSTZczwBFBON2Clwz3ffEjDxGh/X9u/L5Ng/TCqJAhJ7kqN0dUNiPDNnFCSD3kdBlKf69+6PGOTwpotyjHKg9azX2OWcHzciXLvi1FhKEgM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605008597; 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; bh=QMxvINzTMQrTTGUFlWgI/cwk3o4WWgT7VCir/cyxGlk=; b=gd5gZ7jqxE6WRLAXoQv6nSJrBCYivbPgTDXJCcGUZiQA0XwlOWsB8/HZqTLzeZWJTaeQOzAm5ZwQOf6C6CQCbaR4dPd14kYUyw7Z+l8AixvRhKm47+sGvdq9OZFAl1TQRC8kIFRIKBy18cJqxEi6EF1a11h/LAbJDSvPGNbX6/E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass 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 1605008597693919.904227264095; Tue, 10 Nov 2020 03:43:17 -0800 (PST) Received: from localhost ([::1]:60204 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcS3Q-0005CD-FD for importer@patchew.org; Tue, 10 Nov 2020 06:43:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48414) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcRpx-0007K7-42 for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:29:21 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:54617) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kcRps-0001bg-B0 for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:29:20 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-121-L87OecXgOwCgIcKmOAXxVg-1; Tue, 10 Nov 2020 06:29:13 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 83152186DD33; Tue, 10 Nov 2020 11:29:12 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2F2B926345; Tue, 10 Nov 2020 11:29:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605007755; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QMxvINzTMQrTTGUFlWgI/cwk3o4WWgT7VCir/cyxGlk=; b=BSgZLqDbjvyPy+zM+KwNu1e9sgia9o97w9VLpc5CDKD8WtlmF36p83+ZvbsGRUkV4IcZ3B TPDGtJx25ZRit1jSyJuAqmOyxJ4QpQWuDnXQ/TBipdr0V39s7s8Nmac2uisBS4nbdpM6hp F7z970qskzi1qmDLFcXIS7wBirK+WK4= X-MC-Unique: L87OecXgOwCgIcKmOAXxVg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 4/6] Makefile: No echoing for 'make help V=1' Date: Tue, 10 Nov 2020 06:29:07 -0500 Message-Id: <20201110112909.1103518-5-pbonzini@redhat.com> In-Reply-To: <20201110112909.1103518-1-pbonzini@redhat.com> References: <20201110112909.1103518-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/10 02:00:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Greg Kurz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Greg Kurz It doesn't bring much to have echoing with "make help". Suppress it unconditionally. Signed-off-by: Greg Kurz Message-Id: <160459122012.462591.8467906402712875729.stgit@bahia.lan> Signed-off-by: Paolo Bonzini --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6f2da3e7dc..76dbb917f5 100644 --- a/Makefile +++ b/Makefile @@ -270,7 +270,7 @@ include $(SRC_PATH)/tests/docker/Makefile.include include $(SRC_PATH)/tests/vm/Makefile.include =20 print-help-run =3D printf " %-30s - %s\\n" "$1" "$2" -print-help =3D $(quiet-@)$(call print-help-run,$1,$2) +print-help =3D @$(call print-help-run,$1,$2) =20 .PHONY: help help: --=20 2.26.2 From nobody Sun May 5 14:29:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1605008678; cv=none; d=zohomail.com; s=zohoarc; b=ORor8HSOHGXdXC9o4zuzeRguESMEQIEIsBh5x/d9G1l09OQEszkCLdzv+eo7fvfeV5t8RcW7K9p1IBZaQaKxVb577dwNJwwZE1X0lMuFWHEX95R0F+zMR3Pl1aw2/crE+EanUEJvGwd7BLutqp9zRXtbtAWuhWWEm/6V9maBtC8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605008678; 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; bh=ushcjN77hW0DH/FdTQOmHmkRzbg59lIqm6mDE7smTss=; b=X7E1K2uD8hBWTpU+nitzZLhGqm4Ns5nmmHuIP1aWja03E/sVU/F0AooWdTkUYrsWpwqed/64cN3QPoPIObMCRq/2gvEuOSVD1+adhbRS2PZtOc5NsTM0qpTX547xKHLaluSXosSAPsBHHX0qzwZslwiPxBGrxce8bWEiQJS62dI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1605008678467145.63668644839333; Tue, 10 Nov 2020 03:44:38 -0800 (PST) Received: from localhost ([::1]:35416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcS4j-0006jc-Ca for importer@patchew.org; Tue, 10 Nov 2020 06:44:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48412) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcRpw-0007Jk-Uy for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:29:20 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:48420) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kcRpt-0001bp-OI for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:29:20 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-148-GSUCCD4JOnS9B1Kdn3jCcA-1; Tue, 10 Nov 2020 06:29:14 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0A1331074656; Tue, 10 Nov 2020 11:29:13 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9DDAC26345; Tue, 10 Nov 2020 11:29:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605007756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ushcjN77hW0DH/FdTQOmHmkRzbg59lIqm6mDE7smTss=; b=Psj3yrCEBKZ77hWxp1VZPLMn7Sr8BSoqiIs026FrcrwCZ6Z0G8Ujnvm41/I9wjZ0+wgmeg v6iop2kQai45toQCoiwQKNc63NXCXOEw/HNq8mvGxpgqAhveUPKgcCP7WkXEQw0G1T5Egl BIgYofXtcKGzEeCq30TLNE2oxv6mv4I= X-MC-Unique: GSUCCD4JOnS9B1Kdn3jCcA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 5/6] physmem: improve ram size error messages Date: Tue, 10 Nov 2020 06:29:08 -0500 Message-Id: <20201110112909.1103518-6-pbonzini@redhat.com> In-Reply-To: <20201110112909.1103518-1-pbonzini@redhat.com> References: <20201110112909.1103518-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/10 00:21:06 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pankaj Gupta , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Li Zhang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Pankaj Gupta Ram size mismatch condition logs below message. "Length mismatch: pc.ram: 0x80000000 in !=3D 0x180000000: Invalid argume= nt" This patch improves the readability of error messages. Removed the superflous "in" and changed "Length" to "Size". Signed-off-by: Pankaj Gupta Reported-by: Li Zhang Message-Id: <20201022111302.8105-1-pankaj.gupta.linux@gmail.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- softmmu/physmem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/softmmu/physmem.c b/softmmu/physmem.c index 0b31be2928..dd60ff79e9 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -1756,15 +1756,15 @@ int qemu_ram_resize(RAMBlock *block, ram_addr_t new= size, Error **errp) =20 if (!(block->flags & RAM_RESIZEABLE)) { error_setg_errno(errp, EINVAL, - "Length mismatch: %s: 0x" RAM_ADDR_FMT - " in !=3D 0x" RAM_ADDR_FMT, block->idstr, + "Size mismatch: %s: 0x" RAM_ADDR_FMT + " !=3D 0x" RAM_ADDR_FMT, block->idstr, newsize, block->used_length); return -EINVAL; } =20 if (block->max_length < newsize) { error_setg_errno(errp, EINVAL, - "Length too large: %s: 0x" RAM_ADDR_FMT + "Size too large: %s: 0x" RAM_ADDR_FMT " > 0x" RAM_ADDR_FMT, block->idstr, newsize, block->max_length); return -EINVAL; --=20 2.26.2 From nobody Sun May 5 14:29:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605008299; cv=none; d=zohomail.com; s=zohoarc; b=QQ6IXf67PjABKMzOpbud/sYJTzIihGm8FoSimn9zLIA1fA2eqR0Bh9Ni+KZ74itLrLPHDMyk/zZ/4NtuDnBF4Plg3VtTAn3Lf174tcmiF7oew8NNG9jvXfUMgqx9OV4h9gEsCwXzPDFfkuBRBL0jJDadPd4AddPZD+6+aPfFTNo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605008299; 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; bh=+zusEXJzWrjd2rJ1pg02yJMOnG8fetEgGuFkB7srYy8=; b=VnlWwwFPJw//r0HRWTO595svjsoEChjoMYiDi8wZOE1uMwaJGgnwadc8bL+PjwnA9p428PSdl1zsl3YAo5PuX2wvbplJNHAVBLKk6nXXhR63AZ71aAZkLABhGsz4V24+IW2Ea4N/moMfSakMrDfF5HSM7qYFl581c3F1fsveLY0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass 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 160500829911877.1630552503035; Tue, 10 Nov 2020 03:38:19 -0800 (PST) Received: from localhost ([::1]:47768 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcRyc-0008Je-07 for importer@patchew.org; Tue, 10 Nov 2020 06:38:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48388) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcRpv-0007Et-2b for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:29:19 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:36977) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kcRpt-0001bk-0W for qemu-devel@nongnu.org; Tue, 10 Nov 2020 06:29:18 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-340-4gPQf8e8NE291yan3MQi_A-1; Tue, 10 Nov 2020 06:29:14 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 699AB1074654; Tue, 10 Nov 2020 11:29:13 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 24637380; Tue, 10 Nov 2020 11:29:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605007756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+zusEXJzWrjd2rJ1pg02yJMOnG8fetEgGuFkB7srYy8=; b=GHB6HbVco1V1ckYrKY6irU4WhlU0M0VDn0lEWm0QHeZcn0tnlS7jE0bjLxEeL8i1SUyyXL vcd0Bhg2RpRV+VAKKG9SpOJvIYakT8Mtz8dJStGz6BIbNam9Faer1sBpVryyxsqQyy9vmE DnWi77BzubBuXxp+lSgGzhGQnabJ1mw= X-MC-Unique: 4gPQf8e8NE291yan3MQi_A-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 6/6] pvpanic: Advertise the PVPANIC_CRASHLOADED event support Date: Tue, 10 Nov 2020 06:29:09 -0500 Message-Id: <20201110112909.1103518-7-pbonzini@redhat.com> In-Reply-To: <20201110112909.1103518-1-pbonzini@redhat.com> References: <20201110112909.1103518-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/10 00:21:06 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alejandro Jimenez Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Advertise both types of events as supported when the guest OS queries the pvpanic device. Currently only PVPANIC_PANICKED is exposed; PVPANIC_CRASHLOADED must also be advertised, but only on new machine types. Fixes: 7dc58deea79a ("pvpanic: implement crashloaded event handling") Reported-by: Alejandro Jimenez Signed-off-by: Paolo Bonzini --- hw/core/machine.c | 1 + hw/misc/pvpanic.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 98b87f76cb..d0408049b5 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -35,6 +35,7 @@ GlobalProperty hw_compat_5_1[] =3D { { "virtio-blk-device", "num-queues", "1"}, { "virtio-scsi-device", "num_queues", "1"}, { "nvme", "use-intel-id", "on"}, + { "pvpanic", "events", "1"}, /* PVPANIC_PANICKED */ }; const size_t hw_compat_5_1_len =3D G_N_ELEMENTS(hw_compat_5_1); =20 diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index 598d5471a4..35d6797831 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -61,12 +61,14 @@ struct PVPanicState { =20 MemoryRegion io; uint16_t ioport; + uint8_t events; }; =20 /* return supported events on read */ static uint64_t pvpanic_ioport_read(void *opaque, hwaddr addr, unsigned si= ze) { - return PVPANIC_PANICKED; + PVPanicState *pvp =3D opaque; + return pvp->events; } =20 static void pvpanic_ioport_write(void *opaque, hwaddr addr, uint64_t val, @@ -112,6 +114,7 @@ static void pvpanic_isa_realizefn(DeviceState *dev, Err= or **errp) =20 static Property pvpanic_isa_properties[] =3D { DEFINE_PROP_UINT16(PVPANIC_IOPORT_PROP, PVPanicState, ioport, 0x505), + DEFINE_PROP_UINT8("events", PVPanicState, events, PVPANIC_PANICKED | P= VPANIC_CRASHLOADED), DEFINE_PROP_END_OF_LIST(), }; =20 --=20 2.26.2