HI, stefan, Can you pull this patch into your qemu trivial branch?
Regards, Zhi Yong Wu ----- Forwarded message from Isaku Yamahata <yamah...@valinux.co.jp> ----- Date: Wed, 30 Nov 2011 13:47:02 +0900 From: Isaku Yamahata <yamah...@valinux.co.jp> To: Zhi Yong Wu <wu...@linux.vnet.ibm.com> Cc: stefa...@linux.vnet.ibm.com, qemu-triv...@nongnu.org Subject: Re: [PATCH] pcie_aer: adjust do_pcie_aer_inejct_error -> do_pcie_aer_inject_error Message-ID: <20111130044702.gb4...@valinux.co.jp> References: <1322627987-8698-1-git-send-email-wu...@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1322627987-8698-1-git-send-email-wu...@linux.vnet.ibm.com> User-Agent: Mutt/1.5.19 (2009-01-05) X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean x-cbid: 11113004-3270-0000-0000-0000023AAEC4 X-IBM-ISS-SpamDetectors: Score=0; BY=0; FL=0; FP=0; FZ=0; HX=0; KW=0; PH=0; SC=0; ST=0; TS=0; UL=0; ISC= X-IBM-ISS-DetailInfo: BY=3.00000235; HX=3.00000178; KW=3.00000007; PH=3.00000001; SC=3.00000001; SDB=6.00091957; UDB=6.00024379; UTC=2011-11-30 04:47:05 X-Xagent-From: yamah...@valinux.co.jp X-Xagent-To: wu...@linux.vnet.ibm.com X-Xagent-Gateway: vmsdvm4.vnet.ibm.com (XAGENTU4 at VMSDVM4) Good catch. Thank you. On Wed, Nov 30, 2011 at 12:39:47PM +0800, Zhi Yong Wu wrote: > This function name is a bit wrong. Although it doesn't impact function, it is > a bit necessary that we should fixup it. > > > Signed-off-by: Zhi Yong Wu <wu...@linux.vnet.ibm.com> > --- > hmp-commands.hx | 2 +- > hw/pci-stub.c | 2 +- > hw/pcie_aer.c | 2 +- > sysemu.h | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/hmp-commands.hx b/hmp-commands.hx > index 089c1ac..5775144 100644 > --- a/hmp-commands.hx > +++ b/hmp-commands.hx > @@ -922,7 +922,7 @@ ETEXI > "<tlb header> = 32bit x 4\n\t\t\t" > "<tlb header prefix> = 32bit x 4", > .user_print = pcie_aer_inject_error_print, > - .mhandler.cmd_new = do_pcie_aer_inejct_error, > + .mhandler.cmd_new = do_pcie_aer_inject_error, > }, > > STEXI > diff --git a/hw/pci-stub.c b/hw/pci-stub.c > index 636171c..134c448 100644 > --- a/hw/pci-stub.c > +++ b/hw/pci-stub.c > @@ -34,7 +34,7 @@ static void pci_error_message(Monitor *mon) > monitor_printf(mon, "PCI devices not supported\n"); > } > > -int do_pcie_aer_inejct_error(Monitor *mon, > +int do_pcie_aer_inject_error(Monitor *mon, > const QDict *qdict, QObject **ret_data) > { > pci_error_message(mon); > diff --git a/hw/pcie_aer.c b/hw/pcie_aer.c > index 62c06ea..08bb25a 100644 > --- a/hw/pcie_aer.c > +++ b/hw/pcie_aer.c > @@ -951,7 +951,7 @@ static int pcie_aer_parse_error_string(const char > *error_name, > return -EINVAL; > } > > -int do_pcie_aer_inejct_error(Monitor *mon, > +int do_pcie_aer_inject_error(Monitor *mon, > const QDict *qdict, QObject **ret_data) > { > const char *id = qdict_get_str(qdict, "id"); > diff --git a/sysemu.h b/sysemu.h > index 22cd720..3806901 100644 > --- a/sysemu.h > +++ b/sysemu.h > @@ -148,7 +148,7 @@ void do_pci_device_hot_remove(Monitor *mon, const QDict > *qdict); > > /* pcie aer error injection */ > void pcie_aer_inject_error_print(Monitor *mon, const QObject *data); > -int do_pcie_aer_inejct_error(Monitor *mon, > +int do_pcie_aer_inject_error(Monitor *mon, > const QDict *qdict, QObject **ret_data); > > /* serial ports */ > -- > 1.7.6 > -- yamahata ----- End forwarded message -----