From nobody Fri May 17 03:39:45 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=1653335185; cv=none; d=zohomail.com; s=zohoarc; b=nKekyAxuNXdRIqgMqnBoSf3pM6rRB1ErNFddI0CrsDI5YubaWTYlSp28w0XoS+dRTZAFUulIZIQKXgTsOi/oJHXBxfYRyAuLcB4D49AYAkoyRHO2IodWg8EuLLs3qLSEIqUvG+qgMJ5j0+pgl1rSvGuP0meGGa3raaa+l/65YdU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653335185; h=Content-Type: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=YWigOFJrlEduonZrYMWPYmu18zsnVV2tvQpOnvR3f4I=; b=hiIHnS8c9fCY3c5D+OwRe3+768D0GOYFpRkdyUSwlOuO1/5e9ItuuvhxIsh3BXmSQYpbw+SYpnyXeZ9e+GJDuyr38Hpb+ASW+bGq0ND8mnc03S3ITCObUx2svXFPHr1cjh0lDelZLhJ5WNfunwZtiIS28DmLPzNNMCVBbZMxw3c= 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 1653335185453264.3147371057098; Mon, 23 May 2022 12:46:25 -0700 (PDT) Received: from localhost ([::1]:37044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ntE0W-0004fc-CK for importer@patchew.org; Mon, 23 May 2022 15:46:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57828) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntDvg-0004zs-22 for qemu-devel@nongnu.org; Mon, 23 May 2022 15:41:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:46540) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntDvc-0003MM-9O for qemu-devel@nongnu.org; Mon, 23 May 2022 15:41:23 -0400 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-320-8rTqOWVMP-2NNTCr5rnrFQ-1; Mon, 23 May 2022 15:41:15 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 57A6D101A52C; Mon, 23 May 2022 19:41:15 +0000 (UTC) Received: from kostyanf14nb.redhat.com (unknown [10.40.195.86]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 514452026D6A; Mon, 23 May 2022 19:41:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653334879; 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=YWigOFJrlEduonZrYMWPYmu18zsnVV2tvQpOnvR3f4I=; b=DdSrJNo+XNmniCNZVFM70SBs9oe/PLcwNLr11IBKQEiH2vube9SyucTsNKYR3lCCQu/CL0 lQz1kjKfScD40Fdh7RtdGhzfca7j1nQ5j8X5YdhN5NtycoEFf2K2SZixv7ZHjQaB1Xd75/ xS1FTUBA32uhk7WcW2WL/M3Nk0FvAfw= X-MC-Unique: 8rTqOWVMP-2NNTCr5rnrFQ-1 From: Konstantin Kostiuk To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 1/3] qga: add guest-get-diskstats command for Linux guests Date: Mon, 23 May 2022 22:41:09 +0300 Message-Id: <20220523194111.827805-2-kkostiuk@redhat.com> In-Reply-To: <20220523194111.827805-1-kkostiuk@redhat.com> References: <20220523194111.827805-1-kkostiuk@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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=kkostiuk@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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1653335187201100001 From: luzhipeng Add a new 'guest-get-diskstats' command for report disk io statistics for Linux guests. This can be useful for getting io flow or handling IO fault, no need to enter guests. Signed-off-by: luzhipeng Message-Id: <20220520021935.676-1-luzhipeng@cestc.cn> Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Konstantin Kostiuk Signed-off-by: Konstantin Kostiuk --- qga/commands-posix.c | 123 +++++++++++++++++++++++++++++++++++++++++++ qga/commands-win32.c | 6 +++ qga/qapi-schema.json | 86 ++++++++++++++++++++++++++++++ 3 files changed, 215 insertions(+) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index 69f209af87..12b50b7124 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -2783,6 +2783,122 @@ GuestMemoryBlockInfo *qmp_guest_get_memory_block_in= fo(Error **errp) return info; } =20 +#define MAX_NAME_LEN 128 +static GuestDiskStatsInfoList *guest_get_diskstats(Error **errp) +{ +#ifdef CONFIG_LINUX + GuestDiskStatsInfoList *head =3D NULL, **tail =3D &head; + const char *diskstats =3D "/proc/diskstats"; + FILE *fp; + size_t n; + char *line =3D NULL; + + fp =3D fopen(diskstats, "r"); + if (fp =3D=3D NULL) { + error_setg_errno(errp, errno, "open(\"%s\")", diskstats); + return NULL; + } + + while (getline(&line, &n, fp) !=3D -1) { + g_autofree GuestDiskStatsInfo *diskstatinfo =3D NULL; + g_autofree GuestDiskStats *diskstat =3D NULL; + char dev_name[MAX_NAME_LEN]; + unsigned int ios_pgr, tot_ticks, rq_ticks, wr_ticks, dc_ticks, fl_= ticks; + unsigned long rd_ios, rd_merges_or_rd_sec, rd_ticks_or_wr_sec, wr_= ios; + unsigned long wr_merges, rd_sec_or_wr_ios, wr_sec; + unsigned long dc_ios, dc_merges, dc_sec, fl_ios; + unsigned int major, minor; + int i; + + i =3D sscanf(line, "%u %u %s %lu %lu %lu" + "%lu %lu %lu %lu %u %u %u %u" + "%lu %lu %lu %u %lu %u", + &major, &minor, dev_name, + &rd_ios, &rd_merges_or_rd_sec, &rd_sec_or_wr_ios, + &rd_ticks_or_wr_sec, &wr_ios, &wr_merges, &wr_sec, + &wr_ticks, &ios_pgr, &tot_ticks, &rq_ticks, + &dc_ios, &dc_merges, &dc_sec, &dc_ticks, + &fl_ios, &fl_ticks); + + if (i < 7) { + continue; + } + + diskstatinfo =3D g_new0(GuestDiskStatsInfo, 1); + diskstatinfo->name =3D g_strdup(dev_name); + diskstatinfo->major =3D major; + diskstatinfo->minor =3D minor; + + diskstat =3D g_new0(GuestDiskStats, 1); + if (i =3D=3D 7) { + diskstat->has_read_ios =3D true; + diskstat->read_ios =3D rd_ios; + diskstat->has_read_sectors =3D true; + diskstat->read_sectors =3D rd_merges_or_rd_sec; + diskstat->has_write_ios =3D true; + diskstat->write_ios =3D rd_sec_or_wr_ios; + diskstat->has_write_sectors =3D true; + diskstat->write_sectors =3D rd_ticks_or_wr_sec; + } + if (i >=3D 14) { + diskstat->has_read_ios =3D true; + diskstat->read_ios =3D rd_ios; + diskstat->has_read_sectors =3D true; + diskstat->read_sectors =3D rd_sec_or_wr_ios; + diskstat->has_read_merges =3D true; + diskstat->read_merges =3D rd_merges_or_rd_sec; + diskstat->has_read_ticks =3D true; + diskstat->read_ticks =3D rd_ticks_or_wr_sec; + diskstat->has_write_ios =3D true; + diskstat->write_ios =3D wr_ios; + diskstat->has_write_sectors =3D true; + diskstat->write_sectors =3D wr_sec; + diskstat->has_write_merges =3D true; + diskstat->write_merges =3D wr_merges; + diskstat->has_write_ticks =3D true; + diskstat->write_ticks =3D wr_ticks; + diskstat->has_ios_pgr =3D true; + diskstat->ios_pgr =3D ios_pgr; + diskstat->has_total_ticks =3D true; + diskstat->total_ticks =3D tot_ticks; + diskstat->has_weight_ticks =3D true; + diskstat->weight_ticks =3D rq_ticks; + } + if (i >=3D 18) { + diskstat->has_discard_ios =3D true; + diskstat->discard_ios =3D dc_ios; + diskstat->has_discard_merges =3D true; + diskstat->discard_merges =3D dc_merges; + diskstat->has_discard_sectors =3D true; + diskstat->discard_sectors =3D dc_sec; + diskstat->has_discard_ticks =3D true; + diskstat->discard_ticks =3D dc_ticks; + } + if (i >=3D 20) { + diskstat->has_flush_ios =3D true; + diskstat->flush_ios =3D fl_ios; + diskstat->has_flush_ticks =3D true; + diskstat->flush_ticks =3D fl_ticks; + } + + diskstatinfo->stats =3D g_steal_pointer(&diskstat); + QAPI_LIST_APPEND(tail, diskstatinfo); + diskstatinfo =3D NULL; + } + free(line); + fclose(fp); + return head; +#else + g_debug("disk stats reporting available only for Linux"); + return NULL; +#endif +} + +GuestDiskStatsInfoList *qmp_guest_get_diskstats(Error **errp) +{ + return guest_get_diskstats(errp); +} + #else /* defined(__linux__) */ =20 void qmp_guest_suspend_disk(Error **errp) @@ -3131,6 +3247,13 @@ GuestDiskInfoList *qmp_guest_get_disks(Error **errp) return NULL; } =20 +GuestDiskStatsInfoList *qmp_guest_get_diskstats(Error **errp) +{ + error_setg(errp, QERR_UNSUPPORTED); + return NULL; +} + + #endif /* CONFIG_FSFREEZE */ =20 #if !defined(CONFIG_FSTRIM) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index d56b5fd2a7..dcdeb76a68 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -2532,3 +2532,9 @@ char *qga_get_host_name(Error **errp) =20 return g_utf16_to_utf8(tmp, size, NULL, NULL, NULL); } + +GuestDiskStatsInfoList *qmp_guest_get_diskstats(Error **errp) +{ + error_setg(errp, QERR_UNSUPPORTED); + return NULL; +} diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json index f989597b0c..9fa20e791b 100644 --- a/qga/qapi-schema.json +++ b/qga/qapi-schema.json @@ -1490,3 +1490,89 @@ { 'command': 'guest-ssh-remove-authorized-keys', 'data': { 'username': 'str', 'keys': ['str'] }, 'if': 'CONFIG_POSIX' } + +## +# @GuestDiskStats: +# +# @read-sectors: sectors read +# +# @read-ios: reads completed successfully +# +# @read-merges: read requests merged +# +# @write-sectors: sectors written +# +# @write-ios: writes completed +# +# @write-merges: write requests merged +# +# @discard-sectors: sectors discarded +# +# @discard-ios: discards completed successfully +# +# @discard-merges: discard requests merged +# +# @flush-ios: flush requests completed successfully +# +# @read-ticks: time spent reading(ms) +# +# @write-ticks: time spent writing(ms) +# +# @discard-ticks: time spent discarding(ms) +# +# @flush-ticks: time spent flushing(ms) +# +# @ios-pgr: number of I/Os currently in flight +# +# @total-ticks: time spent doing I/Os (ms) +# +# @weight-ticks: weighted time spent doing I/Os since the last update of t= his field(ms) +# +# Since: 7.1 +## +{ 'struct': 'GuestDiskStats', + 'data': {'*read-sectors': 'uint64', + '*read-ios': 'uint64', + '*read-merges': 'uint64', + '*write-sectors': 'uint64', + '*write-ios': 'uint64', + '*write-merges': 'uint64', + '*discard-sectors': 'uint64', + '*discard-ios': 'uint64', + '*discard-merges': 'uint64', + '*flush-ios': 'uint64', + '*read-ticks': 'uint64', + '*write-ticks': 'uint64', + '*discard-ticks': 'uint64', + '*flush-ticks': 'uint64', + '*ios-pgr': 'uint64', + '*total-ticks': 'uint64', + '*weight-ticks': 'uint64' + } } + +## +# @GuestDiskStatsInfo: +# +# @name disk name +# +# @major major device number of disk +# +# @minor minor device number of disk +## +{ 'struct': 'GuestDiskStatsInfo', + 'data': {'name': 'str', + 'major': 'uint64', + 'minor': 'uint64', + 'stats': 'GuestDiskStats' } } + +## +# @guest-get-diskstats: +# +# Retrieve information about disk stats. +# Returns: List of disk stats of guest. +# +# Since: 7.1 +## +{ 'command': 'guest-get-diskstats', + 'returns': ['GuestDiskStatsInfo'] +} --=20 2.25.1 From nobody Fri May 17 03:39:45 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=1653335176; cv=none; d=zohomail.com; s=zohoarc; b=J87BbLhRu8NeRR/PNB57J9208MOhSOAaVdKOBaWXOBIBoE2HB6Yre3DnZq9PVFB6S/Krrm5W8PSPRkMy9aR0aFnPzB1wk/WJQ3b3Cu3C9SVch2bx6h6IFnaPknpz4fFvy9ujB2/Giq1yMiTXQsxfYd/+WsINEwhhtHmHRm/ByX8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653335176; h=Content-Type: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=HfktU04Bgnt1dq6XqXQIM2pd9sGHsvPCMZ7hDbcmybw=; b=VqXgO1pAJugoNv0IblYxEuu6t62jDuv20HQHErybAWtLDKWLl4khpnFMRhXl57qhJG5tMOsNDA/PxhmyDSw8yrCIYWB/rKEoOZdv2YkrppZit1/fPSzFtYpgJskAfLT22k9T8CzLMohXCCJsXySSe6a0W7dFyrfXhhs3ad/1fr4= 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 1653335176700929.8085392790775; Mon, 23 May 2022 12:46:16 -0700 (PDT) Received: from localhost ([::1]:36458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ntE0N-0004F7-Hq for importer@patchew.org; Mon, 23 May 2022 15:46:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntDve-0004zK-MG for qemu-devel@nongnu.org; Mon, 23 May 2022 15:41:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:59843) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntDvb-0003Lx-Q0 for qemu-devel@nongnu.org; Mon, 23 May 2022 15:41:22 -0400 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-62-1JyuyF6bPaKbGdq4BakJ7A-1; Mon, 23 May 2022 15:41:16 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 79B813831C44; Mon, 23 May 2022 19:41:16 +0000 (UTC) Received: from kostyanf14nb.redhat.com (unknown [10.40.195.86]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A80F82026D6A; Mon, 23 May 2022 19:41:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653334878; 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=HfktU04Bgnt1dq6XqXQIM2pd9sGHsvPCMZ7hDbcmybw=; b=ImOByC+dKnbnIe70dndLSK1jX+OUgvYJeSy2jGiLwUtsr5dAE6/vEQbbhzebnMiw6hGZi3 gIzptwLNj7pN2tU2PYS0+n8HsJrgZWrDAFfp40jtrbvlaZ3k4uNr2bEnAd2oZ01o8V+dW2 Mv1GUa10FP0ptRvScCCxiNDK6m0EKQU= X-MC-Unique: 1JyuyF6bPaKbGdq4BakJ7A-1 From: Konstantin Kostiuk To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 2/3] qga-win32: Add support for NVME but type Date: Mon, 23 May 2022 22:41:10 +0300 Message-Id: <20220523194111.827805-3-kkostiuk@redhat.com> In-Reply-To: <20220523194111.827805-1-kkostiuk@redhat.com> References: <20220523194111.827805-1-kkostiuk@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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=kkostiuk@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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1653335177125100001 Bus type spaces (Indicates a storage spaces bus) is not supported, so return it as unknown. Signed-off-by: Konstantin Kostiuk Message-Id: <20220520201401.706630-1-kkostiuk@redhat.com> Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Konstantin Kostiuk --- qga/commands-win32.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index dcdeb76a68..36f94c0f9c 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -490,6 +490,11 @@ static GuestDiskBusType win2qemu[] =3D { #if (_WIN32_WINNT >=3D 0x0601) [BusTypeVirtual] =3D GUEST_DISK_BUS_TYPE_VIRTUAL, [BusTypeFileBackedVirtual] =3D GUEST_DISK_BUS_TYPE_FILE_BACKED_VIRTUAL, + /* + * BusTypeSpaces currently is not suported + */ + [BusTypeSpaces] =3D GUEST_DISK_BUS_TYPE_UNKNOWN, + [BusTypeNvme] =3D GUEST_DISK_BUS_TYPE_NVME, #endif }; =20 --=20 2.25.1 From nobody Fri May 17 03:39:45 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=1653334999; cv=none; d=zohomail.com; s=zohoarc; b=EFPxXE4ZB1cppBJHum4CuZ+Z49UgG1G5wdTPsZ7/qUuQ1NADRLzzzwbcHAmwCqZzkcUldTyCFYz30TKwLoX5Ui0pSugOpfovnnjsqO7HzBx/pkn8f2o0gy2PyawiWTq3JkmpR4en2ADQbLT/zkqlNnybty9ICnHMsXxI+TazThI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653334999; h=Content-Type: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=zXUsowygGlCzKSIzdN9drLRthvVTBHDjSjGFLMVkY4Y=; b=HXzv45ff+j/fk1wGWMZ7MtLb1Zgz4YTkFNPnqfFF/xnyAYCdbMBkXklqgFzLymNXcQ+WtU6rEsmkjKij787uKfiMVEoAxvSQ/yq0SJZCBlqutBuyvTQWttBpkDTQZgKhs5I6eAzCpVOBXcZIhII3i0FnJBZGb5878nSOWRCsQ5I= 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 165333499972156.74831571988307; Mon, 23 May 2022 12:43:19 -0700 (PDT) Received: from localhost ([::1]:58074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ntDxW-0007ax-8h for importer@patchew.org; Mon, 23 May 2022 15:43:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntDve-0004zL-MP for qemu-devel@nongnu.org; Mon, 23 May 2022 15:41:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:53781) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ntDvc-0003MC-06 for qemu-devel@nongnu.org; Mon, 23 May 2022 15:41:22 -0400 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-327-gA4fXA3cMzWd0LbTSGB1dQ-1; Mon, 23 May 2022 15:41:18 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A6CEA1D3386A; Mon, 23 May 2022 19:41:17 +0000 (UTC) Received: from kostyanf14nb.redhat.com (unknown [10.40.195.86]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D9C072026D6A; Mon, 23 May 2022 19:41:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653334879; 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=zXUsowygGlCzKSIzdN9drLRthvVTBHDjSjGFLMVkY4Y=; b=g0He4QXS9qx8ntsH3JNfjfKE8GGErzzRMJP1naW+giep3ZcbhTEcjOeE1VZ4UchTqwBjde 7E2F4dKiN18LuXhLsz8EmlWUvRK4J7EbN+lrP5K7zwjDcdC3Pf3weVoDlc8Ah8zlOJowzZ zrWmHZS1hO1cND/ewLelnxbEhwAqrOc= X-MC-Unique: gA4fXA3cMzWd0LbTSGB1dQ-1 From: Konstantin Kostiuk To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 3/3] trivial: qga: Log version on start Date: Mon, 23 May 2022 22:41:11 +0300 Message-Id: <20220523194111.827805-4-kkostiuk@redhat.com> In-Reply-To: <20220523194111.827805-1-kkostiuk@redhat.com> References: <20220523194111.827805-1-kkostiuk@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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=kkostiuk@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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1653335001409100001 Signed-off-by: Konstantin Kostiuk Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20220523191644.823726-2-kkostiuk@redhat.com> Signed-off-by: Konstantin Kostiuk --- qga/main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qga/main.c b/qga/main.c index 3b9546c185..c373fec3ee 100644 --- a/qga/main.c +++ b/qga/main.c @@ -1271,6 +1271,8 @@ static GAState *initialize_agent(GAConfig *config, in= t socket_activation) g_log_set_fatal_mask(NULL, G_LOG_LEVEL_ERROR); ga_enable_logging(s); =20 + g_debug("Guest agent version %s started", QEMU_FULL_VERSION); + #ifdef _WIN32 /* On win32 the state directory is application specific (be it the def= ault * or a user override). We got past the command line parsing; let's cr= eate --=20 2.25.1