SIOCGIFMAP takes an ifreq not an ifmap

Author: rocallahan

src/log.cc

@@ -88,9 +88,7 @@ _CONSTANT_STATIC deque<char>* log_buffer;
 _CONSTANT_STATIC std::ostream* log_file;
 size_t log_buffer_size;
 
-static void flush_log_file() {
-  log_file->flush();
-}
+static void flush_log_file() { log_file->flush(); }
 
 static void init_log_globals() {
   if (log_globals_initialized) {

src/record_syscall.cc

@@ -1438,6 +1438,7 @@ static Switchable prepare_ioctl(RecordTask* t,
     case SIOCGIFNAME:
     case SIOCGIFNETMASK:
     case SIOCGIFMETRIC:
+    case SIOCGIFMAP:
       syscall_state.reg_parameter<typename Arch::ifreq>(3);
       syscall_state.after_syscall_action(record_page_below_stack_ptr);
       return PREVENT_SWITCH;
@@ -1462,10 +1463,6 @@ static Switchable prepare_ioctl(RecordTask* t,
       return PREVENT_SWITCH;
     }
 
-    case SIOCGIFMAP:
-      syscall_state.reg_parameter<typename Arch::ifmap>(3);
-      return PREVENT_SWITCH;
-
     case SIOCGSTAMP:
       syscall_state.reg_parameter<typename Arch::timeval>(3);
       return PREVENT_SWITCH;

src/test/sioc.c

@@ -202,6 +202,13 @@ int main(void) {
   GENERIC_REQUEST_BY_NAME(SIOCGIFMETRIC);
   atomic_printf("metric is %d\n", req->ifr_metric);
 
+  GENERIC_REQUEST_BY_NAME(SIOCGIFMAP);
+  atomic_printf("map is %llu,%llu,%u,%d,%d,%d\n",
+                (unsigned long long)req->ifr_map.mem_start,
+                (unsigned long long)req->ifr_map.mem_end,
+                req->ifr_map.base_addr, req->ifr_map.irq, req->ifr_map.dma,
+                req->ifr_map.port);
+
   memset(&req->ifr_metric, 0xff, sizeof(req->ifr_metric));
   ret = ioctl(sockfd, SIOCGIFMEM, req);
   VERIFY_GUARD(req);