Commit 4822f1ee authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/fixes-31-20181127-pull-request' into staging 



various bugfixes for 3.1: fmops, ps2, cirrus, hda, usb-host, qapi

# gpg: Signature made Tue 27 Nov 2018 06:49:13 GMT
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/fixes-31-20181127-pull-request:
  qapi: add query-display-options command
  usb-host: set ifs.detached as true if kernel driver is not active
  audio/hda: fix guest triggerable assert
  cirrus_vga/migration: update the bank offset before use
  ps2kbd: default to scan enabled after reset
  fmops: fix off-by-one in AR_TABLE and DR_TABLE array size

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d5d31c9a e1ca8f7e

hw/audio/fmopl.h

+2 −2
Original line number Diff line number Diff line
@@ -72,8 +72,8 @@ typedef struct fm_opl_f { 
	/* Rhythm sention */

	uint8_t rhythm;		/* Rhythm mode , key flag */

	/* time tables */

	int32_t AR_TABLE[75];	/* atttack rate tables */

	int32_t DR_TABLE[75];	/* decay rate tables   */

	int32_t AR_TABLE[76];	/* attack rate tables  */

	int32_t DR_TABLE[76];	/* decay rate tables   */

	uint32_t FN_TABLE[1024];  /* fnumber -> increment counter */

	/* LFO */

	int32_t *ams_table;

hw/audio/intel-hda.c

+6 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "hw/pci/msi.h"

#include "qemu/timer.h"

#include "qemu/bitops.h"

#include "qemu/log.h"

#include "hw/audio/soundhw.h"

#include "intel-hda.h"

#include "intel-hda-defs.h"
@@ -929,6 +930,11 @@ static void intel_hda_reg_write(IntelHDAState *d, const IntelHDAReg *reg, uint32 
    if (!reg) {

        return;

    }

    if (!reg->wmask) {

        qemu_log_mask(LOG_GUEST_ERROR, "intel-hda: write to r/o reg %s\n",

                      reg->name);

        return;

    }



    if (d->debug) {

        time_t now = time(NULL);

hw/display/cirrus_vga.c

+3 −2
Original line number Diff line number Diff line
@@ -2746,11 +2746,12 @@ static int cirrus_post_load(void *opaque, int version_id) 
    s->vga.gr[0x00] = s->cirrus_shadow_gr0 & 0x0f;

    s->vga.gr[0x01] = s->cirrus_shadow_gr1 & 0x0f;



    cirrus_update_bank_ptr(s, 0);

    cirrus_update_bank_ptr(s, 1);

    cirrus_update_memory_access(s);

    /* force refresh */

    s->vga.graphic_mode = -1;

    cirrus_update_bank_ptr(s, 0);

    cirrus_update_bank_ptr(s, 1);



    return 0;

}

hw/input/ps2.c

+1 −1
Original line number Diff line number Diff line
@@ -942,7 +942,7 @@ static void ps2_kbd_reset(void *opaque) 


    trace_ps2_kbd_reset(opaque);

    ps2_common_reset(&s->common);

    s->scan_enabled = 0;

    s->scan_enabled = 1;

    s->translate = 0;

    s->scancode_set = 2;

    s->modifiers = 0;

hw/usb/host-libusb.c

+3 −0
Original line number Diff line number Diff line
@@ -1120,6 +1120,9 @@ static void usb_host_detach_kernel(USBHostDevice *s) 
        rc = libusb_kernel_driver_active(s->dh, i);

        usb_host_libusb_error("libusb_kernel_driver_active", rc);

        if (rc != 1) {

            if (rc == 0) {

                s->ifs[i].detached = true;

            }

            continue;

        }

        trace_usb_host_detach_kernel(s->bus_num, s->addr, i);