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

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



Bugfixes and making SCSI adapters IOMMU-friendly.

# gpg: Signature made Thu Mar 26 13:24:05 2015 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:
  virtio-scsi-dataplane: fix memory leak for VirtIOSCSIVring
  misc: fix typos in copyright declaration
  exec: avoid possible overwriting of mmaped area in qemu_ram_remap
  sparc: memory: Replace memory_region_init_ram with memory_region_allocate_system_memory
  mips: memory: Replace memory_region_init_ram with memory_region_allocate_system_memory
  m68k: memory: Replace memory_region_init_ram with memory_region_allocate_system_memory
  nbd: Fix up comment after commit e140177d
  vmw_pvscsi: use PCI DMA APIs
  megasas: use PCI DMA APIs
  cpus: Don't kick un-realized cpus.
  i6300esb: Fix signed integer overflow
  i6300esb: Correct endiannness
  fw_cfg: factor out initialization of FW_CFG_ID (rev. number)
  rcu tests: fix compilation on 32-bit ppc

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 896848f0 4020db04

blockdev-nbd.c

+3 −2
Original line number Diff line number Diff line
@@ -47,8 +47,9 @@ void qmp_nbd_server_start(SocketAddress *addr, Error **errp) 
    }

}



/* Hook into the BlockDriverState notifiers to close the export when

 * the file is closed.

/*

 * Hook into the BlockBackend notifiers to close the export when the

 * backend is closed.

 */

typedef struct NBDCloseNotifier {

    Notifier n;

cpus.c

+1 −1
Original line number Diff line number Diff line
@@ -1119,7 +1119,7 @@ bool qemu_in_vcpu_thread(void) 
void qemu_mutex_lock_iothread(void)

{

    atomic_inc(&iothread_requesting_mutex);

    if (!tcg_enabled() || !first_cpu) {

    if (!tcg_enabled() || !first_cpu || !first_cpu->thread) {

        qemu_mutex_lock(&qemu_global_mutex);

        atomic_dec(&iothread_requesting_mutex);

    } else {

exec.c

+0 −1
Original line number Diff line number Diff line
@@ -1638,7 +1638,6 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length) 
                abort();

            } else {

                flags = MAP_FIXED;

                munmap(vaddr, length);

                if (block->fd >= 0) {

                    flags |= (block->flags & RAM_SHARED ?

                              MAP_SHARED : MAP_PRIVATE);

hw/i386/pc.c

+0 −1
Original line number Diff line number Diff line
@@ -702,7 +702,6 @@ static FWCfgState *bochs_bios_init(void) 
     *     the APIC ID, not the "CPU index"

     */

    fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, (uint16_t)apic_id_limit);

    fw_cfg_add_i32(fw_cfg, FW_CFG_ID, 1);

    fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size);

    fw_cfg_add_bytes(fw_cfg, FW_CFG_ACPI_TABLES,

                     acpi_tables, acpi_tables_len);

hw/m68k/an5206.c

+1 −2
Original line number Diff line number Diff line
@@ -50,8 +50,7 @@ static void an5206_init(MachineState *machine) 
    env->rambar0 = AN5206_RAMBAR_ADDR | 1;



    /* DRAM at address zero */

    memory_region_init_ram(ram, NULL, "an5206.ram", ram_size, &error_abort);

    vmstate_register_ram_global(ram);

    memory_region_allocate_system_memory(ram, NULL, "an5206.ram", ram_size);

    memory_region_add_subregion(address_space_mem, 0, ram);



    /* Internal SRAM.  */