From nobody Wed Nov 27 06:31:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1699902191; cv=none; d=zohomail.com; s=zohoarc; b=ieeNIUk8s0xNgJ3zR6h6YEvkdhYltvE0aHqTZzb75cPTWUbiNRudj5Rqvm6zaPz5e1IlEc63op1Au9kD6TLmKZkZ8qdr0gH6Ic5LnUukFUV3+vCN+xqbT4w52tP7S5cN4iJ8z7uimMrcCgZXOOcKiG3s30oINYHbGTZKZ9beKHw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699902191; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=T9oQMwnfds7gwheh540NHUto9x6gbHU1X9JBynkAdpY=; b=bJLMcb0YyXs40X2qF92lTOEmHKIU1Rdn+szmfhL7TJDDIaTVx66l9zTpuVwYl87C8u22fvjhdM4surH7e+OCKe9bsp1kAawYu7YJd1YDwjO5C6EivUZLIF3vh3Lb2xTw+HvmguPCZ6j6nAgbFdp7zmV9F0kUF3jo2l6D8T/2KU0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1699902191755450.76951911458434; Mon, 13 Nov 2023 11:03:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r2cCi-0002dL-LV; Mon, 13 Nov 2023 14:02:37 -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 1r2cCf-0002d4-Ut for qemu-devel@nongnu.org; Mon, 13 Nov 2023 14:02:34 -0500 Received: from mail-qt1-x82e.google.com ([2607:f8b0:4864:20::82e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r2cCd-0000Ki-5K for qemu-devel@nongnu.org; Mon, 13 Nov 2023 14:02:32 -0500 Received: by mail-qt1-x82e.google.com with SMTP id d75a77b69052e-41b7ec4cceeso27832551cf.1 for ; Mon, 13 Nov 2023 11:02:30 -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.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 11:02:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699902150; x=1700506950; 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=T9oQMwnfds7gwheh540NHUto9x6gbHU1X9JBynkAdpY=; b=M2ajJyqkCwRwWifWXQDJKrticpN6AaK1rVJmE7ZLew2NefgoQr7IjqMMmhSBfp/8+H aCkQaB+x+5jIHF4FjjYFluMN/bxdeOuUuGRkxDagCGekar7RZRuvYrq5DQbF2C86nnkJ +iF7FF6rPmmOXbi6oo+3nD2lcsr1ihsYSRIuqbIugPh+WnTRe3NehfDU7T0csdx/2RLO mwMi2HvsxmhUQBUBF8AsQy2CbNBCOF83m13HkSe6wrP4xnVXH5Rg+77nR4Jw2sVOZSkV R8wbr3jPjY4meLunUspjaV+WInbxrasRVbc1xXlRfr+KQIJqxyt0keMpHlAwwgPVdoJs dAZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699902150; x=1700506950; 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=T9oQMwnfds7gwheh540NHUto9x6gbHU1X9JBynkAdpY=; b=kbDYjoPTwTgR8SHyfqGxKHNHilCWHODM0jfgO9610ZtnmmYh0+fN+PpQBqhBfA3G+r 7JfEOUJ0mYivxZFzZiC4oKe//9ksRYkYUk8MrfgP8t3BdILSSgV5DT0O0IBr781PLV0b cji40AEepKrrsblTKrb+5evgQ3Yv8FwzSLunEGXslMjsKt+RJcydCTdoL1CGZyaxm8s+ c1d52pGmwsyUGjd9JWlcZ96PF1PpcsoY7sEZDwassNMc3oklLsK1g7xiazk5rVyFGkdN +DlvzjOtn8HSODpCci3ksuP0nZe613cyy5/P9UVQkqOPlGoIAyQPgqT1Iwg+iuJL9YfI yfWw== X-Gm-Message-State: AOJu0YxWvRyqgJn99Y22Hedtr/jTfARDV2KYNXti5Kdg7VU7oXoarW9J EFooQjdwfT9DTYaAdrzYTw0wdQt+Vsh2R/5JqzbJ8GyfwBA= X-Google-Smtp-Source: AGHT+IHPoFxzYvVu79GJZPGxA5Gn5C5BIkMBWS6C0V1ERvKXH7v6HeU/b6exAxFcVLjf11W+t7xeaQ== X-Received: by 2002:ac8:5a83:0:b0:418:194a:f9fe with SMTP id c3-20020ac85a83000000b00418194af9femr9009254qtc.62.1699902149795; Mon, 13 Nov 2023 11:02:29 -0800 (PST) From: Leo Yan To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Gerd Hoffmann , "Michael S . Tsirkin" , Manos Pitsidianakis , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Leo Yan Subject: [PATCH v2 1/4] hw/virtio: Support set_config() callback in vhost-user-base Date: Tue, 14 Nov 2023 03:02:08 +0800 Message-Id: <20231113190211.92412-2-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 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::82e; envelope-from=leo.yan@linaro.org; helo=mail-qt1-x82e.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1699902193669100001 Content-Type: text/plain; charset="utf-8" The Virtio input device invokes set_config() callback for retrieving the event configuration info, but the callback is not supported in vhost-user-base. This patch adds support set_config() callback in vhost-user-base. Signed-off-by: Leo Yan Reviewed-by: Marc-Andr=C3=A9 Lureau --- hw/virtio/vhost-user-base.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/hw/virtio/vhost-user-base.c b/hw/virtio/vhost-user-base.c index 78cfa9a5bb..a83167191e 100644 --- a/hw/virtio/vhost-user-base.c +++ b/hw/virtio/vhost-user-base.c @@ -140,6 +140,22 @@ static void vub_get_config(VirtIODevice *vdev, uint8_t= *config) } } =20 +static void vub_set_config(VirtIODevice *vdev, const uint8_t *config_data) +{ + VHostUserBase *vub =3D VHOST_USER_BASE(vdev); + int ret; + + g_assert(vub->config_size && vub->vhost_user.supports_config =3D=3D tr= ue); + + ret =3D vhost_dev_set_config(&vub->vhost_dev, config_data, + 0, vub->config_size, + VHOST_SET_CONFIG_TYPE_FRONTEND); + if (ret) { + error_report("vhost guest set device config space failed: %d", ret= ); + return; + } +} + /* * When the daemon signals an update to the config we just need to * signal the guest as we re-read the config on demand above. @@ -337,6 +353,7 @@ static void vub_class_init(ObjectClass *klass, void *da= ta) vdc->unrealize =3D vub_device_unrealize; vdc->get_features =3D vub_get_features; vdc->get_config =3D vub_get_config; + vdc->set_config =3D vub_set_config; vdc->set_status =3D vub_set_status; } =20 --=20 2.34.1 From nobody Wed Nov 27 06:31:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1699902191; cv=none; d=zohomail.com; s=zohoarc; b=ThcBkT6vNQNpL9uWUr8/jhvSBmRVUqxZ4noQEpxfZ26fc/Dgcnis+s4//HhhQZ4+t8lCz5pZzsPO0QnDegiywSkaOYZzSQ60H+IyJ9a3gHJIg0JklToMllLcqz/tzoL7nJMmXCYNMQYmc1cvYIPo1s5sQqr7Wcgp3uYdyG3wKXA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699902191; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=FYSYSgbV/GuLcMBTYGrmXS1BeLIkylU92XcqQA40kIg=; b=IJRp0w1+7YRiTZnm2uFokzrnwmIlbfhfWYZpMIro6YOvPMZTaTyzzKkl1HCLgqprBUJtg/LreeYe99BqvOYqRmZ8P+yMX15BKLnZxidshTqsghUz34WHhIuVsBQPGolyKeyJ/Fjul3B3YokOn8a+tC/gMV4lvfP0v8Jv0vT+nj8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1699902191649695.2245796673539; Mon, 13 Nov 2023 11:03:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r2cCl-0002dj-9n; Mon, 13 Nov 2023 14:02:39 -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 1r2cCj-0002db-N0 for qemu-devel@nongnu.org; Mon, 13 Nov 2023 14:02:38 -0500 Received: from mail-qt1-x82c.google.com ([2607:f8b0:4864:20::82c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r2cCh-0000L5-7L for qemu-devel@nongnu.org; Mon, 13 Nov 2023 14:02:37 -0500 Received: by mail-qt1-x82c.google.com with SMTP id d75a77b69052e-421bcd0b532so16892841cf.2 for ; Mon, 13 Nov 2023 11:02:34 -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.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 11:02:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699902154; x=1700506954; 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=FYSYSgbV/GuLcMBTYGrmXS1BeLIkylU92XcqQA40kIg=; b=A/l2x5bXQoQRjKcmWHve+gCwW40StMbs8HD3VCH2dNZ5LS3Mwp7hxp7lQ0VwXneaIR s9mWzQ+K81EKH6RuJmsSkY6XMBX9NzwsMLvcYuAvaZRkfIKLZ9aDDGQPj4hfOIFzaFoZ G3qF1LR1VyaqtyHbegLuPxZNfszmtwLxBCe8Ye69rBqombAsA5qDvYVxejqkqMla9ZQS nmhsNkr7q1P50EIXCpauyAW2Rhaapp98gKIxPlr12BRiRdRffLWLbQVklK84tZvuNHB0 0h1yZwmWTQ0PVC60PFdc44Yz2Uw+Bd6mPF/YVzLLd3JOqTEBcPED7uuQLreaMACGFfUG LNXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699902154; x=1700506954; 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=FYSYSgbV/GuLcMBTYGrmXS1BeLIkylU92XcqQA40kIg=; b=DRCEp12Vo26oHW5+w/rdmAVVz7lgTRgrc7bttalI7m/6efzy3h6Tml99t38IBdMKTL uNh+DUW1BJ/CzcN7RWK1LKkZUnfsNI56uOBWA4WDxYYuZ69JS9ZayE5bIm+7mFk/LixQ aETYcziV3fWLsZiialES0q5h82knvs57OH4MrEBvBeDVxMZC9QrhgaPKHnAfDjfn84Tl chCSw8IbrU5/FlUzfYrM5gY5KRbrsnyPaakspjpFTxxVVZkrf6glDxMYC6PT5CvuO+ig CCdX0gNKUPZjnwn0U3Nw/3kBEd5ZPbL2t5+UYuhZMMbtbzYOg9cOnuMd+tAtBQwXIlyX Q7+A== X-Gm-Message-State: AOJu0Yy9CLljcgjoOBxqj/Bo3Go3wbZe4CRdX6olYK5c+o7YkJt+dGEv wyiZrxLRq7fSXlTZ6Hp3QhN45FYlTKIvdQqEgCEKgoSHd5k= X-Google-Smtp-Source: AGHT+IGvxbBXrnZiM2bOelyc9TrOdArai7bc4Pfvo8Scr8TboVgdCZXDEUKr6b3PMnIfNRDMPD2vXA== X-Received: by 2002:ac8:7fd3:0:b0:413:bd3:cda5 with SMTP id b19-20020ac87fd3000000b004130bd3cda5mr9226970qtk.49.1699902154250; Mon, 13 Nov 2023 11:02:34 -0800 (PST) From: Leo Yan To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Gerd Hoffmann , "Michael S . Tsirkin" , Manos Pitsidianakis , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Leo Yan Subject: [PATCH v2 2/4] docs/system: Add vhost-user-input documentation Date: Tue, 14 Nov 2023 03:02:09 +0800 Message-Id: <20231113190211.92412-3-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 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::82c; envelope-from=leo.yan@linaro.org; helo=mail-qt1-x82c.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1699902193679100003 Content-Type: text/plain; charset="utf-8" This adds basic documentation for vhost-user-input. Signed-off-by: Leo Yan --- MAINTAINERS | 1 + docs/system/devices/vhost-user-input.rst | 44 ++++++++++++++++++++++++ docs/system/devices/vhost-user.rst | 2 +- 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 docs/system/devices/vhost-user-input.rst diff --git a/MAINTAINERS b/MAINTAINERS index 86c649784e..ef72c6d512 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2233,6 +2233,7 @@ L: virtio-fs@redhat.com 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: include/hw/virtio/virtio-input.h diff --git a/docs/system/devices/vhost-user-input.rst b/docs/system/devices= /vhost-user-input.rst new file mode 100644 index 0000000000..4ff9dd4b27 --- /dev/null +++ b/docs/system/devices/vhost-user-input.rst @@ -0,0 +1,44 @@ +.. _vhost_user_input: + +QEMU vhost-user-input - Input emulation +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +This document describes the setup and usage of the Virtio input device. +The Virtio input device is a paravirtualized device for input events. + +Description +----------- + +The vhost-user-input device implementation was designed to work with a dae= mon +polling on input devices and passes input events to the guest. + +QEMU provides a backend implementation in contrib/vhost-user-input. + +Linux kernel support +-------------------- + +Virtio input requires a guest Linux kernel built with the +``CONFIG_VIRTIO_INPUT`` option. + +Examples +-------- + +The backend daemon should be started first: + +:: + + host# vhost-user-input --socket-path=3Dinput.sock \ + --evdev-path=3D/dev/input/event17 + +The QEMU invocation needs to create a chardev socket to communicate with t= he +backend daemon and share memory with the guest over a memfd. + +:: + + host# qemu-system \ + -chardev socket,path=3D/tmp/input.sock,id=3Dmouse0 \ + -device vhost-user-input-pci,chardev=3Dmouse0 \ + -m 4096 \ + -object memory-backend-file,id=3Dmem,size=3D4G,mem-path=3D/dev/shm,s= hare=3Don \ + -numa node,memdev=3Dmem \ + ... diff --git a/docs/system/devices/vhost-user.rst b/docs/system/devices/vhost= -user.rst index c6afc4836f..75b40f08c6 100644 --- a/docs/system/devices/vhost-user.rst +++ b/docs/system/devices/vhost-user.rst @@ -42,7 +42,7 @@ platform details for what sort of virtio bus to use. - See https://github.com/rust-vmm/vhost-device * - vhost-user-input - Generic input driver - - See contrib/vhost-user-input + - :ref:`vhost_user_input` * - vhost-user-rng - Entropy driver - :ref:`vhost_user_rng` --=20 2.34.1 From nobody Wed Nov 27 06:31:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1699902230; cv=none; d=zohomail.com; s=zohoarc; b=Leo2qofbn6ghfDTarOZL8AyoqNkJ8Bwl91CF84ngQY6sKWBcpmP3UNKCpXoKehBE4YoXWLkRLbZFCncUeZw8v+oDSVdCCwMmSok1S7E2H4EKUkVHVSDyGRcJoV6ar+2apjYk0IYzKLyNA+XXEyUfgKdxT4/FIdLoJbTdmWT4V9I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699902230; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=pKs2iaNGcckU3ni81u+5apbwGwozAkz/WW7uZAFdepY=; b=ULSAjEcrGZoRvXd8HDnC0noWUXPvd3qgxRIZRpshVwWypkc+1jtVRvgjBNw1hYoToKD43Wu0OL6rMzkVEpzA2ErMzPfposnFPZjYinpveOhoKFfbVo0/nDdZ6t7507WOdMRBaS8qSP8Q1ZycypBzPUXcR3qgwsqwQOyd+m8w5vA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1699902230203998.2988288389408; Mon, 13 Nov 2023 11:03:50 -0800 (PST) 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) 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) 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-Google-Smtp-Source: AGHT+IGbdBDiArhG8Nyj7lqNuVsOp3IrB0+YWC6+9q0GZxS8q/8ZtukRhU5Rl8ZRS9yVA7kuZMw/Bw== 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) From: Leo Yan To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Gerd Hoffmann , "Michael S . Tsirkin" , Manos Pitsidianakis , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , 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 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1699902231891100001 Content-Type: text/plain; charset="utf-8" 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 =3D> virtio}/vhost-user-input.c | 0 4 files changed, 4 insertions(+), 3 deletions(-) rename hw/{input =3D> 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/* =20 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('tsc= 2005.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-hi= d.c')) system_ss.add(when: 'CONFIG_VIRTIO_INPUT_HOST', if_true: files('virtio-inp= ut-host.c')) -system_ss.add(when: 'CONFIG_VHOST_USER_INPUT', if_true: files('vhost-user-= input.c')) =20 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('vh= ost-user-i2c.c')) system_virtio_ss.add(when: 'CONFIG_VHOST_USER_RNG', if_true: files('vh= ost-user-rng.c')) system_virtio_ss.add(when: 'CONFIG_VHOST_USER_SND', if_true: files('vh= ost-user-snd.c')) + system_virtio_ss.add(when: 'CONFIG_VHOST_USER_INPUT', if_true: files('= vhost-user-input.c')) =20 # 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_SN= D'], if_true: files('vhost-user-snd-pci.c')) + system_virtio_ss.add(when: ['CONFIG_VIRTIO_PCI', 'CONFIG_VHOST_USER_IN= PUT'], + 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 =3D 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-u= ser-vsock-pci.c')) virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_BLK', if_true: files('vhost-use= r-blk-pci.c')) -virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_INPUT', if_true: files('vhost-u= ser-input-pci.c')) virtio_pci_ss.add(when: 'CONFIG_VHOST_USER_SCSI', if_true: files('vhost-us= er-scsi-pci.c')) virtio_pci_ss.add(when: 'CONFIG_VHOST_SCSI', if_true: files('vhost-scsi-pc= i.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 --=20 2.34.1 From nobody Wed Nov 27 06:31:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1699902244; cv=none; d=zohomail.com; s=zohoarc; b=FXU+B0882nRFWaTeoraVpGGxuS8gnYsC6jJgK604XScpoT9ANkkFDe7lFqn+6rAWrKlDTQOZNZb40+zrxQnXEt64bwhZzox6uXQx9ku29JwPnb8ePTyLo2iXUAqiznoxGDeZoRVo2ldyE/+H8qccm6JdRFgJOsWfcZNUDhHmvpc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699902244; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=LwfL1MMbcUd8gBQwuRg85QiTdLCeCUniVkLUUu4iwTE=; b=IXNXwBINQJnwvh13urFb/WzX7PrXrHtktW+5jtVp+EMfT9gDlm6iw6oAxAAa8C2vcq/ylHBS+TcnXRP+WLoOlCwqsWdBsG36S6PQbjk3ysg6KMYnslOiTkZy2mPapuDyrfjbCOCrn73SetWgWRuDW0g31d1PRXq/CfssVRSkXjI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1699902244306776.101966785721; Mon, 13 Nov 2023 11:04:04 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r2cCu-0002el-4y; Mon, 13 Nov 2023 14:02:49 -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 1r2cCp-0002eU-VF for qemu-devel@nongnu.org; Mon, 13 Nov 2023 14:02:44 -0500 Received: from mail-qt1-x830.google.com ([2607:f8b0:4864:20::830]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r2cCl-0000LT-2x for qemu-devel@nongnu.org; Mon, 13 Nov 2023 14:02:43 -0500 Received: by mail-qt1-x830.google.com with SMTP id d75a77b69052e-41cb615c6fbso30100991cf.1 for ; Mon, 13 Nov 2023 11:02:38 -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.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 11:02:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699902158; x=1700506958; 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=LwfL1MMbcUd8gBQwuRg85QiTdLCeCUniVkLUUu4iwTE=; b=kGKjfWRfkUYZatdcGS5Jv91JIqdZvcfAg4CJH2mOl3N0XR/Ehy6pNYTsyQzYPSjCD8 gi+4Ohsd3VNXCPa1lTtwyWnTedbqPit6PyoZQzCHZr5541u+nuVaCCmghQ7L5aOjoPQB 8IS7s7EX8zAaQXax7Xcc74ZtD417Bt88Od9Rj/TG8U3oITlHZbjA/7LLYFQ1BeQLlDzn usCz/rIQLZkfaL1zRD1zeG1E05ZGzoka2133Qd2qCMWKOMyrrjL+uL4YOWa7eicMWUf2 E0n81fwQgXt0SG+ocACAdS69c7JE2c4kGtSweSdVz3EHJU/hvbAnPrV5UqPb4fISsSPY P/og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699902158; x=1700506958; 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=LwfL1MMbcUd8gBQwuRg85QiTdLCeCUniVkLUUu4iwTE=; b=H9MfHF+51VpTcB6pJlcjmEjNiv+3bPFeGKrYohhLRh5Md4LdpxnvM8mhAeYhqqcZWx g0zDLaTbutICmuER0rt0ONh7snDiCKnN4h7I2ZT0BmuQ0Qx8hQmnkSLjUV3w1DJ8rT11 6388E14FdTv/Z7kAd/KPudAC4+xP74KIepUVbgfYwNVsfp2uX1gH3gtUK8gDNxTOqN+J Mf+9G0zj2N3FGhpGatEcOrsfDElWEBmvVcVEGCPLD+jFbU5PiE77DQ74KVAdGOIbIKak J5R4p9ovmSLoFyPIAl+VI2PaELbxTYYyZ33iPbG2nbqQdImrvl+ZIvDeqPmjp9VahDyk LNaQ== X-Gm-Message-State: AOJu0YykiUZr3qQn2lw66RqhkN6qD2a+4OrQ/iJeG0YJ+kAWYPl8R/wR KIuFiLALCOTGox6yfDymFqrCYYwWB2s1TZf0f50fuz60RZQ= X-Google-Smtp-Source: AGHT+IHMwhGxEm29W18CsnP44pWmxKmrYqXtwg4Rbs5f9xyIhqZTCjUumIgOXotTyRIjwQUBqPOMIQ== X-Received: by 2002:ac8:5bc2:0:b0:41c:dd22:e7c0 with SMTP id b2-20020ac85bc2000000b0041cdd22e7c0mr11728863qtb.29.1699902157983; Mon, 13 Nov 2023 11:02:37 -0800 (PST) From: Leo Yan To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Gerd Hoffmann , "Michael S . Tsirkin" , Manos Pitsidianakis , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Leo Yan Subject: [PATCH v2 4/4] hw/virtio: derive vhost-user-input from vhost-user-base Date: Tue, 14 Nov 2023 03:02:11 +0800 Message-Id: <20231113190211.92412-5-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 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::830; envelope-from=leo.yan@linaro.org; helo=mail-qt1-x830.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1699902246439100003 Content-Type: text/plain; charset="utf-8" This patch derives vhost-user-input from vhost-user-base class, so make the input stub as a simpler boilerplate wrapper. With the refactoring, vhost-user-input adds the property 'chardev', this leads to conflict with the vhost-user-input-pci adds the same property. To resolve the error, remove the duplicate property from vhost-user-input-pci. Signed-off-by: Leo Yan --- hw/virtio/vhost-user-input-pci.c | 3 - hw/virtio/vhost-user-input.c | 114 +++++-------------------------- include/hw/virtio/virtio-input.h | 6 +- 3 files changed, 21 insertions(+), 102 deletions(-) diff --git a/hw/virtio/vhost-user-input-pci.c b/hw/virtio/vhost-user-input-= pci.c index b858898a36..3f4761ce88 100644 --- a/hw/virtio/vhost-user-input-pci.c +++ b/hw/virtio/vhost-user-input-pci.c @@ -30,9 +30,6 @@ static void vhost_user_input_pci_instance_init(Object *ob= j) =20 virtio_instance_init_common(obj, &dev->vhi, sizeof(dev->vhi), TYPE_VHOST_USER_INPUT); - - object_property_add_alias(obj, "chardev", - OBJECT(&dev->vhi), "chardev"); } =20 static const VirtioPCIDeviceTypeInfo vhost_user_input_pci_info =3D { diff --git a/hw/virtio/vhost-user-input.c b/hw/virtio/vhost-user-input.c index 4ee3542106..bedec0468c 100644 --- a/hw/virtio/vhost-user-input.c +++ b/hw/virtio/vhost-user-input.c @@ -5,83 +5,25 @@ */ =20 #include "qemu/osdep.h" -#include "qemu/error-report.h" -#include "qapi/error.h" - #include "hw/virtio/virtio-input.h" =20 -static int vhost_input_config_change(struct vhost_dev *dev) -{ - error_report("vhost-user-input: unhandled backend config change"); - return -1; -} - -static const VhostDevConfigOps config_ops =3D { - .vhost_dev_config_notifier =3D vhost_input_config_change, +static Property vinput_properties[] =3D { + DEFINE_PROP_CHR("chardev", VHostUserBase, chardev), + DEFINE_PROP_END_OF_LIST(), }; =20 -static void vhost_input_realize(DeviceState *dev, Error **errp) +static void vinput_realize(DeviceState *dev, Error **errp) { - VHostUserInput *vhi =3D VHOST_USER_INPUT(dev); - VirtIOInput *vinput =3D VIRTIO_INPUT(dev); - VirtIODevice *vdev =3D VIRTIO_DEVICE(dev); + VHostUserBase *vub =3D VHOST_USER_BASE(dev); + VHostUserBaseClass *vubc =3D VHOST_USER_BASE_GET_CLASS(dev); =20 - vhost_dev_set_config_notifier(&vhi->vhost->dev, &config_ops); - vinput->cfg_size =3D sizeof_field(virtio_input_config, u); - if (vhost_user_backend_dev_init(vhi->vhost, vdev, 2, errp) =3D=3D -1) { - return; - } -} + /* Fixed for input device */ + vub->virtio_id =3D VIRTIO_ID_INPUT; + vub->num_vqs =3D 2; + vub->vq_size =3D 4; + vub->config_size =3D sizeof(virtio_input_config); =20 -static void vhost_input_change_active(VirtIOInput *vinput) -{ - VHostUserInput *vhi =3D VHOST_USER_INPUT(vinput); - - if (vinput->active) { - vhost_user_backend_start(vhi->vhost); - } else { - vhost_user_backend_stop(vhi->vhost); - } -} - -static void vhost_input_get_config(VirtIODevice *vdev, uint8_t *config_dat= a) -{ - VirtIOInput *vinput =3D VIRTIO_INPUT(vdev); - VHostUserInput *vhi =3D VHOST_USER_INPUT(vdev); - Error *local_err =3D NULL; - int ret; - - memset(config_data, 0, vinput->cfg_size); - - ret =3D vhost_dev_get_config(&vhi->vhost->dev, config_data, vinput->cf= g_size, - &local_err); - if (ret) { - error_report_err(local_err); - return; - } -} - -static void vhost_input_set_config(VirtIODevice *vdev, - const uint8_t *config_data) -{ - VHostUserInput *vhi =3D VHOST_USER_INPUT(vdev); - int ret; - - ret =3D vhost_dev_set_config(&vhi->vhost->dev, config_data, - 0, sizeof(virtio_input_config), - VHOST_SET_CONFIG_TYPE_FRONTEND); - if (ret) { - error_report("vhost-user-input: set device config space failed"); - return; - } - - virtio_notify_config(vdev); -} - -static struct vhost_dev *vhost_input_get_vhost(VirtIODevice *vdev) -{ - VHostUserInput *vhi =3D VHOST_USER_INPUT(vdev); - return &vhi->vhost->dev; + vubc->parent_realize(dev, errp); } =20 static const VMStateDescription vmstate_vhost_input =3D { @@ -91,40 +33,20 @@ static const VMStateDescription vmstate_vhost_input =3D= { =20 static void vhost_input_class_init(ObjectClass *klass, void *data) { - VirtIOInputClass *vic =3D VIRTIO_INPUT_CLASS(klass); - VirtioDeviceClass *vdc =3D VIRTIO_DEVICE_CLASS(klass); + VHostUserBaseClass *vubc =3D VHOST_USER_BASE_CLASS(klass); DeviceClass *dc =3D DEVICE_CLASS(klass); =20 dc->vmsd =3D &vmstate_vhost_input; - vdc->get_config =3D vhost_input_get_config; - vdc->set_config =3D vhost_input_set_config; - vdc->get_vhost =3D vhost_input_get_vhost; - vic->realize =3D vhost_input_realize; - vic->change_active =3D vhost_input_change_active; -} - -static void vhost_input_init(Object *obj) -{ - VHostUserInput *vhi =3D VHOST_USER_INPUT(obj); - - vhi->vhost =3D VHOST_USER_BACKEND(object_new(TYPE_VHOST_USER_BACKEND)); - object_property_add_alias(obj, "chardev", - OBJECT(vhi->vhost), "chardev"); -} - -static void vhost_input_finalize(Object *obj) -{ - VHostUserInput *vhi =3D VHOST_USER_INPUT(obj); - - object_unref(OBJECT(vhi->vhost)); + device_class_set_props(dc, vinput_properties); + device_class_set_parent_realize(dc, vinput_realize, + &vubc->parent_realize); + set_bit(DEVICE_CATEGORY_INPUT, dc->categories); } =20 static const TypeInfo vhost_input_info =3D { .name =3D TYPE_VHOST_USER_INPUT, - .parent =3D TYPE_VIRTIO_INPUT, + .parent =3D TYPE_VHOST_USER_BASE, .instance_size =3D sizeof(VHostUserInput), - .instance_init =3D vhost_input_init, - .instance_finalize =3D vhost_input_finalize, .class_init =3D vhost_input_class_init, }; =20 diff --git a/include/hw/virtio/virtio-input.h b/include/hw/virtio/virtio-in= put.h index a6c9703644..e69c0aeca3 100644 --- a/include/hw/virtio/virtio-input.h +++ b/include/hw/virtio/virtio-input.h @@ -1,6 +1,8 @@ #ifndef QEMU_VIRTIO_INPUT_H #define QEMU_VIRTIO_INPUT_H =20 +#include "hw/virtio/vhost-user.h" +#include "hw/virtio/vhost-user-base.h" #include "ui/input.h" #include "sysemu/vhost-user-backend.h" =20 @@ -97,9 +99,7 @@ struct VirtIOInputHost { }; =20 struct VHostUserInput { - VirtIOInput parent_obj; - - VhostUserBackend *vhost; + VHostUserBase parent_obj; }; =20 void virtio_input_send(VirtIOInput *vinput, virtio_input_event *event); --=20 2.34.1