From patchwork Wed Jun 24 23:06:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 279483 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80070C433DF for ; Wed, 24 Jun 2020 23:09:30 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 47F0E20738 for ; Wed, 24 Jun 2020 23:09:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="SiPchCM3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 47F0E20738 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joEWH-00042y-GI for qemu-devel@archiver.kernel.org; Wed, 24 Jun 2020 19:09:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42052) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joETY-0008FP-SO for qemu-devel@nongnu.org; Wed, 24 Jun 2020 19:06:41 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:59127 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1joETV-0001FL-OA for qemu-devel@nongnu.org; Wed, 24 Jun 2020 19:06:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593039996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=yEBYz/1rOCc1PXQNYXHobgljmWeZgraW/Nx26o3Lqgc=; b=SiPchCM3pKMfdHqr/vozTJga0lhPkaANCSsSccPYee2DY+6YLLD18WaDVuzgSfVye1J7Kv Ujfy05ByiAtOv2vcS3MuBpRX9Bbim+pJOaJ6IlgEDSSnxIuc01YtDkxxZ8aPOmdJUQKrJ4 xgJjitSx1dnpODOx19dmfsU9U61XoME= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-85-sSiZUijPP6C3qDywOTEpvQ-1; Wed, 24 Jun 2020 19:06:33 -0400 X-MC-Unique: sSiZUijPP6C3qDywOTEpvQ-1 Received: by mail-wm1-f70.google.com with SMTP id g187so4665061wme.0 for ; Wed, 24 Jun 2020 16:06:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=yEBYz/1rOCc1PXQNYXHobgljmWeZgraW/Nx26o3Lqgc=; b=a6OBDVAR9ZG5HPpGGLMpL7lBBDwVIST0AygteiL+LMIWpf2R0ffX2JRyNs+CHsOrkm 3qabw0bFu5I6JZaDUe+3Tsqe9ZqtdOYS2uXQt4rJK0erUj7vI8laBlT5DDBDadKZUSvl /RFmUHLCgGN9/ntY1wKo2p3/XBZSWmbHltGAnh500yDDitepXoqBNpe4PWeqbxHkJf0P dQJj5knUhy1w0TggWvL1dRa0qKBwVhhwK4cmCvE1eVyeZ76vau+7dBBoSb65ktLsAIgx hcAE/wO1ziGegu8qdKCg34D83ja+BSIdh9v+rzZQM+cVTRcFf+/nVoHHYoXmybFRuYds Z1rQ== X-Gm-Message-State: AOAM533lLwFNVpEa1oznRjUbzBAne8Ya1GC7Y44RPIk1Ko8FHspY8XYr c8EdzzCfleakfueia5thGTWiErqKokaLyKwzn+NU3VeNzspWdRetOmoTLqKwyxzgAivUwEg12f0 Mgv6D2qFecRr2Aek= X-Received: by 2002:a5d:6107:: with SMTP id v7mr32849297wrt.174.1593039992425; Wed, 24 Jun 2020 16:06:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwkpBhYqoNFCWvxqzVFvefHVuz9Owc83laJA9ZQUI/co/ll1ZIUNGqyLO5yLI7014U4c4Ok6w== X-Received: by 2002:a5d:6107:: with SMTP id v7mr32849281wrt.174.1593039992233; Wed, 24 Jun 2020 16:06:32 -0700 (PDT) Received: from redhat.com (bzq-79-182-31-92.red.bezeqint.net. [79.182.31.92]) by smtp.gmail.com with ESMTPSA id t16sm7036094wru.9.2020.06.24.16.06.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 16:06:31 -0700 (PDT) Date: Wed, 24 Jun 2020 19:06:30 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 01/19] qtest: allow DSDT acpi table changes Message-ID: <20200624230609.703104-2-mst@redhat.com> References: <20200624230609.703104-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200624230609.703104-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Received-SPF: pass client-ip=207.211.31.81; envelope-from=mst@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/24 01:59:40 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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 Maydell , Gerd Hoffmann , Igor Mammedov Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Gerd Hoffmann Signed-off-by: Gerd Hoffmann Message-Id: <20200619091905.21676-2-kraxel@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/qtest/bios-tables-test-allowed-diff.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h index dfb8523c8b..8992f1f12b 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,19 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/pc/DSDT", +"tests/data/acpi/pc/DSDT.acpihmat", +"tests/data/acpi/pc/DSDT.bridge", +"tests/data/acpi/pc/DSDT.cphp", +"tests/data/acpi/pc/DSDT.dimmpxm", +"tests/data/acpi/pc/DSDT.ipmikcs", +"tests/data/acpi/pc/DSDT.memhp", +"tests/data/acpi/pc/DSDT.numamem", +"tests/data/acpi/q35/DSDT", +"tests/data/acpi/q35/DSDT.acpihmat", +"tests/data/acpi/q35/DSDT.bridge", +"tests/data/acpi/q35/DSDT.cphp", +"tests/data/acpi/q35/DSDT.dimmpxm", +"tests/data/acpi/q35/DSDT.ipmibt", +"tests/data/acpi/q35/DSDT.memhp", +"tests/data/acpi/q35/DSDT.mmio64", +"tests/data/acpi/q35/DSDT.numamem", +"tests/data/acpi/q35/DSDT.tis", From patchwork Wed Jun 24 23:06:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 279484 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37CA3C433E0 for ; Wed, 24 Jun 2020 23:08:07 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F392420738 for ; Wed, 24 Jun 2020 23:08:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="HPyfhcGy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F392420738 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:44240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joEUv-0001mS-V9 for qemu-devel@archiver.kernel.org; Wed, 24 Jun 2020 19:08:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42070) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joETa-0008Fz-AQ for qemu-devel@nongnu.org; Wed, 24 Jun 2020 19:06:42 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:52292 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1joETY-0001Gx-4d for qemu-devel@nongnu.org; Wed, 24 Jun 2020 19:06:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593039998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=unmpPZT+vnpLsu4lIIaVV67y5xez7uhexAq7iIY4vXw=; b=HPyfhcGybRlHNBhyZIiHiIfSltFGmNezUlfQAwqZYY6wJutmXe0UARZMohIX9UXCz6/05r fvbTByQ1atJNvHdwbkE1kJA5ciSdYr+TJzrJ7yKulLaYsycyzbYElRE4SunBKef9/u+8bA N+KUaxxNAq9FmSmhNiI5JAwlMTW8G+Y= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-330-7CInZu-9OlScFJTzELXy9w-1; Wed, 24 Jun 2020 19:06:36 -0400 X-MC-Unique: 7CInZu-9OlScFJTzELXy9w-1 Received: by mail-wm1-f70.google.com with SMTP id a7so4655299wmf.1 for ; Wed, 24 Jun 2020 16:06:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=unmpPZT+vnpLsu4lIIaVV67y5xez7uhexAq7iIY4vXw=; b=FD2NJwh/PSug/16H8U4aX1t2ySOy2Lptn5ZnAhsyEyxcjz0cixHJTQGI8lCRFl0k2+ A7Zi0Y9Bz/3BV1FQ6XynrF3SQj37hgl1AYq/4DmTvyN31S2vljX6YmAu9uxEfn0SQuwb ybebHZTXHDqRcwHV+OJsF1ASLz2Cjeain1x3qsBKNl8b7DpjAFpkcX+EgsqcyYNR5SXM G5fIbMrTUY77buG4TP3Y7J61xNHIWcQDFE/SN/2E7JKux4YJTJ1AlK3KFkxGK6CzjLQU qMXV7gbiwC/z5DNSeB8/BShT2tsQtmd72ZzSrmI2apX6ByUWZyfSRssUrX7rkcAHZYkk vLCA== X-Gm-Message-State: AOAM530U2FpJabFC7Al6MmBqvhDrUizSjWgkdSDBpVG5tEFoIlXfxx9E jHwlIhH64tkNHeufvzAz7DYBp4fAgG//4nhSQpvs3XWaMWdZWuBvvL/NCe9Fj6BX10Un2sPxt8K IrCgPBjmshfum2Ng= X-Received: by 2002:a5d:46d0:: with SMTP id g16mr36125726wrs.229.1593039995232; Wed, 24 Jun 2020 16:06:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwKCZlW+0JXE9TiCemf/+lstqFrAJ86Pr8zhKuKa52H9sHan2LZflf1+KahV2APOTnzIkhwTw== X-Received: by 2002:a5d:46d0:: with SMTP id g16mr36125708wrs.229.1593039995044; Wed, 24 Jun 2020 16:06:35 -0700 (PDT) Received: from redhat.com (bzq-79-182-31-92.red.bezeqint.net. [79.182.31.92]) by smtp.gmail.com with ESMTPSA id u23sm15316490wru.94.2020.06.24.16.06.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 16:06:34 -0700 (PDT) Date: Wed, 24 Jun 2020 19:06:32 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 02/19] acpi: bios-tables-test: show more context on asl diffs Message-ID: <20200624230609.703104-3-mst@redhat.com> References: <20200624230609.703104-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200624230609.703104-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Received-SPF: pass client-ip=205.139.110.120; envelope-from=mst@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/24 03:27:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Laurent Vivier , Peter Maydell , Thomas Huth , Gerd Hoffmann , Paolo Bonzini , Igor Mammedov , Philippe =?utf-8?q?Mathieu-Daud?= =?utf-8?b?w6k=?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Gerd Hoffmann Makes it easier to create good commit messages from the logs. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200619091905.21676-3-kraxel@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/qtest/bios-tables-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index b482f76c03..c315156858 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -469,7 +469,7 @@ static void test_acpi_asl(test_data *data) fflush(stderr); if (getenv("V")) { const char *diff_env = getenv("DIFF"); - const char *diff_cmd = diff_env ? diff_env : "diff -u"; + const char *diff_cmd = diff_env ? diff_env : "diff -U 16"; char *diff = g_strdup_printf("%s %s %s", diff_cmd, exp_sdt->asl_file, sdt->asl_file); int out = dup(STDOUT_FILENO); From patchwork Wed Jun 24 23:06:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 279482 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88FAEC433E0 for ; Wed, 24 Jun 2020 23:10:12 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4E21820738 for ; Wed, 24 Jun 2020 23:10:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="B+Oz6v7d" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4E21820738 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joEWx-0005Wj-FE for qemu-devel@archiver.kernel.org; Wed, 24 Jun 2020 19:10:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joETg-0008JR-N7 for qemu-devel@nongnu.org; Wed, 24 Jun 2020 19:06:48 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:36416 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1joETe-0001MG-6w for qemu-devel@nongnu.org; Wed, 24 Jun 2020 19:06:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593040004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FFvaXkZTKjDx5cRD4SdzQ8DkQ6V3EUCI1ITwbUTwI1E=; b=B+Oz6v7dqPJQR7Kqd02tmk3a/zKrl4IkzcrsamsJLNEFWo9DZP1tcK7vZwoJuhnIHO3OYG 70VdGtfEDqezQrMh+/v1aNU7RrAmqGUuAxu+lw2iq+q5swUCCEgKLAPLHVFHNvzf77i+Fy DcN2G875OBIIglh6GRqClInZkwIDR9M= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-234-8zXIXV8AN8WP6UqOplPyug-1; Wed, 24 Jun 2020 19:06:42 -0400 X-MC-Unique: 8zXIXV8AN8WP6UqOplPyug-1 Received: by mail-wm1-f72.google.com with SMTP id g187so4665737wme.0 for ; Wed, 24 Jun 2020 16:06:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=FFvaXkZTKjDx5cRD4SdzQ8DkQ6V3EUCI1ITwbUTwI1E=; b=spbBx4jDnh9b70F8uGFhmndlrFkYaogsGkKPZj+0EWKxWtmY2aUgsvmg92uoTkKg3g uTrYDKhZ2EDwQcZRGF+olKwBpJMjTSlm+hiL8v7NdKtBIiY35uXWvFiffYuU1Eh0+8fb bgGKxmCu2g26dtJtd4VlWeArcwc0WKqRaEJy73VfVE4nyqmm7r9whsNJEUKR6CSUZRju SL0wJqYvTvqmGftd1+NSGxgDPBopkqf9XP3AhtiQJbMZJPAcx5DKwZSU32KYimsrFI0i hDHf6Ujk1kwtEv8B13JShTAVMsYiPPjAky36keHKGV7L9alegSKnHPHMX70zdJIcx7+R Er0g== X-Gm-Message-State: AOAM531+IIzD2vg9OvsXgVYzGg/yadaplpzlA4LWOMOX/XUxFKctHlhn aeCLtRQpEjW7HrJUO86W6JMrc9qIdzW/K87VLbexrSVhkR2muWKuYD7tMnmPqK9F0rwArKY5KZx Oez94sjQM1Dzwvys= X-Received: by 2002:a05:600c:281:: with SMTP id 1mr88827wmk.143.1593040001164; Wed, 24 Jun 2020 16:06:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzhRyS1fsGCzgI4mnuybl4XyDKFZEE1Bg+DLCaCxPgDE3g4ulKnK4W3h2yvXF191n+EST0C3Q== X-Received: by 2002:a05:600c:281:: with SMTP id 1mr88814wmk.143.1593040000987; Wed, 24 Jun 2020 16:06:40 -0700 (PDT) Received: from redhat.com (bzq-79-182-31-92.red.bezeqint.net. [79.182.31.92]) by smtp.gmail.com with ESMTPSA id y16sm29078848wro.71.2020.06.24.16.06.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 16:06:40 -0700 (PDT) Date: Wed, 24 Jun 2020 19:06:38 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 04/19] floppy: make isa_fdc_get_drive_max_chs static Message-ID: <20200624230609.703104-5-mst@redhat.com> References: <20200624230609.703104-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200624230609.703104-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Received-SPF: pass client-ip=205.139.110.120; envelope-from=mst@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/24 03:27:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Kevin Wolf , Peter Maydell , qemu-block@nongnu.org, Philippe =?utf-8?q?Mathieu-Daud=C3=A9?= , Max Reitz , Gerd Hoffmann , Igor Mammedov , John Snow Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Gerd Hoffmann acpi aml generator needs this, but it is in floppy code now so we can make the function static. Signed-off-by: Gerd Hoffmann Reviewed-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daudé Acked-by: John Snow Message-Id: <20200619091905.21676-5-kraxel@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/block/fdc.h | 2 -- hw/block/fdc.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/hw/block/fdc.h b/include/hw/block/fdc.h index c15ff4c623..5d71cf9722 100644 --- a/include/hw/block/fdc.h +++ b/include/hw/block/fdc.h @@ -16,7 +16,5 @@ void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base, DriveInfo **fds, qemu_irq *fdc_tc); FloppyDriveType isa_fdc_get_drive_type(ISADevice *fdc, int i); -void isa_fdc_get_drive_max_chs(FloppyDriveType type, - uint8_t *maxc, uint8_t *maxh, uint8_t *maxs); #endif diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 5244df6f91..f1da83f08e 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -2747,8 +2747,8 @@ FloppyDriveType isa_fdc_get_drive_type(ISADevice *fdc, int i) return isa->state.drives[i].drive; } -void isa_fdc_get_drive_max_chs(FloppyDriveType type, - uint8_t *maxc, uint8_t *maxh, uint8_t *maxs) +static void isa_fdc_get_drive_max_chs(FloppyDriveType type, uint8_t *maxc, + uint8_t *maxh, uint8_t *maxs) { const FDFormat *fdf; From patchwork Wed Jun 24 23:06:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 279480 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6AFFC433DF for ; Wed, 24 Jun 2020 23:12:10 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8F14F206F7 for ; Wed, 24 Jun 2020 23:12:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="VO5x8kUh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8F14F206F7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joEYr-000126-QU for qemu-devel@archiver.kernel.org; Wed, 24 Jun 2020 19:12:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joETq-000095-4W for qemu-devel@nongnu.org; Wed, 24 Jun 2020 19:06:58 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:50527 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1joETo-0001RI-9A for qemu-devel@nongnu.org; Wed, 24 Jun 2020 19:06:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593040015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ToFNM9aVXQBet1ZT+w3NmxhXnSHtmFVtuTLjusFLtHM=; b=VO5x8kUhMOYIcXhVu0EtDxy/GMdl/ftwOaZfpr63tz+UbAFPT+Xg29BgGJS2Fk/RiBQA6g ce3lEahsHiAgC5NiW3mZC3g7xVKNn9lBFme6cYjXUXBT+GHBNbtM5CHmHkfGKnz0qWzcsN Zge04UH6iQA+tcADChFUk2BV3340rGM= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-326-fOE397vhPpW74SRctjRSNQ-1; Wed, 24 Jun 2020 19:06:53 -0400 X-MC-Unique: fOE397vhPpW74SRctjRSNQ-1 Received: by mail-wm1-f69.google.com with SMTP id a18so4645988wmm.3 for ; Wed, 24 Jun 2020 16:06:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=ToFNM9aVXQBet1ZT+w3NmxhXnSHtmFVtuTLjusFLtHM=; b=EkBrh9M009b4HvELBMX4EPNTC7TgdW813qwEGOIwj+HEkKz2ypFFNtrrBc6fHuM4AL GkWa7c+lUkjIxh04loXMsILpwuKScSt6ixmN+6aCRA4esdKBTd8ZEz8x4/CA13+HmA7X gznVjcW6UgaVRZfeZdC+Vxw4p2UH8zG2psjdLv8440Y7ZueN8obxb+DyI3nZQ0moLYE/ LNBU93DR8UVpLuMCyeo7X6JqrxjUXxNZIbC4HmAQuS7GGYBptQXG1x25bJ6qcOZFt8yO jUPSrQVG9wlSE7dQstZfEmELwPzB1hzX8qJjsGZBmef/qwYmJsfCRFsmJF/11FslfDnK XBeg== X-Gm-Message-State: AOAM530YZbWA5XVGy4XHq4eNtbKF9PpgkbGWUaye0//CMbTa1LL4ho+q k2G0RddvyMJWJKmQkbD0KNQUbyJhzWqqCdAzLzcast3ty5qhOxIatfbXM/DgSDqbleMNPOiQbwl AwrhjC5IU/5XaSD4= X-Received: by 2002:adf:e40e:: with SMTP id g14mr15027162wrm.271.1593040012245; Wed, 24 Jun 2020 16:06:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwvcr5MZAJbcbla0TfBIwcJt5/2SRI/fxVP+qKYbiBzekuqGu1ip0hs7lt45IpzuPJpVASBMA== X-Received: by 2002:adf:e40e:: with SMTP id g14mr15027146wrm.271.1593040012089; Wed, 24 Jun 2020 16:06:52 -0700 (PDT) Received: from redhat.com (bzq-79-182-31-92.red.bezeqint.net. [79.182.31.92]) by smtp.gmail.com with ESMTPSA id y6sm10454373wmy.0.2020.06.24.16.06.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 16:06:51 -0700 (PDT) Date: Wed, 24 Jun 2020 19:06:49 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 08/19] acpi: simplify build_isa_devices_aml() Message-ID: <20200624230609.703104-9-mst@redhat.com> References: <20200624230609.703104-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200624230609.703104-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Received-SPF: pass client-ip=205.139.110.120; envelope-from=mst@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/24 03:27:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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 Maydell , Eduardo Habkost , Gerd Hoffmann , Igor Mammedov , Paolo Bonzini , Philippe =?utf-8?q?Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Gerd Hoffmann x86 machines can have a single ISA bus only. Signed-off-by: Gerd Hoffmann Reviewed-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200619091905.21676-9-kraxel@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/acpi-build.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 19e9c298dc..d27cecc877 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -979,18 +979,14 @@ static void build_isa_devices_aml(Aml *table) { VMBusBridge *vmbus_bridge = vmbus_bridge_find(); bool ambiguous; - - Aml *scope = aml_scope("_SB.PCI0.ISA"); Object *obj = object_resolve_path_type("", TYPE_ISA_BUS, &ambiguous); + Aml *scope; - if (ambiguous) { - error_report("Multiple ISA busses, unable to define IPMI ACPI data"); - } else if (!obj) { - error_report("No ISA bus, unable to define IPMI ACPI data"); - } else { - build_acpi_ipmi_devices(scope, BUS(obj), "\\_SB.PCI0.ISA"); - isa_build_aml(ISA_BUS(obj), scope); - } + assert(obj && !ambiguous); + + scope = aml_scope("_SB.PCI0.ISA"); + build_acpi_ipmi_devices(scope, BUS(obj), "\\_SB.PCI0.ISA"); + isa_build_aml(ISA_BUS(obj), scope); if (vmbus_bridge) { aml_append(scope, build_vmbus_device_aml(vmbus_bridge)); From patchwork Wed Jun 24 23:06:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 279478 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D931CC433E0 for ; Wed, 24 Jun 2020 23:14:22 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A45E5206F7 for ; Wed, 24 Jun 2020 23:14:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="A4lWc5Ly" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A45E5206F7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41552 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joEaz-0004uq-OS for qemu-devel@archiver.kernel.org; Wed, 24 Jun 2020 19:14:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42230) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joETs-0000Fq-VS for qemu-devel@nongnu.org; Wed, 24 Jun 2020 19:07:00 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:23435 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1joETr-0001T8-69 for qemu-devel@nongnu.org; Wed, 24 Jun 2020 19:07:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593040018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=DkqmilDoYxlrdvOEadJHYOZPGQ72zPB+ueTswvkBgD4=; b=A4lWc5LygmNFDIm3DNYwvhn3CdYOi1ce4fLjTQ/c61LudZtKkOD6RG+XynqfVLuEMGVQAo 4MT9mkbN8W1ELqST8OPzupa12/BrsFZK1ob6/UVrlh0jWyVy8dj4uQRcXu3rSAu9j7eKuL KKqjE5IXkaEHKqFNZfGvrQHAKk1pbBI= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-288-sHUR8HAKOlWtqSNKEZDUNQ-1; Wed, 24 Jun 2020 19:06:56 -0400 X-MC-Unique: sHUR8HAKOlWtqSNKEZDUNQ-1 Received: by mail-wr1-f72.google.com with SMTP id w4so2809917wrm.5 for ; Wed, 24 Jun 2020 16:06:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=DkqmilDoYxlrdvOEadJHYOZPGQ72zPB+ueTswvkBgD4=; b=FlBvqOTPbl5bxIitV+uzUQae0H2vq/NpJOQnpeL9ogNQbODZ5Ae5v/M/H0dxc+I4V6 qfhXvW3r2FapTwblCMSKaPN9usFX7ZoVo5J1h7ZVNMDUsn+ZWRoqvRFvNbrJ6hh+wGX5 k5fkAuk1JD4ec4Ow/NGqkvuM4yhPYFsmQqtT07C+ccCj5NnT2+ttTg0svO3Nk0NrFr5F P/8iCdYd/SQg86KE0v236PlMkmQoui4rX4JtTOVg/Hg6npwWGzwlwqr5/C/C2WsYpqb0 jBz2ytSXSELVcTvbzNLvwmQVrS8MPsf+UPW/FKsCW/CORKTLLuQCjgZpKUUaXsHwUA5p /7zw== X-Gm-Message-State: AOAM5336Gz5Jf+hKlAbG67wd21iIv2FaXmJvQ1MhlJZiqxu40PlT9p0k PnV8+PrJk/M4rWE7cRbZYChe1fmxUbYtbYVlln5PLeHPEAKh+pzj4hty46gYj0loBWblSLWY7Ah OLLgFNN8/LBxhCJs= X-Received: by 2002:a7b:ce97:: with SMTP id q23mr99007wmj.89.1593040014852; Wed, 24 Jun 2020 16:06:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwp1NhzHTme6qLKxQGXsLqANtXaOH2ZjVwQ+zBuD8DhQAi79Stv3ibQjBzElJmCHQrT+ap3cQ== X-Received: by 2002:a7b:ce97:: with SMTP id q23mr98988wmj.89.1593040014620; Wed, 24 Jun 2020 16:06:54 -0700 (PDT) Received: from redhat.com (bzq-79-182-31-92.red.bezeqint.net. [79.182.31.92]) by smtp.gmail.com with ESMTPSA id 3sm4181906wmi.45.2020.06.24.16.06.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 16:06:54 -0700 (PDT) Date: Wed, 24 Jun 2020 19:06:52 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 09/19] acpi: drop serial/parallel enable bits from dsdt Message-ID: <20200624230609.703104-10-mst@redhat.com> References: <20200624230609.703104-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200624230609.703104-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Received-SPF: pass client-ip=205.139.110.61; envelope-from=mst@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/24 00:34:35 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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 Maydell , Eduardo Habkost , Gerd Hoffmann , Igor Mammedov , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Gerd Hoffmann The _STA methods for COM+LPT used to reference them, but that isn't the case any more. piix4 DSDT changes: Scope (_SB.PCI0) { Device (ISA) { Name (_ADR, 0x00010000) // _ADR: Address OperationRegion (P40C, PCI_Config, 0x60, 0x04) - Field (^PX13.P13C, AnyAcc, NoLock, Preserve) - { - Offset (0x5F), - , 7, - LPEN, 1, - Offset (0x67), - , 3, - CAEN, 1, - , 3, - CBEN, 1 - } } } ich9 DSDT changes: Scope (_SB.PCI0) { Device (ISA) { Name (_ADR, 0x001F0000) // _ADR: Address OperationRegion (PIRQ, PCI_Config, 0x60, 0x0C) OperationRegion (LPCD, PCI_Config, 0x80, 0x02) Field (LPCD, AnyAcc, NoLock, Preserve) { COMA, 3, , 1, COMB, 3, Offset (0x01), LPTD, 2 } - - OperationRegion (LPCE, PCI_Config, 0x82, 0x02) - Field (LPCE, AnyAcc, NoLock, Preserve) - { - CAEN, 1, - CBEN, 1, - LPEN, 1 - } } } Signed-off-by: Gerd Hoffmann Reviewed-by: Igor Mammedov Message-Id: <20200619091905.21676-10-kraxel@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/acpi-build.c | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index d27cecc877..ffbdbee51a 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1360,15 +1360,6 @@ static void build_q35_isa_bridge(Aml *table) aml_append(field, aml_named_field("LPTD", 2)); aml_append(dev, field); - aml_append(dev, aml_operation_region("LPCE", AML_PCI_CONFIG, - aml_int(0x82), 0x02)); - /* enable bits */ - field = aml_field("LPCE", AML_ANY_ACC, AML_NOLOCK, AML_PRESERVE); - aml_append(field, aml_named_field("CAEN", 1)); - aml_append(field, aml_named_field("CBEN", 1)); - aml_append(field, aml_named_field("LPEN", 1)); - aml_append(dev, field); - aml_append(scope, dev); aml_append(table, scope); } @@ -1392,7 +1383,6 @@ static void build_piix4_isa_bridge(Aml *table) { Aml *dev; Aml *scope; - Aml *field; scope = aml_scope("_SB.PCI0"); dev = aml_device("ISA"); @@ -1401,19 +1391,6 @@ static void build_piix4_isa_bridge(Aml *table) /* PIIX PCI to ISA irq remapping */ aml_append(dev, aml_operation_region("P40C", AML_PCI_CONFIG, aml_int(0x60), 0x04)); - /* enable bits */ - field = aml_field("^PX13.P13C", AML_ANY_ACC, AML_NOLOCK, AML_PRESERVE); - /* Offset(0x5f),, 7, */ - aml_append(field, aml_reserved_field(0x2f8)); - aml_append(field, aml_reserved_field(7)); - aml_append(field, aml_named_field("LPEN", 1)); - /* Offset(0x67),, 3, */ - aml_append(field, aml_reserved_field(0x38)); - aml_append(field, aml_reserved_field(3)); - aml_append(field, aml_named_field("CAEN", 1)); - aml_append(field, aml_reserved_field(3)); - aml_append(field, aml_named_field("CBEN", 1)); - aml_append(dev, field); aml_append(scope, dev); aml_append(table, scope); From patchwork Wed Jun 24 23:06:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 279481 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DF490C433DF for ; Wed, 24 Jun 2020 23:11:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A566120738 for ; Wed, 24 Jun 2020 23:11:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="dmGlODnJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A566120738 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joEY3-0007Zt-T4 for qemu-devel@archiver.kernel.org; Wed, 24 Jun 2020 19:11:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joETw-0000K8-1u for qemu-devel@nongnu.org; Wed, 24 Jun 2020 19:07:05 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:52423 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1joETu-0001Ul-A4 for qemu-devel@nongnu.org; Wed, 24 Jun 2020 19:07:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593040021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=OrDy+2bSGC3EvnrEAuXyXBzNgsnQeum1itKPO21c+vk=; b=dmGlODnJOspocfDmQBtvz/pkYNit2xr4cHfkOXYqT3JCdFcIAa2B7MFgf2dAGCX/Ny1VJN hAVN0IzptXpsfOnSPe24laRD+Q00mEx69yLKMDWtCyXKO9Kel+ggVVRvi1wMtvYrmKsSp8 W8xZ9LmggrMGwOUtVSj7m5kvIFL9sek= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-432-IEfoCfwOMj6aDKgvnc1kMA-1; Wed, 24 Jun 2020 19:06:59 -0400 X-MC-Unique: IEfoCfwOMj6aDKgvnc1kMA-1 Received: by mail-wm1-f69.google.com with SMTP id a21so4588766wmd.0 for ; Wed, 24 Jun 2020 16:06:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=OrDy+2bSGC3EvnrEAuXyXBzNgsnQeum1itKPO21c+vk=; b=EpdNFbugE6r6ZF5dO5n01ev5PcVbAeX3SCErZ4My0HrpDWV0IN4wRia0P7GKzGaHJ4 OFyAjEcAAI4iIf3xeUClPVQnNLfub657zA5T9L91Piiy5UHo8eMBnZB48BgMVhjJTpjX 6mmdmoeGwRmJ9sJLJHcQAqQtsOaGNM6CqVIYwEkCwrAojEt+JxIS8+xBMxut4b//eeTM lRwPATI9MGkvHJ77Im2vAscyAW7Yw8psZ54xLcUtG8ZPYPc6ftHFgaUyTkCBWlpEl3LD HOuoebaOEFFLQHxBNOeZBogvk5eOcGYep21gj4qfkT6bvOtFz5xAHZciJWoDs6AvcmmL yImQ== X-Gm-Message-State: AOAM533B5lbwSu7B0O0BNccwgE+459Uhjbf4esIjIoQuuwmna3j9D8X4 z9IvXWRf0ADMmmjpDB5UjqGmbU0+bOrLWBRnFnL5frqvagHjjTfDMLsoPGPzpdSgjxbSmHTm2g4 pdGx74pTgM1RTCHQ= X-Received: by 2002:a5d:664a:: with SMTP id f10mr33505922wrw.300.1593040017680; Wed, 24 Jun 2020 16:06:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx9PT1kTteKSaNNFWjTQ2x+g8uAJj/OQBtYL+CHh+6oI5Fd+TbLDbwVHIfQ5c4N47O7lkx5iw== X-Received: by 2002:a5d:664a:: with SMTP id f10mr33505909wrw.300.1593040017464; Wed, 24 Jun 2020 16:06:57 -0700 (PDT) Received: from redhat.com (bzq-79-182-31-92.red.bezeqint.net. [79.182.31.92]) by smtp.gmail.com with ESMTPSA id u15sm23548697wrm.64.2020.06.24.16.06.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 16:06:56 -0700 (PDT) Date: Wed, 24 Jun 2020 19:06:55 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 10/19] acpi: drop build_piix4_pm() Message-ID: <20200624230609.703104-11-mst@redhat.com> References: <20200624230609.703104-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200624230609.703104-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Received-SPF: pass client-ip=205.139.110.120; envelope-from=mst@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/24 03:27:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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 Maydell , Eduardo Habkost , Gerd Hoffmann , Igor Mammedow , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Gerd Hoffmann The _SB.PCI0.PX13.P13C opregion (holds isa device enable bits) is not used any more, remove it from DSDT. piix4 DSDT changes: Scope (_SB.PCI0) { - Device (PX13) - { - Name (_ADR, 0x00010003) // _ADR: Address - OperationRegion (P13C, PCI_Config, Zero, 0xFF) - } - } - - Scope (_SB.PCI0) - { Device (ISA) { Name (_ADR, 0x00010000) // _ADR: Address OperationRegion (P40C, PCI_Config, 0x60, 0x04) } } Signed-off-by: Gerd Hoffmann Reviewed-by: Igor Mammedow Message-Id: <20200619091905.21676-11-kraxel@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/acpi-build.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index ffbdbee51a..59f1b4d890 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1364,21 +1364,6 @@ static void build_q35_isa_bridge(Aml *table) aml_append(table, scope); } -static void build_piix4_pm(Aml *table) -{ - Aml *dev; - Aml *scope; - - scope = aml_scope("_SB.PCI0"); - dev = aml_device("PX13"); - aml_append(dev, aml_name_decl("_ADR", aml_int(0x00010003))); - - aml_append(dev, aml_operation_region("P13C", AML_PCI_CONFIG, - aml_int(0x00), 0xff)); - aml_append(scope, dev); - aml_append(table, scope); -} - static void build_piix4_isa_bridge(Aml *table) { Aml *dev; @@ -1530,7 +1515,6 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, aml_append(dsdt, sb_scope); build_hpet_aml(dsdt); - build_piix4_pm(dsdt); build_piix4_isa_bridge(dsdt); build_isa_devices_aml(dsdt); build_piix4_pci_hotplug(dsdt); From patchwork Wed Jun 24 23:06:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 279479 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33C7CC433DF for ; Wed, 24 Jun 2020 23:13:18 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F0679206F7 for ; Wed, 24 Jun 2020 23:13:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="gN7aLmEr" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F0679206F7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:37852 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joEZx-0003Cx-4R for qemu-devel@archiver.kernel.org; Wed, 24 Jun 2020 19:13:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42254) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joETy-0000N6-BV for qemu-devel@nongnu.org; Wed, 24 Jun 2020 19:07:06 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:26865 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1joETw-0001Vk-Go for qemu-devel@nongnu.org; Wed, 24 Jun 2020 19:07:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593040023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=XlFSgiVnedcPbHMPcza92pu5ADeDm2yfx70RS10qWhY=; b=gN7aLmEre2CHmt2pxcmHmMc/YoE2pYMOYmlye6z1rGHmfmw6cupXyImuFEV6kS4pYo+IJ3 o6PTHgW4zE2oCwWiwlky4kELbpVheDJ0tIEymGocYTRR81+S5uljtV9NhbaGzIc3utqo9k 8/UUIrs1oIFj0huX7wdKqSA175hswVk= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-370-aLzSSXkwMSWJuh8zl_AE0w-1; Wed, 24 Jun 2020 19:07:01 -0400 X-MC-Unique: aLzSSXkwMSWJuh8zl_AE0w-1 Received: by mail-wr1-f69.google.com with SMTP id g14so4715533wrp.8 for ; Wed, 24 Jun 2020 16:07:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=XlFSgiVnedcPbHMPcza92pu5ADeDm2yfx70RS10qWhY=; b=ENp9Z/L7unfLYCqx+nNTWo0sbqDw9IvSfYu4aZsE3iJnNS34WkYEW2VIRDzpSdPC7M kxeZf1xrTDrHzX5CWjapYehEyM4nlpO5Ic4fLbBqFifqOeyboyhsREFHjZ7hxYd8EvDw hhPmlzytCQIfEEFdD+71OP5UDempjzmDAsOiHAZBSGcdc3grrMyvO06SHy1ALaCUNLyu Oo184i8V8K+omiAzGynOdbpmcH1gvL2uRxEwrpQ8lsJzlM/6XxNIwQxDhHRieozlU09+ 0ezbMN4P1J4Ch4uQVq4i8pyAgaUvxPg/Mq68u3Wh5RG3Jb23n6XQozE1aicgeVwynHly ItiQ== X-Gm-Message-State: AOAM532fo3/EhUJI5xCbY5U4IleWBs+HQfZ5qN8hET0J3vIx86keyQoy CaVpLc5UAa3ZOwJT6OXNGXFVC8xBK4d9LOUVAiKfMQncxODUoptxPyAATxutobs959iCqbrewTe F9cs6CP2vuVVq7dM= X-Received: by 2002:a1c:7e52:: with SMTP id z79mr133112wmc.104.1593040020375; Wed, 24 Jun 2020 16:07:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy/+ly/FKD5+cQ9M7V0rzjx9wLH+MmfnUk2RtTQjBDo/b4nnBiXpwDJKCGheg8UipldjpnlAg== X-Received: by 2002:a1c:7e52:: with SMTP id z79mr133087wmc.104.1593040020149; Wed, 24 Jun 2020 16:07:00 -0700 (PDT) Received: from redhat.com (bzq-79-182-31-92.red.bezeqint.net. [79.182.31.92]) by smtp.gmail.com with ESMTPSA id q1sm14484983wro.82.2020.06.24.16.06.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 16:06:59 -0700 (PDT) Date: Wed, 24 Jun 2020 19:06:57 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 11/19] acpi: q35: drop _SB.PCI0.ISA.LPCD opregion. Message-ID: <20200624230609.703104-12-mst@redhat.com> References: <20200624230609.703104-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200624230609.703104-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Received-SPF: pass client-ip=205.139.110.61; envelope-from=mst@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/24 00:34:35 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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 Maydell , Eduardo Habkost , Gerd Hoffmann , Igor Mammedov , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Gerd Hoffmann Seems to be unused. ich9 DSDT changes: Scope (_SB.PCI0) { Device (ISA) { Name (_ADR, 0x001F0000) // _ADR: Address OperationRegion (PIRQ, PCI_Config, 0x60, 0x0C) - OperationRegion (LPCD, PCI_Config, 0x80, 0x02) - Field (LPCD, AnyAcc, NoLock, Preserve) - { - COMA, 3, - , 1, - COMB, 3, - Offset (0x01), - LPTD, 2 - } } } Signed-off-by: Gerd Hoffmann Reviewed-by: Igor Mammedov Message-Id: <20200619091905.21676-12-kraxel@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/acpi-build.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 59f1b4d890..378515df66 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1340,7 +1340,6 @@ static void build_q35_isa_bridge(Aml *table) { Aml *dev; Aml *scope; - Aml *field; scope = aml_scope("_SB.PCI0"); dev = aml_device("ISA"); @@ -1350,16 +1349,6 @@ static void build_q35_isa_bridge(Aml *table) aml_append(dev, aml_operation_region("PIRQ", AML_PCI_CONFIG, aml_int(0x60), 0x0C)); - aml_append(dev, aml_operation_region("LPCD", AML_PCI_CONFIG, - aml_int(0x80), 0x02)); - field = aml_field("LPCD", AML_ANY_ACC, AML_NOLOCK, AML_PRESERVE); - aml_append(field, aml_named_field("COMA", 3)); - aml_append(field, aml_reserved_field(1)); - aml_append(field, aml_named_field("COMB", 3)); - aml_append(field, aml_reserved_field(1)); - aml_append(field, aml_named_field("LPTD", 2)); - aml_append(dev, field); - aml_append(scope, dev); aml_append(table, scope); } From patchwork Wed Jun 24 23:07:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 279477 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0AAC6C433E1 for ; Wed, 24 Jun 2020 23:15:22 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C880B206F7 for ; Wed, 24 Jun 2020 23:15:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="fN7/5qv5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C880B206F7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joEbx-0007JE-3d for qemu-devel@archiver.kernel.org; Wed, 24 Jun 2020 19:15:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joEUF-0000wz-A4 for qemu-devel@nongnu.org; Wed, 24 Jun 2020 19:07:23 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:46810 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1joEUB-0001ga-RZ for qemu-devel@nongnu.org; Wed, 24 Jun 2020 19:07:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593040037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=P2QwBFExPnrm+QSOonZAHZYTv+JWyU5E11O8o1MzXlk=; b=fN7/5qv5DRGaJhmlymLI3YEoTYr6CG2sKyjOr7rXuAy09+xFZ3l01K8GNkjDdepu4vjrwe H7PH/XakQQAYBxGAqFCiH+IWzhbpe1W20oHf0vmGsDXQG0eS1LC7QiLTZIJ6SoRkxAPkCK ZOx6opddj1bk5/fBaPwnxKGinkP3XKU= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-25-jRsTOEvsMGSh30DSeKQmEA-1; Wed, 24 Jun 2020 19:07:12 -0400 X-MC-Unique: jRsTOEvsMGSh30DSeKQmEA-1 Received: by mail-wm1-f70.google.com with SMTP id o13so4786912wmh.9 for ; Wed, 24 Jun 2020 16:07:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=P2QwBFExPnrm+QSOonZAHZYTv+JWyU5E11O8o1MzXlk=; b=rXHAN28huY4/2I+6pStNGyQM3NWG8qB6jwiKs/XaeIzkEdp5haBl9P1klieh1KKiS0 YinAJ/rw6qYcm1nTUOn8jByVwtepQaVYuPs8A2FGn6BWbf/MJo8YJa4WeQh+CBpdnWDB gYskn7l2n9M7mGuOR1MANiS1vLADnpBHolbM3lmsE3TFubeW9ihyIgQj50cpc+NdwrUA TFs4d46UWFYuE7zgdYFEnLOndX1h61pj5Ba0X6wfYC6VX9Bn2aiW7M/67A6Mloyi1khH nbGTVn1jJ7D7W12YCpjY8EkWBBIbmoKXR8feMHtQcs1P2NPOx2/V4u3xLB+ErJHz2beZ 0EEA== X-Gm-Message-State: AOAM532vtsAA16QaLbQ2tfx7cEmZ1kjZ5b8tjwnzwVEiyUR3tqNfLzkM G3UfBabQ/QCDcZpQWCZ5a7h2Qa7qSrBwVoGnfAqh16yLvvQ6OIoOykuPTu1PSchvqpWzJYUYViX snOMZw+xkA37IDkk= X-Received: by 2002:a5d:40c9:: with SMTP id b9mr2379698wrq.425.1593040030362; Wed, 24 Jun 2020 16:07:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJze2iV2qsngQG7j3SZlkR/9CJ+L5U0si23SP92JJig0dRqd2ib5WamexHA5Mnd7nndhDrokFQ== X-Received: by 2002:a5d:40c9:: with SMTP id b9mr2379685wrq.425.1593040030192; Wed, 24 Jun 2020 16:07:10 -0700 (PDT) Received: from redhat.com (bzq-79-182-31-92.red.bezeqint.net. [79.182.31.92]) by smtp.gmail.com with ESMTPSA id j41sm30234145wre.12.2020.06.24.16.07.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 16:07:09 -0700 (PDT) Date: Wed, 24 Jun 2020 19:07:07 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 15/19] docs/specs/tpm: ACPI boot now supported for TPM/ARM Message-ID: <20200624230609.703104-16-mst@redhat.com> References: <20200624230609.703104-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200624230609.703104-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Received-SPF: pass client-ip=207.211.31.120; envelope-from=mst@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/24 02:33:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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 Maydell , Eric Auger , =?utf-8?q?Marc-Andr=C3=A9?= Lureau , Igor Mammedov , David Gibson , Ard Biesheuvel , Stefan Berger Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Eric Auger ACPI boot now is supported. Let's remove the comment saying it is not. Signed-off-by: Eric Auger Reviewed-by: Stefan Berger Reviewed-by: Igor Mammedov Message-Id: <20200622140620.17229-4-eric.auger@redhat.com> Tested-by: Ard Biesheuvel Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- docs/specs/tpm.rst | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/specs/tpm.rst b/docs/specs/tpm.rst index 5e61238bc5..eeeb93730a 100644 --- a/docs/specs/tpm.rst +++ b/docs/specs/tpm.rst @@ -346,8 +346,6 @@ In case an Arm virt machine is emulated, use the following command line: -drive if=pflash,format=raw,file=flash0.img,readonly \ -drive if=pflash,format=raw,file=flash1.img - On Arm, ACPI boot with TPM is not yet supported. - In case SeaBIOS is used as firmware, it should show the TPM menu item after entering the menu with 'ESC'. From patchwork Wed Jun 24 23:07:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 279476 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C93DCC433DF for ; Wed, 24 Jun 2020 23:16:51 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8FBE7206F7 for ; Wed, 24 Jun 2020 23:16:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="IhHMdQRy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8FBE7206F7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:51842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joEdO-0001wZ-SJ for qemu-devel@archiver.kernel.org; Wed, 24 Jun 2020 19:16:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42394) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joEUD-0000sv-TO for qemu-devel@nongnu.org; Wed, 24 Jun 2020 19:07:21 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:20260 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1joEUB-0001gX-Qb for qemu-devel@nongnu.org; Wed, 24 Jun 2020 19:07:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593040036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=MdpySV97K79Gyh8zeUujKQRFRgwzwS9j5RkITL/a4rs=; b=IhHMdQRyfg0yKudBZbrIjxA/OKFgD156iHX2KLOBwWxKxrYWYstGoMQzzbZWD7edQiXq75 9nzzVyscmiyRv6yRODJcIGugUxbhJlw/YbXqVUzR8qBj/zPz11pyEOryo1jVut5cAQwlcN ACf9iivoRZzrBZxXcVkZSCx4wIuu9Nc= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-501-FWuq9w9sN5yCtCdNgf7K5g-1; Wed, 24 Jun 2020 19:07:14 -0400 X-MC-Unique: FWuq9w9sN5yCtCdNgf7K5g-1 Received: by mail-wr1-f69.google.com with SMTP id a18so4704504wrm.14 for ; Wed, 24 Jun 2020 16:07:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=MdpySV97K79Gyh8zeUujKQRFRgwzwS9j5RkITL/a4rs=; b=RWxLs1Hbsd/5kdikz++wfKntjd5aRddU+l5FYzD8Gx0kKaZKTr969ae2S+NfyW31lc VoInTemXXkZNukQgizvJj+XbLVfwQWwhYJ7MMoiqGTZ9yvcKuaWf5QjZEhGEQFa8ddNV uKbAut5R/GKoSRa1M+k7uh2zuFYEtH3e4Evrd0jTMm99SbLhZsGFgX5D00tjlDPKqZoK poy2/pk6yLulOUkGJDKoF06Z9kmzdyHTIIJCJTW1jjx7VGtVbRDNqvgP1RJU9BnOgISG Qz/7QW8V62Ja5MLmcyq3ujo2ckHWqBw/dE7tP0+inq+/AbMpZskIarlKN7jMpMeTwYFS +0bA== X-Gm-Message-State: AOAM530rWoS8QC655HxioaROCq4/LP98KBCYKtXuOKWvw5Mgi/uZtrcz yznMR405R2rCyk5g/BJEqz9sAnwGUqjqB5oSaqRqleBuoRNwWK0c4RqjuY9FcdNaHgzunfTiZpX Z2h/8ik8iC+stKQI= X-Received: by 2002:a1c:a3c5:: with SMTP id m188mr115014wme.152.1593040032685; Wed, 24 Jun 2020 16:07:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTRFDDBThaWTuJAY59AlbPE0ZSyPfdvKebKQSOi4xN/awIUuLly0594cjWVF9MndH6JPfNZg== X-Received: by 2002:a1c:a3c5:: with SMTP id m188mr115002wme.152.1593040032495; Wed, 24 Jun 2020 16:07:12 -0700 (PDT) Received: from redhat.com (bzq-79-182-31-92.red.bezeqint.net. [79.182.31.92]) by smtp.gmail.com with ESMTPSA id y19sm9316412wmi.6.2020.06.24.16.07.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 16:07:11 -0700 (PDT) Date: Wed, 24 Jun 2020 19:07:10 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 16/19] Stop vhost-user sending uninitialized mmap_offsets Message-ID: <20200624230609.703104-17-mst@redhat.com> References: <20200624230609.703104-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200624230609.703104-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Received-SPF: pass client-ip=207.211.31.81; envelope-from=mst@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/24 01:59:40 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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 Maydell , Stefan Hajnoczi , Raphael Norwitz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Raphael Norwitz Prior to this change, the vhost_user_fill_msg_region function filled out all elements of the VhostUserMemoryRegion struct except the mmap_offset. This function is often called on uninitialized structs, which are then copied into VHOST_USER_SET_MEM_TABLE and VHOST_USER_ADD/REM_MEM_REG messages. In some cases, where the mmap_offset was not needed, it was left uninitialized, causing QEMU to send the backend uninitialized data, which Coverity flagged as a series of issues. This change augments the vhost_user_fill_msg_region API, adding a mmap_offset paramenter, forcing the caller to initialize mmap_offset. Fixes: ece99091c2d0aeb23734289a50ef2ff4e0a08929 Fixes: f1aeb14b0809e313c74244d838645ed25e85ea63 Reported-by: Coverity (CIDs 1429802, 1429803 and 1429804) Suggested-by: Peter Maydell Signed-off-by: Raphael Norwitz Message-Id: <1592650156-25845-1-git-send-email-raphael.norwitz@nutanix.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Peter Maydell Reviewed-by: Stefan Hajnoczi --- hw/virtio/vhost-user.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 4d6cd4e58a..31231218dc 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -460,12 +460,14 @@ static MemoryRegion *vhost_user_get_mr_data(uint64_t addr, ram_addr_t *offset, } static void vhost_user_fill_msg_region(VhostUserMemoryRegion *dst, - struct vhost_memory_region *src) + struct vhost_memory_region *src, + uint64_t mmap_offset) { assert(src != NULL && dst != NULL); dst->userspace_addr = src->userspace_addr; dst->memory_size = src->memory_size; dst->guest_phys_addr = src->guest_phys_addr; + dst->mmap_offset = mmap_offset; } static int vhost_user_fill_set_mem_table_msg(struct vhost_user *u, @@ -500,9 +502,8 @@ static int vhost_user_fill_set_mem_table_msg(struct vhost_user *u, error_report("Failed preparing vhost-user memory table msg"); return -1; } - vhost_user_fill_msg_region(®ion_buffer, reg); + vhost_user_fill_msg_region(®ion_buffer, reg, offset); msg->payload.memory.regions[*fd_num] = region_buffer; - msg->payload.memory.regions[*fd_num].mmap_offset = offset; fds[(*fd_num)++] = fd; } else if (track_ramblocks) { u->region_rb_offset[i] = 0; @@ -649,7 +650,7 @@ static int send_remove_regions(struct vhost_dev *dev, if (fd > 0) { msg->hdr.request = VHOST_USER_REM_MEM_REG; - vhost_user_fill_msg_region(®ion_buffer, shadow_reg); + vhost_user_fill_msg_region(®ion_buffer, shadow_reg, 0); msg->payload.mem_reg.region = region_buffer; if (vhost_user_write(dev, msg, &fd, 1) < 0) { @@ -709,9 +710,8 @@ static int send_add_regions(struct vhost_dev *dev, u->region_rb[reg_idx] = mr->ram_block; } msg->hdr.request = VHOST_USER_ADD_MEM_REG; - vhost_user_fill_msg_region(®ion_buffer, reg); + vhost_user_fill_msg_region(®ion_buffer, reg, offset); msg->payload.mem_reg.region = region_buffer; - msg->payload.mem_reg.region.mmap_offset = offset; if (vhost_user_write(dev, msg, &fd, 1) < 0) { return -1; From patchwork Wed Jun 24 23:07:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 279475 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B6E0C433E0 for ; Wed, 24 Jun 2020 23:20:01 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 51805206F7 for ; Wed, 24 Jun 2020 23:20:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="C3JT2nP8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 51805206F7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56796 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joEgS-00045y-KM for qemu-devel@archiver.kernel.org; Wed, 24 Jun 2020 19:20:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42444) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joEUG-00010w-NT for qemu-devel@nongnu.org; Wed, 24 Jun 2020 19:07:24 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:50652 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1joEUD-0001iW-UD for qemu-devel@nongnu.org; Wed, 24 Jun 2020 19:07:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1593040041; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O1Pk0uuKND2QavcxSvQGg35kYy9TBUCkwDwrM5cX6Tw=; b=C3JT2nP8cXRzRRIdxPn6Qhi40ayUiXBlF+js6U+2AkcUUdv+6lvZiXUGTzOT2hhX7i01mD xeQkj+nLJBG6P2slnQAWdS4TT37+T72S6nmLKXYozdx5nFfOAZwAJrIaR+0RK1VHDNsiU0 sewW6mqvOqZxn9rI4wS4oy6iIHz5+jM= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-140-l9ig1ZxqNXm2V0eMMTKsHQ-1; Wed, 24 Jun 2020 19:07:19 -0400 X-MC-Unique: l9ig1ZxqNXm2V0eMMTKsHQ-1 Received: by mail-wm1-f69.google.com with SMTP id o13so4787495wmh.9 for ; Wed, 24 Jun 2020 16:07:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=O1Pk0uuKND2QavcxSvQGg35kYy9TBUCkwDwrM5cX6Tw=; b=LSWTe2UfcvoUi5ttR4hRk9WkQ/b3UgBeM4nQnosuIrxfsqVP8k0yPKmZLfW4L5ud5O fnLtn7k4lH4F8y9UB+3Bln+53xiAaglid78lpXRt+XDLsvIZNPDP5oYYD2aNOzlG2Pul L9I0MQED+YASunT2uZ4odCkzsPN+FsOx2Wtva8ekdaFgmWzo3wO81+4sxxRY+RNyCgVk wIQfPHYnWP8dFBn6Eipod7PG8cJ9c4rcnGxbO6klrTAMko3R3OOZr/KmkQQwCzDWgKO1 8EskdIqLLtrhpL2O+CZc4+SnAD61X6Ka+4WV7PYzgv0OYZxrGw/3IhHoICIVt5zM8oRx oWRQ== X-Gm-Message-State: AOAM5325kudeVl4GJd8S8ISvdH6ygQ2zzr46C8UezqXgDRg5TJFPvT/m QM9rJyVRmS19CyKEnQWq4ylIJ8kq3a2zbzZnI05W3sfVXVnGh4meLfTrSGHN4gatznpLTacpMDj 8yP8z3592Ndue2Xk= X-Received: by 2002:a1c:9ad8:: with SMTP id c207mr100879wme.45.1593040038028; Wed, 24 Jun 2020 16:07:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5k3ZVx6jwJ4pTZntrtJ2ymfH21rA0QK7PB/58sNX0lJBZnypz7rwZtBxI6hxb/y30pTX+PA== X-Received: by 2002:a1c:9ad8:: with SMTP id c207mr100852wme.45.1593040037802; Wed, 24 Jun 2020 16:07:17 -0700 (PDT) Received: from redhat.com (bzq-79-182-31-92.red.bezeqint.net. [79.182.31.92]) by smtp.gmail.com with ESMTPSA id l17sm10210326wmh.14.2020.06.24.16.07.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 16:07:17 -0700 (PDT) Date: Wed, 24 Jun 2020 19:07:15 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 18/19] tests/qtest/bios-tables: Only run the TPM test with CONFIG_TPM enabled Message-ID: <20200624230609.703104-19-mst@redhat.com> References: <20200624230609.703104-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200624230609.703104-1-mst@redhat.com> X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Received-SPF: pass client-ip=205.139.110.61; envelope-from=mst@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/24 00:34:35 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Laurent Vivier , Peter Maydell , Thomas Huth , eric.auger@redhat.com, Paolo Bonzini , Igor Mammedov , Philippe =?utf-8?q?Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth "make check-qtest" currently fails if configure has been run with "--disable-tpm" - the TPM-related tests can only work if the TPM is enabled in the build. So let's use the CONFIG_TPM switch to disable the test if TPM is not available. Signed-off-by: Thomas Huth Message-Id: <20200615125402.12898-1-thuth@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Fixes: 5da7c35e25 ("bios-tables-test: Add Q35/TPM-TIS test") Cc: eric.auger@redhat.com Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- tests/qtest/bios-tables-test.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index c315156858..3bd57b830d 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -877,6 +877,8 @@ static void test_acpi_piix4_tcg_numamem(void) free_test_data(&data); } +#ifdef CONFIG_TPM + uint64_t tpm_tis_base_addr; static void test_acpi_tcg_tpm(const char *machine, const char *tpm_if, @@ -935,6 +937,8 @@ static void test_acpi_q35_tcg_tpm_tis(void) test_acpi_tcg_tpm("q35", "tis", 0xFED40000); } +#endif /* CONFIG_TPM */ + static void test_acpi_tcg_dimm_pxm(const char *machine) { test_data data; @@ -1098,7 +1102,9 @@ int main(int argc, char *argv[]) return ret; } +#ifdef CONFIG_TPM qtest_add_func("acpi/q35/tpm-tis", test_acpi_q35_tcg_tpm_tis); +#endif qtest_add_func("acpi/piix4", test_acpi_piix4_tcg); qtest_add_func("acpi/piix4/bridge", test_acpi_piix4_tcg_bridge); qtest_add_func("acpi/q35", test_acpi_q35_tcg);