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

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



* QemuMutex tracing improvements (Alex)
* ram_addr_t optimization (David)
* SCSI fixes (Fam, Stefan, me)
* do {} while (0) fixes (Eric)
* KVM fix for PMU (Jan)
* memory leak fixes from ASAN (Marc-André)
* migration fix for HPET, icount, loadvm (Maria, Pavel)
* hflags fixes (me, Tao)
* block/iscsi uninitialized variable (Peter L.)
* full support for GMainContexts in character devices (Peter Xu)
* more boot-serial-test (Thomas)
* Memory leak fix (Zhecheng)

# gpg: Signature made Tue 16 Jan 2018 14:15:45 GMT
# gpg:                using RSA key 0xBFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
# 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: (51 commits)
  scripts/analyse-locks-simpletrace.py: script to analyse lock times
  util/qemu-thread-*: add qemu_lock, locked and unlock trace events
  cpu: flush TB cache when loading VMState
  block/iscsi: fix initialization of iTask in iscsi_co_get_block_status
  find_ram_offset: Align ram_addr_t allocation on long boundaries
  find_ram_offset: Add comments and tracing
  cpu_physical_memory_sync_dirty_bitmap: Another alignment fix
  checkpatch: Enforce proper do/while (0) style
  maint: Fix macros with broken 'do/while(0); ' usage
  tests: Avoid 'do/while(false); ' in vhost-user-bridge
  chardev: Clean up previous patch indentation
  chardev: Use goto/label instead of do/break/while(0)
  mips: Tweak location of ';' in macros
  net: Drop unusual use of do { } while (0);
  irq: fix memory leak
  cpus: unify qemu_*_wait_io_event
  icount: fixed saving/restoring of icount warp timers
  scripts/qemu-gdb/timers.py: new helper to dump timer state
  scripts/qemu-gdb: add simple tcg lock status helper
  target-i386: update hflags on Hypervisor.framework
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents aae39d24 b5976c2e

Makefile

+5 −2
Original line number Diff line number Diff line
@@ -8,9 +8,12 @@ SRC_PATH=. 


UNCHECKED_GOALS := %clean TAGS cscope ctags dist \

    html info pdf txt \

    help check-help \

    help check-help print-% \

    docker docker-% vm-test vm-build-%



print-%:

	@echo '$*=$($*)'



# All following code might depend on configuration variables

ifneq ($(wildcard config-host.mak),)

# Put the all: rule here so that config-host.mak can contain dependencies.
@@ -277,7 +280,7 @@ else 
DOCS=

endif



SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory) BUILD_DIR=$(BUILD_DIR)

SUBDIR_MAKEFLAGS=BUILD_DIR=$(BUILD_DIR)

SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS))

SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %-config-devices.mak.d, $(TARGET_DIRS))

audio/paaudio.c

+2 −2
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static inline int PA_STREAM_IS_GOOD(pa_stream_state_t x) 
            }                                                   \

            goto label;                                         \

        }                                                       \

    } while (0);

    } while (0)



#define CHECK_DEAD_GOTO(c, stream, rerror, label)                       \

    do {                                                                \
@@ -107,7 +107,7 @@ static inline int PA_STREAM_IS_GOOD(pa_stream_state_t x) 
            }                                                           \

            goto label;                                                 \

        }                                                               \

    } while (0);

    } while (0)



static int qpa_simple_read (PAVoiceIn *p, void *data, size_t length, int *rerror)

{

block/iscsi.c

+2 −1
Original line number Diff line number Diff line
@@ -658,6 +658,8 @@ static int64_t coroutine_fn iscsi_co_get_block_status(BlockDriverState *bs, 
    uint64_t lba;

    int64_t ret;



    iscsi_co_init_iscsitask(iscsilun, &iTask);



    if (!is_sector_request_lun_aligned(sector_num, nb_sectors, iscsilun)) {

        ret = -EINVAL;

        goto out;
@@ -675,7 +677,6 @@ static int64_t coroutine_fn iscsi_co_get_block_status(BlockDriverState *bs, 


    lba = sector_qemu2lun(sector_num, iscsilun);



    iscsi_co_init_iscsitask(iscsilun, &iTask);

    qemu_mutex_lock(&iscsilun->mutex);

retry:

    if (iscsi_get_lba_status_task(iscsilun->iscsi, iscsilun->lun,

chardev/char-fe.c

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ guint qemu_chr_fe_add_watch(CharBackend *be, GIOCondition cond, 
    }



    g_source_set_callback(src, (GSourceFunc)func, user_data, NULL);

    tag = g_source_attach(src, NULL);

    tag = g_source_attach(src, s->gcontext);

    g_source_unref(src);



    return tag;

chardev/char-pty.c

+32 −32
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ typedef struct { 


    /* Protected by the Chardev chr_write_lock.  */

    int connected;

    guint timer_tag;

    guint open_tag;

    GSource *timer_src;

    GSource *open_source;

} PtyChardev;



#define PTY_CHARDEV(obj) OBJECT_CHECK(PtyChardev, (obj), TYPE_CHARDEV_PTY)
@@ -57,8 +57,9 @@ static gboolean pty_chr_timer(gpointer opaque) 
    PtyChardev *s = PTY_CHARDEV(opaque);



    qemu_mutex_lock(&chr->chr_write_lock);

    s->timer_tag = 0;

    s->open_tag = 0;

    s->timer_src = NULL;

    g_source_unref(s->open_source);

    s->open_source = NULL;

    if (!s->connected) {

        /* Next poll ... */

        pty_chr_update_read_handler_locked(chr);
@@ -67,25 +68,25 @@ static gboolean pty_chr_timer(gpointer opaque) 
    return FALSE;

}



static void pty_chr_timer_cancel(PtyChardev *s)

{

    if (s->timer_src) {

        g_source_destroy(s->timer_src);

        g_source_unref(s->timer_src);

        s->timer_src = NULL;

    }

}



/* Called with chr_write_lock held.  */

static void pty_chr_rearm_timer(Chardev *chr, int ms)

{

    PtyChardev *s = PTY_CHARDEV(chr);

    char *name;



    if (s->timer_tag) {

        g_source_remove(s->timer_tag);

        s->timer_tag = 0;

    }



    if (ms == 1000) {

        name = g_strdup_printf("pty-timer-secs-%s", chr->label);

        s->timer_tag = g_timeout_add_seconds(1, pty_chr_timer, chr);

    } else {

        name = g_strdup_printf("pty-timer-ms-%s", chr->label);

        s->timer_tag = g_timeout_add(ms, pty_chr_timer, chr);

    }

    g_source_set_name_by_id(s->timer_tag, name);

    pty_chr_timer_cancel(s);

    name = g_strdup_printf("pty-timer-%s", chr->label);

    s->timer_src = qemu_chr_timeout_add_ms(chr, ms, pty_chr_timer, chr);

    g_source_set_name(s->timer_src, name);

    g_free(name);

}
@@ -183,7 +184,7 @@ static gboolean qemu_chr_be_generic_open_func(gpointer opaque) 
    Chardev *chr = CHARDEV(opaque);

    PtyChardev *s = PTY_CHARDEV(opaque);



    s->open_tag = 0;

    s->open_source = NULL;

    qemu_chr_be_event(chr, CHR_EVENT_OPENED);

    return FALSE;

}
@@ -194,9 +195,10 @@ static void pty_chr_state(Chardev *chr, int connected) 
    PtyChardev *s = PTY_CHARDEV(chr);



    if (!connected) {

        if (s->open_tag) {

            g_source_remove(s->open_tag);

            s->open_tag = 0;

        if (s->open_source) {

            g_source_destroy(s->open_source);

            g_source_unref(s->open_source);

            s->open_source = NULL;

        }

        remove_fd_in_watch(chr);

        s->connected = 0;
@@ -205,14 +207,15 @@ static void pty_chr_state(Chardev *chr, int connected) 
         * the virtual device linked to our pty. */

        pty_chr_rearm_timer(chr, 1000);

    } else {

        if (s->timer_tag) {

            g_source_remove(s->timer_tag);

            s->timer_tag = 0;

        }

        pty_chr_timer_cancel(s);

        if (!s->connected) {

            g_assert(s->open_tag == 0);

            g_assert(s->open_source == NULL);

            s->open_source = g_idle_source_new();

            s->connected = 1;

            s->open_tag = g_idle_add(qemu_chr_be_generic_open_func, chr);

            g_source_set_callback(s->open_source,

                                  qemu_chr_be_generic_open_func,

                                  chr, NULL);

            g_source_attach(s->open_source, chr->gcontext);

        }

        if (!chr->gsource) {

            chr->gsource = io_add_watch_poll(chr, s->ioc,
@@ -231,10 +234,7 @@ static void char_pty_finalize(Object *obj) 
    qemu_mutex_lock(&chr->chr_write_lock);

    pty_chr_state(chr, 0);

    object_unref(OBJECT(s->ioc));

    if (s->timer_tag) {

        g_source_remove(s->timer_tag);

        s->timer_tag = 0;

    }

    pty_chr_timer_cancel(s);

    qemu_mutex_unlock(&chr->chr_write_lock);

    qemu_chr_be_event(chr, CHR_EVENT_CLOSED);

}
@@ -267,7 +267,7 @@ static void char_pty_open(Chardev *chr, 
    name = g_strdup_printf("chardev-pty-%s", chr->label);

    qio_channel_set_name(QIO_CHANNEL(s->ioc), name);

    g_free(name);

    s->timer_tag = 0;

    s->timer_src = NULL;

    *be_opened = false;

}