From nobody Fri May 3 09:35:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1664472330; cv=none; d=zohomail.com; s=zohoarc; b=VpTOx7/lzDDFTo+N2wG9kpX38CbUlRvdLK8N525eyxgRMBls9JWI58xl/9lhj3EW0e+3iOmSuc7xgZJjSeFfZsDDaIoeQNX9/YXE6RYiinbX9TdSUB9c6CgrzskAMfN3p/Uj23npYZx3TP5gk89fACYfop5qIbh/X2mlzibdLlA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664472330; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GXJPV458KsoAQpYLOg9NuX3miw29N/Vem+vkqg1lI8o=; b=EcMjnioiEDqIajPrJokwyN+LTTwqsjeTnejjSmrDEcAv0Q9PibdeKMNuP69gECjBzZW+C46QnYCwMNQ4sk7uz/V7EO3ufg/+Df4eKBgFWam5GNe3eXG4slOEo6r5boVa4fGDSQg4W95ZO5HRejBo66TJ3ofQ/Vk2CxEGqXbXCOs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664472330342109.22142707129001; Thu, 29 Sep 2022 10:25:30 -0700 (PDT) Received: from localhost ([::1]:39516 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odxHs-0001oU-39 for importer@patchew.org; Thu, 29 Sep 2022 13:25:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwQc-0003W1-7e for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:30:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:51496) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwQa-00033R-Ab for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:30:25 -0400 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-463-N0lhw8JON_KNPQQi8iYCtQ-1; Thu, 29 Sep 2022 12:30:22 -0400 Received: by mail-ej1-f72.google.com with SMTP id hr29-20020a1709073f9d00b0078333782c48so957192ejc.10 for ; Thu, 29 Sep 2022 09:30:22 -0700 (PDT) Received: from avogadro.local ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id bo5-20020a0564020b2500b0045546aa0a95sm4166996edb.52.2022.09.29.09.30.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 09:30:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664469023; 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=GXJPV458KsoAQpYLOg9NuX3miw29N/Vem+vkqg1lI8o=; b=AOPTv39SHzDg9WNvyx2wxPu/VMuBfmwJZLeWW3yuDx36OCm0PFIjQZtWW7c66LXr9riYZ0 5X6lQ2iwRNB2SINrbE4AYBFqohWG1Uojnj3voeFwplHt+ocmb2rcFnkAfNGhWVNDV3UmLY dQSgV9ZlgJX2zH0s1BuUXDgOuIBjnV0= X-MC-Unique: N0lhw8JON_KNPQQi8iYCtQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=GXJPV458KsoAQpYLOg9NuX3miw29N/Vem+vkqg1lI8o=; b=BQVb4dJ28yQolcKirzHQRh8bZpgQ62YFs4M04utkaa/YipP++Clqro0dohtKyiGhNd kpb80lcupsBYLDkUO3pPjkTRVGl8bd7sAMMj7hFaoxwSR7iOGREGhGLxxgMgC9ZufliA PqTYPX+yA3g9vgpPxiBlsdgaB0b6XdZ3yjjrucXHLRxkWBh7YI5Wydcmv2ezEWBUWi28 OUtU4yyUe0MPsMa48cxTNIVqjBqDOmJYT0bBf7TKJpTq2oo0ypE8QvuwGXKqyEX3FJhe VPkFSUzd3+07WOzjt3/kP0wJ9tsQqPLhnF+VEEO1N/WlCWqgcJcJoKWmbOqsKoG1NBKD x7uw== X-Gm-Message-State: ACrzQf2l/uh557cxt+WxLWN07f+SS3jOXc4fsdaTET/EazpECoDT7iDA i11JDdLhvd+ZIJqY+yKRwxtEcHNaan59ADhTk3xddaNDto9nJpAi/vgkYY5MSI3dKddjNPiLLCp 8rcbyReoTQNpAD4NNGCjqJmJTHlsgZjNuVHkzBBPpXzUk6m7/fOLYp50jCD/kluBAC/o= X-Received: by 2002:a17:906:730b:b0:782:2eaf:a4ad with SMTP id di11-20020a170906730b00b007822eafa4admr3534208ejc.27.1664469020711; Thu, 29 Sep 2022 09:30:20 -0700 (PDT) X-Google-Smtp-Source: AMsMyM41cLHwyEicQ6la1cofzshj7UpArI71wKni2uD/g4cZQLypkaD6VIMaupBEZKcf+zNH10qUMQ== X-Received: by 2002:a17:906:730b:b0:782:2eaf:a4ad with SMTP id di11-20020a170906730b00b007822eafa4admr3534180ejc.27.1664469020400; Thu, 29 Sep 2022 09:30:20 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: "Jason A. Donenfeld" , Gerd Hoffmann , Laurent Vivier , "Michael S . Tsirkin" , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Ard Biesheuvel Subject: [PULL 01/14] x86: return modified setup_data only if read as memory, not as file Date: Thu, 29 Sep 2022 18:30:01 +0200 Message-Id: <20220929163014.16950-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220929163014.16950-1-pbonzini@redhat.com> References: <20220929163014.16950-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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.08, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PP_MIME_FAKE_ASCII_TEXT=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664472330636100001 From: "Jason A. Donenfeld" If setup_data is being read into a specific memory location, then generally the setup_data address parameter is read first, so that the caller knows where to read it into. In that case, we should return setup_data containing the absolute addresses that are hard coded and determined a priori. This is the case when kernels are loaded by BIOS, for example. In contrast, when setup_data is read as a file, then we shouldn't modify setup_data, since the absolute address will be wrong by definition. This is the case when OVMF loads the image. This allows setup_data to be used like normal, without crashing when EFI tries to use it. (As a small development note, strangely, fw_cfg_add_file_callback() was exported but fw_cfg_add_bytes_callback() wasn't, so this makes that consistent.) Cc: Gerd Hoffmann Cc: Laurent Vivier Cc: Michael S. Tsirkin Cc: Paolo Bonzini Cc: Peter Maydell Cc: Philippe Mathieu-Daud=C3=A9 Cc: Richard Henderson Suggested-by: Ard Biesheuvel Reviewed-by: Ard Biesheuvel Signed-off-by: Jason A. Donenfeld Message-Id: <20220921093134.2936487-1-Jason@zx2c4.com> Signed-off-by: Paolo Bonzini --- hw/i386/x86.c | 46 ++++++++++++++++++++++++++++++--------- hw/nvram/fw_cfg.c | 12 +++++----- include/hw/nvram/fw_cfg.h | 22 +++++++++++++++++++ 3 files changed, 64 insertions(+), 16 deletions(-) diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 050eedc0c8..96d205927e 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -37,6 +37,7 @@ #include "sysemu/whpx.h" #include "sysemu/numa.h" #include "sysemu/replay.h" +#include "sysemu/reset.h" #include "sysemu/sysemu.h" #include "sysemu/cpu-timers.h" #include "sysemu/xen.h" @@ -764,6 +765,24 @@ static bool load_elfboot(const char *kernel_filename, return true; } =20 +typedef struct SetupDataFixup { + void *pos; + hwaddr orig_val, new_val; + uint32_t addr; +} SetupDataFixup; + +static void fixup_setup_data(void *opaque) +{ + SetupDataFixup *fixup =3D opaque; + stq_p(fixup->pos, fixup->new_val); +} + +static void reset_setup_data(void *opaque) +{ + SetupDataFixup *fixup =3D opaque; + stq_p(fixup->pos, fixup->orig_val); +} + void x86_load_linux(X86MachineState *x86ms, FWCfgState *fw_cfg, int acpi_data_size, @@ -1088,8 +1107,11 @@ void x86_load_linux(X86MachineState *x86ms, qemu_guest_getrandom_nofail(setup_data->data, RNG_SEED_LENGTH); } =20 - /* Offset 0x250 is a pointer to the first setup_data link. */ - stq_p(header + 0x250, first_setup_data); + fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, prot_addr); + fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size); + fw_cfg_add_bytes(fw_cfg, FW_CFG_KERNEL_DATA, kernel, kernel_size); + sev_load_ctx.kernel_data =3D (char *)kernel; + sev_load_ctx.kernel_size =3D kernel_size; =20 /* * If we're starting an encrypted VM, it will be OVMF based, which use= s the @@ -1099,16 +1121,20 @@ void x86_load_linux(X86MachineState *x86ms, * file the user passed in. */ if (!sev_enabled()) { + SetupDataFixup *fixup =3D g_malloc(sizeof(*fixup)); + memcpy(setup, header, MIN(sizeof(header), setup_size)); + /* Offset 0x250 is a pointer to the first setup_data link. */ + fixup->pos =3D setup + 0x250; + fixup->orig_val =3D ldq_p(fixup->pos); + fixup->new_val =3D first_setup_data; + fixup->addr =3D cpu_to_le32(real_addr); + fw_cfg_add_bytes_callback(fw_cfg, FW_CFG_SETUP_ADDR, fixup_setup_d= ata, NULL, + fixup, &fixup->addr, sizeof(fixup->addr)= , true); + qemu_register_reset(reset_setup_data, fixup); + } else { + fw_cfg_add_i32(fw_cfg, FW_CFG_SETUP_ADDR, real_addr); } - - fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, prot_addr); - fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size); - fw_cfg_add_bytes(fw_cfg, FW_CFG_KERNEL_DATA, kernel, kernel_size); - sev_load_ctx.kernel_data =3D (char *)kernel; - sev_load_ctx.kernel_size =3D kernel_size; - - fw_cfg_add_i32(fw_cfg, FW_CFG_SETUP_ADDR, real_addr); fw_cfg_add_i32(fw_cfg, FW_CFG_SETUP_SIZE, setup_size); fw_cfg_add_bytes(fw_cfg, FW_CFG_SETUP_DATA, setup, setup_size); sev_load_ctx.setup_data =3D (char *)setup; diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index d605f3f45a..564bda3395 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -692,12 +692,12 @@ static const VMStateDescription vmstate_fw_cfg =3D { } }; =20 -static void fw_cfg_add_bytes_callback(FWCfgState *s, uint16_t key, - FWCfgCallback select_cb, - FWCfgWriteCallback write_cb, - void *callback_opaque, - void *data, size_t len, - bool read_only) +void fw_cfg_add_bytes_callback(FWCfgState *s, uint16_t key, + FWCfgCallback select_cb, + FWCfgWriteCallback write_cb, + void *callback_opaque, + void *data, size_t len, + bool read_only) { int arch =3D !!(key & FW_CFG_ARCH_LOCAL); =20 diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h index 0e7a8bc7af..e4fef393be 100644 --- a/include/hw/nvram/fw_cfg.h +++ b/include/hw/nvram/fw_cfg.h @@ -117,6 +117,28 @@ struct FWCfgMemState { */ void fw_cfg_add_bytes(FWCfgState *s, uint16_t key, void *data, size_t len); =20 +/** + * fw_cfg_add_bytes_callback: + * @s: fw_cfg device being modified + * @key: selector key value for new fw_cfg item + * @select_cb: callback function when selecting + * @write_cb: callback function after a write + * @callback_opaque: argument to be passed into callback function + * @data: pointer to start of item data + * @len: size of item data + * @read_only: is file read only + * + * Add a new fw_cfg item, available by selecting the given key, as a raw + * "blob" of the given size. The data referenced by the starting pointer + * is only linked, NOT copied, into the data structure of the fw_cfg devic= e. + */ +void fw_cfg_add_bytes_callback(FWCfgState *s, uint16_t key, + FWCfgCallback select_cb, + FWCfgWriteCallback write_cb, + void *callback_opaque, + void *data, size_t len, + bool read_only); + /** * fw_cfg_add_string: * @s: fw_cfg device being modified --=20 2.37.3 From nobody Fri May 3 09:35:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1664470950; cv=none; d=zohomail.com; s=zohoarc; b=Jrjz8CeWcDupX0MvSY2dQG5Hdrhpimdshw1G+wqGSmh95gEpFTItSP7xXgeFDbhhlkL/Tff+RlVXXwdJUB86aPhfGUSQVQxFv6l0fYmrUYoO7SBE2nuIjt4U4EQrNpwXG1eBn9KN+JUYZe9sNq5RJD9c8nWV02gGgf84Yc/3yCk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664470950; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WiZVMx9Rx+fIhof5xKOzfVzLvULj1mS05oyWMAyb/1E=; b=RS2iSQ4H+PyeRCGkANqtd+oF3WXBs8HNu182qDaFVeCH/uYaSlxuih3dB4qGP0DNlpwlDFh4BiZfF9WK5TN+dRpBudTPw0FIrTVVLOTgLYwk3ZCh2W1ccRViAoPQrOgWBBU+ICKf8dhu5J7ku9cdc+CBex6TelGJKqj2cmJlykw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664470950644898.355006690087; Thu, 29 Sep 2022 10:02:30 -0700 (PDT) Received: from localhost ([::1]:51126 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odwvc-00058c-1b for importer@patchew.org; Thu, 29 Sep 2022 13:02:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38876) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwQg-0003eg-F4 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:30:30 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:23771) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwQf-00035Z-0y for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:30:30 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-482-Qeg7UofoNGO0ILRJYGbK3g-1; Thu, 29 Sep 2022 12:30:25 -0400 Received: by mail-ej1-f69.google.com with SMTP id qk10-20020a1709077f8a00b0078297c303afso976826ejc.20 for ; Thu, 29 Sep 2022 09:30:25 -0700 (PDT) Received: from avogadro.local ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id i3-20020a1709064ec300b007712444e98csm4176296ejv.43.2022.09.29.09.30.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 09:30:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664469026; 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=WiZVMx9Rx+fIhof5xKOzfVzLvULj1mS05oyWMAyb/1E=; b=KTStdQchwG01oU56u/k9ZrCE5LSZ7EgPAbzxlIzTsMz6p+uilAGec3ZGwWRFFyIInHbBg9 10X1bUMA6L1kpfsrUJ3kXj515D6sePmwlXsxP6NJi4B1ZwERcslxUnMHSF+G2HaVnSP/1c W1U2bQsDLExwCfC6VDAAoaYT26hZWCQ= X-MC-Unique: Qeg7UofoNGO0ILRJYGbK3g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=WiZVMx9Rx+fIhof5xKOzfVzLvULj1mS05oyWMAyb/1E=; b=LY5tkAH4GRbuDggS3aXQNWQ9d7OtoASEUY+2OSTNruwNCFbhoUN20saa1VsZz4fQqj NlDeY57VBCPjP/0+vWt0KkgS4RseN7M55h3GxktwuUvRIlntzKTfwS6lZw86BaMlwi9G 11TokC7V88uX6+Wdue5F71lSbTbAhw4gL+PVeJei6ha/zJinvRxfnjNz2Rcv38DUaIQ4 BXEyLxrb9s0P21iPWUXv4Lksr36gstUv/0HShS2FRHVfGVpEq5fckjvLFOsNM52b3SMW RYoOctLIiziFxylpkdaokuxfsfUTe/9v0semXj2MedfAZ4mEP8Oc8pWpncAXhNdX5Nnu N2FA== X-Gm-Message-State: ACrzQf0FaIeUy6XcXN5xAnV34SYCmrMepXwTxI2kgS0w3YsSG19qvRNX xGQrHPuYZ/1mZwcM7V5thLaZuCTpMMqEmZqYrAn39uLhxiGPF+7nupEySmpkoZwja4BogGIRxr9 q1KODKREANjTnIEvpNn/h/peHEEm1MOrg0r+BZd3IVHBi0NC/RlTe6EYpbQOADTXESQQ= X-Received: by 2002:a05:6402:1cc1:b0:453:1517:94e4 with SMTP id ds1-20020a0564021cc100b00453151794e4mr4022182edb.399.1664469023707; Thu, 29 Sep 2022 09:30:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7+86PMYGMQWY3ouCc4jfQ7VQxmjQ6Pe52RY6Tdntx0s5+JIQjxh2nKCrOvePb2qYCir5GMdQ== X-Received: by 2002:a05:6402:1cc1:b0:453:1517:94e4 with SMTP id ds1-20020a0564021cc100b00453151794e4mr4022159edb.399.1664469023448; Thu, 29 Sep 2022 09:30:23 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: "Jason A. Donenfeld" , Ard Biesheuvel , "Michael S . Tsirkin" Subject: [PULL 02/14] x86: use typedef for SetupData struct Date: Thu, 29 Sep 2022 18:30:02 +0200 Message-Id: <20220929163014.16950-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220929163014.16950-1-pbonzini@redhat.com> References: <20220929163014.16950-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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.08, 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 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664470953461100001 Content-Type: text/plain; charset="utf-8" From: "Jason A. Donenfeld" The preferred style is SetupData as a typedef, not setup_data as a plain struct. Cc: Paolo Bonzini Cc: Ard Biesheuvel Suggested-by: Michael S. Tsirkin Signed-off-by: Jason A. Donenfeld Message-Id: <20220921093134.2936487-2-Jason@zx2c4.com> Signed-off-by: Paolo Bonzini --- hw/i386/x86.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 96d205927e..1ee0b1b413 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -653,12 +653,12 @@ DeviceState *ioapic_init_secondary(GSIState *gsi_stat= e) return dev; } =20 -struct setup_data { +typedef struct SetupData { uint64_t next; uint32_t type; uint32_t len; uint8_t data[]; -} __attribute__((packed)); +} __attribute__((packed)) SetupData; =20 =20 /* @@ -799,7 +799,7 @@ void x86_load_linux(X86MachineState *x86ms, FILE *f; char *vmode; MachineState *machine =3D MACHINE(x86ms); - struct setup_data *setup_data; + SetupData *setup_data; const char *kernel_filename =3D machine->kernel_filename; const char *initrd_filename =3D machine->initrd_filename; const char *dtb_filename =3D machine->dtb; @@ -1082,11 +1082,11 @@ void x86_load_linux(X86MachineState *x86ms, } =20 setup_data_offset =3D QEMU_ALIGN_UP(kernel_size, 16); - kernel_size =3D setup_data_offset + sizeof(struct setup_data) + dt= b_size; + kernel_size =3D setup_data_offset + sizeof(SetupData) + dtb_size; kernel =3D g_realloc(kernel, kernel_size); =20 =20 - setup_data =3D (struct setup_data *)(kernel + setup_data_offset); + setup_data =3D (SetupData *)(kernel + setup_data_offset); setup_data->next =3D cpu_to_le64(first_setup_data); first_setup_data =3D prot_addr + setup_data_offset; setup_data->type =3D cpu_to_le32(SETUP_DTB); @@ -1097,9 +1097,9 @@ void x86_load_linux(X86MachineState *x86ms, =20 if (!legacy_no_rng_seed) { setup_data_offset =3D QEMU_ALIGN_UP(kernel_size, 16); - kernel_size =3D setup_data_offset + sizeof(struct setup_data) + RN= G_SEED_LENGTH; + kernel_size =3D setup_data_offset + sizeof(SetupData) + RNG_SEED_L= ENGTH; kernel =3D g_realloc(kernel, kernel_size); - setup_data =3D (struct setup_data *)(kernel + setup_data_offset); + setup_data =3D (SetupData *)(kernel + setup_data_offset); setup_data->next =3D cpu_to_le64(first_setup_data); first_setup_data =3D prot_addr + setup_data_offset; setup_data->type =3D cpu_to_le32(SETUP_RNG_SEED); --=20 2.37.3 From nobody Fri May 3 09:35:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1664474475; cv=none; d=zohomail.com; s=zohoarc; b=goGmcU/XhFYybfsxJ+iEmLSY6vKXHeHpO4DxWmEcoYcL+QBCyumQym2SuexTpWj41832t7Q7RM/3kmpmvikPXe+79fQcm0dHiajp1H+tHSQb7jEad8ju8ThyqyWCy4FejdPFLxtJ92qYaQTdxWf+zdlui/5IMZACviCmQDTd0Qw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664474475; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8othBN7do/fP0V1Ks4ePs6mHlPkR1/tZJO0dYZNV1j8=; b=OzAryFtQm43HaHuu5OTSYqVCdpMTFe8WyceuggChAgIw1cHkqcZD89xFnXY25teoW31uc2eOUjBG9+x63M58rRtPkOO5BXdpjjdMY1wE48pW/vE71ecE8W616plPQKcs15Uz7UcuTgU2PEnGLZaD1jgyWuEq93q2Xgjo2d/Cdp8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664474475156231.88544320366623; Thu, 29 Sep 2022 11:01:15 -0700 (PDT) Received: from localhost ([::1]:55914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odxqU-000615-4W for importer@patchew.org; Thu, 29 Sep 2022 14:01:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwQh-0003fC-8S for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:30:32 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:24920) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwQf-00035h-U5 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:30:31 -0400 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.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-606-4xdZ-85BPgeQNi_tUhsWCQ-1; Thu, 29 Sep 2022 12:30:27 -0400 Received: by mail-ed1-f69.google.com with SMTP id z2-20020a056402274200b004516734e755so1667350edd.3 for ; Thu, 29 Sep 2022 09:30:27 -0700 (PDT) Received: from avogadro.local ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id z5-20020aa7c645000000b0044f0c01196esm5583236edr.65.2022.09.29.09.30.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 09:30:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664469029; 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=8othBN7do/fP0V1Ks4ePs6mHlPkR1/tZJO0dYZNV1j8=; b=Z0nAzx+BrXAbw6GfP6FDczpmwNSjDIWBpwsdhvu8gX3ZIXnaiMnc2+ZTCCExqoM+bePGjD hrDF8W7NJ8D/tyJbzjbDqFFrfsYd3SlZD/J99jFhWBAsnzMCmSlnNB/9TOU6TuLxip0bTN 6iZJlATANlKoMe7elnOy6DQphVw0pdQ= X-MC-Unique: 4xdZ-85BPgeQNi_tUhsWCQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=8othBN7do/fP0V1Ks4ePs6mHlPkR1/tZJO0dYZNV1j8=; b=W/r553QgE5NWVsOfP1z8aCYPaGBs/+paSPr63MAUF6CEnaqWczngonuwostXwZ+uzN 0G7ymrbddbeNg306gcPqOMzP0I+KB1XyXQEJPvE5PoT4q1T40GiZZPCCM9zTIO5GFeiE 7HLccU7ZOP04tVn2446pV1NfkTlBEzCMH7k4p9sLTZbkxhtef1ztEWu+SGFUtnZgJgBE CqAv858W7owRoKJBbqQbZsPITOFd3urwV5nfDs+/x/dN3/H50fNSNoYIwCCCHd3soyQh nPTVOGKNprzT5gRBC/VZ+zqZrKXTWOGpRmGkdHwzS/ijaRau0DdeB1thmYAgGfakLjNx yYtQ== X-Gm-Message-State: ACrzQf3a7H7bls3gc63KtXMuLUHCLTDM7g5kkoFDsCpJUxA7NM4JPpi9 J+jPl53yKupJGFNcmPVGi7k/F/hNbAv4s6HyUzlgbd68Ko8oMsAKyjKmjsltPBJRgOpioYA/JGh DycxKkZdDZT0NZxI8ccYyq4Bt7Vi4xNCbC3Hm4FpYjaYatpDfhaKp1MI/RbaxYwN0E4A= X-Received: by 2002:a17:907:970c:b0:782:e3f1:af60 with SMTP id jg12-20020a170907970c00b00782e3f1af60mr3389407ejc.757.1664469026326; Thu, 29 Sep 2022 09:30:26 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6/zwcp8cOTV2D7QMT5yWyXHryLXqv4FA7jUcxVx1hpsbvD0BVqjJTrP/Amgo4Y4HjcRRuCEQ== X-Received: by 2002:a17:907:970c:b0:782:e3f1:af60 with SMTP id jg12-20020a170907970c00b00782e3f1af60mr3389378ejc.757.1664469026045; Thu, 29 Sep 2022 09:30:26 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: "Jason A. Donenfeld" Subject: [PULL 03/14] x86: reinitialize RNG seed on system reboot Date: Thu, 29 Sep 2022 18:30:03 +0200 Message-Id: <20220929163014.16950-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220929163014.16950-1-pbonzini@redhat.com> References: <20220929163014.16950-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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.08, 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 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664474476043100001 Content-Type: text/plain; charset="utf-8" From: "Jason A. Donenfeld" Since this is read from fw_cfg on each boot, the kernel zeroing it out alone is insufficient to prevent it from being used twice. And indeed on reboot we always want a new seed, not the old one. So re-fill it in this circumstance. Cc: Paolo Bonzini Signed-off-by: Jason A. Donenfeld Message-Id: <20220921093134.2936487-3-Jason@zx2c4.com> Signed-off-by: Paolo Bonzini --- hw/i386/x86.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/i386/x86.c b/hw/i386/x86.c index 1ee0b1b413..f9a4ddaa4a 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -783,6 +783,12 @@ static void reset_setup_data(void *opaque) stq_p(fixup->pos, fixup->orig_val); } =20 +static void reset_rng_seed(void *opaque) +{ + SetupData *setup_data =3D opaque; + qemu_guest_getrandom_nofail(setup_data->data, le32_to_cpu(setup_data->= len)); +} + void x86_load_linux(X86MachineState *x86ms, FWCfgState *fw_cfg, int acpi_data_size, @@ -1105,6 +1111,7 @@ void x86_load_linux(X86MachineState *x86ms, setup_data->type =3D cpu_to_le32(SETUP_RNG_SEED); setup_data->len =3D cpu_to_le32(RNG_SEED_LENGTH); qemu_guest_getrandom_nofail(setup_data->data, RNG_SEED_LENGTH); + qemu_register_reset(reset_rng_seed, setup_data); } =20 fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, prot_addr); --=20 2.37.3 From nobody Fri May 3 09:35:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1664474669; cv=none; d=zohomail.com; s=zohoarc; b=nip/DRxTk3VSqZgaX+zaCeaAYvgk1T7R9QvooCH2h9zdvk8lfkDdCIWyTE0GSCoXoJdIX8HLwrdVc/LLzl2w3t6kbrumfDUuxVyfW0n03cUjfZts9YE2IAbejipagnSTBmkMsqGd9hPvVcI/UQUCmbLvAeUEaDalBKUSrE6dQFo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664474669; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HPT28RrcUjLUQw60OIcNqXsyvIh0beuV4wvIwCLtC44=; b=DshwkgYerwCfIAMM037Kut2OTRCOJR5ovPaVEJugm1sxx1oiVr3B6wZDWWqgoLQgJFiIXqEB1sSz6+06fCfk+1/QT+gy+IUUFW7/ys7beCPEa79MSCOsTjQ/gdhKSZ6sH5c3FWe20BdigyYYKCp3lEC3isHdNAF6cDkIL/6E1ic= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664474669613618.0894319112299; Thu, 29 Sep 2022 11:04:29 -0700 (PDT) Received: from localhost ([::1]:33072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odxtc-0000jy-5C for importer@patchew.org; Thu, 29 Sep 2022 14:04:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33800) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwQo-0003hC-EP for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:30:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:24700) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwQl-000368-KP for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:30:36 -0400 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-629-AnXqNFwbNd2Tqf2AQTY_Eg-1; Thu, 29 Sep 2022 12:30:30 -0400 Received: by mail-ed1-f72.google.com with SMTP id f18-20020a056402355200b0045115517911so1648469edd.14 for ; Thu, 29 Sep 2022 09:30:30 -0700 (PDT) Received: from avogadro.local ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id ca5-20020a170906a3c500b007778c9b7629sm4174426ejb.34.2022.09.29.09.30.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 09:30:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664469035; 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=HPT28RrcUjLUQw60OIcNqXsyvIh0beuV4wvIwCLtC44=; b=RmU/Q+7XLcLpMwcXwPcPIjuMT+umZ2EtPHold0jM4yjkoz8yAvsi83agid1nDfxoyORZs9 R25G3HCA9gh/cJcZIFUaCQtsXabctNQsti0upqhpBlHeXIZlzLUh4Umnualywc99slY1U7 RQb+/ZruhXQnX4a3uvw2UJ9SiBTMU4s= X-MC-Unique: AnXqNFwbNd2Tqf2AQTY_Eg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=HPT28RrcUjLUQw60OIcNqXsyvIh0beuV4wvIwCLtC44=; b=NBSdebWgNyZJHHt47UiKctPFi/1q8j9uLtdujsnCOHI/qUsfUw3tcj1DmAbKkWBBHh 6Ak34cpMwZsjDq9LTKAcBUjbuu4m7en3ej5KBo4Zz6o50T9Cd1XSXgRqYBBtkFlGVUqT 0UXNG5h8ACG7ou/ZrbEOS5dgVoiIGJ8zmHAGb3U1XbNQu7bxgch+4KLFV5cMIxIr8r6d AHIOGPY/3qaPIAurO2MMs3nAnSzwigBjMFCzXmP5Xn0TYP87/MTGgF/wdrckPwSA23qh f/rUwNsjlyjrU8gk42DrVHLXGm6oVRi0wle+I8FZFk8VTkO/Z0ebyYh0l1UlfNYrNVtX D+Aw== X-Gm-Message-State: ACrzQf3ssWzLJtocn2myEWvciQo6UlOJWqmi1miMrPA0t3Q510izN80c 7huqC5YjNGjhcFG1ql4nEaUMXeCLbdxCMs7aVzqnw+wL/MW7A1Y6+E9i8tyZh2502aQUvOzd+TZ WDeKC0jW4tIZ0BkmO1dWUS1ud9ug3DezQhNowYDepp0J2Q+5dnN2YPpAQ9msmCArHy8U= X-Received: by 2002:a17:907:7621:b0:741:6656:bd14 with SMTP id jy1-20020a170907762100b007416656bd14mr3291586ejc.298.1664469029020; Thu, 29 Sep 2022 09:30:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5cxrCcidS57gfqm3J3eVspuADAnvLBFMBekdfTKKGcU4Gh71sH2mQSzF1bFT3dPztr5kr2xg== X-Received: by 2002:a17:907:7621:b0:741:6656:bd14 with SMTP id jy1-20020a170907762100b007416656bd14mr3291567ejc.298.1664469028781; Thu, 29 Sep 2022 09:30:28 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: "Jason A. Donenfeld" , Laurent Vivier , "Michael S . Tsirkin" , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Ard Biesheuvel , Gerd Hoffmann Subject: [PULL 04/14] x86: re-enable rng seeding via SetupData Date: Thu, 29 Sep 2022 18:30:04 +0200 Message-Id: <20220929163014.16950-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220929163014.16950-1-pbonzini@redhat.com> References: <20220929163014.16950-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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.08, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PP_MIME_FAKE_ASCII_TEXT=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664474671623100001 From: "Jason A. Donenfeld" This reverts 3824e25db1 ("x86: disable rng seeding via setup_data"), but for 7.2 rather than 7.1, now that modifying setup_data is safe to do. Cc: Laurent Vivier Cc: Michael S. Tsirkin Cc: Paolo Bonzini Cc: Peter Maydell Cc: Philippe Mathieu-Daud=C3=A9 Cc: Richard Henderson Cc: Ard Biesheuvel Acked-by: Gerd Hoffmann Signed-off-by: Jason A. Donenfeld Message-Id: <20220921093134.2936487-4-Jason@zx2c4.com> Signed-off-by: Paolo Bonzini --- hw/i386/microvm.c | 2 +- hw/i386/pc_piix.c | 3 ++- hw/i386/pc_q35.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 52cafa003d..7fe8cce03e 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -332,7 +332,7 @@ static void microvm_memory_init(MicrovmMachineState *mm= s) rom_set_fw(fw_cfg); =20 if (machine->kernel_filename !=3D NULL) { - x86_load_linux(x86ms, fw_cfg, 0, true, true); + x86_load_linux(x86ms, fw_cfg, 0, true, false); } =20 if (mms->option_roms) { diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 8043a250ad..0b1a79c0fa 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -439,7 +439,6 @@ static void pc_i440fx_7_2_machine_options(MachineClass = *m) m->alias =3D "pc"; m->is_default =3D true; pcmc->default_cpu_version =3D 1; - pcmc->legacy_no_rng_seed =3D true; } =20 DEFINE_I440FX_MACHINE(v7_2, "pc-i440fx-7.2", NULL, @@ -447,9 +446,11 @@ DEFINE_I440FX_MACHINE(v7_2, "pc-i440fx-7.2", NULL, =20 static void pc_i440fx_7_1_machine_options(MachineClass *m) { + PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); pc_i440fx_7_2_machine_options(m); m->alias =3D NULL; m->is_default =3D false; + pcmc->legacy_no_rng_seed =3D true; compat_props_add(m->compat_props, hw_compat_7_1, hw_compat_7_1_len); compat_props_add(m->compat_props, pc_compat_7_1, pc_compat_7_1_len); } diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 53eda50e81..a496bd6e74 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -376,7 +376,6 @@ static void pc_q35_7_2_machine_options(MachineClass *m) pc_q35_machine_options(m); m->alias =3D "q35"; pcmc->default_cpu_version =3D 1; - pcmc->legacy_no_rng_seed =3D true; } =20 DEFINE_Q35_MACHINE(v7_2, "pc-q35-7.2", NULL, @@ -384,8 +383,10 @@ DEFINE_Q35_MACHINE(v7_2, "pc-q35-7.2", NULL, =20 static void pc_q35_7_1_machine_options(MachineClass *m) { + PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); pc_q35_7_2_machine_options(m); m->alias =3D NULL; + pcmc->legacy_no_rng_seed =3D true; compat_props_add(m->compat_props, hw_compat_7_1, hw_compat_7_1_len); compat_props_add(m->compat_props, pc_compat_7_1, pc_compat_7_1_len); } --=20 2.37.3 From nobody Fri May 3 09:35:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1664471436; cv=none; d=zohomail.com; s=zohoarc; b=ID3OG5m20zcOiPUteE4n1b8I81mLncLcFVngjhZ/6jY/lKviWz/TYrlWrDJZu+HRNJPY81bqR7Mdm3Kh5GKWaqHuoe1pQhFo467Tg6DT7GiwFIRGKgroSI9QEyKoDh5kBadjGu3tfL826RlxOD8c0RBMiP407Sj1txuUfVInbPE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664471436; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2H9YJuqTTj92hjMhPMv/Yqbt6AHiYRl7GDRFXnI5NXg=; b=U4dZJdGqNKXLKm+QKHMhVCqaPUDeJSID0ALWX+ulmStlMiEkzPD6TnXahLZKYjrSObeuHsbPvmD8QjWCGLdUQGrGfIJnLVRXiXbvwRk9yVA4RroVPzRtSYxYNyNVO7yBKrcvKYSIzyO5wPlKA/10saD7tlnUEa7hBnZ4+tv0zfY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664471436027403.61654075931256; Thu, 29 Sep 2022 10:10:36 -0700 (PDT) Received: from localhost ([::1]:49606 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odx3S-0002lk-Bz for importer@patchew.org; Thu, 29 Sep 2022 13:10:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33804) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwQp-0003hR-CK for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:30:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:38227) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwQl-00036A-RA for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:30:39 -0400 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-320-u85y4Ik_NpCRYcl2RkAcVA-1; Thu, 29 Sep 2022 12:30:33 -0400 Received: by mail-ej1-f70.google.com with SMTP id 7-20020a170906328700b007838b96bf70so952463ejw.7 for ; Thu, 29 Sep 2022 09:30:33 -0700 (PDT) Received: from avogadro.local ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id g23-20020a170906539700b00738795e7d9bsm4130416ejo.2.2022.09.29.09.30.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 09:30:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664469035; 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=2H9YJuqTTj92hjMhPMv/Yqbt6AHiYRl7GDRFXnI5NXg=; b=Y8btQHqaKgb/B9QXWNrXYf7+PJR1c8q35qCmYzMhNqKhuSRVfi6lhS9Ef7KHEus17/GRt+ jbmpUlnNc7HZo1ztvU6HLWCwWLsgxQuuLNyeUp/6oG4ySZDCAnOl8Q6L03ZroUD6fUyWo5 aQFh6/NwCxIKEkSI6796H0X8qGbzMd4= X-MC-Unique: u85y4Ik_NpCRYcl2RkAcVA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=2H9YJuqTTj92hjMhPMv/Yqbt6AHiYRl7GDRFXnI5NXg=; b=ZM+2dArZIVsAdEHjK/p2Cnw3oWCqBMJr/ojUMUbqMvw0BqATR1QvggnEILWk4o3xFm 6dbAcLm4TYemvc79fdgz8row5c6RO5mLWz1oBMGeRNnSVHpdy+oi2ew+wVd3u7sR5V4T ArhG5P0siDck70wzrNarHahytQ16azmJWeA/l/3at5Qa0zVaBudysu03oCCp0OFUNYmh Tt0j/+0hXItNg3QmREj2o2wPCaErpa06H1zWIV8EEA6TOBGhVIpp4cq4/le1HoejYtHp VELOduJGyH87SShLdxyYNCUDGLK+K9iPiwuDAwXiWYj5JqxRzSuZH/B4yJEzjRKR9fpG 1J3A== X-Gm-Message-State: ACrzQf1vdqdrNIIspvh0zD7J6FfI7k4n7leH+Y4Z0MUpJiD2AIswdb4K JvGZalKtm88WcbesJCxgJQqrmKNzR7Blykr04SQOsbfBEXz8mWUYKr7PXqlno1WlgBN0WcbUO7p aJJrbRCidwtBHGlj0Ylpgd7ZOcdWmOWCozF5tgdM1V4sv5Xdwt9dgP+axH9zCVGWi174= X-Received: by 2002:a17:907:a04f:b0:772:da0b:e2f1 with SMTP id gz15-20020a170907a04f00b00772da0be2f1mr3364197ejc.327.1664469032004; Thu, 29 Sep 2022 09:30:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5ULVPvWaOApiEjNM5n7BCf5FZTtYzAEwiB4oh8oyvAYvf22j8DXQPRqOssPigRyc4dJ1xd2w== X-Received: by 2002:a17:907:a04f:b0:772:da0b:e2f1 with SMTP id gz15-20020a170907a04f00b00772da0be2f1mr3364154ejc.327.1664469031393; Thu, 29 Sep 2022 09:30:31 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: "Jason A . Donenfeld" Subject: [PULL 05/14] qboot: rebuild based on latest commit Date: Thu, 29 Sep 2022 18:30:05 +0200 Message-Id: <20220929163014.16950-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220929163014.16950-1-pbonzini@redhat.com> References: <20220929163014.16950-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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.08, 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 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664471437561100001 Content-Type: text/plain; charset="utf-8" df22fbb751 ("qboot: update to latest submodule") updated the qboot submodule from a5300c49 to 8ca302e8. However, qboot isn't built during the QEMU's build process but rather is included in binary form. So rebuild it here. Cc: Paolo Bonzini Signed-off-by: Jason A. Donenfeld [Rebuilt it myself for paranoia. - Paolo] Signed-off-by: Paolo Bonzini --- pc-bios/qboot.rom | Bin 65536 -> 65536 bytes 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 =3D> 100755 pc-bios/qboot.rom diff --git a/pc-bios/qboot.rom b/pc-bios/qboot.rom old mode 100644 new mode 100755 index 7634106a0766913077e88dfcb1021c1168dcad3c..684000f57aad8925c81890d9734= 5500eb266827e GIT binary patch delta 8383 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 delta 9151 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 SEQnQ-4%R&t{Vp*}=3DKleWh?AlK --=20 2.37.3 From nobody Fri May 3 09:35:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1664474983; cv=none; d=zohomail.com; s=zohoarc; b=kSJWBloH2GITv5cJCk/O16IBKPI3vquQYtXfTgwCFO1wBcTyZ16FWMr9pRaLfqfkXnFfQXpLzrKQEptzuuDMPORiYkMHXnwJMqeN5SPoIY+1RkfFEJMpgpA4FQFrQ3Enh2Iaojn4n+Ejil6hK4Z9BcJ946LpCe3ZWPytBLOp5gY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664474983; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ziq4VGpS8d35Ri8KEGR9TwGMwDkZruBUJpKoLFh+vSQ=; b=OYWL2q/W9MIakDebsyw/LX9JIQJhjcWuCU+AivhjQAfA/Gu13Nm/3TYWnkRtZ8WCV26j4A1YBiICPOTT9uex34fkTCly1wkuX9iGI9TCrEcg2BvUKOquwirbUXEKBqKsjdVjPeaSOvbSWUb7slsExUgN0Kybm9h5e8m4fBY7JjU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 166447498398270.86852767557411; Thu, 29 Sep 2022 11:09:43 -0700 (PDT) Received: from localhost ([::1]:48234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odxyf-00040C-AN for importer@patchew.org; Thu, 29 Sep 2022 14:09:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33806) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwQr-0003hT-Rz for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:30:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:49097) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwQo-00036V-Kn for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:30:39 -0400 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.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-593-6tjRe2UrMY2BquPbk2nYJw-1; Thu, 29 Sep 2022 12:30:36 -0400 Received: by mail-ed1-f71.google.com with SMTP id w17-20020a056402269100b0045249bc17a9so1648348edd.9 for ; Thu, 29 Sep 2022 09:30:36 -0700 (PDT) Received: from avogadro.local ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id s3-20020a056402520300b00453d8dee355sm5835151edd.60.2022.09.29.09.30.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 09:30:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664469037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ziq4VGpS8d35Ri8KEGR9TwGMwDkZruBUJpKoLFh+vSQ=; b=KM7uuv758jjad8LKVtaK2Pa8yWlMmFTQnQjPIjoFruuXqeGt6Tcj9EPI4rU537rqCRWKBF N46eND6fMCTKoQA4jqgbPNMLKMph34NaCVh8lzZUSAium7wZ0tQXaBm+WvOm58J1G+eZIy KLRams+rwn5aSx1dvc1wSYZSF3VqNJk= X-MC-Unique: 6tjRe2UrMY2BquPbk2nYJw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date; bh=ziq4VGpS8d35Ri8KEGR9TwGMwDkZruBUJpKoLFh+vSQ=; b=UrL6oYVvaJTakuAqg7uVNTeBkhLzhgmfU1Lei/mLY/Evpg9NGx7vI2Fr9Aqnn5R/00 +dR55fwuU9B239jbRtLlScSZwA228ycFdJJQi46xjSgFzlfpzsoWmlwROIT5GRUkzptv r/achZ9Fwr2HPiPzyAUhuGrImWfrzpQcyVSVT+Qy2V3Jb7odQVZTlMmg+4P7aLE1W1RX oYdfp0HZZ0NITmOKPUq7k4Wd0N8cLqEvZAl1luC9rZvuS3yO70I6IY7dtRHVsyC3NTcM usZckFXGDyjYhlvgVsIKACMVsspl9oCYP526Ls7jRyYDoHcl9+r3MHph+5x/bTzLR04I iJeQ== X-Gm-Message-State: ACrzQf0f0Ce9NwVFImk9zeWKQUiVjkQ5kCkpQ540YysMBPRB0RZy8RLM nqdvW+hvDUrSvPjb5MDkYOvyOhVP4HJqxpbDGsjlFKzjFOfTit7A0aAfCBybFyTIRCdUrHf6xpw QAor9KrtjMEfU698YU9sC2HQeWknhqQrCI6aCKuaZdeOeIvE3MZsCvnwYrN2/1O8e4Ho= X-Received: by 2002:a05:6402:d49:b0:458:27b3:4d1b with SMTP id ec9-20020a0564020d4900b0045827b34d1bmr3601650edb.201.1664469034327; Thu, 29 Sep 2022 09:30:34 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6rKwxy8HJCUj4U9jJb23CqlAqHlnSvQSEx/4uOF/8cOIQPG7pmLXFMH2rTfO6ElfHkEs1M8w== X-Received: by 2002:a05:6402:d49:b0:458:27b3:4d1b with SMTP id ec9-20020a0564020d4900b0045827b34d1bmr3601620edb.201.1664469033906; Thu, 29 Sep 2022 09:30:33 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 06/14] configure: do not invoke as/ld directly for pc-bios/optionrom Date: Thu, 29 Sep 2022 18:30:06 +0200 Message-Id: <20220929163014.16950-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220929163014.16950-1-pbonzini@redhat.com> References: <20220929163014.16950-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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.08, 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 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664474984625100001 Content-Type: text/plain; charset="utf-8" Just use using the compiler binary, with -nostdlib in the case of the linker; the compiler driver (whether i686-*-gcc, or x86_64-*-gcc with the -m32 option) will then pick the right magic option to as and ld. Signed-off-by: Paolo Bonzini --- configure | 22 +++++----------------- pc-bios/optionrom/Makefile | 12 ++++-------- 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/configure b/configure index cc4ecd6008..894e37310f 100755 --- a/configure +++ b/configure @@ -2320,23 +2320,11 @@ probe_target_compiler i386-softmmu if test -n "$target_cc" && test "$targetos" !=3D "darwin" && test "$targetos" !=3D "sunos" &&= \ test "$targetos" !=3D "haiku" && test "$softmmu" =3D yes ; then - # Different host OS linkers have different ideas about the name of the= ELF - # emulation. Linux and OpenBSD/amd64 use 'elf_i386'; FreeBSD uses the = _fbsd - # variant; OpenBSD/i386 uses the _obsd variant; and Windows uses i386p= e. - for emu in elf_i386 elf_i386_fbsd elf_i386_obsd i386pe; do - if "$target_ld" -verbose 2>&1 | grep -q "^[[:space:]]*${emu}[[:spa= ce:]]*$"; then - ld_i386_emulation=3D"$emu" - break - fi - done - if test -n "$ld_i386_emulation"; then - roms=3D"pc-bios/optionrom" - config_mak=3Dpc-bios/optionrom/config.mak - echo "# Automatically generated by configure - do not modify" > $c= onfig_mak - echo "TOPSRC_DIR=3D$source_path" >> $config_mak - echo "LD_I386_EMULATION=3D$ld_i386_emulation" >> $config_mak - write_target_makefile >> $config_mak - fi + roms=3D"pc-bios/optionrom" + config_mak=3Dpc-bios/optionrom/config.mak + echo "# Automatically generated by configure - do not modify" > $confi= g_mak + echo "TOPSRC_DIR=3D$source_path" >> $config_mak + write_target_makefile >> $config_mak fi =20 probe_target_compiler ppc-softmmu diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index e90ca2e1c6..3e06c11dea 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -20,28 +20,24 @@ override CFLAGS +=3D $(call cc-option, -fcf-protection= =3Dnone) # Flags for dependency generation override CPPFLAGS +=3D -MMD -MP -MT $@ -MF $(@D)/$(*F).d =20 -override CFLAGS +=3D $(filter -W%, $(QEMU_CFLAGS)) override CFLAGS +=3D $(call cc-option, -fno-pie) +override CFLAGS +=3D $(call cc-option, -no-pie) override CFLAGS +=3D -ffreestanding -I$(TOPSRC_DIR)/include override CFLAGS +=3D $(call cc-option, -fno-stack-protector) override CFLAGS +=3D $(call cc-option, -Wno-array-bounds) =20 -Wa =3D -Wa, -override ASFLAGS +=3D -32 -override CFLAGS +=3D $(call cc-option, $(Wa)-32) - -override LDFLAGS =3D -m $(LD_I386_EMULATION) -T $(SRC_DIR)/flat.lds +override LDFLAGS =3D -nostdlib -Wl,-T,$(SRC_DIR)/flat.lds =20 pvh.img: pvh.o pvh_main.o =20 %.o: %.S - $(call quiet-command,$(CC) $(CPPFLAGS) -E -o - $< | $(AS) $(ASFLAGS) -o $= @,"AS","$@") + $(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<,"AS","$@") =20 %.o: %.c $(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@,"CC","$@") =20 %.img: %.o - $(call quiet-command,$(LD) $(LDFLAGS) -s -o $@ $^,"BUILD","$@") + $(call quiet-command,$(CC) $(CFLAGS) $(LDFLAGS) -s -o $@ $^,"BUILD","$@") =20 %.raw: %.img $(call quiet-command,$(OBJCOPY) -O binary -j .text $< $@,"BUILD","$@") --=20 2.37.3 From nobody Fri May 3 09:35:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1664469864; cv=none; d=zohomail.com; s=zohoarc; b=HGxkVcnmTHrKIsojTmnKEgl02xr7IlSTuON4uUfNgaQeBecaLeywdC1G/kmA3UZkxtZ0O86vKBO7r9yUGb+KNV24n/NBToH/IYxjIyGMaIH2LHZe6ypEZWi1pT2GK7G8Gq9D+4PgKemCBscjxJZHnqLkETO0JProdJ2ABGY0RSk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664469864; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=usXePx9xMfaFrg22Nk1uiPt1yJYXpDEO1vmb2qbIUj4=; b=LPWZip+sNGWBWqTaJ91isIJm/KbDb3y9bhvk5Ixw3AJ6SnaptUxu4/xRkeZ1cKvHAam9K5Uzm+n3ZWFwKOkbFgoE/p7QlUGqJkRNZv92cA9yOfrH52hZWPRUNrIfNMyLU7Bn/1zPqolp4dLXr4KAvKb1iq7ZZwJMtSbpe2s5XE4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664469864129676.9041585818599; Thu, 29 Sep 2022 09:44:24 -0700 (PDT) Received: from localhost ([::1]:51602 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odwe6-0001F7-Q3 for importer@patchew.org; Thu, 29 Sep 2022 12:44:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwQu-0003hW-RJ for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:30:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:49662) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwQr-00036l-LP for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:30:44 -0400 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.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-245-uQmuGqV8O1GMBJPFCOJdIQ-1; Thu, 29 Sep 2022 12:30:38 -0400 Received: by mail-ed1-f69.google.com with SMTP id h11-20020a05640250cb00b004580ee86ca8so1632120edb.6 for ; Thu, 29 Sep 2022 09:30:38 -0700 (PDT) Received: from avogadro.local ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id m9-20020a509989000000b0045391f7d877sm5952464edb.53.2022.09.29.09.30.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 09:30:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664469040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=usXePx9xMfaFrg22Nk1uiPt1yJYXpDEO1vmb2qbIUj4=; b=Nk8YyrE3IpexozLqaTUKsuBcY1AbpwplNeVVOSQwEQvg21Bz7ymDHI5Xuyj6mHEFLUV0Nr XK4J5SOC0tZFcmT7y83nwBRe8eJNZIjMUxRXUrcOMdIAUZtMdefYr3qdG2fUf2oltmiQ/Z Ymyo5rQK5hFBdm3dAKZonOZEwLA9P2k= X-MC-Unique: uQmuGqV8O1GMBJPFCOJdIQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date; bh=usXePx9xMfaFrg22Nk1uiPt1yJYXpDEO1vmb2qbIUj4=; b=S3Jcq5xYknvQGT6sYunBybOMLcymUkdYr5uAcNDykJ1afYXJqFxevmfCzKSWIACczI Q2xwTUT14eRjgtZpeyKAZnLfxBiJCm/aL93yciGnfQ/vNNRN82iSqYvIYxgChsHXBWkG oAGKi5b+D7rgXsooM6l7WDYBQGw0T0yOtmK9QGa6TA7DgNmEzbKWAgBifsmDNbLkIoqs ugPku8FLFz/wTeRTp+ecv9t8L4n6zyj4uHrkpRYmj7BbrAFaFK0PstreqPpQSbWcah4G +bRCT1DURBTq7tbpaPP+iiq6urq3drS3mv5FP9nKsXQHeJL2OXRV5m1q0XfKqIbpMMvB 7o7Q== X-Gm-Message-State: ACrzQf3WDtHQMosdzh0MVFWqLWMmNKxLxmyOEF4aZA0XoOKVU685le/k E/ruVtMe4bqvZRym57Ik6yqEt/eXYDZZu8+xUeKWxGfVXU1QlKbKeakq98jb4eaYR2i0ja8ckSl 6FKsYyx6e6m2+Y3CXW9UdlF24a1/pdEg0x6tdvUXNT9xIrTUh/wxMEd/mHZV2qb0+9Ic= X-Received: by 2002:a17:907:a425:b0:783:b550:d99d with SMTP id sg37-20020a170907a42500b00783b550d99dmr3494323ejc.17.1664469037111; Thu, 29 Sep 2022 09:30:37 -0700 (PDT) X-Google-Smtp-Source: AMsMyM62vn1dJsgOyU1RDoEzHnFeZOSA6hit6uYA1p7zvfjaueuhWv+7kDUqaDyREb97R03rPJnlHA== X-Received: by 2002:a17:907:a425:b0:783:b550:d99d with SMTP id sg37-20020a170907a42500b00783b550d99dmr3494289ejc.17.1664469036586; Thu, 29 Sep 2022 09:30:36 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 07/14] watchdog: remove -watchdog option Date: Thu, 29 Sep 2022 18:30:07 +0200 Message-Id: <20220929163014.16950-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220929163014.16950-1-pbonzini@redhat.com> References: <20220929163014.16950-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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.08, 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 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664469864477100001 Content-Type: text/plain; charset="utf-8" This was deprecated in 6.2 and is ready to go. It removes quite a bit of code that handled the registration of watchdog models. Signed-off-by: Paolo Bonzini --- docs/about/deprecated.rst | 5 ---- docs/about/removed-features.rst | 5 ++++ hw/watchdog/sbsa_gwdt.c | 6 ----- hw/watchdog/watchdog.c | 43 --------------------------------- hw/watchdog/wdt_aspeed.c | 6 ----- hw/watchdog/wdt_diag288.c | 6 ----- hw/watchdog/wdt_i6300esb.c | 6 ----- hw/watchdog/wdt_ib700.c | 6 ----- hw/watchdog/wdt_imx2.c | 6 ----- include/sysemu/watchdog.h | 12 --------- qemu-options.hx | 33 ++----------------------- softmmu/vl.c | 16 ------------ 12 files changed, 7 insertions(+), 143 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index a72fedba5f..93affe3669 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -81,11 +81,6 @@ the process listing. This is replaced by the new ``passw= ord-secret`` option which lets the password be securely provided on the command line using a ``secret`` object instance. =20 -``-watchdog`` (since 6.2) -''''''''''''''''''''''''' - -Use ``-device`` instead. - ``-smp`` ("parameter=3D0" SMP configurations) (since 6.2) ''''''''''''''''''''''''''''''''''''''''''''''''''''''' =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index a4aa3dca69..63df9848fd 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -403,6 +403,11 @@ Sound card devices should be created using ``-device``= or ``-audio``. The exception is ``pcspk`` which can be activated using ``-machine pcspk-audiodev=3D``. =20 +``-watchdog`` (since 7.2) +''''''''''''''''''''''''' + +Use ``-device`` instead. + =20 QEMU Machine Protocol (QMP) commands ------------------------------------ diff --git a/hw/watchdog/sbsa_gwdt.c b/hw/watchdog/sbsa_gwdt.c index e49cacd0e2..7aa57a8c51 100644 --- a/hw/watchdog/sbsa_gwdt.c +++ b/hw/watchdog/sbsa_gwdt.c @@ -24,11 +24,6 @@ #include "qemu/log.h" #include "qemu/module.h" =20 -static WatchdogTimerModel model =3D { - .wdt_name =3D TYPE_WDT_SBSA, - .wdt_description =3D "SBSA-compliant generic watchdog device", -}; - static const VMStateDescription vmstate_sbsa_gwdt =3D { .name =3D "sbsa-gwdt", .version_id =3D 1, @@ -287,7 +282,6 @@ static const TypeInfo wdt_sbsa_gwdt_info =3D { =20 static void wdt_sbsa_gwdt_register_types(void) { - watchdog_add_model(&model); type_register_static(&wdt_sbsa_gwdt_info); } =20 diff --git a/hw/watchdog/watchdog.c b/hw/watchdog/watchdog.c index 1437e6c5b6..6c082a3263 100644 --- a/hw/watchdog/watchdog.c +++ b/hw/watchdog/watchdog.c @@ -32,49 +32,6 @@ #include "qemu/help_option.h" =20 static WatchdogAction watchdog_action =3D WATCHDOG_ACTION_RESET; -static QLIST_HEAD(, WatchdogTimerModel) watchdog_list; - -void watchdog_add_model(WatchdogTimerModel *model) -{ - QLIST_INSERT_HEAD(&watchdog_list, model, entry); -} - -/* Returns: - * 0 =3D continue - * 1 =3D exit program with error - * 2 =3D exit program without error - */ -int select_watchdog(const char *p) -{ - WatchdogTimerModel *model; - QemuOpts *opts; - - /* -watchdog ? lists available devices and exits cleanly. */ - if (is_help_option(p)) { - QLIST_FOREACH(model, &watchdog_list, entry) { - fprintf(stderr, "\t%s\t%s\n", - model->wdt_name, model->wdt_description); - } - return 2; - } - - QLIST_FOREACH(model, &watchdog_list, entry) { - if (strcasecmp(model->wdt_name, p) =3D=3D 0) { - /* add the device */ - opts =3D qemu_opts_create(qemu_find_opts("device"), NULL, 0, - &error_abort); - qemu_opt_set(opts, "driver", p, &error_abort); - return 0; - } - } - - fprintf(stderr, "Unknown -watchdog device. Supported devices are:\n"); - QLIST_FOREACH(model, &watchdog_list, entry) { - fprintf(stderr, "\t%s\t%s\n", - model->wdt_name, model->wdt_description); - } - return 1; -} =20 WatchdogAction get_watchdog_action(void) { diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c index 31855afdf4..d753693a2e 100644 --- a/hw/watchdog/wdt_aspeed.c +++ b/hw/watchdog/wdt_aspeed.c @@ -202,11 +202,6 @@ static void aspeed_wdt_write(void *opaque, hwaddr offs= et, uint64_t data, return; } =20 -static WatchdogTimerModel model =3D { - .wdt_name =3D TYPE_ASPEED_WDT, - .wdt_description =3D "Aspeed watchdog device", -}; - static const VMStateDescription vmstate_aspeed_wdt =3D { .name =3D "vmstate_aspeed_wdt", .version_id =3D 0, @@ -416,7 +411,6 @@ static const TypeInfo aspeed_1030_wdt_info =3D { =20 static void wdt_aspeed_register_types(void) { - watchdog_add_model(&model); type_register_static(&aspeed_wdt_info); type_register_static(&aspeed_2400_wdt_info); type_register_static(&aspeed_2500_wdt_info); diff --git a/hw/watchdog/wdt_diag288.c b/hw/watchdog/wdt_diag288.c index 9e8882a11c..76d89fbf78 100644 --- a/hw/watchdog/wdt_diag288.c +++ b/hw/watchdog/wdt_diag288.c @@ -19,11 +19,6 @@ #include "migration/vmstate.h" #include "qemu/log.h" =20 -static WatchdogTimerModel model =3D { - .wdt_name =3D TYPE_WDT_DIAG288, - .wdt_description =3D "diag288 device for s390x platform", -}; - static const VMStateDescription vmstate_diag288 =3D { .name =3D "vmstate_diag288", .version_id =3D 0, @@ -138,7 +133,6 @@ static const TypeInfo wdt_diag288_info =3D { =20 static void wdt_diag288_register_types(void) { - watchdog_add_model(&model); type_register_static(&wdt_diag288_info); } =20 diff --git a/hw/watchdog/wdt_i6300esb.c b/hw/watchdog/wdt_i6300esb.c index f99a1c9d29..5693ec6a09 100644 --- a/hw/watchdog/wdt_i6300esb.c +++ b/hw/watchdog/wdt_i6300esb.c @@ -457,11 +457,6 @@ static void i6300esb_exit(PCIDevice *dev) timer_free(d->timer); } =20 -static WatchdogTimerModel model =3D { - .wdt_name =3D "i6300esb", - .wdt_description =3D "Intel 6300ESB", -}; - static void i6300esb_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -493,7 +488,6 @@ static const TypeInfo i6300esb_info =3D { =20 static void i6300esb_register_types(void) { - watchdog_add_model(&model); type_register_static(&i6300esb_info); } =20 diff --git a/hw/watchdog/wdt_ib700.c b/hw/watchdog/wdt_ib700.c index 91d1bdc0da..b116c3a3aa 100644 --- a/hw/watchdog/wdt_ib700.c +++ b/hw/watchdog/wdt_ib700.c @@ -128,11 +128,6 @@ static void wdt_ib700_reset(DeviceState *dev) timer_del(s->timer); } =20 -static WatchdogTimerModel model =3D { - .wdt_name =3D "ib700", - .wdt_description =3D "iBASE 700", -}; - static void wdt_ib700_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); @@ -153,7 +148,6 @@ static const TypeInfo wdt_ib700_info =3D { =20 static void wdt_ib700_register_types(void) { - watchdog_add_model(&model); type_register_static(&wdt_ib700_info); } =20 diff --git a/hw/watchdog/wdt_imx2.c b/hw/watchdog/wdt_imx2.c index c3128370b5..e776a2fbd4 100644 --- a/hw/watchdog/wdt_imx2.c +++ b/hw/watchdog/wdt_imx2.c @@ -291,14 +291,8 @@ static const TypeInfo imx2_wdt_info =3D { .class_init =3D imx2_wdt_class_init, }; =20 -static WatchdogTimerModel model =3D { - .wdt_name =3D "imx2-watchdog", - .wdt_description =3D "i.MX2 Watchdog", -}; - static void imx2_wdt_register_type(void) { - watchdog_add_model(&model); type_register_static(&imx2_wdt_info); } type_init(imx2_wdt_register_type) diff --git a/include/sysemu/watchdog.h b/include/sysemu/watchdog.h index d2d4901dbb..745c89b02b 100644 --- a/include/sysemu/watchdog.h +++ b/include/sysemu/watchdog.h @@ -25,20 +25,8 @@ #include "qemu/queue.h" #include "qapi/qapi-types-run-state.h" =20 -struct WatchdogTimerModel { - QLIST_ENTRY(WatchdogTimerModel) entry; - - /* Short name of the device - used to select it on the command line. */ - const char *wdt_name; - /* Longer description (eg. manufacturer and full model number). */ - const char *wdt_description; -}; -typedef struct WatchdogTimerModel WatchdogTimerModel; - /* in hw/watchdog.c */ -int select_watchdog(const char *p); WatchdogAction get_watchdog_action(void); -void watchdog_add_model(WatchdogTimerModel *model); void watchdog_perform_action(void); =20 #endif /* QEMU_WATCHDOG_H */ diff --git a/qemu-options.hx b/qemu-options.hx index d8b5ce5b43..df4b8c8f1a 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4330,7 +4330,7 @@ SRST =20 ``-action panic=3Dnone`` ``-action reboot=3Dshutdown,shutdown=3Dpause`` - ``-watchdog i6300esb -action watchdog=3Dpause`` + ``-device i6300esb -action watchdog=3Dpause`` =20 ERST =20 @@ -4448,35 +4448,6 @@ SRST specifies the snapshot name used to load the initial VM state. ERST =20 -DEF("watchdog", HAS_ARG, QEMU_OPTION_watchdog, \ - "-watchdog model\n" \ - " enable virtual hardware watchdog [default=3Dnone]\n", - QEMU_ARCH_ALL) -SRST -``-watchdog model`` - Create a virtual hardware watchdog device. Once enabled (by a guest - action), the watchdog must be periodically polled by an agent inside - the guest or else the guest will be restarted. Choose a model for - which your guest has drivers. - - The model is the model of hardware watchdog to emulate. Use - ``-watchdog help`` to list available hardware models. Only one - watchdog can be enabled for a guest. - - The following models may be available: - - ``ib700`` - iBASE 700 is a very simple ISA watchdog with a single timer. - - ``i6300esb`` - Intel 6300ESB I/O controller hub is a much more featureful - PCI-based dual-timer watchdog. - - ``diag288`` - A virtual watchdog for s390x backed by the diagnose 288 - hypercall (currently KVM only). -ERST - DEF("watchdog-action", HAS_ARG, QEMU_OPTION_watchdog_action, \ "-watchdog-action reset|shutdown|poweroff|inject-nmi|pause|debug|none\= n" \ " action when watchdog fires [default=3Dreset]\n", @@ -4498,7 +4469,7 @@ SRST =20 Examples: =20 - ``-watchdog i6300esb -watchdog-action pause``; \ ``-watchdog ib700`` + ``-device i6300esb -watchdog-action pause`` =20 ERST =20 diff --git a/softmmu/vl.c b/softmmu/vl.c index e62b9cc35d..b8788e765a 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -53,7 +53,6 @@ #include "hw/isa/isa.h" #include "hw/scsi/scsi.h" #include "hw/display/vga.h" -#include "sysemu/watchdog.h" #include "hw/firmware/smbios.h" #include "hw/acpi/acpi.h" #include "hw/xen/xen.h" @@ -181,7 +180,6 @@ static Chardev **serial_hds; static const char *log_mask; static const char *log_file; static bool list_data_dirs; -static const char *watchdog; static const char *qtest_chrdev; static const char *qtest_log; =20 @@ -2329,12 +2327,6 @@ static void qemu_process_sugar_options(void) } object_register_sugar_prop("memory-backend", "prealloc", "on", fal= se); } - - if (watchdog) { - int i =3D select_watchdog(watchdog); - if (i > 0) - exit (i =3D=3D 1 ? 1 : 0); - } } =20 /* -action processing */ @@ -3107,14 +3099,6 @@ void qemu_init(int argc, char **argv, char **envp) default_monitor =3D 0; } break; - case QEMU_OPTION_watchdog: - if (watchdog) { - error_report("only one watchdog option may be given"); - exit(1); - } - warn_report("-watchdog is deprecated; use -device instead.= "); - watchdog =3D optarg; - break; case QEMU_OPTION_action: olist =3D qemu_find_opts("action"); if (!qemu_opts_parse_noisily(olist, optarg, false)) { --=20 2.37.3 From nobody Fri May 3 09:35:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1664472489; cv=none; d=zohomail.com; s=zohoarc; b=Ww0l+OhxW0xeVwv0pb3k4E6IoWEOyK7OAicN4vuMCmnaP/dVmx7IgxVfD2wQBmua629SARMb1EZIawSVkk+HuJFhYXihVA4PzF0J0al7jEACrJPlksdKh5R7Y8dA0sIHRtixy0Zrkpf3suU4AGrRSkVHmFHh5cbrnvpBA3PHHI8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664472489; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GJzCllnxG/DxrGKRWWoxC+uavu4ndvSXFH/Fdt26IG8=; b=gseo/DE1SFfeuBEVIgHvifDDeKQRWYjzAJP4C/mBiqdmBleIaD5PwUASS5Q8qM/riMjgGNiYDivtq9rs1NaSMs6h86TepsDU7zdOfoCIpkNkNDQzSrSlKV0uEpi56IyQFhgeJJAdkiHnv4147EOjaGdMOwrtqVBXofZL16K/xUQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664472489634159.9734579051651; Thu, 29 Sep 2022 10:28:09 -0700 (PDT) Received: from localhost ([::1]:40652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odxKS-0006u5-HZ for importer@patchew.org; Thu, 29 Sep 2022 13:28:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50822) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwQv-0003hZ-Q1 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:30:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:42845) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwQt-00036u-If for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:30:45 -0400 Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-207-KI0dBMccOM2PWzreFnB1iQ-1; Thu, 29 Sep 2022 12:30:41 -0400 Received: by mail-ed1-f72.google.com with SMTP id h13-20020a056402280d00b004581108ba90so1663880ede.2 for ; Thu, 29 Sep 2022 09:30:40 -0700 (PDT) Received: from avogadro.local ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id kx6-20020a170907774600b007708635be05sm4270475ejc.4.2022.09.29.09.30.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 09:30:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664469042; 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=GJzCllnxG/DxrGKRWWoxC+uavu4ndvSXFH/Fdt26IG8=; b=QmU5DQe0BZAbYVEWG2hl2Ia76VxDMs1esKhdVNdBpsTC0yatTKSKoBR2MRe74XztPji6i5 YmrNwOv6ewGd0SsMoWdEBQDI2Xicppxt5theKE2oae0H775KN0JZbfRl6JSbNNgqfB3Fyd KlMHmhAag9umpWU7EUeqMZJKHRIPkx8= X-MC-Unique: KI0dBMccOM2PWzreFnB1iQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=GJzCllnxG/DxrGKRWWoxC+uavu4ndvSXFH/Fdt26IG8=; b=Xkmz/6thaqWkIO4JsA4PH9BStQFuVx5JFfyUjdOkx9/Efh/5Nyjg6uVht8fiA07C9e pbUVAypT8TUIjECOP0ekNy7VDU/zXGNKy4g5Emy5yEdpzT9mliDzdDBjdlWtSDT5ioq5 cNBMMVbJteJ7LwMDHaOyej4HPu62AtGSh8lOD2yKqJE4+C0zcpjdMWgccIiGjvmIb6+k ThBW/cCfHY5yWogIwMFro/VR8jMiPPPlHzDNAIEgbkQr4QkSBdxLqL7nQHAFAzSLD1cU e0vUMeCTCl4GzQJl8Ai9O0XHLcldHVs5EyI695hCnx/DK4dt4kd+STx+ThXeEIfGzW0i eG3g== X-Gm-Message-State: ACrzQf2u0oXIiMfu2Au6zuWWx3ONCimLfsiIA/eknPr5Vx45NoDHXyAT prcdfLyf1morvPAZpMquJYHW9Uh4isKL1xTX8IX1qLmuzZ6f8vhBm85PDk3CKrBFETlH6N39hnp qFvjsCYPLUpjuPAJtu36rWK8z/so/xejHF6gr56cJa2LscfGjDffj6W0prOD960AG9Pc= X-Received: by 2002:a17:907:75d4:b0:77a:fcb7:a2cc with SMTP id jl20-20020a17090775d400b0077afcb7a2ccmr3431687ejc.480.1664469039511; Thu, 29 Sep 2022 09:30:39 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7Svg/QW8z/8vub/0u8LdJBGGDI3G+Bhr4BxFFcn6HmWISJWhJZsY7Lw8Y1hrQASbMd1Wvruw== X-Received: by 2002:a17:907:75d4:b0:77a:fcb7:a2cc with SMTP id jl20-20020a17090775d400b0077afcb7a2ccmr3431668ejc.480.1664469039239; Thu, 29 Sep 2022 09:30:39 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 08/14] ui: fix path to dbus-display1.h Date: Thu, 29 Sep 2022 18:30:08 +0200 Message-Id: <20220929163014.16950-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220929163014.16950-1-pbonzini@redhat.com> References: <20220929163014.16950-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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.08, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PP_MIME_FAKE_ASCII_TEXT=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664472491828100001 While the source directory is always included in the include path, the corresponding directory in the build tree is not. Therefore, custom_targets (e.g. ui/dbus-display1.h) must be referred to using the full path. This avoids a build failure when ui/dbus-chardev.c is not built as a module: In file included from ../ui/dbus-chardev.c:32: ../ui/dbus.h:34:10: fatal error: dbus-display1.h: No such file or directory 34 | #include "dbus-display1.h" | ^~~~~~~~~~~~~~~~~ Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- tests/qtest/dbus-display-test.c | 2 +- ui/dbus.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qtest/dbus-display-test.c b/tests/qtest/dbus-display-tes= t.c index 8be5974763..cb1b62d1d1 100644 --- a/tests/qtest/dbus-display-test.c +++ b/tests/qtest/dbus-display-test.c @@ -3,7 +3,7 @@ #include #include #include "libqtest.h" -#include "dbus-display1.h" +#include "ui/dbus-display1.h" =20 static GDBusConnection* test_dbus_p2p_from_fd(int fd) diff --git a/ui/dbus.h b/ui/dbus.h index c001c11f70..9c149e7b41 100644 --- a/ui/dbus.h +++ b/ui/dbus.h @@ -31,7 +31,7 @@ #include "ui/console.h" #include "ui/clipboard.h" =20 -#include "dbus-display1.h" +#include "ui/dbus-display1.h" =20 typedef struct DBusClipboardRequest { GDBusMethodInvocation *invocation; --=20 2.37.3 From nobody Fri May 3 09:35:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1664475182; cv=none; d=zohomail.com; s=zohoarc; b=CxQ0p/QtETT/95rcmjbi9W6bFG6WDQrP+bcAkfyHIlW1NtwPxQfrtPgXFlXJHDFrfku2gfyeZ26htFddleS0xlZKY6/0d9nX9OiUfc8hn7CupDZt5Bh0UfR70QiyRIazlIM0GAkcLqiqxBXoGnxCXVI6oXULUQDRUqrfjHi6614= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664475182; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UjY/Jq0lPx63CQPxnhr1RzSewXNLSU5XzcmJxfZ8oUE=; b=Diw1x0zIJ5PzN9EcPvh04VLZVd3sToyaHAXY/uuc32+5zMFcopRqMwVwWJ8jLVmgWwQvJOpYQm0EOb8AHT/y9IvR9puUqwiMM6mpX+dtaOPLZ/Sb2W6Jl7wRN51TOtMuatyz7h3MAIZSil2bs22CuDdlBGFr3CdXaBTO7qieM8w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664475182611240.58049201149743; Thu, 29 Sep 2022 11:13:02 -0700 (PDT) Received: from localhost ([::1]:53384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ody1t-0007Md-LE for importer@patchew.org; Thu, 29 Sep 2022 14:13:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwR1-0003kB-JL for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:30:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:28577) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwQv-00037I-Qk for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:30:51 -0400 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.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-481-Kpp0_TqCMheyqodmI1ZCLw-1; Thu, 29 Sep 2022 12:30:43 -0400 Received: by mail-ed1-f70.google.com with SMTP id s17-20020a056402521100b004511c8d59e3so1670666edd.11 for ; Thu, 29 Sep 2022 09:30:43 -0700 (PDT) Received: from avogadro.local ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id dk9-20020a0564021d8900b0043df042bfc6sm5633028edb.47.2022.09.29.09.30.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 09:30:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664469045; 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=UjY/Jq0lPx63CQPxnhr1RzSewXNLSU5XzcmJxfZ8oUE=; b=htfrPPjLDKJpW7e50yV0k8ip88bDC4gsOwidpGXSGX3M0q0JEOvh80H8TYujMK2EcxP5XT G6mWRiGIFw0lfv9gdfL1piSU8K7XAOYO4LjJcOapz949Qs55/cU2lbuylJ28Mx/WTgxo9f 3Y4ZOB4g+YANXAikCxp5OqsSYrfBiaI= X-MC-Unique: Kpp0_TqCMheyqodmI1ZCLw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=UjY/Jq0lPx63CQPxnhr1RzSewXNLSU5XzcmJxfZ8oUE=; b=n3YKLAvG8GT4dJsbOhtSPY8NrIyIcJ8Kj7s8e4m5Fvapm0mXnQAlygH4e0wyEqcCBx u5RdTutv7XMGyEEzYyPWmQ3teNbcvqtmcDMHryRXXbVQbdJEvAPfUMeoC709WP4bDXV/ MyF6gHqBG4pZrCh+o7x2xSr7WfXd8TgebyThmua3W3GjmJU9IjgAE7h0yrjwgI+fj5lv nVX9F+T5IAR6ZrRGPRqNrQucte5yl42cq5uVyHkvSLIHYiR8vgPwoJhw7JN4BnNAa72Y d/v1h7gE6Lec9RQ4i1+Su+y89QhMciGRsZ5LJVZvVXgWGZwOAeuVpu6Ce2+TYotdE9MA salw== X-Gm-Message-State: ACrzQf3h6/ni7k1KANixHVqDKQLcH5zL5rYP8LNfuddEPsvnJKap1BWs cl5OLzKq08TqT/XcRHHBazk3CuowhUjkpnRGB0+mu6MAecA1Gz38RRW3hzpv1vpFymEecSx1/ju aw66D8mQqRIaer5tVHBgLGgu7gnuct6HL67tPJhb5fljMrN9oUUvDUc0kx+jCBwuv0VQ= X-Received: by 2002:a17:907:3e03:b0:722:e694:438 with SMTP id hp3-20020a1709073e0300b00722e6940438mr3382677ejc.755.1664469042195; Thu, 29 Sep 2022 09:30:42 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4CQ6YbL+xTRBMZazjs7x2AwSEkrJDEzsLYsSmlKxbw+0b6OlqdrIhmCuGnuISqIBhM63zDNw== X-Received: by 2002:a17:907:3e03:b0:722:e694:438 with SMTP id hp3-20020a1709073e0300b00722e6940438mr3382654ejc.755.1664469041950; Thu, 29 Sep 2022 09:30:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 09/14] meson: require 0.61.3 Date: Thu, 29 Sep 2022 18:30:09 +0200 Message-Id: <20220929163014.16950-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220929163014.16950-1-pbonzini@redhat.com> References: <20220929163014.16950-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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.08, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PP_MIME_FAKE_ASCII_TEXT=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664475184483100001 This removes the dependency of dbus-display on --enable-modules. It also a= llows cleanups in modinfo collection and allows moving C++ compiler detection to meson.build. Because it is now deprecated to use install_subdir to create an empty direc= tory, replace it with install_emptydir. Updating the Meson submodule to 0.61.5 also removes the message WARNING: Broken python installation detected. Python files installed by Meson might not be found by python interpreter. unless using system meson is forced with --meson. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/873 Resolves: https://gitlab.com/qemu-project/qemu/-/issues/848 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- configure | 2 +- meson | 2 +- meson.build | 5 +---- qga/meson.build | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 894e37310f..c5069775db 100755 --- a/configure +++ b/configure @@ -1114,7 +1114,7 @@ fi python=3D"$python -B" =20 if test -z "$meson"; then - if test "$explicit_python" =3D no && has meson && version_ge "$(meson = --version)" 0.59.3; then + if test "$explicit_python" =3D no && has meson && version_ge "$(meson = --version)" 0.61.5; then meson=3Dmeson elif test "$git_submodules_action" !=3D 'ignore' ; then meson=3Dgit diff --git a/meson b/meson index 12f9f04ba0..3a9b285a55 160000 --- a/meson +++ b/meson @@ -1 +1 @@ -Subproject commit 12f9f04ba0decfda425dbbf9a501084c153a2d18 +Subproject commit 3a9b285a55b91b53b2acda987192274352ecb5be diff --git a/meson.build b/meson.build index 3885fc1076..8c1139a82b 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('qemu', ['c'], meson_version: '>=3D0.59.3', +project('qemu', ['c'], meson_version: '>=3D0.61.3', default_options: ['warning_level=3D1', 'c_std=3Dgnu11', 'cpp_std= =3Dgnu++11', 'b_colorout=3Dauto', 'b_staticpic=3Dfalse', 'stdsplit=3Dfalse', 'opti= mization=3D2', 'b_pie=3Dtrue'], version: files('VERSION')) @@ -1669,12 +1669,9 @@ endif have_host_block_device =3D (targetos !=3D 'darwin' or cc.has_header('IOKit/storage/IOMedia.h')) =20 -# FIXME enable_modules shouldn't be necessary, but: https://github.com/mes= onbuild/meson/issues/8333 dbus_display =3D get_option('dbus_display') \ .require(gio.version().version_compare('>=3D2.64'), error_message: '-display dbus requires glib>=3D2.64') \ - .require(enable_modules, - error_message: '-display dbus requires --enable-modules') \ .require(gdbus_codegen.found(), error_message: '-display dbus requires gdbus-codegen') \ .require(opengl.found() and gbm.found(), diff --git a/qga/meson.build b/qga/meson.build index 65c1e93846..a0ffd6d268 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -138,7 +138,7 @@ else if get_option('guest_agent_msi').enabled() error('MSI guest agent package is available only for MinGW Windows cro= ss-compilation') endif - install_subdir('run', install_dir: get_option('localstatedir')) + install_emptydir(get_option('localstatedir') / 'run') endif =20 alias_target('qemu-ga', all_qga) --=20 2.37.3 From nobody Fri May 3 09:35:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1664472111; cv=none; d=zohomail.com; s=zohoarc; b=DYimsg4i9137YR8+3OJ2Rb3dp9In+HcX0WAmiDkqyh2FCN6vTHferterIEdU5r+k51d2ZkrhsVNelQnEwQ4VzTEPPg+YHJdo6DVwDFdT4tSrmM28wSBhNUf/VzOznEBn9rs109JK7+dRaDDdZ0Dif2sd9UaRB6c6FfzIaMcOga4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664472111; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BzQ2W/6tj3VXgm+BZMFM6kvKXkcy8XGIKo0gkp2srZM=; b=FiXoQ0P4jRuS3hR3KhF5hRy6O2nq0ZKblSij91kxrqBLdCsOO+8n3eQCzBKHe3iDNGFYMwfoJnjCY+0wux6nqyS9tw0UsZ1ZEUYlNil53zNhNUuftbra5KnZyUBJwHZhS15Y+Ijlzny/XyL5LDVi0ppOtC2UzGbVfxu3ngvVnoM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 166447211173235.85954389309882; Thu, 29 Sep 2022 10:21:51 -0700 (PDT) Received: from localhost ([::1]:59818 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odxEM-0006GZ-II for importer@patchew.org; Thu, 29 Sep 2022 13:21:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41324) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwRB-0003vz-M6 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:31:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:52211) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwQy-00037W-GQ for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:31:01 -0400 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.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-124-12A-_kpwN-WGSAKmembeHA-1; Thu, 29 Sep 2022 12:30:46 -0400 Received: by mail-ed1-f71.google.com with SMTP id w20-20020a05640234d400b00450f24c8ca6so1642294edc.13 for ; Thu, 29 Sep 2022 09:30:46 -0700 (PDT) Received: from avogadro.local ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id 6-20020a508e06000000b004574f4326b8sm5895607edw.30.2022.09.29.09.30.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 09:30:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664469047; 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=BzQ2W/6tj3VXgm+BZMFM6kvKXkcy8XGIKo0gkp2srZM=; b=PKWvoSURPLOw59QwNmfiYH79h9NYW/UeHdyWNlDTlNYfdGavPY84C3UW6Uk2+/69vojNKG 8VbJFkgXnglSPdf9dAZ4PNi61QQVqDAczGPcY6aXmCP3gv39gxVwPavdPBM5/4X/k9e+3r OhYjc5ZqY//TVmi+qSvTwwcBU8wHFO4= X-MC-Unique: 12A-_kpwN-WGSAKmembeHA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=BzQ2W/6tj3VXgm+BZMFM6kvKXkcy8XGIKo0gkp2srZM=; b=JFf7yTR7d29NEk7D8boSfqDzo+CHDB680IRMe4340X4LTSnJwB13T+cZY/3zxTMchX n95NpMLYtzAxlRR8FxcJvZhbIgTsQKnLENuOe2KytpxCpUkWrUb+A3szx5D+5Ytt3m/2 a+tRd5Gh+29qblcmVYf0FJfSnBtAORk/9Wb1nFMARc9h/6gzYyTahiqZwEktwJH7/dLt pBZ8N39Q5D/sDtBz2YHWBtYH0Ortku1V2Fyxv7LG1SfhGqU+vvnsWPli2PCaFM8O/h/j 1DS3E1y7lM/PyN1MN0aHMwKfV0rwGYk+QMYPA3U73C3rE+Cx3mkWC6w3qnUNj4uWlzWO oDzA== X-Gm-Message-State: ACrzQf0vopzEv0d0h4LVCITPm5uL38D9oWmos6Ry9GMGwDLc3QhE3iYC V9wzGc5rYSv8dEsEnhcEqByl1LKnQN6sT7U6tnnAepwzXzCoR4FJ58ciDf9ync75VdHO+t1K3wa ZHgJQQf6DaUY3bRSsUA29xMHRbO4pRJlKQSanGGSDmPMpXpzElxxkWA+/euys4h9xLz8= X-Received: by 2002:a17:906:cc58:b0:76f:c119:acb5 with SMTP id mm24-20020a170906cc5800b0076fc119acb5mr3278141ejb.651.1664469045213; Thu, 29 Sep 2022 09:30:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7+4L4bzKoMXCrx+bUUP/E2Q7qRHPNqm/y0WyMh1cE0CkF2ta0X8aGwjdBw3OHVsmIwVIKmdA== X-Received: by 2002:a17:906:cc58:b0:76f:c119:acb5 with SMTP id mm24-20020a170906cc5800b0076fc119acb5mr3278122ejb.651.1664469044890; Thu, 29 Sep 2022 09:30:44 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 10/14] meson: multiple names can be passed to dependency() Date: Thu, 29 Sep 2022 18:30:10 +0200 Message-Id: <20220929163014.16950-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220929163014.16950-1-pbonzini@redhat.com> References: <20220929163014.16950-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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.08, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PP_MIME_FAKE_ASCII_TEXT=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664472112849100001 This is new in Meson 0.60.0. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- meson.build | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index 8c1139a82b..48533ace7b 100644 --- a/meson.build +++ b/meson.build @@ -825,14 +825,10 @@ if have_system and get_option('curses').allowed() }''' =20 curses_dep_list =3D targetos =3D=3D 'windows' ? ['ncurses', 'ncursesw'] = : ['ncursesw'] - foreach curses_dep : curses_dep_list - if not curses.found() - curses =3D dependency(curses_dep, - required: false, - method: 'pkg-config', - kwargs: static_kwargs) - endif - endforeach + curses =3D dependency(curses_dep_list, + required: false, + method: 'pkg-config', + kwargs: static_kwargs) msg =3D get_option('curses').enabled() ? 'curses library not found' : '' curses_compile_args =3D ['-DNCURSES_WIDECHAR=3D1'] if curses.found() --=20 2.37.3 From nobody Fri May 3 09:35:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1664470128; cv=none; d=zohomail.com; s=zohoarc; b=A7cW121RySxRu8yYfAB5xVMRl/9fl1V6E8ixNhIlMa+nV1g7ABZMsF2g4I0VNMuejBqG0kU0mOLGdSjDVWXa4TexnBMTEervuUPgP18CQUi6QWkWE3fTye5LNI+XLH4cOBE8MGKeXf15nQ4e4E+BRZV5SH/EyCzmJKeuAIoJlCM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664470128; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gWtuzhZlXWimeJzTK/CgOxliSMAqBzNFhn9r6Sbw5SQ=; b=YExYVVl/dtxRmqRJt6TEOBWO4628wkUxDyjOI0w0gSdN8pDufsd+oez+7rdlwKWqntYV2GVBE7TEicwDKtp/JiC43a2UlQ8YRulxUBr85lnWjkJGJgBUcikFXC9JmDiZjOKNc7e7ZnLpdFgPDo/cdsg/6nMWP5bKltIqxH+WKls= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664470128560403.17557867201754; Thu, 29 Sep 2022 09:48:48 -0700 (PDT) Received: from localhost ([::1]:34038 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odwiL-0007Ff-Ud for importer@patchew.org; Thu, 29 Sep 2022 12:48:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41316) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwR5-0003mI-Kl for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:30:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:60303) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwR2-00037y-Ou for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:30:54 -0400 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.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-543-7X7b9RpbP86az1XD_1JYYA-1; Thu, 29 Sep 2022 12:30:50 -0400 Received: by mail-ed1-f69.google.com with SMTP id y9-20020a056402270900b00451dfbbc9b2so1649351edd.12 for ; Thu, 29 Sep 2022 09:30:49 -0700 (PDT) Received: from avogadro.local ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id y19-20020a170906449300b0077077c62cadsm4211099ejo.31.2022.09.29.09.30.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 09:30:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664469052; 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=gWtuzhZlXWimeJzTK/CgOxliSMAqBzNFhn9r6Sbw5SQ=; b=cNpqqZIYITg2BqC8iX/WtPx9TQ+8RNsrPtmFdCX4sM5ypvDAaZYGXx4EjvCvSPWX4BfuKd JAwFx4QrX8fgaoHKkWtXShCCkj7MkYZMfqkqjTz0bC5MC7lIbiSvZKOT4Q9k62h2pDDUrH 5OawCkphpvVZcNu5oEXQprSUiMBf0kA= X-MC-Unique: 7X7b9RpbP86az1XD_1JYYA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=gWtuzhZlXWimeJzTK/CgOxliSMAqBzNFhn9r6Sbw5SQ=; b=Bf5xvLFsGSZQgbGLe4vKNyfA6lFCHM5q8VKp+jkK1CDUSYGLyTHuAaxTLwjGpu7QUs zmJBCV2vhrxv6Z4/rBbJiDCjgdAusfkmwmxBBfQ0qtxVaEunTfOLQUN9EYgAywxiBD9w VF71DGiRUnFUKsnDxgX1GwibmouN4fFCpgo2nTe/JWl5tq3vBqaDlmNLN4MT4ANVroxk eJxc+jUIDIS96HREUzkoNlq3G8rJJpbX2OurjbNx037EDfe89GsAjvbjeJJLBlSbSPY5 WwZhFsDb0SOV8Jg05cvxCYxhVEmmF7Lww9FdCd/bZTVMM0rKzHZSTkgJC1sAT8kY6z/W pRAg== X-Gm-Message-State: ACrzQf3+E+EZFYvrBas+aaP3gIYbH47QVcWMNW3jHOLQjgoieFfr6R+D qDoKYjlDDdCA4z3IX/6yHRbKezaZeUSsGP1KjpTlqM5YmpmneQ7N+BnaALKxR3dqLvgQd0rTpRu 4F36qymbwLb6nO8RG3feO2hwF5p/tWWlMrNg+cAYDsWk1a1lnVGgTuh+P0cHH40koEQY= X-Received: by 2002:a05:6402:847:b0:453:943b:bf4 with SMTP id b7-20020a056402084700b00453943b0bf4mr4100425edz.301.1664469048000; Thu, 29 Sep 2022 09:30:48 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5FK4yzD/zWSWLubJsACNrDwx6zX30VYxatyv9hec/ekCMWl6jdaIHfixqFsOc2rM3ttwBfiw== X-Received: by 2002:a05:6402:847:b0:453:943b:bf4 with SMTP id b7-20020a056402084700b00453943b0bf4mr4100393edz.301.1664469047670; Thu, 29 Sep 2022 09:30:47 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 11/14] configure, meson: move C++ compiler detection to meson.build Date: Thu, 29 Sep 2022 18:30:11 +0200 Message-Id: <20220929163014.16950-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220929163014.16950-1-pbonzini@redhat.com> References: <20220929163014.16950-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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.08, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PP_MIME_FAKE_ASCII_TEXT=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664470129713100001 The test is slightly weaker than before, because it does not call an extern "C" function from a C source file. However, in practice what we seek to detect is ABI compatibility of the various sanitizer flags, and for that it is enough to compile anything with CC and link it with CXX. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- configure | 57 -------------------------------------------------- meson.build | 37 ++++++++++++++++++++++---------- scripts/main.c | 1 + 3 files changed, 27 insertions(+), 68 deletions(-) create mode 100644 scripts/main.c diff --git a/configure b/configure index c5069775db..3e3c0f36c9 100755 --- a/configure +++ b/configure @@ -75,7 +75,6 @@ fi TMPB=3D"qemu-conf" TMPC=3D"${TMPDIR1}/${TMPB}.c" TMPO=3D"${TMPDIR1}/${TMPB}.o" -TMPCXX=3D"${TMPDIR1}/${TMPB}.cxx" TMPM=3D"${TMPDIR1}/${TMPB}.m" TMPE=3D"${TMPDIR1}/${TMPB}.exe" =20 @@ -158,10 +157,6 @@ do_cc() { do_compiler_werror "$cc" $CPU_CFLAGS "$@" } =20 -do_cxx() { - do_compiler_werror "$cxx" $CPU_CFLAGS "$@" -} - do_objc() { do_compiler_werror "$objcc" $CPU_CFLAGS "$@" } @@ -171,24 +166,6 @@ add_to() { eval $1=3D\${$1:+\"\$$1 \"}\$2 } =20 -update_cxxflags() { - # Set QEMU_CXXFLAGS from QEMU_CFLAGS by filtering out those - # options which some versions of GCC's C++ compiler complain about - # because they only make sense for C programs. - QEMU_CXXFLAGS=3D"-D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -D__ST= DC_FORMAT_MACROS" - CONFIGURE_CXXFLAGS=3D$(echo "$CONFIGURE_CFLAGS" | sed s/-std=3Dgnu11/-= std=3Dgnu++11/) - for arg in $QEMU_CFLAGS; do - case $arg in - -Wstrict-prototypes|-Wmissing-prototypes|-Wnested-externs|\ - -Wold-style-declaration|-Wold-style-definition|-Wredundant-dec= ls) - ;; - *) - QEMU_CXXFLAGS=3D${QEMU_CXXFLAGS:+$QEMU_CXXFLAGS }$arg - ;; - esac - done -} - compile_object() { local_cflags=3D"$1" do_cc $CFLAGS $EXTRA_CFLAGS $CONFIGURE_CFLAGS $QEMU_CFLAGS $local_cflags= -c -o $TMPO $TMPC @@ -2362,38 +2339,6 @@ fi ####################################### # generate config-host.mak =20 -# Check that the C++ compiler exists and works with the C compiler. -# All the QEMU_CXXFLAGS are based on QEMU_CFLAGS. Keep this at the end to = don't miss any other that could be added. -if has $cxx; then - cat > $TMPC < $TMPCXX <> $config_host_mak echo "NINJA=3D$ninja" >> $config_host_mak echo "CC=3D$cc" >> $config_host_mak echo "QEMU_CFLAGS=3D$QEMU_CFLAGS" >> $config_host_mak -echo "QEMU_CXXFLAGS=3D$QEMU_CXXFLAGS" >> $config_host_mak echo "QEMU_OBJCFLAGS=3D$QEMU_OBJCFLAGS" >> $config_host_mak echo "GLIB_CFLAGS=3D$glib_cflags" >> $config_host_mak echo "GLIB_LIBS=3D$glib_libs" >> $config_host_mak @@ -2665,7 +2609,6 @@ if test "$skip_meson" =3D no; then echo "${a}-softmmu =3D '$c'" >> $cross done =20 - test -z "$cxx" && echo "link_language =3D 'c'" >> $cross echo "[built-in options]" >> $cross echo "c_args =3D [$(meson_quote $CFLAGS $EXTRA_CFLAGS)]" >> $cross echo "cpp_args =3D [$(meson_quote $CXXFLAGS $EXTRA_CXXFLAGS)]" >> $cross diff --git a/meson.build b/meson.build index 48533ace7b..a1b265b133 100644 --- a/meson.build +++ b/meson.build @@ -180,7 +180,6 @@ endif ################## =20 qemu_cflags =3D config_host['QEMU_CFLAGS'].split() -qemu_cxxflags =3D config_host['QEMU_CXXFLAGS'].split() qemu_objcflags =3D config_host['QEMU_OBJCFLAGS'].split() qemu_ldflags =3D config_host['QEMU_LDFLAGS'].split() =20 @@ -194,7 +193,6 @@ endif =20 if get_option('gprof') qemu_cflags +=3D ['-p'] - qemu_cxxflags +=3D ['-p'] qemu_objcflags +=3D ['-p'] qemu_ldflags +=3D ['-p'] endif @@ -240,8 +238,33 @@ if get_option('fuzzing') endif =20 add_global_arguments(qemu_cflags, native: false, language: ['c']) -add_global_arguments(qemu_cxxflags, native: false, language: ['cpp']) add_global_arguments(qemu_objcflags, native: false, language: ['objc']) + +# Check that the C++ compiler exists and works with the C compiler. +link_language =3D 'c' +linker =3D cc +qemu_cxxflags =3D [] +if add_languages('cpp', required: false, native: false) + cxx =3D meson.get_compiler('cpp') + add_global_arguments(['-D__STDC_LIMIT_MACROS', '-D__STDC_CONSTANT_MACROS= ', '-D__STDC_FORMAT_MACROS'], + native: false, language: 'cpp') + foreach k: qemu_cflags + if k not in ['-Wstrict-prototypes', '-Wmissing-prototypes', '-Wnested-= externs', + '-Wold-style-declaration', '-Wold-style-definition', '-Wr= edundant-decls'] + qemu_cxxflags +=3D [k] + endif + endforeach + add_global_arguments(qemu_cxxflags, native: false, language: 'cpp') + + if cxx.links(files('scripts/main.c'), args: qemu_cflags) + link_language =3D 'cpp' + linker =3D cxx + else + message('C++ compiler does not work with C compiler') + message('Disabling C++-specific optional code') + endif +endif + add_global_link_arguments(qemu_ldflags, native: false, language: ['c', 'cp= p', 'objc']) =20 if targetos =3D=3D 'linux' @@ -255,14 +278,6 @@ add_project_arguments('-iquote', '.', '-iquote', meson.current_source_dir() / 'include', language: ['c', 'cpp', 'objc']) =20 -link_language =3D meson.get_external_property('link_language', 'cpp') -if link_language =3D=3D 'cpp' - add_languages('cpp', required: true, native: false) - cxx =3D meson.get_compiler('cpp') - linker =3D cxx -else - linker =3D cc -endif if host_machine.system() =3D=3D 'darwin' add_languages('objc', required: false, native: false) endif diff --git a/scripts/main.c b/scripts/main.c new file mode 100644 index 0000000000..b552c8e4ed --- /dev/null +++ b/scripts/main.c @@ -0,0 +1 @@ +int main(void) {} --=20 2.37.3 From nobody Fri May 3 09:35:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1664472645; cv=none; d=zohomail.com; s=zohoarc; b=JeFFl0CvWMCFSKEpXsc8I7/pqg5/Iw6bpolvVv+FNEB3AY8r3OVfuSVCQMm+5DHdkmUWSq/b7S066Jm3z2N/eFqloKPTmps8FIZWeMn2iG9Jem5QOnQD0QeHIro54wdTijIcCrTWn9wtgArzbzKw1dC5CVWyBdBFxg3YP9LiGAE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664472645; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xXxWqtCuAF+FsHQxb4jKS3YZKYzYr+qDiDGVxpCRZYs=; b=Iq48DY4hzqIeTC4ZZ64UwVmK9bTPMM7F+v6ISeO9WwSyZBqUgmDrIkNWaQyxzsCmOYBhx/kLQq5xJr/mEVsx7un5mIbtW6u1WBPvSARjjK3prx8UuoHu1UVcEPu9FS7RKVEp5lPI5k+eJjcjDIw4BcyQOQQu5yO0oGepbSRbQUw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664472645723875.5154200996674; Thu, 29 Sep 2022 10:30:45 -0700 (PDT) Received: from localhost ([::1]:36636 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odxMy-00046F-7c for importer@patchew.org; Thu, 29 Sep 2022 13:30:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41318) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwR6-0003mk-TX for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:30:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:50074) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwR5-000389-C0 for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:30:56 -0400 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.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-187-xW5nPv98N4aSApHtBQgicQ-1; Thu, 29 Sep 2022 12:30:52 -0400 Received: by mail-ej1-f71.google.com with SMTP id sb34-20020a1709076da200b00783a5f786easo969924ejc.22 for ; Thu, 29 Sep 2022 09:30:52 -0700 (PDT) Received: from avogadro.local ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id f7-20020a17090631c700b007803083a36asm4149159ejf.115.2022.09.29.09.30.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 09:30:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664469054; 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=xXxWqtCuAF+FsHQxb4jKS3YZKYzYr+qDiDGVxpCRZYs=; b=W7r02gTUccEpgG4arNVmm8Tm+uZoh8WyJrvYeqKbi5XpImK2UJDBg0qNhfyj26DOJBDdDu xT98HVF8IyblqtWdHzJWejtRgvKuZlFdDwUvJB71s122WOH8m+8q312rC3Amu9+suDju1F haYWO3ih6U5hh7fKX/nRa0dAc9l+hmg= X-MC-Unique: xW5nPv98N4aSApHtBQgicQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=xXxWqtCuAF+FsHQxb4jKS3YZKYzYr+qDiDGVxpCRZYs=; b=2EkuNZryQpvbyv/YoaXh9dk/U3bcRQAMe/42YX6tvzfzWOY7RqWxQ6iWiKXVmyR5gF SK7Xztp5caJQ+/ygq/QmOBlOcZcFGW07Ejk4cwT9ADaIfgGfDGSrxL6O2XfKMeEzk8AO DN5ioBmuRHDzFQgH9SchFZoVGyShF9sUUwy3lYVLnl22oTKdJnnrcJRz3JRw1sM01klw KNCNK4YIq3wc7HVN8NidniYvSjTWF+dDj65XRSK/qJASoc1LxbIzNF6WtTc+BJMX0zxX OY8OSzozYsFhen6n6mSmmE3/IiuEC/jBWVP2o0Hkj0tZrWipyfEPHwRGxciO4/N25YDK fl5A== X-Gm-Message-State: ACrzQf23yJ/pfMSYHOy6P73lHeQ5xJ735n87NkdsAaIZI4vMSH6fFttJ zk/gOp+V9cFujSsNWsY2xnYAY22F822HMWHtqIbf1Xt0xoU5YRT/4QXXznZ89P+/RyjiehdvGFI lDQTgn1scAkQvFK43uQhmOUddzQfG5p7P511yoPt+BAD4pLHde3qVPAtScEmgoJo+Fs0= X-Received: by 2002:a17:906:8a4a:b0:781:70ab:e7cb with SMTP id gx10-20020a1709068a4a00b0078170abe7cbmr3309099ejc.492.1664469050787; Thu, 29 Sep 2022 09:30:50 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4Bds7YivMfkbnNm4qWAiZ9pAriQOS3UGuBHyLPW4z0By1eqwXXOTmQQLK7SIiBJLgJgzq7cA== X-Received: by 2002:a17:906:8a4a:b0:781:70ab:e7cb with SMTP id gx10-20020a1709068a4a00b0078170abe7cbmr3309082ejc.492.1664469050435; Thu, 29 Sep 2022 09:30:50 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 12/14] configure, meson: move linker flag detection to meson Date: Thu, 29 Sep 2022 18:30:12 +0200 Message-Id: <20220929163014.16950-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220929163014.16950-1-pbonzini@redhat.com> References: <20220929163014.16950-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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.08, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PP_MIME_FAKE_ASCII_TEXT=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664472646383100001 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- configure | 16 ---------------- meson.build | 13 +++++++++++++ 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/configure b/configure index 3e3c0f36c9..e032bd0a08 100755 --- a/configure +++ b/configure @@ -1342,12 +1342,10 @@ EOF if test "$static" =3D "yes"; then if test "$pie" !=3D "no" && compile_prog "-Werror -fPIE -DPIE" "-static-= pie"; then CONFIGURE_CFLAGS=3D"-fPIE -DPIE $CONFIGURE_CFLAGS" - QEMU_LDFLAGS=3D"-static-pie $QEMU_LDFLAGS" pie=3D"yes" elif test "$pie" =3D "yes"; then error_exit "-static-pie not available due to missing toolchain support" else - QEMU_LDFLAGS=3D"-static $QEMU_LDFLAGS" pie=3D"no" fi elif test "$pie" =3D "no"; then @@ -1369,12 +1367,6 @@ else pie=3D"no" fi =20 -# Detect support for PT_GNU_RELRO + DT_BIND_NOW. -# The combination is known as "full relro", because .got.plt is read-only = too. -if compile_prog "" "-Wl,-z,relro -Wl,-z,now" ; then - QEMU_LDFLAGS=3D"-Wl,-z,relro -Wl,-z,now $QEMU_LDFLAGS" -fi - ########################################## # __sync_fetch_and_and requires at least -march=3Di486. Many toolchains # use i686 as default anyway, but for those that don't, an explicit @@ -2242,14 +2234,6 @@ if test "$have_ubsan" =3D "yes"; then fi =20 ########################################## - -# Exclude --warn-common with TSan to suppress warnings from the TSan libra= ries. -if test "$solaris" =3D "no" && test "$tsan" =3D "no"; then - if $ld --version 2>/dev/null | grep "GNU ld" >/dev/null 2>/dev/null ; = then - QEMU_LDFLAGS=3D"-Wl,--warn-common $QEMU_LDFLAGS" - fi -fi - # Guest agent Windows MSI package =20 if test "$QEMU_GA_MANUFACTURER" =3D ""; then diff --git a/meson.build b/meson.build index a1b265b133..f6962834a3 100644 --- a/meson.build +++ b/meson.build @@ -183,6 +183,14 @@ qemu_cflags =3D config_host['QEMU_CFLAGS'].split() qemu_objcflags =3D config_host['QEMU_OBJCFLAGS'].split() qemu_ldflags =3D config_host['QEMU_LDFLAGS'].split() =20 +if enable_static + qemu_ldflags +=3D get_option('b_pie') ? '-static-pie' : '-static' +endif + +# Detect support for PT_GNU_RELRO + DT_BIND_NOW. +# The combination is known as "full relro", because .got.plt is read-only = too. +qemu_ldflags +=3D cc.get_supported_link_arguments('-Wl,-z,relro', '-Wl,-z,= now') + if targetos =3D=3D 'windows' qemu_ldflags +=3D cc.get_supported_link_arguments('-Wl,--no-seh', '-Wl,-= -nxcompat') # Disable ASLR for debug builds to allow debugging with gdb @@ -265,6 +273,11 @@ if add_languages('cpp', required: false, native: false) endif endif =20 +# Exclude --warn-common with TSan to suppress warnings from the TSan libra= ries. +if targetos !=3D 'sunos' and not config_host.has_key('CONFIG_TSAN') + qemu_ldflags +=3D linker.get_supported_link_arguments('-Wl,--warn-common= ') +endif + add_global_link_arguments(qemu_ldflags, native: false, language: ['c', 'cp= p', 'objc']) =20 if targetos =3D=3D 'linux' --=20 2.37.3 From nobody Fri May 3 09:35:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1664471787; cv=none; d=zohomail.com; s=zohoarc; b=fPbcynPXCGwk9U6J0p3U1Yfcwhju6fBrylj71x+TKKEQzzL8Be2IDfj/CUxmLmRLH6UwYTVjWCI7Pm0rrK4aElf4YGtzAmX1ywT3AWm4ztnfplgGqumxeYIo9p2hQVxzitN90JGzr8eBvItivV4/0y5pjBZbKMK7LNQMMQA5Bd0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664471787; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TxT5Mw8r3lduhbysVF+py45W71A3byvjHK4jNnbC6vo=; b=PeaCNX9RRpx+67jUkRnEmzmcEJqL44LzKxR5BfAk3Igo36Tb9IZBmYAfOmECJ3rZmIElI60rP0ljAvC0KLlVe6itPAhDgdExufQYwnB2WRGIDik967CkTLXGgRrBgPk5CsOknDBE187wehS7nwEt3m8y0fWF0sXgtB/XgRZ+mg4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1664471787526815.2566865904962; Thu, 29 Sep 2022 10:16:27 -0700 (PDT) Received: from localhost ([::1]:45764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odx97-0000LX-T7 for importer@patchew.org; Thu, 29 Sep 2022 13:16:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwR9-0003oz-Gr for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:30:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:21408) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwR7-00038T-VW for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:30:59 -0400 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.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-605-r6pQKZfKNveB2sw4uAzU2g-1; Thu, 29 Sep 2022 12:30:54 -0400 Received: by mail-ed1-f71.google.com with SMTP id y9-20020a056402270900b00451dfbbc9b2so1649484edd.12 for ; Thu, 29 Sep 2022 09:30:54 -0700 (PDT) Received: from avogadro.local ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id j5-20020aa7de85000000b00455262f83aasm5719102edv.32.2022.09.29.09.30.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 09:30:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664469057; 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=TxT5Mw8r3lduhbysVF+py45W71A3byvjHK4jNnbC6vo=; b=ND5F+jWxmqNURAK62coPnaVjs5je9qFxw2uegNJ3d487DsaJw2yfEXWbgWfBbXN+9UCZbX pGc2uQa7eSEsnCjnsvliGN//nlsnNFnDEnVvOBMxo6CGqgghOVn0NnB2aHsc6CVnq2aGbv KOrl0QFR9VNo4F+5uXwNJOLvl10OBtQ= X-MC-Unique: r6pQKZfKNveB2sw4uAzU2g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=TxT5Mw8r3lduhbysVF+py45W71A3byvjHK4jNnbC6vo=; b=Emu87g/KSwMXBypDaRmNt/h6p0qjvz92mZq68lVai+7+wCvn4s0LA3rKuQYFEC97pj P9zFkwm490LtkfBHY7NA07UH0lJeogm3Qg00PwUVDD/EIGvkxv0PPIHAhL9G4QLNJj3Q TyhuO9hr/P9O92CrdlHkpGK3shIVLy+I68nhDDHQF34RDIIocP6OHECKHyze39HSEDKM 5aKcrmN61Z2IjaK8Aaq3LCziGzhymtahPXBgovnQyJbG+uGvyI62Kpyz7bmsWAAwJPeE VuLLIQRa9shWS7ebSE8vXMOP/g8Ib/K0bMGhJOc/ns7h+U3ZmpPAA58Nud2/KJ5Qd5nn ySxg== X-Gm-Message-State: ACrzQf2kWfqwFSBh6lwVt0FZW/1jTdJqNDeujNAOb6GR2ASqFXbAyUR7 GjLWPOyDAa64OZUb35g3W7ELKBrKnKOE3T4C6KoO6flvcKOoL84yL7gMXx9aKE3TvYA4VW9ncXF nVtBIvciy/MxaGz6XlDeEqn8pI6NdNkk8Lch7uVIdHbpGHq149eF1qssWEa5AdZ17Kw8= X-Received: by 2002:a17:907:8688:b0:782:6637:e8dc with SMTP id qa8-20020a170907868800b007826637e8dcmr3517455ejc.174.1664469053334; Thu, 29 Sep 2022 09:30:53 -0700 (PDT) X-Google-Smtp-Source: AMsMyM42OTmo8CQt3z0pTKDO4eDAD1czi1br3ZUddBCYKTBkTA1/cRMoDF1CICNRqNmMngwc2u5ysQ== X-Received: by 2002:a17:907:8688:b0:782:6637:e8dc with SMTP id qa8-20020a170907868800b007826637e8dcmr3517436ejc.174.1664469053048; Thu, 29 Sep 2022 09:30:53 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Ray Zhang Subject: [PULL 13/14] target/i386/kvm: fix kvmclock_current_nsec: Assertion `time.tsc_timestamp <= migration_tsc' failed Date: Thu, 29 Sep 2022 18:30:13 +0200 Message-Id: <20220929163014.16950-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220929163014.16950-1-pbonzini@redhat.com> References: <20220929163014.16950-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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.08, 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 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664471789379100001 Content-Type: text/plain; charset="utf-8" From: Ray Zhang New KVM_CLOCK flags were added in the kernel.(c68dc1b577eabd5605c6c7c08f3e0= 7ae18d30d5d) ``` + #define KVM_CLOCK_VALID_FLAGS \ + (KVM_CLOCK_TSC_STABLE | KVM_CLOCK_REALTIME | KVM_CLOCK_HOST_TSC) case KVM_CAP_ADJUST_CLOCK: - r =3D KVM_CLOCK_TSC_STABLE; + r =3D KVM_CLOCK_VALID_FLAGS; ``` kvm_has_adjust_clock_stable needs to handle additional flags, so that s->clock_is_reliable can be true and kvmclock_current_nsec doesn't = need to be called. Signed-off-by: Ray Zhang Message-Id: <20220922100523.2362205-1-zhanglei002@gmail.com> Signed-off-by: Paolo Bonzini --- target/i386/kvm/kvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index a1fd1f5379..9eeee91c2f 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -157,7 +157,7 @@ bool kvm_has_adjust_clock_stable(void) { int ret =3D kvm_check_extension(kvm_state, KVM_CAP_ADJUST_CLOCK); =20 - return (ret =3D=3D KVM_CLOCK_TSC_STABLE); + return (ret & KVM_CLOCK_TSC_STABLE); } =20 bool kvm_has_adjust_clock(void) --=20 2.37.3 From nobody Fri May 3 09:35:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1664475283; cv=none; d=zohomail.com; s=zohoarc; b=hyTpMWd/l+zoI8NF4sr5VUqE4WFSVPuGTOpctaw4aQte+hlD4qKUrebaufuJ/8P160B/BjWnRRxqTqQKcnROljWi05N3JVO2k0YQyvl79I5bbQhLn88Al2RyN68IU5uLwU0j2IZAtFEihGQzfM+sSuEUF3uhLdDx/eE+nPIhx7s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1664475283; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Blv0482qqGw+iiQWg7x334l3dt4qxtymalbZQfpg5Dg=; b=IAj6Y1v5lKordo7qav1poXzPWboAD+cXsMs1zfnoLV7/5qH/tPMpUuwwp7riSrcMDlU8Z8dgJZTtkitkCUGt48usvMsxDHFMwA4fJ+3fTKtwHCtM7re6G2FxBN1I8db7HPTXy7sgZauDUzVG2aVfGVpRvd8L0ZKmQSCO5MX56s8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 166447528347949.65833687094096; Thu, 29 Sep 2022 11:14:43 -0700 (PDT) Received: from localhost ([::1]:60538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ody3U-00023B-Qp for importer@patchew.org; Thu, 29 Sep 2022 14:14:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwRB-0003vM-IW for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:31:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:30830) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1odwR9-00038l-VP for qemu-devel@nongnu.org; Thu, 29 Sep 2022 12:31:01 -0400 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-574-zz-30kF-NT6-9umGUqOpUA-1; Thu, 29 Sep 2022 12:30:57 -0400 Received: by mail-ej1-f70.google.com with SMTP id he8-20020a1709073d8800b007838dd153f4so955691ejc.12 for ; Thu, 29 Sep 2022 09:30:57 -0700 (PDT) Received: from avogadro.local ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id cn25-20020a0564020cb900b00443d657d8a4sm5666506edb.61.2022.09.29.09.30.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 09:30:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664469059; 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=Blv0482qqGw+iiQWg7x334l3dt4qxtymalbZQfpg5Dg=; b=PYICEBp5RJKZ01nfd/TfOoSzGhSIlftwCrjrWvMDhUTUYMBqVi9xn7GsoNYeh+xaeoRHy4 OEaUuePkA2W5iMdn4qRJm9P58FOgfCxF+Pompt0q7ehnr6URY7Y1P+IuaSFberO3bo62pe wWFpAoKYrvYBmqJ9If58FVCDVmp5P0E= X-MC-Unique: zz-30kF-NT6-9umGUqOpUA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=Blv0482qqGw+iiQWg7x334l3dt4qxtymalbZQfpg5Dg=; b=c4YhbUPrkYEF9GUG2y9jQCtS0I3goewQGDq9ae4svPcc+ClRfzGhSRlHAOJYzsseiI RuGAi2w2gggIcX9xin3guSGyETeRUoqSqZA9h4hMjnCEfsuyw3whAlLeRv6+8zGGW9z2 YL2JsMdQPBkVRrND7iYVzIgFmKm6xNy2PMrTnPwkJmOh9MvDgsewSreGkLLVivEsWJxl zJZJYPI+8KyCpt+G5ycgZZnqrEN77HIqd3sgGXyZf0CawqBJhovSHdza7nvZgNsZ0wCA YA7WzCZ3KNxRlD3MjsML2k1Rvl3w4oV7yTIjA1c8n8TbMb9kGyjvrLffJyDSLhVi5wDt vKSQ== X-Gm-Message-State: ACrzQf2GlDZ2TUuuBfxXDrvVAfVSmZ3zExroxUAsBl1P2DepCQC57DT+ dSNewrvXS9Cyq4CEGYi9xU9aWR5iiG66VEWcub8OZF9k3oaPbVwu0VeEa2XmF/Gm9Z12k9rv9k5 9XYo8Yr1joAcp/a4rTs+J9iesbRWWVRVkxj1XpSUzLw/fR6/C0zKmA10wDlS0rVZD97o= X-Received: by 2002:a17:907:7284:b0:783:ca4d:1c49 with SMTP id dt4-20020a170907728400b00783ca4d1c49mr3388763ejc.618.1664469056165; Thu, 29 Sep 2022 09:30:56 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5bTVFSZMEnfDMwHT5hA4kF5AQdBwS/GhB35bFllOVjE8Hixvz4HFlQCAVOG6HtRbGYlEFadw== X-Received: by 2002:a17:907:7284:b0:783:ca4d:1c49 with SMTP id dt4-20020a170907728400b00783ca4d1c49mr3388742ejc.618.1664469055893; Thu, 29 Sep 2022 09:30:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: "Jason A. Donenfeld" Subject: [PULL 14/14] x86: re-initialize RNG seed when selecting kernel Date: Thu, 29 Sep 2022 18:30:14 +0200 Message-Id: <20220929163014.16950-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220929163014.16950-1-pbonzini@redhat.com> References: <20220929163014.16950-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=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.08, 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 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1664475283938100001 Content-Type: text/plain; charset="utf-8" From: "Jason A. Donenfeld" We don't want it to be possible to re-read the RNG seed after ingesting it, because this ruins forward secrecy. Currently, however, the setup data section can just be re-read. Since the kernel is always read after the setup data, use the selection of the kernel as a trigger to re-initialize the RNG seed, just like we do on reboot, to preserve forward secrecy. Cc: Paolo Bonzini Signed-off-by: Jason A. Donenfeld Message-Id: <20220922152847.3670513-1-Jason@zx2c4.com> Signed-off-by: Paolo Bonzini --- hw/i386/x86.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/i386/x86.c b/hw/i386/x86.c index f9a4ddaa4a..1148f70c03 100644 --- a/hw/i386/x86.c +++ b/hw/i386/x86.c @@ -1112,11 +1112,14 @@ void x86_load_linux(X86MachineState *x86ms, setup_data->len =3D cpu_to_le32(RNG_SEED_LENGTH); qemu_guest_getrandom_nofail(setup_data->data, RNG_SEED_LENGTH); qemu_register_reset(reset_rng_seed, setup_data); + fw_cfg_add_bytes_callback(fw_cfg, FW_CFG_KERNEL_DATA, reset_rng_se= ed, NULL, + setup_data, kernel, kernel_size, true); + } else { + fw_cfg_add_bytes(fw_cfg, FW_CFG_KERNEL_DATA, kernel, kernel_size); } =20 fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_ADDR, prot_addr); fw_cfg_add_i32(fw_cfg, FW_CFG_KERNEL_SIZE, kernel_size); - fw_cfg_add_bytes(fw_cfg, FW_CFG_KERNEL_DATA, kernel, kernel_size); sev_load_ctx.kernel_data =3D (char *)kernel; sev_load_ctx.kernel_size =3D kernel_size; =20 --=20 2.37.3