aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
Diffstat (limited to 'hw')
-rw-r--r--hw/arm/sysbus-fdt.c4
-rw-r--r--hw/block/xen_disk.c153
-rw-r--r--hw/core/machine.c2
-rw-r--r--hw/core/platform-bus.c8
-rw-r--r--hw/input/ps2.c612
-rw-r--r--hw/net/e1000e.c2
-rw-r--r--hw/net/e1000e_core.c32
-rw-r--r--hw/net/e1000e_core.h3
-rw-r--r--hw/net/imx_fec.c2
-rw-r--r--hw/net/mcf_fec.c7
-rw-r--r--hw/net/trace-events2
-rw-r--r--hw/net/virtio-net.c26
-rw-r--r--hw/ppc/e500.c4
-rw-r--r--hw/ppc/spapr.c4
14 files changed, 768 insertions, 93 deletions
diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c
index 5debb3348c..d68e3dcdbd 100644
--- a/hw/arm/sysbus-fdt.c
+++ b/hw/arm/sysbus-fdt.c
@@ -436,7 +436,7 @@ static const NodeCreationPair add_fdt_node_functions[] = {
* are dynamically instantiable and if so call the node creation
* function.
*/
-static int add_fdt_node(SysBusDevice *sbdev, void *opaque)
+static void add_fdt_node(SysBusDevice *sbdev, void *opaque)
{
int i, ret;
@@ -445,7 +445,7 @@ static int add_fdt_node(SysBusDevice *sbdev, void *opaque)
add_fdt_node_functions[i].typename)) {
ret = add_fdt_node_functions[i].add_fdt_node_fn(sbdev, opaque);
assert(!ret);
- return 0;
+ return;
}
}
error_report("Device %s can not be dynamically instantiated",
diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c
index 342868904d..5aa350a1bf 100644
--- a/hw/block/xen_disk.c
+++ b/hw/block/xen_disk.c
@@ -119,6 +119,9 @@ struct XenBlkDev {
unsigned int persistent_gnt_count;
unsigned int max_grants;
+ /* Grant copy */
+ gboolean feature_grant_copy;
+
/* qemu block driver */
DriveInfo *dinfo;
BlockBackend *blk;
@@ -489,6 +492,106 @@ static int ioreq_map(struct ioreq *ioreq)
return 0;
}
+#if CONFIG_XEN_CTRL_INTERFACE_VERSION >= 480
+
+static void ioreq_free_copy_buffers(struct ioreq *ioreq)
+{
+ int i;
+
+ for (i = 0; i < ioreq->v.niov; i++) {
+ ioreq->page[i] = NULL;
+ }
+
+ qemu_vfree(ioreq->pages);
+}
+
+static int ioreq_init_copy_buffers(struct ioreq *ioreq)
+{
+ int i;
+
+ if (ioreq->v.niov == 0) {
+ return 0;
+ }
+
+ ioreq->pages = qemu_memalign(XC_PAGE_SIZE, ioreq->v.niov * XC_PAGE_SIZE);
+
+ for (i = 0; i < ioreq->v.niov; i++) {
+ ioreq->page[i] = ioreq->pages + i * XC_PAGE_SIZE;
+ ioreq->v.iov[i].iov_base = ioreq->page[i];
+ }
+
+ return 0;
+}
+
+static int ioreq_grant_copy(struct ioreq *ioreq)
+{
+ xengnttab_handle *gnt = ioreq->blkdev->xendev.gnttabdev;
+ xengnttab_grant_copy_segment_t segs[BLKIF_MAX_SEGMENTS_PER_REQUEST];
+ int i, count, rc;
+ int64_t file_blk = ioreq->blkdev->file_blk;
+
+ if (ioreq->v.niov == 0) {
+ return 0;
+ }
+
+ count = ioreq->v.niov;
+
+ for (i = 0; i < count; i++) {
+ if (ioreq->req.operation == BLKIF_OP_READ) {
+ segs[i].flags = GNTCOPY_dest_gref;
+ segs[i].dest.foreign.ref = ioreq->refs[i];
+ segs[i].dest.foreign.domid = ioreq->domids[i];
+ segs[i].dest.foreign.offset = ioreq->req.seg[i].first_sect * file_blk;
+ segs[i].source.virt = ioreq->v.iov[i].iov_base;
+ } else {
+ segs[i].flags = GNTCOPY_source_gref;
+ segs[i].source.foreign.ref = ioreq->refs[i];
+ segs[i].source.foreign.domid = ioreq->domids[i];
+ segs[i].source.foreign.offset = ioreq->req.seg[i].first_sect * file_blk;
+ segs[i].dest.virt = ioreq->v.iov[i].iov_base;
+ }
+ segs[i].len = (ioreq->req.seg[i].last_sect
+ - ioreq->req.seg[i].first_sect + 1) * file_blk;
+ }
+
+ rc = xengnttab_grant_copy(gnt, count, segs);
+
+ if (rc) {
+ xen_be_printf(&ioreq->blkdev->xendev, 0,
+ "failed to copy data %d\n", rc);
+ ioreq->aio_errors++;
+ return -1;
+ }
+
+ for (i = 0; i < count; i++) {
+ if (segs[i].status != GNTST_okay) {
+ xen_be_printf(&ioreq->blkdev->xendev, 3,
+ "failed to copy data %d for gref %d, domid %d\n",
+ segs[i].status, ioreq->refs[i], ioreq->domids[i]);
+ ioreq->aio_errors++;
+ rc = -1;
+ }
+ }
+
+ return rc;
+}
+#else
+static void ioreq_free_copy_buffers(struct ioreq *ioreq)
+{
+ abort();
+}
+
+static int ioreq_init_copy_buffers(struct ioreq *ioreq)
+{
+ abort();
+}
+
+static int ioreq_grant_copy(struct ioreq *ioreq)
+{
+ abort();
+}
+#endif
+
static int ioreq_runio_qemu_aio(struct ioreq *ioreq);
static void qemu_aio_complete(void *opaque, int ret)
@@ -511,8 +614,31 @@ static void qemu_aio_complete(void *opaque, int ret)
return;
}
+ if (ioreq->blkdev->feature_grant_copy) {
+ switch (ioreq->req.operation) {
+ case BLKIF_OP_READ:
+ /* in case of failure ioreq->aio_errors is increased */
+ if (ret == 0) {
+ ioreq_grant_copy(ioreq);
+ }
+ ioreq_free_copy_buffers(ioreq);
+ break;
+ case BLKIF_OP_WRITE:
+ case BLKIF_OP_FLUSH_DISKCACHE:
+ if (!ioreq->req.nr_segments) {
+ break;
+ }
+ ioreq_free_copy_buffers(ioreq);
+ break;
+ default:
+ break;
+ }
+ }
+
ioreq->status = ioreq->aio_errors ? BLKIF_RSP_ERROR : BLKIF_RSP_OKAY;
- ioreq_unmap(ioreq);
+ if (!ioreq->blkdev->feature_grant_copy) {
+ ioreq_unmap(ioreq);
+ }
ioreq_finish(ioreq);
switch (ioreq->req.operation) {
case BLKIF_OP_WRITE:
@@ -538,8 +664,18 @@ static int ioreq_runio_qemu_aio(struct ioreq *ioreq)
{
struct XenBlkDev *blkdev = ioreq->blkdev;
- if (ioreq->req.nr_segments && ioreq_map(ioreq) == -1) {
- goto err_no_map;
+ if (ioreq->blkdev->feature_grant_copy) {
+ ioreq_init_copy_buffers(ioreq);
+ if (ioreq->req.nr_segments && (ioreq->req.operation == BLKIF_OP_WRITE ||
+ ioreq->req.operation == BLKIF_OP_FLUSH_DISKCACHE) &&
+ ioreq_grant_copy(ioreq)) {
+ ioreq_free_copy_buffers(ioreq);
+ goto err;
+ }
+ } else {
+ if (ioreq->req.nr_segments && ioreq_map(ioreq)) {
+ goto err;
+ }
}
ioreq->aio_inflight++;
@@ -582,6 +718,9 @@ static int ioreq_runio_qemu_aio(struct ioreq *ioreq)
}
default:
/* unknown operation (shouldn't happen -- parse catches this) */
+ if (!ioreq->blkdev->feature_grant_copy) {
+ ioreq_unmap(ioreq);
+ }
goto err;
}
@@ -590,8 +729,6 @@ static int ioreq_runio_qemu_aio(struct ioreq *ioreq)
return 0;
err:
- ioreq_unmap(ioreq);
-err_no_map:
ioreq_finish(ioreq);
ioreq->status = BLKIF_RSP_ERROR;
return -1;
@@ -1034,6 +1171,12 @@ static int blk_connect(struct XenDevice *xendev)
xen_be_bind_evtchn(&blkdev->xendev);
+ blkdev->feature_grant_copy =
+ (xengnttab_grant_copy(blkdev->xendev.gnttabdev, 0, NULL) == 0);
+
+ xen_be_printf(&blkdev->xendev, 3, "grant copy operation %s\n",
+ blkdev->feature_grant_copy ? "enabled" : "disabled");
+
xen_be_printf(&blkdev->xendev, 1, "ok: proto %s, ring-ref %d, "
"remote port %d, local port %d\n",
blkdev->xendev.protocol, blkdev->ring_ref,
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 00fbe3e880..afd84accbf 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -332,7 +332,7 @@ static bool machine_get_enforce_config_section(Object *obj, Error **errp)
return ms->enforce_config_section;
}
-static int error_on_sysbus_device(SysBusDevice *sbdev, void *opaque)
+static void error_on_sysbus_device(SysBusDevice *sbdev, void *opaque)
{
error_report("Option '-device %s' cannot be handled by this machine",
object_class_get_name(object_get_class(OBJECT(sbdev))));
diff --git a/hw/core/platform-bus.c b/hw/core/platform-bus.c
index 36f84ab72f..329ac670c0 100644
--- a/hw/core/platform-bus.c
+++ b/hw/core/platform-bus.c
@@ -74,7 +74,7 @@ hwaddr platform_bus_get_mmio_addr(PlatformBusDevice *pbus, SysBusDevice *sbdev,
return object_property_get_int(OBJECT(sbdev_mr), "addr", NULL);
}
-static int platform_bus_count_irqs(SysBusDevice *sbdev, void *opaque)
+static void platform_bus_count_irqs(SysBusDevice *sbdev, void *opaque)
{
PlatformBusDevice *pbus = opaque;
qemu_irq sbirq;
@@ -93,8 +93,6 @@ static int platform_bus_count_irqs(SysBusDevice *sbdev, void *opaque)
}
}
}
-
- return 0;
}
/*
@@ -168,7 +166,7 @@ static void platform_bus_map_mmio(PlatformBusDevice *pbus, SysBusDevice *sbdev,
* For each sysbus device, look for unassigned IRQ lines as well as
* unassociated MMIO regions. Connect them to the platform bus if available.
*/
-static int link_sysbus_device(SysBusDevice *sbdev, void *opaque)
+static void link_sysbus_device(SysBusDevice *sbdev, void *opaque)
{
PlatformBusDevice *pbus = opaque;
int i;
@@ -180,8 +178,6 @@ static int link_sysbus_device(SysBusDevice *sbdev, void *opaque)
for (i = 0; sysbus_has_mmio(sbdev, i); i++) {
platform_bus_map_mmio(pbus, sbdev, i);
}
-
- return 0;
}
static void platform_bus_init_notify(Notifier *notifier, void *data)
diff --git a/hw/input/ps2.c b/hw/input/ps2.c
index a8aa36f5c0..0d14de08a6 100644
--- a/hw/input/ps2.c
+++ b/hw/input/ps2.c
@@ -22,6 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu/osdep.h"
+#include "qemu/log.h"
#include "hw/hw.h"
#include "hw/input/ps2.h"
#include "ui/console.h"
@@ -94,12 +95,10 @@ typedef struct {
typedef struct {
PS2State common;
int scan_enabled;
- /* QEMU uses translated PC scancodes internally. To avoid multiple
- conversions we do the translation (if any) in the PS/2 emulation
- not the keyboard controller. */
int translate;
int scancode_set; /* 1=XT, 2=AT, 3=PS/2 */
int ledstate;
+ bool need_high_bit;
} PS2KbdState;
typedef struct {
@@ -116,26 +115,430 @@ typedef struct {
uint8_t mouse_buttons;
} PS2MouseState;
-/* Table to convert from PC scancodes to raw scancodes. */
-static const unsigned char ps2_raw_keycode[128] = {
- 0, 118, 22, 30, 38, 37, 46, 54, 61, 62, 70, 69, 78, 85, 102, 13,
- 21, 29, 36, 45, 44, 53, 60, 67, 68, 77, 84, 91, 90, 20, 28, 27,
- 35, 43, 52, 51, 59, 66, 75, 76, 82, 14, 18, 93, 26, 34, 33, 42,
- 50, 49, 58, 65, 73, 74, 89, 124, 17, 41, 88, 5, 6, 4, 12, 3,
- 11, 2, 10, 1, 9, 119, 126, 108, 117, 125, 123, 107, 115, 116, 121, 105,
-114, 122, 112, 113, 127, 96, 97, 120, 7, 15, 23, 31, 39, 47, 55, 63,
- 71, 79, 86, 94, 8, 16, 24, 32, 40, 48, 56, 64, 72, 80, 87, 111,
- 19, 25, 57, 81, 83, 92, 95, 98, 99, 100, 101, 103, 104, 106, 109, 110
+/* Table to convert from QEMU codes to scancodes. */
+static const uint16_t qcode_to_keycode_set1[Q_KEY_CODE__MAX] = {
+ [0 ... Q_KEY_CODE__MAX - 1] = 0,
+
+ [Q_KEY_CODE_A] = 0x1e,
+ [Q_KEY_CODE_B] = 0x30,
+ [Q_KEY_CODE_C] = 0x2e,
+ [Q_KEY_CODE_D] = 0x20,
+ [Q_KEY_CODE_E] = 0x12,
+ [Q_KEY_CODE_F] = 0x21,
+ [Q_KEY_CODE_G] = 0x22,
+ [Q_KEY_CODE_H] = 0x23,
+ [Q_KEY_CODE_I] = 0x17,
+ [Q_KEY_CODE_J] = 0x24,
+ [Q_KEY_CODE_K] = 0x25,
+ [Q_KEY_CODE_L] = 0x26,
+ [Q_KEY_CODE_M] = 0x32,
+ [Q_KEY_CODE_N] = 0x31,
+ [Q_KEY_CODE_O] = 0x18,
+ [Q_KEY_CODE_P] = 0x19,
+ [Q_KEY_CODE_Q] = 0x10,
+ [Q_KEY_CODE_R] = 0x13,
+ [Q_KEY_CODE_S] = 0x1f,
+ [Q_KEY_CODE_T] = 0x14,
+ [Q_KEY_CODE_U] = 0x16,
+ [Q_KEY_CODE_V] = 0x2f,
+ [Q_KEY_CODE_W] = 0x11,
+ [Q_KEY_CODE_X] = 0x2d,
+ [Q_KEY_CODE_Y] = 0x15,
+ [Q_KEY_CODE_Z] = 0x2c,
+ [Q_KEY_CODE_0] = 0x0b,
+ [Q_KEY_CODE_1] = 0x02,
+ [Q_KEY_CODE_2] = 0x03,
+ [Q_KEY_CODE_3] = 0x04,
+ [Q_KEY_CODE_4] = 0x05,
+ [Q_KEY_CODE_5] = 0x06,
+ [Q_KEY_CODE_6] = 0x07,
+ [Q_KEY_CODE_7] = 0x08,
+ [Q_KEY_CODE_8] = 0x09,
+ [Q_KEY_CODE_9] = 0x0a,
+ [Q_KEY_CODE_GRAVE_ACCENT] = 0x29,
+ [Q_KEY_CODE_MINUS] = 0x0c,
+ [Q_KEY_CODE_EQUAL] = 0x0d,
+ [Q_KEY_CODE_BACKSLASH] = 0x2b,
+ [Q_KEY_CODE_BACKSPACE] = 0x0e,
+ [Q_KEY_CODE_SPC] = 0x39,
+ [Q_KEY_CODE_TAB] = 0x0f,
+ [Q_KEY_CODE_CAPS_LOCK] = 0x3a,
+ [Q_KEY_CODE_SHIFT] = 0x2a,
+ [Q_KEY_CODE_CTRL] = 0x1d,
+ [Q_KEY_CODE_META_L] = 0xe05b,
+ [Q_KEY_CODE_ALT] = 0x38,
+ [Q_KEY_CODE_SHIFT_R] = 0x36,
+ [Q_KEY_CODE_CTRL_R] = 0xe01d,
+ [Q_KEY_CODE_META_R] = 0xe05c,
+ [Q_KEY_CODE_ALT_R] = 0xe038,
+ [Q_KEY_CODE_MENU] = 0xe05d,
+ [Q_KEY_CODE_RET] = 0x1c,
+ [Q_KEY_CODE_ESC] = 0x01,
+ [Q_KEY_CODE_F1] = 0x3b,
+ [Q_KEY_CODE_F2] = 0x3c,
+ [Q_KEY_CODE_F3] = 0x3d,
+ [Q_KEY_CODE_F4] = 0x3e,
+ [Q_KEY_CODE_F5] = 0x3f,
+ [Q_KEY_CODE_F6] = 0x40,
+ [Q_KEY_CODE_F7] = 0x41,
+ [Q_KEY_CODE_F8] = 0x42,
+ [Q_KEY_CODE_F9] = 0x43,
+ [Q_KEY_CODE_F10] = 0x44,
+ [Q_KEY_CODE_F11] = 0x57,
+ [Q_KEY_CODE_F12] = 0x58,
+ /* special handling for Q_KEY_CODE_PRINT */
+ [Q_KEY_CODE_SCROLL_LOCK] = 0x46,
+ /* special handling for Q_KEY_CODE_PAUSE */
+ [Q_KEY_CODE_BRACKET_LEFT] = 0x1a,
+ [Q_KEY_CODE_INSERT] = 0xe052,
+ [Q_KEY_CODE_HOME] = 0xe047,
+ [Q_KEY_CODE_PGUP] = 0xe049,
+ [Q_KEY_CODE_DELETE] = 0xe053,
+ [Q_KEY_CODE_END] = 0xe04f,
+ [Q_KEY_CODE_PGDN] = 0xe051,
+ [Q_KEY_CODE_UP] = 0xe048,
+ [Q_KEY_CODE_LEFT] = 0xe04b,
+ [Q_KEY_CODE_DOWN] = 0xe050,
+ [Q_KEY_CODE_RIGHT] = 0xe04d,
+ [Q_KEY_CODE_NUM_LOCK] = 0x45,
+ [Q_KEY_CODE_KP_DIVIDE] = 0xe035,
+ [Q_KEY_CODE_KP_MULTIPLY] = 0x37,
+ [Q_KEY_CODE_KP_SUBTRACT] = 0x4a,
+ [Q_KEY_CODE_KP_ADD] = 0x4e,
+ [Q_KEY_CODE_KP_ENTER] = 0xe01c,
+ [Q_KEY_CODE_KP_DECIMAL] = 0x53,
+ [Q_KEY_CODE_KP_0] = 0x52,
+ [Q_KEY_CODE_KP_1] = 0x4f,
+ [Q_KEY_CODE_KP_2] = 0x50,
+ [Q_KEY_CODE_KP_3] = 0x51,
+ [Q_KEY_CODE_KP_4] = 0x4b,
+ [Q_KEY_CODE_KP_5] = 0x4c,
+ [Q_KEY_CODE_KP_6] = 0x4d,
+ [Q_KEY_CODE_KP_7] = 0x47,
+ [Q_KEY_CODE_KP_8] = 0x48,
+ [Q_KEY_CODE_KP_9] = 0x49,
+ [Q_KEY_CODE_BRACKET_RIGHT] = 0x1b,
+ [Q_KEY_CODE_SEMICOLON] = 0x27,
+ [Q_KEY_CODE_APOSTROPHE] = 0x28,
+ [Q_KEY_CODE_COMMA] = 0x33,
+ [Q_KEY_CODE_DOT] = 0x34,
+ [Q_KEY_CODE_SLASH] = 0x35,
+
+#if 0
+ [Q_KEY_CODE_POWER] = 0x0e5e,
+ [Q_KEY_CODE_SLEEP] = 0x0e5f,
+ [Q_KEY_CODE_WAKE] = 0x0e63,
+
+ [Q_KEY_CODE_AUDIONEXT] = 0xe019,
+ [Q_KEY_CODE_AUDIOPREV] = 0xe010,
+ [Q_KEY_CODE_AUDIOSTOP] = 0xe024,
+ [Q_KEY_CODE_AUDIOPLAY] = 0xe022,
+ [Q_KEY_CODE_AUDIOMUTE] = 0xe020,
+ [Q_KEY_CODE_VOLUMEUP] = 0xe030,
+ [Q_KEY_CODE_VOLUMEDOWN] = 0xe02e,
+ [Q_KEY_CODE_MEDIASELECT] = 0xe06d,
+ [Q_KEY_CODE_MAIL] = 0xe06c,
+ [Q_KEY_CODE_CALCULATOR] = 0xe021,
+ [Q_KEY_CODE_COMPUTER] = 0xe06b,
+ [Q_KEY_CODE_AC_SEARCH] = 0xe065,
+ [Q_KEY_CODE_AC_HOME] = 0xe032,
+ [Q_KEY_CODE_AC_BACK] = 0xe06a,
+ [Q_KEY_CODE_AC_FORWARD] = 0xe069,
+ [Q_KEY_CODE_AC_STOP] = 0xe068,
+ [Q_KEY_CODE_AC_REFRESH] = 0xe067,
+ [Q_KEY_CODE_AC_BOOKMARKS] = 0xe066,
+#endif
+
+ [Q_KEY_CODE_ASTERISK] = 0x37,
+ [Q_KEY_CODE_LESS] = 0x56,
+ [Q_KEY_CODE_RO] = 0x73,
+ [Q_KEY_CODE_KP_COMMA] = 0x7e,
};
-static const unsigned char ps2_raw_keycode_set3[128] = {
- 0, 8, 22, 30, 38, 37, 46, 54, 61, 62, 70, 69, 78, 85, 102, 13,
- 21, 29, 36, 45, 44, 53, 60, 67, 68, 77, 84, 91, 90, 17, 28, 27,
- 35, 43, 52, 51, 59, 66, 75, 76, 82, 14, 18, 92, 26, 34, 33, 42,
- 50, 49, 58, 65, 73, 74, 89, 126, 25, 41, 20, 7, 15, 23, 31, 39,
- 47, 2, 63, 71, 79, 118, 95, 108, 117, 125, 132, 107, 115, 116, 124, 105,
-114, 122, 112, 113, 127, 96, 97, 86, 94, 15, 23, 31, 39, 47, 55, 63,
- 71, 79, 86, 94, 8, 16, 24, 32, 40, 48, 56, 64, 72, 80, 87, 111,
- 19, 25, 57, 81, 83, 92, 95, 98, 99, 100, 101, 103, 104, 106, 109, 110
+
+static const uint16_t qcode_to_keycode_set2[Q_KEY_CODE__MAX] = {
+ [0 ... Q_KEY_CODE__MAX - 1] = 0,
+
+ [Q_KEY_CODE_A] = 0x1c,
+ [Q_KEY_CODE_B] = 0x32,
+ [Q_KEY_CODE_C] = 0x21,
+ [Q_KEY_CODE_D] = 0x23,
+ [Q_KEY_CODE_E] = 0x24,
+ [Q_KEY_CODE_F] = 0x2b,
+ [Q_KEY_CODE_G] = 0x34,
+ [Q_KEY_CODE_H] = 0x33,
+ [Q_KEY_CODE_I] = 0x43,
+ [Q_KEY_CODE_J] = 0x3b,
+ [Q_KEY_CODE_K] = 0x42,
+ [Q_KEY_CODE_L] = 0x4b,
+ [Q_KEY_CODE_M] = 0x3a,
+ [Q_KEY_CODE_N] = 0x31,
+ [Q_KEY_CODE_O] = 0x44,
+ [Q_KEY_CODE_P] = 0x4d,
+ [Q_KEY_CODE_Q] = 0x15,
+ [Q_KEY_CODE_R] = 0x2d,
+ [Q_KEY_CODE_S] = 0x1b,
+ [Q_KEY_CODE_T] = 0x2c,
+ [Q_KEY_CODE_U] = 0x3c,
+ [Q_KEY_CODE_V] = 0x2a,
+ [Q_KEY_CODE_W] = 0x1d,
+ [Q_KEY_CODE_X] = 0x22,
+ [Q_KEY_CODE_Y] = 0x35,
+ [Q_KEY_CODE_Z] = 0x1a,
+ [Q_KEY_CODE_0] = 0x45,
+ [Q_KEY_CODE_1] = 0x16,
+ [Q_KEY_CODE_2] = 0x1e,
+ [Q_KEY_CODE_3] = 0x26,
+ [Q_KEY_CODE_4] = 0x25,
+ [Q_KEY_CODE_5] = 0x2e,
+ [Q_KEY_CODE_6] = 0x36,
+ [Q_KEY_CODE_7] = 0x3d,
+ [Q_KEY_CODE_8] = 0x3e,
+ [Q_KEY_CODE_9] = 0x46,
+ [Q_KEY_CODE_GRAVE_ACCENT] = 0x0e,
+ [Q_KEY_CODE_MINUS] = 0x4e,
+ [Q_KEY_CODE_EQUAL] = 0x55,
+ [Q_KEY_CODE_BACKSLASH] = 0x5d,
+ [Q_KEY_CODE_BACKSPACE] = 0x66,
+ [Q_KEY_CODE_SPC] = 0x29,
+ [Q_KEY_CODE_TAB] = 0x0d,
+ [Q_KEY_CODE_CAPS_LOCK] = 0x58,
+ [Q_KEY_CODE_SHIFT] = 0x12,
+ [Q_KEY_CODE_CTRL] = 0x14,
+ [Q_KEY_CODE_META_L] = 0xe01f,
+ [Q_KEY_CODE_ALT] = 0x11,
+ [Q_KEY_CODE_SHIFT_R] = 0x59,
+ [Q_KEY_CODE_CTRL_R] = 0xe014,
+ [Q_KEY_CODE_META_R] = 0xe027,
+ [Q_KEY_CODE_ALT_R] = 0xe011,
+ [Q_KEY_CODE_MENU] = 0xe02f,
+ [Q_KEY_CODE_RET] = 0x5a,
+ [Q_KEY_CODE_ESC] = 0x76,
+ [Q_KEY_CODE_F1] = 0x05,
+ [Q_KEY_CODE_F2] = 0x06,
+ [Q_KEY_CODE_F3] = 0x04,
+ [Q_KEY_CODE_F4] = 0x0c,
+ [Q_KEY_CODE_F5] = 0x03,
+ [Q_KEY_CODE_F6] = 0x0b,
+ [Q_KEY_CODE_F7] = 0x83,
+ [Q_KEY_CODE_F8] = 0x0a,
+ [Q_KEY_CODE_F9] = 0x01,
+ [Q_KEY_CODE_F10] = 0x09,
+ [Q_KEY_CODE_F11] = 0x78,
+ [Q_KEY_CODE_F12] = 0x07,
+ /* special handling for Q_KEY_CODE_PRINT */
+ [Q_KEY_CODE_SCROLL_LOCK] = 0x7e,
+ /* special handling for Q_KEY_CODE_PAUSE */
+ [Q_KEY_CODE_BRACKET_LEFT] = 0x54,
+ [Q_KEY_CODE_INSERT] = 0xe070,
+ [Q_KEY_CODE_HOME] = 0xe06c,
+ [Q_KEY_CODE_PGUP] = 0xe07d,
+ [Q_KEY_CODE_DELETE] = 0xe071,
+ [Q_KEY_CODE_END] = 0xe069,
+ [Q_KEY_CODE_PGDN] = 0xe07a,
+ [Q_KEY_CODE_UP] = 0xe075,
+ [Q_KEY_CODE_LEFT] = 0xe06b,
+ [Q_KEY_CODE_DOWN] = 0xe072,
+ [Q_KEY_CODE_RIGHT] = 0xe074,
+ [Q_KEY_CODE_NUM_LOCK] = 0x77,
+ [Q_KEY_CODE_KP_DIVIDE] = 0xe04a,
+ [Q_KEY_CODE_KP_MULTIPLY] = 0x7c,
+ [Q_KEY_CODE_KP_SUBTRACT] = 0x7b,
+ [Q_KEY_CODE_KP_ADD] = 0x79,
+ [Q_KEY_CODE_KP_ENTER] = 0xe05a,
+ [Q_KEY_CODE_KP_DECIMAL] = 0x71,
+ [Q_KEY_CODE_KP_0] = 0x70,
+ [Q_KEY_CODE_KP_1] = 0x69,
+ [Q_KEY_CODE_KP_2] = 0x72,
+ [Q_KEY_CODE_KP_3] = 0x7a,
+ [Q_KEY_CODE_KP_4] = 0x6b,
+ [Q_KEY_CODE_KP_5] = 0x73,
+ [Q_KEY_CODE_KP_6] = 0x74,
+ [Q_KEY_CODE_KP_7] = 0x6c,
+ [Q_KEY_CODE_KP_8] = 0x75,
+ [Q_KEY_CODE_KP_9] = 0x7d,
+ [Q_KEY_CODE_BRACKET_RIGHT] = 0x5b,
+ [Q_KEY_CODE_SEMICOLON] = 0x4c,
+ [Q_KEY_CODE_APOSTROPHE] = 0x52,
+ [Q_KEY_CODE_COMMA] = 0x41,
+ [Q_KEY_CODE_DOT] = 0x49,
+ [Q_KEY_CODE_SLASH] = 0x4a,
+
+#if 0
+ [Q_KEY_CODE_POWER] = 0x0e37,
+ [Q_KEY_CODE_SLEEP] = 0x0e3f,
+ [Q_KEY_CODE_WAKE] = 0x0e5e,
+
+ [Q_KEY_CODE_AUDIONEXT] = 0xe04d,
+ [Q_KEY_CODE_AUDIOPREV] = 0xe015,
+ [Q_KEY_CODE_AUDIOSTOP] = 0xe03b,
+ [Q_KEY_CODE_AUDIOPLAY] = 0xe034,
+ [Q_KEY_CODE_AUDIOMUTE] = 0xe023,
+ [Q_KEY_CODE_VOLUMEUP] = 0xe032,
+ [Q_KEY_CODE_VOLUMEDOWN] = 0xe021,
+ [Q_KEY_CODE_MEDIASELECT] = 0xe050,
+ [Q_KEY_CODE_MAIL] = 0xe048,
+ [Q_KEY_CODE_CALCULATOR] = 0xe02b,
+ [Q_KEY_CODE_COMPUTER] = 0xe040,
+ [Q_KEY_CODE_AC_SEARCH] = 0xe010,
+ [Q_KEY_CODE_AC_HOME] = 0xe03a,
+ [Q_KEY_CODE_AC_BACK] = 0xe038,
+ [Q_KEY_CODE_AC_FORWARD] = 0xe030,
+ [Q_KEY_CODE_AC_STOP] = 0xe028,
+ [Q_KEY_CODE_AC_REFRESH] = 0xe020,
+ [Q_KEY_CODE_AC_BOOKMARKS] = 0xe018,
+#endif
+
+ [Q_KEY_CODE_ALTGR] = 0x08,
+ [Q_KEY_CODE_ALTGR_R] = 0xe008,
+ [Q_KEY_CODE_ASTERISK] = 0x7c,
+ [Q_KEY_CODE_LESS] = 0x61,
+ [Q_KEY_CODE_SYSRQ] = 0x7f,
+ [Q_KEY_CODE_RO] = 0x51,
+ [Q_KEY_CODE_KP_COMMA] = 0x6d,
+};
+
+static const uint16_t qcode_to_keycode_set3[Q_KEY_CODE__MAX] = {
+ [0 ... Q_KEY_CODE__MAX - 1] = 0,
+
+ [Q_KEY_CODE_A] = 0x1c,
+ [Q_KEY_CODE_B] = 0x32,
+ [Q_KEY_CODE_C] = 0x21,
+ [Q_KEY_CODE_D] = 0x23,
+ [Q_KEY_CODE_E] = 0x24,
+ [Q_KEY_CODE_F] = 0x2b,
+ [Q_KEY_CODE_G] = 0x34,
+ [Q_KEY_CODE_H] = 0x33,
+ [Q_KEY_CODE_I] = 0x43,
+ [Q_KEY_CODE_J] = 0x3b,
+ [Q_KEY_CODE_K] = 0x42,
+ [Q_KEY_CODE_L] = 0x4b,
+ [Q_KEY_CODE_M] = 0x3a,
+ [Q_KEY_CODE_N] = 0x31,
+ [Q_KEY_CODE_O] = 0x44,
+ [Q_KEY_CODE_P] = 0x4d,
+ [Q_KEY_CODE_Q] = 0x15,
+ [Q_KEY_CODE_R] = 0x2d,
+ [Q_KEY_CODE_S] = 0x1b,
+ [Q_KEY_CODE_T] = 0x2c,
+ [Q_KEY_CODE_U] = 0x3c,
+ [Q_KEY_CODE_V] = 0x2a,
+ [Q_KEY_CODE_W] = 0x1d,
+ [Q_KEY_CODE_X] = 0x22,
+ [Q_KEY_CODE_Y] = 0x35,
+ [Q_KEY_CODE_Z] = 0x1a,
+ [Q_KEY_CODE_0] = 0x45,
+ [Q_KEY_CODE_1] = 0x16,
+ [Q_KEY_CODE_2] = 0x1e,
+ [Q_KEY_CODE_3] = 0x26,
+ [Q_KEY_CODE_4] = 0x25,
+ [Q_KEY_CODE_5] = 0x2e,
+ [Q_KEY_CODE_6] = 0x36,
+ [Q_KEY_CODE_7] = 0x3d,
+ [Q_KEY_CODE_8] = 0x3e,
+ [Q_KEY_CODE_9] = 0x46,
+ [Q_KEY_CODE_GRAVE_ACCENT] = 0x0e,
+ [Q_KEY_CODE_MINUS] = 0x4e,
+ [Q_KEY_CODE_EQUAL] = 0x55,
+ [Q_KEY_CODE_BACKSLASH] = 0x5c,
+ [Q_KEY_CODE_BACKSPACE] = 0x66,
+ [Q_KEY_CODE_SPC] = 0x29,
+ [Q_KEY_CODE_TAB] = 0x0d,
+ [Q_KEY_CODE_CAPS_LOCK] = 0x14,
+ [Q_KEY_CODE_SHIFT] = 0x12,
+ [Q_KEY_CODE_CTRL] = 0x11,
+ [Q_KEY_CODE_META_L] = 0x8b,
+ [Q_KEY_CODE_ALT] = 0x19,
+ [Q_KEY_CODE_SHIFT_R] = 0x59,
+ [Q_KEY_CODE_CTRL_R] = 0x58,
+ [Q_KEY_CODE_META_R] = 0x8c,
+ [Q_KEY_CODE_ALT_R] = 0x39,
+ [Q_KEY_CODE_MENU] = 0x8d,
+ [Q_KEY_CODE_RET] = 0x5a,
+ [Q_KEY_CODE_ESC] = 0x08,
+ [Q_KEY_CODE_F1] = 0x07,
+ [Q_KEY_CODE_F2] = 0x0f,
+ [Q_KEY_CODE_F3] = 0x17,
+ [Q_KEY_CODE_F4] = 0x1f,
+ [Q_KEY_CODE_F5] = 0x27,
+ [Q_KEY_CODE_F6] = 0x2f,
+ [Q_KEY_CODE_F7] = 0x37,
+ [Q_KEY_CODE_F8] = 0x3f,
+ [Q_KEY_CODE_F9] = 0x47,
+ [Q_KEY_CODE_F10] = 0x4f,
+ [Q_KEY_CODE_F11] = 0x56,
+ [Q_KEY_CODE_F12] = 0x5e,
+ [Q_KEY_CODE_PRINT] = 0x57,
+ [Q_KEY_CODE_SCROLL_LOCK] = 0x5f,
+ [Q_KEY_CODE_PAUSE] = 0x62,
+ [Q_KEY_CODE_BRACKET_LEFT] = 0x54,
+ [Q_KEY_CODE_INSERT] = 0x67,
+ [Q_KEY_CODE_HOME] = 0x6e,
+ [Q_KEY_CODE_PGUP] = 0x6f,
+ [Q_KEY_CODE_DELETE] = 0x64,
+ [Q_KEY_CODE_END] = 0x65,
+ [Q_KEY_CODE_PGDN] = 0x6d,
+ [Q_KEY_CODE_UP] = 0x63,
+ [Q_KEY_CODE_LEFT] = 0x61,
+ [Q_KEY_CODE_DOWN] = 0x60,
+ [Q_KEY_CODE_RIGHT] = 0x6a,
+ [Q_KEY_CODE_NUM_LOCK] = 0x76,
+ [Q_KEY_CODE_KP_DIVIDE] = 0x4a,
+ [Q_KEY_CODE_KP_MULTIPLY] = 0x7e,
+ [Q_KEY_CODE_KP_SUBTRACT] = 0x4e,
+ [Q_KEY_CODE_KP_ADD] = 0x7c,
+ [Q_KEY_CODE_KP_ENTER] = 0x79,
+ [Q_KEY_CODE_KP_DECIMAL] = 0x71,
+ [Q_KEY_CODE_KP_0] = 0x70,
+ [Q_KEY_CODE_KP_1] = 0x69,
+ [Q_KEY_CODE_KP_2] = 0x72,
+ [Q_KEY_CODE_KP_3] = 0x7a,
+ [Q_KEY_CODE_KP_4] = 0x6b,
+ [Q_KEY_CODE_KP_5] = 0x73,
+ [Q_KEY_CODE_KP_6] = 0x74,
+ [Q_KEY_CODE_KP_7] = 0x6c,
+ [Q_KEY_CODE_KP_8] = 0x75,
+ [Q_KEY_CODE_KP_9] = 0x7d,
+ [Q_KEY_CODE_BRACKET_RIGHT] = 0x5b,
+ [Q_KEY_CODE_SEMICOLON] = 0x4c,
+ [Q_KEY_CODE_APOSTROPHE] = 0x52,
+ [Q_KEY_CODE_COMMA] = 0x41,
+ [Q_KEY_CODE_DOT] = 0x49,
+ [Q_KEY_CODE_SLASH] = 0x4a,
+};
+
+static uint8_t translate_table[256] = {
+ 0xff, 0x43, 0x41, 0x3f, 0x3d, 0x3b, 0x3c, 0x58,
+ 0x64, 0x44, 0x42, 0x40, 0x3e, 0x0f, 0x29, 0x59,
+ 0x65, 0x38, 0x2a, 0x70, 0x1d, 0x10, 0x02, 0x5a,
+ 0x66, 0x71, 0x2c, 0x1f, 0x1e, 0x11, 0x03, 0x5b,
+ 0x67, 0x2e, 0x2d, 0x20, 0x12, 0x05, 0x04, 0x5c,
+ 0x68, 0x39, 0x2f, 0x21, 0x14, 0x13, 0x06, 0x5d,
+ 0x69, 0x31, 0x30, 0x23, 0x22, 0x15, 0x07, 0x5e,
+ 0x6a, 0x72, 0x32, 0x24, 0x16, 0x08, 0x09, 0x5f,
+ 0x6b, 0x33, 0x25, 0x17, 0x18, 0x0b, 0x0a, 0x60,
+ 0x6c, 0x34, 0x35, 0x26, 0x27, 0x19, 0x0c, 0x61,
+ 0x6d, 0x73, 0x28, 0x74, 0x1a, 0x0d, 0x62, 0x6e,
+ 0x3a, 0x36, 0x1c, 0x1b, 0x75, 0x2b, 0x63, 0x76,
+ 0x55, 0x56, 0x77, 0x78, 0x79, 0x7a, 0x0e, 0x7b,
+ 0x7c, 0x4f, 0x7d, 0x4b, 0x47, 0x7e, 0x7f, 0x6f,
+ 0x52, 0x53, 0x50, 0x4c, 0x4d, 0x48, 0x01, 0x45,
+ 0x57, 0x4e, 0x51, 0x4a, 0x37, 0x49, 0x46, 0x54,
+ 0x80, 0x81, 0x82, 0x41, 0x54, 0x85, 0x86, 0x87,
+ 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+ 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
+ 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
+ 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
+ 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
+ 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
+ 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
+ 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
+ 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
+ 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
+ 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
+ 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
+ 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
+ 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
+ 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
};
void ps2_queue(void *opaque, int b)
@@ -152,44 +555,130 @@ void ps2_queue(void *opaque, int b)
s->update_irq(s->update_arg, 1);
}
-/*
- keycode is expressed as follow:
- bit 7 - 0 key pressed, 1 = key released
- bits 6-0 - translated scancode set 2
- */
+/* keycode is the untranslated scancode in the current scancode set. */
static void ps2_put_keycode(void *opaque, int keycode)
{
PS2KbdState *s = opaque;
trace_ps2_put_keycode(opaque, keycode);
qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER);
- /* XXX: add support for scancode set 1 */
- if (!s->translate && keycode < 0xe0 && s->scancode_set > 1) {
- if (keycode & 0x80) {
- ps2_queue(&s->common, 0xf0);
- }
- if (s->scancode_set == 2) {
- keycode = ps2_raw_keycode[keycode & 0x7f];
- } else if (s->scancode_set == 3) {
- keycode = ps2_raw_keycode_set3[keycode & 0x7f];
+
+ if (s->translate) {
+ if (keycode == 0xf0) {
+ s->need_high_bit = true;
+ } else if (s->need_high_bit) {
+ ps2_queue(&s->common, translate_table[keycode] | 0x80);
+ s->need_high_bit = false;
+ } else {
+ ps2_queue(&s->common, translate_table[keycode]);
}
- }
- ps2_queue(&s->common, keycode);
+ } else {
+ ps2_queue(&s->common, keycode);
+ }
}
static void ps2_keyboard_event(DeviceState *dev, QemuConsole *src,
InputEvent *evt)
{
PS2KbdState *s = (PS2KbdState *)dev;
- int scancodes[3], i, count;
InputKeyEvent *key = evt->u.key.data;
+ int qcode;
+ uint16_t keycode;
qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER);
- count = qemu_input_key_value_to_scancode(key->key,
- key->down,
- scancodes);
- for (i = 0; i < count; i++) {
- ps2_put_keycode(s, scancodes[i]);
+ assert(evt->type == INPUT_EVENT_KIND_KEY);
+ qcode = qemu_input_key_value_to_qcode(key->key);
+
+ if (s->scancode_set == 1) {
+ if (qcode == Q_KEY_CODE_PAUSE) {
+ if (key->down) {
+ ps2_put_keycode(s, 0xe1);
+ ps2_put_keycode(s, 0x1d);
+ ps2_put_keycode(s, 0x45);
+ ps2_put_keycode(s, 0x91);
+ ps2_put_keycode(s, 0x9d);
+ ps2_put_keycode(s, 0xc5);
+ }
+ } else if (qcode == Q_KEY_CODE_PRINT) {
+ if (key->down) {
+ ps2_put_keycode(s, 0xe0);
+ ps2_put_keycode(s, 0x2a);
+ ps2_put_keycode(s, 0xe0);
+ ps2_put_keycode(s, 0x37);
+ } else {
+ ps2_put_keycode(s, 0xe0);
+ ps2_put_keycode(s, 0xb7);
+ ps2_put_keycode(s, 0xe0);
+ ps2_put_keycode(s, 0xaa);
+ }
+ } else {
+ keycode = qcode_to_keycode_set1[qcode];
+ if (keycode) {
+ if (keycode & 0xff00) {
+ ps2_put_keycode(s, keycode >> 8);
+ }
+ if (!key->down) {
+ keycode |= 0x80;
+ }
+ ps2_put_keycode(s, keycode & 0xff);
+ } else {
+ qemu_log_mask(LOG_UNIMP,
+ "ps2: ignoring key with qcode %d\n", qcode);
+ }
+ }
+ } else if (s->scancode_set == 2) {
+ if (qcode == Q_KEY_CODE_PAUSE) {
+ if (key->down) {
+ ps2_put_keycode(s, 0xe1);
+ ps2_put_keycode(s, 0x14);
+ ps2_put_keycode(s, 0x77);
+ ps2_put_keycode(s, 0xe1);
+ ps2_put_keycode(s, 0xf0);
+ ps2_put_keycode(s, 0x14);
+ ps2_put_keycode(s, 0xf0);
+ ps2_put_keycode(s, 0x77);
+ }
+ } else if (qcode == Q_KEY_CODE_PRINT) {
+ if (key->down) {
+ ps2_put_keycode(s, 0xe0);
+ ps2_put_keycode(s, 0x12);
+ ps2_put_keycode(s, 0xe0);
+ ps2_put_keycode(s, 0x7c);
+ } else {
+ ps2_put_keycode(s, 0xe0);
+ ps2_put_keycode(s, 0xf0);
+ ps2_put_keycode(s, 0x7c);
+ ps2_put_keycode(s, 0xe0);
+ ps2_put_keycode(s, 0xf0);
+ ps2_put_keycode(s, 0x12);
+ }
+ } else {
+ keycode = qcode_to_keycode_set2[qcode];
+ if (keycode) {
+ if (keycode & 0xff00) {
+ ps2_put_keycode(s, keycode >> 8);
+ }
+ if (!key->down) {
+ ps2_put_keycode(s, 0xf0);
+ }
+ ps2_put_keycode(s, keycode & 0xff);
+ } else {
+ qemu_log_mask(LOG_UNIMP,
+ "ps2: ignoring key with qcode %d\n", qcode);
+ }
+ }
+ } else if (s->scancode_set == 3) {
+ keycode = qcode_to_keycode_set3[qcode];
+ if (keycode) {
+ /* FIXME: break code should be configured on a key by key basis */
+ if (!key->down) {
+ ps2_put_keycode(s, 0xf0);
+ }
+ ps2_put_keycode(s, keycode);
+ } else {
+ qemu_log_mask(LOG_UNIMP,
+ "ps2: ignoring key with qcode %d\n", qcode);
+ }
}
}
@@ -290,22 +779,19 @@ void ps2_write_keyboard(void *opaque, int val)
ps2_queue(&s->common, KBD_REPLY_POR);
break;
default:
- ps2_queue(&s->common, KBD_REPLY_ACK);
+ ps2_queue(&s->common, KBD_REPLY_RESEND);
break;
}
break;
case KBD_CMD_SCANCODE:
if (val == 0) {
- if (s->scancode_set == 1)
- ps2_put_keycode(s, 0x43);
- else if (s->scancode_set == 2)
- ps2_put_keycode(s, 0x41);
- else if (s->scancode_set == 3)
- ps2_put_keycode(s, 0x3f);
- } else {
- if (val >= 1 && val <= 3)
- s->scancode_set = val;
ps2_queue(&s->common, KBD_REPLY_ACK);
+ ps2_put_keycode(s, s->scancode_set);
+ } else if (val >= 1 && val <= 3) {
+ s->scancode_set = val;
+ ps2_queue(&s->common, KBD_REPLY_ACK);
+ } else {
+ ps2_queue(&s->common, KBD_REPLY_RESEND);
}
s->common.write_cmd = -1;
break;
@@ -690,6 +1176,23 @@ static const VMStateDescription vmstate_ps2_keyboard_ledstate = {
}
};
+static bool ps2_keyboard_need_high_bit_needed(void *opaque)
+{
+ PS2KbdState *s = opaque;
+ return s->need_high_bit != 0; /* 0 is the usual state */
+}
+
+static const VMStateDescription vmstate_ps2_keyboard_need_high_bit = {
+ .name = "ps2kbd/need_high_bit",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .needed = ps2_keyboard_need_high_bit_needed,
+ .fields = (VMStateField[]) {
+ VMSTATE_BOOL(need_high_bit, PS2KbdState),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
static int ps2_kbd_post_load(void* opaque, int version_id)
{
PS2KbdState *s = (PS2KbdState*)opaque;
@@ -726,6 +1229,7 @@ static const VMStateDescription vmstate_ps2_keyboard = {
},
.subsections = (const VMStateDescription*[]) {
&vmstate_ps2_keyboard_ledstate,
+ &vmstate_ps2_keyboard_need_high_bit,
NULL
}
};
diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c
index bad43f474e..4994e1ca00 100644
--- a/hw/net/e1000e.c
+++ b/hw/net/e1000e.c
@@ -400,7 +400,7 @@ static void e1000e_write_config(PCIDevice *pci_dev, uint32_t address,
if (range_covers_byte(address, len, PCI_COMMAND) &&
(pci_dev->config[PCI_COMMAND] & PCI_COMMAND_MASTER)) {
- qemu_flush_queued_packets(qemu_get_queue(s->nic));
+ e1000e_start_recv(&s->core);
}
}
diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c
index e0bd31c577..6505983c12 100644
--- a/hw/net/e1000e_core.c
+++ b/hw/net/e1000e_core.c
@@ -953,7 +953,7 @@ e1000e_has_rxbufs(E1000ECore *core, const E1000E_RingInfo *r,
core->rx_desc_buf_size;
}
-static inline void
+void
e1000e_start_recv(E1000ECore *core)
{
int i;
@@ -1710,7 +1710,8 @@ e1000e_receive_iov(E1000ECore *core, const struct iovec *iov, int iovcnt)
}
/* Perform ACK receive detection */
- if (e1000e_is_tcp_ack(core, core->rx_pkt)) {
+ if (!(core->mac[RFCTL] & E1000_RFCTL_ACK_DIS) &&
+ (e1000e_is_tcp_ack(core, core->rx_pkt))) {
n |= E1000_ICS_ACK;
}
@@ -1807,6 +1808,7 @@ e1000e_core_set_link_status(E1000ECore *core)
core->autoneg_timer);
} else {
e1000x_update_regs_on_link_up(core->mac, core->phy[0]);
+ e1000e_start_recv(core);
}
}
@@ -2007,19 +2009,23 @@ e1000e_msix_notify_one(E1000ECore *core, uint32_t cause, uint32_t int_cfg)
}
if (core->mac[CTRL_EXT] & E1000_CTRL_EXT_EIAME) {
- trace_e1000e_irq_ims_clear_eiame(core->mac[IAM], cause);
- e1000e_clear_ims_bits(core, core->mac[IAM] & cause);
+ trace_e1000e_irq_iam_clear_eiame(core->mac[IAM], cause);
+ core->mac[IAM] &= ~cause;
}
trace_e1000e_irq_icr_clear_eiac(core->mac[ICR], core->mac[EIAC]);
- if (core->mac[EIAC] & E1000_ICR_OTHER) {
- effective_eiac = (core->mac[EIAC] & E1000_EIAC_MASK) |
- E1000_ICR_OTHER_CAUSES;
- } else {
- effective_eiac = core->mac[EIAC] & E1000_EIAC_MASK;
+ effective_eiac = core->mac[EIAC] & cause;
+
+ if (effective_eiac == E1000_ICR_OTHER) {
+ effective_eiac |= E1000_ICR_OTHER_CAUSES;
}
+
core->mac[ICR] &= ~effective_eiac;
+
+ if (!(core->mac[CTRL_EXT] & E1000_CTRL_EXT_IAME)) {
+ core->mac[IMS] &= ~effective_eiac;
+ }
}
static void
@@ -2130,7 +2136,7 @@ e1000e_update_interrupt_state(E1000ECore *core)
/* Set ICR[OTHER] for MSI-X */
if (is_msix) {
- if (core->mac[ICR] & core->mac[IMS] & E1000_ICR_OTHER_CAUSES) {
+ if (core->mac[ICR] & E1000_ICR_OTHER_CAUSES) {
core->mac[ICR] |= E1000_ICR_OTHER;
trace_e1000e_irq_add_msi_other(core->mac[ICR]);
}
@@ -2168,7 +2174,7 @@ e1000e_update_interrupt_state(E1000ECore *core)
}
}
-static inline void
+static void
e1000e_set_interrupt_cause(E1000ECore *core, uint32_t val)
{
trace_e1000e_irq_set_cause_entry(val, core->mac[ICR]);
@@ -2187,6 +2193,8 @@ e1000e_autoneg_timer(void *opaque)
E1000ECore *core = opaque;
if (!qemu_get_queue(core->owner_nic)->link_down) {
e1000x_update_regs_on_autoneg_done(core->mac, core->phy[0]);
+ e1000e_start_recv(core);
+
e1000e_update_flowctl_status(core);
/* signal link status change to the guest */
e1000e_set_interrupt_cause(core, E1000_ICR_LSC);
@@ -2344,7 +2352,7 @@ e1000e_set_pbaclr(E1000ECore *core, int index, uint32_t val)
core->mac[PBACLR] = val & E1000_PBACLR_VALID_MASK;
- if (msix_enabled(core->owner)) {
+ if (!msix_enabled(core->owner)) {
return;
}
diff --git a/hw/net/e1000e_core.h b/hw/net/e1000e_core.h
index 5f413a9e08..1ff6978ca1 100644
--- a/hw/net/e1000e_core.h
+++ b/hw/net/e1000e_core.h
@@ -144,3 +144,6 @@ e1000e_receive(E1000ECore *core, const uint8_t *buf, size_t size);
ssize_t
e1000e_receive_iov(E1000ECore *core, const struct iovec *iov, int iovcnt);
+
+void
+e1000e_start_recv(E1000ECore *core);
diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c
index 1c415ab3b1..50c75642c6 100644
--- a/hw/net/imx_fec.c
+++ b/hw/net/imx_fec.c
@@ -429,7 +429,7 @@ static void imx_fec_do_tx(IMXFECState *s)
frame_size += len;
if (bd.flags & ENET_BD_L) {
/* Last buffer in frame. */
- qemu_send_packet(qemu_get_queue(s->nic), frame, len);
+ qemu_send_packet(qemu_get_queue(s->nic), frame, frame_size);
ptr = frame;
frame_size = 0;
s->regs[ENET_EIR] |= ENET_INT_TXF;
diff --git a/hw/net/mcf_fec.c b/hw/net/mcf_fec.c
index 0ee8ad9d66..dc61bac2fc 100644
--- a/hw/net/mcf_fec.c
+++ b/hw/net/mcf_fec.c
@@ -23,6 +23,7 @@ do { printf("mcf_fec: " fmt , ## __VA_ARGS__); } while (0)
#define DPRINTF(fmt, ...) do {} while(0)
#endif
+#define FEC_MAX_DESC 1024
#define FEC_MAX_FRAME_SIZE 2032
typedef struct {
@@ -149,7 +150,7 @@ static void mcf_fec_do_tx(mcf_fec_state *s)
uint32_t addr;
mcf_fec_bd bd;
int frame_size;
- int len;
+ int len, descnt = 0;
uint8_t frame[FEC_MAX_FRAME_SIZE];
uint8_t *ptr;
@@ -157,7 +158,7 @@ static void mcf_fec_do_tx(mcf_fec_state *s)
ptr = frame;
frame_size = 0;
addr = s->tx_descriptor;
- while (1) {
+ while (descnt++ < FEC_MAX_DESC) {
mcf_fec_read_bd(&bd, addr);
DPRINTF("tx_bd %x flags %04x len %d data %08x\n",
addr, bd.flags, bd.length, bd.data);
@@ -176,7 +177,7 @@ static void mcf_fec_do_tx(mcf_fec_state *s)
if (bd.flags & FEC_BD_L) {
/* Last buffer in frame. */
DPRINTF("Sending packet\n");
- qemu_send_packet(qemu_get_queue(s->nic), frame, len);
+ qemu_send_packet(qemu_get_queue(s->nic), frame, frame_size);
ptr = frame;
frame_size = 0;
s->eir |= FEC_INT_TXF;
diff --git a/hw/net/trace-events b/hw/net/trace-events
index 47ab14ac71..1a5c909939 100644
--- a/hw/net/trace-events
+++ b/hw/net/trace-events
@@ -223,7 +223,7 @@ e1000e_irq_icr_read_entry(uint32_t icr) "Starting ICR read. Current ICR: 0x%x"
e1000e_irq_icr_read_exit(uint32_t icr) "Ending ICR read. Current ICR: 0x%x"
e1000e_irq_icr_clear_zero_ims(void) "Clearing ICR on read due to zero IMS"
e1000e_irq_icr_clear_iame(void) "Clearing ICR on read due to IAME"
-e1000e_irq_ims_clear_eiame(uint32_t iam, uint32_t cause) "Clearing IMS due to EIAME, IAM: 0x%X, cause: 0x%X"
+e1000e_irq_iam_clear_eiame(uint32_t iam, uint32_t cause) "Clearing IMS due to EIAME, IAM: 0x%X, cause: 0x%X"
e1000e_irq_icr_clear_eiac(uint32_t icr, uint32_t eiac) "Clearing ICR bits due to EIAC, ICR: 0x%X, EIAC: 0x%X"
e1000e_irq_ims_clear_set_imc(uint32_t val) "Clearing IMS bits due to IMC write 0x%x"
e1000e_irq_fire_delayed_interrupts(void) "Firing delayed interrupts"
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 01f1351554..6b8ae2c1fa 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -31,6 +31,11 @@
#define MAC_TABLE_ENTRIES 64
#define MAX_VLAN (1 << 12) /* Per 802.1Q definition */
+/* previously fixed value */
+#define VIRTIO_NET_RX_QUEUE_DEFAULT_SIZE 256
+/* for now, only allow larger queues; with virtio-1, guest can downsize */
+#define VIRTIO_NET_RX_QUEUE_MIN_SIZE VIRTIO_NET_RX_QUEUE_DEFAULT_SIZE
+
/*
* Calculate the number of bytes up to and including the given 'field' of
* 'container'.
@@ -1412,7 +1417,8 @@ static void virtio_net_add_queue(VirtIONet *n, int index)
{
VirtIODevice *vdev = VIRTIO_DEVICE(n);
- n->vqs[index].rx_vq = virtio_add_queue(vdev, 256, virtio_net_handle_rx);
+ n->vqs[index].rx_vq = virtio_add_queue(vdev, n->net_conf.rx_queue_size,
+ virtio_net_handle_rx);
if (n->net_conf.tx && !strcmp(n->net_conf.tx, "timer")) {
n->vqs[index].tx_vq =
virtio_add_queue(vdev, 256, virtio_net_handle_tx_timer);
@@ -1720,6 +1726,22 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp)
virtio_net_set_config_size(n, n->host_features);
virtio_init(vdev, "virtio-net", VIRTIO_ID_NET, n->config_size);
+ /*
+ * We set a lower limit on RX queue size to what it always was.
+ * Guests that want a smaller ring can always resize it without
+ * help from us (using virtio 1 and up).
+ */
+ if (n->net_conf.rx_queue_size < VIRTIO_NET_RX_QUEUE_MIN_SIZE ||
+ n->net_conf.rx_queue_size > VIRTQUEUE_MAX_SIZE ||
+ (n->net_conf.rx_queue_size & (n->net_conf.rx_queue_size - 1))) {
+ error_setg(errp, "Invalid rx_queue_size (= %" PRIu16 "), "
+ "must be a power of 2 between %d and %d.",
+ n->net_conf.rx_queue_size, VIRTIO_NET_RX_QUEUE_MIN_SIZE,
+ VIRTQUEUE_MAX_SIZE);
+ virtio_cleanup(vdev);
+ return;
+ }
+
n->max_queues = MAX(n->nic_conf.peers.queues, 1);
if (n->max_queues * 2 + 1 > VIRTIO_QUEUE_MAX) {
error_setg(errp, "Invalid number of queues (= %" PRIu32 "), "
@@ -1880,6 +1902,8 @@ static Property virtio_net_properties[] = {
TX_TIMER_INTERVAL),
DEFINE_PROP_INT32("x-txburst", VirtIONet, net_conf.txburst, TX_BURST),
DEFINE_PROP_STRING("tx", VirtIONet, net_conf.tx),
+ DEFINE_PROP_UINT16("rx_queue_size", VirtIONet, net_conf.rx_queue_size,
+ VIRTIO_NET_RX_QUEUE_DEFAULT_SIZE),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 0cd534df55..cf8b122afe 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -196,7 +196,7 @@ static int create_devtree_etsec(SysBusDevice *sbdev, PlatformDevtreeData *data)
return 0;
}
-static int sysbus_device_create_devtree(SysBusDevice *sbdev, void *opaque)
+static void sysbus_device_create_devtree(SysBusDevice *sbdev, void *opaque)
{
PlatformDevtreeData *data = opaque;
bool matched = false;
@@ -211,8 +211,6 @@ static int sysbus_device_create_devtree(SysBusDevice *sbdev, void *opaque)
qdev_fw_name(DEVICE(sbdev)));
exit(1);
}
-
- return 0;
}
static void platform_bus_create_devtree(PPCE500Params *params, void *fdt,
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index aa067aefdb..14b6821a94 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -1110,7 +1110,7 @@ static void spapr_reallocate_hpt(sPAPRMachineState *spapr, int shift,
}
}
-static int find_unknown_sysbus_device(SysBusDevice *sbdev, void *opaque)
+static void find_unknown_sysbus_device(SysBusDevice *sbdev, void *opaque)
{
bool matched = false;
@@ -1123,8 +1123,6 @@ static int find_unknown_sysbus_device(SysBusDevice *sbdev, void *opaque)
qdev_fw_name(DEVICE(sbdev)));
exit(1);
}
-
- return 0;
}
static void ppc_spapr_reset(void)
generated by cgit v1.2.3 (git 2.26.2) at 2025-01-31 11:59:38 +0000