[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v10-fix 1/1] fixup! Add the vhost-user netdev backen
From: |
Nikolay Nikolaev |
Subject: |
[Qemu-devel] [PATCH v10-fix 1/1] fixup! Add the vhost-user netdev backend to the command line |
Date: |
Tue, 10 Jun 2014 17:17:05 +0300 |
User-agent: |
StGit/0.17.1-dirty |
Fixes remarks:
- rever vhost-force to vhostforce (consistent with tap)
- removed has_unsupported member from VhostUserChardevProps
- removed double error reporting when parsing chardev options
Signed-off-by: Nikolay Nikolaev <address@hidden>
---
net/vhost-user.c | 18 ++++++------------
qapi-schema.json | 4 ++--
2 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/net/vhost-user.c b/net/vhost-user.c
index 32b78fb..24e050c 100644
--- a/net/vhost-user.c
+++ b/net/vhost-user.c
@@ -26,7 +26,6 @@ typedef struct VhostUserChardevProps {
bool is_socket;
bool is_unix;
bool is_server;
- bool has_unsupported;
} VhostUserChardevProps;
VHostNetState *vhost_user_get_vhost_net(NetClientState *nc)
@@ -172,7 +171,6 @@ static int net_vhost_chardev_opts(const char *name, const
char *value,
error_report("vhost-user does not support a chardev"
" with the following option:\n %s = %s",
name, value);
- props->has_unsupported = true;
return -1;
}
return 0;
@@ -190,7 +188,9 @@ static CharDriverState *net_vhost_parse_chardev(const
NetdevVhostUserOptions *op
/* inspect chardev opts */
memset(&props, 0, sizeof(props));
- qemu_opt_foreach(chr->opts, net_vhost_chardev_opts, &props, false);
+ if (qemu_opt_foreach(chr->opts, net_vhost_chardev_opts, &props, true) !=
0) {
+ return NULL;
+ }
if (!props.is_socket || !props.is_unix) {
error_report("chardev \"%s\" is not a unix socket",
@@ -198,12 +198,6 @@ static CharDriverState *net_vhost_parse_chardev(const
NetdevVhostUserOptions *op
return NULL;
}
- if (props.has_unsupported) {
- error_report("chardev \"%s\" has an unsupported option",
- opts->chardev);
- return NULL;
- }
-
qemu_chr_fe_claim_no_fail(chr);
return chr;
@@ -253,9 +247,9 @@ int net_init_vhost_user(const NetClientOptions *opts, const
char *name,
return -1;
}
- /* vhost-force for non-MSIX */
- if (vhost_user_opts->has_vhost_force) {
- vhostforce = vhost_user_opts->vhost_force;
+ /* vhostforce for non-MSIX */
+ if (vhost_user_opts->has_vhostforce) {
+ vhostforce = vhost_user_opts->vhostforce;
} else {
vhostforce = false;
}
diff --git a/qapi-schema.json b/qapi-schema.json
index f062ce9..0837fc5 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3273,14 +3273,14 @@
#
# @chardev: name of a unix socket chardev
#
-# @vhost-force: #optional vhost on for non-MSIX virtio guests (default: false).
+# @vhostforce: #optional vhost on for non-MSIX virtio guests (default: false).
#
# Since 2.1
##
{ 'type': 'NetdevVhostUserOptions',
'data': {
'chardev': 'str',
- '*vhost-force': 'bool' } }
+ '*vhostforce': 'bool' } }
##
# @NetClientOptions
- [Qemu-devel] [PATCH v10-fix 1/1] fixup! Add the vhost-user netdev backend to the command line,
Nikolay Nikolaev <=