From patchwork Mon Nov 13 19:02:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 743486 Delivered-To: patch@linaro.org Received: by 2002:a5d:67cf:0:b0:32d:baff:b0ca with SMTP id n15csp1793538wrw; Mon, 13 Nov 2023 11:03:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IHgtpsYKZQVLNkqQ8fxdUTTGePNFMUxCRxtMCLJg4GXy/TasAk/ribjAStuMkzEwTJ+0uBM X-Received: by 2002:a05:620a:4006:b0:77a:25bd:e616 with SMTP id h6-20020a05620a400600b0077a25bde616mr63542qko.42.1699902229507; Mon, 13 Nov 2023 11:03:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699902229; cv=none; d=google.com; s=arc-20160816; b=a5YcV+kVbCxfA2sCWHo4XkEFkAtRJo1nPY5V/QcqHiOAvVeiI/v93t0ltFYdrRpjdI gsA08xUuB3spLk2EOfVnpNrHqowjX4iUuRfiE0p1fL32Kd6YbPAxk3cm6XTEfUJynl/T my+l9tHLMsifPArNXgp/ufnKtpaewg1JZd0Z9EpzmAonayRShGrp8ZbCZzp7Bn313zxr UgNciBNmX9Kxjw+kzXwTELeg6hjaoQ3ShIEcSXwNM4d8sQgV7fJcPOWlOvRW+MN9hv8D YuvQfdfongIdXiOeV1Pps2nwHintCvLZuX5HQvpz3ss9hMgeD+9o0xfQb7Qsty8TgI2w FtbA== 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=pKs2iaNGcckU3ni81u+5apbwGwozAkz/WW7uZAFdepY=; fh=j5N4gOp3ka1Xsisgn/3FSSHjf2kwoyjMvxSEx5jWFCk=; b=vhDOJVdqpI+uceSQxRC/aFkE/N57r/ah0ebVFPd6pq3iZNFca29Iq9sZUgfrZtZltB n+Iv4zW3mBGg3u3zs2C6M0+c7e29bFn4OX+yyeGVLul1qjzwZ9eDVNl7jGtIl62g8i/H IZG04y0M2P23ILEcCw/N6ErkNiZJcMYBGXfSl8oNrxwucYSsBxAee9GoaA3Xpujvav59 CbIGWPiKbkkTeHCS4ZSbE6Ca5eDUhvJ6AAR3BOR2p2mPEJb9fUe+5/GQRJIiC9c2xdWn qVKnsfu619U1Mv0p6H0lZKFFYvakn0wQNXkAI8xE/hssZ1cApcG4oUNHYzKAB70dJm2i bB+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ma+SD+Fa; 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 bj18-20020a05620a191200b0077411b34546si5055388qkb.243.2023.11.13.11.03.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Nov 2023 11:03:49 -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=Ma+SD+Fa; 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 1r2cCq-0002eV-8x; Mon, 13 Nov 2023 14:02:44 -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 1r2cCn-0002e6-Ge for qemu-devel@nongnu.org; Mon, 13 Nov 2023 14:02:41 -0500 Received: from mail-qt1-x82d.google.com ([2607:f8b0:4864:20::82d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r2cCj-0000LF-LR for qemu-devel@nongnu.org; Mon, 13 Nov 2023 14:02:39 -0500 Received: by mail-qt1-x82d.google.com with SMTP id d75a77b69052e-41eae4ebf61so31158171cf.2 for ; Mon, 13 Nov 2023 11:02:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699902156; x=1700506956; 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=pKs2iaNGcckU3ni81u+5apbwGwozAkz/WW7uZAFdepY=; b=Ma+SD+FaeB0XJSF0amKQLnzM2tzC2BIbBoRKBdG+dWKMFo93phgu4+/kU6Knjt+88M GxtuIVNXHd01Q7nSZY1f5OjK5wu5o7RqEu7NlHalZ6w/h1IXooi3opARjI+aaGt/S++6 J42afjuuItxD0KvKg+RfB8R0moMpAd63ox1QIxzTE4i9n74ci/0NKN9vN4WM1lIhWGbo bxQYl4I+MIt/Q7HZpoe2psREp+/QUV32GNhEF081AIKCqOQIPXBYbe8y6WlvgDO6TpPZ rBxFoSgWq0X7usemjaO+3ljL/W9bUK4Mu8jcNk5vn3Gto84oHjD9jYq4USZDvZCOk89H LeiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699902156; x=1700506956; 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=pKs2iaNGcckU3ni81u+5apbwGwozAkz/WW7uZAFdepY=; b=iB9L6OOK3XjS4j3XYDzzW4nRlQ79iSh+2gJkh9ZG6TvXOevOqU1wVd0QOnFdOHxifq VSykEwmTK0PmZufoa0hmM4JNTsohNZ1/Oedohr8KzorL0QvVIEluOngFmvvY/MZ/NAzE CdnVcSD+Po/9CtPREHi5iO0zfj48RNcxD2vMaVsoV5slU2DqpRyF6hXmW1OVFONcgMUh uYa7ooI9CovfxUNv5og3pDruA6Q4z3aHo8gEsDciDsR/GcErZTW9pmYZ6uXEbHqGiqWI 3OVgZK2VS4fZrMMzPuGkdeyDMtadE1K1GW3BDvc6jlKhDHkGWRSQNMqhhH+DEedCs+Ld 8wMg== X-Gm-Message-State: AOJu0YxaXJQplpbm4zTqBKFAbXXsNsSB1LIx3Jf1lw3z8gDzGzz1RJAh ltvwjbHGiRAVi/SOKpxV+GE0guq0rq2n2wzMLeaGhvr0ovY= X-Received: by 2002:ac8:4e83:0:b0:41c:c34a:84af with SMTP id 3-20020ac84e83000000b0041cc34a84afmr17686qtp.6.1699902156181; Mon, 13 Nov 2023 11:02:36 -0800 (PST) Received: from localhost.localdomain ([12.186.190.1]) by smtp.gmail.com with ESMTPSA id kq4-20020ac86184000000b004181c32dcc3sm2124834qtb.16.2023.11.13.11.02.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 11:02:34 -0800 (PST) From: Leo Yan To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Gerd Hoffmann , "Michael S . Tsirkin" , Manos Pitsidianakis , =?utf-8?q?Marc-Andr?= =?utf-8?q?=C3=A9_Lureau?= , Leo Yan Subject: [PATCH v2 3/4] hw/virtio: Move vhost-user-input into virtio folder Date: Tue, 14 Nov 2023 03:02:10 +0800 Message-Id: <20231113190211.92412-4-leo.yan@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231113190211.92412-1-leo.yan@linaro.org> References: <20231113190211.92412-1-leo.yan@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::82d; envelope-from=leo.yan@linaro.org; helo=mail-qt1-x82d.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 --- MAINTAINERS | 2 +- hw/input/meson.build | 1 - hw/virtio/meson.build | 4 +++- hw/{input => virtio}/vhost-user-input.c | 0 4 files changed, 4 insertions(+), 3 deletions(-) rename hw/{input => virtio}/vhost-user-input.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index ef72c6d512..b0b6db38c7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2234,8 +2234,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/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