From patchwork Mon Nov 13 01:16:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 743444 Delivered-To: patch@linaro.org Received: by 2002:a5d:67cf:0:b0:32d:baff:b0ca with SMTP id n15csp1403976wrw; Sun, 12 Nov 2023 17:18:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IGUiKdnmTOnyAJ/RUb4Y5r/cB+cAVj2l5xkFAMu80o2EFitXlyYx4L8GvU2IerhifXDQeig X-Received: by 2002:a05:622a:1991:b0:410:9089:6b74 with SMTP id u17-20020a05622a199100b0041090896b74mr6135925qtc.15.1699838309639; Sun, 12 Nov 2023 17:18:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699838309; cv=none; d=google.com; s=arc-20160816; b=onOpDoZLix5dX3n71/CZG/0VndexdRXETHWgP7Z+lAyDdGKV2TzMdeL2AmazQramMm ULpu5GWnvhYC3K9gKbeRqoNaQhbX/6QUa3auWhzDNM6jspungro8UKmwu+nFwCDCtwth OT1yN1Qc83tXkg201qY/fFOAwMJ5cV6yDoTRNJyI//lUCE99BT7fAMWCgQtNGYBItkVb Cw6UFKt7vUXpKNshEgGNuQY5KIjojA4H87oI5TSr1ZPgXZK8p2PxQzYkR9UvJhLQZZAv oOPZd+XsUfFP/NK5c6OHt+hRuWQylXLmTrhpSLcTvShVyEM9u/SB/Rb1gjqSCdy/zMTg +DoA== 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=CnIjF81Iq4zeaKROB6E3ZJNVF7enVvjwzbGJ8K3b0k4=; fh=wuGuGNzRUBT5nBQhy+zJrmr0MipRLMv40xtKcfwYGIM=; b=fdG+deScZsJPoB3ZU9wUJE8NbrUy3DC/gSfzZLvKiHzXGoiIM7dVtlCLJAVYaDqUN+ PIXwiP5JFw7JaNBhm8vsDp6cgg2eOm8VAnoqM/JiDgAezcJguICXoZOsrFH1EWRj75nm U1EcTTWL86pj9vnnzyrdsBg5qhyJBoJBJ8hvpltwGB74M6pmB0MEze5dkCOv/U1SGq+d 5fM/xa4eM85uU+MrOzEmpID/z78GfcSfR1D+ejuUB2LEc8+BScR3HKc0vQTOmUiWyuLM w2BA15gcRTZ7clYV1MOjPPigEzCapD9H+1G/PqNMOyAiaN2qfVXh8IMkjRCo7KlJuq/B EJTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="vh/lrjJd"; 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 w14-20020ac87e8e000000b0041cc1bc8ed8si3832024qtj.23.2023.11.12.17.18.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 12 Nov 2023 17:18:29 -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="vh/lrjJd"; 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 1r2LaD-0000c0-PD; Sun, 12 Nov 2023 20:17:45 -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 1r2LaC-0000b5-HY for qemu-devel@nongnu.org; Sun, 12 Nov 2023 20:17:44 -0500 Received: from mail-oa1-x31.google.com ([2001:4860:4864:20::31]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r2LaA-0003pc-RH for qemu-devel@nongnu.org; Sun, 12 Nov 2023 20:17:44 -0500 Received: by mail-oa1-x31.google.com with SMTP id 586e51a60fabf-1efb9571b13so2517301fac.2 for ; Sun, 12 Nov 2023 17:17:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699838261; x=1700443061; 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=CnIjF81Iq4zeaKROB6E3ZJNVF7enVvjwzbGJ8K3b0k4=; b=vh/lrjJdDVrKdfaX8qtd+/sx9fYI67hcfUQc5Ajjw0O+84wTrxKZJaafo84rFaqv8A qoXC2uQeInLABUYih9t45P/EIMd3jcz59OE0MUPmS0YK+MGyefMqNBwCdIefrQN69Z7y VRllSywr9zvoCvveaL3ySVBkVVOq8n17LU+Os21r1BiaQ6Gzh5zKJk5ucY1rEjB/oblY BeRNplnvcjipDI+iQpvl9yu06h5elJBon1tkfGyffoGhrh0Nz2QUwxaXhSuxY7oxSjYZ TVRvO/XPZmQkdZ46sHLjw5ctR1KqWpcWYDwWLpuk/eIQVo0rbjE2NptILewHrrbXcv1l lYnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699838261; x=1700443061; 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=CnIjF81Iq4zeaKROB6E3ZJNVF7enVvjwzbGJ8K3b0k4=; b=L1FC5chkFeQTHXfy4sA0S1sdOwyX2lmk2MF1IwLXnctuv9Na5vWSHOmLVav9UbHueu O3aNmfQ37E17hGjnjAc1bG7UbFF6T6KCBVF/YasYPohJ2UiT8DuEx1WeG3j/gE+IknEh h+tjZ8UNm8JkA75Dtew/3PP9lsesa1WodV1GJPnuZLf8Ms9lFXBwMZ5sOZuwnsg4BdwT 3VA/LrFK8pREOXH9cfUYNoKlUQzFmaW/oCpa5ZumEBD1gt5rM7kjpWJzGpi4GVS5F6ii DXc2aNulUJVon+m7R8sw4TSwhS4St6o136JjuLucqmUbuhqMPXsbBg7HaEDljELPE1BX 0WjQ== X-Gm-Message-State: AOJu0YxCB9aZ0cyPmCppAEgpae7bMGFndW7zl4/rx2DTKlBxekrDhIuU o4c0+q7u9N1Cz3A6zL3sKevO7uIVXT0Ck8tjfxXqDcTSE5Q= X-Received: by 2002:a05:6870:887:b0:1ea:6a7b:e40a with SMTP id fx7-20020a056870088700b001ea6a7be40amr7142194oab.59.1699838261335; Sun, 12 Nov 2023 17:17:41 -0800 (PST) Received: from localhost.localdomain ([128.1.74.235]) by smtp.gmail.com with ESMTPSA id r6-20020aa78b86000000b0064f76992905sm2918511pfd.202.2023.11.12.17.17.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Nov 2023 17:17:40 -0800 (PST) From: Leo Yan To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , "Michael S . Tsirkin" , Gerd Hoffmann , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Manos Pitsidianakis , Leo Yan Subject: [PATCH v1 3/4] hw/virtio: Move vhost-user-input into virtio folder Date: Mon, 13 Nov 2023 09:16:41 +0800 Message-Id: <20231113011642.48176-4-leo.yan@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231113011642.48176-1-leo.yan@linaro.org> References: <20231113011642.48176-1-leo.yan@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2001:4860:4864:20::31; envelope-from=leo.yan@linaro.org; helo=mail-oa1-x31.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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 --- hw/input/meson.build | 1 - hw/virtio/meson.build | 4 +++- hw/{input => virtio}/vhost-user-input.c | 0 3 files changed, 3 insertions(+), 2 deletions(-) rename hw/{input => virtio}/vhost-user-input.c (100%) diff --git a/hw/input/meson.build b/hw/input/meson.build index 640556bbbc..3cc8ab85f0 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 118d4d4da7..c924afcafc 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')) 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