From patchwork Tue Sep 24 21:00:57 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: 174316 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp4742559ill; Tue, 24 Sep 2019 15:31:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqzMMcJy9heNCqI32KdqA4f04W8BrW4NyLHYSZ9+pDK7aKv9PbaIlUr26RNxBWuz8S0Muln0 X-Received: by 2002:a17:90a:3ae7:: with SMTP id b94mr2610674pjc.63.1569364273745; Tue, 24 Sep 2019 15:31:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569364273; cv=none; d=google.com; s=arc-20160816; b=f9gaRl7cY6w5wOj7bnfnxnuriFmx1kkv+cqbMU4WadMqZlMCrGYiChGN7078+Ic2z4 tFv8FtDbCgCqY71lbGTvTIPtpV6Nzz3uC8n7BMSjSHWpMLHiczzbpFCFKrhfmmE/HxbH +CwbhIvabZFesyBZK7o8D48Ak6uF9htPfgM740O78ML1DwvdMgOGVcXpImIkW6sf8uMA m9kFtNTzfVYbwMbOcPSrVH/8MHvnKrYFtWjfAvAYXHtgnWwj42XlX1HpQOAp1fC7s/dA 9J8+XGB/R7hVHW2VnD1unTVOuaIglLmSZiGXlgfYqKVpWReeJbsuBaOR5xNuOFWenNe9 Xzdw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=1FxA19EJXqVzVVxV/lcD510kd0tyA3qdkBCm+GGbDgQ=; b=t+flhWFalm9LG7M3zf5CKGA0y8OF8dvinFVWQfWzBTUp01z0atLyHJ7f7mQMEqjuag 0aJuYFJMqyoX3Hncx+q9Hmtgjpxzb5FMyqFfk9BiLkukllIJG+ItcGUMGZCNc/WgGL8w tAgrOcYXm+pm3lXsKkVacNaAPywcBf8AMbqvI8FSQIAlGNXwnvmWwzccZgnBB9Pwtd9T yJ95kYZ+1Q7qs0bg3RtKdmzcolfzq566b3HNzwdZPo6wcnHDEdcZyYv3iDk+/yZVErjG /W0zk7ErB01s/k+4ZlwsNyUAihqilS5KYS3YqACF5rLOpGlEKh8zjXfK2wfWeqC6ZHce /qNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DVL0t1+t; 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 r36si3067059pgm.224.2019.09.24.15.31.12 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Sep 2019 15:31:13 -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=DVL0t1+t; 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]:43116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCtKu-0005xa-7l for patch@linaro.org; Tue, 24 Sep 2019 18:31:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56760) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCs55-0003Eg-Sj for qemu-devel@nongnu.org; Tue, 24 Sep 2019 17:10:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCs50-0007YP-7k for qemu-devel@nongnu.org; Tue, 24 Sep 2019 17:10:41 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:40059) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iCs50-0007Y0-18 for qemu-devel@nongnu.org; Tue, 24 Sep 2019 17:10:38 -0400 Received: by mail-wr1-x441.google.com with SMTP id l3so3651598wru.7 for ; Tue, 24 Sep 2019 14:10:37 -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=1FxA19EJXqVzVVxV/lcD510kd0tyA3qdkBCm+GGbDgQ=; b=DVL0t1+tO/Ad3+NukDmIl5kvHylGLVOpyJbTjwOpYMVBn5hzihQgWcsI2/gNI034nQ 1Tr2b61H3r8gZMEZ4kUBCHkZ7p6jjZ3mGHgdu4cSlE5sKBy74u/b88RUTNr8jt7sMIAZ ooeUcHyasAA07I04tA0QGXhRRL9tOcxnQKz6f3dwQtQu2j7yhx0r+/OcmWLoGM/ZMhN7 MeyFMgc0NOZ+L3zW68UxmbWq2jL2rWajMB935yho82IinPawwC2Y7IRXP+gBRXQO440X 7J2Sy4s8smmFe580rpxJsC9tCRlJ9yHwyaA9vmP11eUZBSfNYJrI0aGqghD2kl+RbveB ax/g== 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=1FxA19EJXqVzVVxV/lcD510kd0tyA3qdkBCm+GGbDgQ=; b=X5Lv892N/ZF2+mL3/oLssJ8KAAaYp9ljHlQYeyfASsyT30xTflBJjvgZmMPjLwdGbF BgIoQw90TkKTe8p0yHQ1iPCv/I6NyvpArBTVbFcob6GSiN5sI1riTB/c3WTg5y3tc/x6 BNJszIH+jCi3J6i1f5F2J3mW+qgE4gGSc4QpQ1xxQl0o6hRajaMQoWytfJ3FMsK3GCl/ tKAXUAy+4oHwDilV1bmk/aeoYopXJU9kCahtTKWexLa2z0rxwjmSkgY/RRQ5k4hFMgHx DVJnvaFNK0t4wQ6tdW5+vo6JrEFsvnjF7vTRbITCs90KvgNjechkqr2UImlK5+5tQqw0 aJZg== X-Gm-Message-State: APjAAAUUHATi22sN/AUfhQuy6xcz8i10HAQnF7PAnVZYZxqx7jecQ6Jq 5b2ynjSxclkYWbuVJugL0Tj67w== X-Received: by 2002:adf:ee4a:: with SMTP id w10mr4516271wro.138.1569359436991; Tue, 24 Sep 2019 14:10:36 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b194sm1223084wmg.46.2019.09.24.14.10.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Sep 2019 14:10:35 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1A3D31FFAC; Tue, 24 Sep 2019 22:01:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 24/33] target/i386: Fix broken build with WHPX enabled Date: Tue, 24 Sep 2019 22:00:57 +0100 Message-Id: <20190924210106.27117-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190924210106.27117-1-alex.bennee@linaro.org> References: <20190924210106.27117-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::441 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 , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , f4bug@amsat.org, jsnow@redhat.com, Stefan Weil , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Ilias Maratos , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé The WHPX build is broken since commit 12e9493df92 which removed the "hw/boards.h" where MachineState is declared: $ ./configure \ --enable-hax --enable-whpx $ make x86_64-softmmu/all [...] CC x86_64-softmmu/target/i386/whpx-all.o target/i386/whpx-all.c: In function 'whpx_accel_init': target/i386/whpx-all.c:1378:25: error: dereferencing pointer to incomplete type 'MachineState' {aka 'struct MachineState'} whpx->mem_quota = ms->ram_size; ^~ make[1]: *** [rules.mak:69: target/i386/whpx-all.o] Error 1 CC x86_64-softmmu/trace/generated-helpers.o make[1]: Target 'all' not remade because of errors. make: *** [Makefile:471: x86_64-softmmu/all] Error 2 Restore this header, partially reverting commit 12e9493df92. Fixes: 12e9493df92 Reported-by: Ilias Maratos Reviewed-by: Stefan Weil Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20190920113329.16787-2-philmd@redhat.com> --- target/i386/whpx-all.c | 1 + 1 file changed, 1 insertion(+) -- 2.20.1 diff --git a/target/i386/whpx-all.c b/target/i386/whpx-all.c index 0c15241ae49..def0c284801 100644 --- a/target/i386/whpx-all.c +++ b/target/i386/whpx-all.c @@ -18,6 +18,7 @@ #include "sysemu/cpus.h" #include "sysemu/runstate.h" #include "qemu/main-loop.h" +#include "hw/boards.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "migration/blocker.h"