{"id":1839960,"url":"http://patchwork.ozlabs.org/api/patches/1839960/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20230926224107.2951144-4-jonah.palmer@oracle.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20230926224107.2951144-4-jonah.palmer@oracle.com>","list_archive_url":null,"date":"2023-09-26T22:41:07","name":"[RESEND,v5,3/3] vhost-user: move VhostUserProtocolFeature definition to header file","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"5ac081b9b3571462f2bdeb67db04720b1fe9a628","submitter":{"id":81365,"url":"http://patchwork.ozlabs.org/api/people/81365/?format=json","name":"Jonah Palmer","email":"jonah.palmer@oracle.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20230926224107.2951144-4-jonah.palmer@oracle.com/mbox/","series":[{"id":375011,"url":"http://patchwork.ozlabs.org/api/series/375011/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=375011","date":"2023-09-26T22:41:04","name":"qmp, vhost-user: Remove virtio_list & update virtio introspection","version":5,"mbox":"http://patchwork.ozlabs.org/series/375011/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1839960/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1839960/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=oracle.com header.i=@oracle.com header.a=rsa-sha256\n header.s=corp-2023-03-30 header.b=d3sFU47G;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4RwFBJ1Sfkz1yp8\n\tfor ; Wed, 27 Sep 2023 08:42:48 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1qlGkA-0005xz-IO; Tue, 26 Sep 2023 18:41:26 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1qlGk8-0005xJ-LY\n for qemu-devel@nongnu.org; Tue, 26 Sep 2023 18:41:24 -0400","from mx0b-00069f02.pphosted.com ([205.220.177.32])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1qlGk7-0005UA-3b\n for qemu-devel@nongnu.org; Tue, 26 Sep 2023 18:41:24 -0400","from pps.filterd (m0333520.ppops.net [127.0.0.1])\n by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id\n 38QLTKM2025086; Tue, 26 Sep 2023 22:41:20 GMT","from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com\n (phxpaimrmta02.appoci.oracle.com [147.154.114.232])\n by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3t9r2dg5fc-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n Tue, 26 Sep 2023 22:41:20 +0000","from pps.filterd\n (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1])\n by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19)\n with ESMTP id 38QMPShm021222; Tue, 26 Sep 2023 22:41:19 GMT","from pps.reinject (localhost [127.0.0.1])\n by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id\n 3t9pf74ca3-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n Tue, 26 Sep 2023 22:41:19 +0000","from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com\n (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1])\n by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 38QMfBNr022981;\n Tue, 26 Sep 2023 22:41:18 GMT","from jonah-ol8.us.oracle.com (dhcp-10-65-186-167.vpn.oracle.com\n [10.65.186.167])\n by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTP id\n 3t9pf74c6n-4; Tue, 26 Sep 2023 22:41:18 +0000"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com;\n h=from : to : cc :\n subject : date : message-id : in-reply-to : references : mime-version :\n content-transfer-encoding; s=corp-2023-03-30;\n bh=puPbkCPkmwjn8Qang7iM1mQ6NTsVvzo3LiVOXVLjxKg=;\n b=d3sFU47GVmBLglQcwZDftXoUzMxJX4Tic223fhLy8co1Okx1sOkAlgk+wS/U7Us27JRo\n j575LQXg7k8O75grNQpa0w2oD7S7i3jT7hZAzmYcEHQdm8bwkTWk4puGH5iGXBxjQd4D\n gONskN5zBvecp1LM2bUsWSHtuY7oy63dBfwf+caO7fD+Yy74dklYFJ96E9yNPJgPRuzv\n A8QmnZGeOhVuqgGPW+GdlxSBM5gmx+kM0T15oCEAneRfRU2UGS4gBvsYArfTIqKrFEr3\n MQPZ9ABCiPhuy7J/V/q3QLPRx4yDJ4Pv0mO0Zdy1u6tme6IXOnpekDRAGXgQWsGgAh8V gA==","From":"Jonah Palmer ","To":"qemu-devel@nongnu.org","Cc":"philmd@linaro.org, laurent@vivier.eu, mst@redhat.com,\n boris.ostrovsky@oracle.com, alex.bennee@linaro.org,\n viresh.kumar@linaro.org, armbru@redhat.com, pbonzini@redhat.com,\n berrange@redhat.com, eduardo@habkost.net, jonah.palmer@oracle.com","Subject":"[PATCH RESEND v5 3/3] vhost-user: move VhostUserProtocolFeature\n definition to header file","Date":"Tue, 26 Sep 2023 18:41:07 -0400","Message-Id":"<20230926224107.2951144-4-jonah.palmer@oracle.com>","X-Mailer":"git-send-email 2.39.3","In-Reply-To":"<20230926224107.2951144-1-jonah.palmer@oracle.com>","References":"<20230926224107.2951144-1-jonah.palmer@oracle.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Proofpoint-Virus-Version":"vendor=baseguard\n engine=ICAP:2.0.267,Aquarius:18.0.980,Hydra:6.0.619,FMLib:17.11.176.26\n definitions=2023-09-26_15,2023-09-26_01,2023-05-22_02","X-Proofpoint-Spam-Details":"rule=notspam policy=default score=0 phishscore=0\n bulkscore=0 mlxscore=0\n adultscore=0 mlxlogscore=999 suspectscore=0 malwarescore=0 spamscore=0\n classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2309180000\n definitions=main-2309260194","X-Proofpoint-GUID":"jHsim_5NbG7Z-9l9Q0zhkEYZaKTrBzbG","X-Proofpoint-ORIG-GUID":"jHsim_5NbG7Z-9l9Q0zhkEYZaKTrBzbG","Received-SPF":"pass client-ip=205.220.177.32;\n envelope-from=jonah.palmer@oracle.com; helo=mx0b-00069f02.pphosted.com","X-Spam_score_int":"-27","X-Spam_score":"-2.8","X-Spam_bar":"--","X-Spam_report":"(-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001,\n 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":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"Move the definition of VhostUserProtocolFeature to\ninclude/hw/virtio/vhost-user.h.\n\nRemove previous definitions in hw/scsi/vhost-user-scsi.c,\nhw/virtio/vhost-user.c, and hw/virtio/virtio-qmp.c.\n\nPreviously there were 3 separate definitions of this over 3 different\nfiles. Now only 1 definition of this will be present for these 3 files.\n\nSigned-off-by: Jonah Palmer \nReviewed-by: Emmanouil Pitsidianakis \n---\n hw/scsi/vhost-user-scsi.c | 4 ----\n hw/virtio/vhost-user.c | 21 ---------------------\n hw/virtio/virtio-qmp.c | 22 +---------------------\n include/hw/virtio/vhost-user.h | 21 +++++++++++++++++++++\n 4 files changed, 22 insertions(+), 46 deletions(-)","diff":"diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c\nindex ee99b19e7a..df6b66cc1a 100644\n--- a/hw/scsi/vhost-user-scsi.c\n+++ b/hw/scsi/vhost-user-scsi.c\n@@ -39,10 +39,6 @@ static const int user_feature_bits[] = {\n VHOST_INVALID_FEATURE_BIT\n };\n \n-enum VhostUserProtocolFeature {\n- VHOST_USER_PROTOCOL_F_RESET_DEVICE = 13,\n-};\n-\n static void vhost_user_scsi_set_status(VirtIODevice *vdev, uint8_t status)\n {\n VHostUserSCSI *s = (VHostUserSCSI *)vdev;\ndiff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c\nindex 8dcf049d42..a096335921 100644\n--- a/hw/virtio/vhost-user.c\n+++ b/hw/virtio/vhost-user.c\n@@ -56,27 +56,6 @@\n */\n #define VHOST_USER_MAX_CONFIG_SIZE 256\n \n-enum VhostUserProtocolFeature {\n- VHOST_USER_PROTOCOL_F_MQ = 0,\n- VHOST_USER_PROTOCOL_F_LOG_SHMFD = 1,\n- VHOST_USER_PROTOCOL_F_RARP = 2,\n- VHOST_USER_PROTOCOL_F_REPLY_ACK = 3,\n- VHOST_USER_PROTOCOL_F_NET_MTU = 4,\n- VHOST_USER_PROTOCOL_F_BACKEND_REQ = 5,\n- VHOST_USER_PROTOCOL_F_CROSS_ENDIAN = 6,\n- VHOST_USER_PROTOCOL_F_CRYPTO_SESSION = 7,\n- VHOST_USER_PROTOCOL_F_PAGEFAULT = 8,\n- VHOST_USER_PROTOCOL_F_CONFIG = 9,\n- VHOST_USER_PROTOCOL_F_BACKEND_SEND_FD = 10,\n- VHOST_USER_PROTOCOL_F_HOST_NOTIFIER = 11,\n- VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD = 12,\n- VHOST_USER_PROTOCOL_F_RESET_DEVICE = 13,\n- /* Feature 14 reserved for VHOST_USER_PROTOCOL_F_INBAND_NOTIFICATIONS. */\n- VHOST_USER_PROTOCOL_F_CONFIGURE_MEM_SLOTS = 15,\n- VHOST_USER_PROTOCOL_F_STATUS = 16,\n- VHOST_USER_PROTOCOL_F_MAX\n-};\n-\n #define VHOST_USER_PROTOCOL_FEATURE_MASK ((1 << VHOST_USER_PROTOCOL_F_MAX) - 1)\n \n typedef enum VhostUserRequest {\ndiff --git a/hw/virtio/virtio-qmp.c b/hw/virtio/virtio-qmp.c\nindex 3431711db5..1dd96ed20f 100644\n--- a/hw/virtio/virtio-qmp.c\n+++ b/hw/virtio/virtio-qmp.c\n@@ -17,6 +17,7 @@\n #include \"qapi/qapi-commands-qom.h\"\n #include \"qapi/qmp/qobject.h\"\n #include \"qapi/qmp/qjson.h\"\n+#include \"hw/virtio/vhost-user.h\"\n \n #include \"standard-headers/linux/virtio_ids.h\"\n #include \"standard-headers/linux/vhost_types.h\"\n@@ -37,27 +38,6 @@\n #define FEATURE_ENTRY(name, desc) (qmp_virtio_feature_map_t) \\\n { .virtio_bit = name, .feature_desc = desc }\n \n-enum VhostUserProtocolFeature {\n- VHOST_USER_PROTOCOL_F_MQ = 0,\n- VHOST_USER_PROTOCOL_F_LOG_SHMFD = 1,\n- VHOST_USER_PROTOCOL_F_RARP = 2,\n- VHOST_USER_PROTOCOL_F_REPLY_ACK = 3,\n- VHOST_USER_PROTOCOL_F_NET_MTU = 4,\n- VHOST_USER_PROTOCOL_F_BACKEND_REQ = 5,\n- VHOST_USER_PROTOCOL_F_CROSS_ENDIAN = 6,\n- VHOST_USER_PROTOCOL_F_CRYPTO_SESSION = 7,\n- VHOST_USER_PROTOCOL_F_PAGEFAULT = 8,\n- VHOST_USER_PROTOCOL_F_CONFIG = 9,\n- VHOST_USER_PROTOCOL_F_BACKEND_SEND_FD = 10,\n- VHOST_USER_PROTOCOL_F_HOST_NOTIFIER = 11,\n- VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD = 12,\n- VHOST_USER_PROTOCOL_F_RESET_DEVICE = 13,\n- VHOST_USER_PROTOCOL_F_INBAND_NOTIFICATIONS = 14,\n- VHOST_USER_PROTOCOL_F_CONFIGURE_MEM_SLOTS = 15,\n- VHOST_USER_PROTOCOL_F_STATUS = 16,\n- VHOST_USER_PROTOCOL_F_MAX\n-};\n-\n /* Virtio transport features mapping */\n static const qmp_virtio_feature_map_t virtio_transport_map[] = {\n /* Virtio device transport features */\ndiff --git a/include/hw/virtio/vhost-user.h b/include/hw/virtio/vhost-user.h\nindex 191216a74f..80e2b4a463 100644\n--- a/include/hw/virtio/vhost-user.h\n+++ b/include/hw/virtio/vhost-user.h\n@@ -11,6 +11,27 @@\n #include \"chardev/char-fe.h\"\n #include \"hw/virtio/virtio.h\"\n \n+enum VhostUserProtocolFeature {\n+ VHOST_USER_PROTOCOL_F_MQ = 0,\n+ VHOST_USER_PROTOCOL_F_LOG_SHMFD = 1,\n+ VHOST_USER_PROTOCOL_F_RARP = 2,\n+ VHOST_USER_PROTOCOL_F_REPLY_ACK = 3,\n+ VHOST_USER_PROTOCOL_F_NET_MTU = 4,\n+ VHOST_USER_PROTOCOL_F_BACKEND_REQ = 5,\n+ VHOST_USER_PROTOCOL_F_CROSS_ENDIAN = 6,\n+ VHOST_USER_PROTOCOL_F_CRYPTO_SESSION = 7,\n+ VHOST_USER_PROTOCOL_F_PAGEFAULT = 8,\n+ VHOST_USER_PROTOCOL_F_CONFIG = 9,\n+ VHOST_USER_PROTOCOL_F_BACKEND_SEND_FD = 10,\n+ VHOST_USER_PROTOCOL_F_HOST_NOTIFIER = 11,\n+ VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD = 12,\n+ VHOST_USER_PROTOCOL_F_RESET_DEVICE = 13,\n+ VHOST_USER_PROTOCOL_F_INBAND_NOTIFICATIONS = 14,\n+ VHOST_USER_PROTOCOL_F_CONFIGURE_MEM_SLOTS = 15,\n+ VHOST_USER_PROTOCOL_F_STATUS = 16,\n+ VHOST_USER_PROTOCOL_F_MAX\n+};\n+\n /**\n * VhostUserHostNotifier - notifier information for one queue\n * @rcu: rcu_head for cleanup\n","prefixes":["RESEND","v5","3/3"]}