From nobody Sat May 18 11:46:50 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1607606904; cv=none; d=zohomail.com; s=zohoarc; b=Z0MKI7Y8bZqFOmSv49XnuRbpfc+WMUk7UPXofsGY6wrhLPOq/HuecImNoUBwtqP8Iwn28iCc6T/vDu5XYk3XPEjMtcbC8+fPZWP4Xalo1E/YuJLuUAKiZu0h35ScJiGb8ACFIkxRN0hGBpbmx/3phIB6ysmXpu1OOsYCVnDBsVg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607606904; 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; bh=5Dm4uLkhOhBxPHBrz6/awUBe8bZ/FLYqEi8eUvp/YJ8=; b=NVmnQEhVjsi4+kjqKps7rrpF/soHv/D76b/q22EwMt7a6eTzjUooHF6dZ7MEcACYcVr9R6YEn/5xQPyPFVP/K5nlw0+I+AQPE8WN4/J/b9eyqJtqJMGF+nbmGB+lRAie4bfetmOWIZNsLDIypVuym34/aGlDqdTARGjZtZvZ1mw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1607606904687274.8458239153707; Thu, 10 Dec 2020 05:28:24 -0800 (PST) Received: from localhost ([::1]:42502 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knLzb-0007GF-HZ for importer@patchew.org; Thu, 10 Dec 2020 08:28:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57126) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knKpy-0003iS-Qq for qemu-devel@nongnu.org; Thu, 10 Dec 2020 07:14:23 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:39346) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knKpr-0006sm-Gv for qemu-devel@nongnu.org; Thu, 10 Dec 2020 07:14:22 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-127-f35fEnDoMW2Sgpp8d65BaA-1; Thu, 10 Dec 2020 07:14:11 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B95BA100C664; Thu, 10 Dec 2020 12:14:10 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-94.ams2.redhat.com [10.36.112.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id CBF615C26D; Thu, 10 Dec 2020 12:14:00 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id AE979A1EE; Thu, 10 Dec 2020 13:13:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607602454; 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=5Dm4uLkhOhBxPHBrz6/awUBe8bZ/FLYqEi8eUvp/YJ8=; b=WgJcslVU7jgG+XG24m540gYBsIBhcbCHnT4FYp2tB+AxHk87MkKJZEGmuoVG3yw+2PBnZ1 LyyILEqIbPVAnb5PsxaGiMpAOQ6qTlV9JoDQbJF4NhxWffUVJjrtteI2RBlGOWVcIF4XaJ udflEH8vdXlNya7zYZbiSt8c6a//fDc= X-MC-Unique: f35fEnDoMW2Sgpp8d65BaA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 01/11] x86: rewrite gsi_handler() Date: Thu, 10 Dec 2020 13:13:49 +0100 Message-Id: <20201210121359.18320-2-kraxel@redhat.com> In-Reply-To: <20201210121359.18320-1-kraxel@redhat.com> References: <20201210121359.18320-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no 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: Eduardo Habkost , Sergio Lopez , "Michael S. Tsirkin" , Richard Henderson , Gerd Hoffmann , Paolo Bonzini , 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-Type: text/plain; charset="utf-8" Rewrite function to use switch() for IRQ number mapping. Check i8259_irq exists before raising it so the function also works in case no i8259 (aka pic) is present. Signed-off-by: Gerd Hoffmann Reviewed-by: Igor Mammedov Reviewed-by: Michael S. Tsirkin Message-id: 20201203105423.10431-3-kraxel@redhat.com --- hw/i386/x86.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 5944fc44edca..b67e7b789f89 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -588,11 +588,17 @@ void gsi_handler(void *opaque, int n, int level) GSIState *s =3D opaque; =20 trace_x86_gsi_interrupt(n, level); - if (n < ISA_NUM_IRQS) { - /* Under KVM, Kernel will forward to both PIC and IOAPIC */ - qemu_set_irq(s->i8259_irq[n], level); + switch (n) { + case 0 ... ISA_NUM_IRQS - 1: + if (s->i8259_irq[n]) { + /* Under KVM, Kernel will forward to both PIC and IOAPIC */ + qemu_set_irq(s->i8259_irq[n], level); + } + /* fall through */ + case ISA_NUM_IRQS ... IOAPIC_NUM_PINS - 1: + qemu_set_irq(s->ioapic_irq[n], level); + break; } - qemu_set_irq(s->ioapic_irq[n], level); } =20 void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name) --=20 2.27.0 From nobody Sat May 18 11:46:50 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1607612143; cv=none; d=zohomail.com; s=zohoarc; b=UCn9qbIieODgcZgZTYanZClaMk9/FlhTLdOneUfeNEft0+Lk6Z8ixwQonMiYT/546JlaYkHhm+G9JTLT82lQS5gxHDxM7pX9+Sgg2vMc/bv0BoObls8zEBy9RhbE1mTglNVebr3F5YFwe7Rbk7/HMczMnQN31X7Ovs4lkBFSIw0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607612143; 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; bh=E339ra7dN/rNJELo+FfdX1Z1O0AZQC/u2p7HOvR5onE=; b=SCTVjVf5Go90SEp3jaqt85/syIDydXigO0yhRdU5B3HpWJMcH7GgPeW2xxiHKUcgNlpXAJsr33zwarDl5S4+0I64SfEzZ2TwTYipE1EzRo38jZfQyiAu7s2wyW42Mi6qkIBVu1kYxChy7CKMNtHABbb9NP9LihOqmIH6JfPSXeE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1607612143224824.9371436934576; Thu, 10 Dec 2020 06:55:43 -0800 (PST) Received: from localhost ([::1]:48228 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knLab-0002hZ-Oq for importer@patchew.org; Thu, 10 Dec 2020 08:02:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knKq0-0003ia-NC for qemu-devel@nongnu.org; Thu, 10 Dec 2020 07:14:25 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:23682) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knKpr-0006t5-Jv for qemu-devel@nongnu.org; Thu, 10 Dec 2020 07:14:24 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-158-CtIPLvIkPhai2UF1qpznYg-1; Thu, 10 Dec 2020 07:14:12 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EBA7A80362A; Thu, 10 Dec 2020 12:14:10 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-94.ams2.redhat.com [10.36.112.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id CE28460BF3; Thu, 10 Dec 2020 12:14:00 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id BF8FFA1FB; Thu, 10 Dec 2020 13:13:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607602454; 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=E339ra7dN/rNJELo+FfdX1Z1O0AZQC/u2p7HOvR5onE=; b=W2BHA5BW+njvp5hpPHWbX7yhCFEviHogkwbzUNyLThbQ/llW84EG1ZbX1gptCcwFRqUGKA rudJ7PAXa6QqKBox5yAMI53RhikbI45B679LyO1pRRorcDWu1gD0oVaRWOFgE4cFwJoGr0 6hjDtkVWwQFXzlBWxjLK5yf26v+mvuM= X-MC-Unique: CtIPLvIkPhai2UF1qpznYg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 02/11] x86: add support for second ioapic Date: Thu, 10 Dec 2020 13:13:50 +0100 Message-Id: <20201210121359.18320-3-kraxel@redhat.com> In-Reply-To: <20201210121359.18320-1-kraxel@redhat.com> References: <20201210121359.18320-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: Eduardo Habkost , Sergio Lopez , "Michael S. Tsirkin" , Richard Henderson , Gerd Hoffmann , Paolo Bonzini , 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-Type: text/plain; charset="utf-8" Add ioapic_init_secondary to initialize it, wire up in gsi handling and acpi apic table creation. Signed-off-by: Gerd Hoffmann Reviewed-by: Michael S. Tsirkin Reviewed-by: Igor Mammedov Reviewed-by: Sergio Lopez Message-id: 20201203105423.10431-4-kraxel@redhat.com --- include/hw/i386/ioapic.h | 2 ++ include/hw/i386/ioapic_internal.h | 2 +- include/hw/i386/x86.h | 3 +++ hw/i386/acpi-common.c | 10 ++++++++++ hw/i386/x86.c | 21 +++++++++++++++++++++ 5 files changed, 37 insertions(+), 1 deletion(-) diff --git a/include/hw/i386/ioapic.h b/include/hw/i386/ioapic.h index 06bfaaeac6b8..ef37b8a9fda1 100644 --- a/include/hw/i386/ioapic.h +++ b/include/hw/i386/ioapic.h @@ -22,6 +22,8 @@ =20 #define IOAPIC_NUM_PINS 24 #define IO_APIC_DEFAULT_ADDRESS 0xfec00000 +#define IO_APIC_SECONDARY_ADDRESS (IO_APIC_DEFAULT_ADDRESS + 0x10000) +#define IO_APIC_SECONDARY_IRQBASE 24 /* primary 0 -> 23, secondary 24 -> 4= 7 */ =20 #define TYPE_KVM_IOAPIC "kvm-ioapic" #define TYPE_IOAPIC "ioapic" diff --git a/include/hw/i386/ioapic_internal.h b/include/hw/i386/ioapic_int= ernal.h index 0f9002a2c23e..021e715f1131 100644 --- a/include/hw/i386/ioapic_internal.h +++ b/include/hw/i386/ioapic_internal.h @@ -27,7 +27,7 @@ #include "qemu/notify.h" #include "qom/object.h" =20 -#define MAX_IOAPICS 1 +#define MAX_IOAPICS 2 =20 #define IOAPIC_LVT_DEST_SHIFT 56 #define IOAPIC_LVT_DEST_IDX_SHIFT 48 diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h index 739fac50871b..3f9b052cfc34 100644 --- a/include/hw/i386/x86.h +++ b/include/hw/i386/x86.h @@ -50,6 +50,7 @@ struct X86MachineState { ISADevice *rtc; FWCfgState *fw_cfg; qemu_irq *gsi; + DeviceState *ioapic2; GMappedFile *initrd_mapped_file; HotplugHandler *acpi_dev; =20 @@ -120,10 +121,12 @@ bool x86_machine_is_acpi_enabled(const X86MachineStat= e *x86ms); typedef struct GSIState { qemu_irq i8259_irq[ISA_NUM_IRQS]; qemu_irq ioapic_irq[IOAPIC_NUM_PINS]; + qemu_irq ioapic2_irq[IOAPIC_NUM_PINS]; } GSIState; =20 qemu_irq x86_allocate_cpu_irq(void); void gsi_handler(void *opaque, int n, int level); void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name); +DeviceState *ioapic_init_secondary(GSIState *gsi_state); =20 #endif diff --git a/hw/i386/acpi-common.c b/hw/i386/acpi-common.c index 8a769654060e..a6a30e836339 100644 --- a/hw/i386/acpi-common.c +++ b/hw/i386/acpi-common.c @@ -103,6 +103,16 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *l= inker, io_apic->address =3D cpu_to_le32(IO_APIC_DEFAULT_ADDRESS); io_apic->interrupt =3D cpu_to_le32(0); =20 + if (x86ms->ioapic2) { + AcpiMadtIoApic *io_apic2; + io_apic2 =3D acpi_data_push(table_data, sizeof *io_apic); + io_apic2->type =3D ACPI_APIC_IO; + io_apic2->length =3D sizeof(*io_apic); + io_apic2->io_apic_id =3D ACPI_BUILD_IOAPIC_ID + 1; + io_apic2->address =3D cpu_to_le32(IO_APIC_SECONDARY_ADDRESS); + io_apic2->interrupt =3D cpu_to_le32(IO_APIC_SECONDARY_IRQBASE); + } + if (x86ms->apic_xrupt_override) { intsrcovr =3D acpi_data_push(table_data, sizeof *intsrcovr); intsrcovr->type =3D ACPI_APIC_XRUPT_OVERRIDE; diff --git a/hw/i386/x86.c b/hw/i386/x86.c index b67e7b789f89..d68a9eaefc2c 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -598,6 +598,10 @@ void gsi_handler(void *opaque, int n, int level) case ISA_NUM_IRQS ... IOAPIC_NUM_PINS - 1: qemu_set_irq(s->ioapic_irq[n], level); break; + case IO_APIC_SECONDARY_IRQBASE + ... IO_APIC_SECONDARY_IRQBASE + IOAPIC_NUM_PINS - 1: + qemu_set_irq(s->ioapic2_irq[n - IO_APIC_SECONDARY_IRQBASE], level); + break; } } =20 @@ -624,6 +628,23 @@ void ioapic_init_gsi(GSIState *gsi_state, const char *= parent_name) } } =20 +DeviceState *ioapic_init_secondary(GSIState *gsi_state) +{ + DeviceState *dev; + SysBusDevice *d; + unsigned int i; + + dev =3D qdev_new(TYPE_IOAPIC); + d =3D SYS_BUS_DEVICE(dev); + sysbus_realize_and_unref(d, &error_fatal); + sysbus_mmio_map(d, 0, IO_APIC_SECONDARY_ADDRESS); + + for (i =3D 0; i < IOAPIC_NUM_PINS; i++) { + gsi_state->ioapic2_irq[i] =3D qdev_get_gpio_in(dev, i); + } + return dev; +} + struct setup_data { uint64_t next; uint32_t type; --=20 2.27.0 From nobody Sat May 18 11:46:50 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1607605057; cv=none; d=zohomail.com; s=zohoarc; b=B7FeOzPD10/bNDwKstTFk92PDmrsSnaxyPxr2VrkZ98sQ1ZqZjXjeoplqdB5CW0kpHzt6pUw/y8oMyJmOZdM/TCiJ5Cqpx5Ai6DkRZSlll4HRiGU2FZzHZVxcu31rg8p6laoKyf36DNKlBFxTkF7Aw4diCzy16UgmekJNVtO2+Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607605057; 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; bh=iATpMF+fzI3jAbrXoY/IGjL2pyXbrxyiPKBeucFMvrw=; b=bPrJLk+VMQs4CNdy1GQf0FN5k28k2yNIkrhyHShIDelqEXffGeXexrZyfJDBSBzY2l/b6HjjKmRDC0FYPRCCsUEAGgtJRz807Mu2s35GvE9E0VWrQOjZB9VHQm5CDxQPXpUKIokWXPyGm1GSqvhVfWgJhmLoFw8DzHHAuflAu94= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1607605057022354.84393799709585; Thu, 10 Dec 2020 04:57:37 -0800 (PST) Received: from localhost ([::1]:40100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knLVm-0007Zw-3s for importer@patchew.org; Thu, 10 Dec 2020 07:57:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knKpu-0003gU-PH for qemu-devel@nongnu.org; Thu, 10 Dec 2020 07:14:18 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:49641) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knKpr-0006sn-Gu for qemu-devel@nongnu.org; Thu, 10 Dec 2020 07:14:18 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-189-G2TrJoX0N4-jSGt_bCB8Lg-1; Thu, 10 Dec 2020 07:14:11 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 91041803627; Thu, 10 Dec 2020 12:14:10 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-94.ams2.redhat.com [10.36.112.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id D467F5D9E2; Thu, 10 Dec 2020 12:14:00 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id CB2C19D92; Thu, 10 Dec 2020 13:13:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607602454; 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=iATpMF+fzI3jAbrXoY/IGjL2pyXbrxyiPKBeucFMvrw=; b=Wpb7Er3WoKw++LZLBKJi3c8enuYNxJj4+et0MdzrVd45DHNiZg0+pnZFIvlgOOvqvK2dfG PDZs2d+0Lzg5Mhxbs1evZ/2DMr3ErHojY8zdvTDfMKJK4MRtev6/6qkMRXOHV1LMzeEyyP o4knwB7VDmUKgVtbWLedc7H7afy3P0k= X-MC-Unique: G2TrJoX0N4-jSGt_bCB8Lg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 03/11] microvm: make number of virtio transports runtime changeable Date: Thu, 10 Dec 2020 13:13:51 +0100 Message-Id: <20201210121359.18320-4-kraxel@redhat.com> In-Reply-To: <20201210121359.18320-1-kraxel@redhat.com> References: <20201210121359.18320-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: Eduardo Habkost , Sergio Lopez , "Michael S. Tsirkin" , Richard Henderson , Gerd Hoffmann , Paolo Bonzini , 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-Type: text/plain; charset="utf-8" This will allow to increase the number of transports in case we have enough irq lines available for them all. Signed-off-by: Gerd Hoffmann Reviewed-by: Michael S. Tsirkin Reviewed-by: Igor Mammedov Reviewed-by: Sergio Lopez Message-id: 20201203105423.10431-5-kraxel@redhat.com --- include/hw/i386/microvm.h | 2 +- hw/i386/microvm.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/include/hw/i386/microvm.h b/include/hw/i386/microvm.h index 0fc216007777..c5d60bacb5e8 100644 --- a/include/hw/i386/microvm.h +++ b/include/hw/i386/microvm.h @@ -52,7 +52,6 @@ =20 /* Platform virtio definitions */ #define VIRTIO_MMIO_BASE 0xfeb00000 -#define VIRTIO_NUM_TRANSPORTS 8 #define VIRTIO_CMDLINE_MAXLEN 64 =20 #define GED_MMIO_BASE 0xfea00000 @@ -98,6 +97,7 @@ struct MicrovmMachineState { =20 /* Machine state */ uint32_t virtio_irq_base; + uint32_t virtio_num_transports; bool kernel_cmdline_fixed; Notifier machine_done; Notifier powerdown_req; diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 5428448b7059..e92f236bf442 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -178,8 +178,13 @@ static void microvm_devices_init(MicrovmMachineState *= mms) =20 kvmclock_create(true); =20 - mms->virtio_irq_base =3D x86_machine_is_acpi_enabled(x86ms) ? 16 : 5; - for (i =3D 0; i < VIRTIO_NUM_TRANSPORTS; i++) { + mms->virtio_irq_base =3D 5; + mms->virtio_num_transports =3D 8; + if (x86_machine_is_acpi_enabled(x86ms)) { + mms->virtio_irq_base =3D 16; + } + + for (i =3D 0; i < mms->virtio_num_transports; i++) { sysbus_create_simple("virtio-mmio", VIRTIO_MMIO_BASE + i * 512, x86ms->gsi[mms->virtio_irq_base + i]); --=20 2.27.0 From nobody Sat May 18 11:46:50 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1607611923; cv=none; d=zohomail.com; s=zohoarc; b=WTtoKEzS/vxKUpv/m1i/xKB7+kb5y5dK2+TpiHaZMfLhR3uKM2v98AvJiaN009MnziBItRmx0vRYp8QI4P5483KlzBQGzGH16jxA3dfeSe6j9yfFQJIab4Z4Zd5hp+aXTkyXa9JEXPgt5seAarULY/rscEesMtO9pvkOG7oIFhY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607611923; 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; bh=l/qgyaDCneZjDwCmj/pfvCtup6tX6mCqb1hy+jm8GnM=; b=bq1+CHYzfv518sbb3zREy/b52RD5rMCyo70iuIccrNrMZtAA6Tp1AOppScV424WCqsMdVQatMiUW3UiQzlRMLK2uIa+vT8dR19hPu6WrT+KPLuyJf6p/TVA82a2yrEIVBLfuDxb1/ZZ5+JDVboUt0oYousrs3le4cAttO06IJaA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1607611923566140.78494860156127; Thu, 10 Dec 2020 06:52:03 -0800 (PST) Received: from localhost ([::1]:37270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knLjq-0001b3-68 for importer@patchew.org; Thu, 10 Dec 2020 08:12:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57226) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knKq6-0003jg-DH for qemu-devel@nongnu.org; Thu, 10 Dec 2020 07:14:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:43641) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knKpr-0006sJ-GO for qemu-devel@nongnu.org; Thu, 10 Dec 2020 07:14:28 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-518-PKEhG_GRMZiei5MbOZ3O4w-1; Thu, 10 Dec 2020 07:14:11 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BF01D107ACF7; Thu, 10 Dec 2020 12:14:10 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-94.ams2.redhat.com [10.36.112.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF77A5C277; Thu, 10 Dec 2020 12:14:00 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id D67999D99; Thu, 10 Dec 2020 13:13:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607602453; 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=l/qgyaDCneZjDwCmj/pfvCtup6tX6mCqb1hy+jm8GnM=; b=eNmC+Gr5C0SDLcqBKMro5moooNs6/OplQAVjQ3N1QoqWeEdw1ro2+6Q7oaoKk3ldNfyWkm E6dnfPEjgR/GVN6bb4LK3hknqmkRGKtZmvh5R5CnHG/O43u4LtizGz3z92M2m+qvpHDX7h FrG3FSOMfmVlYe+BAI1tmDZBGjSnCgE= X-MC-Unique: PKEhG_GRMZiei5MbOZ3O4w-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 04/11] microvm: make pcie irq base runtime changeable Date: Thu, 10 Dec 2020 13:13:52 +0100 Message-Id: <20201210121359.18320-5-kraxel@redhat.com> In-Reply-To: <20201210121359.18320-1-kraxel@redhat.com> References: <20201210121359.18320-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no 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: Eduardo Habkost , Sergio Lopez , "Michael S. Tsirkin" , Richard Henderson , Gerd Hoffmann , Paolo Bonzini , 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-Type: text/plain; charset="utf-8" Allows to move them in case we have enough irq lines available. Signed-off-by: Gerd Hoffmann Reviewed-by: Igor Mammedov Reviewed-by: Michael S. Tsirkin Reviewed-by: Sergio Lopez Message-id: 20201203105423.10431-6-kraxel@redhat.com --- include/hw/i386/microvm.h | 2 +- hw/i386/microvm.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/hw/i386/microvm.h b/include/hw/i386/microvm.h index c5d60bacb5e8..f1e9db059b85 100644 --- a/include/hw/i386/microvm.h +++ b/include/hw/i386/microvm.h @@ -66,7 +66,6 @@ #define PCIE_MMIO_SIZE 0x20000000 #define PCIE_ECAM_BASE 0xe0000000 #define PCIE_ECAM_SIZE 0x10000000 -#define PCIE_IRQ_BASE 12 =20 /* Machine type options */ #define MICROVM_MACHINE_PIT "pit" @@ -96,6 +95,7 @@ struct MicrovmMachineState { bool auto_kernel_cmdline; =20 /* Machine state */ + uint32_t pcie_irq_base; uint32_t virtio_irq_base; uint32_t virtio_num_transports; bool kernel_cmdline_fixed; diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index e92f236bf442..5e4182b47464 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -181,6 +181,7 @@ static void microvm_devices_init(MicrovmMachineState *m= ms) mms->virtio_irq_base =3D 5; mms->virtio_num_transports =3D 8; if (x86_machine_is_acpi_enabled(x86ms)) { + mms->pcie_irq_base =3D 12; mms->virtio_irq_base =3D 16; } =20 @@ -226,12 +227,12 @@ static void microvm_devices_init(MicrovmMachineState = *mms) mms->gpex.mmio32.size =3D PCIE_MMIO_SIZE; mms->gpex.ecam.base =3D PCIE_ECAM_BASE; mms->gpex.ecam.size =3D PCIE_ECAM_SIZE; - mms->gpex.irq =3D PCIE_IRQ_BASE; + mms->gpex.irq =3D mms->pcie_irq_base; create_gpex(mms); - x86ms->pci_irq_mask =3D ((1 << (PCIE_IRQ_BASE + 0)) | - (1 << (PCIE_IRQ_BASE + 1)) | - (1 << (PCIE_IRQ_BASE + 2)) | - (1 << (PCIE_IRQ_BASE + 3))); + x86ms->pci_irq_mask =3D ((1 << (mms->pcie_irq_base + 0)) | + (1 << (mms->pcie_irq_base + 1)) | + (1 << (mms->pcie_irq_base + 2)) | + (1 << (mms->pcie_irq_base + 3))); } else { x86ms->pci_irq_mask =3D 0; } --=20 2.27.0 From nobody Sat May 18 11:46:50 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1607604786; cv=none; d=zohomail.com; s=zohoarc; b=Sq0RRzW9LYepnWPrUKg1RYZsSW1oCkMt73i7CIbsGNMEWN2VoGVuxfdNlCSwDXuqHluH+9w0lK3UjJGsAbQRGx+6a4snEuY+OTX2LSUHWIGNbgATvNpBfzjMFGS0bP4FALaoz0LYSGP7T1wAaIY8dPj0ixFxaPIMdKvAc218n3E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607604786; 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; bh=xRH+pjGzGtRjy6FKKl80YM75BEmp/+t5H86RzdzmFUs=; b=PBzZIw0KEs684eysoaCIcJ1ikjFBlSraEQ1M//vKJZFO3KLVBvoLbHSfpYBd3C9X4a/NGIaKv9j9ktPFbmaXoI6T4PYx9sCmFbKzXnAqYP1l59zuHnlQ3Rhasxqvnw9hvLGby1e39kITmLdKaYVVbU/S+wFTYbuyQZsPfnXxczI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1607604786179899.5309753590898; Thu, 10 Dec 2020 04:53:06 -0800 (PST) Received: from localhost ([::1]:56276 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knLRR-0002dA-2a for importer@patchew.org; Thu, 10 Dec 2020 07:53:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knKqE-0003pn-7Y for qemu-devel@nongnu.org; Thu, 10 Dec 2020 07:14:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:46983) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knKq1-0006w8-HZ for qemu-devel@nongnu.org; Thu, 10 Dec 2020 07:14:37 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-3-JTa9nMeeOHSa2_CgyApFRg-1; Thu, 10 Dec 2020 07:14:22 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4CEF318C8C00; Thu, 10 Dec 2020 12:14:21 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-94.ams2.redhat.com [10.36.112.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9E2F15275D; Thu, 10 Dec 2020 12:14:11 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id DF9919D9B; Thu, 10 Dec 2020 13:13:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607602465; 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=xRH+pjGzGtRjy6FKKl80YM75BEmp/+t5H86RzdzmFUs=; b=eYweoNtzta7unfgVRU5mtXEesWlG7fnnbmxuujO/0vAuAK3zhtYsA0Z7e884W/3vuVXL29 4VcR7nvJGuPuea3zQvkP05O844FEiaRYq/1EqhjNH+71s1spXgWvvYJ6eJDkZspSDguqvq 0e8lg9NleTHNnCqJtInyiUOl31ye5ho= X-MC-Unique: JTa9nMeeOHSa2_CgyApFRg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 05/11] microvm: drop microvm_gsi_handler() Date: Thu, 10 Dec 2020 13:13:53 +0100 Message-Id: <20201210121359.18320-6-kraxel@redhat.com> In-Reply-To: <20201210121359.18320-1-kraxel@redhat.com> References: <20201210121359.18320-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: Eduardo Habkost , Sergio Lopez , "Michael S. Tsirkin" , Richard Henderson , Gerd Hoffmann , Paolo Bonzini , 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-Type: text/plain; charset="utf-8" With the improved gsi_handler() we don't need our private version any more. Signed-off-by: Gerd Hoffmann Reviewed-by: Igor Mammedov Reviewed-by: Michael S. Tsirkin Reviewed-by: Sergio Lopez Message-id: 20201203105423.10431-7-kraxel@redhat.com --- hw/i386/microvm.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 5e4182b47464..829b376a1278 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -96,13 +96,6 @@ static void microvm_set_rtc(MicrovmMachineState *mms, IS= ADevice *s) rtc_set_memory(s, 0x5d, val >> 16); } =20 -static void microvm_gsi_handler(void *opaque, int n, int level) -{ - GSIState *s =3D opaque; - - qemu_set_irq(s->ioapic_irq[n], level); -} - static void create_gpex(MicrovmMachineState *mms) { X86MachineState *x86ms =3D X86_MACHINE(mms); @@ -163,12 +156,7 @@ static void microvm_devices_init(MicrovmMachineState *= mms) /* Core components */ =20 gsi_state =3D g_malloc0(sizeof(*gsi_state)); - if (mms->pic =3D=3D ON_OFF_AUTO_ON || mms->pic =3D=3D ON_OFF_AUTO_AUTO= ) { - x86ms->gsi =3D qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_= PINS); - } else { - x86ms->gsi =3D qemu_allocate_irqs(microvm_gsi_handler, - gsi_state, GSI_NUM_PINS); - } + x86ms->gsi =3D qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS= ); =20 isa_bus =3D isa_bus_new(NULL, get_system_memory(), get_system_io(), &error_abort); --=20 2.27.0 From nobody Sat May 18 11:46:50 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1607607082; cv=none; d=zohomail.com; s=zohoarc; b=B8dSSy5NwCUv20Bk1BH7xqf27GwotDvUl8+XT3FoyvHjP/ibyuDsQmMXr/m/xN7YFo59BkRhLePSlUkRQT1sy859DWUGWAfnvYTXhhueq7uNaimH+rBj2mnsS0nlBI3SshCUDV/H4Iu6uBG+a8hS6bgldmmJuVyrF8Vn9ZnEeuA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607607082; 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; bh=Vsnziv8lsVasLDIsDSb35ijlknBI77YgIERjlDvVxNQ=; b=OMyFrIn1jzdey620MVii/yRIQjc5CRMCoxmPTLe/UKQx+VtANWNyDNhWRW6+69bPBD2ECxg57SqqPWtI+B6TCUBgDHOOe2uCeR7QsiNMoecFP0ywh/u9KKc+/PG0O90k71h9kqKOrq6m8Nh3WWvNFAKl3Zx6j+Bxg/Ql5/VtBrE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1607607082176420.7626802351647; Thu, 10 Dec 2020 05:31:22 -0800 (PST) Received: from localhost ([::1]:48980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knM2S-0001by-TM for importer@patchew.org; Thu, 10 Dec 2020 08:31:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57262) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knKqB-0003ld-Kl for qemu-devel@nongnu.org; Thu, 10 Dec 2020 07:14:36 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:39638) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knKq1-0006w4-HN for qemu-devel@nongnu.org; Thu, 10 Dec 2020 07:14:34 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-37-U3NcXLbeNuCPM1zbZkfnmw-1; Thu, 10 Dec 2020 07:14:22 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 88B5318C8C02; Thu, 10 Dec 2020 12:14:21 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-94.ams2.redhat.com [10.36.112.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id A001F6E41C; Thu, 10 Dec 2020 12:14:11 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id ECB689D9C; Thu, 10 Dec 2020 13:13:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607602464; 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=Vsnziv8lsVasLDIsDSb35ijlknBI77YgIERjlDvVxNQ=; b=Hr0j0ogN0EnHUs5cOljP5+kmL4eGVeMI686zgG8gzWigVCE1Uy6He7BAMb+YPfx3aqXJzx g4AoL05+Ky5mXsOSnutAXbDnLYK/m+zQcBim2kC23fypTGZRzHPjIMPQUeSAK03kyMLsAq cWVBAlrtzE1lcpSo6rcwHPIPFBw4r38= X-MC-Unique: U3NcXLbeNuCPM1zbZkfnmw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 06/11] microvm: add second ioapic Date: Thu, 10 Dec 2020 13:13:54 +0100 Message-Id: <20201210121359.18320-7-kraxel@redhat.com> In-Reply-To: <20201210121359.18320-1-kraxel@redhat.com> References: <20201210121359.18320-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: Eduardo Habkost , Sergio Lopez , "Michael S. Tsirkin" , Richard Henderson , Gerd Hoffmann , Paolo Bonzini , 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-Type: text/plain; charset="utf-8" Create second ioapic, route virtio-mmio IRQs to it, allow more virtio-mmio devices (24 instead of 8). Needs ACPI, enabled by default, can be turned off using -machine ioapic2=3Doff Signed-off-by: Gerd Hoffmann Reviewed-by: Michael S. Tsirkin Reviewed-by: Igor Mammedov Reviewed-by: Sergio Lopez Message-id: 20201203105423.10431-8-kraxel@redhat.com --- include/hw/i386/microvm.h | 2 ++ hw/i386/microvm.c | 56 +++++++++++++++++++++++++++++++--- tests/qtest/bios-tables-test.c | 8 ++--- 3 files changed, 57 insertions(+), 9 deletions(-) diff --git a/include/hw/i386/microvm.h b/include/hw/i386/microvm.h index f1e9db059b85..f25f8374413f 100644 --- a/include/hw/i386/microvm.h +++ b/include/hw/i386/microvm.h @@ -72,6 +72,7 @@ #define MICROVM_MACHINE_PIC "pic" #define MICROVM_MACHINE_RTC "rtc" #define MICROVM_MACHINE_PCIE "pcie" +#define MICROVM_MACHINE_IOAPIC2 "ioapic2" #define MICROVM_MACHINE_ISA_SERIAL "isa-serial" #define MICROVM_MACHINE_OPTION_ROMS "x-option-roms" #define MICROVM_MACHINE_AUTO_KERNEL_CMDLINE "auto-kernel-cmdline" @@ -90,6 +91,7 @@ struct MicrovmMachineState { OnOffAuto pit; OnOffAuto rtc; OnOffAuto pcie; + OnOffAuto ioapic2; bool isa_serial; bool option_roms; bool auto_kernel_cmdline; diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 829b376a1278..56886086133c 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -145,32 +145,53 @@ static void create_gpex(MicrovmMachineState *mms) } } =20 +static int microvm_ioapics(MicrovmMachineState *mms) +{ + if (!x86_machine_is_acpi_enabled(X86_MACHINE(mms))) { + return 1; + } + if (mms->ioapic2 =3D=3D ON_OFF_AUTO_OFF) { + return 1; + } + return 2; +} + static void microvm_devices_init(MicrovmMachineState *mms) { X86MachineState *x86ms =3D X86_MACHINE(mms); ISABus *isa_bus; ISADevice *rtc_state; GSIState *gsi_state; + int ioapics; int i; =20 /* Core components */ - + ioapics =3D microvm_ioapics(mms); gsi_state =3D g_malloc0(sizeof(*gsi_state)); - x86ms->gsi =3D qemu_allocate_irqs(gsi_handler, gsi_state, GSI_NUM_PINS= ); + x86ms->gsi =3D qemu_allocate_irqs(gsi_handler, gsi_state, + IOAPIC_NUM_PINS * ioapics); =20 isa_bus =3D isa_bus_new(NULL, get_system_memory(), get_system_io(), &error_abort); isa_bus_irqs(isa_bus, x86ms->gsi); =20 ioapic_init_gsi(gsi_state, "machine"); + if (ioapics > 1) { + x86ms->ioapic2 =3D ioapic_init_secondary(gsi_state); + } =20 kvmclock_create(true); =20 mms->virtio_irq_base =3D 5; mms->virtio_num_transports =3D 8; - if (x86_machine_is_acpi_enabled(x86ms)) { - mms->pcie_irq_base =3D 12; - mms->virtio_irq_base =3D 16; + if (x86ms->ioapic2) { + mms->pcie_irq_base =3D 16; /* 16 -> 19 */ + /* use second ioapic (24 -> 47) for virtio-mmio irq lines */ + mms->virtio_irq_base =3D IO_APIC_SECONDARY_IRQBASE; + mms->virtio_num_transports =3D IOAPIC_NUM_PINS; + } else if (x86_machine_is_acpi_enabled(x86ms)) { + mms->pcie_irq_base =3D 12; /* 12 -> 15 */ + mms->virtio_irq_base =3D 16; /* 16 -> 23 */ } =20 for (i =3D 0; i < mms->virtio_num_transports; i++) { @@ -544,6 +565,23 @@ static void microvm_machine_set_pcie(Object *obj, Visi= tor *v, const char *name, visit_type_OnOffAuto(v, name, &mms->pcie, errp); } =20 +static void microvm_machine_get_ioapic2(Object *obj, Visitor *v, const cha= r *name, + void *opaque, Error **errp) +{ + MicrovmMachineState *mms =3D MICROVM_MACHINE(obj); + OnOffAuto ioapic2 =3D mms->ioapic2; + + visit_type_OnOffAuto(v, name, &ioapic2, errp); +} + +static void microvm_machine_set_ioapic2(Object *obj, Visitor *v, const cha= r *name, + void *opaque, Error **errp) +{ + MicrovmMachineState *mms =3D MICROVM_MACHINE(obj); + + visit_type_OnOffAuto(v, name, &mms->ioapic2, errp); +} + static bool microvm_machine_get_isa_serial(Object *obj, Error **errp) { MicrovmMachineState *mms =3D MICROVM_MACHINE(obj); @@ -620,6 +658,7 @@ static void microvm_machine_initfn(Object *obj) mms->pit =3D ON_OFF_AUTO_AUTO; mms->rtc =3D ON_OFF_AUTO_AUTO; mms->pcie =3D ON_OFF_AUTO_AUTO; + mms->ioapic2 =3D ON_OFF_AUTO_AUTO; mms->isa_serial =3D true; mms->option_roms =3D true; mms->auto_kernel_cmdline =3D true; @@ -693,6 +732,13 @@ static void microvm_class_init(ObjectClass *oc, void *= data) object_class_property_set_description(oc, MICROVM_MACHINE_PCIE, "Enable PCIe"); =20 + object_class_property_add(oc, MICROVM_MACHINE_IOAPIC2, "OnOffAuto", + microvm_machine_get_ioapic2, + microvm_machine_set_ioapic2, + NULL, NULL); + object_class_property_set_description(oc, MICROVM_MACHINE_IOAPIC2, + "Enable second IO-APIC"); + object_class_property_add_bool(oc, MICROVM_MACHINE_ISA_SERIAL, microvm_machine_get_isa_serial, microvm_machine_set_isa_serial); diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 64a9a772eee7..61bf861ac91d 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1124,7 +1124,7 @@ static void test_acpi_microvm_tcg(void) test_data data; =20 test_acpi_microvm_prepare(&data); - test_acpi_one(" -machine microvm,acpi=3Don,rtc=3Doff", + test_acpi_one(" -machine microvm,acpi=3Don,ioapic2=3Doff,rtc=3Doff", &data); free_test_data(&data); } @@ -1135,7 +1135,7 @@ static void test_acpi_microvm_usb_tcg(void) =20 test_acpi_microvm_prepare(&data); data.variant =3D ".usb"; - test_acpi_one(" -machine microvm,acpi=3Don,usb=3Don,rtc=3Doff", + test_acpi_one(" -machine microvm,acpi=3Don,ioapic2=3Doff,usb=3Don,rtc= =3Doff", &data); free_test_data(&data); } @@ -1146,7 +1146,7 @@ static void test_acpi_microvm_rtc_tcg(void) =20 test_acpi_microvm_prepare(&data); data.variant =3D ".rtc"; - test_acpi_one(" -machine microvm,acpi=3Don,rtc=3Don", + test_acpi_one(" -machine microvm,acpi=3Don,ioapic2=3Doff,rtc=3Don", &data); free_test_data(&data); } @@ -1158,7 +1158,7 @@ static void test_acpi_microvm_pcie_tcg(void) test_acpi_microvm_prepare(&data); data.variant =3D ".pcie"; data.tcg_only =3D true; /* need constant host-phys-bits */ - test_acpi_one(" -machine microvm,acpi=3Don,rtc=3Doff,pcie=3Don", + test_acpi_one(" -machine microvm,acpi=3Don,ioapic2=3Doff,rtc=3Doff,pci= e=3Don", &data); free_test_data(&data); } --=20 2.27.0 From nobody Sat May 18 11:46:50 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1607604614; cv=none; d=zohomail.com; s=zohoarc; b=Mbo4J2Y4lopyQUmoifrlPexvI5HtRqHrgP6r0exm9hc/Z226S1hTpAisjFn4BuEKa6nutwU8bkICeR8Y5rbODRzzdjXENmgO7lLFfY6lNM/Lln6yaVrnZmkK3egxN4k2v8XjxgrZDFErPOg6gjK29nKaSu8zeJDdnZrSdeQ0RH0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607604614; 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; bh=WyJIPXt177RmKanBwQoDU7RLIoOE6CaeOPBkZ4x/uck=; b=QggEhGmbj9iwNjL4b8gq+w4xeWXWSGHuNzQivuQnlmMYZLC3MKz7qcS39Vyzta6DeaE/RXZ8oZ+lguHdpEyUpfj4w+/GVxXhVa59MM4R4oC5Pdp/i3jGNNkZPwDmMKJxHyuAnpb2YmnJaOyAEtlWrKjDKwkDvFT3tpfZQACopWU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1607604614590299.26973809387357; Thu, 10 Dec 2020 04:50:14 -0800 (PST) Received: from localhost ([::1]:47772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knLOe-0007LN-VV for importer@patchew.org; Thu, 10 Dec 2020 07:50:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57230) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knKq6-0003jq-Dx for qemu-devel@nongnu.org; Thu, 10 Dec 2020 07:14:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:41149) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knKpr-0006t2-Ia for qemu-devel@nongnu.org; Thu, 10 Dec 2020 07:14:28 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-208-KPa9y2JRNsS18-tdpB-vRg-1; Thu, 10 Dec 2020 07:14:13 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EC19A107ACE3; Thu, 10 Dec 2020 12:14:11 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-94.ams2.redhat.com [10.36.112.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id AAD095C224; Thu, 10 Dec 2020 12:14:11 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 01C529D9D; Thu, 10 Dec 2020 13:14:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607602454; 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=WyJIPXt177RmKanBwQoDU7RLIoOE6CaeOPBkZ4x/uck=; b=AHIVJo857n/r0b5i2MlaAnDT2jAOdbGqRN593cLQS6YNG9nbuK4kp3o7XmGj2p0Ujo/IGA NrcusdTQv/KQk4IE31XBWEvZOnp3UKTbnbKJX3ttvJ6FNjqrYYjl9zJ7yDDDWqlgSZwu1Z VcOUSnbr35HBFWD4B/4EFHCW5HxpjZk= X-MC-Unique: KPa9y2JRNsS18-tdpB-vRg-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 07/11] tests/acpi: allow updates for expected data files Date: Thu, 10 Dec 2020 13:13:55 +0100 Message-Id: <20201210121359.18320-8-kraxel@redhat.com> In-Reply-To: <20201210121359.18320-1-kraxel@redhat.com> References: <20201210121359.18320-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no 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: Eduardo Habkost , Sergio Lopez , "Michael S. Tsirkin" , Richard Henderson , Gerd Hoffmann , Paolo Bonzini , 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-Type: text/plain; charset="utf-8" Signed-off-by: Gerd Hoffmann Reviewed-by: Michael S. Tsirkin Reviewed-by: Igor Mammedov Reviewed-by: Sergio Lopez Message-id: 20201203105423.10431-9-kraxel@redhat.com --- tests/qtest/bios-tables-test-allowed-diff.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index dfb8523c8bf4..191ac230b013 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1 +1,3 @@ /* List of comma-separated changed AML files to ignore */ +"tests/data/acpi/microvm/APIC.ioapic2", +"tests/data/acpi/microvm/DSDT.ioapic2", --=20 2.27.0 From nobody Sat May 18 11:46:50 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1607608116; cv=none; d=zohomail.com; s=zohoarc; b=XjsLZZ4Ul26HPr0vVn3gMA+l/hBPwjUXg0xkYb70s5FuGX8MnZVq6UtIIKWYwgr+Tjdyg7KRiqXOTXiewWg/SrbwDn8VzBfTwl0rw8/s6yw3nhO0voSpiGjTCE2VGa21JLB32agDD7g9JOYhbwx7+WuGGjHdpDGFODWvhPQK/Cc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607608116; 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; bh=TzyW1LfV3kICae7XN9LudGTy5RZDrztOysxJu7Wx2/s=; b=fafOnGmZz3Dg8/TJsqTuIStMFvIaGOBi+wDk0lgvcqL5ASsfK1k4ZDPhM7Ai5eroyvmNwJ9g4wbfQzMUOoPcVG8ZbHqNULF7AtkS7NJWU9hRYuhF8hzhD4iWIiPPpbVM3KSXCeIo+xTPiIGe0plABrgjrqZlK4ILY7biXDbLewM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1607608116266833.9721185127202; Thu, 10 Dec 2020 05:48:36 -0800 (PST) Received: from localhost ([::1]:57092 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knLuE-0001ZI-Ts for importer@patchew.org; Thu, 10 Dec 2020 08:22:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57318) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knKqG-0003uO-0i for qemu-devel@nongnu.org; Thu, 10 Dec 2020 07:14:40 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:41657) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knKq1-0006w0-HW for qemu-devel@nongnu.org; Thu, 10 Dec 2020 07:14:39 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-216-IudmbYyQOpeOKhtd-xG3dA-1; Thu, 10 Dec 2020 07:14:22 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 76C6118C8C01; Thu, 10 Dec 2020 12:14:21 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-94.ams2.redhat.com [10.36.112.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id A414F5D6BA; Thu, 10 Dec 2020 12:14:11 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 0985D9D9E; Thu, 10 Dec 2020 13:14:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607602464; 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=TzyW1LfV3kICae7XN9LudGTy5RZDrztOysxJu7Wx2/s=; b=LkfxhMQHHOJ1ykgCudRbDtUeSYsMzuFM5NDNYtF7yDa2GT6qli2noCF1OxUFjGiZqhqCec cfq9TDZkIPjgXlXaA8+jn6v9YHqzWUyEE6JYn2j/7wAsJDqo8YKXebOWUT5uDyuOxemVPE zVbRc6p2GGqNpSG6r+hbNULKzoPeuEw= X-MC-Unique: IudmbYyQOpeOKhtd-xG3dA-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 08/11] tests/acpi: add data files for ioapic2 test variant Date: Thu, 10 Dec 2020 13:13:56 +0100 Message-Id: <20201210121359.18320-9-kraxel@redhat.com> In-Reply-To: <20201210121359.18320-1-kraxel@redhat.com> References: <20201210121359.18320-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: Eduardo Habkost , Sergio Lopez , "Michael S. Tsirkin" , Richard Henderson , Gerd Hoffmann , Paolo Bonzini , 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-Type: text/plain; charset="utf-8" Copy microvm/APIC -> microvm/APIC.ioapic2 Copy microvm/DSDT -> microvm/DSDT.ioapic2 Signed-off-by: Gerd Hoffmann Reviewed-by: Michael S. Tsirkin Reviewed-by: Igor Mammedov Reviewed-by: Sergio Lopez Message-id: 20201203105423.10431-10-kraxel@redhat.com --- tests/data/acpi/microvm/APIC.ioapic2 | Bin 0 -> 70 bytes tests/data/acpi/microvm/DSDT.ioapic2 | Bin 0 -> 365 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 tests/data/acpi/microvm/APIC.ioapic2 create mode 100644 tests/data/acpi/microvm/DSDT.ioapic2 diff --git a/tests/data/acpi/microvm/APIC.ioapic2 b/tests/data/acpi/microvm= /APIC.ioapic2 new file mode 100644 index 0000000000000000000000000000000000000000..7472c7e830b6c7139720e93dd54= 4d4441556661d GIT binary patch literal 70 zcmZ<^@N{-#U|?Xp?&R<65v<@85#a0y6k`O6f!H9Lf#JbFFwFr}2jnsGfW!{`1CcCj H|A7JkCE=3D5t zE;#2y@U)soH1M>j)Okp0N|?)B()oaTI~2uqaQfeg{#@eeMV8=3De3}=3Dmj(J&BYn|!sEgD;a (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 1607604481015280.96209821033074; Thu, 10 Dec 2020 04:48:01 -0800 (PST) Received: from localhost ([::1]:42194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knLMV-00050f-RH for importer@patchew.org; Thu, 10 Dec 2020 07:47:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57278) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knKqD-0003nq-Fu for qemu-devel@nongnu.org; Thu, 10 Dec 2020 07:14:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:59836) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knKq1-0006vt-H6 for qemu-devel@nongnu.org; Thu, 10 Dec 2020 07:14:37 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-220-wQv2qBIdPP20q_Uwuzrvig-1; Thu, 10 Dec 2020 07:14:22 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 48BB0803620; Thu, 10 Dec 2020 12:14:21 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-94.ams2.redhat.com [10.36.112.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id A0B806F971; Thu, 10 Dec 2020 12:14:11 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 12CA09D9F; Thu, 10 Dec 2020 13:14:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607602464; 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=skCVuGgQ5i6vpvP72F0TThaaxaTMpEC/Y2NtBY4sMCI=; b=EgpW35digOAExxmtr6SGkp452eZYIw4BiKircTtgGNYprb0dsbdedNps+I9v8kUdUWRnT2 6ehGjMWSa6Z/W5+Bc7uqT0k0Dhk8jvX2uXwDThLKRxaouXUR3oOJUwOvgbdm1leXk/Oihd k6oL8bwwi1Hpv8QWFMbSUP5mvX1/PUs= X-MC-Unique: wQv2qBIdPP20q_Uwuzrvig-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 09/11] tests/acpi: add ioapic2=on test for microvm Date: Thu, 10 Dec 2020 13:13:57 +0100 Message-Id: <20201210121359.18320-10-kraxel@redhat.com> In-Reply-To: <20201210121359.18320-1-kraxel@redhat.com> References: <20201210121359.18320-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: Eduardo Habkost , Sergio Lopez , "Michael S. Tsirkin" , Richard Henderson , Gerd Hoffmann , Paolo Bonzini , 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-Type: text/plain; charset="utf-8" APIC table changes: [034h 0052 1] Subtable Type : 01 [I/O APIC] [035h 0053 1] Length : 0C [036h 0054 1] I/O Apic ID : 00 [037h 0055 1] Reserved : 00 [038h 0056 4] Address : FEC00000 [03Ch 0060 4] Interrupt : 00000000 +[040h 0064 1] Subtable Type : 01 [I/O APIC] +[041h 0065 1] Length : 0C +[042h 0066 1] I/O Apic ID : 01 +[043h 0067 1] Reserved : 00 +[044h 0068 4] Address : FEC10000 +[048h 0072 4] Interrupt : 00000018 DSDT table changes: - Device (VR07) + Device (VR23) { Name (_HID, "LNRO0005") // _HID: Hardware ID - Name (_UID, 0x07) // _UID: Unique ID + Name (_UID, 0x17) // _UID: Unique ID Name (_CCA, One) // _CCA: Cache Coherency Attribute Name (_CRS, ResourceTemplate () // _CRS: Current Resource Set= tings { Memory32Fixed (ReadWrite, - 0xFEB00E00, // Address Base + 0xFEB02E00, // Address Base 0x00000200, // Address Length ) Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive,= ,, ) { - 0x00000017, + 0x0000002F, } }) } } Signed-off-by: Gerd Hoffmann Reviewed-by: Michael S. Tsirkin Reviewed-by: Igor Mammedov Reviewed-by: Sergio Lopez Message-id: 20201203105423.10431-11-kraxel@redhat.com --- tests/qtest/bios-tables-test.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index 61bf861ac91d..f2f79dd6a4a0 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -1163,6 +1163,17 @@ static void test_acpi_microvm_pcie_tcg(void) free_test_data(&data); } =20 +static void test_acpi_microvm_ioapic2_tcg(void) +{ + test_data data; + + test_acpi_microvm_prepare(&data); + data.variant =3D ".ioapic2"; + test_acpi_one(" -machine microvm,acpi=3Don,ioapic2=3Don,rtc=3Doff", + &data); + free_test_data(&data); +} + static void test_acpi_virt_tcg_numamem(void) { test_data data =3D { @@ -1323,6 +1334,7 @@ int main(int argc, char *argv[]) qtest_add_func("acpi/microvm", test_acpi_microvm_tcg); qtest_add_func("acpi/microvm/usb", test_acpi_microvm_usb_tcg); qtest_add_func("acpi/microvm/rtc", test_acpi_microvm_rtc_tcg); + qtest_add_func("acpi/microvm/ioapic2", test_acpi_microvm_ioapic2_t= cg); if (strcmp(arch, "x86_64") =3D=3D 0) { qtest_add_func("acpi/microvm/pcie", test_acpi_microvm_pcie_tcg= ); } --=20 2.27.0 From nobody Sat May 18 11:46:50 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1607605613; cv=none; d=zohomail.com; s=zohoarc; b=hOaO7Rw0raX/X8EUSymnL6FaIh9biRXB0vGh3fskmIWI9xeiyJdGXYMRsk2EBGnT4/oFlyniTgQ7MTCLeJq8J9DjEZ9wJZymBxzDp1J1lXQxTZOlWkibyNu7Futk4qaoTshahwbsiEIkprwshFizVfXrFAmdJTnURi7sRKoVdBg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607605613; 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; bh=DpzsULmMH7+A8PnT+Qb88Cb0FxGBER4QcgaIUJ/uH3Y=; b=nLoL+8UuWPLrfphjhI/BZROW221IkU5dySruO8LQr7qmgdaXYUJkrgAxr4T9vdB8dfb/z0QmTwYelVDBNfVTyChH9kj3ZbOKlfwIMstdIE8xnZ7xDbEc5FmnBjDoG+QQx+G4q5iYythtSmm6WdZfAIkJUaM/7aKOYmCGIyk79qI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1607605613390961.2388787509549; Thu, 10 Dec 2020 05:06:53 -0800 (PST) Received: from localhost ([::1]:56812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knLei-0006K0-FF for importer@patchew.org; Thu, 10 Dec 2020 08:06:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knKq6-0003jr-F4 for qemu-devel@nongnu.org; Thu, 10 Dec 2020 07:14:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:49389) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knKpr-0006tA-Oc for qemu-devel@nongnu.org; Thu, 10 Dec 2020 07:14:30 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-524-cFGAgEPGPGCWCWVxpFGwOw-1; Thu, 10 Dec 2020 07:14:13 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E95E4BBEE7; Thu, 10 Dec 2020 12:14:11 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-94.ams2.redhat.com [10.36.112.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id A23B519C78; Thu, 10 Dec 2020 12:14:11 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 1A54D9DA0; Thu, 10 Dec 2020 13:14:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607602455; 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=DpzsULmMH7+A8PnT+Qb88Cb0FxGBER4QcgaIUJ/uH3Y=; b=iN93NYoPGlGcQazxo2zXW6/ivv0Kba3DVFUhs6O4qwgM+BZzzRT8jQ0zhggt8/Dn8foQsd Ucy/pujlw+G1+9ASPlPibJeFMD95KC5WikRazR3kK/teA7YZnz7var2rbosMnPuxxcx9Ok m3y10tvT5Wvoz/JrBsNdj0vbOhQQCbM= X-MC-Unique: cFGAgEPGPGCWCWVxpFGwOw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 10/11] tests/acpi: update expected data files Date: Thu, 10 Dec 2020 13:13:58 +0100 Message-Id: <20201210121359.18320-11-kraxel@redhat.com> In-Reply-To: <20201210121359.18320-1-kraxel@redhat.com> References: <20201210121359.18320-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: Eduardo Habkost , Sergio Lopez , "Michael S. Tsirkin" , Richard Henderson , Gerd Hoffmann , Paolo Bonzini , 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-Type: text/plain; charset="utf-8" Signed-off-by: Gerd Hoffmann Reviewed-by: Michael S. Tsirkin Reviewed-by: Igor Mammedov Reviewed-by: Sergio Lopez Message-id: 20201203105423.10431-12-kraxel@redhat.com --- tests/data/acpi/microvm/APIC.ioapic2 | Bin 70 -> 82 bytes tests/data/acpi/microvm/DSDT.ioapic2 | Bin 365 -> 365 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/tests/data/acpi/microvm/APIC.ioapic2 b/tests/data/acpi/microvm= /APIC.ioapic2 index 7472c7e830b6c7139720e93dd544d4441556661d..a305f89d99eca881109ba54090d= a0f90262a402c 100644 GIT binary patch delta 35 ncmZ<@;&Ke|bPi%*U|@VUk;_bok%tk;KKM@pNV2f~2MPlKf^P=3DP delta 23 dcmWG?<8ln}barE4U|_sHk;{yYh3!9(2>?8v1it_P diff --git a/tests/data/acpi/microvm/DSDT.ioapic2 b/tests/data/acpi/microvm= /DSDT.ioapic2 index b43f427a222a933d3f34aceab6224a2c6115c365..aee44dd3de1bb16585bf571ff0c= a8e44d467d009 100644 GIT binary patch delta 83 zcmaFM^p=3DUsCD (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 1607610324131765.0629675172064; Thu, 10 Dec 2020 06:25:24 -0800 (PST) Received: from localhost ([::1]:45916 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knLoz-0005Io-UE for importer@patchew.org; Thu, 10 Dec 2020 08:17:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57220) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knKq6-0003jb-EG for qemu-devel@nongnu.org; Thu, 10 Dec 2020 07:14:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:39339) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knKps-0006tD-1T for qemu-devel@nongnu.org; Thu, 10 Dec 2020 07:14:25 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-477-QN0wCleWOSWMbKESxzPCdw-1; Thu, 10 Dec 2020 07:14:13 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0CD3E18C8C02; Thu, 10 Dec 2020 12:14:12 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-94.ams2.redhat.com [10.36.112.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id C1A0B5D9DD; Thu, 10 Dec 2020 12:14:11 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 237549DA1; Thu, 10 Dec 2020 13:14:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607602455; 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=qUQqyDKqbLkd/zwLz1XsYKuI3t8/WOs5D82LuP7vFao=; b=WbQtRc9zziHtPagb1+pcdsJ5SG0tuQopneB/tP/z5dAealT4pQOtm7EwsduwHwvbkLyUrQ TSmZcOEMdNWpEded/487Agl489Iq92zMx4zMsqI3TbDYy1XhposxSjG6G4zICSKgvLWZPM +nlkkDugAETiONfN3mEfqy656OZ6GC8= X-MC-Unique: QN0wCleWOSWMbKESxzPCdw-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PULL 11/11] tests/acpi: disallow updates for expected data files Date: Thu, 10 Dec 2020 13:13:59 +0100 Message-Id: <20201210121359.18320-12-kraxel@redhat.com> In-Reply-To: <20201210121359.18320-1-kraxel@redhat.com> References: <20201210121359.18320-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=216.205.24.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: Eduardo Habkost , Sergio Lopez , "Michael S. Tsirkin" , Richard Henderson , Gerd Hoffmann , Paolo Bonzini , 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-Type: text/plain; charset="utf-8" Signed-off-by: Gerd Hoffmann Reviewed-by: Michael S. Tsirkin Reviewed-by: Igor Mammedov Reviewed-by: Sergio Lopez Message-id: 20201203105423.10431-13-kraxel@redhat.com --- tests/qtest/bios-tables-test-allowed-diff.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios= -tables-test-allowed-diff.h index 191ac230b013..dfb8523c8bf4 100644 --- a/tests/qtest/bios-tables-test-allowed-diff.h +++ b/tests/qtest/bios-tables-test-allowed-diff.h @@ -1,3 +1 @@ /* List of comma-separated changed AML files to ignore */ -"tests/data/acpi/microvm/APIC.ioapic2", -"tests/data/acpi/microvm/DSDT.ioapic2", --=20 2.27.0