| vmm_dev.c (246686) | vmm_dev.c (249396) |
|---|---|
| 1/*- 2 * Copyright (c) 2011 NetApp, Inc. 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 9 unchanged lines hidden (view full) --- 18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 * | 1/*- 2 * Copyright (c) 2011 NetApp, Inc. 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 9 unchanged lines hidden (view full) --- 18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * SUCH DAMAGE. 25 * |
| 26 * $FreeBSD: head/sys/amd64/vmm/vmm_dev.c 246686 2013-02-11 20:36:07Z neel $ | 26 * $FreeBSD: head/sys/amd64/vmm/vmm_dev.c 249396 2013-04-12 01:16:52Z neel $ |
| 27 */ 28 29#include <sys/cdefs.h> | 27 */ 28 29#include <sys/cdefs.h> |
| 30__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm_dev.c 246686 2013-02-11 20:36:07Z neel $"); | 30__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm_dev.c 249396 2013-04-12 01:16:52Z neel $"); |
| 31 32#include <sys/param.h> 33#include <sys/kernel.h> 34#include <sys/queue.h> 35#include <sys/lock.h> 36#include <sys/mutex.h> 37#include <sys/malloc.h> 38#include <sys/conf.h> --- 431 unchanged lines hidden (view full) --- 470 return (error); 471 472 mtx_lock(&vmmdev_mtx); 473 sc = vmmdev_lookup(buf); 474 mtx_unlock(&vmmdev_mtx); 475 if (sc != NULL) 476 return (EEXIST); 477 | 31 32#include <sys/param.h> 33#include <sys/kernel.h> 34#include <sys/queue.h> 35#include <sys/lock.h> 36#include <sys/mutex.h> 37#include <sys/malloc.h> 38#include <sys/conf.h> --- 431 unchanged lines hidden (view full) --- 470 return (error); 471 472 mtx_lock(&vmmdev_mtx); 473 sc = vmmdev_lookup(buf); 474 mtx_unlock(&vmmdev_mtx); 475 if (sc != NULL) 476 return (EEXIST); 477 |
| 478 vm = vm_create(buf); 479 if (vm == NULL) 480 return (EINVAL); | 478 error = vm_create(buf, &vm); 479 if (error != 0) 480 return (error); |
| 481 482 sc = malloc(sizeof(struct vmmdev_softc), M_VMMDEV, M_WAITOK | M_ZERO); 483 sc->vm = vm; 484 485 /* 486 * Lookup the name again just in case somebody sneaked in when we 487 * dropped the lock. 488 */ --- 38 unchanged lines hidden --- | 481 482 sc = malloc(sizeof(struct vmmdev_softc), M_VMMDEV, M_WAITOK | M_ZERO); 483 sc->vm = vm; 484 485 /* 486 * Lookup the name again just in case somebody sneaked in when we 487 * dropped the lock. 488 */ --- 38 unchanged lines hidden --- |