From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:33879) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SxOlP-0000YL-UJ for qemu-devel@nongnu.org; Fri, 03 Aug 2012 16:46:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SxOlO-0001kb-JT for qemu-devel@nongnu.org; Fri, 03 Aug 2012 16:46:27 -0400 Received: from e36.co.us.ibm.com ([32.97.110.154]:53205) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SxOlO-0001kT-AA for qemu-devel@nongnu.org; Fri, 03 Aug 2012 16:46:26 -0400 Received: from /spool/local by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 3 Aug 2012 14:46:24 -0600 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 1029219D804C for ; Fri, 3 Aug 2012 20:45:34 +0000 (WET) Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q73KjDlw077266 for ; Fri, 3 Aug 2012 14:45:17 -0600 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q73Kj6m9031633 for ; Fri, 3 Aug 2012 14:45:07 -0600 From: Anthony Liguori In-Reply-To: <87boivc04a.fsf@skywalker.in.ibm.com> References: <87boivc04a.fsf@skywalker.in.ibm.com> Date: Fri, 03 Aug 2012 15:45:04 -0500 Message-ID: <87r4rnu2lr.fsf@codemonkey.ws> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [Qemu-devel] [PULL] VirtFS update List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Aneesh Kumar K.V" Cc: QEMU Developers "Aneesh Kumar K.V" writes: > Hi Anthony, > > I have merged the configure fix which is sent as a part of > > http://thread.gmane.org/gmane.comp.emulators.qemu/160620/focus=160634 > > The following changes since commit 5e3bc7144edd6e4fa2824944e5eb16c28197dd5a: > > Merge remote-tracking branch 'mst/tags/for_anthony' into staging (2012-07-30 10:00:48 -0500) > > are available in the git repository at: > > > git://github.com/kvaneesh/QEMU.git for-upstream > > for you to fetch changes up to 4cdc0789ec17ce1ce48506cae62035310e932a2e: > > hw/9pfs: Fix assert when disabling migration (2012-07-31 22:01:40 +0530) Pulled. Thanks. Regards, Anthony Liguori > > ---------------------------------------------------------------- > Aneesh Kumar K.V (1): > hw/9pfs: Fix assert when disabling migration > > Stefan Weil (1): > configure: Fix build with capabilities > > configure | 2 +- > hw/9pfs/virtio-9p.c | 15 ++++++++++----- > 2 files changed, 11 insertions(+), 6 deletions(-) > > diff --git a/configure b/configure > index c65b5f6..309aeac 100755 > --- a/configure > +++ b/configure > @@ -2084,7 +2084,7 @@ if test "$cap" != "no" ; then > cat > $TMPC < #include > #include > -int main(void) { cap_t caps; caps = cap_init(); } > +int main(void) { cap_t caps; caps = cap_init(); return caps != NULL; } > EOF > if compile_prog "" "-lcap" ; then > cap=yes > diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c > index f4a7026..4b52540 100644 > --- a/hw/9pfs/virtio-9p.c > +++ b/hw/9pfs/virtio-9p.c > @@ -983,11 +983,16 @@ static void v9fs_attach(void *opaque) > err += offset; > trace_v9fs_attach_return(pdu->tag, pdu->id, > qid.type, qid.version, qid.path); > - s->root_fid = fid; > - /* disable migration */ > - error_set(&s->migration_blocker, QERR_VIRTFS_FEATURE_BLOCKS_MIGRATION, > - s->ctx.fs_root ? s->ctx.fs_root : "NULL", s->tag); > - migrate_add_blocker(s->migration_blocker); > + /* > + * disable migration if we haven't done already. > + * attach could get called multiple times for the same export. > + */ > + if (!s->migration_blocker) { > + s->root_fid = fid; > + error_set(&s->migration_blocker, QERR_VIRTFS_FEATURE_BLOCKS_MIGRATION, > + s->ctx.fs_root ? s->ctx.fs_root : "NULL", s->tag); > + migrate_add_blocker(s->migration_blocker); > + } > out: > put_fid(pdu, fidp); > out_nofid: