From nobody Sun May 19 09:42:16 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=1671012646; cv=none; d=zohomail.com; s=zohoarc; b=k3Y11GhO7ghiEiCm6k4iBjvDv+V70As3eN9rXnkRHAE/deDtSiCjBX0wAde12i9oXxeED+KRNVtYx/EPxILFMJuBe5YS6UnY5tsym84WGCLzuxmIyc3a96NMiZNmY0KnpjXCJ+2MihvzGGAIXDz6ks4cALNIK0lIr1PHTm9FtrI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671012646; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=k/lpCYBXIRzEJL16dt1SG350wajOBOqN5P7sPMMQaJM=; b=CgLWECcZ81/2x/aSjzXt0Wd6xr6y4Jo/8vlywHmnGayjI+dJaWsQnx3EvyUXVAX1iCpm5DiojURruoOJUfqumQ88mnk3DM+jhp174IPKloGqPtG26oUVLqqu9GsO3IJ/tTAkHfpqD9/l9IOxj0lZ4clMcznWkmNV9+k43b/1SHM= 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 167101264699060.24019081617723; Wed, 14 Dec 2022 02:10:46 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Oi9-0007iR-BJ; Wed, 14 Dec 2022 05:10:01 -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 1p5Ohr-0007cA-Dx for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:47 -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 1p5Ohe-00015I-GS for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:34 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-581-_A2g6N8OOaOy7_jJV-0ckA-1; Wed, 14 Dec 2022 05:09:19 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DAACB1C0896E; Wed, 14 Dec 2022 10:09:18 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id BD71F492C14; Wed, 14 Dec 2022 10:09:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671012561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=k/lpCYBXIRzEJL16dt1SG350wajOBOqN5P7sPMMQaJM=; b=CQiLKF9Y7A8yAXFehDv9KGzUUkQ6TjVwJqxTGp6Ot/GxEole9LglG92vCUCNvBpMilX1if P25AmDTn84w/VESD06+QEDVVVNiaxrMM5aBBuOPHct1uj/vYh2Wq5OcJhNKq3kCYJ2qQWO QxdvpeJoWkIAnu3i71WqIAA7AxYFZA4= X-MC-Unique: _A2g6N8OOaOy7_jJV-0ckA-1 From: Thomas Huth To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: Matthew Rosato , Eric Farman Subject: [PULL 01/23] s390x/pci: coalesce unmap operations Date: Wed, 14 Dec 2022 11:08:49 +0100 Message-Id: <20221214100911.165291-2-thuth@redhat.com> In-Reply-To: <20221214100911.165291-1-thuth@redhat.com> References: <20221214100911.165291-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=thuth@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: 1671012648801100003 Content-Type: text/plain; charset="utf-8" From: Matthew Rosato Currently, each unmapped page is handled as an individual iommu region notification. Attempt to group contiguous unmap operations into fewer notifications to reduce overhead. Signed-off-by: Matthew Rosato Message-Id: <20221028194758.204007-3-mjrosato@linux.ibm.com> Reviewed-by: Eric Farman Signed-off-by: Thomas Huth --- hw/s390x/s390-pci-inst.c | 51 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c index 7cc4bcf850..66e764f901 100644 --- a/hw/s390x/s390-pci-inst.c +++ b/hw/s390x/s390-pci-inst.c @@ -640,6 +640,8 @@ static uint32_t s390_pci_update_iotlb(S390PCIIOMMU *iom= mu, } g_hash_table_remove(iommu->iotlb, &entry->iova); inc_dma_avail(iommu); + /* Don't notify the iommu yet, maybe we can bundle contiguous unma= ps */ + goto out; } else { if (cache) { if (cache->perm =3D=3D entry->perm && @@ -663,15 +665,44 @@ static uint32_t s390_pci_update_iotlb(S390PCIIOMMU *i= ommu, dec_dma_avail(iommu); } =20 + /* + * All associated iotlb entries have already been cleared, trigger the + * unmaps. + */ memory_region_notify_iommu(&iommu->iommu_mr, 0, event); =20 out: return iommu->dma_limit ? iommu->dma_limit->avail : 1; } =20 +static void s390_pci_batch_unmap(S390PCIIOMMU *iommu, uint64_t iova, + uint64_t len) +{ + uint64_t remain =3D len, start =3D iova, end =3D start + len - 1, mask= , size; + IOMMUTLBEvent event =3D { + .type =3D IOMMU_NOTIFIER_UNMAP, + .entry =3D { + .target_as =3D &address_space_memory, + .translated_addr =3D 0, + .perm =3D IOMMU_NONE, + }, + }; + + while (remain >=3D TARGET_PAGE_SIZE) { + mask =3D dma_aligned_pow2_mask(start, end, 64); + size =3D mask + 1; + event.entry.iova =3D start; + event.entry.addr_mask =3D mask; + memory_region_notify_iommu(&iommu->iommu_mr, 0, event); + start +=3D size; + remain -=3D size; + } +} + int rpcit_service_call(S390CPU *cpu, uint8_t r1, uint8_t r2, uintptr_t ra) { CPUS390XState *env =3D &cpu->env; + uint64_t iova, coalesce =3D 0; uint32_t fh; uint16_t error =3D 0; S390PCIBusDevice *pbdev; @@ -742,6 +773,21 @@ int rpcit_service_call(S390CPU *cpu, uint8_t r1, uint8= _t r2, uintptr_t ra) break; } =20 + /* + * If this is an unmap of a PTE, let's try to coalesce multiple un= maps + * into as few notifier events as possible. + */ + if (entry.perm =3D=3D IOMMU_NONE && entry.len =3D=3D TARGET_PAGE_S= IZE) { + if (coalesce =3D=3D 0) { + iova =3D entry.iova; + } + coalesce +=3D entry.len; + } else if (coalesce > 0) { + /* Unleash the coalesced unmap before processing a new map */ + s390_pci_batch_unmap(iommu, iova, coalesce); + coalesce =3D 0; + } + start +=3D entry.len; while (entry.iova < start && entry.iova < end) { if (dma_avail > 0 || entry.perm =3D=3D IOMMU_NONE) { @@ -759,6 +805,11 @@ int rpcit_service_call(S390CPU *cpu, uint8_t r1, uint8= _t r2, uintptr_t ra) } } } + if (coalesce) { + /* Unleash the coalesced unmap before finishing rpcit */ + s390_pci_batch_unmap(iommu, iova, coalesce); + coalesce =3D 0; + } if (again && dma_avail > 0) goto retry; err: --=20 2.31.1 From nobody Sun May 19 09:42:16 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=1671012664; cv=none; d=zohomail.com; s=zohoarc; b=aEv/CET64bRWwqkfKYXr4phiwOilNmt0JT/Ncee1N0WxI4Ec8J+VC+0Y6VLY9CNfVSJqITIh8ESik50YUPX8Kha1TSB64sNjQsAL4I+eOTpHtbi2CwUgfjpg/BhQT0uqFzL2HFaJERIXWs+V14/MK7L6/UAM+Ovv8V1dezH+57A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671012664; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fC2uX57Vo/LJduT5Qa2yFHUm2yh9kzdU0t1CV28GY4A=; b=M8R3OBBjXhUuAP7PAlHSjvEkhPlHwR5UY1wmGVMLwdQeAo0GSakCOGgxe0wOBaqrvtEVcwfidJ4t7O4nM8YJwOJNhDyqiSjszSYW5/0Gj403NQN/ccehCFmc63hZl5s6Qjic79C7ZTbxChjvgBLlsqp9HMAiU36Yl1em3ymzfsg= 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 1671012664722966.8044828001925; Wed, 14 Dec 2022 02:11:04 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Oi8-0007i4-77; Wed, 14 Dec 2022 05:10:00 -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 1p5Ohr-0007cF-G2 for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:47 -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 1p5Ohe-00016Y-Fr for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:34 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-486-RQ2vz3M1N-2i5H2glQfmlQ-1; Wed, 14 Dec 2022 05:09:20 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 55F9288B7A2; Wed, 14 Dec 2022 10:09:20 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 34C9C492C3C; Wed, 14 Dec 2022 10:09:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671012564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fC2uX57Vo/LJduT5Qa2yFHUm2yh9kzdU0t1CV28GY4A=; b=NC/Xa8KUs3wk2Dsz/mWl5Dyy1evalg+LisfE9pI5QA0DkkIYLBJdFavZmECFyPz9O8rGzk zEB/vxcn6b+KAqMc03HkDVZbuqT/yRuT2FhrBSdbBxgJ1FjX8oKms13yb1CdQuaYYp/bCG AAJklgpuUY9Q3DXQWA+/f0q61+hRj0Y= X-MC-Unique: RQ2vz3M1N-2i5H2glQfmlQ-1 From: Thomas Huth To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: Matthew Rosato , Eric Farman Subject: [PULL 02/23] s390x/pci: shrink DMA aperture to be bound by vfio DMA limit Date: Wed, 14 Dec 2022 11:08:50 +0100 Message-Id: <20221214100911.165291-3-thuth@redhat.com> In-Reply-To: <20221214100911.165291-1-thuth@redhat.com> References: <20221214100911.165291-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=thuth@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: 1671012664986100005 Content-Type: text/plain; charset="utf-8" From: Matthew Rosato Currently, s390x-pci performs accounting against the vfio DMA limit and triggers the guest to clean up mappings when the limit is reached. Let's go a step further and also limit the size of the supported DMA aperture reported to the guest based upon the initial vfio DMA limit reported for the container (if less than than the size reported by the firmware/host zPCI layer). This avoids processing sections of the guest DMA table during global refresh that, for common use cases, will never be used anway, and makes exhausting the vfio DMA limit due to mismatch between guest aperture size and host limit far less likely and more indicitive of an error. Signed-off-by: Matthew Rosato Message-Id: <20221028194758.204007-4-mjrosato@linux.ibm.com> Reviewed-by: Eric Farman Signed-off-by: Thomas Huth --- include/hw/s390x/s390-pci-bus.h | 1 + hw/s390x/s390-pci-vfio.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/include/hw/s390x/s390-pci-bus.h b/include/hw/s390x/s390-pci-bu= s.h index 0605fcea24..1c46e3a269 100644 --- a/include/hw/s390x/s390-pci-bus.h +++ b/include/hw/s390x/s390-pci-bus.h @@ -278,6 +278,7 @@ struct S390PCIIOMMU { uint64_t g_iota; uint64_t pba; uint64_t pal; + uint64_t max_dma_limit; GHashTable *iotlb; S390PCIDMACount *dma_limit; }; diff --git a/hw/s390x/s390-pci-vfio.c b/hw/s390x/s390-pci-vfio.c index 5f0adb0b4a..f7bf36cec8 100644 --- a/hw/s390x/s390-pci-vfio.c +++ b/hw/s390x/s390-pci-vfio.c @@ -84,6 +84,7 @@ S390PCIDMACount *s390_pci_start_dma_count(S390pciState *s, cnt->users =3D 1; cnt->avail =3D avail; QTAILQ_INSERT_TAIL(&s->zpci_dma_limit, cnt, link); + pbdev->iommu->max_dma_limit =3D avail; return cnt; } =20 @@ -103,6 +104,7 @@ static void s390_pci_read_base(S390PCIBusDevice *pbdev, struct vfio_info_cap_header *hdr; struct vfio_device_info_cap_zpci_base *cap; VFIOPCIDevice *vpci =3D container_of(pbdev->pdev, VFIOPCIDevice, pdev= ); + uint64_t vfio_size; =20 hdr =3D vfio_get_device_info_cap(info, VFIO_DEVICE_INFO_CAP_ZPCI_BASE); =20 @@ -122,6 +124,15 @@ static void s390_pci_read_base(S390PCIBusDevice *pbdev, /* The following values remain 0 until we support other FMB formats */ pbdev->zpci_fn.fmbl =3D 0; pbdev->zpci_fn.pft =3D 0; + + /* + * If appropriate, reduce the size of the supported DMA aperture repor= ted + * to the guest based upon the vfio DMA limit. + */ + vfio_size =3D pbdev->iommu->max_dma_limit << TARGET_PAGE_BITS; + if (vfio_size < (cap->end_dma - cap->start_dma + 1)) { + pbdev->zpci_fn.edma =3D cap->start_dma + vfio_size - 1; + } } =20 static bool get_host_fh(S390PCIBusDevice *pbdev, struct vfio_device_info *= info, --=20 2.31.1 From nobody Sun May 19 09:42:16 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=1671013154; cv=none; d=zohomail.com; s=zohoarc; b=FRPWwWMdsdvZKx45SDaYmADlyq3oROnZDCTg+XU+QSkj1uIY97/HFqVRC2gmIt9OCxgdHuEOABYm89xb6fVX6/KmP2Bs+BA02FJ4CTAD4rj2gdNtKBstbXLMd/Jy3TUAEjCthGNLxlIyrTX+PX6oaY0xiphtqh1NuRwWjGitz1c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671013154; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cBez5/22PyLA7ndtkwULR/IZ5CbFM7noqm5OTnaRikk=; b=aOxJw9nMyM7+0paBIveal8vZ5kxCyFcH7tK8SWa+Ayc+UkEHtvpgao+i/tPAEB1nWIUYLmWX4mLksUw1gn0yQzejFLXTBkT7Y0l7J5VCJOfPSoJcWCs6eNcrjmWUqZZ0yINnJnQk74uMBTlskr47HawC5MNAXxKGrF5NNpH5jf0= 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 16710131542921021.4936264922294; Wed, 14 Dec 2022 02:19:14 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Oi4-0007gx-Ei; Wed, 14 Dec 2022 05:09:56 -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 1p5Ohr-0007cC-FI for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:47 -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 1p5Ohe-00017c-GP for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:34 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-282-YiMGrhyXNJeTLV52dIwtbg-1; Wed, 14 Dec 2022 05:09:22 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D5F711C08962; Wed, 14 Dec 2022 10:09:21 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id B5FC6492C14; Wed, 14 Dec 2022 10:09:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671012565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cBez5/22PyLA7ndtkwULR/IZ5CbFM7noqm5OTnaRikk=; b=X3A9dnnLRQZXGAQQsxnZ+DLbGHXAc9iuP38t2uem6NK9OUhn3rMvwxuW1Eau4OhcHptzs3 gi9q6bm4FWmHe34C3Qeivr5/AdqnfkvMxPGraAcj2RYHN4In7N/X9wk1dU7H/MK96Yx2A3 OeH3aOPfas9HcHTzbSkNMfocZGNJZ2Y= X-MC-Unique: YiMGrhyXNJeTLV52dIwtbg-1 From: Thomas Huth To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: Matthew Rosato , Eric Farman Subject: [PULL 03/23] s390x/pci: reset ISM passthrough devices on shutdown and system reset Date: Wed, 14 Dec 2022 11:08:51 +0100 Message-Id: <20221214100911.165291-4-thuth@redhat.com> In-Reply-To: <20221214100911.165291-1-thuth@redhat.com> References: <20221214100911.165291-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=thuth@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: 1671013156475100003 Content-Type: text/plain; charset="utf-8" From: Matthew Rosato ISM device firmware stores unique state information that can can cause a wholesale unmap of the associated IOMMU (e.g. when we get a termination signal for QEMU) to trigger firmware errors because firmware believes we are attempting to invalidate entries that are still in-use by the guest OS (when in fact that guest is in the process of being terminated or rebooted). To alleviate this, register both a shutdown notifier (for unexpected termination cases e.g. virsh destroy) as well as a reset callback (for cases like guest OS reboot). For each of these scenarios, trigger PCI device reset; this is enough to indicate to firmware that the IOMMU is no longer in-use by the guest OS, making it safe to invalidate any associated IOMMU entries. Fixes: 15d0e7942d3b ("s390x/pci: don't fence interpreted devices without MS= I-X") Signed-off-by: Matthew Rosato Message-Id: <20221209195700.263824-1-mjrosato@linux.ibm.com> Reviewed-by: Eric Farman [thuth: Adjusted the hunk in s390-pci-vfio.c due to different context] Signed-off-by: Thomas Huth --- include/hw/s390x/s390-pci-bus.h | 5 +++++ hw/s390x/s390-pci-bus.c | 28 ++++++++++++++++++++++++++++ hw/s390x/s390-pci-vfio.c | 2 ++ 3 files changed, 35 insertions(+) diff --git a/include/hw/s390x/s390-pci-bus.h b/include/hw/s390x/s390-pci-bu= s.h index 1c46e3a269..e0a9f9385b 100644 --- a/include/hw/s390x/s390-pci-bus.h +++ b/include/hw/s390x/s390-pci-bus.h @@ -39,6 +39,9 @@ #define UID_CHECKING_ENABLED 0x01 #define ZPCI_DTSM 0x40 =20 +/* zPCI Function Types */ +#define ZPCI_PFT_ISM 5 + OBJECT_DECLARE_SIMPLE_TYPE(S390pciState, S390_PCI_HOST_BRIDGE) OBJECT_DECLARE_SIMPLE_TYPE(S390PCIBus, S390_PCI_BUS) OBJECT_DECLARE_SIMPLE_TYPE(S390PCIBusDevice, S390_PCI_DEVICE) @@ -344,6 +347,7 @@ struct S390PCIBusDevice { uint16_t noi; uint16_t maxstbl; uint8_t sum; + uint8_t pft; S390PCIGroup *pci_group; ClpRspQueryPci zpci_fn; S390MsixInfo msix; @@ -352,6 +356,7 @@ struct S390PCIBusDevice { MemoryRegion msix_notify_mr; IndAddr *summary_ind; IndAddr *indicator; + Notifier shutdown_notifier; bool pci_unplug_request_processed; bool unplug_requested; bool interp; diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c index 977e7daa15..02751f3597 100644 --- a/hw/s390x/s390-pci-bus.c +++ b/hw/s390x/s390-pci-bus.c @@ -24,6 +24,8 @@ #include "hw/pci/msi.h" #include "qemu/error-report.h" #include "qemu/module.h" +#include "sysemu/reset.h" +#include "sysemu/runstate.h" =20 #ifndef DEBUG_S390PCI_BUS #define DEBUG_S390PCI_BUS 0 @@ -150,10 +152,30 @@ out: psccb->header.response_code =3D cpu_to_be16(rc); } =20 +static void s390_pci_shutdown_notifier(Notifier *n, void *opaque) +{ + S390PCIBusDevice *pbdev =3D container_of(n, S390PCIBusDevice, + shutdown_notifier); + + pci_device_reset(pbdev->pdev); +} + +static void s390_pci_reset_cb(void *opaque) +{ + S390PCIBusDevice *pbdev =3D opaque; + + pci_device_reset(pbdev->pdev); +} + static void s390_pci_perform_unplug(S390PCIBusDevice *pbdev) { HotplugHandler *hotplug_ctrl; =20 + if (pbdev->pft =3D=3D ZPCI_PFT_ISM) { + notifier_remove(&pbdev->shutdown_notifier); + qemu_unregister_reset(s390_pci_reset_cb, pbdev); + } + /* Unplug the PCI device */ if (pbdev->pdev) { DeviceState *pdev =3D DEVICE(pbdev->pdev); @@ -1111,6 +1133,12 @@ static void s390_pcihost_plug(HotplugHandler *hotplu= g_dev, DeviceState *dev, pbdev->fh |=3D FH_SHM_VFIO; pbdev->forwarding_assist =3D false; } + /* Register shutdown notifier and reset callback for ISM devic= es */ + if (pbdev->pft =3D=3D ZPCI_PFT_ISM) { + pbdev->shutdown_notifier.notify =3D s390_pci_shutdown_noti= fier; + qemu_register_shutdown_notifier(&pbdev->shutdown_notifier); + qemu_register_reset(s390_pci_reset_cb, pbdev); + } } else { pbdev->fh |=3D FH_SHM_EMUL; /* Always intercept emulated devices */ diff --git a/hw/s390x/s390-pci-vfio.c b/hw/s390x/s390-pci-vfio.c index f7bf36cec8..f51190d466 100644 --- a/hw/s390x/s390-pci-vfio.c +++ b/hw/s390x/s390-pci-vfio.c @@ -124,6 +124,8 @@ static void s390_pci_read_base(S390PCIBusDevice *pbdev, /* The following values remain 0 until we support other FMB formats */ pbdev->zpci_fn.fmbl =3D 0; pbdev->zpci_fn.pft =3D 0; + /* Store function type separately for type-specific behavior */ + pbdev->pft =3D cap->pft; =20 /* * If appropriate, reduce the size of the supported DMA aperture repor= ted --=20 2.31.1 From nobody Sun May 19 09:42:16 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=1671012824; cv=none; d=zohomail.com; s=zohoarc; b=U+y+3LcLhteQ1MPvgNAQrce2W2TBTBc2KcPlILFpVz1Lqt11p8mFBRgKE0vKVnjnnme7J3aopt5nKWGFUTgpxyBlcm/bwsAM54q5T58dEoCf+B7IzJF2Au85xgk3PRTtZAZ+jeUAuc4PqDN2WBltYPS+hyHzO0bc1ypEPiF1t4o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671012824; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ypgFWqhE2J3xK3+MXb0eHLmjlDQ/avUfb48tdBuEKYw=; b=X3sg98Olt6Gh2/xMuJCChvEQXLUiaWWLD3oi3kFwiqR1NOiUL4RvVupZSzy6c32Dn6oSiXi7+9I0KyhFqIqiaOCzhptgQUl7b2o1j2ftzJE5uIt8474QMq1Mt+TMq7nes0VP1gnJsGiwmJ9ICZWqrGDtiLSTM5zzLt9KQV75BbI= 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 167101282407444.34099787981677; Wed, 14 Dec 2022 02:13:44 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5OiC-0007jD-0O; Wed, 14 Dec 2022 05:10:04 -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 1p5Ohw-0007dt-67 for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:55 -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 1p5Ohr-00016o-51 for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:47 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-76-V4Z2OEvMORih0rrWFfu50g-1; Wed, 14 Dec 2022 05:09:23 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4789B181E3EE; Wed, 14 Dec 2022 10:09:23 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 44956492C14; Wed, 14 Dec 2022 10:09:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671012564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ypgFWqhE2J3xK3+MXb0eHLmjlDQ/avUfb48tdBuEKYw=; b=CfCMg31yx7W+krRwYax6ZKBUY+ddmLoOfmiyP8PNNcumRrbHbn6U5UesRTdyAuttbk2pkY 9EF2ef48QLU4GdsJULuF5skf6VML014y3ZvOY7Ee1JJVkuj1O9j0qlpLvi8L0CmSQIYQwJ Ax8RjhDzLnBTZUzU+IAVCXWL2uvwHOY= X-MC-Unique: V4Z2OEvMORih0rrWFfu50g-1 From: Thomas Huth To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: Nina Schoetterl-Glausch , David Hildenbrand Subject: [PULL 04/23] target/s390x/tcg/mem_helper: Test the right bits in psw_key_valid() Date: Wed, 14 Dec 2022 11:08:52 +0100 Message-Id: <20221214100911.165291-5-thuth@redhat.com> In-Reply-To: <20221214100911.165291-1-thuth@redhat.com> References: <20221214100911.165291-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=thuth@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: 1671012825979100003 Content-Type: text/plain; charset="utf-8" The PSW key mask is a 16 bit field, and the psw_key variable is in the range from 0 to 15, so it does not make sense to use "0x80 >> psw_key" for testing the bits here. We should use 0x8000 instead. Message-Id: <20221205142043.95185-1-thuth@redhat.com> Reviewed-by: Nina Schoetterl-Glausch Reviewed-by: David Hildenbrand Signed-off-by: Thomas Huth --- target/s390x/tcg/mem_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c index 3758b9e688..006b6798a7 100644 --- a/target/s390x/tcg/mem_helper.c +++ b/target/s390x/tcg/mem_helper.c @@ -51,7 +51,7 @@ static inline bool psw_key_valid(CPUS390XState *env, uint= 8_t psw_key) =20 if (env->psw.mask & PSW_MASK_PSTATE) { /* PSW key has range 0..15, it is valid if the bit is 1 in the PKM= */ - return pkm & (0x80 >> psw_key); + return pkm & (0x8000 >> psw_key); } return true; } --=20 2.31.1 From nobody Sun May 19 09:42:16 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=1671012839; cv=none; d=zohomail.com; s=zohoarc; b=NtVRLH3nCjZpO9asf+vL5LjcdqqulGn7r26o1Gz5k83tD41SQEBHEqh2OhK3cX4gRRvJBSyJ/4zuwU1mbI5vNM6VmxYpg85gjYRq9K2ZvC8pn/E/WSZor4sedx/ulinLGGLS8hr+/l4GIkdMnzQFPLZpjMdE/iwwcwUDGgwjkt8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671012839; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Z20HP6FvsJIrt/gLkdyk0hsYH6mMRPW471lF9nrJQ+c=; b=FvDdeExqaBn4P99zoUGNe1Pvls49Hk1fAwt/p+Sf8+znmN6AteGxV3vLOiMIY3psZtsOsjDzwfQeb9zpELtrJGCjsj2j5qxEzMu5XeI70Op8cBkNSN2ftX4CNs1FJOwprsg73OHdVuZX1jJKNgacBVmeTa6X7obM7axT5GGRxWQ= 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 1671012839755461.93069310832584; Wed, 14 Dec 2022 02:13:59 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5OiB-0007io-D2; Wed, 14 Dec 2022 05:10:03 -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 1p5Ohr-0007cB-FM for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:47 -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 1p5Ohe-00018e-G5 for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:34 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-665-ZtrXZJK1Ogi0-5U1Q2t14g-1; Wed, 14 Dec 2022 05:09:25 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A9B751C0896F; Wed, 14 Dec 2022 10:09:24 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id B3500492C14; Wed, 14 Dec 2022 10:09:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671012569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Z20HP6FvsJIrt/gLkdyk0hsYH6mMRPW471lF9nrJQ+c=; b=a5HP6nj3meRotv5tHhHXNMn1dj/AuRXxkDwprZPQS6MUpUP4zjA4QLTtvx3EJPRlVthhfO xIf//hRUdGgXaxMPM6x41ua6rvkNBX0hkKfaewjt7wZ4H6xwBScQgbdFT29Z/uKPtAiCVo kDVfCdc8jeCvAJj5SBhlzK0D7wAgxHw= X-MC-Unique: ZtrXZJK1Ogi0-5U1Q2t14g-1 From: Thomas Huth To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: Ilya Leoshkevich Subject: [PULL 05/23] target/s390x: The MVCP and MVCS instructions are not privileged Date: Wed, 14 Dec 2022 11:08:53 +0100 Message-Id: <20221214100911.165291-6-thuth@redhat.com> In-Reply-To: <20221214100911.165291-1-thuth@redhat.com> References: <20221214100911.165291-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=thuth@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: 1671012840033100001 Content-Type: text/plain; charset="utf-8" The "MOVE TO PRIMARY/SECONDARY" instructions can also be called from problem state. We just should properly check whether the secondary-space access key is valid here, too, and inject a privileged program exception if it is invalid. Message-Id: <20221205125852.81848-1-thuth@redhat.com> Reviewed-by: Ilya Leoshkevich Signed-off-by: Thomas Huth --- target/s390x/helper.h | 4 ++-- target/s390x/tcg/insn-data.h.inc | 4 ++-- target/s390x/tcg/mem_helper.c | 16 ++++++++++++---- target/s390x/tcg/translate.c | 6 ++++-- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index bf33d86f74..93923ca153 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -353,8 +353,8 @@ DEF_HELPER_FLAGS_3(tprot, TCG_CALL_NO_WG, i32, env, i64= , i64) DEF_HELPER_2(iske, i64, env, i64) DEF_HELPER_3(sske, void, env, i64, i64) DEF_HELPER_2(rrbe, i32, env, i64) -DEF_HELPER_4(mvcs, i32, env, i64, i64, i64) -DEF_HELPER_4(mvcp, i32, env, i64, i64, i64) +DEF_HELPER_5(mvcs, i32, env, i64, i64, i64, i64) +DEF_HELPER_5(mvcp, i32, env, i64, i64, i64, i64) DEF_HELPER_4(sigp, i32, env, i64, i32, i32) DEF_HELPER_FLAGS_2(sacf, TCG_CALL_NO_WG, void, env, i64) DEF_HELPER_FLAGS_4(idte, TCG_CALL_NO_RWG, void, env, i64, i64, i32) diff --git a/target/s390x/tcg/insn-data.h.inc b/target/s390x/tcg/insn-data.= h.inc index 54d4250c9f..79c6ab509a 100644 --- a/target/s390x/tcg/insn-data.h.inc +++ b/target/s390x/tcg/insn-data.h.inc @@ -1355,9 +1355,9 @@ E(0xb24b, LURA, RRE, Z, 0, ra2, new, r1_32, lura, 0, MO_TEUL, I= F_PRIV) E(0xb905, LURAG, RRE, Z, 0, ra2, r1, 0, lura, 0, MO_TEUQ, IF_PRI= V) /* MOVE TO PRIMARY */ - F(0xda00, MVCP, SS_d, Z, la1, a2, 0, 0, mvcp, 0, IF_PRIV) + C(0xda00, MVCP, SS_d, Z, la1, a2, 0, 0, mvcp, 0) /* MOVE TO SECONDARY */ - F(0xdb00, MVCS, SS_d, Z, la1, a2, 0, 0, mvcs, 0, IF_PRIV) + C(0xdb00, MVCS, SS_d, Z, la1, a2, 0, 0, mvcs, 0) /* PURGE TLB */ F(0xb20d, PTLB, S, Z, 0, 0, 0, 0, ptlb, 0, IF_PRIV) /* RESET REFERENCE BIT EXTENDED */ diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c index 006b6798a7..cb82cd1c1d 100644 --- a/target/s390x/tcg/mem_helper.c +++ b/target/s390x/tcg/mem_helper.c @@ -2295,7 +2295,8 @@ uint32_t HELPER(rrbe)(CPUS390XState *env, uint64_t r2) return re >> 1; } =20 -uint32_t HELPER(mvcs)(CPUS390XState *env, uint64_t l, uint64_t a1, uint64_= t a2) +uint32_t HELPER(mvcs)(CPUS390XState *env, uint64_t l, uint64_t a1, uint64_= t a2, + uint64_t key) { const uint8_t psw_as =3D (env->psw.mask & PSW_MASK_ASC) >> PSW_SHIFT_A= SC; S390Access srca, desta; @@ -2310,6 +2311,10 @@ uint32_t HELPER(mvcs)(CPUS390XState *env, uint64_t l= , uint64_t a1, uint64_t a2) s390_program_interrupt(env, PGM_SPECIAL_OP, ra); } =20 + if (!psw_key_valid(env, (key >> 4) & 0xf)) { + s390_program_interrupt(env, PGM_PRIVILEGED, ra); + } + l =3D wrap_length32(env, l); if (l > 256) { /* max 256 */ @@ -2319,14 +2324,14 @@ uint32_t HELPER(mvcs)(CPUS390XState *env, uint64_t = l, uint64_t a1, uint64_t a2) return cc; } =20 - /* TODO: Access key handling */ srca =3D access_prepare(env, a2, l, MMU_DATA_LOAD, MMU_PRIMARY_IDX, ra= ); desta =3D access_prepare(env, a1, l, MMU_DATA_STORE, MMU_SECONDARY_IDX= , ra); access_memmove(env, &desta, &srca, ra); return cc; } =20 -uint32_t HELPER(mvcp)(CPUS390XState *env, uint64_t l, uint64_t a1, uint64_= t a2) +uint32_t HELPER(mvcp)(CPUS390XState *env, uint64_t l, uint64_t a1, uint64_= t a2, + uint64_t key) { const uint8_t psw_as =3D (env->psw.mask & PSW_MASK_ASC) >> PSW_SHIFT_A= SC; S390Access srca, desta; @@ -2341,6 +2346,10 @@ uint32_t HELPER(mvcp)(CPUS390XState *env, uint64_t l= , uint64_t a1, uint64_t a2) s390_program_interrupt(env, PGM_SPECIAL_OP, ra); } =20 + if (!psw_key_valid(env, (key >> 4) & 0xf)) { + s390_program_interrupt(env, PGM_PRIVILEGED, ra); + } + l =3D wrap_length32(env, l); if (l > 256) { /* max 256 */ @@ -2350,7 +2359,6 @@ uint32_t HELPER(mvcp)(CPUS390XState *env, uint64_t l,= uint64_t a1, uint64_t a2) return cc; } =20 - /* TODO: Access key handling */ srca =3D access_prepare(env, a2, l, MMU_DATA_LOAD, MMU_SECONDARY_IDX, = ra); desta =3D access_prepare(env, a1, l, MMU_DATA_STORE, MMU_PRIMARY_IDX, = ra); access_memmove(env, &desta, &srca, ra); diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index 1e599ac259..a339b277e9 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -3476,7 +3476,8 @@ static DisasJumpType op_mvcos(DisasContext *s, DisasO= ps *o) static DisasJumpType op_mvcp(DisasContext *s, DisasOps *o) { int r1 =3D get_field(s, l1); - gen_helper_mvcp(cc_op, cpu_env, regs[r1], o->addr1, o->in2); + int r3 =3D get_field(s, r3); + gen_helper_mvcp(cc_op, cpu_env, regs[r1], o->addr1, o->in2, regs[r3]); set_cc_static(s); return DISAS_NEXT; } @@ -3484,7 +3485,8 @@ static DisasJumpType op_mvcp(DisasContext *s, DisasOp= s *o) static DisasJumpType op_mvcs(DisasContext *s, DisasOps *o) { int r1 =3D get_field(s, l1); - gen_helper_mvcs(cc_op, cpu_env, regs[r1], o->addr1, o->in2); + int r3 =3D get_field(s, r3); + gen_helper_mvcs(cc_op, cpu_env, regs[r1], o->addr1, o->in2, regs[r3]); set_cc_static(s); return DISAS_NEXT; } --=20 2.31.1 From nobody Sun May 19 09:42:16 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=1671013176; cv=none; d=zohomail.com; s=zohoarc; b=CD03L+radx+j3W04Bm+hUsX/68YiReV1sgMDf1HHVycB129E+1rCob1CHH2BYtsB2qJ4agQyhKuYtxl2BtpCBD+gfTL728gnkOFR1tS6E5QKi+AkvokdNiEJqgxP18RYzgEtEwWPnSm+X3dMuBdZG334G1C4doB19hwD8PIsouI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671013176; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sHIes2pzkcfTQ+dXBIJhpv7FL9o7l+cY6fDfdYvtrm4=; b=N2cAt/qQKvy6UKdE++gX46PeSzABLIft9VcDdt3iihguV0HYqh42Eavi7oKB34/+SK7F54TegGyNGstHhVIZ6veq1nOgCCkp0e2/R7RkjSu+PigDyELZGJtbXAay0qPpJJmVJD8y4bre3qKbNBCHjch6S8ABFpHrp3EuwgR5/X0= 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 1671013176224848.5637507012069; Wed, 14 Dec 2022 02:19:36 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Oi6-0007hd-Gk; Wed, 14 Dec 2022 05:09: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 1p5Ohu-0007cV-SE for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:47 -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 1p5Ohr-00018W-33 for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:45 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-445--Lxsl8zsO6a-9jUQs_SjYA-1; Wed, 14 Dec 2022 05:09:26 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EB579181E3F2 for ; Wed, 14 Dec 2022 10:09:25 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0C4F8492C14; Wed, 14 Dec 2022 10:09:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671012567; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sHIes2pzkcfTQ+dXBIJhpv7FL9o7l+cY6fDfdYvtrm4=; b=UxbhAjr3+f0HOZLTIF5aj6vzprJ08uylsGdk7EoSt6yJ9jnzhFXZaetnanGADdONAGJktC GrzkX72TKZtbuBtvUtOjC3dYtDTBCu1c2Qr/SWI2sMOUfeOX7sy9q+I/g+PWXamnpP8d4R wc0V4QcNRDTo6acOZxMYPflwSIxw60Q= X-MC-Unique: -Lxsl8zsO6a-9jUQs_SjYA-1 From: Thomas Huth To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: Markus Armbruster Subject: [PULL 06/23] monitor/misc: Remove superfluous include statements Date: Wed, 14 Dec 2022 11:08:54 +0100 Message-Id: <20221214100911.165291-7-thuth@redhat.com> In-Reply-To: <20221214100911.165291-1-thuth@redhat.com> References: <20221214100911.165291-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=thuth@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: 1671013176567100001 Content-Type: text/plain; charset="utf-8" These #includes are not required anymore (the likely got superfluous with commit da76ee76f7 - "hmp-commands-info: move info_cmds content out of monitor.c"). Message-Id: <20221128133514.220919-1-thuth@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: Thomas Huth --- monitor/misc.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/monitor/misc.c b/monitor/misc.c index 205487e2b9..e2c017d69c 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -25,10 +25,8 @@ #include "qemu/osdep.h" #include "monitor-internal.h" #include "monitor/qdev.h" -#include "hw/usb.h" #include "hw/pci/pci.h" #include "sysemu/watchdog.h" -#include "hw/loader.h" #include "exec/gdbstub.h" #include "net/net.h" #include "net/slirp.h" @@ -39,16 +37,13 @@ #include "ui/input.h" #include "audio/audio.h" #include "disas/disas.h" -#include "sysemu/balloon.h" #include "qemu/timer.h" #include "qemu/log.h" #include "sysemu/hw_accel.h" #include "sysemu/runstate.h" #include "authz/list.h" #include "qapi/util.h" -#include "sysemu/blockdev.h" #include "sysemu/sysemu.h" -#include "sysemu/tpm.h" #include "sysemu/device_tree.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qerror.h" @@ -77,7 +72,6 @@ #include "qapi/qapi-init-commands.h" #include "qapi/error.h" #include "qapi/qmp-event.h" -#include "sysemu/cpus.h" #include "qemu/cutils.h" =20 #if defined(TARGET_S390X) --=20 2.31.1 From nobody Sun May 19 09:42:16 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=1671012633; cv=none; d=zohomail.com; s=zohoarc; b=W5HfYijVMF5bgeHJQdWyfUOcsk8cd8wQWoZKbR0Y9cdb7PxYdLJMr9rRjtswVsLB0IwA1NHOr7f0ls5EDad0CIA3XrpoVWLrXhsjPqoQWVg8dqUMxeeqzVcy9e43OsIJBzl6sqoN7qa+qnGWiK6Beuq7zPPa06cbp3ZyhCcZEmE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671012633; 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=o/uPm2oLr8glG3gTasgkV6ihPXLLyKGd6quQKQzJmPo=; b=lRzrA93IYOkjE0v1hsKdufRT0/SrkBqPvgC0LgG4WotGpTgj2nZwlwESM3KRl50E0Mm3N6ihRrb9UMiqtCH2Av9/+K3UlqwtkCYusZR/DOhKvL5zd4HUcWBnah0jNdU9PiJec9w/KOmw37VK5H850f9dbUNQH9vJKaH4yG7ZkxU= 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 1671012633946383.8975830196447; Wed, 14 Dec 2022 02:10:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Oi9-0007iS-Qy; Wed, 14 Dec 2022 05:10:01 -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 1p5Ohw-0007dx-BP for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:55 -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 1p5Ohr-00018m-5l for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:48 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-340-ZqID5VF-PzWC8Bz4xp4GHQ-1; Wed, 14 Dec 2022 05:09:27 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5FCD9811E9C; Wed, 14 Dec 2022 10:09:27 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5B9C5492C14; Wed, 14 Dec 2022 10:09:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671012569; 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=o/uPm2oLr8glG3gTasgkV6ihPXLLyKGd6quQKQzJmPo=; b=aleJWuR+OVW6w6rKbNChbcxDrRXiD46nyyewz/i49mSXk1eAOfDN0XVEWuVOlbetWzebXv u1aOrOuV6YpgvAl2ei7KKsxP1wRxZNo8LrbXZGuCiu5hhlJoUK3nJcMf33fWEo18/oVyzY u3CeVs+oRkjzDsHi0D6PKdE39VaVCPQ= X-MC-Unique: ZqID5VF-PzWC8Bz4xp4GHQ-1 From: Thomas Huth To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 07/23] scripts/make-release: Add a simple help text for the script Date: Wed, 14 Dec 2022 11:08:55 +0100 Message-Id: <20221214100911.165291-8-thuth@redhat.com> In-Reply-To: <20221214100911.165291-1-thuth@redhat.com> References: <20221214100911.165291-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=thuth@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: 1671012634864100005 Print a simple help text if the script has been called with the wrong amount of parameters. Message-Id: <20221128092555.37102-2-thuth@redhat.com> Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Thomas Huth --- scripts/make-release | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/make-release b/scripts/make-release index 05b14ecc95..4be9b3b9ce 100755 --- a/scripts/make-release +++ b/scripts/make-release @@ -10,6 +10,12 @@ # This work is licensed under the terms of the GNU GPLv2 or later. # See the COPYING file in the top-level directory. =20 +if [ $# -ne 2 ]; then + echo "Usage:" + echo " $0 gitrepo version" + exit 0 +fi + src=3D"$1" version=3D"$2" destination=3Dqemu-${version} --=20 2.31.1 From nobody Sun May 19 09:42:16 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=1671013373; cv=none; d=zohomail.com; s=zohoarc; b=b4Af2kmoPjMKbg5HVtHm423CRr5s3zzn/i2dAymKutREvVz7KRERUPLhD1GK/6X6uQ5jfKiGoiGteEQxwudvXAw4Os+KCGF1P8oBFR084vfgORWAQSMharnZA5+K0Is+klHm868nn2ZmNwQjgsrX0NsRRdMOXzo/AF9ENdzEpq4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671013373; 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=LU/ar0/7i1cly4C1aLb8loaeKKkdNBeetikSG4plrLE=; b=EAKaPaURhwBXe9z6IkhlMGZxyIBebC4tTTrsr4K5ycgWk94OnQk/3QS7hdYeptYAC92rSOFnufUH6y1l/hXB7Qpo9fjDCx/DiI2gSIv7rfw2WIUsLhLLV3Gvx1TfMhiItMhIYS37lqTt1c++t1kSNEW2N/9RwpOXBS5HhIA71rQ= 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 1671013373832130.3624592850748; Wed, 14 Dec 2022 02:22:53 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Oi4-0007ga-DN; Wed, 14 Dec 2022 05:09:56 -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 1p5Ohu-0007cP-2d for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:47 -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 1p5Ohj-00018y-FM for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:44 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-434-o99BBWTLMEGVFUbUt-EBPQ-1; Wed, 14 Dec 2022 05:09:29 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B95BA181E3F4; Wed, 14 Dec 2022 10:09:28 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id B497B492C14; Wed, 14 Dec 2022 10:09:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671012570; 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=LU/ar0/7i1cly4C1aLb8loaeKKkdNBeetikSG4plrLE=; b=e4jMTZW2RriMr3ODczGkRVNXPPwRkUfKwT+sX0/6F8gb4mbOlx4yeZV0gXkaw/u0U66a6p i4haFeQTzw9W2+SQRyBRdplttENqpVFuoXvLhAH1/IH08ZKShXm0i2NRCvEJRP42uK17eb ldFyH/fWRPqaMni91k0Qc9TK34R6lw0= X-MC-Unique: o99BBWTLMEGVFUbUt-EBPQ-1 From: Thomas Huth To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 08/23] scripts/make-release: Only clone single branches to speed up the script Date: Wed, 14 Dec 2022 11:08:56 +0100 Message-Id: <20221214100911.165291-9-thuth@redhat.com> In-Reply-To: <20221214100911.165291-1-thuth@redhat.com> References: <20221214100911.165291-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=thuth@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: 1671013375249100003 Using --single-branch and --depth 1 here helps to speed up the process a little bit and helps to save some networking bandwidth. Message-Id: <20221128092555.37102-3-thuth@redhat.com> Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Thomas Huth --- scripts/make-release | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/make-release b/scripts/make-release index 4be9b3b9ce..44a9d86a04 100755 --- a/scripts/make-release +++ b/scripts/make-release @@ -20,10 +20,12 @@ src=3D"$1" version=3D"$2" destination=3Dqemu-${version} =20 -git clone "${src}" ${destination} +git clone --single-branch -b "v${version}" -c advice.detachedHead=3Dfalse \ + "${src}" ${destination} + pushd ${destination} -git checkout "v${version}" -git submodule update --init + +git submodule update --init --single-branch (cd roms/seabios && git describe --tags --long --dirty > .version) (cd roms/skiboot && ./make_version.sh > .version) # Fetch edk2 submodule's submodules, since it won't have access to them via @@ -34,7 +36,7 @@ git submodule update --init # submodule dependencies, so we continue to handle these on a case-by-case # basis for now. (cd roms/edk2 && \ - git submodule update --init -- \ + git submodule update --init --depth 1 -- \ ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 \ BaseTools/Source/C/BrotliCompress/brotli \ CryptoPkg/Library/OpensslLib/openssl \ --=20 2.31.1 From nobody Sun May 19 09:42:16 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=1671012817; cv=none; d=zohomail.com; s=zohoarc; b=TeVc8+5/3mGvexpaP2fae/RD2Q9BY5xC9cNpYUqcg2wAZGgFMtZs8M1cQu0rR8uNzMIfx3RNeQiNrVOvgvV9xPablNjvfUtCafdbxstUkReG4vdGVSJgKD5B5SFYFxjWDEm1esu6Y/KmfuLxMU8YvWroF60B/26ubAivHayv0U8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671012817; h=Content-Transfer-Encoding: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=qXrWg7KpN3EnwaKQArqYqNYriosS+/I5wYI4RAVRT+M=; b=BfnV1dXCYkdbyEKAk7aENiRNJCmN/QgmrfPkE9veiTySKL3mPX5NhVxDkx4090MjRjL+vAUcNCJShcCq7SYAYJDFeBEWah/DIPGAbdxvKCuBQVHLenf/bJzNq7lg3QToOe75qlpJ3vyb1fqzBH7Xoa/4XFQn8l0bk7okRv7pOp4= 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 1671012817748182.89775085253757; Wed, 14 Dec 2022 02:13:37 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5OiB-0007iw-Ro; Wed, 14 Dec 2022 05:10:03 -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 1p5Ohv-0007dg-T3 for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:51 -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 1p5Ohr-0001A6-40 for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:47 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-494-a1RoPLwhPpeRL6zkXoSXdQ-1; Wed, 14 Dec 2022 05:09:30 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F0B71181E3EF for ; Wed, 14 Dec 2022 10:09:29 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2A494492C14; Wed, 14 Dec 2022 10:09:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671012577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qXrWg7KpN3EnwaKQArqYqNYriosS+/I5wYI4RAVRT+M=; b=JveelAawLQDMQXHG/rl9KTiCPG18KQpVrSAe6Gzs3Ub9EEOAkuZVGiehG9S/W24UiwnSVx YSxTDTmktBX84k8Bk/0+qkeytqxwCFDfXe8vOcJ73as/bHW26k7qc56V8TPLnDL6BQAqqa Bfw69mM7ANO5DZL4nyVyU3ilFGPUUj4= X-MC-Unique: a1RoPLwhPpeRL6zkXoSXdQ-1 From: Thomas Huth To: Stefan Hajnoczi , qemu-devel@nongnu.org Subject: [PULL 09/23] util/qemu-config: Fix "query-command-line-options" to provide the right values Date: Wed, 14 Dec 2022 11:08:57 +0100 Message-Id: <20221214100911.165291-10-thuth@redhat.com> In-Reply-To: <20221214100911.165291-1-thuth@redhat.com> References: <20221214100911.165291-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=thuth@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: 1671012817990100001 Content-Type: text/plain; charset="utf-8" The "query-command-line-options" command uses a hand-crafted list of options that should be returned for the "machine" parameter. This is pretty much out of sync with reality, for example settings like "kvm_shadow_mem" or "accel" are not parameters for the machine anymore. Also, there is no distinction between the targets here, so e.g. the s390x-specific values like "loadparm" in this list also show up with the other targets like x86_64. Let's fix this now by geting rid of the hand-crafted list and by querying the properties of the machine classes instead to assemble the list. Fixes: 0a7cf217d8 ("fix regression of qmp_query_command_line_options") Message-Id: <20221111141323.246267-1-thuth@redhat.com> Signed-off-by: Thomas Huth --- util/qemu-config.c | 168 +++++++++++++++++++++------------------------ 1 file changed, 77 insertions(+), 91 deletions(-) diff --git a/util/qemu-config.c b/util/qemu-config.c index 433488aa56..cf47e8a3d0 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -8,6 +8,7 @@ #include "qemu/error-report.h" #include "qemu/option.h" #include "qemu/config-file.h" +#include "hw/boards.h" =20 static QemuOptsList *vm_config_groups[48]; static QemuOptsList *drive_config_groups[5]; @@ -149,97 +150,82 @@ static CommandLineParameterInfoList *get_drive_infoli= st(void) return head; } =20 -/* restore machine options that are now machine's properties */ -static QemuOptsList machine_opts =3D { - .merge_lists =3D true, - .head =3D QTAILQ_HEAD_INITIALIZER(machine_opts.head), - .desc =3D { - { - .name =3D "type", - .type =3D QEMU_OPT_STRING, - .help =3D "emulated machine" - },{ - .name =3D "accel", - .type =3D QEMU_OPT_STRING, - .help =3D "accelerator list", - },{ - .name =3D "kernel_irqchip", - .type =3D QEMU_OPT_BOOL, - .help =3D "use KVM in-kernel irqchip", - },{ - .name =3D "kvm_shadow_mem", - .type =3D QEMU_OPT_SIZE, - .help =3D "KVM shadow MMU size", - },{ - .name =3D "kernel", - .type =3D QEMU_OPT_STRING, - .help =3D "Linux kernel image file", - },{ - .name =3D "initrd", - .type =3D QEMU_OPT_STRING, - .help =3D "Linux initial ramdisk file", - },{ - .name =3D "append", - .type =3D QEMU_OPT_STRING, - .help =3D "Linux kernel command line", - },{ - .name =3D "dtb", - .type =3D QEMU_OPT_STRING, - .help =3D "Linux kernel device tree file", - },{ - .name =3D "dumpdtb", - .type =3D QEMU_OPT_STRING, - .help =3D "Dump current dtb to a file and quit", - },{ - .name =3D "phandle_start", - .type =3D QEMU_OPT_NUMBER, - .help =3D "The first phandle ID we may generate dynamically", - },{ - .name =3D "dt_compatible", - .type =3D QEMU_OPT_STRING, - .help =3D "Overrides the \"compatible\" property of the dt roo= t node", - },{ - .name =3D "dump-guest-core", - .type =3D QEMU_OPT_BOOL, - .help =3D "Include guest memory in a core dump", - },{ - .name =3D "mem-merge", - .type =3D QEMU_OPT_BOOL, - .help =3D "enable/disable memory merge support", - },{ - .name =3D "usb", - .type =3D QEMU_OPT_BOOL, - .help =3D "Set on/off to enable/disable usb", - },{ - .name =3D "firmware", - .type =3D QEMU_OPT_STRING, - .help =3D "firmware image", - },{ - .name =3D "iommu", - .type =3D QEMU_OPT_BOOL, - .help =3D "Set on/off to enable/disable Intel IOMMU (VT-d)", - },{ - .name =3D "suppress-vmdesc", - .type =3D QEMU_OPT_BOOL, - .help =3D "Set on to disable self-describing migration", - },{ - .name =3D "aes-key-wrap", - .type =3D QEMU_OPT_BOOL, - .help =3D "enable/disable AES key wrapping using the CPACF wra= pping key", - },{ - .name =3D "dea-key-wrap", - .type =3D QEMU_OPT_BOOL, - .help =3D "enable/disable DEA key wrapping using the CPACF wra= pping key", - },{ - .name =3D "loadparm", - .type =3D QEMU_OPT_STRING, - .help =3D "Up to 8 chars in set of [A-Za-z0-9. ](lower case ch= ars" - " converted to upper case) to pass to machine" - " loader, boot manager, and guest kernel", - }, - { /* End of list */ } +static CommandLineParameterInfo *objprop_to_cmdline_prop(ObjectProperty *p= rop) +{ + CommandLineParameterInfo *info; + + info =3D g_malloc0(sizeof(*info)); + info->name =3D g_strdup(prop->name); + + if (g_str_equal(prop->type, "bool") || g_str_equal(prop->type, "OnOffA= uto")) { + info->type =3D COMMAND_LINE_PARAMETER_TYPE_BOOLEAN; + } else if (g_str_equal(prop->type, "int")) { + info->type =3D COMMAND_LINE_PARAMETER_TYPE_NUMBER; + } else if (g_str_equal(prop->type, "size")) { + info->type =3D COMMAND_LINE_PARAMETER_TYPE_SIZE; + } else { + info->type =3D COMMAND_LINE_PARAMETER_TYPE_STRING; } -}; + + if (prop->description) { + info->has_help =3D true; + info->help =3D g_strdup(prop->description); + } + + return info; +} + +static CommandLineParameterInfoList *query_all_machine_properties(void) +{ + CommandLineParameterInfoList *params =3D NULL, *clpiter; + CommandLineParameterInfo *info; + GSList *machines, *curr_mach; + ObjectPropertyIterator op_iter; + ObjectProperty *prop; + bool is_new; + + machines =3D object_class_get_list(TYPE_MACHINE, false); + assert(machines); + + /* Loop over all machine classes */ + for (curr_mach =3D machines; curr_mach; curr_mach =3D curr_mach->next)= { + object_class_property_iter_init(&op_iter, curr_mach->data); + /* ... and over the properties of each machine: */ + while ((prop =3D object_property_iter_next(&op_iter))) { + if (!prop->set) { + continue; + } + /* + * Check whether the property has already been put into the li= st + * (via another machine class) + */ + is_new =3D true; + for (clpiter =3D params; clpiter !=3D NULL; clpiter =3D clpite= r->next) { + if (g_str_equal(clpiter->value->name, prop->name)) { + is_new =3D false; + break; + } + } + /* If it hasn't been added before, add it now to the list */ + if (is_new) { + info =3D objprop_to_cmdline_prop(prop); + QAPI_LIST_PREPEND(params, info); + } + } + } + + g_slist_free(machines); + + /* Add entry for the "type" parameter */ + info =3D g_malloc0(sizeof(*info)); + info->name =3D g_strdup("type"); + info->type =3D COMMAND_LINE_PARAMETER_TYPE_STRING; + info->has_help =3D true; + info->help =3D g_strdup("machine type"); + QAPI_LIST_PREPEND(params, info); + + return params; +} =20 CommandLineOptionInfoList *qmp_query_command_line_options(bool has_option, const char *opti= on, @@ -266,7 +252,7 @@ CommandLineOptionInfoList *qmp_query_command_line_optio= ns(bool has_option, if (!has_option || !strcmp(option, "machine")) { info =3D g_malloc0(sizeof(*info)); info->option =3D g_strdup("machine"); - info->parameters =3D query_option_descs(machine_opts.desc); + info->parameters =3D query_all_machine_properties(); QAPI_LIST_PREPEND(conf_list, info); } =20 --=20 2.31.1 From nobody Sun May 19 09:42:16 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=1671012977; cv=none; d=zohomail.com; s=zohoarc; b=avqaw6Y2zjQijyYLjQ+EQNsLlge4UuFTQvDT2vRtr80tRpk4ydvOyFyyJHaryisdJWY8cijz+2CKEL9DzFHnqFv6esJS04IoSEdTONXclkAk0gfFdpib5pVbHpf7dx9kzhcxZd7X6K731eLsiPMKtcFKZiNSXZD/QvY2H2b1hqU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671012977; 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=lYt2R1VOK0G324xErJUQZPSyqa5qqXsL3KSkSH7mha0=; b=DnniRNadSbC2fQl3TB6Rs4mByv0xXajpvJo8o2OkdXzUJW+8dObb87WDy4T6+EKRPoM1rYKCALYKwcApQGdYN3+xUBCHVTxfdg+g8NgJfD2p00uyZeJ8ZZ7tbeLNeX++3uR0lwmWnKo6RKuRx9bT0p8s0U48pCeFfGegMM+jdp0= 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 1671012977236648.679398651147; Wed, 14 Dec 2022 02:16:17 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Oi6-0007hb-G5; Wed, 14 Dec 2022 05:09: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 1p5Ohu-0007cN-1e for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:47 -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 1p5Ohr-00019o-37 for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:45 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-634-_3oUW21JNtWZXuGROAJPug-1; Wed, 14 Dec 2022 05:09:31 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 28EE63C0252B; Wed, 14 Dec 2022 10:09:31 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 63920492C14; Wed, 14 Dec 2022 10:09:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671012575; 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=lYt2R1VOK0G324xErJUQZPSyqa5qqXsL3KSkSH7mha0=; b=Tm5shxxqD5beZtBG+g45DR+ZAgruGtEGxn0tPn4CBLqwL52Y4h8fYfOFFyS2IgzmIOVYff noGx8aq4rWIpyFU4FovveTerLXzGgLrDqyjIX2tkhmq2NUThVJb56FFue35iEzlJIiCXpH X078GCoh3hL4PrIoP6opB/jJbajzMwg= X-MC-Unique: _3oUW21JNtWZXuGROAJPug-1 From: Thomas Huth To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 10/23] util/oslib-win32: Remove obsolete reference to g_poll code Date: Wed, 14 Dec 2022 11:08:58 +0100 Message-Id: <20221214100911.165291-11-thuth@redhat.com> In-Reply-To: <20221214100911.165291-1-thuth@redhat.com> References: <20221214100911.165291-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=thuth@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: 1671012978816100003 The comment about g_poll is not required here anymore since the corresponding code has been removed a while ago already. Fixes: b4c6036faa ("configure: bump min required glib version to 2.56") Message-Id: <20221208133257.95673-1-thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- util/oslib-win32.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/util/oslib-win32.c b/util/oslib-win32.c index a67cb3822e..07ade41800 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -24,10 +24,6 @@ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN * THE SOFTWARE. - * - * The implementation of g_poll (functions poll_rest, g_poll) at the end of - * this file are based on code from GNOME glib-2 and use a different licen= se, - * see the license comment there. */ =20 #include "qemu/osdep.h" --=20 2.31.1 From nobody Sun May 19 09:42:16 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=1671012633; cv=none; d=zohomail.com; s=zohoarc; b=VrxOvwGFFTZRgSFT2RBebNuupxvNeT7fcP/My1243QOkRul7x6B/eia7y7F3dL63+f6MMqcoQ3Oow5RPhowYKsgpSWOSHw14+PFtO1j9t0KA+N8h6YTz95G+irFNqJSotBaOHVafB44UBrn9jFGfrIgzfdFbR6ZJzKQgxNtKfmQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671012633; 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=R1lyVU8V1gqJLPj5Fi5Eu9owxEds7BepbuIDc8OUm4w=; b=m4iqTVk9ACHACioLZKXbg5raN6PdOErzlSjl26FWwkVDxVcpcrX3eAslv2KA3McVGLUuR+H58CXlAkhnLjdiwuAVnLqFpbLjvWPAV/jn4NA0yC0wSax42RNn5wgT6Jr8RhtViifxRovTQcVJDYZyBVuZIyDzmWvsqKgN8SLW7ZQ= 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 1671012633375226.26065614331344; Wed, 14 Dec 2022 02:10:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Oi8-0007iM-Us; Wed, 14 Dec 2022 05:10:00 -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 1p5Ohx-0007e0-AV for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:55 -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 1p5Ohr-00019y-3O for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:48 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-327-A8rebzPaMtu6jxzplig7Gg-1; Wed, 14 Dec 2022 05:09:32 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3735B801779; Wed, 14 Dec 2022 10:09:32 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 74292492C14; Wed, 14 Dec 2022 10:09:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671012576; 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=R1lyVU8V1gqJLPj5Fi5Eu9owxEds7BepbuIDc8OUm4w=; b=CcHONaN83Q5dcFodpb/5XZuz5zSwjxYQbNAwNGPrlfQfZbyht0oQvwsC0E1HF2y5sREteX rO3jgdbKRFGgJzDY8B/9XHLEsKImkE2skpG+QifyXYWxjQFfsxApwDo5Eyv09pd/JxRirq YPLnRcugSxNuKGJwGvnhP8dP0S6fJIg= X-MC-Unique: A8rebzPaMtu6jxzplig7Gg-1 From: Thomas Huth To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 11/23] MAINTAINERS: Add documentation files to the corresponding sections Date: Wed, 14 Dec 2022 11:08:59 +0100 Message-Id: <20221214100911.165291-12-thuth@redhat.com> In-Reply-To: <20221214100911.165291-1-thuth@redhat.com> References: <20221214100911.165291-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=thuth@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: 1671012634881100006 A lot of files in the docs directory do not have a maintainer according to our MAINTAINERS file, though they can be clearly associated with one of the sections in there. Add the files now so that our scripts/get_maintainer.pl script can output the right maintainer for them. Message-Id: <20221212174841.201003-1-thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- MAINTAINERS | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 6966490c94..3bd433b65a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -78,6 +78,7 @@ M: Laurent Vivier S: Maintained L: qemu-trivial@nongnu.org K: ^Subject:.*(?i)trivial +F: docs/devel/trivial-patches.rst T: git git://git.corpit.ru/qemu.git trivial-patches T: git https://github.com/vivier/qemu.git trivial-patches =20 @@ -129,6 +130,7 @@ F: util/cacheinfo.c F: util/cacheflush.c F: scripts/decodetree.py F: docs/devel/decodetree.rst +F: docs/devel/tcg* F: include/exec/cpu*.h F: include/exec/exec-all.h F: include/exec/helper*.h @@ -254,6 +256,7 @@ F: tests/docker/dockerfiles/debian-nios2-cross.d/build-= toolchain.sh OpenRISC TCG CPUs M: Stafford Horne S: Odd Fixes +F: docs/system/openrisc/cpu-features.rst F: target/openrisc/ F: hw/openrisc/ F: tests/tcg/openrisc/ @@ -332,6 +335,7 @@ F: target/i386/tcg/ F: tests/tcg/i386/ F: tests/tcg/x86_64/ F: hw/i386/ +F: docs/system/i386/cpu.rst F: docs/system/cpu-models-x86* T: git https://gitlab.com/ehabkost/qemu.git x86-next =20 @@ -873,6 +877,7 @@ M: Peter Maydell R: Jean-Christophe Dubois L: qemu-arm@nongnu.org S: Odd Fixes +F: docs/system/arm/sabrelite.rst F: hw/arm/sabrelite.c F: hw/arm/fsl-imx6.c F: hw/misc/imx6_*.c @@ -1273,6 +1278,7 @@ OpenRISC Machines or1k-sim M: Jia Liu S: Maintained +F: docs/system/openrisc/or1k-sim.rst F: hw/openrisc/openrisc_sim.c =20 PowerPC Machines @@ -2016,6 +2022,7 @@ F: hw/virtio/trace-events F: qapi/virtio.json F: net/vhost-user.c F: include/hw/virtio/ +F: docs/devel/virtio* =20 virtio-balloon M: Michael S. Tsirkin @@ -2108,7 +2115,7 @@ F: tests/qtest/virtio-rng-test.c vhost-user-rng M: Mathieu Poirier S: Supported -F: docs/tools/vhost-user-rng.rst +F: docs/system/devices/vhost-user-rng.rst F: hw/virtio/vhost-user-rng.c F: hw/virtio/vhost-user-rng-pci.c F: include/hw/virtio/vhost-user-rng.h @@ -2146,7 +2153,7 @@ S: Supported F: hw/nvme/* F: include/block/nvme.h F: tests/qtest/nvme-test.c -F: docs/system/nvme.rst +F: docs/system/devices/nvme.rst T: git git://git.infradead.org/qemu-nvme.git nvme-next =20 megasas @@ -2696,6 +2703,7 @@ GDB stub M: Alex Benn=C3=A9e R: Philippe Mathieu-Daud=C3=A9 S: Maintained +F: docs/system/gdb.rst F: gdbstub/* F: include/exec/gdbstub.h F: gdb-xml/ @@ -2753,6 +2761,7 @@ F: ui/ F: include/ui/ F: qapi/ui.json F: util/drm.c +F: docs/devel/ui.rst =20 Cocoa graphics M: Peter Maydell @@ -2930,6 +2939,7 @@ M: Paolo Bonzini R: Daniel P. Berrange R: Eduardo Habkost S: Supported +F: docs/devel/qom.rst F: docs/qdev-device-use.txt F: hw/core/qdev* F: hw/core/bus.c @@ -2978,6 +2988,7 @@ F: softmmu/qtest.c F: accel/qtest/ F: tests/qtest/ F: docs/devel/qgraph.rst +F: docs/devel/qtest.rst X: tests/qtest/bios-tables-test* =20 Device Fuzzing @@ -3044,6 +3055,7 @@ F: include/sysemu/tpm* F: qapi/tpm.json F: backends/tpm/ F: tests/qtest/*tpm* +F: docs/specs/tpm.rst T: git https://github.com/stefanberger/qemu-tpm.git tpm-next =20 Checkpatch @@ -3195,7 +3207,8 @@ F: replay/* F: block/blkreplay.c F: net/filter-replay.c F: include/sysemu/replay.h -F: docs/replay.txt +F: docs/devel/replay.rst +F: docs/system/replay.rst F: stubs/replay.c F: tests/avocado/replay_kernel.py F: tests/avocado/replay_linux.py @@ -3719,6 +3732,7 @@ F: tests/docker/ F: tests/vm/ F: tests/lcitool/ F: scripts/archive-source.sh +F: docs/devel/testing.rst W: https://gitlab.com/qemu-project/qemu/pipelines W: https://travis-ci.org/qemu/qemu =20 --=20 2.31.1 From nobody Sun May 19 09:42:16 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=1671014057; cv=none; d=zohomail.com; s=zohoarc; b=AIYE1eUqATBd7MaY+eqHWyBCMCsypA0VYKzNb4L9gFRjik+zC62LgCpG9kvWk79a+lCH5btq+C1fDet8zflGYYx0JAsP7GYda/d/u+Z6zIRAJX7PTAlxyESQ0p2hJ2UEcbexLqwr4RbouN7vDHzFbFJCspfXiNrvQMp3nNbVbAY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671014057; 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=XYBb/yUjxNamcfvIsoQSNlUwHNq50gt6HuBMX9rCx3o=; b=mAc74dbIXEFTRbJHc+tSDMGvEj1ycL3VJbhCe3Y+QV37l+oK3PRPnIvFAXasu5+kCXy+mYp3dPSEhZzdqPr7Z5mmeZzHu1lnZ5Qc0pAzF9cbcSypewB6wJrRz8y0r/DEEo/Lwwdw07Qrl/iKpd5A0rdgZe6njjGcZgGvvXUuIT4= 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 1671014057971427.53881341415615; Wed, 14 Dec 2022 02:34:17 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Oi7-0007hv-9G; Wed, 14 Dec 2022 05:09:59 -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 1p5Ohw-0007dz-Iq for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:51 -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 1p5Ohr-00019k-Hm for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:48 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-214-cfjSFyKBPjOCcklnhP_iYA-1; Wed, 14 Dec 2022 05:09:33 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4BD8380234E; Wed, 14 Dec 2022 10:09:33 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B8E0492C14; Wed, 14 Dec 2022 10:09:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671012575; 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=XYBb/yUjxNamcfvIsoQSNlUwHNq50gt6HuBMX9rCx3o=; b=TeupsrJtSTVdV3vlaRj9AQvw/r6CsvdqjT/paDiGKYn/2fhb/BRK1DWCaLc9bWbZaSIXpX VohDXJEP31fLN+2e0RGc1wvtmARHDHKDRJaV77vyBZW++L/X9tCGsxVddZ5iMJOc2mMLlK jzCNSdqBPXwMxCeCkyr44eMUA13yVC0= X-MC-Unique: cfjSFyKBPjOCcklnhP_iYA-1 From: Thomas Huth To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 12/23] hw: Include the VMWare devices only in the x86 targets Date: Wed, 14 Dec 2022 11:09:00 +0100 Message-Id: <20221214100911.165291-13-thuth@redhat.com> In-Reply-To: <20221214100911.165291-1-thuth@redhat.com> References: <20221214100911.165291-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=thuth@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: 1671014060087100001 It seems a little bit weird that the para-virtualized x86 VMWare devices "vmware-svga" and "vmxnet3" also show up in non-x86 targets. They are likely pretty useless there (since the guest OSes likely do not have any drivers for those enabled), so let's change this and only enable those devices by default for the classical x86 targets. Message-Id: <20221213095144.42355-1-thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- hw/display/Kconfig | 2 +- hw/net/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/display/Kconfig b/hw/display/Kconfig index a1b159becd..7b3da68d1c 100644 --- a/hw/display/Kconfig +++ b/hw/display/Kconfig @@ -55,7 +55,7 @@ config VGA_MMIO =20 config VMWARE_VGA bool - default y if PCI_DEVICES + default y if PCI_DEVICES && PC_PCI depends on PCI select VGA =20 diff --git a/hw/net/Kconfig b/hw/net/Kconfig index 6d795ec752..1cc1c5775e 100644 --- a/hw/net/Kconfig +++ b/hw/net/Kconfig @@ -51,7 +51,7 @@ config RTL8139_PCI =20 config VMXNET3_PCI bool - default y if PCI_DEVICES + default y if PCI_DEVICES && PC_PCI depends on PCI =20 config SMC91C111 --=20 2.31.1 From nobody Sun May 19 09:42:16 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=1671013146; cv=none; d=zohomail.com; s=zohoarc; b=kTZGpkkz4md0WTnabOLk2B9yKYDGyL8nRVOz8DwWcQME6+vBUtrhwbp9uXTTYMbXiFJ6P9pGyjJogPxJEQHjHtk3qwmS/m31zglO0Gli3F4kUK3KddCkBn1Xydj2unJ2cHH7aoyFVwluGK3nrjh68lX7uhLolAp8qOdi93cNzco= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671013146; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kNfrrBL/mjgPHbQU/Qojt5qlkUMjtSePTq0laiEocT4=; b=kfZJ5Xkhbq60d4UzCq9NHlOJaDEz2NZHqh2ExEnGj7tx1oWrrigJFmcdAh2RA1A/orrc5ixYD3AmtTHr5TWMYLKkg/OYXNQNyVF3qksLUJWJXQr/L227kDRXSEroaZFGVy/T6Ze/MUoZHTlYn6Av+HB9VJG22kvilem7LlAlQ7w= 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 1671013146844978.901340539648; Wed, 14 Dec 2022 02:19:06 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5OiA-0007ic-5i; Wed, 14 Dec 2022 05:10:02 -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 1p5Ohu-0007cO-2k for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:47 -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 1p5Ohr-0001AJ-32 for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:45 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-489-pClWf_8wPBq9TA87jhduvA-1; Wed, 14 Dec 2022 05:09:35 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BE1AD29AA2C3; Wed, 14 Dec 2022 10:09:34 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id B7620492C14; Wed, 14 Dec 2022 10:09:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671012578; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kNfrrBL/mjgPHbQU/Qojt5qlkUMjtSePTq0laiEocT4=; b=Ab+GQdCNGukruNAy+1hpvjCH2TQQhtbVTo/a47w714mjNApz2kw4sWrlXj/jr22rGES3n/ rAXb/2vcSH8auvPp4p2OIxfQg4clCbIrJapyYpTee6PWUHtwoWdCAGiB1T1w8brDnlhpTj D9ZDLNEPIcMIFbJTUrGk50A08WQhstY= X-MC-Unique: pClWf_8wPBq9TA87jhduvA-1 From: Thomas Huth To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: Akihiko Odaki Subject: [PULL 13/23] tests/qtest/libqos/e1000e: Remove "other" interrupts Date: Wed, 14 Dec 2022 11:09:01 +0100 Message-Id: <20221214100911.165291-14-thuth@redhat.com> In-Reply-To: <20221214100911.165291-1-thuth@redhat.com> References: <20221214100911.165291-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=thuth@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: 1671013148832100002 Content-Type: text/plain; charset="utf-8" From: Akihiko Odaki The "other" kind of interrupts are not used in the tests. Signed-off-by: Akihiko Odaki Message-Id: <20221110114045.65544-1-akihiko.odaki@daynix.com> Signed-off-by: Thomas Huth --- tests/qtest/libqos/e1000e.h | 1 - tests/qtest/libqos/e1000e.c | 1 - 2 files changed, 2 deletions(-) diff --git a/tests/qtest/libqos/e1000e.h b/tests/qtest/libqos/e1000e.h index a22f5fdbad..3bf285af42 100644 --- a/tests/qtest/libqos/e1000e.h +++ b/tests/qtest/libqos/e1000e.h @@ -24,7 +24,6 @@ =20 #define E1000E_RX0_MSG_ID (0) #define E1000E_TX0_MSG_ID (1) -#define E1000E_OTHER_MSG_ID (2) =20 #define E1000E_TDLEN (0x3808) #define E1000E_TDT (0x3818) diff --git a/tests/qtest/libqos/e1000e.c b/tests/qtest/libqos/e1000e.c index 80b3e3db90..3b51bafcb7 100644 --- a/tests/qtest/libqos/e1000e.c +++ b/tests/qtest/libqos/e1000e.c @@ -32,7 +32,6 @@ #define E1000E_IVAR_TEST_CFG \ (((E1000E_RX0_MSG_ID | E1000_IVAR_INT_ALLOC_VALID) << E1000_IVAR_RXQ0_= SHIFT) | \ ((E1000E_TX0_MSG_ID | E1000_IVAR_INT_ALLOC_VALID) << E1000_IVAR_TXQ0_= SHIFT) | \ - ((E1000E_OTHER_MSG_ID | E1000_IVAR_INT_ALLOC_VALID) << E1000_IVAR_OTH= ER_SHIFT) | \ E1000_IVAR_TX_INT_EVERY_WB) =20 #define E1000E_RING_LEN (0x1000) --=20 2.31.1 From nobody Sun May 19 09:42:16 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=1671014096; cv=none; d=zohomail.com; s=zohoarc; b=jhJa+/NmsliBVjtqjkCi1ydR/nlh7yoA42jyaqAlzNN85Dl/gVnLPFjWcyqxyQCkZI9Qs774NRjjrWzeJjfC42Km6TrUW3/O0/1PJ/1EiXO1KPnQp8jpcHcKwRIsgxtgFO1vYxfGtDSSe+OWQ2f1hzQ24UICDXC6WN3wc2+jVHA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671014096; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7S3GWN51CmGtsthJ2l5fGFqu0VyC2LZnsZ77JXdeJ4w=; b=NNpRM/BBNkMLAP04D99fh9bE3Ztfe/2RBoUY/86slKpjThRKhTUsF19/mT1KekABJ5gzUM5yrKqO0+3uhea5fdwK3WvAse5pZw3eQdOKjIk1sMHcZhoydkl4D+/+1H2qaW1bOF7RBRjivMyQ4OTbIJmr8elPQmNqai/WF1yimnE= 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 1671014095809950.0117381027599; Wed, 14 Dec 2022 02:34:55 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Oi7-0007hx-BS; Wed, 14 Dec 2022 05:09:59 -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 1p5Ohv-0007dh-TC for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:51 -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 1p5Ohr-0001AR-4t for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:47 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-350-1mRRqW-cNN-tJfJHxvhzZw-1; Wed, 14 Dec 2022 05:09:36 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4763E101A521; Wed, 14 Dec 2022 10:09:36 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 15892492C14; Wed, 14 Dec 2022 10:09:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671012580; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7S3GWN51CmGtsthJ2l5fGFqu0VyC2LZnsZ77JXdeJ4w=; b=PgGJQyazaJ8S7gmT+PTvlMKcTlgK/aFWGROkmlKOUoE9r7+E2hn3DZQ2Cuh6vc66PLHllk Rk0Xuj/EezeDqcW5H3vwzEGa3GwtrbSUmd6V6wSladdQBh4LDOq7FS3xkx+/46eZyH1mY6 DnqaZhirbzcEVJa/AoXU5tIDSjIxDJQ= X-MC-Unique: 1mRRqW-cNN-tJfJHxvhzZw-1 From: Thomas Huth To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: Akihiko Odaki Subject: [PULL 14/23] tests/qtest/e1000e-test: De-duplicate constants Date: Wed, 14 Dec 2022 11:09:02 +0100 Message-Id: <20221214100911.165291-15-thuth@redhat.com> In-Reply-To: <20221214100911.165291-1-thuth@redhat.com> References: <20221214100911.165291-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=thuth@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: 1671014098375100003 Content-Type: text/plain; charset="utf-8" From: Akihiko Odaki De-duplicate constants found in e1000e_send_verify() and e1000e_receive_verify() to avoid mismatch and improve readability. Signed-off-by: Akihiko Odaki Message-Id: <20221110114426.65951-1-akihiko.odaki@daynix.com> Signed-off-by: Thomas Huth --- tests/qtest/e1000e-test.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/tests/qtest/e1000e-test.c b/tests/qtest/e1000e-test.c index 08adc5226d..3fc92046be 100644 --- a/tests/qtest/e1000e-test.c +++ b/tests/qtest/e1000e-test.c @@ -37,15 +37,15 @@ =20 static void e1000e_send_verify(QE1000E *d, int *test_sockets, QGuestAlloca= tor *alloc) { + static const char test[] =3D "TEST"; struct e1000_tx_desc descr; - static const int data_len =3D 64; char buffer[64]; int ret; uint32_t recv_len; =20 /* Prepare test data buffer */ - uint64_t data =3D guest_alloc(alloc, data_len); - memwrite(data, "TEST", 5); + uint64_t data =3D guest_alloc(alloc, sizeof(buffer)); + memwrite(data, test, sizeof(test)); =20 /* Prepare TX descriptor */ memset(&descr, 0, sizeof(descr)); @@ -54,7 +54,7 @@ static void e1000e_send_verify(QE1000E *d, int *test_sock= ets, QGuestAllocator *a E1000_TXD_CMD_EOP | E1000_TXD_CMD_DEXT | E1000_TXD_DTYP_D | - data_len); + sizeof(buffer)); =20 /* Put descriptor to the ring */ e1000e_tx_ring_push(d, &descr); @@ -69,9 +69,9 @@ static void e1000e_send_verify(QE1000E *d, int *test_sock= ets, QGuestAllocator *a /* Check data sent to the backend */ ret =3D recv(test_sockets[0], &recv_len, sizeof(recv_len), 0); g_assert_cmpint(ret, =3D=3D , sizeof(recv_len)); - ret =3D recv(test_sockets[0], buffer, 64, 0); - g_assert_cmpint(ret, >=3D, 5); - g_assert_cmpstr(buffer, =3D=3D , "TEST"); + ret =3D recv(test_sockets[0], buffer, sizeof(buffer), 0); + g_assert_cmpint(ret, =3D=3D, sizeof(buffer)); + g_assert_cmpstr(buffer, =3D=3D , test); =20 /* Free test data buffer */ guest_free(alloc, data); @@ -93,7 +93,6 @@ static void e1000e_receive_verify(QE1000E *d, int *test_s= ockets, QGuestAllocator }, }; =20 - static const int data_len =3D 64; char buffer[64]; int ret; =20 @@ -102,7 +101,7 @@ static void e1000e_receive_verify(QE1000E *d, int *test= _sockets, QGuestAllocator g_assert_cmpint(ret, =3D=3D , sizeof(test) + sizeof(len)); =20 /* Prepare test data buffer */ - uint64_t data =3D guest_alloc(alloc, data_len); + uint64_t data =3D guest_alloc(alloc, sizeof(buffer)); =20 /* Prepare RX descriptor */ memset(&descr, 0, sizeof(descr)); @@ -120,7 +119,7 @@ static void e1000e_receive_verify(QE1000E *d, int *test= _sockets, QGuestAllocator =20 /* Check data sent to the backend */ memread(data, buffer, sizeof(buffer)); - g_assert_cmpstr(buffer, =3D=3D , "TEST"); + g_assert_cmpstr(buffer, =3D=3D , test); =20 /* Free test data buffer */ guest_free(alloc, data); --=20 2.31.1 From nobody Sun May 19 09:42:16 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=1671012725; cv=none; d=zohomail.com; s=zohoarc; b=FHFrW8IN8dlVvBl5K67qe6XrLD4WZBixrimjPG23awt6rLFnw4IoYT6WY6AQvd9Zyp2yxWll0ArgeCiSgxWcv8idEtwp3E0yN3AB3BtFlrVui1hKO+raM81dSn7suc1dFkjaxuYMqD1jz8Y4jq9WJXye0gj+OPE9YBFIhSvVVA0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671012725; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=44aU4OJjqzesrUhGxbQUh6zbHNIGKC1yBWtv/m4R5AA=; b=gbAb2obZzXurIr7a1tPND8i/wSiPYmTqGs6NCmaikA3EqPdrjK7AmXNfT+ZYyccF+1EYTEP6N/ekyYosPFwwcuO6KNBta6Zt/wAENuPX37qE5jxE90BsbTwaSSC7IW4uBLF2ip+4Dq9252/TURPIi14NY/8i768RBhgLukG2mxM= 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 1671012725922188.82069716563637; Wed, 14 Dec 2022 02:12:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Oi5-0007hJ-9z; Wed, 14 Dec 2022 05:09:57 -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 1p5Ohu-0007cW-Sq for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:47 -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 1p5Ohr-0001Ak-31 for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:45 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-413-VkJTXR9vOYyjFVNSLqyiXA-1; Wed, 14 Dec 2022 05:09:38 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BC83C85C6E0; Wed, 14 Dec 2022 10:09:37 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id B4FB7492C14; Wed, 14 Dec 2022 10:09:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671012581; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=44aU4OJjqzesrUhGxbQUh6zbHNIGKC1yBWtv/m4R5AA=; b=hPRLQLFZdfSkPFwtPIIhLoKDDSr3qr3FB5s0SxtIQ+u+yJQ+oIwmqtMvU9enK11VDD5sSx weW+XmQeBL6Mh281DPMh+WoyC2Suhdybjhn4flG2EAMTsAhInuqkfqxdL1EgKtm4Ujr0Ul eHDkDLp7TKik12dyTytwf+Mho0rvd9w= X-MC-Unique: VkJTXR9vOYyjFVNSLqyiXA-1 From: Thomas Huth To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: Akihiko Odaki Subject: [PULL 15/23] tests/qtest/libqos/e1000e: Correctly group register accesses Date: Wed, 14 Dec 2022 11:09:03 +0100 Message-Id: <20221214100911.165291-16-thuth@redhat.com> In-Reply-To: <20221214100911.165291-1-thuth@redhat.com> References: <20221214100911.165291-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=thuth@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: 1671012727508100003 Content-Type: text/plain; charset="utf-8" From: Akihiko Odaki Add a newline after E1000_TCTL write and make it clear that E1000_TCTL write is what enabling transmit. Signed-off-by: Akihiko Odaki Message-Id: <20221110114549.66081-1-akihiko.odaki@daynix.com> Signed-off-by: Thomas Huth --- tests/qtest/libqos/e1000e.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/qtest/libqos/e1000e.c b/tests/qtest/libqos/e1000e.c index 3b51bafcb7..37c794b130 100644 --- a/tests/qtest/libqos/e1000e.c +++ b/tests/qtest/libqos/e1000e.c @@ -151,6 +151,7 @@ static void e1000e_pci_start_hw(QOSGraphObject *obj) =20 /* Enable transmit */ e1000e_macreg_write(&d->e1000e, E1000_TCTL, E1000_TCTL_EN); + e1000e_macreg_write(&d->e1000e, E1000_RDBAL, (uint32_t)d->e1000e.rx_ring); e1000e_macreg_write(&d->e1000e, E1000_RDBAH, --=20 2.31.1 From nobody Sun May 19 09:42:16 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=1671012833; cv=none; d=zohomail.com; s=zohoarc; b=fRfQMfcgFxkP+DEjD4E1KT7KtMAlwcB9P9A994DD7kIMzbcBW9PburhAEK6lASRU3MfiT6sSh8WdrFC5AC8JdDx2Gv3CpyTPAvUA70OX2eNb1DeDBv+6sIxcgMDgMp4QE2Wkn7IwdjXbvRI7kQPsuaqjNfbLT+QefEHPa2flKjM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671012833; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ibPDNC+0uswTwDdm+Dx+xTEDng2WIscZU1LHkNv3XVM=; b=Bo44InIkYmWd2b9zMzULLO6tXjzoRQvlJe/nvsIFBdPTdCuoMSM187aLJyiqrXiSD7xtZ/h/3BilxWFTLvEjElrHG411iea4HCIcOSgdGnJ/sVQ9LSIZG6SjWwpI5J2aYaOB/ip9xV8cRdcMl+InbCz7Av5K1FYRPj2e+BDNz9g= 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 1671012833357358.83900177382225; Wed, 14 Dec 2022 02:13:53 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5OiC-0007jz-Pj; Wed, 14 Dec 2022 05:10:04 -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 1p5Ohy-0007e2-6b for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:55 -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 1p5Ohr-0001Ar-Ht for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:49 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-672-UJWpcrnUN0S65tUxqGRgQw-1; Wed, 14 Dec 2022 05:09:39 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 15220185A78B; Wed, 14 Dec 2022 10:09:39 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2DF91492C14; Wed, 14 Dec 2022 10:09:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671012582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ibPDNC+0uswTwDdm+Dx+xTEDng2WIscZU1LHkNv3XVM=; b=hEUYMzjbeBOErsL1pS5ziOIazGBQeEWdZ3XEnZ3gBqfg9qm7RHO4gKJ38mbQ1zjrjV43Zk 2mTfoty7vkK4iqPC3D8+cIfHJDdQilEF3W2Gsavu/0/PIBNeb51NMR8u1WcQNSGuXcYKHP tbxIbk8Ak1WKpkaHggZNIx8Ip3njKTU= X-MC-Unique: UJWpcrnUN0S65tUxqGRgQw-1 From: Thomas Huth To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: Bin Meng Subject: [PULL 16/23] .gitlab-ci.d/windows.yml: Unify the prerequisite packages Date: Wed, 14 Dec 2022 11:09:04 +0100 Message-Id: <20221214100911.165291-17-thuth@redhat.com> In-Reply-To: <20221214100911.165291-1-thuth@redhat.com> References: <20221214100911.165291-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=thuth@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: 1671012834141100003 Content-Type: text/plain; charset="utf-8" From: Bin Meng At present the prerequisite packages for 64-bit and 32-bit builds are slightly different. Let's use the same packages for both for easier maintenance in the future. Signed-off-by: Bin Meng Message-Id: <20221125114100.3184790-1-bmeng.cn@gmail.com> Signed-off-by: Thomas Huth --- .gitlab-ci.d/windows.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index a3e7a37022..99d78c2213 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -41,11 +41,15 @@ msys2-64bit: mingw-w64-x86_64-gcc mingw-w64-x86_64-glib2 mingw-w64-x86_64-gnutls + mingw-w64-x86_64-gtk3 + mingw-w64-x86_64-libgcrypt + mingw-w64-x86_64-libjpeg-turbo mingw-w64-x86_64-libnfs mingw-w64-x86_64-libpng mingw-w64-x86_64-libssh mingw-w64-x86_64-libtasn1 mingw-w64-x86_64-libusb + mingw-w64-x86_64-lzo2 mingw-w64-x86_64-nettle mingw-w64-x86_64-ninja mingw-w64-x86_64-pixman @@ -79,16 +83,22 @@ msys2-32bit: mingw-w64-i686-gtk3 mingw-w64-i686-libgcrypt mingw-w64-i686-libjpeg-turbo + mingw-w64-i686-libnfs + mingw-w64-i686-libpng mingw-w64-i686-libssh mingw-w64-i686-libtasn1 mingw-w64-i686-libusb mingw-w64-i686-lzo2 + mingw-w64-i686-nettle mingw-w64-i686-ninja mingw-w64-i686-pixman mingw-w64-i686-pkgconf mingw-w64-i686-python + mingw-w64-i686-SDL2 + mingw-w64-i686-SDL2_image mingw-w64-i686-snappy - mingw-w64-i686-usbredir " + mingw-w64-i686-usbredir + mingw-w64-i686-zstd " - $env:CHERE_INVOKING =3D 'yes' # Preserve the current working directory - $env:MSYSTEM =3D 'MINGW32' # Start a 32-bit MinG environment - $env:MSYS =3D 'winsymlinks:native' # Enable native Windows symlink --=20 2.31.1 From nobody Sun May 19 09:42:16 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=1671014049; cv=none; d=zohomail.com; s=zohoarc; b=H3LkQz2yH5U7gMd+rXNswzWTAt8Dd9Bu+S0POYgkinO82qPI/7UM8czMMTnPeggwJ0/9YhrPfUucIW89Iiu1etkValkR/MM5M5INevs8rmrBGyy3c89dV6zZB++hdkpkv6VzQPhgkA72ZOuXJWog9YLtCtHDUMItEwPX7HA3cBE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671014049; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TOH5dvzQ3tQ1pxjoHz62GZIPDJDjxuM67jZknCrLOAE=; b=MRLFxaeB05e3jYuHj5rKbsXYkPcPZTrPPpzAd5SzZO6vi5Py2mgQDPJBSpKhVQz0UazFboVvLb0tHnEBPuBnqRyARRgDlsbYS6qDrnpyKrWRt9ndpkh/uiKsC/lyeHWKbGh9EodW4jmmpTfnykcXJ01WlgAYWCor62PrzqnyaMU= 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 1671014049982835.92645840178; Wed, 14 Dec 2022 02:34:09 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Oi7-0007hw-Aq; Wed, 14 Dec 2022 05:09:59 -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 1p5Ohz-0007e6-62 for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:55 -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 1p5Oht-0001Bl-6r for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:50 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-604-4Bi9n2u7O8q5yS2lMTRuvA-1; Wed, 14 Dec 2022 05:09:40 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5947C185A78B; Wed, 14 Dec 2022 10:09:40 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7822D492C14; Wed, 14 Dec 2022 10:09:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671012584; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TOH5dvzQ3tQ1pxjoHz62GZIPDJDjxuM67jZknCrLOAE=; b=MoAOz/J8DwWWHd/W0LnIsiv3lxFs/DAM0MMpnpgU684vsHYF3sowtKlYXrE0phOdcEuzVl nlwnD/jrdm4Wv+zkQ2GHqvDFOWBw01LJ5fCcAw79yk3fV40+4JH3wSzN6RAiZyCLbR6FTB P4VSTEI3wcYwX/pfoBBJoi/EpP4twwI= X-MC-Unique: 4Bi9n2u7O8q5yS2lMTRuvA-1 From: Thomas Huth To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: Bin Meng Subject: [PULL 17/23] .gitlab-ci.d/windows.yml: Keep 64-bit and 32-bit build scripts consistent Date: Wed, 14 Dec 2022 11:09:05 +0100 Message-Id: <20221214100911.165291-18-thuth@redhat.com> In-Reply-To: <20221214100911.165291-1-thuth@redhat.com> References: <20221214100911.165291-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=thuth@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: 1671014052195100001 Content-Type: text/plain; charset="utf-8" From: Bin Meng At present the build scripts of 32-bit and 64-bit are inconsistent. Let's keep them consistent for easier maintenance. While we are here, add some comments to explain that for the 64-bit job, "--without-default-devices" is a must have, at least for now. Signed-off-by: Bin Meng Reviewed-by: Thomas Huth Message-Id: <20221125114100.3184790-2-bmeng.cn@gmail.com> Signed-off-by: Thomas Huth --- .gitlab-ci.d/windows.yml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index 99d78c2213..6741c90ff1 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -61,12 +61,19 @@ msys2-64bit: mingw-w64-x86_64-usbredir mingw-w64-x86_64-zstd " - $env:CHERE_INVOKING =3D 'yes' # Preserve the current working directory - - $env:MSYSTEM =3D 'MINGW64' # Start a 64 bit Mingw environment + - $env:MSYSTEM =3D 'MINGW64' # Start a 64-bit MinGW environment - $env:MSYS =3D 'winsymlinks:native' # Enable native Windows symlink - - .\msys64\usr\bin\bash -lc './configure --target-list=3Dx86_64-softmmu - --enable-capstone --without-default-devices' - - .\msys64\usr\bin\bash -lc 'make' - - .\msys64\usr\bin\bash -lc 'make check || { cat build/meson-logs/testlo= g.txt; exit 1; } ;' + - mkdir output + - cd output + # Note: do not remove "--without-default-devices"! + # commit 9f8e6cad65a6 ("gitlab-ci: Speed up the msys2-64bit job by using= --without-default-devices" + # changed to compile QEMU with the --without-default-devices switch + # for the msys2 64-bit job, due to the build could not complete within + # the project timeout. + - ..\msys64\usr\bin\bash -lc '../configure --target-list=3Dx86_64-softmmu + --without-default-devices' + - ..\msys64\usr\bin\bash -lc 'make' + - ..\msys64\usr\bin\bash -lc 'make check || { cat meson-logs/testlog.txt= ; exit 1; } ;' =20 msys2-32bit: extends: .shared_msys2_builder @@ -100,10 +107,10 @@ msys2-32bit: mingw-w64-i686-usbredir mingw-w64-i686-zstd " - $env:CHERE_INVOKING =3D 'yes' # Preserve the current working directory - - $env:MSYSTEM =3D 'MINGW32' # Start a 32-bit MinG environment + - $env:MSYSTEM =3D 'MINGW32' # Start a 32-bit MinGW environment - $env:MSYS =3D 'winsymlinks:native' # Enable native Windows symlink - mkdir output - cd output - - ..\msys64\usr\bin\bash -lc "../configure --target-list=3Dppc64-softmmu" + - ..\msys64\usr\bin\bash -lc '../configure --target-list=3Dppc64-softmmu' - ..\msys64\usr\bin\bash -lc 'make' - ..\msys64\usr\bin\bash -lc 'make check || { cat meson-logs/testlog.txt= ; exit 1; } ;' --=20 2.31.1 From nobody Sun May 19 09:42:16 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=1671013615; cv=none; d=zohomail.com; s=zohoarc; b=nq12YyH2UwHu1hP74t5/qGEdrgd48MFziM+q51Ep1Jdz66ozmvCGKUan5QiXUEfBvv+fYaubQ/o1BZ+z0wNsA5eWgCJNWP/Y5TSNoh9Jel7uRu+EIrqFqvmpC85C8Znf9S17rS258TZ1u57O33qpDRMj3WT5Q90cnCZahfELUy4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671013615; 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=azMe/qjZB3T/aT3tonbdKtgLcru2ioqy4HJUyaLWWZw=; b=i5SiNqSPi55GpO/LbradS5orD04U7dnXIJT0OcPQHY6XKuR4Nx6kUk6fzLwgaOefI/MPQRWYnI9O3O78PkBVHmnocpmZQ29HLuEF4RGlx5xirYz+HOrfPM9jF7GMAD8vx4ccvUZoGkf8Xak6fznXVioEsAVZv5Yn8h5AA6C89go= 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 1671013615483226.72631068394026; Wed, 14 Dec 2022 02:26:55 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Oi7-0007hz-UQ; Wed, 14 Dec 2022 05:09:59 -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 1p5Ohz-0007e7-HF for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:55 -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 1p5Ohs-0001BX-0u for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:51 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-574-M-3Ha-ClOPeWADxrmAIvUg-1; Wed, 14 Dec 2022 05:09:42 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CE4F529AA2C0; Wed, 14 Dec 2022 10:09:41 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id BD949492C14; Wed, 14 Dec 2022 10:09:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671012583; 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=azMe/qjZB3T/aT3tonbdKtgLcru2ioqy4HJUyaLWWZw=; b=OavMDyykKReeP3wvCwVpvdtDjSwVJvWj3pqdpvT2fo5LcvU4tWgitb2ULa1wJ9toz/Ggkj zAjOlgmQj2vMDFZ3q3D99yVj8A6gAzNA+m5DrlsgYGyfG/IDBV59wiqjc+NKJwfNFNEEmj RMXoUSs1JBLqjbI7QeMMTBSK54iGv6U= X-MC-Unique: M-3Ha-ClOPeWADxrmAIvUg-1 From: Thomas Huth To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: Bin Meng , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 18/23] .gitlab-ci.d/windows.yml: Exclude qTests from 64-bit CI job for now Date: Wed, 14 Dec 2022 11:09:06 +0100 Message-Id: <20221214100911.165291-19-thuth@redhat.com> In-Reply-To: <20221214100911.165291-1-thuth@redhat.com> References: <20221214100911.165291-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=thuth@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: 1671013617732100001 From: Bin Meng qTests don't run successfully with "--without-default-devices", so let's exclude the qtests from CI for now. Suggested-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Bin Meng Reviewed-by: Thomas Huth Message-Id: <20221125114100.3184790-3-bmeng.cn@gmail.com> Signed-off-by: Thomas Huth --- .gitlab-ci.d/windows.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index 6741c90ff1..9b5c4bcd8a 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -73,7 +73,9 @@ msys2-64bit: - ..\msys64\usr\bin\bash -lc '../configure --target-list=3Dx86_64-softmmu --without-default-devices' - ..\msys64\usr\bin\bash -lc 'make' - - ..\msys64\usr\bin\bash -lc 'make check || { cat meson-logs/testlog.txt= ; exit 1; } ;' + # qTests don't run successfully with "--without-default-devices", + # so let's exclude the qtests from CI for now. + - ..\msys64\usr\bin\bash -lc 'make check MTESTARGS=3D\"--no-suite qtest\= " || { cat meson-logs/testlog.txt; exit 1; } ;' =20 msys2-32bit: extends: .shared_msys2_builder --=20 2.31.1 From nobody Sun May 19 09:42:16 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=1671013642; cv=none; d=zohomail.com; s=zohoarc; b=ejB0OEirFLHVu4a5IEiSS2wZSLT3w9H9VQTGmoLz/xMK70HO2OeuiC9qFCVN+8Asd7DzLkRlGwViB0+O/i7YnNA2Klp2kQGoFWVrXmKnTzEyx7vIBQdIF60Y7ZNysy8/WsZv5n7t1DLBgKSz700ryvCaXEKP6iA+SNfyVbw8efI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671013642; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=d5mj49lCuPpzSIHMFz4HAlDgZLnOfLUzro+6BYT/GGw=; b=G3XI1ECUwt7KYOJmo0zWxOnExzN7IqhseQiIZUuxsgFj3yK5ascHBvHM3XwzYI7TSrr/OYHBye/ww8rLYWGZSjO8KEC3/fBKnT0ZHtY3CyMuDR2KVeteMOEWFT6IIZt/gfgGIfEXRc4f9peeD+iO5qUrpsoiPF7s0r03/WkBouw= 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 1671013642543882.7691704064513; Wed, 14 Dec 2022 02:27:22 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5OiA-0007ih-VH; Wed, 14 Dec 2022 05:10:03 -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 1p5Ohz-0007eC-Ry for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:55 -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 1p5Oht-0001Bw-OK for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:51 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-154-ErJna7ZZNn2Wdz8W1ldZGA-1; Wed, 14 Dec 2022 05:09:43 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2C85A1C08969; Wed, 14 Dec 2022 10:09:43 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3BF83492C14; Wed, 14 Dec 2022 10:09:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671012585; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=d5mj49lCuPpzSIHMFz4HAlDgZLnOfLUzro+6BYT/GGw=; b=BvkHskRWJJO16VTwRYEe8FZNhF0R90MJECVwseqYpGdzBczN9wM0BQfmxNhfTyzwt2ntoU oiSQ0tsRtShFGcIKb+0JGcedcHiW97lv9d2FLabOULVx8OVXt+ViBI3jL3PckBv9ORtPX5 Y2UJ/IW5+Gidft3tCqzp3v9UP3M4Law= X-MC-Unique: ErJna7ZZNn2Wdz8W1ldZGA-1 From: Thomas Huth To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: Bin Meng Subject: [PULL 19/23] tests/qtest: Enable qtest build on Windows Date: Wed, 14 Dec 2022 11:09:07 +0100 Message-Id: <20221214100911.165291-20-thuth@redhat.com> In-Reply-To: <20221214100911.165291-1-thuth@redhat.com> References: <20221214100911.165291-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=thuth@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: 1671013643794100003 Content-Type: text/plain; charset="utf-8" From: Bin Meng Now that we have fixed various test case issues as seen when running on Windows, let's enable the qtest build on Windows. Signed-off-by: Bin Meng Reviewed-by: Thomas Huth Message-Id: <20221125114100.3184790-4-bmeng.cn@gmail.com> Signed-off-by: Thomas Huth --- tests/qtest/meson.build | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index c07a5b1a5f..f0ebb5fac6 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -1,9 +1,3 @@ -# All QTests for now are POSIX-only, but the dependencies are -# really in libqtest, not in the testcases themselves. -if not config_host.has_key('CONFIG_POSIX') - subdir_done() -endif - slow_qtests =3D { 'ahci-test' : 60, 'bios-tables-test' : 120, --=20 2.31.1 From nobody Sun May 19 09:42:16 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=1671014008; cv=none; d=zohomail.com; s=zohoarc; b=l/+QXTmv4XUUlnW8gcN7z/2qFF/ot5byAfUxgPQWR6qU2w1g358SIl308SQ3HsWzI6v/6tqxqUeKlTsZQ2lsAZKpFyflwBAHJU+i4TU7LRdvdcpvM8MM+VzlRqQyzFe20rQnxaeRdTkltbcwIicIeVTOdtUERYG7ZZSsn+cw1J8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671014008; 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=tVnT1VrWL1s4Tq0qu4AsVdR7OETcvF0vUizJcuFBx3o=; b=oKNQ7TmYXgdzaBOUWcqrIVVyuRfAZaMWD3pY/5JFM/QgPaf9M/kb29jUM/h/S6k7HApjBRp7WjswbHTSLDFqoaX/7ilQzptHCLt1KlmgzKTTrt13XshFtLUAt8IQPBaLSdB5OxTMeV5o/JBn/MxfvqvhhwkgRhm4IH+cSxb05k8= 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 1671014008313532.3692665352944; Wed, 14 Dec 2022 02:33:28 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Oi7-0007i1-Vs; Wed, 14 Dec 2022 05:10:00 -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 1p5Oi1-0007eO-H9 for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:55 -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 1p5Ohz-0001Ed-Q9 for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:53 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-194-8WyiDp1ENJ6MsmKbVbDK1A-1; Wed, 14 Dec 2022 05:09:44 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7FCA5857A89; Wed, 14 Dec 2022 10:09:44 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8DEEB492C14; Wed, 14 Dec 2022 10:09:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671012591; 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=tVnT1VrWL1s4Tq0qu4AsVdR7OETcvF0vUizJcuFBx3o=; b=Nm6uP4aN3Fyp4Y2MVtsmayv+roZ5t7YM5SBuXIL4OcB6/91aauYu/2TqLDcifwTYF2R9Od b7lwoAlx15htC2QZ9bG8ZHqNiNDUwRLKWIj1pTahB4w/JoCuva6UYOzZtMk+NOfLLly2z0 sQCGL3rsUhUtgIbXHAAjehOBNZrtUVw= X-MC-Unique: 8WyiDp1ENJ6MsmKbVbDK1A-1 From: Thomas Huth To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: Brad Smith , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 20/23] FreeBSD: Upgrade to 12.4 release Date: Wed, 14 Dec 2022 11:09:08 +0100 Message-Id: <20221214100911.165291-21-thuth@redhat.com> In-Reply-To: <20221214100911.165291-1-thuth@redhat.com> References: <20221214100911.165291-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=thuth@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: 1671014009722100001 From: Brad Smith Upgrade to 12.4 release Signed-off-by: Brad Smith Message-Id: Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed by: Warner Losh Signed-off-by: Thomas Huth --- .gitlab-ci.d/cirrus.yml | 2 +- tests/vm/freebsd | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index 634a73a742..785b163aa6 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -50,7 +50,7 @@ x64-freebsd-12-build: NAME: freebsd-12 CIRRUS_VM_INSTANCE_TYPE: freebsd_instance CIRRUS_VM_IMAGE_SELECTOR: image_family - CIRRUS_VM_IMAGE_NAME: freebsd-12-3 + CIRRUS_VM_IMAGE_NAME: freebsd-12-4 CIRRUS_VM_CPUS: 8 CIRRUS_VM_RAM: 8G UPDATE_COMMAND: pkg update diff --git a/tests/vm/freebsd b/tests/vm/freebsd index d6ff4461ba..ba2ba23d24 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -28,8 +28,8 @@ class FreeBSDVM(basevm.BaseVM): name =3D "freebsd" arch =3D "x86_64" =20 - link =3D "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.3/Fr= eeBSD-12.3-RELEASE-amd64-disc1.iso.xz" - csum =3D "36dd0de50f1fe5f0a88e181e94657656de26fb64254412f74e80e128e8b9= 38b4" + link =3D "https://download.freebsd.org/ftp/releases/ISO-IMAGES/12.4/Fr= eeBSD-12.4-RELEASE-amd64-disc1.iso.xz" + csum =3D "1dcf6446e31bf3f81b582e9aba3319a258c29a937a2af6138ee4b181ed71= 9a87" size =3D "20G" pkgs =3D [ # build tools --=20 2.31.1 From nobody Sun May 19 09:42:16 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=1671013016; cv=none; d=zohomail.com; s=zohoarc; b=E1cesFto6Pdl7VUA3VAVi6Y8BriH4Vmc9yPvMhwwAp615zE9vD1W0c3bTZexuWui4o33Ke7pza6cLBAMW6SRmXsgM6q7svtrnPtAWf1P5eSq4xzjyGjKAoRjn6KwzTC/VKxBAw2sk+0KP7aI8iXHCwzt8EIYxoSLXi66klb680U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671013016; 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=eQqGZCq6X7BSNtTaSbN/dgrfzLhh4AnFyr6hY2P1X4Q=; b=NQYPKcvCnob4ksYTazOvLDCkqiIYNzy9XQ9oOmFmjteykyQrLbbgLsObQaNgKgUZDkIOXWL3w9t80TsF+vOI/9M7Qnid2oV0ebKFLO6gNAR0V8dvc0KqppUGTbKDySnkyxmFAV45i0upY97xFgae4p8XNYz1cHlbrADrbSeUYKc= 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 1671013016054683.3745756184469; Wed, 14 Dec 2022 02:16:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Oi8-0007iL-Ub; Wed, 14 Dec 2022 05:10:00 -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 1p5Oi1-0007eN-HY for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:55 -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 1p5Ohz-0001EJ-A5 for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:52 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-231-zt6dLiUDMyCUw7M_i7TNWA-1; Wed, 14 Dec 2022 05:09:46 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CF63629AA2C0; Wed, 14 Dec 2022 10:09:45 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id CE4DD492C14; Wed, 14 Dec 2022 10:09:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671012589; 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=eQqGZCq6X7BSNtTaSbN/dgrfzLhh4AnFyr6hY2P1X4Q=; b=LTgoqNdbkujxq14KxR7btEqXTx1se2WvOzIXIo9CTY6dNMb7R4xxNYdH201tyJ48AKQLca CAxmCEoIcUcNyTK0Al07iCS8gch2Wimk+j9EKj2ppgEMJYh33fejEq2q+2itXJMPex2ub9 lJlGufUMqlsj7D7qTW82I/2rJhtofh8= X-MC-Unique: zt6dLiUDMyCUw7M_i7TNWA-1 From: Thomas Huth To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 21/23] gitlab-ci: Check building ppc64 without TCG Date: Wed, 14 Dec 2022 11:09:09 +0100 Message-Id: <20221214100911.165291-22-thuth@redhat.com> In-Reply-To: <20221214100911.165291-1-thuth@redhat.com> References: <20221214100911.165291-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=thuth@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: 1671013017593100003 Building QEMU for ppc64 hosts with --disable-tcg used to break a couple of times in the past, see e.g. commit a01b64cee7 ("target/ppc: Put do_rfi under a TCG-only block") or commit 049b4ad669 ("target/ppc: Fix build warnings when building with 'disable-tcg'"), so we should test this in our CI to avoid such regressions. Message-Id: <20221208101527.36873-1-thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- .gitlab-ci.d/crossbuilds.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index c4cd96433d..8dbbb8f881 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -112,6 +112,14 @@ cross-ppc64el-user: variables: IMAGE: debian-ppc64el-cross =20 +cross-ppc64el-kvm-only: + extends: .cross_accel_build_job + needs: + job: ppc64el-debian-cross-container + variables: + IMAGE: debian-ppc64el-cross + EXTRA_CONFIGURE_OPTS: --disable-tcg --without-default-devices + # The riscv64 cross-builds currently use a 'sid' container to get # compilers and libraries. Until something more stable is found we # allow_failure so as not to block CI. --=20 2.31.1 From nobody Sun May 19 09:42:16 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=1671014045; cv=none; d=zohomail.com; s=zohoarc; b=OvKdt1BKAa6JJa7JC0cwoIiFhQO9jRIO3bDZjUASek4D5KAF6/T//HHr/1UzocfGb9TbaCJ1USQZeLqIShlWqMQfBqCZzY5AzBn6+0s/oMbMSr13SDRiMdOjKUiRZlDLoTvglTPhEWmu33M89f9392+gMiCuW/1AoiTJV7rnoJU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671014045; 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=mJ4tAjlesJSAXrMTYi1FsNFxUG9gwH9T6d1DHJIqb64=; b=klFn1OwUryueaF1uiP9vcS3mBKG4yG15l57U3pHrm0ApIIjr1v8J3uaJpk+SCTFsBYRNt5y9kC1zeBNndL9KbonUxGhpwF5zVhnvE72XmChohOX223mQ0XmFm4iVEgsQdkg/4oy0CXD19xsPyOpd6A9rlTv35XieELOW4x3ljVw= 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 1671014045081562.1746607508522; Wed, 14 Dec 2022 02:34:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5OiD-0007kE-1L; Wed, 14 Dec 2022 05:10:05 -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 1p5Oi1-0007eP-Hg for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:55 -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 1p5Ohz-0001EX-MT for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:53 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-436-IAQ39WYXP2iwZBd2U73VKA-1; Wed, 14 Dec 2022 05:09:47 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8E5BB29AA2C0; Wed, 14 Dec 2022 10:09:47 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3C2C4492C14; Wed, 14 Dec 2022 10:09:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671012591; 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=mJ4tAjlesJSAXrMTYi1FsNFxUG9gwH9T6d1DHJIqb64=; b=YTtlAri/f/sfuNh5sgKrFC3sP80zy+OV8CM26HXjFBYdNJqx7APl2xk6mXxH/8a6bf3Wog hqST3MeXP3Ua810Oh+FCD2/aUCN4O6qFLVYxNgx3kGUIN9TANR4Cdn3MMKgQ6HdLkH8qiV gIJ69of353wGPj3eDTNIHkEgmYG1XFc= X-MC-Unique: IAQ39WYXP2iwZBd2U73VKA-1 From: Thomas Huth To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: John Snow , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson Subject: [PULL 22/23] .gitlab/issue_templates: Move suggestions into comments Date: Wed, 14 Dec 2022 11:09:10 +0100 Message-Id: <20221214100911.165291-23-thuth@redhat.com> In-Reply-To: <20221214100911.165291-1-thuth@redhat.com> References: <20221214100911.165291-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=thuth@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: 1671014046042100001 Many users forget to remove the suggestions from the bug template when creating a new issue. So when searching for strings like "s390x" or "Windows", you get a lot of unrelated issues in the results. Thus let's move the suggestions into HTML comments - so they will still show up in the markdown when editing the bug, while being hidden/ignored in the final text or in the search queries. Message-Id: <20221201133756.77216-1-thuth@redhat.com> Reviewed-by: John Snow Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Richard Henderson Signed-off-by: Thomas Huth --- .gitlab/issue_templates/bug.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab/issue_templates/bug.md b/.gitlab/issue_templates/bug.md index e910f7b1c2..53a79f5828 100644 --- a/.gitlab/issue_templates/bug.md +++ b/.gitlab/issue_templates/bug.md @@ -18,11 +18,11 @@ https://www.qemu.org/contribute/security-process/ --> =20 ## Host environment - - Operating system: (Windows 10 21H1, Fedora 34, etc.) - - OS/kernel version: (For POSIX hosts, use `uname -a`) - - Architecture: (x86, ARM, s390x, etc.) - - QEMU flavor: (qemu-system-x86_64, qemu-aarch64, qemu-img, etc.) - - QEMU version: (e.g. `qemu-system-x86_64 --version`) + - Operating system: + - OS/kernel version: + - Architecture: + - QEMU flavor: + - QEMU version: + - OS/kernel version: + - Architecture: =20 =20 ## Description of problem --=20 2.31.1 From nobody Sun May 19 09:42:16 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=1671012661; cv=none; d=zohomail.com; s=zohoarc; b=J6NseUvOvpLmauFEXf71/K15I2C2TjSiDC09XW3/eKwXDE3uN8DN++OoyXQQeDI31AYv29jOIgHB+4jrEHQl/nQYByfYAAeK8thsDeWGl2IIs5+U5aAi0AlS4NfYTZqUA1eXqHllI9OpQ4KEDaA4gyPfcGKdim/5U+RJSzxrURs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1671012661; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ICX9dpuUPa7l+uVKKhDHhSks58NundfTvA3Htr3E5Q8=; b=WTGnAhMSuaZ1PkR6k8K2HKb/en+XYleI/GvVDxcVXZELXx6eHyIyr2d92Al3maRPDnyIdx/+W3IfA9i65Dhp1BctxfNgCJeBSCny8sZhv61zYNKMcSa7G7yL95o8aVPB4+1h0oMlTTZjQI3OnhcZy4sAvD5TRvRhGc3w3fkie3U= 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 1671012661118262.1848719109191; Wed, 14 Dec 2022 02:11:01 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5OiC-0007jS-5t; Wed, 14 Dec 2022 05:10:04 -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 1p5Oi2-0007eR-MG for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:55 -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 1p5Oi0-0001Eu-9p for qemu-devel@nongnu.org; Wed, 14 Dec 2022 05:09:54 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-450-THuqCEKBMPqBE_B0fZlhqg-1; Wed, 14 Dec 2022 05:09:49 -0500 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DE9601C08969; Wed, 14 Dec 2022 10:09:48 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.57]) by smtp.corp.redhat.com (Postfix) with ESMTP id D8C26492C14; Wed, 14 Dec 2022 10:09:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671012591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ICX9dpuUPa7l+uVKKhDHhSks58NundfTvA3Htr3E5Q8=; b=jRuf8bVihWfBAIfCQqA5NZ9a5a07tUCxKq/zDaRVp8DMvctgVE0UkZDtCLx8EsnA0TsjZZ h8UogXj1fdNT45vNyXD/IrQSgpF8xucm2ULNSIzr9BXX1P2jMaavfBpCkFPzhxjH8/QH+S W+Ou+4S0wXuas6KsmWedvg3DPqEMf5I= X-MC-Unique: THuqCEKBMPqBE_B0fZlhqg-1 From: Thomas Huth To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: Christian Schoenebeck Subject: [PULL 23/23] tests/qtest/vhost-user-blk-test: don't abort all qtests on missing envar Date: Wed, 14 Dec 2022 11:09:11 +0100 Message-Id: <20221214100911.165291-24-thuth@redhat.com> In-Reply-To: <20221214100911.165291-1-thuth@redhat.com> References: <20221214100911.165291-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=thuth@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: 1671012663135100003 Content-Type: text/plain; charset="utf-8" From: Christian Schoenebeck This test requires environment variable QTEST_QEMU_STORAGE_DAEMON_BINARY to be defined for running. If not, it would immediately abort all qtests and prevent other, unrelated tests from running. To fix that, just skip vhost-user-blk-test instead and log a message about missing environment variable. Signed-off-by: Christian Schoenebeck Message-Id: Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- tests/qtest/vhost-user-blk-test.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/qtest/vhost-user-blk-test.c b/tests/qtest/vhost-user-blk= -test.c index 07a4c2d500..dc37f5af4d 100644 --- a/tests/qtest/vhost-user-blk-test.c +++ b/tests/qtest/vhost-user-blk-test.c @@ -983,6 +983,12 @@ static void register_vhost_user_blk_test(void) .before =3D vhost_user_blk_test_setup, }; =20 + if (!getenv("QTEST_QEMU_STORAGE_DAEMON_BINARY")) { + g_test_message("QTEST_QEMU_STORAGE_DAEMON_BINARY not defined, " + "skipping vhost-user-blk-test"); + return; + } + /* * tests for vhost-user-blk and vhost-user-blk-pci * The tests are borrowed from tests/virtio-blk-test.c. But some tests --=20 2.31.1