[block] Minor code style fixes

Author: facekapow

js/core/block/block-device-interface.js

@@ -14,8 +14,12 @@
 
 'use strict';
 
+const typeutils = require('typeutils');
+
 const busHandle = Symbol('bus');
 const formatInfoHandle = Symbol('formatInfo');
+const nameHandle = Symbol('name');
+const setNameHandle = Symbol('setName');
 
 class BlockDeviceInterface {
   constructor(bus = '', init = {}) {
@@ -24,24 +28,30 @@ class BlockDeviceInterface {
     this.onread = null;
     this.onwrite = null;
     this.ongetonline = null;
-    if (typeof init === 'object' && init !== null) {
-      if (typeof init.read === 'function') {
+    if (typeutils.isObject(init)) {
+      if (typeutils.isFunction(init.read)) {
         this.onread = init.read;
       }
-      if (typeof init.write === 'function') {
+      if (typeutils.isFunction(init.write)) {
         this.write = init.write;
       }
-      if (typeof init.formatInfo === 'object') {
+      if (typeutils.isObject(init.formatInfo)) {
         this[formatInfoHandle] = init.formatInfo;
       }
-      if (typeof init.isOnline === 'function') {
+      if (typeutils.isFunction(init.isOnline)) {
         this.ongetonline = init.isOnline;
       }
     }
   }
+  get name() {
+    return this[nameHandle];
+  }
   get bus() {
     return this[busHandle];
   }
+  [setNameHandle](newName) {
+    this[nameHandle] = newName;
+  }
   read(sector, u8) {
     if (!this.onread) {
       throw new Error('driver was not initialized');
@@ -65,4 +75,7 @@ class BlockDeviceInterface {
   }
 }
 
-module.exports = BlockDeviceInterface;
+module.exports = {
+  BlockDeviceInterface,
+  setNameHandle,
+};

js/core/block/devices.js

@@ -13,18 +13,16 @@
 // limitations under the License.
 
 'use strict';
+
+const { setNameHandle } = require('./block-device-interface');
 const availableBuses = Object.create(null); // not using a Map because the buses should be easy to access directly
 const availableDevices = [];
 
 module.exports = {
   registerDevice(device) {
     if (!availableBuses[device.bus]) availableBuses[device.bus] = [];
     const i = availableDevices.push(device) - 1;
-    Object.assign(device, {
-      get name() {
-        return `${device.bus}${i}`;
-      },
-    });
+    device[setNameHandle](`${device.bus}${i}`);
     availableBuses[device.bus].push(device);
 
     console.log(`[block] registered block device ${device.name}`);

js/core/block/index.js

@@ -13,7 +13,7 @@
 // limitations under the License.
 
 'use strict';
-const BlockDeviceInterface = require('./block-device-interface');
+const { BlockDeviceInterface } = require('./block-device-interface');
 const { registerDevice, getDevices, getBuses } = require('./devices');
 
 module.exports = {
@@ -24,5 +24,5 @@ module.exports = {
   },
   get buses() {
     return getBuses();
-  }
+  },
 };

js/driver/virtio/blk.js

@@ -81,7 +81,7 @@ function initializeBlockDevice(pciDevice) {
         }
         const status = new Uint8Array(1);
         promiseQueue.push([resolve, reject, VIRTIO_BLK_T_IN, data, status]);
-        reqQueue.placeBuffers([buildHeader(VIRTIO_BLK_T_IN, sector), data, status], null, [false, true, true]);
+        reqQueue.placeBuffers([buildHeader(VIRTIO_BLK_T_IN, sector), data, status], false, [false, true, true]);
 
         if (reqQueue.isNotificationNeeded()) {
           dev.queueNotify(QUEUE_ID_REQ);
@@ -92,7 +92,7 @@ function initializeBlockDevice(pciDevice) {
       return new Promise((resolve, reject) => {
         const status = new Uint8Array(1);
         promiseQueue.push([resolve, reject, VIRTIO_BLK_T_OUT, data, status]);
-        reqQueue.placeBuffers([buildHeader(VIRTIO_BLK_T_OUT, sector), data, status], null, [false, false, true]);
+        reqQueue.placeBuffers([buildHeader(VIRTIO_BLK_T_OUT, sector), data, status], false, [false, false, true]);
 
         if (reqQueue.isNotificationNeeded()) {
           dev.queueNotify(QUEUE_ID_REQ);