From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33637) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwqE0-0003mR-NP for qemu-devel@nongnu.org; Thu, 12 Nov 2015 06:39:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZwqDz-00068f-RE for qemu-devel@nongnu.org; Thu, 12 Nov 2015 06:39:32 -0500 Date: Thu, 12 Nov 2015 13:39:24 +0200 From: "Michael S. Tsirkin" Message-ID: <20151112133747-mutt-send-email-mst@redhat.com> References: <1447278167-320-1-git-send-email-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1447278167-320-1-git-send-email-ehabkost@redhat.com> Subject: Re: [Qemu-devel] [PATCH] nseries: Don't use qemu_hw_version() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org, qemu-devel@nongnu.org, Paolo Bonzini On Wed, Nov 11, 2015 at 07:42:47PM -0200, Eduardo Habkost wrote: > nseries doesn't use qemu_set_hw_version() and doesn't need the > compatibility magic of qemu_hw_version(). Use QEMU_VERSION > directly. > > Signed-off-by: Eduardo Habkost This looks very wrong. We should be reducing the users of QEMU_VERSION, not adding more. > --- > hw/arm/nseries.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c > index 2a8835e..f1eab73 100644 > --- a/hw/arm/nseries.c > +++ b/hw/arm/nseries.c > @@ -1275,7 +1275,7 @@ static int n8x0_atag_setup(void *p, int model) > strcpy((void *) w, "hw-build"); /* char component[12] */ > w += 6; > strcpy((void *) w, "QEMU "); > - pstrcat((void *) w, 12, qemu_hw_version()); /* char version[12] */ > + pstrcat((void *) w, 12, QEMU_VERSION); /* char version[12] */ > w += 6; > > tag = (model == 810) ? "1.1.10-qemu" : "1.1.6-qemu"; > -- > 2.1.0