From nobody Mon Apr 29 14:16: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.zohomail.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 1501249925610200.84293475621462; Fri, 28 Jul 2017 06:52:05 -0700 (PDT) Received: from localhost ([::1]:48492 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1db5gQ-0000mG-0A for importer@patchew.org; Fri, 28 Jul 2017 09:52:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1db5fc-0000UN-PE for qemu-devel@nongnu.org; Fri, 28 Jul 2017 09:51:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1db5fY-00070M-5K for qemu-devel@nongnu.org; Fri, 28 Jul 2017 09:51:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48568) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1db5fX-0006xK-VA for qemu-devel@nongnu.org; Fri, 28 Jul 2017 09:51:08 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A74226D6EF; Fri, 28 Jul 2017 13:45:54 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-254.ams2.redhat.com [10.36.116.254]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6E5285C549; Fri, 28 Jul 2017 13:45:54 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9F29D113864E; Fri, 28 Jul 2017 15:45:52 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A74226D6EF Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=armbru@redhat.com From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 28 Jul 2017 15:45:50 +0200 Message-Id: <1501249552-788-2-git-send-email-armbru@redhat.com> In-Reply-To: <1501249552-788-1-git-send-email-armbru@redhat.com> References: <1501249552-788-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Fri, 28 Jul 2017 13:45:54 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/3] replay: Define ReplayMode without QAPI 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: Pavel Dovgalyuk 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" ReplayMode is defined in the QAPI schema, but not used there. Of the stuff QAPI generates for it only the typedef is actually used. Use of QAPI is pointless and only complicates things, so don't. Cc: Pavel Dovgalyuk Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- include/sysemu/replay.h | 6 ++++++ qapi-schema.json | 18 ------------------ 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h index fa14d0e..621bc61 100644 --- a/include/sysemu/replay.h +++ b/include/sysemu/replay.h @@ -42,6 +42,12 @@ typedef enum ReplayCheckpoint ReplayCheckpoint; =20 typedef struct ReplayNetState ReplayNetState; =20 +typedef enum { + REPLAY_MODE_NONE, /* replay / record disabled */ + REPLAY_MODE_RECORD, /* recording to replay log */ + REPLAY_MODE_PLAY, /* replaying log */ +} ReplayMode; + extern ReplayMode replay_mode; =20 /* Name of the initial VM snapshot */ diff --git a/qapi-schema.json b/qapi-schema.json index 9c6c3e1..9b6f6cb 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -6258,24 +6258,6 @@ { 'include': 'qapi/rocker.json' } =20 ## -# @ReplayMode: -# -# Mode of the replay subsystem. -# -# @none: normal execution mode. Replay or record are not enabled. -# -# @record: record mode. All non-deterministic data is written into the -# replay log. -# -# @play: replay mode. Non-deterministic data required for system execution -# is read from the log. -# -# Since: 2.5 -## -{ 'enum': 'ReplayMode', - 'data': [ 'none', 'record', 'play' ] } - -## # @xen-load-devices-state: # # Load the state of all devices from file. The RAM and the block devices --=20 2.7.5 From nobody Mon Apr 29 14:16: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.zohomail.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 1501250108349309.9977393373275; Fri, 28 Jul 2017 06:55:08 -0700 (PDT) Received: from localhost ([::1]:48504 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1db5jO-0003B7-Gm for importer@patchew.org; Fri, 28 Jul 2017 09:55:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1db5iH-0002OM-Su for qemu-devel@nongnu.org; Fri, 28 Jul 2017 09:53:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1db5iD-0000u0-4w for qemu-devel@nongnu.org; Fri, 28 Jul 2017 09:53:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57306) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1db5iC-0000t4-UC for qemu-devel@nongnu.org; Fri, 28 Jul 2017 09:53:53 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 76954C047B79; Fri, 28 Jul 2017 13:45:54 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-254.ams2.redhat.com [10.36.116.254]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4013A6F442; Fri, 28 Jul 2017 13:45:54 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A19AD113864F; Fri, 28 Jul 2017 15:45:52 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 76954C047B79 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=armbru@redhat.com From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 28 Jul 2017 15:45:51 +0200 Message-Id: <1501249552-788-3-git-send-email-armbru@redhat.com> In-Reply-To: <1501249552-788-1-git-send-email-armbru@redhat.com> References: <1501249552-788-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 28 Jul 2017 13:45:54 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/3] COLO: Define COLOMode without QAPI 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: zhanghailiang 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" COLOMode is defined in the QAPI schema, but not used there. Of the stuff QAPI generates for it only the typedef is actually used. Use of QAPI is pointless and only complicates things, so don't. Cc: zhanghailiang Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- include/migration/colo.h | 6 ++++++ qapi-schema.json | 16 ---------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/include/migration/colo.h b/include/migration/colo.h index ff9874e..5d7c500 100644 --- a/include/migration/colo.h +++ b/include/migration/colo.h @@ -26,6 +26,12 @@ void migration_incoming_exit_colo(void); void *colo_process_incoming_thread(void *opaque); bool migration_incoming_in_colo_state(void); =20 +typedef enum { + COLO_MODE_UNKNOWN, + COLO_MODE_PRIMARY, + COLO_MODE_SECONDARY, +} COLOMode; + COLOMode get_colo_mode(void); =20 /* failover */ diff --git a/qapi-schema.json b/qapi-schema.json index 9b6f6cb..3f0eb05 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -1304,22 +1304,6 @@ 'vmstate-loaded' ] } =20 ## -# @COLOMode: -# -# The colo mode -# -# @unknown: unknown mode -# -# @primary: master side -# -# @secondary: slave side -# -# Since: 2.8 -## -{ 'enum': 'COLOMode', - 'data': [ 'unknown', 'primary', 'secondary'] } - -## # @FailoverStatus: # # An enumeration of COLO failover status --=20 2.7.5 From nobody Mon Apr 29 14:16: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.zohomail.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 1501249996855228.12060760511054; Fri, 28 Jul 2017 06:53:16 -0700 (PDT) Received: from localhost ([::1]:48496 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1db5ha-0001Zl-HR for importer@patchew.org; Fri, 28 Jul 2017 09:53:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41338) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1db5gJ-0000qI-Rq for qemu-devel@nongnu.org; Fri, 28 Jul 2017 09:51:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1db5gF-0007fW-5l for qemu-devel@nongnu.org; Fri, 28 Jul 2017 09:51:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52920) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1db5gF-0007eb-04 for qemu-devel@nongnu.org; Fri, 28 Jul 2017 09:51:51 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E0E2A3E2A4 for ; Fri, 28 Jul 2017 13:45:54 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-254.ams2.redhat.com [10.36.116.254]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 42D026F444; Fri, 28 Jul 2017 13:45:54 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A47E41138656; Fri, 28 Jul 2017 15:45:52 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com E0E2A3E2A4 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=armbru@redhat.com From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 28 Jul 2017 15:45:52 +0200 Message-Id: <1501249552-788-4-git-send-email-armbru@redhat.com> In-Reply-To: <1501249552-788-1-git-send-email-armbru@redhat.com> References: <1501249552-788-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 28 Jul 2017 13:45:55 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 3/3] block: Remove unused BlockDeviceMapEntry 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: Paolo Bonzini 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" BlockDeviceMapEntry has never been used. It was added in commit facd6e2 "so that it is published through the introspection mechanism." What exactly introspecting types that aren't used for anything could accomplish isn't clear. What "introspection mechanism" to use is also nebulous. To the best of my knowledge, there has never been one that covered this type. Certainly not query-qmp-schema, which includes only types that are actually used in QMP. Not being able to introspect BlockDeviceMapEntry hasn't bothered anyone enough to complain in almost four years. Get rid of it. Cc: Paolo Bonzini Cc: Eric Blake Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- qapi/block-core.json | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/qapi/block-core.json b/qapi/block-core.json index 833c602..27790f3 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -383,35 +383,6 @@ { 'enum': 'BlockDeviceIoStatus', 'data': [ 'ok', 'failed', 'nospace' ] } =20 ## -# @BlockDeviceMapEntry: -# -# Entry in the metadata map of the device (returned by "qemu-img map") -# -# @start: Offset in the image of the first byte described by this entry -# (in bytes) -# -# @length: Length of the range described by this entry (in bytes) -# -# @depth: Number of layers (0 =3D top image, 1 =3D top image's backing fil= e, etc.) -# before reaching one for which the range is allocated. The value= is -# in the range 0 to the depth of the image chain - 1. -# -# @zero: the sectors in this range read as zeros -# -# @data: reading the image will actually read data from a file (in particu= lar, -# if @offset is present this means that the sectors are not simply -# preallocated, but contain actual data in raw format) -# -# @offset: if present, the image file stores the data for this range in -# raw format at the given offset. -# -# Since: 1.7 -## -{ 'struct': 'BlockDeviceMapEntry', - 'data': { 'start': 'int', 'length': 'int', 'depth': 'int', 'zero': 'bool= ', - 'data': 'bool', '*offset': 'int' } } - -## # @DirtyBitmapStatus: # # An enumeration of possible states that a dirty bitmap can report to the = user. --=20 2.7.5