haraldwolff
/
qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

convert net_init_dump() to NetClientOptions 

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 <lersek@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
stable-1.2
Laszlo Ersek 2012-07-17 16:17:15 +02:00 committed by Stefan Hajnoczi
parent 2456f36f18
commit 848040d174
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
net/dump.c
View File

@ -144,22 +144,35 @@ static int net_dump_init(VLANState *vlan, const char *device,
return 0; 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) const char *name, VLANState *vlan)
{ {
int len; int len;
const char *file; const char *file;
char def_file[128]; char def_file[128];
const NetdevDumpOptions *dump;
assert(opts->kind == NET_CLIENT_OPTIONS_KIND_DUMP);
dump = opts->dump;
assert(vlan); assert(vlan);
file = qemu_opt_get(opts, "file"); if (dump->has_file) {
if (!file) { file = dump->file;
} else {
snprintf(def_file, sizeof(def_file), "qemu-vlan%d.pcap", vlan->id); snprintf(def_file, sizeof(def_file), "qemu-vlan%d.pcap", vlan->id);
file = def_file; 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); return net_dump_init(vlan, "dump", name, file, len);
} }