Skip to content

Commit

Permalink
dm: code clean up
Browse files Browse the repository at this point in the history 
Following functions have never been used anywhere.
Let's remove them.

fbsdrun_muxed()
fbsdrun_vmexit_on_hlt()
fbsdrun_vmexit_on_pause()
fbsdrun_disable_x2apic()

Remove weird prefix "fbsdrun" from following functions' name.

fbsdrun_virtio_msix()  -->  virtio_uses_msix()
fbsdrun_start_thread() -->  start_thread()

Signed-off-by: Jie Deng <jie.deng@intel.com>
Reviewed-by: Hao Li <hao.l.li@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
  • Loading branch information
@ssqre @jren1
ssqre authored and jren1 committed May 15, 2018
1 parent d1a17a6 commit d63b900
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 31 deletions.
18 changes: 3 additions & 15 deletions devicemodel/core/main.c
View file
Expand Up @@ -231,25 +231,13 @@ dm_gpa2hva(uint64_t gpa, size_t size)
}

int
fbsdrun_vmexit_on_pause(void)
{
return guest_vmexit_on_pause;
}

int
fbsdrun_vmexit_on_hlt(void)
{
return guest_vmexit_on_hlt;
}

int
fbsdrun_virtio_msix(void)
virtio_uses_msix(void)
{
return virtio_msix;
}

static void *
fbsdrun_start_thread(void *param)
start_thread(void *param)
{
char tname[MAXCOMLEN + 1];
struct mt_vmm_info *mtp;
Expand Down Expand Up @@ -285,7 +273,7 @@ add_cpu(struct vmctx *ctx, int guest_ncpus)
}

error = pthread_create(&mt_vmm_info[0].mt_thr, NULL,
fbsdrun_start_thread, &mt_vmm_info[0]);
start_thread, &mt_vmm_info[0]);
assert(error == 0);
}

Expand Down
2 changes: 1 addition & 1 deletion devicemodel/hw/pci/virtio/virtio_block.c
View file
Expand Up @@ -388,7 +388,7 @@ virtio_blk_init(struct vmctx *ctx, struct pci_vdev *dev, char *opts)
pci_set_cfgdata16(dev, PCIR_SUBDEV_0, VIRTIO_TYPE_BLOCK);
pci_set_cfgdata16(dev, PCIR_SUBVEND_0, VIRTIO_VENDOR);

if (virtio_interrupt_init(&blk->base, fbsdrun_virtio_msix())) {
if (virtio_interrupt_init(&blk->base, virtio_uses_msix())) {
blockif_close(blk->bc);
free(blk);
return -1;
Expand Down
2 changes: 1 addition & 1 deletion devicemodel/hw/pci/virtio/virtio_console.c
View file
Expand Up @@ -859,7 +859,7 @@ virtio_console_init(struct vmctx *ctx, struct pci_vdev *dev, char *opts)
pci_set_cfgdata16(dev, PCIR_SUBDEV_0, VIRTIO_TYPE_CONSOLE);
pci_set_cfgdata16(dev, PCIR_SUBVEND_0, VIRTIO_VENDOR);

if (virtio_interrupt_init(&console->base, fbsdrun_virtio_msix())) {
if (virtio_interrupt_init(&console->base, virtio_uses_msix())) {
if (console) {
if (console->config)
free(console->config);
Expand Down
4 changes: 2 additions & 2 deletions devicemodel/hw/pci/virtio/virtio_heci.c
View file
Expand Up @@ -1302,7 +1302,7 @@ virtio_heci_init(struct vmctx *ctx, struct pci_vdev *dev, char *opts)
WPRINTF(("vheci init: mutexattr init fail, erro %d!\r\n", rc));
goto fail;
}
if (fbsdrun_virtio_msix()) {
if (virtio_uses_msix()) {
rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_DEFAULT);
if (rc) {
WPRINTF(("vheci init: mutexattr_settype failed with "
Expand Down Expand Up @@ -1340,7 +1340,7 @@ virtio_heci_init(struct vmctx *ctx, struct pci_vdev *dev, char *opts)
pci_set_cfgdata16(dev, PCIR_SUBDEV_0, VIRTIO_TYPE_HECI);
pci_set_cfgdata16(dev, PCIR_SUBVEND_0, INTEL_VENDOR_ID);

if (virtio_interrupt_init(&vheci->base, fbsdrun_virtio_msix()))
if (virtio_interrupt_init(&vheci->base, virtio_uses_msix()))
goto setup_fail;
virtio_set_io_bar(&vheci->base, 0);

Expand Down
4 changes: 2 additions & 2 deletions devicemodel/hw/pci/virtio/virtio_hyper_dmabuf.c
View file
Expand Up @@ -306,7 +306,7 @@ virtio_hyper_dmabuf_init(struct vmctx *ctx, struct pci_vdev *dev, char *opts)
if (rc)
DPRINTF("mutexattr init failed with erro %d!\n", rc);

if (fbsdrun_virtio_msix()) {
if (virtio_uses_msix()) {
rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_DEFAULT);
DPRINTF("virtio_msix: mutexattr_settype ");
DPRINTF("failed with error %d!\n", rc);
Expand Down Expand Up @@ -347,7 +347,7 @@ virtio_hyper_dmabuf_init(struct vmctx *ctx, struct pci_vdev *dev, char *opts)
pci_set_cfgdata16(dev, PCIR_SUBDEV_0, VIRTIO_TYPE_HYPERDMABUF);
pci_set_cfgdata16(dev, PCIR_SUBVEND_0, INTEL_VENDOR_ID);

if (virtio_interrupt_init(&hyper_dmabuf->base, fbsdrun_virtio_msix())) {
if (virtio_interrupt_init(&hyper_dmabuf->base, virtio_uses_msix())) {
if (hyper_dmabuf)
free(hyper_dmabuf);
return -1;
Expand Down
2 changes: 1 addition & 1 deletion devicemodel/hw/pci/virtio/virtio_net.c
View file
Expand Up @@ -1003,7 +1003,7 @@ virtio_net_init(struct vmctx *ctx, struct pci_vdev *dev, char *opts)
net->nmd != NULL);

/* use BAR 1 to map MSI-X table and PBA, if we're using MSI-X */
if (virtio_interrupt_init(&net->base, fbsdrun_virtio_msix())) {
if (virtio_interrupt_init(&net->base, virtio_uses_msix())) {
if (net)
free(net);
return -1;
Expand Down
4 changes: 2 additions & 2 deletions devicemodel/hw/pci/virtio/virtio_rnd.c
View file
Expand Up @@ -387,7 +387,7 @@ virtio_rnd_init(struct vmctx *ctx, struct pci_vdev *dev, char *opts)
rc = pthread_mutexattr_init(&attr);
if (rc)
DPRINTF(("mutexattr init failed with erro %d!\n", rc));
if (fbsdrun_virtio_msix()) {
if (virtio_uses_msix()) {
rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_DEFAULT);
if (rc)
DPRINTF(("virtio_msix: mutexattr_settype failed with "
Expand Down Expand Up @@ -435,7 +435,7 @@ virtio_rnd_init(struct vmctx *ctx, struct pci_vdev *dev, char *opts)
pci_set_cfgdata16(dev, PCIR_SUBDEV_0, VIRTIO_TYPE_ENTROPY);
pci_set_cfgdata16(dev, PCIR_SUBVEND_0, VIRTIO_VENDOR);

if (virtio_interrupt_init(&rnd->base, fbsdrun_virtio_msix())) {
if (virtio_interrupt_init(&rnd->base, virtio_uses_msix())) {
if (rnd)
free(rnd);
return -1;
Expand Down
8 changes: 1 addition & 7 deletions devicemodel/include/dm.h
View file
Expand Up @@ -47,12 +47,6 @@ int vmexit_task_switch(struct vmctx *ctx, struct vhm_request *vhm_req,
int *vcpu);
void *paddr_guest2host(struct vmctx *ctx, uintptr_t addr, size_t len);
void *dm_gpa2hva(uint64_t gpa, size_t size);

int fbsdrun_muxed(void);
int fbsdrun_vmexit_on_hlt(void);
int fbsdrun_vmexit_on_pause(void);
int fbsdrun_disable_x2apic(void);
int fbsdrun_virtio_msix(void);

int virtio_uses_msix(void);
void ptdev_prefer_msi(bool enable);
#endif

0 comments on commit d63b900

Please sign in to comment.