From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=43458 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OvsfV-0003rI-5Q for qemu-devel@nongnu.org; Wed, 15 Sep 2010 10:09:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OvsfT-0001VR-Kk for qemu-devel@nongnu.org; Wed, 15 Sep 2010 10:09:01 -0400 Received: from mail-bw0-f45.google.com ([209.85.214.45]:62181) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OvsfT-0001VM-ED for qemu-devel@nongnu.org; Wed, 15 Sep 2010 10:08:59 -0400 Received: by bwz4 with SMTP id 4so617717bwz.4 for ; Wed, 15 Sep 2010 07:08:58 -0700 (PDT) Date: Wed, 15 Sep 2010 15:53:56 +0200 From: "Edgar E. Iglesias" Subject: Re: [Qemu-devel] [PATCH] serial: Update parameters after load Message-ID: <20100915135356.GA29442@edde.se.axis.com> References: <4C8E2B60.1010909@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4C8E2B60.1010909@redhat.com> List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Michal Novotny Cc: "qemu-devel@nongnu.org" On Mon, Sep 13, 2010 at 03:47:12PM +0200, Michal Novotny wrote: > Hi, > > this is the patch to update serial port parameters after guest is > already loaded. Hi This patch didn't apply: % git am -s ~/.maildir/minovotn/ Applying: serial: Update parameters after load error: patch failed: hw/serial.c:674 error: hw/serial.c: patch does not apply Patch failed at 0001 serial: Update parameters after load When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort" > > Signed-off-by: Michal Novotny ^^^^ missing space I manually fixed both errors and applied it. Cheers, Edgar > --- > hw/serial.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/hw/serial.c b/hw/serial.c > index 49431b2..bf74876 100644 > --- a/hw/serial.c > +++ b/hw/serial.c > @@ -674,6 +674,7 @@ static int serial_post_load(void *opaque, int version_id) > } > /* Initialize fcr via setter to perform essential side-effects */ > serial_ioport_write(s, 0x02, s->fcr_vmstate); > + serial_update_parameters(s); > return 0; > } > > -- > 1.7.2.3