From patchwork Fri Jul 29 15:04:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1662055 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=JOexsHrW; 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 4LvW6m0w4Gz9sGH for ; Sat, 30 Jul 2022 01:05:50 +1000 (AEST) Received: from localhost ([::1]:60048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oHRYg-0003e3-Vo for incoming@patchwork.ozlabs.org; Fri, 29 Jul 2022 11:05:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHRXo-0003cy-Sd for qemu-devel@nongnu.org; Fri, 29 Jul 2022 11:04:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:34652) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHRXl-0005WF-Ho for qemu-devel@nongnu.org; Fri, 29 Jul 2022 11:04:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659107086; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uKem1gFTaYZEfwKiLIIk3p12yz13r44iWz46N1Yc1K4=; b=JOexsHrWzWaYReNvloxdProcymHWph+n7X3874ZCtIdOQhj/2ZEPXKH8bDROi1lx1qvdlo 4lMoh2lgpUrvQGChOLWHuz5stVc9ZpbTL9yRHIjMliHZmFEOVnSMv3o5duX4mNMbioHICq zB0xybQNut9GrR4Er2u/Ez0plaGuxtg= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-126-sgMBYId5ODe8LKVaAFANKA-1; Fri, 29 Jul 2022 11:04:45 -0400 X-MC-Unique: sgMBYId5ODe8LKVaAFANKA-1 Received: by mail-ed1-f70.google.com with SMTP id b15-20020a056402278f00b0043acaf76f8dso3124871ede.21 for ; Fri, 29 Jul 2022 08:04:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uKem1gFTaYZEfwKiLIIk3p12yz13r44iWz46N1Yc1K4=; b=0afvgbXMK+8/+b8g292PpA45Mfe59ssLiCyN9jYjImAy7VWwboeuXYb9Q53PINZjSC 66R0a1AG/P31N1RlL8usiha9qW4GLxvXe2Q1k5q6cAVLuEbQrXYwBmf2xwW487bzYLG/ TjYJ+0wb+VGv4SNEOo2pTAO6Qywb71zlGAjR9ixIf6nhc0yYENaPNTAN0QZbqFX8W68g 46dkaYJDWmp1hQ/wGXgIKeg4if6zUqiticUUTpbSbOMUJxZ8dtrx6GV65wCp9IP2gF4z dTc/qUs1cqqOJM/unt4aJL6E1dp9jWb56ROsVKQ5xvSwET4aVYHBZHM0d49Lv13b6htk Ol/A== X-Gm-Message-State: AJIora/bFHr25QXpDAUA8fHAIgbG6RA2bP/OtOepRqA1ohp4do/a3oJE B/0VRAhdgYxJIzMDJQF8claLXTT30dUfT6ZxH+p8/YPXufpyQSOCbBN8UJqLNAUtAqzbgB0rBzq YYHhLWrW7S1qSforfJhRCdW2bf73DBBVgVhKdtW+A7bBZZoHdfNUA3n1x1hKf1kVUJ3I= X-Received: by 2002:a05:6402:2687:b0:43a:6025:1658 with SMTP id w7-20020a056402268700b0043a60251658mr3902508edd.271.1659107083543; Fri, 29 Jul 2022 08:04:43 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sLBTIwC0L1BJO0niVrYPzbs11JPcGz2eCbSDYUBwbLIpVCXHCHBTJZ6+abo8EPLVt/eHsgsw== X-Received: by 2002:a05:6402:2687:b0:43a:6025:1658 with SMTP id w7-20020a056402268700b0043a60251658mr3902460edd.271.1659107082992; Fri, 29 Jul 2022 08:04:42 -0700 (PDT) Received: from goa-sendmail ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id i26-20020a50fc1a000000b0043cf1c6bb10sm2437134edr.25.2022.07.29.08.04.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 08:04:42 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= Subject: [PULL 1/6] ui: dbus-display requires CONFIG_GBM Date: Fri, 29 Jul 2022 17:04:33 +0200 Message-Id: <20220729150438.20293-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220729150438.20293-1-pbonzini@redhat.com> References: <20220729150438.20293-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -11 X-Spam_score: -1.2 X-Spam_bar: - X-Spam_report: (-1.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PP_MIME_FAKE_ASCII_TEXT=0.999, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-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" Without CONFIG_GBM, compiling dbus-display fails with ../ui/dbus.c: In function ‘dbus_create_context’: ../ui/dbus.c:47:20: error: ‘qemu_egl_rn_ctx’ undeclared (first use in this function); did you mean ‘qemu_egl_init_ctx’? 47 | qemu_egl_rn_ctx); | ^~~~~~~~~~~~~~~ | qemu_egl_init_ctx ../ui/dbus.c:47:20: note: each undeclared identifier is reported only once for each function it appears in and many other similar errors, because include/ui/egl-helpers.h only has these declaration if gbm is found on the system. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1108 Reviewed-by: Marc-André Lureau Reviewed-by: Daniel P. Berrangé Signed-off-by: Paolo Bonzini --- meson.build | 4 ++-- ui/meson.build | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 75aaca8462..294e9a8f32 100644 --- a/meson.build +++ b/meson.build @@ -1677,8 +1677,8 @@ dbus_display = get_option('dbus_display') \ error_message: '-display dbus requires --enable-modules') \ .require(gdbus_codegen.found(), error_message: '-display dbus requires gdbus-codegen') \ - .require(opengl.found(), - error_message: '-display dbus requires epoxy/egl') \ + .require(opengl.found() and gbm.found(), + error_message: '-display dbus requires epoxy/egl and gbm') \ .allowed() have_virtfs = get_option('virtfs') \ diff --git a/ui/meson.build b/ui/meson.build index e9f48c5315..ec13949776 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -81,7 +81,7 @@ if dbus_display '--interface-prefix', 'org.qemu.', '--c-namespace', 'QemuDBus', '--generate-c-code', '@BASENAME@']) - dbus_ss.add(when: [gio, pixman, opengl], + dbus_ss.add(when: [gio, pixman, opengl, gbm], if_true: [files( 'dbus-chardev.c', 'dbus-clipboard.c', From patchwork Fri Jul 29 15:04:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1662054 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=CsC/xvxe; 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 4LvW6l6fCGz9s5W for ; Sat, 30 Jul 2022 01:05:50 +1000 (AEST) Received: from localhost ([::1]:60066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oHRYh-0003ex-EK for incoming@patchwork.ozlabs.org; Fri, 29 Jul 2022 11:05:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39952) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHRXo-0003cx-Sg for qemu-devel@nongnu.org; Fri, 29 Jul 2022 11:04:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:38362) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHRXk-0005WQ-UU for qemu-devel@nongnu.org; Fri, 29 Jul 2022 11:04:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659107087; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Y9jTGz6yycUqlvdaKmP8LetyYM6boIaRuNVp7IEHQfM=; b=CsC/xvxexhQbF0mJSYzoiA30eoM66QwCSH6tdQN6SgQw3ksbuXUiKAnVZh76X7NG+f5VXG 5fIF1OJ9d3G9qH1H297vaVW1LbLhST7j64qhKnZLfFNi2lLl95UHKBWfK1YxtVCOxLFnK7 VFLQBjNs7e5P3wxt4Wiiax6uy6SAzSw= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-58-jYTcdJ0nO2-ay0GUGeLHrA-1; Fri, 29 Jul 2022 11:04:46 -0400 X-MC-Unique: jYTcdJ0nO2-ay0GUGeLHrA-1 Received: by mail-ed1-f71.google.com with SMTP id h15-20020a056402280f00b0043bd8412fe0so3097289ede.16 for ; Fri, 29 Jul 2022 08:04:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Y9jTGz6yycUqlvdaKmP8LetyYM6boIaRuNVp7IEHQfM=; b=MInU204ivvDftirRd28lh+y0Wz1HwB6q3zJ16O8l8b9XgNwscgAw/3tqnJfSfMfLrF VgCIP3iP6YETh+A9LyvSVQOMsLxHNMlcrEvzDjCJlVkQz2sFDwnUWBlxaqHY0nksAseT TMeZmdISsfTGHNnDUYxNOoxGOKTBHxbhT0bFXnq5qISh1qyO6Vhq6QSqyS0CXJp/N56q ZTyClvyS8TC8aFr9TIA7Z0hlT0XRi2d+z+jldkoaYvrBo4R5xsicdCYcEWFAIx6v/pIb LvuNsTzsmqc1NX2pdVEZtmJbjgvCd1POngQMqjZlxa3zSAeDyOLznVYLARVMwkrdOvxG VGeA== X-Gm-Message-State: AJIora+O19MUULrhxkO9ioqhhzR6olpoXEKO5+JPt/kGQX8zRm22oGAe aeqYhqRdZF3gAu7cS587APpNBIfh1GUlqeNdn+prgyENywulhkcTWte++VQ5ZSYAcZlRqKt3UR7 V9sXcUPPJ7PHIm5ra5lmSd+V+cmBNR/bZ/mnpSpYFiOQlmVi80ReAi7r9dpR50oAErHU= X-Received: by 2002:a05:6402:348f:b0:43c:2919:cfb5 with SMTP id v15-20020a056402348f00b0043c2919cfb5mr3919113edc.326.1659107084983; Fri, 29 Jul 2022 08:04:44 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sMtoLcMgY1uS8qqJ7PSO+4SCI7OdFvpQ+DTvcxZapp249wgSwzU/7/Om+5aCZMI5zT0CCfDA== X-Received: by 2002:a05:6402:348f:b0:43c:2919:cfb5 with SMTP id v15-20020a056402348f00b0043c2919cfb5mr3919070edc.326.1659107084505; Fri, 29 Jul 2022 08:04:44 -0700 (PDT) Received: from goa-sendmail ([93.56.169.184]) by smtp.gmail.com with ESMTPSA id c10-20020a17090618aa00b00704fa2748ffsm5261ejf.99.2022.07.29.08.04.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 08:04:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Korneliusz Osmenda Subject: [PULL 2/6] vga: fix incorrect line height in 640x200x2 mode Date: Fri, 29 Jul 2022 17:04:34 +0200 Message-Id: <20220729150438.20293-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220729150438.20293-1-pbonzini@redhat.com> References: <20220729150438.20293-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" When in CGA modes, QEMU wants to ignore the maximum scan field (bits 0..4) of the maximum scan length register in the CRTC. It is not clear why this is needed---for example, Bochs ignores bit 7 instead. The issue is that the CGA modes are not detected correctly, and in particular mode 6 results in multi_scan==3 according to how SeaBIOS programs it. The right way to check for CGA graphics modes is to check whether bit 13 of the address is special cased by the CRT controller to achieve line interleaving, i.e. whether bit 0 of the CRTC mode control register is clear. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1020 Reported-by: Korneliusz Osmenda Signed-off-by: Paolo Bonzini --- hw/display/vga.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/display/vga.c b/hw/display/vga.c index 5dca2d1528..50ecb1ad02 100644 --- a/hw/display/vga.c +++ b/hw/display/vga.c @@ -1514,9 +1514,10 @@ static void vga_draw_graphic(VGACommonState *s, int full_update) force_shadow = true; } + /* bits 5-6: 0 = 16-color mode, 1 = 4-color mode, 2 = 256-color mode. */ shift_control = (s->gr[VGA_GFX_MODE] >> 5) & 3; double_scan = (s->cr[VGA_CRTC_MAX_SCAN] >> 7); - if (shift_control != 1) { + if (s->cr[VGA_CRTC_MODE] & 1) { multi_scan = (((s->cr[VGA_CRTC_MAX_SCAN] & 0x1f) + 1) << double_scan) - 1; } else { From patchwork Fri Jul 29 15:04:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1662059 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=SwMnVaLf; 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 4LvWD72tKCz9s5W for ; Sat, 30 Jul 2022 01:10:31 +1000 (AEST) Received: from localhost ([::1]:42412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oHRdE-0002Oq-Q6 for incoming@patchwork.ozlabs.org; Fri, 29 Jul 2022 11:10:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHRXu-0003fu-GU for qemu-devel@nongnu.org; Fri, 29 Jul 2022 11:04:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:34030) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHRXt-0005ct-3r for qemu-devel@nongnu.org; Fri, 29 Jul 2022 11:04:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659107096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oym6wOOKBT4WvthSHQ18RTGVxUH/cH6Hs2+0WEigjfY=; b=SwMnVaLfDlY+widiPheJsDSouwnBiKSbKP4S8gQrUK9YJNl4IaBukuY0jx2I/MenJD0ik6 F2+Op9+kyMQMg0YH2qCLOLUuuaHbDxT9GW/J0UExPxLvgp2oqq+t66fD2Nht87EYiMZAE/ Rl9SmRg6bxB1Xse3hwRFCIwt9DvUtKc= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-312-b_BV2PvqP-6IEtoM_TEUmA-1; Fri, 29 Jul 2022 11:04:47 -0400 X-MC-Unique: b_BV2PvqP-6IEtoM_TEUmA-1 Received: by mail-ed1-f71.google.com with SMTP id z1-20020a05640235c100b0043bca7d9b3eso3048725edc.5 for ; Fri, 29 Jul 2022 08:04:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oym6wOOKBT4WvthSHQ18RTGVxUH/cH6Hs2+0WEigjfY=; b=tiE81G8s8G5zc82ZqJ2X8NMl1u0/bB731Vez09AUwg4ftXQZLXhlb69JvVC2y6+b5W 3NVic6AgK8czYCWScmZnRM1z/wC7XxEumHTJXyxrtfb3Gs+qgLQ5KK8LquEZLaEnPqC8 QmPDgqx03iZobzFIjPxHcl3vlp7vl+A7AkVbG2QTqlgX1vlRP9QBoYMbiTUlTK9WmRuR BsabPFCApNk/1ORUE2TY+u9djJrM71epVg+eSc3LVTLIkv6Z2Pll9ZmO3o31IdaQvKY6 y54CKhb7b3NNiL8tFB0urtgkmJiICJl/ftJ57+7TSxrNFQGRk6zukXMh/1iH8MjLY3cy jBkw== X-Gm-Message-State: AJIora9Y4MY4q7Cjrp2jM2cUGmxj2yWliH6rMHpOBzyOe1vNx3R39kZh E/8haW5E2yvWBJEJUcT1LmgFOd/4ls0o+GWN+UaIb6nmOsb08oGzsntUfeoERZk7JJypPmqob8J SFdHwLJfrbpyJeBZ2PUMxWaBZnknOnFS997TjMW6cI+D4Y82YQJPQBTlw8EL2iOFjI1U= X-Received: by 2002:a05:6402:34c8:b0:43b:e7b1:353c with SMTP id w8-20020a05640234c800b0043be7b1353cmr4006886edc.171.1659107086325; Fri, 29 Jul 2022 08:04:46 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u+JfC0xVPtEFc+CYy2RM1zo6gaHJ0itVBDGqG19hE/7CXFe853QV46hpRGPfpREDL4ZyAv+Q== X-Received: by 2002:a05:6402:34c8:b0:43b:e7b1:353c with SMTP id w8-20020a05640234c800b0043be7b1353cmr4006853edc.171.1659107085894; Fri, 29 Jul 2022 08:04:45 -0700 (PDT) Received: from goa-sendmail ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id s11-20020a056402014b00b0043cc66d7accsm2442955edu.36.2022.07.29.08.04.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 08:04:45 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Claudio Fontana , Pavel Dovgalyuk , Thomas Huth Subject: [PULL 3/6] stubs: update replay-tools to match replay.h types Date: Fri, 29 Jul 2022 17:04:35 +0200 Message-Id: <20220729150438.20293-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220729150438.20293-1-pbonzini@redhat.com> References: <20220729150438.20293-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Claudio Fontana detected with GCC 13 [-Werror=enum-int-mismatch] Solves Issue #1096. Signed-off-by: Claudio Fontana Cc: Pavel Dovgalyuk Reviewed-by: Thomas Huth Message-Id: <20220704075832.31537-1-cfontana@suse.de> Signed-off-by: Paolo Bonzini --- stubs/replay-tools.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/stubs/replay-tools.c b/stubs/replay-tools.c index 43296b3d4e..f2e72bb225 100644 --- a/stubs/replay-tools.c +++ b/stubs/replay-tools.c @@ -7,13 +7,14 @@ bool replay_events_enabled(void) return false; } -int64_t replay_save_clock(unsigned int kind, int64_t clock, int64_t raw_icount) +int64_t replay_save_clock(ReplayClockKind kind, + int64_t clock, int64_t raw_icount) { abort(); return 0; } -int64_t replay_read_clock(unsigned int kind, int64_t raw_icount) +int64_t replay_read_clock(ReplayClockKind kind, int64_t raw_icount) { abort(); return 0; @@ -48,11 +49,11 @@ void replay_mutex_unlock(void) { } -void replay_register_char_driver(Chardev *chr) +void replay_register_char_driver(struct Chardev *chr) { } -void replay_chr_be_write(Chardev *s, uint8_t *buf, int len) +void replay_chr_be_write(struct Chardev *s, uint8_t *buf, int len) { abort(); } From patchwork Fri Jul 29 15:04:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1662053 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=XANpWWf8; 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 4LvW6m0tQ2z9sGD for ; Sat, 30 Jul 2022 01:05:50 +1000 (AEST) Received: from localhost ([::1]:60070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oHRYh-0003ez-Ki for incoming@patchwork.ozlabs.org; Fri, 29 Jul 2022 11:05:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39982) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHRXp-0003d4-9U for qemu-devel@nongnu.org; Fri, 29 Jul 2022 11:04:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:40636) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHRXn-0005Zg-Ss for qemu-devel@nongnu.org; Fri, 29 Jul 2022 11:04:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659107091; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ozqz6NgN5UrYIkgbF2IKICsewj9wf4h4U4xk0uoexgQ=; b=XANpWWf8kaoEBqrzrcKzLzrjGjU3jUCT5UbGVzvmdBjqTt8TCdth+nL8elE8qpRd83OXds k0VfACbAGZjn4PlUVEPkabbJNZHuQSI3iJCn0/Py8uF7q/ljCj7VikosSx2VpArEwKVZ0u LsbUuk8Wl/WgXQMn++j/SrLpW0YhbMY= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-9-vGuavOalN3KrOQBqPDv-UA-1; Fri, 29 Jul 2022 11:04:49 -0400 X-MC-Unique: vGuavOalN3KrOQBqPDv-UA-1 Received: by mail-ed1-f69.google.com with SMTP id z1-20020a05640235c100b0043bca7d9b3eso3048772edc.5 for ; Fri, 29 Jul 2022 08:04:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ozqz6NgN5UrYIkgbF2IKICsewj9wf4h4U4xk0uoexgQ=; b=FM55gtArGkB3nY98KyVaw3hqNOdIQHbyG9Xx8KCP0BJkuyccWCGQCQf11+r4kYCuCM 5tn9JG+a+4s3Bgr5Zv6PBCSGb7HX8/fxCqu4JbMIqmE5bRwwXZzArNg7sg2d75AaKlNO ++4ksuGm4jHreK03hgZdWrmRfH8CRAXFJIEDixl1aZATl7n2gyYrBPg2xNCVK6uT2KPF ukeiQ0yvCkiayvMt5WwwHAYu2brW/4ozBww3vKJRngxYuat3buWp/TwQ54KQb/VPdiY7 HBj1BsG7Od/8M9+r/c2IJpccdcP5j3O5GV0/wXA/Qd39f5DVndaEruIX+3WqY7nOa5z2 0rMw== X-Gm-Message-State: AJIora+AqeVhNd2U2S3fBCbqGjjhyu3uTZHV8oj85CkNu9LH3AKzEYFs oRFVvc/x2QIuuTf2kpk4jFG4sAGH4vC+HWmB64rAStwCTvmXH/HzB2eq4uUJE521ViVY1hthGjN xIu6aT3kf7Z4a2YjjwP9yKYR/Pn+0B01YpmlWhxQ4WL4QYUFRCEnvi+jTmgRORqVa4B0= X-Received: by 2002:a17:907:7e87:b0:72f:18d7:6094 with SMTP id qb7-20020a1709077e8700b0072f18d76094mr3209420ejc.77.1659107087733; Fri, 29 Jul 2022 08:04:47 -0700 (PDT) X-Google-Smtp-Source: AGRyM1syQgae0m9dbxCOgnKpp9zq0TFSMZvShAZzB0b19gmX854veh363PQkjv40htozJFGaU+09WA== X-Received: by 2002:a17:907:7e87:b0:72f:18d7:6094 with SMTP id qb7-20020a1709077e8700b0072f18d76094mr3209390ejc.77.1659107087254; Fri, 29 Jul 2022 08:04:47 -0700 (PDT) Received: from goa-sendmail ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id gq12-20020a170906e24c00b0072aebed5937sm1762505ejb.221.2022.07.29.08.04.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 08:04:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Richard Henderson Subject: [PULL 4/6] configure: Fix ppc container_cross_cc substitution Date: Fri, 29 Jul 2022 17:04:36 +0200 Message-Id: <20220729150438.20293-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220729150438.20293-1-pbonzini@redhat.com> References: <20220729150438.20293-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson When moving this code out of probe_target_compiler(), we failed to adjust the variable in which the target is located, resulting in e.g. powerpc64-linux-user-linux-gnu-gcc-10 Fixes: cd362defbbd ("tests/tcg: merge configure.sh back into main configure script") Signed-off-by: Richard Henderson Message-Id: <20220728183901.1290113-1-richard.henderson@linaro.org> Signed-off-by: Paolo Bonzini --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 2c19329d58..c4c02b8438 100755 --- a/configure +++ b/configure @@ -2028,7 +2028,7 @@ probe_target_compiler() { ;; ppc64|ppc64le) container_image=debian-powerpc-test-cross - container_cross_prefix=powerpc${1#ppc}-linux-gnu- + container_cross_prefix=powerpc${target_arch#ppc}-linux-gnu- container_cross_cc=${container_cross_prefix}gcc-10 ;; riscv64) From patchwork Fri Jul 29 15:04:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1662058 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=TwD8erBe; 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 4LvWD13cslz9s5W for ; Sat, 30 Jul 2022 01:10:25 +1000 (AEST) Received: from localhost ([::1]:42344 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oHRd9-0002MB-Cg for incoming@patchwork.ozlabs.org; Fri, 29 Jul 2022 11:10:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHRXp-0003dg-Tv for qemu-devel@nongnu.org; Fri, 29 Jul 2022 11:04:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:60705) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHRXo-0005Zw-EP for qemu-devel@nongnu.org; Fri, 29 Jul 2022 11:04:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659107092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aequy6Qk0ViZ+gTKObRysKwXIpsvPUj5N7aD5w/r25U=; b=TwD8erBeNm/mEctn45WZ3yaRFACgm2yTSO1K0VavupERDDL/X2SpNEofpEttS7oIS2GPHc R0Hiq116Lczv7c40FBC8CSUr1jRdVwuIc+ty0nP2WC6cO9KWX0mEHLUnmkh2KqWcVcrn2g acWXurAoWBD2F4H9Mn7JU05KmSAYR4k= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-32-n9r83-PvOEypvjm54wmyTQ-1; Fri, 29 Jul 2022 11:04:50 -0400 X-MC-Unique: n9r83-PvOEypvjm54wmyTQ-1 Received: by mail-ed1-f71.google.com with SMTP id z14-20020a05640240ce00b0043c25c21e94so3072177edb.14 for ; Fri, 29 Jul 2022 08:04:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aequy6Qk0ViZ+gTKObRysKwXIpsvPUj5N7aD5w/r25U=; b=1EvlL728jnhyP/PdmK6tLSTDZIXg84E+LL2JWNNEnTmohajeV/lA7IwiwnqK0p+0ML Ri89X9Fa/HKS5WMlNNaVmJFaTd7vINClVDrI14yW0YLDPt7sdJGE0Ntqw2sNdU6enh8s Cm1FbPkhc5knqOMGScrsKG99x/5WxYXWSS4C9M1newWx/+R9NvzsM5fT2GHX+xOMbq++ z/1BoYXeXW/hchSsrMrraaJU7GfkLnFYA+85SqjB6vIfZcVj2n5+MYFlYh+kgGgYAkny Og04LiEe9ut9qkm1gSqgxuT7pBLFk4M3zH2iLrQRKDu83EbE968YSoowkKmt5NilL33X QT7g== X-Gm-Message-State: AJIora+Y3a8itjoRcj8kerUXr7f2T7KkHrUBHELkOX20YplGDpQf2BU5 8dcQN2uvJOKCVbhZCA1cBuISWOavnHZhFsGqMWXVSSe2iE1GG5mylosgzgUMZHKh1k2rGfOykZK 9xWTfaq0iKctXxgaEMrQv9LasiALLOF41AbQuXNQeUBS5W9yJWxbFAUE1ZSTNlF5MxXQ= X-Received: by 2002:aa7:cad3:0:b0:43c:e615:13e2 with SMTP id l19-20020aa7cad3000000b0043ce61513e2mr3875779edt.289.1659107088995; Fri, 29 Jul 2022 08:04:48 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tCoWCA1oCP7QsDnGxhccYOKdg2GgCIiJU70L6nJZqSdDAJdBD4wYFbKQC8KeuypyTsi58q/Q== X-Received: by 2002:aa7:cad3:0:b0:43c:e615:13e2 with SMTP id l19-20020aa7cad3000000b0043ce61513e2mr3875744edt.289.1659107088594; Fri, 29 Jul 2022 08:04:48 -0700 (PDT) Received: from goa-sendmail ([93.56.169.184]) by smtp.gmail.com with ESMTPSA id j20-20020aa7c414000000b0043a85d7d15esm2511505edq.12.2022.07.29.08.04.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 08:04:47 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Cornelia Huck Subject: [PULL 5/6] kvm: don't use perror() without useful errno Date: Fri, 29 Jul 2022 17:04:37 +0200 Message-Id: <20220729150438.20293-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220729150438.20293-1-pbonzini@redhat.com> References: <20220729150438.20293-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Cornelia Huck perror() is designed to append the decoded errno value to a string. This, however, only makes sense if we called something that actually sets errno prior to that. For the callers that check for split irqchip support that is not the case, and we end up with confusing error messages that end in "success". Use error_report() instead. Signed-off-by: Cornelia Huck Message-Id: <20220728142446.438177-1-cohuck@redhat.com> Signed-off-by: Paolo Bonzini --- accel/kvm/kvm-all.c | 2 +- target/arm/kvm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index f165074e99..645f0a249a 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -2265,7 +2265,7 @@ static void kvm_irqchip_create(KVMState *s) ret = kvm_arch_irqchip_create(s); if (ret == 0) { if (s->kernel_irqchip_split == ON_OFF_AUTO_ON) { - perror("Split IRQ chip mode not supported."); + error_report("Split IRQ chip mode not supported."); exit(1); } else { ret = kvm_vm_ioctl(s, KVM_CREATE_IRQCHIP); diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 4339e1cd6e..e5c1bd50d2 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -959,7 +959,7 @@ void kvm_arch_init_irq_routing(KVMState *s) int kvm_arch_irqchip_create(KVMState *s) { if (kvm_kernel_irqchip_split()) { - perror("-machine kernel_irqchip=split is not supported on ARM."); + error_report("-machine kernel_irqchip=split is not supported on ARM."); exit(1); } From patchwork Fri Jul 29 15:04:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1662057 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ByplzipH; 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 4LvW9m1CH3z9sGD for ; Sat, 30 Jul 2022 01:08:28 +1000 (AEST) Received: from localhost ([::1]:38150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oHRbG-0007xM-0d for incoming@patchwork.ozlabs.org; Fri, 29 Jul 2022 11:08:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40008) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHRXr-0003eI-5s for qemu-devel@nongnu.org; Fri, 29 Jul 2022 11:04:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:28277) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHRXp-0005a7-Nu for qemu-devel@nongnu.org; Fri, 29 Jul 2022 11:04:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659107093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ORLqmTavrpmFCjM97zE9EOvvemvokaHihzrA+oOsJbE=; b=ByplzipHq0vf5t/Y7FdqKDi2+tNGmIIEhpNhZt+gFP+rjA76ozN8IkO7sWjm4YRl+1RpwA SfZ6v65FL7JxizgTiDkuubFOkv0aE0bUT+oerMy4HW+hLmKrR7uzM4Jy7pJZRSzKvvJ+1z 8/fNFCYwi9wEkHd3YXmJhb7QqUNYWJ4= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-631-kFRILNheONiKHfqO0cx20w-1; Fri, 29 Jul 2022 11:04:52 -0400 X-MC-Unique: kFRILNheONiKHfqO0cx20w-1 Received: by mail-ej1-f71.google.com with SMTP id gn10-20020a1709070d0a00b0072fd8bafeffso1903703ejc.12 for ; Fri, 29 Jul 2022 08:04:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ORLqmTavrpmFCjM97zE9EOvvemvokaHihzrA+oOsJbE=; b=I9rxE2AQYBGw9O3XfW3aX8qUR0XaaBC7Fln2efHWhfLYjDQt2zhyPjqDEMpaWMMLxP 409DjJTiidC5Hj8TuFISIsqqGDHw4ddUH+U8fML25qyEkv5mVsPUn4KvLtbRI7t6JRdX uIE4KFUB3IlJvCq7Ehu1cUNA905BDQ1hrWrJLXWqmuiP3MzBrVx+5V+FSwF7Cp2Ym2Ot DlMbirErclEGQMH8xQA2nVh1NGJX+IGIxGE1eP7rX0G3nVULt24rZPKT/1Xm18ibk7nX VskbFk96j50Q/wUPBlZbj7WZrGw9VnjWlfPX2Xi8EdXx/Sc/lVqYUoBPPRpTM+7IhlV8 4ctA== X-Gm-Message-State: AJIora/7vYMsWCPcTj9kwcccvG2KH5Lsl/2ffuuRTXi/YGazQVMdO8cy HZhJdlrbG7Tf0HVd7khPRX6CsI4oQv0UIxyCA3Z5oagv4FcG550nuiBvlB1qxGEB+nZOjLTFYOS kazuNpoMWUKfunTEpaKcffoyJgOMKdnp5KjPc47TRW2KRU7sRy9l5qoJB0ztg8n+Z91Y= X-Received: by 2002:a17:907:9613:b0:72b:68df:8ada with SMTP id gb19-20020a170907961300b0072b68df8adamr3254713ejc.31.1659107090657; Fri, 29 Jul 2022 08:04:50 -0700 (PDT) X-Google-Smtp-Source: AGRyM1thiBirrTpeE4L0FS/3q0D29v5s8HpgK/uQf//Qj8oSIKFFbD5peHQH98isGaCam5FTR+v6OA== X-Received: by 2002:a17:907:9613:b0:72b:68df:8ada with SMTP id gb19-20020a170907961300b0072b68df8adamr3254685ejc.31.1659107090149; Fri, 29 Jul 2022 08:04:50 -0700 (PDT) Received: from goa-sendmail ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id u2-20020a1709061da200b006fec4ee28d0sm1785642ejh.189.2022.07.29.08.04.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 08:04:49 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Taylor Simpson Subject: [PULL 6/6] configure: pass correct cflags to container-based cross compilers Date: Fri, 29 Jul 2022 17:04:38 +0200 Message-Id: <20220729150438.20293-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220729150438.20293-1-pbonzini@redhat.com> References: <20220729150438.20293-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" probe_target_compiler returns nonempty $target_cc for installed toolchains and $container_cross_cc for container-based toolchains. In both cases however the flags (coming from $cross_cc_cflags_${target_arch}) must be in $target_cflags. Therefore, do not clear them prior to returning from probe_target_compiler. Reported-by: Taylor Simpson Fixes: 92e288fcfb ("build: try both native and cross compilers", 2022-07-08) Signed-off-by: Paolo Bonzini --- configure | 1 - 1 file changed, 1 deletion(-) diff --git a/configure b/configure index c4c02b8438..72ab03f11a 100755 --- a/configure +++ b/configure @@ -2173,7 +2173,6 @@ probe_target_compiler() { build_static= target_cc= target_ccas= - target_cflags= target_ar= target_as= target_ld=