From patchwork Thu Jan 4 21:09:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 759882 Delivered-To: patch@linaro.org Received: by 2002:a5d:67c6:0:b0:336:6142:bf13 with SMTP id n6csp7183844wrw; Thu, 4 Jan 2024 13:12:52 -0800 (PST) X-Google-Smtp-Source: AGHT+IFctLSjL5RotccfV+Yy1OrEVcteUkp1RNoPX8nToUsDG/wDwR1AyuKz0xn3bJUu8g1Qvxp9 X-Received: by 2002:a05:6808:f10:b0:3bc:d0:ac71 with SMTP id m16-20020a0568080f1000b003bc00d0ac71mr1338060oiw.24.1704402772629; Thu, 04 Jan 2024 13:12:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704402772; cv=none; d=google.com; s=arc-20160816; b=fFlBfTqnbSOIW9UBnZfPdduAF8CwA0u08xD52lImpHW4iFUUR2A6JCgglVyfsz3fiO 5TqrnswzOnDpZqsxxUNVd8z57xnq5sZjaALvHlE8nc5GssY6HKRaOXMSpqpl1PC2bMDq FX3ccGhW1fI6ycFUOGwTeFINfZI+Sns7VF1NkG0FKPLm9onh3FWY6uqRmNus78jI57b3 tDADXmBqqQb0UbIkywdiS94f9WKBnu4+g9JRzKJgGMmlOfE0cO3GkCJuD1GVPCQ5MIsJ U6nLxR1xVQf4u0fUfTVRl44hMdmIQ+RsHWQUtY7s/ida4G27LvLZ41ysgGi+hlar8oX8 1gtw== 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=zpHAzaxTJd2Vec5B4UMxY6RAVe5qp1syQpkc++MJBDc=; fh=Ud52xLVns4YOXK9oAfV6buiiCgh2jRAKo3BCP7q+jII=; b=VfWD8zaCgFH6GXkMVQEkPZPyCOknIbYnsAhf6paGFoYbxRsHI2zi1J31taD+Q5znFE ETHHPcLTNTrgBGKYOHTsi7XBRKExDaq/ZUJGOxfVTlViqELk3qgORnZbOl2CqIsjF0Hr +ZPLmtNfBtsNU/NNnuTStW9uiXhx9ejnvb6L8QvTrkaZLWlQ6Cnmek9bK2e//ItCEcDF oQuMqWc01Dfb9T3bJQrN/iisaw99dxxzNvJgRWvGEcDAd/H5vZC2gmt0Ftwsew5r1oZH LHdpCNyTjAKligT+MtHoMxNTfw7Z8UQAAI13G6l4SaAGqVSuD7Y7y2YPbHG/appaltgH y13g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=h2KQymzd; 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 t21-20020a05620a451500b00781cb2e8277si333593qkp.133.2024.01.04.13.12.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 04 Jan 2024 13:12:52 -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=@linaro.org header.s=google header.b=h2KQymzd; 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 1rLUzT-0007XU-UQ; Thu, 04 Jan 2024 16:10:59 -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 1rLUyV-0006ww-FK for qemu-devel@nongnu.org; Thu, 04 Jan 2024 16:10:00 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rLUyS-0007V3-Dr for qemu-devel@nongnu.org; Thu, 04 Jan 2024 16:09:59 -0500 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-40d60c49ee7so9243295e9.0 for ; Thu, 04 Jan 2024 13:09:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704402594; x=1705007394; 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=zpHAzaxTJd2Vec5B4UMxY6RAVe5qp1syQpkc++MJBDc=; b=h2KQymzdBk5p3CjRKSsD7qYmEBdFEtMMCbPbEv7JPR1AQ0kZCDcO1+mioyce/wrlbp LzFVCEpuNqkpv0r51hmTYDWOn+whCTZsqVaVllp3d96+aUXqLMHA42UxgKJSFPGYXHdS 0uYoBdz5mBecY3G/SF4vlxv/pbb5W4H4Lum/1rdYay+ae9Zfie9chYx6Z99hJzKkOOfm FLwKWFHb7nG4f2Z29STWGkF/QlB3p8F/YIKjdf2Rvz+D012dlT0w5yol/721R0V9AxtI h0u8Isy/uzIijLG9nNJUC5Rj/wmrO3AlAcNCzNSbSkMnNify9MGaH/4Qk6ZhMSO2QdkP iVzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704402594; x=1705007394; 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=zpHAzaxTJd2Vec5B4UMxY6RAVe5qp1syQpkc++MJBDc=; b=XAZrbOfX8owaUSYayoADC40Z5lUs3PAySkQvGmNsHTMc0vH0cMaSNDsI5Q/Z46Xzqt SNDUheqUNoyMXoowYeKNbUOQbhhM3A2q3it2s5xyW8V3un6Rx7US/gO0dZO9CMaULkob TQWqW7VkyScfV0BSqtD9boCzQ0MBqdRz3woZnXxu/YbzKwXpt7kyfvKcoYgp1x8ItkvX YYn37fB3jmt7iZvG9zEN8tSnjp7CP1+2BFyb4i677FY2a3iPCSE+vfp/1HMts7SbO8Hu sLmOFOyv1YWHl3Vl887TBa683arBsoavkl1hMCVfqQhVpwnRLyZtVbr4Ek0Y0OxOWxJM LEmA== X-Gm-Message-State: AOJu0Ywn3FDuW8yyryn9nI7Zec6NbBb8H/lUpk/MAk5Q7YyTT//1/LnQ IlHzVOplX1J6jXdnJPHCywCUfy8xo6djxA== X-Received: by 2002:a7b:c8d3:0:b0:40d:87ed:7c80 with SMTP id f19-20020a7bc8d3000000b0040d87ed7c80mr711291wml.18.1704402594740; Thu, 04 Jan 2024 13:09:54 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id f17-20020a05600c155100b0040d934f48d3sm353945wmg.32.2024.01.04.13.09.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 13:09:53 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 141C95F944; Thu, 4 Jan 2024 21:09:46 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Mathieu Poirier , Kevin Wolf , Mark Cave-Ayland , Jason Wang , Erik Schilling , Eric Blake , Fam Zheng , =?utf-8?q?Marc-?= =?utf-8?q?Andr=C3=A9_Lureau?= , Eduardo Habkost , virtio-fs@redhat.com, Hanna Reitz , =?utf-8?q?Alex_Benn=C3=A9e?= , Manos Pitsidianakis , =?utf-8?q?Daniel_P=2E?= =?utf-8?q?_Berrang=C3=A9?= , qemu-block@nongnu.org, Markus Armbruster , "Gonglei (Arei)" , "Michael S. Tsirkin" , Raphael Norwitz , Paolo Bonzini , Viresh Kumar , Stefan Hajnoczi , Leo Yan Subject: [PATCH v9 10/11] hw/virtio: Move vhost-user-input into virtio folder Date: Thu, 4 Jan 2024 21:09:44 +0000 Message-Id: <20240104210945.1223134-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240104210945.1223134-1-alex.bennee@linaro.org> References: <20240104210945.1223134-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.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=unavailable 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: Leo Yan vhost-user-input is in the input folder. On the other hand, the folder 'hw/virtio' maintains other virtio stubs (e.g. I2C, RNG, GPIO, etc). This patch moves vhost-user-input into the virtio folder for better code organization. No functionality change. Signed-off-by: Leo Yan Reviewed-by: Manos Pitsidianakis Message-Id: <20231120043721.50555-4-leo.yan@linaro.org> Signed-off-by: Alex Bennée --- MAINTAINERS | 2 +- hw/{input => virtio}/vhost-user-input.c | 0 hw/input/meson.build | 1 - hw/virtio/meson.build | 4 +++- 4 files changed, 4 insertions(+), 3 deletions(-) rename hw/{input => virtio}/vhost-user-input.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index ff70987aeb3..66bd1eadc78 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2275,8 +2275,8 @@ virtio-input M: Gerd Hoffmann S: Odd Fixes F: docs/system/devices/vhost-user-input.rst -F: hw/input/vhost-user-input.c F: hw/input/virtio-input*.c +F: hw/virtio/vhost-user-input.c F: include/hw/virtio/virtio-input.h F: contrib/vhost-user-input/* diff --git a/hw/input/vhost-user-input.c b/hw/virtio/vhost-user-input.c similarity index 100% rename from hw/input/vhost-user-input.c rename to hw/virtio/vhost-user-input.c diff --git a/hw/input/meson.build b/hw/input/meson.build index 640556bbbcc..3cc8ab85f0c 100644 --- a/hw/input/meson.build +++ b/hw/input/meson.build @@ -11,7 +11,6 @@ system_ss.add(when: 'CONFIG_TSC2005', if_true: files('tsc2005.c')) system_ss.add(when: 'CONFIG_VIRTIO_INPUT', if_true: files('virtio-input.c')) system_ss.add(when: 'CONFIG_VIRTIO_INPUT', if_true: files('virtio-input-hid.c')) system_ss.add(when: 'CONFIG_VIRTIO_INPUT_HOST', if_true: files('virtio-input-host.c')) -system_ss.add(when: 'CONFIG_VHOST_USER_INPUT', if_true: files('vhost-user-input.c')) system_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_keypad.c')) system_ss.add(when: 'CONFIG_TSC210X', if_true: files('tsc210x.c')) diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index 118d4d4da7c..c924afcafc0 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -25,6 +25,7 @@ if have_vhost system_virtio_ss.add(when: 'CONFIG_VHOST_USER_I2C', if_true: files('vhost-user-i2c.c')) system_virtio_ss.add(when: 'CONFIG_VHOST_USER_RNG', if_true: files('vhost-user-rng.c')) system_virtio_ss.add(when: 'CONFIG_VHOST_USER_SND', if_true: files('vhost-user-snd.c')) + system_virtio_ss.add(when: 'CONFIG_VHOST_USER_INPUT', if_true: files('vhost-user-input.c')) # PCI Stubs system_virtio_ss.add(when: 'CONFIG_VIRTIO_PCI', if_true: files('vhost-user-device-pci.c')) @@ -36,6 +37,8 @@ if have_vhost if_true: files('vhost-user-rng-pci.c')) system_virtio_ss.add(when: ['CONFIG_VIRTIO_PCI', 'CONFIG_VHOST_USER_SND'], if_true: files('vhost-user-snd-pci.c')) + system_virtio_ss.add(when: ['CONFIG_VIRTIO_PCI', 'CONFIG_VHOST_USER_INPUT'], + if_true: files('vhost-user-input-pci.c')) endif if have_vhost_vdpa system_virtio_ss.add(files('vhost-vdpa.c')) @@ -59,7 +62,6 @@ virtio_pci_ss = ss.source_set() virtio_pci_ss.add(when: 'CONFIG_VHOST_VSOCK', if_true: files('vhost-vsock-pci.c')) virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_VSOCK', if_true: files('vhost-user-vsock-pci.c')) virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-user-blk-pci.c')) -virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_INPUT', if_true: files('vhost-user-input-pci.c')) virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-user-scsi-pci.c')) virtio_pci_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vhost-scsi-pci.c')) virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_FS', if_true: files('vhost-user-fs-pci.c'))