xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Anthony PERARD <anthony.perard@citrix.com>
To: <xen-devel@lists.xenproject.org>
Cc: Anthony PERARD <anthony.perard@citrix.com>,
	Jason Andryuk <jandryuk@gmail.com>,
	Ian Jackson <iwj@xenproject.org>, Wei Liu <wl@xen.org>
Subject: [XEN PATCH v2 5/8] libxl: Assert qmp_ev's state in qmp_ev_qemu_compare_version
Date: Tue, 11 May 2021 10:28:07 +0100	[thread overview]
Message-ID: <20210511092810.13759-6-anthony.perard@citrix.com> (raw)
In-Reply-To: <20210511092810.13759-1-anthony.perard@citrix.com>

We are supposed to read the version information only when qmp_ev is in
state "Connected" (that correspond to state==qmp_state_connected),
assert it so that the function isn't used too early.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Reviewed-by: Jason Andryuk <jandryuk@gmail.com>
---
 tools/libs/light/libxl_qmp.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/libs/light/libxl_qmp.c b/tools/libs/light/libxl_qmp.c
index 9b638e6f5442..d0967c9f029f 100644
--- a/tools/libs/light/libxl_qmp.c
+++ b/tools/libs/light/libxl_qmp.c
@@ -292,6 +292,8 @@ static int qmp_handle_response(libxl__gc *gc, libxl__qmp_handler *qmp,
 static int qmp_ev_qemu_compare_version(libxl__ev_qmp *ev, int major,
                                        int minor, int micro)
 {
+    assert(ev->state == qmp_state_connected);
+
 #define CHECK_VERSION(level) do { \
     if (ev->qemu_version.level > (level)) return +1; \
     if (ev->qemu_version.level < (level)) return -1; \
-- 
Anthony PERARD



  parent reply	other threads:[~2021-05-11  9:28 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-11  9:28 [XEN PATCH v2 0/8] Fix libxl with QEMU 6.0 + remove some more deprecated usages Anthony PERARD
2021-05-11  9:28 ` [XEN PATCH v2 1/8] libxl: Replace deprecated QMP command by "query-cpus-fast" Anthony PERARD
2021-05-11  9:28 ` [XEN PATCH v2 2/8] libxl: Replace QEMU's command line short-form boolean option Anthony PERARD
2021-05-11  9:28 ` [XEN PATCH v2 3/8] libxl: Replace deprecated "cpu-add" QMP command by "device_add" Anthony PERARD
2021-05-11  9:28 ` [XEN PATCH v2 4/8] libxl: Use -device for cd-rom drives Anthony PERARD
2021-05-11  9:28 ` Anthony PERARD [this message]
2021-05-11  9:28 ` [XEN PATCH v2 6/8] libxl: Export libxl__qmp_ev_qemu_compare_version Anthony PERARD
2021-05-11  9:28 ` [XEN PATCH v2 7/8] libxl: Use `id` with the "eject" QMP command Anthony PERARD
2021-05-11  9:28 ` [XEN PATCH v2 8/8] libxl: Replace QMP command "change" by "blockdev-change-media" Anthony PERARD
2021-06-15 13:02 ` [XEN PATCH v2 0/8] Fix libxl with QEMU 6.0 + remove some more deprecated usages Julien Grall
2021-06-29  7:59 ` Olaf Hering

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210511092810.13759-6-anthony.perard@citrix.com \
    --to=anthony.perard@citrix.com \
    --cc=iwj@xenproject.org \
    --cc=jandryuk@gmail.com \
    --cc=wl@xen.org \
    --cc=xen-devel@lists.xenproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).