From patchwork Tue Jul 19 09:34:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1657867 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=AltZsF7X; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LnDGt2jtHz9sG1 for ; Tue, 19 Jul 2022 19:36:06 +1000 (AEST) Received: from localhost ([::1]:41722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oDje8-0001ST-7s for incoming@patchwork.ozlabs.org; Tue, 19 Jul 2022 05:36:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41594) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDjct-0001PP-Sx for qemu-devel@nongnu.org; Tue, 19 Jul 2022 05:34:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:58255) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDjcs-0000Qg-BN for qemu-devel@nongnu.org; Tue, 19 Jul 2022 05:34:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658223285; 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=vBYfpPuzNQ2Hah53ZeUIE84a2xKUBptEf78oS/hKeg8=; b=AltZsF7X3wsX/9jDeZN/+4dlaEWQWq1I0KVbdu5GIoafNMVDKTJYDHMLQwnDki7uxFCicy ulgARYYpEgWvLZm2I4iVKE8VBS+VMkN2RECfSyjrovv2yS6tmFXSaxBd8U3KKikoxy5Yq4 a0ne/PgdvJ3iaNB9e2mSDf5pA3FXR00= Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-298-3YCK8RUxMcWYAb2dEJgihQ-1; Tue, 19 Jul 2022 05:34:44 -0400 X-MC-Unique: 3YCK8RUxMcWYAb2dEJgihQ-1 Received: by mail-ej1-f69.google.com with SMTP id hr24-20020a1709073f9800b0072b57c28438so2847087ejc.5 for ; Tue, 19 Jul 2022 02:34:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vBYfpPuzNQ2Hah53ZeUIE84a2xKUBptEf78oS/hKeg8=; b=HVgt+VUKtzy3d3obEp+5+SMPDYorQszCQCXfkO1EQ2FIbpjwnBCVKY5TjlZ5c7eDE3 SQkkJ5NoY05yEzD6MkQgzYUamKqsXoZIOta0XfkFgsvM+frsiQXiAtTfZwnoKn7kDsO0 ZNizxfsKgKzjjyCfomRprVMxYSgdiNqBFZHuyNIeWl1+us08IsNjJK96uyD1hsA5++KH sxDZRVL6A8RTv/YSU3FiAxiLcgWUPx2U+POlz5agW0p4TDbeEGOqKBhdLR/kvxr2220w DJ2I5cH35X9LnPdxUF5G8T5qXjM/n7mtJc5y71Nhh94bP5VC9jpKeGnZCeYWGgTJ31ZX TQQQ== X-Gm-Message-State: AJIora8euw6RD+CPqy3S6FTFdsctIAC9IocOgd60vCdN1RGSatTi6u7M t/xtn9APQTVc7BrwVxR4bW1frjtFSCOlLt/McbZr9hpiEyWNAFxBkvnV9bCFnEbI25nUwyFMpeE FliU7Kc0+LgXSpbMZS0wXpIACtLlfAZKuptb231yc9WYZj4sOW/MJCHw1+76F/ammCyQ= X-Received: by 2002:a17:906:5512:b0:726:be2c:a2e5 with SMTP id r18-20020a170906551200b00726be2ca2e5mr29189728ejp.88.1658223282810; Tue, 19 Jul 2022 02:34:42 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ueljy+y5hwHPQ89X8hZwuY8NCBaeR8wrHkiOC1JjtAN+lb21DRpB7ab46sb/I5/SP20OwIvQ== X-Received: by 2002:a17:906:5512:b0:726:be2c:a2e5 with SMTP id r18-20020a170906551200b00726be2ca2e5mr29189701ejp.88.1658223282482; Tue, 19 Jul 2022 02:34:42 -0700 (PDT) Received: from goa-sendmail ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id d25-20020aa7c1d9000000b0043a75f62155sm10202391edp.86.2022.07.19.02.34.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jul 2022 02:34:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Amneesh Singh Subject: [PULL 1/3] monitor: add support for boolean statistics Date: Tue, 19 Jul 2022 11:34:37 +0200 Message-Id: <20220719093439.528810-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220719093439.528810-1-pbonzini@redhat.com> References: <20220719093439.528810-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The next version of Linux will introduce boolean statistics, which can only have 0 or 1 values. Support them in the schema and in the HMP command. Suggested-by: Amneesh Singh Signed-off-by: Paolo Bonzini --- monitor/hmp-cmds.c | 2 ++ qapi/stats.json | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index ca98df0495..e8d6963722 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -2337,6 +2337,8 @@ static void print_stats_results(Monitor *mon, StatsTarget target, if (stats_value->type == QTYPE_QNUM) { monitor_printf(mon, ": %" PRId64 "\n", stats_value->u.scalar); + } else if (stats_value->type == QTYPE_QBOOL) { + monitor_printf(mon, ": %s\n", stats_value->u.boolean ? "yes" : "no"); } else if (stats_value->type == QTYPE_QLIST) { uint64List *list; int i; diff --git a/qapi/stats.json b/qapi/stats.json index 2f8bfe8fdb..57db5b1c74 100644 --- a/qapi/stats.json +++ b/qapi/stats.json @@ -38,11 +38,12 @@ # @bytes: stat reported in bytes. # @seconds: stat reported in seconds. # @cycles: stat reported in clock cycles. +# @boolean: stat is a boolean value. # # Since: 7.1 ## { 'enum' : 'StatsUnit', - 'data' : [ 'bytes', 'seconds', 'cycles' ] } + 'data' : [ 'bytes', 'seconds', 'cycles', 'boolean' ] } ## # @StatsProvider: @@ -123,6 +124,7 @@ ## { 'alternate': 'StatsValue', 'data': { 'scalar': 'uint64', + 'boolean': 'bool', 'list': [ 'uint64' ] } } ## From patchwork Tue Jul 19 09:34:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1657869 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=CNYMqYnR; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LnDKr1qL1z9sG1 for ; Tue, 19 Jul 2022 19:38:40 +1000 (AEST) Received: from localhost ([::1]:48146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oDjgc-0005sl-0B for incoming@patchwork.ozlabs.org; Tue, 19 Jul 2022 05:38:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41634) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDjcx-0001Vp-MW for qemu-devel@nongnu.org; Tue, 19 Jul 2022 05:34:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:56506) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDjcw-0000R2-5T for qemu-devel@nongnu.org; Tue, 19 Jul 2022 05:34:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658223289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RHdWC55cUPvE5A/T86wNKaY1/bkuZbeyxYtfxnHKD7k=; b=CNYMqYnRksHLmGygIaaD8hgpr+iNpbvuu23omQh0FN7kQOT3FgOjx9wZUsmVtmhYdnpAaJ 3ePHEMHV1eTPHrellPxnxgHI7dxEvrXRKfzli1IxdPJOPQsQuQFoIIk6ecfslQgIVPuwn1 coWBu+3Om+Bd+4lHbjgSO66W6tkfTzU= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-57-iFfcRJBeP7miuUxdqY0inw-1; Tue, 19 Jul 2022 05:34:45 -0400 X-MC-Unique: iFfcRJBeP7miuUxdqY0inw-1 Received: by mail-ed1-f71.google.com with SMTP id g7-20020a056402424700b0043ac55ccf15so9517714edb.4 for ; Tue, 19 Jul 2022 02:34:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RHdWC55cUPvE5A/T86wNKaY1/bkuZbeyxYtfxnHKD7k=; b=mKvkPnoeFRneGEEmQ7u302UpDeo4oJeVAgoWOaKQ+k/C3Iv9EzsvbbmPAjLb/4SAiR f6V/KGs+NUlYwb6i+AO7ruQraS6+yUimsrnn5EYxjPjRrOIAFth+/TLOW+UFUqSk6eBu TBgM5xxvG1buJPCgQvYbQjp6wFJovic89QS30lg8v9/FummiFd5NooFvEGJoy3eqFQZb i8X/RGhOZCxQeUDIR0ftM50HtTNaWHQIRMoUAB12f0hG0NRnH7JZ4WO8pZngLOmmJSV1 OBh4XxaHL5sjMWcLPEq38WvwolGUkcD835zCY/S9wjnuFvIPPaENb4487tJcy/+reM/R tP7g== X-Gm-Message-State: AJIora+0csh2uZcEdCt9c15KeQ9fz9yGa2hBdVp5gtk4gXQNB4mo/zYv Byi4iu/tM5KesfUGsQHqPX4gyJ3JEoLja5aiz1oc4Y9TK2pOpvkDNhp3VG2GMOZOptD3zbRdJ+a 7fYAmxNa2Fruoc21plwwbAlTl1iaqTvMKfbfkfqvr+1g5uJD+OCNg+DFBr66oXWFKzRg= X-Received: by 2002:a05:6402:2804:b0:439:83c2:8be2 with SMTP id h4-20020a056402280400b0043983c28be2mr42741066ede.292.1658223284041; Tue, 19 Jul 2022 02:34:44 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uDC+Q7pX3uqPQNO8HkXbJ0IFYrd+7SrZJIyixbarK6ajGTwvFA4IyTLoKRZuB3IeAtdXuwUg== X-Received: by 2002:a05:6402:2804:b0:439:83c2:8be2 with SMTP id h4-20020a056402280400b0043983c28be2mr42741034ede.292.1658223283717; Tue, 19 Jul 2022 02:34:43 -0700 (PDT) Received: from goa-sendmail ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id lb11-20020a170907784b00b007246492658asm6543819ejc.117.2022.07.19.02.34.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jul 2022 02:34:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 2/3] kvm: add support for boolean statistics Date: Tue, 19 Jul 2022 11:34:38 +0200 Message-Id: <20220719093439.528810-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220719093439.528810-1-pbonzini@redhat.com> References: <20220719093439.528810-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The next version of Linux will introduce boolean statistics, which can only have 0 or 1 values. Convert them to the new QAPI fields added in the previous commit. Signed-off-by: Paolo Bonzini --- accel/kvm/kvm-all.c | 10 +++++++++- linux-headers/linux/kvm.h | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index ed8b6b896e..3a2677d065 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -3743,6 +3743,7 @@ static StatsList *add_kvmstat_entry(struct kvm_stats_desc *pdesc, case KVM_STATS_UNIT_BYTES: case KVM_STATS_UNIT_CYCLES: case KVM_STATS_UNIT_SECONDS: + case KVM_STATS_UNIT_BOOLEAN: break; default: return stats_list; @@ -3761,7 +3762,10 @@ static StatsList *add_kvmstat_entry(struct kvm_stats_desc *pdesc, stats->name = g_strdup(pdesc->name); stats->value = g_new0(StatsValue, 1);; - if (pdesc->size == 1) { + if ((pdesc->flags & KVM_STATS_UNIT_MASK) == KVM_STATS_UNIT_BOOLEAN) { + stats->value->u.boolean = *stats_data; + stats->value->type = QTYPE_QBOOL; + } else if (pdesc->size == 1) { stats->value->u.scalar = *stats_data; stats->value->type = QTYPE_QNUM; } else { @@ -3809,6 +3813,10 @@ static StatsSchemaValueList *add_kvmschema_entry(struct kvm_stats_desc *pdesc, switch (pdesc->flags & KVM_STATS_UNIT_MASK) { case KVM_STATS_UNIT_NONE: break; + case KVM_STATS_UNIT_BOOLEAN: + schema_entry->value->has_unit = true; + schema_entry->value->unit = STATS_UNIT_BOOLEAN; + break; case KVM_STATS_UNIT_BYTES: schema_entry->value->has_unit = true; schema_entry->value->unit = STATS_UNIT_BYTES; diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h index 0d05d02ee4..f089349149 100644 --- a/linux-headers/linux/kvm.h +++ b/linux-headers/linux/kvm.h @@ -2031,6 +2031,7 @@ struct kvm_stats_header { #define KVM_STATS_UNIT_BYTES (0x1 << KVM_STATS_UNIT_SHIFT) #define KVM_STATS_UNIT_SECONDS (0x2 << KVM_STATS_UNIT_SHIFT) #define KVM_STATS_UNIT_CYCLES (0x3 << KVM_STATS_UNIT_SHIFT) +#define KVM_STATS_UNIT_BOOLEAN (0x4 << KVM_STATS_UNIT_SHIFT) #define KVM_STATS_UNIT_MAX KVM_STATS_UNIT_CYCLES #define KVM_STATS_BASE_SHIFT 8 From patchwork Tue Jul 19 09:34:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1657868 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=FhqtL4ee; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LnDHX6V73z9sG1 for ; Tue, 19 Jul 2022 19:36:40 +1000 (AEST) Received: from localhost ([::1]:43230 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oDjeg-0002V0-N4 for incoming@patchwork.ozlabs.org; Tue, 19 Jul 2022 05:36:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDjcx-0001VV-IA for qemu-devel@nongnu.org; Tue, 19 Jul 2022 05:34:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:50198) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oDjcv-0000Qv-2V for qemu-devel@nongnu.org; Tue, 19 Jul 2022 05:34:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658223288; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bPXIpCM8zHIlVcNcC0Ag1GGxuLFE2QgmEO781sVav7g=; b=FhqtL4eeqFOngpgPcpwtiW/NsBVgsdVdZa8vVJhO9V46IzDhpf5E2voA3thx1CcXnneoj4 dFiIOlUERoACpdflUa3qHVQT95Cm9E3HkYNpsislYD3tEnsMMuN8TN3zVjxTCS5oCLpY3J qf0hJT2kGjx1hg9NS2cpmiNdbkGfP2I= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-125-YnGu2iiWN1-HZ5a6qjHIVw-1; Tue, 19 Jul 2022 05:34:46 -0400 X-MC-Unique: YnGu2iiWN1-HZ5a6qjHIVw-1 Received: by mail-ed1-f72.google.com with SMTP id bs1-20020a056402304100b0043ad1e84611so9704523edb.15 for ; Tue, 19 Jul 2022 02:34:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bPXIpCM8zHIlVcNcC0Ag1GGxuLFE2QgmEO781sVav7g=; b=MyQTZoPJWiixIbPJ8VgMLsXbhQsHr2TF8cxZb1uxGo8x6d8ktKJLCrj9PjbFqgtFgW R2oUdJbBGNGAa2Xefb73CkL1YC3wp0Uar8fN1YBcveTjpNZhcOJAK1Dp88t08W4Ex+IY 8OZXZtTRstM0cNb73Di/d5H533fdyncmInwvNkw6D8HykZweqtmKGAsShpbg4+t1wYLy n/ZrIT1dM5e6+YBtGf8V4BJmQvrLtKa7Bkg/f3d7syRWYm5NJQJKeqbbCAUBHG1f2f+a OaBLSeMxLMVAE3bRSPrWwaORKiwJQ2hmYg3ulMLs7TyhNNU7OpqlLE0uYAoguC3Tjdqj 5Ecg== X-Gm-Message-State: AJIora/FmvGn7ydhX8VcgKzguWzpFzQt+9UfhI0+682IvrIdNZEtHtWB ZhgxMoQCnVfYDbDST9ieYYZcApXtZe+3SrH2WRvPMZ5tEL6o1mf7XKR0rTujokL8T6MEWUlNCXc UAajwhowWULTIdYPFRVvhL435OgoZvCNZ8U+MJq87A1xrOZ8n4u/XTrC8ww1F6l3p6fY= X-Received: by 2002:a17:906:b6c7:b0:726:60aa:1b81 with SMTP id ec7-20020a170906b6c700b0072660aa1b81mr29815538ejb.383.1658223285068; Tue, 19 Jul 2022 02:34:45 -0700 (PDT) X-Google-Smtp-Source: AGRyM1srG0mkpDCIrGsS3STwph8ueVEuVvTEpt8uqIJzzL98NOxl5kFArkMEHbLuvgxVxtSQ4B8VBw== X-Received: by 2002:a17:906:b6c7:b0:726:60aa:1b81 with SMTP id ec7-20020a170906b6c700b0072660aa1b81mr29815519ejb.383.1658223284775; Tue, 19 Jul 2022 02:34:44 -0700 (PDT) Received: from goa-sendmail ([93.56.169.184]) by smtp.gmail.com with ESMTPSA id t4-20020a1709067c0400b0072124df085bsm6642118ejo.15.2022.07.19.02.34.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jul 2022 02:34:44 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Subject: [PULL 3/3] util: Fix broken build on Haiku Date: Tue, 19 Jul 2022 11:34:39 +0200 Message-Id: <20220719093439.528810-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220719093439.528810-1-pbonzini@redhat.com> References: <20220719093439.528810-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PP_MIME_FAKE_ASCII_TEXT=0.999, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth A recent commit moved some Haiku-specific code parts from oslib-posix.c to cutils.c, but failed to move the corresponding header #include statement, too, so "make vm-build-haiku.x86_64" is currently broken. Fix it by moving the header #include, too. Fixes: 06680b15b4 ("include: move qemu_*_exec_dir() to cutils") Signed-off-by: Thomas Huth Reviewed-by: Marc-André Lureau Message-Id: <20220718172026.139004-1-thuth@redhat.com> Signed-off-by: Paolo Bonzini --- util/cutils.c | 4 ++++ util/oslib-posix.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/util/cutils.c b/util/cutils.c index 8199dac598..cb43dda213 100644 --- a/util/cutils.c +++ b/util/cutils.c @@ -35,6 +35,10 @@ #include #endif +#ifdef __HAIKU__ +#include +#endif + #ifdef G_OS_WIN32 #include #include diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 7a34c1657c..bffec18869 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -62,10 +62,6 @@ #include #endif -#ifdef __HAIKU__ -#include -#endif - #include "qemu/mmap-alloc.h" #ifdef CONFIG_DEBUG_STACK_USAGE