[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 12/18] convert net_init_dump() to NetClientOption
From: |
Laszlo Ersek |
Subject: |
[Qemu-devel] [PATCH v3 12/18] convert net_init_dump() to NetClientOptions |
Date: |
Tue, 17 Jul 2012 16:17:15 +0200 |
v1->v2:
- NetdevDumpOptions::len is of type 'size', whose C type was changed to
uint64_t. Adapt the printf() format specifier macro.
Signed-off-by: Laszlo Ersek <address@hidden>
---
net/dump.c | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/net/dump.c b/net/dump.c
index 27e9528..f3d2fa9 100644
--- a/net/dump.c
+++ b/net/dump.c
@@ -144,22 +144,35 @@ static int net_dump_init(VLANState *vlan, const char
*device,
return 0;
}
-int net_init_dump(QemuOpts *opts, const NetClientOptions *new_opts,
+int net_init_dump(QemuOpts *old_opts, const NetClientOptions *opts,
const char *name, VLANState *vlan)
{
int len;
const char *file;
char def_file[128];
+ const NetdevDumpOptions *dump;
+
+ assert(opts->kind == NET_CLIENT_OPTIONS_KIND_DUMP);
+ dump = opts->dump;
assert(vlan);
- file = qemu_opt_get(opts, "file");
- if (!file) {
+ if (dump->has_file) {
+ file = dump->file;
+ } else {
snprintf(def_file, sizeof(def_file), "qemu-vlan%d.pcap", vlan->id);
file = def_file;
}
- len = qemu_opt_get_size(opts, "len", 65536);
+ if (dump->has_len) {
+ if (dump->len > INT_MAX) {
+ error_report("invalid length: %"PRIu64, dump->len);
+ return -1;
+ }
+ len = dump->len;
+ } else {
+ len = 65536;
+ }
return net_dump_init(vlan, "dump", name, file, len);
}
--
1.7.1
- [Qemu-devel] [PATCH v3 01/18] qapi: fix error propagation, (continued)
- [Qemu-devel] [PATCH v3 01/18] qapi: fix error propagation, Laszlo Ersek, 2012/07/17
- [Qemu-devel] [PATCH v3 04/18] qapi: introduce "size" type, Laszlo Ersek, 2012/07/17
- [Qemu-devel] [PATCH v3 05/18] expose QemuOpt and QemuOpts struct definitions to interested parties, Laszlo Ersek, 2012/07/17
- [Qemu-devel] [PATCH v3 07/18] qapi schema: remove trailing whitespace, Laszlo Ersek, 2012/07/17
- [Qemu-devel] [PATCH v3 06/18] qapi: introduce OptsVisitor, Laszlo Ersek, 2012/07/17
- [Qemu-devel] [PATCH v3 08/18] qapi schema: add Netdev types, Laszlo Ersek, 2012/07/17
- [Qemu-devel] [PATCH v3 09/18] hw, net: "net_client_type" -> "NetClientOptionsKind" (qapi-generated), Laszlo Ersek, 2012/07/17
- [Qemu-devel] [PATCH v3 10/18] convert net_client_init() to OptsVisitor, Laszlo Ersek, 2012/07/17
- [Qemu-devel] [PATCH v3 13/18] convert net_init_slirp() to NetClientOptions, Laszlo Ersek, 2012/07/17
- [Qemu-devel] [PATCH v3 11/18] convert net_init_nic() to NetClientOptions, Laszlo Ersek, 2012/07/17
- [Qemu-devel] [PATCH v3 12/18] convert net_init_dump() to NetClientOptions,
Laszlo Ersek <=
- [Qemu-devel] [PATCH v3 18/18] remove unused QemuOpts parameter from net init functions, Laszlo Ersek, 2012/07/17
- [Qemu-devel] [PATCH v3 16/18] convert net_init_tap() to NetClientOptions, Laszlo Ersek, 2012/07/17
- [Qemu-devel] [PATCH v3 15/18] convert net_init_vde() to NetClientOptions, Laszlo Ersek, 2012/07/17
- [Qemu-devel] [PATCH v3 17/18] convert net_init_bridge() to NetClientOptions, Laszlo Ersek, 2012/07/17
- [Qemu-devel] [PATCH v3 14/18] convert net_init_socket() to NetClientOptions, Laszlo Ersek, 2012/07/17
- Re: [Qemu-devel] [PATCH v3 00/18] introduce OptsVisitor, rebase -net/-netdev parsing, Stefan Hajnoczi, 2012/07/20