From patchwork Wed Apr 24 07:57:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 791500 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:346:15ad:a2a with SMTP id g4csp698155wrq; Wed, 24 Apr 2024 01:00:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWasCqlMnQ3VKFmAfUdyDh/l402rD0VOqI1Fyz/RXj4qXFqJsMR2uIrDVZvYKbbtAVD1jrKkYOY1mOSe4/ht9It X-Google-Smtp-Source: AGHT+IGHev6SFkc4bK+cJU+k9Ti5Rg6EJKwd8nNsZR0Zfm08JnfhOEzmi51mtYh8dS19zCmenyuE X-Received: by 2002:ac8:5f10:0:b0:439:f9d6:42aa with SMTP id x16-20020ac85f10000000b00439f9d642aamr2102225qta.60.1713945608430; Wed, 24 Apr 2024 01:00:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713945608; cv=none; d=google.com; s=arc-20160816; b=QuxttPpAU3Fau0r3JJnIdvEAb8+OPNgZI8ZTkN+Ay8XyEqC7iq7SBeCXBOgHldPWe+ Yt8lE9cUJs8EGnbAifjCIkswWCDsiGphcey4g4tpEn41xA3xyjc8BGneT6zKPhijqkc0 R/i8xpcdLCAy9VXHrpfOeGUHhJkD37UGKZH4ZU/MuYiJ1lM4lpiM+0NUMYttic91hX1c axLSGSSKRmx2RL0xNf5HK1OBSZaE8OvyGJY5Phx8WkNIXDS38JCOguWSbLf9UA3PNHQf ki7onynnK2x2SU3GlgCNpUMwKAi+C0LT9LpSgl38/mbFAMTYc5q5KekWSyGaBweRvPr/ 6BVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=h5LHVnYyLW2OICqVeP2czgrsfF1STKIdoc75JBnDZiI=; fh=WWqn8o31GBVx9Q3bcEIcT+oblAwuvojKcV17oLpkFMo=; b=fhJsug/aOeA4QjbRjVDrAsq2EMYlSheqrd5F/GV76AIvaEi4sfOnT0gFAzcnldCe9G w13jMGRbjfTkQXhtQBOGa6ICpsaGaQncBCuLJi8Dzkm6dgOaZ1+IgFDK8gpVAFzeVzB8 ogGvesb2mce/w0KisAV4uvkSybQ4/abe3pTiJ3sc8P3ZrSJRiPjshQupE5xmgYLQ/Dyi SlHHAB8NOeNO4nB/9xUqJsbz9BC0+zSFs2Ds8MGDSHxY6h7ctvSd4xwAKoD7Y0h+Fa9i waoPmuRFWh0hRgIdbuH+o25GVYE63jV1H9U2j0w+hRx02WMIZbE9kdgd9I0jdBamztdc thYA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=hQeaVaJS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id et5-20020a05622a4b0500b004313a129c15si13354487qtb.512.2024.04.24.01.00.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Apr 2024 01:00:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=hQeaVaJS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rzXWM-0004sm-4g; Wed, 24 Apr 2024 03:58:26 -0400 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 1rzXWI-0004kB-FQ for qemu-devel@nongnu.org; Wed, 24 Apr 2024 03:58:22 -0400 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 1rzXWG-00033P-UM for qemu-devel@nongnu.org; Wed, 24 Apr 2024 03:58:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1713945500; 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=h5LHVnYyLW2OICqVeP2czgrsfF1STKIdoc75JBnDZiI=; b=hQeaVaJSZcPb1glZ+TwHl0shSBnmGW1tuana2zNoKBgARYFcUbResXASEaTPcX/5nwY0Mt WgJG7V7gndzAM35nfAfPgtepmFeYTp1NY1BAztTd2Zrvl8BeosvXU8tpgpKaAGGastd/Rq HBT8BFOnCorPnJFG8/P9H52LlxitMkM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-53-JcjMR8jRMa6ElX6nTWWOSg-1; Wed, 24 Apr 2024 03:58:16 -0400 X-MC-Unique: JcjMR8jRMa6ElX6nTWWOSg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E2EC281B5AF; Wed, 24 Apr 2024 07:58:15 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id DD5A13543A; Wed, 24 Apr 2024 07:58:14 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , Eric Farman Subject: [PULL 14/17] hw/s390x: Include missing 'cpu.h' header Date: Wed, 24 Apr 2024 09:57:32 +0200 Message-ID: <20240424075735.248041-15-thuth@redhat.com> In-Reply-To: <20240424075735.248041-1-thuth@redhat.com> References: <20240424075735.248041-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 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: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.67, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé "cpu.h" is implicitly included. Include it explicitly to avoid the following error when refactoring headers: hw/s390x/s390-stattrib.c:86:40: error: use of undeclared identifier 'TARGET_PAGE_SIZE' len = sac->peek_stattr(sas, addr / TARGET_PAGE_SIZE, buflen, vals); ^ hw/s390x/s390-stattrib.c:94:58: error: use of undeclared identifier 'TARGET_PAGE_MASK' addr / TARGET_PAGE_SIZE, len, addr & ~TARGET_PAGE_MASK); ^ hw/s390x/s390-stattrib.c:224:40: error: use of undeclared identifier 'TARGET_PAGE_BITS' qemu_put_be64(f, (start_gfn << TARGET_PAGE_BITS) | STATTR_FLAG_MORE); ^ In file included from hw/s390x/s390-virtio-ccw.c:17: hw/s390x/s390-virtio-hcall.h:22:27: error: unknown type name 'CPUS390XState' int s390_virtio_hypercall(CPUS390XState *env); ^ Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Acked-by: Eric Farman Message-ID: <20240322162822.7391-1-philmd@linaro.org> Signed-off-by: Thomas Huth --- hw/s390x/s390-virtio-hcall.h | 2 ++ hw/s390x/s390-stattrib.c | 1 + 2 files changed, 3 insertions(+) diff --git a/hw/s390x/s390-virtio-hcall.h b/hw/s390x/s390-virtio-hcall.h index 9800c4b351..3ae6d6ae3a 100644 --- a/hw/s390x/s390-virtio-hcall.h +++ b/hw/s390x/s390-virtio-hcall.h @@ -13,6 +13,7 @@ #define HW_S390_VIRTIO_HCALL_H #include "standard-headers/asm-s390/virtio-ccw.h" +#include "cpu.h" /* The only thing that we need from the old kvm_virtio.h file */ #define KVM_S390_VIRTIO_NOTIFY 0 @@ -20,4 +21,5 @@ typedef int (*s390_virtio_fn)(const uint64_t *args); void s390_register_virtio_hypercall(uint64_t code, s390_virtio_fn fn); int s390_virtio_hypercall(CPUS390XState *env); + #endif /* HW_S390_VIRTIO_HCALL_H */ diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c index c483b62a9b..aaf48ac73f 100644 --- a/hw/s390x/s390-stattrib.c +++ b/hw/s390x/s390-stattrib.c @@ -19,6 +19,7 @@ #include "exec/ram_addr.h" #include "qapi/error.h" #include "qapi/qmp/qdict.h" +#include "cpu.h" /* 512KiB cover 2GB of guest memory */ #define CMMA_BLOCK_SIZE (512 * KiB) From patchwork Wed Apr 24 07:57:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 791499 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:346:15ad:a2a with SMTP id g4csp698001wrq; Wed, 24 Apr 2024 00:59:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV4Zn8kiMRzD7c5D917Qt2uWT7XTn9tsvqm4EcBcNQUXVwo4foNsoGpUgY8NZC8nwJmqDVzEakuYIuSqs6P0Mx9 X-Google-Smtp-Source: AGHT+IEeKQ/xxMbTIpVmE2qopjKGcCvSxcw/9j5DubUGve2x0OaWk1d/ZHOVQcg+wiTZNPE2G486 X-Received: by 2002:a05:6214:5093:b0:6a0:8e1d:bbce with SMTP id kk19-20020a056214509300b006a08e1dbbcemr4090568qvb.22.1713945581425; Wed, 24 Apr 2024 00:59:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713945581; cv=none; d=google.com; s=arc-20160816; b=uicOGh8ye77YkFWu3Gdrj9Pzm8xC09DPFVZ5ikMGRgYKtwjQ1RT+ONnrjZGvrPSXCc LP28rCSQLi1wazl0UiQXsR3C0Xon9+cVytHJbB89eC+qKkCXTXkP2JkuL7mOd2pF92XI GGLiI2gBryqGlGIZywdaAxrbt4Cw2RvbuwtWo0QfQaI2jL52knMsBLPuiYWe3WH6KgNb slDDtOC8OskkycegxGCmG2Fsbz+lboy+3p707S2ER9jIkmhAd279/Gm9d3teIF7FU06o uuIyTBwIM/b8yD2P08+cyajw5/ar+6kX0CXg5y2v0pbGnOeoubB79eJnA6Or1ElfNYit A1wA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=B5k/XgyV6OBmCESICUalI1ibyWn0WpELMf2zPFLN3Uo=; fh=LIBv6sHtiDrH7N3D/L5kPnopb5nhVi/qvkJyKA6jqcs=; b=qdi4tThLpbiJq3mdSuAf224MsiCvMgCNTIuJMVtE5esvqz/mWnK0yGAXS2rSlYwPMs /RHPdFhD/vw0qk2aldOi7i+HMGKv6mUGoejFd+lMgCWdNsf2vRVuP/hKcGJ3ZTK7++4Q LY71IkLn2ZFEn2/J4OKT8GuzcAxZkWQHqgg3lj2JsYZKYopvpos98osZavZALupTk9A1 JdRvsVI0uPqu0iAJI+3wMZPagSZ71gYe19c7JvPshm0w35TvCcU0jVXEp23LrlXON6zc y0eepilqFEillmz3N1o2TviB2ygn29C8l5rFhN1/+efjbLmmtqXgCpqpUTDEl8eHo6FY FjQA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=bddnJ3IJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6-20020a0562140d4600b0069b19c7ec13si14424868qvr.100.2024.04.24.00.59.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Apr 2024 00:59:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=bddnJ3IJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rzXWP-00052n-2T; Wed, 24 Apr 2024 03:58:29 -0400 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 1rzXWL-0004sU-UC for qemu-devel@nongnu.org; Wed, 24 Apr 2024 03:58:25 -0400 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 1rzXWK-00033s-5y for qemu-devel@nongnu.org; Wed, 24 Apr 2024 03:58:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1713945503; 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=B5k/XgyV6OBmCESICUalI1ibyWn0WpELMf2zPFLN3Uo=; b=bddnJ3IJAFI0iRULiy10eUT2hRCCm9AV5e5SAK+oJZrA0I3IKyRau4EChBSD9zYHIOKDPi gzABLlyNDQCLEE30r+Z7w+cP4QWYlGaQkOM4zBBW/L8fmO5NmxOw5gZpdFbwPM2WwJ+amb s4CmmiNqn42FEc/axtvcbtO+lM3usTk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-454-lL4zu9BvOd21pfT6CCNyww-1; Wed, 24 Apr 2024 03:58:20 -0400 X-MC-Unique: lL4zu9BvOd21pfT6CCNyww-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BA0F118065AE; Wed, 24 Apr 2024 07:58:19 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 695A83543A; Wed, 24 Apr 2024 07:58:18 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , Eric Blake , Stefan Hajnoczi Subject: [PULL 16/17] tests/unit: Remove debug statements in test-nested-aio-poll.c Date: Wed, 24 Apr 2024 09:57:34 +0200 Message-ID: <20240424075735.248041-17-thuth@redhat.com> In-Reply-To: <20240424075735.248041-1-thuth@redhat.com> References: <20240424075735.248041-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 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: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.67, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé We have been running this test for almost a year; it is safe to remove its debug statements, which clutter CI jobs output: ▶ 88/100 /nested-aio-poll OK io_read 0x16bb26158 io_poll_true 0x16bb26158 > io_poll_ready io_read 0x16bb26164 < io_poll_ready io_poll_true 0x16bb26158 io_poll_false 0x16bb26164 > io_poll_ready io_poll_false 0x16bb26164 io_poll_false 0x16bb26164 io_poll_false 0x16bb26164 io_poll_false 0x16bb26164 io_poll_false 0x16bb26164 io_poll_false 0x16bb26164 io_poll_false 0x16bb26164 io_poll_false 0x16bb26164 io_poll_false 0x16bb26164 io_read 0x16bb26164 < io_poll_ready 88/100 qemu:unit / test-nested-aio-poll OK Reviewed-by: Eric Blake Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Stefan Hajnoczi Message-ID: <20240422112246.83812-1-philmd@linaro.org> Signed-off-by: Thomas Huth --- tests/unit/test-nested-aio-poll.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/unit/test-nested-aio-poll.c b/tests/unit/test-nested-aio-poll.c index db33742af3..d8fd92c43b 100644 --- a/tests/unit/test-nested-aio-poll.c +++ b/tests/unit/test-nested-aio-poll.c @@ -30,19 +30,16 @@ typedef struct { static void io_read(EventNotifier *notifier) { - fprintf(stderr, "%s %p\n", __func__, notifier); event_notifier_test_and_clear(notifier); } static bool io_poll_true(void *opaque) { - fprintf(stderr, "%s %p\n", __func__, opaque); return true; } static bool io_poll_false(void *opaque) { - fprintf(stderr, "%s %p\n", __func__, opaque); return false; } @@ -50,8 +47,6 @@ static void io_poll_ready(EventNotifier *notifier) { TestData *td = container_of(notifier, TestData, poll_notifier); - fprintf(stderr, "> %s\n", __func__); - g_assert(!td->nested); td->nested = true; @@ -62,8 +57,6 @@ static void io_poll_ready(EventNotifier *notifier) g_assert(aio_poll(td->ctx, true)); td->nested = false; - - fprintf(stderr, "< %s\n", __func__); } /* dummy_notifier never triggers */ From patchwork Wed Apr 24 07:57:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 791498 Delivered-To: patch@linaro.org Received: by 2002:a5d:4884:0:b0:346:15ad:a2a with SMTP id g4csp697826wrq; Wed, 24 Apr 2024 00:59:06 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWpdwgIrQXTGv3CXysNoulk7NG2e+MP9kSlz4zDbDvFD1YibX2VZWk3UBJh15tXQHex4N3B9bU75+x6Pw8mAkAV X-Google-Smtp-Source: AGHT+IG/7ylPk15+hsnOf1G+IOy1e5rpFI6gYG7sAZ1US1DIgMVj/leO8vHxNLpsuymzV968BG6B X-Received: by 2002:a05:6359:4119:b0:18d:8d90:5844 with SMTP id kh25-20020a056359411900b0018d8d905844mr1419514rwc.8.1713945545722; Wed, 24 Apr 2024 00:59:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713945545; cv=none; d=google.com; s=arc-20160816; b=iXR3Hvxk7wNCKiM+10Dl1DfeK4FabwbwNZ1XODFxvDha26h/fXhfdHlJrnNEY3Hue+ 2miNAdLKUT7Vf2jlCneb/7Zpc0hSoVQ9yF01+oAsOcrtXr6Hssb9nUGysELa7hYhqHOQ e8lROpXMa270N1BXc8bTYcDbr+6i5PrXLTDL08/5WBC7lyd9FEySWzDeI7mzDon51pog f4KPCDAqiZTvLLD3zA5Fbau7Z/mKdW3M5rEbIMQmqGBkVjeS4HbXb/E13iVpoB2qe2G8 aUlqC2jklkQmUHv16/x9P1ErG8yBoxs3/Hw9bjc+TVF3Tu7j1ObnKf6SH3aD0R0F43S2 dTeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/BEyNWolWnVTOxMJlngpc1vllM2q2ts8Q1bV3+bysT4=; fh=ZXDWg7hKG7Hj19AbRuutTLw+Zvn/B9RsGUUw/YagpFI=; b=oGM+AiK5QqFcLo/8BcP846JyM9iA/04RvsfkH9YxernHMNgLi7aXH3Z/H2zA3VpcoD SEfhhiOUYCLPpMoqAUz+xcWNFJbRKo2UH+PejZB5xE0skTXd1yNrmLK/2EQ/RqUsxMxC 0IVslL9DFrg2dD/vf3hDUP2VQ3YYs5nscZ/OF0AUJ3u64qBPSQf9xKtrqbF16CPcPHFf Uc1137qqfeWO/SORsestevMW0GjOoYRFT7y7nXVnovxnZsm74977p4p7wIz4zx4nO8GI jBHr/0hoUGESqP7faAGtSn4wlyM8flHcsm7GLKtd23m5G82LW2duNZbUWMjRwiLiOLjx dyFA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Nh7umMUh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ey10-20020a0562140b6a00b0069b317ea520si14449887qvb.319.2024.04.24.00.59.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Apr 2024 00:59:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Nh7umMUh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rzXWQ-00056K-6N; Wed, 24 Apr 2024 03:58:30 -0400 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 1rzXWN-0004xd-JV for qemu-devel@nongnu.org; Wed, 24 Apr 2024 03:58:27 -0400 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 1rzXWM-00034L-2o for qemu-devel@nongnu.org; Wed, 24 Apr 2024 03:58:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1713945505; 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=/BEyNWolWnVTOxMJlngpc1vllM2q2ts8Q1bV3+bysT4=; b=Nh7umMUhNYJ04U2RBtAfnTx6Ag1D6nZtveAqJhaUoKACHu1BBT8NXck06IdDoMHNcSwk8y sFqL+M3POYV6nStNWzwj0wRSrhoksOubYYsymwwaS3v+lnY16b1kztQRoCgawmWN2HTBZb 2bk16dx7IGMGmrqCjSNdo8ZVhCAQP6U= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-142-vzmS_zCAPMWODCgD1bTNJA-1; Wed, 24 Apr 2024 03:58:21 -0400 X-MC-Unique: vzmS_zCAPMWODCgD1bTNJA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 526991C4C3A0; Wed, 24 Apr 2024 07:58:21 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 403703543A; Wed, 24 Apr 2024 07:58:20 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Cc: Richard Henderson , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Subject: [PULL 17/17] target/s390x: Remove KVM stubs in cpu_models.h Date: Wed, 24 Apr 2024 09:57:35 +0200 Message-ID: <20240424075735.248041-18-thuth@redhat.com> In-Reply-To: <20240424075735.248041-1-thuth@redhat.com> References: <20240424075735.248041-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 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: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.67, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Since the calls are elided when KVM is not available, we can remove the stubs (which are never compiled). Signed-off-by: Philippe Mathieu-Daudé Message-ID: <20240419090631.48055-1-philmd@linaro.org> Signed-off-by: Thomas Huth --- target/s390x/cpu_models.h | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/target/s390x/cpu_models.h b/target/s390x/cpu_models.h index d7b8912989..a89c2a15ab 100644 --- a/target/s390x/cpu_models.h +++ b/target/s390x/cpu_models.h @@ -114,23 +114,8 @@ static inline uint64_t s390_cpuid_from_cpu_model(const S390CPUModel *model) S390CPUDef const *s390_find_cpu_def(uint16_t type, uint8_t gen, uint8_t ec_ga, S390FeatBitmap features); -#ifdef CONFIG_KVM bool kvm_s390_cpu_models_supported(void); void kvm_s390_get_host_cpu_model(S390CPUModel *model, Error **errp); void kvm_s390_apply_cpu_model(const S390CPUModel *model, Error **errp); -#else -static inline void kvm_s390_get_host_cpu_model(S390CPUModel *model, - Error **errp) -{ -} -static inline void kvm_s390_apply_cpu_model(const S390CPUModel *model, - Error **errp) -{ -} -static inline bool kvm_s390_cpu_models_supported(void) -{ - return false; -} -#endif #endif /* TARGET_S390X_CPU_MODELS_H */