From nobody Mon Feb 9 16:02:15 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605895872; cv=none; d=zohomail.com; s=zohoarc; b=If7pv69zDvNZYl6U51S8VcmvbrugUyiN+3CuLYw3uyQ/DFULACUw3xOkqOCFqZkWpvxoqq0Nj9GZWBdEb9tp594zH5SaN1r9jaHQrOzOy6kEKfCwPbiBVE8t1CcajTb71hPQrQbxToG59wojJdMMSjcrPybfVDz525eQVGpukEY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605895872; 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=FfMafpB62N/57DQYWf5ozdzxwOFvFjV5qofDokTTz0w=; b=FlJlnS0LhSTvYtEwyyzBdedxdoMCZLsz8GxV56tWLeY9yDJ9lzxSbQ7UeO/y0CfOGkxqgj/fL5HnhtBaKAYEXUSAOFbzDVg871wBg0HsxXrAihNHaQ1EXEFjcXy8wkVnaTlmgokjn/SlumVtjGNvsTwjL1QivH5OAaJT/K/gBsk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1605895872033998.4274636927023; Fri, 20 Nov 2020 10:11:12 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-327-9OaOn3N5On-txtcFz4J06w-1; Fri, 20 Nov 2020 13:11:07 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F3FB9801B19; Fri, 20 Nov 2020 18:11:00 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CE7AB10013C0; Fri, 20 Nov 2020 18:11:00 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9AA2A1809C9F; Fri, 20 Nov 2020 18:11:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0AKIAxqJ010613 for ; Fri, 20 Nov 2020 13:10:59 -0500 Received: by smtp.corp.redhat.com (Postfix) id EB3BA60C5F; Fri, 20 Nov 2020 18:10:59 +0000 (UTC) Received: from localhost (unknown [10.36.110.42]) by smtp.corp.redhat.com (Postfix) with ESMTP id EDE1960C4D; Fri, 20 Nov 2020 18:10:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605895870; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=FfMafpB62N/57DQYWf5ozdzxwOFvFjV5qofDokTTz0w=; b=KHqx410DKoz8rXe2mk0qycqgCXrNTWe4bAxXqv9eA3K2Pn5idlgZIXA12PxfAQPLOwAEBx hsj+34+XQMCCH9IGz0k/bPTvn5RuRdh6MWVBet3CSv689Ol6EefGk2lXx12VsuWsWKe8+J sIRbkyx/p0a69ivkTw1Xb622BRfIBdc= X-MC-Unique: 9OaOn3N5On-txtcFz4J06w-1 From: marcandre.lureau@redhat.com To: libvir-list@redhat.com Subject: [libvirt PATCH 6/9] qemu_agent: add qemuAgentGetDisks Date: Fri, 20 Nov 2020 22:09:45 +0400 Message-Id: <20201120180948.203254-7-marcandre.lureau@redhat.com> In-Reply-To: <20201120180948.203254-1-marcandre.lureau@redhat.com> References: <20201120180948.203254-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?Michal=20Pr=C3=ADvozn=C3=ADk?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau guest-get-disks is available since QEMU 5.2: https://wiki.qemu.org/ChangeLog/5.2#Guest_agent Note that the test response was manually edited based on a reply on my bare-metal computer. It shows partial results due to pcieport driver not being currently supported by QGA. Signed-off-by: Marc-Andr=C3=A9 Lureau --- src/qemu/qemu_agent.c | 91 ++++++++++++++++++++++++++++++++++ src/qemu/qemu_agent.h | 15 ++++++ tests/qemuagenttest.c | 111 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 217 insertions(+) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 31f26eedd1..8698e5cfaf 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1827,6 +1827,21 @@ qemuAgentDiskAddressFree(qemuAgentDiskAddressPtr inf= o) g_free(info); } =20 + +void +qemuAgentDiskInfoFree(qemuAgentDiskInfoPtr info) +{ + if (!info) + return; + + g_free(info->name); + g_strfreev(info->dependencies); + qemuAgentDiskAddressFree(info->address); + g_free(info->alias); + g_free(info); +} + + void qemuAgentFSInfoFree(qemuAgentFSInfoPtr info) { @@ -2640,3 +2655,79 @@ qemuAgentSSHRemoveAuthorizedKeys(qemuAgentPtr agent, =20 return qemuAgentCommand(agent, cmd, &reply, agent->timeout); } + + +int qemuAgentGetDisks(qemuAgentPtr agent, + qemuAgentDiskInfoPtr **disks, + bool report_unsupported) +{ + g_autoptr(virJSONValue) cmd =3D NULL; + g_autoptr(virJSONValue) reply =3D NULL; + virJSONValuePtr data =3D NULL; + size_t ndata; + size_t i; + + if (!(cmd =3D qemuAgentMakeCommand("guest-get-disks", NULL))) + return -1; + + if (qemuAgentCommandFull(agent, cmd, &reply, agent->timeout, + report_unsupported) < 0) + return -1; + + if (!(data =3D virJSONValueObjectGetArray(reply, "return"))) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("qemu agent didn't return an array of disks")); + return -1; + } + + ndata =3D virJSONValueArraySize(data); + + *disks =3D g_new0(qemuAgentDiskInfoPtr, ndata); + + for (i =3D 0; i < ndata; i++) { + virJSONValuePtr addr; + virJSONValuePtr entry =3D virJSONValueArrayGet(data, i); + qemuAgentDiskInfoPtr disk; + + if (!entry) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("array element missing in guest-get-disks ret= urn " + "value")); + goto error; + } + + disk =3D g_new0(qemuAgentDiskInfo, 1); + (*disks)[i] =3D disk; + + disk->name =3D g_strdup(virJSONValueObjectGetString(entry, "name")= ); + if (!disk->name) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("'name' missing in reply of guest-get-disks")= ); + goto error; + } + + if (virJSONValueObjectGetBoolean(entry, "partition", &disk->partit= ion) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("'partition' missing in reply of guest-get-di= sks")); + goto error; + } + + disk->dependencies =3D virJSONValueObjectGetStringArray(entry, "de= pendencies"); + disk->alias =3D g_strdup(virJSONValueObjectGetString(entry, "alias= ")); + addr =3D virJSONValueObjectGetObject(entry, "address"); + if (addr) { + disk->address =3D qemuAgentGetDiskAddress(addr); + if (!disk->address) + goto error; + } + } + + return ndata; + + error: + for (i =3D 0; i < ndata; i++) { + qemuAgentDiskInfoFree((*disks)[i]); + } + g_free(*disks); + return -1; +} diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index 62d68b165a..74f1410760 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -81,6 +81,17 @@ struct _qemuAgentDiskAddress { void qemuAgentDiskAddressFree(qemuAgentDiskAddressPtr addr); G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuAgentDiskAddress, qemuAgentDiskAddressFr= ee); =20 +typedef struct _qemuAgentDiskInfo qemuAgentDiskInfo; +typedef qemuAgentDiskInfo *qemuAgentDiskInfoPtr; +struct _qemuAgentDiskInfo { + char *name; + bool partition; + char **dependencies; + qemuAgentDiskAddressPtr address; + char *alias; +}; +void qemuAgentDiskInfoFree(qemuAgentDiskInfoPtr info); + typedef struct _qemuAgentFSInfo qemuAgentFSInfo; typedef qemuAgentFSInfo *qemuAgentFSInfoPtr; struct _qemuAgentFSInfo { @@ -187,3 +198,7 @@ int qemuAgentSSHRemoveAuthorizedKeys(qemuAgentPtr agent, const char *user, const char **keys, size_t nkeys); + +int qemuAgentGetDisks(qemuAgentPtr mon, + qemuAgentDiskInfoPtr **disks, + bool report_unsupported); diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index 47ff92733a..bf295496e1 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -1022,6 +1022,116 @@ testQemuAgentGetInterfaces(const void *data) return ret; } =20 + +/* this is a bit of a pathological response on a real hw */ +static const char testQemuAgentGetDisksResponse[] =3D + "{\"return\": " + " [" + " {\"alias\" : \"fedora_localhost--live-home\"," + " \"dependencies\" : " + " [" + " \"/dev/dm-0\"" + " ]," + " \"name\" : \"/dev/dm-3\"," + " \"partition\" : false" + " }," + " {\"address\" : " + " {\"bus\" : 0," + " \"bus-type\" : \"unknown\"," + " \"dev\" : \"/dev/nvme0n1\"," + " \"pci-controller\" : " + " {\"bus\" : -1," + " \"domain\" : -1," + " \"function\" : -1," + " \"slot\" : -1" + " }," + " \"serial\" : \"GIGABYTE GP-ASM2NE6100TTTD_SN202208900567\"," + " \"target\" : 0," + " \"unit\" : 0" + " }," + " \"dependencies\" : []," + " \"name\" : \"/dev/nvme0n1\"," + " \"partition\" : false" + " }" + " ]" + "}"; + +static int +testQemuAgentGetDisks(const void *data) +{ + virDomainXMLOptionPtr xmlopt =3D (virDomainXMLOptionPtr)data; + qemuMonitorTestPtr test =3D qemuMonitorTestNewAgent(xmlopt); + size_t i; + int ret =3D -1; + int disks_count =3D 0; + qemuAgentDiskInfoPtr *disks =3D NULL; + + if (!test) + return -1; + + if (qemuMonitorTestAddAgentSyncResponse(test) < 0) + goto cleanup; + + if (qemuMonitorTestAddItem(test, "guest-get-disks", + testQemuAgentGetDisksResponse) < 0) + goto cleanup; + + if ((disks_count =3D qemuAgentGetDisks(qemuMonitorTestGetAgent(test), + &disks, true)) < 0) + goto cleanup; + + if (disks_count !=3D 2) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "expected 2 disks, got %d", ret); + goto cleanup; + } + + if (STRNEQ(disks[0]->name, "/dev/dm-3") || + STRNEQ(disks[1]->name, "/dev/nvme0n1")) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + "unexpected return values for disks names"); + goto cleanup; + } + + if (STRNEQ(disks[0]->alias, "fedora_localhost--live-home") || + disks[1]->alias !=3D NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + "unexpected return values for disks aliases"); + goto cleanup; + } + + if (STRNEQ(disks[0]->dependencies[0], "/dev/dm-0") || + disks[0]->dependencies[1] !=3D NULL || + disks[1]->dependencies[0] !=3D NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + "unexpected return values for disks dependencies"); + goto cleanup; + } + + if (disks[0]->address !=3D NULL || + disks[1]->address->bus !=3D 0 || + disks[1]->address->target !=3D 0 || + disks[1]->address->unit !=3D 0 || + STRNEQ(disks[1]->address->serial, "GIGABYTE GP-ASM2NE6100TTTD_SN20= 2208900567") || + STRNEQ(disks[1]->address->bus_type, "unknown")) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + "unexpected return values for disks addresses"); + goto cleanup; + } + ret =3D 0; + + cleanup: + qemuMonitorTestFree(test); + if (disks) { + for (i =3D 0; i < disks_count; i++) + qemuAgentDiskInfoFree(disks[i]); + } + VIR_FREE(disks); + + return ret; +} + + static const char testQemuAgentUsersResponse[] =3D "{\"return\": " " [" @@ -1394,6 +1504,7 @@ mymain(void) DO_TEST(OSInfo); DO_TEST(Timezone); DO_TEST(SSHKeys); + DO_TEST(GetDisks); =20 DO_TEST(Timeout); /* Timeout should always be called last */ =20 --=20 2.29.0