From nobody Fri May 10 17:03:04 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 1626968316437724.0427049227584; Thu, 22 Jul 2021 08:38:36 -0700 (PDT) Received: from localhost ([::1]:51894 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6amR-0003J9-BQ for importer@patchew.org; Thu, 22 Jul 2021 11:38:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35580) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6akH-0000Z0-2C for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:21 -0400 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]:46952) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6akC-0002hA-3p for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:17 -0400 Received: by mail-ed1-x529.google.com with SMTP id t2so7282962edd.13 for ; Thu, 22 Jul 2021 08:36:15 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id qo6sm9638628ejb.122.2021.07.22.08.36.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 08:36:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b+SyzHYFOk1E/GaAQ0K5wVgZaD0erJqoG+fb+9OgOB8=; b=SyLM4LH1/3aI1TAqz5g6IwvbxnX6dSiRj4C+AwFgEm2yg5uE5x/854ik4c3oN614sQ /MSeiDmMfTBnJtwqXpbyba2cqXwj254OxjxvkbS+Of0dL8MBOJaNW+PKwqmCtsWGO7x1 bj7kStSco2EZbFqCzNKwurT8706a2MnGCFSdUbiii6VNd1CBtrazjvevizCHhUfFVf3n kyEwuDdPFE0CGBLo/87MgZ5QeQ/4pQas3OPpi9HokSipaDH2/MWLyao/1DfaJOBCrc8y UDyGM121A0rbVnouXRfQxlBsGzDng2/BKEPSC5UkYtKpn4+Wtsa8QzWaayvuTOQWJao9 b68Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=b+SyzHYFOk1E/GaAQ0K5wVgZaD0erJqoG+fb+9OgOB8=; b=Bt630FxeF/09zd17ySUugE9qLeoAoFVpFTjUyLqlemoaYX/Ye9ZYQDKLY0BWnVyc4d awiGtIjP8Qz2QuTU9k3cVaOnoT93FbHiLs8Mfk4kUOgnGdqLOk02P80Vbix3V/JCOzl1 3aZJZGU67PsMHjDP4PxhSV3sZ58npY8zZ9xWF9d3/jg3+4Ldd1aY1Nk1AbQsw/lKs/Kn cLOebpU4CLQAxkWf8Z+6ywAga/+ORJplH/cU7BT0Rso0ctMcfFCTDaeNAMBg2wvogIAa 89M0xgSFkQsn5Z2x8AJ1yVV8NGI2QkIBja9dkbinC/QVzLorC/jyJVRniao/019Mz7rE eRBA== X-Gm-Message-State: AOAM532xkDLNTbTi7zVG+OvS7WcKLdgWxcu+xx6QfgqjBubTpFm0h8AU jvLUkHDz+O3taxRHile+gxPgxRfF4Y8Cog== X-Google-Smtp-Source: ABdhPJyfPiNj6aXf9EFn+srOsG+PQ8mMdAfIWmipvwwZ5LaZwOwZVX5JFWB4QVaQxJJ+gELRjA4oAg== X-Received: by 2002:aa7:cb86:: with SMTP id r6mr230471edt.181.1626968174818; Thu, 22 Jul 2021 08:36:14 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 01/15] qemu-config: never call the callback after an error, fix leak Date: Thu, 22 Jul 2021 17:35:58 +0200 Message-Id: <20210722153612.955537-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210722153612.955537-1-pbonzini@redhat.com> References: <20210722153612.955537-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::529; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x529.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.249, 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: armbru@redhat.com 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: 1626969220076100001 Content-Type: text/plain; charset="utf-8" Ensure that the callback to qemu_config_foreach is never called upon an error, by moving the invocation before the "out" label. Cc: armbru@redhat.com Fixes: 3770141139 ("qemu-config: parse configuration files to a QDict", 202= 1-06-04) Signed-off-by: Paolo Bonzini --- util/qemu-config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/qemu-config.c b/util/qemu-config.c index 84ee6dc4ea..7db810f1e0 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -417,12 +417,12 @@ static int qemu_config_foreach(FILE *fp, QEMUConfigCB= *cb, void *opaque, return res; } res =3D count; -out: if (qdict) { cb(group, qdict, opaque, errp); - qobject_unref(qdict); } +out: loc_pop(&loc); + qobject_unref(qdict); return res; } =20 --=20 2.31.1 From nobody Fri May 10 17:03:04 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 1626968450969816.9011805383055; Thu, 22 Jul 2021 08:40:50 -0700 (PDT) Received: from localhost ([::1]:60466 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6aob-00018l-TH for importer@patchew.org; Thu, 22 Jul 2021 11:40:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35662) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6akJ-0000aV-Pr for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:23 -0400 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]:42996) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6akC-0002hX-MX for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:23 -0400 Received: by mail-ed1-x52a.google.com with SMTP id k27so7306256edk.9 for ; Thu, 22 Jul 2021 08:36:16 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id qo6sm9638628ejb.122.2021.07.22.08.36.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 08:36:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iAn6zfw6aMrYcPgefnzHwccYHf72WoOmDtwMwiOdWOU=; b=fNVvaMASkWFNYnLKBzUS+/syZWHlYikQGrEudz2JfonLoQ1HcHtwJmLC4VqHjfs+gy zAUd6LGUBTcq07vVufcBXsxX5/N70uirWmXh7xxpGu6bG+raDldS/LXKJtBOuWAR9iSE //vELqTyTnUw8TnyW/161hKs6sY28XjEd/8ugAMr2wZrUdj5Sng3QQZV/sBc1F1sb7Jm 2rByMRBuxa78of6kdbAVpvnjjy0dxyfZ+3wQj22UHAhncCxvPlKrfTJZ710DbFhFYLKw Txd8aTbMbUSH58c4AS9xKdukxm9LIohHtzWfC2MPR9/p+0YjmLhWFa4gIWT277WKc6e9 n6lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=iAn6zfw6aMrYcPgefnzHwccYHf72WoOmDtwMwiOdWOU=; b=sbcadgjry8ev11fSca0OAVpdPU5+w6nUMhQVxm9BkfKSAliz11PDaAWQIAx58BiWMX XjHZ+tlHHZEVGiuSLWDXHMz9XGhcKpRvm6izo/MAEkEYQ9IAv6qIIgVGqL77v0UwhvL+ MOE90i9YFWRRJzM98VooXE/sLeK1agR6fuU7IaMnSTp/fzUQA51xgfA1OqpJAa5bJi0M lXd+6wSdxQrX6CA3y6wuPMYKRsyGuC/b3vAJcjYX2S0zg4d9yekIenaOm5+rrllSu96N sVZHk5RHo3GAt0DrGdfnzimrurYqO5yArNL34RddvZfNq8nKDCGkrG9KLK9YL3l2Uyo/ 9l9w== X-Gm-Message-State: AOAM5320NLtjn74Xw6mVOqTFYtcg2VseRcayoiuqdHSUabg0mypboUoT lQZYtuosFoI9w91IA5CDBsER40yp6SNr+w== X-Google-Smtp-Source: ABdhPJz43A7rXJbcTIyY4UfqPvzVadhVWrD4V/vg5C7HXHt+tXzgZ2CF5PMUt0CWeOZP9sSZopZkoQ== X-Received: by 2002:aa7:d857:: with SMTP id f23mr223222eds.249.1626968175555; Thu, 22 Jul 2021 08:36:15 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 02/15] qemu-config: fix memory leak on ferror() Date: Thu, 22 Jul 2021 17:35:59 +0200 Message-Id: <20210722153612.955537-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210722153612.955537-1-pbonzini@redhat.com> References: <20210722153612.955537-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::52a; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52a.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.249, 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 , armbru@redhat.com 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: 1626968452830100001 Content-Type: text/plain; charset="utf-8" The leak is basically impossible to reach, since the only common way to get ferror(fp) is by passing a directory to -readconfig. In that case, the error occurs before qdict is set to anything non-NULL. However, it's theoretically possible to get there after an EIO. Cc: armbru@redhat.com Reported-by: Peter Maydell Fixes: f7544edcd3 ("qemu-config: add error propagation to qemu_config_parse= ", 2021-03-06) Signed-off-by: Paolo Bonzini --- util/qemu-config.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/util/qemu-config.c b/util/qemu-config.c index 7db810f1e0..fdf6cd69fc 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -414,7 +414,7 @@ static int qemu_config_foreach(FILE *fp, QEMUConfigCB *= cb, void *opaque, if (ferror(fp)) { loc_pop(&loc); error_setg_errno(errp, errno, "Cannot read config file"); - return res; + goto out_no_loc; } res =3D count; if (qdict) { @@ -422,6 +422,7 @@ static int qemu_config_foreach(FILE *fp, QEMUConfigCB *= cb, void *opaque, } out: loc_pop(&loc); +out_no_loc: qobject_unref(qdict); return res; } --=20 2.31.1 From nobody Fri May 10 17:03:04 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 1626968447063176.29444916949717; Thu, 22 Jul 2021 08:40:47 -0700 (PDT) Received: from localhost ([::1]:60170 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6aoX-0000vk-Vj for importer@patchew.org; Thu, 22 Jul 2021 11:40:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35624) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6akI-0000ZX-Ko for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:22 -0400 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]:36416) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6akG-0002hd-Hg for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:22 -0400 Received: by mail-ed1-x535.google.com with SMTP id h2so7335408edt.3 for ; Thu, 22 Jul 2021 08:36:17 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id qo6sm9638628ejb.122.2021.07.22.08.36.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 08:36:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OvCsuQTCKolldXkD8XBLFsvZqVgvWjLwnNgNmih/Hb4=; b=RDRSHW339576z/92GaOatm5QaGzgP8imMuasYHnaL64afzqGxoTFnivnRsvYIKkFDG wHo+iixDSqIx5fkMrybPSW3DzN2T55YdJ97XLDTNWD7QdphJtKgoOQIicCXGrNFjEiW4 hCY9y5j6JDDTcFehutbKL7qPbwSI2FJ6cwwqSkQV+4zquxWFHLM11v7jMF8fTX3du/jt 94BonQ4j+wWRL0ppgvub5of/rpAEONLie3qNt8r4h52BZxE+UF53BpVI1fLO92X5vJsT 53gAN/iGcsVqWTUBNZczh1DRGbaOFOZlqPYpVAnqEaNQJZMHvCsI1jg192fSRi0EANcW aa+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=OvCsuQTCKolldXkD8XBLFsvZqVgvWjLwnNgNmih/Hb4=; b=h9RqO2YkDp4fCvr+KHAzSJCuPlTYy1e9gJUfeazclhdujvFFziJLZ5txGN0Dt5MlJu cV3w/Id39Oo+DElKzbTK2qIaSIlO1ca/75qyzXqrUJGTB0MHvHBfrZsOTuMWB4qob0TQ 1HrKUXdL84aOivn3ySgqarYLxJavf2SSgDP3peTBGCpvmTUu7w1SoWeLYMLciCp7QQPG 0HC+hmuQz7SP0XD7pOqE8CdAD3ylskajqjWk4q37+o9KEtWfyO71WBnJvVJ7syjmw3XM RFn1QnVUn9fFnIvmsbtlsI8SAYLSVZGon6Frpf9wR3AD0QPWX7/GSHlu2c+UEEskntqZ 5vQw== X-Gm-Message-State: AOAM532QLt1FDkf9KosofUb7j6QZUQhktnfcdU0ZVtzkUf7DUkipjpie O9MuLJmh63kgUpLFY50D1RG9sMpRFF1S9Q== X-Google-Smtp-Source: ABdhPJz4mZhDx89egdXDVYajtzdgesIXmjru3ZdYrNgIIW+lkJ3ifof6tpZGv4AsiNuwin8EQ0eT+w== X-Received: by 2002:a50:8d4e:: with SMTP id t14mr288069edt.138.1626968176194; Thu, 22 Jul 2021 08:36:16 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 03/15] vl: Parse legacy default_machine_opts Date: Thu, 22 Jul 2021 17:36:00 +0200 Message-Id: <20210722153612.955537-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210722153612.955537-1-pbonzini@redhat.com> References: <20210722153612.955537-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::535; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x535.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.249, 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: Jason Andryuk 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: 1626968448726100003 Content-Type: text/plain; charset="utf-8" From: Jason Andryuk qemu can't start a xen vm after commit d8fb7d0969d5 "vl: switch -M parsing to keyval" with: $ ./qemu-system-i386 -M xenfv Unexpected error in object_property_find_err() at ../qom/object.c:1298: qemu-system-i386: Property 'xenfv-3.1-machine.accel' not found Aborted (core dumped) The default_machine_opts handling doesn't process the legacy machine options like "accel". Call qemu_apply_legacy_machine_options to provide the legacy handling. Signed-off-by: Jason Andryuk Message-Id: <20210713021552.19110-1-jandryuk@gmail.com> Signed-off-by: Paolo Bonzini --- softmmu/vl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/softmmu/vl.c b/softmmu/vl.c index 4df1496101..f4d8630fc6 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -2126,6 +2126,7 @@ static void qemu_create_machine(QDict *qdict) QDict *default_opts =3D keyval_parse(machine_class->default_machine_opts, NULL, NULL, &error_abort); + qemu_apply_legacy_machine_options(default_opts); object_set_properties_from_keyval(OBJECT(current_machine), default= _opts, false, &error_abort); qobject_unref(default_opts); --=20 2.31.1 From nobody Fri May 10 17:03:04 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 162696845201158.4126189387606; Thu, 22 Jul 2021 08:40:52 -0700 (PDT) Received: from localhost ([::1]:60518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6aoc-0001Ah-Uq for importer@patchew.org; Thu, 22 Jul 2021 11:40:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35626) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6akI-0000ZY-MO for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:23 -0400 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]:38789) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6akG-0002io-Ne for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:22 -0400 Received: by mail-ed1-x532.google.com with SMTP id ee25so7314132edb.5 for ; Thu, 22 Jul 2021 08:36:17 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id qo6sm9638628ejb.122.2021.07.22.08.36.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 08:36:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YSHBt5TLWSH//IhnNECzgHbG4HJzFRz1fhGpkz8H4T0=; b=b6IfZb5DZNQWg3PqUIyO5NOeJdweLdXlHhsBxFfdhVlqwTW7E/56w/LGERUq88O8+g Bbnc8ERKssjTnm7MrYVMp67ohuC+Znt7NGe+K1wM58lJG++a4GD6hxRRXRToTDmF7uUO UOGF7k3/2hxgDEdi85iQDefqbGVMQk/vkE1JOqF2iMXtWZXTk2lhWX3Uk3KcbsyxRayX i5QTHr0EQGss5g8KgiWpmhWZPNhcs/XoCkFC0gzzbntpnQIz3eyQqNrzwWsEnFe5ITnn 5h6hQmP9P/40FonsQSXYoqwAwsLPXcrpF5RBQ+QVm2B3AwN9XFYB8d9voTEt6L2iCy0T yilQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=YSHBt5TLWSH//IhnNECzgHbG4HJzFRz1fhGpkz8H4T0=; b=m+/jClNBU1+oFoXHe2aM9NSyfHIylwY8Zh5MaNnAeDl23VgEwkfDv5e48U/RdO3BuX RZ+F4a4KrStmMcZzKFWti2UyPmXFWAfVeNYjg1uHjqWu1U7UqTxtj3b+oX8555W/JxTr ozjgmyWokDMxIdaXfuoFJq9a/3qb2zudfCAhy8jyCL+NUnAQW2ujp3LbHQfZyBs1O1DF uG8pnbqDgQnTBP+Jy2Z0VLfIaIrpEVWIenoU8LlufdcxfdNUpFdCLQA6Nk7xeU+XvFOL U8Jy/udGW+GxS1MsNBVv8IZz8xm+D+vHj7p5jHkGHQoP3JhbC0mIwZmun67Wm7vkxHkE OFXA== X-Gm-Message-State: AOAM530w36pg7fTHT1DVF90JI+dBd+EX27kkqnBKziUKsDKvM0iLnqhj SJIX5xYfRIUbZXl+JBSXS2GA7y33QGepLg== X-Google-Smtp-Source: ABdhPJz/1v/nOGT6XTZHRINoxRmahJ6wlq4GtzD82i6jadrYfajy9akQ7hMVrgMTTA66I8Z7mVG9IQ== X-Received: by 2002:aa7:d604:: with SMTP id c4mr244858edr.39.1626968176819; Thu, 22 Jul 2021 08:36:16 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 04/15] chardev-spice: add missing module_obj directive Date: Thu, 22 Jul 2021 17:36:01 +0200 Message-Id: <20210722153612.955537-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210722153612.955537-1-pbonzini@redhat.com> References: <20210722153612.955537-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::532; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x532.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.249, 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=20=2E=20Berrang=C3=A9?= , Frederic Bezies 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: 1626968452885100002 The chardev-spicevmc class was not listed in chardev/spice.c, causing "-chardev spicevmc" to fail when modules are enabled. Reported-by: Frederic Bezies Fixes: 9f4a0f0978 ("modules: use modinfo for qom load", 2021-07-09) Resolves: //gitlab.com/qemu-project/qemu/-/issues/488 Signed-off-by: Paolo Bonzini Reviewed-by: Daniel P. Berrang=C3=A9 Message-Id: <20210719164435.1227794-1-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- chardev/spice.c | 1 + 1 file changed, 1 insertion(+) diff --git a/chardev/spice.c b/chardev/spice.c index 3ffb3fdc0d..bbffef4913 100644 --- a/chardev/spice.c +++ b/chardev/spice.c @@ -382,6 +382,7 @@ static const TypeInfo char_spicevmc_type_info =3D { .parent =3D TYPE_CHARDEV_SPICE, .class_init =3D char_spicevmc_class_init, }; +module_obj(TYPE_CHARDEV_SPICEVMC); =20 static void char_spiceport_class_init(ObjectClass *oc, void *data) { --=20 2.31.1 From nobody Fri May 10 17:03:04 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 1626968552291772.188785494344; Thu, 22 Jul 2021 08:42:32 -0700 (PDT) Received: from localhost ([::1]:40442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6aqF-0006bK-2R for importer@patchew.org; Thu, 22 Jul 2021 11:42:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6akK-0000bZ-81 for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:24 -0400 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]:43577) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6akG-0002iv-O8 for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:23 -0400 Received: by mail-ed1-x532.google.com with SMTP id l26so7309533eda.10 for ; Thu, 22 Jul 2021 08:36:18 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id qo6sm9638628ejb.122.2021.07.22.08.36.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 08:36:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=buCvLsLhrPlmFHD4WI3Z8/oFic9Gn2g+XnUDkOMJ8uM=; b=AIp3jv9XQMmjzbAV6bhBrntd+Hgh8LbrzDMFGCKD/03gzkAgP9hfHG0EbvyO97i2LP N6TqMDi2idqKrPJjs51UVQyPL51bhLePVIxLnICnA1c7CHohgjKBVHFcZPid33k74fAL aHgr1gQ3ny5NagCEyh+Yl2t1rxYq8kE6akNf7ogu7cnYzulDXus5+zeI5uXzYEpFfbqa kVtfymIPFd5MOJNCdoSWR9QTmJAua7FAqDi147PNTbYXmNEuyQAEK788QlRhlq95PfpP n/9M6Aynmyqe/YSFRdjRQAqxQ65vXU7r8tzY60gHhFDcxOUcsJOAeoztmR6/3zL0P0rD eKcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=buCvLsLhrPlmFHD4WI3Z8/oFic9Gn2g+XnUDkOMJ8uM=; b=DOpfilAO8u+hbPe9tkTXBJYqykubSDeynbcNKPNAwgXIYYhzDzA8o/jXW+jzm0tABq rdGnxdaBCNSrKjGmxRK+sDd+1Rb4Bip9h3dxut6wywm137NBCi+vh+IGQLESVkeEu9+d s3/ka2EAQPtWe/Dp41sPrsbpWQqfyO8mRnLbW0uckePxcX35WZvM22bwOgKelIeutHjF 6ul6g/tSBFhGdQLuCLyIdeLPeYy+8zwE8qkAWbYBiaeWvrdoLY7pEkQ1RTWhH2v31GC9 VOesA/YX0Q5EbT4HzySoECWKm+3MnGCQZO3AaNudWwydJIrom6ge+izw5cMLEw8XYHTQ amRg== X-Gm-Message-State: AOAM530nZ/rQ0zalYxyraMnkz1JsKeT0Gw9Jj5KmQtYszcNHC+uRsaqN JzDPOGVNS43gVt+nwVnIPvOGQ3D0lnG8HQ== X-Google-Smtp-Source: ABdhPJzw7HH+ef87M6AmmkYHznEu/xuRthhBgvwmVT4SG9esGjW3f5by0hUbx0yL9GIx3d5jo2bu7Q== X-Received: by 2002:a05:6402:1a57:: with SMTP id bf23mr258403edb.312.1626968177579; Thu, 22 Jul 2021 08:36:17 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 05/15] usb: fix usb-host dependency check Date: Thu, 22 Jul 2021 17:36:02 +0200 Message-Id: <20210722153612.955537-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210722153612.955537-1-pbonzini@redhat.com> References: <20210722153612.955537-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::532; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x532.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.249, 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: Programmingkid , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann 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: 1626968554369100001 From: Gerd Hoffmann Fixes: 90540f3289 ("configure, meson: convert libusb detection to meson", 2= 021-06-25) Reported-by: Programmingkid Signed-off-by: Gerd Hoffmann Message-Id: <20210721081718.301343-1-kraxel@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- hw/usb/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/usb/meson.build b/hw/usb/meson.build index 3ca6127937..de853d780d 100644 --- a/hw/usb/meson.build +++ b/hw/usb/meson.build @@ -72,7 +72,7 @@ if usbredir.found() endif =20 # usb pass-through -if config_host.has_key('CONFIG_USB_LIBUSB') +if libusb.found() usbhost_ss =3D ss.source_set() usbhost_ss.add(when: ['CONFIG_USB', libusb], if_true: files('host-libusb.c')) --=20 2.31.1 From nobody Fri May 10 17:03:04 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 1626968659600796.9562682202369; Thu, 22 Jul 2021 08:44:19 -0700 (PDT) Received: from localhost ([::1]:47908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6ary-00036Y-Km for importer@patchew.org; Thu, 22 Jul 2021 11:44:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35672) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6akK-0000bO-4I for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:24 -0400 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]:44915) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6akG-0002jX-OB for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:23 -0400 Received: by mail-ed1-x530.google.com with SMTP id l1so7292316edr.11 for ; Thu, 22 Jul 2021 08:36:19 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id qo6sm9638628ejb.122.2021.07.22.08.36.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 08:36:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PpjWAo5stvNiyV4KTcrkBtX4qLcVV0HWWyAwngBxZRI=; b=bndu2lu5JmTiSfC+0MLNz4ocB5drLs8nmJ2MIEwaYPPoBFjLLUQK2trTDT1PRBOc3u fUH2qepoYwrn6dkGzhT2GCXSZAfAsuUU6xWdGDwyyaEtyEEKFmNtLe5G4VVj40QyYx20 XOfJW8RZJIBWp2k7hiSZhatElSXs+1s8cl7yodeA0ErVIwanOGOjrEE5U59LQcXrk9Kk JdpZN018yielj/YWBoJuKqQaj2Npvk7D5fibHXmPp/0JQnl0MtQo4sQ2Iv7R77Rc5J9X 8SrmwyVMfoLIaFNMdrjQwk2k/5DvW5+O1puOfpoAv38tB4LllryVujWenHkhUEOR7EA4 SXEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=PpjWAo5stvNiyV4KTcrkBtX4qLcVV0HWWyAwngBxZRI=; b=IqLnTYBkRJISHlS4k72bibL+4HyE1qLTqMZ6+IA7hbSfat6Nu6v9XqzVkPTP+VZmME k1/cOxb5fONb91FsNjgjaxIKEwZQ3jX4AEA+8QaNskawq/vrti0uW2QZQt9qt7Bw1wR+ eeY7RgpyVIZ4VbPxXYCAHWyMjBvDaaYU6DjdujUmqkggg38muu3ZJM6fp3lvnDl3C2VG DaDfda4kZxBt2FLViUyDFsb01m9muUvEUU8Tq/BYSy8PvNrshqOpLxXq7J3jS1uqkmst iIL7d506JhblhRDWvNajbA5Ms9qE6r5NwUx8AqdqSFZHliwlIyMNo/8mJZYdkTmG3lt0 ukww== X-Gm-Message-State: AOAM533BOoqJn1+Jky4aIiZMu/YITqIMNOTE8nzM86RuSjwr29qdpsW4 ekHUm35MJZZ/uTxv4WMiESLzhJaMh1Ei5w== X-Google-Smtp-Source: ABdhPJxeSduW9zXhO4fviwEmrXkcVyQj/p+NLsVH/WbNZgMvCL9DUwAoaz1JEFj5kj1BLTD6t1gtAQ== X-Received: by 2002:a05:6402:60c:: with SMTP id n12mr228960edv.189.1626968178272; Thu, 22 Jul 2021 08:36:18 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 06/15] qemu-config: restore "machine" in qmp_query_command_line_options() Date: Thu, 22 Jul 2021 17:36:03 +0200 Message-Id: <20210722153612.955537-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210722153612.955537-1-pbonzini@redhat.com> References: <20210722153612.955537-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::530; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x530.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.249, 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: Stefan Hajnoczi 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: 1626968660787100001 Content-Type: text/plain; charset="utf-8" From: Stefan Hajnoczi Commit d8fb7d0969d5c32b3d1b9e20b63ec6c0abe80be4 ("vl: switch -M parsing to keyval") stopped adding the "machine" QemuOptsList. This causes "machine" options to not show up in QMP query-command-line-options output. For example, libvirt cannot detect that kernel_irqchip support is available. Adjust the "machine" opts enumeration in qmp_query_command_line_options() so that options are properly reported. Fixes: d8fb7d0969d5 ("vl: switch -M parsing to keyval") Cc: Paolo Bonzini Signed-off-by: Stefan Hajnoczi Message-Id: <20210721151055.424580-1-stefanha@redhat.com> Signed-off-by: Paolo Bonzini --- util/qemu-config.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/util/qemu-config.c b/util/qemu-config.c index fdf6cd69fc..436ab63b16 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -255,8 +255,6 @@ CommandLineOptionInfoList *qmp_query_command_line_optio= ns(bool has_option, info->option =3D g_strdup(vm_config_groups[i]->name); if (!strcmp("drive", vm_config_groups[i]->name)) { info->parameters =3D get_drive_infolist(); - } else if (!strcmp("machine", vm_config_groups[i]->name)) { - info->parameters =3D query_option_descs(machine_opts.desc); } else { info->parameters =3D query_option_descs(vm_config_groups[i]->desc); @@ -265,6 +263,13 @@ CommandLineOptionInfoList *qmp_query_command_line_opti= ons(bool has_option, } } =20 + if (!has_option || !strcmp(option, "machine")) { + info =3D g_malloc0(sizeof(*info)); + info->option =3D g_strdup("machine"); + info->parameters =3D query_option_descs(machine_opts.desc); + QAPI_LIST_PREPEND(conf_list, info); + } + if (conf_list =3D=3D NULL) { error_setg(errp, "invalid option name: %s", option); } --=20 2.31.1 From nobody Fri May 10 17:03:04 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 1626968556191212.60344592064644; Thu, 22 Jul 2021 08:42:36 -0700 (PDT) Received: from localhost ([::1]:40870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6aqJ-0006sL-6r for importer@patchew.org; Thu, 22 Jul 2021 11:42:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35666) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6akJ-0000ae-Sh for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:23 -0400 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]:38781) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6akH-0002ja-6r for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:23 -0400 Received: by mail-ed1-x529.google.com with SMTP id ee25so7314277edb.5 for ; Thu, 22 Jul 2021 08:36:19 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id qo6sm9638628ejb.122.2021.07.22.08.36.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 08:36:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0CUu59jU+QrLXiW2oOeunVguInuponinPtlaQBzYVEQ=; b=EdepfyFi3KBEG3DusUCfa0bc3FKECXEu+eaK6AXJAhnl6Xba5XLfgKQswY3r2mLgs4 slXZkfOm3YqfXIjyYTch/OvP7KdvApDvsBBt74a6sqVHv4jqY4BpbfzXztr4M0PSbYDC t+X9IXM1/KFhaPgLeK2nAsM3MWuTca2KD6rPu6yeqm73Pvh2kI5BDs2fHDEYPH8YOgfz 2Jl6+Ot2sDfyNv8qtASNk8wjyFFF83K2PZsosgafm9V63QaVAOuaiqveVZDlewliQcxX F6te4T/2QWKj9uvsSI2Kfqd5D5zZWyMQ3TD7lyYBO5tujJTeYjQUz4vJAsM0l1udLOv0 r0Pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0CUu59jU+QrLXiW2oOeunVguInuponinPtlaQBzYVEQ=; b=V3ckWJBHAoBSbATz+qYi1AkvH11J0Kubb/mBOFzRfKKahEoEnInJT1HF0w2jXYrm5A esg0e7AEJAzpg29P9QoPoT7wBeXRp1OqaHA/l3+hB40GEeN4pLlWnZ229yx8F+P7oS/q ek7EI6L3RCSXPvvzwyFNLSDNoVrHbeGTO+uCaxcHIlJKhheKB8nyyRSXKPnoRi0MSJmc ocAwbIUF7cJveXN5kHZPez6KtFZ8RHsyxyxrgREgcIF1trmIo0wMt6801HZ75KfPlkd2 76v9GtdOcR/TBNSquPcHYsVPJ/TN/Yiekus5mhP4+B739agK35fERR9fqg+ITpvupPZS 1V2A== X-Gm-Message-State: AOAM532ODb+59W6vhonOAc4aZbjW2hx98sMJBAqft2yCxcDt0BDRJkEB ADYjTAFXSjjNkXlstLKaXakdKVrp3zHpCA== X-Google-Smtp-Source: ABdhPJwlgXzrNDF2iXlEjQJX0yj4klOckEjq1TB7ZyWET9NhuLkn14Uge4pZp/LQjWgrdHfyvQtNeQ== X-Received: by 2002:aa7:de92:: with SMTP id j18mr235793edv.141.1626968178961; Thu, 22 Jul 2021 08:36:18 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 07/15] target/i386: Added V_INTR_PRIO check to virtual interrupts Date: Thu, 22 Jul 2021 17:36:04 +0200 Message-Id: <20210722153612.955537-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210722153612.955537-1-pbonzini@redhat.com> References: <20210722153612.955537-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::529; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x529.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.249, 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: 1626968556767100003 Content-Type: text/plain; charset="utf-8" From: Lara Lazier The APM2 states that The processor takes a virtual INTR interrupt if V_IRQ and V_INTR_PRIO indicate that there is a virtual interrupt pending whose priority is greater than the value in V_TPR. Signed-off-by: Lara Lazier Message-Id: <20210721152651.14683-1-laramglazier@gmail.com> Signed-off-by: Paolo Bonzini --- target/i386/tcg/sysemu/svm_helper.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/target/i386/tcg/sysemu/svm_helper.c b/target/i386/tcg/sysemu/s= vm_helper.c index 00618cff23..72b03a345d 100644 --- a/target/i386/tcg/sysemu/svm_helper.c +++ b/target/i386/tcg/sysemu/svm_helper.c @@ -65,6 +65,16 @@ 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) +{ + uint32_t int_prio; + uint32_t tpr; + + int_prio =3D (int_ctl & V_INTR_PRIO_MASK) >> V_INTR_MASKING_SHIFT; + tpr =3D int_ctl & V_TPR_MASK; + return (int_ctl & V_IRQ_MASK) && (int_prio >=3D tpr); +} + void helper_vmrun(CPUX86State *env, int aflag, int next_eip_addend) { CPUState *cs =3D env_cpu(env); @@ -290,7 +300,7 @@ void helper_vmrun(CPUX86State *env, int aflag, int next= _eip_addend) =20 env->hflags2 |=3D HF2_GIF_MASK; =20 - if (int_ctl & V_IRQ_MASK) { + if (ctl_has_irq(int_ctl)) { CPUState *cs =3D env_cpu(env); =20 cs->interrupt_request |=3D CPU_INTERRUPT_VIRQ; --=20 2.31.1 From nobody Fri May 10 17:03:04 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 1626968315940771.5651424681749; Thu, 22 Jul 2021 08:38:35 -0700 (PDT) Received: from localhost ([::1]:51888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6amQ-0003Ig-VB for importer@patchew.org; Thu, 22 Jul 2021 11:38:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6akK-0000bY-6b for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:24 -0400 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]:43576) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6akH-0002kp-6q for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:23 -0400 Received: by mail-ed1-x530.google.com with SMTP id l26so7309665eda.10 for ; Thu, 22 Jul 2021 08:36:20 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id qo6sm9638628ejb.122.2021.07.22.08.36.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 08:36:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iRNjWU+xQBwxSuzOkzKqjOuCIKJsPrHkUb10noaPNJw=; b=vaDcE0cSAqU3cFZQDwJaiWcC0FVbyPhviVvcnvYIoA9MQ8FwOl2DP+vimiPSCTLI2F /11wNVLaKN7qHMIOtRNnwPHFQBJ0vucGMVbtZ5qR7OdZLHwE7A350WnQ5hIKat4X7RhI dWC0+Zzqf7szObl/I4oAGMvR7fPnWVB1M89DLU/DBZRToOZV8mbPVwQ145gB/Ib+Yd5h 6dLyEFQeWq/2A6jnbxkDlYaLXZx5A5IfV5Z0OHyc4bTDBYttlN8hTAU9YMKkSjH6UjRZ fYSQB32lrz4Y0UgnIhxNj7vdH3VGQkhcgdW300023nezv4fBLwoPtTQoz7DKm1N35wRR lU+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=iRNjWU+xQBwxSuzOkzKqjOuCIKJsPrHkUb10noaPNJw=; b=nXuiCA3R6Y0tBdrC2YHUoSWdiCuCd+frbrE0cmRiWI39HaBQ/TP5F3ZrOJ4Z+/61Ny Z9ITOgWdpL5f/MEI7dFjtrN0fGP4KnqUNq5Q5NszCy6AmcVVNnz86DMoUPAQYFdk5F2A yhJZFzVOj0K1pCHVS7FsYv8EFWeESK1ipwG9h3Zk5hpuIvU+0dl7HXHDySKRGTOVcSs6 fDB/jTHGw4IvHkmXG0DbqZCVlt/4Oycugobye0demeZCE5mFSCb1pFpPEx1ffsbT89t8 fDq8OGBbuhZKmYiZulMMNTriRrg8XjJuxPgtodbatwmknH0kHUVn739YMKPVP4fO79yp Rwsw== X-Gm-Message-State: AOAM530xUa9exyOzvyRCN56+z3tmlHamJJPudJ7c++LUZUtFKdyApe1U +AKL/Lwr0bVsJh438onM0qWSphwDjFrBWw== X-Google-Smtp-Source: ABdhPJwb6rMn+ny5+6XwEPVHo29BIGoN88p5pUSvm+SapwymmIIhhGsGausapR4DhqvfJ1AtLE+SOQ== X-Received: by 2002:aa7:d703:: with SMTP id t3mr294912edq.50.1626968179645; Thu, 22 Jul 2021 08:36:19 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 08/15] target/i386: Added consistency checks for CR4 Date: Thu, 22 Jul 2021 17:36:05 +0200 Message-Id: <20210722153612.955537-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210722153612.955537-1-pbonzini@redhat.com> References: <20210722153612.955537-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::530; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x530.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.249, 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: 1626968317938100002 Content-Type: text/plain; charset="utf-8" From: Lara Lazier 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 --- target/i386/cpu.h | 39 ++++++++++++++++++++++++++++ target/i386/tcg/sysemu/misc_helper.c | 3 +++ target/i386/tcg/sysemu/svm_helper.c | 9 ++++--- 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 5d98a4e7c0..1f7e8d7f0a 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -240,6 +240,7 @@ typedef enum X86Seg { #define CR4_OSFXSR_SHIFT 9 #define CR4_OSFXSR_MASK (1U << CR4_OSFXSR_SHIFT) #define CR4_OSXMMEXCPT_MASK (1U << 10) +#define CR4_UMIP_MASK (1U << 11) #define CR4_LA57_MASK (1U << 12) #define CR4_VMXE_MASK (1U << 13) #define CR4_SMXE_MASK (1U << 14) @@ -251,6 +252,14 @@ typedef enum X86Seg { #define CR4_PKE_MASK (1U << 22) #define CR4_PKS_MASK (1U << 24) =20 +#define CR4_RESERVED_MASK \ +(~(target_ulong)(CR4_VME_MASK | CR4_PVI_MASK | CR4_TSD_MASK \ + | 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_FSGSBASE_MASK | CR4_PCIDE_MASK | CR4_OSXSAVE_MASK \ + | CR4_SMEP_MASK | CR4_SMAP_MASK | CR4_PKE_MASK | CR4_PKS_M= ASK)) + #define DR6_BD (1 << 13) #define DR6_BS (1 << 14) #define DR6_BT (1 << 15) @@ -2196,6 +2205,36 @@ static inline bool hyperv_feat_enabled(X86CPU *cpu, = int feat) return !!(cpu->hyperv_features & BIT(feat)); } =20 +static inline uint64_t cr4_reserved_bits(CPUX86State *env) +{ + uint64_t reserved_bits =3D CR4_RESERVED_MASK; + if (!env->features[FEAT_XSAVE]) { + reserved_bits |=3D CR4_OSXSAVE_MASK; + } + if (!(env->features[FEAT_7_0_EBX] & CPUID_7_0_EBX_SMEP)) { + reserved_bits |=3D CR4_SMEP_MASK; + } + if (!(env->features[FEAT_7_0_EBX] & CPUID_7_0_EBX_SMAP)) { + reserved_bits |=3D CR4_SMAP_MASK; + } + if (!(env->features[FEAT_7_0_EBX] & CPUID_7_0_EBX_FSGSBASE)) { + reserved_bits |=3D CR4_FSGSBASE_MASK; + } + if (!(env->features[FEAT_7_0_ECX] & CPUID_7_0_ECX_PKU)) { + reserved_bits |=3D CR4_PKE_MASK; + } + if (!(env->features[FEAT_7_0_ECX] & CPUID_7_0_ECX_LA57)) { + reserved_bits |=3D CR4_LA57_MASK; + } + if (!(env->features[FEAT_7_0_ECX] & CPUID_7_0_ECX_UMIP)) { + reserved_bits |=3D CR4_UMIP_MASK; + } + if (!(env->features[FEAT_7_0_ECX] & CPUID_7_0_ECX_PKS)) { + reserved_bits |=3D CR4_PKS_MASK; + } + return reserved_bits; +} + #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 db0d8a9d79..a2af2c9bba 100644 --- a/target/i386/tcg/sysemu/misc_helper.c +++ b/target/i386/tcg/sysemu/misc_helper.c @@ -99,6 +99,9 @@ void helper_write_crN(CPUX86State *env, int reg, target_u= long t0) cpu_x86_update_cr3(env, t0); break; case 4: + if (t0 & cr4_reserved_bits(env)) { + cpu_vmexit(env, SVM_EXIT_ERR, 0, GETPC()); + } if (((t0 ^ env->cr[4]) & CR4_LA57_MASK) && (env->hflags & HF_CS64_MASK)) { raise_exception_ra(env, EXCP0D_GPF, GETPC()); diff --git a/target/i386/tcg/sysemu/svm_helper.c b/target/i386/tcg/sysemu/s= vm_helper.c index 72b03a345d..d7d7a86aa9 100644 --- a/target/i386/tcg/sysemu/svm_helper.c +++ b/target/i386/tcg/sysemu/svm_helper.c @@ -85,6 +85,7 @@ void helper_vmrun(CPUX86State *env, int aflag, int next_e= ip_addend) uint32_t int_ctl; uint32_t asid; uint64_t new_cr0; + uint64_t new_cr4; =20 cpu_svm_check_intercept_param(env, SVM_EXIT_VMRUN, 0, GETPC()); =20 @@ -225,14 +226,16 @@ void helper_vmrun(CPUX86State *env, int aflag, int ne= xt_eip_addend) if ((new_cr0 & CR0_NW_MASK) && !(new_cr0 & CR0_CD_MASK)) { cpu_vmexit(env, SVM_EXIT_ERR, 0, GETPC()); } + new_cr4 =3D x86_ldq_phys(cs, env->vm_vmcb + offsetof(struct vmcb, save= .cr4)); + if (new_cr4 & cr4_reserved_bits(env)) { + cpu_vmexit(env, SVM_EXIT_ERR, 0, GETPC()); + } /* clear exit_info_2 so we behave like the real hardware */ x86_stq_phys(cs, env->vm_vmcb + offsetof(struct vmcb, control.exit_info_2), 0); =20 cpu_x86_update_cr0(env, new_cr0); - cpu_x86_update_cr4(env, x86_ldq_phys(cs, - env->vm_vmcb + offsetof(struct vmcb, - save.cr4))); + cpu_x86_update_cr4(env, new_cr4); cpu_x86_update_cr3(env, x86_ldq_phys(cs, env->vm_vmcb + offsetof(struct vmcb, save.cr3))); --=20 2.31.1 From nobody Fri May 10 17:03:04 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 1626968317977546.0277272449255; Thu, 22 Jul 2021 08:38:37 -0700 (PDT) Received: from localhost ([::1]:52064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6amS-0003Q2-W3 for importer@patchew.org; Thu, 22 Jul 2021 11:38:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35728) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6akL-0000e3-Ie for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:26 -0400 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]:39581) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6akH-0002ku-Id for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:25 -0400 Received: by mail-ed1-x533.google.com with SMTP id v1so7321045edt.6 for ; Thu, 22 Jul 2021 08:36:21 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id qo6sm9638628ejb.122.2021.07.22.08.36.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 08:36:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=x5PjpK8bbyx5zYtsFg2O3bVbBdfEVzuimKehuk+bGaA=; b=kAAHbWgNjGx//LCfd4y6Wg0MMQ7ZhDU7pmaUK9cziH0mMyqKOb8LVJUub1WfliAqwY V9NkU3Cflq4vRy1M+hpE1smhQw/FXnPy/t+laEaQgBUxJIaInDh0ZbCD0BnkfFUcJaNo hcQePamfzAhOzNmsoVQBbR76chV5tDZTuWECljulx4LfZC83Cs0fNfqQEr3vFEFj8/9b DaJF0CmHVEZSo7O1tqzNMV2btQOnQag0bsZobOH+FbEHygpDvFPEg39d7VKmx2LNWlRn eptoV2TUm5bz160Cp2pfebsv16psgmnb86M19/GswavtH7rMhdGZ9Httd9J8kp2Mhkyx IMrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=x5PjpK8bbyx5zYtsFg2O3bVbBdfEVzuimKehuk+bGaA=; b=Ulal1mq028UHOpQLyl7MyFXOLUv7ZYovDCPVBdCXo06MhsCwt0VZquNsFG+MYbzLOu 9ibx+GG3XyEr/QilflG8hgjTEG5gmikf15UU8bcm/9c9cgjE6wh5kh97CZ95Pp2xC0Qp EXVDHKxoKUo4YJk8uGcKX4uHYqm1PonHX8Zs7YJDWzX1GjivDD0hXLF5OaT4ZVvAVVvC ZjkTSZOT2n8XonZ0hLO1G9gpdmq+DkFhN5CfuksjhYMrsbzHsyd0cYYXWdtQ8lHEUHP7 PdxqIYotTO66OBTS8OCslmJ3LXd4S4XWHWqqzd92wGnvIcFpWIAMNY2NKiyEd1dnuWMx JX/A== X-Gm-Message-State: AOAM533+N8WayKs2KQHsOM8LJPDuL+n/hzgMlw99PwIEcYRrmBCg4i1m a5PgK2hPRCyf7tz8UEGz6EpBuAPzK8ZoQw== X-Google-Smtp-Source: ABdhPJyCNOF92czukjSCdwllKBvqaUggwcoWBTKoirtJRnIqtnWBaM0NkjlCCnmljz+9LoK1q611lA== X-Received: by 2002:aa7:cd03:: with SMTP id b3mr285579edw.112.1626968180275; Thu, 22 Jul 2021 08:36:20 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 09/15] target/i386: Added consistency checks for EFER Date: Thu, 22 Jul 2021 17:36:06 +0200 Message-Id: <20210722153612.955537-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210722153612.955537-1-pbonzini@redhat.com> References: <20210722153612.955537-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::533; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x533.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.249, 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: 1626968318389100005 Content-Type: text/plain; charset="utf-8" From: Lara Lazier EFER.SVME has to be set, and EFER reserved bits must be zero. In addition the combinations * EFER.LMA or EFER.LME is non-zero and the processor does not support LM * non-zero EFER.LME and CR0.PG and zero CR4.PAE * non-zero EFER.LME and CR0.PG and zero CR0.PE * non-zero EFER.LME, CR0.PG, CR4.PAE, CS.L and CS.D are all invalid. (AMD64 Architecture Programmer's Manual, V2, 15.5) Signed-off-by: Lara Lazier Message-Id: <20210721152651.14683-3-laramglazier@gmail.com> Signed-off-by: Paolo Bonzini --- target/i386/cpu.h | 5 ++++ target/i386/tcg/sysemu/svm_helper.c | 39 +++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 1f7e8d7f0a..6c50d3ab4f 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -475,6 +475,11 @@ typedef enum X86Seg { #define MSR_EFER_SVME (1 << 12) #define MSR_EFER_FFXSR (1 << 14) =20 +#define MSR_EFER_RESERVED\ + (~(target_ulong)(MSR_EFER_SCE | MSR_EFER_LME\ + | MSR_EFER_LMA | MSR_EFER_NXE | MSR_EFER_SVME\ + | MSR_EFER_FFXSR)) + #define MSR_STAR 0xc0000081 #define MSR_LSTAR 0xc0000082 #define MSR_CSTAR 0xc0000083 diff --git a/target/i386/tcg/sysemu/svm_helper.c b/target/i386/tcg/sysemu/s= vm_helper.c index d7d7a86aa9..4d64ec378e 100644 --- a/target/i386/tcg/sysemu/svm_helper.c +++ b/target/i386/tcg/sysemu/svm_helper.c @@ -75,6 +75,41 @@ static inline bool ctl_has_irq(uint32_t int_ctl) return (int_ctl & V_IRQ_MASK) && (int_prio >=3D tpr); } =20 +static inline bool is_efer_invalid_state (CPUX86State *env) +{ + if (!(env->efer & MSR_EFER_SVME)) { + return true; + } + + if (env->efer & MSR_EFER_RESERVED) { + return true; + } + + if ((env->efer & (MSR_EFER_LMA | MSR_EFER_LME)) && + !(env->features[FEAT_8000_0001_EDX] & CPUID_EXT2_LM)) { + return true; + } + + if ((env->efer & MSR_EFER_LME) && (env->cr[0] & CR0_PG_MASK) + && !(env->cr[4] & CR4_PAE_MASK)) { + return true; + } + + if ((env->efer & MSR_EFER_LME) && (env->cr[0] & CR0_PG_MASK) + && !(env->cr[0] & CR0_PE_MASK)) { + return true; + } + + if ((env->efer & MSR_EFER_LME) && (env->cr[0] & CR0_PG_MASK) + && (env->cr[4] & CR4_PAE_MASK) + && (env->segs[R_CS].flags & DESC_L_MASK) + && (env->segs[R_CS].flags & DESC_B_MASK)) { + return true; + } + + return false; +} + void helper_vmrun(CPUX86State *env, int aflag, int next_eip_addend) { CPUState *cs =3D env_cpu(env); @@ -291,6 +326,10 @@ void helper_vmrun(CPUX86State *env, int aflag, int nex= t_eip_addend) } #endif =20 + if (is_efer_invalid_state(env)) { + cpu_vmexit(env, SVM_EXIT_ERR, 0, GETPC()); + } + switch (x86_ldub_phys(cs, env->vm_vmcb + offsetof(struct vmcb, control.tlb_ctl= ))) { case TLB_CONTROL_DO_NOTHING: --=20 2.31.1 From nobody Fri May 10 17:03:04 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 1626968453316808.8214015755584; Thu, 22 Jul 2021 08:40:53 -0700 (PDT) Received: from localhost ([::1]:60608 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6aoe-0001Ef-Cf for importer@patchew.org; Thu, 22 Jul 2021 11:40:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35730) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6akL-0000e4-J0 for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:26 -0400 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]:38786) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6akI-0002lB-Dr for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:25 -0400 Received: by mail-ed1-x52e.google.com with SMTP id ee25so7314401edb.5 for ; Thu, 22 Jul 2021 08:36:21 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id qo6sm9638628ejb.122.2021.07.22.08.36.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 08:36:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rMzNUuNwWAM/TkiUDfnvx8sYrs7OMMGNvX1n8FypylU=; b=Q17pLBngmslcb/o2stvevIGeWB3WWcHCiG8X4YqWKOwk5IOCRd6p1pjrNlMM9v1awu 3cn88n+i2KVR22IGNRq0zmjWGaAkXgy4cXtWp0BmMgias/CeD1Dfiqfj52g5KoLDkue+ tGfUhIcm8nJfCebKyJtsSydahFPbQRAM1JvqMG534dCojAdHyV9RjzuDWD/0zX2RDJlR 8HtDgQt6rC9DiJzkp+5CCRBxlCKTFzBSgeCUl0bo+Pko6jcGCVEHm8zTTEhSiyXut67P xhYideM1hRkyaZxLvDlrfO7T70697K2dVgNbdiDSaDsFMW8fNvg8G1aSNzlVJ/bB1Jt5 hTrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=rMzNUuNwWAM/TkiUDfnvx8sYrs7OMMGNvX1n8FypylU=; b=GdHuJeY32SfUXeikD8O7HPVkrLnYWluElVNufK+dpXli1olqJPmN5wu2QHA8Zr52Eh Ri0Hhfrl4RGOGX7SlDalh38Fi0d3mPIw9o24UzRbfi+EMDTmkLfuZVvlV28AdgToGluq auIOIUcDocyW2/vulNvWO5m9ViIG1wPnW+eoGzvKWxblkiNqWQd8+sXGSFRIeVZde22v O5qbfSdt55bOaM7ebu8DgCvjniWfFrb+NBa8a5DU3KqmfvprT5lSHXDP7A7co8USMP0+ mUPfVHxQg0pt3Oe+SEp7zdH9J3mxRUX7Pn2ZkCh5g4pM5d6TBl0gUus9JN4ZFyXgF4Nj 3FLg== X-Gm-Message-State: AOAM531/FOn6orxMlJBHs/J3zVdigkr0oiFEq5IRnCzwSJklBiNSMvIB VidDLSa6glG7KGtxBrGxIphdK2OCXEhIYA== X-Google-Smtp-Source: ABdhPJxYkwmr4mZl2ZV933It6b4OvpaWeisgDcYPR74q3MxQHSbk7ibT26RjwZAchsoZpjDQgBKejQ== X-Received: by 2002:a05:6402:711:: with SMTP id w17mr223341edx.233.1626968180996; Thu, 22 Jul 2021 08:36:20 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 10/15] configure: Drop obsolete check for the alloc_size attribute Date: Thu, 22 Jul 2021 17:36:07 +0200 Message-Id: <20210722153612.955537-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210722153612.955537-1-pbonzini@redhat.com> References: <20210722153612.955537-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::52e; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52e.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.249, 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: Thomas Huth 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: 1626968455079100001 Content-Type: text/plain; charset="utf-8" From: Thomas Huth We recently bumped our requirement for Clang to at least version 6.0. And according to: https://releases.llvm.org/6.0.0/tools/clang/docs/AttributeReference.html Clang v6.0 supports the alloc_size attribute. Thus we can drop this check in the configure script now. Signed-off-by: Thomas Huth Message-Id: <20210714072855.785566-1-thuth@redhat.com> Signed-off-by: Paolo Bonzini --- configure | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/configure b/configure index 63f38fa94c..026704f15a 100755 --- a/configure +++ b/configure @@ -3266,18 +3266,6 @@ if ! compile_prog "$glib_cflags" "$glib_libs" ; then "build target" fi =20 -# Silence clang 3.5.0 warnings about glib attribute __alloc_size__ usage -cat > $TMPC << EOF -#include -int main(void) { return 0; } -EOF -if ! compile_prog "$glib_cflags -Werror" "$glib_libs" ; then - if cc_has_warning_flag "-Wno-unknown-attributes"; then - glib_cflags=3D"-Wno-unknown-attributes $glib_cflags" - CONFIGURE_CFLAGS=3D"-Wno-unknown-attributes $CONFIGURE_CFLAGS" - fi -fi - # Silence clang warnings triggered by glib < 2.57.2 cat > $TMPC << EOF #include --=20 2.31.1 From nobody Fri May 10 17:03:04 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 1626968791533212.86805021819453; Thu, 22 Jul 2021 08:46:31 -0700 (PDT) Received: from localhost ([::1]:54146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6au6-0007QQ-98 for importer@patchew.org; Thu, 22 Jul 2021 11:46:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35724) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6akL-0000e2-IZ for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:26 -0400 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]:33358) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6akJ-0002lc-5b for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:25 -0400 Received: by mail-ed1-x52d.google.com with SMTP id dj21so7359307edb.0 for ; Thu, 22 Jul 2021 08:36:22 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id qo6sm9638628ejb.122.2021.07.22.08.36.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 08:36:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=icIrCY10oRJsa1u+U1hGlXQsA/dthD4WgJ12w3rkyTQ=; b=uLb2fL2uPFVDdl/+awOT56PFy9g8OOE82sMf0HLoidG4cxW5ZhyuntvXA//oGzbpd0 Kyf2SrDa6bWV/Wpe6MAvv1uKtbScLnbBB1ATcsDe/bxo2v6fZHAOM0dmwlIHjWFTVUZ2 97i/xQd+jpMF61B1OXp91L5TMbkA38Qwk1fJtOCEMZHvHAW3/hr5BAS4qYdHLcnb7Ewa Z8VnjucFsNTM84EuryFz2gkWDIHHNj16tVBw1JuM7lsTrV2miBeaIe0zz51I93rQN2Lu DUAJAENO+zbBx400VEmE1z8cQiBt/FoczH2Pv7IwHcMV0IdhvF9SlR8lacOwot0O9cXA vzMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=icIrCY10oRJsa1u+U1hGlXQsA/dthD4WgJ12w3rkyTQ=; b=VqoaeTax2/JFU/U8bQqqYUds8oftr8ty1GrjJDXrq8Wcd7ozkfKACgvgA+4Hf1tsCp rQBqiHeox3fjyG0nPsKYMgybWf3wfDy70YVXwZUK8NjhzwMIyhDTLNyVPYhhUxWHZZ7Y PBX1pHXCssKN9rMMwOMQXX+1HGAKYCtdJpQxlLnbWB5ynczu5+a/OlsoiBawM5qexZlb 3AvLQvUQRTV1EEuzmIj1Q2bz1RTfoQCISRxhF4O8Icx+/w8Oq7KnwCjvX+9iU/j06h4c KI1JRi2o8xS0uls51dvSdYVgEFa+22YmtPyV3TOYt7BXt1zXLdwDmh8JP9kah9U4IMZ6 kmVQ== X-Gm-Message-State: AOAM530rG19pCnLHmxmPw//jm7oPcwwAvY4oWtf3XJdTtVzEyGxY8q3M h2BddVGCfE3pNy5zc78/jvnS6R94N12IxQ== X-Google-Smtp-Source: ABdhPJwysIbkSd5yC6TT03UrYjEM9v9imjZKvWXwRSP/e+LtZ6c3Sd87cq9RTgctcG4NDQcCI6hqaw== X-Received: by 2002:a05:6402:30af:: with SMTP id df15mr254566edb.19.1626968181601; Thu, 22 Jul 2021 08:36:21 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 11/15] meson: fix dependencies for modinfo Date: Thu, 22 Jul 2021 17:36:08 +0200 Message-Id: <20210722153612.955537-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210722153612.955537-1-pbonzini@redhat.com> References: <20210722153612.955537-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::52d; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52d.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.249, 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: 1626968793606100001 Content-Type: text/plain; charset="utf-8" modinfo runs the preprocessor and therefore needs all generated input files to be there. The "depends" clause does not work in Meson 0.55.3, so for now use "input". Signed-off-by: Paolo Bonzini --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 6e4d2d8034..eb85fe8e44 100644 --- a/meson.build +++ b/meson.build @@ -2335,9 +2335,9 @@ foreach d, list : modules # https://github.com/mesonbuild/meson/pull/8900 modinfo_files +=3D custom_target(d + '-' + m + '.modinfo', output: d + '-' + m + '.modinfo', - input: module_ss.sources(), + input: module_ss.sources() + genh, capture: true, - command: [modinfo_collect, '@INPUT@= ']) + command: [modinfo_collect, module_s= s.sources()]) endif else if d =3D=3D 'block' --=20 2.31.1 From nobody Fri May 10 17:03:04 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 1626968557369740.8161509634655; Thu, 22 Jul 2021 08:42:37 -0700 (PDT) Received: from localhost ([::1]:40950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6aqK-0006vH-9j for importer@patchew.org; Thu, 22 Jul 2021 11:42:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6akN-0000g6-OR for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:28 -0400 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]:43875) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6akJ-0002m9-NG for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:26 -0400 Received: by mail-ej1-x62c.google.com with SMTP id qa36so8970267ejc.10 for ; Thu, 22 Jul 2021 08:36:23 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id qo6sm9638628ejb.122.2021.07.22.08.36.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 08:36:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Mdtr8XFQwFP7ENj776O5QnFQUyoHYwPVbVP0E5RC+v4=; b=Hl/o7U56vixTaa03CFQq9rO2Z5Oe/nuONTr+MwXCvvJzzE4THUvJ5gUnaavd/upxAn LGHw0zop/pvW4nTJ3RsPmrCPnZFOKlLTJxWaFw/RqeXDc3eqJXvUwJE7TAfb4KsHEr1J v5KPSVkWIvAh19y1zHcKw7zFijqF1SUbEF9Hu2lOibbXCMJD5UixgDtIJt4PBGEYOPA0 mz3fZ46JllT2VAcfbfBFoZx+9/++emjzvO6x3KSkaVMrjgpQ4ldc6bMwiFV3O5GF8Spw afalG9w6Ecswfem3J5fh/7tPI644Z4c2yuR6LuXqV3zrFx4M8n0rcqdl0XQG3GgdRhTX iWXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Mdtr8XFQwFP7ENj776O5QnFQUyoHYwPVbVP0E5RC+v4=; b=Q1wQ8BSUf/CC9Vbs+VBVbBE6N0SKXyvblcoXQrBbU3boW3aK42kLBc3NiT/wiWmXFB c82FVvfUkH5BuP1cjjVhp9WyIETMB10IUWFZWrOv2NgLXRFcE5eCh718W8408d+SX9mj BntZ6mvoULN9faVthScTajLCzZ36FOB82F0uTSgu2rLH36ilpqt38kEkqN7FG/x5uxgV 4yh0hkMS+JtjhcpTlzheRZvCOzPw5KqeaF01ZPRkJ/GlPE5SPQ1hXe2bua2GEro85Hx6 u+LD7KMHXwvOvKfzSDlDlIfZgdP5xvU4I+FPiuHV02pLdL9eFEGAKIP3hyf8uFprelMd 8VXA== X-Gm-Message-State: AOAM5308HzruiwsBp9Iu9p8bv7NrqCgy92PYk6f3O7LmOAiSJ1UzGZ9N gua0H9Ugr2ACb8IjMkoWv+RFupMmFlU/ug== X-Google-Smtp-Source: ABdhPJxywVYxuqrMcrWja00bOeYz0gWBWxy4v1f0UMEDk0ST8tccoNPE4rqoWFqn7PvJnKZ2Ov8bXw== X-Received: by 2002:a17:906:a18b:: with SMTP id s11mr510429ejy.8.1626968182299; Thu, 22 Jul 2021 08:36:22 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 12/15] configure: Fix --without-default-features propagation to meson Date: Thu, 22 Jul 2021 17:36:09 +0200 Message-Id: <20210722153612.955537-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210722153612.955537-1-pbonzini@redhat.com> References: <20210722153612.955537-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::62c; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62c.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.249, 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: Thomas Huth , Cole Robinson 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: 1626968558879100001 Content-Type: text/plain; charset="utf-8" From: Thomas Huth A typo prevents that many features get disabled when the user runs "configure" with the --without-default-features switch. Reported-by: Cole Robinson Signed-off-by: Thomas Huth Message-Id: <20210713093155.677589-2-thuth@redhat.com> Signed-off-by: Paolo Bonzini --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 026704f15a..19c4bc1192 100755 --- a/configure +++ b/configure @@ -5206,7 +5206,7 @@ if test "$skip_meson" =3D no; then -Ddocs=3D$docs -Dsphinx_build=3D$sphinx_build -Dinstall_blobs=3D$b= lobs \ -Dvhost_user_blk_server=3D$vhost_user_blk_server -Dmultiprocess=3D= $multiprocess \ -Dfuse=3D$fuse -Dfuse_lseek=3D$fuse_lseek -Dguest_agent_msi=3D$gue= st_agent_msi -Dbpf=3D$bpf\ - $(if test "$default_features" =3D no; then echo "-Dauto_features= =3Ddisabled"; fi) \ + $(if test "$default_feature" =3D no; then echo "-Dauto_features=3D= disabled"; fi) \ -Dtcg_interpreter=3D$tcg_interpreter \ $cross_arg \ "$PWD" "$source_path" --=20 2.31.1 From nobody Fri May 10 17:03:04 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 1626968653725204.70239242843695; Thu, 22 Jul 2021 08:44:13 -0700 (PDT) Received: from localhost ([::1]:47500 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6ars-0002q9-Mi for importer@patchew.org; Thu, 22 Jul 2021 11:44:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6akN-0000g8-Q7 for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:28 -0400 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]:33361) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6akK-0002mI-8u for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:26 -0400 Received: by mail-ed1-x530.google.com with SMTP id dj21so7359404edb.0 for ; Thu, 22 Jul 2021 08:36:23 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id qo6sm9638628ejb.122.2021.07.22.08.36.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 08:36:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pxsn2XHOgcR9z+0i+A4IJbWQ2gbXQ+Upy2E7J0F0AL8=; b=PgxeTG7wdmQ8mCcMYVGlJhoi0geWBcjhWRMF4fRf8pFG15TfEQzjka7PvD5jt3nUX1 QdIDm+idgpZ82MnGMYoHic715QMWEgrxJo4G1pLisVl4ehFE6JKOxmb1p0D/TXo83A3G aKrfdZ8oCaYgw+ivDa+UZzxCnfDkyCNNEpHlVI0nV0cW2Gez8tRSnF/pipKG4TzGNR8w q7iCkyo5QNEtZ6Uuymsjqkwo/khGfMVlOfLQsJCq/c26ZhPbqM7Aj30TnwnrxW5KNuIN MpmYjl4oWVX6+wBTY8QRPA0VGjL8Q1k6vk1DU8JXuxVQYHDWr2kfhf759G7IRdVIimJc WWew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=pxsn2XHOgcR9z+0i+A4IJbWQ2gbXQ+Upy2E7J0F0AL8=; b=RlIDqfpcfWRTQYamMu5LR6OjsnrFRvWuiI+cKwcV/tAD/zkff+/Nujtj2zHZGEM/5l Z6KWBpQ/i3xwumeqpwAHzew/uqb+C0YkPlXUi7plHbi+2gA1p2g8XP03hhbNGnRaDBWe 6R0VfuaSuj4vVBhfpl8tMXlZ3BGDJT7c4LtiW+ofnWjVUr07njHhnNQ1IVOdhh4JtVfB 2yDkIo+uN7ItAzvg3IVRdqF/xQRr0X7DFbh4zU/Zz5AGQhe8a8cfAwAmnXeVrq5ailmk tEoOCbmP4wWAoMHgkAY/Fwp4wGnIRppdef3o73BDC0HtlxyR+sOj/hfXRXM9l4Kqc4Zo F1dQ== X-Gm-Message-State: AOAM532INiyC+IF8TGx33dTYQc7JEJ44cGcED3ltEkty76sHsYwiTKZJ ROSnKyRgyZfejC2y9lFQ6d2q/PVxkK6hGQ== X-Google-Smtp-Source: ABdhPJyoe4cA2cAZ+3fm80oHgjWr4l59KZD0+i1AhlBOYQXSX8LpGemk/mB5W6Wuu1oFNzZcHx9mLA== X-Received: by 2002:a50:fe97:: with SMTP id d23mr231235edt.169.1626968182966; Thu, 22 Jul 2021 08:36:22 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 13/15] configure: Allow vnc to get disabled with --without-default-features Date: Thu, 22 Jul 2021 17:36:10 +0200 Message-Id: <20210722153612.955537-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210722153612.955537-1-pbonzini@redhat.com> References: <20210722153612.955537-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::530; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x530.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.249, 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: Thomas Huth , Cole Robinson 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: 1626968654183100001 Content-Type: text/plain; charset="utf-8" From: Thomas Huth There's no reason why we should keep VNC enabled when the user specified --without-default-features. Reported-by: Cole Robinson Signed-off-by: Thomas Huth Message-Id: <20210713093155.677589-3-thuth@redhat.com> Signed-off-by: Paolo Bonzini --- configure | 2 +- meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 19c4bc1192..468aac58e2 100755 --- a/configure +++ b/configure @@ -304,7 +304,7 @@ virtiofsd=3D"auto" virtfs=3D"auto" libudev=3D"auto" mpath=3D"auto" -vnc=3D"enabled" +vnc=3D"auto" sparse=3D"auto" vde=3D"$default_feature" vnc_sasl=3D"auto" diff --git a/meson.build b/meson.build index eb85fe8e44..cb3856fc35 100644 --- a/meson.build +++ b/meson.build @@ -930,7 +930,7 @@ vnc =3D not_found png =3D not_found jpeg =3D not_found sasl =3D not_found -if get_option('vnc').enabled() +if 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 Fri May 10 17:03:04 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 1626968554799110.21872160814291; Thu, 22 Jul 2021 08:42:34 -0700 (PDT) Received: from localhost ([::1]:40690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6aqH-0006l6-NG for importer@patchew.org; Thu, 22 Jul 2021 11:42:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6akN-0000g7-Q3 for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:28 -0400 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]:45876) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6akL-0002nj-0d for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:26 -0400 Received: by mail-ej1-x635.google.com with SMTP id dt7so8958885ejc.12 for ; Thu, 22 Jul 2021 08:36:24 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id qo6sm9638628ejb.122.2021.07.22.08.36.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 08:36:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=r16ePz42dOqHAxVE1WpwwDfKzU3eDPUzvyNj7r1Wfl4=; b=F9WFU8VCYSmIGqLQLDoHRX5e+0NHf2U+S9Bih3ATseOndy/rGFggovc93xDkJl/kVN RV/5+DAhtoe20ccSQogk/BewXsTMwbJKgbVOY5gEe5RRsNhdX2/MN2cWkQwmiZLWK9kZ R59EyRgGLTEqzChisqONaTFBnzd/jnds5ESX/BelMFt2LpKxflYthuwdDkFTqf35uiC1 vbKax63y8CLFytVmwqu7B29VT+LOxZxWsB9RWmK8Nd8XttD7KY7yqMrT9jt8+pctuezK FjHMz5hweg/v8x+cSTcAZZATH+VcU3kyBkhYAHapW9ZhzOhHgXIbOaWI7bgLVVxYrLhC wWuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=r16ePz42dOqHAxVE1WpwwDfKzU3eDPUzvyNj7r1Wfl4=; b=UTZiRrnJLD7Y3MI5p/bO+8dkhltHGx6mZRDymiqay5F88bpGgHhwWXYwN0CHVxFASM TA1XSXRF2LGB0H06Gekrq0LD3jEdohs68seJNQiXFLvH/Vaxo4I6UfJ9o3wpGDH3B0rw 7ym8RYRXv9EoaeyUIrcj/fhDcnZrl1d82rjPscTtUQ1K1FIxMjmZkPq0Y/M29FYN3BOf WP+8Y9gcOUICxV1L55shxHN7+knetMcW30/xyLDoiqTUSuRvK259Kcc5+9SUHNXSp+Ee ENvT3sIExGZgppLTT53R4xoS2YgKAmoy4ezbcY4XCxbE5Jt51lS6NnDpdp4xRdkSs/n4 /MYw== X-Gm-Message-State: AOAM532cltunQdLbhOU66AxSubxi72QSswwKazNQNSmYakjLKNUMfQD9 uKZSFGodN6ctgoe6tWw3uFHclJyZckv/Rg== X-Google-Smtp-Source: ABdhPJx7sZoj/1EWo0x2RpTXVYnpALhFGG1MT2Gps1mak5vSJLDZGu0g11Iec8/h3zXHo5lbBoBItw== X-Received: by 2002:a17:906:9fc1:: with SMTP id hj1mr452851ejc.103.1626968183687; Thu, 22 Jul 2021 08:36:23 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 14/15] configure: Fix the default setting of the "xen" feature Date: Thu, 22 Jul 2021 17:36:11 +0200 Message-Id: <20210722153612.955537-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210722153612.955537-1-pbonzini@redhat.com> References: <20210722153612.955537-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::635; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x635.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.249, 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: Thomas Huth , Cole Robinson 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: 1626968556586100001 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The "xen" variable should either contain "enabled", "disabled" or nothing (for auto detection). But when the user currently runs the configure script with --without-default-features, it gets set to "no" instead. This does not work as expected, the feature will still be enabled if the Xen headers are present. Thus set the variable to "disabled" instead if default_feature switch has been set. Reported-by: Cole Robinson Signed-off-by: Thomas Huth Message-Id: <20210713093155.677589-4-thuth@redhat.com> Signed-off-by: Paolo Bonzini --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 468aac58e2..40fa8cc26e 100755 --- a/configure +++ b/configure @@ -311,7 +311,7 @@ vnc_sasl=3D"auto" vnc_jpeg=3D"auto" vnc_png=3D"auto" xkbcommon=3D"auto" -xen=3D"$default_feature" +xen=3D${default_feature:+disabled} xen_ctrl_version=3D"$default_feature" xen_pci_passthrough=3D"auto" linux_aio=3D"$default_feature" --=20 2.31.1 From nobody Fri May 10 17:03:04 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 1626968927233708.3151427748255; Thu, 22 Jul 2021 08:48:47 -0700 (PDT) Received: from localhost ([::1]:60116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6awI-0002y9-9B for importer@patchew.org; Thu, 22 Jul 2021 11:48:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6akT-0000lP-Ql for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:34 -0400 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]:40805) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6akL-0002oI-NZ for qemu-devel@nongnu.org; Thu, 22 Jul 2021 11:36:31 -0400 Received: by mail-ed1-x531.google.com with SMTP id t3so7317353edc.7 for ; Thu, 22 Jul 2021 08:36:25 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id qo6sm9638628ejb.122.2021.07.22.08.36.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 08:36:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=w20at22fJRmOLaH2w4vov7p+ss5meuUwIflTMQ0+qWo=; b=chNXNIkZZ25SGVsg8+q2yC8N7gPsACc7zu0Skp1cjovgPWTexWGD+sGpHTz9d3qtt7 aVw9uXUWuDT3kH89bV6cVI9kol3UR3ojKGjSPoXe9u3+5U+vtRNlAwMIu5Ag/qHFWaFm COGBHApgkcF0cq8fOHh76iIG9EKlajSMbH6eQFSsqlHzbqeF/YH4yXu3aabgdKVMFb9r eNRyvZSx/76l3XgVIe9FNO3/M0vKdGvhJUKnULVqndaVGa5h+cu/xy/5L+iiSbb9ujTB irfCZWmdh+uz9ih+msRqNSh7H/r42i0v4P99pBNXQWkGci1Q+osch7nO5b4e9HvPkeTs UNjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=w20at22fJRmOLaH2w4vov7p+ss5meuUwIflTMQ0+qWo=; b=cW4KxYj4ZWizI5XRY+3sZcRA/qijUmxYYarMOkiHaXAKayTAgnIbci06ymHIvXZCpY AG7WFSwK3W9tENtteyAKWL3uZ0Y2xjeQ6oTil+6O1jAzLPoEkWmGnoXdyj+ugx642Jh/ seW+4z21wa0li1n+FNsxBAj177XyJDM85rwo08Hq9p1Tr/nSwrQXMbahLv38CTys8xyb gRysf56J1r6zf2JuW4EzAedWgWCTDm/H7vgHz+PuWszT27DOWSbgNn+42HyCFF65gF6Y Gbkah4M/SvKjExlBTgrZre5naP4ifwJ//R9QTnUqx+Ue3IAn9FyCVce8KOVR6Tq/6hU2 l8iA== X-Gm-Message-State: AOAM5314bsj4s+PUZsqYtVyCDgNPsvTcPISBreu1bNagPNqsWgfX4Xpj uyb0OoXOxx3YxabiW5WxhYU5juoCgBB8Bw== X-Google-Smtp-Source: ABdhPJzdf/LdVMvtHrv5bTDBnqZSVuuMVG5QG3o7utp1ClrZ5jhCr3xy0tE5yuHfDkvX6B4LLtRLqw== X-Received: by 2002:aa7:c1cc:: with SMTP id d12mr267275edp.282.1626968184370; Thu, 22 Jul 2021 08:36:24 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 15/15] configure: Let --without-default-features disable vhost-kernel and vhost-vdpa Date: Thu, 22 Jul 2021 17:36:12 +0200 Message-Id: <20210722153612.955537-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210722153612.955537-1-pbonzini@redhat.com> References: <20210722153612.955537-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::531; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x531.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.249, 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: Thomas Huth , Cole Robinson 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: 1626968929368100001 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The vhost_kernel and vhost_vdpa variables should be pre-initialized with the $default_feature setting so that these features get disabled when the user runs the configure scripts with --without-default-features. Reported-by: Cole Robinson Signed-off-by: Thomas Huth Message-Id: <20210713093155.677589-5-thuth@redhat.com> Signed-off-by: Paolo Bonzini --- configure | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure b/configure index 40fa8cc26e..2a6d23a844 100755 --- a/configure +++ b/configure @@ -321,6 +321,7 @@ attr=3D"auto" xfs=3D"$default_feature" tcg=3D"enabled" membarrier=3D"$default_feature" +vhost_kernel=3D"$default_feature" vhost_net=3D"$default_feature" vhost_crypto=3D"$default_feature" vhost_scsi=3D"$default_feature" @@ -328,6 +329,7 @@ vhost_vsock=3D"$default_feature" vhost_user=3D"no" vhost_user_blk_server=3D"auto" vhost_user_fs=3D"$default_feature" +vhost_vdpa=3D"$default_feature" bpf=3D"auto" kvm=3D"auto" hax=3D"auto" --=20 2.31.1