i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtio*: remove trailing spaces

Browse Source
This commit is contained in:
Jérôme Duval
2013-07-18 17:57:56 +02:00
parent f1eb42958f
commit 2f2f475b1d
11 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/virtio/VirtioDevice.cpp
+6 -6
View File
@@ -118,12 +118,12 @@ VirtioDevice::NegociateFeatures(uint32 supported, uint32* negociated,
/*| VIRTIO_FEATURE_RING_INDIRECT_DESC*/ | VIRTIO_FEATURE_RING_EVENT_IDX);
*negociated = fFeatures;
DumpFeatures("negociated features", fFeatures, get_feature_name);
return fController->write_guest_features(fCookie, fFeatures);
}
status_t
VirtioDevice::ReadDeviceConfig(uint8 offset, void* buffer, size_t bufferSize)
@@ -183,7 +183,7 @@ VirtioDevice::SetupInterrupt(virtio_intr_func configHandler, void *driverCookie)
if (status != B_OK)
return status;
// ready to go
// ready to go
fController->set_status(fCookie, VIRTIO_CONFIG_STATUS_DRIVER_OK);
for (size_t index = 0; index < fQueueCount; index++)
@@ -196,7 +196,7 @@ status_t
VirtioDevice::SetupQueue(uint16 queueNumber, phys_addr_t physAddr)
{
return fController->setup_queue(fCookie, queueNumber, physAddr);
}
}
void
@@ -214,14 +214,14 @@ VirtioDevice::QueueInterrupt(uint16 queueNumber)
return B_BAD_VALUE;
return fQueues[queueNumber]->Interrupt();
}
status_t status = B_OK;
for (uint16 i = 0; i < fQueueCount; i++) {
status = fQueues[i]->Interrupt();
if (status != B_OK)
break;
}
return status;
}
src/add-ons/kernel/bus_managers/virtio/VirtioModule.cpp
+6 -6
View File
@@ -58,18 +58,18 @@ virtio_negociate_features(void* cookie, uint32 supported,
{
CALLED();
VirtioDevice *device = (VirtioDevice *)cookie;
return device->NegociateFeatures(supported, negociated, get_feature_name);
}
status_t
virtio_read_device_config(void* cookie, uint8 offset, void* buffer,
size_t bufferSize)
{
CALLED();
VirtioDevice *device = (VirtioDevice *)cookie;
return device->ReadDeviceConfig(offset, buffer, bufferSize);
}
@@ -80,7 +80,7 @@ virtio_write_device_config(void* cookie, uint8 offset,
{
CALLED();
VirtioDevice *device = (VirtioDevice *)cookie;
return device->WriteDeviceConfig(offset, buffer, bufferSize);
}
@@ -100,7 +100,7 @@ virtio_setup_interrupt(virtio_device cookie, virtio_intr_func config_handler,
{
CALLED();
VirtioDevice *device = (VirtioDevice *)cookie;
return device->SetupInterrupt(config_handler, driverCookie);
return device->SetupInterrupt(config_handler, driverCookie);
}
@@ -128,7 +128,7 @@ virtio_queue_request(virtio_queue cookie, const physical_entry *readEntry,
entries[1] = *writtenEntry;
} else if (writtenEntry != NULL)
entries[0] = *writtenEntry;
return virtio_queue_request_v(cookie, entries, readEntry != NULL ? 1 : 0,
writtenEntry != NULL? 1 : 0, callback, callbackCookie);
}
src/add-ons/kernel/bus_managers/virtio/VirtioPrivate.h
+4 -4
View File
@@ -21,7 +21,7 @@
#ifdef VIRTIO_TRACE
# define TRACE(x...) dprintf("\33[33mvirtio:\33[0m " x)
#else
# define TRACE(x...)
# define TRACE(x...)
#endif
#define TRACE_ALWAYS(x...) dprintf("\33[33mvirtio:\33[0m " x)
#define ERROR(x...) TRACE_ALWAYS(x)
@@ -48,7 +48,7 @@ public:
status_t NegociateFeatures(uint32 supported,
uint32* negociated,
const char* (*get_feature_name)(uint32));
status_t ReadDeviceConfig(uint8 offset, void* buffer,
size_t bufferSize);
status_t WriteDeviceConfig(uint8 offset,
@@ -75,7 +75,7 @@ private:
void DumpFeatures(const char* title,
uint32 features,
const char* (*get_feature_name)(uint32));
device_node * fNode;
uint32 fID;
@@ -123,7 +123,7 @@ public:
void *callbackCookie);
void EnableInterrupt();
void DisableInterrupt();
private:
void UpdateAvailable(uint16 index);
uint16 QueueVector(uint16 insertIndex,
src/add-ons/kernel/bus_managers/virtio/VirtioQueue.cpp
+8 -8
View File
@@ -51,7 +51,7 @@ alloc_mem(void **virt, phys_addr_t *phy, size_t size, uint32 protection,
class TransferDescriptor {
public:
TransferDescriptor(VirtioQueue* queue,
uint16 size,
uint16 size,
virtio_callback_func callback,
void *callbackCookie);
~TransferDescriptor();
@@ -69,7 +69,7 @@ private:
};
TransferDescriptor::TransferDescriptor(VirtioQueue* queue, uint16 size,
TransferDescriptor::TransferDescriptor(VirtioQueue* queue, uint16 size,
virtio_callback_func callback, void *callbackCookie)
: fQueue(queue),
fCookie(callbackCookie),
@@ -127,7 +127,7 @@ VirtioQueue::VirtioQueue(VirtioDevice* device, uint16 queueNumber,
for (uint16 i = 0; i < fRingSize - 1; i++)
fRing.desc[i].next = i + 1;
fRing.desc[fRingSize - 1].next = UINT16_MAX;
DisableInterrupt();
device->SetupQueue(fQueueNumber, physAddr);
@@ -172,7 +172,7 @@ VirtioQueue::Interrupt()
while (fRingUsedIndex != fRing.used->idx)
Finish();
EnableInterrupt();
return B_OK;
}
@@ -199,7 +199,7 @@ VirtioQueue::Finish()
index = fRing.desc[index].next;
size--;
}
if (size > 0)
panic("VirtioQueue::Finish() descriptors left %d\n", size);
@@ -221,7 +221,7 @@ VirtioQueue::QueueRequest(const physical_entry* vector, size_t readVectorCount,
if (count < 1)
return B_BAD_VALUE;
if ((fDevice->Features() & VIRTIO_FEATURE_RING_INDIRECT_DESC) != 0) {
return QueueRequestIndirect(vector, readVectorCount,
return QueueRequestIndirect(vector, readVectorCount,
writtenVectorCount, callback, callbackCookie);
}
@@ -233,7 +233,7 @@ VirtioQueue::QueueRequest(const physical_entry* vector, size_t readVectorCount,
count, callback, callbackCookie);
if (fDescriptors[insertIndex] == NULL)
return B_NO_MEMORY;
// enqueue
uint16 index = QueueVector(insertIndex, fRing.desc, vector,
readVectorCount, writtenVectorCount);
@@ -244,7 +244,7 @@ VirtioQueue::QueueRequest(const physical_entry* vector, size_t readVectorCount,
UpdateAvailable(insertIndex);
NotifyHost();
return B_OK;
}
src/add-ons/kernel/busses/scsi/virtio/VirtioSCSIController.cpp
+8 -8
View File
@@ -42,7 +42,7 @@ VirtioSCSIController::VirtioSCSIController(device_node *node)
if (gSCSI->alloc_dpc(&fEventDPC) != B_OK)
return;
// get the Virtio device from our parent's parent
device_node *parent = gDeviceManager->get_parent_node(node);
device_node *virtioParent = gDeviceManager->get_parent_node(parent);
@@ -90,14 +90,14 @@ VirtioSCSIController::VirtioSCSIController(device_node *node)
for (uint32 i = 0; i < VIRTIO_SCSI_NUM_EVENTS; i++)
_SubmitEvent(i);
fStatus = fVirtio->setup_interrupt(fVirtioDevice, NULL, this);
if (fStatus != B_OK) {
ERROR("interrupt setup failed (%s)\n", strerror(fStatus));
return;
}
}
@@ -149,7 +149,7 @@ VirtioSCSIController::GetRestrictions(uint8 targetID, bool *isATAPI,
bool *noAutoSense, uint32 *maxBlocks)
{
*isATAPI = false;
*noAutoSense = true;
*noAutoSense = true;
*maxBlocks = fConfig.cmd_per_lun;
}
@@ -219,7 +219,7 @@ VirtioSCSIController::ExecuteRequest(scsi_ccb *ccb)
result = fInterruptConditionEntry.Wait(B_RELATIVE_TIMEOUT,
fRequest->Timeout());
{
InterruptsSpinLocker locker(fInterruptLock);
fExpectsInterrupt = false;
@@ -233,7 +233,7 @@ VirtioSCSIController::ExecuteRequest(scsi_ccb *ccb)
uchar
VirtioSCSIController::AbortRequest(scsi_ccb *request)
VirtioSCSIController::AbortRequest(scsi_ccb *request)
{
return SCSI_REQ_CMP;
}
@@ -250,7 +250,7 @@ status_t
VirtioSCSIController::Control(uint8 targetID, uint32 op, void *buffer,
size_t length)
{
CALLED();
CALLED();
return B_DEV_INVALID_IOCTL;
}
@@ -293,7 +293,7 @@ VirtioSCSIController::_EventInterrupt(struct virtio_scsi_event* event)
} else switch (event->event) {
case VIRTIO_SCSI_T_TRANSPORT_RESET:
ERROR("transport reset\n");
break;
break;
case VIRTIO_SCSI_T_ASYNC_NOTIFY:
ERROR("async notify\n");
break;
src/add-ons/kernel/busses/scsi/virtio/VirtioSCSIPrivate.h
+2 -2
View File
@@ -60,7 +60,7 @@ public:
uchar TerminateRequest(scsi_ccb* request);
status_t Control(uint8 targetID, uint32 op,
void* buffer, size_t length);
private:
static void _RequestCallback(void* driverCookie,
void *cookie);
@@ -141,7 +141,7 @@ private:
bool fHasLock;
uint8 fStatus;
bigtime_t fTimeout;
size_t fBytesLeft;
bool fIsWrite;
src/add-ons/kernel/busses/scsi/virtio/VirtioSCSIRequest.cpp
+1 -1
View File
@@ -181,7 +181,7 @@ VirtioSCSIRequest::FillRequest(uint32 inCount, uint32 outCount,
entries[outCount].address = entries[0].address
+ sizeof(struct virtio_scsi_cmd_req);
entries[outCount].size = sizeof(struct virtio_scsi_cmd_resp);
if (inCount > 1) {
memcpy(entries + outCount + 1, fCCB->sg_list, fCCB->sg_count
* sizeof(physical_entry));
src/add-ons/kernel/busses/scsi/virtio/virtio_scsi.cpp
+2 -2
View File
@@ -198,7 +198,7 @@ virtio_scsi_register_device(device_node *parent)
gDeviceManager->get_driver(parent, (driver_module_info **)&virtio,
(void **)&virtioDevice);
status_t status = virtio->read_device_config(virtioDevice, 0, &config,
sizeof(struct virtio_scsi_config));
if (status != B_OK)
@@ -221,7 +221,7 @@ virtio_scsi_register_device(device_node *parent)
{ ui32: config.seg_max }},
{ NULL }
};
return gDeviceManager->register_node(parent, VIRTIO_SCSI_DEVICE_MODULE_NAME,
attrs, NULL, NULL);
}
src/add-ons/kernel/busses/virtio/Jamfile
+1 -1
View File
@@ -11,6 +11,6 @@ KernelAddon virtio_pci :
;
SEARCH on [ FGristFiles
kernel_cpp.cpp
kernel_cpp.cpp
] = [ FDirName $(HAIKU_TOP) src system kernel util ] ;
src/add-ons/kernel/busses/virtio/virtio_pci.cpp
+16 -16
View File
@@ -68,7 +68,7 @@ int32
virtio_pci_interrupt(void *data)
{
virtio_pci_sim_info* bus = (virtio_pci_sim_info*)data;
uint8 isr = bus->pci->read_io_8(bus->device,
uint8 isr = bus->pci->read_io_8(bus->device,
bus->base_addr + VIRTIO_PCI_ISR);
if (isr == 0)
return B_UNHANDLED_INTERRUPT;
@@ -129,7 +129,7 @@ virtio_pci_setup_msix_interrupts(virtio_pci_sim_info* bus)
ERROR("msix queue vector incorrect\n");
return B_BAD_VALUE;
}
if (bus->irq_type == VIRTIO_IRQ_MSI_X)
irq++;
}
@@ -156,7 +156,7 @@ read_host_features(void* cookie, uint32 *features)
TRACE("read_host_features() %p node %p pci %p device %p\n", bus,
bus->node, bus->pci, bus->device);
*features = bus->pci->read_io_32(bus->device,
*features = bus->pci->read_io_32(bus->device,
bus->base_addr + VIRTIO_PCI_HOST_FEATURES);
return B_OK;
}
@@ -206,17 +206,17 @@ read_device_config(void* cookie, uint8 _offset, void* _buffer,
uint8 size = 4;
if (bufferSize == 1) {
size = 1;
*buffer = bus->pci->read_io_8(bus->device,
*buffer = bus->pci->read_io_8(bus->device,
offset);
} else if (bufferSize <= 3) {
size = 2;
*(uint16*)buffer = bus->pci->read_io_16(bus->device,
*(uint16*)buffer = bus->pci->read_io_16(bus->device,
offset);
} else {
*(uint32*)buffer = bus->pci->read_io_32(bus->device,
*(uint32*)buffer = bus->pci->read_io_32(bus->device,
offset);
}
buffer += size;
buffer += size;
bufferSize -= size;
offset += size;
}
@@ -238,17 +238,17 @@ write_device_config(void* cookie, uint8 _offset, const void* _buffer,
uint8 size = 4;
if (bufferSize == 1) {
size = 1;
bus->pci->write_pci_config(bus->device,
bus->pci->write_pci_config(bus->device,
offset, size, *buffer);
} else if (bufferSize <= 3) {
size = 2;
bus->pci->write_pci_config(bus->device,
bus->pci->write_pci_config(bus->device,
offset, size, *(const uint16*)buffer);
} else {
bus->pci->write_pci_config(bus->device,
bus->pci->write_pci_config(bus->device,
offset, size, *(const uint32*)buffer);
}
buffer += size;
buffer += size;
bufferSize -= size;
offset += size;
}
@@ -275,13 +275,13 @@ setup_queue(void* cookie, uint16 queue, phys_addr_t phy)
virtio_pci_sim_info* bus = (virtio_pci_sim_info*)cookie;
bus->pci->write_io_16(bus->device, bus->base_addr + VIRTIO_PCI_QUEUE_SEL,
queue);
bus->pci->write_io_32(bus->device, bus->base_addr + VIRTIO_PCI_QUEUE_PFN,
bus->pci->write_io_32(bus->device, bus->base_addr + VIRTIO_PCI_QUEUE_PFN,
(uint32)phy >> VIRTIO_PCI_QUEUE_ADDR_SHIFT);
return B_OK;
}
status_t
status_t
setup_interrupt(void* cookie, uint16 queueCount)
{
CALLED();
@@ -327,7 +327,7 @@ setup_interrupt(void* cookie, uint16 queueCount)
}
} else if (sPCIx86Module->get_msi_count(
pciInfo->bus, pciInfo->device, pciInfo->function) >= 1) {
// try MSI
// try MSI
uint8 vector;
if (sPCIx86Module->configure_msi(pciInfo->bus, pciInfo->device,
pciInfo->function, 1, &vector) == B_OK
@@ -514,13 +514,13 @@ register_child_devices(void* cookie)
pci_device* device;
gDeviceManager->get_driver(parent, (driver_module_info**)&pci,
(void**)&device);
uint16 pciSubDeviceId = pci->read_pci_config(device, PCI_subsystem_id,
2);
char prettyName[25];
sprintf(prettyName, "Virtio Device %" B_PRIu16, pciSubDeviceId);
device_attr attrs[] = {
// properties of this controller for virtio bus manager
{ B_DEVICE_PRETTY_NAME, B_STRING_TYPE,
src/add-ons/kernel/drivers/disk/virtual/virtio_block/virtio_block.cpp
+6 -6
View File
@@ -201,7 +201,7 @@ do_io(void* cookie, IOOperation* operation)
1 + (operation->IsWrite() ? operation->VecCount() : 0 ),
1 + (operation->IsWrite() ? 0 : operation->VecCount()),
virtio_block_callback, info);
acquire_sem(info->sem_cb);
switch (*ack) {
@@ -258,7 +258,7 @@ virtio_block_init_device(void* _info, void** _cookie)
uint64 capacity = info->config.capacity * 512 / block_size;
virtio_block_set_capacity(info, capacity, block_size);
TRACE("virtio_block: capacity: %" B_PRIu64 ", block_size %" B_PRIu32 "\n",
info->capacity, info->block_size);
@@ -269,7 +269,7 @@ virtio_block_init_device(void* _info, void** _cookie)
return status;
}
status = info->virtio->setup_interrupt(info->virtio_device, NULL, NULL);
*_cookie = info;
return status;
}
@@ -298,7 +298,7 @@ virtio_block_open(void* _info, const char* path, int openMode, void** _cookie)
return B_NO_MEMORY;
handle->info = info;
*_cookie = handle;
return B_OK;
}
@@ -319,7 +319,7 @@ virtio_block_free(void* cookie)
{
CALLED();
virtio_block_handle* handle = (virtio_block_handle*)cookie;
free(handle);
return B_OK;
}
@@ -476,7 +476,7 @@ virtio_block_set_capacity(virtio_block_driver_info* info, uint64 capacity,
restrictions.max_segment_size = info->config.size_max;
if ((info->features & VIRTIO_BLK_F_SEG_MAX) != 0)
restrictions.max_segment_count = info->config.seg_max;
// TODO: we need to replace the DMAResource in our IOScheduler
status_t status = info->dma_resource->Init(restrictions, blockSize,
1024, 32);