From patchwork Wed Jul 17 13:43:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 169139 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp997537ilk; Wed, 17 Jul 2019 06:51:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqxOFz23dY/I4NXSzBhf9W2t/jGTXPzWRz5Gy6gP6AkB4Q7+4w4bpxekCi/RDplzXrcpFaPv X-Received: by 2002:a17:906:b203:: with SMTP id p3mr30893851ejz.223.1563371474639; Wed, 17 Jul 2019 06:51:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563371474; cv=none; d=google.com; s=arc-20160816; b=sBKmGFISeQNsxDactuib2RCMM6/N3yp6MOEuFKeIp6lyIjFX4Snc+vSwnpeuKm48L6 3/7EGOSmI18UsZeLMKHhGN7UqJoRK2XWmgw0RJSKd7ZsC31M4mDgUkWrnf019OzmRcOV THGCBr2yoqBJAGZ07ucRiNBdbNu8vaPw+PfDfYXHJhFw2/anBieUvZv4bQJ7PcensGkf r2hcGsWMsRdyW6+emraHVdjyeU/BdrsI4KOPz2M1spCF/FEXzeEoSW3TKI/tS8+AgvvO AbycyES3palAUFF37yQB3Uiz9PwTm0K5UJIwpwaMcrS4ku6bzuE84LB4DVj5VOuYYgC/ Ml6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=m27wikNUV2ioSIIaNiDI3xIBu0qKgf8kwe98LNTGUc4=; b=antGWOLocuY5JPnU+YnVcSOeaogUnBA9Za/jK5F2R6AbmAfWFp7xlVoE+EVBKwnd/G tx4z1ApkPHhI+3FEBa0aGfqkkCapPI4p/D8Ks1BxBg8JLQGuKi84SWRP1SRimVXd7uMM oyWWsa/HJ9Wzao3dHj/uC+8LMIsIPQIJmgaEns0FDxuWSxKTZJvPX/cE1YIa/7ROUf1S BnRaHezgZhODg2dkHFygHxWPDTTABhsREf9fR0aSkaDKv+XwlIAiOM5mOWwJdNIgXrJ1 3y8sKkyOVU+MmH10ogM/Jxjv2fXIA9Hey+ePJV0+QhDUaK8mQUqi5mc1tfDuYQ03EQ5x GryA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=h0TMBYau; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id g15si12719922ejm.175.2019.07.17.06.51.14 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Jul 2019 06:51:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=h0TMBYau; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:57392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKv-0004XN-8o for patch@linaro.org; Wed, 17 Jul 2019 09:51:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57773) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hnkKe-0004X4-2t for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hnkKd-00010l-3c for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:56 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:32997) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hnkKc-000101-S6 for qemu-devel@nongnu.org; Wed, 17 Jul 2019 09:50:55 -0400 Received: by mail-wm1-x344.google.com with SMTP id h19so19232466wme.0 for ; Wed, 17 Jul 2019 06:50:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m27wikNUV2ioSIIaNiDI3xIBu0qKgf8kwe98LNTGUc4=; b=h0TMBYauQel7RhclqI/KijPgCYbscH7rFEJNoFAhX9/PlG1Ud4STUrLFwWppXuyzkj L66e3Mag2hYO3Q7X5gjdlgz3HEFISkzFTsgn7OYodtN0+01IlMZ28LKU2cl6R0jfzCxU Pn1n+qYaVxf4NAbvjsyslzcYuRuE3ZgIggWgzy2EJSBkmxlUw15RyNnSG3p1QEKHoRKy iVyEOCloon0wMQN+78IBYQrbQIDYcwbMeD/iudED8t1u/AvhASwrigh+bWgL2rCLOdJo 7bLJD2YpaAGVwI3HrrZSFHu0zEiusCJwjE7CeLfYdX1mXVQi/m+QkDdzRgDS3vliYiG8 vCPw== 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=m27wikNUV2ioSIIaNiDI3xIBu0qKgf8kwe98LNTGUc4=; b=N/L3j6cDpO4HyuR8j7d/fMORPUuEpafobISEk4BWVJLiOv47n7QwzQ2wILA842NMiA v7Q4ENrNZc1MzrPmhwIvReBMM9I0bGznHaVwZTPp8G9dnS8BYd/As7JU3SrVtK1wl5UB w1tt27jv65kfRhp6si8tCyrAwPGbdXJOaWTaE1taxSpQOxchUI633uwpM2dO3WcoZ8R0 LfRZ7ED5WfbkoGGu3tnqOc5aSPDWxwU5FksYnK8UkdLr35uYy6EX4dSuC6XOWUrfDj2Y 1ixyUtPAHR/WDPbDUuGPBLkOxhkRJ9iOYI9YqaSD9mIJ/QOiPQHF7IOKTDSrWl4lJNFP 21fw== X-Gm-Message-State: APjAAAXix53p1hexljezGrgRYxa51eGtlmbeDlLfwa28dt2pUvnIQtL/ 0Gln0zdNxgSqBeX8eubTGNA8lg== X-Received: by 2002:a05:600c:23d2:: with SMTP id p18mr34702879wmb.160.1563371453405; Wed, 17 Jul 2019 06:50:53 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v18sm24932786wrs.80.2019.07.17.06.50.52 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 06:50:52 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5ADBD1FF87; Wed, 17 Jul 2019 14:43:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 17 Jul 2019 14:43:29 +0100 Message-Id: <20190717134335.15351-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190717134335.15351-1-alex.bennee@linaro.org> References: <20190717134335.15351-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH v2 17/23] hw/i386: also turn off VMMOUSE is VMPORT is disabled 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: Eduardo Habkost , "Michael S. Tsirkin" , Paolo Bonzini , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Commit 97fd1ea8c1 broke the build for --without-default-devices as VMMOUSE depends on VMPORT. Fixes: 97fd1ea8c1 Signed-off-by: Alex Bennée --- hw/i386/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig index b9c96ac361e..6350438036f 100644 --- a/hw/i386/Kconfig +++ b/hw/i386/Kconfig @@ -52,6 +52,7 @@ config I440FX bool imply E1000_PCI imply VMPORT + imply VMMOUSE select PC_PCI select PC_ACPI select ACPI_SMBUS @@ -59,7 +60,6 @@ config I440FX select IDE_PIIX select DIMM select SMBIOS - select VMMOUSE select FW_CFG_DMA config ISAPC @@ -78,6 +78,7 @@ config Q35 imply AMD_IOMMU imply E1000E_PCI_EXPRESS imply VMPORT + imply VMMOUSE select PC_PCI select PC_ACPI select PCI_EXPRESS_Q35 @@ -85,7 +86,6 @@ config Q35 select AHCI_ICH9 select DIMM select SMBIOS - select VMMOUSE select FW_CFG_DMA config VTD