From nobody Tue May 7 21:29:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562358881; cv=none; d=zoho.com; s=zohoarc; b=jnAT4nRDNXC26ntCKkCjd6AwlNPpQ95IujTwHf/boMangew9fdYhO3/nyDXWZZ7FOfGv5iINJR//F8qghRKAotVr9EEXkY9xvAadspK1hI7aA3/LemRL/fSrK6ub8VvH7bXyGk3SE60dxD2EEkxwCEbjeiFRPRgFcPBp4uU1PSk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562358881; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=uj5oH2lIOzQhbVvPGa1CJyfr5Ywg7honDl46Ua9isOg=; b=KvJds/8K2jrNo7iHRmXw8ccTnMk7+PFk+9LxJdMj5ms2gnrjVlT6HM/5sXdfsTgLRmrUgw0dUveOH2xQf+QxaHu/97EDRS4phZnr73/x8KaDL3U9JsKZYlpzd/8MOgVGz2wjSsA+sNFNsOiraZMJ8xAv1aRpS6GmnBR0R23phJw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562358881447967.5573447131717; Fri, 5 Jul 2019 13:34:41 -0700 (PDT) Received: from localhost ([::1]:55926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjUuh-0007Py-Cg for importer@patchew.org; Fri, 05 Jul 2019 16:34:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34144) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjUk4-0004HU-H5 for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjUjz-0002jn-Ny for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:33 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:51742) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hjUjw-0002fq-Aj for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:29 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 207so10296288wma.1 for ; Fri, 05 Jul 2019 13:23:25 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id v23sm3035875wmj.32.2019.07.05.13.23.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jul 2019 13:23:24 -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; bh=uj5oH2lIOzQhbVvPGa1CJyfr5Ywg7honDl46Ua9isOg=; b=ZkFcGdaeOOtXb1HsONRTcOTJg5JPJgCFAPJaboK8fJcguFC1EaWs9boDlwUxOIXCxX N2UgBnO7kxloDx7t+MWTs20JVBsEGy4POt1Nnj7DiTd64tfZvIHbEVxx07lEOqTcJmyv xeSTBv9tpbeXSH5yy7/zqPHkwP6QFSjNKPrYMd5Kh7FLVSUvvD6DKdJ0/TdXWePVamtS NS1Xu8nAZTjkn59VzUHDDwVoCB39g1Gpm3INb0zOwRNL48WaH08skoJqAP5z6uZ+DTIS TEtvW0MQeO4hFyzbrUZNspI+JvvVXK6jYGvCtzRY3VtvqXJcAJvf8vLqOMGYKWdWCOv9 QKtg== 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; bh=uj5oH2lIOzQhbVvPGa1CJyfr5Ywg7honDl46Ua9isOg=; b=YXgyF8DquVgPVDW5jWGCJ0POTLqtFNSILjuFuG9b0HXruZyZm3N8Pm0ogkNUMcgAMx A2YFva7K+Ge4tYxlcjwRnPGlzimuiSBURAWpEGG+sOL31siUdbvu8R5cWdT7zc4OcPLp k6p9aznApDa/fpHXDQSwqW8gf6KLpszoMFqbHkV1Kv4Axe4zay4rQJ4U4Ud5kURtOjLs t9QMaU1Cs5yBAebx5AO+21BpUfPgA1Sm0K87W099cNA/7k4mgEhh7m26soV3cS4+bbIu CmRq5Ez2Z5HnOFlcsxjUxgWdJ1UnM+G6b59gR0SRcmpkJtwIBFqOuQQYqhYGUFOuRfaJ o3VQ== X-Gm-Message-State: APjAAAX/EuPUbsKPkU14KW3rZ7jSfKjNxTjMkusOUBTBxj4LRJx5pXGo 2oQBFKY94TJejFLZjzxLFwHBBUdIKVE= X-Google-Smtp-Source: APXvYqwjk8NYCC8hvOlyXESbovgMIV9ogtZ3QAfWtu+0+Ylw6xwLggzRSif2kiZBauXw0bXCRM763w== X-Received: by 2002:a05:600c:2243:: with SMTP id a3mr4432590wmm.83.1562358204804; Fri, 05 Jul 2019 13:23:24 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 5 Jul 2019 22:23:11 +0200 Message-Id: <1562358202-28008-2-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1562358202-28008-1-git-send-email-pbonzini@redhat.com> References: <1562358202-28008-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32e Subject: [Qemu-devel] [PULL 01/12] pc: fix possible NULL pointer dereference in pc_machine_get_device_memory_region_size() 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: Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Igor Mammedov QEMU will crash when device-memory-region-size property is read if ms->devi= ce_memory wasn't initialized yet. Crash can be reproduced with: $QEMU -preconfig -qmp unix:qmp_socket,server,nowait & ./scripts/qmp/qom-get -s qmp_socket /machine.device-memory-region-size Instead of crashing return 0 if ms->device_memory hasn't been initialized. Signed-off-by: Igor Mammedov Message-Id: <1560174635-22602-1-git-send-email-imammedo@redhat.com> Signed-off-by: Paolo Bonzini --- hw/i386/pc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index e96360b..552f340 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -2458,7 +2458,11 @@ pc_machine_get_device_memory_region_size(Object *obj= , Visitor *v, Error **errp) { MachineState *ms =3D MACHINE(obj); - int64_t value =3D memory_region_size(&ms->device_memory->mr); + int64_t value =3D 0; + + if (ms->device_memory) { + value =3D memory_region_size(&ms->device_memory->mr); + } =20 visit_type_int(v, name, &value, errp); } --=20 1.8.3.1 From nobody Tue May 7 21:29:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562358703; cv=none; d=zoho.com; s=zohoarc; b=Mqg88h8P7/Sp6BAZhmZFHzgOirKnZ6+zNQYDonjyZ/heC73qgZILoVch8fS26JUsuz+A0DrsConU2hrV2EIgd1jSGkCv2eV7uxIGIFIwzblVOdABZdwvHz/n7uuxrI6T9cgpZKyzaiLaRDRBKJAy4EILZtPm/DnpkV+ctPqe8C0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562358703; h=Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=2QJXgDdeciu+QM4e3C1K2WEVvDtyNAWGx3hRO2WruJ0=; b=ehrbleV1s/2BvK0HMdUJXYOjdlzS9JkIRDqKtfLX7KyQ7j2bgdN8DGiKDL4TiNNauM5qRwIggoUTAc5oJFx70SY7sPuPay3L12msoZp/xzmgDvbXRs/MNr6kfQb0WKSs9XgKRPETRteBbW5lvMWhDhpF8sADE4dIo1m19GPzHII= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562358703495754.3764814995913; Fri, 5 Jul 2019 13:31:43 -0700 (PDT) Received: from localhost ([::1]:55896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjUru-0004Wx-1h for importer@patchew.org; Fri, 05 Jul 2019 16:31:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34183) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjUk9-0004Ld-W3 for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjUk4-0002ny-H6 for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:39 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:46956) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hjUk0-0002gH-JE for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:33 -0400 Received: by mail-wr1-x42b.google.com with SMTP id z1so6392869wru.13 for ; Fri, 05 Jul 2019 13:23:27 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id v23sm3035875wmj.32.2019.07.05.13.23.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jul 2019 13:23:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=2QJXgDdeciu+QM4e3C1K2WEVvDtyNAWGx3hRO2WruJ0=; b=W1C4IIInxHmm2j6ms/74hDmp0LtqX9wHVoNRfffyya+p8megN0YXbeVuSuCnnEyNTT GVY8mjl4MdoUqydVMgWIRfnqBQcruMIb4BhZxkBsGpb4Vn5c5P+8/Uzqb3i0JaZ8aAxd 2t/XnVwQ8mUgWxTXlXWsg+Xgjab0w5reGBA7mN/UYmZFd9m/r8YlMKU0ljiqxcWxeUtf mgd+pikrgOjiNwXDAemnUOBY748n3QmLsgNbJ4ceexdZxJcHwFVvg4hhBoYS6Afdh/ua Udj7BQ3I67GVJoFTIcVKUfJ0drngeo3NSXJdmZ8MlytyMCWiMwhjRUIxdQ9wSVCMGr5e S/Mw== 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:subject:date:message-id :in-reply-to:references; bh=2QJXgDdeciu+QM4e3C1K2WEVvDtyNAWGx3hRO2WruJ0=; b=bRt/h0T4oQjFalToH4aGsu4j9E9QOIAsJLeYKIz+e7CJI8bE5TfF+4U12ctGlyOVNF RkRaMhk4MVnBIte6O3bed1PSh5U5MlfEgST/qsqY1Gc5SfpDleUHb5SXvL+UBc8TuaSf JarYzT3ZpFgBWkczZKCd5vRZ/6121ar1WMPmpnVbKrANBweYinDDeevqqTkLwzgT1ctW thiqeRYoTgKrm1PYOfr0IIHkdJmPwDHlvsyObLERxd3caU7NQ7k5cvk0a9YTCd+Kb9D+ kfqN400iZuqZJc3j+s9UOgDf7X4RbCSu2NC5FeMCrgCpstyGcbt5IBjuXIUfJuPzQqeQ xx4w== X-Gm-Message-State: APjAAAV2swoAuRqsXXGfjpD8KMBl09onLi6wkI8RPW7ftyUVT/aydn9A Vf7svX6ZGOm+1Rdj15zEOou7ZcG47r8= X-Google-Smtp-Source: APXvYqxytVifRVE+fgeroUdTtAW4PhIvmRt485rGBW7kvxqAMnBWjWNVGxoYN8peMrf+lWsl2oaNCg== X-Received: by 2002:adf:c706:: with SMTP id k6mr5239400wrg.40.1562358205626; Fri, 05 Jul 2019 13:23:25 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 5 Jul 2019 22:23:12 +0200 Message-Id: <1562358202-28008-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1562358202-28008-1-git-send-email-pbonzini@redhat.com> References: <1562358202-28008-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b Subject: [Qemu-devel] [PULL 02/12] checkpatch: do not warn for multiline parenthesized returned value 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" While indeed we do not want to have return (a); it is less clear that this applies to return (a && b); Some editors indent more nicely if you have parentheses, and some people's eyes may appreciate that as well. Signed-off-by: Paolo Bonzini Reviewed-by: Eric Blake Reviewed-by: Richard Henderson Message-Id: <1561116534-21814-1-git-send-email-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- scripts/checkpatch.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index c2aaf42..2f81371 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2296,7 +2296,8 @@ sub process { $value =3D~ s/\([^\(\)]*\)/1/) { } #print "value<$value>\n"; - if ($value =3D~ /^\s*(?:$Ident|-?$Constant)\s*$/) { + if ($value =3D~ /^\s*(?:$Ident|-?$Constant)\s*$/ && + $line =3D~ /;$/) { ERROR("return is not a function, parentheses are not required\n" . $he= recurr); =20 } elsif ($spacing !~ /\s+/) { --=20 1.8.3.1 From nobody Tue May 7 21:29:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562360620; cv=none; d=zoho.com; s=zohoarc; b=Wkv0JyALcbYTm2jrrXNyVEQxcUOl5lcon8gM9uJFeQBgy6g+gRqcney8nPfNSk046iM//C7WED/TouoL03cu7B491kA1JVIUAoI2z8CFM5VscH7Un8C+5pdQg2ioqTFVo4jnsJtEtO34wEy0anQ+Svl10mkcTWifBRNDRd6nOzQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562360620; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=wzOpofdcurA5wsLNGyb10WqGKKid4Jy5IfhsoibOXrE=; b=QA2RPDVNMw36aZrPRRaA/NS8nS/oNSP1V9yTvFvBxz+oanqgD1stP3ay+0ysk+zI4uN8iE8kgnYXHNA0tl20BkjDv5fuNoJC8S9gEJqjWh6aFIfseCKfrPlDLdD3TsXFeAojkiKfF6zUx9ojN1OpqexCfQrFuP0GHRWSWJGr/IM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15623606205575.662474473301927; Fri, 5 Jul 2019 14:03:40 -0700 (PDT) Received: from localhost ([::1]:56126 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjVMp-0006N9-DG for importer@patchew.org; Fri, 05 Jul 2019 17:03:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34270) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjUkS-0004Yk-M9 for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:24:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjUkR-00034V-Eu for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:24:00 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:47082) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hjUkQ-0002gi-NQ for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:59 -0400 Received: by mail-wr1-x443.google.com with SMTP id z1so6392901wru.13 for ; Fri, 05 Jul 2019 13:23:27 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id v23sm3035875wmj.32.2019.07.05.13.23.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jul 2019 13:23: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; bh=wzOpofdcurA5wsLNGyb10WqGKKid4Jy5IfhsoibOXrE=; b=DKyJRbEy18ZuxnVwrFYwij/hUBPHQFs+eLH81D2+OLJm6Lc4O1N7Ka7gP5hp9Kp0Dn blHm3xxR9lB89/uQZZHkhWoyKeeJZigr/0d1ESjD+NDw+gXrgyFsNWg19v/QJC7qiJnT x+sKOkYqkRJDcG/kFUrOz0efF2ZNTKGdSuHoa6GLbDZeMwGuVrFab3hk6k0FXMJ1Gw7k t9zUck5qkEKbpXyKDKTOwLTKiek/TUZ7cIghtugOYxASa88iESXLb4FHKPV3aQ6rwobS /m/oEzJlgwqaUCo6xzPdHSn5hvsukjjRaFevxRs9qtv4cWaMluPqOMUvvWIaDJLugGoo /khA== 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; bh=wzOpofdcurA5wsLNGyb10WqGKKid4Jy5IfhsoibOXrE=; b=LbO1p3sWNbc3bdHXWOedVd9DirdVRj2BzuoOl9BFeOIwLKoxbiGFBZuqB3kUsP/c/8 nILEiYkzrYS2RPuZJxa7qQ9dZI+WzRoVa9LVRGkcKGTyHfT/T9Wvipc5DIfilMLCvkgD O/lGoWS8B5PzzAkjmafDwRje/gPuwJ9QMFPaosnELdCUb6/UjKPxVwrFKZDrzj5e42Ys keO/QTtGnSkwyN17zYOnc7GfISTgoqA72hyrA/x7jKozqnFpSLTdktKGNVt5lm+tNdDp oC6NiThnYuhSUYoRLoiIJciuFzmpMMVG9PhzlImElhkKDSDG0nK87M5ufvCyx5ghRqo8 APTg== X-Gm-Message-State: APjAAAV/w1rsZZtjReKxWA5fZU/Ie0Q/3vwRMpxeUJBRYJTXjEE7BJK1 iX8gYKCDsPq2l9P5LXEdntEqX4hVgMs= X-Google-Smtp-Source: APXvYqwbScvg06K9GOeh0UAuMC5Jp6uHLlTBh7UDryM1cWfw1LeQStZUjOPuXmMI2Gvwgjk0b9S7Eg== X-Received: by 2002:adf:ed04:: with SMTP id a4mr4880872wro.86.1562358206572; Fri, 05 Jul 2019 13:23:26 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 5 Jul 2019 22:23:13 +0200 Message-Id: <1562358202-28008-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1562358202-28008-1-git-send-email-pbonzini@redhat.com> References: <1562358202-28008-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PULL 03/12] i386/kvm: Fix build with -m32 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: Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Max Reitz find_next_bit() takes a pointer of type "const unsigned long *", but the first argument passed here is a "uint64_t *". These types are incompatible when compiling qemu with -m32. Just use ctz64() instead. Fixes: c686193072a47032d83cb4e131dc49ae30f9e5d Signed-off-by: Max Reitz Reviewed-by: Eduardo Habkost Message-Id: <20190624193913.28343-1-mreitz@redhat.com> Signed-off-by: Paolo Bonzini --- target/i386/kvm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index e4b4f57..31490bf 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -1043,14 +1043,15 @@ static int hv_cpuid_check_and_set(CPUState *cs, str= uct kvm_cpuid2 *cpuid, CPUX86State *env =3D &cpu->env; uint32_t r, fw, bits; uint64_t deps; - int i, dep_feat =3D 0; + int i, dep_feat; =20 if (!hyperv_feat_enabled(cpu, feature) && !cpu->hyperv_passthrough) { return 0; } =20 deps =3D kvm_hyperv_properties[feature].dependencies; - while ((dep_feat =3D find_next_bit(&deps, 64, dep_feat)) < 64) { + while (deps) { + dep_feat =3D ctz64(deps); if (!(hyperv_feat_enabled(cpu, dep_feat))) { fprintf(stderr, "Hyper-V %s requires Hyper-V %s\n", @@ -1058,7 +1059,7 @@ static int hv_cpuid_check_and_set(CPUState *cs, struc= t kvm_cpuid2 *cpuid, kvm_hyperv_properties[dep_feat].desc); return 1; } - dep_feat++; + deps &=3D ~(1ull << dep_feat); } =20 for (i =3D 0; i < ARRAY_SIZE(kvm_hyperv_properties[feature].flags); i+= +) { --=20 1.8.3.1 From nobody Tue May 7 21:29:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562360050; cv=none; d=zoho.com; s=zohoarc; b=Ygnvk1+PnixUAkAAp9kokUIYKDd+gh5N2VRxdDov+9i8NjXNNd3UvPOIWdij48n03avPFm6gR2Y3ytJR4a0VWUk3gy6RMObyLgb2WT3c6CVRZv9R6NriYj6OK2abSx/urdy4V+vZlNTIBXeub0jqgiULXLBJkLeIMn955h8HjAU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562360050; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=6hb8qfyahz2ocOwlim+36bgUK6wk1cqH4qWGOP6ftsg=; b=PNaIISh3suKaah91OqX8i8YXQvWV6PxgKfF+Cf84iWOCCrX8jBlXuhsIIYM7ClM2UUapZnOT6ffMOA6Rj27/bqh6iFizaY46FhWvk/ZH+upGOPHS44PbogjRU9fdkvQkLTyFPdrBrc6AN1mSpazmkSdNI4i3YFUvi58TKA9fBEs= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562360050499164.20472502273446; Fri, 5 Jul 2019 13:54:10 -0700 (PDT) Received: from localhost ([::1]:56070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjVDF-0006ax-04 for importer@patchew.org; Fri, 05 Jul 2019 16:53:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34179) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjUk9-0004Lc-L9 for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjUk4-0002nV-1N for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:37 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:32826) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hjUjz-0002hF-Rn for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:33 -0400 Received: by mail-wm1-x331.google.com with SMTP id h19so8294532wme.0 for ; Fri, 05 Jul 2019 13:23:28 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id v23sm3035875wmj.32.2019.07.05.13.23.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jul 2019 13:23:26 -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; bh=6hb8qfyahz2ocOwlim+36bgUK6wk1cqH4qWGOP6ftsg=; b=Hko+fzodl8+JD8D73EYnXwlYk+GPuXKtCus7vta2/z06DkOljoqZf+KDfoztMdtcvg zTnKkGkkuR9JeK6uO95foCLDS85CEpOd4OacedKLXuXJAedBobIU3xGGODI85J0PoNGr d6OKPgiwZ/mwVn3SdAxt7YuhVr92K7Yh1ngSmSr43TnROgE3nKjWZ0UOax8eWM1tGaXc jQf7+2W4LKgxU51sOtJKVp5NbXjYaVpaT5RGVtP/2+Skx0TepFvpL4nr0anyZLSzr5I7 zvNkqAo7HVaMCBBdtTTGhMSBYilMa7Do/xi87sn6CNZIJn5korD4ZilJ2h0oeudpOijb h1wQ== 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; bh=6hb8qfyahz2ocOwlim+36bgUK6wk1cqH4qWGOP6ftsg=; b=Poam5avqWEoelLoxor1/1MriiLEUp61dCpR4UW7CLVhpjkhnUTIpbFcQcA/z/h4hdI YHu9Um3eNmedAZFbZscHxPGURsnZfuJR7xUi4KXf+JVWVXqCnwucXnJCBotkhQXjsVjx xx34b51yhyWeDg+0f6cBR9kJic1TB/WfDh8OBvsgqYGD22VdT7UHGXFhfUh0p98BDJgj I3bzivk3T/7Vp+rQklew0X6/P19vcF3BtK97X/YsH3KbAEjdLHFnLKG4I2mAJLhzmmsu Dv2oYAel93920/o5I25P1aODnTUD2+g6T4AWaMfmJzt48uNs8W5F83mMN7C2iKOF3vKQ UmDw== X-Gm-Message-State: APjAAAXlVMUKEk9HIPltz9/FmPiq+Yuoo5K+WsbagO25//CHoF4Pm4sU 5FjZfvvrPS19F72hFm9Kf0ZQPm5kxU8= X-Google-Smtp-Source: APXvYqzelV1hXtG3JdTtXL5MsM7WN2MTxuYvaYY5mr+BK26XZjbx40EdMQPXu0XUMcYk4Bn7Z86O2A== X-Received: by 2002:a1c:96c7:: with SMTP id y190mr4200674wmd.87.1562358207498; Fri, 05 Jul 2019 13:23:27 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 5 Jul 2019 22:23:14 +0200 Message-Id: <1562358202-28008-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1562358202-28008-1-git-send-email-pbonzini@redhat.com> References: <1562358202-28008-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::331 Subject: [Qemu-devel] [PULL 04/12] intel_iommu: Fix incorrect "end" for vtd_address_space_unmap 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: Yan Zhao , Peter Xu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Yan Zhao IOMMUNotifier is with inclusive ranges, so we should check against (VTD_ADDRESS_SIZE(s->aw_bits) - 1). Signed-off-by: Yan Zhao [peterx: split from another bigger patch] Reviewed-by: Eric Auger Signed-off-by: Peter Xu Message-Id: <20190624091811.30412-2-peterx@redhat.com> Signed-off-by: Paolo Bonzini --- hw/i386/intel_iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 44b1231..719ce19 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -3379,12 +3379,12 @@ static void vtd_address_space_unmap(VTDAddressSpace= *as, IOMMUNotifier *n) * VT-d spec), otherwise we need to consider overflow of 64 bits. */ =20 - if (end > VTD_ADDRESS_SIZE(s->aw_bits)) { + if (end > VTD_ADDRESS_SIZE(s->aw_bits) - 1) { /* * Don't need to unmap regions that is bigger than the whole * VT-d supported address space size */ - end =3D VTD_ADDRESS_SIZE(s->aw_bits); + end =3D VTD_ADDRESS_SIZE(s->aw_bits) - 1; } =20 assert(start <=3D end); --=20 1.8.3.1 From nobody Tue May 7 21:29:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562359826; cv=none; d=zoho.com; s=zohoarc; b=VjiVtaUXlWtTwP3/SwD5P2OZ6ZMQWhqd/Mp9ZOTmsWP5b6tC9C6DdmusjnH2YcDkoCmOEl5IF+n6xPnn9wqn4jd8MqtyowojgcrPqqFU62M4T+dNKP1iw2XjHaUzeSvw8trjPxi5JRsNgN+zif/I/65WvdpIxsa/prxnSSQhko4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562359826; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=YbMFVYWCeviKweLwBNufDDcBIGFAoGlnFAeGpWGi3rw=; b=ZdH4ZLc5LldtUu0B/CT6iqV7zEHAymgA9DwQUk8xNdgK+ThjVeyvfgT//lrKhewQVS9K5hEkLC3mOMIUDjJhIZ/GOuLy1bU8T6268zXzF8O38TZ1zAVub5gr3V3KHFME5gDAqq3M7r1pkhcHYmdta9fTLHZdQzjFRHxeiGyPfsI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562359826369700.6783132900614; Fri, 5 Jul 2019 13:50:26 -0700 (PDT) Received: from localhost ([::1]:56044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjV9z-0004BJ-Hy for importer@patchew.org; Fri, 05 Jul 2019 16:50:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34184) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjUk9-0004Le-W3 for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjUk4-0002na-1U for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:39 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:54295) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hjUjz-0002hm-UF for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:33 -0400 Received: by mail-wm1-x334.google.com with SMTP id p74so7245931wme.4 for ; Fri, 05 Jul 2019 13:23:29 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id v23sm3035875wmj.32.2019.07.05.13.23.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jul 2019 13:23:27 -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; bh=YbMFVYWCeviKweLwBNufDDcBIGFAoGlnFAeGpWGi3rw=; b=KEzBGU2Ou3kgfZGkF5Ya6OSGrCnDBMFvgtGMofrjM19PvoAGDM5ohTQSiFJkGVYoYo +mzClx+Z2+zpwSekFPBKvUjDxma8KQNYa0m2wTxPwcr09d0kL8n6+xrOSdwBn1wW1Qf4 tjKd3j7UPady/nKffKQD1CKOoW+iPshGiLv7C7W7OdLfsUIh6rDH5kZTDUh5yumGY+ep o/8Xv6O40dwpmHC8r7lA97uSU1n6zezCBGX441bItQ6hanmGWCBJ+oKCjYOiQ955nStU Lu5lQfiD5TbuMgoHgYbRamozwDskp7LCNyTj3PENMYWlVBkcf5dIN8qYNyvZCkP9FdB+ L/HA== 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; bh=YbMFVYWCeviKweLwBNufDDcBIGFAoGlnFAeGpWGi3rw=; b=sOZHiUVqvwxZFhJUSyprk5D4BZ3NBMytJ7h1DXMbPXnSjPRTVKS1cR9+viwv+GpTwo mKQZrpqlrzZLar4S4rhEvnJVl5fYpRJBLQ07E8iDhqss1oFTUzsmCQqCTfTl2uhhD+0x U6QVXtYLNOAJR+fJU2VRRwXpZd2V9y8h9AoOpclOrGsQxWHioImCgtAv0j0mCS0ARNnk C80jcVn+gVVBmIzZoHqhtq6/xs1vt41eJzVqV5+aSjlALNY7cp1+QKlpWAY4UxCxPjBl 4USurWG7xm+oWrZSwd6YmZxeXY7jjtD0QQNKo5Yia/jmWh3S0pXWAGrks+lTdB0MHkOh 91ZQ== X-Gm-Message-State: APjAAAUkN+9+sHKbdZfi9AS8OwBDt+naWpcbzJ17Z3wVN0PC37N6DSrI PBel3ZALMVstQkm0TAonLuRq6+fcmMk= X-Google-Smtp-Source: APXvYqymIRyzAL4rxwdCgo+OY1nYDJfeRjvyeW+ERyP9srQfUiOT1oQuR73YkMCqDve8ny1ntixC+Q== X-Received: by 2002:a7b:c776:: with SMTP id x22mr4477030wmk.55.1562358208303; Fri, 05 Jul 2019 13:23:28 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 5 Jul 2019 22:23:15 +0200 Message-Id: <1562358202-28008-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1562358202-28008-1-git-send-email-pbonzini@redhat.com> References: <1562358202-28008-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::334 Subject: [Qemu-devel] [PULL 05/12] intel_iommu: Fix unexpected unmaps during global unmap 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: Peter Xu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Peter Xu This is an replacement work of Yan Zhao's patch: https://www.mail-archive.com/qemu-devel@nongnu.org/msg625340.html vtd_address_space_unmap() will do proper page mask alignment to make sure each IOTLB message will have correct masks for notification messages (2^N-1), but sometimes it can be expanded to even supercede the registered range. That could lead to unexpected UNMAP of already mapped regions in some other notifiers. Instead of doing mindless expension of the start address and address mask, we split the range into smaller ones and guarantee that each small range will have correct masks (2^N-1) and at the same time we should also try our best to generate as less IOTLB messages as possible. Reported-by: Yan Zhao Signed-off-by: Peter Xu Reviewed-by: Eric Auger Tested-by: Yan Zhao Message-Id: <20190624091811.30412-3-peterx@redhat.com> Signed-off-by: Paolo Bonzini --- hw/i386/intel_iommu.c | 67 +++++++++++++++++++++++++++++++----------------= ---- 1 file changed, 41 insertions(+), 26 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 719ce19..de86f53 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -3363,11 +3363,28 @@ VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s= , PCIBus *bus, int devfn) return vtd_dev_as; } =20 +static uint64_t get_naturally_aligned_size(uint64_t start, + uint64_t size, int gaw) +{ + uint64_t max_mask =3D 1ULL << gaw; + uint64_t alignment =3D start ? start & -start : max_mask; + + alignment =3D MIN(alignment, max_mask); + size =3D MIN(size, max_mask); + + if (alignment <=3D size) { + /* Increase the alignment of start */ + return alignment; + } else { + /* Find the largest page mask from size */ + return 1ULL << (63 - clz64(size)); + } +} + /* Unmap the whole range in the notifier's scope. */ static void vtd_address_space_unmap(VTDAddressSpace *as, IOMMUNotifier *n) { - IOMMUTLBEntry entry; - hwaddr size; + hwaddr size, remain; hwaddr start =3D n->start; hwaddr end =3D n->end; IntelIOMMUState *s =3D as->iommu_state; @@ -3388,39 +3405,37 @@ static void vtd_address_space_unmap(VTDAddressSpace= *as, IOMMUNotifier *n) } =20 assert(start <=3D end); - size =3D end - start; + size =3D remain =3D end - start + 1; =20 - if (ctpop64(size) !=3D 1) { - /* - * This size cannot format a correct mask. Let's enlarge it to - * suite the minimum available mask. - */ - int n =3D 64 - clz64(size); - if (n > s->aw_bits) { - /* should not happen, but in case it happens, limit it */ - n =3D s->aw_bits; - } - size =3D 1ULL << n; + while (remain >=3D VTD_PAGE_SIZE) { + IOMMUTLBEntry entry; + uint64_t mask =3D get_naturally_aligned_size(start, remain, s->aw_= bits); + + assert(mask); + + entry.iova =3D start; + entry.addr_mask =3D mask - 1; + entry.target_as =3D &address_space_memory; + entry.perm =3D IOMMU_NONE; + /* This field is meaningless for unmap */ + entry.translated_addr =3D 0; + + memory_region_notify_one(n, &entry); + + start +=3D mask; + remain -=3D mask; } =20 - entry.target_as =3D &address_space_memory; - /* Adjust iova for the size */ - entry.iova =3D n->start & ~(size - 1); - /* This field is meaningless for unmap */ - entry.translated_addr =3D 0; - entry.perm =3D IOMMU_NONE; - entry.addr_mask =3D size - 1; + assert(!remain); =20 trace_vtd_as_unmap_whole(pci_bus_num(as->bus), VTD_PCI_SLOT(as->devfn), VTD_PCI_FUNC(as->devfn), - entry.iova, size); + n->start, size); =20 - map.iova =3D entry.iova; - map.size =3D entry.addr_mask; + map.iova =3D n->start; + map.size =3D size; iova_tree_remove(as->iova_tree, &map); - - memory_region_notify_one(n, &entry); } =20 static void vtd_address_space_unmap_all(IntelIOMMUState *s) --=20 1.8.3.1 From nobody Tue May 7 21:29:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562360411; cv=none; d=zoho.com; s=zohoarc; b=f9si6+WJ6+fR2ou/CE8GgpzLZbrb3y7J8q/CcKUsd4Qhg9A0zpa0j2r71v3tt4dijEA6kTrQQrpkfk2owU2+GrfLf8wEonNr+ATKCwPfv4GM9cyIKtlp0YHHsl7DWMFHyoWwINsZpoOPCND6Q6bP4udS7GRf/vcVyJf/QZB1mWw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562360411; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=yDJUvL9nWhLhts5GRxzh+3OuJBbBUiS1ssTSFuvIqR4=; b=J5cKvVtAM8lAQ3KA3zipdxYadeyDHeTd+XEr3RClO8R0wK49/VZKf5JyVtqbqgmXN/TNm+Ro8/o0g2Cf9HxH3I5zOkCoC/wuZtXtBEbERYFexjQlaUFChBNpDXbaMt9JWJkb6dyhlBeWM/5gVtg1XjM3poihRyBCemzevCmrceU= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562360411059994.6648857757979; Fri, 5 Jul 2019 14:00:11 -0700 (PDT) Received: from localhost ([::1]:56098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjVJK-0002uV-D1 for importer@patchew.org; Fri, 05 Jul 2019 17:00:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34211) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjUkG-0004N5-M1 for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjUk8-0002pr-HJ for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:44 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:36279) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hjUk4-0002iX-9B for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:37 -0400 Received: by mail-wr1-x435.google.com with SMTP id n4so11052720wrs.3 for ; Fri, 05 Jul 2019 13:23:30 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id v23sm3035875wmj.32.2019.07.05.13.23.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jul 2019 13:23:28 -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; bh=yDJUvL9nWhLhts5GRxzh+3OuJBbBUiS1ssTSFuvIqR4=; b=KVWXLN4gLf5250ibJWUojN2agC6g4K9l5l5slyuX/pZtA6N4+Q5NeaDZFz5yHFnfZ/ mfaBqisbwzTNBVsRofxx1w5jvoLdmD1d/JtdK98FvHpnNCTzP9HGebAziOpIKu4i8FD+ dkHndFhNLVvuuY/x/H3e6R7dUKejWpUybEX684u9NEG/TzPIuR5NWK16Ns1LATRgi4es EIpenb5hZL4888UVl/GYohKbKrXO1+Svgeg0Xl/IVSEVd4tAtVuyGOCq93/v0Gvadr58 7xGMtw1wzb7bPV2FUYdaTHbu4FIcYl/HofQxE1vNgvxkLs1mChhOVFyYecRVPWiXZAM9 7Fcg== 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; bh=yDJUvL9nWhLhts5GRxzh+3OuJBbBUiS1ssTSFuvIqR4=; b=mjoXql5NqolMW8EZcUsI7K5KLYyt8pLcGusrxEDZBc9Vh5gtXPoVAg79DxER9FD8OS 7BNDAzNgaVsNjwJOZo7eJW8Kp65rTsGTrX8ZuVe2sXwy3htulpbJKkMtot3NrkyilLqN q3T8fvuBoymI4nyWgi3CduhXJTTsrY2KvQi9/tmuGqXteTzNiJeri1R4KlzlWcn9blgJ TTj55cStms6fXDEdi6NbJxkVRhxKBdg0WLkeP2RsWQXTZskYows7iHbfBtU7jfcrYSHf XSutF7dM/DvnxNEshGp5WHxHEymiJAx1x1cTOxo5yaCvVpwN4gzP/NvewbCu6wGm0qhR jVIg== X-Gm-Message-State: APjAAAVb6WiMBN915AgkMYSzeHIGyMbB52YwCa5BJocyJ10tEJ7usH28 +wLjxIGjJz4OwHSsrDIBwMP1xyAdcsw= X-Google-Smtp-Source: APXvYqxNc7nA0KeOWa7sxu2PCn5lDID7hTNzjhUDTvFf9ZidURsTG6NzzC1F7wbM/m4DwFREz/0/Vg== X-Received: by 2002:adf:aacf:: with SMTP id i15mr4946756wrc.124.1562358209239; Fri, 05 Jul 2019 13:23:29 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 5 Jul 2019 22:23:16 +0200 Message-Id: <1562358202-28008-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1562358202-28008-1-git-send-email-pbonzini@redhat.com> References: <1562358202-28008-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::435 Subject: [Qemu-devel] [PULL 06/12] ioapic: clear irq_eoi when updating the ioapic redirect table entry 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: Li Qiang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Li Qiang irq_eoi is used to count the number of irq injected during eoi broadcast. It should be set to 0 when updating the ioapic's redirect table entry. Suggested-by: Peter Xu Signed-off-by: Li Qiang Reviewed-by: Peter Xu Message-Id: <20190624151635.22494-1-liq3ea@163.com> Signed-off-by: Paolo Bonzini --- hw/intc/ioapic.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c index 7074489..db9e518 100644 --- a/hw/intc/ioapic.c +++ b/hw/intc/ioapic.c @@ -380,6 +380,7 @@ ioapic_mem_write(void *opaque, hwaddr addr, uint64_t va= l, /* restore RO bits */ s->ioredtbl[index] &=3D IOAPIC_RW_BITS; s->ioredtbl[index] |=3D ro_bits; + s->irq_eoi[index] =3D 0; ioapic_fix_edge_remote_irr(&s->ioredtbl[index]); ioapic_service(s); } --=20 1.8.3.1 From nobody Tue May 7 21:29:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562359194; cv=none; d=zoho.com; s=zohoarc; b=hwTNSCIQF4RJwxyOD2GMC3M8BYjaigqcbdICLm4hmx7JdcuYK1C/0mHzdUeAWvCUS4WmPrsCeFinbtO+b2pAETkK7sqskWo8ggczOmOAYeR3L2G+kt8pOB7xE9NZPGwaxJJznopET38E5LSsPh3iptQCgS5l93TTvYDS1DuDJkA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562359194; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=NL1qamEi1SWCxCZDQ+Ft1vPKiyaKCd/QL3Bjak1vxXQ=; b=mUyu17IpvOC+9s0di65tjh7uNkMzHkkZhTsSsy9d5RSCrmtP5LvaELfqzR+WdOrnmJwLz/+YrjN2eXP2pwm2VxlTZp4jxT0MtVLi2ShLk/pkCb9/q3y85CUJiZdaA78uFftTB3i0VqqyVaysz/QHkGjMK+UivtAfTpXfF7uIo1k= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562359194939501.9044314224833; Fri, 5 Jul 2019 13:39:54 -0700 (PDT) Received: from localhost ([::1]:55954 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjUzp-0002lW-CV for importer@patchew.org; Fri, 05 Jul 2019 16:39:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34168) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjUk8-0004LB-HX for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjUk3-0002mw-A2 for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:37 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:33052) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hjUjz-0002jC-R2 for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:32 -0400 Received: by mail-wm1-x341.google.com with SMTP id h19so8294606wme.0 for ; Fri, 05 Jul 2019 13:23:31 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id v23sm3035875wmj.32.2019.07.05.13.23.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jul 2019 13:23:29 -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=NL1qamEi1SWCxCZDQ+Ft1vPKiyaKCd/QL3Bjak1vxXQ=; b=Nd+YlPvYNskjnp2NN5XY0QePTM253d0iLZfXER0olQ8TFtJt0zWB8nO/vin0waW/RJ RNhAUriBDt8gzQydZHbd4ii8CRjTLrooceH1GGAARkD5eOQFk/+TRcjOFdP0qTSCcBOj 1UBK9Ls6krJQSBH5uotnqZLuwLbPfSEuQFw/4BhKGJZVIn9Qlf2ud1s03EidXTVIFb4v giMdepo8oIqx8RZb6wRe/KWv0nu4reQ2JYB8DNJbzMHzcKJYj5IGqV3ci7SrLm7Jzy/x P4SfOjVrWvYd8kbWn6wFfirqNY+1v2VSylWhgi6JKoovUeJ9Ml9ut5flW5XH8ZmhtuPB ObGQ== 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=NL1qamEi1SWCxCZDQ+Ft1vPKiyaKCd/QL3Bjak1vxXQ=; b=DrBvo4XlMFuwQZJz7h3wXc2q5Vb4MmeL7Jwn1UNFvZeQuMjjZ+Z5zI3bz/gsK0PDJa neowKdx/gG1zXJlPw7Z6flcvcBGIeVd8sXt6pxOoeypkKe8fIfcdSIXJYzJqzAOhSs6b QbSCqtnQfY3a7npDizt2hy9i+2fHPo0Mb3AsGu+QbIArObeaqkD1H0U78Dd+RSL4reoh LWrSC50fpgWZQ/pB86yTuMEM/4Bjj4UGX0kCg9ZpsUa8BdUzBnYaahCC0F2npdznFoS1 5y4hcIPmUt6X4IHrYXoHfb7bbvcI50JoZ28tiCf2D1q5Y9vRAvVOpghG9XQmDBAP8OYL 3utQ== X-Gm-Message-State: APjAAAXoUIwdpjUk6w2NvmeBiAWN7eE0szc8sbLHCgbNuHOlpFbJ+gtu aMoV/hHvt//S8MHxJ9sK1Tk6rXZngCc= X-Google-Smtp-Source: APXvYqwJ0V5dfMDxy4F8t9gFM7WF1jwib/clFm4YPqc9GcJrTFWc0dR7nTO4OP038XF6viVLpHhvdg== X-Received: by 2002:a05:600c:2056:: with SMTP id p22mr4453308wmg.155.1562358210084; Fri, 05 Jul 2019 13:23:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 5 Jul 2019 22:23:17 +0200 Message-Id: <1562358202-28008-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1562358202-28008-1-git-send-email-pbonzini@redhat.com> References: <1562358202-28008-1-git-send-email-pbonzini@redhat.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: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PULL 07/12] target/i386: fix feature check in hyperv-stub.c 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: Vitaly Kuznetsov , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Roman Kagan Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Alex Benn=C3=A9e Commit 2d384d7c8 broken the build when built with: configure --without-default-devices --disable-user The reason was the conversion of cpu->hyperv_synic to cpu->hyperv_synic_kvm_only although the rest of the patch introduces a feature checking mechanism. So I've fixed the KVM_EXIT_HYPERV_SYNIC in hyperv-stub to do the same feature check as in the real hyperv.c Signed-off-by: Alex Benn=C3=A9e Cc: Vitaly Kuznetsov Cc: Paolo Bonzini Cc: Roman Kagan Message-Id: <20190624123835.28869-1-alex.bennee@linaro.org> Reviewed-by: Vitaly Kuznetsov Signed-off-by: Paolo Bonzini --- target/i386/hyperv-stub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/i386/hyperv-stub.c b/target/i386/hyperv-stub.c index fe548cb..0028527 100644 --- a/target/i386/hyperv-stub.c +++ b/target/i386/hyperv-stub.c @@ -15,7 +15,7 @@ int kvm_hv_handle_exit(X86CPU *cpu, struct kvm_hyperv_exi= t *exit) { switch (exit->type) { case KVM_EXIT_HYPERV_SYNIC: - if (!cpu->hyperv_synic) { + if (!hyperv_feat_enabled(cpu, HYPERV_FEAT_SYNIC)) { return -1; } =20 --=20 1.8.3.1 From nobody Tue May 7 21:29:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562360668; cv=none; d=zoho.com; s=zohoarc; b=LFP/wYZzNL06x9Uz0QaJfmTvyTXA1DeFhyfk/Y7IZSaMZ7q/uPfFFN1NFJCMRqkrNY23mUjfQy/Pwr4jQFzmCuzsIFVUFYUMuk5KNaG255XvV9ffQ9D5EYa4a0vMbxNk6XezfibBHTiCJr9f2dBUtV2zJaxrBUDxQuRS8l2d4wo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562360668; h=Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=hD3kbFvZZ3EzTHJ9PgPfFOKh05+UxEjCQiiQlxvG2pQ=; b=E++C3k/+t8OdcktpnaybCVqTz8SFzAQsi/NbOTMAz3latbZbh/YGHCC7qq3nSG0ciFhX/TlJwV9bqRTGkLfZWOJNur5L4v/k3uF/l/kMl+DZOYBZQkENMYmYTocMEZoVkfiEGnR3he8duSy0AMskWZZw0OpEZtYGNnwJJbya8tY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562360668311208.9218408702277; Fri, 5 Jul 2019 14:04:28 -0700 (PDT) Received: from localhost ([::1]:56130 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjVNZ-0007AQ-7z for importer@patchew.org; Fri, 05 Jul 2019 17:04:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34278) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjUkS-0004Ym-TT for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:24:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjUkR-00035B-Kb for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:24:00 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:35763) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hjUkR-0002jZ-D4 for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:59 -0400 Received: by mail-wr1-x432.google.com with SMTP id y4so2426024wrm.2 for ; Fri, 05 Jul 2019 13:23:32 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id v23sm3035875wmj.32.2019.07.05.13.23.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jul 2019 13:23:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=hD3kbFvZZ3EzTHJ9PgPfFOKh05+UxEjCQiiQlxvG2pQ=; b=XI2Ot1p3X5O4fSY6kYJrE+TCrJsD8KMdN5VRt1udLR5VDZnx3fV+FxzV0z/BChWu5L ZTrD+0YInLxXEFF8rwhguU0ZfxiRHr9I2ulKnf/rsGsn52LF55PpT7wMKq872vtyc5cg KUpxdD27ntw0B2zUrTNzCPBpp+SXStuR9ulz+y2ClKJwMTTBljRvi7xLSN8ulJrITnQR cX5KE9Y/a0hUhAiXZ6VCD5D7q8onXkwW3iVFpUXflbdTjy7H6z0HcrnFr5VKm3cXTub7 1216L3DwjxX+9I/a6Fbnz0DpoYWZ7/+dfMsh4CV7lphzl37YLpLjAnhvpahUoXResCQf 50DA== 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:subject:date:message-id :in-reply-to:references; bh=hD3kbFvZZ3EzTHJ9PgPfFOKh05+UxEjCQiiQlxvG2pQ=; b=MBYdLT9Mj0nX4JqF444c2PyVcjrVAToZLifOBOAY1+spst3MB6dUIRif6eQ+wsiPTw Fhsb86d2814zHEtOMA87Gb3dpwDm0qburCK9UHuIW1VEZFm594tW9od47qnjF7V0nFN4 1U2Hn9LGEOY3llxvwGKKXGCDqB84X1QkUu8fUufIOrNI/OrvFrimvvUL/mVlHwx4nxRA lCsyIj3aU71HNL8ZCGd3GidXVgxlcQ4nLksCRfiCC1ZCq5N9YOIgA1oMulkZHW6F1jKJ 9uosbqZfNJjt67RHa/zZw9d1LNCyrbZNo0uKbib66DkuMTxc4E1BjhVG0cYRwhaS9wfj XzBw== X-Gm-Message-State: APjAAAU9jpFswj/4Fp/c8gnFmDKwYT8cc0/jR+S1Q/askktuGCXnDvAh 0z6VRi+F/XQOzjT6CKKgoB+oiYgXgwg= X-Google-Smtp-Source: APXvYqzqm1houuww+bAm7PX0GEX6RseXx03Chv+McT1mPi0w6SJpApxC2gP4meq+WacpZCt4+m2tVA== X-Received: by 2002:adf:ea8b:: with SMTP id s11mr5165090wrm.100.1562358210913; Fri, 05 Jul 2019 13:23:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 5 Jul 2019 22:23:18 +0200 Message-Id: <1562358202-28008-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1562358202-28008-1-git-send-email-pbonzini@redhat.com> References: <1562358202-28008-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::432 Subject: [Qemu-devel] [PULL 08/12] minikconf: do not include variables from MINIKCONF_ARGS in config-all-devices.mak 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" When minikconf writes config-devices.mak, it includes all variables includi= ng those from MINIKCONF_ARGS. This causes values from config-host.mak to "sti= ck" to the ones used in generating config-devices.mak, because config-devices.mak = is included after config-host.mak. Avoid this by omitting assignments coming from the command line in the output of minikconf. Reported-by: Christophe de Dinechin Reviewed-by: Christophe de Dinechin Tested-by: Christophe de Dinechin Signed-off-by: Paolo Bonzini --- scripts/minikconf.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/minikconf.py b/scripts/minikconf.py index 0ffc6c3..3109a81 100644 --- a/scripts/minikconf.py +++ b/scripts/minikconf.py @@ -688,11 +688,13 @@ if __name__ =3D=3D '__main__': =20 data =3D KconfigData(mode) parser =3D KconfigParser(data) + external_vars =3D set() for arg in argv[3:]: m =3D re.match(r'^(CONFIG_[A-Z0-9_]+)=3D([yn]?)$', arg) if m is not None: name, value =3D m.groups() parser.do_assignment(name, value =3D=3D 'y') + external_vars.add(name[7:]) else: fp =3D open(arg, 'r') parser.parse_file(fp) @@ -700,7 +702,8 @@ if __name__ =3D=3D '__main__': =20 config =3D data.compute_config() for key in sorted(config.keys()): - print ('CONFIG_%s=3D%s' % (key, ('y' if config[key] else 'n'))) + if key not in external_vars: + print ('CONFIG_%s=3D%s' % (key, ('y' if config[key] else 'n'))) =20 deps =3D open(argv[2], 'w') for fname in data.previously_included: --=20 1.8.3.1 From nobody Tue May 7 21:29:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562358996; cv=none; d=zoho.com; s=zohoarc; b=JiNu7uk3D2JYHewLXwXXcjmjjZKageVJQPxlAHPeljykVUJCbmdAQDBssdXjBiPB5uAay6CMaaFzLvuiczTFi8tDgqO7Cc0U8Cbvi8WfrPSnKBrEJdCtM22EgmHveFI+5fe6WRkgmrkvEPULMxOBfv0fQl/DGKcdS7qhQr1aAew= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562358996; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=JvV1iVqyAdHF++s4qbNgPhXah3+qiDNHrezSixoPhkU=; b=hDrBHJ5G7qUZjNy7Ixokr7Tn7QU8vxX2EuJrEYuRbA63ZLDZQliM7IogD2SSsBXFfxdm3rRM9LbE4GzZxaqvaUEfWVAS1dgf1dkXf8l52YZ5LH0yEu3AlMEFewD0ClsPdfHo/mKNRyYNf81uHNv9S53aTgZlwFduIkAEKO4I3lw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562358996311304.6670514407522; Fri, 5 Jul 2019 13:36:36 -0700 (PDT) Received: from localhost ([::1]:55930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjUwd-0008Ro-7u for importer@patchew.org; Fri, 05 Jul 2019 16:36:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34235) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjUkQ-0004TY-Ku for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:24:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjUkJ-0002zu-UD for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:55 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:42112) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hjUkC-0002li-VS for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:46 -0400 Received: by mail-wr1-x444.google.com with SMTP id a10so9932830wrp.9 for ; Fri, 05 Jul 2019 13:23:33 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id v23sm3035875wmj.32.2019.07.05.13.23.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jul 2019 13:23:31 -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; bh=JvV1iVqyAdHF++s4qbNgPhXah3+qiDNHrezSixoPhkU=; b=mHyCKijx57N9McKdZR2Ut8MF57TxOE2rTTDhHAREOehCXinalcBZgvaV6JWt1C8OC0 9ECGlWdHZvAM/YESYZRPSekk+JuAobLSYo1ZnjjFVf4CtETWyuepys+gyVTokMDy5lUm GQD3iJrxfoFPYM/l70pCIxKrBSpNGI9rJw7xMISx8e62PiGtI71y0F/ARjCH5Ocfpwb7 sFmTPaWB9udUbUlKSDuU91+xlbo/mZ2UAUIIcUO+aYiACYJOrmICSc1PQxc68wGc9Zbp PK1Fx9L2mgIJWlBMKJIFwDcPCPBUbqqnN7CarD2MXN+ajgmhR9NNKC/Q4OyrCpeXAfF3 moUw== 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; bh=JvV1iVqyAdHF++s4qbNgPhXah3+qiDNHrezSixoPhkU=; b=CzmScz6R1Bsk4s51lLMOY+FUpZI1AR8DA5SOj+PT1xyXL/ay9I7XeNrKhTSk7vXfj/ 734/8L3NDMxuddxd/Uj7Q2+n5P/m/ZIANGkCDb1VKsMso9pKMTYQNql0fGh1g9mePMfE S1lY1hcM51FtEUOhAp8T40aXSuVuMxVp9OZ5fy705znj5Dy4EiYuq7wjOIr662FQX/fw SjOKEOedklzZ2IXTbmUsb2yDC1Mx1CmVoXb2wYBMTUhq9KWRDGmpiklPHvQLsWQ6ulbG BmB4AzfLzyDx17MpvepB6MFNqk7tEZ+nfBTH78qX/3BKfNbaDwPw3cYXfXml9Rd4bzGQ /Aew== X-Gm-Message-State: APjAAAUzKCOD9DvcPtNIB1LuW/RTceMuivZHxgctfagdJT97f/ZSakdj nMlj0XUjz+JC3eqBeVxs9JvZthRBnuc= X-Google-Smtp-Source: APXvYqy3vrPXBKUIrjJ0vdtHgDMhQBdVUbEpDeJAhfYQtKbPCKIt5LeIogIFbCjWwdzDN0MAnCOtmw== X-Received: by 2002:a5d:4107:: with SMTP id l7mr2447440wrp.191.1562358211934; Fri, 05 Jul 2019 13:23:31 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 5 Jul 2019 22:23:19 +0200 Message-Id: <1562358202-28008-10-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1562358202-28008-1-git-send-email-pbonzini@redhat.com> References: <1562358202-28008-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PULL 09/12] target/i386: kvm: Fix when nested state is needed for migration 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: Liran Alon Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Liran Alon When vCPU is in VMX operation and enters SMM mode, it temporarily exits VMX operation but KVM maintained nested-state still stores the VMXON region physical address, i.e. even when the vCPU is in SMM mode then (nested_state->hdr.vmx.vmxon_pa !=3D -1ull). Therefore, there is no need to explicitly check for KVM_STATE_NESTED_SMM_VMXON to determine if it is necessary to save nested-state as part of migration stream. Reviewed-by: Karl Heubaum Signed-off-by: Liran Alon Message-Id: <20190624230514.53326-1-liran.alon@oracle.com> Signed-off-by: Paolo Bonzini --- target/i386/machine.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/target/i386/machine.c b/target/i386/machine.c index 851b249..704ba6d 100644 --- a/target/i386/machine.c +++ b/target/i386/machine.c @@ -997,9 +997,8 @@ static bool vmx_nested_state_needed(void *opaque) { struct kvm_nested_state *nested_state =3D opaque; =20 - return ((nested_state->format =3D=3D KVM_STATE_NESTED_FORMAT_VMX) && - ((nested_state->hdr.vmx.vmxon_pa !=3D -1ull) || - (nested_state->hdr.vmx.smm.flags & KVM_STATE_NESTED_SMM_VMXON= ))); + return (nested_state->format =3D=3D KVM_STATE_NESTED_FORMAT_VMX && + nested_state->hdr.vmx.vmxon_pa !=3D -1ull); } =20 static const VMStateDescription vmstate_vmx_nested_state =3D { --=20 1.8.3.1 From nobody Tue May 7 21:29:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562360482; cv=none; d=zoho.com; s=zohoarc; b=jLi5HR2Q7cQ+RR5p8VSuN+v8PgqNM0hxyBMGAtSLO4j04pbkPR+xMTMdwKUbJgCQ7PmDVEE6RfKzLinlwIq5YctGZf2slarBJ4LQqIlUuCsyylnKFeim1zUmH2dXTDEUOrj+x8oy3ksctMtcu4oU8qMF54U5//REbErkWPAB7Og= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562360482; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=1Q2/Kno8eBtSRnDs1aukgO8GHqqzId6Tt8OoZfKY3WI=; b=WZprHAtYaHv/X5drxiHWKYr0rUlx0yV7zz1uJqHRs6y7AT4+NK47FOr5++Nte0OqiZuWjN5wq7F97MyP6gGoCHGr4S4daJiZJwSJWacc4KYAuZci5PgyNsGRfuDBcRKAxS3Uhn4bsOzmVUDlFmvjT+3AJSCo3yJb/VuDKQN/kf8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562360482703340.9380634563448; Fri, 5 Jul 2019 14:01:22 -0700 (PDT) Received: from localhost ([::1]:56108 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjVKZ-0003ih-Fb for importer@patchew.org; Fri, 05 Jul 2019 17:01:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34293) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjUkT-0004ZW-EG for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:24:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjUkR-00034n-Gz for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:24:01 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:54286) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hjUkR-0002m1-0W for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:59 -0400 Received: by mail-wm1-x32a.google.com with SMTP id p74so7246064wme.4 for ; Fri, 05 Jul 2019 13:23:34 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id v23sm3035875wmj.32.2019.07.05.13.23.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jul 2019 13:23:32 -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; bh=1Q2/Kno8eBtSRnDs1aukgO8GHqqzId6Tt8OoZfKY3WI=; b=GpCwa0XAqILHwkgw3pwQtNifuwZybLcvwyq/aHf3X1x5qCfbFZjCxACGd9WaZXSVqJ MjwvhvgcNLSk+aHQQTXYyWLE5T1kruEzSVD5QJuhnLpKd+KbL4QZ8eSPg4sAIWOaAG2a G3m6IfQWH2MD5miMvalN4xrkv3z1b2z9qbL032wtE14kyngS6ySpdD+vWL/LYHkPssr2 mg4ak9WyouhJVC1Uickvv3pLexzySKV8V29ifiBNk1IbTtX80eX0oi00acNzJfFc9HzJ Ammt7jjUXYGT91p4Xy+Z4m6pd6bgdQAIrqh+hrwq4xNNkP/g3TE6mXO/FZ5NhAziMGn6 QLcQ== 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; bh=1Q2/Kno8eBtSRnDs1aukgO8GHqqzId6Tt8OoZfKY3WI=; b=bzWE+eEsgNmCIYl9LZPHZvG3XFQpaLjAmoQ2kAQH+/2VCfJv3+zNGFh/X6xyjkXCEe AeplXlVIDf0zB0dzIYOG9/Njm9Rk7QOZPnj6AFNFJ8QMYLzwkk93eLmcrqkB4fZyunRP VFi8iAPHsalFt5KKbN0+xtuX3Pehh5XHFT/2iKWEAcZX/6P2eWsKimk/ldWsIviODNiC XSp2+dBw+xBMlae8Me8VPRkVTqx33fUYMfmnFUTRQ9TkSjqnMXwuPg+bctZJPXtYecXD lh63phk9mBHpHmO6G+VUW2O7c/ncYhlNdCpqq/D4q1XXL1RBM3iEJCDxPNRVhjmOumlR wNTw== X-Gm-Message-State: APjAAAWSACL+JCmEs40+a/nckFfpY4I0HwCcGTyd6Bayhy6CrtkfhZxp roLidA8cHaPgnW7DaGo7ZiJ9QXwtfZU= X-Google-Smtp-Source: APXvYqwJdYkd8oQYoek8/tt4O8IK5Ue9HwJKJTO0S7+EO3kt5dGFi7Zks8p23Og/n3pT+JvskQBmPw== X-Received: by 2002:a7b:c4d2:: with SMTP id g18mr678085wmk.79.1562358212808; Fri, 05 Jul 2019 13:23:32 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 5 Jul 2019 22:23:20 +0200 Message-Id: <1562358202-28008-11-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1562358202-28008-1-git-send-email-pbonzini@redhat.com> References: <1562358202-28008-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32a Subject: [Qemu-devel] [PULL 10/12] Makefile: generate header file with the list of devices enabled 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: Julio Montes Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Julio Montes v2: generate config-devices.h which contains the list of devices enabled Message-Id: <20190705143554.10295-1-julio.montes@intel.com> Signed-off-by: Paolo Bonzini Signed-off-by: Julio Montes --- Makefile.target | 4 ++++ scripts/create_config | 2 ++ 2 files changed, 6 insertions(+) diff --git a/Makefile.target b/Makefile.target index 72c267f..7154e99 100644 --- a/Makefile.target +++ b/Makefile.target @@ -45,6 +45,9 @@ include $(SRC_PATH)/tests/tcg/Makefile.include config-target.h: config-target.h-timestamp config-target.h-timestamp: config-target.mak =20 +config-devices.h: config-devices.h-timestamp +config-devices.h-timestamp: config-devices.mak + ifdef CONFIG_TRACE_SYSTEMTAP stap: $(QEMU_PROG).stp-installed $(QEMU_PROG).stp $(QEMU_PROG)-simpletrace= .stp $(QEMU_PROG)-log.stp =20 @@ -168,6 +171,7 @@ obj-y +=3D hw/$(TARGET_BASE_ARCH)/ endif =20 generated-files-y +=3D hmp-commands.h hmp-commands-info.h +generated-files-y +=3D config-devices.h =20 endif # CONFIG_SOFTMMU =20 diff --git a/scripts/create_config b/scripts/create_config index d727e5e..00e86c8 100755 --- a/scripts/create_config +++ b/scripts/create_config @@ -58,6 +58,8 @@ case $line in name=3D${line%=3D*} echo "#define $name 1" ;; + CONFIG_*=3Dn) # configuration + ;; CONFIG_*=3D*) # configuration name=3D${line%=3D*} value=3D${line#*=3D} --=20 1.8.3.1 From nobody Tue May 7 21:29:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562360276; cv=none; d=zoho.com; s=zohoarc; b=G1MnJaw1fhFkkcMIHRshwPRJ3PfSJdIIct96plnOikymsvXIdBskskIe9vJlvyY7/BH+9CcBuWbKsSx0EvlzJWefX9QC9poTS9kH6+04PhN2RVx1aut/zoMpCh98ln6DiA2EPtvrJ9A0Xkb4jaixja+o9oWChyc1E5qsOXdwg/8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562360276; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=UHc1AWBOadewTEukk6xNWZCM4+ZLGS/wJxEaP2onOLs=; b=Ylcf3e86XxoowzAaLY3VsPlg0MxYh0ZEOEWnh5aNKSBuaOfNFApc3S6tJIxKihL42f3HM5K+NmiAW4WLjwyn4ZZ2J6exhG4LzEnW5txPgFjCWSQbLfAq3ZUueLskSLpxnULdDM5WZjqJ7nC6+WMlAjzauDLOzsr0ggyKaE6dXr0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562360276795736.9971094757944; Fri, 5 Jul 2019 13:57:56 -0700 (PDT) Received: from localhost ([::1]:56086 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjVHH-0000wM-MK for importer@patchew.org; Fri, 05 Jul 2019 16:57:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34223) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjUkJ-0004Pp-UO for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjUkC-0002sG-4v for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:46 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:44354) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hjUk5-0002mO-VC for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:39 -0400 Received: by mail-wr1-x434.google.com with SMTP id b2so9796769wrx.11 for ; Fri, 05 Jul 2019 13:23:35 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id v23sm3035875wmj.32.2019.07.05.13.23.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jul 2019 13:23: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; bh=UHc1AWBOadewTEukk6xNWZCM4+ZLGS/wJxEaP2onOLs=; b=XpVZj5QkjsUZUHqI1s+Tr5NLFxI50bXFE7Ep5ymr7yJoELSGbmAeaU26wsI2Axw/fb 8ECfvIzLtdfk/QftzjFyauFl/SK12TrUV1nmmB+/TMYfYLvDsHJqWZVlmrDFhXUWFzde xtscf8f0l/zkUnQDpkdPknUAs09Y3ubipmZqC2FPqKjiajP4cR4Yn2DXhxKYFCmLVqHt NGIRw0OvvuiOjPEuTFj3VF1PRS7aBnQlrwLIE3T0wMWH2Q5eLwVwPjzx8Wg41AL4cXTE S13Yff2etYirFdvFYI+Ak4NAloKxM0DCARWmuKODnPCKxla1CFFX1eVhRsJfjtyGjIY5 Ne0w== 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; bh=UHc1AWBOadewTEukk6xNWZCM4+ZLGS/wJxEaP2onOLs=; b=DlwY5pbxUOjlTyCV8qFcaUBss/+vftUdSbdKiewLTkqxNE58ImgBT8tx/NLd1OT3X+ BcRsBQ42jWi4CtqwRuwnDkiOIoE3zZcAs4+PJLV8DAZIVc9eEtpAFhkNk02Q2+jTSYGD iPBR3tb5dDgcvEm8PLqG9dRCZg5tbQTFNZudPUFS+/Lirqnv9Q8oHoPXwxNqFCq7xrGU XRGdf4vDsnko5yrkeJSI4u5EhLNPuBrEdrTVLSaP/vL7wec61wpHEoNRhn55fA8IR2aS ufhvjNLscL/XXk0uZsSl2oyFpRPvXW+ixtAxBCPg537ExvwrLIHG/ZEfuNctcNXqn1rD OvUQ== X-Gm-Message-State: APjAAAUctTfPmC44ehzwkOzaCyy5Q3NZKloX+IabeDLWSnFZxguZhJ2i UR4fEfjPJSHsnZ3tvf8iOuErjtIr/T4= X-Google-Smtp-Source: APXvYqwX7n8FYJLojGJ4Ij3rteAMhoEV3vEGRSe0Da8Hg/PZdHSPShNUOiUXW/QbMbLORODBTao8Xg== X-Received: by 2002:adf:ea88:: with SMTP id s8mr5026623wrm.68.1562358214000; Fri, 05 Jul 2019 13:23:34 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 5 Jul 2019 22:23:21 +0200 Message-Id: <1562358202-28008-12-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1562358202-28008-1-git-send-email-pbonzini@redhat.com> References: <1562358202-28008-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 Subject: [Qemu-devel] [PULL 11/12] hw/i386: Fix linker error when ISAPC 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: Julio Montes Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Julio Montes v2: include config-devices.h to use CONFIG_IDE_ISA Message-Id: <20190705143554.10295-2-julio.montes@intel.com> Signed-off-by: Paolo Bonzini Signed-off-by: Julio Montes --- hw/i386/pc_piix.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index c07c4a5..cc04c01 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -23,6 +23,7 @@ */ =20 #include "qemu/osdep.h" +#include "config-devices.h" =20 #include "qemu/units.h" #include "hw/hw.h" @@ -61,9 +62,11 @@ =20 #define MAX_IDE_BUS 2 =20 +#ifdef CONFIG_IDE_ISA static const int ide_iobase[MAX_IDE_BUS] =3D { 0x1f0, 0x170 }; static const int ide_iobase2[MAX_IDE_BUS] =3D { 0x3f6, 0x376 }; static const int ide_irq[MAX_IDE_BUS] =3D { 14, 15 }; +#endif =20 /* PC hardware initialisation */ static void pc_init1(MachineState *machine, @@ -254,7 +257,10 @@ static void pc_init1(MachineState *machine, } idebus[0] =3D qdev_get_child_bus(&dev->qdev, "ide.0"); idebus[1] =3D qdev_get_child_bus(&dev->qdev, "ide.1"); - } else { + pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state); + } +#ifdef CONFIG_IDE_ISA +else { for(i =3D 0; i < MAX_IDE_BUS; i++) { ISADevice *dev; char busname[] =3D "ide.0"; @@ -268,9 +274,9 @@ static void pc_init1(MachineState *machine, busname[4] =3D '0' + i; idebus[i] =3D qdev_get_child_bus(DEVICE(dev), busname); } + pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state); } - - pc_cmos_init(pcms, idebus[0], idebus[1], rtc_state); +#endif =20 if (pcmc->pci_enabled && machine_usb(machine)) { pci_create_simple(pci_bus, piix3_devfn + 2, "piix3-usb-uhci"); --=20 1.8.3.1 From nobody Tue May 7 21:29:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562359266; cv=none; d=zoho.com; s=zohoarc; b=SJlrX4oZ3oQMoBJNxLEpTLblNjXFXikwQCaSPmhcAa5owgSmTAAr/9oJe9OgvjvPb/lqDCcpOJfLtbQKHtZoYCeXU7GurL2693hOgLw1rO9PxF2pLhpcIv/7w/wWEaLn4Qqa9P71uNUrd7DU9LjpH/ppImc4jRBCuDfEmXdk3iE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562359266; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=tkNz7uqIs0Rv1hq1F0XpRF7vtnO8a8dqtlBjE4VOmbk=; b=VCax47GQuRUW53FkhFYmso9f5Aa3Qnx5kfHWA+45ydtpoEL2HuQ3V7TSt2JeVasIhhAHaubuNwAgkHPoMrRnUiLl1lSaWIlUS2ZBGaIOE4yFrYZvVLGnh+DsoAkNgLPiHYlsxQd4i4rG0+D0uBYVMbBjIKDNkAycr8+I3EjMB3Q= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562359265996578.120434594466; Fri, 5 Jul 2019 13:41:05 -0700 (PDT) Received: from localhost ([::1]:55960 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjV0y-00042R-Qk for importer@patchew.org; Fri, 05 Jul 2019 16:41:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34266) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hjUkS-0004Yh-LK for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:24:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hjUkQ-00033s-LR for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:24:00 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:40230) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hjUkL-0002n8-Nc for qemu-devel@nongnu.org; Fri, 05 Jul 2019 16:23:55 -0400 Received: by mail-wr1-x42a.google.com with SMTP id r1so4699621wrl.7 for ; Fri, 05 Jul 2019 13:23:36 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id v23sm3035875wmj.32.2019.07.05.13.23.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Jul 2019 13:23:34 -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; bh=tkNz7uqIs0Rv1hq1F0XpRF7vtnO8a8dqtlBjE4VOmbk=; b=CiNK7xa1Jx2Ke2fdyKqozCsgA8qo8aCH4aKnQkiM3/MeT+qSk6SHXC1Ymv5D1/AC/7 fAuBD+3TQjrfDG0KN2ddV8fZ2KIWqDra8hQSw6R65TvZ4DptCg/U91j3MxuPZOZyClQF omMlyuylSzdJ4mFjGrG3bul7z3K/4IJj2ka0aMxoj8VIiQ0+R9ikCWYimVjlVRUDjz9K J9P7o6YVdw8dsng2d/sZxlLWnfgFZfvaDU6EcGOileGAXMH7MCf9XzrTX/rfSkjhoKjm L8tPA1rN3AgAlfRTgaTLSHePA85Dg//nz2fNA0nCdrsAApqU2+6gVoFYsH+m6EZ53ST6 7kmQ== 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; bh=tkNz7uqIs0Rv1hq1F0XpRF7vtnO8a8dqtlBjE4VOmbk=; b=aO2V+zWW2JDclbavJ1EK77mxy1YoMn5EUBQwNFq0jK5ymilT3+HxTL+HawZd1mwJqE 84Ko23kDK0FEbOOIbgS9lUubLoa0NQk+Ndzn2bM0llf/I8d4Bzwgxxb1VyMm4NdNSfdx hcg5IHNfMGeym6PtOmjFpuOK6JbmOCg2/QOmJ0nCkWdlCav+qQ+YZSA6+8VgygjCPqjM /KI0IF7/8cLaebdxO9IDiqn7ICoHc4SmEX80OHN6ahsVUyXmdPnbfGU65/fmRoeTnFYg 6WO7Ye3xF+9woEvnjQJKcvLDeqxxuR+Bqrtl9G8gQKpPRCD9KcNtNb2NIeTJp2tV7+r1 08Tg== X-Gm-Message-State: APjAAAXKVxEfJROROsGXRmhE3Kok/UxjtOpMJgqJwL7hUmgKPNsjkpVP V1NlNGkG1ToJR6yfFyS+rjYj5BbRc9E= X-Google-Smtp-Source: APXvYqy2kXav6uHXm46tXNoqwg6Z+fTsS1uqDM1WinsjQIMu/CoKLgLdL8FPpnvRixxaFukcdI5A6w== X-Received: by 2002:a05:6000:1203:: with SMTP id e3mr5000065wrx.300.1562358214871; Fri, 05 Jul 2019 13:23:34 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 5 Jul 2019 22:23:22 +0200 Message-Id: <1562358202-28008-13-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1562358202-28008-1-git-send-email-pbonzini@redhat.com> References: <1562358202-28008-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42a Subject: [Qemu-devel] [PULL 12/12] ioapic: use irq number instead of vector in ioapic_eoi_broadcast 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: Li Qiang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Li Qiang When emulating irqchip in qemu, such as following command: x86_64-softmmu/qemu-system-x86_64 -m 1024 -smp 4 -hda /home/test/test.img -machine kernel-irqchip=3Doff --enable-kvm -vnc :0 -device edu -monitor std= io We will get a crash with following asan output: (qemu) /home/test/qemu5/qemu/hw/intc/ioapic.c:266:27: runtime error: index = 35 out of bounds for type 'int [24]' =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D113504=3D=3DERROR: AddressSanitizer: heap-buffer-overflow on address = 0x61b000003114 at pc 0x5579e3c7a80f bp 0x7fd004bf8c10 sp 0x7fd004bf8c00 WRITE of size 4 at 0x61b000003114 thread T4 #0 0x5579e3c7a80e in ioapic_eoi_broadcast /home/test/qemu5/qemu/hw/intc= /ioapic.c:266 #1 0x5579e3c6f480 in apic_eoi /home/test/qemu5/qemu/hw/intc/apic.c:428 #2 0x5579e3c720a7 in apic_mem_write /home/test/qemu5/qemu/hw/intc/apic.= c:802 #3 0x5579e3b1e31a in memory_region_write_accessor /home/test/qemu5/qemu= /memory.c:503 #4 0x5579e3b1e6a2 in access_with_adjusted_size /home/test/qemu5/qemu/me= mory.c:569 #5 0x5579e3b28d77 in memory_region_dispatch_write /home/test/qemu5/qemu= /memory.c:1497 #6 0x5579e3a1b36b in flatview_write_continue /home/test/qemu5/qemu/exec= .c:3323 #7 0x5579e3a1b633 in flatview_write /home/test/qemu5/qemu/exec.c:3362 #8 0x5579e3a1bcb1 in address_space_write /home/test/qemu5/qemu/exec.c:3= 452 #9 0x5579e3a1bd03 in address_space_rw /home/test/qemu5/qemu/exec.c:3463 #10 0x5579e3b8b979 in kvm_cpu_exec /home/test/qemu5/qemu/accel/kvm/kvm-= all.c:2045 #11 0x5579e3ae4499 in qemu_kvm_cpu_thread_fn /home/test/qemu5/qemu/cpus= .c:1287 #12 0x5579e4cbdb9f in qemu_thread_start util/qemu-thread-posix.c:502 #13 0x7fd0146376da in start_thread (/lib/x86_64-linux-gnu/libpthread.so= .0+0x76da) #14 0x7fd01436088e in __clone (/lib/x86_64-linux-gnu/libc.so.6+0x12188e This is because in ioapic_eoi_broadcast function, we uses 'vector' to index the 's->irq_eoi'. To fix this, we should uses the irq number. Signed-off-by: Li Qiang Reviewed-by: Peter Xu Message-Id: <20190622002119.126834-1-liq3ea@163.com> --- hw/intc/ioapic.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c index db9e518..c408749 100644 --- a/hw/intc/ioapic.c +++ b/hw/intc/ioapic.c @@ -245,8 +245,8 @@ void ioapic_eoi_broadcast(int vector) s->ioredtbl[n] =3D entry & ~IOAPIC_LVT_REMOTE_IRR; =20 if (!(entry & IOAPIC_LVT_MASKED) && (s->irr & (1 << n))) { - ++s->irq_eoi[vector]; - if (s->irq_eoi[vector] >=3D SUCCESSIVE_IRQ_MAX_COUNT) { + ++s->irq_eoi[n]; + if (s->irq_eoi[n] >=3D SUCCESSIVE_IRQ_MAX_COUNT) { /* * Real hardware does not deliver the interrupt immedi= ately * during eoi broadcast, and this lets a buggy guest m= ake @@ -254,16 +254,16 @@ void ioapic_eoi_broadcast(int vector) * level-triggered interrupt. Emulate this behavior if= we * detect an interrupt storm. */ - s->irq_eoi[vector] =3D 0; + s->irq_eoi[n] =3D 0; timer_mod_anticipate(s->delayed_ioapic_service_timer, qemu_clock_get_ns(QEMU_CLOCK_VIRT= UAL) + NANOSECONDS_PER_SECOND / 100); - trace_ioapic_eoi_delayed_reassert(vector); + trace_ioapic_eoi_delayed_reassert(n); } else { ioapic_service(s); } } else { - s->irq_eoi[vector] =3D 0; + s->irq_eoi[n] =3D 0; } } } --=20 1.8.3.1