From: Wei Liu <wei.liu2@citrix.com>
To: Xen-devel <xen-devel@lists.xenproject.org>
Cc: Anthony PERARD <anthony.perard@citrix.com>,
Ian Jackson <ian.jackson@eu.citrix.com>,
Wei Liu <wei.liu2@citrix.com>
Subject: [PATCH v3 5/5] libxl: only issue cpu-add call to QEMU for not present CPU
Date: Wed, 15 Jun 2016 10:31:42 +0100 [thread overview]
Message-ID: <1465983102-19308-6-git-send-email-wei.liu2@citrix.com> (raw)
In-Reply-To: <1465983102-19308-1-git-send-email-wei.liu2@citrix.com>
Calculate the final bitmap for CPUs to add to avoid having annoying
error messages complaining those CPUs are already present.
We can also properly handle error from QMP now.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Anthony PERARD <anthony.perard@citrix.com>
v3:
1. Add Anthony's Reviewed-by tag.
---
tools/libxl/libxl.c | 39 +++++++++++++++++++++++++++++----------
1 file changed, 29 insertions(+), 10 deletions(-)
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index b748bf1..0e2c15a 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -5753,19 +5753,38 @@ static int libxl__set_vcpuonline_qmp(libxl__gc *gc, uint32_t domid,
libxl_bitmap *cpumap,
const libxl_dominfo *info)
{
- int i;
+ int i, rc;
+ libxl_bitmap current_map, final_map;
+
+ libxl_bitmap_init(¤t_map);
+ libxl_bitmap_init(&final_map);
+
+ libxl_bitmap_alloc(CTX, ¤t_map, info->vcpu_max_id + 1);
+ libxl_bitmap_set_none(¤t_map);
+ rc = libxl__qmp_query_cpus(gc, domid, ¤t_map);
+ if (rc) {
+ LOG(ERROR, "failed to query cpus for domain %d", domid);
+ goto out;
+ }
+
+ libxl_bitmap_copy_alloc(CTX, &final_map, cpumap);
- for (i = 0; i <= info->vcpu_max_id; i++) {
- if (libxl_bitmap_test(cpumap, i)) {
- /* Return value is ignore because it does not tell anything useful
- * on the completion of the command.
- * (For instance, "CPU already plugged-in" give the same return
- * value as "command not supported".)
- */
- libxl__qmp_cpu_add(gc, domid, i);
+ libxl_for_each_set_bit(i, current_map)
+ libxl_bitmap_reset(&final_map, i);
+
+ libxl_for_each_set_bit(i, final_map) {
+ rc = libxl__qmp_cpu_add(gc, domid, i);
+ if (rc) {
+ LOG(ERROR, "failed to add cpu %d to domain %d", i, domid);
+ goto out;
}
}
- return 0;
+
+ rc = 0;
+out:
+ libxl_bitmap_dispose(¤t_map);
+ libxl_bitmap_dispose(&final_map);
+ return rc;
}
int libxl_set_vcpuonline(libxl_ctx *ctx, uint32_t domid, libxl_bitmap *cpumap)
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-06-15 9:31 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-15 9:31 [PATCH v3 0/5] libxl: libxl: update available vcpus map in retrieve configuration function Wei Liu
2016-06-15 9:31 ` [PATCH v3 1/5] libxl: libxl_domain_need_memory shouldn't modify b_info Wei Liu
2016-06-15 13:31 ` Dario Faggioli
2016-06-15 13:38 ` Wei Liu
2016-07-08 17:35 ` Ian Jackson
2016-07-11 11:03 ` Wei Liu
2016-06-15 9:31 ` [PATCH v3 2/5] libxl: factor out libxl__get_device_modlel_version Wei Liu
2016-06-15 13:27 ` Dario Faggioli
2016-06-15 17:04 ` Anthony PERARD
2016-07-08 17:37 ` Ian Jackson
2016-06-15 9:31 ` [PATCH v3 3/5] libxl: introduce libxl__qmp_query_cpus Wei Liu
2016-06-15 13:26 ` Dario Faggioli
2016-06-15 16:48 ` Anthony PERARD
2016-07-08 17:45 ` Ian Jackson
2016-06-15 9:31 ` [PATCH v3 4/5] libxl: update vcpus bitmap in retrieved guest config Wei Liu
2016-06-15 17:20 ` Anthony PERARD
2016-07-08 17:44 ` Ian Jackson
2016-07-11 11:31 ` Wei Liu
2016-07-11 14:59 ` Wei Liu
2016-06-15 9:31 ` Wei Liu [this message]
2016-07-08 17:48 ` [PATCH v3 5/5] libxl: only issue cpu-add call to QEMU for not present CPU Ian Jackson
2016-07-11 11:32 ` Wei Liu
2016-07-02 10:22 ` [PATCH v3 0/5] libxl: libxl: update available vcpus map in retrieve configuration function Wei Liu
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=1465983102-19308-6-git-send-email-wei.liu2@citrix.com \
--to=wei.liu2@citrix.com \
--cc=anthony.perard@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--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).