From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=57038 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJuQT-0005Pr-4y for qemu-devel@nongnu.org; Wed, 02 Jun 2010 16:20:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OJuQR-0003ga-S5 for qemu-devel@nongnu.org; Wed, 02 Jun 2010 16:20:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28084) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OJuQR-0003gU-Iy for qemu-devel@nongnu.org; Wed, 02 Jun 2010 16:20:31 -0400 From: Luiz Capitulino Date: Wed, 2 Jun 2010 17:19:56 -0300 Message-Id: <1275509996-25823-4-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1275509996-25823-1-git-send-email-lcapitulino@redhat.com> References: <1275509996-25823-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [STABLE 3/3] usb-bus: fix no params List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: TeLeMan , Aurelien Jarno After commit 702f3e0fb52c124c07f215426eeadb70a716643f, the params is nerver NULL. It should check *params instead of params to determine whether the params is empty. Conflicts: hw/usb-bus.c Signed-off-by: TeLeMan Signed-off-by: Aurelien Jarno Signed-off-by: Luiz Capitulino (cherry picked from commit 98f22dc172e1ebd5341da3de0d67666442566f72) --- hw/usb-bus.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/usb-bus.c b/hw/usb-bus.c index 3bb8986..aae1fef 100644 --- a/hw/usb-bus.c +++ b/hw/usb-bus.c @@ -299,7 +299,7 @@ USBDevice *usbdevice_create(const char *cmdline) } if (!usb->usbdevice_init) { - if (params) { + if (*params) { qemu_error("usbdevice %s accepts no params\n", driver); return NULL; } -- 1.7.1.231.gd0b16