From nobody Mon Feb 9 19:08:07 2026 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=1605106351; cv=none; d=zohomail.com; s=zohoarc; b=k1iIN/xq+1Mze73rAbc+HX/hjj/Cu72QGbrSamhslJ/pcNjfszqMY9PsZod+LL6v6icxvJDHwUIA7irDFj/BTcsSoKzEIqckRWSEPjSS5iXGnhcceQN3/srJs/+HcUldHvcVcGGkJOE70DoAbe6oDX2nH1miq2UEF6gRjYdDpP8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605106351; 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=sKe3oBQLm2a+hOtqxx/wc/SsMEvmYRw16qPBLjKNppk=; b=akZ5rZC6XKv2Q00S6zXpd2MWin6+ASz3+ENYbO4kxX5Df9Ovy/KaFVkZfRs5d5AEdC4v9SdbHDj3FqKeVqHKMOYBQ9mN36D9pJmyiZgwJ7SHnWuS+MgvmhdTJRgBNlTzFZPpzQyDpE15pVxq5nF+YFnwbwt27tuwSqTaxiXORCo= 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 1605106351637986.914194819803; Wed, 11 Nov 2020 06:52:31 -0800 (PST) Received: from localhost ([::1]:34342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kcrU6-0004Ak-G5 for importer@patchew.org; Wed, 11 Nov 2020 09:52:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42750) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kcrRe-0002WF-I9 for qemu-devel@nongnu.org; Wed, 11 Nov 2020 09:49:58 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:23788) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kcrRZ-0001qZ-JU for qemu-devel@nongnu.org; Wed, 11 Nov 2020 09:49:57 -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-511-WHiTyUUaM6OCX2fdVLWHUA-1; Wed, 11 Nov 2020 09:49:49 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6AECB1891E8A; Wed, 11 Nov 2020 14:49:48 +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 267645B4C4; Wed, 11 Nov 2020 14:49:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605106191; 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=sKe3oBQLm2a+hOtqxx/wc/SsMEvmYRw16qPBLjKNppk=; b=Ud8CqM/OJqR7LcT4FaAKjXAtmeiF3b/lvYPDHTIzjFRnMWREUcF3f5bsAdy4ZWQMPP2kJv KtNGaHHoiXZHB+j2Ya/AMkP22TvNglxSwYt1HdYE7Ab/dgT8mWd/Q3IJjUIDdgBaBV9LvG yBteitiBnzgTskTL5fUJe720fnuryzM= X-MC-Unique: WHiTyUUaM6OCX2fdVLWHUA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 6/6] pvpanic: Advertise the PVPANIC_CRASHLOADED event support Date: Wed, 11 Nov 2020 09:49:46 -0500 Message-Id: <20201111144946.1213713-2-pbonzini@redhat.com> In-Reply-To: <20201111144946.1213713-1-pbonzini@redhat.com> References: <20201111144946.1213713-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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/11 01:49:01 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: 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 ++++- tests/qtest/pvpanic-test.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) 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 diff --git a/tests/qtest/pvpanic-test.c b/tests/qtest/pvpanic-test.c index 0657de797f..016b32ebee 100644 --- a/tests/qtest/pvpanic-test.c +++ b/tests/qtest/pvpanic-test.c @@ -20,7 +20,7 @@ static void test_panic(void) qts =3D qtest_init("-device pvpanic"); =20 val =3D qtest_inb(qts, 0x505); - g_assert_cmpuint(val, =3D=3D, 1); + g_assert_cmpuint(val, =3D=3D, 3); =20 qtest_outb(qts, 0x505, 0x1); =20 --=20 2.26.2