Merge remote-tracking branch 'sstabellini/xen-2013-09-25' into staging

[qemu.git] / net / dump.c

diff --git a/net/dump.c b/net/dump.c
index f835c51187518d3e675b1f0da1a44d03367168cf..9d3a09e3341af6ad8958fe960991be5a945cc16b 100644 (file)
--- a/net/dump.c
+++ b/net/dump.c
@@ -22,14 +22,15 @@
  * THE SOFTWARE.
  */
 
  * THE SOFTWARE.
  */
 

-#include "dump.h"
+#include "clients.h"

 #include "qemu-common.h"
 #include "qemu-common.h"

-#include "qemu-error.h"
-#include "qemu-log.h"
-#include "qemu-timer.h"
+#include "qemu/error-report.h"
+#include "qemu/log.h"
+#include "qemu/timer.h"
+#include "hub.h"

 
 typedef struct DumpState {
 
 typedef struct DumpState {

-    VLANClientState nc;
+    NetClientState nc;

     int64_t start_ts;
     int fd;
     int pcap_caplen;
     int64_t start_ts;
     int fd;
     int pcap_caplen;


@@ -56,7 +57,7 @@ struct pcap_sf_pkthdr {
     uint32_t len;
 };
 
     uint32_t len;
 };
 

-static ssize_t dump_receive(VLANClientState *nc, const uint8_t *buf, size_t size)
+static ssize_t dump_receive(NetClientState *nc, const uint8_t *buf, size_t size)

 {
     DumpState *s = DO_UPCAST(DumpState, nc, nc);
     struct pcap_sf_pkthdr hdr;
 {
     DumpState *s = DO_UPCAST(DumpState, nc, nc);
     struct pcap_sf_pkthdr hdr;


@@ -68,7 +69,7 @@ static ssize_t dump_receive(VLANClientState *nc, const uint8_t *buf, size_t size
         return size;
     }
 
         return size;
     }
 

-    ts = muldiv64(qemu_get_clock_ns(vm_clock), 1000000, get_ticks_per_sec());
+    ts = muldiv64(qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL), 1000000, get_ticks_per_sec());

     caplen = size > s->pcap_caplen ? s->pcap_caplen : size;
 
     hdr.ts.tv_sec = ts / 1000000 + s->start_ts;
     caplen = size > s->pcap_caplen ? s->pcap_caplen : size;
 
     hdr.ts.tv_sec = ts / 1000000 + s->start_ts;


@@ -85,7 +86,7 @@ static ssize_t dump_receive(VLANClientState *nc, const uint8_t *buf, size_t size
     return size;
 }
 
     return size;
 }
 

-static void dump_cleanup(VLANClientState *nc)
+static void dump_cleanup(NetClientState *nc)

 {
     DumpState *s = DO_UPCAST(DumpState, nc, nc);
 
 {
     DumpState *s = DO_UPCAST(DumpState, nc, nc);
 


@@ -93,17 +94,17 @@ static void dump_cleanup(VLANClientState *nc)
 }
 
 static NetClientInfo net_dump_info = {
 }
 
 static NetClientInfo net_dump_info = {

-    .type = NET_CLIENT_TYPE_DUMP,
+    .type = NET_CLIENT_OPTIONS_KIND_DUMP,

     .size = sizeof(DumpState),
     .receive = dump_receive,
     .cleanup = dump_cleanup,
 };
 
     .size = sizeof(DumpState),
     .receive = dump_receive,
     .cleanup = dump_cleanup,
 };
 

-static int net_dump_init(VLANState *vlan, const char *device,
+static int net_dump_init(NetClientState *peer, const char *device,

                          const char *name, const char *filename, int len)
 {
     struct pcap_file_hdr hdr;
                          const char *name, const char *filename, int len)
 {
     struct pcap_file_hdr hdr;

-    VLANClientState *nc;
+    NetClientState *nc;

     DumpState *s;
     struct tm tm;
     int fd;
     DumpState *s;
     struct tm tm;
     int fd;


@@ -128,7 +129,7 @@ static int net_dump_init(VLANState *vlan, const char *device,
         return -1;
     }
 
         return -1;
     }
 

-    nc = qemu_new_net_client(&net_dump_info, vlan, NULL, device, name);
+    nc = qemu_new_net_client(&net_dump_info, peer, device, name);

 
     snprintf(nc->info_str, sizeof(nc->info_str),
              "dump to %s (len=%d)", filename, len);
 
     snprintf(nc->info_str, sizeof(nc->info_str),
              "dump to %s (len=%d)", filename, len);


@@ -144,21 +145,41 @@ static int net_dump_init(VLANState *vlan, const char *device,
     return 0;
 }
 
     return 0;
 }
 

-int net_init_dump(QemuOpts *opts, const char *name, VLANState *vlan)
+int net_init_dump(const NetClientOptions *opts, const char *name,
+                  NetClientState *peer)

 {
     int len;
     const char *file;
     char def_file[128];
 {
     int len;
     const char *file;
     char def_file[128];

+    const NetdevDumpOptions *dump;

 
 

-    assert(vlan);
+    assert(opts->kind == NET_CLIENT_OPTIONS_KIND_DUMP);
+    dump = opts->dump;

 
 

-    file = qemu_opt_get(opts, "file");
-    if (!file) {
-        snprintf(def_file, sizeof(def_file), "qemu-vlan%d.pcap", vlan->id);
+    assert(peer);
+
+    if (dump->has_file) {
+        file = dump->file;
+    } else {
+        int id;
+        int ret;
+
+        ret = net_hub_id_for_client(peer, &id);
+        assert(ret == 0); /* peer must be on a hub */
+
+        snprintf(def_file, sizeof(def_file), "qemu-vlan%d.pcap", 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(peer, "dump", name, file, len);

 }
 }