From patchwork Tue Oct 23 11:23:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?VG9tw6HFoSBHb2xlbWJpb3Zza8O9?= X-Patchwork-Id: 988156 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42fWQ840HVz9sN9 for ; Tue, 23 Oct 2018 22:29:52 +1100 (AEDT) Received: from localhost ([::1]:40303 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gEusg-0007BA-3R for incoming@patchwork.ozlabs.org; Tue, 23 Oct 2018 07:29:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42793) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gEumk-0001ql-5d for qemu-devel@nongnu.org; Tue, 23 Oct 2018 07:23:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gEumi-0007kw-Co for qemu-devel@nongnu.org; Tue, 23 Oct 2018 07:23:42 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:36644) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gEumi-0007in-44 for qemu-devel@nongnu.org; Tue, 23 Oct 2018 07:23:40 -0400 Received: by mail-wr1-f65.google.com with SMTP id y16so1274076wrw.3 for ; Tue, 23 Oct 2018 04:23:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=skZVrF37u6HGTAuOR7vryDJKJh6bnk3oKTcQQkTu3O8=; b=o6sLMy5jm5IJPHpcd+EBinbY5ZxkQV0D9AJ3Wx5zPh8b62tAgNmoflFKKqWCyo7MIs twncWyeNt8GzwjFpG2Te2ro+ZxhFVj+rQMSoiWC4EjKph0V5sxIPMQlMPuGBfCYVsFY5 3gWxiDeX/Y+ppK5r8rqQ3QB5h8l7cLw0EhHdmtOKvxpXhLhcb1xr47r/4e000yQP2o5o OGnkjrtu/DPs0D9byPXREVuBUuSwVKYSTYDL6iWd/VAp9K6ddxz6co0VPNVnUq3nQVTm 7SBf4m6G8gJriGtacVvybPPAOppW2/K5YJNarSIQjEzRl1iHXSQybSlCChg1qAuzYhkZ P7bQ== X-Gm-Message-State: AGRZ1gKPFWqzJaNmt+mPMJMGTiQiSUz4SzJmnmFaMUncHCeMveZrIVqi TJzX+P8KbhOi8afJ/UQ2sJb6jzQ9ktI= X-Google-Smtp-Source: AJdET5f8x1qqZ1AqKYYdibz6Um2Dpbw9C1rngpskwipV08jzapqozOaZqJ8w0oopLYkrkeF08f13ng== X-Received: by 2002:adf:e485:: with SMTP id i5-v6mr10299882wrm.145.1540293818041; Tue, 23 Oct 2018 04:23:38 -0700 (PDT) Received: from localhost.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id g8-v6sm1498990wmf.45.2018.10.23.04.23.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Oct 2018 04:23:37 -0700 (PDT) From: =?utf-8?b?VG9tw6HFoSBHb2xlbWJpb3Zza8O9?= To: qemu-devel@nongnu.org Date: Tue, 23 Oct 2018 13:23:19 +0200 Message-Id: <39758553c13a033021bd981d1cbaf1a170c453fd.1540293796.git.tgolembi@redhat.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.221.65 Subject: [Qemu-devel] [PATCH v5 10/14] 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: Michael Roth , Olga Krishtal , =?utf-8?b?VG9tw6HFoSBHb2xlbWJpb3Zza8O9?= , Sameeh Jubran , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Tomáš Golembiovský --- qga/commands-win32.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 5ebacd241f..e7d9cdea62 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -609,6 +609,31 @@ static void get_disk_properties(HANDLE vol_h, GuestDiskAddress *disk, disk->bus_type = find_bus_type(dev_desc->BusType); g_debug("bus type %d", disk->bus_type); + /* Query once more. Now with long enough buffer. */ + size = dev_desc->Size; + dev_desc = 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 number"); + goto out_free; + } + if (dev_desc->SerialNumberOffset > 0) { + if (dev_desc->SerialNumberOffset >= received) { + error_setg(errp, "offset outside the buffer"); + goto out_free; + } + const char *serial = (char *)dev_desc + dev_desc->SerialNumberOffset; + size_t len = received - dev_desc->SerialNumberOffset; + if (*serial != 0) { + disk->serial = g_strndup(serial, len); + disk->has_serial = true; + g_debug("serial number %s", disk->serial); + } + } +out_free: + g_free(dev_desc); + return; }