Commit 2b31cd4e authored by Peter Maydell's avatar Peter Maydell
Browse files

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



- Memory: improve error reporting and avoid crashes on hotplug
- Build: fixing block/iscsi.so and ranlib warnings on Mac OS X
- Migration fixes for x86
- The odd KVM patch.

# gpg: Signature made Thu 11 Sep 2014 11:21:10 BST using RSA key ID 9B4D86F2
# gpg: Good signature from "Paolo Bonzini <pbonzini@redhat.com>"
# gpg:                 aka "Paolo Bonzini <bonzini@gnu.org>"

* remotes/bonzini/tags/for-upstream: (21 commits)
  gdbstub: init mon_chr through qemu_chr_alloc
  pckbd: adding new fields to vmstate
  mc146818rtc: add missed field to vmstate
  piix: do not set irq while loading vmstate
  serial: fixing vmstate for save/restore
  parallel: adding vmstate for save/restore
  fdc: adding vmstate for save/restore
  cpu: init vmstate for ticks and clock offset
  apic_common: vapic_paddr synchronization fix
  vl: use QLIST_FOREACH_SAFE to visit change state handlers
  exec: add parameter errp to gethugepagesize
  exec: report error when memory < hpagesize
  hostmem-ram: don't exit qemu if size of memory-backend-ram is way too big
  memory: add parameter errp to memory_region_init_rom_device
  memory: add parameter errp to memory_region_init_ram
  exec: add parameter errp to qemu_ram_alloc and qemu_ram_alloc_from_ptr
  rules.mak: Fix DSO build by pulling in archive symbols
  util: Don't link host-utils.o if it's empty
  util: Move general qemu_getauxval to util/getauxval.c
  trace: Only link generated-tracers.o with "simple" backend
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 4c24f400 462efe9e

backends/hostmem-ram.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ ram_backend_memory_alloc(HostMemoryBackend *backend, Error **errp) 


    path = object_get_canonical_path_component(OBJECT(backend));

    memory_region_init_ram(&backend->mr, OBJECT(backend), path,

                           backend->size);

                           backend->size, errp);

    g_free(path);

}

cpus.c

+6 −2
Original line number Diff line number Diff line
@@ -493,13 +493,17 @@ static const VMStateDescription vmstate_timers = { 
    }

};



void cpu_ticks_init(void)

{

    seqlock_init(&timers_state.vm_clock_seqlock, NULL);

    vmstate_register(NULL, 0, &vmstate_timers, &timers_state);

}



void configure_icount(QemuOpts *opts, Error **errp)

{

    const char *option;

    char *rem_str = NULL;



    seqlock_init(&timers_state.vm_clock_seqlock, NULL);

    vmstate_register(NULL, 0, &vmstate_timers, &timers_state);

    option = qemu_opt_get(opts, "shift");

    if (!option) {

        if (qemu_opt_get(opts, "align") != NULL) {

exec.c

+40 −16
Original line number Diff line number Diff line
@@ -1059,7 +1059,7 @@ void qemu_mutex_unlock_ramlist(void) 


#define HUGETLBFS_MAGIC       0x958458f6



static long gethugepagesize(const char *path)

static long gethugepagesize(const char *path, Error **errp)

{

    struct statfs fs;

    int ret;
@@ -1069,7 +1069,8 @@ static long gethugepagesize(const char *path) 
    } while (ret != 0 && errno == EINTR);



    if (ret != 0) {

        perror(path);

        error_setg_errno(errp, errno, "failed to get page size of file %s",

                         path);

        return 0;

    }
@@ -1087,17 +1088,22 @@ static void *file_ram_alloc(RAMBlock *block, 
    char *filename;

    char *sanitized_name;

    char *c;

    void *area;

    void *area = NULL;

    int fd;

    unsigned long hpagesize;

    uint64_t hpagesize;

    Error *local_err = NULL;



    hpagesize = gethugepagesize(path);

    if (!hpagesize) {

    hpagesize = gethugepagesize(path, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        goto error;

    }



    if (memory < hpagesize) {

        return NULL;

        error_setg(errp, "memory size 0x" RAM_ADDR_FMT " must be equal to "

                   "or larger than huge page size 0x%" PRIx64,

                   memory, hpagesize);

        goto error;

    }



    if (kvm_enabled() && !kvm_has_sync_mmu()) {
@@ -1287,7 +1293,7 @@ static int memory_try_enable_merging(void *addr, size_t len) 
    return qemu_madvise(addr, len, QEMU_MADV_MERGEABLE);

}



static ram_addr_t ram_block_add(RAMBlock *new_block)

static ram_addr_t ram_block_add(RAMBlock *new_block, Error **errp)

{

    RAMBlock *block;

    ram_addr_t old_ram_size, new_ram_size;
@@ -1304,9 +1310,11 @@ static ram_addr_t ram_block_add(RAMBlock *new_block) 
        } else {

            new_block->host = phys_mem_alloc(new_block->length);

            if (!new_block->host) {

                fprintf(stderr, "Cannot set up guest memory '%s': %s\n",

                        memory_region_name(new_block->mr), strerror(errno));

                exit(1);

                error_setg_errno(errp, errno,

                                 "cannot set up guest memory '%s'",

                                 memory_region_name(new_block->mr));

                qemu_mutex_unlock_ramlist();

                return -1;

            }

            memory_try_enable_merging(new_block->host, new_block->length);

        }
@@ -1357,6 +1365,8 @@ ram_addr_t qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr, 
                                    Error **errp)

{

    RAMBlock *new_block;

    ram_addr_t addr;

    Error *local_err = NULL;



    if (xen_enabled()) {

        error_setg(errp, "-mem-path not supported with Xen");
@@ -1386,14 +1396,22 @@ ram_addr_t qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr, 
        return -1;

    }



    return ram_block_add(new_block);

    addr = ram_block_add(new_block, &local_err);

    if (local_err) {

        g_free(new_block);

        error_propagate(errp, local_err);

        return -1;

    }

    return addr;

}

#endif



ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host,

                                   MemoryRegion *mr)

                                   MemoryRegion *mr, Error **errp)

{

    RAMBlock *new_block;

    ram_addr_t addr;

    Error *local_err = NULL;



    size = TARGET_PAGE_ALIGN(size);

    new_block = g_malloc0(sizeof(*new_block));
@@ -1404,12 +1422,18 @@ ram_addr_t qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, 
    if (host) {

        new_block->flags |= RAM_PREALLOC;

    }

    return ram_block_add(new_block);

    addr = ram_block_add(new_block, &local_err);

    if (local_err) {

        g_free(new_block);

        error_propagate(errp, local_err);

        return -1;

    }

    return addr;

}



ram_addr_t qemu_ram_alloc(ram_addr_t size, MemoryRegion *mr)

ram_addr_t qemu_ram_alloc(ram_addr_t size, MemoryRegion *mr, Error **errp)

{

    return qemu_ram_alloc_from_ptr(size, NULL, mr);

    return qemu_ram_alloc_from_ptr(size, NULL, mr, errp);

}



void qemu_ram_free_from_ptr(ram_addr_t addr)

gdbstub.c

+1 −1
Original line number Diff line number Diff line
@@ -1707,7 +1707,7 @@ int gdbserver_start(const char *device) 
        qemu_add_vm_change_state_handler(gdb_vm_state_change, NULL);



        /* Initialize a monitor terminal for gdb */

        mon_chr = g_malloc0(sizeof(*mon_chr));

        mon_chr = qemu_chr_alloc();

        mon_chr->chr_write = gdb_monitor_write;

        monitor_init(mon_chr, 0);

    } else {

hw/alpha/typhoon.c

+2 −1
Original line number Diff line number Diff line
@@ -844,7 +844,8 @@ PCIBus *typhoon_init(ram_addr_t ram_size, ISABus **isa_bus, 


    /* Main memory region, 0x00.0000.0000.  Real hardware supports 32GB,

       but the address space hole reserved at this point is 8TB.  */

    memory_region_init_ram(&s->ram_region, OBJECT(s), "ram", ram_size);

    memory_region_init_ram(&s->ram_region, OBJECT(s), "ram", ram_size,

                           &error_abort);

    vmstate_register_ram_global(&s->ram_region);

    memory_region_add_subregion(addr_space, 0, &s->ram_region);