From nobody Sun May 19 22:46:09 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631534414107848.4180448964595; Mon, 13 Sep 2021 05:00:14 -0700 (PDT) Received: from localhost ([::1]:58670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPkdA-00068K-Fm for importer@patchew.org; Mon, 13 Sep 2021 08:00:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42792) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPkau-0002lu-IT for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:57:53 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:39563) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPkar-0005lL-1t for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:57:52 -0400 Received: by mail-wr1-x436.google.com with SMTP id u15so8206957wru.6 for ; Mon, 13 Sep 2021 04:57:48 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n186sm6011037wme.31.2021.09.13.04.57.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 04:57:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/7nrEReoQoR7zRCQbazGzZCmxeeaU0xNt1erxfpNR44=; b=MLJywj489R6zX6kU0hKeVjBdhFwAfmFSmdwVIpIVSCmKJvN61hDPPWUCn1yPp9aW0Q c9FqnPGk7CGqNK4Ek668MjdAHTWUDxS+f3RMybdIDuxhVpFYUOqSR6EaoG5NJT2bgz8n Q687N6Cipp0D7GKSXqpekWG6bJpW+IrB62EOZfLnESfCpFHBzuk6W1ztW4HJjJa4a4nM aW6ajGTapSdXTea2XiusC3qQw2rNwxUa+Ho+mymiAuv0RkfFSKWGOKcbTvuRxjCfYviA GAXHLtROurGAoFgDpybFFcOFmQumUr2K+OInHRCRHVK31bSjCzgaU/PwqYzfhWefd8dG bEiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/7nrEReoQoR7zRCQbazGzZCmxeeaU0xNt1erxfpNR44=; b=5bsohNBM3O5osIDvS4C/vUy8IFQY6s3wj+tlgqdZLqMNuL/icqIMm1Y9o5z8CGah+T 3ejwFGcDchGFdADk4wKECVbSbqnACIR/aBGuLexFFtd0ZnxwD60hN9Z2px4j0ZSi/Sqd Q1a2kadFE9hqhxP5/RywvjCjIMaamxG4Ce2EhO8DU2mkMRE9LFt0bejX5/TMbv3Ei0RM EDE2fIxqlBbJ72C6ZCTHq1nQekW4+kTdZUyVsYvKLxNdpx8mmI+nYYeJH7u0RfuGcKRW a/bNePZpJGeAQlGWhqyuLLckNSGZ3ZrVaGRBRxFl/Z8rIvcyO9XVvdkLdnspqS2EK5BK +zpw== X-Gm-Message-State: AOAM532yn8aUgfCvYdbM5+FVgdAcsZsawEb9kiwUfkBa1PE6H/Cyitpy C3pASv3vUP2/g8NEINbFmCh3xce1Dvg= X-Google-Smtp-Source: ABdhPJxd6tGSyL8XGh61vt7niCCEaI/bb/Z2EsSvqg2E5W6WM0woEy5VjOL9nyQY7CmmfI45DdgBRw== X-Received: by 2002:a5d:504f:: with SMTP id h15mr12347812wrt.69.1631534267547; Mon, 13 Sep 2021 04:57:47 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 01/21] target/i386: add missing bits to CR4_RESERVED_MASK Date: Mon, 13 Sep 2021 13:57:22 +0200 Message-Id: <20210913115742.533197-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210913115742.533197-1-pbonzini@redhat.com> References: <20210913115742.533197-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::436; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x436.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , "Richard W . M . Jones" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631534415772100001 From: Daniel P. Berrang=C3=A9 Booting Fedora kernels with -cpu max hangs very early in boot. Disabling the la57 CPUID bit fixes the problem. git bisect traced the regression to commit 213ff024a2f92020290296cb9dc29c2af3d4a221 (HEAD, refs/bisect/bad) Author: Lara Lazier Date: Wed Jul 21 17:26:50 2021 +0200 target/i386: Added consistency checks for CR4 All MBZ bits in CR4 must be zero. (APM2 15.5) Added reserved bitmask and added checks in both helper_vmrun and helper_write_crN. Signed-off-by: Lara Lazier Message-Id: <20210721152651.14683-2-laramglazier@gmail.com> Signed-off-by: Paolo Bonzini In this commit CR4_RESERVED_MASK is missing CR4_LA57_MASK and two others. Adding this lets Fedora kernels boot once again. Signed-off-by: Daniel P. Berrang=C3=A9 Tested-by: Richard W.M. Jones Message-Id: <20210831175033.175584-1-berrange@redhat.com> [Removed VMXE/SMXE, matching the commit message. - Paolo] Fixes: 213ff024a2 ("target/i386: Added consistency checks for CR4", 2021-07= -22) Signed-off-by: Paolo Bonzini --- target/i386/cpu.h | 1 + 1 file changed, 1 insertion(+) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 6c50d3ab4f..21b33fbe2e 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -257,6 +257,7 @@ typedef enum X86Seg { | CR4_DE_MASK | CR4_PSE_MASK | CR4_PAE_MASK \ | CR4_MCE_MASK | CR4_PGE_MASK | CR4_PCE_MASK \ | CR4_OSFXSR_MASK | CR4_OSXMMEXCPT_MASK |CR4_UMIP_MASK \ + | CR4_LA57_MASK \ | CR4_FSGSBASE_MASK | CR4_PCIDE_MASK | CR4_OSXSAVE_MASK \ | CR4_SMEP_MASK | CR4_SMAP_MASK | CR4_PKE_MASK | CR4_PKS_M= ASK)) =20 --=20 2.31.1 From nobody Sun May 19 22:46:09 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631534400795777.788718388215; Mon, 13 Sep 2021 05:00:00 -0700 (PDT) Received: from localhost ([::1]:58080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPkcx-0005kN-OT for importer@patchew.org; Mon, 13 Sep 2021 07:59:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPkav-0002m4-Qg for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:57:53 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:34760) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPkas-0005m6-DZ for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:57:53 -0400 Received: by mail-wr1-x42b.google.com with SMTP id m9so14288423wrb.1 for ; Mon, 13 Sep 2021 04:57:50 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n186sm6011037wme.31.2021.09.13.04.57.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 04:57:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XWN6TWfYGXaOKzPRhA5oC6s5wzK7ZkowpHJRh9f6v9w=; b=CrzJdxJ8uINdu8AIFfCBAU2CG3Wyxm2PIjUF12XcbyP3v0SKM+fJ/kXUTzPAlqVs69 jvNAi8ie2LOIWpTaPTAa/vfsfVMSUbHQYdkM5kVU/02dZGJ5/pC3UgZOlOEYA//M97B/ fm78RAmPR/mE69XptBeusiZNiITHxDcDavXCosiS1z/YfLFvLh28XhOU8djJ56qBC7pV Wo21PVsIVOkJW6scp6IDgTthBxiw9xB7cRDdfLqe4ekfvLTKRWBq5If5y8RVjfXdAIjH PbHFu5KRlONiFVGGyZooVHhdIMfLIdQVBz44QF3Svc+dLT8mddYC7ghF4OK+gzotu5Wz roFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=XWN6TWfYGXaOKzPRhA5oC6s5wzK7ZkowpHJRh9f6v9w=; b=ZwYeF/7SrMTwcufetVXdjTAIal+lw5e62hMgo+OybdLHWTMbOZi0gU+vpkpm8aNtdY GUT8gsf3geE1BLmfqodoMNR1DBfVJAE3NeTMTP8wPEHeCdjG2tMRgv4WG6uT84odNCcZ ZFkf/n3QvD1kZaFh1GXXTJRYUXxylBdQgvvG6trzQwlQYfUbMESEcQCYlyVvhcGI8RDn B4H/dzo4GZBKwqmr0biVP4+l98YrJ2+MScpSlv/xxxqx5z4OQap0j4rCC+3VTcfwx/vd AdX2G/VjhvJM8mdDJibSj0iF4ZQVuHJ9lGDF/p4nCDoWjcJRLlIvzClxvk0aQHP6FxGc GP8Q== X-Gm-Message-State: AOAM530g0L7LalV3oyFnLQadl/zsW0I6ZORZ5kOW/33uEZnvIJoLivQa vCqf+3KPkQJp1bSYlXfu3nbIykfpOJo= X-Google-Smtp-Source: ABdhPJyTVi17cjzFeopHw/KYWLm4NKBqXrB31TT9iqQb3+TgevXu7DOCpCSWl6/enCOG/Z1L4GlHZA== X-Received: by 2002:adf:f185:: with SMTP id h5mr12224103wro.302.1631534268876; Mon, 13 Sep 2021 04:57:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 02/21] target/i386: VMRUN and VMLOAD canonicalizations Date: Mon, 13 Sep 2021 13:57:23 +0200 Message-Id: <20210913115742.533197-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210913115742.533197-1-pbonzini@redhat.com> References: <20210913115742.533197-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::42b; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42b.google.com X-Spam_score_int: 4 X-Spam_score: 0.4 X-Spam_bar: / X-Spam_report: (0.4 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Lara Lazier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631535304426100001 Content-Type: text/plain; charset="utf-8" From: Lara Lazier APM2 requires that VMRUN and VMLOAD canonicalize (sign extend to 63 from 48/57) all base addresses in the segment registers that have been respectively loaded. Signed-off-by: Lara Lazier Message-Id: <20210804113058.45186-1-laramglazier@gmail.com> Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 19 +++++++++++-------- target/i386/cpu.h | 2 ++ target/i386/tcg/sysemu/svm_helper.c | 27 +++++++++++++++++---------- 3 files changed, 30 insertions(+), 18 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 97e250e876..fbca4e5860 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -5115,6 +5115,15 @@ static void x86_register_cpudef_types(const X86CPUDe= finition *def) =20 } =20 +uint32_t cpu_x86_virtual_addr_width(CPUX86State *env) +{ + if (env->features[FEAT_7_0_ECX] & CPUID_7_0_ECX_LA57) { + return 57; /* 57 bits virtual */ + } else { + return 48; /* 48 bits virtual */ + } +} + void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx) @@ -5517,16 +5526,10 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index= , uint32_t count, break; case 0x80000008: /* virtual & phys address size in low 2 bytes. */ + *eax =3D cpu->phys_bits; if (env->features[FEAT_8000_0001_EDX] & CPUID_EXT2_LM) { /* 64 bit processor */ - *eax =3D cpu->phys_bits; /* configurable physical bits */ - if (env->features[FEAT_7_0_ECX] & CPUID_7_0_ECX_LA57) { - *eax |=3D 0x00003900; /* 57 bits virtual */ - } else { - *eax |=3D 0x00003000; /* 48 bits virtual */ - } - } else { - *eax =3D cpu->phys_bits; + *eax |=3D (cpu_x86_virtual_addr_width(env) << 8); } *ebx =3D env->features[FEAT_8000_0008_EBX]; if (cs->nr_cores * cs->nr_threads > 1) { diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 21b33fbe2e..aafc2eb696 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1955,6 +1955,8 @@ typedef struct PropValue { } PropValue; void x86_cpu_apply_props(X86CPU *cpu, PropValue *props); =20 +uint32_t cpu_x86_virtual_addr_width(CPUX86State *env); + /* cpu.c other functions (cpuid) */ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, uint32_t *eax, uint32_t *ebx, diff --git a/target/i386/tcg/sysemu/svm_helper.c b/target/i386/tcg/sysemu/s= vm_helper.c index 0d549b3d6c..0e7de4e054 100644 --- a/target/i386/tcg/sysemu/svm_helper.c +++ b/target/i386/tcg/sysemu/svm_helper.c @@ -41,6 +41,16 @@ static inline void svm_save_seg(CPUX86State *env, hwaddr= addr, ((sc->flags >> 8) & 0xff) | ((sc->flags >> 12) & 0x0f00)); } =20 +/* + * VMRUN and VMLOAD canonicalizes (i.e., sign-extend to bit 63) all base + * addresses in the segment registers that have been loaded. + */ +static inline void svm_canonicalization(CPUX86State *env, target_ulong *se= g_base) +{ + uint16_t shift_amt =3D 64 - cpu_x86_virtual_addr_width(env); + *seg_base =3D ((((long) *seg_base) << shift_amt) >> shift_amt); +} + static inline void svm_load_seg(CPUX86State *env, hwaddr addr, SegmentCache *sc) { @@ -53,6 +63,7 @@ static inline void svm_load_seg(CPUX86State *env, hwaddr = addr, sc->limit =3D x86_ldl_phys(cs, addr + offsetof(struct vmcb_seg, limit)= ); flags =3D x86_lduw_phys(cs, addr + offsetof(struct vmcb_seg, attrib)); sc->flags =3D ((flags & 0xff) << 8) | ((flags & 0x0f00) << 12); + svm_canonicalization(env, &sc->base); } =20 static inline void svm_load_seg_cache(CPUX86State *env, hwaddr addr, @@ -245,16 +256,6 @@ void helper_vmrun(CPUX86State *env, int aflag, int nex= t_eip_addend) env->tsc_offset =3D x86_ldq_phys(cs, env->vm_vmcb + offsetof(struct vmcb, control.tsc_offset)); =20 - env->gdt.base =3D x86_ldq_phys(cs, env->vm_vmcb + offsetof(struct vmc= b, - save.gdtr.base)); - env->gdt.limit =3D x86_ldl_phys(cs, env->vm_vmcb + offsetof(struct vmc= b, - save.gdtr.limit)); - - env->idt.base =3D x86_ldq_phys(cs, env->vm_vmcb + offsetof(struct vmc= b, - save.idtr.base)); - env->idt.limit =3D x86_ldl_phys(cs, env->vm_vmcb + offsetof(struct vmc= b, - save.idtr.limit)); - new_cr0 =3D x86_ldq_phys(cs, env->vm_vmcb + offsetof(struct vmcb, save= .cr0)); if (new_cr0 & SVM_CR0_RESERVED_MASK) { cpu_vmexit(env, SVM_EXIT_ERR, 0, GETPC()); @@ -308,6 +309,10 @@ void helper_vmrun(CPUX86State *env, int aflag, int nex= t_eip_addend) R_SS); svm_load_seg_cache(env, env->vm_vmcb + offsetof(struct vmcb, save.ds), R_DS); + svm_load_seg(env, env->vm_vmcb + offsetof(struct vmcb, save.idtr), + &env->idt); + svm_load_seg(env, env->vm_vmcb + offsetof(struct vmcb, save.gdtr), + &env->gdt); =20 env->eip =3D x86_ldq_phys(cs, env->vm_vmcb + offsetof(struct vmcb, save.rip)); @@ -446,6 +451,7 @@ void helper_vmload(CPUX86State *env, int aflag) env->lstar =3D x86_ldq_phys(cs, addr + offsetof(struct vmcb, save.lsta= r)); env->cstar =3D x86_ldq_phys(cs, addr + offsetof(struct vmcb, save.csta= r)); env->fmask =3D x86_ldq_phys(cs, addr + offsetof(struct vmcb, save.sfma= sk)); + svm_canonicalization(env, &env->kernelgsbase); #endif env->star =3D x86_ldq_phys(cs, addr + offsetof(struct vmcb, save.star)= ); env->sysenter_cs =3D x86_ldq_phys(cs, @@ -454,6 +460,7 @@ void helper_vmload(CPUX86State *env, int aflag) save.sysenter_esp)); env->sysenter_eip =3D x86_ldq_phys(cs, addr + offsetof(struct vmcb, save.sysenter_eip)); + } =20 void helper_vmsave(CPUX86State *env, int aflag) --=20 2.31.1 From nobody Sun May 19 22:46:09 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631534657474777.6222945880053; Mon, 13 Sep 2021 05:04:17 -0700 (PDT) Received: from localhost ([::1]:38176 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPkh6-0003Ab-0S for importer@patchew.org; Mon, 13 Sep 2021 08:04:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42798) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPkau-0002lw-TT for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:57:53 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:36605) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPkas-0005n0-TD for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:57:52 -0400 Received: by mail-wr1-x42c.google.com with SMTP id g16so14296269wrb.3 for ; Mon, 13 Sep 2021 04:57:50 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n186sm6011037wme.31.2021.09.13.04.57.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 04:57:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vC4CLxS3uATszG/9NMGUyh1mVGgnFuJ2ybR8crd545U=; b=FywgWqflrnkJzeGbYi9epTXIFsOxf2xPYFRvn8JiU9/B3Ews4id851Rup1JASLQ8t9 wagJHYEsUvoHcpUKSPaUWjy/jb6JrmwWNwCM5VpoTCmcUNYfep+4ONCba3hk3A67ZBj5 sPM0jOOSLlV3QZOkEjnx+C42zoW2IbhMr6G1k49/8ZjT49WwUeeXRNamiekr594uoufQ Kk6JYsCLNHzS7h5zGUwv2KOiiQq/NKdVJUWxmT5udoNvXB4IBZYgwN7bO8JFZPmikxNl 7SJCntjP0XcU6R8CwcUEtXGVhVpVDS7HceXxtMC9BmiEtFM8bqGYa/e6m3P4sUk9uyTu uq5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=vC4CLxS3uATszG/9NMGUyh1mVGgnFuJ2ybR8crd545U=; b=h1DfqxficLA9zCQxITrUdyDcFuDhp4PQlexYbvVJiR9AnDWIeU3A1QjZQLej/jsI6k CUBERv3F93TyOg/tyfNIebTyffLeS0xf8DwCiPyZgjJVsiPAvHBEnn+jtfCOymBR47z7 HKx7NgO+SyYCkVMOI3KVPnnuOaNNdsNdCJLhIsdHEeojjG/vPI45d1qLKfiQY/eAESfJ WsN75TghbH9xWJJCC21wz7VgOr+N7sc0EkzbW0xWmgNWdRlBrfWZ9L21U+y7aRHY16YN DnHDaRr6RYd/eD8WJ6ku5En9EtwvqU2OvPfWNDLbfn9sJcujcW0mov+9uXba0WnbpPPG G6DA== X-Gm-Message-State: AOAM530Pz4sg+a1xUJRFSAV+UbCGh5yvR10X224p2z4hK5uWX3o0bYUg K4fw/DgyBA1HrXeIDmQjJ8o5a4h5iig= X-Google-Smtp-Source: ABdhPJwjzzTC89uxCaxwB5dcpcA2KhvM1gQqJ5IRpPHmZYA3LJEWymy0goFyGYaBLttvlHOnN+SVXQ== X-Received: by 2002:a5d:53cd:: with SMTP id a13mr12091623wrw.33.1631534269572; Mon, 13 Sep 2021 04:57:49 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 03/21] target/i386: Added VGIF feature Date: Mon, 13 Sep 2021 13:57:24 +0200 Message-Id: <20210913115742.533197-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210913115742.533197-1-pbonzini@redhat.com> References: <20210913115742.533197-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::42c; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Lara Lazier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631534674072100001 Content-Type: text/plain; charset="utf-8" From: Lara Lazier VGIF allows STGI and CLGI to execute in guest mode and control virtual interrupts in guest mode. When the VGIF feature is enabled then: * executing STGI in the guest sets bit 9 of the VMCB offset 60h. * executing CLGI in the guest clears bit 9 of the VMCB offset 60h. Signed-off-by: Lara Lazier Message-Id: <20210730070742.9674-1-laramglazier@gmail.com> Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 3 ++- target/i386/svm.h | 6 ++++++ target/i386/tcg/sysemu/svm_helper.c | 31 +++++++++++++++++++++++++++-- 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index fbca4e5860..86064ea1f9 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -631,7 +631,8 @@ void x86_cpu_vendor_words2str(char *dst, uint32_t vendo= r1, #define TCG_EXT3_FEATURES (CPUID_EXT3_LAHF_LM | CPUID_EXT3_SVM | \ CPUID_EXT3_CR8LEG | CPUID_EXT3_ABM | CPUID_EXT3_SSE4A) #define TCG_EXT4_FEATURES 0 -#define TCG_SVM_FEATURES CPUID_SVM_NPT +#define TCG_SVM_FEATURES (CPUID_SVM_NPT | CPUID_SVM_VGIF | \ + CPUID_SVM_SVME_ADDR_CHK) #define TCG_KVM_FEATURES 0 #define TCG_7_0_EBX_FEATURES (CPUID_7_0_EBX_SMEP | CPUID_7_0_EBX_SMAP | \ CPUID_7_0_EBX_BMI1 | CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ADX | \ diff --git a/target/i386/svm.h b/target/i386/svm.h index adc058dc76..036597a2ff 100644 --- a/target/i386/svm.h +++ b/target/i386/svm.h @@ -9,6 +9,12 @@ #define V_IRQ_SHIFT 8 #define V_IRQ_MASK (1 << V_IRQ_SHIFT) =20 +#define V_GIF_ENABLED_SHIFT 25 +#define V_GIF_ENABLED_MASK (1 << V_GIF_ENABLED_SHIFT) + +#define V_GIF_SHIFT 9 +#define V_GIF_MASK (1 << V_GIF_SHIFT) + #define V_INTR_PRIO_SHIFT 16 #define V_INTR_PRIO_MASK (0x0f << V_INTR_PRIO_SHIFT) =20 diff --git a/target/i386/tcg/sysemu/svm_helper.c b/target/i386/tcg/sysemu/s= vm_helper.c index 0e7de4e054..66c2c1e61f 100644 --- a/target/i386/tcg/sysemu/svm_helper.c +++ b/target/i386/tcg/sysemu/svm_helper.c @@ -121,6 +121,17 @@ static inline bool is_efer_invalid_state (CPUX86State = *env) return false; } =20 +static inline bool virtual_gif_enabled(CPUX86State *env, uint32_t *int_ctl) +{ + if (likely(env->hflags & HF_GUEST_MASK)) { + *int_ctl =3D x86_ldl_phys(env_cpu(env), + env->vm_vmcb + offsetof(struct vmcb, control.int_ct= l)); + return (env->features[FEAT_SVM] & CPUID_SVM_VGIF) + && (*int_ctl & V_GIF_ENABLED_MASK); + } + return false; +} + void helper_vmrun(CPUX86State *env, int aflag, int next_eip_addend) { CPUState *cs =3D env_cpu(env); @@ -510,13 +521,29 @@ void helper_vmsave(CPUX86State *env, int aflag) void helper_stgi(CPUX86State *env) { cpu_svm_check_intercept_param(env, SVM_EXIT_STGI, 0, GETPC()); - env->hflags2 |=3D HF2_GIF_MASK; + + CPUState *cs =3D env_cpu(env); + uint32_t int_ctl; + if (virtual_gif_enabled(env, &int_ctl)) { + x86_stl_phys(cs, env->vm_vmcb + offsetof(struct vmcb, control.int_= ctl), + int_ctl | V_GIF_MASK); + } else { + env->hflags2 |=3D HF2_GIF_MASK; + } } =20 void helper_clgi(CPUX86State *env) { cpu_svm_check_intercept_param(env, SVM_EXIT_CLGI, 0, GETPC()); - env->hflags2 &=3D ~HF2_GIF_MASK; + + CPUState *cs =3D env_cpu(env); + uint32_t int_ctl; + if (virtual_gif_enabled(env, &int_ctl)) { + x86_stl_phys(cs, env->vm_vmcb + offsetof(struct vmcb, control.int_= ctl), + int_ctl & ~V_GIF_MASK); + } else { + env->hflags2 &=3D ~HF2_GIF_MASK; + } } =20 bool cpu_svm_has_intercept(CPUX86State *env, uint32_t type) --=20 2.31.1 From nobody Sun May 19 22:46:09 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631534678989347.4521983022446; Mon, 13 Sep 2021 05:04:38 -0700 (PDT) Received: from localhost ([::1]:39032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPkhQ-0003jN-PJ for importer@patchew.org; Mon, 13 Sep 2021 08:04:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPkax-0002mq-4f for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:57:55 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:40598) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPkav-0005oo-5g for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:57:54 -0400 Received: by mail-wr1-x436.google.com with SMTP id q26so14261129wrc.7 for ; Mon, 13 Sep 2021 04:57:52 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n186sm6011037wme.31.2021.09.13.04.57.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 04:57:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yGGcFCxa3DPzLBu/R2mPTHRKMWG0DNlo6ftGn6pELgQ=; b=Ai2TtWUh3UainORa4v4624xEEz8PRObM9cNMezbc86EFBMjdpC6MKn+aaxcbtxI1K0 eStXGdqIcQAwj9ZROhdMstLOIK1S823FJwH0diKPj+uTv9aiY+TyrNbnzYy7W+nYw2np jxaPfzCiV6PfhfcQm7IaE2vAsC3CSZNx9HHwKIt5ujFlx2evypUQEMMRdwY0zN3r6gNm ZSsQzYmq7FbKNTmrLoV+Jy+aPrQiPOJLY6wRT/auvjACPgajF7DwKyIrOnHec5UM1IHB Hd7ylLZ1PcFSuNtCsM0fiFXKNnuSEY6gd5v/ngqxD8RcYEazfsvQx9pu8qVjclpP3sln U4cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=yGGcFCxa3DPzLBu/R2mPTHRKMWG0DNlo6ftGn6pELgQ=; b=l1M3mxrEqYiMxqmTAa1vYhuAj/hlwhE8MdhebJA+5JdB+vYKoJyWjUWsVD1WiPWEaX bNpeiEIDHp93CwMUvVY54i/AgjIg99DYLKvQSbi8K82FPY3BxzXmddLQ40uMARvzHjq2 0G+53TCFZoPUdnkjwvuqn1yBZYBEmsaed5HRziDns5WThIpmypRH77Zl0/ohqhGnQagu G9/971dAnSSC1kxnzmoM724TnODYYwjFvFSig1JFATjT2Bdgu9XlCsUa/KF1gnqbmWLk 2BJbB/pI5wjKG4wB/G1YmSYHkhvL0EoH5ZYnn0KlCWW2PNjG6JleZzt1qRGnc7oIwXY5 xKBA== X-Gm-Message-State: AOAM531p0TEh3i2ziiT8HY2eEjFoJIJnAbiJ50lMfUXQiv7aqd7T58e8 EfC0xJIrnE/KIRRRdt8Gs/jVIQhsleU= X-Google-Smtp-Source: ABdhPJyVhO960h0fvrhUPW/2nKKsrv58uCFNYcYY5x6GTyQlqRy02+udAQTcWSDoiAkvAIfCOAUreA== X-Received: by 2002:adf:9bdb:: with SMTP id e27mr11865684wrc.162.1631534271790; Mon, 13 Sep 2021 04:57:51 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 04/21] target/i386: Moved int_ctl into CPUX86State structure Date: Mon, 13 Sep 2021 13:57:25 +0200 Message-Id: <20210913115742.533197-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210913115742.533197-1-pbonzini@redhat.com> References: <20210913115742.533197-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::436; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x436.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Lara Lazier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631534690900100001 Content-Type: text/plain; charset="utf-8" From: Lara Lazier Moved int_ctl into the CPUX86State structure. It removes some unnecessary stores and loads, and prepares for tracking the vIRQ state even when it is masked due to vGIF. Signed-off-by: Lara Lazier Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 2 +- target/i386/cpu.h | 1 + target/i386/machine.c | 22 ++++++++++++- target/i386/tcg/seg_helper.c | 2 +- target/i386/tcg/sysemu/misc_helper.c | 4 +-- target/i386/tcg/sysemu/svm_helper.c | 48 +++++++++------------------- 6 files changed, 41 insertions(+), 38 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 86064ea1f9..ddc3b63cb8 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -5655,7 +5655,7 @@ static void x86_cpu_reset(DeviceState *dev) env->old_exception =3D -1; =20 /* init to reset state */ - + env->int_ctl =3D 0; env->hflags2 |=3D HF2_GIF_MASK; env->hflags &=3D ~HF_GUEST_MASK; =20 diff --git a/target/i386/cpu.h b/target/i386/cpu.h index aafc2eb696..3dfe630d7e 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1578,6 +1578,7 @@ typedef struct CPUX86State { uint64_t nested_cr3; uint32_t nested_pg_mode; uint8_t v_tpr; + uint32_t int_ctl; =20 /* KVM states, automatically cleared on reset */ uint8_t nmi_injected; diff --git a/target/i386/machine.c b/target/i386/machine.c index f6f094f1c9..b0943118d1 100644 --- a/target/i386/machine.c +++ b/target/i386/machine.c @@ -203,7 +203,7 @@ static int cpu_pre_save(void *opaque) X86CPU *cpu =3D opaque; CPUX86State *env =3D &cpu->env; int i; - + env->v_tpr =3D env->int_ctl & V_TPR_MASK; /* FPU */ env->fpus_vmstate =3D (env->fpus & ~0x3800) | (env->fpstt & 0x7) << 11; env->fptag_vmstate =3D 0; @@ -1356,6 +1356,25 @@ static const VMStateDescription vmstate_svm_npt =3D { } }; =20 +static bool svm_guest_needed(void *opaque) +{ + X86CPU *cpu =3D opaque; + CPUX86State *env =3D &cpu->env; + + return tcg_enabled() && env->int_ctl; +} + +static const VMStateDescription vmstate_svm_guest =3D { + .name =3D "cpu/svm_guest", + .version_id =3D 1, + .minimum_version_id =3D 1, + .needed =3D svm_guest_needed, + .fields =3D (VMStateField[]){ + VMSTATE_UINT32(env.int_ctl, X86CPU), + VMSTATE_END_OF_LIST() + } +}; + #ifndef TARGET_X86_64 static bool intel_efer32_needed(void *opaque) { @@ -1524,6 +1543,7 @@ const VMStateDescription vmstate_x86_cpu =3D { &vmstate_msr_intel_pt, &vmstate_msr_virt_ssbd, &vmstate_svm_npt, + &vmstate_svm_guest, #ifndef TARGET_X86_64 &vmstate_efer32, #endif diff --git a/target/i386/tcg/seg_helper.c b/target/i386/tcg/seg_helper.c index 3ed20ca31d..cef68b610a 100644 --- a/target/i386/tcg/seg_helper.c +++ b/target/i386/tcg/seg_helper.c @@ -1166,7 +1166,6 @@ bool x86_cpu_exec_interrupt(CPUState *cs, int interru= pt_request) break; #if !defined(CONFIG_USER_ONLY) case CPU_INTERRUPT_VIRQ: - /* FIXME: this should respect TPR */ cpu_svm_check_intercept_param(env, SVM_EXIT_VINTR, 0, 0); intno =3D x86_ldl_phys(cs, env->vm_vmcb + offsetof(struct vmcb, control.int_vector)); @@ -1174,6 +1173,7 @@ bool x86_cpu_exec_interrupt(CPUState *cs, int interru= pt_request) "Servicing virtual hardware INT=3D0x%02x\n", intno); do_interrupt_x86_hardirq(env, intno, 1); cs->interrupt_request &=3D ~CPU_INTERRUPT_VIRQ; + env->int_ctl &=3D ~V_IRQ_MASK; break; #endif } diff --git a/target/i386/tcg/sysemu/misc_helper.c b/target/i386/tcg/sysemu/= misc_helper.c index e7a2ebde81..91b0fc916b 100644 --- a/target/i386/tcg/sysemu/misc_helper.c +++ b/target/i386/tcg/sysemu/misc_helper.c @@ -73,7 +73,7 @@ target_ulong helper_read_crN(CPUX86State *env, int reg) if (!(env->hflags2 & HF2_VINTR_MASK)) { val =3D cpu_get_apic_tpr(env_archcpu(env)->apic_state); } else { - val =3D env->v_tpr; + val =3D env->int_ctl & V_TPR_MASK; } break; } @@ -121,7 +121,7 @@ void helper_write_crN(CPUX86State *env, int reg, target= _ulong t0) cpu_set_apic_tpr(env_archcpu(env)->apic_state, t0); qemu_mutex_unlock_iothread(); } - env->v_tpr =3D t0 & 0x0f; + env->int_ctl =3D (env->int_ctl & ~V_TPR_MASK) | (t0 & V_TPR_MASK); break; default: env->cr[reg] =3D t0; diff --git a/target/i386/tcg/sysemu/svm_helper.c b/target/i386/tcg/sysemu/s= vm_helper.c index 66c2c1e61f..24c58b6a38 100644 --- a/target/i386/tcg/sysemu/svm_helper.c +++ b/target/i386/tcg/sysemu/svm_helper.c @@ -76,14 +76,14 @@ static inline void svm_load_seg_cache(CPUX86State *env,= hwaddr addr, sc->base, sc->limit, sc->flags); } =20 -static inline bool ctl_has_irq(uint32_t int_ctl) +static inline bool ctl_has_irq(CPUX86State *env) { uint32_t int_prio; uint32_t tpr; =20 - int_prio =3D (int_ctl & V_INTR_PRIO_MASK) >> V_INTR_PRIO_SHIFT; - tpr =3D int_ctl & V_TPR_MASK; - return (int_ctl & V_IRQ_MASK) && (int_prio >=3D tpr); + int_prio =3D (env->int_ctl & V_INTR_PRIO_MASK) >> V_INTR_PRIO_SHIFT; + tpr =3D env->int_ctl & V_TPR_MASK; + return (env->int_ctl & V_IRQ_MASK) && (int_prio >=3D tpr); } =20 static inline bool is_efer_invalid_state (CPUX86State *env) @@ -121,13 +121,11 @@ static inline bool is_efer_invalid_state (CPUX86State= *env) return false; } =20 -static inline bool virtual_gif_enabled(CPUX86State *env, uint32_t *int_ctl) +static inline bool virtual_gif_enabled(CPUX86State *env) { if (likely(env->hflags & HF_GUEST_MASK)) { - *int_ctl =3D x86_ldl_phys(env_cpu(env), - env->vm_vmcb + offsetof(struct vmcb, control.int_ct= l)); return (env->features[FEAT_SVM] & CPUID_SVM_VGIF) - && (*int_ctl & V_GIF_ENABLED_MASK); + && (env->int_ctl & V_GIF_ENABLED_MASK); } return false; } @@ -139,7 +137,6 @@ void helper_vmrun(CPUX86State *env, int aflag, int next= _eip_addend) target_ulong addr; uint64_t nested_ctl; uint32_t event_inj; - uint32_t int_ctl; uint32_t asid; uint64_t new_cr0; uint64_t new_cr3; @@ -292,11 +289,10 @@ void helper_vmrun(CPUX86State *env, int aflag, int ne= xt_eip_addend) cpu_x86_update_cr3(env, new_cr3); env->cr[2] =3D x86_ldq_phys(cs, env->vm_vmcb + offsetof(struct vmcb, save.cr2)); - int_ctl =3D x86_ldl_phys(cs, + env->int_ctl =3D x86_ldl_phys(cs, env->vm_vmcb + offsetof(struct vmcb, control.int_ct= l)); env->hflags2 &=3D ~(HF2_HIF_MASK | HF2_VINTR_MASK); - if (int_ctl & V_INTR_MASKING_MASK) { - env->v_tpr =3D int_ctl & V_TPR_MASK; + if (env->int_ctl & V_INTR_MASKING_MASK) { env->hflags2 |=3D HF2_VINTR_MASK; if (env->eflags & IF_MASK) { env->hflags2 |=3D HF2_HIF_MASK; @@ -362,7 +358,7 @@ void helper_vmrun(CPUX86State *env, int aflag, int next= _eip_addend) =20 env->hflags2 |=3D HF2_GIF_MASK; =20 - if (ctl_has_irq(int_ctl)) { + if (ctl_has_irq(env)) { CPUState *cs =3D env_cpu(env); =20 cs->interrupt_request |=3D CPU_INTERRUPT_VIRQ; @@ -522,11 +518,8 @@ void helper_stgi(CPUX86State *env) { cpu_svm_check_intercept_param(env, SVM_EXIT_STGI, 0, GETPC()); =20 - CPUState *cs =3D env_cpu(env); - uint32_t int_ctl; - if (virtual_gif_enabled(env, &int_ctl)) { - x86_stl_phys(cs, env->vm_vmcb + offsetof(struct vmcb, control.int_= ctl), - int_ctl | V_GIF_MASK); + if (virtual_gif_enabled(env)) { + env->int_ctl |=3D V_GIF_MASK; } else { env->hflags2 |=3D HF2_GIF_MASK; } @@ -536,11 +529,8 @@ void helper_clgi(CPUX86State *env) { cpu_svm_check_intercept_param(env, SVM_EXIT_CLGI, 0, GETPC()); =20 - CPUState *cs =3D env_cpu(env); - uint32_t int_ctl; - if (virtual_gif_enabled(env, &int_ctl)) { - x86_stl_phys(cs, env->vm_vmcb + offsetof(struct vmcb, control.int_= ctl), - int_ctl & ~V_GIF_MASK); + if (virtual_gif_enabled(env)) { + env->int_ctl &=3D ~V_GIF_MASK; } else { env->hflags2 &=3D ~HF2_GIF_MASK; } @@ -688,7 +678,6 @@ void cpu_vmexit(CPUX86State *env, uint32_t exit_code, u= int64_t exit_info_1, void do_vmexit(CPUX86State *env) { CPUState *cs =3D env_cpu(env); - uint32_t int_ctl; =20 if (env->hflags & HF_INHIBIT_IRQ_MASK) { x86_stl_phys(cs, @@ -731,16 +720,8 @@ void do_vmexit(CPUX86State *env) env->vm_vmcb + offsetof(struct vmcb, save.cr3), env->cr[3]); x86_stq_phys(cs, env->vm_vmcb + offsetof(struct vmcb, save.cr4), env->cr[4]); - - int_ctl =3D x86_ldl_phys(cs, - env->vm_vmcb + offsetof(struct vmcb, control.int_ct= l)); - int_ctl &=3D ~(V_TPR_MASK | V_IRQ_MASK); - int_ctl |=3D env->v_tpr & V_TPR_MASK; - if (cs->interrupt_request & CPU_INTERRUPT_VIRQ) { - int_ctl |=3D V_IRQ_MASK; - } x86_stl_phys(cs, - env->vm_vmcb + offsetof(struct vmcb, control.int_ctl), int_ct= l); + env->vm_vmcb + offsetof(struct vmcb, control.int_ctl), env->i= nt_ctl); =20 x86_stq_phys(cs, env->vm_vmcb + offsetof(struct vmcb, save.rflags), cpu_compute_eflags(env)); @@ -763,6 +744,7 @@ void do_vmexit(CPUX86State *env) env->intercept =3D 0; env->intercept_exceptions =3D 0; cs->interrupt_request &=3D ~CPU_INTERRUPT_VIRQ; + env->int_ctl =3D 0; env->tsc_offset =3D 0; =20 env->gdt.base =3D x86_ldq_phys(cs, env->vm_hsave + offsetof(struct vm= cb, --=20 2.31.1 From nobody Sun May 19 22:46:09 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631534401440380.8979777901844; Mon, 13 Sep 2021 05:00:01 -0700 (PDT) Received: from localhost ([::1]:58190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPkcy-0005oU-7Z for importer@patchew.org; Mon, 13 Sep 2021 08:00:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPkay-0002pE-R4 for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:57:58 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:33313) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPkav-0005pW-QX for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:57:56 -0400 Received: by mail-wr1-x42a.google.com with SMTP id t18so14311645wrb.0 for ; Mon, 13 Sep 2021 04:57:53 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n186sm6011037wme.31.2021.09.13.04.57.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 04:57:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rury9kyy7jESqyjutVRPw1Pj5BJEZzJk31MIDToIicI=; b=Q5p67lPN4qVsg666BTAe8mRSOXwI25RIM6RGZ5ZTLomVRy0+GM4ClM+paaOzOMNBR2 4+BZ+LnHKP5a1ywUxsgwqXQwz2V6Bvf4pt4CMYDw1XNGczuegkh8itWy9jcMcTUMF0fh tKK5r4tTWzFlHyv2EFB//hdgYRVS+hJaDKsLKj5okaNTjvEJDWpO7zd7pDR4hxGXoZwU qbsjIIb5i2BwDc6yYHj/WmrA4cWmY4uP4ZPWSo8AaH1xilmuoCid1vME1FRPpvIrVmGk TZA0a5xzeY3CfdD6sQn0H+EBIWeL/j5zVhVYE5WsGTeSfA8u2DX6K5qJpr38a5ykW6kc escQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=rury9kyy7jESqyjutVRPw1Pj5BJEZzJk31MIDToIicI=; b=CWKb53qqy4n3XhIQOQNZcAJr/XY+6uBmB//8qtedKKaADVt6vTuSL7UX6hXSmP98jI fMGPtPiEsDBYnCy91UmF6DeU8nTCi+UcA6yeZvqiIlfzoP8njQcIdLP37oy09v8u+Mj4 SeYzd+tsW9n8g2VJoKZ0R4suPlgYbx6p4bXwbe/wCrLy8Ckpw+UrvJdtpp6pkYX5jd48 6IxQUllIkxEtyenvgcy2du3qaSN5oApYr5Ls5Gp8DwX2NmO+2KEeq36MfdjNylhD9S75 Cnd8UdxamQNDDkCP/r4tXoQIEA7gUL6T2gdkQD/2b2z6+GVgcj+VhA3GHfA+t6tgNUgZ 9ImA== X-Gm-Message-State: AOAM531Wn6aUt9gCrNTuMUhXu3EcjUI9/UlfymVKaGnb4SjwAN2Lh+ex WENeeN4htG2jYKIP/R3FTtmlOR5yerc= X-Google-Smtp-Source: ABdhPJwIit+/AOstTaMWi3T3Z2/4sqEAr2qDcr8FNpEbbMhUz6f3KmI1TVkS+Iw6ApAvNA0OU62FoA== X-Received: by 2002:a05:6000:1623:: with SMTP id v3mr12310578wrb.288.1631534272501; Mon, 13 Sep 2021 04:57:52 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 05/21] target/i386: Added VGIF V_IRQ masking capability Date: Mon, 13 Sep 2021 13:57:26 +0200 Message-Id: <20210913115742.533197-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210913115742.533197-1-pbonzini@redhat.com> References: <20210913115742.533197-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::42a; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42a.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Lara Lazier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631534401810100004 Content-Type: text/plain; charset="utf-8" From: Lara Lazier VGIF provides masking capability for when virtual interrupts are taken. (APM2) Signed-off-by: Lara Lazier Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 7 +++++-- target/i386/cpu.h | 2 ++ target/i386/tcg/sysemu/svm_helper.c | 12 ++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index ddc3b63cb8..6b029f1bdf 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -5657,6 +5657,7 @@ static void x86_cpu_reset(DeviceState *dev) /* init to reset state */ env->int_ctl =3D 0; env->hflags2 |=3D HF2_GIF_MASK; + env->hflags2 |=3D HF2_VGIF_MASK; env->hflags &=3D ~HF_GUEST_MASK; =20 cpu_x86_update_cr0(env, 0x60000010); @@ -6540,10 +6541,12 @@ int x86_cpu_pending_interrupt(CPUState *cs, int int= errupt_request) !(env->hflags & HF_INHIBIT_IRQ_MASK))))) { return CPU_INTERRUPT_HARD; #if !defined(CONFIG_USER_ONLY) - } else if ((interrupt_request & CPU_INTERRUPT_VIRQ) && + } else if (env->hflags2 & HF2_VGIF_MASK) { + if((interrupt_request & CPU_INTERRUPT_VIRQ) && (env->eflags & IF_MASK) && !(env->hflags & HF_INHIBIT_IRQ_MASK)) { - return CPU_INTERRUPT_VIRQ; + return CPU_INTERRUPT_VIRQ; + } #endif } } diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 3dfe630d7e..24e8ec5273 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -203,6 +203,7 @@ typedef enum X86Seg { #define HF2_MPX_PR_SHIFT 5 /* BNDCFGx.BNDPRESERVE */ #define HF2_NPT_SHIFT 6 /* Nested Paging enabled */ #define HF2_IGNNE_SHIFT 7 /* Ignore CR0.NE=3D0 */ +#define HF2_VGIF_SHIFT 8 /* Can take VIRQ*/ =20 #define HF2_GIF_MASK (1 << HF2_GIF_SHIFT) #define HF2_HIF_MASK (1 << HF2_HIF_SHIFT) @@ -212,6 +213,7 @@ typedef enum X86Seg { #define HF2_MPX_PR_MASK (1 << HF2_MPX_PR_SHIFT) #define HF2_NPT_MASK (1 << HF2_NPT_SHIFT) #define HF2_IGNNE_MASK (1 << HF2_IGNNE_SHIFT) +#define HF2_VGIF_MASK (1 << HF2_VGIF_SHIFT) =20 #define CR0_PE_SHIFT 0 #define CR0_MP_SHIFT 1 diff --git a/target/i386/tcg/sysemu/svm_helper.c b/target/i386/tcg/sysemu/s= vm_helper.c index 24c58b6a38..4612dae1ac 100644 --- a/target/i386/tcg/sysemu/svm_helper.c +++ b/target/i386/tcg/sysemu/svm_helper.c @@ -130,6 +130,11 @@ static inline bool virtual_gif_enabled(CPUX86State *en= v) return false; } =20 +static inline bool virtual_gif_set(CPUX86State *env) +{ + return !virtual_gif_enabled(env) || (env->int_ctl & V_GIF_MASK); +} + void helper_vmrun(CPUX86State *env, int aflag, int next_eip_addend) { CPUState *cs =3D env_cpu(env); @@ -364,6 +369,10 @@ void helper_vmrun(CPUX86State *env, int aflag, int nex= t_eip_addend) cs->interrupt_request |=3D CPU_INTERRUPT_VIRQ; } =20 + if (virtual_gif_set(env)) { + env->hflags2 |=3D HF2_VGIF_MASK; + } + /* maybe we need to inject an event */ event_inj =3D x86_ldl_phys(cs, env->vm_vmcb + offsetof(struct vmcb, control.event_inj)); @@ -520,6 +529,7 @@ void helper_stgi(CPUX86State *env) =20 if (virtual_gif_enabled(env)) { env->int_ctl |=3D V_GIF_MASK; + env->hflags2 |=3D HF2_VGIF_MASK; } else { env->hflags2 |=3D HF2_GIF_MASK; } @@ -531,6 +541,7 @@ void helper_clgi(CPUX86State *env) =20 if (virtual_gif_enabled(env)) { env->int_ctl &=3D ~V_GIF_MASK; + env->hflags2 &=3D ~HF2_VGIF_MASK; } else { env->hflags2 &=3D ~HF2_GIF_MASK; } @@ -812,6 +823,7 @@ void do_vmexit(CPUX86State *env) env->vm_vmcb + offsetof(struct vmcb, control.event_inj), 0); =20 env->hflags2 &=3D ~HF2_GIF_MASK; + env->hflags2 &=3D ~HF2_VGIF_MASK; /* FIXME: Resets the current ASID register to zero (host ASID). */ =20 /* Clears the V_IRQ and V_INTR_MASKING bits inside the processor. */ --=20 2.31.1 From nobody Sun May 19 22:46:09 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631534921560226.3192857374122; Mon, 13 Sep 2021 05:08:41 -0700 (PDT) Received: from localhost ([::1]:46824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPklM-0000fc-D5 for importer@patchew.org; Mon, 13 Sep 2021 08:08:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPkay-0002nV-9l for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:57:56 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:37851) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPkaw-0005qw-VW for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:57:56 -0400 Received: by mail-wr1-x436.google.com with SMTP id t8so9226881wrq.4 for ; Mon, 13 Sep 2021 04:57:54 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n186sm6011037wme.31.2021.09.13.04.57.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 04:57:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=F257kBkfuJl6Q7MoJ0dNQEoRR26oeybWJUiYLakF928=; b=CsnMPFk5g/c4vXiEDCsijRlM2O2hRMBn4a3zurCFVHqa+1d/WirCxjBqet1Dndre+L e/mwyqUXalaA+qBejT0mMdHdQeDNO51aCdgMENWen7I/E8GrAKpDtTNVo8qXtKGimLuB 1yerqZUFGi9p+OgeR3L2Gb9v1gSSbb5g6zODVOGZKwR5WNRetIEPDQnr0mm/FwF1NI/r jg3D9INtEL4pEgaIIH0zgZ1MyctooUsUaZ4r/rgRU7f46g4MKYEb1rApI+hJY9oibyOq 1y7KuP5LH0XwNLqPjpGJsqWIcJsWqIG8VVg4SxcALbaCwIQmbjiw/AMfFQBqlCXzS3R1 gPTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=F257kBkfuJl6Q7MoJ0dNQEoRR26oeybWJUiYLakF928=; b=B+ORVFRm5eiKiOTt39IeZeVVTEY215+a01dkCJesbpyIGjo9pTgCMQ+QHUYygtkXpI zbPYuzHZ85R3OUVXLIpIVhno9IhDHcVfR7wN2iVqwtPXs4GReOCfRWgfveXVA4cktg3I Ak1ffgzeXHHDw9OqXX0PfjtPGBKFPc9InV1ymLQhL5RrTgLEZQ/NdniHTVy0uvyIK4rS HQSNgDB85vCM7dLT/tQRRhV0dsgBFN097kriLvX6fxBD3XCiSl4qXA4Lx1Tykn6P+OL5 pLD1jqpkyTEnvBKJX3qL0oWo19z8FGo6n3XMZ3U+JTQw2FWtGqF2wca+atIWkP941i+a G/xQ== X-Gm-Message-State: AOAM532VObAqLAJISabvfMBG3e3V9vpY4ZIVd2NVFUvJp1A3h1S4BUpq Jt63o0dFzrqAG33Edy2x21nHy4dM5nY= X-Google-Smtp-Source: ABdhPJxCnBGMvMWn0J3aAvKTof1L/eJoxtxargFyjIbEm2Lr64uHJDzYA/XaWmZF0LLgl+jvpjy55Q== X-Received: by 2002:a5d:46cb:: with SMTP id g11mr12067771wrs.60.1631534273642; Mon, 13 Sep 2021 04:57:53 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 06/21] target/i386: Added ignore TPR check in ctl_has_irq Date: Mon, 13 Sep 2021 13:57:27 +0200 Message-Id: <20210913115742.533197-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210913115742.533197-1-pbonzini@redhat.com> References: <20210913115742.533197-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::436; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x436.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Lara Lazier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631534922028100002 Content-Type: text/plain; charset="utf-8" From: Lara Lazier The APM2 states that if V_IGN_TPR is nonzero, the current virtual interrupt ignores the (virtual) TPR. Signed-off-by: Lara Lazier Signed-off-by: Paolo Bonzini --- target/i386/tcg/sysemu/svm_helper.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/i386/tcg/sysemu/svm_helper.c b/target/i386/tcg/sysemu/s= vm_helper.c index 4612dae1ac..a35b79548a 100644 --- a/target/i386/tcg/sysemu/svm_helper.c +++ b/target/i386/tcg/sysemu/svm_helper.c @@ -83,6 +83,11 @@ static inline bool ctl_has_irq(CPUX86State *env) =20 int_prio =3D (env->int_ctl & V_INTR_PRIO_MASK) >> V_INTR_PRIO_SHIFT; tpr =3D env->int_ctl & V_TPR_MASK; + + if (env->int_ctl & V_IGN_TPR_MASK) { + return env->int_ctl & V_IRQ_MASK; + } + return (env->int_ctl & V_IRQ_MASK) && (int_prio >=3D tpr); } =20 --=20 2.31.1 From nobody Sun May 19 22:46:09 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631534661465655.3490197603869; Mon, 13 Sep 2021 05:04:21 -0700 (PDT) Received: from localhost ([::1]:38422 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPkhA-0003KP-5W for importer@patchew.org; Mon, 13 Sep 2021 08:04:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42882) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPkaz-0002pc-J8 for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:57:59 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:37739) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPkay-0005rw-4g for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:57:57 -0400 Received: by mail-wm1-x32a.google.com with SMTP id c8-20020a7bc008000000b002e6e462e95fso6747527wmb.2 for ; Mon, 13 Sep 2021 04:57:55 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n186sm6011037wme.31.2021.09.13.04.57.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 04:57:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/8CXdZuaVrNzRFWLPIhtZbQOhTCypBHZ9xL86lrreCQ=; b=luSZmC/Va0DEB86SMqJLOjNRJYYuZG7vdzgQG2m1YWO2xCGSCWHjR4jeTQqK6g01Db 059CmXwNoFx+A1VLIkxDNNAMH7mNEKqkHTFcOluGD7eCUJq6C8X+G2BBdFh8sR6Qcjs4 Xbm9cSiIIuZZ1uJ1iwC0a/3BNzGTLsT2p0WhI+aidBoXsIR0o49AZJFlwNWvXEH6HPMI XM9SWE2pgmOcujzQixk82SvILunTR7uweY6FLpMNn23X47hlMEhsdgpQ4RRV3aqe1jmy yMpEGGVKrVJ52Vx14+6d0IY/cgnVyH71oHRM5t1u0EBh+89UOY75OQIgXdqXYeXuWZn7 e4cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/8CXdZuaVrNzRFWLPIhtZbQOhTCypBHZ9xL86lrreCQ=; b=kX65wFLxLP061ZZdk6o8n9xadifHkwUmgLhmHCxo2MTnaYcQF1IkIspOvxZmYOIJ6t odgt9SQHeAKk3ZQ0YxSNOChuN5sQoHIk50aLW6hAfOi2iRriOzOC14tDcZVz2oCY/lOO gPgOtiRz9gro9F4WPF9XsJjs4/KWL0O6KAGHfxxr28Y2opotQxB3S5MSwNmVYcWsLhvZ UORFwbaftNsEWVOtfYWiy2XOc8wOlZcKzsHVo5e4gdZH6+qhVABYNHxYJI/LFG7dY0Za GgcPVRG7l0Ng3nxctvITtGoJBUSt0iWp8Qv8Lyg7LkDhINSCEm8QAx+n/91hf3gU9Z2r o/Ug== X-Gm-Message-State: AOAM531LkCq5QK/SecXUIveb4QxN8e5ee5qzAKiqkQ+c8C1hQK76Rh71 j7QPtS+f+tNUN3Yk+UASftjxmHPv5+o= X-Google-Smtp-Source: ABdhPJx2bxAjr0emGgvlE2d0n0lUV1sLT/KZ+NgyiqXejSiTA2pwlW/fqubLjPpCtXDlvznYvAN0PQ== X-Received: by 2002:a1c:2547:: with SMTP id l68mr10641066wml.23.1631534274867; Mon, 13 Sep 2021 04:57:54 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 07/21] target/i386: Added changed priority check for VIRQ Date: Mon, 13 Sep 2021 13:57:28 +0200 Message-Id: <20210913115742.533197-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210913115742.533197-1-pbonzini@redhat.com> References: <20210913115742.533197-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::32a; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32a.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Lara Lazier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631534676715100001 Content-Type: text/plain; charset="utf-8" From: Lara Lazier Writes to cr8 affect v_tpr. This could set or unset an interrupt request as the priority might have changed. Signed-off-by: Lara Lazier Signed-off-by: Paolo Bonzini --- target/i386/cpu.h | 15 +++++++++++++++ target/i386/tcg/sysemu/misc_helper.c | 7 +++++++ target/i386/tcg/sysemu/svm_helper.c | 15 --------------- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 24e8ec5273..6b09b8b62f 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2246,6 +2246,21 @@ static inline uint64_t cr4_reserved_bits(CPUX86State= *env) return reserved_bits; } =20 +static inline bool ctl_has_irq(CPUX86State *env) +{ + uint32_t int_prio; + uint32_t tpr; + + int_prio =3D (env->int_ctl & V_INTR_PRIO_MASK) >> V_INTR_PRIO_SHIFT; + tpr =3D env->int_ctl & V_TPR_MASK; + + if (env->int_ctl & V_IGN_TPR_MASK) { + return (env->int_ctl & V_IRQ_MASK); + } + + return (env->int_ctl & V_IRQ_MASK) && (int_prio >=3D tpr); +} + #if defined(TARGET_X86_64) && \ defined(CONFIG_USER_ONLY) && \ defined(CONFIG_LINUX) diff --git a/target/i386/tcg/sysemu/misc_helper.c b/target/i386/tcg/sysemu/= misc_helper.c index 91b0fc916b..9ccaa054c4 100644 --- a/target/i386/tcg/sysemu/misc_helper.c +++ b/target/i386/tcg/sysemu/misc_helper.c @@ -122,6 +122,13 @@ void helper_write_crN(CPUX86State *env, int reg, targe= t_ulong t0) qemu_mutex_unlock_iothread(); } env->int_ctl =3D (env->int_ctl & ~V_TPR_MASK) | (t0 & V_TPR_MASK); + + CPUState *cs =3D env_cpu(env); + if (ctl_has_irq(env)) { + cpu_interrupt(cs, CPU_INTERRUPT_VIRQ); + } else { + cpu_reset_interrupt(cs, CPU_INTERRUPT_VIRQ); + } break; default: env->cr[reg] =3D t0; diff --git a/target/i386/tcg/sysemu/svm_helper.c b/target/i386/tcg/sysemu/s= vm_helper.c index a35b79548a..7bbd3a18c9 100644 --- a/target/i386/tcg/sysemu/svm_helper.c +++ b/target/i386/tcg/sysemu/svm_helper.c @@ -76,21 +76,6 @@ static inline void svm_load_seg_cache(CPUX86State *env, = hwaddr addr, sc->base, sc->limit, sc->flags); } =20 -static inline bool ctl_has_irq(CPUX86State *env) -{ - uint32_t int_prio; - uint32_t tpr; - - int_prio =3D (env->int_ctl & V_INTR_PRIO_MASK) >> V_INTR_PRIO_SHIFT; - tpr =3D env->int_ctl & V_TPR_MASK; - - if (env->int_ctl & V_IGN_TPR_MASK) { - return env->int_ctl & V_IRQ_MASK; - } - - return (env->int_ctl & V_IRQ_MASK) && (int_prio >=3D tpr); -} - static inline bool is_efer_invalid_state (CPUX86State *env) { if (!(env->efer & MSR_EFER_SVME)) { --=20 2.31.1 From nobody Sun May 19 22:46:09 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631534920942784.6258793952338; Mon, 13 Sep 2021 05:08:40 -0700 (PDT) Received: from localhost ([::1]:46848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPklL-0000gP-Sv for importer@patchew.org; Mon, 13 Sep 2021 08:08:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPkb0-0002ps-R7 for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:57:59 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:37844) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPkaz-0005td-99 for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:57:58 -0400 Received: by mail-wr1-x42e.google.com with SMTP id t8so9227074wrq.4 for ; Mon, 13 Sep 2021 04:57:56 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n186sm6011037wme.31.2021.09.13.04.57.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 04:57:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IBf010dxB3czTGLExguHE9lNbcC2xzM9osq4hO9COOE=; b=FOP5pDtY+mcqqlO1T2TKO0GHd+k+0QFej6cyimmsuEYb1ayLTzkCB6+Heca7PakpPA Jtln/+eAKmx/AQzsPhQBwDSn8kXbCtJ+eV4WraaP9yl6UBiK7Vw7LeRTCUl9JKx8YSgZ 5KORt0wWH5alafMtrp9FnDCxGjK+o3SLMVYslHeFkSN44Y7hiRSLOKyZKovn1eXIjCoH Qr3wA+WxFoFa8lmEg3Ht7m0IDoyFcasBdviddnwIvYHtiX1CCaGmU3AQ3j1CTsYFvKJf AymCuJw8vEzN7Mz3uIQBv6YQktEy2i4+k/1YUuf0O8SBWX9xMwTEkbVVUZKBqwGxktcn 5Lhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=IBf010dxB3czTGLExguHE9lNbcC2xzM9osq4hO9COOE=; b=g3S3LRnmh91TecjuXpBrMffjq77qrSaGa22Lhx7wbzMwUWWZpTbgETzoZwbHvaGSTh 5gihFaUYLPsjpRdLNFyZDjpfPPT2HiYbnX5WcNmMCJAIYqzpJPnbGPife1vHKVBbN+Ou bAM/4OReixGkyIGgxwGM2syT80PUkFv5KpJ/ObhAS982WRc91Sz7eegATBk09QY0IA49 orA0KMoxGdFwkcPr786s8DBemibnOMw9/lrKWrBo75RVowFzK6zeWHA02P/VtelNp4LA BEd6CSeSWfpuDndGvjBG+VmzUV5GWW4ykO/E6r19SgjswqNchfC52WUisc0sZvwRg7x0 +B9w== X-Gm-Message-State: AOAM530qTnvr0y+AAXQ9yZpQRU9Kt/PJLzuaxGNQHikxHDHiejrBrTzB 0xMkfie5F8hFxuSElPw/0rpd48r+SXw= X-Google-Smtp-Source: ABdhPJzRJLM7j3MWyjaRoEoKFzViq8xu7MGfll/7DnSi6LHgA2QoXJxhmXgYYqVedZnZ/PaF9FEIrQ== X-Received: by 2002:a5d:6750:: with SMTP id l16mr12004956wrw.174.1631534275996; Mon, 13 Sep 2021 04:57:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 08/21] target/i386: Added vVMLOAD and vVMSAVE feature Date: Mon, 13 Sep 2021 13:57:29 +0200 Message-Id: <20210913115742.533197-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210913115742.533197-1-pbonzini@redhat.com> References: <20210913115742.533197-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::42e; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42e.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Lara Lazier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631534922004100001 Content-Type: text/plain; charset="utf-8" From: Lara Lazier The feature allows the VMSAVE and VMLOAD instructions to execute in guest m= ode without causing a VMEXIT. (APM2 15.33.1) Signed-off-by: Lara Lazier Signed-off-by: Paolo Bonzini --- target/i386/cpu.h | 2 ++ target/i386/svm.h | 2 ++ target/i386/tcg/sysemu/excp_helper.c | 2 +- target/i386/tcg/sysemu/svm_helper.c | 29 ++++++++++++++++++++++++++++ 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 6b09b8b62f..71ae3141c3 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2261,6 +2261,8 @@ static inline bool ctl_has_irq(CPUX86State *env) return (env->int_ctl & V_IRQ_MASK) && (int_prio >=3D tpr); } =20 +hwaddr get_hphys(CPUState *cs, hwaddr gphys, MMUAccessType access_type, + int *prot); #if defined(TARGET_X86_64) && \ defined(CONFIG_USER_ONLY) && \ defined(CONFIG_LINUX) diff --git a/target/i386/svm.h b/target/i386/svm.h index 036597a2ff..f9a785489d 100644 --- a/target/i386/svm.h +++ b/target/i386/svm.h @@ -24,6 +24,8 @@ #define V_INTR_MASKING_SHIFT 24 #define V_INTR_MASKING_MASK (1 << V_INTR_MASKING_SHIFT) =20 +#define V_VMLOAD_VMSAVE_ENABLED_MASK (1 << 1) + #define SVM_INTERRUPT_SHADOW_MASK 1 =20 #define SVM_IOIO_STR_SHIFT 2 diff --git a/target/i386/tcg/sysemu/excp_helper.c b/target/i386/tcg/sysemu/= excp_helper.c index b6d940e04e..7af887be4d 100644 --- a/target/i386/tcg/sysemu/excp_helper.c +++ b/target/i386/tcg/sysemu/excp_helper.c @@ -358,7 +358,7 @@ do_check_protect_pse36: return error_code; } =20 -static hwaddr get_hphys(CPUState *cs, hwaddr gphys, MMUAccessType access_t= ype, +hwaddr get_hphys(CPUState *cs, hwaddr gphys, MMUAccessType access_type, int *prot) { CPUX86State *env =3D &X86_CPU(cs)->env; diff --git a/target/i386/tcg/sysemu/svm_helper.c b/target/i386/tcg/sysemu/s= vm_helper.c index 7bbd3a18c9..6d39611eb6 100644 --- a/target/i386/tcg/sysemu/svm_helper.c +++ b/target/i386/tcg/sysemu/svm_helper.c @@ -120,6 +120,25 @@ static inline bool virtual_gif_enabled(CPUX86State *en= v) return false; } =20 +static inline bool virtual_vm_load_save_enabled(CPUX86State *env, uint32_t= exit_code, uintptr_t retaddr) +{ + uint64_t lbr_ctl; + + if (likely(env->hflags & HF_GUEST_MASK)) { + if (likely(!(env->hflags2 & HF2_NPT_MASK)) || !(env->efer & MSR_EF= ER_LMA)) { + cpu_vmexit(env, exit_code, 0, retaddr); + } + + lbr_ctl =3D x86_ldl_phys(env_cpu(env), env->vm_vmcb + offsetof(str= uct vmcb, + control.lbr_ctl)); + return (env->features[FEAT_SVM] & CPUID_SVM_V_VMSAVE_VMLOAD) + && (lbr_ctl & V_VMLOAD_VMSAVE_ENABLED_MASK); + + } + + return false; +} + static inline bool virtual_gif_set(CPUX86State *env) { return !virtual_gif_enabled(env) || (env->int_ctl & V_GIF_MASK); @@ -431,6 +450,7 @@ void helper_vmload(CPUX86State *env, int aflag) { CPUState *cs =3D env_cpu(env); target_ulong addr; + int prot; =20 cpu_svm_check_intercept_param(env, SVM_EXIT_VMLOAD, 0, GETPC()); =20 @@ -440,6 +460,10 @@ void helper_vmload(CPUX86State *env, int aflag) addr =3D (uint32_t)env->regs[R_EAX]; } =20 + if (virtual_vm_load_save_enabled(env, SVM_EXIT_VMLOAD, GETPC())) { + addr =3D get_hphys(cs, addr, MMU_DATA_LOAD, &prot); + } + qemu_log_mask(CPU_LOG_TB_IN_ASM, "vmload! " TARGET_FMT_lx "\nFS: %016" PRIx64 " | " TARGET_FMT_lx "\n", addr, x86_ldq_phys(cs, addr + offsetof(struct vmcb, @@ -473,6 +497,7 @@ void helper_vmsave(CPUX86State *env, int aflag) { CPUState *cs =3D env_cpu(env); target_ulong addr; + int prot; =20 cpu_svm_check_intercept_param(env, SVM_EXIT_VMSAVE, 0, GETPC()); =20 @@ -482,6 +507,10 @@ void helper_vmsave(CPUX86State *env, int aflag) addr =3D (uint32_t)env->regs[R_EAX]; } =20 + if (virtual_vm_load_save_enabled(env, SVM_EXIT_VMSAVE, GETPC())) { + addr =3D get_hphys(cs, addr, MMU_DATA_STORE, &prot); + } + qemu_log_mask(CPU_LOG_TB_IN_ASM, "vmsave! " TARGET_FMT_lx "\nFS: %016" PRIx64 " | " TARGET_FMT_lx "\n", addr, x86_ldq_phys(cs, --=20 2.31.1 From nobody Sun May 19 22:46:09 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631534940381740.8048076407774; Mon, 13 Sep 2021 05:09:00 -0700 (PDT) Received: from localhost ([::1]:47696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPklf-0001G7-7N for importer@patchew.org; Mon, 13 Sep 2021 08:08:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42914) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPkb2-0002rj-Cv for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:58:00 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:33320) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPkb0-0005wI-Tc for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:58:00 -0400 Received: by mail-wr1-x431.google.com with SMTP id t18so14312064wrb.0 for ; Mon, 13 Sep 2021 04:57:58 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n186sm6011037wme.31.2021.09.13.04.57.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 04:57:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QDW0/wH2iY9wyTNx+C9A/U5ln75ztBlF6G4LQIygGKU=; b=KIcKTmSvqSIr+7uXbcMGpFZ9vh00LzE2pO4rSdhzw27VvIdhK2dPwLfgvgpV1ymj8m sVHhKzfz5X4tnUWracbGSbwcV3/MVsqIf0P/7NSNNzS4GK+c3yh5aQKpqpMWa/eqaYID 1VvLD0rTenK2uWoHkmZqikuo/SWGvSQDVSkIg1ol1OT7EoMo5u5dTWbHFLCfFAu8zIkt f/HNgM6o/ypvtG53RZ4P/6rf3N4L+xaRTgQJMm9N/QN+Qln2XN1ODTjfF5aMqz/epWDr 0pFtGSy0CvzZnI1h/6JD3TQbdO3B9krEBKXlmFH0olFkVGeZHkZrXDmxEuZ+DlCPHZlV Q/yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=QDW0/wH2iY9wyTNx+C9A/U5ln75ztBlF6G4LQIygGKU=; b=0X6bBtXS+pZTYe97uXlu/d1tHXbuhDKws47vK1lhR5R9J2Z5VCJHNv54mVoAqguphi qNi9lfiKo0NamrEhjl5GZ3TFJUjsE91XTcXqtE/zqhB0dKN5WTs6ETFRdIRXKaMReNWH 8fKsobEq2eRTcL84xBp73Zcj/cyCj/Rt7bNophwdpMqnL948fW4KLL1b30datU3Kx4Hq ZXMs6PW9j/tH6JnZriTZKANntw+AxdHL6MNs9zyNg+XNoaLEjLAgz0r6I7HkFOVlA27F e2jvFrYCRtmdTnUJ8v6UbmhcxZauICiIugwwQU1i5bpEmdPLilXIYgOjI1hsbpdwr2y/ ULpQ== X-Gm-Message-State: AOAM531Tc1sc5v5r6H6UF7l6OWWZ5+fWLwXCG0OP0SSpMvzwab5RRzqA pGXthefn7U/oIMFwo3TEoIPNmZW3hpQ= X-Google-Smtp-Source: ABdhPJwwBwFY0EwOTsEO8JwHjaWJ8o3pIAupA6O91vfwnYQv8xPqjosB6VOceFj/OlH4U6lwnCJV5w== X-Received: by 2002:adf:e806:: with SMTP id o6mr11790254wrm.239.1631534277618; Mon, 13 Sep 2021 04:57:57 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 09/21] docs: standardize book titles to === with overline Date: Mon, 13 Sep 2021 13:57:30 +0200 Message-Id: <20210913115742.533197-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210913115742.533197-1-pbonzini@redhat.com> References: <20210913115742.533197-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::431; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x431.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631534942303100005 Content-Type: text/plain; charset="utf-8" Documents within a Sphinx manual are separate files and therefore can use different conventions for headings. However, keeping some consistency is useful so that included files are easy to get right. This patch uses a standard heading format for book titles, so that it is obvious when a file sits at the top level toctree of a book or man page. The heading is irrelevant for man pages, but keep it consistent as well. Reviewed-by: Peter Maydell Signed-off-by: Paolo Bonzini --- docs/index.rst | 1 + docs/system/qemu-block-drivers.rst | 1 + docs/system/qemu-cpu-models.rst | 1 + docs/system/qemu-manpage.rst | 5 +++-- docs/tools/qemu-img.rst | 1 + docs/tools/qemu-nbd.rst | 1 + docs/tools/qemu-pr-helper.rst | 1 + docs/tools/qemu-storage-daemon.rst | 1 + docs/tools/qemu-trace-stap.rst | 1 + 9 files changed, 11 insertions(+), 2 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index 5f7eaaa632..0b9ee9901d 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -3,6 +3,7 @@ You can adapt this file completely to your liking, but it should at lea= st contain the root `toctree` directive. =20 +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D Welcome to QEMU's documentation! =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D =20 diff --git a/docs/system/qemu-block-drivers.rst b/docs/system/qemu-block-dr= ivers.rst index bd99d4fa8e..eb276481d6 100644 --- a/docs/system/qemu-block-drivers.rst +++ b/docs/system/qemu-block-drivers.rst @@ -1,5 +1,6 @@ :orphan: =20 +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D QEMU block drivers reference =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D =20 diff --git a/docs/system/qemu-cpu-models.rst b/docs/system/qemu-cpu-models.= rst index 53d7538c47..8c51e2bf49 100644 --- a/docs/system/qemu-cpu-models.rst +++ b/docs/system/qemu-cpu-models.rst @@ -1,5 +1,6 @@ :orphan: =20 +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D QEMU / KVM CPU model configuration =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 diff --git a/docs/system/qemu-manpage.rst b/docs/system/qemu-manpage.rst index e9a25d0680..d6f44e265b 100644 --- a/docs/system/qemu-manpage.rst +++ b/docs/system/qemu-manpage.rst @@ -6,8 +6,9 @@ parts of the documentation that go in the manpage as well as the HTML manual. =20 -Title -=3D=3D=3D=3D=3D +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +QEMU User Documentation +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 Synopsis -------- diff --git a/docs/tools/qemu-img.rst b/docs/tools/qemu-img.rst index b7d602a288..fe6c30d509 100644 --- a/docs/tools/qemu-img.rst +++ b/docs/tools/qemu-img.rst @@ -1,3 +1,4 @@ +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D QEMU disk image utility =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 diff --git a/docs/tools/qemu-nbd.rst b/docs/tools/qemu-nbd.rst index ee862fa0bc..e39a9f4b1a 100644 --- a/docs/tools/qemu-nbd.rst +++ b/docs/tools/qemu-nbd.rst @@ -1,3 +1,4 @@ +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D QEMU Disk Network Block Device Server =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 diff --git a/docs/tools/qemu-pr-helper.rst b/docs/tools/qemu-pr-helper.rst index ac036180ac..eaebe40da0 100644 --- a/docs/tools/qemu-pr-helper.rst +++ b/docs/tools/qemu-pr-helper.rst @@ -1,3 +1,4 @@ +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D QEMU persistent reservation helper =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 diff --git a/docs/tools/qemu-storage-daemon.rst b/docs/tools/qemu-storage-d= aemon.rst index 3ec4bdd914..b8ef4486f1 100644 --- a/docs/tools/qemu-storage-daemon.rst +++ b/docs/tools/qemu-storage-daemon.rst @@ -1,3 +1,4 @@ +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D QEMU Storage Daemon =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 diff --git a/docs/tools/qemu-trace-stap.rst b/docs/tools/qemu-trace-stap.rst index fb70445c75..d53073b52b 100644 --- a/docs/tools/qemu-trace-stap.rst +++ b/docs/tools/qemu-trace-stap.rst @@ -1,3 +1,4 @@ +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D QEMU SystemTap trace tool =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D =20 --=20 2.31.1 From nobody Sun May 19 22:46:09 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631535103485991.3226904256492; Mon, 13 Sep 2021 05:11:43 -0700 (PDT) Received: from localhost ([::1]:55442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPkoI-0006VG-ET for importer@patchew.org; Mon, 13 Sep 2021 08:11:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42940) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPkb4-0002tL-3b for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:58:02 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:53052) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPkb2-0005y7-Gd for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:58:01 -0400 Received: by mail-wm1-x32c.google.com with SMTP id e26so6463112wmk.2 for ; Mon, 13 Sep 2021 04:58:00 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n186sm6011037wme.31.2021.09.13.04.57.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 04:57:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=T9gO+6rZ8JlV74yiESfnbGPf5MMVTMA7x/McqIYwXak=; b=aXRxZMJFd4y2vflGSYeLlmDSe+MWe536D7Yi0E1A3kGRmxXEgKgK1RPMkF7wKMLMaK QdxueFZdaS+U2KG2sVh3ILz8SMzWfv3urMRU+JxHhzBRkjv4Z7tkY7+yx+0gqEuhxkjo FqYyDJfgnOBKyWnwNJbkdTwqF69ApIE6LLu5PgI89FjFBQO58pxIyEe/rmYIzw2LFC7X /qa1p3MpSENdepnnPR0EbiqcPXd4AMeSXjGSbFabGoinoqUDZRf+1PC/hMLoXz91xLKi eVNI6YHxOFpeO7K4NDsohvp4KW6rY/y8NLD2YspaqjXrWFT/UjjIsdyIx4C8aGSrFc3L 5jvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=T9gO+6rZ8JlV74yiESfnbGPf5MMVTMA7x/McqIYwXak=; b=ukoWRS62y9nGwMKx+X8jNIgoK+0QnLFcefkWS3SxUVif0BAQxU7JAHeAfZKt56zdSE 6/fpix2UuY/lQm86Pi8Jrd/jLTa56NreXLKe8/vicvZmNrTwTT4DmNvH61F67mEYwXWL pczYqoCI3tdL59TqiNS7sBWoUOWZluT7crNwR5cQSwK04zRFIrrkgwWnrjYqsmljrVIh saVcYz+8fXSd52LmHjEjstz5i6wZ6Nu0QfrKRE7DXsY9J67h0PqxHob3tvrF5e586Ler kSrVFPpfE73YHvl+ampQq3C0jYY+l+dElW+djiFfczAQbD+r5g95O8H4okqMSKgcd1Ep Vicg== X-Gm-Message-State: AOAM5329znsYkvz7Iz0a0tbZxTQkAlqYw3e3yP0Ldd5YEb8Hv5xqaWjx RSZimsNoN44Js/YFYRl0oqSgNDEAgpk= X-Google-Smtp-Source: ABdhPJzNAb1utrUI4P7YzW5pUeianw0DWnKkjUUcLCmxcNxu8Xg5MGQBju05ys55mG22mB+pSh9Y+Q== X-Received: by 2002:a05:600c:1552:: with SMTP id f18mr10537660wmg.168.1631534279239; Mon, 13 Sep 2021 04:57:59 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 10/21] docs: standardize directory index to --- with overline Date: Mon, 13 Sep 2021 13:57:31 +0200 Message-Id: <20210913115742.533197-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210913115742.533197-1-pbonzini@redhat.com> References: <20210913115742.533197-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::32c; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631535105314100001 Content-Type: text/plain; charset="utf-8" Use a standard heading format for the index.rst file in a directory. Using overlines makes it clear that individual documents can use e.g. =3D=3D=3D for chapter titles and --- for section titles, as suggested in the Linux kernel guidelines[1]. They could do it anyway, because documents included in a toctree are parsed separately and therefore are not tied to the same conventions for headings. However, keeping some consistency is useful since sometimes files are included from multiple places. [1] https://www.kernel.org/doc/html/latest/doc-guide/sphinx.html Reviewed-by: Peter Maydell Signed-off-by: Paolo Bonzini --- docs/about/index.rst | 3 ++- docs/devel/index.rst | 3 ++- docs/interop/index.rst | 3 ++- docs/specs/index.rst | 3 ++- docs/system/index.rst | 3 ++- docs/tools/index.rst | 3 ++- docs/user/index.rst | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/docs/about/index.rst b/docs/about/index.rst index beb762aa0a..5bea653c07 100644 --- a/docs/about/index.rst +++ b/docs/about/index.rst @@ -1,5 +1,6 @@ +---------- About QEMU -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +---------- =20 QEMU is a generic and open source machine emulator and virtualizer. =20 diff --git a/docs/devel/index.rst b/docs/devel/index.rst index 5522db7241..f95df10b3e 100644 --- a/docs/devel/index.rst +++ b/docs/devel/index.rst @@ -1,5 +1,6 @@ +--------------------- Developer Information -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +--------------------- =20 This section of the manual documents various parts of the internals of QEM= U. You only need to read it if you are interested in reading or diff --git a/docs/interop/index.rst b/docs/interop/index.rst index f9801a9c20..47b9ed82bb 100644 --- a/docs/interop/index.rst +++ b/docs/interop/index.rst @@ -1,5 +1,6 @@ +------------------------------------------------ System Emulation Management and Interoperability -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +------------------------------------------------ =20 This section of the manual contains documents and specifications that are useful for making QEMU interoperate with other software. diff --git a/docs/specs/index.rst b/docs/specs/index.rst index 65e9663916..ecc43896bb 100644 --- a/docs/specs/index.rst +++ b/docs/specs/index.rst @@ -1,5 +1,6 @@ +---------------------------------------------- System Emulation Guest Hardware Specifications -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +---------------------------------------------- =20 This section of the manual contains specifications of guest hardware that is specific to QEMU. diff --git a/docs/system/index.rst b/docs/system/index.rst index 7b9276c05f..73bbedbc22 100644 --- a/docs/system/index.rst +++ b/docs/system/index.rst @@ -1,5 +1,6 @@ +---------------- System Emulation -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +---------------- =20 This section of the manual is the overall guide for users using QEMU for full system emulation (as opposed to user-mode emulation). diff --git a/docs/tools/index.rst b/docs/tools/index.rst index ef6041a490..1edd5a8054 100644 --- a/docs/tools/index.rst +++ b/docs/tools/index.rst @@ -1,5 +1,6 @@ +----- Tools -=3D=3D=3D=3D=3D +----- =20 This section of the manual documents QEMU's "tools": its command line utilities and other standalone programs. diff --git a/docs/user/index.rst b/docs/user/index.rst index 9faa4badd7..2c4e29f3db 100644 --- a/docs/user/index.rst +++ b/docs/user/index.rst @@ -1,5 +1,6 @@ +------------------- User Mode Emulation -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +------------------- =20 This section of the manual is the overall guide for users using QEMU for user-mode emulation. In this mode, QEMU can launch --=20 2.31.1 From nobody Sun May 19 22:46:09 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631535120080365.7552981004296; Mon, 13 Sep 2021 05:12:00 -0700 (PDT) Received: from localhost ([::1]:56450 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPkoZ-0007H6-1s for importer@patchew.org; Mon, 13 Sep 2021 08:11:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42956) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPkb6-0002uG-Sm for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:58:05 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:36616) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPkb4-0005zS-At for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:58:04 -0400 Received: by mail-wr1-x435.google.com with SMTP id g16so14297220wrb.3 for ; Mon, 13 Sep 2021 04:58:01 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n186sm6011037wme.31.2021.09.13.04.57.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 04:58:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OFxC3PMcGDPUTIq1mYdRtX5DKUYLQy7cB0NmvTziU58=; b=G4WZAIcpCOsTgb2/hxj1gmq09ghaBvIHo37NKUi55+aGZEV2rOvBkzINmOz5gPMO3P ZWkgf1DZ9H8mdnY/u7FDDdJNzgVAywfty+qx3JBierDK0KHl01NPPuciKNn3bZkgd+Pc QRg6DBftQryGOJ0m6YY570inijKztOWz8dOvRlogO0+mB2xjR9IilmVDZFDZmdnedOMM VpNA6Tb72KzuhmeQPMIxxVSCnJE+LJ9vLltFWGy38KxpIL8rTKLWFL4k8yp/a7PfUUtV DJCBBvnorQDjoPoz2DPRQo8M0COweGYbdo2vOK+pBYfnRXw+bDAfaUqhkOMSR+FrMZn6 wOSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=OFxC3PMcGDPUTIq1mYdRtX5DKUYLQy7cB0NmvTziU58=; b=NfytVd+8YxG9BXwxE0q+3tmJl+CCUJc6qgvo4bVCIFkqNTM+OfqKtC6hchNHhIOlQG SKQkbQ4ZYv+HxeyAD/gfmmJOoI1xta0n0H4GAkcN9rMfdk25rsV6hlHdt1PIxAGfyP8X PRoXSYKbOKFfrn840937Inz91S6qhNjPadzsVEDDP2DkCBj4w6gqmt15S9YZeGOwmswN ogGgLLsMTZfn+PyW0yjyJ5Y3pSV0ceUUDdLMm92XqRAYfr2c08eADfFeBl0xjctKpfvH +VqdK/vBiLqsW1Mp5P6KN2msCnkQFfQ9HNdQ7oiLd7SyOUfiux7h17NogIFqWMWW+ETM 1QBQ== X-Gm-Message-State: AOAM531Zgp1s+s4o6BE/5k8m/BkzjtpJY/VFAbzIkkFbBKL001U/P5bD qxg3AIXJEudmow8hJ6XxJUIHC+6vo98= X-Google-Smtp-Source: ABdhPJwZtfkgdeJnz+20wWMAC1bozQKvOyENavNpMmVlEBfIDWs0hgdsHV8FCO0G/v5BrveT8yfa6g== X-Received: by 2002:a5d:53cd:: with SMTP id a13mr12092335wrw.33.1631534281021; Mon, 13 Sep 2021 04:58:01 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 11/21] docs/system: standardize man page sections to --- with overline Date: Mon, 13 Sep 2021 13:57:32 +0200 Message-Id: <20210913115742.533197-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210913115742.533197-1-pbonzini@redhat.com> References: <20210913115742.533197-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::435; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x435.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631535120744100001 Content-Type: text/plain; charset="utf-8" Man pages in docs/system use file inclusion heavily. Use headings with overlines in the main files, so that the same included file work well from both manuals and man pages. This style of heading is a bit more heavy-weight, so it is not used by the other man pages in interop/ and tools/. If in the future they are changed to use include files, for example to avoid having sections named "synopsis" or "description", they can switch to --- with overline as well. Reviewed-by: Peter Maydell Signed-off-by: Paolo Bonzini --- docs/system/qemu-block-drivers.rst | 3 +++ docs/system/qemu-cpu-models.rst | 9 ++++++--- docs/system/qemu-manpage.rst | 5 +++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/docs/system/qemu-block-drivers.rst b/docs/system/qemu-block-dr= ivers.rst index eb276481d6..c2c0114cec 100644 --- a/docs/system/qemu-block-drivers.rst +++ b/docs/system/qemu-block-drivers.rst @@ -4,16 +4,19 @@ QEMU block drivers reference =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D =20 +-------- Synopsis -------- =20 QEMU block driver reference manual =20 +----------- Description ----------- =20 .. include:: qemu-block-drivers.rst.inc =20 +-------- See also -------- =20 diff --git a/docs/system/qemu-cpu-models.rst b/docs/system/qemu-cpu-models.= rst index 8c51e2bf49..5cf6e46f8a 100644 --- a/docs/system/qemu-cpu-models.rst +++ b/docs/system/qemu-cpu-models.rst @@ -4,18 +4,21 @@ QEMU / KVM CPU model configuration =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 +-------- Synopsis -'''''''' +-------- =20 QEMU CPU Modelling Infrastructure manual =20 +----------- Description -''''''''''' +----------- =20 .. include:: cpu-models-x86.rst.inc .. include:: cpu-models-mips.rst.inc =20 +-------- See also -'''''''' +-------- =20 The HTML documentation of QEMU for more precise information and Linux user= mode emulator invocation. diff --git a/docs/system/qemu-manpage.rst b/docs/system/qemu-manpage.rst index d6f44e265b..c47a412758 100644 --- a/docs/system/qemu-manpage.rst +++ b/docs/system/qemu-manpage.rst @@ -10,6 +10,7 @@ QEMU User Documentation =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 +-------- Synopsis -------- =20 @@ -17,11 +18,13 @@ Synopsis =20 |qemu_system| [options] [disk_image] =20 +----------- Description ----------- =20 .. include:: target-i386-desc.rst.inc =20 +------- Options ------- =20 @@ -34,11 +37,13 @@ not need a disk image. =20 .. include:: mux-chardev.rst.inc =20 +----- Notes ----- =20 .. include:: device-url-syntax.rst.inc =20 +-------- See also -------- =20 --=20 2.31.1 From nobody Sun May 19 22:46:09 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631535330705165.33071314740573; Mon, 13 Sep 2021 05:15:30 -0700 (PDT) Received: from localhost ([::1]:36742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPkrx-000505-HQ for importer@patchew.org; Mon, 13 Sep 2021 08:15:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42970) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPkb8-0002ux-5j for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:58:07 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:39566) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPkb6-000610-M3 for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:58:05 -0400 Received: by mail-wr1-x436.google.com with SMTP id u15so8208068wru.6 for ; Mon, 13 Sep 2021 04:58:03 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n186sm6011037wme.31.2021.09.13.04.58.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 04:58:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WwPR13OXi9fX3IyCvHJSOgO2fs5MlAYtMNrY89yA+cU=; b=XRBux6Ru+mp9RGicIEYP9nLA2aKwQnxlOty19ym5uM/wLkO2s3lFC9T2tZ82qTIgzm JfosQv13mQk4EFHKqcqADfP1dRiaj2PekXyd9tMvSb0PAItRePZKYGhsnZDksjzVQ3sv 0/qld8iAGF2LHuQ5PbBKKNqgx22zHTQwgjGMaeb9CHc55bGtn7NFcgoKzKqh8wVn10NR bzcf9aZ4Sf4ubHvP7r5ZeeG8hG3VxlsZHm0ANrD9WaqWurlyv4I5xw1qF6rMLZW9FoGp o1V8znol7aH3TQPBOTptZAl4gZTENJzMiJjmkaCqGjofxtQiFlxlu/qIdt6vNcPn2TTR VBSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=WwPR13OXi9fX3IyCvHJSOgO2fs5MlAYtMNrY89yA+cU=; b=JTaNw31BHyyuyNAQMbLaI9/2I0leQc2/9d9zLqHbxG9YHgxmSqocDVY2Z4XKFkYuzd xUc5kmUY4qUmGtXjYHi/kDR1TG7ehvFx43JgJzho41QlglrCN+Tcm7zkYFmpaMwcQhNd 555k9u9qMuoLFoPB3jVh+4ok+QJsxPZYl5c7Ouc8JsAkMm6/B4LQ8bdibWoWOIjDE5y9 2zEOLa91YTdccLTJduHrQBO7dMpyFKfkD7HOiXEgLuV0XaXwhofgUkeQxGdOzrP8slSC UXhq5StA0S65JlLp1+Bfab4tfK92LplKglqIz2Nk5AvG6YhbFRI8W0JASU+xCsknLhCb uJYA== X-Gm-Message-State: AOAM531S/NfpeZS6WmTr85SW85eQqnXHbfm/fQ8dzXr7LDR8kQa17394 4nILo9ZeyEs+qcOoO886W0cg2tn5Ru0= X-Google-Smtp-Source: ABdhPJy+QT1d1o78nTOlkHtJnrpEAeSPrM2pfZntOUTHBgQktU77hQy5t0vtsBw5qQAotsJUec6Abw== X-Received: by 2002:a5d:4488:: with SMTP id j8mr12245441wrq.260.1631534282789; Mon, 13 Sep 2021 04:58:02 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 12/21] docs/system: move x86 CPU configuration to a separate document Date: Mon, 13 Sep 2021 13:57:33 +0200 Message-Id: <20210913115742.533197-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210913115742.533197-1-pbonzini@redhat.com> References: <20210913115742.533197-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::436; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x436.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631535332076100003 Content-Type: text/plain; charset="utf-8" Currently, cpu-models-x86.rst.inc is included in target-i386.rst directly. To make the toctree more homogeneous when adding more documentation, include it through a first-class .rst file. Together with the previous changes to the man page skeletons, this also frees "=3D=3D=3D" for the headings, so that cpu-models-x86.rst.inc need not assume anything about the headings used by target-i386.rst. Reviewed-by: Peter Maydell Signed-off-by: Paolo Bonzini --- docs/system/cpu-models-x86.rst.inc | 4 ++-- docs/system/i386/cpu.rst | 1 + docs/system/target-i386.rst | 8 +++++++- 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 docs/system/i386/cpu.rst diff --git a/docs/system/cpu-models-x86.rst.inc b/docs/system/cpu-models-x8= 6.rst.inc index 9119f5dff5..6e8be7d79b 100644 --- a/docs/system/cpu-models-x86.rst.inc +++ b/docs/system/cpu-models-x86.rst.inc @@ -1,5 +1,5 @@ Recommendations for KVM CPU model configuration on x86 hosts -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =20 The information that follows provides recommendations for configuring CPU models on x86 hosts. The goals are to maximise performance, while @@ -368,7 +368,7 @@ featureset, which prevents guests having optimal perfor= mance. =20 =20 Syntax for configuring CPU models -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D =20 The examples below illustrate the approach to configuring the various CPU models / features in QEMU and libvirt. diff --git a/docs/system/i386/cpu.rst b/docs/system/i386/cpu.rst new file mode 100644 index 0000000000..738719da9a --- /dev/null +++ b/docs/system/i386/cpu.rst @@ -0,0 +1 @@ +.. include:: ../cpu-models-x86.rst.inc diff --git a/docs/system/target-i386.rst b/docs/system/target-i386.rst index 22ba5ce2c0..c9720a8cd1 100644 --- a/docs/system/target-i386.rst +++ b/docs/system/target-i386.rst @@ -19,7 +19,13 @@ Board-specific documentation i386/microvm i386/pc =20 -.. include:: cpu-models-x86.rst.inc +Architectural features +~~~~~~~~~~~~~~~~~~~~~~ + +.. toctree:: + :maxdepth: 1 + + i386/cpu =20 .. _pcsys_005freq: =20 --=20 2.31.1 From nobody Sun May 19 22:46:09 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631535306368170.85502963981503; Mon, 13 Sep 2021 05:15:06 -0700 (PDT) Received: from localhost ([::1]:35824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPkrZ-0004Ns-5a for importer@patchew.org; Mon, 13 Sep 2021 08:15:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42982) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPkbA-0002vA-0Y for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:58:09 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:54019) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPkb7-00062O-R3 for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:58:07 -0400 Received: by mail-wm1-x330.google.com with SMTP id i3so6454427wmq.3 for ; Mon, 13 Sep 2021 04:58:05 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n186sm6011037wme.31.2021.09.13.04.58.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 04:58:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=14SEeU0UMLkgFlaB4KV5IS119VHrF2FPl2DRudjmlkA=; b=H9gYRaBzpLNfFX7aXI6ZKYgap/UnQprXEPTrOleE+Gr/YbkRtPyE2B4wL4YsgBD+nN yZMdZY64nWxJVPZB0SCAOlUTH5twmTTiBED5UE5hPbENWW9DcZw36bq6wqgBpdq0jz8t uqKpBwdHL9RB2KOAsRr3OUvQFtcsynqaFCS381uXjrRB8hnvFdL6HDoOzgxzp3jPvW1t RMaD2xNA0wU4TLbDP9peu5iwOJLwHvNBrYUnqNocwRjXrH5b03BWGS/VqG/oddUGBKOi dDHwXNSmFLfr9AE2bz//vNo66RkAR8EPjmIloJxYyGtzS9Sbg2LpOOYUeAbLeHVyF+3F Soxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=14SEeU0UMLkgFlaB4KV5IS119VHrF2FPl2DRudjmlkA=; b=E51LkUkkJGjq9i9xBuRP3BahEu/kLjfq4UgOZJ0zjZICHfCeSYAOpho6+8xs7XZpPn iKJJFdd1yEF19ZnbtaPyKs3ca1U9/52vKWYSX/9mfqHGvSvgs/3pbGAd7iDX1by2AAs1 NCF8jN5JE2hD7im5l0m0LEtz4jhgUB1spDYfoANS3dAY4I20AcvC72CrdPCTaXfDqr0Z W9hXpAWIY/FHEYODXv+KHUq0+NmV6Yc3AMg3Iq7uBSyj/rBbU8rEBsph2GvaWFfOW9k9 6mYne77ShzNUstJic1c3bfLndd8OLoWjc6IPyf8SMC080G65W7TSm/fd9rXE7j8r7eUU juow== X-Gm-Message-State: AOAM533gnzS4PCvJO9j+DuF7yPmY5MxTiuteMWqNPn7zoZUq5Phgylq2 dnz0oOU8CRyFhcrPj6Phvx6yaPcQ1L8= X-Google-Smtp-Source: ABdhPJzL4H2ED59Oy+no/zEyfvwGTPavmeNzbbM5+Ax1J8/DgQi2YKJPr5q9HGlcZ+pKukPEN3aKNg== X-Received: by 2002:a7b:c947:: with SMTP id i7mr702373wml.179.1631534284490; Mon, 13 Sep 2021 04:58:04 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 13/21] meson.build: Do not look for VNC-related libraries if have_system is not set Date: Mon, 13 Sep 2021 13:57:34 +0200 Message-Id: <20210913115742.533197-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210913115742.533197-1-pbonzini@redhat.com> References: <20210913115742.533197-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::330; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x330.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631535306931100001 From: Thomas Huth When running "./configure --static --disable-system" there is currently a warning if the static version of libpng is missing: WARNING: Static library 'png16' not found for dependency 'libpng', may not be statically linked Since it does not make sense to look for the VNC-related libraries at all when we're building without system emulator binaries, let's add a check for have_system here to silence this warning. Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20210906153939.165567-1-thuth@redhat.com> Signed-off-by: Paolo Bonzini --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 7e58e6279b..f07236d947 100644 --- a/meson.build +++ b/meson.build @@ -931,7 +931,7 @@ vnc =3D not_found png =3D not_found jpeg =3D not_found sasl =3D not_found -if not get_option('vnc').disabled() +if have_system and not get_option('vnc').disabled() vnc =3D declare_dependency() # dummy dependency png =3D dependency('libpng', required: get_option('vnc_png'), method: 'pkg-config', kwargs: static_kwargs) --=20 2.31.1 From nobody Sun May 19 22:46:09 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631535661770356.0558710025416; Mon, 13 Sep 2021 05:21:01 -0700 (PDT) Received: from localhost ([::1]:42802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPkxI-0001E6-HP for importer@patchew.org; Mon, 13 Sep 2021 08:21:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43004) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPkbB-0002va-8O for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:58:09 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:40589) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPkb9-000639-QV for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:58:09 -0400 Received: by mail-wr1-x429.google.com with SMTP id q26so14262229wrc.7 for ; Mon, 13 Sep 2021 04:58:06 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n186sm6011037wme.31.2021.09.13.04.58.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 04:58:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=e2TTDs5+tuHORnO8NeKFNOSmiYrLPaNVfoCzWcqAEts=; b=KF5Za98fE3H9CwcwsbCDl2PBzHxyPt4rgjy0rehJNqu+fymzDgnZTX2XFInOYO6nqh +QN+BBLxkbxzXvZOzc54OFjJXHbk6RNeUl+1U/iwvvSGeNm6lJyd/3I32rOmVE+0ofmm p/zF+Yx28uFz4AOK+S9FtFUQ70Z+EyHyV0UQ3UlSpp0VKfhAHFfIF64g0SnkEOp3YIjD EsFC+a1siIkLT+uorqzS0yQd0c89sr3loF0MUgAiQZ02a3OA/KP2AsCkpzP01P+LfiZS 8AzyEx65XASM2FkvFdAETrzxLdgub6MK+Uzy2ktBpDe7glAFsbc7j3XHXH8HqY9RSFNY PN2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=e2TTDs5+tuHORnO8NeKFNOSmiYrLPaNVfoCzWcqAEts=; b=hg8ySI45obONi5bGBg3xlPj2Zf2Jmld7wKmbLHF1dE9rR784SQu6mP1X2QGpZTu2h4 XCMOMLy4y5M1ePOS88Zb50iSBkczioKEwXfgRxl8ndjQRaUdWdIXprVIqdlnScVhjEwY nJWPW3HpQCBsR0UGp0O/7EKEDvJXcREPMSmhoRnzeN5X7mSIAdRw8gci7xg7Gb3axRrN bYPOf5tFQOSsQROr1u1/2K8twXCBk5e5fktpQLUZrnIqN8+S79aSLAz5paqT/6iGIMNB IjfsPpU0VSdYUAkYTPKypbJpP3+7OkXwWL3MSyZocYf03dN1/FNg6zAaKumh4z5pBxQs in0w== X-Gm-Message-State: AOAM533qmw6bWBziVonBpIuS0R2877QZsdZtR7QqGsLI8At6aIDSpg3z FNdznD+VsoFlxaCdJe6N3eGwb5I7ZFA= X-Google-Smtp-Source: ABdhPJw1Q6dJMbPToyTXDeyoA0uLsSsPwet7T8BMMl3P2t9BSTLXfTg7KuGPMCvgVoeRfV4X8dHHuQ== X-Received: by 2002:a05:6000:1623:: with SMTP id v3mr12311426wrb.288.1631534285624; Mon, 13 Sep 2021 04:58:05 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 14/21] meson: look up cp and dtrace with find_program() Date: Mon, 13 Sep 2021 13:57:35 +0200 Message-Id: <20210913115742.533197-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210913115742.533197-1-pbonzini@redhat.com> References: <20210913115742.533197-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::429; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x429.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631535664381100005 Content-Type: text/plain; charset="utf-8" Avoid that meson prints a "Program xyz found" test once per custom_target. Signed-off-by: Paolo Bonzini --- pc-bios/keymaps/meson.build | 3 ++- trace/meson.build | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build index 05eda6c0d2..44247a12b5 100644 --- a/pc-bios/keymaps/meson.build +++ b/pc-bios/keymaps/meson.build @@ -38,6 +38,7 @@ if meson.is_cross_build() or 'CONFIG_XKBCOMMON' not in co= nfig_host else native_qemu_keymap =3D qemu_keymap endif +cp =3D find_program('cp') =20 t =3D [] foreach km, args: keymaps @@ -55,7 +56,7 @@ foreach km, args: keymaps build_by_default: true, input: km, output: km, - command: ['cp', '@INPUT@', '@OUTPUT@'], + command: [cp, '@INPUT@', '@OUTPUT@'], install: true, install_dir: qemu_datadir / 'keymaps') endif diff --git a/trace/meson.build b/trace/meson.build index ef18f11d64..e401e7c415 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -2,6 +2,7 @@ specific_ss.add(files('control-target.c')) =20 trace_events_files =3D [] +dtrace =3D find_program('dtrace', required: 'CONFIG_TRACE_DTRACE' in confi= g_host) foreach dir : [ '.' ] + trace_events_subdirs trace_events_file =3D meson.source_root() / dir / 'trace-events' trace_events_files +=3D [ trace_events_file ] @@ -39,13 +40,13 @@ foreach dir : [ '.' ] + trace_events_subdirs trace_dtrace_h =3D custom_target(fmt.format('trace-dtrace', 'h'), output: fmt.format('trace-dtrace', 'h'), input: trace_dtrace, - command: [ 'dtrace', '-DSTAP_SDT_V2', '= -o', '@OUTPUT@', '-h', '-s', '@INPUT@' ]) + command: [ dtrace, '-DSTAP_SDT_V2', '-o= ', '@OUTPUT@', '-h', '-s', '@INPUT@' ]) trace_ss.add(trace_dtrace_h) if host_machine.system() !=3D 'darwin' trace_dtrace_o =3D custom_target(fmt.format('trace-dtrace', 'o'), output: fmt.format('trace-dtrace', 'o= '), input: trace_dtrace, - command: [ 'dtrace', '-DSTAP_SDT_V2',= '-o', '@OUTPUT@', '-G', '-s', '@INPUT@' ]) + command: [ dtrace, '-DSTAP_SDT_V2', '= -o', '@OUTPUT@', '-G', '-s', '@INPUT@' ]) trace_ss.add(trace_dtrace_o) endif =20 --=20 2.31.1 From nobody Sun May 19 22:46:09 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631535872224125.78060747951031; Mon, 13 Sep 2021 05:24:32 -0700 (PDT) Received: from localhost ([::1]:50058 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPl0h-0006pK-7E for importer@patchew.org; Mon, 13 Sep 2021 08:24:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43010) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPkbB-0002wh-O9 for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:58:11 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:43923) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPkbA-00063r-Ea for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:58:09 -0400 Received: by mail-wm1-x32c.google.com with SMTP id n7-20020a05600c3b8700b002f8ca941d89so6407839wms.2 for ; Mon, 13 Sep 2021 04:58:08 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n186sm6011037wme.31.2021.09.13.04.58.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 04:58:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NeR77cPP8dHJ6y/NZzKUpgxfmomQXUZFqq15ts9MaO4=; b=Ec8OiY8ESgW7b9+5MACDq7hcDpo515QD4MPoFQWX3FbZwHrQ4RNEXT5c9bZeGqSGEZ SBaaenRm8kUU2i2CErAQiLCcVxZ15awr/sJG82tkOoxChb7DlXFlxdGv4nkvnXNtA5WV 7ME4ijeGShiDKyKdLIwspXwxGx1u7+TYndklvKH1maoB+Zy29YfwOoLKQixtkKuUxkJt 41cqrJgYjeEHf9kIa7dL/jRHjyt5cq5mQo/DSJCgeuSo7QWX5KMzlJ3Wnth4tTAIUGb6 EAPcrxLf7eskQqwmCREHxZ1yVSWtmF0EBSIL0x7WM2BCVgMcDTMVhSYKNPcICRn7ShRW T2hQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=NeR77cPP8dHJ6y/NZzKUpgxfmomQXUZFqq15ts9MaO4=; b=2iyDz3Uruv/DA6JA5VY+dcYs3r20q/KHeo4qiQFR7Yf1nEPM22b3F4az0FUnAjldvE ysZLvWS1zPUVJkSHWVDJQxD6F7mYOLfVzzWsZckccGVBwm2bcaHbqT4i5zMWVy+lz97W //iKkq6YbawlGjltqbeEKKqRsLRr7cAIOmtiDsQymcZVMY4kgXyVVIbM5H2aOeURYKUn BwhNuEeScQLUsKz+Z1a/Flc0/sPesx0GcPUWVKGSplm1Wfz3SBVhrtNufrmWn4L2Dbxc WKRDLm7ktyjloGPHXDV37yeDWUSrsxNQLFWhz3l4YfBT+aYNJqKbY+0AOuqe/p+BMCsv CtVw== X-Gm-Message-State: AOAM533eX0zQS6Mqcnr4yFoAAZbwxFdQ8GKPdrfi6lG9d9ZYPvevIbaC PfMrGbLzhWPPB6B6KNzejirJ4Zb906c= X-Google-Smtp-Source: ABdhPJxUUMNSSQE/Rc79JwlAVc2DX1B8tEhEz7W5v8xG3LQUJKjfof2zDnYcuh9HFWXyxmLb1gyh8Q== X-Received: by 2002:a1c:3102:: with SMTP id x2mr10957838wmx.122.1631534287222; Mon, 13 Sep 2021 04:58:07 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 15/21] meson: do not use python.full_path() unnecessarily Date: Mon, 13 Sep 2021 13:57:36 +0200 Message-Id: <20210913115742.533197-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210913115742.533197-1-pbonzini@redhat.com> References: <20210913115742.533197-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::32c; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631535872647100001 Content-Type: text/plain; charset="utf-8" The "python" variable is an external program and can be passed directly to custom_target. This avoids the need to look it up multiple times, which was previously silent but is now explicit in recent Meson versions. Signed-off-by: Paolo Bonzini --- ui/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/meson.build b/ui/meson.build index 7d25c1b95b..7faa42eb3f 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -134,7 +134,7 @@ if have_system or xkbcommon.found() output: output, capture: true, input: files('keycodemapdb/data/keymaps.csv'), - command: [python.full_path(), files('keycodemapdb/tools/= keymap-gen'), + command: [python, files('keycodemapdb/tools/keymap-gen'), 'code-map', '--lang', 'glib2', '--varname', 'qemu_input_map_@0@_to_@1@'.forma= t(e[0], e[1]), --=20 2.31.1 From nobody Sun May 19 22:46:09 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631535681258297.9662099933935; Mon, 13 Sep 2021 05:21:21 -0700 (PDT) Received: from localhost ([::1]:43508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPkxa-0001lI-E4 for importer@patchew.org; Mon, 13 Sep 2021 08:21:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43026) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPkbC-0002wo-Gj for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:58:11 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:42945) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPkbB-000640-3O for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:58:10 -0400 Received: by mail-wm1-x336.google.com with SMTP id u19-20020a7bc053000000b002f8d045b2caso6410139wmc.1 for ; Mon, 13 Sep 2021 04:58:08 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n186sm6011037wme.31.2021.09.13.04.58.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 04:58:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PeFhdW3ldj9N2neDhskeRk7Vv8dHVOjd4x2dNblRlbI=; b=HQLbnm0DUqp8wnLsI9H45ds/dsHO1stJPa+kAspz3ldH1pYVp24wZsqWfJg/fN/iPz vM4uSxFTRfoQF1HSBGkFQ+OTbsP1BdY4jtdnmJkScTY0UcK48Bm4pw/LRGx4yClxB4ow xrBd08qRT+uCbuk1cswggF6SI6oKNRGkhFlE8g7bjqsjul8C4kYV/bLOFoiM0ffuVcoE 1sz9l4MftjhMXeNi+D1gpVIbJNHYiV8E1bELhfUgo2XHC5bpZV9718DDnBSZnuAAZZE3 6Z9aj6y0w/JpvjHRPFAnVlAV+eFuTaacRjgD6XVmTWUuND5Csg92HLQ0ZiE6twOfmoP2 ZtvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=PeFhdW3ldj9N2neDhskeRk7Vv8dHVOjd4x2dNblRlbI=; b=nN7ohmx4RuIxJWGmBmqmYpf4WFMl+I4XDRRf3kVCDO/On7WsDqdMRyS2bFJC8nsLYb XoTPYiPWSQUaKm8qi3YYQYZao3Hh6qJDE6YLeYs9S2Voqyng/spP1jMq9csRRNrXWYBN rH7jLHNzz23lr6epW4DOODugdU6wnc0DXnRB77KmARXBLSLUp8WwukG/Moj+Ki1G/tkY jgJDl6RruutjJdK+krTumH6eOm0y+3D0nCLgI+QhHb7iukKEjJznSD98vrOEGsSmB/Dm 2EbET47LV+uwkMbpvdaBOOkLct3O0ex4twxYoyNUzGOZ7LFeTi0FrF0TtyYxVQZwZXYM 3CmA== X-Gm-Message-State: AOAM533JNfwNFVoFVTXtFpiobSihgGH8JHvYRq0Z2tAfuTwOkERQEwvI zq7bCPsiplX6EqeAeZepv5Lqyggisos= X-Google-Smtp-Source: ABdhPJw5IS4S9i/GQ0TKzvWKdtpBYWsv+nYLv7igr9SuZUHJwJbDOwJFKQRe6jjDpGlqgFaUbgcrIw== X-Received: by 2002:a1c:3b41:: with SMTP id i62mr10856058wma.38.1631534287837; Mon, 13 Sep 2021 04:58:07 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 16/21] meson: remove dead variable Date: Mon, 13 Sep 2021 13:57:37 +0200 Message-Id: <20210913115742.533197-17-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210913115742.533197-1-pbonzini@redhat.com> References: <20210913115742.533197-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::336; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x336.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631535682763100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- ui/meson.build | 2 -- 1 file changed, 2 deletions(-) diff --git a/ui/meson.build b/ui/meson.build index 7faa42eb3f..a73beb0e54 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -105,8 +105,6 @@ if config_host.has_key('CONFIG_SPICE') and config_host.= has_key('CONFIG_GIO') ui_modules +=3D {'spice-app': spice_ss} endif =20 -keymap_gen =3D find_program('keycodemapdb/tools/keymap-gen') - keymaps =3D [ ['atset1', 'qcode'], ['linux', 'qcode'], --=20 2.31.1 From nobody Sun May 19 22:46:09 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631535860189121.86014920148955; Mon, 13 Sep 2021 05:24:20 -0700 (PDT) Received: from localhost ([::1]:49098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPl0V-0006Be-3b for importer@patchew.org; Mon, 13 Sep 2021 08:24:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPkbD-0002wp-0N for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:58:11 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:51030) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPkbB-00064v-Mj for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:58:10 -0400 Received: by mail-wm1-x329.google.com with SMTP id 140so3027836wma.0 for ; Mon, 13 Sep 2021 04:58:09 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n186sm6011037wme.31.2021.09.13.04.58.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 04:58:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2ijvhFm3qkGCih7E+IGi13wOWIV5MP5pvlk/20m1FbI=; b=O3ZVioHs5df8JNEOrOFmmOvYjB1rVn0wqp4mW6kju7dQoCtJ+nJSju+Ei2wzHBWmrA tLVSGuQ62HKjxAlpEr7KScTe0XpH7XfNJtYhPYFDzlJyIrkY1Z5y7r2PAVASq1Yxmdl6 UYbuIIhdjgFYd9+Jq1qoC1N+hKwAsKnucIu/zD9Zk3SMWC7E7XwM6LjXj1sT8LcLtGnE 3jJIl9tg3TeCyX94qoshrqvDoDlG0Q63mS2uTdKVWND4cAY7s2DntTPmRBxi0b0g0X3w 9rqIfIx3L2FoSPWm7m+KUj6m9BL9DI6E4HCRTK08oeRvxRmD953K/asg5jIU68FBJMSG 1f0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2ijvhFm3qkGCih7E+IGi13wOWIV5MP5pvlk/20m1FbI=; b=NrR5nQhIXODveOV+lS+ua9CK+C60Dmz6FrrSrwvVTJMAMP1rUpErS+xblqnwY2t8Fq ylrjFn1n+Gh67OITBpxT5lq+CqNX3mVMpoQlq82OnNWmsF/nQbeLw0QS7SgjwYhOeXTc C86Yxb3ccVyUzMXyLYOi6CkBmv8BJvbHX3zIRjBQZE1ID5QL5t6k1GsKCK8a0CJMjC6B eif1Fsyvr+d/OgCcOorzHXTNFvIqxgstKxFp4DqZwq8j+J58L6KelGolIumjNV+ehLDL 2MtWTLeYDxRLWzOjG8TFWeLdHfVoEoBa2tDZJcQ0AXsEwzvxNJl7XxVcXXavEYPhfB9O unHA== X-Gm-Message-State: AOAM532cgb3pbLalnWgc8z9eZsqU3OFGp3FlZzFqjhXy9iXygmCSdneW 14AULcDwJaEWF5/BWFSc6X1NremABCo= X-Google-Smtp-Source: ABdhPJzOCqclkgTsckDf1Hq0Mm0NwPxif8uihfRABzNTc5uwljTRni3kn4A/XIsLDBKMtf1+eeRtpA== X-Received: by 2002:a7b:c5d2:: with SMTP id n18mr10704681wmk.97.1631534288417; Mon, 13 Sep 2021 04:58:08 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 17/21] fw_cfg: add etc/msr_feature_control Date: Mon, 13 Sep 2021 13:57:38 +0200 Message-Id: <20210913115742.533197-18-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210913115742.533197-1-pbonzini@redhat.com> References: <20210913115742.533197-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::329; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x329.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631535861063100001 Content-Type: text/plain; charset="utf-8" The file already existed, but nobody had noticed the warning until now. Add it at the bottom, since that is where unknown files go in legacy mode. Fixes: 217f1b4a721 ("target-i386: Publish advised value of MSR_IA32_FEATURE= _CONTROL via fw_cfg") Signed-off-by: Paolo Bonzini --- hw/nvram/fw_cfg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 9b8dcca4ea..c06b30de11 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -878,6 +878,7 @@ static struct { { "etc/tpm/log", 150 }, { "etc/acpi/rsdp", 160 }, { "bootorder", 170 }, + { "etc/msr_feature_control", 180 }, =20 #define FW_CFG_ORDER_OVERRIDE_LAST 200 }; --=20 2.31.1 From nobody Sun May 19 22:46:09 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631536126601823.3507082974949; Mon, 13 Sep 2021 05:28:46 -0700 (PDT) Received: from localhost ([::1]:56458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPl4n-0002u6-EM for importer@patchew.org; Mon, 13 Sep 2021 08:28:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPkbE-0002x8-NS for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:58:13 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:37750) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPkbD-000663-AV for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:58:12 -0400 Received: by mail-wm1-x334.google.com with SMTP id c8-20020a7bc008000000b002e6e462e95fso6748032wmb.2 for ; Mon, 13 Sep 2021 04:58:10 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n186sm6011037wme.31.2021.09.13.04.58.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 04:58:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BR3kp9x1U17N8tBq/3eXPV/aD82EtrsCdplx3rKkI4c=; b=F0qp3RZH/SBIQt6FAhI+Il7X+7rvRFAbOL/xZPlIuMadCXe/UACD/fvySCOoJ4/GWD hCmlIPHpzHViyEQ2k33Vi7PGVGMCtmIIZ6lAVFt1Nw+KvWet7npdf2x8bVgNGA/ZI3pt N48LQoz2Q8ykrP52/damXf6tMLW9CKo7fGZFz2LoZHKXzTyUd1EEhhBAHCgXzHZmijCW gK8mBZfRGP72xfMvib+ZoyIwAViIs35Pz7ty18HsM0lY2ilblT8PvGw9jKc9Jn1eh+za +Aa1qFBlXO56eFJGK6C0rF1OTFcKw8nHu8Cd/NGEImTpV2USjvgkQetx9TFOn7VSKt0B bkTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=BR3kp9x1U17N8tBq/3eXPV/aD82EtrsCdplx3rKkI4c=; b=MjLJCdNVlsXK4iMS5ViWbe0JS/0Ga/IIaz0dwXY6XkvycCxw68fBbUTSCg6CT5ZAkK y0WO7fLRKaXji+9sCgaBCxYV9Yqe7Q4Or0pGEwHxkPL+/xGFBLgbvZSgPjfcZKla8gro QZEbeo9aAtzkpkHzcgWYGoQbkD3hBm82q9Q9u+6SjLz9eM9Evn1hBYq9Hp5KpcET4Z3i +aiIsBpotiyVRLTDb4Ef1NDwfVORTJoZLg4dp5qsJyYW7cIZxKEWltTcTA6bDtyhAMYO rJ6XRh28EwxUWPIdPf0l7vjDudJpEe5Isq+MkD0hfsRVbQMSh8ZtTyTVD7DkBwZMKiKM IQ1Q== X-Gm-Message-State: AOAM531b8jpmWRcbzvxI/tewUd5Zoi16MlLUyq1N0pWadqmVXBtMgx8r 9zQ6JsdVduq+ALyaAri2fs0PkJfKcNg= X-Google-Smtp-Source: ABdhPJwK48x1fYbk4me5rWM8m2BeXsFledJDbrA8zLhStbVRdPJO5dz4eZHbKbe9KsR/BEc+7Jz9UQ== X-Received: by 2002:a1c:2547:: with SMTP id l68mr10641906wml.23.1631534289981; Mon, 13 Sep 2021 04:58:09 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 18/21] util: Suppress -Wstringop-overflow in qemu_thread_start Date: Mon, 13 Sep 2021 13:57:39 +0200 Message-Id: <20210913115742.533197-19-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210913115742.533197-1-pbonzini@redhat.com> References: <20210913115742.533197-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::334; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x334.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631536128132100003 From: Richard Henderson This seems to be either a glibc or gcc bug, but the code appears to be fine with the warning suppressed. Signed-off-by: Richard Henderson Message-Id: <20210803211907.150525-1-richard.henderson@linaro.org> Signed-off-by: Paolo Bonzini --- util/qemu-thread-posix.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/util/qemu-thread-posix.c b/util/qemu-thread-posix.c index fd9d714038..6c5004220d 100644 --- a/util/qemu-thread-posix.c +++ b/util/qemu-thread-posix.c @@ -537,9 +537,28 @@ static void *qemu_thread_start(void *args) QEMU_TSAN_ANNOTATE_THREAD_NAME(qemu_thread_args->name); g_free(qemu_thread_args->name); g_free(qemu_thread_args); + + /* + * GCC 11 with glibc 2.17 on PowerPC reports + * + * qemu-thread-posix.c:540:5: error: =E2=80=98__sigsetjmp=E2=80=99 acc= essing 656 bytes + * in a region of size 528 [-Werror=3Dstringop-overflow=3D] + * 540 | pthread_cleanup_push(qemu_thread_atexit_notify, NULL); + * | ^~~~~~~~~~~~~~~~~~~~ + * + * which is clearly nonsense. + */ +#pragma GCC diagnostic push +#ifndef __clang__ +#pragma GCC diagnostic ignored "-Wstringop-overflow" +#endif + pthread_cleanup_push(qemu_thread_atexit_notify, NULL); r =3D start_routine(arg); pthread_cleanup_pop(1); + +#pragma GCC diagnostic pop + return r; } =20 --=20 2.31.1 From nobody Sun May 19 22:46:09 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631536494494964.6663076830104; Mon, 13 Sep 2021 05:34:54 -0700 (PDT) Received: from localhost ([::1]:36832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPlAf-0000eo-J4 for importer@patchew.org; Mon, 13 Sep 2021 08:34:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43052) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPkbF-0002x9-Bm for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:58:13 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:55846) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPkbE-00066I-05 for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:58:13 -0400 Received: by mail-wm1-x32d.google.com with SMTP id g128so2011174wma.5 for ; Mon, 13 Sep 2021 04:58:11 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n186sm6011037wme.31.2021.09.13.04.58.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 04:58:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ybwvFhhB8BrLO2rZlPd30rviyTAUGPZU5FsjXoQhJS4=; b=cRXAaKID0KEkmZrPkRFbg7PDKnwjTyPqJatyyV6bscuEshYDBdNROLtWnFr3XHDqdr ZCysVA3vpLX6ln57y24aMeN3DGdoVDDkuRfAYyKlwv9upmOHqaHVGPENuMdaYaOkgO9O EapdtinU8a9GY/a16I9CHGHSlpocnixMll1h64WqxASPzeAWSp9/oeHyxEyS6bSWVkt2 0D8zMfM3jJIgsFnDQLhW7urY8Fnn2d+gUbMEr2zmFDoxj/zcVAR2O5XzDx+9uenuWe6b kp72fPiB0kwQsucNBj49CpSkEeBRBvNaUBDH33REDGdJUyr52HPehkeAqNZ1lURga/04 cGfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ybwvFhhB8BrLO2rZlPd30rviyTAUGPZU5FsjXoQhJS4=; b=bmc2vKle92blNaHnFVJ4ySEOpJ/9WP/v74F2eFe5cS5gsjz3eTHBgY7SUPbW8spgXI Pj98BGKHL3RQrrAWjxqviZUVO6rU5bRAvI1o9aBntzwcB6Rryvte/3rX3PH9asN+/fF3 uREvHPjbbXifOQNBR0nEL4Afcijhi7N56nBTFhLdKzpNFBzz9oetJLLD8ZYme+W1Del1 6R7HcUeftyVu5az+GMN/+2kmgndUuEzn6Io5FOCxzK2UU5JV243QJx/NbW9KkbF4iwTa cviUDTMCa9999j7NuMZYOE4SIs4vyTJYxmVdWdZKYIlb8WLW8hBquxS3NaFg6bNSZ9jJ hHJQ== X-Gm-Message-State: AOAM532tR4rq2wU/ZccTRF7icfc6qLbxews3NzaEbhO/ivUtQ5pw+TY5 e2LKRd7h7qzaTcFF3cL1X/A+iL6W8+Q= X-Google-Smtp-Source: ABdhPJzRdKBfxH3FHm2CqlQUJCGK6637/7EdjYuDkiU3mH42tvsZvNsNvcoJhwz4zeok80CXoSHWmQ== X-Received: by 2002:a05:600c:3790:: with SMTP id o16mr10730703wmr.157.1631534290711; Mon, 13 Sep 2021 04:58:10 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 19/21] Only check CONFIG_NVMM when NEED_CPU_H is defined Date: Mon, 13 Sep 2021 13:57:40 +0200 Message-Id: <20210913115742.533197-20-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210913115742.533197-1-pbonzini@redhat.com> References: <20210913115742.533197-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::32d; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32d.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Reinoud Zandijk Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631536495319100001 Content-Type: text/plain; charset="utf-8" From: Reinoud Zandijk Userland targers will otherwise use a poisoned CONFIG_NVMM Signed-off-by: Reinoud Zandijk Message-Id: <20210718134650.1191-2-reinoud@NetBSD.org> Signed-off-by: Paolo Bonzini --- include/sysemu/nvmm.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/sysemu/nvmm.h b/include/sysemu/nvmm.h index 6d216599b0..833670fccb 100644 --- a/include/sysemu/nvmm.h +++ b/include/sysemu/nvmm.h @@ -10,8 +10,7 @@ #ifndef QEMU_NVMM_H #define QEMU_NVMM_H =20 -#include "config-host.h" -#include "qemu-common.h" +#ifdef NEED_CPU_H =20 #ifdef CONFIG_NVMM =20 @@ -23,4 +22,6 @@ int nvmm_enabled(void); =20 #endif /* CONFIG_NVMM */ =20 -#endif /* CONFIG_NVMM */ +#endif /* NEED_CPU_H */ + +#endif /* QEMU_NVMM_H */ --=20 2.31.1 From nobody Sun May 19 22:46:09 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631534662531755.8496429413327; Mon, 13 Sep 2021 05:04:22 -0700 (PDT) Received: from localhost ([::1]:38486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPkhA-0003Ms-K4 for importer@patchew.org; Mon, 13 Sep 2021 08:04:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43084) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPkbH-0002z3-21 for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:58:16 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:55120) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPkbF-00067v-JG for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:58:14 -0400 Received: by mail-wm1-x329.google.com with SMTP id s24so6441080wmh.4 for ; Mon, 13 Sep 2021 04:58:13 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n186sm6011037wme.31.2021.09.13.04.58.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 04:58:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Dx21SJFtGQHR502uhGJAgjLcaXSroCju6rio9v9gGTE=; b=fYcEjWYR7zD8gM6ve4p53GMeHUKICkOsH7FlqoZ0rwgXp/4n20sEGMf0BIEtFlZVwC z7Ri2c20YP+BY7VMaelrSOd12UewaeNvd6FNMxs1pWsANlHVC0/GDfMjaazt+X7gjmiS WUyBU0fJCF+5HOkl0NE+tJAruFx0eD4KWGoUs1ZtHvBJVywWxQ22ySPzU+c+9eKVn55D 19StPHmSWxvapuE5b2IpyImX8J8l3llFsauJ+nzU6XhCqA1QzTJKW8YSp66Fd0wojUOL jLLclbkDprWDBMHPDhGp9WgR0syjtreMvO5b57BU/SUGMtqEnsQ2YSnnjIUwvpJyEhQI XRjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Dx21SJFtGQHR502uhGJAgjLcaXSroCju6rio9v9gGTE=; b=11EiN7akiq0hH/ZKf+5mIjEcx6036e+Oe+r+QXm8UINBHmVHYyDFBZi/v8mayQzoyz rsjdfIZ6Kvf131oA/WlwGNNK0iiMGHNasn4YDUfPZXj+WAAC1J0Q6nkbx4N+jpJDw6HI /Bmy6+yDiFgLZFYElhKchwpebmV1FtbMicyiK2yL4jLk/y5Cy8EOEEZGNw2JlmmWgqOc LkTxYFE2Olg9UpDfDXuwUCZCPZA7gSAYp+VRNWpSIIFEcSGLQBiaYOCh5lyYIyDhTCAE pN9OW+qas3QONT3sSN7jd2fIvdeH4/wPG1ywpyzEAN5CVg9JZ1xRoORN6Vmyt7dGydFr CE7Q== X-Gm-Message-State: AOAM532rIeuccke+BaTMaaXIRQuK6r53u5CQDhN+Cwahh+BmiUuxoBbK O5pC4IOTKIMGMHkpaGOKyis/djOz8+s= X-Google-Smtp-Source: ABdhPJzewCyV9DiHXkOVUZzlSn8RVZ6xTjANLQDs/XV98IUosAv4SuxluUHCa3uv/RkQamXyMCtD1Q== X-Received: by 2002:a7b:c048:: with SMTP id u8mr10735309wmc.113.1631534292383; Mon, 13 Sep 2021 04:58:12 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 20/21] Fix nvmm_ram_block_added() function arguments Date: Mon, 13 Sep 2021 13:57:41 +0200 Message-Id: <20210913115742.533197-21-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210913115742.533197-1-pbonzini@redhat.com> References: <20210913115742.533197-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::329; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x329.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Reinoud Zandijk Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631534677075100003 Content-Type: text/plain; charset="utf-8" From: Reinoud Zandijk A parameter max_size was added to the RAMBlockNotifier ram_block_added function. Use the max_size for pre allocation of hva space. Signed-off-by: Reinoud Zandijk Message-Id: <20210718134650.1191-3-reinoud@NetBSD.org> Signed-off-by: Paolo Bonzini --- target/i386/nvmm/nvmm-all.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c index 28dee4c5ee..a488b00e90 100644 --- a/target/i386/nvmm/nvmm-all.c +++ b/target/i386/nvmm/nvmm-all.c @@ -1132,13 +1132,14 @@ static MemoryListener nvmm_memory_listener =3D { }; =20 static void -nvmm_ram_block_added(RAMBlockNotifier *n, void *host, size_t size) +nvmm_ram_block_added(RAMBlockNotifier *n, void *host, size_t size, + size_t max_size) { struct nvmm_machine *mach =3D get_nvmm_mach(); uintptr_t hva =3D (uintptr_t)host; int ret; =20 - ret =3D nvmm_hva_map(mach, hva, size); + ret =3D nvmm_hva_map(mach, hva, max_size); =20 if (ret =3D=3D -1) { error_report("NVMM: Failed to map HVA, HostVA:%p " --=20 2.31.1 From nobody Sun May 19 22:46:09 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1631536146944727.5161357054463; Mon, 13 Sep 2021 05:29:06 -0700 (PDT) Received: from localhost ([::1]:57738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPl57-0003kj-Rm for importer@patchew.org; Mon, 13 Sep 2021 08:29:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPkbI-0002zE-JC for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:58:17 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:46863) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPkbH-00068y-3N for qemu-devel@nongnu.org; Mon, 13 Sep 2021 07:58:16 -0400 Received: by mail-wr1-x42c.google.com with SMTP id x6so14240811wrv.13 for ; Mon, 13 Sep 2021 04:58:14 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id n186sm6011037wme.31.2021.09.13.04.58.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Sep 2021 04:58:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YYFvpsgHSuGUkE2kfQnK35cPCVzYcBdrTYC5ihd4kR8=; b=R7X5fkXMO+QUGeUzgGhGyXhCG4rIJIo+Ct1cPcCvVQgPnN6+r77kaw4IJfp9oXt8E4 nInj/W6PKfr+Khi0PpNKbBra0z2PjlIbduvG6LtEvKgGjWNmQqka/hv3EZZ5pjDgPj7g 3bYWzBdS7BRinCRXMcjq/ri+L9JlZCU26AyeAdu1ZPPAMu0wCLABp9bI7YS6tzqI/PPy t9Ih0TnkhFdhQSgAUiay8S0EeqMPyzp9jehNKcnI+i60vtbIgQ8TG3fOIdFIm1Sm06w2 +3BRlNf4Fij9n+o9Op9GX/JeArK+x/mi08Ohu14VtiZ68TIBpnAHu3rvsUenuSkaiElO 2cZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=YYFvpsgHSuGUkE2kfQnK35cPCVzYcBdrTYC5ihd4kR8=; b=506RTIYj04v+ae2zLeC//H21J441mRFWpXaOwGbu33c0E8b6L8ZjWEwTxDyfk/JMVp J7CXdSNLBLbvwdY5scGC7O29abuL6LbtYC26w+PIm69QFLF/FscHgw2iTmcZhDt9SLzA hXPRqb3IJI/agScburI2YISGyWNnFYoi53wY2Kwq4EoAg1kup+d3Ai8BFX2gCZ5AFM6C wgtQXFiJx1yVfcsU8dCLsSHHWCptIFaep3U24MGYNwBfzXlm5LdPrJYYAIhXFgE79Dxv KLRjeLKwxB15n5QlRUbUqAlUL7A5ORpCJOBkx29ncbHg8bA7fLTXODyYbXIMDHZ2l+pp 7sQA== X-Gm-Message-State: AOAM5322XTb13NpfE5wHi2vnzVr3bS5Q8nDSVx4PiOOVVy0H4UPjbkaC NQ0+HLFkgKrobNvBC9RZSe4Oc9mGgqk= X-Google-Smtp-Source: ABdhPJzbKgerYGh5ys2B3mvZnwPrBdRrTSKhHA287fxc2y/AnEyZ2ZOenTwm7uT14IoLFLNRrEZ5ww== X-Received: by 2002:a5d:6750:: with SMTP id l16mr12006244wrw.174.1631534293852; Mon, 13 Sep 2021 04:58:13 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 21/21] docs: link to archived Fedora code of conduct Date: Mon, 13 Sep 2021 13:57:42 +0200 Message-Id: <20210913115742.533197-22-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210913115742.533197-1-pbonzini@redhat.com> References: <20210913115742.533197-1-pbonzini@redhat.com> MIME-Version: 1.0 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=2a00:1450:4864:20::42c; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: Markus Armbruster Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1631536148942100001 Content-Type: text/plain; charset="utf-8" Fedora has switched to a different CoC. QEMU's own code of conduct is based on the previous version and cites it as a source. Replace the link with one to the Wayback Machine. Reviewed-by: Markus Armbruster Signed-off-by: Paolo Bonzini --- docs/devel/code-of-conduct.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/devel/code-of-conduct.rst b/docs/devel/code-of-conduct.rst index 277b5250d1..195444d1b4 100644 --- a/docs/devel/code-of-conduct.rst +++ b/docs/devel/code-of-conduct.rst @@ -55,6 +55,6 @@ Sources ------- =20 This document is based on the `Fedora Code of Conduct -`__ and the -`Contributor Covenant version 1.3.0 +`__ +(as of April 2021) and the `Contributor Covenant version 1.3.0 `__. --=20 2.31.1