From patchwork Fri Feb 23 15:41:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 775132 Delivered-To: patch@linaro.org Received: by 2002:adf:a356:0:b0:33b:4db1:f5b3 with SMTP id d22csp414605wrb; Fri, 23 Feb 2024 07:59:14 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVaFfJw1SRfmt6Rse9nKx9Obk2gAin6F97GlxgUom+nz/Yx6EZBY0YCrdQ5dbkzdhycuF7/5QF/vDzVbhAQef2o X-Google-Smtp-Source: AGHT+IEUkf8sP3Gr2uNGTxXosCI0lxgXMQDvJH8ajHfUkHl775hmKZh612oXzhgJlAxoQ0HZh6/M X-Received: by 2002:a05:6808:eca:b0:3c1:83fb:ee34 with SMTP id q10-20020a0568080eca00b003c183fbee34mr208801oiv.29.1708703953976; Fri, 23 Feb 2024 07:59:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708703953; cv=none; d=google.com; s=arc-20160816; b=r8rWXbu3cEKToDVuqNpuBIZUOvnUG36U8QNScRz2WpN9ttMjdqrXOoTnLPqrkqQIXh MJmHlKKkrirZ1xVnPLg/U0Jxx0+GT8zSMWix+FAcEAZ+GI024bmwOzJAyV6D3K7VpLHp Nub4UAqm/dYsVSwBmz+ieiU9KxNET9ITG5J5SfoOOk5GQgWeqyhDprdFoaleAIbckjYX Bb6/2apJBTxTWOly+fxblk32Gr+7Ro2W/lHr1AkiK+CgQOtL/t0603sDMujepiHb7rEe u87z3CS4GmV87VUityCDzljATATKH8QMwVlvMItsH6fp4ziNMc20sVkavFVCcV5ozuD2 h1NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=p/uWlpyLjbwpL//Tp94l/d17ZDvOpZ1Q/CQ+bpb2Coc=; fh=xQogT0MP6lBZBoeys7fE0427FH9vJOmdwnI1Wql3azk=; b=Eg5TBj5a2k1CPniRxP7g5iYkL5zhzM//SuzB5SUuaYAnYocDsLZBbbfy7h65R7l0/O iG0HS+vqxMN0ydCaaLD2tCr/kpuqwhYg14ljJ/xyz5Vm18JJS5EIMjMWb66XQ+rkK2uU O0ZIGTllwMDgO0Y6HwJdX8vT2U4KrOooruuTpuXeLb9649dTQrupOG4EJx8UM5zG0aN2 P4IeZQ62lbmgYssTUm7n/EC8s/hd2FwBLY8Cqf+04cnLjzKwCwUk6wykCnsX/ydgUCA/ uM7VmGxIImAGXyisESz2cuN9YCarhX2gxjslwXYmFpVI1vcxZp3pWrEAW6Db/5sj3rOG De/g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=afOiToqL; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r8-20020a05620a298800b00787b49630besi1280029qkp.60.2024.02.23.07.59.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Feb 2024 07:59:13 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=afOiToqL; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdXu8-0003hZ-9B; Fri, 23 Feb 2024 10:56:04 -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 1rdXiX-0005ZP-LH; Fri, 23 Feb 2024 10:44:05 -0500 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rdXiW-0006Ec-8M; Fri, 23 Feb 2024 10:44:05 -0500 Received: by mail-pg1-x52e.google.com with SMTP id 41be03b00d2f7-5ce07cf1e5dso433145a12.2; Fri, 23 Feb 2024 07:44:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708703042; x=1709307842; 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=p/uWlpyLjbwpL//Tp94l/d17ZDvOpZ1Q/CQ+bpb2Coc=; b=afOiToqLIVOb90o9gHQhTQWBrx/0eIzaxkpWR0C+q/UY3bvokGDx5XJycMrcY+iT/b pZJ+vkfoGa5qNfPMKlEOd05n6qEnhflFiLK2KN0hHNjW7YPT1cOGDBSUfIEmF6ZwXJO7 xDFIEnHnbwhUao1tHWDggoK/6RCyRy6wtb+XQjKNDCWNhKwqgJRKfcnu37+kdZsXGVF4 Ww5klY2l6SPwMD/N2YyPCjU5sklwbYIdBwX/eT3c+pWX87QRcjNmVz5mVrRv7W6h6XCs foFqnyWtPvlwtY0to+3GQDaghPsQ0wEw/FJRaeiL3Ozgqr0uPM3zxLTFYUCA3aA20m71 yN1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708703042; x=1709307842; 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=p/uWlpyLjbwpL//Tp94l/d17ZDvOpZ1Q/CQ+bpb2Coc=; b=mq2H6LbB6OJv16rFx0ncZG3DmV88cM1fJO6xbJGaig8BrnztQOPGxlIei1uMQLGTEO yNPIDEvQdGAT68cpc6xoQoqxFbxydfNeE44eZr9IxwiN7paD3sKbGYVgNBqpYUf+N689 RzQ+I+QQ56BuwDyGNy0MYaleH6M7fbmQVzCCs54VuhIX9ztVtrwsid7zZFzuG6yqXHR7 qMGhCn3d+KJ0jokib+4ony5bMXBIQPqE9LsBxDqQIFMrKf7wSNnQS7vAljoYPiqelJsy 4yej4asF3zpjANye8XOu6UMTAoBp5bu2mGPorbJG4qzjFg+TjpbVDxKu2pDebBx4WzXB rrbA== X-Forwarded-Encrypted: i=1; AJvYcCWblacq2is+xbiSnE7QKRVRwnNN/01dNY6IHXVnoJ9uxrN10z67Xt2oP5c+lJQG6O2F9VtwbgNf+JmMnlz9p3FqGJYV X-Gm-Message-State: AOJu0Yz+JCZL6ry1cFfppZXDqzDuetjmrFkHfwxjwsKYnJ9yduvDfRJ2 A+Iqv7q2NF7BOVpI9PZ444jfk/NboacE12gbZR+2n+St60YjlrFQLgAPp0Nw X-Received: by 2002:a05:6a20:d495:b0:19e:bd3e:76e1 with SMTP id im21-20020a056a20d49500b0019ebd3e76e1mr232774pzb.48.1708703042166; Fri, 23 Feb 2024 07:44:02 -0800 (PST) Received: from wheely.local0.net (220-235-194-103.tpgi.com.au. [220.235.194.103]) by smtp.gmail.com with ESMTPSA id h18-20020a170902f2d200b001d913992d8csm11808208plc.242.2024.02.23.07.43.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Feb 2024 07:44:02 -0800 (PST) From: Nicholas Piggin To: qemu-devel@nongnu.org Cc: Nicholas Piggin , qemu-ppc@nongnu.org, Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , Harsh Prateek Bora , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 12/47] hw/ppc/spapr: Add missing license Date: Sat, 24 Feb 2024 01:41:31 +1000 Message-ID: <20240223154211.1001692-13-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240223154211.1001692-1-npiggin@gmail.com> References: <20240223154211.1001692-1-npiggin@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52e; envelope-from=npiggin@gmail.com; helo=mail-pg1-x52e.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, FREEMAIL_FROM=0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Commit 9fdf0c2995 ("Start implementing pSeries logical partition machine") added hw/ppc/spapr_hcall.c, then commit 962104f044 ("hw/ppc: moved hcalls that depend on softmmu") extracted the system code to hw/ppc/spapr_softmmu.c. Take the license and copyrights from the original spapr_hcall.c at commit 9fdf0c2995. Signed-off-by: Philippe Mathieu-Daudé [npiggin: Update file description.] Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Nicholas Piggin --- hw/ppc/spapr_softmmu.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hw/ppc/spapr_softmmu.c b/hw/ppc/spapr_softmmu.c index fc1bbc0b61..2fade94029 100644 --- a/hw/ppc/spapr_softmmu.c +++ b/hw/ppc/spapr_softmmu.c @@ -1,3 +1,12 @@ +/* + * MMU hypercalls for the sPAPR (pseries) vHyp hypervisor that is used by TCG + * + * Copyright (c) 2004-2007 Fabrice Bellard + * Copyright (c) 2007 Jocelyn Mayer + * Copyright (c) 2010 David Gibson, IBM Corporation. + * + * SPDX-License-Identifier: MIT + */ #include "qemu/osdep.h" #include "qemu/cutils.h" #include "qemu/memalign.h" From patchwork Fri Feb 23 15:41:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 775133 Delivered-To: patch@linaro.org Received: by 2002:adf:a356:0:b0:33b:4db1:f5b3 with SMTP id d22csp418391wrb; Fri, 23 Feb 2024 08:04:34 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWhKX3ma444+zaFSuAH0K9pMpjFhSyZgEHR3WVhj/5qXq4SaYZdXjGvO374cnmwE5SkwqSEpoKW+gmgMNJIprp4 X-Google-Smtp-Source: AGHT+IHX7ip9nxN2snfG4PSdperiwnX9ZnkaOefy97qmj6lCfGNa0N/uNNTdYejvS2h5xbs+ww9P X-Received: by 2002:a05:622a:118f:b0:42e:64bc:4d1b with SMTP id m15-20020a05622a118f00b0042e64bc4d1bmr365470qtk.4.1708704274288; Fri, 23 Feb 2024 08:04:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708704274; cv=none; d=google.com; s=arc-20160816; b=AWs4qokSc8wHsJ2MPwvfDSbxd5bYu3QO7s1hj1wf3TkiwYnCv+ch1ZExxd+yFsCWDd zCw2MZC52Yt7O8VcB/DFsgPWc9vC8Hgcsdi7wPDMS5C1brldZnbo47uBWXHYx6is4YMz Ps5mw90ndnWuxGolJDhZse/TANXj0kJHDncMoc0wLy4zs4b8QNAPgs0bMyMZgJvZMl6C H5FWFhMDXuL51cnk/BwCJ1DwtjrqnBd5X2U/xq1AZXe5osicAh2ZHXMx6SM6X10Msr0b WwuS+797ogskXEs8bDLqvC6cBVG2tlHtjAA8KVFQwF/3O14qcWzTYJWOoENZB69h1FQ5 6zVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BO+f3hPKeL5HSk7HpmCD/7SFZU9TBIYTsIyIXJfwhsQ=; fh=FCMZdzrasomXFRd1IGhuNpu/Fs7aUaP7sKvDvDc04/M=; b=sVZ9Yrw8vNPqKSBXjJoXIdgMoxM+UFvXXHZ8DlbTdWWA92tSbtC/sySqvun/3wBQ/c G6YeSRvN3VqH0hrXoAjsWQVQJmjqa4xyUmebBAxQvrGj6MpNxfOj91aiuPCaIKIaGnbV m84ojy2JeRIiR9+5kSZlq77qdKTrtWdMQ5r4xG56oTzxtpQoXVAOvIxcDXUEPU/yKtUL hIhD9+N6RNdRcamztT/wf6e9LVtHCbQvV/0uJasNZQtzfdec0TIq/q5wE4JUlrBV8oOj 9DFk+yA7J6kJDDRByrV7gpx/Gnyhr2iw43/Kd8EPKjdihT6P4uFpe10QmQt83eGOvO/T acCA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=l7P2TXJW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e9-20020ac85dc9000000b0042c0effa9bfsi16592479qtx.295.2024.02.23.08.04.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Feb 2024 08:04:34 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=l7P2TXJW; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdY1f-0006Pz-KX; Fri, 23 Feb 2024 11:03: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 1rdXid-0005a5-A1; Fri, 23 Feb 2024 10:44:11 -0500 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rdXia-0006FE-5P; Fri, 23 Feb 2024 10:44:11 -0500 Received: by mail-pg1-x530.google.com with SMTP id 41be03b00d2f7-5dcc4076c13so820656a12.0; Fri, 23 Feb 2024 07:44:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708703046; x=1709307846; 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=BO+f3hPKeL5HSk7HpmCD/7SFZU9TBIYTsIyIXJfwhsQ=; b=l7P2TXJWVa+kAXDw+z0HPgc0C/cpq1njmCeJ9drlB2VflZ6Nk9rp2Lw7UFuMByZqtO cvJIzUaqG4h0OOse/qVwapCIAUkHVy02YecW5Fbj5AVgEVLVSQ0H2C8U7zo2Ggu9JKa7 SI+gN5lq7H59Ygz5UUQAeRhScp+KmJoPd95MM3My+iPRwLM348ERHtsI8dRraETfm/Fo PAKHuqjPeUuh+19HZc/zR0CXCqVnkPmNFfRSk7mmou5gY+6qpEb7KpIJs6dGUOdN2Xo2 RoDmWkVtc2uuRatcJm12jvjrGSsDCAuuaJj1u46MFOkEqo94iwEQ8+gwRbhEf9B5aN+/ 8q3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708703046; x=1709307846; 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=BO+f3hPKeL5HSk7HpmCD/7SFZU9TBIYTsIyIXJfwhsQ=; b=v25YXhUXkdR8wFH55p3p+S6Qz7C4GDmb6jhzxl3huxdKHujV5j9B2EFczhD/AqS+wr 8mxgM+Y62+u6Imb5pVK2Ca9as4nkSokwBuzbhznsHL2+ioyMuEbdxRy67MPeWUNd7q6n 3InfRixEKSuvSrxNuPfE3ibR23/O8tolvKylbbXvZqIYuxIB9NsD8RQFBkkkf0jLPiOh tYBOdamCki8s3qlTsPq1NySDzjI2nXeD+iUfOMwAE3ohzucMx0CVmSohcoPt4YjxWDeV EaTsj+ejORolWoVmlRCNRsuwuQIm7dBgTPqXt50Mdk+pffSMHl93qQhPD5pHp+njklMI FMzw== X-Forwarded-Encrypted: i=1; AJvYcCXaVwSOIQ5+MdYcCuFQpeM+bTpAfv2vt61zIer+sIfkB8YXuRL+wEsphtNTvwXkMcIHI3O7unmZ4CAPsWXDPNicDGyO X-Gm-Message-State: AOJu0YzWBBVKPVd3FOBb+biXyNViKM5gBctvddanEc7FVAViAn85yRSa woNOhzmhnesd8Yv+7ZJd2a8ZSOO2UQkXZZswd82VQFjMeQwW7y7Dba2d9bio X-Received: by 2002:a17:902:ce91:b0:1d9:4106:b8b5 with SMTP id f17-20020a170902ce9100b001d94106b8b5mr178262plg.11.1708703045756; Fri, 23 Feb 2024 07:44:05 -0800 (PST) Received: from wheely.local0.net (220-235-194-103.tpgi.com.au. [220.235.194.103]) by smtp.gmail.com with ESMTPSA id h18-20020a170902f2d200b001d913992d8csm11808208plc.242.2024.02.23.07.44.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Feb 2024 07:44:05 -0800 (PST) From: Nicholas Piggin To: qemu-devel@nongnu.org Cc: Nicholas Piggin , qemu-ppc@nongnu.org, Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , Harsh Prateek Bora , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 13/47] hw/ppc/spapr_hcall: Allow elision of softmmu_resize_hpt_prep Date: Sat, 24 Feb 2024 01:41:32 +1000 Message-ID: <20240223154211.1001692-14-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240223154211.1001692-1-npiggin@gmail.com> References: <20240223154211.1001692-1-npiggin@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::530; envelope-from=npiggin@gmail.com; helo=mail-pg1-x530.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, FREEMAIL_FROM=0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Check tcg_enabled() before calling softmmu_resize_hpt_prepare() and softmmu_resize_hpt_commit() to allow the compiler to elide their calls. The stubs are then unnecessary, remove them. Reviewed-by: Nicholas Piggin Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Nicholas Piggin --- hw/ppc/spapr_hcall.c | 12 ++++++++---- target/ppc/tcg-stub.c | 15 --------------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index fcefd1d1c7..0d7d523e6d 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -123,9 +123,11 @@ static target_ulong h_resize_hpt_prepare(PowerPCCPU *cpu, if (kvm_enabled()) { return H_HARDWARE; + } else if (tcg_enabled()) { + return softmmu_resize_hpt_prepare(cpu, spapr, shift); + } else { + g_assert_not_reached(); } - - return softmmu_resize_hpt_prepare(cpu, spapr, shift); } static void do_push_sregs_to_kvm_pr(CPUState *cs, run_on_cpu_data data) @@ -191,9 +193,11 @@ static target_ulong h_resize_hpt_commit(PowerPCCPU *cpu, if (kvm_enabled()) { return H_HARDWARE; + } else if (tcg_enabled()) { + return softmmu_resize_hpt_commit(cpu, spapr, flags, shift); + } else { + g_assert_not_reached(); } - - return softmmu_resize_hpt_commit(cpu, spapr, flags, shift); } diff --git a/target/ppc/tcg-stub.c b/target/ppc/tcg-stub.c index aadcf59d26..740d796b98 100644 --- a/target/ppc/tcg-stub.c +++ b/target/ppc/tcg-stub.c @@ -28,18 +28,3 @@ void create_ppc_opcodes(PowerPCCPU *cpu, Error **errp) void destroy_ppc_opcodes(PowerPCCPU *cpu) { } - -target_ulong softmmu_resize_hpt_prepare(PowerPCCPU *cpu, - SpaprMachineState *spapr, - target_ulong shift) -{ - g_assert_not_reached(); -} - -target_ulong softmmu_resize_hpt_commit(PowerPCCPU *cpu, - SpaprMachineState *spapr, - target_ulong flags, - target_ulong shift) -{ - g_assert_not_reached(); -} From patchwork Fri Feb 23 15:41:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 775131 Delivered-To: patch@linaro.org Received: by 2002:adf:a356:0:b0:33b:4db1:f5b3 with SMTP id d22csp413240wrb; Fri, 23 Feb 2024 07:55:53 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVHTYy46PonOCIzdrI2FWpU7xw6eNbG/X7kCHBVHQSlBAIvBQmtaySnijWbmNtkA+2Am7eSTErbTz6z+6m4vPdb X-Google-Smtp-Source: AGHT+IF6j52emf6uBGsnXofBh1coZTBWaSelbVDntMzq0Q4FquREVJXv2oneB0ouNoMnrFIZ08P3 X-Received: by 2002:aca:1902:0:b0:3c1:3322:157d with SMTP id l2-20020aca1902000000b003c13322157dmr145362oii.44.1708703753116; Fri, 23 Feb 2024 07:55:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708703753; cv=none; d=google.com; s=arc-20160816; b=K7FjJaZr0iYXXHRbz7BcAcVACZRHcLmNvsQ3DwNypdm3qlWnrTDzDs7/nn7GW0WMVb wmFXgmVnlg7r+TYttmUIOelX52dzs8f446YhtUh4XkVQj3MWC/vD00AVIARGFI1YGKIN lRHtBXL5YP/z1Ka/E4n6zqLvmjWqG0ILs+wzjUQtaXY9HWHTrNaZoS4yBrRZQIIWGkPp hz+7JIL1CUYxQj8i0fjjgjFJhlXUMu1zpp5pkjK5IQ95rxilt9omTuPkPT8FJodiRdLd a0Lx68U6gyVOlf5SBOE5ivkft9TyuEDPGCMcNdp/ekecrWIKngHwsEksDfSQl4I+T+4H ovRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7/DLuXky9FQDqFdM2qoHQOMo5LuNUVQuzkj5LQTCSNQ=; fh=f/HO5294NDMfAInWPeDfWdCzN3nt+WT2Es0JSK3pS8U=; b=D87H1nY2jUuVQ4nfBcYGiWq+VZv+Z9V6H15QXdgnyxCdSfhOJFgMYIrv6HcMUyV+s2 qbPCDlx8xV/aS+C/JR3yGvjWo6AjU3gCSm4lKJHu5XGQGlcKrbOujcJ1IR3EHLLPhZfr ke54rqTzHSbz3W2HBtoc59gyDb1uVma1gD1Q1VD8sCETK5/K2MDSR+/fDw+QoNYFsyse lwm0TXOp07Jy5fOXH2MFTwBm/LEpRDCl8YmRjAEIu9cyWgJTmpio1mfkZuE/OLyNGen3 coLs04l5v9mj1I7Sew5p9E256ypCxeeiBtFkZ+qzUM60kyHV87/E4aQ7u1V6p8ugdnnj er5A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=FeYfRhPm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 10-20020a05621420ca00b0068cd864e437si15419721qve.325.2024.02.23.07.55.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Feb 2024 07:55:53 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=FeYfRhPm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdXrd-0006QL-Ob; Fri, 23 Feb 2024 10:53:29 -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 1rdXie-0005aM-Ue; Fri, 23 Feb 2024 10:44:13 -0500 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rdXid-0006Gx-Al; Fri, 23 Feb 2024 10:44:12 -0500 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-1d94b222a3aso9669245ad.2; Fri, 23 Feb 2024 07:44:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708703049; x=1709307849; 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=7/DLuXky9FQDqFdM2qoHQOMo5LuNUVQuzkj5LQTCSNQ=; b=FeYfRhPmlXB3swxxkoUljgpVo5bsujoMcq03bTznh0phSNrBWr5jYMMmw7/09sIRxo ym18ecibSFlkq5M8w9mhv3eiTsh1AIYh4bYqvWd5N3jo7Y/GRH5urvJhpgImu1Cotgw8 OWuhq8ijw3Hxhr1ZvhwvGGJMYBKVuSTG4VEp4T9/GJzUJj/Iq4BZvkzX/1kN7iGnHsv3 Pu8KOkF4aQyDJaZ3P8PU9nJx7ALLtMRn5NjJ+GLIMFOGwBjcCigf+Q6ZUTp0PuBWIU6J yNoVYl4bg/pi1SvRwz9B32r5HtvHNDa0RM73//bezdmnU3ckn/kYKPu+3Z57VATYOoWH VITQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708703049; x=1709307849; 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=7/DLuXky9FQDqFdM2qoHQOMo5LuNUVQuzkj5LQTCSNQ=; b=fgKi5dbQ16cDBBND/j0YrSROHesOfF6xRQ1Ew931zhDsuqkIN8cGbWpXTbFq6JE6ZD taEshJs0fG7uIBxA5l1/8+ggYYROvyz8lUqmPa9KEFtO09SzZP2SXKlY9pkIbfYYAjIK DJiqFLPHiMQQ02oHixKYeIlUJncQatBmzsn9VbkXQ5ZN18tp8z5HCNtZiOkh0ErC43E6 6C20SJ/qKqrZgC04WUkt9TKFXmSqMXh3K8VnGYo+GSW+E1pzWoVWxAkxi8jxr8NuEXXX bAR/SbSXA3FwmQf0tg8YB0FPYuC4S963QuwEGioZjkjDq9J0JhHDQAxT9fcgfy6O6Z6p SP1Q== X-Forwarded-Encrypted: i=1; AJvYcCUKB6JlVSVsx4xi+qtRXZhtoGEBmpdxV+SuWMivNiuS32VzJvCeznn7uxDE2VHB3Z5fUox4YUI4hLNjCIvaKQXFUQ22 X-Gm-Message-State: AOJu0Yz7G1QxPAfy/p3cLyevkEPSjg5paO8ZRWXAACDwNa+J+O6un0W8 Q7xl0YhylZ/+FpXlIgfgq6WlaPbdahppPuAAUWzzVYGS3J1BYTnzQS5qYhEB X-Received: by 2002:a17:903:8c7:b0:1dc:78cc:176a with SMTP id lk7-20020a17090308c700b001dc78cc176amr213178plb.61.1708703049497; Fri, 23 Feb 2024 07:44:09 -0800 (PST) Received: from wheely.local0.net (220-235-194-103.tpgi.com.au. [220.235.194.103]) by smtp.gmail.com with ESMTPSA id h18-20020a170902f2d200b001d913992d8csm11808208plc.242.2024.02.23.07.44.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Feb 2024 07:44:09 -0800 (PST) From: Nicholas Piggin To: qemu-devel@nongnu.org Cc: Nicholas Piggin , qemu-ppc@nongnu.org, Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , Harsh Prateek Bora , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 14/47] hw/ppc/spapr_hcall: Rename {softmmu -> vhyp_mmu}_resize_hpt_pr Date: Sat, 24 Feb 2024 01:41:33 +1000 Message-ID: <20240223154211.1001692-15-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240223154211.1001692-1-npiggin@gmail.com> References: <20240223154211.1001692-1-npiggin@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62b; envelope-from=npiggin@gmail.com; helo=mail-pl1-x62b.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, FREEMAIL_FROM=0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé Since 'softmmu' is quite a loaded term in QEMU, rename the vhyp MMU facilities to use the vhyp_mmu_ prefix rather than softmmu_. vhyp_mmu_ is chosen because the code that manipulates the hash table via guest software hypercalls is QEMU's implementation of the PAPR hypervisor interface, called vhyp. Reviewed-by: Nicholas Piggin Signed-off-by: Philippe Mathieu-Daudé [npiggin: Pick a different name, explain it in changelog.] Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Nicholas Piggin --- hw/ppc/spapr_hcall.c | 4 ++-- hw/ppc/spapr_softmmu.c | 4 ++-- include/hw/ppc/spapr.h | 9 ++++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 0d7d523e6d..75c2d12978 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -124,7 +124,7 @@ static target_ulong h_resize_hpt_prepare(PowerPCCPU *cpu, if (kvm_enabled()) { return H_HARDWARE; } else if (tcg_enabled()) { - return softmmu_resize_hpt_prepare(cpu, spapr, shift); + return vhyp_mmu_resize_hpt_prepare(cpu, spapr, shift); } else { g_assert_not_reached(); } @@ -194,7 +194,7 @@ static target_ulong h_resize_hpt_commit(PowerPCCPU *cpu, if (kvm_enabled()) { return H_HARDWARE; } else if (tcg_enabled()) { - return softmmu_resize_hpt_commit(cpu, spapr, flags, shift); + return vhyp_mmu_resize_hpt_commit(cpu, spapr, flags, shift); } else { g_assert_not_reached(); } diff --git a/hw/ppc/spapr_softmmu.c b/hw/ppc/spapr_softmmu.c index 2fade94029..b3dd8b3a59 100644 --- a/hw/ppc/spapr_softmmu.c +++ b/hw/ppc/spapr_softmmu.c @@ -378,7 +378,7 @@ static void cancel_hpt_prepare(SpaprMachineState *spapr) free_pending_hpt(pending); } -target_ulong softmmu_resize_hpt_prepare(PowerPCCPU *cpu, +target_ulong vhyp_mmu_resize_hpt_prepare(PowerPCCPU *cpu, SpaprMachineState *spapr, target_ulong shift) { @@ -562,7 +562,7 @@ static int rehash_hpt(PowerPCCPU *cpu, return H_SUCCESS; } -target_ulong softmmu_resize_hpt_commit(PowerPCCPU *cpu, +target_ulong vhyp_mmu_resize_hpt_commit(PowerPCCPU *cpu, SpaprMachineState *spapr, target_ulong flags, target_ulong shift) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index e91791a1a9..5b5ba9ef77 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -634,10 +634,13 @@ void spapr_register_hypercall(target_ulong opcode, spapr_hcall_fn fn); target_ulong spapr_hypercall(PowerPCCPU *cpu, target_ulong opcode, target_ulong *args); -target_ulong softmmu_resize_hpt_prepare(PowerPCCPU *cpu, SpaprMachineState *spapr, +target_ulong vhyp_mmu_resize_hpt_prepare(PowerPCCPU *cpu, + SpaprMachineState *spapr, target_ulong shift); -target_ulong softmmu_resize_hpt_commit(PowerPCCPU *cpu, SpaprMachineState *spapr, - target_ulong flags, target_ulong shift); +target_ulong vhyp_mmu_resize_hpt_commit(PowerPCCPU *cpu, + SpaprMachineState *spapr, + target_ulong flags, + target_ulong shift); bool is_ram_address(SpaprMachineState *spapr, hwaddr addr); void push_sregs_to_kvm_pr(SpaprMachineState *spapr); From patchwork Fri Feb 23 15:41:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 775130 Delivered-To: patch@linaro.org Received: by 2002:adf:a356:0:b0:33b:4db1:f5b3 with SMTP id d22csp412643wrb; Fri, 23 Feb 2024 07:54:22 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXpSYKXpGKCfwxZH0PT9esSg0/E0WRhARZ/QQJqEKvLYN9YRLoVhKuWb+3i2qG5+o0RW6iD5fy/32pgPjhciYMk X-Google-Smtp-Source: AGHT+IHBBBgKePOm2g7WMiF3hT2Xk7Xcm9lld49bOlx9fHTa5oYDm5OV6M4RRILITjiEEjVYb4uw X-Received: by 2002:a05:620a:c0c:b0:787:a40a:4bbc with SMTP id l12-20020a05620a0c0c00b00787a40a4bbcmr183245qki.65.1708703662519; Fri, 23 Feb 2024 07:54:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708703662; cv=none; d=google.com; s=arc-20160816; b=MdlJ0h1m8NHSl126EoLTSkMOP1D7i57A6yYLR/Hb1/O9xIbaKLw8AjLCD79oj3t2mk qHvV8IeRgHwukZsbHc8yPUnoQnGyyy4o3sR2h4eBA2AaYX4cok0xYtBPdRlHg23bjFA9 vrPUltPxCOzs5jptRfFpFKYzTwoIA8KSWGMGxqLXqJPwUQ/6duVmU7gOc5LgXGLt9P91 pBxLG7KqZk1U1CiggTttJbsWYUEaNsYOjGNzhI5gff7hYdwD/RWwZFPx0LA7flk/ldTc 04FdbDftKlwnj31fnHG6SnQVHxCG7yelFW3+QA5b2wHdVfILpcVQ5YgW2OFeVn3slKic qXKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=aZa3WsnJHLzg9werjuxOzrnjxOzmy7c9BmDhBtjSlwU=; fh=t4mY7MlR10JSd2TxbohLxM1xKKkbicQRMrRWcyUgqD8=; b=BNlkuFtCKlxeuO9BDcDeLV8EG2h/pB0hmzO4Wbpf+GPPwwPEmsoDRzmLNrgPNyRfnb +iSxKvUGhu6qhThipVFQubhBLRYiJ7F03TmqmlNZi0vCp0Kz3/IFRf8SAmuu6zl5ixJt pzEk4n5y8enYPVdomqeyROBdEBJKNgc7ASCFD1c8V7/n6JVDrav6OZALLc8tmpvrir9i JtsPijEoAKo//yKewGXiopK2VrPXJe/1mvaAbmBWWwCsGhTMOflIk56a384dgH3U+9wj kn4zKeythwA4zjTYxDJLjH0c/DjoMi9J41pEg1CLB+/ZvaVSQTu2yB/lupIz3rdpLbTM HskQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Xjwpq5Eo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id oo2-20020a05620a530200b00787720524f9si9495679qkn.124.2024.02.23.07.54.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Feb 2024 07:54:22 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Xjwpq5Eo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdXre-0006Qy-J0; Fri, 23 Feb 2024 10:53:30 -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 1rdXij-0005at-Jt; Fri, 23 Feb 2024 10:44:19 -0500 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rdXih-0006IJ-85; Fri, 23 Feb 2024 10:44:16 -0500 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-1dbb47852cdso7943275ad.1; Fri, 23 Feb 2024 07:44:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708703053; x=1709307853; 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=aZa3WsnJHLzg9werjuxOzrnjxOzmy7c9BmDhBtjSlwU=; b=Xjwpq5EoFR1zwKhYvp3RN7zKKgODjHs50qQsTuxUG+VngmcTIW+7xqtxYp3SnRR2SM WHYKsy8Zbvg9Ha/446s7tnOP3lvLNEsrfQUE6oitqUuK84eM9eAM9T6saXgQVAnXiNsy l2JKzjGOILufboGGkBk4dshjG7uT6xINUyJgTna9/AlB8JeQmADZkDtixW4y9+Aib3f4 mDzyfNXUcEzUY9bfh0iV2sUCU5FYzkhc2M/FNOohxWZUA4swLQ3tzKcmuxd7BGaY3PPQ xy2FcAxO53m5QvxHgRR2ETarKWpF0TRuDQ5ASoz9O7T5lmZ+SDYQikqnJ67jhVloXfiL aXUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708703053; x=1709307853; 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=aZa3WsnJHLzg9werjuxOzrnjxOzmy7c9BmDhBtjSlwU=; b=Iyr2P6Bm/4L1iiD1tcYt5fgeCKjLQX45vXIoTCRfPYXopS5QNXsgkv6EkvQkBDgA1f 44lQsgsvzb9Myj+/ltthjqWutWDVOTtHeehJRNgQsFB8nP0PrHwZhzlcD8wSZ1qEtqe+ 2Cz3ZrbVTL00094eLz83f81eqLYY8q16Z3DuPgQsmPzf+D/ByKdd4DRC/oofNAuQlJOU +zW55HvHQO+FBjTXhiUKoM3dKXi0OR2mHLnSIkzkhoIZeGojLUsh2kNRkmEfnX97gDYH S2ZPyWCZnS926RW5ND29GuaOnK2feLIdCAmxWZOyceTHeO/Ny+SA9IFHewu3Lrv5Yzqq F9xQ== X-Forwarded-Encrypted: i=1; AJvYcCW3SURyuPbnxIerHsPELcJjSeQBpc2t5r3yeACZoK9OfPgYobgG90ANoe0LnDspqxNmVNIcInVlkm1ZI/7yaFZ1Ind3 X-Gm-Message-State: AOJu0YzefOzNmUP2rv3UPh0+JMqlA9Pis9COKxU4hVMZCpvxS+LNO+PQ PzZU3L+vsyqFQKCSyFTvN6+QjtCDKCqJL+a6lCT28uXrgCVeDUVo1/T5KnsV X-Received: by 2002:a17:902:ce92:b0:1db:f392:e993 with SMTP id f18-20020a170902ce9200b001dbf392e993mr218425plg.52.1708703053113; Fri, 23 Feb 2024 07:44:13 -0800 (PST) Received: from wheely.local0.net (220-235-194-103.tpgi.com.au. [220.235.194.103]) by smtp.gmail.com with ESMTPSA id h18-20020a170902f2d200b001d913992d8csm11808208plc.242.2024.02.23.07.44.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Feb 2024 07:44:12 -0800 (PST) From: Nicholas Piggin To: qemu-devel@nongnu.org Cc: Nicholas Piggin , qemu-ppc@nongnu.org, Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , Harsh Prateek Bora , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 15/47] hw/ppc/spapr: Rename 'softmmu' -> 'vhyp_mmu' Date: Sat, 24 Feb 2024 01:41:34 +1000 Message-ID: <20240223154211.1001692-16-npiggin@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240223154211.1001692-1-npiggin@gmail.com> References: <20240223154211.1001692-1-npiggin@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::630; envelope-from=npiggin@gmail.com; helo=mail-pl1-x630.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, FREEMAIL_FROM=0.001, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé To reduce the use of the term 'softmmu', rename spapr_softmmu.c to spapr_vhyp_mmu.c. Reviewed-by: Nicholas Piggin Signed-off-by: Philippe Mathieu-Daudé [np: change name] Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Nicholas Piggin --- hw/ppc/meson.build | 2 +- hw/ppc/{spapr_softmmu.c => spapr_vhyp_mmu.c} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename hw/ppc/{spapr_softmmu.c => spapr_vhyp_mmu.c} (100%) diff --git a/hw/ppc/meson.build b/hw/ppc/meson.build index da14fccce5..15d13e649d 100644 --- a/hw/ppc/meson.build +++ b/hw/ppc/meson.build @@ -31,7 +31,7 @@ ppc_ss.add(when: 'CONFIG_PSERIES', if_true: files( 'pef.c', )) ppc_ss.add(when: ['CONFIG_PSERIES', 'CONFIG_TCG'], if_true: files( - 'spapr_softmmu.c', + 'spapr_vhyp_mmu.c', )) ppc_ss.add(when: 'CONFIG_SPAPR_RNG', if_true: files('spapr_rng.c')) if host_os == 'linux' diff --git a/hw/ppc/spapr_softmmu.c b/hw/ppc/spapr_vhyp_mmu.c similarity index 100% rename from hw/ppc/spapr_softmmu.c rename to hw/ppc/spapr_vhyp_mmu.c