From patchwork Fri Mar 1 18:59:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1906871 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=pd74+PDh; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Tmcqf4qn8z23qd for ; Sat, 2 Mar 2024 06:00:46 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rg86p-0007NP-8P; Fri, 01 Mar 2024 13:59:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rg86n-0007Mu-PD for qemu-devel@nongnu.org; Fri, 01 Mar 2024 13:59:49 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rg86m-0004Ku-8X for qemu-devel@nongnu.org; Fri, 01 Mar 2024 13:59:49 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-412cda08022so2742685e9.2 for ; Fri, 01 Mar 2024 10:59:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709319586; x=1709924386; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BtfJTO9TdCzL5i6d7LjIfwE/FV4OnWItChimAYUDyq8=; b=pd74+PDhBwRykPDzoMQjve0GsXlz7jkEV+eHlzjYx1nBB1vBN/f1LHAdHdaB6Oaze7 V/FHcIOTmNzFJDHm28895Wv4fiN6TFlczxxib6RPa9JjtwTOjd3DVof1nV4gW3fhyDtg v6t3O+yCqL1xfiM/e7cidMlkJsY+94JrfyPOrrk/j4R/PdqZkiTfqVD7Vy7v6kocLc+N sxozAeCLRhbFhQfyUTRpgrn4iz1V7KlfFeSGP0Adykj5r8CXkpnBjRwgab7LmGJ7SGa9 hO2wz/JIwpqNAy/7ejxKBq8hZFiuM5UzYHNra2SJKnSZvsJM/TUXaPHe4okJx6qbZL9d mZbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709319586; x=1709924386; 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:message-id:reply-to; bh=BtfJTO9TdCzL5i6d7LjIfwE/FV4OnWItChimAYUDyq8=; b=fHBem9Khz8160vIMGovcIOTT7nBWUXQxKukGKqRDhpCFzXHqR2UGFAVncz/LevdECK 75yvmB6G/d3y3B0TCwcnYH9kgKZqEATlDOVxusdIN9tatD1KcQvbXV+pNxxpQ96eHOT/ bv5VLvM116Z8pZepoado5Gyl9i6jCx2NIoCcMw3ldBlacgdqwmZ3MOcHqwysGRZfCiXw fP5fOG2LtnGlPK3Zkm57AFBL18P8kF4lq8S4VzMt76tGWn5PBKn7rfSVjXYqcVdkvpul iEhevjjkxHrrg0PcpvQsYVwcDbs7kkAcvEE8QQNQdNE8u/2srhDfb6CF+S2GTtUXpQ8D FodQ== X-Gm-Message-State: AOJu0YyZCuE52Kw6cf2z7b55dsqUVcim/Vm6KzmuSHGMz6eeulhP/zCN RbgFLqaoSlaoZvKEsfk+LY28RAMQWZTDLSA7uTW4TLFtVv1PYM88a9e3yqiSLq0DboRb1d4+hW4 GtNa6ZA== X-Google-Smtp-Source: AGHT+IFEUub7geG0ha7OxaS3A67neNZZ/2YR79NIdWDyKHQh9hyYlQg6wJNIxlmEy5miz7USjjOGRw== X-Received: by 2002:a5d:6a08:0:b0:33e:fd3:8f4c with SMTP id m8-20020a5d6a08000000b0033e0fd38f4cmr2012508wru.1.1709319586405; Fri, 01 Mar 2024 10:59:46 -0800 (PST) Received: from m1x-phil.lan ([176.187.210.84]) by smtp.gmail.com with ESMTPSA id m17-20020a056000009100b0033e17341ebesm3737235wrx.117.2024.03.01.10.59.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 01 Mar 2024 10:59:46 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bernhard Beschow , Eduardo Habkost , "Michael S. Tsirkin" , Richard Henderson , Marcel Apfelbaum , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 1/4] hw/i386/pc: Remove pc_compat_1_4..1.7[] left over declarations Date: Fri, 1 Mar 2024 19:59:33 +0100 Message-ID: <20240301185936.95175-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240301185936.95175-1-philmd@linaro.org> References: <20240301185936.95175-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org These definitions were removed in commit ea985d235b ("pc_piix: remove pc-i440fx-1.4 up to pc-i440fx-1.7"). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- include/hw/i386/pc.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 5065590281..b958023187 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -288,18 +288,6 @@ extern const size_t pc_compat_2_1_len; extern GlobalProperty pc_compat_2_0[]; extern const size_t pc_compat_2_0_len; -extern GlobalProperty pc_compat_1_7[]; -extern const size_t pc_compat_1_7_len; - -extern GlobalProperty pc_compat_1_6[]; -extern const size_t pc_compat_1_6_len; - -extern GlobalProperty pc_compat_1_5[]; -extern const size_t pc_compat_1_5_len; - -extern GlobalProperty pc_compat_1_4[]; -extern const size_t pc_compat_1_4_len; - #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \ static void pc_machine_##suffix##_class_init(ObjectClass *oc, void *data) \ { \ From patchwork Fri Mar 1 18:59:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1906872 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=WqYLV6gd; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Tmcqp27K6z23q3 for ; Sat, 2 Mar 2024 06:00:54 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rg86v-0007VZ-OZ; Fri, 01 Mar 2024 13:59:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rg86u-0007UT-26 for qemu-devel@nongnu.org; Fri, 01 Mar 2024 13:59:56 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rg86s-0004L6-JI for qemu-devel@nongnu.org; Fri, 01 Mar 2024 13:59:55 -0500 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-412c780464dso7503865e9.0 for ; Fri, 01 Mar 2024 10:59:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709319593; x=1709924393; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rt0/+i2C3VmFBjnLzoqxPp8QQxKL3HX9E43/9vQY3SM=; b=WqYLV6gdGU2zcNc6Dt4ee/o59z0oZDrNV7Y0k7CMgNmstLdOWityJrvrwCeAJ8vQ3N FZwEXag8vDF1e5EeKwfUy0uZZggKnHFDj+HntSjrAcWV8N97Rw2ShJugyiukyBunvfYo L6wZYCpotuRturtV4bPlXtiy1GX6yTbkrbyO4abo0W74BthqjW0EDGD5MS+jGlKgAwCh 7lh9950/sQsCHDa4/YloEL1FTOotH7yPU+pBtAHyAS8uFdzazle/8hAxIVNLKNVWztmo d04PjsR2WR2oBQ5fXkRUUGCU+ahX6aeyCefcHu+BLuHO2jqhxV8Rf/AibICNy9+oX6NH K1Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709319593; x=1709924393; 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:message-id:reply-to; bh=rt0/+i2C3VmFBjnLzoqxPp8QQxKL3HX9E43/9vQY3SM=; b=DMien0SgipfHR9OlalTCr4FTUGNU3AXR4DUzDLXfl/3wtzqT3lZy+/NgnkwgjlD9b1 RCZIjJnYEnoD9WzX1a+sy5v8e8qmi5LWzffRVc+fHXvHu673setmea/o4NJzotO1c8oK /1qBcKdxPvdcauyqBMCaFzPq7O1bwvg6RCTOvL1wyiT3YsGP5ULh4piVXjdGbYxODpvU XmH5P3qglmBRG9d1acL3fx8j3/BqDqGbydTL/1/dC40ebYwsxAcbeRGk9q9mqk3H4/ch 31Wn0VPGMfbrK3/IR4OXLKqGFTwioM70BBa34hISmXd6+PvnTPQUFRRGiSFDLbk7arU7 ZMCg== X-Gm-Message-State: AOJu0Yyfzrq0mDdzGFuW3v0GSNl8BqOAIJ6FKVF67rrXxYplHSYRHynJ WNySW/JHaATxCaos75bvqBGWAfOZyFYzj+DcFDqEEbg+op6caQST+aFNpuaPCU5Br87Y34JO1Np f+hJs2w== X-Google-Smtp-Source: AGHT+IGvaXDi+W8Dat1kgEcLY0xbWi9HVkLMzqqxhq6aWQJHJu3OYubjGDM0osbVBEy7S2Z3nPgiwA== X-Received: by 2002:a05:600c:350a:b0:412:cb58:6b20 with SMTP id h10-20020a05600c350a00b00412cb586b20mr1079044wmq.7.1709319592896; Fri, 01 Mar 2024 10:59:52 -0800 (PST) Received: from m1x-phil.lan ([176.187.210.84]) by smtp.gmail.com with ESMTPSA id dx14-20020a05600c63ce00b004129f28e2cdsm9185881wmb.3.2024.03.01.10.59.51 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 01 Mar 2024 10:59:52 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bernhard Beschow , Eduardo Habkost , "Michael S. Tsirkin" , Richard Henderson , Marcel Apfelbaum , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 2/4] hw/i386/pc: Use generated NotifyVmexitOption_str() Date: Fri, 1 Mar 2024 19:59:34 +0100 Message-ID: <20240301185936.95175-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240301185936.95175-1-philmd@linaro.org> References: <20240301185936.95175-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org NotifyVmexitOption_str() is QAPI-generated in "qapi/qapi-types-run-state.h", which "sysemu/runstate.h" already includes. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- hw/i386/pc_piix.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index ce6aad758d..0e688ed655 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -60,6 +60,7 @@ #include "hw/xen/xen.h" #include "migration/global_state.h" #include "migration/misc.h" +#include "sysemu/runstate.h" #include "sysemu/numa.h" #include "hw/hyperv/vmbus-bridge.h" #include "hw/mem/nvdimm.h" @@ -382,9 +383,6 @@ static const QEnumLookup PCSouthBridgeOption_lookup = { .size = PC_SOUTH_BRIDGE_OPTION_MAX }; -#define NotifyVmexitOption_str(val) \ - qapi_enum_lookup(&NotifyVmexitOption_lookup, (val)) - static int pc_get_south_bridge(Object *obj, Error **errp) { PCMachineState *pcms = PC_MACHINE(obj); From patchwork Fri Mar 1 18:59:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1906869 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=nyX6ydOp; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Tmcqd6wHQz23q3 for ; Sat, 2 Mar 2024 06:00:45 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rg874-0007sB-AF; Fri, 01 Mar 2024 14:00:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rg872-0007ot-ON for qemu-devel@nongnu.org; Fri, 01 Mar 2024 14:00:04 -0500 Received: from mail-lj1-x229.google.com ([2a00:1450:4864:20::229]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rg870-0004Mo-Va for qemu-devel@nongnu.org; Fri, 01 Mar 2024 14:00:04 -0500 Received: by mail-lj1-x229.google.com with SMTP id 38308e7fff4ca-2d33986dbc0so11814461fa.2 for ; Fri, 01 Mar 2024 11:00:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709319599; x=1709924399; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iHk7WDIhUQBXUG2yd5CNMJ5GMZ9MlTxW37cN4pEmRS8=; b=nyX6ydOpWAsKrfwS+YiBv3bFfKkXmQC0BK6m0O6GyabF5oYjxdrTh1ZWVWP3ycftV4 s4J1I1ieXouO2IPe2jhtN3WR5TAczgyqzJs2DueAG+YLXIJHaUUtnJXD2HhuBvs4vQRZ qUz0dTpP156szK2bPKwBj/KkCXDyJp1AcgZxfchA7c/jx1jBMjJO7NboyRmzDNVPRNkp SD2Lpsg98bnyafzD3g8SdZsIkA0yQTim0Em6wRXFGRZ6vmzGQpAEu/G6NMqgSlFQkipY aIUm45kBEchkRAi2jR98SVq+IQOtWEdZsQcC+2Ri1BXysxkgkNM93KiY1LchjRMJyqgY H7kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709319599; x=1709924399; 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:message-id:reply-to; bh=iHk7WDIhUQBXUG2yd5CNMJ5GMZ9MlTxW37cN4pEmRS8=; b=IIArCNGaYvisS2syknSKrFFo1fqR4u1U6sDj6/CiYXX0dMwkLzNm8VnuP3QSFT8EfV VQMN5abeWKBmjTLqXRXeBQbOIApGAXDa3JBj2GYglRyQGUoKABLqqdSFowjby0lMmkGL BSaLgCam22htpcwR3mtU0rg+FMNQhyT2YYyswkmCFXPSa3GsdmrrhMSm0f4A0isWLEm5 b0Y0xndgV505SyxlAe6iavAveWTXLvD9UVzBY2SZT+2DIlGrbJ6UVN2ebciMDg9ajZxL oa0aFpmRhe0GVJwdFL38Qv9I8KEqeMPxQFp2Ek9CYF5G1Gs1oMWq51nfmXMN2DDneIOv WVsA== X-Gm-Message-State: AOJu0YxWPxG8kPBZGwDX3XEv8NsbUIZTm1gyH5U0aU9l7f2VOvRR9Okj SUafUiNMZtEccksj2ycOoCrYd0bQNKh2XDgOHWVypF93wo7I3gGzykWP7SWcHiU6yGsaLZz8DB/ zHs0big== X-Google-Smtp-Source: AGHT+IE9oYaPfr6MP0MtVWVX1oDf7/jSmCNyUbc7UFarKxQlcbKamZ0d/PnPxtljZvcLfs53HF5FqA== X-Received: by 2002:a05:651c:1043:b0:2d2:a440:d704 with SMTP id x3-20020a05651c104300b002d2a440d704mr1824172ljm.24.1709319599194; Fri, 01 Mar 2024 10:59:59 -0800 (PST) Received: from m1x-phil.lan ([176.187.210.84]) by smtp.gmail.com with ESMTPSA id p39-20020a05600c1da700b00412d149ec79sm51068wms.5.2024.03.01.10.59.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 01 Mar 2024 10:59:58 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bernhard Beschow , Eduardo Habkost , "Michael S. Tsirkin" , Richard Henderson , Marcel Apfelbaum , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 3/4] hw/i386/pc: Remove 'host_type' argument from pc_init1() Date: Fri, 1 Mar 2024 19:59:35 +0100 Message-ID: <20240301185936.95175-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240301185936.95175-1-philmd@linaro.org> References: <20240301185936.95175-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::229; envelope-from=philmd@linaro.org; helo=mail-lj1-x229.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org All callers use host_type=TYPE_I440FX_PCI_HOST_BRIDGE. Directly use this definition within pc_init1(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- hw/i386/pc_piix.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 0e688ed655..400b1c1e15 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -100,8 +100,7 @@ static void piix_intx_routing_notifier_xen(PCIDevice *dev) } /* PC hardware initialisation */ -static void pc_init1(MachineState *machine, - const char *host_type, const char *pci_type) +static void pc_init1(MachineState *machine, const char *pci_type) { PCMachineState *pcms = PC_MACHINE(machine); PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms); @@ -193,7 +192,7 @@ static void pc_init1(MachineState *machine, memory_region_init(pci_memory, NULL, "pci", UINT64_MAX); rom_memory = pci_memory; - phb = OBJECT(qdev_new(host_type)); + phb = OBJECT(qdev_new(TYPE_I440FX_PCI_HOST_BRIDGE)); object_property_add_child(OBJECT(machine), "i440fx", phb); object_property_set_link(phb, PCI_HOST_PROP_RAM_MEM, OBJECT(ram_memory), &error_fatal); @@ -450,7 +449,7 @@ static void pc_compat_2_0_fn(MachineState *machine) #ifdef CONFIG_ISAPC static void pc_init_isa(MachineState *machine) { - pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, TYPE_I440FX_PCI_DEVICE); + pc_init1(machine, TYPE_I440FX_PCI_DEVICE); } #endif @@ -460,9 +459,7 @@ static void pc_xen_hvm_init_pci(MachineState *machine) const char *pci_type = xen_igd_gfx_pt_enabled() ? TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE : TYPE_I440FX_PCI_DEVICE; - pc_init1(machine, - TYPE_I440FX_PCI_HOST_BRIDGE, - pci_type); + pc_init1(machine, pci_type); } static void pc_xen_hvm_init(MachineState *machine) @@ -487,8 +484,7 @@ static void pc_xen_hvm_init(MachineState *machine) if (compat) { \ compat(machine); \ } \ - pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, \ - TYPE_I440FX_PCI_DEVICE); \ + pc_init1(machine, TYPE_I440FX_PCI_DEVICE); \ } \ DEFINE_PC_MACHINE(suffix, name, pc_init_##suffix, optionfn) From patchwork Fri Mar 1 18:59:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 1906873 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=MvAF5qYA; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Tmcqz25S3z23q3 for ; Sat, 2 Mar 2024 06:01:03 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rg87A-0007vz-53; Fri, 01 Mar 2024 14:00:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rg877-0007vQ-KR for qemu-devel@nongnu.org; Fri, 01 Mar 2024 14:00:09 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rg876-0004Z6-41 for qemu-devel@nongnu.org; Fri, 01 Mar 2024 14:00:09 -0500 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-412cb23625fso4369645e9.1 for ; Fri, 01 Mar 2024 11:00:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709319605; x=1709924405; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LnLg0GlDlx8BY5bqC0PJRd1qke0B9SIhpAt2ftapvRU=; b=MvAF5qYAfpApw60SfBfomJe+4cnnEgJx3jWq1fkrqupNN5ePuWaw7n2ZhVNlvAmatM d3fAZkyN+WQfhxC3KHJL1IA05LWwVEzz18DRJSb7THcUZZ4HQ/YeyHoykma7zIQc+Yy2 bneI6tC452hqvnqrDo2PIPUhyKgEw4M+b3LHDb3mn5liCQeNgGKr9tXD6mQ1a/4sopc9 rZ1/gKw0JVRCEHo5++pdRoTdEZhYWNmEKnUjxQtkqY+922ds2mhr8SbFuPqbc64KqHur ZxOhHweNp0ImeHyU2dyEF2ghj24/swzTQVf+McY3l19xrB+9PiAJFbsF7HaKjup1HoqY I8hQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709319605; x=1709924405; 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:message-id:reply-to; bh=LnLg0GlDlx8BY5bqC0PJRd1qke0B9SIhpAt2ftapvRU=; b=a24OMi4DXT3fCHWRsfjNhHP18u1Lih8DPAYA4LYz3jrx6new0dhxouUTz0wCyJQBrZ nzqRWimNg0kAt7V130EQYL+cEzV5n6FTvIpAD8r60LubYp1Lk332EYN8Fl3vkLAqQBjM sFLe5m6tisxnQwgP1zr+/ssDJnAGHn8Qk/sdU5qcmMDrgG1nCpZ2gUovad6VwoRUXfHQ QSrY+mTyt9sXqcyZjBAqRUCuro4/z1wIWckWGxSQbE+1qMap/51dhX7RwlApfqeg/cHL HOC0bXyjmsle5XgfwXiBJoQjd+C3zTJ34Db7/EXtvBJKyAJgqseKeduWwE0EQSX4kvVJ LzbQ== X-Gm-Message-State: AOJu0YzrOUN1vwDVPrpSmXWzaJ1/MQO+/9ZkH9I8PrnjZSYauxXxCqGN QDROUND0MPWQ6QmmG3sqIvS+0cuQQVl4QmcxvvtPqSDkeHVPBPF/WjuuLB2flZ3ObOeCG5prqGv UPWZ1+g== X-Google-Smtp-Source: AGHT+IH33H41lDOfST544btGajVoGmRRg7xrrsYQtc557NsKy2IH4+1lf6fVvZumzZ6qZ6kiRovElg== X-Received: by 2002:a05:600c:3645:b0:412:b30b:e47b with SMTP id y5-20020a05600c364500b00412b30be47bmr1754728wmq.27.1709319605315; Fri, 01 Mar 2024 11:00:05 -0800 (PST) Received: from m1x-phil.lan ([176.187.210.84]) by smtp.gmail.com with ESMTPSA id dx14-20020a05600c63ce00b004129f28e2cdsm9186404wmb.3.2024.03.01.11.00.03 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 01 Mar 2024 11:00:04 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bernhard Beschow , Eduardo Habkost , "Michael S. Tsirkin" , Richard Henderson , Marcel Apfelbaum , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 4/4] hw/i386/pc: Have pc_init_isa() pass a NULL pci_type argument Date: Fri, 1 Mar 2024 19:59:36 +0100 Message-ID: <20240301185936.95175-5-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240301185936.95175-1-philmd@linaro.org> References: <20240301185936.95175-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The "isapc" machine only provides an ISA bus, not a PCI one, and doesn't instanciate any i440FX south bridge. Its machine class defines PCMachineClass::pci_enabled = false, and pc_init1() only uses the pci_type argument when pci_enabled is true. Since for this machine the argument is not used, passing NULL makes more sense. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Bernhard Beschow --- hw/i386/pc_piix.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 400b1c1e15..fa5f93f99f 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -449,7 +449,7 @@ static void pc_compat_2_0_fn(MachineState *machine) #ifdef CONFIG_ISAPC static void pc_init_isa(MachineState *machine) { - pc_init1(machine, TYPE_I440FX_PCI_DEVICE); + pc_init1(machine, NULL); } #endif