Commit 7c12fd9b authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'stefanha/trivial-patches' into staging 



* stefanha/trivial-patches:
  pc_sysfw: Plug memory leak on pc_fw_add_pflash_drv() error path
  qemu-options: Fix space at EOL
  Fix spelling in comments and documentation
  Clean up pci_drive_hot_add()'s use of BlockInterfaceType
  arm: a9mpcore: remove un-used ptimer_iomem field
  target-sparc: Remove t0, t1 from CPUSPARCState
  target-m68k: Remove t1 from CPUM68KState
  target-alpha: Remove t0, t1 from CPUAlphaState
  s390x: Spelling fixes (endianess -> endianness, occured -> occurred)
  Fix comments (adress -> address, layed -> laid, wierd -> weird)
  Fix spelling (prefered -> preferred)
  configure: Remove stray debug output
  sd: Send debug printfery to stderr not stdout

Conflicts:
	configure

Resolve spelling conflict in configure.

Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents 8385b173 654598c9

configure

+1 −3
Original line number Diff line number Diff line
@@ -2139,7 +2139,7 @@ if test "$pixman" = "system"; then 
else

  if test ! -d ${source_path}/pixman/pixman; then

    echo "ERROR: pixman not present (or older than 0.18.4). Your options:"

    echo "  (1) Prefered: Install the pixman devel package (any recent"

    echo "  (1) Preferred: Install the pixman devel package (any recent"

    echo "      distro should have packages as Xorg needs pixman too)."

    echo "  (2) Fetch the pixman submodule, using:"

    echo "      git submodule update --init pixman"
@@ -2978,8 +2978,6 @@ EOF 
    else

	coroutine_backend=gthread

    fi

  else

    echo "Silently falling back into gthread backend under darwin"

  fi

elif test "$coroutine" = "gthread" ; then

  coroutine_backend=gthread

hw/a9mpcore.c

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ typedef struct a9mp_priv_state { 
    uint32_t old_timer_status[8];

    uint32_t num_cpu;

    MemoryRegion scu_iomem;

    MemoryRegion ptimer_iomem;

    MemoryRegion container;

    DeviceState *mptimer;

    DeviceState *gic;

hw/device-hotplug.c

+4 −7
Original line number Diff line number Diff line
@@ -49,18 +49,16 @@ DriveInfo *add_init_drive(const char *optstr) 
}



#if !defined(TARGET_I386)

int pci_drive_hot_add(Monitor *mon, const QDict *qdict,

                      DriveInfo *dinfo, int type)

int pci_drive_hot_add(Monitor *mon, const QDict *qdict, DriveInfo *dinfo)

{

    /* On non-x86 we don't do PCI hotplug */

    monitor_printf(mon, "Can't hot-add drive to type %d\n", type);

    monitor_printf(mon, "Can't hot-add drive to type %d\n", dinfo->type);

    return -1;

}

#endif



void drive_hot_add(Monitor *mon, const QDict *qdict)

{

    int type;

    DriveInfo *dinfo = NULL;

    const char *opts = qdict_get_str(qdict, "opts");
@@ -72,14 +70,13 @@ void drive_hot_add(Monitor *mon, const QDict *qdict) 
        monitor_printf(mon, "Parameter addr not supported\n");

        goto err;

    }

    type = dinfo->type;



    switch (type) {

    switch (dinfo->type) {

    case IF_NONE:

        monitor_printf(mon, "OK\n");

        break;

    default:

        if (pci_drive_hot_add(mon, qdict, dinfo, type)) {

        if (pci_drive_hot_add(mon, qdict, dinfo)) {

            goto err;

        }

    }

hw/pc_sysfw.c

+3 −1
Original line number Diff line number Diff line
@@ -98,7 +98,9 @@ static void pc_fw_add_pflash_drv(void) 
      return;

    }



    drive_init(opts, machine->use_scsi);

    if (!drive_init(opts, machine->use_scsi)) {

        qemu_opts_del(opts);

    }

}



static void pc_system_flash_init(MemoryRegion *rom_memory,

hw/pci-hotplug.c

+3 −4
Original line number Diff line number Diff line
@@ -111,15 +111,14 @@ static int scsi_hot_add(Monitor *mon, DeviceState *adapter, 
    return 0;

}



int pci_drive_hot_add(Monitor *mon, const QDict *qdict,

                      DriveInfo *dinfo, int type)

int pci_drive_hot_add(Monitor *mon, const QDict *qdict, DriveInfo *dinfo)

{

    int dom, pci_bus;

    unsigned slot;

    PCIDevice *dev;

    const char *pci_addr = qdict_get_str(qdict, "pci_addr");



    switch (type) {

    switch (dinfo->type) {

    case IF_SCSI:

        if (pci_read_devaddr(mon, pci_addr, &dom, &pci_bus, &slot)) {

            goto err;
@@ -135,7 +134,7 @@ int pci_drive_hot_add(Monitor *mon, const QDict *qdict, 
        }

        break;

    default:

        monitor_printf(mon, "Can't hot-add drive to type %d\n", type);

        monitor_printf(mon, "Can't hot-add drive to type %d\n", dinfo->type);

        goto err;

    }