From nobody Thu Nov 6 12:13:09 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1540910828576217.3808746378695; Tue, 30 Oct 2018 07:47:08 -0700 (PDT) Received: from localhost ([::1]:53653 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHVIM-0000RK-AK for importer@patchew.org; Tue, 30 Oct 2018 10:47:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46196) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHVG8-0007VZ-Pr for qemu-devel@nongnu.org; Tue, 30 Oct 2018 10:44:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gHVG7-00009N-Kr for qemu-devel@nongnu.org; Tue, 30 Oct 2018 10:44:44 -0400 Received: from mail-qt1-x834.google.com ([2607:f8b0:4864:20::834]:44092) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gHVG7-0008Rg-Ak for qemu-devel@nongnu.org; Tue, 30 Oct 2018 10:44:43 -0400 Received: by mail-qt1-x834.google.com with SMTP id b22-v6so13703209qtr.11 for ; Tue, 30 Oct 2018 07:44:36 -0700 (PDT) Received: from localhost (76-251-165-188.lightspeed.austtx.sbcglobal.net. [76.251.165.188]) by smtp.gmail.com with ESMTPSA id h49-v6sm18065928qth.32.2018.10.30.07.44.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Oct 2018 07:44:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lJTCbkkBdols6F5fbem69Rs++cbtn/Hjin27UsxH/WM=; b=R7tay646zrtWVJei7ZeKShbPq2bnuF10vuqvhoLbiggiOX1EUx/HfR14LGnn/f7QTM adVhO17djyk6ItMRX1dkySFV70LJtgbYy8S7bp1QTM8fTFroHuFSJo3K/Cn+PymtsMQr clRhIRtdsMTA9Asb1F7wbPdXPXOVIBiHXkGCa+TZkTYpaEZn9GZ7JU1bK2CsjJwrGVwi VltsPjT1RDD3/qVyB1DhhD70XiFHPL0xsvzXcM19TNMc4yjV1EOS0kQHmQIFuCvOl16O DmyLK6YPSYDsDAOBmWEYmBjj8HcXncvzqey5mdDLiizHbI+zz8QrvSCy+Opt6mXLLhvb XD6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=lJTCbkkBdols6F5fbem69Rs++cbtn/Hjin27UsxH/WM=; b=UvjFOp+xFB1WsuFlAXmlxdBSqAN6/H/HzVPCWeY3wwGUyMbe6soia8MOOTmFAQBPdW RJSpfSDx7V5/VcIj22m/ebySQVN3G/PQbI8VpZUsfaAxd7vD1Kk98Roap8Qny2JCjJ/R OeT2NKIZpw7qLYSuUP0HcxtdvcM/LSxiymCAcadIB93JtacI4OKoFcb+WbtJJFgyfUlP y2U8j32LU3bLMIXfJdhebLmcOKBXdqpFApxW5HZm/ZrQuEqIc7ljlYGXVfuoFdctEehl 9hvaioI9sAXweKU6fjCVJHJWHFZQvjLORQ5sljXMeWFIMrp33QC+0IlotgG1Z3Qz64No zvJw== X-Gm-Message-State: AGRZ1gK+OH3+mw7dIE0KAEc986QrYZ/8Rl9aJuOKKH7JlEZMy0HQShyb 71/V12lGfPugmqaRqiz5qMkoDgaU X-Google-Smtp-Source: AJdET5d7ao+G220PJrFGs02Uf3AjO/cWCHE6XAY0UAnvLZ6thzVIWT1z8lHBlF0+srwc5tEF59uBDA== X-Received: by 2002:ac8:701d:: with SMTP id x29-v6mr2515910qtm.161.1540910674702; Tue, 30 Oct 2018 07:44:34 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 30 Oct 2018 09:43:46 -0500 Message-Id: <20181030144358.23144-13-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181030144358.23144-1-mdroth@linux.vnet.ibm.com> References: <20181030144358.23144-1-mdroth@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::834 Subject: [Qemu-devel] [PULL 12/24] qga-win: report disk serial number X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Tom=C3=A1=C5=A1 Golembiovsk=C3=BD Signed-off-by: Tom=C3=A1=C5=A1 Golembiovsk=C3=BD *coding style fix-ups (declarations at beginning of block) *improve readability for user-visible errors *cover additional edge-cases with debug statements Signed-off-by: Michael Roth --- qga/commands-win32.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 1e91aa2343..2d7b56d538 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -634,6 +634,36 @@ static void get_disk_properties(HANDLE vol_h, GuestDis= kAddress *disk, disk->bus_type =3D find_bus_type(dev_desc->BusType); g_debug("bus type %d", disk->bus_type); =20 + /* Query once more. Now with long enough buffer. */ + size =3D dev_desc->Size; + dev_desc =3D g_malloc0(size); + if (!DeviceIoControl(vol_h, IOCTL_STORAGE_QUERY_PROPERTY, &query, + sizeof(STORAGE_PROPERTY_QUERY), dev_desc, + size, &received, NULL)) { + error_setg_win32(errp, GetLastError(), "failed to get serial numbe= r"); + g_debug("failed to get serial number"); + goto out_free; + } + if (dev_desc->SerialNumberOffset > 0) { + const char *serial; + size_t len; + + if (dev_desc->SerialNumberOffset >=3D received) { + error_setg(errp, "failed to get serial number: offset outside = the buffer"); + g_debug("serial number offset outside the buffer"); + goto out_free; + } + serial =3D (char *)dev_desc + dev_desc->SerialNumberOffset; + len =3D received - dev_desc->SerialNumberOffset; + g_debug("serial number \"%s\"", serial); + if (*serial !=3D 0) { + disk->serial =3D g_strndup(serial, len); + disk->has_serial =3D true; + } + } +out_free: + g_free(dev_desc); + return; } =20 --=20 2.17.1