Deleted Added
sdiff udiff text old ( 268891 ) new ( 268953 )
full compact
vmm_ioport.c (268891) vmm_ioport.c (268953)
1/*-
2 * Copyright (c) 2014 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
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

--- 11 unchanged lines hidden (view full) ---

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
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2014 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
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

--- 11 unchanged lines hidden (view full) ---

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
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: stable/10/sys/amd64/vmm/vmm_ioport.c 268891 2014-07-19 22:06:46Z jhb $");
28__FBSDID("$FreeBSD: stable/10/sys/amd64/vmm/vmm_ioport.c 268953 2014-07-21 19:08:02Z jhb $");
29
30#include <sys/param.h>
31#include <sys/types.h>
32#include <sys/queue.h>
33#include <sys/cpuset.h>
34#include <sys/systm.h>
35
36#include <machine/vmm.h>

--- 27 unchanged lines hidden (view full) ---

64
65 if (vmexit->u.inout.port >= MAX_IOPORTS)
66 return (-1);
67
68 handler = ioport_handler[vmexit->u.inout.port];
69 if (handler == NULL)
70 return (-1);
71
29
30#include <sys/param.h>
31#include <sys/types.h>
32#include <sys/queue.h>
33#include <sys/cpuset.h>
34#include <sys/systm.h>
35
36#include <machine/vmm.h>

--- 27 unchanged lines hidden (view full) ---

64
65 if (vmexit->u.inout.port >= MAX_IOPORTS)
66 return (-1);
67
68 handler = ioport_handler[vmexit->u.inout.port];
69 if (handler == NULL)
70 return (-1);
71
72 switch (vmexit->u.inout.bytes) {
73 case 1:
74 mask = 0xff;
75 break;
76 case 2:
77 mask = 0xffff;
78 break;
79 default:
80 mask = 0xffffffff;
81 break;
82 }
83
72 if (!vmexit->u.inout.in) {
84 if (!vmexit->u.inout.in) {
73 switch (vmexit->u.inout.bytes) {
74 case 1:
75 mask = 0xff;
76 break;
77 case 2:
78 mask = 0xffff;
79 break;
80 default:
81 mask = 0xffffffff;
82 break;
83 }
84 val = vmexit->u.inout.eax & mask;
85 }
86
87 error = (*handler)(vm, vcpuid, vmexit->u.inout.in,
88 vmexit->u.inout.port, vmexit->u.inout.bytes, &val);
89
90 if (!error && vmexit->u.inout.in) {
85 val = vmexit->u.inout.eax & mask;
86 }
87
88 error = (*handler)(vm, vcpuid, vmexit->u.inout.in,
89 vmexit->u.inout.port, vmexit->u.inout.bytes, &val);
90
91 if (!error && vmexit->u.inout.in) {
91 switch (vmexit->u.inout.bytes) {
92 case 1:
93 mask = 0xff;
94 break;
95 case 2:
96 mask = 0xffff;
97 break;
98 default:
99 mask = 0xffffffff;
100 break;
101 }
102 vmexit->u.inout.eax &= ~mask;
103 vmexit->u.inout.eax |= val & mask;
104 }
105
106 return (error);
107}
92 vmexit->u.inout.eax &= ~mask;
93 vmexit->u.inout.eax |= val & mask;
94 }
95
96 return (error);
97}