Commit a4ba2008 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 



More migration fixes and more record/replay preparations.  Also moves
the sdhci-pci device id to make space for the rocker device.

# gpg: Signature made Sat 03 Jan 2015 08:22:36 GMT using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream:
  pci: move REDHAT_SDHCI device ID to make room for Rocker
  block/iscsi: fix uninitialized variable
  pckbd: set bits 2-3-6-7 of the output port by default
  serial: refine serial_thr_ipending_needed
  gen-icount: check cflags instead of use_icount global
  translate: check cflags instead of use_icount global
  cpu-exec: add a new CF_USE_ICOUNT cflag
  target-ppc: pass DisasContext to SPR generator functions
  atomic: fix position of volatile qualifier

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 7d010ae9 5aa81360

block/iscsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1286,7 +1286,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags, 
    QemuOpts *opts;

    Error *local_err = NULL;

    const char *filename;

    int i, ret;

    int i, ret = 0;



    if ((BDRV_SECTOR_SIZE % 512) != 0) {

        error_setg(errp, "iSCSI: Invalid BDRV_SECTOR_SIZE. "

docs/specs/pci-ids.txt

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ PCI devices (other than virtio): 
1b36:0003  PCI Dual-port 16550A adapter (docs/specs/pci-serial.txt)

1b36:0004  PCI Quad-port 16550A adapter (docs/specs/pci-serial.txt)

1b36:0005  PCI test device (docs/specs/pci-testdev.txt)

1b36:0006  PCI SD Card Host Controller Interface (SDHCI)

1b36:0007  PCI SD Card Host Controller Interface (SDHCI)



All these devices are documented in docs/specs.

hw/char/serial.c

+11 −2
Original line number Diff line number Diff line
@@ -645,8 +645,17 @@ static int serial_post_load(void *opaque, int version_id) 
static bool serial_thr_ipending_needed(void *opaque)

{

    SerialState *s = opaque;



    if (s->ier & UART_IER_THRI) {

        bool expected_value = ((s->iir & UART_IIR_ID) == UART_IIR_THRI);

        return s->thr_ipending != expected_value;

    } else {

        /* LSR.THRE will be sampled again when the interrupt is

         * enabled.  thr_ipending is not used in this case, do

         * not migrate it.

         */

        return false;

    }

}



const VMStateDescription vmstate_serial_thr_ipending = {

hw/input/pckbd.c

+8 −2
Original line number Diff line number Diff line
@@ -101,6 +101,12 @@ 
#define KBD_OUT_OBF             0x10    /* Keyboard output buffer full */

#define KBD_OUT_MOUSE_OBF       0x20    /* Mouse output buffer full */



/* OSes typically write 0xdd/0xdf to turn the A20 line off and on.

 * We make the default value of the outport include these four bits,

 * so that the subsection is rarely necessary.

 */

#define KBD_OUT_ONES            0xcc



/* Mouse Commands */

#define AUX_SET_SCALE11		0xE6	/* Set 1:1 scaling */

#define AUX_SET_SCALE21		0xE7	/* Set 2:1 scaling */
@@ -367,13 +373,13 @@ static void kbd_reset(void *opaque) 


    s->mode = KBD_MODE_KBD_INT | KBD_MODE_MOUSE_INT;

    s->status = KBD_STAT_CMD | KBD_STAT_UNLOCKED;

    s->outport = KBD_OUT_RESET | KBD_OUT_A20;

    s->outport = KBD_OUT_RESET | KBD_OUT_A20 | KBD_OUT_ONES;

    s->outport_present = false;

}



static uint8_t kbd_outport_default(KBDState *s)

{

    return KBD_OUT_RESET | KBD_OUT_A20

    return KBD_OUT_RESET | KBD_OUT_A20 | KBD_OUT_ONES

           | (s->status & KBD_STAT_OBF ? KBD_OUT_OBF : 0)

           | (s->status & KBD_STAT_MOUSE_OBF ? KBD_OUT_MOUSE_OBF : 0);

}

include/exec/exec-all.h

+3 −2
Original line number Diff line number Diff line
@@ -142,10 +142,12 @@ struct TranslationBlock { 
    uint64_t flags; /* flags defining in which context the code was generated */

    uint16_t size;      /* size of target code for this block (1 <=

                           size <= TARGET_PAGE_SIZE) */

    uint16_t cflags;    /* compile flags */

    uint16_t icount;

    uint32_t cflags;    /* compile flags */

#define CF_COUNT_MASK  0x7fff

#define CF_LAST_IO     0x8000 /* Last insn may be an IO access.  */

#define CF_NOCACHE     0x10000 /* To be freed after execution */

#define CF_USE_ICOUNT  0x20000



    void *tc_ptr;    /* pointer to the translated code */

    /* next matching tb for physical address. */
@@ -169,7 +171,6 @@ struct TranslationBlock { 
       jmp_first */

    struct TranslationBlock *jmp_next[2];

    struct TranslationBlock *jmp_first;

    uint32_t icount;

};



#include "exec/spinlock.h"