From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E987CC43459 for ; Mon, 27 Jul 2020 23:30:46 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 9DD0620809 for ; Mon, 27 Jul 2020 23:30:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cPt5tBV1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9DD0620809 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.vnet.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0CZx-0002ug-Pw for qemu-devel@archiver.kernel.org; Mon, 27 Jul 2020 19:30:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0CYn-0001yL-8R for qemu-devel@nongnu.org; Mon, 27 Jul 2020 19:29:33 -0400 Received: from mail-oi1-x243.google.com ([2607:f8b0:4864:20::243]:40917) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k0CYl-00072Z-3L for qemu-devel@nongnu.org; Mon, 27 Jul 2020 19:29:33 -0400 Received: by mail-oi1-x243.google.com with SMTP id u24so5975805oiv.7 for ; Mon, 27 Jul 2020 16:29:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:mime-version:content-transfer-encoding:to:from:in-reply-to :cc:references:message-id:user-agent:subject:date; bh=2zTbT1c8RQz7EFp+E6ifuseSTFkFYhdYFyXEHXYlg3Y=; b=cPt5tBV11KRby0O9CW1hl3aD2/kZDkDjEEn2k7alAZPuyJyGHtdpP3xcRnxrd+xyux hK7QyZrE83Db2xBAA58HaqhmezcBK7OJp+a6+30IkUa7LunAcQ3ft6PwDMLbrIxGwdjE q600BS/Q/4fNIIOZb8fESQYciTLZOVZZp4aMGkfb3PkswCllAIDuvMDqtQUsSLO2ldgi DLIvbcvVayG4860DU7jyvRPi75p22+ITqJh4NFbsdnXRn/I5p8nVmnszTG8g5642Ab3w cOhewhKDsz/F6lCJ7G55ZO0xkt2GTZRXNaVgco0xckSWMLpMgWw7lYOKJxbhz4DZZAZn 1WEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:mime-version:content-transfer-encoding:to :from:in-reply-to:cc:references:message-id:user-agent:subject:date; bh=2zTbT1c8RQz7EFp+E6ifuseSTFkFYhdYFyXEHXYlg3Y=; b=dBxiFJvUYcUGegmLdB3/570Xce3GJ8BdUlUVga+RbpKCnCCmFEBMWUBawdScX/jXxy 7OIsuzn+5zA9vb0Ok21XmXggPIRy66sMU+HH7SrKFYap2+Bzm9XbGNF41+ZXdbtz2PKz kAMwLW1CiAAkFpwcWwCLDwbYdh9zlmsHRPvchDNFiPLUQvFl9rmuSjEb6SJDiQj6UbPz KDtZ2bQxph/z/uCB9Ta7Up+rU9k/l/89+vcXG1xsDKYk8wGCeZFX5aUGclExnla+rhyF 4ADrQBbhCLSHvLZSSqbODseFyKole/dUm+0gntZt3AardHtTfq5l2o6m87+HwG/UyNv2 hY/A== X-Gm-Message-State: AOAM530itsARgYxLaCTd/aiZizydNziz9Y+wKdk+sTGNeN6Tan9aWWdL 1MAjjz2Tv/o3DUBFuEXkfbU= X-Google-Smtp-Source: ABdhPJzX1yTsorFGQUHOwaouwfUgRqtJ4BWpelbGsRwb00wfUEi4li1GCdvS2UxF/bFfJ26CdRNF1Q== X-Received: by 2002:aca:af04:: with SMTP id y4mr1363226oie.116.1595892569717; Mon, 27 Jul 2020 16:29:29 -0700 (PDT) Received: from localhost (76-251-165-188.lightspeed.austtx.sbcglobal.net. [76.251.165.188]) by smtp.gmail.com with ESMTPSA id b3sm2739937ooa.27.2020.07.27.16.29.28 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 27 Jul 2020 16:29:28 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: =?utf-8?b?VG9tw6HFoSBHb2xlbWJpb3Zza8O9?= , qemu-devel@nongnu.org From: Michael Roth In-Reply-To: <24edfdd5ff980abc0b66889246d88ab25ebee1fa.1595345951.git.tgolembi@redhat.com> References: <24edfdd5ff980abc0b66889246d88ab25ebee1fa.1595345951.git.tgolembi@redhat.com> Message-ID: <159589241423.31322.6114708218752861676@sif> User-Agent: alot/0.7 Subject: Re: [PATCH v10] qga: add command guest-get-devices for reporting VirtIO devices Date: Mon, 27 Jul 2020 18:26:54 -0500 Received-SPF: pass client-ip=2607:f8b0:4864:20::243; envelope-from=flukshun@gmail.com; helo=mail-oi1-x243.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?b?VG9tw6HFoSBHb2xlbWJpb3Zza8O9?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Quoting Tom=C3=A1=C5=A1 Golembiovsk=C3=BD (2020-07-21 10:40:41) > Add command for reporting devices on Windows guest. The intent is not so > much to report the devices but more importantly the driver (and its > version) that is assigned to the device. This gives caller the > information whether VirtIO drivers are installed and/or whether > inadequate driver is used on a device (e.g. QXL device with base VGA > driver). > = > Example: > [ > { > "driver-date": "2019-08-12", > "driver-name": "Red Hat VirtIO SCSI controller", > "driver-version": "100.80.104.17300", > "address": { > "type": "pci", > "data": { > "device-id": 4162, > "vendor-id": 6900 > } > } > }, > ... > ] > = > Signed-off-by: Tom=C3=A1=C5=A1 Golembiovsk=C3=BD > Reviewed-by: Marc-Andr=C3=A9 Lureau > Reviewed-by: Philippe Mathieu-Daud=C3=A9 Thanks, applied to qga-staging tree for 5.2: https://github.com/mdroth/qemu/commits/qga-staging Sorry for the delays in processing this. > --- > = > Changes in v10: > - rebased to current master > - changed `since` tag in schema to 5.2 > = > qga/commands-posix.c | 9 ++ > qga/commands-win32.c | 212 ++++++++++++++++++++++++++++++++++++++++++- > qga/qapi-schema.json | 51 +++++++++++ > 3 files changed, 271 insertions(+), 1 deletion(-) > = > diff --git a/qga/commands-posix.c b/qga/commands-posix.c > index 1a62a3a70d..f509a1f525 100644 > --- a/qga/commands-posix.c > +++ b/qga/commands-posix.c > @@ -2761,6 +2761,8 @@ GList *ga_command_blacklist_init(GList *blacklist) > blacklist =3D g_list_append(blacklist, g_strdup("guest-fstrim")); > #endif > = > + blacklist =3D g_list_append(blacklist, g_strdup("guest-get-devices")= ); > + > return blacklist; > } > = > @@ -2981,3 +2983,10 @@ GuestOSInfo *qmp_guest_get_osinfo(Error **errp) > = > return info; > } > + > +GuestDeviceInfoList *qmp_guest_get_devices(Error **errp) > +{ > + error_setg(errp, QERR_UNSUPPORTED); > + > + return NULL; > +} > diff --git a/qga/commands-win32.c b/qga/commands-win32.c > index aaa71f147b..1302bae9eb 100644 > --- a/qga/commands-win32.c > +++ b/qga/commands-win32.c > @@ -21,10 +21,11 @@ > #ifdef CONFIG_QGA_NTDDSCSI > #include > #include > +#endif > #include > #include > #include > -#endif > +#include > #include > #include > #include > @@ -39,6 +40,36 @@ > #include "qemu/base64.h" > #include "commands-common.h" > = > +/* > + * The following should be in devpkey.h, but it isn't. The key names were > + * prefixed to avoid (future) name clashes. Once the definitions get into > + * mingw the following lines can be removed. > + */ > +DEFINE_DEVPROPKEY(qga_DEVPKEY_NAME, 0xb725f130, 0x47ef, 0x101a, 0xa5, > + 0xf1, 0x02, 0x60, 0x8c, 0x9e, 0xeb, 0xac, 10); > + /* DEVPROP_TYPE_STRING */ > +DEFINE_DEVPROPKEY(qga_DEVPKEY_Device_HardwareIds, 0xa45c254e, 0xdf1c, > + 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 3); > + /* DEVPROP_TYPE_STRING_LIST */ > +DEFINE_DEVPROPKEY(qga_DEVPKEY_Device_DriverDate, 0xa8b865dd, 0x2e3d, > + 0x4094, 0xad, 0x97, 0xe5, 0x93, 0xa7, 0xc, 0x75, 0xd6, 2); > + /* DEVPROP_TYPE_FILETIME */ > +DEFINE_DEVPROPKEY(qga_DEVPKEY_Device_DriverVersion, 0xa8b865dd, 0x2e3d, > + 0x4094, 0xad, 0x97, 0xe5, 0x93, 0xa7, 0xc, 0x75, 0xd6, 3); > + /* DEVPROP_TYPE_STRING */ > +/* The following shoud be in cfgmgr32.h, but it isn't */ > +#ifndef CM_Get_DevNode_Property > +CMAPI CONFIGRET WINAPI CM_Get_DevNode_PropertyW( > + DEVINST dnDevInst, > + CONST DEVPROPKEY * PropertyKey, > + DEVPROPTYPE * PropertyType, > + PBYTE PropertyBuffer, > + PULONG PropertyBufferSize, > + ULONG ulFlags > +); > +#define CM_Get_DevNode_Property CM_Get_DevNode_PropertyW > +#endif > + > #ifndef SHTDN_REASON_FLAG_PLANNED > #define SHTDN_REASON_FLAG_PLANNED 0x80000000 > #endif > @@ -93,6 +124,8 @@ static OpenFlags guest_file_open_modes[] =3D { > g_free(suffix); \ > } while (0) > = > +G_DEFINE_AUTOPTR_CLEANUP_FUNC(GuestDeviceInfo, qapi_free_GuestDeviceInfo) > + > static OpenFlags *find_open_flag(const char *mode_str) > { > int mode; > @@ -2229,3 +2262,180 @@ GuestOSInfo *qmp_guest_get_osinfo(Error **errp) > = > return info; > } > + > +/* > + * Safely get device property. Returned strings are using wide character= s. > + * Caller is responsible for freeing the buffer. > + */ > +static LPBYTE cm_get_property(DEVINST devInst, const DEVPROPKEY *propNam= e, > + PDEVPROPTYPE propType) > +{ > + CONFIGRET cr; > + g_autofree LPBYTE buffer =3D NULL; > + ULONG buffer_len =3D 0; > + > + /* First query for needed space */ > + cr =3D CM_Get_DevNode_PropertyW(devInst, propName, propType, > + buffer, &buffer_len, 0); > + if (cr !=3D CR_SUCCESS && cr !=3D CR_BUFFER_SMALL) { > + > + slog("failed to get property size, error=3D0x%lx", cr); > + return NULL; > + } > + buffer =3D g_new0(BYTE, buffer_len + 1); > + cr =3D CM_Get_DevNode_PropertyW(devInst, propName, propType, > + buffer, &buffer_len, 0); > + if (cr !=3D CR_SUCCESS) { > + slog("failed to get device property, error=3D0x%lx", cr); > + return NULL; > + } > + return g_steal_pointer(&buffer); > +} > + > +static GStrv ga_get_hardware_ids(DEVINST devInstance) > +{ > + GArray *values =3D NULL; > + DEVPROPTYPE cm_type; > + LPWSTR id; > + g_autofree LPWSTR property =3D (LPWSTR)cm_get_property(devInstance, > + &qga_DEVPKEY_Device_HardwareIds, &cm_type); > + if (property =3D=3D NULL) { > + slog("failed to get hardware IDs"); > + return NULL; > + } > + if (*property =3D=3D '\0') { > + /* empty list */ > + return NULL; > + } > + values =3D g_array_new(TRUE, TRUE, sizeof(gchar *)); > + for (id =3D property; '\0' !=3D *id; id +=3D lstrlenW(id) + 1) { > + gchar *id8 =3D g_utf16_to_utf8(id, -1, NULL, NULL, NULL); > + g_array_append_val(values, id8); > + } > + return (GStrv)g_array_free(values, FALSE); > +} > + > +/* > + * https://docs.microsoft.com/en-us/windows-hardware/drivers/install/ide= ntifiers-for-pci-devices > + */ > +#define DEVICE_PCI_RE "PCI\\\\VEN_(1AF4|1B36)&DEV_([0-9A-B]{4})(&|$)" > + > +GuestDeviceInfoList *qmp_guest_get_devices(Error **errp) > +{ > + GuestDeviceInfoList *head =3D NULL, *cur_item =3D NULL, *item =3D NU= LL; > + HDEVINFO dev_info =3D INVALID_HANDLE_VALUE; > + SP_DEVINFO_DATA dev_info_data; > + int i, j; > + GError *gerr =3D NULL; > + g_autoptr(GRegex) device_pci_re =3D NULL; > + DEVPROPTYPE cm_type; > + > + device_pci_re =3D g_regex_new(DEVICE_PCI_RE, > + G_REGEX_ANCHORED | G_REGEX_OPTIMIZE, 0, > + &gerr); > + g_assert(device_pci_re !=3D NULL); > + > + dev_info_data.cbSize =3D sizeof(SP_DEVINFO_DATA); > + dev_info =3D SetupDiGetClassDevs(0, 0, 0, DIGCF_PRESENT | DIGCF_ALLC= LASSES); > + if (dev_info =3D=3D INVALID_HANDLE_VALUE) { > + error_setg(errp, "failed to get device tree"); > + return NULL; > + } > + > + slog("enumerating devices"); > + for (i =3D 0; SetupDiEnumDeviceInfo(dev_info, i, &dev_info_data); i+= +) { > + bool skip =3D true; > + SYSTEMTIME utc_date; > + g_autofree LPWSTR name =3D NULL; > + g_autofree LPFILETIME date =3D NULL; > + g_autofree LPWSTR version =3D NULL; > + g_auto(GStrv) hw_ids =3D NULL; > + g_autoptr(GuestDeviceInfo) device =3D g_new0(GuestDeviceInfo, 1); > + g_autofree char *vendor_id =3D NULL; > + g_autofree char *device_id =3D NULL; > + > + name =3D (LPWSTR)cm_get_property(dev_info_data.DevInst, > + &qga_DEVPKEY_NAME, &cm_type); > + if (name =3D=3D NULL) { > + slog("failed to get device description"); > + continue; > + } > + device->driver_name =3D g_utf16_to_utf8(name, -1, NULL, NULL, NU= LL); > + if (device->driver_name =3D=3D NULL) { > + error_setg(errp, "conversion to utf8 failed (driver name)"); > + continue; > + } > + slog("querying device: %s", device->driver_name); > + hw_ids =3D ga_get_hardware_ids(dev_info_data.DevInst); > + if (hw_ids =3D=3D NULL) { > + continue; > + } > + for (j =3D 0; hw_ids[j] !=3D NULL; j++) { > + GMatchInfo *match_info; > + GuestDeviceAddressPCI *address; > + if (!g_regex_match(device_pci_re, hw_ids[j], 0, &match_info)= ) { > + continue; > + } > + skip =3D false; > + > + address =3D g_new0(GuestDeviceAddressPCI, 1); > + vendor_id =3D g_match_info_fetch(match_info, 1); > + device_id =3D g_match_info_fetch(match_info, 2); > + address->vendor_id =3D g_ascii_strtoull(vendor_id, NULL, 16); > + address->device_id =3D g_ascii_strtoull(device_id, NULL, 16); > + > + device->address =3D g_new0(GuestDeviceAddress, 1); > + device->has_address =3D true; > + device->address->type =3D GUEST_DEVICE_ADDRESS_KIND_PCI; > + device->address->u.pci.data =3D address; > + > + g_match_info_free(match_info); > + break; > + } > + if (skip) { > + continue; > + } > + > + version =3D (LPWSTR)cm_get_property(dev_info_data.DevInst, > + &qga_DEVPKEY_Device_DriverVersion, &cm_type); > + if (version =3D=3D NULL) { > + slog("failed to get driver version"); > + continue; > + } > + device->driver_version =3D g_utf16_to_utf8(version, -1, NULL, > + NULL, NULL); > + if (device->driver_version =3D=3D NULL) { > + error_setg(errp, "conversion to utf8 failed (driver version)= "); > + continue; > + } > + device->has_driver_version =3D true; > + > + date =3D (LPFILETIME)cm_get_property(dev_info_data.DevInst, > + &qga_DEVPKEY_Device_DriverDate, &cm_type); > + if (date =3D=3D NULL) { > + slog("failed to get driver date"); > + continue; > + } > + FileTimeToSystemTime(date, &utc_date); > + device->driver_date =3D g_strdup_printf("%04d-%02d-%02d", > + utc_date.wYear, utc_date.wMonth, utc_date.wDay); > + device->has_driver_date =3D true; > + > + slog("driver: %s\ndriver version: %s,%s\n", device->driver_name, > + device->driver_date, device->driver_version); > + item =3D g_new0(GuestDeviceInfoList, 1); > + item->value =3D g_steal_pointer(&device); > + if (!cur_item) { > + head =3D cur_item =3D item; > + } else { > + cur_item->next =3D item; > + cur_item =3D item; > + } > + continue; > + } > + > + if (dev_info !=3D INVALID_HANDLE_VALUE) { > + SetupDiDestroyDeviceInfoList(dev_info); > + } > + return head; > +} > diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json > index 4be9aad48e..a1ebe1e91b 100644 > --- a/qga/qapi-schema.json > +++ b/qga/qapi-schema.json > @@ -1252,3 +1252,54 @@ > ## > { 'command': 'guest-get-osinfo', > 'returns': 'GuestOSInfo' } > + > +## > +# @GuestDeviceAddressPCI: > +# > +# @vendor-id: vendor ID > +# @device-id: device ID > +# > +# Since: 5.2 > +## > +{ 'struct': 'GuestDeviceAddressPCI', > + 'data': { 'vendor-id': 'uint16', 'device-id': 'uint16' } } > + > +## > +# @GuestDeviceAddress: > +# > +# Address of the device > +# - @pci: address of PCI device, since: 5.2 > +# > +# Since: 5.2 > +## > +{ 'union': 'GuestDeviceAddress', > + 'data': { 'pci': 'GuestDeviceAddressPCI' } } > + > +## > +# @GuestDeviceInfo: > +# > +# @driver-name: name of the associated driver > +# @driver-date: driver release date in format YYYY-MM-DD > +# @driver-version: driver version > +# > +# Since: 5.2 > +## > +{ 'struct': 'GuestDeviceInfo', > + 'data': { > + 'driver-name': 'str', > + '*driver-date': 'str', > + '*driver-version': 'str', > + '*address': 'GuestDeviceAddress' > + } } > + > +## > +# @guest-get-devices: > +# > +# Retrieve information about device drivers in Windows guest > +# > +# Returns: @GuestDeviceInfo > +# > +# Since: 5.2 > +## > +{ 'command': 'guest-get-devices', > + 'returns': ['GuestDeviceInfo'] } > -- = > 2.25.0 >=20