From patchwork Thu Sep 3 16:12:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Programmingkid X-Patchwork-Id: 514202 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4A3801401E7 for ; Fri, 4 Sep 2015 02:15:24 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=06Q6ps2/; dkim-atps=neutral Received: from localhost ([::1]:49934 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZXXAY-0000PP-Fp for incoming@patchwork.ozlabs.org; Thu, 03 Sep 2015 12:15:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47349) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZXX80-00049U-M4 for qemu-devel@nongnu.org; Thu, 03 Sep 2015 12:12:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZXX7w-0006d1-Oh for qemu-devel@nongnu.org; Thu, 03 Sep 2015 12:12:44 -0400 Received: from mail-qg0-x234.google.com ([2607:f8b0:400d:c04::234]:33124) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZXX7w-0006cp-Jg for qemu-devel@nongnu.org; Thu, 03 Sep 2015 12:12:40 -0400 Received: by qgev79 with SMTP id v79so32358745qge.0 for ; Thu, 03 Sep 2015 09:12:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:mime-version:content-type:from:in-reply-to:date:cc :message-id:references:to; bh=VfTLz8D1R9X570hmVXtrYG2ielOHO4YdOufdr9m9nXE=; b=06Q6ps2/J7wsKgW4rCJmnrByfNO1p9lPyKhKjMjRU7LwWXnbDiFvkLjbNQ9UTEHXKl ZqnBs/LQOEM7K6j4ZFg06oh62sJxFQwmimdXpev9EVjCx2pugf27ORu3RrruQyxRjJwg UrVf6fWm7SSj0USIiwTfYHbjtfV0Q0w41BeBavkijbNOnS7iX5PhVhiu28UeE5nTZgua uce3K4ux4EwX1WlJLao1EQ0FIanpNtQBslztMW3rM2k15Iu3wkj8m0/MOJHFkjfCl5sX 9Oe6p2qTdp49m9HfKfKrw1rmUe3H6fwCfLyvHICSIyXUG/kqyPGuEioOnZ6rZu7YUDyr 1sxQ== X-Received: by 10.140.133.145 with SMTP id 139mr70775097qhf.97.1441296760144; Thu, 03 Sep 2015 09:12:40 -0700 (PDT) Received: from [192.168.0.3] (d199-74-164-53.col.wideopenwest.com. [74.199.53.164]) by smtp.gmail.com with ESMTPSA id f10sm15022958qhc.12.2015.09.03.09.12.39 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 03 Sep 2015 09:12:39 -0700 (PDT) Mime-Version: 1.0 (Apple Message framework v1084) From: Programmingkid In-Reply-To: <20150903144309.GB19447@localhost.localdomain> Date: Thu, 3 Sep 2015 12:12:38 -0400 Message-Id: <58EAC71D-E839-40E7-97B7-28C7400536D1@gmail.com> References: <29C62C49-06A5-4F99-8062-7269A28C29A3@gmail.com> <8737z7o85i.fsf@blackfin.pond.sub.org> <441C227A-2CF0-43AE-AC7F-B066708CEABD@gmail.com> <87fv36j9j6.fsf@blackfin.pond.sub.org> <117F603F-1907-4D9A-B5F9-4164A76FBBAF@gmail.com> <20150903144309.GB19447@localhost.localdomain> To: Jeff Cody X-Mailer: Apple Mail (2.1084) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c04::234 Cc: Kevin Wolf , Peter Maydell , Markus Armbruster , qemu-devel qemu-devel , Paolo Bonzini , =?iso-8859-1?Q?Andreas_F=E4rber?= Subject: [Qemu-devel] [PATCH v3] qdev-monitor.c: Add device id generation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Give an automatically generated ID to a device that wasn't given one by the user. Signed-off-by: John Arbuckle --- Replaced my original ID generation code with Jeff Cody's id_generate() function. qdev-monitor.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/qdev-monitor.c b/qdev-monitor.c index f9e2d62..a9c54bd 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -574,18 +574,12 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **errp) id = qemu_opts_id(opts); if (id) { dev->id = id; + } else { + dev->id = id_generate(ID_QDEV); } - if (dev->id) { - object_property_add_child(qdev_get_peripheral(), dev->id, - OBJECT(dev), NULL); - } else { - static int anon_count; - gchar *name = g_strdup_printf("device[%d]", anon_count++); - object_property_add_child(qdev_get_peripheral_anon(), name, + object_property_add_child(qdev_get_peripheral(), dev->id, OBJECT(dev), NULL); - g_free(name); - } /* set properties */ if (qemu_opt_foreach(opts, set_property, dev, &err)) {