From nobody Thu Apr 25 10:42:32 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=1669112657; cv=none; d=zohomail.com; s=zohoarc; b=HZdLtjH2VCkkabnAQE0L/CkcsPVag6hfrYYDZ4DD0l5XILr9zMMp3qoVBA9dTSRskJjetx4dlobq+JlPKpBjPmSdrFynBA0u0FRJdXv6MCvMG6CevdeMuJtR5vFJOjx6dEAdVGFURC3CPTUamO9SyvFgM3ZJ75WOxjWio7Q7RPw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669112657; h=Content-Type: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=eDwgZDiyyCgip4i0+7/CBveDv0WhKC1DL4TSrg/EZuY=; b=VUVNKjgZxQFdCW0b37NoDMXsprYFEDidAAdkG5VulHJX9MS/ZAbp+cRrgM3mNUPgycbJdGbmopyrDqyjPZ7AhuDtVB8qotaki/SJyFlm/b8p1tPlx9ZPPGQE1+ceLbXQjvMCfcOv2gpHKBRMNSQoGeilNDbOVMlp3APVQw0V3Zo= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1669112657424669.5883261639129; Tue, 22 Nov 2022 02:24:17 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxQRF-0008HP-KV; Tue, 22 Nov 2022 05:23:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQRB-0008Fo-QL for qemu-devel@nongnu.org; Tue, 22 Nov 2022 05:23:33 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQR9-0004kN-SR for qemu-devel@nongnu.org; Tue, 22 Nov 2022 05:23:33 -0500 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-333-gkW-RjpaPMe9MFK6iYBFEw-1; Tue, 22 Nov 2022 05:23:29 -0500 Received: by mail-wr1-f72.google.com with SMTP id v12-20020adfa1cc000000b00236eaee7197so4084389wrv.0 for ; Tue, 22 Nov 2022 02:23:29 -0800 (PST) Received: from redhat.com ([2.52.21.254]) by smtp.gmail.com with ESMTPSA id e13-20020a5d500d000000b0022cc6b8df5esm13741575wrt.7.2022.11.22.02.23.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 02:23:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669112611; 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: in-reply-to:in-reply-to:references:references; bh=eDwgZDiyyCgip4i0+7/CBveDv0WhKC1DL4TSrg/EZuY=; b=iy+pgOpgBqFEoUUmMZ8Lzc9zyo31xLynKqeeA9Sse0YSBlHD6pt3kXpvsSO5TWaYO9HSkX ZJacN63CupED/P1I6FLlGrrA6dxkygyJvJXV5sOjd2qaDf9lJIuKj9q8TpFQJ/gKq5qZa0 5suOGGkBht9uxEpp/x9blx/+51Bta1g= X-MC-Unique: gkW-RjpaPMe9MFK6iYBFEw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=eDwgZDiyyCgip4i0+7/CBveDv0WhKC1DL4TSrg/EZuY=; b=p1ZnsfHQ48uuClalNv8hNqdIsiySS/coCf6I4xxPn6lWmLxgUTjv41wkiIghIEdmzt y5rJOHI58HXmIYxFPrzdZU+gE8Uj6rPS5dpFfSQsxu5CY6vX4naVnWb4J+C0rfCmkaBl YYLuTwNl42imPo/Jrn82q7AbunzLsY3tkmb8xSPONv+4lzYp24Ys5E5Dc/deHj3ErSJB RQSn+k4VxMBrZZLVBQwDZnKN33Hg/YUz0hie68mmfbfBefqyYi/stSmaBaiXqsgPeN5E y9s9OjPLdF7blyJFvRoM561O5f8YRp8i8ywBKMhhjNoiWR7tEadssa9AysZYsoCrvZg4 7m+w== X-Gm-Message-State: ANoB5pmE3f3NfSMmylugyiYHEk45wlvyN9V6aNXwBkvIfWhUsVJ1jKR8 Mqs/watcAksOJU5fbRKsD01NNUCtUu1fWlz7RXdr55WnlToTBmrebyzqzh/z057N2Rtej0NFQE/ 4KNO/yMedDaE0BliRxWa7C/tUmWonhc9OGbqXNm5uLZsVD8NmH2Hes8Rx5rSw X-Received: by 2002:adf:f843:0:b0:241:bcae:987f with SMTP id d3-20020adff843000000b00241bcae987fmr2146924wrq.619.1669112607090; Tue, 22 Nov 2022 02:23:27 -0800 (PST) X-Google-Smtp-Source: AA0mqf70kDhutNVllYbMaYJcYdCjWeQ8Pw9+qf6vczFGSIJ2h3RIhE4TIr0Kc+OVL5zDt3hlgUuOEw== X-Received: by 2002:adf:f843:0:b0:241:bcae:987f with SMTP id d3-20020adff843000000b00241bcae987fmr2146880wrq.619.1669112606658; Tue, 22 Nov 2022 02:23:26 -0800 (PST) Date: Tue, 22 Nov 2022 05:23:23 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefano Garzarella , Stefan Hajnoczi , Raphael Norwitz , Jason Wang , Kevin Wolf , Hanna Reitz , Paolo Bonzini , Fam Zheng , "Dr. David Alan Gilbert" , Alex =?utf-8?Q?Benn=C3=A9e?= , Viresh Kumar , Mathieu Poirier , qemu-block@nongnu.org, virtio-fs@redhat.com Subject: [PULL 1/8] vhost: mask VIRTIO_F_RING_RESET for vhost and vhost-user devices Message-ID: <20221122102227.6603-2-mst@redhat.com> References: <20221122102227.6603-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20221122102227.6603-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent 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=170.10.129.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1669112659258100019 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Stefano Garzarella Commit 69e1c14aa2 ("virtio: core: vq reset feature negotation support") enabled VIRTIO_F_RING_RESET by default for all virtio devices. This feature is not currently emulated by QEMU, so for vhost and vhost-user devices we need to make sure it is supported by the offloaded device emulation (in-kernel or in another process). To do this we need to add VIRTIO_F_RING_RESET to the features bitmap passed to vhost_get_features(). This way it will be masked if the device does not support it. This issue was initially discovered with vhost-vsock and vhost-user-vsock, and then also tested with vhost-user-rng which confirmed the same issue. They fail when sending features through VHOST_SET_FEATURES ioctl or VHOST_USER_SET_FEATURES message, since VIRTIO_F_RING_RESET is negotiated by the guest (Linux >=3D v6.0), but not supported by the device. Fixes: 69e1c14aa2 ("virtio: core: vq reset feature negotation support") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1318 Signed-off-by: Stefano Garzarella Message-Id: <20221121101101.29400-1-sgarzare@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Stefan Hajnoczi Acked-by: Raphael Norwitz Acked-by: Jason Wang --- hw/block/vhost-user-blk.c | 1 + hw/net/vhost_net.c | 1 + hw/scsi/vhost-scsi.c | 1 + hw/scsi/vhost-user-scsi.c | 1 + hw/virtio/vhost-user-fs.c | 1 + hw/virtio/vhost-user-gpio.c | 1 + hw/virtio/vhost-user-i2c.c | 1 + hw/virtio/vhost-user-rng.c | 11 +++++++++-- hw/virtio/vhost-vsock-common.c | 1 + net/vhost-vdpa.c | 1 + 10 files changed, 18 insertions(+), 2 deletions(-) diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c index 16ad400889..0d5190accf 100644 --- a/hw/block/vhost-user-blk.c +++ b/hw/block/vhost-user-blk.c @@ -52,6 +52,7 @@ static const int user_feature_bits[] =3D { VIRTIO_F_NOTIFY_ON_EMPTY, VIRTIO_F_RING_PACKED, VIRTIO_F_IOMMU_PLATFORM, + VIRTIO_F_RING_RESET, VHOST_INVALID_FEATURE_BIT }; =20 diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index feda448878..26e4930676 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -75,6 +75,7 @@ static const int user_feature_bits[] =3D { VIRTIO_NET_F_MTU, VIRTIO_F_IOMMU_PLATFORM, VIRTIO_F_RING_PACKED, + VIRTIO_F_RING_RESET, VIRTIO_NET_F_RSS, VIRTIO_NET_F_HASH_REPORT, =20 diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c index bdf337a7a2..6a0fd0dfb1 100644 --- a/hw/scsi/vhost-scsi.c +++ b/hw/scsi/vhost-scsi.c @@ -38,6 +38,7 @@ static const int kernel_feature_bits[] =3D { VIRTIO_RING_F_INDIRECT_DESC, VIRTIO_RING_F_EVENT_IDX, VIRTIO_SCSI_F_HOTPLUG, + VIRTIO_F_RING_RESET, VHOST_INVALID_FEATURE_BIT }; =20 diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c index bc37317d55..b7a71a802c 100644 --- a/hw/scsi/vhost-user-scsi.c +++ b/hw/scsi/vhost-user-scsi.c @@ -36,6 +36,7 @@ static const int user_feature_bits[] =3D { VIRTIO_RING_F_INDIRECT_DESC, VIRTIO_RING_F_EVENT_IDX, VIRTIO_SCSI_F_HOTPLUG, + VIRTIO_F_RING_RESET, VHOST_INVALID_FEATURE_BIT }; =20 diff --git a/hw/virtio/vhost-user-fs.c b/hw/virtio/vhost-user-fs.c index 1c40f42045..dc4014cdef 100644 --- a/hw/virtio/vhost-user-fs.c +++ b/hw/virtio/vhost-user-fs.c @@ -32,6 +32,7 @@ static const int user_feature_bits[] =3D { VIRTIO_F_NOTIFY_ON_EMPTY, VIRTIO_F_RING_PACKED, VIRTIO_F_IOMMU_PLATFORM, + VIRTIO_F_RING_RESET, =20 VHOST_INVALID_FEATURE_BIT }; diff --git a/hw/virtio/vhost-user-gpio.c b/hw/virtio/vhost-user-gpio.c index 677d1c7730..5851cb3bc9 100644 --- a/hw/virtio/vhost-user-gpio.c +++ b/hw/virtio/vhost-user-gpio.c @@ -24,6 +24,7 @@ static const int feature_bits[] =3D { VIRTIO_RING_F_INDIRECT_DESC, VIRTIO_RING_F_EVENT_IDX, VIRTIO_GPIO_F_IRQ, + VIRTIO_F_RING_RESET, VHOST_INVALID_FEATURE_BIT }; =20 diff --git a/hw/virtio/vhost-user-i2c.c b/hw/virtio/vhost-user-i2c.c index 864eba695e..1c9f3d20dc 100644 --- a/hw/virtio/vhost-user-i2c.c +++ b/hw/virtio/vhost-user-i2c.c @@ -16,6 +16,7 @@ =20 static const int feature_bits[] =3D { VIRTIO_I2C_F_ZERO_LENGTH_REQUEST, + VIRTIO_F_RING_RESET, VHOST_INVALID_FEATURE_BIT }; =20 diff --git a/hw/virtio/vhost-user-rng.c b/hw/virtio/vhost-user-rng.c index 8b47287875..f9084cde58 100644 --- a/hw/virtio/vhost-user-rng.c +++ b/hw/virtio/vhost-user-rng.c @@ -16,6 +16,11 @@ #include "qemu/error-report.h" #include "standard-headers/linux/virtio_ids.h" =20 +static const int feature_bits[] =3D { + VIRTIO_F_RING_RESET, + VHOST_INVALID_FEATURE_BIT +}; + static void vu_rng_start(VirtIODevice *vdev) { VHostUserRNG *rng =3D VHOST_USER_RNG(vdev); @@ -106,8 +111,10 @@ static void vu_rng_set_status(VirtIODevice *vdev, uint= 8_t status) static uint64_t vu_rng_get_features(VirtIODevice *vdev, uint64_t requested_features, Error **e= rrp) { - /* No feature bits used yet */ - return requested_features; + VHostUserRNG *rng =3D VHOST_USER_RNG(vdev); + + return vhost_get_features(&rng->vhost_dev, feature_bits, + requested_features); } =20 static void vu_rng_handle_output(VirtIODevice *vdev, VirtQueue *vq) diff --git a/hw/virtio/vhost-vsock-common.c b/hw/virtio/vhost-vsock-common.c index 29b9ab4f72..a67a275de2 100644 --- a/hw/virtio/vhost-vsock-common.c +++ b/hw/virtio/vhost-vsock-common.c @@ -21,6 +21,7 @@ =20 const int feature_bits[] =3D { VIRTIO_VSOCK_F_SEQPACKET, + VIRTIO_F_RING_RESET, VHOST_INVALID_FEATURE_BIT }; =20 diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 6811089231..2b4b85d8f8 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -69,6 +69,7 @@ const int vdpa_feature_bits[] =3D { VIRTIO_NET_F_CTRL_VQ, VIRTIO_F_IOMMU_PLATFORM, VIRTIO_F_RING_PACKED, + VIRTIO_F_RING_RESET, VIRTIO_NET_F_RSS, VIRTIO_NET_F_HASH_REPORT, VIRTIO_NET_F_GUEST_ANNOUNCE, --=20 MST From nobody Thu Apr 25 10:42:32 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=1669112655; cv=none; d=zohomail.com; s=zohoarc; b=aie1z7/KIZqzNlLkIrjmJ948kKHOjnjbMOgMZVYCXo72ARoHeHmkhUPjT538M73vGeKiJtw1OaGVRoT09AgmjbPVTBEPTU2/07rvcWNRutnetVxuIs29gZAe6WqJWDPN6b5WYbzvMxzH22zo/5AFWNmd5hTpls1EsLv3dFwwvvY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669112655; h=Content-Type: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=9emkX+AdNEa+IfHb+6zLMULHpi99heqhQVMILfG/WCA=; b=iAZDaPZb7msBKDFX+QLnKWmqLBBY+jNZP/+aNlufXzImZ3KromklMlE4mloqy7112F+O08AJYznx3kdRrmdQ1JXPAYjdhasAa4t6FiAQWSIyJXjQmKkcq3KhKotelNNtxHqpDoQgNfujDztr6eULWUY8W6PJrK990scyUuOFuP4= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 166911265538361.07030120125512; Tue, 22 Nov 2022 02:24:15 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxQRG-0008Hs-IZ; Tue, 22 Nov 2022 05:23:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQRD-0008Gk-Md for qemu-devel@nongnu.org; Tue, 22 Nov 2022 05:23:36 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQRC-0004lr-63 for qemu-devel@nongnu.org; Tue, 22 Nov 2022 05:23:35 -0500 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-265-IL-8bOApNjCNVYU04bhglQ-1; Tue, 22 Nov 2022 05:23:31 -0500 Received: by mail-wm1-f70.google.com with SMTP id i133-20020a1c3b8b000000b003cffc0a69afso8387188wma.9 for ; Tue, 22 Nov 2022 02:23:31 -0800 (PST) Received: from redhat.com ([2.52.21.254]) by smtp.gmail.com with ESMTPSA id v16-20020adfe4d0000000b00241d32ab1casm6500002wrm.89.2022.11.22.02.23.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 02:23:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669112612; 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: in-reply-to:in-reply-to:references:references; bh=9emkX+AdNEa+IfHb+6zLMULHpi99heqhQVMILfG/WCA=; b=U+3ooT21FbCrzTlYzNRRP3nhPS07E1vnfIAXPwba1PpMPg/D7aEdZhvk2+SFP6fgEvBb4b dOb+NJrAVS15tf2lVBZQ3aVZBmYJKxTa6gnnxUuBbbOjmsnLK3RjN8ws4JdErh03JOHyBS mqae6HN2jyuRz0eaHCAjouXt1gdnVH4= X-MC-Unique: IL-8bOApNjCNVYU04bhglQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=9emkX+AdNEa+IfHb+6zLMULHpi99heqhQVMILfG/WCA=; b=hZ12UJqU3ezRfTHHdrjF3bc29SDbouWBgmnrAI48/9+xYOZZQ+TADx/D7282DVHYjU zY5wPN2cd7nPzqaZsAJy2K1oVYUlJspgMp37ElF7gs8TqPT5RUduuLJL8v34Lh6zECQE 3WXkH0hh4fqOB0qpw2lhE5bxSj+fPnD9sHg4LO2F2phzwnHuEa28AvxpDMfBtHId3Eco 9t3i3kFM1ZxeixXXNWqolTfTgK7fe5s+NY/YZF8dlfQeyGZbrArc4yr0zYE0HG6B35su 2D56EVOZf7frUDX/V51DTjXFasTNOxLwhnruCxSBR1Qu/KDx4U7VSya52GP+NZlccAEA b4lA== X-Gm-Message-State: ANoB5plhFoYxJ8Mq++gmBfnEWDLWeeiE+hLccFiqZ/0KYObO7ZLWXDVw YHB3NQmo01+4wyfnt9htmgCfOo3bv53N/I+8+RfxLM2JN92u+tOGZt5tjutxmXmmGiI2+2cMciA TplnKce9plH3QdwlYyW1oHMmhEVJUxN7+U8zJB30iRvpKfwZV9lvuJlum3SWp X-Received: by 2002:a5d:4c48:0:b0:241:bd2c:bef with SMTP id n8-20020a5d4c48000000b00241bd2c0befmr7831024wrt.304.1669112610077; Tue, 22 Nov 2022 02:23:30 -0800 (PST) X-Google-Smtp-Source: AA0mqf52YVis13KCl01u05Ag0htLTe9gWALRW2LH9s8jNi/MmsrdmkCK1lXVHT/Rz7rV9Cuf/17/2g== X-Received: by 2002:a5d:4c48:0:b0:241:bd2c:bef with SMTP id n8-20020a5d4c48000000b00241bd2c0befmr7831007wrt.304.1669112609736; Tue, 22 Nov 2022 02:23:29 -0800 (PST) Date: Tue, 22 Nov 2022 05:23:27 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Igor Mammedov , Ani Sinha Subject: [PULL 2/8] tests: acpi: whitelist DSDT before moving PRQx to _SB scope Message-ID: <20221122102227.6603-3-mst@redhat.com> References: <20221122102227.6603-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20221122102227.6603-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent 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=170.10.129.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1669112657294100009 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Igor Mammedov Signed-off-by: Igor Mammedov Message-Id: <20221121153613.3972225-2-imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/qtest/bios-tables-test-allowed-diff.h | 36 +++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index dfb8523c8b..a4587652dd 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,37 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/pc/DSDT", +"tests/data/acpi/pc/DSDT.acpierst", +"tests/data/acpi/pc/DSDT.acpihmat", +"tests/data/acpi/pc/DSDT.bridge", +"tests/data/acpi/pc/DSDT.cphp", +"tests/data/acpi/pc/DSDT.dimmpxm", +"tests/data/acpi/pc/DSDT.hpbridge", +"tests/data/acpi/pc/DSDT.hpbrroot", +"tests/data/acpi/pc/DSDT.ipmikcs", +"tests/data/acpi/pc/DSDT.memhp", +"tests/data/acpi/pc/DSDT.nohpet", +"tests/data/acpi/pc/DSDT.numamem", +"tests/data/acpi/pc/DSDT.roothp", +"tests/data/acpi/q35/DSDT", +"tests/data/acpi/q35/DSDT.acpierst", +"tests/data/acpi/q35/DSDT.acpihmat", +"tests/data/acpi/q35/DSDT.acpihmat-noinitiator", +"tests/data/acpi/q35/DSDT.applesmc", +"tests/data/acpi/q35/DSDT.bridge", +"tests/data/acpi/q35/DSDT.cphp", +"tests/data/acpi/q35/DSDT.cxl", +"tests/data/acpi/q35/DSDT.core-count2", +"tests/data/acpi/q35/DSDT.dimmpxm", +"tests/data/acpi/q35/DSDT.ipmibt", +"tests/data/acpi/q35/DSDT.ipmismbus", +"tests/data/acpi/q35/DSDT.ivrs", +"tests/data/acpi/q35/DSDT.memhp", +"tests/data/acpi/q35/DSDT.mmio64", +"tests/data/acpi/q35/DSDT.multi-bridge", +"tests/data/acpi/q35/DSDT.nohpet", +"tests/data/acpi/q35/DSDT.numamem", +"tests/data/acpi/q35/DSDT.pvpanic-isa", +"tests/data/acpi/q35/DSDT.tis.tpm12", +"tests/data/acpi/q35/DSDT.tis.tpm2", +"tests/data/acpi/q35/DSDT.viot", +"tests/data/acpi/q35/DSDT.xapic", --=20 MST From nobody Thu Apr 25 10:42:32 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=1669112752; cv=none; d=zohomail.com; s=zohoarc; b=mlHC6nnUZiEur4OuFm2bbkcthMEjUnBo6HAd4SNV0hjJEfmTqga9eERUx2pmNZNtC7ftWc5eu+SvtmXaV9sWolznUwIEF+cMHcrXmUJXWdbxPjM7wNspw9Sj19xUoZNpkCly/BRuGfyIQTTvn97cQIrP34srB8wbzc9iQPVMFr8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669112752; 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=YXgILXRzQ35uaiYJ0xWzjDvRkf6Ce/SEEm9XD9ULZtg=; b=Zirl6FyjKC52oQm9YiF0wNWmFa9k6GBwQu13uaUVggCtOJ+6EHtMxqoudaSUUMNeSP0+KuHGrJpIFTmJbP/hogu39jpsJ+nIK+6bj6FT1ifl+R2EpxayRdfSKYz745o1g7909L07uE+mH5pwXSHqLBaZYryOnlb9A8fN4U1Se58= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1669112752473558.7931531364927; Tue, 22 Nov 2022 02:25:52 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxQRI-0008II-6A; Tue, 22 Nov 2022 05:23:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQRG-0008Ht-I6 for qemu-devel@nongnu.org; Tue, 22 Nov 2022 05:23:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQRE-0004mO-I4 for qemu-devel@nongnu.org; Tue, 22 Nov 2022 05:23:38 -0500 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-211-wzQdfJxdPx2thOKPocaQIw-1; Tue, 22 Nov 2022 05:23:34 -0500 Received: by mail-wm1-f72.google.com with SMTP id m14-20020a7bcb8e000000b003cfcff0057eso3914008wmi.9 for ; Tue, 22 Nov 2022 02:23:34 -0800 (PST) Received: from redhat.com ([2.52.21.254]) by smtp.gmail.com with ESMTPSA id h16-20020a05600c315000b003cff309807esm22496031wmo.23.2022.11.22.02.23.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 02:23:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669112615; 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=YXgILXRzQ35uaiYJ0xWzjDvRkf6Ce/SEEm9XD9ULZtg=; b=DDk6GS88QVGFIrZ87H7sSXKwM2IpzkcYlPPmFxh2tw90QltaGQfb9UdCgVYfKZt3blZl6t XmTII/+7Ylq0kcfQDiGRaTU4w6htQK4Myg5sO9jj4qLQo39MYvCKEM0/i3EmIiC4+9YFsr zpJ19s/N0AVJSjKP8BRzHnflk6gRLi8= X-MC-Unique: wzQdfJxdPx2thOKPocaQIw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=YXgILXRzQ35uaiYJ0xWzjDvRkf6Ce/SEEm9XD9ULZtg=; b=Rgor+jyhTPY+JILiUcALXCgEWd9iZSowYYT0l6qwARATXNcESobn/33OnV6NLYamLE +SuC/z7hUG5FG3bE3Dd9zKtFYDNs/mBax22KqlNye1zqp5+sFZzUbIjajuVyDad2q18i NDMcENxlVg42ta5KIvJtB97wjo2XWir7eRVRPmaJ0BI5Gzr+uEWusQ8sJPXMnCqZzqh2 TaVhSokbeW4S22vRIpNAFZfM58du4NBeffo5hTP05QeX23I1Pv5bUnX4RF4zT68o5067 u7fSEa8/i+CzlFYrTGZK0b8br0PaP4UnlRQZrlQhq18cK4E8Dg6mYltnyDQAo1wHLJtk vwvg== X-Gm-Message-State: ANoB5pk8V4ynhHA9RDsKBX6CFknrXxZAnkWURhv/ZXpcfMjGSbbPlM+W 2snc41ZypDIFbvdn8uimPiNefWBSQERUyr52fqItGb5I0rHCigc2Qsv73t7QdvL33jxHhu5V3QZ krLmMLOx60v3fLthTpZJmSEqk2+7N7WHnfeAvlQzn0/dORVi4GzRAYkgy3cbe X-Received: by 2002:a05:6000:501:b0:22c:d27d:12e4 with SMTP id a1-20020a056000050100b0022cd27d12e4mr13269459wrf.546.1669112613189; Tue, 22 Nov 2022 02:23:33 -0800 (PST) X-Google-Smtp-Source: AA0mqf66eF20OFaT3eJq7SHUABzTfm/KE2EkPDq5xZJIXoTt+e6JbL4F+OFjH8Ti6LUnSHSqGamzCg== X-Received: by 2002:a05:6000:501:b0:22c:d27d:12e4 with SMTP id a1-20020a056000050100b0022cd27d12e4mr13269443wrf.546.1669112612842; Tue, 22 Nov 2022 02:23:32 -0800 (PST) Date: Tue, 22 Nov 2022 05:23:30 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Igor Mammedov , Volker =?utf-8?Q?R=C3=BCmelin?= , Marcel Apfelbaum Subject: [PULL 3/8] acpi: x86: move RPQx field back to _SB scope Message-ID: <20221122102227.6603-4-mst@redhat.com> References: <20221122102227.6603-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20221122102227.6603-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent 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=170.10.129.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1669112753070100003 From: Igor Mammedov Commit 47a373faa6b2 (acpi: pc/q35: drop ad-hoc PCI-ISA bridge AML routines = and let bus ennumeration generate AML) moved ISA bridge AML generation to respective devices and was using aml_alias() to provide PRQx fields in _SB. scope. However, it turned out that SeaBIOS was not able to process Alias opcode when parsing DSDT, resulting in lack of keyboard during boot (SeaBIOS console, grub, FreeDOS). While fix for SeaBIOS is posted https://mail.coreboot.org/hyperkitty/list/seabios@seabios.org/thread/RGPL= 7HESH5U5JRLEO6FP77CZVHZK5J65/ fixed SeaBIOS might not make into QEMU-7.2 in time. Hence this workaround that puts PRQx back into _SB scope and gets rid of aliases in ISA bridge description, so DSDT will be parsable by broken SeaBIOS. That brings back hardcoded references to ISA bridge PCI0.S08.P40C/PCI0.SF8.PIRQ where middle part now is auto generated based on slot it's plugged in, but it should be fine as bridge initialization also hardcodes PCI address of the bridge so it can't ever move. Once QEMU tree has fixed SeaBIOS blob, we should be able to drop this part and revert back to alias based approach Reported-by: Volker R=C3=BCmelin Signed-off-by: Igor Mammedov Message-Id: <20221121153613.3972225-3-imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/isa/lpc_ich9.c | 16 ++++------------ hw/isa/piix3.c | 12 ++++-------- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 0b0a83e080..6c44cc9767 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -813,12 +813,13 @@ static void build_ich9_isa_aml(AcpiDevAmlIf *adev, Am= l *scope) BusChild *kid; ICH9LPCState *s =3D ICH9_LPC_DEVICE(adev); BusState *bus =3D BUS(s->isa_bus); + Aml *sb_scope =3D aml_scope("\\_SB"); =20 /* ICH9 PCI to ISA irq remapping */ aml_append(scope, aml_operation_region("PIRQ", AML_PCI_CONFIG, aml_int(0x60), 0x0C)); /* Fields declarion has to happen *after* operation region */ - field =3D aml_field("PIRQ", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE); + field =3D aml_field("PCI0.SF8.PIRQ", AML_BYTE_ACC, AML_NOLOCK, AML_PRE= SERVE); aml_append(field, aml_named_field("PRQA", 8)); aml_append(field, aml_named_field("PRQB", 8)); aml_append(field, aml_named_field("PRQC", 8)); @@ -828,17 +829,8 @@ static void build_ich9_isa_aml(AcpiDevAmlIf *adev, Aml= *scope) aml_append(field, aml_named_field("PRQF", 8)); aml_append(field, aml_named_field("PRQG", 8)); aml_append(field, aml_named_field("PRQH", 8)); - aml_append(scope, field); - - /* hack: put fields into _SB scope for LNKx to find them */ - aml_append(scope, aml_alias("PRQA", "\\_SB.PRQA")); - aml_append(scope, aml_alias("PRQB", "\\_SB.PRQB")); - aml_append(scope, aml_alias("PRQC", "\\_SB.PRQC")); - aml_append(scope, aml_alias("PRQD", "\\_SB.PRQD")); - aml_append(scope, aml_alias("PRQE", "\\_SB.PRQE")); - aml_append(scope, aml_alias("PRQF", "\\_SB.PRQF")); - aml_append(scope, aml_alias("PRQG", "\\_SB.PRQG")); - aml_append(scope, aml_alias("PRQH", "\\_SB.PRQH")); + aml_append(sb_scope, field); + aml_append(scope, sb_scope); =20 QTAILQ_FOREACH(kid, &bus->children, sibling) { call_dev_aml_func(DEVICE(kid->child), scope); diff --git a/hw/isa/piix3.c b/hw/isa/piix3.c index f9b4af5c05..eabad7ba58 100644 --- a/hw/isa/piix3.c +++ b/hw/isa/piix3.c @@ -318,24 +318,20 @@ static void build_pci_isa_aml(AcpiDevAmlIf *adev, Aml= *scope) { Aml *field; BusChild *kid; + Aml *sb_scope =3D aml_scope("\\_SB"); BusState *bus =3D qdev_get_child_bus(DEVICE(adev), "isa.0"); =20 /* PIIX PCI to ISA irq remapping */ aml_append(scope, aml_operation_region("P40C", AML_PCI_CONFIG, aml_int(0x60), 0x04)); /* Fields declarion has to happen *after* operation region */ - field =3D aml_field("P40C", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE); + field =3D aml_field("PCI0.S08.P40C", AML_BYTE_ACC, AML_NOLOCK, AML_PRE= SERVE); aml_append(field, aml_named_field("PRQ0", 8)); aml_append(field, aml_named_field("PRQ1", 8)); aml_append(field, aml_named_field("PRQ2", 8)); aml_append(field, aml_named_field("PRQ3", 8)); - aml_append(scope, field); - - /* hack: put fields into _SB scope for LNKx to find them */ - aml_append(scope, aml_alias("PRQ0", "\\_SB.PRQ0")); - aml_append(scope, aml_alias("PRQ1", "\\_SB.PRQ1")); - aml_append(scope, aml_alias("PRQ2", "\\_SB.PRQ2")); - aml_append(scope, aml_alias("PRQ3", "\\_SB.PRQ3")); + aml_append(sb_scope, field); + aml_append(scope, sb_scope); =20 QTAILQ_FOREACH(kid, &bus->children, sibling) { call_dev_aml_func(DEVICE(kid->child), scope); --=20 MST From nobody Thu Apr 25 10:42:32 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=1669112655; cv=none; d=zohomail.com; s=zohoarc; b=WoarUIgqav/wrwQu0LMu9SJRRMo3PjvjTpTgINToXec/bNqhACyH4bAbrCzL7x0NKTZFRdmz9z1elrFWS3xQeJA3cbcbepQ+hVOKDa21g1uca/VJRsQb+/4E6XVyDbheawWOfJPeVGhw9HBr3VX9wvRjDyxuPuiAz51g243D+sc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669112655; h=Content-Type: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=AFyfuScQTJkWiwItZL4ClYP9RpmGgHhVFjDOHIwKoSY=; b=Ush8Haiu8RuYT9o0/nvBc0chk6jXzi+qa0iEyMPEhe1ITU921ekpvCbc2Sz7lRX1amMW6FgUziP9WrT7shIXRt/5oumg7yH1uMijJFhg5MQN12diaKGHy8BF+IvU/JDPdtu99LTQDVsjtRUo5V1fIpTZarnGx6SvI1jNZIN2UcY= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1669112655387633.2572673643938; Tue, 22 Nov 2022 02:24:15 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxQRQ-0008JW-Um; Tue, 22 Nov 2022 05:23:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQRO-0008JK-GB for qemu-devel@nongnu.org; Tue, 22 Nov 2022 05:23:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQRJ-0004md-J7 for qemu-devel@nongnu.org; Tue, 22 Nov 2022 05:23:45 -0500 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-564-jfz4yzwvOuaw-7t8eD4jDw-1; Tue, 22 Nov 2022 05:23:38 -0500 Received: by mail-wr1-f70.google.com with SMTP id j20-20020adfb314000000b002366d9f67aaso4047132wrd.3 for ; Tue, 22 Nov 2022 02:23:37 -0800 (PST) Received: from redhat.com ([2.52.21.254]) by smtp.gmail.com with ESMTPSA id v11-20020a5d43cb000000b00241bd177f89sm12881808wrr.14.2022.11.22.02.23.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 02:23:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669112619; 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: in-reply-to:in-reply-to:references:references; bh=AFyfuScQTJkWiwItZL4ClYP9RpmGgHhVFjDOHIwKoSY=; b=V7NkZR+XdRZbY7KMWzvM3+uLFTqGggcr4N/5NbI1FFUE7fdqARaDlsiWTi+6I5CoHgmU5A bK/a2gYiaxHvVL8rrp9gSbFLTR2otnmXnZATnrckqPFL3N0GL/sIrUJbrNGrGlC1Gl/Kks tX+sFocz/71M/TCYyocGVPMy2yJu3bI= X-MC-Unique: jfz4yzwvOuaw-7t8eD4jDw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=AFyfuScQTJkWiwItZL4ClYP9RpmGgHhVFjDOHIwKoSY=; b=HTsmmG3z+LSJSGKapfTtoRHum329YHjINFOh/Ux8zTlFNTF8O2vZA1ron7OSvYE38o CkQAj1hyMJVX0jAFyG2/MIrZTLLZk0lV9GOpoXQzYqu05YGRFOtPLWCd07mio9pXH4Zz HZaYlgkAKGpOcdERB1V2WONQfx43SfmniwBBk202nHyO7E7Nw3b4fgfgpvGxH8vOHyTl Ub2FauoSD5qPiybtzkbfZZ8NA3mUWCwKfM22YFibeR+tq2jr2IcGbYYf0W/9kae/Q/F0 iQt9pTOomdjmS8WWfAp+Vz2UinlUQOpIGOxlP46Bw+Hg2xQQJMU8VK3tqL5AQewnwa5w bDzg== X-Gm-Message-State: ANoB5pnV1V/Y5st4sGDbg7yNbQwS4qFFZO60fxZLERHfCIpALWLfqKcp WAQ+fta6/NBGGp+AYMml1E4nuYqGVbl5Tb87VS+fGNo55DLGo5LgDfWzU+a1jz2bPb2VFhisUjC uUVN4A53YgucNPhdq4lpQD+Fv3CncrYGYL/PIOJzyi1FfmI7wz/dKKPQ9mLn1 X-Received: by 2002:a1c:7504:0:b0:3cf:8ebf:69b with SMTP id o4-20020a1c7504000000b003cf8ebf069bmr6401383wmc.86.1669112616241; Tue, 22 Nov 2022 02:23:36 -0800 (PST) X-Google-Smtp-Source: AA0mqf6hvCRRfx0eqVgZSE06LYEL1JzNFh138/j6bKrDvMC0VSE3+PssaFU0gTOMFaZAZXwmnIjFDA== X-Received: by 2002:a1c:7504:0:b0:3cf:8ebf:69b with SMTP id o4-20020a1c7504000000b003cf8ebf069bmr6401354wmc.86.1669112615624; Tue, 22 Nov 2022 02:23:35 -0800 (PST) Date: Tue, 22 Nov 2022 05:23:33 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Igor Mammedov , Ani Sinha Subject: [PULL 4/8] tests: acpi: x86: update expected DSDT after moving PRQx fields in _SB scope Message-ID: <20221122102227.6603-5-mst@redhat.com> References: <20221122102227.6603-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20221122102227.6603-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent 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=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1669112657308100011 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Igor Mammedov Expected DSDT changes, pc: - Field (P40C, ByteAcc, NoLock, Preserve) + Scope (\_SB) { - PRQ0, 8, - PRQ1, 8, - PRQ2, 8, - PRQ3, 8 + Field (PCI0.S08.P40C, ByteAcc, NoLock, Preserve) + { + PRQ0, 8, + PRQ1, 8, + PRQ2, 8, + PRQ3, 8 + } } - Alias (PRQ0, \_SB.PRQ0) - Alias (PRQ1, \_SB.PRQ1) - Alias (PRQ2, \_SB.PRQ2) - Alias (PRQ3, \_SB.PRQ3) q35: - Field (PIRQ, ByteAcc, NoLock, Preserve) - { - PRQA, 8, - PRQB, 8, - PRQC, 8, - PRQD, 8, - Offset (0x08), - PRQE, 8, - PRQF, 8, - PRQG, 8, - PRQH, 8 + Scope (\_SB) + { + Field (PCI0.SF8.PIRQ, ByteAcc, NoLock, Preserve) + { + PRQA, 8, + PRQB, 8, + PRQC, 8, + PRQD, 8, + Offset (0x08), + PRQE, 8, + PRQF, 8, + PRQG, 8, + PRQH, 8 + } } - Alias (PRQA, \_SB.PRQA) - Alias (PRQB, \_SB.PRQB) - Alias (PRQC, \_SB.PRQC) - Alias (PRQD, \_SB.PRQD) - Alias (PRQE, \_SB.PRQE) - Alias (PRQF, \_SB.PRQF) - Alias (PRQG, \_SB.PRQG) - Alias (PRQH, \_SB.PRQH) Signed-off-by: Igor Mammedov Message-Id: <20221121153613.3972225-4-imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/qtest/bios-tables-test-allowed-diff.h | 36 ------------------ tests/data/acpi/pc/DSDT | Bin 6501 -> 6458 bytes tests/data/acpi/pc/DSDT.acpierst | Bin 6461 -> 6418 bytes tests/data/acpi/pc/DSDT.acpihmat | Bin 7826 -> 7783 bytes tests/data/acpi/pc/DSDT.bridge | Bin 9575 -> 9532 bytes tests/data/acpi/pc/DSDT.cphp | Bin 6965 -> 6922 bytes tests/data/acpi/pc/DSDT.dimmpxm | Bin 8155 -> 8112 bytes tests/data/acpi/pc/DSDT.hpbridge | Bin 6461 -> 6418 bytes tests/data/acpi/pc/DSDT.hpbrroot | Bin 3107 -> 3064 bytes tests/data/acpi/pc/DSDT.ipmikcs | Bin 6573 -> 6530 bytes tests/data/acpi/pc/DSDT.memhp | Bin 7860 -> 7817 bytes tests/data/acpi/pc/DSDT.nohpet | Bin 6359 -> 6316 bytes tests/data/acpi/pc/DSDT.numamem | Bin 6507 -> 6464 bytes tests/data/acpi/pc/DSDT.roothp | Bin 6699 -> 6656 bytes tests/data/acpi/q35/DSDT | Bin 8412 -> 8310 bytes tests/data/acpi/q35/DSDT.acpierst | Bin 8429 -> 8327 bytes tests/data/acpi/q35/DSDT.acpihmat | Bin 9737 -> 9635 bytes tests/data/acpi/q35/DSDT.acpihmat-noinitiator | Bin 8691 -> 8589 bytes tests/data/acpi/q35/DSDT.applesmc | Bin 8458 -> 8356 bytes tests/data/acpi/q35/DSDT.bridge | Bin 11541 -> 11439 bytes tests/data/acpi/q35/DSDT.core-count2 | Bin 32552 -> 32450 bytes tests/data/acpi/q35/DSDT.cphp | Bin 8876 -> 8774 bytes tests/data/acpi/q35/DSDT.cxl | Bin 9738 -> 9636 bytes tests/data/acpi/q35/DSDT.dimmpxm | Bin 10066 -> 9964 bytes tests/data/acpi/q35/DSDT.ipmibt | Bin 8487 -> 8385 bytes tests/data/acpi/q35/DSDT.ipmismbus | Bin 8500 -> 8398 bytes tests/data/acpi/q35/DSDT.ivrs | Bin 8429 -> 8327 bytes tests/data/acpi/q35/DSDT.memhp | Bin 9771 -> 9669 bytes tests/data/acpi/q35/DSDT.mmio64 | Bin 9542 -> 9440 bytes tests/data/acpi/q35/DSDT.multi-bridge | Bin 8732 -> 8630 bytes tests/data/acpi/q35/DSDT.nohpet | Bin 8270 -> 8168 bytes tests/data/acpi/q35/DSDT.numamem | Bin 8418 -> 8316 bytes tests/data/acpi/q35/DSDT.pvpanic-isa | Bin 8513 -> 8411 bytes tests/data/acpi/q35/DSDT.tis.tpm12 | Bin 9018 -> 8916 bytes tests/data/acpi/q35/DSDT.tis.tpm2 | Bin 9044 -> 8942 bytes tests/data/acpi/q35/DSDT.viot | Bin 9521 -> 9419 bytes tests/data/acpi/q35/DSDT.xapic | Bin 35775 -> 35673 bytes 37 files changed, 36 deletions(-) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index a4587652dd..dfb8523c8b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,37 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/pc/DSDT", -"tests/data/acpi/pc/DSDT.acpierst", -"tests/data/acpi/pc/DSDT.acpihmat", -"tests/data/acpi/pc/DSDT.bridge", -"tests/data/acpi/pc/DSDT.cphp", -"tests/data/acpi/pc/DSDT.dimmpxm", -"tests/data/acpi/pc/DSDT.hpbridge", -"tests/data/acpi/pc/DSDT.hpbrroot", -"tests/data/acpi/pc/DSDT.ipmikcs", -"tests/data/acpi/pc/DSDT.memhp", -"tests/data/acpi/pc/DSDT.nohpet", -"tests/data/acpi/pc/DSDT.numamem", -"tests/data/acpi/pc/DSDT.roothp", -"tests/data/acpi/q35/DSDT", -"tests/data/acpi/q35/DSDT.acpierst", -"tests/data/acpi/q35/DSDT.acpihmat", -"tests/data/acpi/q35/DSDT.acpihmat-noinitiator", -"tests/data/acpi/q35/DSDT.applesmc", -"tests/data/acpi/q35/DSDT.bridge", -"tests/data/acpi/q35/DSDT.cphp", -"tests/data/acpi/q35/DSDT.cxl", -"tests/data/acpi/q35/DSDT.core-count2", -"tests/data/acpi/q35/DSDT.dimmpxm", -"tests/data/acpi/q35/DSDT.ipmibt", -"tests/data/acpi/q35/DSDT.ipmismbus", -"tests/data/acpi/q35/DSDT.ivrs", -"tests/data/acpi/q35/DSDT.memhp", -"tests/data/acpi/q35/DSDT.mmio64", -"tests/data/acpi/q35/DSDT.multi-bridge", -"tests/data/acpi/q35/DSDT.nohpet", -"tests/data/acpi/q35/DSDT.numamem", -"tests/data/acpi/q35/DSDT.pvpanic-isa", -"tests/data/acpi/q35/DSDT.tis.tpm12", -"tests/data/acpi/q35/DSDT.tis.tpm2", -"tests/data/acpi/q35/DSDT.viot", -"tests/data/acpi/q35/DSDT.xapic", diff --git a/tests/data/acpi/pc/DSDT b/tests/data/acpi/pc/DSDT index f1cf7fab349bd26e0f0fa461c715534c1426fbf5..b688686dc3614f56582991c0974= f6ef1964ee6ce 100644 GIT binary patch delta 92 zcmaEAw9AOgCDyx{=3DZJE4eC!gZB)fLbIi$*u9 n=3Drad6dm02ASi}dI7&tQq1O*y!00~17VFV(KIX1`hu<-%_+;JHN delta 115 zcmdmG^wfyUCD- diff --git a/tests/data/acpi/pc/DSDT.acpierst b/tests/data/acpi/pc/DSDT.acp= ierst index 5cb477625e96f5526f0c7703ba3b443a0b35eefd..86259be9d1df3fcc89b780f3bae= 028a5ebd8bbe5 100644 GIT binary patch delta 92 zcmdmMG|7m|CDq!K2nsad01}2E!U#kdb8L?1xyJ(l#`_td delta 115 zcmbPawAYBsCDyx{=3DZJAsZCZFQAWsYu?nk>yD mX~Px}6lf5m2T}oIfw+cnt|5qP1m_xoxW;g<@n#dAdprPA1R$^g diff --git a/tests/data/acpi/pc/DSDT.acpihmat b/tests/data/acpi/pc/DSDT.acp= ihmat index 76e8bef36fdb667447ad0320d35604031aae2c93..e2cc2a6fc9877380ef85c354065= 4e0691472f27c 100644 GIT binary patch delta 92 zcmbPa``m`hCDoM`cPVoYc*C+1~ux0X+o%~(ER#!j=3DEE?UY nqR$-Q>}e2eU=3Dbf+V&Kde5EN*@0VE7Tgb|1^=3DGfdL$i@o*_h}ic delta 135 zcmaEEGs%|ACD2az?R8XVe)qY+lc5!sQ?oL yXU2e_Km!gSVF)6OK!h;|8%Qul52Opk0&xxDTtg7o2+lPEagE_z@$5#fa&GRnS&T99!A|i4y)!5GaN9AtDoj4ZZOa_pC^cD@ nN79BZASlovMh~O{!~$^*;ao!y*9guv0&$JuT;t7VJZzEx@&h4V diff --git a/tests/data/acpi/pc/DSDT.cphp b/tests/data/acpi/pc/DSDT.cphp index eb3da0e232e4362bd5850e4eebf5916cbc1d565a..53eb0dd7d422e880a668cf3ea01= b8b288004042a 100644 GIT binary patch delta 92 zcmdmL)@8=3D!66_MfCC$LVczYw4J1>{#^_cizr+5L!>yx8-ZJE4eC(q)w)fLbIi$*u9 n=3Drad6dm02ASi}dI7&tQq1O*y!00~17VFV(KIX3I_vGD=3D`smT~C delta 115 zcmeA&+iJ$;66_LUD$T&a=3D(3T^otMkyR!n@bQ@nuB&B@WcwoI-HlV|bTGDkN`O@7TQ mX~Px}6lf5m2T}oIfw+cnt|5qP1m_xoxW;g<@n#l2HeLW?o*)bW diff --git a/tests/data/acpi/pc/DSDT.dimmpxm b/tests/data/acpi/pc/DSDT.dimm= pxm index 6553e4c6053aff76ac42dad87d714e4e9ab28f72..9089d994e0324741190b48dfcfb= 4e6074ba102c1 100644 GIT binary patch delta 71 zcmca@zrmi%CD}e2eU=3DcsLK}d4*RUtNB03ZPsBme*a delta 115 zcmdmBf7_nRCDzdQxrQLF5u9rT;u^!b#+z3OvGD=3D`wTmG& diff --git a/tests/data/acpi/pc/DSDT.hpbridge b/tests/data/acpi/pc/DSDT.hpb= ridge index 5cb477625e96f5526f0c7703ba3b443a0b35eefd..86259be9d1df3fcc89b780f3bae= 028a5ebd8bbe5 100644 GIT binary patch delta 92 zcmdmMG|7m|CDq!K2nsad01}2E!U#kdb8L?1xyJ(l#`_td delta 115 zcmbPawAYBsCDyx{=3DZJAsZCZFQAWsYu?nk>yD mX~Px}6lf5m2T}oIfw+cnt|5qP1m_xoxW;g<@n#dAdprPA1R$^g diff --git a/tests/data/acpi/pc/DSDT.hpbrroot b/tests/data/acpi/pc/DSDT.hpb= rroot index ff04ad360beb60571d48bd1e477a4e58e5ee9337..578468f4f00a9373366c92926b5= 12c192dd6675b 100644 GIT binary patch delta 126 zcmZ21@k5-;CD5r{D6U;_!p=3Dz+`yu|Qly aIM)!wHG**k1C2m@V;Dcsc(X6pYDNHVI4i{f diff --git a/tests/data/acpi/pc/DSDT.ipmikcs b/tests/data/acpi/pc/DSDT.ipmi= kcs index 83eec58a52b5844a02003665494f63a4ea0b26a7..39427103aadb969721257feb9af= 66863b25b6ad9 100644 GIT binary patch delta 92 zcmZ2$++@t<66_MvB+0PE35TQ@nuZ?aAHTwoFb+lTUHm>I&$9MWY*4 m^qB*kJq>~lEaC%944fGQf&vXVfP^84FaiyD mX~Px}6lf5m2T}oIfw+cnt|5qP1m_xoxW;g<@n#bqKVATl)*#3L diff --git a/tests/data/acpi/pc/DSDT.memhp b/tests/data/acpi/pc/DSDT.memhp index 9e2201d170a86652951a2a4b234bb58204010642..987a263339225c2cb5ba71cd1aa= 183c651bb353e 100644 GIT binary patch delta 92 zcmdmD+iAyvK@*fM#^PL>q3)fLbIi$*u9 n=3Drad6dm02ASi}dI7&tQq1O*y!00~17VFV(KIX15oWa9+@;u9HA delta 135 zcmeCQ-D1n-66_MPMUH`i@zO@FV**?*w_@Uho#F+2Zce@>V9VsHFj-R2HX^!FD!|0R ynK2+J(0~I-7=3Dj2R5Mj*01`>?X1L*>>KwLvO*AT=3Dtf^&^PTw^%bcyqHL8!rHbb0$y# diff --git a/tests/data/acpi/pc/DSDT.nohpet b/tests/data/acpi/pc/DSDT.nohpet index c969e0dae410763a5f749c4c4fc842ccbf901fc5..fc7598b76287648f4b35273c91e= 46417a50b640b 100644 GIT binary patch delta 71 zcmca^xW}e2eU=3DcsLhFfy;MQ%1;03PoZR{#J2 delta 115 zcmZ2uc-@f8CDysyP+cJ5{PQJixD=3Dr+5LMo0BJU+cLQ-OuoQv%N*S(HCd5I m(uOS{D9|8A52OOb0&xxDTtg7o2+lPEagE_z;a diff --git a/tests/data/acpi/pc/DSDT.roothp b/tests/data/acpi/pc/DSDT.roothp index f57a14cd5c48ddded4c5d0b7da037b9d021a9ecb..545512adfa0f9af81a7fafd3536= 79f64f75e501e 100644 GIT binary patch delta 85 zcmZ2&(qO{n66_MfAjQDI$i9)QoLk=3DiaZG%$Q@nut;{az*gXkviU;~4Aj(A6xAcp8B kH|fa>xFtmdbiit&8&&j~L8^icEaE5c;g;Mi$RouE0OME}0RR91 delta 129 zcmZoLS#84Q66_M9EycjVSih00oLk=3DOSxkJeQ@nuFvjAsLgXkviU;~4Aj(A6xAcp8B zN4d!hxFwmR8>J?n<(9Nz3kV7{h|vS72eCk0LpawE#5IC*jX+#uIM;adGj1t90AL*@ A5dZ)H diff --git a/tests/data/acpi/q35/DSDT b/tests/data/acpi/q35/DSDT index 8e989819a5f8c470a8933bf9b7af7b988048cce6..2771bcea89b531549557a195386= 06219a8e222b1 100644 GIT binary patch delta 92 zcmccP_|1XKCDqa2sFR7`xZQ@nt))a0ph_6A-e!EP4u9Py4WK|Bl$ r@(j@p0iHpDOk4?EJOa)vV5QNGR{G2V&YlJ!m6Jco>2IDX@5~4QhjbXu delta 202 zcmez7aL19$CDXd2fJCsbHqEk1o1F1 z$TLJY1b7AoGI1qv@kBQoOlFbSuV)Jg3UrLo1L*>>KwKv{*9pXRhI5@kTo*Xk1;llQ jb6r7PH#pY~#C3;r-9cOrIM*Y($;8{qC4RG&ybU7&jZ8Ty diff --git a/tests/data/acpi/q35/DSDT.acpierst b/tests/data/acpi/q35/DSDT.a= cpierst index 03745d78de4c7e9639a4a37553361e0e18258633..b45abca7c289d8ae38faeca1fca= f6370ed621cd4 100644 GIT binary patch delta 92 zcmaFs*zU;X66_MvuE4;+D7ulWQI5+;Iwn5YDPF)udh%4c00S?PU^k0+j(A6xARYz=3D rd4}kQ0MDR6Cawf79sy?-u+r#8D}CkwXHNr=3D%E`>~`kPnDJ2L_RO!606 delta 202 zcmZp7eCx>N66_N4R)K+mar#ECMma7grI`3&r+5J`#mQ6U0^}T|gWW9RIpQ5%f_NAh zjdID!@15Nt_z&&0^+*D jxvn6t8=3DUI~;=3D04R?jWuQoa+(YWa91Q62IA7-i8qXA!9hS diff --git a/tests/data/acpi/q35/DSDT.acpihmat b/tests/data/acpi/q35/DSDT.a= cpihmat index 3ad9ba3c987ca1cfbafc3778db889602ab53530e..d90fd4723a703df348c12a5a1c1= c672b5af60a43 100644 GIT binary patch delta 92 zcmeD5S?tZ_66_MPSe1c+(P$&rI%O_zshId+r+5KpsmX_w?G3y{g550QIpQ5%f_NAh r-vDWY8D( delta 202 zcmZ4N-RZ;S66_Mfsm8#-xOpSjI%O_L#hCbDr+5KRg~^AM?d2S#gWW9RIpQ5%f_NAh zjdID!@15Nt_z&&0^+*D jxvn6t8=3DUI~;=3D04R?jWuQoa+(YWa91Q62CcJ#fA|8uwXb) diff --git a/tests/data/acpi/q35/DSDT.acpihmat-noinitiator b/tests/data/acp= i/q35/DSDT.acpihmat-noinitiator index 8efa1c5ded52b8a9dfbb6945a3c75cdc6ef9b277..279fafa8219140687f1cdaab973= 9fc2f4c80ed6a 100644 GIT binary patch delta 72 zcmezD-0RHc66_MvtH{8>_2 delta 182 zcmeBm{_M=3D<66_N4S&@N(v34WZ40$d`#hCbDr+5KRg~@B=3D?U@{;C%=3D`KWR7k$m@KWJ zU(Xg06zCYE2T}oIfw)d^t`mss4Cgw7xGr$63yA9q=3DemNpZg8#}i0cmLx`VhLaIQym PlZm&JOZ?_Q1sg^HC4x0a diff --git a/tests/data/acpi/q35/DSDT.applesmc b/tests/data/acpi/q35/DSDT.a= pplesmc index 5f01572dc2cf44aa0e730401e0709b95cd8db604..fdf6d144286860ff7f998df676c= a9a50ce988d41 100644 GIT binary patch delta 92 zcmeBjTH?s%66_MPM1g^UF?AzXqa2r~Y)pKxQ@ntq?BuC(_68o}!EP4u9Py4WK|Bl$ r@(j@p0iHpDOk4?EJOa)vV5QNGR{G2V&YlJ!m6Jco>2IDXU&sgmSo#=3Dy delta 202 zcmZ4D*yY6K66_MfrO3d*cw!@0qa2sNa!h=3D%Q@nt?^5m&<_Hur*!EP4u9Py4WK|Bl$ z@(j@p0iHpDOk4?EJkgB?lUd~T>)8T=3D0v%)YK)OII5Z4LLbpmmn;aq1B*9FdX0dZa7 jTvrg+4bF7~aoyoucM#VD&h?0H(h2r;j^Au0pT!6OWe+#t diff --git a/tests/data/acpi/q35/DSDT.bridge b/tests/data/acpi/q35/DSDT.bri= dge index 97141f9db208e1948bc2bdb3f3452ac8f78f98b0..b41a4dddc0b7bdeb2349d874a39= 0858453c927f8 100644 GIT binary patch delta 93 zcmbOlwLX%|CDZnV;84siA~0I8g;sI9;Ggtjju0OqzC%m4rY delta 203 zcmZ1yQCDkQ{QgSakmt_z6k k3g^0lxNdN+8;I);=3DemQq9&oNlbd!mzt0QD+5CIA2c diff --git a/tests/data/acpi/q35/DSDT.core-count2 b/tests/data/acpi/q35/DSD= T.core-count2 index ca309f6569f1f4016cf7e67117b208d57fbc7365..375aceed6b16528f7986fad46b0= 45eba76af9760 100644 GIT binary patch delta 94 zcmZ4SkMYo7MlP3Nmykns3=3DE7DHgcV<;qsP>i4S&)7jTxE{IJH}z)K|9%_5#7-q9t9 thk-$!A-W;JGboUWD}jqgz?lWCG`i7BpEpvxw)2cXSEj zVPKGFh;9h*3<_l8O5oy&ZZw!2P^(|h77!HZ7^4T$1!94?PH?Uhi0cgJI)k__aIOo8 l>k8+(g1ByQt{aH!4(GaqxE^q>M|6{kx06f!=3DC)cJMgYi0JE{Nx diff --git a/tests/data/acpi/q35/DSDT.cphp b/tests/data/acpi/q35/DSDT.cphp index 622e8e5f3700abffc58683689b9470573c117cd0..a0ecafc36c57c6d4791b511f3fe= be210713d253c 100644 GIT binary patch delta 92 zcmZ4Edd!8(CDR`WAsL@Km{&G#hCbDr+5KRg~_Q3_Hqu=3D!EP4u9Py4WK|Bl$ z@(j@p0iHpDOk4?EJkgB?ldmY~*Rur#1vjdID!@15Nt_z&&0^+*D jxvn6t8=3DUI~;=3D04R?jWuQoa+(YWa91Q62F;C(S{KK;Vw8% diff --git a/tests/data/acpi/q35/DSDT.cxl b/tests/data/acpi/q35/DSDT.cxl index cecc1caaab81db8559781d23e45d8c615dc73740..f9c6dd4ee0502ca000509493411= b421dfd23b96f 100644 GIT binary patch delta 92 zcmeD3S>ny*66_MPM3sSoF>fPRuQHdfOiX;RQ@nty%;bg2i3VOG!EP4u9Py4WK|Bl$ r@(j@p0iHpDOk4?EJOa)vV5QNGR{G2V&YlJ!m6H`z^fw<@ab^SnaF-Y# delta 202 zcmZ4D-Q~mO66_MfrN+R(_)8T=3D0v%)YK)OII5Z4LLbpmmn;aq1B*9FdX0dZa7 jTvrg+4bF7~aoyoucM#VD&h?0HGVykDiQk-|V#5dk&1pD! diff --git a/tests/data/acpi/q35/DSDT.dimmpxm b/tests/data/acpi/q35/DSDT.di= mmpxm index e5be00b4fa658477a9ae7016ed72ae04430a3b2f..f0659716e3cef916ed0d8f58317= 5a2edbc07141b 100644 GIT binary patch delta 72 zcmccQ_r{mYCD-&MH0rDEcPo#F+Yr6zN$+B12HO!iTg6cuo00SiYr ZTIn+fIC~ldyII6f&QR6g%&+Fm2ml*$6h#04 delta 182 zcmaFkd&!T>CDjdID!@15Nt_z&&0^+*Dxvn6t8=3DUI~;=3D04R?jWuQoa+(Y PWa91Q62EzastqFmgBvuS diff --git a/tests/data/acpi/q35/DSDT.ipmibt b/tests/data/acpi/q35/DSDT.ipm= ibt index c4f8212c63be2a1d579d6ebc9ac41d4bd5be414b..9c52529919d72a43034b1bbf4d3= f1810ba9e22b2 100644 GIT binary patch delta 92 zcmZ4PbkLE@CDg1_%_Hy3x!EP4u9Py4WK|Bl$ z@(j@p0iHpDOk4?EJkgB?lUd~T>)8T=3D0v%)YK)OII5Z4LLbpmmn;aq1B*9FdX0dZa7 jTvrg+4bF7~aoyoucM#VD&h?0H@?`P#G~8?@-_8gC8UQyt diff --git a/tests/data/acpi/q35/DSDT.ipmismbus b/tests/data/acpi/q35/DSDT.= ipmismbus index 05fb38820fa9213a20ace5943486ed18ad6a765c..3f32dffdbf3cd7e3791155530cf= 89417d8f2ec90 100644 GIT binary patch delta 92 zcmdnubk32>CDn|>8Mma7|wV3!|r+5KJwaHWE?ByJ!gWW9RIpQ5%f_NAh zjdID!@15Nt_z&&0^+*D jxvn6t8=3DUI~;=3D04R?jWuQoa+(YWa91Q62I9>ehMQ1mkc;N diff --git a/tests/data/acpi/q35/DSDT.ivrs b/tests/data/acpi/q35/DSDT.ivrs index 03745d78de4c7e9639a4a37553361e0e18258633..b45abca7c289d8ae38faeca1fca= f6370ed621cd4 100644 GIT binary patch delta 92 zcmaFs*zU;X66_MvuE4;+D7ulWQI5+;Iwn5YDPF)udh%4c00S?PU^k0+j(A6xARYz=3D rd4}kQ0MDR6Cawf79sy?-u+r#8D}CkwXHNr=3D%E`>~`kPnDJ2L_RO!606 delta 202 zcmZp7eCx>N66_N4R)K+mar#ECMma7grI`3&r+5J`#mQ6U0^}T|gWW9RIpQ5%f_NAh zjdID!@15Nt_z&&0^+*D jxvn6t8=3DUI~;=3D04R?jWuQoa+(YWa91Q62IA7-i8qXA!9hS diff --git a/tests/data/acpi/q35/DSDT.memhp b/tests/data/acpi/q35/DSDT.memhp index 2a4635d48c017970ee38d14148b20d38b699b030..28a192c69af3c6df8f003bf8edc= 9586f0dda35ad 100644 GIT binary patch delta 92 zcmZ4ObJUy5CDkWBNv}3(8#HQZeztPVoZHQj?!3+Z%X^1iM+pbHqEk1o1F1 r$TLJY1b7AoGI1qv@d!AxfR#o!TIn+fIC~m^R8DqO(ck<+#hDQRtI!!4 delta 202 zcmX@=3Dz1oM%CD>KwKv{*9pXRhI5@kTo*Xk1;llQ jb6r7PH#pY~#C3;r-9cOrIM*Y($;8{qC4O_KiVY(GXhAu1 diff --git a/tests/data/acpi/q35/DSDT.mmio64 b/tests/data/acpi/q35/DSDT.mmi= o64 index 0491761dc7132460b08b443579f0d4cad3fa3163..8fda921296e471f2b8dff8c1956= 52841f95cbcf9 100644 GIT binary patch delta 72 zcmX@+^}v(MCDij&_d1u!{CPj*n2WR7k$n4G7q zU(Xg06zCYE2T}oIfw)d^t`mss4Cgw7xGr$63yA9q=3DemNpZg8#}i0cmLx`VhLaIQym PlZm&JOZ?^~$~KGuBGEOP diff --git a/tests/data/acpi/q35/DSDT.multi-bridge b/tests/data/acpi/q35/DS= DT.multi-bridge index 485f571afd35cbd2044baeb7027ef077ba9a133d..3dba4d84369f1f2850fbdc77107= 2519d34f58072 100644 GIT binary patch delta 93 zcmbQ^vdx*xCDxbTqa2r`X-s^uQ@ntu$>ynY*^F`y(!p*P@f`7vE2KzicV+|tiJBL( delta 202 zcmaE1f6jr+CDjdID!@15Nt_z&&0^+*D jxvn6t8=3DUI~;=3D04R?jWuQoa+(YWa91Q62EzkoDCxY66`q( diff --git a/tests/data/acpi/q35/DSDT.numamem b/tests/data/acpi/q35/DSDT.nu= mamem index 2302de88e93a22118889cd33a8c63811925cff02..5eb6159d5f6101c0f75a6de6c83= ad95ccd2e6176 100644 GIT binary patch delta 72 zcmaFl_{V|ECDiZSuQPVoYs3X^Bc*)usvPrf53$sFBiFqunU zzn(21D9|xR52OOb0&$(-Tqh9M8P0VEab4hC7ZBGK&UFQG-QZj|5Z4{fbq8@h;9QUB PCKGQbm-x*N@-~bBMn5%J diff --git a/tests/data/acpi/q35/DSDT.pvpanic-isa b/tests/data/acpi/q35/DSD= T.pvpanic-isa index 5e4b51d33b8bb88ca2610254e6306c16e5b5b0db..908e7b6606b6141556e9df4ffd3= f88f97fe13d98 100644 GIT binary patch delta 92 zcmX@;blZ{3CD<#>-g550QIpQ5%f_NAh rjdID!@15Nt_z&&0^+*D ixvn6t8=3DUI~;=3D04R?jWuQoa+(Y1T@VxY_pa8LPh|=3Dn>bVe diff --git a/tests/data/acpi/q35/DSDT.tis.tpm12 b/tests/data/acpi/q35/DSDT.= tis.tpm12 index 1723fca4464383694f806f93331d008e84b93fef..ce2c2c29c2c177071d6c1284b1c= 496e773942bec 100644 GIT binary patch delta 92 zcmdnxcEy#;CDeW>_A&9nPVoY+_LCRN*&Fy+2D@3rbHqEk1o1F1 r$TLJY1b7AoGI1qv@d!AxfR#o!TIn+fIC~m^R8IaUr@wir{8VND#bz2F delta 202 zcmccOy338rCD*R%U_Hs@R!EP4u9Py4WK|Bl$ z@(j@p0iHpDOk4?EJkgB?lLh4U>)8T=3D0v%)YK)OII5Z4LLbpmmn;aq1B*9FdX0dZa7 jTvrg+4bF7~aoyoucM#VD&h?0Ha!?Hk@ZIbt-^UC9wZ%AV diff --git a/tests/data/acpi/q35/DSDT.tis.tpm2 b/tests/data/acpi/q35/DSDT.t= is.tpm2 index 1a0d6284da01addd0393b8aad96873398411895e..e9e4b7f6ed5094c5ca3635a5936= 7eb1d88b12ad1 100644 GIT binary patch delta 92 zcmccO_Rf{dCDhsg`&>)CDjdID!@15Nt_z&&0^+*D jxvn6t8=3DUI~;=3D04R?jWuQoa+(Y( diff --git a/tests/data/acpi/q35/DSDT.viot b/tests/data/acpi/q35/DSDT.viot index 6927d1cc96565f0e1e4c7f19fd709635873db912..6b436f9cd95776c26bec09066eb= 621bf97219dc6 100644 GIT binary patch delta 72 zcmdn!b=3Ds55CDj9B zU(Xg06zCYE2T}oIfw)d^t`mss4Cgw7xGr$63yA9q=3DemNpZg8#}i0cmLx`VhLaIQym PlZm&JOZ?`3WgA8Sp+q#h diff --git a/tests/data/acpi/q35/DSDT.xapic b/tests/data/acpi/q35/DSDT.xapic index 4a8a4af625edb1fd01a1404e33f34e85c1a252f3..f47f09122287bdd20d7762d3d6d= ee6e05d944285 100644 GIT binary patch delta 94 zcmdl#o$2N@CN7s?mypPA1_nm$ja(_6T;5VK@xe~<0?tyCD?05ByhMWCEaExh9bJNW t7#QRkq8kD{g94ej61aE-oLRt1qZ_UCnFE|X4L~Xpvxw)2cXSEj zVPKGFh;9h*3<_l8O5oy&ZZw$uyi>oPEg&e+F-8xh3&a9(o#0$25Z4*bbp~-=3D;9M6F l*A>on1##WrTsIKc9nN(JaXsK%kLV^7Zzq@d&9YrKi~tUhJK6vM --=20 MST From nobody Thu Apr 25 10:42:32 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=1669112656; cv=none; d=zohomail.com; s=zohoarc; b=aJEQZ6CRK6TmkTAPZHMhpaT3z75sA3nNJ++487wgK/NQ8WGkMYTh3DLpzvq0jUIvhMsQZ68Nb9a7oNyKVQTP0VnJL+tq38dbE9b3V5sGkOrJJ/3B6Go94d/VkcxBRzgnoQt6Pof7c7YsmO5kLPyyd7P99U3f19oI95hlNoqNytc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669112656; h=Content-Type: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=cU19UTpvTyW2lbnyRWSWVel8guq2aRTUFRueobwEObE=; b=RE6ahhXASmnJaKKT7g9c/+fAf1mg2Kro+ubBOnzRbhLtp7WkfPNF2KX5vHqFgoxbFs5PQ7U8/GB0f75UC4+3d/3l7jl1A53cU5TjiG84HvPZ1oNI3aXILJ3XYQMI26+dGENNWND1cuE0z3pous52LRjxSHjngc15YCK2wBfpGFI= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1669112656851601.0735219261737; Tue, 22 Nov 2022 02:24:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxQRP-0008JQ-2p; Tue, 22 Nov 2022 05:23:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQRM-0008Iv-IU for qemu-devel@nongnu.org; Tue, 22 Nov 2022 05:23:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQRK-0004mi-P5 for qemu-devel@nongnu.org; Tue, 22 Nov 2022 05:23:44 -0500 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-1-1v3zCLu4MKy8sPP6TxaWxQ-1; Tue, 22 Nov 2022 05:23:40 -0500 Received: by mail-wr1-f70.google.com with SMTP id j20-20020adfb314000000b002366d9f67aaso4047162wrd.3 for ; Tue, 22 Nov 2022 02:23:40 -0800 (PST) Received: from redhat.com ([2.52.21.254]) by smtp.gmail.com with ESMTPSA id b5-20020adff905000000b002366fb99cdasm13762795wrr.50.2022.11.22.02.23.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 02:23:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669112622; 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: in-reply-to:in-reply-to:references:references; bh=cU19UTpvTyW2lbnyRWSWVel8guq2aRTUFRueobwEObE=; b=VxmOZN93/rwTHshEfxlGqzZIsfDsCSBWQueA4lrLcYQ7MAV+XvVYXrDTu1Kin8eWUxfmeL ki7qcGb+QeRfQZLhKjmQ5t7CtvUng5ZbMctqkhMYJGfT1h5AX7Lxce3CB7ZecJlGGLRClV /OFtWxorwEFOJ/DAifgVuRJsNPIUkWg= X-MC-Unique: 1v3zCLu4MKy8sPP6TxaWxQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=cU19UTpvTyW2lbnyRWSWVel8guq2aRTUFRueobwEObE=; b=7IyDOZf4tOnQF+Z5RSF2UXHpOuKE3wn8rHXoAlucKABpTfYIWmf5u8XRilEj2d4Dho 2nDXJzTMR8xBvjygzRK1hp3lkPdyQZKEhF2FwHirju3cLAh3bTCpvEfFdvmqDZRSXoeQ wmWWfgP8Zm88kRcdwM0LcdenxznCqOIF2MJrF6tol5m3HUx/0T8zyRNo/HgGWa35H8Ry Mzty6S/pcqFbZE2EtZEQaLjZ3H7n6q/haWMM4NqyhnFxb4Z2Yd0L4CPFNo/X5oQZd7lO jlpbpdj/st2BN4wa6k1TRS+4vbFM30RDtoLd7u1/Rv/2XZdmVQhrnaS/yEB3YpUJCmGv Nrrg== X-Gm-Message-State: ANoB5pldiPDQ77GBvfri9E1qsYQKn+fjmn+X2D61q70Obt9TF9Riigbm mo4deX2O2YFh1r0WVgZv0aoH2hSUdkz8r6WxBM+ZYWjqcOFPYMQr8+5KMjiJVi2zLfb53fCvjXg wDd1Di7b3XFwVbb71lC/9lIvthYixESK9hHnVvGkvIbpmyIXL6Koj92kyIuWe X-Received: by 2002:a05:600c:3ba1:b0:3d0:47c:9ff5 with SMTP id n33-20020a05600c3ba100b003d0047c9ff5mr8989177wms.121.1669112619013; Tue, 22 Nov 2022 02:23:39 -0800 (PST) X-Google-Smtp-Source: AA0mqf42Cjh4hb6cy+1bQf9ghLIWb8XCAblhNpVP16NDDE3AMHDbvZ2cDRe4P+2TuRudbPNMBq7H+g== X-Received: by 2002:a05:600c:3ba1:b0:3d0:47c:9ff5 with SMTP id n33-20020a05600c3ba100b003d0047c9ff5mr8989152wms.121.1669112618764; Tue, 22 Nov 2022 02:23:38 -0800 (PST) Date: Tue, 22 Nov 2022 05:23:36 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Ani Sinha , Richard Henderson , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Thomas Huth , Alex =?utf-8?Q?Benn=C3=A9e?= Subject: [PULL 5/8] MAINTAINERS: add mst to list of biosbits maintainers Message-ID: <20221122102227.6603-6-mst@redhat.com> References: <20221122102227.6603-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20221122102227.6603-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent 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=170.10.129.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1669112657297100010 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Ani Sinha Adding Michael's name to the list of bios bits maintainers so that all chan= ges and fixes into biosbits framework can go through his tree and he is notifie= d. Suggested-by: Michael S. Tsirkin Signed-off-by: Ani Sinha Message-Id: <20221111151138.36988-1-ani@anisinha.ca> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index be151f0024..f3e0a4fc2e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1865,6 +1865,7 @@ F: hw/acpi/viot.h =20 ACPI/AVOCADO/BIOSBITS M: Ani Sinha +M: Michael S. Tsirkin S: Supported F: tests/avocado/acpi-bits/* F: tests/avocado/acpi-bits.py --=20 MST From nobody Thu Apr 25 10:42:32 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=1669112716; cv=none; d=zohomail.com; s=zohoarc; b=H/GPP8C1wT37K7Mpp5gA5AKmtIu9sIt3KfMlMVikuYHD9efs+2faZ179cDU9y1cvBWwtiHoVmgpyhqV7ZBYottgBxdEtacycif0xNidYWxQERjdlrvWI57EikDud/Khml1bSeSHJnl/LiiC0qFhF4pJ7fLFf/CjBmKj+VYU8sSI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669112716; h=Content-Type: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=Tp9jFYJgk+YLg5fcJWtG3ksiVNxD2+OIeFCJl1agFd8=; b=Um/6sNaueSL99QwFG6oFKbVcO+L0HNA90e1ERj4GsYfpPt+M8TNHL/QK/ntUJpvqFyPNA9KRpkZvxyPcH1rdGlALQIJEx9SInZQP+tyuFJ28XopSIMCW35nRTxeLZcBXHBp+fHqbQNrIs65a6zf41NZvuWmZNJuX7uxLr/iwvKk= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1669112716233981.0979595053726; Tue, 22 Nov 2022 02:25:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxQRW-0008L3-QE; Tue, 22 Nov 2022 05:23:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQRP-0008JZ-NF for qemu-devel@nongnu.org; Tue, 22 Nov 2022 05:23:48 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQRO-0004nG-8b for qemu-devel@nongnu.org; Tue, 22 Nov 2022 05:23:47 -0500 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-606-lLWNJcw6N0OFAJXxiH7HdQ-1; Tue, 22 Nov 2022 05:23:43 -0500 Received: by mail-wr1-f72.google.com with SMTP id v14-20020adf8b4e000000b0024174021277so4117409wra.13 for ; Tue, 22 Nov 2022 02:23:43 -0800 (PST) Received: from redhat.com ([2.52.21.254]) by smtp.gmail.com with ESMTPSA id n9-20020a05600c3b8900b003c6bbe910fdsm28615388wms.9.2022.11.22.02.23.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 02:23:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669112625; 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: in-reply-to:in-reply-to:references:references; bh=Tp9jFYJgk+YLg5fcJWtG3ksiVNxD2+OIeFCJl1agFd8=; b=O4UFMgqzWK8yPMC3WJ/qAcRRTbeoSdUwmMTIk7vlILpsM8B5dLKnDnHSoiqn/YXQrr903L 0+cZZx8mWmJ438OdqhHzS+/b8BqPe96g8n1T18HBbg6hv+eB6hZRwXux51mnWqoL7mSAQp yPFDAPvd63+w9xbaO8lLFkIwCj12W3A= X-MC-Unique: lLWNJcw6N0OFAJXxiH7HdQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Tp9jFYJgk+YLg5fcJWtG3ksiVNxD2+OIeFCJl1agFd8=; b=zSVtO/SQbFGqnM4s6Wkcb41N6iLzjRSFV9PI8+1KO0BZeurxkTk1+sjfPMRhFpQDDv 0J/QrJko5JQvb1G9KE180fEravD6C4Jn9ze5wSGpRDfss4RwcwlNa+8aFHjWhrz1U/9H 4AW8zs0yDhxX34WnXHdPS5D3K7zde8RjYG4YlA2zX+nwMIzlP3SGO6lL8IRbD7itt7Hq DW+rjxkASEHY7kqIW3G+6H8pIE0M9nCfqgDMl2SqLP2SS6TDsxwO4E1IMZW26nw9yY4O kClBqCYxQJT50K/NNZSDsIGWo/y/xdygXsiS9HY0v2DsCtHZqyTZ8annGArbp/FrI4aa YerA== X-Gm-Message-State: ANoB5pkQ+OaM8tl3XhRKneH/47tzkkt0jDVqp7HLpAOyDRPMFflvYAdj H1ZEoAfqjGy+UMFzlJUP0tEAnGxzA/yZ760QrPmUS0f15WIFICaQAKdog1mvqrMKr0nkPVDIUjd BipFPqBEc7ab7rh4MSOHEgXEyBmfAWn8TS8kCzDvJS+9fDy8z3xJvtxO3S6+2 X-Received: by 2002:a7b:ca45:0:b0:3c4:bda1:7c57 with SMTP id m5-20020a7bca45000000b003c4bda17c57mr19510766wml.6.1669112622115; Tue, 22 Nov 2022 02:23:42 -0800 (PST) X-Google-Smtp-Source: AA0mqf6NljfZ/Ujv+wKTAUFZfEgS4n9BAKTt3u/k147Mk1DA7g/d9tYHM1cZErqZnz+YLXEKPeIj/g== X-Received: by 2002:a7b:ca45:0:b0:3c4:bda1:7c57 with SMTP id m5-20020a7bca45000000b003c4bda17c57mr19510741wml.6.1669112621813; Tue, 22 Nov 2022 02:23:41 -0800 (PST) Date: Tue, 22 Nov 2022 05:23:39 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , John Snow , Ani Sinha , Cleber Rosa , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 6/8] tests/avocado: configure acpi-bits to use avocado timeout Message-ID: <20221122102227.6603-7-mst@redhat.com> References: <20221122102227.6603-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20221122102227.6603-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent 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=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1669112717537100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: John Snow Instead of using a hardcoded timeout, just rely on Avocado's built-in test case timeout. This helps avoid timeout issues on machines where 60 seconds is not sufficient. Signed-off-by: John Snow Message-Id: <20221115212759.3095751-1-jsnow@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Ani Sinha --- tests/avocado/acpi-bits.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/tests/avocado/acpi-bits.py b/tests/avocado/acpi-bits.py index 8745a58a76..ac13e22dc9 100644 --- a/tests/avocado/acpi-bits.py +++ b/tests/avocado/acpi-bits.py @@ -385,12 +385,6 @@ def test_acpi_smbios_bits(self): self._vm.launch() # biosbits has been configured to run all the specified test suites # in batch mode and then automatically initiate a vm shutdown. - # sleep for maximum of one minute - max_sleep_time =3D time.monotonic() + 60 - while self._vm.is_running() and time.monotonic() < max_sleep_time: - time.sleep(1) - - self.assertFalse(time.monotonic() > max_sleep_time, - 'The VM seems to have failed to shutdown in time') - + # Rely on avocado's unit test timeout. + self._vm.wait(timeout=3DNone) self.parse_log() --=20 MST From nobody Thu Apr 25 10:42:32 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=1669112755; cv=none; d=zohomail.com; s=zohoarc; b=Znn5gybt4IvXEDZRewmsAf6L4PUw318VYoePl7MteeVABWO+kRTVXb9CvtcGWAmfHBVSp2PaiVLShMMm3SezVvSOpC2i2/k/UkgZ9zbKFu3bYqY6mq3b1T6bYCVUvxOx8WpSlEsIqblDU8WVzyJ2hUu0FMVOw8CgEDisjFsAhGI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669112755; 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=tCyN486kILbT5B/0SUpD9hz0Zu83tKUQ17jpDn0HiAY=; b=aUeLYObW9supyDusesBub4yi2GA/9Zc5emtjMBByhXiZX5JceogDDxIhZ9Plfa/doBdXFzeX0n+x+M4KSdbETAiEYHEpd/WzNHXuVCDpYS0thU6vGGm+8CvF71h70ZPQyk9kOjRXM945SIQ5gMFvGVEGvhX7ZvHR1XmoXmdEdIQ= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1669112755479409.2116415724877; Tue, 22 Nov 2022 02:25:55 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxQRa-0008LT-SV; Tue, 22 Nov 2022 05:23:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQRW-0008Kt-4j for qemu-devel@nongnu.org; Tue, 22 Nov 2022 05:23:54 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQRQ-0004na-RK for qemu-devel@nongnu.org; Tue, 22 Nov 2022 05:23:53 -0500 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-654-V2Ay1hCHP5K-V0Ahf4EUKQ-1; Tue, 22 Nov 2022 05:23:46 -0500 Received: by mail-wr1-f71.google.com with SMTP id x8-20020adfbb48000000b00241c6e4f72eso2597528wrg.2 for ; Tue, 22 Nov 2022 02:23:46 -0800 (PST) Received: from redhat.com ([2.52.21.254]) by smtp.gmail.com with ESMTPSA id w19-20020adfbad3000000b00241c6729c2bsm10527579wrg.26.2022.11.22.02.23.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 02:23:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669112627; 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=tCyN486kILbT5B/0SUpD9hz0Zu83tKUQ17jpDn0HiAY=; b=Ul8MRDvbqRnS265wWOUHOObCuk6PcmHPmddOTpH1qDajVJVTV7KKr6kDSNCRKBKdP1G1ON WVlYeUffzgaA+aPbJ3HPkY2AKFjygD3Bv5hqfc/kO73ejXUdXpFMGjnyOzTZjTZnKqVNGQ hDnmJcrHsLUQuiGA51Z66IOjmIe9gUw= X-MC-Unique: V2Ay1hCHP5K-V0Ahf4EUKQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=tCyN486kILbT5B/0SUpD9hz0Zu83tKUQ17jpDn0HiAY=; b=opg4y0jfoPPpaM19A34I98MrQqMTs/mG8Uzdova6ra9RvlBgYOCyLWFuRc/C/kEalg 6qSyz3HyTZ1BDgWSoRCveCNNFTWDUWW9K1roS+Z/LiCULcz0rdwYTXee1eOeAlvFA2D9 RZakJogBnZyflZsMXynnQFupxDanq6/ECfBFie9HyGSkJ7DnUnzrfMYkMkvVNgegRjYs QpjfHLos1KRbgfg91WTQsf6rmtTaBP19qvrKf9W8UPi4dUrb2COYvVluMIt3+vlSNtmP 5YqbPsAtTKa25WOmUXcr3Wu2OhKpwQBh4JkLXcPkt2Ta5PjtAP5+7YpskEmYZiEcJvPe 8hUA== X-Gm-Message-State: ANoB5pm6180h0UlIzQMoRAfoaDuex7drqziJXcyasks7wGsIysqV4f5+ zaeDR3m/1T2VuuaY4+Qhc2567bM6klvhl4HTsNkuSOH4wTXcxcgFtRF0ItFhuxQtVQTBZhdRY2y K3ha17Jtv5YmINkW5D6LfVS3OByS10kxoB+d0Cn2mDcKdX20FmR6PBPbSiSua X-Received: by 2002:a5d:430e:0:b0:241:bfb6:c6da with SMTP id h14-20020a5d430e000000b00241bfb6c6damr3007678wrq.204.1669112625295; Tue, 22 Nov 2022 02:23:45 -0800 (PST) X-Google-Smtp-Source: AA0mqf6/xomgXpokGScLs+6dt0ZTnBsDoKUJJOmpvCxiHoMHDPR4LbdGHYM7tYKHT/yAd2urfbLpQw== X-Received: by 2002:a5d:430e:0:b0:241:bfb6:c6da with SMTP id h14-20020a5d430e000000b00241bfb6c6damr3007659wrq.204.1669112625018; Tue, 22 Nov 2022 02:23:45 -0800 (PST) Date: Tue, 22 Nov 2022 05:23:42 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Ani Sinha , Daniel P =?utf-8?B?LiBCZXJyYW5nw6k=?= , Cleber Rosa , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 7/8] acpi/tests/avocado/bits: keep the work directory when BITS_DEBUG is set in env Message-ID: <20221122102227.6603-8-mst@redhat.com> References: <20221122102227.6603-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: <20221122102227.6603-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent 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=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1669112757097100003 From: Ani Sinha Debugging bits issue often involves running the QEMU command line manually outside of the avocado environment with the generated ISO. Hence, its inconvenient if the iso gets cleaned up after the test has finished. This c= hange makes sure that the work directory is kept after the test finishes if the t= est is run with BITS_DEBUG=3D1 in the environment so that the iso is available = for use with the QEMU command line. CC: Daniel P. Berrang=C3=A9 Signed-off-by: Ani Sinha Message-Id: <20221117113630.543495-1-ani@anisinha.ca> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/avocado/acpi-bits.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/avocado/acpi-bits.py b/tests/avocado/acpi-bits.py index ac13e22dc9..4be663968c 100644 --- a/tests/avocado/acpi-bits.py +++ b/tests/avocado/acpi-bits.py @@ -260,7 +260,7 @@ def generate_bits_iso(self): self.logger.info('using grub-mkrescue for generating biosbits iso = ...') =20 try: - if os.getenv('V'): + if os.getenv('V') or os.getenv('BITS_DEBUG'): subprocess.check_call([mkrescue_script, '-o', iso_file, bits_dir], stderr=3Dsubprocess.STDO= UT) else: @@ -344,7 +344,7 @@ def parse_log(self): self._print_log(log) raise e else: - if os.getenv('V'): + if os.getenv('V') or os.getenv('BITS_DEBUG'): self._print_log(log) =20 def tearDown(self): @@ -353,8 +353,13 @@ def tearDown(self): """ if self._vm: self.assertFalse(not self._vm.is_running) - self.logger.info('removing the work directory %s', self._workDir) - shutil.rmtree(self._workDir) + if not os.getenv('BITS_DEBUG'): + self.logger.info('removing the work directory %s', self._workD= ir) + shutil.rmtree(self._workDir) + else: + self.logger.info('not removing the work directory %s ' \ + 'as BITS_DEBUG is ' \ + 'passed in the environment', self._workDir) super().tearDown() =20 def test_acpi_smbios_bits(self): --=20 MST From nobody Thu Apr 25 10:42:32 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=1669112725; cv=none; d=zohomail.com; s=zohoarc; b=nxWpGxVRzjD+87ITA4RxQwRpKUf0hSk/L6IvLU+YxABoCGRuoECU9qrGQCAHA4K/NFqQJGeXWSDIP5AHzzk5sDJfH/AEDTOZyXmFc3ijRQ+QgG0D6d6vzKjCKWasaZ7dkUxj9gIC5IM00YdQzlFka+09Tsueh5a/Utq237z9rJg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669112725; h=Content-Type: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=Z0eKwf2Elhvv90NH0J3EMt4xC/MdiblztPiLZZvKSPs=; b=YgXXHia7VnOdZPoV27IlyFBas/M8dCDvxT7mqoSgwbZtCiauL28m6t4WLkJSCyISlpFibUJzCZIDejS7Fpn4Ai5dFOeXgl0Vkq0GGrz1fu+92xmmvoXiPLl4UvDHgeaQ+Abxs8/tK+GUEv6JxUot8najMmgeLRqOl557EMmR6cE= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1669112725323433.2663459240039; Tue, 22 Nov 2022 02:25:25 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxQRa-0008LS-Nz; Tue, 22 Nov 2022 05:23:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQRV-0008Kg-NL for qemu-devel@nongnu.org; Tue, 22 Nov 2022 05:23:53 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQRU-0004ng-9X for qemu-devel@nongnu.org; Tue, 22 Nov 2022 05:23:53 -0500 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-504-BxsQckHoNJGqW5H4EgGcGw-1; Tue, 22 Nov 2022 05:23:49 -0500 Received: by mail-wr1-f69.google.com with SMTP id q2-20020adfab02000000b00241b8f7efc5so3944193wrc.19 for ; Tue, 22 Nov 2022 02:23:49 -0800 (PST) Received: from redhat.com ([2.52.21.254]) by smtp.gmail.com with ESMTPSA id t65-20020a1c4644000000b003cfa622a18asm20616847wma.3.2022.11.22.02.23.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 02:23:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669112631; 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: in-reply-to:in-reply-to:references:references; bh=Z0eKwf2Elhvv90NH0J3EMt4xC/MdiblztPiLZZvKSPs=; b=gonbBTXyFSMu7QUnebCKFS6rL5eA6msdmUG6KdMlz+isC70qKR20TcZddRtlU4CW4oQd04 FCHzgpmyClHVbOFvd5Yri8IPdM8D5ievsAk7KkwxHy1lSMqUg2QqUwY/ZziUGTpyQ2QTaI PvSy1aVjtI5RFnKyaig3acBScJzvlVE= X-MC-Unique: BxsQckHoNJGqW5H4EgGcGw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Z0eKwf2Elhvv90NH0J3EMt4xC/MdiblztPiLZZvKSPs=; b=cSCuIs5xSMjldODrTFaTqBIxFSELgSqVtp5RAgv6Cuoq9IGBmmwSJwb02t1OMAmF1H bmat/++qv2WPM8advUgZuzwAugVptk6bEXlNNHk+BFAdMvfeSs/+8PGHNWI6cZ/U9hvR TIgjPVKDe0onmHA+T/IjdB50t2WwXuzognweLQmqfaV5GFDi18cMktHXlL6gJrpeS9zv X5WpjMD2LYwtH70ytQdk5D6qxAtvL6zwhDo0528sHPbw3GX5vT3a+NwZjuWcF0CSPBrD GL8j6XoZOVoqz26j1+/aiMMPcdz9yp0StsPj9MlZTziTXU21TFPWAnpU2UryTGvfUd4g iM6w== X-Gm-Message-State: ANoB5pk9sW2Id9tNdM7Eft+0nElbPr5uxGUngqeAodvLQ3NXQRtj6lmP AtCwPHXCasPCXj6pDqMU3GYm9SfNGHchtz9zgNGfwNjjptMcZMBVMQdDlQuTfHx5F5ZCTC2raQm pSWvYI7pwgVuIYkPbz5MCS0PdtNc1pEL8FQriK6BFsqt7mrdkGJ2G2fjvn2ly X-Received: by 2002:a05:600c:4f48:b0:3cf:54f4:eea with SMTP id m8-20020a05600c4f4800b003cf54f40eeamr9400169wmq.105.1669112627918; Tue, 22 Nov 2022 02:23:47 -0800 (PST) X-Google-Smtp-Source: AA0mqf4BrHh7V6MZgQD9bIqnZ+E4Kv+0+QaW5j/v6v2DE9PiNoGW+9HLiSeaekbBqAe2O9hru1bWwQ== X-Received: by 2002:a05:600c:4f48:b0:3cf:54f4:eea with SMTP id m8-20020a05600c4f4800b003cf54f40eeamr9400150wmq.105.1669112627652; Tue, 22 Nov 2022 02:23:47 -0800 (PST) Date: Tue, 22 Nov 2022 05:23:45 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Kangjie Xu Subject: [PULL 8/8] virtio: disable error for out of spec queue-enable Message-ID: <20221122102227.6603-9-mst@redhat.com> References: <20221122102227.6603-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20221122102227.6603-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent 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=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1669112726833100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Virtio 1.0 is pretty clear that features have to be negotiated before enabling VQs. Unfortunately Seabios ignored this ever since gaining 1.0 support (UEFI is ok). Comment the error out for now, and add a TODO. Fixes: 3c37f8b8d1 ("virtio: introduce virtio_queue_enable()") Cc: "Kangjie Xu" Signed-off-by: Michael S. Tsirkin Message-Id: <20221121200339.362452-1-mst@redhat.com> --- hw/virtio/virtio.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 9683b2e158..eb6347ab5d 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -2499,10 +2499,17 @@ void virtio_queue_enable(VirtIODevice *vdev, uint32= _t queue_index) { VirtioDeviceClass *k =3D VIRTIO_DEVICE_GET_CLASS(vdev); =20 + /* + * TODO: Seabios is currently out of spec and triggering this error. + * So this needs to be fixed in Seabios, then this can + * be re-enabled for new machine types only, and also after + * being converted to LOG_GUEST_ERROR. + * if (!virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) { error_report("queue_enable is only suppported in devices of virtio= " "1.0 or later."); } + */ =20 if (k->queue_enable) { k->queue_enable(vdev, queue_index); --=20 MST