From patchwork Wed Nov 3 15:04:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1550345 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=mq5oTi8l; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hkqsq0vCvz9s5P for ; Thu, 4 Nov 2021 02:08:45 +1100 (AEDT) Received: from localhost ([::1]:51352 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miHsX-0001Hz-SV for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2021 11:08:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51734) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miHos-0003Da-B1 for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:04:55 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:51849) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miHoo-0000PD-5q for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:04:52 -0400 Received: by mail-wm1-x329.google.com with SMTP id z200so2221915wmc.1 for ; Wed, 03 Nov 2021 08:04:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=50HBQi4Hy5jMLr0JSY8l5M1bqyl8v0Na28qxD2VdzUY=; b=mq5oTi8l7/rxkxTFqfa/CAYGLbkymxslQtD0/QYeXtr7VsvmdqaRXBQXTqhv0YFYIk G7YgiMmdvW5ayunqKjlGKOtsZz6sRtY1n3H5V2RtlQxYPCeZhKRufkgg4US94YjSNbY0 S8GKxArXdKTmMpCZ4UkITZ3n9xaqFHPTxxfx7O6yf6WI/t3KEBL1mFczM492zkYHa+eL mFDP2n6heDF37tQlG/sseNw95SDAJUhLC20XN/SozqbDunydXgd13ZcCtcZZGsN/Uk3Q 9FrFdwUVqEk/0/kkdWdwpzGqTy4ygk2gCUEB0veUP09YJZQmdbSZ8s+vvHEUJxUfZ2mw E2UQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=50HBQi4Hy5jMLr0JSY8l5M1bqyl8v0Na28qxD2VdzUY=; b=ppvi/LZ4/y2nNJQ7KQO3rh0jb3xAXQcn8Rosri6ShhgmqSUsKKaSxwCgPBY+vmv9LO zOwKYYMs0FiDSpNRbnPA6qSuXQEWNvY1FyvOdYGlPn40h+iW98CSVLa5uzRScW/C72kt tkt1libkYBD8DC+52RDCX5kd/MDp+LnDPnlwNaZTSrQoevd/M5ySsYohjTqzYK0jlCT9 gDrOJUl8DY7RT3QRb4r7CctfCpyEXY9RMf2zXPuZp0NEqhMQu5jOFH1SX831pZ4qmV7a +FTyM4zI0VS0+gud8RGg3kXLba4699PcL54paEiMWwOwu8VykYEnTEldH5uwMMJocB0F 0WAA== X-Gm-Message-State: AOAM532ZieTGqme5PjEUAEfEoj5LSzX9nSJ6yYlQMey4plqa96SbFPSZ FoVoH0VIWmRmZQLqR7vM4/C7PHQyciA= X-Google-Smtp-Source: ABdhPJwQPH12mbMvt7QL7ZLRJMPsqgfTtcQYQ4lK4LY2Ri96y3sSaCgZv5j7c1u40lsFUD+at4Zw4A== X-Received: by 2002:a1c:f219:: with SMTP id s25mr16370161wmc.31.1635951886490; Wed, 03 Nov 2021 08:04:46 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h16sm2488797wrm.27.2021.11.03.08.04.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 08:04:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 01/27] Makefile: Fix gtags generation Date: Wed, 3 Nov 2021 16:04:16 +0100 Message-Id: <20211103150442.387121-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103150442.387121-1-pbonzini@redhat.com> References: <20211103150442.387121-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x329.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Xu Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Peter Xu We should use "-print" or otherwise all "-prone" is ignored. Signed-off-by: Peter Xu Message-Id: <20210804132328.41353-2-peterx@redhat.com> Signed-off-by: Paolo Bonzini --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fe9415ac64..1b36bf2af4 100644 --- a/Makefile +++ b/Makefile @@ -256,7 +256,7 @@ gtags: "GTAGS", "Remove old $@ files") $(call quiet-command, \ (cd $(SRC_PATH) && \ - $(find-src-path) | gtags -f -), \ + $(find-src-path) -print | gtags -f -), \ "GTAGS", "Re-index $(SRC_PATH)") .PHONY: TAGS From patchwork Wed Nov 3 15:04:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1550341 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=IyTvHi4Z; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hkqpk0CTkz9sX3 for ; Thu, 4 Nov 2021 02:06:06 +1100 (AEDT) Received: from localhost ([::1]:42810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miHpz-0003Es-LU for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2021 11:06:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51690) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miHoq-0003Cb-Gz for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:04:53 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:38567) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miHoo-0000PR-68 for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:04:52 -0400 Received: by mail-wm1-x332.google.com with SMTP id a20-20020a1c7f14000000b003231d13ee3cso4858651wmd.3 for ; Wed, 03 Nov 2021 08:04:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fQMQLqy90+/8kjHtBTUhHKPlUSsOwQHXZ5naIaYhI2A=; b=IyTvHi4ZXZ7uVn2JDlHUt36bIK00g6klFFdyfB/GJm1F1t0vJ80zJi085vqTzPesoa ZKIemJhc5cL68Hu3DPlx0SAB0ZxVK81R5uPiM61tt9uMC3v82YUzJFX6SfxKZ+gczMtR 1VagNCktbD8/mDTtR+6At4L0aF93AIj4mAfJfBFbfwx2KYGydQ0zLcdpw4maVmXjxinX cCa5/cSD6jFoQ6oizTdjcqot8o7iHA+GD5rJRXAKrlne03JzPFDG6EK5mNgxWvZvOcak X2goS0d7Aio4mV8vrjAT4Dn6xq674qSE6rJevxdeAurnZr/DqMxDEV5eXgq/9Mm+KaKQ +phA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=fQMQLqy90+/8kjHtBTUhHKPlUSsOwQHXZ5naIaYhI2A=; b=RgFG9z/MKfZ9bUOK/ihTPLFgb5EybTV4DsrN6Slvk5mJhKNuB0U3El3iyAXaDr/5Y1 F6LPlO+EcDmok56oxfVC42Shgvqrh0/0r5JroZbDPnEXU8RwLX4wKMd08jj3tGz/JyOc kKnpEakibUyls5mvx/M2ozEL+i21tW2HPdP7t+OcMC9I0e8AsRelIOVZlCShzmKxKiYu QB/pqhL22o2mVBg+dbskbViJgyy7liS4SPr7MBQqZHXmwvRm3QO9Vvo4s5/q8gFpilau DYCs24Z5dJE9j47109rQ1LYhKzo2dOunYAVdejrO9+HnK5AocaLP/39BFOvo6efXh5/W TxEQ== X-Gm-Message-State: AOAM53115WgBOJN2qjIQ6PcENRJdmSszjjdCd+ttvWeWVU1rY4suFWIA N2fmIMqQqhdslyW08h6e3WcBcNVn/eU= X-Google-Smtp-Source: ABdhPJyuGns1ADmuC4SOVAsiDDl+OpJgESqPEZo+KKIulF73baRa34MDMpEwnPcLiRssyp/fEtU/MQ== X-Received: by 2002:a05:600c:4fd4:: with SMTP id o20mr15523741wmq.175.1635951887586; Wed, 03 Nov 2021 08:04:47 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h16sm2488797wrm.27.2021.11.03.08.04.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 08:04:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 02/27] Makefile: Fix cscope issues on MacOS and soft links Date: Wed, 3 Nov 2021 16:04:17 +0100 Message-Id: <20211103150442.387121-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103150442.387121-1-pbonzini@redhat.com> References: <20211103150442.387121-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x332.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Xu Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Peter Xu This patch fixes actually two issues with 'make cscope'. Firstly, it fixes the command for MacOS "find" command as MacOS will append the full path of "$(SRC_PATH)/" before each found entry, then after the final "./" replacement trick it'll look like (e.g., "qapi/qmp-dispatch.c"): /qapi/qmp-dispatch.c Which will point to the root directory instead. Fix it by simply remove the "/" in "$(SRC_PATH)/" of "find-src-path", then it'll work for at least both Linux and MacOS. The other OS-independent issue is to start proactively ignoring soft links when generating tags, otherwise by default on master branch we'll see this error when "make cscope": cscope: cannot find file subprojects/libvhost-user/include/atomic.h This patch should fix the two issues altogether. Signed-off-by: Peter Xu Message-Id: <20210804132328.41353-3-peterx@redhat.com> Signed-off-by: Paolo Bonzini --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1b36bf2af4..74c5b46d38 100644 --- a/Makefile +++ b/Makefile @@ -235,7 +235,8 @@ distclean: clean rm -f linux-headers/asm rm -Rf .sdk -find-src-path = find "$(SRC_PATH)/" -path "$(SRC_PATH)/meson" -prune -o \( -name "*.[chsS]" -o -name "*.[ch].inc" \) +find-src-path = find "$(SRC_PATH)" -path "$(SRC_PATH)/meson" -prune -o \ + -type l -prune -o \( -name "*.[chsS]" -o -name "*.[ch].inc" \) .PHONY: ctags ctags: From patchwork Wed Nov 3 15:04:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1550355 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=Rb7YCLsg; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HkqwG6789z9s5P for ; Thu, 4 Nov 2021 02:10:54 +1100 (AEDT) Received: from localhost ([::1]:57100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miHue-0005Xf-Kh for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2021 11:10:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miHos-0003Dc-Fd; Wed, 03 Nov 2021 11:04:55 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:33305) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miHop-0000Pe-8R; Wed, 03 Nov 2021 11:04:54 -0400 Received: by mail-wm1-x32d.google.com with SMTP id r9-20020a7bc089000000b00332f4abf43fso3601976wmh.0; Wed, 03 Nov 2021 08:04:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4TrkEf6RZdbASiD3tvojLTbg4WPtkYm2UJl3+lm45aU=; b=Rb7YCLsgOu7Q09EydHdpkim1sEjAyPC/uaL1eqUIyryXktpmq/y2XleAEGbjiaB8b7 R/Q6Fm+7AaC4YPoMxuDAJMlFsFxcp61GVcIkyFSsjIFJHtKUiKLpfyyEouSizU+oyOA6 rxFwX8NbsjKPz6NSVaML3dfWU+xgbwp3QTNXimFCPHGWm/pqd5ikf2qe6I8UW4KIo7RM pYLWuWHOoLYvcGsSNCYu6dxvjiQyFNZ+19lLFr96kDhALPVa8h1QBeoCqK/R9Q2zy/oL Z6YZy6aY/QtE4gbB8jDWFsi2wcbQq7s5H6Vmw8+r0j0pfw2ol7NwwRYyCgJdCiWE8i0B nYTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=4TrkEf6RZdbASiD3tvojLTbg4WPtkYm2UJl3+lm45aU=; b=b/1z8XCZXMMNdK1qBfWerZEitxS4AdMLdxbF2YFJNgBAQuKr8LxX5qeQPMLwBtdY/H cC0tCI/fDpznGMPbfq0vO4i3PkomY9JNuNjEZIjm5IwwDFF33yLUItHA9pGiNF9eRbPr KQz7oCDL+gflo10v+KnZcAbW4aV20dso6d6aKSi9P7oI0mhf4Zc+PXrSUoW3jBQ9FuSG NHLIo97SNyeyGBlccs/ubQux9k7Q5v/iESwrsZmBV0lLMuen6omeYGg91OFdd1cIge1R RO8fq8eu88OuhpZ3PCW0FPwR2aYxSt3RNXoQRvkuoDuv7tjst0MmLejNkCjPz1elHdjO mQCg== X-Gm-Message-State: AOAM533kQmnz9YDr6KPIqDefZWNEH2EzcLB3Fdh7O1lsDLOTK7XMhlkS kjKrYdCGVu5fbKZXPUHRVvUFC42CJ2Q= X-Google-Smtp-Source: ABdhPJzCrU2/KZC1RD4xfpXJoGE033K/LRtW2hVJa6IMBlHHxNOwoYgLQ4d+qQulj3g5YrzIhZnN+Q== X-Received: by 2002:a1c:1c1:: with SMTP id 184mr15931631wmb.1.1635951888779; Wed, 03 Nov 2021 08:04:48 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h16sm2488797wrm.27.2021.11.03.08.04.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 08:04:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 03/27] Partially revert "build: -no-pie is no functional linker flag" Date: Wed, 3 Nov 2021 16:04:18 +0100 Message-Id: <20211103150442.387121-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103150442.387121-1-pbonzini@redhat.com> References: <20211103150442.387121-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32d.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jessica Clarke , qemu-stable@nongnu.org, Christian Ehrhardt Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Jessica Clarke This partially reverts commit bbd2d5a8120771ec59b86a80a1f51884e0a26e53. This commit was misguided and broke using --disable-pie on any distro that enables PIE by default in their compiler driver, including Debian and its derivatives. Whilst -no-pie is not a linker flag, it is a compiler driver flag that ensures -pie is not automatically passed by it to the linker. Without it, all compile_prog checks will fail as any code built with the explicit -fno-pie will fail to link with the implicit default -pie due to trying to use position-dependent relocations. The only bug that needed fixing was LDFLAGS_NOPIE being used as a flag for the linker itself in pc-bios/optionrom/Makefile. Note this does not reinstate exporting LDFLAGS_NOPIE, as it is unused, since the only previous use was the one that should not have existed. I have also updated the comment for the -fno-pie and -no-pie checks to reflect what they're actually needed for. Fixes: bbd2d5a8120771ec59b86a80a1f51884e0a26e53 Cc: Christian Ehrhardt Cc: Paolo Bonzini Cc: qemu-stable@nongnu.org Signed-off-by: Jessica Clarke Message-Id: <20210805192545.38279-1-jrtc27@jrtc27.com> Signed-off-by: Paolo Bonzini --- configure | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 039467c04b..07cb7b412a 100755 --- a/configure +++ b/configure @@ -1771,9 +1771,11 @@ static THREAD int tls_var; int main(void) { return tls_var; } EOF -# Check we support --no-pie first; we will need this for building ROMs. +# Check we support -fno-pie and -no-pie first; we will need the former for +# building ROMs, and both for everything if --disable-pie is passed. if compile_prog "-Werror -fno-pie" "-no-pie"; then CFLAGS_NOPIE="-fno-pie" + LDFLAGS_NOPIE="-no-pie" fi if test "$static" = "yes"; then @@ -1789,6 +1791,7 @@ if test "$static" = "yes"; then fi elif test "$pie" = "no"; then CONFIGURE_CFLAGS="$CFLAGS_NOPIE $CONFIGURE_CFLAGS" + CONFIGURE_LDFLAGS="$LDFLAGS_NOPIE $CONFIGURE_LDFLAGS" elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then CONFIGURE_CFLAGS="-fPIE -DPIE $CONFIGURE_CFLAGS" CONFIGURE_LDFLAGS="-pie $CONFIGURE_LDFLAGS" From patchwork Wed Nov 3 15:04:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1550362 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=JEwYyBGM; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hkr0G6YJ6z9s5P for ; Thu, 4 Nov 2021 02:14:21 +1100 (AEDT) Received: from localhost ([::1]:37194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miHxx-0003IK-Nd for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2021 11:14:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51740) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miHos-0003Dd-Fx for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:04:55 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:41748) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miHop-0000Pm-Rq for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:04:54 -0400 Received: by mail-wm1-x329.google.com with SMTP id f7-20020a1c1f07000000b0032ee11917ceso2115692wmf.0 for ; Wed, 03 Nov 2021 08:04:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oal98zD2Ir0qFzB3ikWmCThICKS9U3UwIlUa/SE6Qjk=; b=JEwYyBGM1y4YANs7IVENPfrlgAZnGcHvqNoPFYdg5AQOyWssYQp4E9yBZwNY4u3PMr OREEIS1Be89HXGfZcjQQZxJYFhXcPsjDOEl4S+TRoA46gonyrryIzvovenDvOr02Q0sG XHTs37vqSs+/RnZVPZdfBb3FwIN+kdqYUlnkgk6IkqJqf5gSrPuxGKHPiGfW83fwgzuh yLTEfWz8ywjOrhYvzMUCjIuOB6wfs0xQc6bXfeYfAijk+HnZimFeNH/bow6zY9+JNVAH rmHcvnhZCsAPOmlT4a2SfBwbgOAGBK4NM6K8K4EZ4s2vM7TqaWH4SkVRZBxHRRDtJk8+ 7NFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=oal98zD2Ir0qFzB3ikWmCThICKS9U3UwIlUa/SE6Qjk=; b=2ZIcpkJ1i/LTWHbPXPILpLEXPJtLVsTufiJL54ofvQmpg5QyinlZu4iO/VkhpAw6I6 QLrGszk2mosejivYSZb7EgX8pMRevPcMiUy1FOmEw8u184rkUXYs6Y2+S2R8amx3QDgB QKv+M/qH64K9uUiBRR6VwZWNtZ+JOTc0TPNio/XAFjWnsHc2Ln7ibLkFMhDvdqRtCVSP vTaf310XQQo1FxbGoBWIu+br9MheABCgDB3SbW2ic9o2qXarl0D8MBfNgPRDmRMJ1lNk 8V1F24VdX2iJYKAm8sSYjNrTasxn23BoH/5U46fefFFyF0uW1ER9Ct+z3vOUgzyKZTa9 IffA== X-Gm-Message-State: AOAM532oYH2vd2rVBHs36gp9/pR3jhsZP7NUw3O3QAVnonw9H3PiBqeb tKr3yKHdd1M6m1FGHXnArsprlWM3ftg= X-Google-Smtp-Source: ABdhPJzB2sU0ZY5tBf4d2FoR88u3SIa65h9ZP6m/OXMwxeCDHLOBl6K7WCZYq/ARlLPMiAi3TWapfw== X-Received: by 2002:a05:600c:22c7:: with SMTP id 7mr15583957wmg.58.1635951890163; Wed, 03 Nov 2021 08:04:50 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h16sm2488797wrm.27.2021.11.03.08.04.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 08:04:49 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 04/27] configure/optionrom: Fix MSYS2 multiboot.bin issue Date: Wed, 3 Nov 2021 16:04:19 +0100 Message-Id: <20211103150442.387121-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103150442.387121-1-pbonzini@redhat.com> References: <20211103150442.387121-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x329.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Helge Konetzka Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Helge Konetzka This patch enables native builds on MSYS2 with symlinks disabled. Signed-off-by: Helge Konetzka Message-Id: <2b5ab039-8495-b55f-03f1-ecfd996907a9@zapateado.de> Signed-off-by: Paolo Bonzini --- configure | 4 ++++ pc-bios/optionrom/Makefile | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 07cb7b412a..03162008aa 100755 --- a/configure +++ b/configure @@ -3963,6 +3963,10 @@ for rom in seabios; do echo "RANLIB=$ranlib" >> $config_mak done +config_mak=pc-bios/optionrom/config.mak +echo "# Automatically generated by configure - do not modify" > $config_mak +echo "TOPSRC_DIR=$source_path" >> $config_mak + if test "$skip_meson" = no; then cross="config-meson.cross.new" meson_quote() { diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index 30771f8d17..3482508a86 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -1,6 +1,5 @@ -CURRENT_MAKEFILE := $(realpath $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))) -SRC_DIR := $(dir $(CURRENT_MAKEFILE)) -TOPSRC_DIR := $(SRC_DIR)/../.. +include config.mak +SRC_DIR := $(TOPSRC_DIR)/pc-bios/optionrom VPATH = $(SRC_DIR) all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin From patchwork Wed Nov 3 15:04:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1550367 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=MMspJ3Ap; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hkr3n4M2tz9s5P for ; Thu, 4 Nov 2021 02:17:25 +1100 (AEDT) Received: from localhost ([::1]:45384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miI0x-0000hQ-Er for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2021 11:17:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miHos-0003De-Hp for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:04:55 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:36413) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miHoq-0000QL-5U for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:04:54 -0400 Received: by mail-wm1-x32d.google.com with SMTP id z11-20020a1c7e0b000000b0030db7b70b6bso4876381wmc.1 for ; Wed, 03 Nov 2021 08:04:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rY/x7hpRoGRz0iG0A3Ugf+UYpglgMHQKbJrVC4Jydts=; b=MMspJ3AphYv9qWjkT0QZbj8wwzohtqp510z4dDPolwQD/TlAaIjGqDVGfdSZwxNLD1 gQSS3DU+Vx2L8bTnGXlhLW71yIoXqARPp6w4Wx+YNDiWjUdZgnBZmTBheXEX9iaLSmQT Rb31IXEShrB5OGUd+Acoj37AtlJOYH08D+/+oWv2LQQfeCGYER+gvuBU7OiXWKCX0Cor 9h5xq7k9Lk+A9cqWqqIp6ixYAKnXfHvC7fscNIcchEfhmchz6zYA/fnVG+SmPM5HIInk /aom3WLb9ANCZLCyrn1xn+aAks5G3r7AMWhLrbcXY+185V4MqBOrXsw3ZxSrjafvFCx7 J9AQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=rY/x7hpRoGRz0iG0A3Ugf+UYpglgMHQKbJrVC4Jydts=; b=im6T0/bhxFkKonYzKydjIZhiiDyAtY2sdnw1JNLhVktUyLNSaSDBY0AfAX0Xe2FUKo Z397LwHhmSG67POhq01b4zXLUSs36978OPxwzNwfGFln9lhIgAnH7ua3yfkegb6Bxt4R XCA0bdWNhZhoHLOL5Phq4rEEJ6bn/1wrcGWbjNkp4IetkCzOFPTEe/KPue0iUWMfoo3F Zxc+MtC6dcfx7xBHdxhukr5yr7p8Ris/llZBdVIX5wVHg1Wj01ffDahdPNvY7BuAds6Z gJMoqhSfad5nuxLQ1YWsFbnBjICwn68uTTd2SXx0R/45Qt/DEkbNOYpv0cUNHYaqk5b4 Xc+A== X-Gm-Message-State: AOAM5339eBuchncgflSKPUpwhI1WDR9lrfikTSn0oIkh5yMtPR3dKpve JYvzmUppmyYlUFlOIICxDeFJS6XUypY= X-Google-Smtp-Source: ABdhPJz2mcWVaVtJ91Dr2L2r4ZaHZiSUonbHP4Mhho7MQfGvmByH79g3ZpgmRjmKUN1xMT4No0ENgA== X-Received: by 2002:a1c:f319:: with SMTP id q25mr15986225wmq.33.1635951890878; Wed, 03 Nov 2021 08:04:50 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h16sm2488797wrm.27.2021.11.03.08.04.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 08:04:50 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 05/27] util: Make some iova_tree parameters const Date: Wed, 3 Nov 2021 16:04:20 +0100 Message-Id: <20211103150442.387121-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103150442.387121-1-pbonzini@redhat.com> References: <20211103150442.387121-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32d.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Eugenio_P=C3=A9rez?= , =?utf-8?q?Philippe?= =?utf-8?q?_Mathieu-Daud=C3=A9?= , Peter Xu Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Eugenio Pérez As qemu guidelines: Unless a pointer is used to modify the pointed-to storage, give it the "const" attribute. In the particular case of iova_tree_find it allows to enforce what is requested by its comment, since the compiler would shout in case of modifying or freeing the const-qualified returned pointer. Signed-off-by: Eugenio Pérez Acked-by: Peter Xu Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20211013182713.888753-2-eperezma@redhat.com> Signed-off-by: Paolo Bonzini --- hw/i386/intel_iommu.c | 2 +- include/qemu/iova-tree.h | 8 ++++---- util/iova-tree.c | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index 75f075547f..33a8af9191 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -1105,7 +1105,7 @@ static int vtd_page_walk_one(IOMMUTLBEvent *event, vtd_page_walk_info *info) .translated_addr = entry->translated_addr, .perm = entry->perm, }; - DMAMap *mapped = iova_tree_find(as->iova_tree, &target); + const DMAMap *mapped = iova_tree_find(as->iova_tree, &target); if (event->type == IOMMU_NOTIFIER_UNMAP && !info->notify_unmap) { trace_vtd_page_walk_one_skip_unmap(entry->iova, entry->addr_mask); diff --git a/include/qemu/iova-tree.h b/include/qemu/iova-tree.h index b66cf93c4b..8249edd764 100644 --- a/include/qemu/iova-tree.h +++ b/include/qemu/iova-tree.h @@ -59,7 +59,7 @@ IOVATree *iova_tree_new(void); * * Return: 0 if succeeded, or <0 if error. */ -int iova_tree_insert(IOVATree *tree, DMAMap *map); +int iova_tree_insert(IOVATree *tree, const DMAMap *map); /** * iova_tree_remove: @@ -74,7 +74,7 @@ int iova_tree_insert(IOVATree *tree, DMAMap *map); * * Return: 0 if succeeded, or <0 if error. */ -int iova_tree_remove(IOVATree *tree, DMAMap *map); +int iova_tree_remove(IOVATree *tree, const DMAMap *map); /** * iova_tree_find: @@ -92,7 +92,7 @@ int iova_tree_remove(IOVATree *tree, DMAMap *map); * user is responsible to make sure the pointer is valid (say, no * concurrent deletion in progress). */ -DMAMap *iova_tree_find(IOVATree *tree, DMAMap *map); +const DMAMap *iova_tree_find(const IOVATree *tree, const DMAMap *map); /** * iova_tree_find_address: @@ -105,7 +105,7 @@ DMAMap *iova_tree_find(IOVATree *tree, DMAMap *map); * * Return: same as iova_tree_find(). */ -DMAMap *iova_tree_find_address(IOVATree *tree, hwaddr iova); +const DMAMap *iova_tree_find_address(const IOVATree *tree, hwaddr iova); /** * iova_tree_foreach: diff --git a/util/iova-tree.c b/util/iova-tree.c index 7990692cbd..23ea35b7a4 100644 --- a/util/iova-tree.c +++ b/util/iova-tree.c @@ -42,14 +42,14 @@ IOVATree *iova_tree_new(void) return iova_tree; } -DMAMap *iova_tree_find(IOVATree *tree, DMAMap *map) +const DMAMap *iova_tree_find(const IOVATree *tree, const DMAMap *map) { return g_tree_lookup(tree->tree, map); } -DMAMap *iova_tree_find_address(IOVATree *tree, hwaddr iova) +const DMAMap *iova_tree_find_address(const IOVATree *tree, hwaddr iova) { - DMAMap map = { .iova = iova, .size = 0 }; + const DMAMap map = { .iova = iova, .size = 0 }; return iova_tree_find(tree, &map); } @@ -60,7 +60,7 @@ static inline void iova_tree_insert_internal(GTree *gtree, DMAMap *range) g_tree_insert(gtree, range, range); } -int iova_tree_insert(IOVATree *tree, DMAMap *map) +int iova_tree_insert(IOVATree *tree, const DMAMap *map) { DMAMap *new; @@ -96,9 +96,9 @@ void iova_tree_foreach(IOVATree *tree, iova_tree_iterator iterator) g_tree_foreach(tree->tree, iova_tree_traverse, iterator); } -int iova_tree_remove(IOVATree *tree, DMAMap *map) +int iova_tree_remove(IOVATree *tree, const DMAMap *map) { - DMAMap *overlap; + const DMAMap *overlap; while ((overlap = iova_tree_find(tree, map))) { g_tree_remove(tree->tree, overlap); From patchwork Wed Nov 3 15:04:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1550343 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=cwBlsxeb; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hkqpp2t1Lz9s5P for ; Thu, 4 Nov 2021 02:06:10 +1100 (AEDT) Received: from localhost ([::1]:43090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miHq4-0003RW-7Y for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2021 11:06:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51788) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miHot-0003Dh-GB for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:04:55 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:54978) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miHos-0000SS-1h for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:04:55 -0400 Received: by mail-wm1-x331.google.com with SMTP id 71so2203726wma.4 for ; Wed, 03 Nov 2021 08:04:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gfk0HUN9ze4SJjJgo6PiF6eooVZ7u9fwxLyfj7EmvVs=; b=cwBlsxebqUmUCr/60S8o0azg/KQHAWZgRd6FwXyJhLQJVItZhbkkMdj8XxZKtd0hGA gi977r6trewOscUUHRhYKHY180BnE/4Gjhg+P9UwgItTpZ0aHmDhaFSK9+OnZoUqAisE oDJc5OzS1rFvemxtzdtCXU0PxcI8I3B8WObG3EK89kngfpupZmK4hW27g5FkOiP30bvH H36P66OufDxkXF0ZhYdWYvpGwisaMzjh1OdYxazYTbD8JNgB/LsqgxN5HLGD+diN6gyH sIuOC8EXHdAF5uK5RHUtnQwFWh7t+cQaZ9Hwp6z87z3nGrVREz8upGMNiohxoKGeqprX ZYiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=gfk0HUN9ze4SJjJgo6PiF6eooVZ7u9fwxLyfj7EmvVs=; b=tv0AOq9nDKsFNUQ8WP2e7DAzS4/Ok8FOmbRjwOmAjkdaESkGeMqdKS1oY4dWaOY+SM MzjyZCagEIsZiW5T6RbqFPbzfMYlijJLHqiHrTLK4dC9vKJruuCo7IfPb+8mZT+C0vEo 1xnNxt+Jp+3Cv++K5wLcg2T9pjXfIREBHpbV3MYU4g2BzuBv0i86NMbI7uOhcOZw1K5G D5gw3AyxJZndtR6LskMrdvTh9ku78v6qzliu8sY4942OupVPfwWPtOLOUAa5Zu/OHLMJ 4uw+jBdsSCaTyQvK0Z5xOqCeiIKTSaHfNnGGFFKt4K8nvi4PrXVWl8O3xWdeetIWcB3+ WWBQ== X-Gm-Message-State: AOAM533MRaPIPPC+cFVPvycUuxj/JRZYY+SHYnzbkqFZBppkgyloe3mN 62WeWR0Mxa/mN8l0x+EGBljExAl3lPU= X-Google-Smtp-Source: ABdhPJyqMALiwilbNNoYMzYeJpa5VvDTA4MtztEYxKVb6vMf8X+XKP9DYxHlVxqXITqRvy5JBPnsxw== X-Received: by 2002:a05:600c:3b28:: with SMTP id m40mr4556193wms.100.1635951892124; Wed, 03 Nov 2021 08:04:52 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h16sm2488797wrm.27.2021.11.03.08.04.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 08:04:51 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 06/27] MAINTAINERS: update location of microvm docs Date: Wed, 3 Nov 2021 16:04:21 +0100 Message-Id: <20211103150442.387121-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103150442.387121-1-pbonzini@redhat.com> References: <20211103150442.387121-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x331.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Alex Bennée Fixes: e8eee8d3d9 ("docs: Move microvm.rst into the system manual") Signed-off-by: Alex Bennée Message-Id: <20211012151447.4147923-1-alex.bennee@linaro.org> Signed-off-by: Paolo Bonzini --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 310a9512ea..5455ff4179 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1609,7 +1609,7 @@ microvm M: Sergio Lopez M: Paolo Bonzini S: Maintained -F: docs/microvm.rst +F: docs/system/i386/microvm.rst F: hw/i386/microvm.c F: include/hw/i386/microvm.h F: pc-bios/bios-microvm.bin From patchwork Wed Nov 3 15:04:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1550357 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=FP7s6KJ3; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HkqxK1Qwxz9s5P for ; Thu, 4 Nov 2021 02:11:49 +1100 (AEDT) Received: from localhost ([::1]:59492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miHvX-0007H8-2i for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2021 11:11:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51820) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miHou-0003Er-Db for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:04:57 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:53050) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miHos-0000Vo-D9 for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:04:56 -0400 Received: by mail-wm1-x32a.google.com with SMTP id b71so2227574wmd.2 for ; Wed, 03 Nov 2021 08:04:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h9p/+sNJF4UoADiuc/UNzSuF6N6VVZml17lGfFKsmQU=; b=FP7s6KJ378RfnbtzesYf34Bwf1bloSyHrqZHMEdV+0jfeQ80njWGbIgQL1mGu7yvG1 DT1TtKwYOKLA74VZWmMmXpHtZi3apO3LZrliSBF9Uo7FPdVEv/9MSthvZnCJOz0BjD5Q qbAmYPNG8FyxIoqdxMKHsMDiOi/4AQ+MY99Be6m+YLjAB/mrmXICVcVbZOmKHlojxyui 4cPC0F9S3rdT5Znmp7N3SclHaNmYi+zeUJHyMHVvQD0iWamuyS2BUdlBWb1RnHi76GDJ Gf8a6hDfoHDBvOW1PiHE0+MHlJdBs6FrX0oG+OhCNO4zoGSsdYIAlCceO56CafjZ9i4R weMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=h9p/+sNJF4UoADiuc/UNzSuF6N6VVZml17lGfFKsmQU=; b=cbCeEbjrVZ9ZUGgGNomUN/etf/EDTfL1xs5rA/lPVg3CmIA1aD0X+BIbviQwDl0qlx 6NpY0XwftFNEBwfz+AFdN65nvV68eRv8o1v7DnqJiW6WeJQoaqF2+LA9FAF3Day36+bT QIYa4fD4c8BFtq+VqlEAPDmFrrKgeuFyQgWcs5TjviHiyBBbEDKs2htlFkklWUCxVNky hiV2DdQX07dJsTwtZ0n9XuD4W6m5hEJCHog0b8CQna2TF9AeXZn/pdKRUPDCYEI5w0Hx lD20xA6yvtXWyGvMSo3F+hKClGF0sRyVt7CYlt3n6OdM5/iSfsvSLGoaCKFSrQeoXJGX ldoQ== X-Gm-Message-State: AOAM531jNJozUHaCiY9K9D0PJbv1qjOXBWPkVEDeWvz2QUT3VrO7EHM8 KziyPS7h48gQX+Y0Ja80NckiUDMdMMc= X-Google-Smtp-Source: ABdhPJzev8QselrK0dGt3zDRNOLK+2JbFr1olVds2zMH869DJbBYs6PqXBCmQNet/1JPrY5txMETBQ== X-Received: by 2002:a1c:48e:: with SMTP id 136mr16109495wme.21.1635951893001; Wed, 03 Nov 2021 08:04:53 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h16sm2488797wrm.27.2021.11.03.08.04.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 08:04:52 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 07/27] target/i386: move linuxboot_dma_enabled to X86MachineState Date: Wed, 3 Nov 2021 16:04:22 +0100 Message-Id: <20211103150442.387121-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103150442.387121-1-pbonzini@redhat.com> References: <20211103150442.387121-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32a.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This removes a parameter from x86_load_linux, and will avoid code duplication between the linux and multiboot cases once multiboot starts to support DMA. Signed-off-by: Paolo Bonzini --- hw/i386/microvm.c | 5 ++++- hw/i386/pc.c | 5 ++--- hw/i386/pc_piix.c | 3 ++- hw/i386/pc_q35.c | 3 ++- hw/i386/x86.c | 5 +++-- include/hw/i386/pc.h | 3 --- include/hw/i386/x86.h | 5 +++-- 7 files changed, 16 insertions(+), 13 deletions(-) diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index f257ec5a0b..837bafb64a 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -331,7 +331,7 @@ static void microvm_memory_init(MicrovmMachineState *mms) rom_set_fw(fw_cfg); if (machine->kernel_filename != NULL) { - x86_load_linux(x86ms, fw_cfg, 0, true, true); + x86_load_linux(x86ms, fw_cfg, 0, true); } if (mms->option_roms) { @@ -667,6 +667,7 @@ static void microvm_machine_initfn(Object *obj) static void microvm_class_init(ObjectClass *oc, void *data) { + X86MachineClass *x86mc = X86_MACHINE_CLASS(oc); MachineClass *mc = MACHINE_CLASS(oc); HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc); @@ -697,6 +698,8 @@ static void microvm_class_init(ObjectClass *oc, void *data) hc->unplug_request = microvm_device_unplug_request_cb; hc->unplug = microvm_device_unplug_cb; + x86mc->fwcfg_dma_enabled = true; + object_class_property_add(oc, MICROVM_MACHINE_PIC, "OnOffAuto", microvm_machine_get_pic, microvm_machine_set_pic, diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 86223acfd3..d203db7845 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -775,7 +775,7 @@ void xen_load_linux(PCMachineState *pcms) rom_set_fw(fw_cfg); x86_load_linux(x86ms, fw_cfg, pcmc->acpi_data_size, - pcmc->pvh_enabled, pcmc->linuxboot_dma_enabled); + pcmc->pvh_enabled); for (i = 0; i < nb_option_roms; i++) { assert(!strcmp(option_rom[i].name, "linuxboot.bin") || !strcmp(option_rom[i].name, "linuxboot_dma.bin") || @@ -927,7 +927,7 @@ void pc_memory_init(PCMachineState *pcms, if (linux_boot) { x86_load_linux(x86ms, fw_cfg, pcmc->acpi_data_size, - pcmc->pvh_enabled, pcmc->linuxboot_dma_enabled); + pcmc->pvh_enabled); } for (i = 0; i < nb_option_roms; i++) { @@ -1664,7 +1664,6 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) /* BIOS ACPI tables: 128K. Other BIOS datastructures: less than 4K reported * to be used at the moment, 32K should be enough for a while. */ pcmc->acpi_data_size = 0x20000 + 0x8000; - pcmc->linuxboot_dma_enabled = true; pcmc->pvh_enabled = true; pcmc->kvmclock_create_always = true; assert(!mc->get_hotplug_handler); diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 6ad0d763c5..223dd3e05d 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -620,11 +620,12 @@ DEFINE_I440FX_MACHINE(v2_7, "pc-i440fx-2.7", NULL, static void pc_i440fx_2_6_machine_options(MachineClass *m) { + X86MachineClass *x86mc = X86_MACHINE_CLASS(m); PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_i440fx_2_7_machine_options(m); pcmc->legacy_cpu_hotplug = true; - pcmc->linuxboot_dma_enabled = false; + x86mc->fwcfg_dma_enabled = false; compat_props_add(m->compat_props, hw_compat_2_6, hw_compat_2_6_len); compat_props_add(m->compat_props, pc_compat_2_6, pc_compat_2_6_len); } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index fcc6e4eb2b..797e09500b 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -573,11 +573,12 @@ DEFINE_Q35_MACHINE(v2_7, "pc-q35-2.7", NULL, static void pc_q35_2_6_machine_options(MachineClass *m) { + X86MachineClass *x86mc = X86_MACHINE_CLASS(m); PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_q35_2_7_machine_options(m); pcmc->legacy_cpu_hotplug = true; - pcmc->linuxboot_dma_enabled = false; + x86mc->fwcfg_dma_enabled = false; compat_props_add(m->compat_props, hw_compat_2_6, hw_compat_2_6_len); compat_props_add(m->compat_props, pc_compat_2_6, pc_compat_2_6_len); } diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 76de7e2265..a34498fe16 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -764,9 +764,9 @@ static bool load_elfboot(const char *kernel_filename, void x86_load_linux(X86MachineState *x86ms, FWCfgState *fw_cfg, int acpi_data_size, - bool pvh_enabled, - bool linuxboot_dma_enabled) + bool pvh_enabled) { + bool linuxboot_dma_enabled = X86_MACHINE_GET_CLASS(x86ms)->fwcfg_dma_enabled; uint16_t protocol; int setup_size, kernel_size, cmdline_size; int dtb_size, setup_data_offset; @@ -1332,6 +1332,7 @@ static void x86_machine_class_init(ObjectClass *oc, void *data) mc->possible_cpu_arch_ids = x86_possible_cpu_arch_ids; x86mc->compat_apic_id_mode = false; x86mc->save_tsc_khz = true; + x86mc->fwcfg_dma_enabled = true; nc->nmi_monitor_handler = x86_nmi; object_class_property_add(oc, X86_MACHINE_SMM, "OnOffAuto", diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 11426e26dc..9162aded21 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -116,9 +116,6 @@ struct PCMachineClass { /* generate legacy CPU hotplug AML */ bool legacy_cpu_hotplug; - /* use DMA capable linuxboot option rom */ - bool linuxboot_dma_enabled; - /* use PVH to load kernels that support this feature */ bool pvh_enabled; diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h index 23267a3674..bb1cfb8896 100644 --- a/include/hw/i386/x86.h +++ b/include/hw/i386/x86.h @@ -38,6 +38,8 @@ struct X86MachineClass { bool save_tsc_khz; /* Enables contiguous-apic-ID mode */ bool compat_apic_id_mode; + /* use DMA capable linuxboot option rom */ + bool fwcfg_dma_enabled; }; struct X86MachineState { @@ -120,8 +122,7 @@ void x86_bios_rom_init(MachineState *ms, const char *default_firmware, void x86_load_linux(X86MachineState *x86ms, FWCfgState *fw_cfg, int acpi_data_size, - bool pvh_enabled, - bool linuxboot_dma_enabled); + bool pvh_enabled); bool x86_machine_is_smm_enabled(const X86MachineState *x86ms); bool x86_machine_is_acpi_enabled(const X86MachineState *x86ms); From patchwork Wed Nov 3 15:04:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1550347 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=ENYO9Xug; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hkqtm3z0Dz9s5P for ; Thu, 4 Nov 2021 02:09:36 +1100 (AEDT) Received: from localhost ([::1]:52478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miHtO-00028H-CP for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2021 11:09:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miHov-0003Ex-Nn for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:04:59 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:36419) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miHot-0000WP-IX for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:04:57 -0400 Received: by mail-wm1-x333.google.com with SMTP id z11-20020a1c7e0b000000b0030db7b70b6bso4876532wmc.1 for ; Wed, 03 Nov 2021 08:04:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0vUABkOdW3n1O+J/YlCSi4LCn6CSZ6NW/xi0cwG+LLU=; b=ENYO9XugqQnXFLUZWu1Vof9bxWLl3mYJyQ22eeb9TbCm1GMs9IBPxzkOFYoH9jlWD2 aY+HLtD9U9HeLHvyAYCu7U4Htv8wb702gVfyn39QndcPEQNpgpd9N1BlBmCuyZfn3vdr aJNmjad6lKc48660djzACkskNyyc8rBWC28YFHYH5zIh+cO2LgdGilCcmWiugKW0OkQK QeY3+RWlRfZoYcVOHvMY2gN6YgRGkuljZS2OckRBx3+ZJBsv01cPAgn1x/jFvB8/KwX0 qnqwib2YH6dx69XvgTLX8rBM8lfO4FiZIg3WcT3oUoFuh85giE74tLQKbGhIXHtwkIKO IODQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0vUABkOdW3n1O+J/YlCSi4LCn6CSZ6NW/xi0cwG+LLU=; b=wuhOLQN72Myv1e/klqtjE1gxYLYdGa+LdGoaxRi6Uy7DA8I1W2MwrAJROR8JD3qaMh YEG7TxKJE5g/fbysIp3oTWIupq2o7rsgmvfyL0kFFX4OkMGBg7q5WmlRSw6mNfFlIaVB Ra3stGxVX4dO7ibKry3HACdD9JAKLiv+eRKCCwtmPgfuovvfg98yYHv9z3p4geh8PjfE xmwmgUx3eiDKIQPKDLrDxca9XSn3OdADmTUcahFGbcMRfk17wcxkoWRQccSaPUcgg3Vg icgUYScfHd3O7iTBnBDzY4cA/ZQeHPyOjvLVHUTxNeJXRPr/CFnAb5mp7DuDoUOrPxIT YaPQ== X-Gm-Message-State: AOAM531w8jS4a0T83c/bFLuvcFsRhaW2StEDWyaU/qqPL3w7jBobcZbz yxb7otjwSsT0Bw44PB8rD/OcX2aF9zA= X-Google-Smtp-Source: ABdhPJxjSIq+5xaAbzjNU/4b3drnww3yzy4+R6mw0UDSk14QWHoGfKJYb511DGqIxhSTo3DEaLCZxA== X-Received: by 2002:a05:600c:3b27:: with SMTP id m39mr16460159wms.132.1635951894262; Wed, 03 Nov 2021 08:04:54 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h16sm2488797wrm.27.2021.11.03.08.04.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 08:04:53 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 08/27] optionrom: add a DMA-enabled multiboot ROM Date: Wed, 3 Nov 2021 16:04:23 +0100 Message-Id: <20211103150442.387121-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103150442.387121-1-pbonzini@redhat.com> References: <20211103150442.387121-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x333.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Lackorzynski , =?utf-8?q?Marcus_H=C3=A4hnel?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marcus Hähnel Add a new option rom for the multiboot loader, using DMA transfers to copy data instead of "rep insb". This significantly lowers QEMU's startup latency by a factor of about 40, for example, going from 30sec to 0.8sec when loading modules of 120MB in size. Signed-off-by: Marcus Hähnel Signed-off-by: Adam Lackorzynski [Modified to keep the non-DMA code depending on #ifdef USE_FW_CFG_DMA; do not write below stack. - Paolo] Signed-off-by: Paolo Bonzini --- pc-bios/meson.build | 1 + pc-bios/multiboot_dma.bin | Bin 0 -> 1024 bytes pc-bios/optionrom/Makefile | 4 +- pc-bios/optionrom/multiboot.S | 4 +- pc-bios/optionrom/multiboot_dma.S | 2 + pc-bios/optionrom/optionrom.h | 66 ++++++++++++++++++++++++++++++ 6 files changed, 72 insertions(+), 5 deletions(-) create mode 100644 pc-bios/multiboot_dma.bin create mode 100644 pc-bios/optionrom/multiboot_dma.S diff --git a/pc-bios/meson.build b/pc-bios/meson.build index a44c9bc127..b40ff3f2bd 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -63,6 +63,7 @@ blobs = files( 'petalogix-s3adsp1800.dtb', 'petalogix-ml605.dtb', 'multiboot.bin', + 'multiboot_dma.bin', 'linuxboot.bin', 'linuxboot_dma.bin', 'kvmvapic.bin', diff --git a/pc-bios/multiboot_dma.bin b/pc-bios/multiboot_dma.bin new file mode 100644 index 0000000000000000000000000000000000000000..c0e2c3102a3358207c61d3ae113524fb6007abc3 GIT binary patch literal 1024 zcmd^-v1=1i9LIlmUTlcNU1}{N5`u&{DAHSmq6iKdix;GHRxaNnR0AR{3q;@~8~^LMo;4s!p158nI!-tWur_ul*P<{!&% z=%3>xm5f`4Bq!!)`Rkwf;(oFd*qcAb=mhXX1)X>Bw-tylkUpR_ETXkH1AnO4L$nJ| zWJui_M1kmKmTID)P`mI^=HM`~{VB1t1l_Ye=Lor4X5{8Gd)zzw_o4<6zLQJ!drMolrKNZG2Z|kTOyaJIhYFc^ zFhhuQ9`r5fQLCrm#T4^_QylQ>8kgs;ZX9bIEiXb`8AIxu;?h~d%9izBkKht%WM1G* z^E{W9(OT9dt5in2qF}|dPH>dL>{=sV#-U1yFoWnOtw14D$&k*SUtsT%wS`ki@#&rUrnmtuDv`PtJm(Kg?H$Pdc0CL@YCy4R X-Patchwork-Id: 1550359 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=aDJDFt9v; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hkqxy0QJjz9s5P for ; Thu, 4 Nov 2021 02:12:22 +1100 (AEDT) Received: from localhost ([::1]:32790 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miHw3-0008SO-SX for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2021 11:12:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miHox-0003F7-6p for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:04:59 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:47057) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miHou-0000Wl-Au for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:04:57 -0400 Received: by mail-wr1-x436.google.com with SMTP id u1so4003954wru.13 for ; Wed, 03 Nov 2021 08:04:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=X3SQejK3WrW99drRT37J6slxXvRt4OUdqxEbD8zahlg=; b=aDJDFt9v1+RcZiKtqsoEBmYIieOev04Tp0utKurWGzEuxy4AJTA7ktgcKQvMRM3Yiu 9lhusLXQ+fdpnbPiz/xNmBdazhVN1PxHaMLGvWHdJpsxMO+rZVJp1YfJyuC/GsjrQxim CGZueNjHc+DKWSOxBp7Ww5H+ga51x3qO4wVEHsM5NbhjShix+7WhkkuCNDgSj7Jxt7ph EALMVjSm4x/zSijApvgNNPuZZHF2eOE/DDGPn+JFDnhpqsvEpw98E1IdWxbbh/n8AnY0 cLkAU2pMVcWZJkwHYRqABuCMSqEYXoOCa9azhld9ISQKff3EaRYXppyto9PdKGU0Hqa5 RI1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=X3SQejK3WrW99drRT37J6slxXvRt4OUdqxEbD8zahlg=; b=cHcodyFSI+FLw2txzMHYBPR+SIuq/U7LNYk5U6P3Kktu9Lk49fQZPg+ydEy41jfhvz +drxhYLDjoigRAF/tkytQ/4WFYd2HqdimcSliVcf33A/tG51k3BacvacEXCt9Az4atxP 1Vne9+Bes4pPLCjT1fp0lWwciEhjD5waqG5c9mkyKR/dQzLzTmzwghTQcGOcgR6B/f6c 8Dy+canLa2aZeaxNODvWgLtCmx6zVneWkStpvpZh5ETDATM3bJmo7oFjiM6BO9s2PGKL aEMLDTTZ60stIcRKwKAt5zv5igRccrQoW5jXz54bcfrZnWoWgYQzE+FTg7vcfqXMqqfc lF6A== X-Gm-Message-State: AOAM531Uy2F5QFHc5jHDTqUxcPrpj+WV3pSLzuWvSywUahVpJUjl3nFT eErvkL3UuLXy3NXTKelrPEzPITCs3Io= X-Google-Smtp-Source: ABdhPJwd7dvaNuu6a5rIZebUX+VaBjqRVE9wPspIUXtIeP/h4jdcEr1rjZuUPgxCuFoJ+FjrwlBKtg== X-Received: by 2002:adf:ef52:: with SMTP id c18mr36563197wrp.162.1635951894854; Wed, 03 Nov 2021 08:04:54 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h16sm2488797wrm.27.2021.11.03.08.04.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 08:04:54 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 09/27] target/i386: use DMA-enabled multiboot ROM for new-enough QEMU machine types Date: Wed, 3 Nov 2021 16:04:24 +0100 Message-Id: <20211103150442.387121-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103150442.387121-1-pbonzini@redhat.com> References: <20211103150442.387121-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x436.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" As long as fw_cfg supports DMA, the new ROM can be used also on older machine types because it has the same size as the existing one. Signed-off-by: Paolo Bonzini --- hw/i386/multiboot.c | 10 ++++++++-- hw/i386/multiboot.h | 4 +++- hw/i386/pc.c | 3 ++- hw/i386/x86.c | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c index 9e7d69d470..0a10089f14 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c @@ -143,7 +143,8 @@ static void mb_add_mod(MultibootState *s, s->mb_mods_count++; } -int load_multiboot(FWCfgState *fw_cfg, +int load_multiboot(X86MachineState *x86ms, + FWCfgState *fw_cfg, FILE *f, const char *kernel_filename, const char *initrd_filename, @@ -151,6 +152,7 @@ int load_multiboot(FWCfgState *fw_cfg, int kernel_file_size, uint8_t *header) { + bool multiboot_dma_enabled = X86_MACHINE_GET_CLASS(x86ms)->fwcfg_dma_enabled; int i, is_multiboot = 0; uint32_t flags = 0; uint32_t mh_entry_addr; @@ -401,7 +403,11 @@ int load_multiboot(FWCfgState *fw_cfg, fw_cfg_add_bytes(fw_cfg, FW_CFG_INITRD_DATA, mb_bootinfo_data, sizeof(bootinfo)); - option_rom[nb_option_roms].name = "multiboot.bin"; + if (multiboot_dma_enabled) { + option_rom[nb_option_roms].name = "multiboot_dma.bin"; + } else { + option_rom[nb_option_roms].name = "multiboot.bin"; + } option_rom[nb_option_roms].bootindex = 0; nb_option_roms++; diff --git a/hw/i386/multiboot.h b/hw/i386/multiboot.h index 60de309cd1..2b9182a8ea 100644 --- a/hw/i386/multiboot.h +++ b/hw/i386/multiboot.h @@ -2,8 +2,10 @@ #define QEMU_MULTIBOOT_H #include "hw/nvram/fw_cfg.h" +#include "hw/i386/x86.h" -int load_multiboot(FWCfgState *fw_cfg, +int load_multiboot(X86MachineState *x86ms, + FWCfgState *fw_cfg, FILE *f, const char *kernel_filename, const char *initrd_filename, diff --git a/hw/i386/pc.c b/hw/i386/pc.c index d203db7845..fcfb7f7139 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -780,7 +780,8 @@ void xen_load_linux(PCMachineState *pcms) assert(!strcmp(option_rom[i].name, "linuxboot.bin") || !strcmp(option_rom[i].name, "linuxboot_dma.bin") || !strcmp(option_rom[i].name, "pvh.bin") || - !strcmp(option_rom[i].name, "multiboot.bin")); + !strcmp(option_rom[i].name, "multiboot.bin") || + !strcmp(option_rom[i].name, "multiboot_dma.bin")); rom_add_option(option_rom[i].name, option_rom[i].bootindex); } x86ms->fw_cfg = fw_cfg; diff --git a/hw/i386/x86.c b/hw/i386/x86.c index a34498fe16..b84840a1bb 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -814,7 +814,7 @@ void x86_load_linux(X86MachineState *x86ms, * PVH), so we try multiboot first since we check the multiboot magic * header before to load it. */ - if (load_multiboot(fw_cfg, f, kernel_filename, initrd_filename, + if (load_multiboot(x86ms, fw_cfg, f, kernel_filename, initrd_filename, kernel_cmdline, kernel_size, header)) { return; } From patchwork Wed Nov 3 15:04:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1550363 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=XQzmtp8g; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hkr1G6l1tz9s5P for ; Thu, 4 Nov 2021 02:15:14 +1100 (AEDT) Received: from localhost ([::1]:39634 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miHyq-00054I-Ox for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2021 11:15:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51912) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miHoy-0003GX-1i for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:00 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:40653) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miHov-0000Wv-DL for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:04:59 -0400 Received: by mail-wm1-x32e.google.com with SMTP id j128-20020a1c2386000000b003301a98dd62so4845607wmj.5 for ; Wed, 03 Nov 2021 08:04:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GCgK4CE3camX8jKly35z9f0qOVDoSg2DiZBY0UgLY9A=; b=XQzmtp8gMyb9o3UVaVtgpja9xReaw70MIP7ZBfvvWgI+rCbgJ/91ina0MNpvdicYHG dQXOOyIxZ4yI+Etj0BvtrMdadv8CH+ryP+VGoyrXdbRacUSTAVR79Ud6HPC9As31mv9K DW+MvzrCRLUKOvLLA8s7dIvtAEUdQ+ySxkYwOA4TNQ0wGdzhxcHk3Y58DIVGKhZIDlzq 0z8fL0xgK/VA+DjewqxQPXTK5oqSW+zUien43Y2dqbyMQDR4zIWJe0mwBmtknBiFGZGL 8Ddznijg8aeZrn1i1Kg23cvKzlkW9bBprQjuEiRtptMbR05hwXxW5dsji02m/dUUx6lt XNbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=GCgK4CE3camX8jKly35z9f0qOVDoSg2DiZBY0UgLY9A=; b=M0HxYi8m3/KQR7ptNfdyzn1yZ5FLd4KE5Uu9gyt4Het5/rJOAXO1KcK0IRBiJiTiOb RISASxQOCJEd/4c3wMBFOEvp0gfRlNic6bpyXlIMfNXfOeOPQO3lGT1+sIT8LPAQBx6q CYcn3ZJeu15L35SO1MJvOXIe9+opR5Tg7FK7IH6PEAbz6mdS2L5TENw5HOrjcRDTYVL2 a1dxj0h0QyEa4lcdnw0e61600WStXJD00EwLIHZHNnnL/67y+TTND4BrQw4cZkOF+zm5 OqBFI5418s2oW1I3kVBf30czzDPDQoiFXDcMETvfdaaIvdMU0Xq3Hi53xogWlNhhDdnu hNBg== X-Gm-Message-State: AOAM531VDxkEvqj11tqnNU4SIO00ASDeWowq0Gg50Mu0h/XcftGs5UIF sMaRXayskIUfCFvy00rr5SX//ZVrAr4= X-Google-Smtp-Source: ABdhPJzrjcuPx5Q2AKoilaDiXnxttZJtuT4HJnzL7XEFjmRC4F4MPd+zpZEaXKwetDdNjGsx3OEjkw== X-Received: by 2002:a1c:790d:: with SMTP id l13mr13225001wme.101.1635951895588; Wed, 03 Nov 2021 08:04:55 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h16sm2488797wrm.27.2021.11.03.08.04.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 08:04:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 10/27] configure: remove useless NPTL probe Date: Wed, 3 Nov 2021 16:04:25 +0100 Message-Id: <20211103150442.387121-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103150442.387121-1-pbonzini@redhat.com> References: <20211103150442.387121-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32e.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Using a linuxthreads system with a recent QEMU will have bigger problems than just not having NPTL. Remove the unnecessary check. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- configure | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/configure b/configure index 03162008aa..b5c36347eb 100755 --- a/configure +++ b/configure @@ -1994,25 +1994,6 @@ if ! has "$pkg_config_exe"; then error_exit "pkg-config binary '$pkg_config_exe' not found" fi -########################################## -# NPTL probe - -if test "$linux_user" = "yes"; then - cat > $TMPC < -#include -int main(void) { -#if !defined(CLONE_SETTLS) || !defined(FUTEX_WAIT) -#error bork -#endif - return 0; -} -EOF - if ! compile_object ; then - feature_not_found "nptl" "Install glibc and linux kernel headers." - fi -fi - ########################################## # xen probe From patchwork Wed Nov 3 15:04:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1550365 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=ctEuR1VM; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hkr200nmwz9s5P for ; Thu, 4 Nov 2021 02:15:52 +1100 (AEDT) Received: from localhost ([::1]:41178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miHzR-0006Au-UB for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2021 11:15:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51914) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miHoz-0003GZ-30 for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:01 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:46078) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miHov-0000XZ-Ld for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:04:59 -0400 Received: by mail-wr1-x429.google.com with SMTP id o14so4006715wra.12 for ; Wed, 03 Nov 2021 08:04:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=u7iqy7Uf8mq7g7Jz4N88Qi8VKXab3PvmqBI8z9TAMeA=; b=ctEuR1VMd3kGKF+YZfO7SnhfkETlZM3+28iHcsSi/yXT56NRIDNxD4KRDEjkBMEsMo S7l9ZIPTXFTD0tfnwdAcOyI+8FuxS+K6oO3zmBo3ehQQP9eKYaYfbjFd16JwIXzgMKlv 78DyyVliaDtL2v1LeiOrXPSKuF92wh79MZ92Uo4B/gY63Smk3fsrCHpogpBwzqCfZArx XE1yQcakx1CCokoA4i4izKfhe7kipCjrbfVepb5sF0svqo+mOLGiaE9dAuXBg7VbjXV9 2+uBZnjTRt8w3OtBIsQrDMQVzggql6GSVW4PRIN45YRwMpDv3efmE2zCsNnhyXkfqJ0I Kbkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=u7iqy7Uf8mq7g7Jz4N88Qi8VKXab3PvmqBI8z9TAMeA=; b=vrW+6aqtXuJT4Nfylqiox4eczaPey7daaZ2trwn32kIsMrz0AzAUzzn41aYgHSD08X EGf1QSGspZ4kKNWge6jRtVwWxyO5c8BPOeSxcV1dnFJnF56lQv9A/aATpvqNyrOI7gjl rif5bOhMpIQkR61I9/Lsb+Q5scKFeiooRBUtHOVfVRQhcU6T0LaWdjUHEUK6sCc2+vTH 5/scE+WjUy2ZqpwmIhYEykIlXq/jdPkncyEHCTmTYcv0MMmeHcoyp+8UvZGECyk0pcv0 pAI5u95rpO12eARM/RMTVFODa2vJAeKweGBqw+0tryNnaagOpti7bqm+9mlna7YtI1Fs eigw== X-Gm-Message-State: AOAM530ZVpWi+NTztYmewdWcGeW0leQs2IHKU/jvFzzq4FD/DY2J94Pp 3cjbxv1w9v16tN1oqlQN7e7yFrZ2k/M= X-Google-Smtp-Source: ABdhPJxbvBmUxl3cBdkAysEZBFX3Q7wGZ+tnuJ9aynLV06xCHP0oDf/Q5YoEegf6LCO+e+kD6LI9FA== X-Received: by 2002:adf:fe8e:: with SMTP id l14mr21288691wrr.177.1635951896432; Wed, 03 Nov 2021 08:04:56 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h16sm2488797wrm.27.2021.11.03.08.04.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 08:04:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 11/27] configure: do not duplicate CPU_CFLAGS into QEMU_LDFLAGS Date: Wed, 3 Nov 2021 16:04:26 +0100 Message-Id: <20211103150442.387121-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103150442.387121-1-pbonzini@redhat.com> References: <20211103150442.387121-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x429.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Since commit 4dba2789084 ("configure, meson: move CPU_CFLAGS out of QEMU_CFLAGS"), CPU_CFLAGS is included in the link commands both during configure and (via config-meson.cross) during meson. It need not be added separately to QEMU_LDFLAGS. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Paolo Bonzini --- configure | 53 ++++++++++++++--------------------------------------- 1 file changed, 14 insertions(+), 39 deletions(-) diff --git a/configure b/configure index b5c36347eb..c0018a304f 100755 --- a/configure +++ b/configure @@ -1263,45 +1263,20 @@ firmwarepath="${firmwarepath:-$datadir/qemu-firmware}" localedir="${localedir:-$datadir/locale}" case "$cpu" in - ppc) - CPU_CFLAGS="-m32" - QEMU_LDFLAGS="-m32 $QEMU_LDFLAGS" - ;; - ppc64) - CPU_CFLAGS="-m64" - QEMU_LDFLAGS="-m64 $QEMU_LDFLAGS" - ;; - sparc) - CPU_CFLAGS="-m32 -mv8plus -mcpu=ultrasparc" - QEMU_LDFLAGS="-m32 -mv8plus $QEMU_LDFLAGS" - ;; - sparc64) - CPU_CFLAGS="-m64 -mcpu=ultrasparc" - QEMU_LDFLAGS="-m64 $QEMU_LDFLAGS" - ;; - s390) - CPU_CFLAGS="-m31" - QEMU_LDFLAGS="-m31 $QEMU_LDFLAGS" - ;; - s390x) - CPU_CFLAGS="-m64" - QEMU_LDFLAGS="-m64 $QEMU_LDFLAGS" - ;; - i386) - CPU_CFLAGS="-m32" - QEMU_LDFLAGS="-m32 $QEMU_LDFLAGS" - ;; - x86_64) - # ??? Only extremely old AMD cpus do not have cmpxchg16b. - # If we truly care, we should simply detect this case at - # runtime and generate the fallback to serial emulation. - CPU_CFLAGS="-m64 -mcx16" - QEMU_LDFLAGS="-m64 $QEMU_LDFLAGS" - ;; - x32) - CPU_CFLAGS="-mx32" - QEMU_LDFLAGS="-mx32 $QEMU_LDFLAGS" - ;; + ppc) CPU_CFLAGS="-m32" ;; + ppc64) CPU_CFLAGS="-m64" ;; + sparc) CPU_CFLAGS="-m32 -mv8plus -mcpu=ultrasparc" ;; + sparc64) CPU_CFLAGS="-m64 -mcpu=ultrasparc" ;; + s390) CPU_CFLAGS="-m31" ;; + s390x) CPU_CFLAGS="-m64" ;; + i386) CPU_CFLAGS="-m32" ;; + x32) CPU_CFLAGS="-mx32" ;; + + # ??? Only extremely old AMD cpus do not have cmpxchg16b. + # If we truly care, we should simply detect this case at + # runtime and generate the fallback to serial emulation. + x86_64) CPU_CFLAGS="-m64 -mcx16" ;; + # No special flags required for other host CPUs esac From patchwork Wed Nov 3 15:04:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1550346 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=NJdhe7sx; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hkqsw42TJz9s5P for ; Thu, 4 Nov 2021 02:08:52 +1100 (AEDT) Received: from localhost ([::1]:51710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miHsg-0001Wd-FD for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2021 11:08:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51944) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miHp0-0003IY-GC for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:02 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:40658) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miHox-0000Xx-Mj for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:02 -0400 Received: by mail-wm1-x333.google.com with SMTP id j128-20020a1c2386000000b003301a98dd62so4845707wmj.5 for ; Wed, 03 Nov 2021 08:04:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Feie4aaYvBPPX4NGQ+HI7Tuz8JeaxPU1QKcXUDGysRQ=; b=NJdhe7sxtXBku4RUMW/0SMRJ5mbYcP9xF6jFleL3Gn0q/trL6rp4Wc+AEbj3VjiQ5c k0TLHweIiy4/pfvFjlH0DzcXMOkFizDcfre1HnVXTA5QKHET/eUlNWohTXR23q0jP2p4 d7v0u9vDcuN6X1VmRUjqfFHB98iPGXiAnC2vKnTzhdrAI0qskg/LnKSxgQmyQ1XyVo89 ToTXtd7JpWgyUAjIti170MAORvf5iVPrqejwtpq2W+CDu5hvFvAbC5z11LQXR9UqxM2/ Ymdq8axeCURlhKacos+2JDiPFbo7aZpHjB5Yega0FHeRTiqADG4iWkmcsEu2i0wIxGmX LiYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Feie4aaYvBPPX4NGQ+HI7Tuz8JeaxPU1QKcXUDGysRQ=; b=LWrA0oWYt5IffnDPOsTehVpljP7SQNd1YwmNKE3c3BStFUzMz+Yt/K611lh2Ui9AD8 6p50LDfBofuzBUAfMLbK2GtEdxHParG5fvJkREGvFZVoCPpWBBA3AZ6lUndtzE32bjav /OgRxMD9DRTKjw2TVQTeM3qAuYm3KKEvB7ZIyj6nim04hRzp5SS1Prpx+EMxno0Syl66 +tiJGReETAWuRVLd8URiHIh0+R/tbq1qNpyW+gYlBI88FTOdaxlavqFBJyXpSWAY93aD urelrcGR+BHLEIkFpzaX6u9WHPINmXxrhd5d6jkgiJ00iarQfzX6wecde70ZQ9Q/31SV OmWw== X-Gm-Message-State: AOAM533MVngp9T6NsR6bMSWim0Xd9Wj4t7++szaaVie/k0Mk999Je5d6 PJp5jqtCS0fnV9Vk2pusOGCaNSTrRUc= X-Google-Smtp-Source: ABdhPJzd+JjzSQ/YbMbkBVb4dehXnsBugXvQ+9YLr15hwT+6AttlPdem9jcbBa5zPfda6B8idscSOQ== X-Received: by 2002:a05:600c:4fd4:: with SMTP id o20mr15525073wmq.175.1635951898161; Wed, 03 Nov 2021 08:04:58 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h16sm2488797wrm.27.2021.11.03.08.04.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 08:04:57 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 12/27] hvf: Avoid mapping regions < PAGE_SIZE as ram Date: Wed, 3 Nov 2021 16:04:27 +0100 Message-Id: <20211103150442.387121-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103150442.387121-1-pbonzini@redhat.com> References: <20211103150442.387121-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x333.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexander Graf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Alexander Graf HVF has generic memory listener code that adds all RAM regions as HVF RAM regions. However, HVF can only handle page aligned, page granule regions. So let's ignore regions that are not page aligned and sized. They will be trapped as MMIO instead. Signed-off-by: Alexander Graf Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20211025132147.28308-1-agraf@csgraf.de> Signed-off-by: Paolo Bonzini --- accel/hvf/hvf-accel-ops.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/accel/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c index 2b2c411076..54457c76c2 100644 --- a/accel/hvf/hvf-accel-ops.c +++ b/accel/hvf/hvf-accel-ops.c @@ -122,6 +122,7 @@ static void hvf_set_phys_mem(MemoryRegionSection *section, bool add) MemoryRegion *area = section->mr; bool writeable = !area->readonly && !area->rom_device; hv_memory_flags_t flags; + uint64_t page_size = qemu_real_host_page_size; if (!memory_region_is_ram(area)) { if (writeable) { @@ -135,6 +136,12 @@ static void hvf_set_phys_mem(MemoryRegionSection *section, bool add) } } + if (!QEMU_IS_ALIGNED(int128_get64(section->size), page_size) || + !QEMU_IS_ALIGNED(section->offset_within_address_space, page_size)) { + /* Not page aligned, so we can not map as RAM */ + add = false; + } + mem = hvf_find_overlap_slot( section->offset_within_address_space, int128_get64(section->size)); From patchwork Wed Nov 3 15:04:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1550374 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=RU+tuUJp; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hkr7x2jGCz9s5P for ; Thu, 4 Nov 2021 02:21:01 +1100 (AEDT) Received: from localhost ([::1]:60556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miI4R-0002g3-6c for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2021 11:20:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52136) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miHp8-0003UY-TN; Wed, 03 Nov 2021 11:05:12 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:43534) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miHoz-0000YY-Mx; Wed, 03 Nov 2021 11:05:10 -0400 Received: by mail-wr1-x42b.google.com with SMTP id t30so4023620wra.10; Wed, 03 Nov 2021 08:05:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rnSjJep00PuWrOp9q/49ZO8vTrCgwf3MZFCi6UASDb4=; b=RU+tuUJp+V8KINeMxy4e7TN7PJ6Mw9ZQ3n+xB8KTEsVv29nLMsQhD1Dk6y+fBnPOzm IHkNVN+i6chyZN2gGQh309VtmuIe/n1m0JSyVbkqv6upUFc0VMgcFmBMtdFZMV616x1B CJJOtTbltL3m3INnSpQQ3mizzENssJB/9yBBOEuI6o54ImI1lsM6+UFT25X7/1noLqRz DFqaqrithXsMzlpgHVpYSglY3ohmTkOO7IzHYcfPN+ZIZdhzWP/8Pq29f+GNw43WxI+f IaSPXYB8PeMFqohOFumPncTB27mgx8swNSW73vkcQeuPBas6zdB0bBeufhGnNIpv8jXO eJkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=rnSjJep00PuWrOp9q/49ZO8vTrCgwf3MZFCi6UASDb4=; b=AW5KEFje3Cu5sEOyWSSOv53KZp05VR2gbm+lAhU0RL0OnhwCk50Jz7gr/CMzAMiNT0 WYubnDOgPbzpQ4t7q32UaO8BPATitL0fCNhfW2KvT4UM/XpU0PT4iqDuvxBfNjEbiDj7 MQ5fxHSEgNHQOa0QLgviBD8lTS9NFMoe5WKi6dQgsRpcExK6ebTRcR4kTFIxrSn8s29t y9Z7RK/keBVxq8s0U9CfYn9m0PyzRkUGcHVoB3zEXFuDn4k8fBjEoBtIEmRaQhFLdxoN p0PevzAWq46ZNaOBLnSooTx9pD9USJWFjyRMAMnNSMdaAI24rnwkL3/xcDP9cZ0iJqgx 4keg== X-Gm-Message-State: AOAM530Pg9EtcguRYpnDRnF/rSYvee7hiM7Gg36ctbopSzkA8Q4rizkZ 4sPre1a23knr5JW9Fd4zBNAqOPrmQF4= X-Google-Smtp-Source: ABdhPJwpQb3VeeL9lYJPpHbPwOb/DwkAW2v05V57R5YIwxny+N/zhOgMv/e8FjfrYUtV4nzkTcZLOQ== X-Received: by 2002:a5d:6449:: with SMTP id d9mr30395276wrw.332.1635951899677; Wed, 03 Nov 2021 08:04:59 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h16sm2488797wrm.27.2021.11.03.08.04.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 08:04:59 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 13/27] hw/i386: Rename default_bus_bypass_iommu Date: Wed, 3 Nov 2021 16:04:28 +0100 Message-Id: <20211103150442.387121-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103150442.387121-1-pbonzini@redhat.com> References: <20211103150442.387121-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42b.google.com X-Spam_score_int: -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, T_SPF_TEMPERROR=0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jean-Philippe Brucker , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , qemu-stable@nongnu.org, Eric Auger Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Jean-Philippe Brucker Since commit d8fb7d0969d5 ("vl: switch -M parsing to keyval"), machine parameter definitions cannot use underscores, because keyval_dashify() transforms them to dashes and the parser doesn't find the parameter. This affects option default_bus_bypass_iommu which was introduced in the same release: $ qemu-system-x86_64 -M q35,default_bus_bypass_iommu=on qemu-system-x86_64: Property 'pc-q35-6.1-machine.default-bus-bypass-iommu' not found Rename the parameter to "default-bus-bypass-iommu". Passing "default_bus_bypass_iommu" is still valid since the underscore are transformed automatically. Fixes: c9e96b04fc19 ("hw/i386: Add a default_bus_bypass_iommu pc machine option") Reviewed-by: Eric Auger Reviewed-by: Philippe Mathieu-Daudé Tested-by: Eric Auger Signed-off-by: Jean-Philippe Brucker Message-Id: <20211025104737.1560274-1-jean-philippe@linaro.org> Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- hw/i386/pc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index fcfb7f7139..ac5af274cd 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1718,7 +1718,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) object_class_property_add_bool(oc, "hpet", pc_machine_get_hpet, pc_machine_set_hpet); - object_class_property_add_bool(oc, "default_bus_bypass_iommu", + object_class_property_add_bool(oc, "default-bus-bypass-iommu", pc_machine_get_default_bus_bypass_iommu, pc_machine_set_default_bus_bypass_iommu); From patchwork Wed Nov 3 15:04:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1550371 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=NoN2YPRB; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hkr6L5YHCz9s5P for ; Thu, 4 Nov 2021 02:19:37 +1100 (AEDT) Received: from localhost ([::1]:53768 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miI33-0006UE-3f for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2021 11:19:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miHp4-0003T0-Ui for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:10 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:45573) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miHoz-0000Yh-Ns for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:06 -0400 Received: by mail-wr1-x430.google.com with SMTP id o14so4007063wra.12 for ; Wed, 03 Nov 2021 08:05:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=r2gcgLovYgk2FFEZHd2igMQ6F1dEK3cZxyz+kGi87HA=; b=NoN2YPRBqw65eTVx3AYTkpnV5uskjy3l6RCKdrDi3ZWRknF+PkJ79yHpHM8YjzWbTD VbGBHO1l1WdAc5d+Ra2N5VbdeHFQAW+C/nj4K9mHnRX7qmZ/e+Gnt6sd7SmhRJfuVXq7 FJe/Fn2x9Of7VJ5an9CbWXzpcKCgigHG9G/BvikO2lwLbGXWjRHVfJ4sKqt1Zt9+TEBU Pisto/s1rZD6Dg3rwHQfmbJ+cW84cyr6M62CtORj2Dl9ENPRZSk0osHQEcsJzV+hG2if 8lSIsOeVK3JptCH0YV0JdVMd1AZOC1vIb9aApojL8PFWOiomAYoB8opV8CFTPfuolHHS D7HA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=r2gcgLovYgk2FFEZHd2igMQ6F1dEK3cZxyz+kGi87HA=; b=ppPLEN/vLdmBp7RAmoBPieI/+EWq4Q+bHjWBj49sZOPMWPU+T3Ie9nsfDvNWzgpj3u 5l5BHIiZ8R3wa042qb1LejlCZFY0dTRlGdd3OF2jJlQDpQh1wBXDaLvCFfJsXgWCkTTq VpyII+B5Aj1EHSONUbw/pMFec5mZCVP0ugD49LwYuIKiqAQLyQdiiUfUguSIKtcSHc+h 5A1NSzWVRtdAGJbiIwoVG38i0z5bSbHW8XoC/JVt2UOHLdDbqTDbKUeTRgqWUQLkxvlf 16xwzxYDThZEHtvdkyXFNx5fjiIk/34ULcbUmiwjWC1Pebhk5nOsY4in+aSKLNdbAUSW fr8A== X-Gm-Message-State: AOAM533KtPp3m+caxgeteQtymHyy6Y4+WLtjQWtiWLGYaAAVT+aKbpAD m9X2HyRJVAb4qLzKAH+gTofJIYC1FQo= X-Google-Smtp-Source: ABdhPJzwPjIHfSL2PQWiAPtBYBC3iXUd7tnUhwsTxbsH8ylt/yHMsYe9Ld/9+6HV0wnuz8VClH5BMg== X-Received: by 2002:adf:ee4b:: with SMTP id w11mr53852597wro.115.1635951900395; Wed, 03 Nov 2021 08:05:00 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h16sm2488797wrm.27.2021.11.03.08.04.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 08:05:00 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 14/27] watchdog: add information from -watchdog help to -device help Date: Wed, 3 Nov 2021 16:04:29 +0100 Message-Id: <20211103150442.387121-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103150442.387121-1-pbonzini@redhat.com> References: <20211103150442.387121-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x430.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_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" List all watchdog devices in a separate category, and populate their descriptions. Signed-off-by: Paolo Bonzini --- hw/watchdog/sbsa_gwdt.c | 3 ++- hw/watchdog/wdt_aspeed.c | 3 ++- hw/watchdog/wdt_diag288.c | 3 ++- hw/watchdog/wdt_i6300esb.c | 3 ++- hw/watchdog/wdt_ib700.c | 3 ++- hw/watchdog/wdt_imx2.c | 4 ++-- include/hw/qdev-core.h | 1 + softmmu/qdev-monitor.c | 1 + 8 files changed, 14 insertions(+), 7 deletions(-) diff --git a/hw/watchdog/sbsa_gwdt.c b/hw/watchdog/sbsa_gwdt.c index d0998f8489..e49cacd0e2 100644 --- a/hw/watchdog/sbsa_gwdt.c +++ b/hw/watchdog/sbsa_gwdt.c @@ -273,8 +273,9 @@ static void wdt_sbsa_gwdt_class_init(ObjectClass *klass, void *data) dc->realize = wdt_sbsa_gwdt_realize; dc->reset = wdt_sbsa_gwdt_reset; dc->hotpluggable = false; - set_bit(DEVICE_CATEGORY_MISC, dc->categories); + set_bit(DEVICE_CATEGORY_WATCHDOG, dc->categories); dc->vmsd = &vmstate_sbsa_gwdt; + dc->desc = "SBSA-compliant generic watchdog device"; } static const TypeInfo wdt_sbsa_gwdt_info = { diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c index 146ffcd713..6aa6f90b66 100644 --- a/hw/watchdog/wdt_aspeed.c +++ b/hw/watchdog/wdt_aspeed.c @@ -293,9 +293,10 @@ static void aspeed_wdt_class_init(ObjectClass *klass, void *data) dc->desc = "ASPEED Watchdog Controller"; dc->realize = aspeed_wdt_realize; dc->reset = aspeed_wdt_reset; - set_bit(DEVICE_CATEGORY_MISC, dc->categories); + set_bit(DEVICE_CATEGORY_WATCHDOG, dc->categories); dc->vmsd = &vmstate_aspeed_wdt; device_class_set_props(dc, aspeed_wdt_properties); + dc->desc = "Aspeed watchdog device"; } static const TypeInfo aspeed_wdt_info = { diff --git a/hw/watchdog/wdt_diag288.c b/hw/watchdog/wdt_diag288.c index e135a4de8b..9e8882a11c 100644 --- a/hw/watchdog/wdt_diag288.c +++ b/hw/watchdog/wdt_diag288.c @@ -122,9 +122,10 @@ static void wdt_diag288_class_init(ObjectClass *klass, void *data) dc->unrealize = wdt_diag288_unrealize; dc->reset = wdt_diag288_reset; dc->hotpluggable = false; - set_bit(DEVICE_CATEGORY_MISC, dc->categories); + set_bit(DEVICE_CATEGORY_WATCHDOG, dc->categories); dc->vmsd = &vmstate_diag288; diag288->handle_timer = wdt_diag288_handle_timer; + dc->desc = "diag288 device for s390x platform"; } static const TypeInfo wdt_diag288_info = { diff --git a/hw/watchdog/wdt_i6300esb.c b/hw/watchdog/wdt_i6300esb.c index 4c52e3bb9e..f99a1c9d29 100644 --- a/hw/watchdog/wdt_i6300esb.c +++ b/hw/watchdog/wdt_i6300esb.c @@ -476,7 +476,8 @@ static void i6300esb_class_init(ObjectClass *klass, void *data) k->class_id = PCI_CLASS_SYSTEM_OTHER; dc->reset = i6300esb_reset; dc->vmsd = &vmstate_i6300esb; - set_bit(DEVICE_CATEGORY_MISC, dc->categories); + set_bit(DEVICE_CATEGORY_WATCHDOG, dc->categories); + dc->desc = "Intel 6300ESB"; } static const TypeInfo i6300esb_info = { diff --git a/hw/watchdog/wdt_ib700.c b/hw/watchdog/wdt_ib700.c index 177aaa503f..91d1bdc0da 100644 --- a/hw/watchdog/wdt_ib700.c +++ b/hw/watchdog/wdt_ib700.c @@ -140,7 +140,8 @@ static void wdt_ib700_class_init(ObjectClass *klass, void *data) dc->realize = wdt_ib700_realize; dc->reset = wdt_ib700_reset; dc->vmsd = &vmstate_ib700; - set_bit(DEVICE_CATEGORY_MISC, dc->categories); + set_bit(DEVICE_CATEGORY_WATCHDOG, dc->categories); + dc->desc = "iBASE 700"; } static const TypeInfo wdt_ib700_info = { diff --git a/hw/watchdog/wdt_imx2.c b/hw/watchdog/wdt_imx2.c index a5fb76308f..c3128370b5 100644 --- a/hw/watchdog/wdt_imx2.c +++ b/hw/watchdog/wdt_imx2.c @@ -280,8 +280,8 @@ static void imx2_wdt_class_init(ObjectClass *klass, void *data) dc->realize = imx2_wdt_realize; dc->reset = imx2_wdt_reset; dc->vmsd = &vmstate_imx2_wdt; - dc->desc = "i.MX watchdog timer"; - set_bit(DEVICE_CATEGORY_MISC, dc->categories); + dc->desc = "i.MX2 watchdog timer"; + set_bit(DEVICE_CATEGORY_WATCHDOG, dc->categories); } static const TypeInfo imx2_wdt_info = { diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 1bad07002d..72622bd337 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -26,6 +26,7 @@ typedef enum DeviceCategory { DEVICE_CATEGORY_SOUND, DEVICE_CATEGORY_MISC, DEVICE_CATEGORY_CPU, + DEVICE_CATEGORY_WATCHDOG, DEVICE_CATEGORY_MAX } DeviceCategory; diff --git a/softmmu/qdev-monitor.c b/softmmu/qdev-monitor.c index e49d9773d2..f8b3a4cd82 100644 --- a/softmmu/qdev-monitor.c +++ b/softmmu/qdev-monitor.c @@ -165,6 +165,7 @@ static void qdev_print_devinfos(bool show_no_user) [DEVICE_CATEGORY_SOUND] = "Sound", [DEVICE_CATEGORY_MISC] = "Misc", [DEVICE_CATEGORY_CPU] = "CPU", + [DEVICE_CATEGORY_WATCHDOG]= "Watchdog", [DEVICE_CATEGORY_MAX] = "Uncategorized", }; GSList *list, *elt; From patchwork Wed Nov 3 15:04:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1550358 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=F1dI5f0S; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HkqxX3zGBz9s5P for ; Thu, 4 Nov 2021 02:12:00 +1100 (AEDT) Received: from localhost ([::1]:60046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miHvi-0007iz-Ca for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2021 11:11:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52126) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miHp8-0003UT-O1 for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:12 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:39765) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miHp0-0000Z5-Dh for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:08 -0400 Received: by mail-wm1-x334.google.com with SMTP id b2-20020a1c8002000000b0032fb900951eso4862978wmd.4 for ; Wed, 03 Nov 2021 08:05:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GMP3uUjLWtP0WS92hT7gluftEH4jK1vIjm6dISQNfvM=; b=F1dI5f0SwVmBu8bN2i+1ruJ8p1MLb9FUc+NZ0lAAfc9i9rK+qPp4mddaZMuIu/QaTG 7XMFXSQoM2feawsMOn5Q4Vnu5BkUg8fZ/hbpN0jFntljppMrV8yeV/tlOvR42KtvQv2E hwqqAEO7SHvV2JtaEOSuFUUbR9O2zW6uv+9RSaM+gaJ3c/nyk4GqdpoPrs54FMArBIsC m/gUBhU4kAQwOucdJp/wxpO6Ve7ElpBc4+ItTEGjz69Yh+zwkqiRwlv/Jk5o9w+w8kfK XKkeDZkvUUo3hMioS3ga0w5aXOngi2dn6EO+jkFu+GmnAI5TLSYJluOwjF3bAbD4/62j kxDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=GMP3uUjLWtP0WS92hT7gluftEH4jK1vIjm6dISQNfvM=; b=VzmKcmOOIFDyASgZl+ngAD1zO6WdZHjPs+lEXUuOZqpr4ByEQuAF1ipfsd3qkLtbQQ iWzdFxT74ZKpY3L9//kKVYm/KiYxpSHmm1F73xNTB0kMYF9e1gZk+b7jt98tuWX26uwH zD+Gl6stAYTrVaepX74H6OU3nFVrr51LkuOu85vDUR91tTCF6l9VGThYkKoZZSV6Somr 0sGKEGJDLPVp9eKJ7Ut4+tta6+s8aIDS3liL4CocVv+C1cZyJLpyJua6wXy7EFi72ffa eYC14bfJqWum20+xlOdqqZjlruC5q+L+/J/EqJGCHqak0Qyt7Lbx54gkitRQ3G1LKFO9 7ojg== X-Gm-Message-State: AOAM531F+noxGj1JXF4L7imhHZvL0A5V4M0g10Z3X7X9+NlkzYWLEeMe j9gZwdUzCqASMSQ2Js1aMMhnMqJYjTo= X-Google-Smtp-Source: ABdhPJwf9kyxkpjjoxr5TvAb0ePNK8U1DwjlbizXzaQGzlaaxq+7yNRLIhvs1A3EDIWaGRKXU2ILvw== X-Received: by 2002:a05:600c:4e8d:: with SMTP id f13mr79740wmq.7.1635951901103; Wed, 03 Nov 2021 08:05:01 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h16sm2488797wrm.27.2021.11.03.08.05.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 08:05:00 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 15/27] vl: deprecate -watchdog Date: Wed, 3 Nov 2021 16:04:30 +0100 Message-Id: <20211103150442.387121-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103150442.387121-1-pbonzini@redhat.com> References: <20211103150442.387121-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x334.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" -watchdog is the same as -device except that it is case insensitive (and it allows only watchdog devices of course). Now that "-device help" can list as such the available watchdog devices, we can deprecate it. Note that even though -watchdog tries to be case insensitive, it fails at that: "-watchdog i6300xyz" fails with "Unknown -watchdog device", but "-watchdog i6300ESB" also fails (when the generated -device option is processed) with an error "'i6300ESB' is not a valid device model name". For this reason, the documentation update does not mention the case insensitivity of -watchdog. Signed-off-by: Paolo Bonzini --- docs/about/deprecated.rst | 5 +++++ softmmu/vl.c | 1 + 2 files changed, 6 insertions(+) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index be19317470..6155b32ee6 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -160,6 +160,11 @@ Use ``-display sdl`` instead. Use ``-display curses`` instead. +``-watchdog`` (since 6.2) +''''''''''''''''''''''''' + +Use ``-device`` instead. + ``-smp`` ("parameter=0" SMP configurations) (since 6.2) ''''''''''''''''''''''''''''''''''''''''''''''''''''''' diff --git a/softmmu/vl.c b/softmmu/vl.c index af0c4cbd99..570120f5c4 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -3256,6 +3256,7 @@ void qemu_init(int argc, char **argv, char **envp) error_report("only one watchdog option may be given"); exit(1); } + warn_report("-watchdog is deprecated; use -device instead."); watchdog = optarg; break; case QEMU_OPTION_action: From patchwork Wed Nov 3 15:04:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1550370 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=aHH1sOCY; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hkr5x42K2z9s5P for ; Thu, 4 Nov 2021 02:19:17 +1100 (AEDT) Received: from localhost ([::1]:52226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miI2l-0005QK-Cc for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2021 11:19:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miHp8-0003UW-Rs for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:12 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:53061) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miHp2-0000a1-5L for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:08 -0400 Received: by mail-wm1-x335.google.com with SMTP id b71so2227988wmd.2 for ; Wed, 03 Nov 2021 08:05:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XfEPGGdEuQA4tJkhanah7cV7Ub1nKcQ28u2qdP0NjLI=; b=aHH1sOCYkPv8n969KKl1eGGy7r9MMnV4os8XAC7JPg4TH02FbggbCQrxwbJXHZKhAm FOHBJqzL7GMHJ/SM7WrdrNrJ6M1tLl3F7jG8CKoSLdzlcOQk//1IQ0jblotH/x82SmTE e5vZVEnO3g9/AuKnif1Wtj0Vjm1cn56mGPFKnEC1hXWGlZVGjr+Dq8iwJhEVm/cYSIty kSGbfZkVDye5J2Z34xk7QDTh3uIUAHeYUcPooJARuokhaKqBomqFm3gNuVLeQ/IsANCK qZEoPA3OUfx0y0r1gFCSJgut6fJrtU9la1e9xD6ikkmVP3iu3iJt50k3cihlVmVgybPt TlJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=XfEPGGdEuQA4tJkhanah7cV7Ub1nKcQ28u2qdP0NjLI=; b=pkpmq0Ls07NtdVN32G3vkjj5Zz1d/4ktEuz7nLiJ73SBSkYFHCp74GMLOeRMOEGWf6 aKRkkCtyOAO16ccpmfvJjefCeOHzNnqnnTR6W/OmT9wMl56XjP/Xu1VHoQt/l+hVYWr6 Wj7sGynFlFwF3PxtUnSQlTKFLxe3cyWgs9uUTiKtrF0+WkYumX/IdWp00lsgie+WEKMH YquRLMP5Ib7Ga+cYxAWQRavqZ5rje3NdpjBtgom84JkbViuA58ZCzlvUCM17V7Kv3wzb jCumVyS8PgfG4h37njx+326OYZAoICTjqzvsVeVkoWmLiy93Tyf5Z9XzZPiYI2GhDp3R DY6w== X-Gm-Message-State: AOAM533pf1v1pC/YW5WziKGpHixGYqsyDOm5GQqxCBM7WE+E3kq27dEU NxF28A/vVeOThXOzxqLxPVDIBAaVR8s= X-Google-Smtp-Source: ABdhPJxKzyhosCtFpHPZ0FoSz7FF/9mJEEAvdqAFgk/3KqCDw9ajThfwQNgsirWTQXFDOtYztTgkcA== X-Received: by 2002:a1c:f319:: with SMTP id q25mr15987820wmq.33.1635951902855; Wed, 03 Nov 2021 08:05:02 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h16sm2488797wrm.27.2021.11.03.08.05.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 08:05:02 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 16/27] watchdog: remove select_watchdog_action Date: Wed, 3 Nov 2021 16:04:31 +0100 Message-Id: <20211103150442.387121-17-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103150442.387121-1-pbonzini@redhat.com> References: <20211103150442.387121-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x335.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Instead of invoking select_watchdog_action from both HMP and command line, go directly from HMP to QMP and use QemuOpts as the intermediary for the command line. This makes -watchdog-action explicitly a shortcut for "-action watchdog", so that "-watchdog-action" and "-action watchdog" override each other based on the position on the command line; previously, "-action watchdog" always won. Signed-off-by: Paolo Bonzini --- hw/watchdog/watchdog.c | 14 -------------- include/sysemu/watchdog.h | 1 - monitor/misc.c | 15 ++++++++++++--- softmmu/vl.c | 10 +++++----- 4 files changed, 17 insertions(+), 23 deletions(-) diff --git a/hw/watchdog/watchdog.c b/hw/watchdog/watchdog.c index 0e98ffb73f..1437e6c5b6 100644 --- a/hw/watchdog/watchdog.c +++ b/hw/watchdog/watchdog.c @@ -76,20 +76,6 @@ int select_watchdog(const char *p) return 1; } -int select_watchdog_action(const char *p) -{ - int action; - char *qapi_value; - - qapi_value = g_ascii_strdown(p, -1); - action = qapi_enum_parse(&WatchdogAction_lookup, qapi_value, -1, NULL); - g_free(qapi_value); - if (action < 0) - return -1; - qmp_watchdog_set_action(action, &error_abort); - return 0; -} - WatchdogAction get_watchdog_action(void) { return watchdog_action; diff --git a/include/sysemu/watchdog.h b/include/sysemu/watchdog.h index a08d16380d..d2d4901dbb 100644 --- a/include/sysemu/watchdog.h +++ b/include/sysemu/watchdog.h @@ -37,7 +37,6 @@ typedef struct WatchdogTimerModel WatchdogTimerModel; /* in hw/watchdog.c */ int select_watchdog(const char *p); -int select_watchdog_action(const char *action); WatchdogAction get_watchdog_action(void); void watchdog_add_model(WatchdogTimerModel *model); void watchdog_perform_action(void); diff --git a/monitor/misc.c b/monitor/misc.c index c2d227a07c..1759d1e7f1 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -70,6 +70,7 @@ #include "qapi/qapi-commands-migration.h" #include "qapi/qapi-commands-misc.h" #include "qapi/qapi-commands-qom.h" +#include "qapi/qapi-commands-run-state.h" #include "qapi/qapi-commands-trace.h" #include "qapi/qapi-init-commands.h" #include "qapi/error.h" @@ -471,10 +472,18 @@ static void hmp_gdbserver(Monitor *mon, const QDict *qdict) static void hmp_watchdog_action(Monitor *mon, const QDict *qdict) { - const char *action = qdict_get_str(qdict, "action"); - if (select_watchdog_action(action) == -1) { - monitor_printf(mon, "Unknown watchdog action '%s'\n", action); + Error *err = NULL; + WatchdogAction action; + char *qapi_value; + + qapi_value = g_ascii_strdown(qdict_get_str(qdict, "action"), -1); + action = qapi_enum_parse(&WatchdogAction_lookup, qapi_value, -1, &err); + g_free(qapi_value); + if (err) { + hmp_handle_error(mon, err); + return; } + qmp_watchdog_set_action(action, &error_abort); } static void monitor_printc(Monitor *mon, int c) diff --git a/softmmu/vl.c b/softmmu/vl.c index 570120f5c4..1159a64bce 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -3265,12 +3265,12 @@ void qemu_init(int argc, char **argv, char **envp) exit(1); } break; - case QEMU_OPTION_watchdog_action: - if (select_watchdog_action(optarg) == -1) { - error_report("unknown -watchdog-action parameter"); - exit(1); - } + case QEMU_OPTION_watchdog_action: { + QemuOpts *opts; + opts = qemu_opts_create(qemu_find_opts("action"), NULL, 0, &error_abort); + qemu_opt_set(opts, "watchdog", optarg, &error_abort); break; + } case QEMU_OPTION_parallel: add_device_config(DEV_PARALLEL, optarg); default_parallel = 0; From patchwork Wed Nov 3 15:04:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1550377 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=oLICi/kJ; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HkrCb21ZYz9s5P for ; Thu, 4 Nov 2021 02:24:11 +1100 (AEDT) Received: from localhost ([::1]:42322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miI7V-00014Q-59 for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2021 11:24:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miHp8-0003UX-Qp for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:12 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:34738) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miHp3-0000gQ-AQ for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:08 -0400 Received: by mail-wr1-x430.google.com with SMTP id d5so4079793wrc.1 for ; Wed, 03 Nov 2021 08:05:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=615AKc7cJa2Nmp/k3mK1vf+yM3PqWLTGp1nXFg7+mVY=; b=oLICi/kJH119FlodCOz55nHw8f/O/cwk6LMHcUL/9I542m93VGt1n4Xm1wLsNmBaBj A0v1ZC8AkhynKPikOlOLAK/o3UyDnI7O0WQMuJJeqKOdW7VbMz2pM66qAsgvLvFu207e Ouf6QaLVa3aEmrgQ/3MRYpjCYvckXWfXfIACxPj1ECQh6KmfNGpoK+T4ybFonHKnLmrr JdKCbFqVA47YK3Fx1Ct+VVxqvTX5JtKy1i8HB6bFTMmWzjH0+tOlfSz44eFYOyeUwPKJ HuJEF+hSqKLRpvaxUIBTDIrOuZrW66teJz5Gw+Ky5gfauWdkvIYrrcEH0m29WMqU3pC4 x0eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=615AKc7cJa2Nmp/k3mK1vf+yM3PqWLTGp1nXFg7+mVY=; b=7FEUPUOcQNZQRF0KHTxQHU8ZgCLcWCTEeCzvG+3eqns9TOIpHM3krWnfVkZ8uA2RH1 aFI6iQbx9BMoznWpJLpkmVBgIYM2iMra4yH/8wwkX88XoVyp/dhoIisPnF0LhbzVPG4a GEv3o6M66qq20Ik6kq/62J3HyLFjXp2X3c6TzGKF0uWfvu+IFPe6x+QVbrKarxo2wVCC qaqdaWvy66iYO/5xXpPPT8VbrrHRPV15aKM9ZrgHFM7xwTvjouIkSMxQV+ARQG3E3fFF nwaEWNZUWxHF3TrmQCGBOGcx7km/zVhOoPaQhs0sKXZNfzwRXoiAAI44fWldOqRK5Wv3 9H1A== X-Gm-Message-State: AOAM531DSWGn1Qte6yOdqFPigpbB6daJ2WnCVkLJbNTO70Ipn4gM0cIg BXWkvAABtKYul5ofgyvhDx5MY9gphDA= X-Google-Smtp-Source: ABdhPJyU18acUgg0THlx9B8JGi0+kkdMt7AMYRyDg7a/yNk9WjPpUXHYOHV8/QXyQ6W/nJpL1DcWcw== X-Received: by 2002:a5d:6902:: with SMTP id t2mr15387757wru.317.1635951904004; Wed, 03 Nov 2021 08:05:04 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h16sm2488797wrm.27.2021.11.03.08.05.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 08:05:03 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 17/27] hw/i386: fix vmmouse registration Date: Wed, 3 Nov 2021 16:04:32 +0100 Message-Id: <20211103150442.387121-18-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103150442.387121-1-pbonzini@redhat.com> References: <20211103150442.387121-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x430.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pavel Dovgalyuk Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Pavel Dovgalyuk According to the logic of vmmouse_update_handler function, vmmouse should be registered as an event handler when it's status is zero. vmmouse_read_id resets the status but does not register the handler. This patch adds vmmouse registration and activation when status is reset. Signed-off-by: Pavel Dovgalyuk Message-Id: <163524204515.1914131.16465061981774791228.stgit@pasha-ThinkPad-X280> Signed-off-by: Paolo Bonzini --- hw/i386/vmmouse.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c index df4798f502..3d66368286 100644 --- a/hw/i386/vmmouse.c +++ b/hw/i386/vmmouse.c @@ -158,6 +158,7 @@ static void vmmouse_read_id(VMMouseState *s) s->queue[s->nb_queue++] = VMMOUSE_VERSION; s->status = 0; + vmmouse_update_handler(s, s->absolute); } static void vmmouse_request_relative(VMMouseState *s) From patchwork Wed Nov 3 15:04:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1550364 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=f3uNZkk1; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hkr1P46WHz9s5P for ; Thu, 4 Nov 2021 02:15:21 +1100 (AEDT) Received: from localhost ([::1]:40090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miHyx-0005Ox-DL for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2021 11:15:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52188) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miHpA-0003Ue-Iq for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:12 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:41753) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miHp4-0000jv-75 for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:10 -0400 Received: by mail-wm1-x32c.google.com with SMTP id f7-20020a1c1f07000000b0032ee11917ceso2116314wmf.0 for ; Wed, 03 Nov 2021 08:05:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0tfk0gJAuF3KXIQCo2baIJgYDepCtxvL/ieGv9NV1vg=; b=f3uNZkk128APUYbeDJYR8Jw85YBkGaNxlUlaQD2UAKF9z1RQzKbBeHIktbThoJDBss DCjWmuHsQlbsU+kduSnVGuZOzwYoe8mi5ggdLZmqy+oFQCxyIa2dxdhD2gZ5VaD07FF3 JvFqvK7tBTyfuuqCGFwUkkUzN2yWiSRHqRbh+Y0dBn916sxJ4HkXN8LQvdX8vUVbmB5e 1jgfa/YGnkXEerk0nqTaQCDjWSjNEpNvzSE0BVjHKK5h0H0OEjB0n13R8Fy50BHGZt3F 26sDhuomDBM8hv/jdLdSIQlWZBrTioRB1Sq6UPrZLt4sV7bLPxXMLrAAaKYB8UZw8GQH 3b7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=0tfk0gJAuF3KXIQCo2baIJgYDepCtxvL/ieGv9NV1vg=; b=GkGLv7apsLuTTbdzcXMJanzbbl2G9OU3zq5xNTwyGLEO3abrQxBKE4P4N1zruVvCQj zbZ3WFlYCVZO6uUIBsQHO4Ahm9W/StFCohD1v5dbSVXW7DdVbxgNekh7BGzQpU4Kg/ZY xIpcVdK8TGX4YW0X/RyQOY/SBUfycEcA2F/v71WHPIVTTWmon5PuLh9Sej67A0VKUie6 PTC2PwLzdFKsUXluR5mPYURs6KbwfSBRmor2732fPXGgq+EUXk6WrICAUWfBkTK/3mvX H5yRcVVt0/lZnd+KTnYqOENo5lRGP+8Rx8FQ1dQIax9hRJwyTPH0ZhTH2rhGxFZmoT+3 qoqw== X-Gm-Message-State: AOAM533TejBoIPWujlMvbWzrdN/RnLzP9jMhPtQQX/1Zdg9MCYwurFCK fiWlYaBwuSR6blh2KD9mFkrVnb850FY= X-Google-Smtp-Source: ABdhPJxFBQpRuf0KrGophIOZLsVQHw11h1GqexsOi4zodKn5MGZVPm4eCx+M+mUGqcym7mnTgqs8LA== X-Received: by 2002:a7b:cb10:: with SMTP id u16mr15872190wmj.65.1635951904761; Wed, 03 Nov 2021 08:05:04 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h16sm2488797wrm.27.2021.11.03.08.05.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 08:05:04 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 18/27] KVM: SVM: add migration support for nested TSC scaling Date: Wed, 3 Nov 2021 16:04:33 +0100 Message-Id: <20211103150442.387121-19-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103150442.387121-1-pbonzini@redhat.com> References: <20211103150442.387121-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maxim Levitsky Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Maxim Levitsky Signed-off-by: Maxim Levitsky Message-Id: <20211101132300.192584-4-mlevitsk@redhat.com> Signed-off-by: Paolo Bonzini --- target/i386/cpu.c | 5 +++++ target/i386/cpu.h | 4 ++++ target/i386/kvm/kvm.c | 15 +++++++++++++++ target/i386/machine.c | 22 ++++++++++++++++++++++ 4 files changed, 46 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 598d451dcf..53a23ca006 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -5928,6 +5928,11 @@ static void x86_cpu_reset(DeviceState *dev) } x86_cpu_set_sgxlepubkeyhash(env); + + if (env->features[FEAT_SVM] & CPUID_SVM_TSCSCALE) { + env->amd_tsc_scale_msr = MSR_AMD64_TSC_RATIO_DEFAULT; + } + #endif } diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 3edaad7688..04f2b790c9 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -499,6 +499,9 @@ typedef enum X86Seg { #define MSR_GSBASE 0xc0000101 #define MSR_KERNELGSBASE 0xc0000102 #define MSR_TSC_AUX 0xc0000103 +#define MSR_AMD64_TSC_RATIO 0xc0000104 + +#define MSR_AMD64_TSC_RATIO_DEFAULT 0x100000000ULL #define MSR_VM_HSAVE_PA 0xc0010117 @@ -1536,6 +1539,7 @@ typedef struct CPUX86State { uint32_t tsx_ctrl; uint64_t spec_ctrl; + uint64_t amd_tsc_scale_msr; uint64_t virt_ssbd; /* End of state preserved by INIT (dummy marker). */ diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 0eb7a0340c..5a698bde19 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -105,6 +105,7 @@ static bool has_msr_hv_reenlightenment; static bool has_msr_xss; static bool has_msr_umwait; static bool has_msr_spec_ctrl; +static bool has_tsc_scale_msr; static bool has_msr_tsx_ctrl; static bool has_msr_virt_ssbd; static bool has_msr_smi_count; @@ -2216,6 +2217,9 @@ static int kvm_get_supported_msrs(KVMState *s) case MSR_IA32_SPEC_CTRL: has_msr_spec_ctrl = true; break; + case MSR_AMD64_TSC_RATIO: + has_tsc_scale_msr = true; + break; case MSR_IA32_TSX_CTRL: has_msr_tsx_ctrl = true; break; @@ -2972,6 +2976,10 @@ static int kvm_put_msrs(X86CPU *cpu, int level) if (has_msr_spec_ctrl) { kvm_msr_entry_add(cpu, MSR_IA32_SPEC_CTRL, env->spec_ctrl); } + if (has_tsc_scale_msr) { + kvm_msr_entry_add(cpu, MSR_AMD64_TSC_RATIO, env->amd_tsc_scale_msr); + } + if (has_msr_tsx_ctrl) { kvm_msr_entry_add(cpu, MSR_IA32_TSX_CTRL, env->tsx_ctrl); } @@ -3377,6 +3385,10 @@ static int kvm_get_msrs(X86CPU *cpu) if (has_msr_spec_ctrl) { kvm_msr_entry_add(cpu, MSR_IA32_SPEC_CTRL, 0); } + if (has_tsc_scale_msr) { + kvm_msr_entry_add(cpu, MSR_AMD64_TSC_RATIO, 0); + } + if (has_msr_tsx_ctrl) { kvm_msr_entry_add(cpu, MSR_IA32_TSX_CTRL, 0); } @@ -3788,6 +3800,9 @@ static int kvm_get_msrs(X86CPU *cpu) case MSR_IA32_SPEC_CTRL: env->spec_ctrl = msrs[i].data; break; + case MSR_AMD64_TSC_RATIO: + env->amd_tsc_scale_msr = msrs[i].data; + break; case MSR_IA32_TSX_CTRL: env->tsx_ctrl = msrs[i].data; break; diff --git a/target/i386/machine.c b/target/i386/machine.c index 4367931623..83c2b91529 100644 --- a/target/i386/machine.c +++ b/target/i386/machine.c @@ -1280,6 +1280,27 @@ static const VMStateDescription vmstate_spec_ctrl = { } }; + +static bool amd_tsc_scale_msr_needed(void *opaque) +{ + X86CPU *cpu = opaque; + CPUX86State *env = &cpu->env; + + return (env->features[FEAT_SVM] & CPUID_SVM_TSCSCALE); +} + +static const VMStateDescription amd_tsc_scale_msr_ctrl = { + .name = "cpu/amd_tsc_scale_msr", + .version_id = 1, + .minimum_version_id = 1, + .needed = amd_tsc_scale_msr_needed, + .fields = (VMStateField[]){ + VMSTATE_UINT64(env.amd_tsc_scale_msr, X86CPU), + VMSTATE_END_OF_LIST() + } +}; + + static bool intel_pt_enable_needed(void *opaque) { X86CPU *cpu = opaque; @@ -1558,6 +1579,7 @@ const VMStateDescription vmstate_x86_cpu = { &vmstate_pkru, &vmstate_pkrs, &vmstate_spec_ctrl, + &amd_tsc_scale_msr_ctrl, &vmstate_mcg_ext_ctl, &vmstate_msr_intel_pt, &vmstate_msr_virt_ssbd, From patchwork Wed Nov 3 15:04:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1550368 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=ATevcCaj; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hkr4T3pCLz9s5P for ; Thu, 4 Nov 2021 02:18:01 +1100 (AEDT) Received: from localhost ([::1]:48152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miI1X-0002dF-C7 for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2021 11:17:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miHpA-0003Ug-Kh for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:13 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:51854) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miHp6-0000lJ-IG for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:12 -0400 Received: by mail-wm1-x32c.google.com with SMTP id z200so2222550wmc.1 for ; Wed, 03 Nov 2021 08:05:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7cWNpBnywY+l7pKZXWN6LNoB6JNOQy205F166UqLIg4=; b=ATevcCaj401p3vjjS3oFhtcOkFHGsFN7SWj+aGpvj4pOb0SAFMXBAQvb0EKcC0Z9pI +iRE9VV3mUfCdUcUdkqmfyKWqAMVONcYTDP2ZbhuoaJH+kHOK5X0G7OpD5BLjmGzss/6 KFWzN0VKxTP+KRfOfbFY2Zc8lSyomiyiYgbPMjlA5yry8CosmCYXu6NvgRDGbYw8iwRy 95++Z6n9waS7hzFPPgk761FViuSkHgHzOsTtpfZtJetWCszeYRINYOe4yEFkbfUhq50l mCh6Z0+WwBZpsP+eJWSGvWFyOEjyK/XfWeLDkyfKk5Fp4uk1dwgafWPZLG+/lTuG09Ui pdJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=7cWNpBnywY+l7pKZXWN6LNoB6JNOQy205F166UqLIg4=; b=nXK0cS4zUkB7LjWQlbPFhWfpTmMAZbCT6qvUm0/yiUBp2UauMhou0Gg+eE28dJ8CDs Qqb6t6xPqr/cWj16+Lhoc7FIqmyfJ8Kc1rMw+1luf1fwrjin/FcNaKhYxyb7nvVc9unF DudDFV725E6zYa3U+GcRQLF109pF5DXVakmj+0Gnft84NTVUI9UOrDslLgQjnh7PiXln r9rjJKJAUxdqIrOFhFGXDxl8ReXy8GFNSN3jf12QxoKsL8iNvMVdXCz1F2X/uJGRwimb PpVL2wqbZoRMbR58X+M9gGi11ViAHIkkEsqQgNWQkWonG7x8XAkDGAET245tuF2uVwRm Gqzg== X-Gm-Message-State: AOAM533hp7VlEQKhNYOU2de3Q8dp8F77tlFa8L4sLconKqXUttIzji98 XiHpNmmuZKRJ8fDnSlf+V9vtIekRfVQ= X-Google-Smtp-Source: ABdhPJxDjpnKVuKXmmM2ztuQtbUsEwRYYUknGez7xVDHdmUHxuzFN2D3tEQvOKmiFgqpPb8Wq0B8zA== X-Received: by 2002:a1c:f219:: with SMTP id s25mr16372682wmc.31.1635951905557; Wed, 03 Nov 2021 08:05:05 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h16sm2488797wrm.27.2021.11.03.08.05.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 08:05:05 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 19/27] esp: ensure in-flight SCSI requests are always cancelled Date: Wed, 3 Nov 2021 16:04:34 +0100 Message-Id: <20211103150442.387121-20-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103150442.387121-1-pbonzini@redhat.com> References: <20211103150442.387121-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Cave-Ayland Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Mark Cave-Ayland There is currently a check in esp_select() to cancel any in-flight SCSI requests to ensure that issuing multiple select commands without continuing through the rest of the ESP state machine ignores all but the last SCSI request. This is also enforced through the addition of assert()s in esp_transfer_data() and scsi_read_data(). The get_cmd() function does not call esp_select() when TC == 0 which means it is possible for a fuzzer to trigger these assert()s by sending a select command when TC == 0 immediately after a valid SCSI CDB has been submitted. Since esp_select() is only called from get_cmd(), hoist the check to cancel in-flight SCSI requests from esp_select() into get_cmd() to ensure it is always called when executing a select command to initiate a new SCSI request. Signed-off-by: Mark Cave-Ayland Closes: https://gitlab.com/qemu-project/qemu/-/issues/662 Closes: https://gitlab.com/qemu-project/qemu/-/issues/663 Message-Id: <20211101183516.8455-2-mark.cave-ayland@ilande.co.uk> Signed-off-by: Paolo Bonzini --- hw/scsi/esp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 8454ed1773..84f935b549 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -204,11 +204,6 @@ static int esp_select(ESPState *s) s->ti_size = 0; fifo8_reset(&s->fifo); - if (s->current_req) { - /* Started a new command before the old one finished. Cancel it. */ - scsi_req_cancel(s->current_req); - } - s->current_dev = scsi_device_find(&s->bus, 0, target, 0); if (!s->current_dev) { /* No such drive */ @@ -235,6 +230,11 @@ static uint32_t get_cmd(ESPState *s, uint32_t maxlen) uint32_t dmalen, n; int target; + if (s->current_req) { + /* Started a new command before the old one finished. Cancel it. */ + scsi_req_cancel(s->current_req); + } + target = s->wregs[ESP_WBUSID] & BUSID_DID; if (s->dma) { dmalen = MIN(esp_get_tc(s), maxlen); From patchwork Wed Nov 3 15:04:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1550380 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=K8ABofkM; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HkrPc4rH1z9s5P for ; Thu, 4 Nov 2021 02:32:51 +1100 (AEDT) Received: from localhost ([::1]:39510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miIFr-0001Hk-R0 for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2021 11:32:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miHpS-0003eH-Rl for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:32 -0400 Received: from mail-lf1-x135.google.com ([2a00:1450:4864:20::135]:46680) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miHpO-00011b-1U for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:30 -0400 Received: by mail-lf1-x135.google.com with SMTP id o18so5709720lfu.13 for ; Wed, 03 Nov 2021 08:05:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SxMMNDBEz7b0O+6ZdEnpdkz/xFDuHSYn2SqbysRD8oQ=; b=K8ABofkM+a3hU8s2ZCCn85YzKwISZhcYCIjWsz/fc8tzXMAQAEtMbirdeIfux/sojU HYob///r9LOO3eVd+ZMMxo0XiJqVoOCPJkcjINJG3Py3d/f4fEJNL2GRxQQ54S2UKb3r apdUldBSil/w16w4/fygJ+vvLH8Rr8fMonfrqbVrnC66mMbzppOStGy7WhMzgDUqZYXK OdCqxsgFTHqhwAVh57yfjzJTNhRwt4iKZWdPJryHgPXxkZ5Uc+VIZPxjXVfydhSUZnNt a57yLPrespMxZCUv27Vc8BUxN2CBOYWeOa2wLfa3ZZho1PP2Sr1f8NWYVLTae4Rc8R/+ 3sSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=SxMMNDBEz7b0O+6ZdEnpdkz/xFDuHSYn2SqbysRD8oQ=; b=DCsklMSUsHLZJ+bPDH7ZlMX9etWKDzwR1mgayzJrhvpyTbAasc73SRjlh8CsQDnK+0 ypARd1++XpQ1X0QsmW2bqK9V8HFlADvf5V88KpbLi+eeMsOZ6Qv1axgXyDQAQkhKsbfA gPoOhqW9N91q/HzCv37DXdZ5ES5FHertuGTzOcm3yq7fYSMKhQsG2XADgSG+35UMcEYr AMVpI86mjhNrQ9UM4zHogEPQuru/yYnub0R7ARoMIRSgmcvCJySH8reFPwNaxlApVyNs rwbwq5qP5mzSE9E5/fCusUz0ozzCYrvcvoF2n6z4V+y0ARX2+pgUuRozmTi9Kx5b71i3 5TqA== X-Gm-Message-State: AOAM530VTvg0ted59Y9NCBgI5ZMzVZWGtEs3UumdQL91L9Ej6cDezksL hmIgX60iMbkftiXnZMTDr8h/sPYEwNc= X-Google-Smtp-Source: ABdhPJwcmEujQm5jHEy5Zkf1utdVFp/wieKdPPsG8ZtIh0YzFjK8afNeWF08jvo3KonSylvqwCFfjw== X-Received: by 2002:a5d:584e:: with SMTP id i14mr17971557wrf.386.1635951906731; Wed, 03 Nov 2021 08:05:06 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h16sm2488797wrm.27.2021.11.03.08.05.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 08:05:06 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 20/27] qtest/am53c974-test: add test for cancelling in-flight requests Date: Wed, 3 Nov 2021 16:04:35 +0100 Message-Id: <20211103150442.387121-21-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103150442.387121-1-pbonzini@redhat.com> References: <20211103150442.387121-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::135; envelope-from=paolo.bonzini@gmail.com; helo=mail-lf1-x135.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Cave-Ayland Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Mark Cave-Ayland Based upon the qtest reproducer posted to Gitlab issue #663 at https://gitlab.com/qemu-project/qemu/-/issues/663. Signed-off-by: Mark Cave-Ayland Message-Id: <20211101183516.8455-3-mark.cave-ayland@ilande.co.uk> Signed-off-by: Paolo Bonzini --- tests/qtest/am53c974-test.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/tests/qtest/am53c974-test.c b/tests/qtest/am53c974-test.c index d996866cd4..9b1e4211bd 100644 --- a/tests/qtest/am53c974-test.c +++ b/tests/qtest/am53c974-test.c @@ -189,6 +189,40 @@ static void test_cancelled_request_ok(void) qtest_quit(s); } +static void test_inflight_cancel_ok(void) +{ + QTestState *s = qtest_init( + "-device am53c974,id=scsi " + "-device scsi-hd,drive=disk0 -drive " + "id=disk0,if=none,file=null-co://,format=raw -nodefaults"); + qtest_outl(s, 0xcf8, 0x80001000); + qtest_inw(s, 0xcfc); + qtest_outl(s, 0xcf8, 0x80001010); + qtest_outl(s, 0xcfc, 0xffffffff); + qtest_outl(s, 0xcf8, 0x80001010); + qtest_inl(s, 0xcfc); + qtest_outl(s, 0xcf8, 0x80001010); + qtest_outl(s, 0xcfc, 0xc001); + qtest_outl(s, 0xcf8, 0x80001004); + qtest_inw(s, 0xcfc); + qtest_outl(s, 0xcf8, 0x80001004); + qtest_outw(s, 0xcfc, 0x7); + qtest_outl(s, 0xcf8, 0x80001004); + qtest_inw(s, 0xcfc); + qtest_inb(s, 0xc000); + qtest_outb(s, 0xc008, 0x8); + qtest_outw(s, 0xc00b, 0x4100); + qtest_outb(s, 0xc009, 0x0); + qtest_outb(s, 0xc009, 0x0); + qtest_outw(s, 0xc00b, 0xc212); + qtest_outl(s, 0xc042, 0x2c2c5a88); + qtest_outw(s, 0xc00b, 0xc212); + qtest_outw(s, 0xc00b, 0x415a); + qtest_outl(s, 0xc03f, 0x3060303); + qtest_outl(s, 0xc00b, 0x5afa9054); + qtest_quit(s); +} + int main(int argc, char **argv) { const char *arch = qtest_get_arch(); @@ -212,6 +246,8 @@ int main(int argc, char **argv) test_fifo_underflow_on_write_ok); qtest_add_func("am53c974/test_cancelled_request_ok", test_cancelled_request_ok); + qtest_add_func("am53c974/test_inflight_cancel_ok", + test_inflight_cancel_ok); } return g_test_run(); From patchwork Wed Nov 3 15:04:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1550372 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=ebziOCvw; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hkr6t6L8zz9s5P for ; Thu, 4 Nov 2021 02:20:06 +1100 (AEDT) Received: from localhost ([::1]:56798 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miI3Y-00005T-Ol for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2021 11:20:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52306) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miHpG-0003a7-Fl for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:20 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:36461) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miHp8-0000vj-Dn for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:14 -0400 Received: by mail-wr1-x429.google.com with SMTP id s13so4084994wrb.3 for ; Wed, 03 Nov 2021 08:05:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9pcrwji9vHuaWvaq0ZOMUVH0lNQxgrqXr28rTnWc4hQ=; b=ebziOCvwT93i71xxcLY+BozqlAIXTeAnZa2EYjJGOq2KqLnswnX6xZJtsNaYF9PfyA O+Yc1fu5ITlB8v0IntEMqLIvrolvoPHl3RCjgbX6kWMXeQB7jO3u3AzmSBpFzxcJl9fc 32ak37SHefYb4u+mjI9BQn7Wcy7iUvRC2EivaUlFZ0PJXr8MvPk+X1FfSb5sDkkyGSwV agmJDowaX4jmZq9z6nsyn7hDU7FjMZKfeLtvCpkvKHTyvp9OZNZB8g5yH/KVu0r11jcC bJVResNxlcWk6H+Stg7eMHbDPzwF+yKGJ9VOewock3SAO/ginXukVgMe/TJxpUYWQp33 u/YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=9pcrwji9vHuaWvaq0ZOMUVH0lNQxgrqXr28rTnWc4hQ=; b=ifJh8cirWlMWQVc2tbaCFsqu3bUVh0ySBqWWdgZnWyNtYn9/MdISAhJvfhGK0f1wa5 uTKJXupK+uwi1WZyVnNE4icjPYQAc/WNntJvip7goYXAay70zzBdKwU6lxmlhMeFLzWD eEI4fz1zOZ+hGpyGuHCljFZLH6NoRcyqkmmrjpQnEwIWWRTd1dHq9us5L+1n4ZQ7aXNW f9AdUABkQrzGpo3jBe8VNF/GKndhLiuONg3iy7NJQkG4lk1RlymR0W2NI1tnN/KphcGe gUIbfROcy0z1+0hG/+qRbf0H+yYPIotH8ollTCkD7iaLOQCtIwJUfQsenACLydNje0gf RQIA== X-Gm-Message-State: AOAM532kJx2Zsz2vx25Hi9freU1xBMhR1hK1syuqz/MIg45X0XsHhc7v h68IBZ1p9aXYghkUHRUT+JH96eJ1LZY= X-Google-Smtp-Source: ABdhPJzMBa5D7KExL+QeWVhgMCw+U/p8GZpPXrSBXDR/6+xx3Y9LSDE2HdAviN0WhorQrjNkhLMgkg== X-Received: by 2002:adf:a389:: with SMTP id l9mr45792112wrb.121.1635951907387; Wed, 03 Nov 2021 08:05:07 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h16sm2488797wrm.27.2021.11.03.08.05.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 08:05:07 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 21/27] meson: bump submodule to 0.59.3 Date: Wed, 3 Nov 2021 16:04:36 +0100 Message-Id: <20211103150442.387121-22-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103150442.387121-1-pbonzini@redhat.com> References: <20211103150442.387121-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x429.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This gains some bugfixes, especially: - it fixes the introspection of array options. While technically we still support Meson 0.58.2, this issue only appears when adding a new option and not if the user is just building QEMU. In the relatively rare case of a contributor using --meson to point to a 0.58 version, review can catch spurious changes to scripts/meson-buildoptions.sh easily. - it fixes "meson test" when it is not the process group leader. Make is the process group leader when "make check" invokes "meson test", so this is a requirement for using it as a test harness. Tested-by: Thomas Huth Reviewed-by: Thomas Huth Signed-off-by: Paolo Bonzini --- configure | 2 +- meson | 2 +- scripts/meson-buildoptions.py | 16 ---------------- 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/configure b/configure index c0018a304f..73af9a7b30 100755 --- a/configure +++ b/configure @@ -1500,7 +1500,7 @@ python_version=$($python -c 'import sys; print("%d.%d.%d" % (sys.version_info[0] python="$python -B" if test -z "$meson"; then - if test "$explicit_python" = no && has meson && version_ge "$(meson --version)" 0.59.2; then + if test "$explicit_python" = no && has meson && version_ge "$(meson --version)" 0.59.3; then meson=meson elif test $git_submodules_action != 'ignore' ; then meson=git diff --git a/meson b/meson index b25d94e7c7..12f9f04ba0 160000 --- a/meson +++ b/meson @@ -1 +1 @@ -Subproject commit b25d94e7c77fda05a7fdfe8afe562cf9760d69da +Subproject commit 12f9f04ba0decfda425dbbf9a501084c153a2d18 diff --git a/scripts/meson-buildoptions.py b/scripts/meson-buildoptions.py index 256523c09d..96969d89ee 100755 --- a/scripts/meson-buildoptions.py +++ b/scripts/meson-buildoptions.py @@ -150,23 +150,7 @@ def print_parse(options): print("}") -def fixup_options(options): - # Meson <= 0.60 does not include the choices in array options, fix that up - for opt in options: - if opt["name"] == "trace_backends": - opt["choices"] = [ - "dtrace", - "ftrace", - "log", - "nop", - "simple", - "syslog", - "ust", - ] - - options = load_options(json.load(sys.stdin)) -fixup_options(options) print("# This file is generated by meson-buildoptions.py, do not edit!") print_help(options) print_parse(options) From patchwork Wed Nov 3 15:04:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1550375 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=g02Y/gRA; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hkr8f5Ksdz9s5P for ; Thu, 4 Nov 2021 02:21:38 +1100 (AEDT) Received: from localhost ([::1]:33944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miI52-0003n1-I5 for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2021 11:21:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52190) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miHpA-0003Uf-Iz for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:12 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:36463) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miHp8-0000x7-Dp for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:12 -0400 Received: by mail-wr1-x42b.google.com with SMTP id s13so4085093wrb.3 for ; Wed, 03 Nov 2021 08:05:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FIzr7BKpCxEPcBjLKnsn6ExhpeVbY0ouQ+sU6JtlHwo=; b=g02Y/gRA7lX8t+Ijq8qtwjoe6PLwAig3BW7H6Pnl7jjSDJfDZxC/Q4MUqD5T+AJhpi TC6LTGrmG2L6mpFBsYI2gegCmgyev/FpaHXaKqpZ/Gy9GnHXkM78OZJ/Nw8SrNMAWdSk 1OAfDEE9TRPDg3xUBn609mQCRzWLGl/NuPrA67RZDbH8mS6FB3U92xzquXQkpdk8hPpp jxu8xhgDaLYrktQwdLjCkScMpSLSYtv8nKbT1kh4toQcTyex580pc/O1tvobrg2UibtH v2xYmJLiPhkJ7OvzcUk9a7mAuK9Zvr4Xs7kfJU5hAcJdfmBwHYXaB6UgXgsD9jGzOUah pyBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=FIzr7BKpCxEPcBjLKnsn6ExhpeVbY0ouQ+sU6JtlHwo=; b=wIKAnqQqjUS9ec+FELYP1ClnzKDT2MWorLKuOyd3XzmjygVsXHoB/mt28EmITffHgm 7R726H2vgoMoX70YXHMv6kIzmR8OVIHuwa5dIaOlG3RVVsLYhcZrNgW7DxcSGF08oktS kVsB++oX4i3w0VCXbeMjw5fP6FOKV5v0OfGwRMCp9OCP+BF77HJeux0FB3uIsrnX5vTC QwLGn0D99lkmvUcT41bvoMNJO3AlfSV5MKl/BfNDTy+O1v0Ck8lrAvOIS0n3cKNa64AO jSPDbjjkkNiLhNmGysTZMAc4TwfyimEaCTDNJYRhWFR1ig28U6CW5RTdph5HTrql53L8 ifPg== X-Gm-Message-State: AOAM530O91XpjCfSjgTRwKp4WEkyroYUZ5yI6a9wbPBiIkB90wyVXIli UnvggA1b3gNv8KmDcrOphn2mzyDlkZc= X-Google-Smtp-Source: ABdhPJwqkz76q88NrfP+EvICcFTl7p6apu8RsDsRGoMxY8kuwQbe8y+yaVTr9DplhWB/JpTgVm+VNA== X-Received: by 2002:a5d:6d51:: with SMTP id k17mr56971453wri.233.1635951908534; Wed, 03 Nov 2021 08:05:08 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h16sm2488797wrm.27.2021.11.03.08.05.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 08:05:08 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 22/27] meson.build: Allow to disable OSS again Date: Wed, 3 Nov 2021 16:04:37 +0100 Message-Id: <20211103150442.387121-23-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103150442.387121-1-pbonzini@redhat.com> References: <20211103150442.387121-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42b.google.com X-Spam_score_int: -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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth If sys/soundcard.h is available, it is currently not possible to disable OSS with the --disable-oss or --without-default-features configure switches. Improve the check in meson.build to fix this. Fixes: 87430d5b13 ("configure, meson: move audio driver detection to Meson") Signed-off-by: Thomas Huth Message-Id: <20211102105822.773131-1-thuth@redhat.com> Signed-off-by: Paolo Bonzini --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 85f1e43dfe..0ab9c43bf2 100644 --- a/meson.build +++ b/meson.build @@ -911,7 +911,7 @@ if liblzfse.found() and not cc.links(''' endif oss = not_found -if not get_option('oss').auto() or have_system +if have_system and not get_option('oss').disabled() if not cc.has_header('sys/soundcard.h') # not found elif targetos == 'netbsd' From patchwork Wed Nov 3 15:04:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1550378 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=pvnYhPZC; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HkrHM17X4z9s5P for ; Thu, 4 Nov 2021 02:27:25 +1100 (AEDT) Received: from localhost ([::1]:50592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miIAb-0006ZG-4J for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2021 11:27:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52290) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miHpG-0003a0-DY for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:18 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:33462) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miHpA-0000xG-9U for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:16 -0400 Received: by mail-wr1-x435.google.com with SMTP id d24so4124956wra.0 for ; Wed, 03 Nov 2021 08:05:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rnLo8h8h3qpMsXw4rmg0h4Mlf1YBlXBqCnyDSXIT3o4=; b=pvnYhPZC9B7itdMDSLPPYMY8vGyHTk9eTpcE6cpNynZ3IT80pJ2lJH0uzB96DGP2fB KFbOSdXv5GrCfS2AGTXHPLZrLKS3Z6YxMzqmDp9d+8sUOTkbvjYqQJ/j9yyUgv8s3Mq3 zxxrfw1u3Rrb1Nnnco9/kNAMrKFH6X86AH1DoPCFbs5d2yE8/LTQhuhJNUHvWhFXx+wE 9gpLGf8OtqKthPDWFrE+TqYkfkJpGCs3mV+WoziHnBl4qgaIpclpIfFApGIN4oF7t2gV /WemeQJgeLrVi2k1oFWnW2RMlP8zHp4s/G/jKako7/E8OD3fLK856+AdUHB9UnS2BON+ X4xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=rnLo8h8h3qpMsXw4rmg0h4Mlf1YBlXBqCnyDSXIT3o4=; b=pWg/uYQv3UnNq+cFZwuiO9t7xbxKvOAytcKYwtdY86ZFg7KVVDQOTWcoQZab3TAsKj KKg2Y5BKjaBMkqvIDQrblHYntWIlBf2W9wIzcTyhjOhneY5H8AQTKeyY2cOFe9E+yL9+ Pn3UqSVMw+kdYUKbveQw4EUIoz/nM2qIcuL/5G43/EDzYbdtr6/sH0dgOMQqfHEUA7gy 44ytNcLPqtRFNHU5vvMJoydKrdsFfgURfGCMXXrM7FC/c2Kjca06Hr2m24QGJTwsNNXx ocVAaXugwbktilbI59950qf26VvdDZmJK8dyZI0fipJAArHeBj6vSPS6uhX7GZ9foRQ9 BYmA== X-Gm-Message-State: AOAM532k6ritafew+Au13g8AfsVPLSAlvO2yAYQLagRfseuagYTGLEaR VGi3KVJhHkA2R/Yv4NdI/INeGvmxWu0= X-Google-Smtp-Source: ABdhPJzQLGaTkPb4buANTC6HdT1o5g5hyXC6f2fbOTD9g+cMD2Oc8xrvyq1qT+bJEdXeoMljdSiATg== X-Received: by 2002:adf:efc6:: with SMTP id i6mr33072185wrp.428.1635951909303; Wed, 03 Nov 2021 08:05:09 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h16sm2488797wrm.27.2021.11.03.08.05.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 08:05:08 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 23/27] meson: remove pointless warnings Date: Wed, 3 Nov 2021 16:04:38 +0100 Message-Id: <20211103150442.387121-24-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103150442.387121-1-pbonzini@redhat.com> References: <20211103150442.387121-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x435.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Meson tests sometimes warn if the required libraries and headers are present but a test program fails to link. In the case of DirectSound and OSS, however, there is no test program so there is no need to warn. Reported-by: Peter Maydell Signed-off-by: Paolo Bonzini --- meson.build | 4 ---- 1 file changed, 4 deletions(-) diff --git a/meson.build b/meson.build index 0ab9c43bf2..d09e314e04 100644 --- a/meson.build +++ b/meson.build @@ -924,8 +924,6 @@ if have_system and not get_option('oss').disabled() if not oss.found() if get_option('oss').enabled() error('OSS not found') - else - warning('OSS not found, disabling') endif endif endif @@ -938,8 +936,6 @@ if not get_option('dsound').auto() or (targetos == 'windows' and have_system) if not dsound.found() if get_option('dsound').enabled() error('DirectSound not found') - else - warning('DirectSound not found, disabling') endif endif endif From patchwork Wed Nov 3 15:04:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1550369 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=V2ivIC/h; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hkr4Y72Dwz9s5P for ; Thu, 4 Nov 2021 02:18:05 +1100 (AEDT) Received: from localhost ([::1]:48562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miI1b-0002tS-QT for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2021 11:18:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52302) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miHpG-0003a6-GR for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:20 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:43722) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miHpA-0000y3-9I for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:15 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 67-20020a1c1946000000b0030d4c90fa87so2090553wmz.2 for ; Wed, 03 Nov 2021 08:05:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AR6zROu+hSNCFZnWbKN2sMBmcQto/oUWk8gUO4Jr0u0=; b=V2ivIC/hkPlL4WuNYuy5VLSScMFZNoq6QwHSDPjBiezpw1Eu2G0Pu3tcG65N7t6Nqh 81YmOWA/3B6+LOV5uuoR75zFKJ1PHqDAFK2J4l1zY8vQxXhp7WdOlDSxV8AfoTYCAb3b 9JcpQ0F5ZZ8Xrzlk2icO5ursTrUNgpbir+XVZFRGQ4vSsX4UHHmrnWl1RAGkP9IwX/Ox XC3+YnUnW4mMqfjkEaxFeeAYTJPPPHMNYRPStlwpJ77nKHzMMsnx82DVL+KSkdeVqfM/ WPGcz4poZqIjHOZvlI5ZdK9gRVPqrCjFqMv1pVVprEtp5iS5vAADqoZ1eX+3FoRIIjN+ noPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=AR6zROu+hSNCFZnWbKN2sMBmcQto/oUWk8gUO4Jr0u0=; b=d7m+7ILfvjvgqF+ssXYYX/USgziaTeV7eQrd5LwAJ4/lvkquQV08Hmw+ZqOqgo5M3T srMtTjQC4DZcLMK4Z0q+QsSA1MXETffL3dmwNMU9s4F/Ln5f8FIVs2w2EtmjZwaJ7Ou8 hrbG+rRcJruJdNw4n+9CGiA+Eo5gzL4nd1j/7UDGJcFqG8XIGW3ZNT5aqmlN1s381ZXN 1QVKCLJXoMIlSZqIqrHXChJLup2qTZYyIzubHJ3SsczMT7dLCMsB8kMWNJB5Bo6zBjLJ PJBFMWsyEXb86q8q/N0jUtwVdexfrhObx9BYt0HkVbJPBz9Se3R55n3JzSqNJ//qUI21 wynQ== X-Gm-Message-State: AOAM532gTQi1qtdPAG8cQKTNNdwsteKXf+38AgvOf5Cg2njNKBJOOK6X R6eVZImgYJkuVMC7voNuin3r4ScJT7Y= X-Google-Smtp-Source: ABdhPJxUhflfR1Xs9pxKCDOtb8h/946uLp8JuI5aMupXezdTOY6FsyykYPUvFJX1f/kJhCvBQbV9jA== X-Received: by 2002:a05:600c:4e8d:: with SMTP id f13mr81029wmq.7.1635951910468; Wed, 03 Nov 2021 08:05:10 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h16sm2488797wrm.27.2021.11.03.08.05.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 08:05:10 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 24/27] meson: remove unnecessary coreaudio test program Date: Wed, 3 Nov 2021 16:04:39 +0100 Message-Id: <20211103150442.387121-25-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103150442.387121-1-pbonzini@redhat.com> References: <20211103150442.387121-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x32b.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" AudioGetCurrentHostTime has been present forever, so the test is not enforcing a specific version of macOS. In fact the test was broken since it was not linking against the coreaudio dependency; just remove it. Fixes: 87430d5b13 ("configure, meson: move audio driver detection to Meson", 2021-10-14) Reported-by: Peter Maydell Signed-off-by: Paolo Bonzini --- meson.build | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/meson.build b/meson.build index d09e314e04..30b06b12b4 100644 --- a/meson.build +++ b/meson.build @@ -944,22 +944,6 @@ coreaudio = not_found if not get_option('coreaudio').auto() or (targetos == 'darwin' and have_system) coreaudio = dependency('appleframeworks', modules: 'CoreAudio', required: get_option('coreaudio')) - if coreaudio.found() and not cc.links(''' - #include - int main(void) - { - return (int)AudioGetCurrentHostTime(); - }''') - coreaudio = not_found - endif - - if not coreaudio.found() - if get_option('coreaudio').enabled() - error('CoreAudio not found') - else - warning('CoreAudio not found, disabling') - endif - endif endif opengl = not_found From patchwork Wed Nov 3 15:04:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1550379 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=i/V1bdyv; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HkrLm3bj7z9s5P for ; Thu, 4 Nov 2021 02:30:24 +1100 (AEDT) Received: from localhost ([::1]:59262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miIDW-0003yd-27 for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2021 11:30:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52384) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miHpS-0003dx-DR for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:32 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:40811) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miHpF-0000yh-Vq for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:27 -0400 Received: by mail-wr1-x42c.google.com with SMTP id r8so4035966wra.7 for ; Wed, 03 Nov 2021 08:05:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=88Swk4/lwxEnEiIlWts7AFtGpk1Nrna2L0JS843r/WE=; b=i/V1bdyv/OOcMcPcYj3w7fAt59nWOBV1nkp8DzQKOjl0EXSLhIRTsLe9WCZwRNOqqj FISF67MZbb3ta73KynOnSTsorJkwsdWPle017eF3ZggEF5gv8w2TlUSH9PSX8zL2ui2e YmdVMPZlXVaYYKi9yUt2L/TLM2uQ6jV7TwF00icL2y17KTeu7eGmBbPRkxuyWxF9blEs 0525PV3wchTgD49X053XMrGV2uJV1ikcZSTn1MJWJbnUN4B7Wd85499YwthjW8npULja mJq/NEYr/NEmJucIPUxOgZUBqUNUk1LYk2lwyksp/JpWy/7+mR0grlP3mTrzgM8YoOSb 1xzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=88Swk4/lwxEnEiIlWts7AFtGpk1Nrna2L0JS843r/WE=; b=QbgSFgyZy79SKiqcIRA5UfI0C3nr38wyQaeBssoxBtD01VMfjkynt23DiPm9N0kHV4 OF2pz3DEYDrlsrKVxkKLDPg/yRneffmtP71P+MRYFJqUo71a+mpXwA4XFdfHohT3awn8 0q+mMrkP5ebMHt2x9+2DMniBztQs8gaDHx/CIiryr8PoE/29+BE291w8HwOXnEBT2/ow Q67V2DRKRgo+sEuOtxmuCtFmdHWBTP5w9317ByerZeJL8FMI4JCtyv1DXPN/jmC6VKaZ QqfXv33EfAfj9SUoLuI9XWDD33H3W+YmwXanCJ+qIwYKfa+DQqfZmQcxBkGG94Zay1af l5nA== X-Gm-Message-State: AOAM533WQp/Qlmc7nR1vnr7EVgeJwVZMFlIU77WXExRnAulOt+1mGf+k nUYOsdhZXnA+1DeHq3vVJElgW6qpnMU= X-Google-Smtp-Source: ABdhPJx7kZgPNbP5mNhOWhOsFJObMD1HTTy6w7EBNgbh45AbsrRTRREEFOLEjxbxtAyyAl9eh1XNyQ== X-Received: by 2002:a05:6000:12c5:: with SMTP id l5mr40809770wrx.173.1635951912079; Wed, 03 Nov 2021 08:05:12 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h16sm2488797wrm.27.2021.11.03.08.05.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 08:05:11 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 25/27] Move the l2tpv3 test from configure to meson.build Date: Wed, 3 Nov 2021 16:04:40 +0100 Message-Id: <20211103150442.387121-26-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103150442.387121-1-pbonzini@redhat.com> References: <20211103150442.387121-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth And while we're at it, also provide a proper entry for this feature in meson_options.txt, so that people who don't need it have a knob to disable this feature. Signed-off-by: Thomas Huth Message-Id: <20211028185910.1729744-3-thuth@redhat.com> Signed-off-by: Paolo Bonzini --- configure | 17 ----------------- meson.build | 8 ++++++++ meson_options.txt | 2 ++ net/meson.build | 4 +++- scripts/meson-buildoptions.sh | 3 +++ 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/configure b/configure index 73af9a7b30..2268e5d0ab 100755 --- a/configure +++ b/configure @@ -1896,20 +1896,6 @@ if test -z "$want_tools"; then fi fi -########################################## -# L2TPV3 probe - -cat > $TMPC < -#include -int main(void) { return sizeof(struct mmsghdr); } -EOF -if compile_prog "" "" ; then - l2tpv3=yes -else - l2tpv3=no -fi - ######################################### # vhost interdependencies and host support @@ -3514,9 +3500,6 @@ if test "$slirp_smbd" = "yes" ; then echo "CONFIG_SLIRP_SMBD=y" >> $config_host_mak echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak fi -if test "$l2tpv3" = "yes" ; then - echo "CONFIG_L2TPV3=y" >> $config_host_mak -fi if test "$gprof" = "yes" ; then echo "CONFIG_GPROF=y" >> $config_host_mak fi diff --git a/meson.build b/meson.build index 30b06b12b4..e330438270 100644 --- a/meson.build +++ b/meson.build @@ -1658,6 +1658,13 @@ config_host_data.set('HAVE_MLOCKALL', cc.links(gnu_source_prefix + ''' return mlockall(MCL_FUTURE); }''')) +have_l2tpv3 = false +if not get_option('l2tpv3').disabled() and have_system + have_l2tpv3 = (cc.has_header_symbol('sys/socket.h', 'struct mmsghdr') + and cc.has_header('linux/ip.h')) +endif +config_host_data.set('CONFIG_L2TPV3', have_l2tpv3) + have_netmap = false if not get_option('netmap').disabled() and have_system have_netmap = cc.compiles(''' @@ -3377,6 +3384,7 @@ summary_info += {'JACK support': jack} summary_info += {'brlapi support': brlapi} summary_info += {'vde support': vde} summary_info += {'netmap support': have_netmap} +summary_info += {'l2tpv3 support': have_l2tpv3} summary_info += {'Linux AIO support': libaio} summary_info += {'Linux io_uring support': linux_io_uring} summary_info += {'ATTR/XATTR support': libattr} diff --git a/meson_options.txt b/meson_options.txt index 4ab4570125..e740dce2a5 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -141,6 +141,8 @@ option('u2f', type : 'feature', value : 'auto', description: 'U2F emulation support') option('usb_redir', type : 'feature', value : 'auto', description: 'libusbredir support') +option('l2tpv3', type : 'feature', value : 'auto', + description: 'l2tpv3 network backend support') option('netmap', type : 'feature', value : 'auto', description: 'netmap network backend support') option('vde', type : 'feature', value : 'auto', diff --git a/net/meson.build b/net/meson.build index 94383e7460..847bc2ac85 100644 --- a/net/meson.build +++ b/net/meson.build @@ -18,7 +18,9 @@ softmmu_ss.add(files( softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('filter-replay.c')) -softmmu_ss.add(when: 'CONFIG_L2TPV3', if_true: files('l2tpv3.c')) +if have_l2tpv3 + softmmu_ss.add(files('l2tpv3.c')) +endif softmmu_ss.add(when: slirp, if_true: files('slirp.c')) softmmu_ss.add(when: vde, if_true: files('vde.c')) if have_netmap diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index c795a13020..55b8a78560 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -49,6 +49,7 @@ meson_options_help() { printf "%s\n" ' iconv Font glyph conversion support' printf "%s\n" ' jack JACK sound support' printf "%s\n" ' kvm KVM acceleration support' + printf "%s\n" ' l2tpv3 l2tpv3 network backend support' printf "%s\n" ' libdaxctl libdaxctl support' printf "%s\n" ' libiscsi libiscsi userspace initiator' printf "%s\n" ' libnfs libnfs block device driver' @@ -166,6 +167,8 @@ _meson_option_parse() { --disable-jack) printf "%s" -Djack=disabled ;; --enable-kvm) printf "%s" -Dkvm=enabled ;; --disable-kvm) printf "%s" -Dkvm=disabled ;; + --enable-l2tpv3) printf "%s" -Dl2tpv3=enabled ;; + --disable-l2tpv3) printf "%s" -Dl2tpv3=disabled ;; --enable-libdaxctl) printf "%s" -Dlibdaxctl=enabled ;; --disable-libdaxctl) printf "%s" -Dlibdaxctl=disabled ;; --enable-libiscsi) printf "%s" -Dlibiscsi=enabled ;; From patchwork Wed Nov 3 15:04:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1550381 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=SPGj0Zih; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HkrRH05Krz9s5P for ; Thu, 4 Nov 2021 02:34:19 +1100 (AEDT) Received: from localhost ([::1]:45668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miIHI-0005N7-SV for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2021 11:34:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miHpU-0003fF-B9 for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:35 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:36423) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miHpG-0000z4-0f for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:31 -0400 Received: by mail-wm1-x335.google.com with SMTP id z11-20020a1c7e0b000000b0030db7b70b6bso4877361wmc.1 for ; Wed, 03 Nov 2021 08:05:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LEYPHCoLHi7U2PQlZyg1xbJFkqyNPR2p+feFATfDKZs=; b=SPGj0ZihjNSAhZl2e5mw1DufY7yLbWIRAh9MDCFCqrZ+8fqIbcWqIGFfhjaaNjc0QK gKh143ZsyB8igGqACGKjL/hjFGth0+ONLd4Ir+sbqh/mf/0EA8CpDa7lQnT9CM6Np8ti xaM2aeGECr0OHqTA+0r7ZW2d0OTeR8y0LUHM1N3ZYAoayPLZMD15hRLpy4Bmbcga5R9g CWc/nUGLR2KruoWB0b6+Qd/zfBDJektmtT+zOMZplSCtXAN0sRSxh9+9qVQ3EROKQ5Zf BN4/jM1hNZ/4lWb0z3CPD+zOmghj7fet/HtRX9bedzxIx649Mhw41kKn2nSlmVceu0mF ZulQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=LEYPHCoLHi7U2PQlZyg1xbJFkqyNPR2p+feFATfDKZs=; b=O+ovCoG7vobeWHCMpQSAjHfT73RuRmY1OR+DgObTh9ndr0izde7+w8EELYY/g56Mnq L1juyoUChl9StfsyGD//cS6nv2a8F1AB8+oGunaVWHGUf1O0gEo5FN+u2rOMBHb1xe1r 5bR3RaC8E3KUXJPz2pj72FLN89plk3upzlS6OvAhR71rCVaRMT9HNW1fiLh8N+0xoitZ +eNxssnMVBRJfW3SlFBEIfmimNfyFBVqE0NuJ5H1Z8vtZAm/I+jlGl2hEZSJLkxtDeDI 6GsL0AoKwb4qjVwgAZhjrL3d+lFSauqnIfzmwKZVDN9uISm4A63QyGG83n78DEDtSfow qVow== X-Gm-Message-State: AOAM53055sMSpxB1oVFbczWoiy6kU7Isfcq73dEs0AMlqeLzP5mXe+Ar LdVgUrewI93ydQ4ZIHA/mw6H+/wcZhs= X-Google-Smtp-Source: ABdhPJzJEW12aSoMOpHepK7OqIrNy70EV4vwmrYH1e6efgsSyYLzVQe4a5VkzKz5p35SDNpjc+X9xQ== X-Received: by 2002:a05:600c:3b28:: with SMTP id m40mr4559123wms.100.1635951913776; Wed, 03 Nov 2021 08:05:13 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h16sm2488797wrm.27.2021.11.03.08.05.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 08:05:13 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 26/27] configure: Remove the check for the __thread keyword Date: Wed, 3 Nov 2021 16:04:41 +0100 Message-Id: <20211103150442.387121-27-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103150442.387121-1-pbonzini@redhat.com> References: <20211103150442.387121-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x335.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth We recently bumped our minimum required version of GCC to 7.4 and Clang to 6.0, and those compiler versions should support the __thread keyword already. Signed-off-by: Thomas Huth Message-Id: <20211028185910.1729744-2-thuth@redhat.com> Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- configure | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/configure b/configure index 2268e5d0ab..4c444e1750 100755 --- a/configure +++ b/configure @@ -1724,17 +1724,6 @@ if test "$static" = "yes" ; then fi fi -# Unconditional check for compiler __thread support - cat > $TMPC << EOF -static __thread int tls_var; -int main(void) { return tls_var; } -EOF - -if ! compile_prog "-Werror" "" ; then - error_exit "Your compiler does not support the __thread specifier for " \ - "Thread-Local Storage (TLS). Please upgrade to a version that does." -fi - cat > $TMPC << EOF #ifdef __linux__ From patchwork Wed Nov 3 15:04:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1550373 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=aqM65Jex; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hkr720LCZz9s5P for ; Thu, 4 Nov 2021 02:20:14 +1100 (AEDT) Received: from localhost ([::1]:57556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1miI3f-0000dM-Rb for incoming@patchwork.ozlabs.org; Wed, 03 Nov 2021 11:20:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1miHpS-0003dw-DM for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:32 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:46678) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1miHpF-0000zA-VZ for qemu-devel@nongnu.org; Wed, 03 Nov 2021 11:05:27 -0400 Received: by mail-wm1-x336.google.com with SMTP id b184-20020a1c1bc1000000b0033140bf8dd5so2065439wmb.5 for ; Wed, 03 Nov 2021 08:05:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hf6F8LWwHbQDD2Jjgb4WPM+UfGS9Me1LA1sRup9TIeU=; b=aqM65JexbnK5Wej+E5u6PFyc3u+pJ+gXabm8XwEeiBowyWC5K0iZN7qHGi3Bpl9YHZ Ejgu0YGgmzKY5PufqmAKUnDyyv4XBs39LML99A52gBkJPS+IjDUi0jQQaiWUh+TdbyPx eBkKPpYdagVKmZtJXrI97HuBWLp8K+XmAAkLkpPH3sF9JtROH0bJDLNMMkhtDHAvoWcC o3PKE7Z3SUErQHToEFinw5JnQ7TTXCOW4qslODjtdf+dS+DxWaeAg3YHTHQixVcOBbc6 +P5Y6O13nk8l6pOQEcfqyqRMqqTrwLNUqfh842exH94j7VfVy1zDhHg7z9FAugmz97na 9baw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=hf6F8LWwHbQDD2Jjgb4WPM+UfGS9Me1LA1sRup9TIeU=; b=Ss46BYvkQ4pn3tJS1b3EOcvB9SW22E+Taygt+2kMPVM/NXhrpo9Sry87COEAXupkAo RNzGrPwwSYdFgHpmM2fNx+9MXDnhwxylzU+D5gRMKwjkIG1nJ7zX03KtluRW7al21Zas 4hQEWRZeT7ukaVB/lsmf48jztWT0p2OR3rklHTZNwcR18W5v5SOsf+X4WctkNlTQdCXc 5WoS9mPLrzIdJY5kkjJHK0b/Z8CJoYSv8AY47sKnQ9RetDNOLibRYJg2NRkGLRhST6fA jylki139+T2jy4mOoRm8wAN67qCk8vzLLKvM3hDJpGaSZDpJL1npiG4S5iBu1kDEGeQ3 hlUA== X-Gm-Message-State: AOAM530S2OTM7qAnHXrmnx8YdCDtRRk41MLw8iXmUbvclYEBEFCKtk5/ haslaj5/RYtEyWTvi7zlw5drXGLKXHU= X-Google-Smtp-Source: ABdhPJy1EWa7KQNuugi8vV7vv5CM/c2QCXc2/bRmPFkKGhhT8gTzr8IVVN9FRqYz5NSU3ST+pqQEBQ== X-Received: by 2002:a1c:48e:: with SMTP id 136mr16112444wme.21.1635951914447; Wed, 03 Nov 2021 08:05:14 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id h16sm2488797wrm.27.2021.11.03.08.05.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Nov 2021 08:05:14 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 27/27] configure: fix --audio-drv-list help message Date: Wed, 3 Nov 2021 16:04:42 +0100 Message-Id: <20211103150442.387121-28-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211103150442.387121-1-pbonzini@redhat.com> References: <20211103150442.387121-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=paolo.bonzini@gmail.com; helo=mail-wm1-x336.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" --audio-drv-list is now establishing which audio drivers to try if -audiodev is not used; drivers for -audiodev are configured with --enable/--disable options or possibly --without-default-features. Adjust the help message for --audio-drv-list. Reported-by: Peter Maydell Signed-off-by: Paolo Bonzini --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 4c444e1750..97fee368ee 100755 --- a/configure +++ b/configure @@ -1390,7 +1390,7 @@ Advanced options (experts only): --disable-strip disable stripping binaries --disable-werror disable compilation abort on warning --disable-stack-protector disable compiler-provided stack protection - --audio-drv-list=LIST set audio drivers list + --audio-drv-list=LIST set audio drivers to try if -audiodev is not used --block-drv-whitelist=L Same as --block-drv-rw-whitelist=L --block-drv-rw-whitelist=L set block driver read-write whitelist