From patchwork Wed Oct 31 14:19:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 991447 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=none (p=none dis=none) header.from=linux.vnet.ibm.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="nHL+MnOD"; dkim-atps=neutral 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 42lVzk49Sxz9s2P for ; Thu, 1 Nov 2018 01:27:46 +1100 (AEDT) Received: from localhost ([::1]:59913 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHrTE-0007FO-2b for incoming@patchwork.ozlabs.org; Wed, 31 Oct 2018 10:27:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHrMf-0000vB-7N for qemu-devel@nongnu.org; Wed, 31 Oct 2018 10:21:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gHrMa-0007DW-Hl for qemu-devel@nongnu.org; Wed, 31 Oct 2018 10:20:55 -0400 Received: from mail-ot1-x343.google.com ([2607:f8b0:4864:20::343]:42710) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gHrMa-0006v6-6j for qemu-devel@nongnu.org; Wed, 31 Oct 2018 10:20:52 -0400 Received: by mail-ot1-x343.google.com with SMTP id j3so8869805otl.9 for ; Wed, 31 Oct 2018 07:20:25 -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=kPRjs/isTOkv09ltsDbUFAShE5SdXioSBw8XjJCetxo=; b=nHL+MnODtlo0YtY2axjB/ue2DsgEstg/usdRbmbVKefpEXjLFWNlPVxibjavV4Z9SX u2dqwrCKwS/VJK1Fmzd49bb94LsCDdNY41G13zGu+dcxb0JboBRF/O3V0s5KZnjYNpFk oRMjxWslo4vItNJCR8rpEaojWlCIcccVKaBJztOLMXJjAGO0y3hYGF5dqZX/D/sffg24 tt1IbYGPTyHHh2tgpvND4KE670yTLtVkje6QF4GHWo4rF3+z3L2XwUct9+yiLmjjCRv1 S00xScKZRvaz6dZWZmt9ZHzNVuDpzTLDdBkrSYm+/yTOFlmMaYEMEW+JwHMpV6RZmE0g oWxA== 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=kPRjs/isTOkv09ltsDbUFAShE5SdXioSBw8XjJCetxo=; b=b72PZfqKhLyruJoGcKl81Y0IyU+J3F065nw1sku4MWGUBZ8jFvBg7zNq50u5WMCpSB IMPCJG+MOI0YvOJfRZM6uhIzv8wpQCmHhlZq0HTvLHN6QlOvx6uQwhPu1nxwLqHZn0VS tSq3MsUuJ3PiFBlBrCBMJuw/7l1sbSy+C30GM4R30+vOGsqZzwJ7z3McaH0ef1yjT5zy tmLIhwW5B2KpJ8kXUqqCwSOVXFr4tlm5GKzFoG/dWXj2kq6b5DDdRm0wk6YKNigfPiin eHZgkiFRkPRSZcM4AqLIAGkMrvHa6YvakyK4RPr8eTo1XQZFmBiOohPtNlPoujCjkkW0 rKRg== X-Gm-Message-State: AGRZ1gIX3dgyxpNF/FHLDi+NT2vVgnxaFrn/DZ6xLmoVnNbQXXF+kxJo QL8Dg1HJ6CHFz/XZ6qaq9LPq1xoq X-Google-Smtp-Source: AJdET5cR2QuQcentJ/pchPU8uRDVhhLanheCeziq53Y6FmJD9+H9WXgKujSRqYv46CIbJb4nl/jEyw== X-Received: by 2002:a9d:38b9:: with SMTP id p54mr2038517otc.303.1540995623227; Wed, 31 Oct 2018 07:20:23 -0700 (PDT) Received: from localhost (76-251-165-188.lightspeed.austtx.sbcglobal.net. [76.251.165.188]) by smtp.gmail.com with ESMTPSA id m65-v6sm9031059oif.45.2018.10.31.07.20.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 31 Oct 2018 07:20:22 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Wed, 31 Oct 2018 09:19:10 -0500 Message-Id: <20181031141925.30026-10-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181031141925.30026-1-mdroth@linux.vnet.ibm.com> References: <20181031141925.30026-1-mdroth@linux.vnet.ibm.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::343 Subject: [Qemu-devel] [PULL v3 09/24] build: rename CONFIG_QGA_NTDDDISK to CONFIG_QGA_NTDDSCSI 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?b?VG9tw6HFoSBHb2xlbWJpb3Zza8O9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Tomáš Golembiovský There was inconsistency between commits: 50cbebb9a3 configure: add configure check for ntdddisk.h a3ef3b2272 qga: added bus type and disk location path The first commit added #define CONFIG_QGA_NTDDDISK but the second commit expected the name to be CONFIG_QGA_NTDDSCSI. As a result the code in second patch was never used. Renaming the option to CONFIG_QGA_NTDDSCSI to match the name of header file that is being checked for. Signed-off-by: Tomáš Golembiovský Reviewed-by: Marc-André Lureau Reviewed-by: Sameeh Jubran Signed-off-by: Michael Roth --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 61276982c6..95f3d44ecd 100755 --- a/configure +++ b/configure @@ -6142,7 +6142,7 @@ if test "$mingw32" = "yes" ; then echo "WIN_SDK=\"$win_sdk\"" >> $config_host_mak fi if test "$guest_agent_ntddscsi" = "yes" ; then - echo "CONFIG_QGA_NTDDDISK=y" >> $config_host_mak + echo "CONFIG_QGA_NTDDSCSI=y" >> $config_host_mak fi if test "$guest_agent_msi" = "yes"; then echo "QEMU_GA_MSI_ENABLED=yes" >> $config_host_mak