Commit 28ee0126 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



* NBD fixes from Alex and Eric
* Debug code bitrot from Emilio
* HPET fix from Bill
* ps2kbd fix from Hervé
* PKU fix from myself
* Coverity fixes from Gonglei
* More memory.txt update from Jiangang
* .gitignore maintenance from Changlong

# gpg: Signature made Thu 07 Apr 2016 23:08:12 BST using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"

* remotes/bonzini/tags/for-upstream:
  target-i386: check for PKU even for non-writable pages
  tests: ignore test-logging
  translate-all: add missing fold of tb_ctx into tcg_ctx
  hostmem-file: fix memory leak
  spapr: fix possible Negative array index read
  nbd: do not hang nbd_wr_syncv if outside a coroutine and no available data
  nbd: Don't kill server when client requests unknown option
  nbd: Fix NBD unsupported options
  qemu-nbd: Document -x option
  nbd: Improve debug traces on little-endian
  nbd: Avoid bitrot in TRACE() usage
  nbd: Return correct error for write to read-only export
  docs: fix typo in memory.txt
  hw/timer: Revert "hpet: inverse polarity when pin above ISA_NUM_IRQS"
  ps2kbd: default to scancode_set 2, as with KBD_CMD_RESET

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ead5268f 44d066a2

backends/hostmem-file.c

+4 −1
Original line number Diff line number Diff line
@@ -52,11 +52,14 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) 
    error_setg(errp, "-mem-path not supported on this host");

#else

    if (!memory_region_size(&backend->mr)) {

        gchar *path;

        backend->force_prealloc = mem_prealloc;

        path = object_get_canonical_path(OBJECT(backend));

        memory_region_init_ram_from_file(&backend->mr, OBJECT(backend),

                                 object_get_canonical_path(OBJECT(backend)),

                                 path,

                                 backend->size, fb->share,

                                 fb->mem_path, errp);

        g_free(path);

    }

#endif

}

docs/memory.txt

+4 −4
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ of its own subregions: D of size 0x1000 at offset 0 and E of size 0x1000 at 
offset 0x2000. As a diagram:



        0      1000   2000   3000   4000   5000   6000   7000   8000

        |------|------|------|------|------|------|------|-------|

        |------|------|------|------|------|------|------|------|

  A:    [                                                      ]

  C:    [CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC]

  B:                  [                          ]
@@ -247,7 +247,7 @@ system_memory: container@0-2^48-1 
 |

 +---- himem: alias@0x100000000-0x11fffffff ---> #ram (0xe0000000-0xffffffff)

 |

 +---- vga-window: alias@0xa0000-0xbfffff ---> #pci (0xa0000-0xbffff)

 +---- vga-window: alias@0xa0000-0xbffff ---> #pci (0xa0000-0xbffff)

 |      (prio 1)

 |

 +---- pci-hole: alias@0xe0000000-0xffffffff ---> #pci (0xe0000000-0xffffffff)

hw/input/ps2.c

+1 −1
Original line number Diff line number Diff line
@@ -628,7 +628,7 @@ static void ps2_kbd_reset(void *opaque) 
    ps2_common_reset(&s->common);

    s->scan_enabled = 0;

    s->translate = 0;

    s->scancode_set = 0;

    s->scancode_set = 2;

}



static void ps2_mouse_reset(void *opaque)

hw/ppc/spapr.c

+4 −0
Original line number Diff line number Diff line
@@ -2208,6 +2208,10 @@ static void spapr_machine_device_plug(HotplugHandler *hotplug_dev, 
        if (*errp) {

            return;

        }

        if (node < 0 || node >= MAX_NODES) {

            error_setg(errp, "Invaild node %d", node);

            return;

        }



        /*

         * Currently PowerPC kernel doesn't allow hot-adding memory to

hw/timer/hpet.c

+2 −12
Original line number Diff line number Diff line
@@ -201,25 +201,15 @@ static void update_irq(struct HPETTimer *timer, int set) 
    if (!set || !timer_enabled(timer) || !hpet_enabled(timer->state)) {

        s->isr &= ~mask;

        if (!timer_fsb_route(timer)) {

            /* fold the ICH PIRQ# pin's internal inversion logic into hpet */

            if (route >= ISA_NUM_IRQS) {

                qemu_irq_raise(s->irqs[route]);

            } else {

            qemu_irq_lower(s->irqs[route]);

        }

        }

    } else if (timer_fsb_route(timer)) {

        address_space_stl_le(&address_space_memory, timer->fsb >> 32,

                             timer->fsb & 0xffffffff, MEMTXATTRS_UNSPECIFIED,

                             NULL);

    } else if (timer->config & HPET_TN_TYPE_LEVEL) {

        s->isr |= mask;

        /* fold the ICH PIRQ# pin's internal inversion logic into hpet */

        if (route >= ISA_NUM_IRQS) {

            qemu_irq_lower(s->irqs[route]);

        } else {

        qemu_irq_raise(s->irqs[route]);

        }

    } else {

        s->isr &= ~mask;

        qemu_irq_pulse(s->irqs[route]);