From nobody Mon May 13 05:42:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1668676316; cv=none; d=zohomail.com; s=zohoarc; b=BrpNtdkpEW9n1pf5/z2lpx83QZu7l2ljED8L4+Q9n3PO23dkLChXzabu3CcCeR3Cn86hMRCeg+/ckArSUapcVGuOnzv4UXrwlYjuqdbxT4RuvyHD4iCUpAG7Qo2gXD09u2tvUgcZY00hL+/4sybsgZP2vsveiwBr+SzMxUX5fxE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1668676316; h=Content-Transfer-Encoding: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=xVyFPyVSwupTgXx3RauOn52dEzy0+GPS97vq4WsSwJg=; b=QwWDhOMVE9wtqNBj7HyuHiqpbZlr/cDADuxQ8yK7PoHZJ+5ZqCxa5a+KDu5Eq2bN8H/fsEVHgy2RMiMvHHkdUagXYJIFQLMTP8Rk7HBtrBuF6/ssAtOqF7u8BL8UNgYrB1lsjKANZs+077pm+2NqcLAtUIobfr8luQk8QCWOHP0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1668676316796999.0614195900142; Thu, 17 Nov 2022 01:11:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ovaua-0007YJ-5u; Thu, 17 Nov 2022 04:10:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ovauY-0007Xb-5Y for qemu-devel@nongnu.org; Thu, 17 Nov 2022 04:10:18 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ovauW-0001r7-3X for qemu-devel@nongnu.org; Thu, 17 Nov 2022 04:10:17 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-581-UWnxrO0kOG25lesWRex1BA-1; Thu, 17 Nov 2022 04:10:13 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 38FFD86E922 for ; Thu, 17 Nov 2022 09:10:13 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 626FD2024CCA; Thu, 17 Nov 2022 09:10:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668676215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xVyFPyVSwupTgXx3RauOn52dEzy0+GPS97vq4WsSwJg=; b=WsTuq6Ek3mImxp3J7a71r50mDbwwnTvPSncmlXm/bILExMj2d3MI5svyaFCD3GCkN/uwqZ xl17jmSA8bEiJHRw8JWcMCrju9ju77JqKYlEzV9u7dVgAM8UAq81AA0T1N5drdlcsTrq/D 12hfqS25nS2XhuLsdR4a2R5oLPFBmJ4= X-MC-Unique: UWnxrO0kOG25lesWRex1BA-1 From: Thomas Huth To: Stefan Hajnoczi , qemu-devel@nongnu.org Subject: [PULL 1/4] s390x: Fix spelling errors Date: Thu, 17 Nov 2022 10:10:03 +0100 Message-Id: <20221117091006.525072-2-thuth@redhat.com> In-Reply-To: <20221117091006.525072-1-thuth@redhat.com> References: <20221117091006.525072-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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=170.10.129.124; envelope-from=thuth@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_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1668676317709100006 Content-Type: text/plain; charset="utf-8" Fix typos (discovered with the 'codespell' utility). Note: Though "migrateable" still seems to be a valid spelling, we change it to "migratable" since this is the way more common spelling here. Message-Id: <20221111182828.282251-1-thuth@redhat.com> Reviewed-by: Stefan Weil Reviewed-by: Ilya Leoshkevich Signed-off-by: Thomas Huth --- hw/s390x/ipl.h | 2 +- pc-bios/s390-ccw/cio.h | 2 +- pc-bios/s390-ccw/iplb.h | 2 +- target/s390x/cpu_models.h | 4 ++-- hw/s390x/s390-pci-vfio.c | 2 +- hw/s390x/s390-virtio-ccw.c | 6 +++--- target/s390x/ioinst.c | 2 +- target/s390x/tcg/excp_helper.c | 2 +- target/s390x/tcg/fpu_helper.c | 2 +- target/s390x/tcg/misc_helper.c | 2 +- target/s390x/tcg/translate.c | 4 ++-- target/s390x/tcg/translate_vx.c.inc | 6 +++--- pc-bios/s390-ccw/start.S | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h index dfc6dfd89c..7fc86e7905 100644 --- a/hw/s390x/ipl.h +++ b/hw/s390x/ipl.h @@ -140,7 +140,7 @@ void s390_ipl_clear_reset_request(void); * have an offset of 4 + n * 8 bytes within the struct in order * to keep it double-word aligned. * The total size of the struct must never exceed 28 bytes. - * This definition must be kept in sync with the defininition + * This definition must be kept in sync with the definition * in pc-bios/s390-ccw/iplb.h. */ struct QemuIplParameters { diff --git a/pc-bios/s390-ccw/cio.h b/pc-bios/s390-ccw/cio.h index 1e5d4e92e1..88a88adfd2 100644 --- a/pc-bios/s390-ccw/cio.h +++ b/pc-bios/s390-ccw/cio.h @@ -20,7 +20,7 @@ struct pmcw { __u32 intparm; /* interruption parameter */ __u32 qf:1; /* qdio facility */ __u32 w:1; - __u32 isc:3; /* interruption sublass */ + __u32 isc:3; /* interruption subclass */ __u32 res5:3; /* reserved zeros */ __u32 ena:1; /* enabled */ __u32 lm:2; /* limit mode */ diff --git a/pc-bios/s390-ccw/iplb.h b/pc-bios/s390-ccw/iplb.h index 772d5c57c9..cb6ac8a880 100644 --- a/pc-bios/s390-ccw/iplb.h +++ b/pc-bios/s390-ccw/iplb.h @@ -81,7 +81,7 @@ extern IplParameterBlock iplb __attribute__((__aligned__(= PAGE_SIZE))); #define QIPL_FLAG_BM_OPTS_ZIPL 0x40 =20 /* - * This definition must be kept in sync with the defininition + * This definition must be kept in sync with the definition * in hw/s390x/ipl.h */ struct QemuIplParameters { diff --git a/target/s390x/cpu_models.h b/target/s390x/cpu_models.h index 74d1f87e4f..fb1adc8b21 100644 --- a/target/s390x/cpu_models.h +++ b/target/s390x/cpu_models.h @@ -24,13 +24,13 @@ struct S390CPUDef { uint8_t gen; /* hw generation identification */ uint16_t type; /* cpu type identification */ uint8_t ec_ga; /* EC GA version (on which also the BC is base= d) */ - uint8_t mha_pow; /* Maximum Host Adress Power, mha =3D 2^pow-1 = */ + uint8_t mha_pow; /* maximum host address power, mha =3D 2^pow-1= */ uint32_t hmfai; /* hypervisor-managed facilities */ /* base/min features, must never be changed between QEMU versions */ S390FeatBitmap base_feat; /* used to init base_feat from generated data */ S390FeatInit base_init; - /* deafault features, QEMU version specific */ + /* default features, QEMU version specific */ S390FeatBitmap default_feat; /* used to init default_feat from generated data */ S390FeatInit default_init; diff --git a/hw/s390x/s390-pci-vfio.c b/hw/s390x/s390-pci-vfio.c index 2aefa508a0..5f0adb0b4a 100644 --- a/hw/s390x/s390-pci-vfio.c +++ b/hw/s390x/s390-pci-vfio.c @@ -313,7 +313,7 @@ retry: /* * Get the host function handle from the vfio CLP capabilities chain. Ret= urns * true if a fh value was placed into the provided buffer. Returns false - * if a fh could not be obtained (ioctl failed or capabilitiy version does + * if a fh could not be obtained (ioctl failed or capability version does * not include the fh) */ bool s390_pci_get_host_fh(S390PCIBusDevice *pbdev, uint32_t *fh) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 7d80bc1837..2e64ffab45 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -354,7 +354,7 @@ static int s390_machine_protect(S390CcwMachineState *ms) } =20 error_setg(&pv_mig_blocker, - "protected VMs are currently not migrateable."); + "protected VMs are currently not migratable."); rc =3D migrate_add_blocker(pv_mig_blocker, &local_err); if (rc) { ram_block_discard_disable(false); @@ -449,7 +449,7 @@ static void s390_machine_reset(MachineState *machine, S= hutdownCause reason) break; case S390_RESET_MODIFIED_CLEAR: /* - * Susbsystem reset needs to be done before we unshare memory + * Subsystem reset needs to be done before we unshare memory * and lose access to VIRTIO structures in guest memory. */ subsystem_reset(); @@ -462,7 +462,7 @@ static void s390_machine_reset(MachineState *machine, S= hutdownCause reason) break; case S390_RESET_LOAD_NORMAL: /* - * Susbsystem reset needs to be done before we unshare memory + * Subsystem reset needs to be done before we unshare memory * and lose access to VIRTIO structures in guest memory. */ subsystem_reset(); diff --git a/target/s390x/ioinst.c b/target/s390x/ioinst.c index b12f18d346..053aaabb5a 100644 --- a/target/s390x/ioinst.c +++ b/target/s390x/ioinst.c @@ -285,7 +285,7 @@ void ioinst_handle_stsch(S390CPU *cpu, uint64_t reg1, u= int32_t ipb, /* * As operand exceptions have a lower priority than access excepti= ons, * we check whether the memory area is writable (injecting the - * access execption if it is not) first. + * access exception if it is not) first. */ if (!s390_cpu_virt_mem_check_write(cpu, addr, ar, sizeof(schib))) { s390_program_interrupt(env, PGM_OPERAND, ra); diff --git a/target/s390x/tcg/excp_helper.c b/target/s390x/tcg/excp_helper.c index 2cd6d062b9..fe02d82201 100644 --- a/target/s390x/tcg/excp_helper.c +++ b/target/s390x/tcg/excp_helper.c @@ -553,7 +553,7 @@ try_deliver: /* don't trigger a cpu_loop_exit(), use an interrupt instead */ cpu_interrupt(CPU(cpu), CPU_INTERRUPT_HALT); } else if (cs->halted) { - /* unhalt if we had a WAIT PSW somehwere in our injection chain */ + /* unhalt if we had a WAIT PSW somewhere in our injection chain */ s390_cpu_unhalt(cpu); } } diff --git a/target/s390x/tcg/fpu_helper.c b/target/s390x/tcg/fpu_helper.c index 4067205405..be80b2373c 100644 --- a/target/s390x/tcg/fpu_helper.c +++ b/target/s390x/tcg/fpu_helper.c @@ -89,7 +89,7 @@ static void handle_exceptions(CPUS390XState *env, bool Xx= C, uintptr_t retaddr) /* * invalid/divbyzero cannot coexist with other conditions. * overflow/underflow however can coexist with inexact, we have to - * handle it separatly. + * handle it separately. */ if (s390_exc & ~S390_IEEE_MASK_INEXACT) { if (s390_exc & ~S390_IEEE_MASK_INEXACT & env->fpc >> 24) { diff --git a/target/s390x/tcg/misc_helper.c b/target/s390x/tcg/misc_helper.c index 10dadb002a..71388a7119 100644 --- a/target/s390x/tcg/misc_helper.c +++ b/target/s390x/tcg/misc_helper.c @@ -333,7 +333,7 @@ uint32_t HELPER(stsi)(CPUS390XState *env, uint64_t a0, = uint64_t r0, uint64_t r1) /* same as machine type number in STORE CPU ID, but in EBCDIC = */ snprintf(type, ARRAY_SIZE(type), "%X", cpu->model->def->type); ebcdic_put(sysib.sysib_111.type, type, 4); - /* model number (not stored in STORE CPU ID for z/Architecure)= */ + /* model number (not stored in STORE CPU ID for z/Architecture= ) */ ebcdic_put(sysib.sysib_111.model, "QEMU ", 16); ebcdic_put(sysib.sysib_111.sequence, "QEMU ", 16); ebcdic_put(sysib.sysib_111.plant, "QEMU", 4); diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index 2fbdab7252..1e599ac259 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -435,7 +435,7 @@ static void gen_program_exception(DisasContext *s, int = code) { TCGv_i32 tmp; =20 - /* Remember what pgm exeption this was. */ + /* Remember what pgm exception this was. */ tmp =3D tcg_const_i32(code); tcg_gen_st_i32(tmp, cpu_env, offsetof(CPUS390XState, int_pgm_code)); tcg_temp_free_i32(tmp); @@ -491,7 +491,7 @@ static TCGv_i64 get_address(DisasContext *s, int x2, in= t b2, int d2) =20 /* * Note that d2 is limited to 20 bits, signed. If we crop negative - * displacements early we create larger immedate addends. + * displacements early we create larger immediate addends. */ if (b2 && x2) { tcg_gen_add_i64(tmp, regs[b2], regs[x2]); diff --git a/target/s390x/tcg/translate_vx.c.inc b/target/s390x/tcg/transla= te_vx.c.inc index b69c1a111c..d39ee81cd6 100644 --- a/target/s390x/tcg/translate_vx.c.inc +++ b/target/s390x/tcg/translate_vx.c.inc @@ -960,7 +960,7 @@ static DisasJumpType op_vpk(DisasContext *s, DisasOps *= o) } break; case 0x94: - /* If sources and destination dont't overlap -> fast path */ + /* If sources and destination don't overlap -> fast path */ if (v1 !=3D v2 && v1 !=3D v3) { const uint8_t src_es =3D get_field(s, m4); const uint8_t dst_es =3D src_es - 1; @@ -2075,7 +2075,7 @@ static DisasJumpType op_vmsl(DisasContext *s, DisasOp= s *o) l2 =3D tcg_temp_new_i64(); h2 =3D tcg_temp_new_i64(); =20 - /* Multipy both even elements from v2 and v3 */ + /* Multiply both even elements from v2 and v3 */ read_vec_element_i64(l1, get_field(s, v2), 0, ES_64); read_vec_element_i64(h1, get_field(s, v3), 0, ES_64); tcg_gen_mulu2_i64(l1, h1, l1, h1); @@ -2084,7 +2084,7 @@ static DisasJumpType op_vmsl(DisasContext *s, DisasOp= s *o) tcg_gen_add2_i64(l1, h1, l1, h1, l1, h1); } =20 - /* Multipy both odd elements from v2 and v3 */ + /* Multiply both odd elements from v2 and v3 */ read_vec_element_i64(l2, get_field(s, v2), 1, ES_64); read_vec_element_i64(h2, get_field(s, v3), 1, ES_64); tcg_gen_mulu2_i64(l2, h2, l2, h2); diff --git a/pc-bios/s390-ccw/start.S b/pc-bios/s390-ccw/start.S index 4d5ad21653..6072906df4 100644 --- a/pc-bios/s390-ccw/start.S +++ b/pc-bios/s390-ccw/start.S @@ -19,7 +19,7 @@ _start: larl %r2, __bss_start larl %r3, _end slgr %r3, %r2 /* get sizeof bss */ - ltgr %r3,%r3 /* bss emtpy? */ + ltgr %r3,%r3 /* bss empty? */ jz done aghi %r3,-1 srlg %r4,%r3,8 /* how many 256 byte chunks? */ --=20 2.31.1 From nobody Mon May 13 05:42:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1668676278; cv=none; d=zohomail.com; s=zohoarc; b=Gb6yqgiL78lIjkVFE1lFQQMTT2EoYOWp0FuSJBMHT2o3221B71Syoq5au18WpHi8ZT/cWIRsE8RauyM8wkn2al0EkKMO2mqG4HTz9RcJMGm+mTeCmK4z6H9ftvehS1mKKhlahIbAfH9aArvgbReOsm4OVm+pXkA8yYUBXZa3Nck= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1668676278; h=Content-Transfer-Encoding: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=1vASfgmJy6tlSODj6TlYRO8X2w/hgsd933UsScQK70g=; b=ldTfiDNVJHamTL5abak2Y0QyNRRDhsXHjUydXA+N+5FP8pI695Pn/SNfm01DvLjBXUzHNwpZvP3d3A/2z2H/vKErlruXAmF7lAleENCUEYM/T9XaqtEw4SEPdxz0+WNgC1M6EQWzvcbMbIdpOzMljrEudP+aRVFBrjgOAw1S+yY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 166867627853522.534905364486463; Thu, 17 Nov 2022 01:11:18 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ovaub-0007YX-2n; Thu, 17 Nov 2022 04:10:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ovauZ-0007Xy-2J for qemu-devel@nongnu.org; Thu, 17 Nov 2022 04:10:19 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ovauX-0001rL-D7 for qemu-devel@nongnu.org; Thu, 17 Nov 2022 04:10:18 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-616-TdcYwA5iPJSSzYNy0T5zvA-1; Thu, 17 Nov 2022 04:10:14 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 570E43802B82 for ; Thu, 17 Nov 2022 09:10:14 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9AB952027064; Thu, 17 Nov 2022 09:10:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668676216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1vASfgmJy6tlSODj6TlYRO8X2w/hgsd933UsScQK70g=; b=f9du15chCVqZW/efRej5IQOnUfqdpG7xjlD6kF8hUjt3O9RI00kOLQte2xLPeyP5GKP2rr ojoepcbWArE1yX+KveiUtTrJt+L1aWiC/aswFd6pGPD+pT1Uf1DAWlx2frFMaQK1JDgxBj H2/b4FFzAZSC58Vq1a2aMqxAaAY6/3E= X-MC-Unique: TdcYwA5iPJSSzYNy0T5zvA-1 From: Thomas Huth To: Stefan Hajnoczi , qemu-devel@nongnu.org Subject: [PULL 2/4] docs/system/s390x: Document the "loadparm" machine property Date: Thu, 17 Nov 2022 10:10:04 +0100 Message-Id: <20221117091006.525072-3-thuth@redhat.com> In-Reply-To: <20221117091006.525072-1-thuth@redhat.com> References: <20221117091006.525072-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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=170.10.133.124; envelope-from=thuth@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_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1668676279429100003 Content-Type: text/plain; charset="utf-8" The "loadparm" machine property is useful for selecting alternative kernels on the disk of the guest, but so far we do not tell the users yet how to use it. Add some documentation to fill this gap. Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=3D2128235 Message-Id: <20221114132502.110213-1-thuth@redhat.com> Reviewed-by: Claudio Imbrenda Signed-off-by: Thomas Huth --- docs/system/s390x/bootdevices.rst | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/docs/system/s390x/bootdevices.rst b/docs/system/s390x/bootdevi= ces.rst index b5950133e8..1a7a18b43b 100644 --- a/docs/system/s390x/bootdevices.rst +++ b/docs/system/s390x/bootdevices.rst @@ -53,6 +53,32 @@ recommended to specify a CD-ROM device via ``-device scs= i-cd`` (as mentioned above) instead. =20 =20 +Selecting kernels with the ``loadparm`` property +------------------------------------------------ + +The ``s390-ccw-virtio`` machine supports the so-called ``loadparm`` parame= ter +which can be used to select the kernel on the disk of the guest that the +s390-ccw bios should boot. When starting QEMU, it can be specified like th= is:: + + qemu-system-s390x -machine s390-ccw-virtio,loadparm=3D + +The first way to use this parameter is to use the word ``PROMPT`` as the +```` here. In that case the s390-ccw bios will show a list of +installed kernels on the disk of the guest and ask the user to enter a num= ber +to chose which kernel should be booted -- similar to what can be achieved = by +specifying the ``-boot menu=3Don`` option when starting QEMU. Note that th= e menu +list will only show the names of the installed kernels when using a DASD-l= ike +disk image with 4k byte sectors. On normal SCSI-style disks with 512-byte +sectors, there is not enough space for the zipl loader on the disk to store +the kernel names, so you only get a list without names here. + +The second way to use this parameter is to use a number in the range from 0 +to 31. The numbers that can be used here correspond to the numbers that are +shown when using the ``PROMPT`` option, and the s390-ccw bios will then try +to automatically boot the kernel that is associated with the given number. +Note that ``0`` can be used to boot the default entry. + + Booting from a network device ----------------------------- =20 --=20 2.31.1 From nobody Mon May 13 05:42:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1668676311; cv=none; d=zohomail.com; s=zohoarc; b=kzyhmH6u2vgjWL/BsaUxUPs6Qx04GB5h+Ws15KAoerdz4/nDIDUqF4OLnGLzzBPkRys62St36Bmowi12VWUCYLoGMwCPV5DH2yW4MD68kK1KxFwMbMEu2I8FAnCf9ZLApRIM0Mn5taQCad3HF6lXIVlkYhDBwbwGTDs5i9jnbQI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1668676311; h=Content-Type:Content-Transfer-Encoding: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=LVJHI3FngWjzqBxGGXPccQv7BLLAWWzVoAzkJvWHBCI=; b=bRZUjTzfCAA/ye7bt5PJLVbpwALH4UWH+GYKSh2qFqkSTLRXQXM/3wxLeBPjXYxKKocSGC4Hg/AxKHUNslBdWYJGorSbsKPSLElsQkd1HUvoOBSdD6FLfbNMw8e9aoGDNKm6HrT5qkkmD0uUypGDSRi16IoXCZMd14qmSQMwBM4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1668676311685836.2631700836741; Thu, 17 Nov 2022 01:11:51 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ovaub-0007Z6-Ub; Thu, 17 Nov 2022 04:10:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ovaua-0007YW-QW for qemu-devel@nongnu.org; Thu, 17 Nov 2022 04:10:20 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ovauY-0001sn-Uz for qemu-devel@nongnu.org; Thu, 17 Nov 2022 04:10:20 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-248-VVRhsd1mM6GGzF54T2lhxA-1; Thu, 17 Nov 2022 04:10:15 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8D5E83C0F43B for ; Thu, 17 Nov 2022 09:10:15 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id BA74D2028CE4; Thu, 17 Nov 2022 09:10:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668676218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LVJHI3FngWjzqBxGGXPccQv7BLLAWWzVoAzkJvWHBCI=; b=EvdbhYQ04vF11NTxUliJnJ0ILm6IfZ8YemLXmFhfWS/+66Fdv9du7YewGNCUsJlq9OH2C8 6qKH0bm9QYdi52UrJFnzYjfXMQDqCSQPtJOHw+Triw1NPbo8NGHEiHugr/MwSYu3/hUqW6 mIT+HLxyhGp7FoIlSJWglp+xse3TVvM= X-MC-Unique: VVRhsd1mM6GGzF54T2lhxA-1 From: Thomas Huth To: Stefan Hajnoczi , qemu-devel@nongnu.org Subject: [PULL 3/4] ci: replace x86_64 macos-11 with aarch64 macos-12 Date: Thu, 17 Nov 2022 10:10:05 +0100 Message-Id: <20221117091006.525072-4-thuth@redhat.com> In-Reply-To: <20221117091006.525072-1-thuth@redhat.com> References: <20221117091006.525072-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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=170.10.133.124; envelope-from=thuth@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_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1668676313651100003 From: Daniel P. Berrang=C3=A9 The Cirrus CI service has announced the intent to discontinue support for x86_64 macOS CI runners. They already have aarch64 runners available and require all projects to switch to these images before Jan 1st 2023. The different architecture is merely determined by the image name requested. For aarch64 they only support macOS 12 onwards. At the same time our support policy only guarantees the most recent 2 major versions, so macOS 12 is already technically our min version. https://cirrus-ci.org/blog/2022/11/08/sunsetting-intel-macos-instances/ Signed-off-by: Daniel P. Berrang=C3=A9 Message-Id: <20221116175023.80627-1-berrange@redhat.com> Tested-by: Thomas Huth Signed-off-by: Thomas Huth --- .gitlab-ci.d/cirrus.yml | 12 ++++++------ .gitlab-ci.d/cirrus/{macos-11.vars =3D> macos-12.vars} | 12 ++++++------ tests/lcitool/libvirt-ci | 2 +- tests/lcitool/refresh | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) rename .gitlab-ci.d/cirrus/{macos-11.vars =3D> macos-12.vars} (74%) diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml index d70da61248..634a73a742 100644 --- a/.gitlab-ci.d/cirrus.yml +++ b/.gitlab-ci.d/cirrus.yml @@ -70,19 +70,19 @@ x64-freebsd-13-build: INSTALL_COMMAND: pkg install -y TEST_TARGETS: check =20 -x64-macos-11-base-build: +aarch64-macos-12-base-build: extends: .cirrus_build_job variables: - NAME: macos-11 - CIRRUS_VM_INSTANCE_TYPE: osx_instance + NAME: macos-12 + CIRRUS_VM_INSTANCE_TYPE: macos_instance CIRRUS_VM_IMAGE_SELECTOR: image - CIRRUS_VM_IMAGE_NAME: big-sur-base + CIRRUS_VM_IMAGE_NAME: ghcr.io/cirruslabs/macos-monterey-base:latest CIRRUS_VM_CPUS: 12 CIRRUS_VM_RAM: 24G UPDATE_COMMAND: brew update INSTALL_COMMAND: brew install - PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin - PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/ncur= ses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig + PATH_EXTRA: /opt/homebrew/ccache/libexec:/opt/homebrew/gettext/bin + PKG_CONFIG_PATH: /opt/homebrew/curl/lib/pkgconfig:/opt/homebrew/ncurse= s/lib/pkgconfig:/opt/homebrew/readline/lib/pkgconfig TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat= check-qtest-x86_64 =20 =20 diff --git a/.gitlab-ci.d/cirrus/macos-11.vars b/.gitlab-ci.d/cirrus/macos-= 12.vars similarity index 74% rename from .gitlab-ci.d/cirrus/macos-11.vars rename to .gitlab-ci.d/cirrus/macos-12.vars index aee9f50de6..ef9e14b373 100644 --- a/.gitlab-ci.d/cirrus/macos-11.vars +++ b/.gitlab-ci.d/cirrus/macos-12.vars @@ -1,16 +1,16 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool variables macos-11 qemu +# $ lcitool variables macos-12 qemu # # https://gitlab.com/libvirt/libvirt-ci =20 -CCACHE=3D'/usr/local/bin/ccache' +CCACHE=3D'/opt/homebrew/bin/ccache' CPAN_PKGS=3D'' CROSS_PKGS=3D'' -MAKE=3D'/usr/local/bin/gmake' -NINJA=3D'/usr/local/bin/ninja' +MAKE=3D'/opt/homebrew/bin/gmake' +NINJA=3D'/opt/homebrew/bin/ninja' PACKAGING_COMMAND=3D'brew' -PIP3=3D'/usr/local/bin/pip3' +PIP3=3D'/opt/homebrew/bin/pip3' PKGS=3D'bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffuti= ls dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo= json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh li= btasn1 libusb llvm lzo make meson ncurses nettle ninja perl pixman pkg-conf= ig python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract = texinfo usbredir vde vte3 zlib zstd' PYPI_PKGS=3D'PyYAML numpy pillow sphinx sphinx-rtd-theme' -PYTHON=3D'/usr/local/bin/python3' +PYTHON=3D'/opt/homebrew/bin/python3' diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index d40e203631..e3eb28cf2e 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit d40e203631eb3eacee17e8cf8fd20aa5152db62a +Subproject commit e3eb28cf2e17fbcf7fe7e19505ee432b8ec5bbb5 diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index ce0b24c0b1..fa966e4009 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -176,7 +176,7 @@ try: # generate_cirrus("freebsd-12") generate_cirrus("freebsd-13") - generate_cirrus("macos-11") + generate_cirrus("macos-12") =20 sys.exit(0) except Exception as ex: --=20 2.31.1 From nobody Mon May 13 05:42:16 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1668676316; cv=none; d=zohomail.com; s=zohoarc; b=lXYiucbSBb9yaJfZ5GLDD8Xy0kyOQqPMLF+ug4mCie4rlxn3YbMSKrO0XyjHKLH68/Iy63uejhzgx3HrHXyAaeQDy4nwaFR3FA4SclGBbtWEyRIUBdSd07VIl0+2VwU8dIccG+24DIy5jigmq3odD8EMZ9EgrZPKZpWvvhmzEq0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1668676316; h=Content-Type:Content-Transfer-Encoding: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=s45didmNilOfTrQ6J5w/1jbTG7vsy/SxjtdR09Uk+oE=; b=mGAn5NbkwRw/QnqLOY4GWoszxahVcnDlUxhJaF+raIUXp25ZfP7JyU8whikW9QGU5I0IX8udAa+bmajVAr3fud0Eln9JfvrrZfnKAIAMLl+nyi77vjtV/4STgmW5qM1q5T9KIPmQj+m74RaGBLDKrksGoZYiEgaFELuqgH88cJE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1668676316544608.179084472021; Thu, 17 Nov 2022 01:11:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ovaud-0007ZX-Vy; Thu, 17 Nov 2022 04:10:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ovaub-0007Yj-9k for qemu-devel@nongnu.org; Thu, 17 Nov 2022 04:10:21 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ovauZ-0001sx-Jt for qemu-devel@nongnu.org; Thu, 17 Nov 2022 04:10:21 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-336-FcH2ZZzOOzSszhqXcltsVg-1; Thu, 17 Nov 2022 04:10:17 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B4F3C3802B81 for ; Thu, 17 Nov 2022 09:10:16 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.254]) by smtp.corp.redhat.com (Postfix) with ESMTP id F27A22027064; Thu, 17 Nov 2022 09:10:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668676218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s45didmNilOfTrQ6J5w/1jbTG7vsy/SxjtdR09Uk+oE=; b=YjIo74Ezqn6nwXnWJdiWvm7ko1LSSYkva0LITnbcNMahUpLnnVAbGLq+/OfbrUrR2AOpqL skaSKn+MSkDx/gDt4/tHmE93tLaOsihhCA4VMqbKuB+f7RvYfSQ4tbcKc3bqk7F8qdbhBy bJ9zwkAd0+kdz6KrPpo0D8UyI0zgr2k= X-MC-Unique: FcH2ZZzOOzSszhqXcltsVg-1 From: Thomas Huth To: Stefan Hajnoczi , qemu-devel@nongnu.org Subject: [PULL 4/4] acpi/tests/avocado/bits: some misc fixes Date: Thu, 17 Nov 2022 10:10:06 +0100 Message-Id: <20221117091006.525072-5-thuth@redhat.com> In-Reply-To: <20221117091006.525072-1-thuth@redhat.com> References: <20221117091006.525072-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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=170.10.133.124; envelope-from=thuth@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_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1668676317676100005 From: Ani Sinha Most of the changes are trivial. The bits test timeout has now been increas= ed to 200 seconds in order to accommodate slower systems and fewer unnecessary failures. Removed of the reference to non-existent README file in docs. Some minor corrections in the doc file. Signed-off-by: Ani Sinha Message-Id: <20221117053644.516649-1-ani@anisinha.ca> Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- docs/devel/acpi-bits.rst | 12 ++++-------- tests/avocado/acpi-bits.py | 3 +++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/docs/devel/acpi-bits.rst b/docs/devel/acpi-bits.rst index 5e22be8ef6..4a94c7d83d 100644 --- a/docs/devel/acpi-bits.rst +++ b/docs/devel/acpi-bits.rst @@ -16,11 +16,8 @@ end user. The other is that we have more control of what= we wanted to test and how by directly using acpica interpreter on top of the bios on a runni= ng system. More details on the inspiration for developing biosbits and its re= al life uses can be found in [#a]_ and [#b]_. -This directory contains tests written in python using avocado framework th= at -exercises the QEMU bios components using biosbits and reports test failure= s. For QEMU, we maintain a fork of bios bits in gitlab along with all the -dependent submodules: -https://gitlab.com/qemu-project/biosbits-bits +dependent submodules here: https://gitlab.com/qemu-project/biosbits-bits This fork contains numerous fixes, a newer acpica and changes specific to running this avocado QEMU tests using bits. The author of this document is the sole maintainer of the QEMU fork of bios bits repo. @@ -38,10 +35,9 @@ Under ``tests/avocado/`` as the root we have: =E2=94=82 =E2=94=9C=E2=94=80=E2=94=80 bits-config =E2=94=82 =E2=94=82 =E2=94=94=E2=94=80=E2=94=80 bits-cfg.txt =E2=94=82 =E2=94=9C=E2=94=80=E2=94=80 bits-tests - =E2=94=82 =E2=94=82 =E2=94=9C=E2=94=80=E2=94=80 smbios.py2 - =E2=94=82 =E2=94=82 =E2=94=9C=E2=94=80=E2=94=80 testacpi.py2 - =E2=94=82 =E2=94=82 =E2=94=94=E2=94=80=E2=94=80 testcpuid.py2 - =E2=94=82 =E2=94=94=E2=94=80=E2=94=80 README + =E2=94=82 =E2=94=9C=E2=94=80=E2=94=80 smbios.py2 + =E2=94=82 =E2=94=9C=E2=94=80=E2=94=80 testacpi.py2 + =E2=94=82 =E2=94=94=E2=94=80=E2=94=80 testcpuid.py2 =E2=94=9C=E2=94=80=E2=94=80 acpi-bits.py =20 * ``tests/avocado``: diff --git a/tests/avocado/acpi-bits.py b/tests/avocado/acpi-bits.py index 8745a58a76..9ac87f01f1 100644 --- a/tests/avocado/acpi-bits.py +++ b/tests/avocado/acpi-bits.py @@ -134,6 +134,9 @@ class AcpiBitsTest(QemuBaseTest): #pylint: disable=3Dto= o-many-instance-attributes :avocado: tags=3Dacpi =20 """ + # in slower systems the test can take as long as 3 minutes to complete. + timeout =3D 200 + def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self._vm =3D None --=20 2.31.1