From owner-svn-src-all@freebsd.org Mon Jun 11 15:03:11 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2906D100DB2F; Mon, 11 Jun 2018 15:03:11 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 943DC69FEB; Mon, 11 Jun 2018 15:03:10 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id w5BF381F028619; Mon, 11 Jun 2018 08:03:08 -0700 (PDT) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id w5BF3804028618; Mon, 11 Jun 2018 08:03:08 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201806111503.w5BF3804028618@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r334950 - head/usr.sbin/bhyve In-Reply-To: <201806111445.w5BEjZT8097450@repo.freebsd.org> To: "Pedro F. Giffuni" Date: Mon, 11 Jun 2018 08:03:08 -0700 (PDT) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jun 2018 15:03:11 -0000 [ Charset UTF-8 unsupported, converting... ] > Author: pfg > Date: Mon Jun 11 14:45:34 2018 > New Revision: 334950 > URL: https://svnweb.freebsd.org/changeset/base/334950 > > Log: > style(9): Fix tabs after #define. > > No functional change intended. Thank you. > Modified: > head/usr.sbin/bhyve/pci_virtio_scsi.c > > Modified: head/usr.sbin/bhyve/pci_virtio_scsi.c > ============================================================================== > --- head/usr.sbin/bhyve/pci_virtio_scsi.c Mon Jun 11 14:27:19 2018 (r334949) > +++ head/usr.sbin/bhyve/pci_virtio_scsi.c Mon Jun 11 14:45:34 2018 (r334950) > @@ -77,17 +77,17 @@ __FBSDID("$FreeBSD$"); > #define VTSCSI_OUT_HEADER_LEN(_sc) \ > (sizeof(struct pci_vtscsi_req_cmd_wr) + _sc->vss_config.sense_size) > > -#define VIRTIO_SCSI_MAX_CHANNEL 0 > -#define VIRTIO_SCSI_MAX_TARGET 0 > -#define VIRTIO_SCSI_MAX_LUN 16383 > +#define VIRTIO_SCSI_MAX_CHANNEL 0 > +#define VIRTIO_SCSI_MAX_TARGET 0 > +#define VIRTIO_SCSI_MAX_LUN 16383 > > #define VIRTIO_SCSI_F_INOUT (1 << 0) > #define VIRTIO_SCSI_F_HOTPLUG (1 << 1) > #define VIRTIO_SCSI_F_CHANGE (1 << 2) > > static int pci_vtscsi_debug = 0; > -#define DPRINTF(params) if (pci_vtscsi_debug) printf params > -#define WPRINTF(params) printf params > +#define DPRINTF(params) if (pci_vtscsi_debug) printf params > +#define WPRINTF(params) printf params > > struct pci_vtscsi_config { > uint32_t num_queues; > @@ -108,7 +108,7 @@ struct pci_vtscsi_queue { > int vsq_ctl_fd; > pthread_mutex_t vsq_mtx; > pthread_mutex_t vsq_qmtx; > - pthread_cond_t vsq_cv; > + pthread_cond_t vsq_cv; > STAILQ_HEAD(, pci_vtscsi_request) vsq_requests; > LIST_HEAD(, pci_vtscsi_worker) vsq_workers; > }; > @@ -117,7 +117,7 @@ struct pci_vtscsi_worker { > struct pci_vtscsi_queue * vsw_queue; > pthread_t vsw_thread; > bool vsw_exiting; > - LIST_ENTRY(pci_vtscsi_worker) vsw_link; > + LIST_ENTRY(pci_vtscsi_worker) vsw_link; > }; > > struct pci_vtscsi_request { > @@ -144,20 +144,20 @@ struct pci_vtscsi_softc { > struct pci_vtscsi_config vss_config; > }; > > -#define VIRTIO_SCSI_T_TMF 0 > -#define VIRTIO_SCSI_T_TMF_ABORT_TASK 0 > -#define VIRTIO_SCSI_T_TMF_ABORT_TASK_SET 1 > -#define VIRTIO_SCSI_T_TMF_CLEAR_ACA 2 > -#define VIRTIO_SCSI_T_TMF_CLEAR_TASK_SET 3 > -#define VIRTIO_SCSI_T_TMF_I_T_NEXUS_RESET 4 > -#define VIRTIO_SCSI_T_TMF_LOGICAL_UNIT_RESET 5 > -#define VIRTIO_SCSI_T_TMF_QUERY_TASK 6 > -#define VIRTIO_SCSI_T_TMF_QUERY_TASK_SET 7 > +#define VIRTIO_SCSI_T_TMF 0 > +#define VIRTIO_SCSI_T_TMF_ABORT_TASK 0 > +#define VIRTIO_SCSI_T_TMF_ABORT_TASK_SET 1 > +#define VIRTIO_SCSI_T_TMF_CLEAR_ACA 2 > +#define VIRTIO_SCSI_T_TMF_CLEAR_TASK_SET 3 > +#define VIRTIO_SCSI_T_TMF_I_T_NEXUS_RESET 4 > +#define VIRTIO_SCSI_T_TMF_LOGICAL_UNIT_RESET 5 > +#define VIRTIO_SCSI_T_TMF_QUERY_TASK 6 > +#define VIRTIO_SCSI_T_TMF_QUERY_TASK_SET 7 > > /* command-specific response values */ > -#define VIRTIO_SCSI_S_FUNCTION_COMPLETE 0 > -#define VIRTIO_SCSI_S_FUNCTION_SUCCEEDED 10 > -#define VIRTIO_SCSI_S_FUNCTION_REJECTED 11 > +#define VIRTIO_SCSI_S_FUNCTION_COMPLETE 0 > +#define VIRTIO_SCSI_S_FUNCTION_SUCCEEDED 10 > +#define VIRTIO_SCSI_S_FUNCTION_REJECTED 11 > > struct pci_vtscsi_ctrl_tmf { > uint32_t type; > @@ -167,13 +167,13 @@ struct pci_vtscsi_ctrl_tmf { > uint8_t response; > } __attribute__((packed)); > > -#define VIRTIO_SCSI_T_AN_QUERY 1 > -#define VIRTIO_SCSI_EVT_ASYNC_OPERATIONAL_CHANGE 2 > -#define VIRTIO_SCSI_EVT_ASYNC_POWER_MGMT 4 > -#define VIRTIO_SCSI_EVT_ASYNC_EXTERNAL_REQUEST 8 > -#define VIRTIO_SCSI_EVT_ASYNC_MEDIA_CHANGE 16 > -#define VIRTIO_SCSI_EVT_ASYNC_MULTI_HOST 32 > -#define VIRTIO_SCSI_EVT_ASYNC_DEVICE_BUSY 64 > +#define VIRTIO_SCSI_T_AN_QUERY 1 > +#define VIRTIO_SCSI_EVT_ASYNC_OPERATIONAL_CHANGE 2 > +#define VIRTIO_SCSI_EVT_ASYNC_POWER_MGMT 4 > +#define VIRTIO_SCSI_EVT_ASYNC_EXTERNAL_REQUEST 8 > +#define VIRTIO_SCSI_EVT_ASYNC_MEDIA_CHANGE 16 > +#define VIRTIO_SCSI_EVT_ASYNC_MULTI_HOST 32 > +#define VIRTIO_SCSI_EVT_ASYNC_DEVICE_BUSY 64 > > struct pci_vtscsi_ctrl_an { > uint32_t type; > @@ -184,23 +184,23 @@ struct pci_vtscsi_ctrl_an { > } __attribute__((packed)); > > /* command-specific response values */ > -#define VIRTIO_SCSI_S_OK 0 > -#define VIRTIO_SCSI_S_OVERRUN 1 > -#define VIRTIO_SCSI_S_ABORTED 2 > -#define VIRTIO_SCSI_S_BAD_TARGET 3 > -#define VIRTIO_SCSI_S_RESET 4 > -#define VIRTIO_SCSI_S_BUSY 5 > -#define VIRTIO_SCSI_S_TRANSPORT_FAILURE 6 > -#define VIRTIO_SCSI_S_TARGET_FAILURE 7 > -#define VIRTIO_SCSI_S_NEXUS_FAILURE 8 > -#define VIRTIO_SCSI_S_FAILURE 9 > -#define VIRTIO_SCSI_S_INCORRECT_LUN 12 > +#define VIRTIO_SCSI_S_OK 0 > +#define VIRTIO_SCSI_S_OVERRUN 1 > +#define VIRTIO_SCSI_S_ABORTED 2 > +#define VIRTIO_SCSI_S_BAD_TARGET 3 > +#define VIRTIO_SCSI_S_RESET 4 > +#define VIRTIO_SCSI_S_BUSY 5 > +#define VIRTIO_SCSI_S_TRANSPORT_FAILURE 6 > +#define VIRTIO_SCSI_S_TARGET_FAILURE 7 > +#define VIRTIO_SCSI_S_NEXUS_FAILURE 8 > +#define VIRTIO_SCSI_S_FAILURE 9 > +#define VIRTIO_SCSI_S_INCORRECT_LUN 12 > > /* task_attr */ > -#define VIRTIO_SCSI_S_SIMPLE 0 > -#define VIRTIO_SCSI_S_ORDERED 1 > -#define VIRTIO_SCSI_S_HEAD 2 > -#define VIRTIO_SCSI_S_ACA 3 > +#define VIRTIO_SCSI_S_SIMPLE 0 > +#define VIRTIO_SCSI_S_ORDERED 1 > +#define VIRTIO_SCSI_S_HEAD 2 > +#define VIRTIO_SCSI_S_ACA 3 > > struct pci_vtscsi_event { > uint32_t event; > > -- Rod Grimes rgrimes@freebsd.org