From nobody Fri May 3 06:38:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605694882; cv=none; d=zohomail.com; s=zohoarc; b=TFa7I1XOvYYU2ERymYdGV2COzUCi2ojy/EUvxWSrTWTxj3iokbWoL5ZMKDJhZl9KgUiL6RW5OUeSY+umSVyXXXTzKBF7hqY0hWvxwiT4lS4njVRbB4so+k9KZ3LGQ7xDTiD5nSxmlJ7mqo1IMsD1CwOTLDmusx2YakVLD4bLZcU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605694882; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Rt8mfICct6gKWy31+Pw2EA3hmZuykXLEsL1HlckGHDA=; b=esCNtCacnM/lmzluOCjATHtoi8844d7zkK+7C8MpL/R+zlZ2SiingmDvjGUkz9CodT/06XKX6AsEMdjWvPA9y7uo7ggoHNhqZt3r4zI3gOz0b8afwIY7mkgRGXoid3SbCHlo1kKz75Vcn4Od4JdOeuvm6zr/XPBmTvsImKDwxbU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605694882768845.7229136217094; Wed, 18 Nov 2020 02:21:22 -0800 (PST) Received: from localhost ([::1]:57038 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfKaX-0001lO-KF for importer@patchew.org; Wed, 18 Nov 2020 05:21:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50402) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfKZ1-0008Tg-Cu for qemu-devel@nongnu.org; Wed, 18 Nov 2020 05:19:47 -0500 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]:35614) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kfKYz-0003ed-OB for qemu-devel@nongnu.org; Wed, 18 Nov 2020 05:19:47 -0500 Received: by mail-ed1-x52a.google.com with SMTP id ay21so1412139edb.2 for ; Wed, 18 Nov 2020 02:19:45 -0800 (PST) Received: from localhost.localdomain ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id f24sm13230052edx.90.2020.11.18.02.19.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 02:19:43 -0800 (PST) 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=Rt8mfICct6gKWy31+Pw2EA3hmZuykXLEsL1HlckGHDA=; b=lSGOZWRFgXIhMfjBxwD/HN2dhN3eb4HO/DOBgGXjlCb1Q1LyREhvsMFuNLh/tF6hE1 lWLJrc5XmZF0YFcKSdI/YTOSSHgA7qWyNRhkD55EkDGjjTLh8TpK0fe0MfexG03XV483 UaxXThcDPmp47cLn6t4stpbcVI/SJXOiW6pmOCVX8HjaBhY4xYnMLIt5TqCGKX3s/NJa tnkuZJ4HuNn107Zn3V77TuJya7he81E7fmdYbCoYGz9fB12LzSbNbEJSTEcQ+4vUXNmF 56/EOdnuauQhCp/YNyT6RV4tO5KKW82RC5bzxid8zO0VyaVtSoeyCijun7HNTK25zh75 sHsQ== 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=Rt8mfICct6gKWy31+Pw2EA3hmZuykXLEsL1HlckGHDA=; b=GseGSmWyJWElUkVI6w47NgyvHEXJmmqrDMheP1qDlklk0fdiyVfOH+jj9knEvbq6pq XwQlRVBmQh3AA9j9aPehtXjDbpDNzZUUmJsqmBJUuM8JV5rmBMWMNbRu+lAKC0S+rD0e Utz+DyzFz99SVQSvvnDD84whGPWCOtvfp+qVSF8hpGP8E+H3zy+ecR5ZQZmAq6FqMYDS b+WgHQRjGyDr5l0znuWu0Yck7xNML8HhLayK7AtJ5P4oRW1fasOAj7820W3FCTpfGHSp pUla+X/UxeJlUXql5mdsQ3rJybL5R7Lphzrzmn7BphELTIf0ffOfvnbQohLhbF0YMHnW +bRA== X-Gm-Message-State: AOAM531NAk6x4ggYHmdVJoRZA/arNylFvB4T03kiaYJV39CnsST5t1AE RxAq82Uku05UC88vZigPqNuz2lmXJzk= X-Google-Smtp-Source: ABdhPJxTiU1IeD4p6qnlZkWoNLhJX22rdkxNt3lHmkhruvJWlNIeUFbu5sMWd9Fy5VEjv8xfbRXYAQ== X-Received: by 2002:aa7:d298:: with SMTP id w24mr239431edq.82.1605694784072; Wed, 18 Nov 2020 02:19:44 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 1/7] meson: Fix argument for makensis (build regression) Date: Wed, 18 Nov 2020 11:19:34 +0100 Message-Id: <20201118101940.132594-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201118101940.132594-1-pbonzini@redhat.com> References: <20201118101940.132594-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::52a; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52a.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: Stefan Weil , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Stefan Weil `make installer` with a DLL directory was broken. Signed-off-by: Stefan Weil Message-Id: <20201117190640.390359-1-sw@weilnetz.de> Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- scripts/nsis.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/nsis.py b/scripts/nsis.py index e1c409344e..5135a05831 100644 --- a/scripts/nsis.py +++ b/scripts/nsis.py @@ -65,7 +65,7 @@ def main(): dlldir =3D "w64" makensis +=3D ["-DW64"] if os.path.exists(os.path.join(args.srcdir, "dll")): - makensis +=3D "-DDLLDIR=3D{0}/dll/{1}".format(args.srcdir, dll= dir) + makensis +=3D ["-DDLLDIR=3D{0}/dll/{1}".format(args.srcdir, dl= ldir)] =20 makensis +=3D ["-DOUTFILE=3D" + args.outfile] + args.nsisargs subprocess.run(makensis) --=20 2.28.0 From nobody Fri May 3 06:38:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605695026; cv=none; d=zohomail.com; s=zohoarc; b=NeUJyX+YWy8tqxCpg8wvWiQSuZRBwBTo/Y35dMOJV234OXAvSwuZrNUEh7aWljf13nQJmpT7bEDxP5wyyTYpBM9CX/yBNpy8j7BprBlPr4grhbqxlJy6c4NYUgtD+VUjgLxgvlFVK2uRG3vXiQZpF+vQ4fSNWL6zkkeuO9PNqqE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605695026; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OQyuD1TAfpwTnEM4g2uQyeb7uUybRaaaBt1SZkktnpg=; b=cBmQVTuLde+12NaDyAv12ET8hSfm19EEkhIc4Lbmv5q8YCHtdwT+iCJieLXCXU2TgsnlaJlC3Cr5a6HD2G0MxPOuChPiwLZcE/7+/WkpnvNNzMg+bsUQbYmOgiJo1Q11cLFXH3jUGn952sG9lWXnjTWMDb25A9daMbLhSCGKaKI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605695026698998.9896458607084; Wed, 18 Nov 2020 02:23:46 -0800 (PST) Received: from localhost ([::1]:36960 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfKcr-0005An-F6 for importer@patchew.org; Wed, 18 Nov 2020 05:23:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50436) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfKZ2-0008VB-T0 for qemu-devel@nongnu.org; Wed, 18 Nov 2020 05:19:48 -0500 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]:41673) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kfKZ0-0003eo-Te for qemu-devel@nongnu.org; Wed, 18 Nov 2020 05:19:48 -0500 Received: by mail-ed1-x52c.google.com with SMTP id t9so1386715edq.8 for ; Wed, 18 Nov 2020 02:19:46 -0800 (PST) Received: from localhost.localdomain ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id f24sm13230052edx.90.2020.11.18.02.19.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 02:19:44 -0800 (PST) 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=OQyuD1TAfpwTnEM4g2uQyeb7uUybRaaaBt1SZkktnpg=; b=sV3XObuMEG0tLJA+MSVIJ+xEew+eoxs6MsfmNBYjAZ5Xb90AGVsbUt3mimJxah5zcT Q0exT/f36ZMWW3V+TSJVUFbONMzK6dk9buNq2rPmGTC9K+ZY4Y6IbpFAE3TG95yWEc8w 1d1HoQ60dEdaEelTMhIfKWorkp+emFjKREnKywKtzEGxXHOHCSoMzMoS5ae5Eytequ2f q/YRvYxZXyS3Q5ET7ODYPDOCKTNEKSHisgC+LgKQ3D5BZdpc8ft4qC+/+PiQFY7nQmC0 r4fBiEQbc7YlsMiYWEIzCXvfnSgSYIN2I0shx9Wpv4pONDif3Wp5cW51XqeLMvFz+SZC m5Lg== 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=OQyuD1TAfpwTnEM4g2uQyeb7uUybRaaaBt1SZkktnpg=; b=uK+s42hagaNfhb39A4Jqr9QDocHpBuh/BmTROXxhyaVzUxEiXdE7EI+aNtWMxPnCIH 8HwisV5SxDZELAjjTsZbsUomEOljOigst23VjjqYjrLhr94a36hBvNcu/kcurgEPMTR5 3pEuxLY6vfmNvLXmtyzH8QQmmyL8Nwjx9cYI20VK5ss+jIM7jzOr5Zw/LtByQM6qrrOi oWGFLPiNNU09mYxeiV2HhElpASgK6pPtbJQqXAw1TSuRdgxkeMiPZQdWPUU409A8bQ7+ gZltKJ42nGW9ziWUQJQJPdf7EXAAGcROZyggWORhT+O4N8g4cLNxkbD32udPGLTuj0dG baMg== X-Gm-Message-State: AOAM533YBQgkSzbHsYH8l3IYDeuAAKlDJwXKdW+d3swq/otTDBpgO9zI T5BkRLWqECe7N+dRHy3faQUa0Qm2cJ4= X-Google-Smtp-Source: ABdhPJxzveRzZJSwaaE4vx6wjtoi0OwbJDJ8bDUiy4q4q4R4i5KujOgDjZzlaBjKSPGBX5OpZpsG0g== X-Received: by 2002:aa7:ce82:: with SMTP id y2mr25558873edv.6.1605694785108; Wed, 18 Nov 2020 02:19:45 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 2/7] docs: Fix some typos (found by codespell) Date: Wed, 18 Nov 2020 11:19:35 +0100 Message-Id: <20201118101940.132594-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201118101940.132594-1-pbonzini@redhat.com> References: <20201118101940.132594-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::52c; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52c.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: Stefan Weil , "Michael S . Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Stefan Weil Fix also a similar typo in a code comment. Signed-off-by: Stefan Weil Message-Id: <20201117193448.393472-1-sw@weilnetz.de> Reviewed-by: Michael S. Tsirkin Signed-off-by: Paolo Bonzini --- docs/can.txt | 8 ++++---- docs/interop/vhost-user.rst | 2 +- docs/replay.txt | 2 +- docs/specs/ppc-spapr-numa.rst | 2 +- docs/system/deprecated.rst | 4 ++-- docs/tools/virtiofsd.rst | 2 +- hw/vfio/igd.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/can.txt b/docs/can.txt index 5838f6620c..0d310237df 100644 --- a/docs/can.txt +++ b/docs/can.txt @@ -19,7 +19,7 @@ interface to implement because such device can be easily = connected to systems with different CPU architectures (x86, PowerPC, Arm, etc.). =20 In 2020, CTU CAN FD controller model has been added as part -of the bachelor theses of Jan Charvat. This controller is complete +of the bachelor thesis of Jan Charvat. This controller is complete open-source/design/hardware solution. The core designer of the project is Ondrej Ille, the financial support has been provided by CTU, and more companies including Volkswagen subsidiaries. @@ -31,7 +31,7 @@ testing lead to goal change to provide environment which = provides complete emulated environment for testing and RTEMS GSoC slot has been donated to work on CAN hardware emulation on QEMU. =20 -Examples how to use CAN emulation for SJA1000 based borads +Examples how to use CAN emulation for SJA1000 based boards =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 When QEMU with CAN PCI support is compiled then one of the next @@ -106,8 +106,8 @@ This open-source core provides CAN FD support. CAN FD d= rames are delivered even to the host systems when SocketCAN interface is found CAN FD capable. =20 -The PCIe borad emulation is provided for now (the device identifier is -ctucan_pci). The defauld build defines two CTU CAN FD cores +The PCIe board emulation is provided for now (the device identifier is +ctucan_pci). The default build defines two CTU CAN FD cores on the board. =20 Example how to connect the canbus0-bus (virtual wire) to the host diff --git a/docs/interop/vhost-user.rst b/docs/interop/vhost-user.rst index 6d4025ba6a..d6085f7045 100644 --- a/docs/interop/vhost-user.rst +++ b/docs/interop/vhost-user.rst @@ -530,7 +530,7 @@ descriptor table (split virtqueue) or descriptor ring (= packed virtqueue). However, it can't work when we process descriptors out-of-order because some entries which store the information of inflight descriptors in available ring (split virtqueue) or descriptor -ring (packed virtqueue) might be overrided by new entries. To solve +ring (packed virtqueue) might be overridden by new entries. To solve this problem, slave need to allocate an extra buffer to store this information of inflight descriptors and share it with master for persistent. ``VHOST_USER_GET_INFLIGHT_FD`` and diff --git a/docs/replay.txt b/docs/replay.txt index 87a64ae068..5b008ca491 100644 --- a/docs/replay.txt +++ b/docs/replay.txt @@ -328,7 +328,7 @@ between the snapshots. Each of the passes include the f= ollowing steps: 1. loading the snapshot 2. replaying to examine the breakpoints 3. if breakpoint or watchpoint was met - - loading the snaphot again + - loading the snapshot again - replaying to the required breakpoint 4. else - proceeding to the p.1 with the earlier snapshot diff --git a/docs/specs/ppc-spapr-numa.rst b/docs/specs/ppc-spapr-numa.rst index 5fca2bdd8e..ffa687dc89 100644 --- a/docs/specs/ppc-spapr-numa.rst +++ b/docs/specs/ppc-spapr-numa.rst @@ -198,7 +198,7 @@ This is how it is being done: * user distance 121 and beyond will be interpreted as 160 * user distance 10 stays 10 =20 -The reasoning behind this aproximation is to avoid any round up to the loc= al +The reasoning behind this approximation is to avoid any round up to the lo= cal distance (10), keeping it exclusive to the 4th NUMA level (which is still exclusive to the node_id). All other ranges were chosen under the developer discretion of what would be (somewhat) sensible considering the user input. diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index bbaae0d97c..d98464098f 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -473,7 +473,7 @@ default configuration. =20 The CPU model runnability guarantee won't apply anymore to existing CPU models. Management software that needs runnability -guarantees must resolve the CPU model aliases using te +guarantees must resolve the CPU model aliases using the ``alias-of`` field returned by the ``query-cpu-definitions`` QMP command. =20 @@ -660,7 +660,7 @@ Splitting RAM by default between NUMA nodes had the sam= e issues as ``mem`` parameter with the difference that the role of the user plays QEMU using implicit generic or board specific splitting rule. Use ``memdev`` with *memory-backend-ram* backend or ``mem`` (if -it's supported by used machine type) to define mapping explictly instead. +it's supported by used machine type) to define mapping explicitly instead. Users of existing VMs, wishing to preserve the same RAM distribution, shou= ld configure it explicitly using ``-numa node,memdev`` options. Current RAM distribution can be retrieved using HMP command ``info numa`` and if separ= ate diff --git a/docs/tools/virtiofsd.rst b/docs/tools/virtiofsd.rst index 34a9e40146..866b7db3ee 100644 --- a/docs/tools/virtiofsd.rst +++ b/docs/tools/virtiofsd.rst @@ -174,7 +174,7 @@ Using ':' as the separator a rule is of the form: - 'bad' - If a client tries to use a name matching 'key' it's denied using EPERM; when the server passes an attribute name matching 'prepend' it's hidden. In many ways it's use is very like - 'ok' as either an explict terminator or for special handling of certain + 'ok' as either an explicit terminator or for special handling of certain patterns. =20 **key** is a string tested as a prefix on an attribute name originating diff --git a/hw/vfio/igd.c b/hw/vfio/igd.c index 64e332746b..470205f487 100644 --- a/hw/vfio/igd.c +++ b/hw/vfio/igd.c @@ -535,7 +535,7 @@ void vfio_probe_igd_bar4_quirk(VFIOPCIDevice *vdev, int= nr) } =20 /* - * Assume we have no GMS memory, but allow it to be overrided by device + * Assume we have no GMS memory, but allow it to be overridden by devi= ce * option (experimental). The spec doesn't actually allow zero GMS wh= en * when IVD (IGD VGA Disable) is clear, but the claim is that it's unu= sed, * so let's not waste VM memory for it. --=20 2.28.0 From nobody Fri May 3 06:38:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605694889; cv=none; d=zohomail.com; s=zohoarc; b=fkpa1wTQ9L9qw7XQFXKhrRAh18oKrfV7EltCArLF3zBGeslF11QyFuZVKP9dLBTudDLhnLb3FI7rUpwY5/1P4uVw2z4y7ZmKI81pOEqnYAkc0kwxjlTq6UsJegdezScEv4rk9GVxfkSkFxsFpWO3n0ie3MUy+6hzpb5foBeaaIc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605694889; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EjXbb8xKE+TyxvfT3qZhLOmOC5AA7l7IBgY8qM/QOVM=; b=ZbtBCueiS6QzZ6/mVGQSYPxyy3wS0yOMYtKYKUJwGOlXUgGeLOHUHUTyLihFxWnitwsSpcQk0ncE9B7ZjGeZlz2gATJl8RMC3K5LLF6uElmGX711rr8M7KHEC1zjRCy0gmP2Ngd7Rz7i5rUtdVMo+6n6R3wYRLZDiCBcLTt0eIc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605694889002313.3311216139647; Wed, 18 Nov 2020 02:21:29 -0800 (PST) Received: from localhost ([::1]:57342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfKad-0001v6-VF for importer@patchew.org; Wed, 18 Nov 2020 05:21:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50448) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfKZ3-0008W4-Cb for qemu-devel@nongnu.org; Wed, 18 Nov 2020 05:19:49 -0500 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]:45828) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kfKZ1-0003ey-Pv for qemu-devel@nongnu.org; Wed, 18 Nov 2020 05:19:49 -0500 Received: by mail-ed1-x533.google.com with SMTP id q3so1368540edr.12 for ; Wed, 18 Nov 2020 02:19:47 -0800 (PST) Received: from localhost.localdomain ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id f24sm13230052edx.90.2020.11.18.02.19.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 02:19:45 -0800 (PST) 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=EjXbb8xKE+TyxvfT3qZhLOmOC5AA7l7IBgY8qM/QOVM=; b=Vrpic9zlmjo0vFiHGLg1nu4DNHjyJ/Wuo+XC9LfZuRnuBBSvpnS9VYi8uUUyoOZVRb WZFPDz8g5LoG/ZwkIUYBJ1ep6lqRoAMvCJWZo8m4yBqSIoFDgcnG6cRBjlZzPIdg0Rjm sSDzCpjUsPmWlmHKagSQOBDnOJmykiv70qDgcimw+LvQCQpeAXGNy6gvbCiu+3pxfdl1 Mm/2rTCEW+H73zOoWo9qwUlyi+dyfCoa4CGQRHzs8yocoVQ/QPQo0yTfJQPMkL9XWGkK 4i2kW1ZhAFnV3gak6t18EkyWR1WGyW+jxMCOoCuJKyg5LAqPTiG01szYPH7JguIsAHuR 2Fhw== 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=EjXbb8xKE+TyxvfT3qZhLOmOC5AA7l7IBgY8qM/QOVM=; b=iR3iAcg4hQx4t9egIrgZ2FfQCTUtswiJaEPvdYe+eZsC0A2TLUC6C/Wurgm6eyvcEc ME6R6tiHuqsIUSKG7lWvqPOq4aZk0ztuK9zEuCRxe6VOSZuFQ7efCnkSGp0YqkNOmdZl X77fTRTCCaz+d7khO6036l3gfRehrVhROOIOMbmxNFy2Mto42+6jsI3G31nHcpf4E/h0 zPSeR4HQ5NwndYYFu8Qv5j/mA35gBxvG+gfmN2YX360zh7if2fXsAWFOwYkhdB+OjW51 PsyFy9lKftw8whhKlEbr1S8CyhvRs1UfEqVsTaRDBoIobXSgVu/t8whO+flMS+kuuZ6e +GDw== X-Gm-Message-State: AOAM533DaUy4qoyeW9bT5Fm9MUrmFTTU8lLUFtyGLJA0DU8ZVLHy+IQr +HCCk0JR++zJQbYqJ8Ckgtn+cqiwfYI= X-Google-Smtp-Source: ABdhPJxZweyXNGnULu4rD3XX7Q8x5vqVqB3fvlAjctybWoMC122qWeYZZAGZeH+AFYTsDS7Dr+aPpg== X-Received: by 2002:aa7:d1c6:: with SMTP id g6mr24768259edp.130.1605694786206; Wed, 18 Nov 2020 02:19:46 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 3/7] meson: Fix build with --disable-guest-agent-msi Date: Wed, 18 Nov 2020 11:19:36 +0100 Message-Id: <20201118101940.132594-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201118101940.132594-1-pbonzini@redhat.com> References: <20201118101940.132594-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-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: Stefan Weil Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Stefan Weil The QGA MSI target requires several macros which are only available without --disable-guest-agent-msi. Don't define that target if configure was called with --disable-guest-agent= -msi. Signed-off-by: Stefan Weil Message-Id: <20201117201834.408892-1-sw@weilnetz.de> Signed-off-by: Paolo Bonzini --- qga/meson.build | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/qga/meson.build b/qga/meson.build index 53ba6de5f8..520af6ce9b 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -61,23 +61,25 @@ if targetos =3D=3D 'windows' if 'CONFIG_QGA_VSS' in config_host and 'QEMU_GA_MSI_WITH_VSS' in confi= g_host deps +=3D qga_vss endif - qga_msi =3D custom_target('QGA MSI', - input: files('installer/qemu-ga.wxs'), - output: 'qemu-ga-@0@.msi'.format(config_host['= ARCH']), - depends: deps, - command: [ - find_program('env'), - 'QEMU_GA_VERSION=3D' + config_host['QEMU_GA_= VERSION'], - 'QEMU_GA_MANUFACTURER=3D' + config_host['QEM= U_GA_MANUFACTURER'], - 'QEMU_GA_DISTRO=3D' + config_host['QEMU_GA_D= ISTRO'], - 'BUILD_DIR=3D' + meson.build_root(), - wixl, '-o', '@OUTPUT0@', '@INPUT0@', - config_host['QEMU_GA_MSI_ARCH'].split(), - config_host['QEMU_GA_MSI_WITH_VSS'].split(), - config_host['QEMU_GA_MSI_MINGW_DLL_PATH'].sp= lit(), - ]) - all_qga +=3D [qga_msi] - alias_target('msi', qga_msi) + if 'CONFIG_QGA_MSI' in config_host + qga_msi =3D custom_target('QGA MSI', + input: files('installer/qemu-ga.wxs'), + output: 'qemu-ga-@0@.msi'.format(config_host= ['ARCH']), + depends: deps, + command: [ + find_program('env'), + 'QEMU_GA_VERSION=3D' + config_host['QEMU_G= A_VERSION'], + 'QEMU_GA_MANUFACTURER=3D' + config_host['Q= EMU_GA_MANUFACTURER'], + 'QEMU_GA_DISTRO=3D' + config_host['QEMU_GA= _DISTRO'], + 'BUILD_DIR=3D' + meson.build_root(), + wixl, '-o', '@OUTPUT0@', '@INPUT0@', + config_host['QEMU_GA_MSI_ARCH'].split(), + config_host['QEMU_GA_MSI_WITH_VSS'].split(= ), + config_host['QEMU_GA_MSI_MINGW_DLL_PATH'].= split(), + ]) + all_qga +=3D [qga_msi] + alias_target('msi', qga_msi) + endif endif else install_subdir('run', install_dir: get_option('localstatedir')) --=20 2.28.0 From nobody Fri May 3 06:38:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605695026; cv=none; d=zohomail.com; s=zohoarc; b=ZxXmBvwled4CEe8A3UILYyXrfSOeoi2spsET1sxgT8w1iTD14BAzct70YmCKZBH8197CLHxngO3WhAVM/c7NK3ZlGtBZg5BvCPMkbaB5USY0v6b7Qt9ts06JQpaam9/DBqfuRIaKwj5khpBTTnjeqwwZZrvwJgKk2bFj7WA1K7w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605695026; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ro2xCmN/EJvdzHE9V9WTlpTshR3d4chs+wdaUY0VcCk=; b=K0LzklNtE1VY1h2Myn9pkZ3OSedRDvrB1mkWi4XN2ojTCLZtop6gCq4ouvPhDU6Pl9Dt0/ZCRLHyQnfTkoHD0f6tcIqSnNqV0wJ9zKst6u99H9f+lhp1zGgG6ArgHgWhNuj0Qj9zIFGSKhBP7HhfCoX+ur2Kk/59KCfNSDKw8OI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605695026117723.949170100575; Wed, 18 Nov 2020 02:23:46 -0800 (PST) Received: from localhost ([::1]:36924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfKcq-00059t-Ml for importer@patchew.org; Wed, 18 Nov 2020 05:23:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50458) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfKZ4-00006J-5M for qemu-devel@nongnu.org; Wed, 18 Nov 2020 05:19:50 -0500 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]:46820) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kfKZ2-0003fG-MA for qemu-devel@nongnu.org; Wed, 18 Nov 2020 05:19:49 -0500 Received: by mail-ed1-x529.google.com with SMTP id t11so1361471edj.13 for ; Wed, 18 Nov 2020 02:19:48 -0800 (PST) Received: from localhost.localdomain ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id f24sm13230052edx.90.2020.11.18.02.19.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 02:19:46 -0800 (PST) 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=ro2xCmN/EJvdzHE9V9WTlpTshR3d4chs+wdaUY0VcCk=; b=hHcWkEnKjOrpBGsmEutclrdFlrEZym4eaPKLO4jAJRtPRW7weQ3VkJccdRvoKhPRVA TaDdORmwtsuKhpJQZhVqH5tEGiT300Uv8Qr0X0NCrnp3gOW5hKjn5N7vSd9N0bdKuxQ3 XyrJBqTkees4Y4t+exKlo8+oURSPw6hcQd9OZp97bNpXeH9+Uv0mgM0MEeHnjJUQ60X2 Y3d1EgWPj0U5LoysGEtejS0KYvbRhBaHhW0zUPXdhAtZfDTrfrJsFMEs+JDy4p9oNBqY /KTP9TENKjtNZtdK9+PvY9YtMOViWXdZLsoTh4dIsIAll4jr9G0U3OCaLZ+1nAPrzK6n 2lJw== 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=ro2xCmN/EJvdzHE9V9WTlpTshR3d4chs+wdaUY0VcCk=; b=YJPFB/BxFTU0F1sA2ch3psa3vHKQLvDRPW73KNfbZuQU5wLGLS6s9HH0oLY00XE5PE IRFXvyu3zfEPCk3cOyyc/Z28KeyqcCJgQPUYTj9TbUcCfGu7MhB6DUkh4QgCVxlrSWSI dxELb/1kBX53QBUffx4eVvQwVnOKF2Lum8Od4Oa7IVlSS1+KgHq3uB1xvJ6LgOEtMhk1 F2viyoQKShN6rcDw8FBSHyDWwRLEmbOWHKFxL8SRzT4VXgvOA0C/Lr2gRFAJ5aDeL2Lm K/BHaIMsMpx2gvHhkjdrjjPAAxTh80BWQqqKppK8xpl4p+hgnaRNas5CRp+n+IoEKvX1 UUxg== X-Gm-Message-State: AOAM532YwCb15W80PfXflpqbTOVh5FI4ULeap89dzu9mrYUkdNtyUe0A 2MWd/Q8ndqA0fK/KZhcLB9WAvecQvAU= X-Google-Smtp-Source: ABdhPJwbB+oqC783mUkRqH+qdUflEfLC/CAt+HC29yuU5fOknb4ANaRjIaT3uwS455B/iF+mlxUowA== X-Received: by 2002:a05:6402:559:: with SMTP id i25mr27342744edx.128.1605694787083; Wed, 18 Nov 2020 02:19:47 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 4/7] meson: Fixes curses detection on msys2 Date: Wed, 18 Nov 2020 11:19:37 +0100 Message-Id: <20201118101940.132594-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201118101940.132594-1-pbonzini@redhat.com> References: <20201118101940.132594-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-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: Yonggang Luo Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Yonggang Luo Fixes regression on curses detection in msys2 by commit#925a40df2828d32d3aaaf022282cba81082fb263 Signed-off-by: Yonggang Luo Message-Id: <20201116213106.589-1-luoyonggang@gmail.com> Signed-off-by: Paolo Bonzini --- meson.build | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 7ddf983ff7..5062407c70 100644 --- a/meson.build +++ b/meson.build @@ -490,10 +490,15 @@ if have_system and not get_option('curses').disabled() return 0; }''' =20 - curses =3D dependency((targetos =3D=3D 'windows' ? 'ncurses' : 'ncursesw= '), - required: false, - method: 'pkg-config', - static: enable_static) + curses_dep_list =3D targetos =3D=3D 'windows' ? ['ncurses', 'ncursesw'] = : ['ncursesw'] + foreach curses_dep : curses_dep_list + if not curses.found() + curses =3D dependency(curses_dep, + required: false, + method: 'pkg-config', + static: enable_static) + endif + endforeach msg =3D get_option('curses').enabled() ? 'curses library not found' : '' if curses.found() if cc.links(curses_test, dependencies: [curses]) --=20 2.28.0 From nobody Fri May 3 06:38:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605695029; cv=none; d=zohomail.com; s=zohoarc; b=LZB0TkpysQmnwS62JLKyPQKn5ZEn9TC8udYulb3bv/kpxef4IzG7TEGHje7IAZssVcCswoCix95FGGgCqJlDasLdrIgIZVBhYyD4jDmJc0/x10BBtS9nMDd+eX+aIG00ZY+3kJ5ZpqFDtvqQBpZ3BTbo9Rx6jZ4TB60k7EddxWA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605695029; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rJC+t5jNQH+UoJIDaWfC2vUnw9SNYRVaW7Ew+YrAB9c=; b=Qmy2zBhBkNZjv7hDnBgTl4Pg0j+PvkJQgd5Uq6o9lQGS7qDWJ/XIt5xpJXbeCqWJE3wl5YISqUH9T/abXrDZZPNOYMfV4VZq2luoupSq5cq1zg69xl4qpaKGQeC++X1gX0AVLPbjA6AaWKSBn8nPqOGbXkGm9HdjpQ7g/TDryZk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605695029840639.8098071626144; Wed, 18 Nov 2020 02:23:49 -0800 (PST) Received: from localhost ([::1]:37218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfKcu-0005HB-M9 for importer@patchew.org; Wed, 18 Nov 2020 05:23:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50472) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfKZ5-00008j-A6 for qemu-devel@nongnu.org; Wed, 18 Nov 2020 05:19:51 -0500 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]:40320) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kfKZ3-0003fO-Js for qemu-devel@nongnu.org; Wed, 18 Nov 2020 05:19:50 -0500 Received: by mail-ed1-x534.google.com with SMTP id d18so1399062edt.7 for ; Wed, 18 Nov 2020 02:19:49 -0800 (PST) Received: from localhost.localdomain ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id f24sm13230052edx.90.2020.11.18.02.19.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 02:19:47 -0800 (PST) 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=rJC+t5jNQH+UoJIDaWfC2vUnw9SNYRVaW7Ew+YrAB9c=; b=A8ZU/kF514yUn+WY/HQJlgQ3LDLY1H7taSzjW+3o1d8/INOdeYGX58GT0iHlbtV0QA XWWGxNUrFi09c7iGTozZijTSq0gdc1eH1mr+xO4+M38KabK7SfmJDO/oXu/Aa6FNtlBR DC7AzRNXxxqyFSkA+9vtUCrWmbsl9SxXu2oyupu9/Owhl/ON0yva78CWa9ZM6cNuwbdN gnP6SzP+4Hmiw5lTwEYigiC8Fr0GWYIxmE5BpNyrUC7zSM2fYMlPSgASk/YtDU/1+ZK7 Zl59pnp+KPgP8MQGdTAPXGxcC4naZTW2Qxln970dYjearB6VP6mLExivR7b5cbsBZZXU u+SA== 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=rJC+t5jNQH+UoJIDaWfC2vUnw9SNYRVaW7Ew+YrAB9c=; b=KRoBNsJpZ85UeYNLZBWwNCJxAlbngcdjvRKqe/deVY8KoDz+yUSmDcDQFdhCvX9GX0 onKrYy1hVGNphNkNRj/b2DwiPI3n2uFuwwuZOBCPEyGAMs2b+5Ev4ZXuxLxex2P7mm90 qn8WZ/wYAxjwXDF//+wRu4FfeSf/X857xbChtkzQ17VPRNeBjrh++ZTc6WjCaIOSmKOC sFniIRyBG8eGcSdv3eEoh+esDbKWd9pS+Jl6TN8N7OBku90Fp0/EIZq20wPSPJVC+VEK MnzEO/l8Dstu14fUS+j9Au5cRjjUajEE9hD0KT4KQIydZjP3Lzmk7DwRAh80LWEujlRJ J4rA== X-Gm-Message-State: AOAM533hi8PfHiLQ2EzznmyoLVOZtrnnCQH1Jgj+skf6ihYFwewrJfNG TIhsPiGbk+BwtqeyYw4B+bcPvnsCBso= X-Google-Smtp-Source: ABdhPJxwQMXqrmbs9vMngweBkaSNF9YBEpudkjYW71JvJXYqMpR5pWSxj+pxbQ07qkrH5OM9pw7b5g== X-Received: by 2002:a05:6402:2206:: with SMTP id cq6mr8042597edb.163.1605694788022; Wed, 18 Nov 2020 02:19:48 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 5/7] hvf: Gate RDTSCP on CPU_BASED2_RDTSCP, not just CPU_BASED_TSC_OFFSET Date: Wed, 18 Nov 2020 11:19:38 +0100 Message-Id: <20201118101940.132594-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201118101940.132594-1-pbonzini@redhat.com> References: <20201118101940.132594-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::534; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x534.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: Jessica Clarke Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Jessica Clarke Buglink: https://bugs.launchpad.net/qemu/+bug/1894836 Signed-off-by: Jessica Clarke Message-Id: <20201116200319.28138-1-jrtc27@jrtc27.com> Signed-off-by: Paolo Bonzini --- target/i386/hvf/x86_cpuid.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/i386/hvf/x86_cpuid.c b/target/i386/hvf/x86_cpuid.c index ac731c2b85..a6842912f5 100644 --- a/target/i386/hvf/x86_cpuid.c +++ b/target/i386/hvf/x86_cpuid.c @@ -122,6 +122,10 @@ uint32_t hvf_get_supported_cpuid(uint32_t func, uint32= _t idx, CPUID_PAT | CPUID_PSE36 | CPUID_EXT2_MMXEXT | CPUID_MMX | CPUID_FXSR | CPUID_EXT2_FXSR | CPUID_EXT2_PDPE1GB | CPUID_= EXT2_3DNOWEXT | CPUID_EXT2_3DNOW | CPUID_EXT2_LM | CPUID_EXT2_RDTSCP | CPU= ID_EXT2_NX; + hv_vmx_read_capability(HV_VMX_CAP_PROCBASED2, &cap); + if (!(cap & CPU_BASED2_RDTSCP)) { + edx &=3D ~CPUID_EXT2_RDTSCP; + } hv_vmx_read_capability(HV_VMX_CAP_PROCBASED, &cap); if (!(cap & CPU_BASED_TSC_OFFSET)) { edx &=3D ~CPUID_EXT2_RDTSCP; --=20 2.28.0 From nobody Fri May 3 06:38:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605695160; cv=none; d=zohomail.com; s=zohoarc; b=lt4VvIa4SSnQ4gCXOIOlaADow3E+Z5ENjUX3k+5ax4REDAoh+zfDRpC8ehRY+ECVz4nJWtj512cMZwiVnOyjeS7eCvVvwPb0jYZHcHaMTlvN32n9Jl8bNRyugi3eDahx5wcoV567zaoDnwH104fBlh7AMAQ/qVnVj2fiuK5bRgE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605695160; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MoDrbZFRPYimX08Mu25vJdw6TEjHqrR/m6bx2o/PoHM=; b=gkSf4JiPGMYCLJD+95mH8DfCaFQ/xwZIlQfTvEaYq6fmcPokITzP99VQkwtjWe3vW92Cfmiiaxgdb4dWhWbVN6DPxxpvO6OmFoOe7q6NHgcjOvOmiIO5+KQG1rc+ZjykJerUee66dwGW4GHO0l1mNtobq+RJHa2yb0nr6Eeo6FI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605695160811531.0280607194525; Wed, 18 Nov 2020 02:26:00 -0800 (PST) Received: from localhost ([::1]:44420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfKf1-0008Et-Ll for importer@patchew.org; Wed, 18 Nov 2020 05:25:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50486) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfKZ6-0000Bw-3l for qemu-devel@nongnu.org; Wed, 18 Nov 2020 05:19:52 -0500 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]:42619) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kfKZ4-0003fb-KB for qemu-devel@nongnu.org; Wed, 18 Nov 2020 05:19:51 -0500 Received: by mail-ej1-x629.google.com with SMTP id i19so1947117ejx.9 for ; Wed, 18 Nov 2020 02:19:50 -0800 (PST) Received: from localhost.localdomain ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id f24sm13230052edx.90.2020.11.18.02.19.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 02:19:48 -0800 (PST) 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=MoDrbZFRPYimX08Mu25vJdw6TEjHqrR/m6bx2o/PoHM=; b=KYShNIh1dQyFHKFjeoQdbCUKn5QMO2XP6eH7WgguUS1ckLyAxskXKgDL6qzwNWS45F +/0BRH9Um92QF0PzWAyT/BMassTExi0fOj4qXvjBVycjAF1vzh1OLihNd+tbD34iQcnP Q/766l++5kpJa+W9gRxtGe7/WOhF+aIUGgNSYXN+Z3Epuv574mLTYOEuh7QmCHLzzWPI K03Tfp0zM7nYkz876eN3qsN3AjYyBCuTqajBxvR9CJczu4gFHk4J7NtJOg0LD/ZLWlt9 Cl98XCwTAWaAO7YQuqaSM0UOSh4cchoRC+XoguJL7u6W9ZzVwaOPYnbTc8JW5wZf2CXv OJGg== 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=MoDrbZFRPYimX08Mu25vJdw6TEjHqrR/m6bx2o/PoHM=; b=pKlT8yoIBxFykCIt8u1eVtEQIHfbB+t1K7HIiZwefqr3jzGIm1rYbHtp1KYMIh3b41 lwZzuX94KxJREynLM1bfkEOVzrjDx//mXdS+kfe1Hpi3v+UXddDcP7xpo5e3qtMgBlF/ cODPB85vaiicArfk4KHp/n8MI53VgLN606CdM6BGdZ4rciei1KfIttfeEtpdEHkCR4XS 8+1uj1mcHW+70gjOqAcFMUAezu+Uup8+UACNib0dEVp4dZVUi2fE26Ollx9vJJBQv1A2 FQg64ieA7qvi9C+i11vHn7X62oa49ZXAq9Bf99vyqBVKScbHmFgGB3D8NVoMhKWZABLO j2Iw== X-Gm-Message-State: AOAM532uom41ABTe9h+2bVDm8ukS0wgmgTmlI27CfoxeJU92fO0U4IIZ F3kbN0hV5dK11RgeX/dxtDsXnIYzVEU= X-Google-Smtp-Source: ABdhPJzLNwXoIjbXAImDojoWloj19dg0z2k8RivJ6sIAOgpRweQ3XakJNh7DYwlzBrDRJMfrIr7lTg== X-Received: by 2002:a17:906:491a:: with SMTP id b26mr24326646ejq.385.1605694788983; Wed, 18 Nov 2020 02:19:48 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 6/7] hvf: Fix segment selector format Date: Wed, 18 Nov 2020 11:19:39 +0100 Message-Id: <20201118101940.132594-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201118101940.132594-1-pbonzini@redhat.com> References: <20201118101940.132594-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::629; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x629.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: Jessica Clarke Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Jessica Clarke The Requested Privilege Level field is 2 bits, the Table Indicator field is 1 bit and the Index field is the remaining 15 bits, with TI=3D0 meaning GDT and TI=3D1 meaning LDT. Signed-off-by: Jessica Clarke Message-Id: <20201116200414.28286-1-jrtc27@jrtc27.com> Signed-off-by: Paolo Bonzini --- target/i386/hvf/x86.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/i386/hvf/x86.h b/target/i386/hvf/x86.h index 9e2c0039e6..782664c2ea 100644 --- a/target/i386/hvf/x86.h +++ b/target/i386/hvf/x86.h @@ -214,16 +214,16 @@ static inline uint32_t x86_call_gate_offset(x86_call_= gate *gate) return (uint32_t)((gate->offset1 << 16) | gate->offset0); } =20 -#define LDT_SEL 0 -#define GDT_SEL 1 +#define GDT_SEL 0 +#define LDT_SEL 1 =20 typedef struct x68_segment_selector { union { uint16_t sel; struct { - uint16_t rpl:3; + uint16_t rpl:2; uint16_t ti:1; - uint16_t index:12; + uint16_t index:13; }; }; } __attribute__ ((__packed__)) x68_segment_selector; --=20 2.28.0 From nobody Fri May 3 06:38:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605694894; cv=none; d=zohomail.com; s=zohoarc; b=Wp2gyfO92tTXtH3XcFYfI6XzHyjSOKSpfYyLdWRMgNzUqAT/wQJdaMgV/hIYultS8bAbfXRthxN4R4ZpZXHoGakBDDX8rMJTngufi5vuSRjUbwEs4T4NdDByjHUagxoJIvubtVVwIREpVJdejF7DugjA/ctViyvhOwd+9Btg058= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605694894; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Sozi0upRiyVBExDmaEq+t/3SL6q0pm2zo/zvd4ASBjU=; b=XKlndzG3Bls3wlX+PIgkfHUQGAWR9PxqrSQcRFTn13xgpGLnmyX/lPHHT/kNsKGz9RHkBcF4d97GVivcUEM97TONrPO+uIkbBR8kErX9qwfhpYndtic1qXF+M8FqQu6FD7E0/FuCTyd+NtHEFJlfayu7y95l971dtq9BBu6ogug= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1605694894942598.3619053973764; Wed, 18 Nov 2020 02:21:34 -0800 (PST) Received: from localhost ([::1]:57962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kfKaj-0002Be-Ta for importer@patchew.org; Wed, 18 Nov 2020 05:21:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50494) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kfKZ7-0000En-7g for qemu-devel@nongnu.org; Wed, 18 Nov 2020 05:19:53 -0500 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]:36889) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kfKZ5-0003fp-G3 for qemu-devel@nongnu.org; Wed, 18 Nov 2020 05:19:52 -0500 Received: by mail-ed1-x530.google.com with SMTP id cq7so1406870edb.4 for ; Wed, 18 Nov 2020 02:19:51 -0800 (PST) Received: from localhost.localdomain ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id f24sm13230052edx.90.2020.11.18.02.19.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 02:19:49 -0800 (PST) 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=Sozi0upRiyVBExDmaEq+t/3SL6q0pm2zo/zvd4ASBjU=; b=mmBBUaLdOsRevSGIL8Z+Bl6O7Rsb3ffrHEy9ZYZdQnUuiHmR+c05vnyEpOBGZ6dwur a5FTCq921/GJxu6z4Df+My3iYGPts7jW8Ooa2lln0zpyxdDl2EPk8TxEOHHxJnm1gZFD LMwDPg0St2u2R/XV0kZIFElFVBAyWsTtBIzdCkRgkpO2H0iyE2aJ5WjOpQkup6kimm4B jmbKjIeUFi9cP9u9j3ACEbrKKqsr9y6KpY9eN1mZcajHLga3pAdGGy0BIvqFptlrokeg XtvtmqI3/30S5h2bKg/3W0JYcypCp3IS64P6sgFZjTapJYvO05Pp6NNtBpqx2UFhJMBD Pj0A== 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=Sozi0upRiyVBExDmaEq+t/3SL6q0pm2zo/zvd4ASBjU=; b=k1yFbLKH4Y2JWLVF0bPTY8DAXCVl3gVuXwpvFbZbEioGXzn32Oj1Ulrd4Iz8P++vj+ /Vp6kt5cm9m1pHQeElX1fNguHOirXi45y2aomQb9ZL7ljGJWc2D33a3ymM6FAPlODmob xt/oBtmz8Hz/WwpuU2K8oB5Q5tapAXkoAfhDdGOqAuXHi0eBGPHl3R8tkIm4K3uQWqJH TRv3tQR6mHZcFZEyQxY6NDswiqXv2eGFRszpsBWnR84JV/C2dVvtu+fyk/zdUfExsfRs LfYul10hY2NJdRmoD1zae14a34N8OIUF3XIJqGykYqUgcRXzIfEyHNTf4T7UJl+eyq6X jkcA== X-Gm-Message-State: AOAM530FG8VR+QZqjzQ9OH6dN0GQWUOrA+bCXntpdnryETb0qMhiRhim 58quKdIaRXW84XNeS2ibGi76chA9DaU= X-Google-Smtp-Source: ABdhPJzIIhXbSGhSkYI0yxC1jy++ya8qJIMI1l+9w5HK1/5CSKQ91VWE33IJ31qGch/1hkY59hduew== X-Received: by 2002:a05:6402:229a:: with SMTP id cw26mr26284777edb.271.1605694789918; Wed, 18 Nov 2020 02:19:49 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 7/7] buildsys: Help git-diff adding .gitattributes config file Date: Wed, 18 Nov 2020 11:19:40 +0100 Message-Id: <20201118101940.132594-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201118101940.132594-1-pbonzini@redhat.com> References: <20201118101940.132594-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::530; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x530.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 Since commits 0979ed017f0 ("meson: rename .inc.h files to .h.inc") and 139c1837db7 ("meson: rename included C source files to .c.inc") 'git-diff --function-context' stopped displaying C function context correctly. We can help git-diff by providing attributes to the .[ch].inc path names. See: https://git-scm.com/docs/gitattributes#_generating_diff_text Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20201014082209.3712625-1-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..3d2fe2ecda --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +*.c.inc diff=3Dc +*.h.inc diff=3Dc --=20 2.28.0