From nobody Tue May 7 13:31:20 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487155777947247.00499000223522; Wed, 15 Feb 2017 02:49:37 -0800 (PST) Received: from localhost ([::1]:39615 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdx9U-0007B7-D4 for importer@patchew.org; Wed, 15 Feb 2017 05:49:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57291) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdwbm-0007Dz-Oe for qemu-devel@nongnu.org; Wed, 15 Feb 2017 05:14:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdwbj-0004wm-MA for qemu-devel@nongnu.org; Wed, 15 Feb 2017 05:14:46 -0500 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:36823) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cdwbj-0004vX-FO for qemu-devel@nongnu.org; Wed, 15 Feb 2017 05:14:43 -0500 Received: by mail-wm0-x231.google.com with SMTP id c85so37896068wmi.1 for ; Wed, 15 Feb 2017 02:14:42 -0800 (PST) Received: from vader.pb.local ([62.217.45.26]) by smtp.gmail.com with ESMTPSA id c133sm4723867wmd.13.2017.02.15.02.14.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 15 Feb 2017 02:14:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=profitbricks-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4fASzf+04BxeDmdvzThDG6WMxEoXKkaOrOsvTE/eg8w=; b=PschTiFg0J6DZ/mCkJsi6mr5mETtXo7X9YKEBL2re7Tp1EkUVQA9P7e7jQl74GTNnY wmcDiOnSBhFgXQzwZmWVdc10B22yzZZQPw25XUjKHk3n4+Ml7Nvd3b9HgWT8WpAha5BA JZcLsl1QU4xkUzYC/SxsR2VpOrCE4+OUemWzIU2lsuUZr9e30lP1bJs5HXEebyMw0zPU 7HJ+pr8lz7X96m/b9u1i9DquMKCr1/X2LPpoixWyJMD26/0FwbLufdt4mUuDwWBCYfKU 1VGzZ+awd/o0W2CrmZSPi7vbg+CdZ2R7lBrKDU17xkQJx5o/JV/kxVbCY29IHhcW5gSg 5y6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4fASzf+04BxeDmdvzThDG6WMxEoXKkaOrOsvTE/eg8w=; b=dkNxBAfo4xm9T6fEodfMV3Z0wgJG1W+li4JIh322pdT7QnTaiRo+NsC6PGScXt5xqC PckU3HVLMoAP4c6Neymh8wPbgoGgTuh6SHb0S+6jggSmu32HZQJfLYNZX3L62i+sXS3J x9brI4Y2MUg0HRSQropCPB6Jrvtw56cocK7jMXw7z1ck7E2dkYTlbO/iBbsmbjljS1Vj zJfBTvTSxFl90K+fdUY3OMHqOy0t2vCw6as0Jjr/tTykeqPhkBMeFKVJgW++CheUemV2 HUo3LJ1Bszu9j7fQlWfvK6iyWdrf8RoZpcs4Mmjvw6secgyHoR5vWSHPIJdRDJ1/EfZ9 9trg== X-Gm-Message-State: AMke39k1vuKWByz1iSQXelvGJDNaL8WaF2lQ+E/Mjbq8r3mXQ1gatm+t0zgJq10wERoeDgZk X-Received: by 10.28.217.136 with SMTP id q130mr7502525wmg.13.1487153681025; Wed, 15 Feb 2017 02:14:41 -0800 (PST) From: Eduardo Otubo To: qemu-devel@nongnu.org Date: Wed, 15 Feb 2017 11:14:26 +0100 Message-Id: <20170215101427.23736-2-eduardo.otubo@profitbricks.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170215101427.23736-1-eduardo.otubo@profitbricks.com> References: <20170215101427.23736-1-eduardo.otubo@profitbricks.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::231 Subject: [Qemu-devel] [PATCH 1/2] qmp/hmp: add writeconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dgilbert@redhat.com, Eduardo Otubo , armbru@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This patch adds support for the command `writeconfig' on the QMP and HMP consoles. This is a simple way to keep track of current state of VM after series of hotplugs and/or hotunplugs of different devices: (qemu) writeconfig qemu.conf Signed-off-by: Eduardo Otubo --- hmp-commands.hx | 14 ++++++++++++++ hmp.c | 9 +++++++++ hmp.h | 1 + qapi-schema.json | 20 ++++++++++++++++++++ ui/console.c | 14 ++++++++++++++ 5 files changed, 58 insertions(+) diff --git a/hmp-commands.hx b/hmp-commands.hx index 88192817b2..ac562192bb 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -252,6 +252,20 @@ Password: ******** ETEXI =20 { + .name =3D "writeconfig", + .args_type =3D "filename:F", + .params =3D "filename", + .help =3D "write config file", + .cmd =3D hmp_writeconfig, + }, + +STEXI +@item writeconfig @var{filename} +@findex writeconfig +Write config file @var{filename}. +ETEXI + + { .name =3D "screendump", .args_type =3D "filename:F", .params =3D "filename", diff --git a/hmp.c b/hmp.c index 2bc4f062bb..4f2b8a10d2 100644 --- a/hmp.c +++ b/hmp.c @@ -1913,6 +1913,15 @@ err_out: goto out; } =20 +void hmp_writeconfig(Monitor *mon, const QDict *qdict) +{ + const char *filename =3D qdict_get_str(qdict, "filename"); + Error *err =3D NULL; + + qmp_writeconfig(filename, &err); + hmp_handle_error(mon, &err); +} + void hmp_screendump(Monitor *mon, const QDict *qdict) { const char *filename =3D qdict_get_str(qdict, "filename"); diff --git a/hmp.h b/hmp.h index 05daf7cd5c..63d44fe50f 100644 --- a/hmp.h +++ b/hmp.h @@ -94,6 +94,7 @@ void hmp_getfd(Monitor *mon, const QDict *qdict); void hmp_closefd(Monitor *mon, const QDict *qdict); void hmp_sendkey(Monitor *mon, const QDict *qdict); void hmp_screendump(Monitor *mon, const QDict *qdict); +void hmp_writeconfig(Monitor *mon, const QDict *qdict); void hmp_nbd_server_start(Monitor *mon, const QDict *qdict); void hmp_nbd_server_add(Monitor *mon, const QDict *qdict); void hmp_nbd_server_stop(Monitor *mon, const QDict *qdict); diff --git a/qapi-schema.json b/qapi-schema.json index 5edb08d621..c19b1ff3df 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -4696,6 +4696,26 @@ 'data': { 'keys': ['KeyValue'], '*hold-time': 'int' } } =20 ## +# @writeconfig: +# +# Write config to file. +# +# @filename: the path of a new file to store the current config +# +# Returns: Nothing on success +# +# Since: 2.7.0 +# +# Example: +# +# -> { "execute": "writeconfig", +# "arguments": { "filename": "/tmp/qemu.conf" } } +# <- { "return": {} } +# +## +{ 'command': 'writeconfig', 'data': {'filename': 'str'} } + +## # @screendump: # # Write a PPM of the VGA screen to a file. diff --git a/ui/console.c b/ui/console.c index 49d0740b40..d2e3d753a8 100644 --- a/ui/console.c +++ b/ui/console.c @@ -30,6 +30,7 @@ #include "sysemu/char.h" #include "trace.h" #include "exec/memory.h" +#include "qemu/config-file.h" =20 #define DEFAULT_BACKSCROLL 512 #define CONSOLE_CURSOR_PERIOD 500 @@ -342,6 +343,19 @@ write_err: goto out; } =20 +void qmp_writeconfig(const char *filename, Error **errp) +{ + if (filename =3D=3D NULL) { + error_setg(errp, "You must specify a filename."); + return; + } + + FILE *fp; + fp =3D fopen(filename, "w"); + qemu_config_write(fp); + fclose(fp); +} + void qmp_screendump(const char *filename, Error **errp) { QemuConsole *con =3D qemu_console_lookup_by_index(0); --=20 2.11.0 From nobody Tue May 7 13:31:20 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487157098274298.26828977427294; Wed, 15 Feb 2017 03:11:38 -0800 (PST) Received: from localhost ([::1]:39785 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdxUl-0003ST-LZ for importer@patchew.org; Wed, 15 Feb 2017 06:11:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57290) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdwbm-0007Dy-Of for qemu-devel@nongnu.org; Wed, 15 Feb 2017 05:14:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdwbj-0004wL-3y for qemu-devel@nongnu.org; Wed, 15 Feb 2017 05:14:46 -0500 Received: from mail-wr0-x22c.google.com ([2a00:1450:400c:c0c::22c]:34082) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cdwbi-0004vm-UJ for qemu-devel@nongnu.org; Wed, 15 Feb 2017 05:14:43 -0500 Received: by mail-wr0-x22c.google.com with SMTP id o16so187753675wra.1 for ; Wed, 15 Feb 2017 02:14:42 -0800 (PST) Received: from vader.pb.local ([62.217.45.26]) by smtp.gmail.com with ESMTPSA id c133sm4723867wmd.13.2017.02.15.02.14.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 15 Feb 2017 02:14:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=profitbricks-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mSrL8wjga7gYxMrG4lMgzNFYZsAop4OFCY7RMo/S/BY=; b=fte9jj4HJlyCiW67M8T9ZdJT5S2j7HUGTIgpuHshFg2mYGTRkOZJAz0N6ziNBvN5LB 6QpVEBA9cK6GzvdnGgtsjeBDZL4blE46G/9wwkKGfZBWxB6utKX0I5dEqva094IjrPZz oq4bJXcP3SFAcOXbq9Kedw/Eh1Mipftuu2qR4Ki7Qu/GmpKHTP7BAgrbPcbzt7cEqgYT MeJxmp9lofA8Om/drjEjWNyqcy/r2RNTuL0L3pUCdSbKiMDK0V69zAL0f8/p6ug9CyLe K+aF/omeHKtJdAD/0rfBCOk6wlrxO1hbP7sDhJeoH/b4OMXxkQHp7Sc1OSJ0FKRvszBU iByw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mSrL8wjga7gYxMrG4lMgzNFYZsAop4OFCY7RMo/S/BY=; b=fj7a6clVH9CW1IePzmnAk2dGNMyRUS8hMjt7e6kT+tjk6f9L65lPWlRwcJtge4guZz 5RoY7cGtEzFt5jSJLZ4nlC355YIjBPZkOFXYq5TPRFjrGbAs+2Rw0N6z9nyKUEWNxkaM SMwLMZzCIhJQGLmuyNj1VjK9qjDQ7ja5ngX263wgljH66NECHX9VqvvNpMonioJ31+BX gaXVrkRoaL32vPRHeIx8YxnlpeDntHi2Wsr4Ixwip4SwiXme1XHp/f5vADWs80+tXVwq VwF/wd+i0ycpiQ4GXLCQFV716pSkcfUWozhOmNyDSMTMH2eLWmZH2S+NN6Fw1sx6NsPv 7iIA== X-Gm-Message-State: AMke39l9QM/fobFP5Gvt1OSR3xAH1c/4/AyrhdIhrMFP4PTQ8XH79Pg2jhwYSGZu+kRUstKZ X-Received: by 10.223.134.151 with SMTP id 23mr33338587wrx.0.1487153681741; Wed, 15 Feb 2017 02:14:41 -0800 (PST) From: Eduardo Otubo To: qemu-devel@nongnu.org Date: Wed, 15 Feb 2017 11:14:27 +0100 Message-Id: <20170215101427.23736-3-eduardo.otubo@profitbricks.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170215101427.23736-1-eduardo.otubo@profitbricks.com> References: <20170215101427.23736-1-eduardo.otubo@profitbricks.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c0c::22c Subject: [Qemu-devel] [PATCH 2/2] object_add not registering option X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dgilbert@redhat.com, Eduardo Otubo , armbru@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" object_add (hmp command) wasn't registering its object in the internal list of options, hence, not showing when using `writeconfig' command. Steps to reproduce: (qemu) object_add memory-backend-ram,id=3Dmem1,size=3D1G (qemu) device_add pc-dimm,id=3Ddimm1,memdev=3Dmem1 (qemu) writeconfig qemu.conf When done before this patch, `writeconfig' would not output the mem1 object to the config file. After this patch the output is as follows: [object "mem1"] qom-type =3D "memory-backend-ram" size =3D "1G" Signed-off-by: Eduardo Otubo --- hmp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hmp.c b/hmp.c index 4f2b8a10d2..36ae478482 100644 --- a/hmp.c +++ b/hmp.c @@ -1818,7 +1818,6 @@ void hmp_object_add(Monitor *mon, const QDict *qdict) } =20 obj =3D user_creatable_add_opts(opts, &err); - qemu_opts_del(opts); =20 if (err) { hmp_handle_error(mon, &err); --=20 2.11.0