From patchwork Fri May 10 10:49:02 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: 796035 Delivered-To: patch@linaro.org Received: by 2002:a5d:452e:0:b0:34e:ceec:bfcd with SMTP id j14csp766206wra; Fri, 10 May 2024 03:49:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUWOJUtcEV1jd/VSsCV1NdT+yiWsutpkq+M7JX5g6iV9ZE2cXCFnDEXh0c+v9163WXnDmokYQSZ5GAK+kI4w/8b X-Google-Smtp-Source: AGHT+IHQ4ZozbIY44W1dhF7KWDZ007aFGs5zWKJfUPa5n9zeDBXqDinImiRX6dvXu16/Tm3TkjzL X-Received: by 2002:a05:620a:1021:b0:78d:68fa:6e40 with SMTP id af79cd13be357-792c7590198mr209172585a.19.1715338179745; Fri, 10 May 2024 03:49:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715338179; cv=none; d=google.com; s=arc-20160816; b=lMzFdYsoBe9E4HFuHedUkWz4UvQrxzNA+NeNiq1h4jJVewv52RCi9a78za6cidwO8N 7fzyHuOZV0WHBIzBrxc2fIHASx95zsgCjKhQinl3TmDqXfqhIQevhjHjnZRTzHtZyg3u KvUQH+6OctO5v7Q7z9m6IucnWKj8XTow37HvamsW8b2hiO6RLXQv/2qP1/S19AA0Jb2C 5YA2w0c3O6BE+BmoSuiAST+46H4w1MYG2G+16kFPq0gGrP1y6r+k9ea8ZzjVc9A7Q2ZU 4XfzgJ9MxxsCXlUMgv5tnJZe1ZlpdwZZHbIlmRhRYTgTH3dmUbT4YtpY28AP+Sz6teMh FsAw== 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=XVbCv81rAzGflBvcSrzxqDvQbbVCQ+aUGbh/Oa+Rhcw=; fh=4SzGJrw+pRu0djVyxBXIF8o3Q6a+Y4E1e4hhoHIewbY=; b=OppJ8YaaMfS9EYNWuuEozCLk9ybafRt6wVx23Ym14YZ1fRyHARg+/Mqs7cf3OR3U1c H3aZiB5PmYyBUVQJhFYRSNDS7di2cebExc6zPYtiwdzjFYIHA3XAwL7gnWKevjgvsEN1 R0h5SAU6fY3aUVnu7Ac1Oz1yaWnNgR4rOBH0SkfiRmEZk6Bl0V7NlCyhhSU5svjBsFZY ksjFKjRgU4MyiNrvEDNMEV2btVymu/sHe9glwrU1aYOgtrNhTdz2oILD4VqTzl/vH518 Jz7IlwZa8k76ihv9fcUduhPkNSFkKaZlwF/sm4sM6p4a06u7wwXFAJEgtEYJ58bQGOwY yaMg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GpfH6ElD; 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=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-792bf366270si319528085a.670.2024.05.10.03.49.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 May 2024 03:49:39 -0700 (PDT) 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=@linaro.org header.s=google header.b=GpfH6ElD; 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=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s5Nog-0001OA-5t; Fri, 10 May 2024 06:49:30 -0400 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 1s5NoX-0001Ko-Kl for qemu-devel@nongnu.org; Fri, 10 May 2024 06:49:23 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s5NoV-0001UQ-Ec for qemu-devel@nongnu.org; Fri, 10 May 2024 06:49:20 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-41ffad2426eso3650795e9.3 for ; Fri, 10 May 2024 03:49:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1715338157; x=1715942957; 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=XVbCv81rAzGflBvcSrzxqDvQbbVCQ+aUGbh/Oa+Rhcw=; b=GpfH6ElDBYL62gof87k7LDlCzRrUU37KUmj4oMkRWiwHb5Ey9EVi2EY5dCkMCs5bJw xgABtdLLEHDi4/qY8sUCaUN968R0AanIkgcriC+J2K1aXEpdyJAxCsf+e+DEz3hKCn35 CCUrTMNJOghpb6GqiR/o+CNK757EW4YlfVv8nvOtw9tiPSVws4Ok31XJl+sk43+ZAHS5 p+KidkmzyBepcVWXnttuXeTeSPRSVKmy8TECG4m0sk/9rQYMU9ud+Fi9Q9NJlnmyQCVu c7wsM4nSlw5+rlgs/h2AEh4wACdJQrVvpASAPwFKRBiXL25YCvGhccsIG8jWc4igN9+d 2jvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715338157; x=1715942957; 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=XVbCv81rAzGflBvcSrzxqDvQbbVCQ+aUGbh/Oa+Rhcw=; b=otkpM4uYIxe5ITq0Nhy7Uiq3AqaVrvalCvUH/Sogd8jxQzWJ2X/hZMlFRYSvfecEcw O88zAmUALU1RULmKVZ7HU/1DoNyEcFqrEPLV9e/fwsetZ4VBa4oBoDiJw5ERSFVzIUG6 XCXjN7r6e9Q8GVfi3wBAgeVxZcp3DYdB/EHMOvT5BgvtLP/tUjoQlRUbfoe7xbf13BBB yTbhMPJ2+ZsLHhd0vhKONRTZFAg2PATYe+hSdonBcwz9IpAFHhJIoMXKGJldMMdHRjuh 7dXOqIskwmHWjEX1+B8K47WDouxI/AS8v79ynyuTr1dZqd6YW66iUElWRpUN8bjvuNjk DYCA== X-Gm-Message-State: AOJu0Yw0EOa/zPaT7FETZdlsPOCBUOdDB90lF00LP5+m1WL1PHCaw8+G npHVRRmWqTNIo2WoG3p+HATL1T8EluCEuBMX2EnX+x6z71Pi3wr0rr8cIvzNmfwzje8eccUwp8X T X-Received: by 2002:a05:600c:3508:b0:41b:f116:8868 with SMTP id 5b1f17b1804b1-41feaa38a79mr24859125e9.12.1715338157651; Fri, 10 May 2024 03:49:17 -0700 (PDT) Received: from m1x-phil.lan (sev93-h02-176-184-17-152.dsl.sta.abo.bbox.fr. [176.184.17.152]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3502b79bdbcsm4196331f8f.23.2024.05.10.03.49.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 10 May 2024 03:49:17 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Paolo Bonzini Cc: Anthony PERARD , Paul Durrant , Richard Henderson , xen-devel@lists.xenproject.org, Stefano Stabellini , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Gerd Hoffmann , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 1/7] hw/xen: Remove declarations left over in 'xen-legacy-backend.h' Date: Fri, 10 May 2024 12:49:02 +0200 Message-ID: <20240510104908.76908-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240510104908.76908-1-philmd@linaro.org> References: <20240510104908.76908-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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 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 'xen_blkdev_ops' was removed in commit 19f87870ba ("xen: remove the legacy 'xen_disk' backend"), 'xen_netdev_ops' in commit 25967ff69f ("hw/xen: update Xen PV NIC to XenDevice model") and 'xen_console_ops' in commit 9b77374690 ("hw/xen: update Xen console to XenDevice model"). Remove them. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Paul Durrant --- include/hw/xen/xen-legacy-backend.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/hw/xen/xen-legacy-backend.h b/include/hw/xen/xen-legacy-backend.h index 2cca174778..eb22633caa 100644 --- a/include/hw/xen/xen-legacy-backend.h +++ b/include/hw/xen/xen-legacy-backend.h @@ -67,14 +67,11 @@ static inline void xen_be_unmap_grant_ref(struct XenLegacyDevice *xendev, } /* actual backend drivers */ -extern struct XenDevOps xen_console_ops; /* xen_console.c */ extern struct XenDevOps xen_kbdmouse_ops; /* xen_framebuffer.c */ extern struct XenDevOps xen_framebuffer_ops; /* xen_framebuffer.c */ -extern struct XenDevOps xen_blkdev_ops; /* xen_disk.c */ #ifdef CONFIG_VIRTFS extern struct XenDevOps xen_9pfs_ops; /* xen-9p-backend.c */ #endif -extern struct XenDevOps xen_netdev_ops; /* xen_nic.c */ #ifdef CONFIG_USB_LIBUSB extern struct XenDevOps xen_usb_ops; /* xen-usb.c */ #endif From patchwork Fri May 10 10:49:03 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: 796036 Delivered-To: patch@linaro.org Received: by 2002:a5d:452e:0:b0:34e:ceec:bfcd with SMTP id j14csp766243wra; Fri, 10 May 2024 03:49:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXiwOIzR/rWhOxU7sq4DFF+YPEHZWCSHdSYpabFvijj0rmEA8NEaGjOVX99sbv4yaP/4rf9Km1/xsiVSPdZsROb X-Google-Smtp-Source: AGHT+IFsw17cyTWIFN2MahwyUoEJYCZY5OaZG+7fhM609ZJ0y1uujvkGMBjVeoueAeHdXfWAXAIp X-Received: by 2002:a05:6214:3c87:b0:6a0:cf48:5196 with SMTP id 6a1803df08f44-6a168235561mr23869176d6.54.1715338188791; Fri, 10 May 2024 03:49:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715338188; cv=none; d=google.com; s=arc-20160816; b=BIlTDlCeyR3GghUm9vm3G+Fo8gnATVdCzfiJX07PdMpPEraC1I8t+dnh8D4rPXmz2Z pUs84kONBeorvz6uHVMKLdHuHvzGTXeIcOTRP9L9JOuB2eFD9suNocMnUjLN37c+9g8R 65aJsaQjyZBv/t08krvu9jwvBpQQW7SXv3zqZXi+OnGgvBMQ7GGJ+Y1rhozTuydMgms+ qYWBxFLrwijC234QkI5p6HrzwIVcWCEzg42kzRxfFnau013vbMs5RU6rp4nmjsKER7mF sPwXRMgViczukzAXzEjoGwILtpcAAH7grTUcYWnimCi5tObHtcs3XW53T3xMRDHtzfBO tU6w== 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=WG6hHvxHnsfDLBmoixzqYQgPTY2J5n6T9oUHauE6pdQ=; fh=4SzGJrw+pRu0djVyxBXIF8o3Q6a+Y4E1e4hhoHIewbY=; b=CcCjKw3NodtLGXFfzfVMbdmu/fmLU3KOiNXUIldIeIeWaQN85TVi/6U9pHJnGWrcoT ZDCHS/Nhe9QW7fsarvZQ5zVBRqih0jRXR0/9Ve/3QYlIttul0CNhyDDc9HoybTCxCZiz lSl96pwEiNhRxL5opbyUMhuYs/A50+A+AjrXpwe1riI/ntmOqwokmvh7f1hjCh48iTom 1T3jDRIGssJ34BpLrNMY8s2t3OMD5ijZx5IGSP6GldqAOsvdtorkVXSdFCK89xDds8Mf rn2CpNhkaVcTmSdTL6Wd5cUWTl9hdZ3NEx3OXN77uhNoAtKdgTru1gTRElHYExkkSTpO NpNg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vNUWPEL1; 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=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6a1803df08f44-6a15f2d8ac5si33320566d6.418.2024.05.10.03.49.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 May 2024 03:49:48 -0700 (PDT) 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=@linaro.org header.s=google header.b=vNUWPEL1; 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=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s5Nol-0001b5-Ur; Fri, 10 May 2024 06:49:36 -0400 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 1s5Noe-0001O9-Bs for qemu-devel@nongnu.org; Fri, 10 May 2024 06:49:29 -0400 Received: from mail-lj1-x22d.google.com ([2a00:1450:4864:20::22d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s5Noc-0001V8-Cl for qemu-devel@nongnu.org; Fri, 10 May 2024 06:49:28 -0400 Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2e0a34b2899so27370091fa.3 for ; Fri, 10 May 2024 03:49:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1715338164; x=1715942964; 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=WG6hHvxHnsfDLBmoixzqYQgPTY2J5n6T9oUHauE6pdQ=; b=vNUWPEL137vpjkzPtZF64LgBDtsJHfrQ4caQX8a9BfK0hB60QVQhFzs9qnfepcTFhJ v75LtWMSYAlcusxKQwYDdg2iDZyROIIV9hIFrIOEe4zvxx4nKYxx9td6o+xKYF7cioqr MUCFS2r1NfS6hkphAHFncAiJnYI5+yOcZK2rSBQQOoH5IzoyqP0Cff1uyRGh4IDPGd8F 1wYk164FDp4RD0XwbvBfTFmOGNPGSkn+o4qEuCgu9ZNOTzpf2cQ/2OHdqvkoFaC62lsx +mzmLS0tW2Qxz5qXHExorVToMX0Dfhd+VIrEjv1IdKGFtloWJGRSvPRvaj7mUevZteDx NgEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715338164; x=1715942964; 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=WG6hHvxHnsfDLBmoixzqYQgPTY2J5n6T9oUHauE6pdQ=; b=j8iuJHBrqC/OpByFuVo6+QHpdMb87AEsTbvLkfisLKmjarU5XV/Wgq7sbJlWQhJ+yo ums9yBL1xVCfh2/8QpoISAVUSjzEW+Gt+D9yfnDXysYZZ/zCkOtKlD5tA1zJJzq4QGc1 KTvSqwefK41fvM/6tfle0KvUHNilOPLd69jX0nT190YL490ciYdYWHaR1R/t69SHhBkJ wen0QikOhGAF2/YmDLtYvh1XkSDCoff4cvysGOEYbJ/gz5j0812u0aehjCpuzY0wGhY9 uQ2xmDAnQ2dPnzg3GLOudFjUlErN47bu2HyuLWPTBEpe5gQ7hFR6xGV84RRz4hz/hnF4 xb8Q== X-Gm-Message-State: AOJu0YyZkEH7Y5npHTQrsF5DhMt6N5DZqKAPKbpAZKxiH03teHdqF90M 7SoPqZPmTMG8jzd2jNeb5zN3BNclpTH/ohtEa74qe42QUOmT8R2EU5mZkqUJh/ckpJo1igfORRo b X-Received: by 2002:a2e:859:0:b0:2e5:4171:1808 with SMTP id 38308e7fff4ca-2e541711898mr7342581fa.51.1715338163501; Fri, 10 May 2024 03:49:23 -0700 (PDT) Received: from m1x-phil.lan (sev93-h02-176-184-17-152.dsl.sta.abo.bbox.fr. [176.184.17.152]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3502b896a06sm4231043f8f.27.2024.05.10.03.49.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 10 May 2024 03:49:23 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Paolo Bonzini Cc: Anthony PERARD , Paul Durrant , Richard Henderson , xen-devel@lists.xenproject.org, Stefano Stabellini , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Gerd Hoffmann , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/7] hw/xen: Constify XenLegacyDevice::XenDevOps Date: Fri, 10 May 2024 12:49:03 +0200 Message-ID: <20240510104908.76908-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240510104908.76908-1-philmd@linaro.org> References: <20240510104908.76908-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::22d; envelope-from=philmd@linaro.org; helo=mail-lj1-x22d.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 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 XenDevOps @ops is not updated, mark it const. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Paul Durrant --- include/hw/xen/xen_pvdev.h | 2 +- hw/xen/xen-legacy-backend.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/hw/xen/xen_pvdev.h b/include/hw/xen/xen_pvdev.h index ddad4b9f36..fd9a33e6ab 100644 --- a/include/hw/xen/xen_pvdev.h +++ b/include/hw/xen/xen_pvdev.h @@ -53,7 +53,7 @@ struct XenLegacyDevice { xenevtchn_handle *evtchndev; xengnttab_handle *gnttabdev; - struct XenDevOps *ops; + const struct XenDevOps *ops; QTAILQ_ENTRY(XenLegacyDevice) next; }; diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c index 124dd5f3d6..35f2b57560 100644 --- a/hw/xen/xen-legacy-backend.c +++ b/hw/xen/xen-legacy-backend.c @@ -170,7 +170,7 @@ int xen_be_copy_grant_refs(struct XenLegacyDevice *xendev, */ static struct XenLegacyDevice *xen_be_get_xendev(const char *type, int dom, int dev, - struct XenDevOps *ops) + const struct XenDevOps *ops) { struct XenLegacyDevice *xendev; From patchwork Fri May 10 10:49:06 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: 796037 Delivered-To: patch@linaro.org Received: by 2002:a5d:452e:0:b0:34e:ceec:bfcd with SMTP id j14csp766445wra; Fri, 10 May 2024 03:50:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUIu92DCjnMHunBw+Bo6Qrf36oQ/SpGN0PNcHhKSUpn+3kos/xGFQgxmx4BqF8mVFcU13pBeNKmroiq2aWXaE8G X-Google-Smtp-Source: AGHT+IEo/iQBHubdeL9JOGrpZk9HMjItAG9QV6kvC/TYMMhIo2sC7/eSE+hhLvEPvBqHU68/EGjx X-Received: by 2002:a05:622a:15ca:b0:43a:e62b:2c20 with SMTP id d75a77b69052e-43dfdb1b9e7mr21048651cf.35.1715338222311; Fri, 10 May 2024 03:50:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715338222; cv=none; d=google.com; s=arc-20160816; b=ipAzz1YyhvoAbzZYd6JhwZ/u+Xjj/4J6ahPdMcwjjqB6vk6CSvmZZEQwiMLd78b91O Ii3P+rXiwaRDoDhb1Ov5ICuz1sDcrzH1P/8ptEqxvq7m9BxXw+/LdnfWdClCJ0zQVsXe Ugqtne1uJ7oN2tLWx9WSBD4aPFvNuw2sKJflVtA84hdh7mFacOvoCRqR7jaVdH50Benu eRVBCRwQuow1Vd92aDnVJDRqocWk5P/MpAf/rxD9GJ6mIYf72Jpk1gnqbN9nAdId8txM vemVqBnLqXY4ig8d8AlU1KgSi+S4s5rg6ap6xELpUcmMEh0cCrvXfRGQhKfi0VJUI5de breA== 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=f6xsQqOmikZFwXbyDk6ZpqqheWDHvbw4l/2JG+MVzRA=; fh=4SzGJrw+pRu0djVyxBXIF8o3Q6a+Y4E1e4hhoHIewbY=; b=ZYrajUxrKG7H0EJ1zD68Yi7KvxITh9veAAFMGadQdcoeT3I0VuliKUiHWqrS1+7E31 HSdyYJuKpTmW+Ib2oq14kQs+94GRYZs+7XMFkpWltkeegtbqTic8VtVE+oUxpvU3Pth0 wSc0prIIwlV+93ucPOMsbMuUOCXPcE8K3l+99oYP3MOTnHYQw36S7GQTqCau+XwH9JhD 3lXbo2olkp51ie36W8KaDLDc1ZHWuFUijckSJrVI1kgvdGRBM81ge/t0WlnePCqJFk8w TrZHYPkGqoWoDuBzd0MLM/ec553jnSKxGSXAevZzyFi+zq//k//GtHBaYLzpHEYQNXjv io3A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ByLvpVQE; 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=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-43df566f4a8si33461071cf.330.2024.05.10.03.50.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 10 May 2024 03:50:22 -0700 (PDT) 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=@linaro.org header.s=google header.b=ByLvpVQE; 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=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s5NpA-0001xc-Oa; Fri, 10 May 2024 06:50:05 -0400 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 1s5Noy-0001ob-75 for qemu-devel@nongnu.org; Fri, 10 May 2024 06:49:49 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s5Nou-0001Wv-MD for qemu-devel@nongnu.org; Fri, 10 May 2024 06:49:46 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-41fd5dc04f0so9555255e9.0 for ; Fri, 10 May 2024 03:49:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1715338183; x=1715942983; 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=f6xsQqOmikZFwXbyDk6ZpqqheWDHvbw4l/2JG+MVzRA=; b=ByLvpVQETrEL0LhjnwyS/H2dH8apyGyxayszlwbsr5shLr6TWCJa1RlAJLncUCAP1d SEYGbxY7M9wxz7T46ArOORat3VSfk+PqbRGAXap8UERMC50GjMAfCbpZOwlufTQGRmsQ HN7JejWk3VIpoFLERcO1ibwPKb905O1rzWgZ3KFJzdBK4klNnnrgeoA8BqPCK2Bxt09/ r9PT6cWcryce2vZc/UNJRODsRPns8VbrnQWs3Q+1vBPq67K3npKtKtWm2WnINTGnK+E9 VV0GBn0stE0iSfmK0sjfqCFrGrDXplhPdK5rWAf3Hpy91VglOpjb5nZ2vkQBdntlyaQY FSow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715338183; x=1715942983; 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=f6xsQqOmikZFwXbyDk6ZpqqheWDHvbw4l/2JG+MVzRA=; b=b8DfjKhYlxJgQafsfQHcBhwrxVNFFrlkwhoz9TNHkByZ12Pq3XasdajAAy69VOlRCL 5aO0KzFRGewAzwbp8D1vNoJBhUnFzn+7XSbSzun+JMOXA3pXrKI/srqlYgmkXqPF+Ojr pIBu0k/SkQrG/i81cQnd2j5UO316kszFIuJxmp0G9aFUVum9XhLxEGu9YH8+Eqjrobxu quEeTmmB//tWER1BvdRQFCIYehUJdbJDdcH/D4ZbjbrhfSVBjbnXlpKfiyveV/Hu60p2 Oz9CfmK2g7J+h8MZ1lW64AnICoGs1KPvIm3TSTBtTobPfqfYEdPbJNVzn2fMzxzIHI7c IGEw== X-Gm-Message-State: AOJu0Yxu1U4ra6bPqOu0BY/5rWRQYCe0Z9BQtYBp7vYsv6EEdE54fxZU XQwmENs+MvlppOPVyv8xaML1ql+KflJJnIKQ5EH4HYyNy1y6yOVJr98wydTtobaU3TeRfpwuA2e + X-Received: by 2002:a05:600c:490a:b0:41f:dcdd:5631 with SMTP id 5b1f17b1804b1-41feaa30cfamr23776095e9.13.1715338182860; Fri, 10 May 2024 03:49:42 -0700 (PDT) Received: from m1x-phil.lan (sev93-h02-176-184-17-152.dsl.sta.abo.bbox.fr. [176.184.17.152]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3502baacf52sm4278278f8f.87.2024.05.10.03.49.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 10 May 2024 03:49:42 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Paolo Bonzini Cc: Anthony PERARD , Paul Durrant , Richard Henderson , xen-devel@lists.xenproject.org, Stefano Stabellini , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Gerd Hoffmann , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 5/7] hw/xen: initialize legacy backends from xen_bus_init() Date: Fri, 10 May 2024 12:49:06 +0200 Message-ID: <20240510104908.76908-6-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240510104908.76908-1-philmd@linaro.org> References: <20240510104908.76908-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.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 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: Paolo Bonzini Prepare for moving the calls to xen_be_register() under the control of xen_bus_init(), using the normal xen_backend_init() method that is used by the "modern" backends. This requires the xenstore global variable to be initialized, which is done by xen_be_init(). To ensure that everything is ready at the time the xen_backend_init() functions are called, remove the xen_be_init() function from all the boards and place it directly in xen_bus_init(). Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé Message-ID: <20240509170044.190795-7-pbonzini@redhat.com> Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Paul Durrant --- hw/i386/pc.c | 1 - hw/xen/xen-bus.c | 4 ++++ hw/xen/xen-hvm-common.c | 2 -- hw/xenpv/xen_machine_pv.c | 5 +---- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 505ea750f4..19f21953b4 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1250,7 +1250,6 @@ void pc_basic_device_init(struct PCMachineState *pcms, pci_create_simple(pcms->pcibus, -1, "xen-platform"); } xen_bus_init(); - xen_be_init(); } #endif diff --git a/hw/xen/xen-bus.c b/hw/xen/xen-bus.c index fb82cc33e4..95b207ac8b 100644 --- a/hw/xen/xen-bus.c +++ b/hw/xen/xen-bus.c @@ -13,6 +13,7 @@ #include "hw/sysbus.h" #include "hw/xen/xen.h" #include "hw/xen/xen-backend.h" +#include "hw/xen/xen-legacy-backend.h" /* xen_be_init() */ #include "hw/xen/xen-bus.h" #include "hw/xen/xen-bus-helper.h" #include "monitor/monitor.h" @@ -329,6 +330,9 @@ static void xen_bus_realize(BusState *bus, Error **errp) goto fail; } + /* Initialize legacy backend core & drivers */ + xen_be_init(); + if (xs_node_scanf(xenbus->xsh, XBT_NULL, "", /* domain root node */ "domid", NULL, "%u", &domid) == 1) { xenbus->backend_id = domid; diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c index 1627da7398..2d1b032121 100644 --- a/hw/xen/xen-hvm-common.c +++ b/hw/xen/xen-hvm-common.c @@ -872,8 +872,6 @@ void xen_register_ioreq(XenIOState *state, unsigned int max_cpus, xen_bus_init(); - xen_be_init(); - return; err: diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c index 1130d1a147..b500ce0989 100644 --- a/hw/xenpv/xen_machine_pv.c +++ b/hw/xenpv/xen_machine_pv.c @@ -34,8 +34,7 @@ static void xen_init_pv(MachineState *machine) { setup_xen_backend_ops(); - /* Initialize backend core & drivers */ - xen_be_init(); + xen_bus_init(); switch (xen_mode) { case XEN_ATTACH: @@ -60,8 +59,6 @@ static void xen_init_pv(MachineState *machine) vga_interface_created = true; } - xen_bus_init(); - /* config cleanup hook */ atexit(xen_config_cleanup); }