From patchwork Tue Nov 22 06:10:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juergen Gross X-Patchwork-Id: 9440527 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 403AE605EE for ; Tue, 22 Nov 2016 06:13:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3972C28452 for ; Tue, 22 Nov 2016 06:13:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2E52E28469; Tue, 22 Nov 2016 06:13:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D8FB528452 for ; Tue, 22 Nov 2016 06:13:24 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c94IM-0007c5-Lp; Tue, 22 Nov 2016 06:11:06 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c94IL-0007bM-0h for xen-devel@lists.xensource.com; Tue, 22 Nov 2016 06:11:05 +0000 Received: from [193.109.254.147] by server-7.bemta-6.messagelabs.com id 0D/1F-29519-871E3385; Tue, 22 Nov 2016 06:11:04 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrKLMWRWlGSWpSXmKPExsVyuP0Ov275Q+M Ig/NXjC3uTXnP7sDosb1vF3sAYxRrZl5SfkUCa0bX4ZlsBe+FK66t/sbawNjN38XIySEhYCTx duI/pi5GLg4hgYWMEtd6/zOCJNgEVCU2XD/FCmKLCFhKzFrfBmYzCzQwSjT8SASxhQUsJO5uf QbUzMHBAlTfe0APJMwrYCKx49ktRoj58hLXvv9jA7E5BUwl1j09yARiCwHVTHk/gXkCI/cCRo ZVjBrFqUVlqUW6RhZ6SUWZ6RkluYmZObqGBmZ6uanFxYnpqTmJScV6yfm5mxiB3mUAgh2M59c GHmKU5GBSEuU9vNQoQogvKT+lMiOxOCO+qDQntfgQowwHh5IEr9UD4wghwaLU9NSKtMwcYJjB pCU4eJREeJNA0rzFBYm5xZnpEKlTjIpS4rxGIAkBkERGaR5cGyy0LzHKSgnzMgIdIsRTkFqUm 1mCKv+KUZyDUUmY1xxkCk9mXgnc9FdAi5mAFiuxGoAsLklESEk1MKYX/Zr8ZMGPYzOZVyRJX6 i5eDfyFPPrGVx6awoOxZ9vVt8wJczRftf1V+dj5U4FLzVe7shS8Mrv9RrDLQ8U+4zeTjGN6n8 pdDVWWnRJuvZz76o7LY7t5SkXkr5xlV2uOObdpppxMzpXSvyY2p2b88+61a51XSnBv7b6ZCiH VeU0hqoyFcdvK5RYijMSDbWYi4oTAZi60KVoAgAA X-Env-Sender: jgross@suse.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1479795063!20710304!1 X-Originating-IP: [195.135.220.15] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.0.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 53744 invoked from network); 22 Nov 2016 06:11:03 -0000 Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by server-2.tower-27.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 22 Nov 2016 06:11:03 -0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 58A11ABC7; Tue, 22 Nov 2016 06:11:03 +0000 (UTC) From: Juergen Gross To: qemu-devel@nongnu.org, xen-devel@lists.xensource.com Date: Tue, 22 Nov 2016 07:10:57 +0100 Message-Id: <20161122061059.26058-3-jgross@suse.com> X-Mailer: git-send-email 2.10.0 In-Reply-To: <20161122061059.26058-1-jgross@suse.com> References: <20161122061059.26058-1-jgross@suse.com> Cc: anthony.perard@citrix.com, Juergen Gross , sstabellini@kernel.org, kraxel@redhat.com, armbru@redhat.com Subject: [Xen-devel] [PATCH v3 2/4] qdev: add function qdev_set_id() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP In order to have an easy way to add a new qdev with a specific id carve out the needed functionality from qdev_device_add() into a new function qdev_set_id(). Signed-off-by: Juergen Gross Reviewed-by: Stefano Stabellini --- include/monitor/qdev.h | 1 + qdev-monitor.c | 36 ++++++++++++++++++++---------------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/include/monitor/qdev.h b/include/monitor/qdev.h index 8e504bc..0ff3331 100644 --- a/include/monitor/qdev.h +++ b/include/monitor/qdev.h @@ -12,5 +12,6 @@ void qmp_device_add(QDict *qdict, QObject **ret_data, Error **errp); int qdev_device_help(QemuOpts *opts); DeviceState *qdev_device_add(QemuOpts *opts, Error **errp); +void qdev_set_id(DeviceState *dev, const char *id); #endif diff --git a/qdev-monitor.c b/qdev-monitor.c index 4f78ecb..c73410c 100644 --- a/qdev-monitor.c +++ b/qdev-monitor.c @@ -539,10 +539,28 @@ static BusState *qbus_find(const char *path, Error **errp) return bus; } +void qdev_set_id(DeviceState *dev, const char *id) +{ + if (id) { + dev->id = id; + } + + 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(dev), NULL); + g_free(name); + } +} + DeviceState *qdev_device_add(QemuOpts *opts, Error **errp) { DeviceClass *dc; - const char *driver, *path, *id; + const char *driver, *path; DeviceState *dev; BusState *bus = NULL; Error *err = NULL; @@ -591,21 +609,7 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **errp) qdev_set_parent_bus(dev, bus); } - id = qemu_opts_id(opts); - if (id) { - dev->id = id; - } - - 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(dev), NULL); - g_free(name); - } + qdev_set_id(dev, qemu_opts_id(opts)); /* set properties */ if (qemu_opt_foreach(opts, set_property, dev, &err)) {