From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 09 May 2014 23:44:33 +0200 (CEST) Received: from mailapp01.imgtec.com ([195.89.28.115]:44608 "EHLO mailapp01.imgtec.com" rhost-flags-OK-FAIL-OK-FAIL) by eddie.linux-mips.org with ESMTP id S6854790AbaEIVobnbcD9 (ORCPT ); Fri, 9 May 2014 23:44:31 +0200 Received: from KLMAIL01.kl.imgtec.org (unknown [192.168.5.35]) by Websense Email Security Gateway with ESMTPS id 177C764D38FD3; Fri, 9 May 2014 22:44:21 +0100 (IST) Received: from KLMAIL02.kl.imgtec.org (192.168.5.97) by KLMAIL01.kl.imgtec.org (192.168.5.35) with Microsoft SMTP Server (TLS) id 14.3.181.6; Fri, 9 May 2014 22:44:24 +0100 Received: from LEMAIL01.le.imgtec.org (192.168.152.62) by klmail02.kl.imgtec.org (192.168.5.97) with Microsoft SMTP Server (TLS) id 14.3.181.6; Fri, 9 May 2014 22:44:24 +0100 Received: from [192.168.154.101] (192.168.154.101) by LEMAIL01.le.imgtec.org (192.168.152.62) with Microsoft SMTP Server (TLS) id 14.3.174.1; Fri, 9 May 2014 22:44:24 +0100 Message-ID: <536D4C38.2010300@imgtec.com> Date: Fri, 9 May 2014 22:44:24 +0100 From: James Hogan User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: Andreas Herrmann , Pekka Enberg CC: David Daney , , Subject: Re: [PATCH 10/11] kvm tools: Introduce weak (default) load_bzimage function References: <1399391491-5021-1-git-send-email-andreas.herrmann@caviumnetworks.com> <1399391491-5021-11-git-send-email-andreas.herrmann@caviumnetworks.com> In-Reply-To: <1399391491-5021-11-git-send-email-andreas.herrmann@caviumnetworks.com> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit X-Originating-IP: [192.168.154.101] Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 40071 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: james.hogan@imgtec.com Precedence: bulk List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: linux-mips X-List-ID: linux-mips List-subscribe: List-owner: List-post: List-archive: X-list: linux-mips Hi Andreas, On 06/05/14 16:51, Andreas Herrmann wrote: > ... to get rid of its function definition from archs that don't > support it. Maybe it makes sense to put this patch before the main mips one so that the function doesn't have to be added for mips in the first place Cheers James > > Signed-off-by: Andreas Herrmann > --- > tools/kvm/arm/fdt.c | 7 ------- > tools/kvm/kvm.c | 6 ++++++ > tools/kvm/mips/kvm.c | 6 ------ > tools/kvm/powerpc/kvm.c | 7 ------- > 4 files changed, 6 insertions(+), 20 deletions(-) > > diff --git a/tools/kvm/arm/fdt.c b/tools/kvm/arm/fdt.c > index 30cd75a..186a718 100644 > --- a/tools/kvm/arm/fdt.c > +++ b/tools/kvm/arm/fdt.c > @@ -276,10 +276,3 @@ int load_flat_binary(struct kvm *kvm, int fd_kernel, int fd_initrd, > > return true; > } > - > -bool load_bzimage(struct kvm *kvm, int fd_kernel, int fd_initrd, > - const char *kernel_cmdline) > -{ > - /* To b or not to b? That is the zImage. */ > - return false; > -} > diff --git a/tools/kvm/kvm.c b/tools/kvm/kvm.c > index 278b915..e1b9f6c 100644 > --- a/tools/kvm/kvm.c > +++ b/tools/kvm/kvm.c > @@ -355,6 +355,12 @@ int __attribute__((__weak__)) load_elf_binary(struct kvm *kvm, int fd_kernel, > return false; > } > > +bool __attribute__((__weak__)) load_bzimage(struct kvm *kvm, int fd_kernel, > + int fd_initrd, const char *kernel_cmdline) > +{ > + return false; > +} > + > bool kvm__load_kernel(struct kvm *kvm, const char *kernel_filename, > const char *initrd_filename, const char *kernel_cmdline) > { > diff --git a/tools/kvm/mips/kvm.c b/tools/kvm/mips/kvm.c > index 09192c8..fc0428b 100644 > --- a/tools/kvm/mips/kvm.c > +++ b/tools/kvm/mips/kvm.c > @@ -323,12 +323,6 @@ int load_elf_binary(struct kvm *kvm, int fd_kernel, int fd_initrd, const char *k > return true; > } > > -bool load_bzimage(struct kvm *kvm, int fd_kernel, int fd_initrd, > - const char *kernel_cmdline) > -{ > - return false; > -} > - > void ioport__map_irq(u8 *irq) > { > } > diff --git a/tools/kvm/powerpc/kvm.c b/tools/kvm/powerpc/kvm.c > index c1712cf..2b03a12 100644 > --- a/tools/kvm/powerpc/kvm.c > +++ b/tools/kvm/powerpc/kvm.c > @@ -204,13 +204,6 @@ int load_flat_binary(struct kvm *kvm, int fd_kernel, int fd_initrd, const char * > return true; > } > > -bool load_bzimage(struct kvm *kvm, int fd_kernel, int fd_initrd, > - const char *kernel_cmdline) > -{ > - /* We don't support bzImages. */ > - return false; > -} > - > struct fdt_prop { > void *value; > int size; > From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailapp01.imgtec.com ([195.89.28.115]:44608 "EHLO mailapp01.imgtec.com" rhost-flags-OK-FAIL-OK-FAIL) by eddie.linux-mips.org with ESMTP id S6854790AbaEIVobnbcD9 (ORCPT ); Fri, 9 May 2014 23:44:31 +0200 Message-ID: <536D4C38.2010300@imgtec.com> Date: Fri, 9 May 2014 22:44:24 +0100 From: James Hogan MIME-Version: 1.0 Subject: Re: [PATCH 10/11] kvm tools: Introduce weak (default) load_bzimage function References: <1399391491-5021-1-git-send-email-andreas.herrmann@caviumnetworks.com> <1399391491-5021-11-git-send-email-andreas.herrmann@caviumnetworks.com> In-Reply-To: <1399391491-5021-11-git-send-email-andreas.herrmann@caviumnetworks.com> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Return-Path: Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-subscribe: List-owner: List-post: List-archive: To: Andreas Herrmann , Pekka Enberg Cc: David Daney , kvm@vger.kernel.org, linux-mips@linux-mips.org Message-ID: <20140509214424.DFmgkN12qQO5bqiPwEegx7P-2OhbovaNXVe98J_9K4A@z> Hi Andreas, On 06/05/14 16:51, Andreas Herrmann wrote: > ... to get rid of its function definition from archs that don't > support it. Maybe it makes sense to put this patch before the main mips one so that the function doesn't have to be added for mips in the first place Cheers James > > Signed-off-by: Andreas Herrmann > --- > tools/kvm/arm/fdt.c | 7 ------- > tools/kvm/kvm.c | 6 ++++++ > tools/kvm/mips/kvm.c | 6 ------ > tools/kvm/powerpc/kvm.c | 7 ------- > 4 files changed, 6 insertions(+), 20 deletions(-) > > diff --git a/tools/kvm/arm/fdt.c b/tools/kvm/arm/fdt.c > index 30cd75a..186a718 100644 > --- a/tools/kvm/arm/fdt.c > +++ b/tools/kvm/arm/fdt.c > @@ -276,10 +276,3 @@ int load_flat_binary(struct kvm *kvm, int fd_kernel, int fd_initrd, > > return true; > } > - > -bool load_bzimage(struct kvm *kvm, int fd_kernel, int fd_initrd, > - const char *kernel_cmdline) > -{ > - /* To b or not to b? That is the zImage. */ > - return false; > -} > diff --git a/tools/kvm/kvm.c b/tools/kvm/kvm.c > index 278b915..e1b9f6c 100644 > --- a/tools/kvm/kvm.c > +++ b/tools/kvm/kvm.c > @@ -355,6 +355,12 @@ int __attribute__((__weak__)) load_elf_binary(struct kvm *kvm, int fd_kernel, > return false; > } > > +bool __attribute__((__weak__)) load_bzimage(struct kvm *kvm, int fd_kernel, > + int fd_initrd, const char *kernel_cmdline) > +{ > + return false; > +} > + > bool kvm__load_kernel(struct kvm *kvm, const char *kernel_filename, > const char *initrd_filename, const char *kernel_cmdline) > { > diff --git a/tools/kvm/mips/kvm.c b/tools/kvm/mips/kvm.c > index 09192c8..fc0428b 100644 > --- a/tools/kvm/mips/kvm.c > +++ b/tools/kvm/mips/kvm.c > @@ -323,12 +323,6 @@ int load_elf_binary(struct kvm *kvm, int fd_kernel, int fd_initrd, const char *k > return true; > } > > -bool load_bzimage(struct kvm *kvm, int fd_kernel, int fd_initrd, > - const char *kernel_cmdline) > -{ > - return false; > -} > - > void ioport__map_irq(u8 *irq) > { > } > diff --git a/tools/kvm/powerpc/kvm.c b/tools/kvm/powerpc/kvm.c > index c1712cf..2b03a12 100644 > --- a/tools/kvm/powerpc/kvm.c > +++ b/tools/kvm/powerpc/kvm.c > @@ -204,13 +204,6 @@ int load_flat_binary(struct kvm *kvm, int fd_kernel, int fd_initrd, const char * > return true; > } > > -bool load_bzimage(struct kvm *kvm, int fd_kernel, int fd_initrd, > - const char *kernel_cmdline) > -{ > - /* We don't support bzImages. */ > - return false; > -} > - > struct fdt_prop { > void *value; > int size; >