Commit fedf2de3 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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



* stefanha/trivial-patches:
  hw/pc.c: Fix converting of ioport_register* to MemoryRegion
  Replace remaining gmtime, localtime by gmtime_r, localtime_r
  savevm: Remove MinGW specific code which is no longer needed
  qga/channel-posix.c: Explicitly include string.h
  configure: Fix comment (copy+paste bug)
  readline: avoid memcpy() of overlapping regions

Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents e2848a78 c02e1eac

block.c

+0 −10
Original line number Diff line number Diff line
@@ -3338,11 +3338,7 @@ char *get_human_readable_size(char *buf, int buf_size, int64_t size) 
char *bdrv_snapshot_dump(char *buf, int buf_size, QEMUSnapshotInfo *sn)

{

    char buf1[128], date_buf[128], clock_buf[128];

#ifdef _WIN32

    struct tm *ptm;

#else

    struct tm tm;

#endif

    time_t ti;

    int64_t secs;
@@ -3352,15 +3348,9 @@ char *bdrv_snapshot_dump(char *buf, int buf_size, QEMUSnapshotInfo *sn) 
                 "ID", "TAG", "VM SIZE", "DATE", "VM CLOCK");

    } else {

        ti = sn->date_sec;

#ifdef _WIN32

        ptm = localtime(&ti);

        strftime(date_buf, sizeof(date_buf),

                 "%Y-%m-%d %H:%M:%S", ptm);

#else

        localtime_r(&ti, &tm);

        strftime(date_buf, sizeof(date_buf),

                 "%Y-%m-%d %H:%M:%S", &tm);

#endif

        secs = sn->vm_clock_nsec / 1000000000;

        snprintf(clock_buf, sizeof(clock_buf),

                 "%02d:%02d:%02d.%03d",

block/vvfat.c

+0 −4
Original line number Diff line number Diff line
@@ -529,13 +529,9 @@ static inline uint8_t fat_chksum(const direntry_t* entry) 
/* if return_time==0, this returns the fat_date, else the fat_time */

static uint16_t fat_datetime(time_t time,int return_time) {

    struct tm* t;

#ifdef _WIN32

    t=localtime(&time); /* this is not thread safe */

#else

    struct tm t1;

    t = &t1;

    localtime_r(&time,t);

#endif

    if(return_time)

	return cpu_to_le16((t->tm_sec/2)|(t->tm_min<<5)|(t->tm_hour<<11));

    return cpu_to_le16((t->tm_mday)|((t->tm_mon+1)<<5)|((t->tm_year-80)<<9));

configure

+1 −1
Original line number Diff line number Diff line
@@ -2705,7 +2705,7 @@ if compile_prog "" "" ; then 
  byteswap_h=yes

fi



# Search for bswap_32 function

# Search for bswap32 function

bswap_h=no

cat > $TMPC << EOF

#include <sys/endian.h>

hw/omap1.c

+1 −1
Original line number Diff line number Diff line
@@ -2830,7 +2830,7 @@ static void omap_rtc_tick(void *opaque) 
        s->round = 0;

    }



    memcpy(&s->current_tm, localtime(&s->ti), sizeof(s->current_tm));

    localtime_r(&s->ti, &s->current_tm);



    if ((s->interrupts & 0x08) && s->ti == s->alarm_ti) {

        s->status |= 0x40;

hw/pc.c

+12 −0
Original line number Diff line number Diff line
@@ -103,6 +103,11 @@ static void ioport80_write(void *opaque, hwaddr addr, uint64_t data, 
{

}



static uint64_t ioport80_read(void *opaque, hwaddr addr, unsigned size)

{

    return 0xffffffffffffffff;

}



/* MSDOS compatibility mode FPU exception support */

static qemu_irq ferr_irq;
@@ -123,6 +128,11 @@ static void ioportF0_write(void *opaque, hwaddr addr, uint64_t data, 
    qemu_irq_lower(ferr_irq);

}



static uint64_t ioportF0_read(void *opaque, hwaddr addr, unsigned size)

{

    return 0xffffffffffffffff;

}



/* TSC handling */

uint64_t cpu_get_tsc(CPUX86State *env)

{
@@ -960,6 +970,7 @@ static void cpu_request_exit(void *opaque, int irq, int level) 


static const MemoryRegionOps ioport80_io_ops = {

    .write = ioport80_write,

    .read = ioport80_read,

    .endianness = DEVICE_NATIVE_ENDIAN,

    .impl = {

        .min_access_size = 1,
@@ -969,6 +980,7 @@ static const MemoryRegionOps ioport80_io_ops = { 


static const MemoryRegionOps ioportF0_io_ops = {

    .write = ioportF0_write,

    .read = ioportF0_read,

    .endianness = DEVICE_NATIVE_ENDIAN,

    .impl = {

        .min_access_size = 1,