API tools faq
paste
Advertisement
Guest User

Virtio remove trailing spaces

a guest
Jul 17th, 2013
106
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 12.86 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/headers/private/virtio/virtio.h b/headers/private/virtio/virtio.h
  2. index fffe0d7..0379242 100644
  3. --- a/headers/private/virtio/virtio.h
  4. +++ b/headers/private/virtio/virtio.h
  5. @@ -81,7 +81,7 @@ typedef struct {
  6. size_t bufferSize);
  7. status_t (*write_device_config)(void* cookie, uint8 offset,
  8. const void* buffer, size_t bufferSize);
  9. -
  10. +
  11. uint16 (*get_queue_ring_size)(void* cookie, uint16 queue);
  12. status_t (*setup_queue)(void* cookie, uint16 queue, phys_addr_t phy);
  13. status_t (*setup_interrupt)(void* cookie, uint16 queueCount);
  14. @@ -95,7 +95,7 @@ typedef struct {
  15.  
  16. status_t (*negociate_features)(virtio_device cookie, uint32 supported,
  17. uint32* negociated, const char* (*get_feature_name)(uint32));
  18. -
  19. +
  20. status_t (*read_device_config)(virtio_device cookie, uint8 offset,
  21. void* buffer, size_t bufferSize);
  22. status_t (*write_device_config)(virtio_device cookie, uint8 offset,
  23. diff --git a/src/add-ons/kernel/bus_managers/virtio/VirtioDevice.cpp b/src/add-ons/kernel/bus_managers/virtio/VirtioDevice.cpp
  24. index d2a12f0..e719397 100644
  25. --- a/src/add-ons/kernel/bus_managers/virtio/VirtioDevice.cpp
  26. +++ b/src/add-ons/kernel/bus_managers/virtio/VirtioDevice.cpp
  27. @@ -123,7 +123,7 @@ VirtioDevice::NegociateFeatures(uint32 supported, uint32* negociated,
  28.  
  29. return fController->write_guest_features(fCookie, fFeatures);
  30. }
  31. -
  32. +
  33.  
  34. status_t
  35. VirtioDevice::ReadDeviceConfig(uint8 offset, void* buffer, size_t bufferSize)
  36. @@ -183,7 +183,7 @@ VirtioDevice::SetupInterrupt(virtio_intr_func configHandler, void *driverCookie)
  37. if (status != B_OK)
  38. return status;
  39.  
  40. - // ready to go
  41. + // ready to go
  42. fController->set_status(fCookie, VIRTIO_CONFIG_STATUS_DRIVER_OK);
  43.  
  44. for (size_t index = 0; index < fQueueCount; index++)
  45. @@ -196,7 +196,7 @@ status_t
  46. VirtioDevice::SetupQueue(uint16 queueNumber, phys_addr_t physAddr)
  47. {
  48. return fController->setup_queue(fCookie, queueNumber, physAddr);
  49. -}
  50. +}
  51.  
  52.  
  53. void
  54. @@ -214,14 +214,14 @@ VirtioDevice::QueueInterrupt(uint16 queueNumber)
  55. return B_BAD_VALUE;
  56. return fQueues[queueNumber]->Interrupt();
  57. }
  58. -
  59. +
  60. status_t status = B_OK;
  61. for (uint16 i = 0; i < fQueueCount; i++) {
  62. status = fQueues[i]->Interrupt();
  63. if (status != B_OK)
  64. break;
  65. }
  66. -
  67. +
  68. return status;
  69. }
  70.  
  71. diff --git a/src/add-ons/kernel/bus_managers/virtio/VirtioModule.cpp b/src/add-ons/kernel/bus_managers/virtio/VirtioModule.cpp
  72. index de6328e..c495cec 100644
  73. --- a/src/add-ons/kernel/bus_managers/virtio/VirtioModule.cpp
  74. +++ b/src/add-ons/kernel/bus_managers/virtio/VirtioModule.cpp
  75. @@ -62,7 +62,7 @@ virtio_negociate_features(void* cookie, uint32 supported,
  76. return device->NegociateFeatures(supported, negociated, get_feature_name);
  77. }
  78.  
  79. -
  80. +
  81. status_t
  82. virtio_read_device_config(void* cookie, uint8 offset, void* buffer,
  83. size_t bufferSize)
  84. @@ -80,7 +80,7 @@ virtio_write_device_config(void* cookie, uint8 offset,
  85. {
  86. CALLED();
  87. VirtioDevice *device = (VirtioDevice *)cookie;
  88. -
  89. +
  90. return device->WriteDeviceConfig(offset, buffer, bufferSize);
  91. }
  92.  
  93. @@ -128,7 +128,7 @@ virtio_queue_request(virtio_queue cookie, const physical_entry *readEntry,
  94. entries[1] = *writtenEntry;
  95. } else if (writtenEntry != NULL)
  96. entries[0] = *writtenEntry;
  97. -
  98. +
  99. return virtio_queue_request_v(cookie, entries, readEntry != NULL ? 1 : 0,
  100. writtenEntry != NULL? 1 : 0, callback, callbackCookie);
  101. }
  102. diff --git a/src/add-ons/kernel/bus_managers/virtio/VirtioPrivate.h b/src/add-ons/kernel/bus_managers/virtio/VirtioPrivate.h
  103. index 4097bdd..c92ac6f 100644
  104. --- a/src/add-ons/kernel/bus_managers/virtio/VirtioPrivate.h
  105. +++ b/src/add-ons/kernel/bus_managers/virtio/VirtioPrivate.h
  106. @@ -21,7 +21,7 @@
  107. #ifdef VIRTIO_TRACE
  108. # define TRACE(x...) dprintf("\33[33mvirtio:\33[0m " x)
  109. #else
  110. -# define TRACE(x...)
  111. +# define TRACE(x...)
  112. #endif
  113. #define TRACE_ALWAYS(x...) dprintf("\33[33mvirtio:\33[0m " x)
  114. #define ERROR(x...) TRACE_ALWAYS(x)
  115. @@ -48,7 +48,7 @@ public:
  116. status_t NegociateFeatures(uint32 supported,
  117. uint32* negociated,
  118. const char* (*get_feature_name)(uint32));
  119. -
  120. +
  121. status_t ReadDeviceConfig(uint8 offset, void* buffer,
  122. size_t bufferSize);
  123. status_t WriteDeviceConfig(uint8 offset,
  124. @@ -75,7 +75,6 @@ private:
  125. void DumpFeatures(const char* title,
  126. uint32 features,
  127. const char* (*get_feature_name)(uint32));
  128. -
  129.  
  130. device_node * fNode;
  131. uint32 fID;
  132. @@ -123,7 +122,7 @@ public:
  133. void *callbackCookie);
  134. void EnableInterrupt();
  135. void DisableInterrupt();
  136. -
  137. +
  138. private:
  139. void UpdateAvailable(uint16 index);
  140. uint16 QueueVector(uint16 insertIndex,
  141. diff --git a/src/add-ons/kernel/bus_managers/virtio/VirtioQueue.cpp b/src/add-ons/kernel/bus_managers/virtio/VirtioQueue.cpp
  142. index 6f8acf3..e674d0d 100644
  143. --- a/src/add-ons/kernel/bus_managers/virtio/VirtioQueue.cpp
  144. +++ b/src/add-ons/kernel/bus_managers/virtio/VirtioQueue.cpp
  145. @@ -127,7 +127,7 @@ VirtioQueue::VirtioQueue(VirtioDevice* device, uint16 queueNumber,
  146. for (uint16 i = 0; i < fRingSize - 1; i++)
  147. fRing.desc[i].next = i + 1;
  148. fRing.desc[fRingSize - 1].next = UINT16_MAX;
  149. -
  150. +
  151. DisableInterrupt();
  152.  
  153. device->SetupQueue(fQueueNumber, physAddr);
  154. @@ -172,7 +172,7 @@ VirtioQueue::Interrupt()
  155.  
  156. while (fRingUsedIndex != fRing.used->idx)
  157. Finish();
  158. -
  159. +
  160. EnableInterrupt();
  161. return B_OK;
  162. }
  163. @@ -199,7 +199,7 @@ VirtioQueue::Finish()
  164. index = fRing.desc[index].next;
  165. size--;
  166. }
  167. -
  168. +
  169. if (size > 0)
  170. panic("VirtioQueue::Finish() descriptors left %d\n", size);
  171.  
  172. @@ -233,7 +233,7 @@ VirtioQueue::QueueRequest(const physical_entry* vector, size_t readVectorCount,
  173. count, callback, callbackCookie);
  174. if (fDescriptors[insertIndex] == NULL)
  175. return B_NO_MEMORY;
  176. -
  177. +
  178. // enqueue
  179. uint16 index = QueueVector(insertIndex, fRing.desc, vector,
  180. readVectorCount, writtenVectorCount);
  181. @@ -244,7 +244,7 @@ VirtioQueue::QueueRequest(const physical_entry* vector, size_t readVectorCount,
  182. UpdateAvailable(insertIndex);
  183.  
  184. NotifyHost();
  185. -
  186. +
  187. return B_OK;
  188. }
  189.  
  190. diff --git a/src/add-ons/kernel/busses/scsi/virtio/VirtioSCSIController.cpp b/src/add-ons/kernel/busses/scsi/virtio/VirtioSCSIController.cpp
  191. index 308835d..80d9638 100644
  192. --- a/src/add-ons/kernel/busses/scsi/virtio/VirtioSCSIController.cpp
  193. +++ b/src/add-ons/kernel/busses/scsi/virtio/VirtioSCSIController.cpp
  194. @@ -42,7 +42,7 @@ VirtioSCSIController::VirtioSCSIController(device_node *node)
  195.  
  196. if (gSCSI->alloc_dpc(&fEventDPC) != B_OK)
  197. return;
  198. -
  199. +
  200. // get the Virtio device from our parent's parent
  201. device_node *parent = gDeviceManager->get_parent_node(node);
  202. device_node *virtioParent = gDeviceManager->get_parent_node(parent);
  203. @@ -90,14 +90,12 @@ VirtioSCSIController::VirtioSCSIController(device_node *node)
  204.  
  205. for (uint32 i = 0; i < VIRTIO_SCSI_NUM_EVENTS; i++)
  206. _SubmitEvent(i);
  207. -
  208. +
  209. fStatus = fVirtio->setup_interrupt(fVirtioDevice, NULL, this);
  210. if (fStatus != B_OK) {
  211. ERROR("interrupt setup failed (%s)\n", strerror(fStatus));
  212. return;
  213. }
  214. -
  215. -
  216. }
  217.  
  218.  
  219. @@ -149,7 +147,7 @@ VirtioSCSIController::GetRestrictions(uint8 targetID, bool *isATAPI,
  220. bool *noAutoSense, uint32 *maxBlocks)
  221. {
  222. *isATAPI = false;
  223. - *noAutoSense = true;
  224. + *noAutoSense = true;
  225. *maxBlocks = fConfig.cmd_per_lun;
  226. }
  227.  
  228. @@ -219,7 +217,7 @@ VirtioSCSIController::ExecuteRequest(scsi_ccb *ccb)
  229.  
  230. result = fInterruptConditionEntry.Wait(B_RELATIVE_TIMEOUT,
  231. fRequest->Timeout());
  232. -
  233. +
  234. {
  235. InterruptsSpinLocker locker(fInterruptLock);
  236. fExpectsInterrupt = false;
  237. @@ -233,7 +231,7 @@ VirtioSCSIController::ExecuteRequest(scsi_ccb *ccb)
  238.  
  239.  
  240. uchar
  241. -VirtioSCSIController::AbortRequest(scsi_ccb *request)
  242. +VirtioSCSIController::AbortRequest(scsi_ccb *request)
  243. {
  244. return SCSI_REQ_CMP;
  245. }
  246. @@ -250,7 +248,7 @@ status_t
  247. VirtioSCSIController::Control(uint8 targetID, uint32 op, void *buffer,
  248. size_t length)
  249. {
  250. - CALLED();
  251. + CALLED();
  252. return B_DEV_INVALID_IOCTL;
  253. }
  254.  
  255. @@ -293,7 +291,7 @@ VirtioSCSIController::_EventInterrupt(struct virtio_scsi_event* event)
  256. } else switch (event->event) {
  257. case VIRTIO_SCSI_T_TRANSPORT_RESET:
  258. ERROR("transport reset\n");
  259. - break;
  260. + break;
  261. case VIRTIO_SCSI_T_ASYNC_NOTIFY:
  262. ERROR("async notify\n");
  263. break;
  264. diff --git a/src/add-ons/kernel/busses/scsi/virtio/VirtioSCSIPrivate.h b/src/add-ons/kernel/busses/scsi/virtio/VirtioSCSIPrivate.h
  265. index ca810de..467532c 100644
  266. --- a/src/add-ons/kernel/busses/scsi/virtio/VirtioSCSIPrivate.h
  267. +++ b/src/add-ons/kernel/busses/scsi/virtio/VirtioSCSIPrivate.h
  268. @@ -60,7 +60,7 @@ public:
  269. uchar TerminateRequest(scsi_ccb* request);
  270. status_t Control(uint8 targetID, uint32 op,
  271. void* buffer, size_t length);
  272. -
  273. +
  274. private:
  275. static void _RequestCallback(void* driverCookie,
  276. void *cookie);
  277. @@ -141,7 +141,7 @@ private:
  278. bool fHasLock;
  279.  
  280. uint8 fStatus;
  281. -
  282. +
  283. bigtime_t fTimeout;
  284. size_t fBytesLeft;
  285. bool fIsWrite;
  286. diff --git a/src/add-ons/kernel/busses/scsi/virtio/VirtioSCSIRequest.cpp b/src/add-ons/kernel/busses/scsi/virtio/VirtioSCSIRequest.cpp
  287. index ab93b17..fef0ff8 100644
  288. --- a/src/add-ons/kernel/busses/scsi/virtio/VirtioSCSIRequest.cpp
  289. +++ b/src/add-ons/kernel/busses/scsi/virtio/VirtioSCSIRequest.cpp
  290. @@ -181,7 +181,7 @@ VirtioSCSIRequest::FillRequest(uint32 inCount, uint32 outCount,
  291. entries[outCount].address = entries[0].address
  292. + sizeof(struct virtio_scsi_cmd_req);
  293. entries[outCount].size = sizeof(struct virtio_scsi_cmd_resp);
  294. -
  295. +
  296. if (inCount > 1) {
  297. memcpy(entries + outCount + 1, fCCB->sg_list, fCCB->sg_count
  298. * sizeof(physical_entry));
  299. diff --git a/src/add-ons/kernel/busses/scsi/virtio/virtio_scsi.cpp b/src/add-ons/kernel/busses/scsi/virtio/virtio_scsi.cpp
  300. index c1b6391..5bf798d 100644
  301. --- a/src/add-ons/kernel/busses/scsi/virtio/virtio_scsi.cpp
  302. +++ b/src/add-ons/kernel/busses/scsi/virtio/virtio_scsi.cpp
  303. @@ -198,7 +198,7 @@ virtio_scsi_register_device(device_node *parent)
  304.  
  305. gDeviceManager->get_driver(parent, (driver_module_info **)&virtio,
  306. (void **)&virtioDevice);
  307. -
  308. +
  309. status_t status = virtio->read_device_config(virtioDevice, 0, &config,
  310. sizeof(struct virtio_scsi_config));
  311. if (status != B_OK)
  312. @@ -221,7 +221,7 @@ virtio_scsi_register_device(device_node *parent)
  313. { ui32: config.seg_max }},
  314. { NULL }
  315. };
  316. -
  317. +
  318. return gDeviceManager->register_node(parent, VIRTIO_SCSI_DEVICE_MODULE_NAME,
  319. attrs, NULL, NULL);
  320. }
  321. diff --git a/src/add-ons/kernel/drivers/disk/scsi/scsi_disk/scsi_disk.cpp b/src/add-ons/kernel/drivers/disk/scsi/scsi_disk/scsi_disk.cpp
  322. index d3d13af..9c35226 100644
  323. --- a/src/add-ons/kernel/drivers/disk/scsi/scsi_disk/scsi_disk.cpp
  324. +++ b/src/add-ons/kernel/drivers/disk/scsi/scsi_disk/scsi_disk.cpp
  325. @@ -649,7 +649,7 @@ struct driver_module_info sSCSIDiskDriver = {
  326. das_init_driver,
  327. das_uninit_driver,
  328. das_register_child_devices,
  329. - das_rescan_child_devices,
  330. + das_rescan_child_devices,
  331. NULL, // removed
  332. };
  333.  
  334. diff --git a/src/add-ons/kernel/drivers/disk/virtual/virtio_block/virtio_block.cpp b/src/add-ons/kernel/drivers/disk/virtual/virtio_block/virtio_block.cpp
  335. index 131b527..1e41a71 100644
  336. --- a/src/add-ons/kernel/drivers/disk/virtual/virtio_block/virtio_block.cpp
  337. +++ b/src/add-ons/kernel/drivers/disk/virtual/virtio_block/virtio_block.cpp
  338. @@ -201,7 +201,7 @@ do_io(void* cookie, IOOperation* operation)
  339. 1 + (operation->IsWrite() ? operation->VecCount() : 0 ),
  340. 1 + (operation->IsWrite() ? 0 : operation->VecCount()),
  341. virtio_block_callback, info);
  342. -
  343. +
  344. acquire_sem(info->sem_cb);
  345.  
  346. switch (*ack) {
  347. @@ -258,7 +258,7 @@ virtio_block_init_device(void* _info, void** _cookie)
  348. uint64 capacity = info->config.capacity * 512 / block_size;
  349.  
  350. virtio_block_set_capacity(info, capacity, block_size);
  351. -
  352. +
  353. TRACE("virtio_block: capacity: %" B_PRIu64 ", block_size %" B_PRIu32 "\n",
  354. info->capacity, info->block_size);
  355.  
  356. @@ -269,7 +269,7 @@ virtio_block_init_device(void* _info, void** _cookie)
  357. return status;
  358. }
  359. status = info->virtio->setup_interrupt(info->virtio_device, NULL, NULL);
  360. -
  361. +
  362. *_cookie = info;
  363. return status;
  364. }
  365. @@ -298,7 +298,7 @@ virtio_block_open(void* _info, const char* path, int openMode, void** _cookie)
  366. return B_NO_MEMORY;
  367.  
  368. handle->info = info;
  369. -
  370. +
  371. *_cookie = handle;
  372. return B_OK;
  373. }
  374. @@ -319,7 +319,7 @@ virtio_block_free(void* cookie)
  375. {
  376. CALLED();
  377. virtio_block_handle* handle = (virtio_block_handle*)cookie;
  378. -
  379. +
  380. free(handle);
  381. return B_OK;
  382. }
  383. @@ -476,7 +476,7 @@ virtio_block_set_capacity(virtio_block_driver_info* info, uint64 capacity,
  384. restrictions.max_segment_size = info->config.size_max;
  385. if ((info->features & VIRTIO_BLK_F_SEG_MAX) != 0)
  386. restrictions.max_segment_count = info->config.seg_max;
  387. -
  388. +
  389. // TODO: we need to replace the DMAResource in our IOScheduler
  390. status_t status = info->dma_resource->Init(restrictions, blockSize,
  391. 1024, 32);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!