From: George Dunlap <george.dunlap@citrix.com>
To: xen-devel@lists.xen.org
Cc: Ian Jackson <ian.jackson@citrix.com>,
Wei Liu <wei.liu2@citrix.com>,
George Dunlap <george.dunlap@citrix.com>,
Roger Pau Monne <roger.pau@citrix.com>
Subject: [PATCH 2/8] libxl: Remove redundant setting of phyical-device
Date: Wed, 16 Mar 2016 16:09:11 +0000 [thread overview]
Message-ID: <1458144557-29070-3-git-send-email-george.dunlap@citrix.com> (raw)
In-Reply-To: <1458144557-29070-1-git-send-email-george.dunlap@citrix.com>
Regardless of whether we're running a custom hotplug script or using
normal phy: or file:, the "block" script will be run, which will set
all the necessary xenstore nodes.
In fact, writing this value here prevents the block script from
accomplishing its only purpose: to detect duplicate physical block
devices used in different virtual devices. The first thing the block
script does is check to see if this node is written; and if it is, it
silently exits.
Remove this, and let the block script perform its duplicate checking
function.
Signed-off-by: George Dunlap <george.dunlap@citrix.com>
---
NOTE: It's likely that the duplicate checking for physical devices has
never been run under libxl (at least since this bug was introduced);
this may shake out some issues.
CC: Ian Jackson <ian.jackson@citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>
CC: Roger Pau Monne <roger.pau@citrix.com>
---
tools/libxl/libxl.c | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 4cdc169..7ce3ebb 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -2441,21 +2441,6 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid,
libxl__xen_script_dir_path());
flexarray_append_pair(back, "script", script);
- /* If the user did not supply a block script then we
- * write the physical-device node ourselves.
- *
- * If the user did supply a script then that script is
- * responsible for this since the block device may not
- * exist yet.
- */
- if (!disk->script &&
- disk->backend_domid == LIBXL_TOOLSTACK_DOMID) {
- int major, minor;
- if (!libxl__device_physdisk_major_minor(dev, &major, &minor))
- flexarray_append_pair(back, "physical-device",
- GCSPRINTF("%x:%x", major, minor));
- }
-
assert(device->backend_kind == LIBXL__DEVICE_KIND_VBD);
break;
--
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-03-16 16:09 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-16 16:09 [PATCH 0/8] tools: Allow HVM domains emulated access to disks provided by hotplug scripts George Dunlap
2016-03-16 16:09 ` [PATCH 1/8] tools/hotplug: Add a "dummy" hotplug script for testing George Dunlap
2016-03-16 16:54 ` Ian Jackson
2016-03-16 16:09 ` George Dunlap [this message]
2016-03-16 16:54 ` [PATCH 2/8] libxl: Remove redundant setting of phyical-device Ian Jackson
2016-03-16 16:09 ` [PATCH 3/8] tools/hotplug: Write physical-device-path in addition to physical-device George Dunlap
2016-03-16 16:56 ` Ian Jackson
2016-03-16 16:57 ` George Dunlap
2016-03-16 16:09 ` [PATCH 4/8] libxl: Move check for local access to a funciton George Dunlap
2016-03-16 16:58 ` Ian Jackson
2016-03-16 17:02 ` George Dunlap
2016-03-17 18:11 ` Ian Jackson
2016-03-21 15:35 ` George Dunlap
2016-03-16 16:09 ` [PATCH 5/8] libxl: Share logic for finding path between qemuu and pygrub George Dunlap
2016-03-17 18:22 ` Ian Jackson
2016-03-18 17:09 ` George Dunlap
2016-04-01 14:17 ` Ian Jackson
2016-03-16 16:09 ` [PATCH 6/8] libxl: Allow local access for block devices with hotplug scripts George Dunlap
2016-03-17 18:36 ` Ian Jackson
2016-03-18 17:17 ` George Dunlap
2016-03-16 16:09 ` [PATCH 7/8] docs: Document block-script protocol George Dunlap
2016-03-16 22:57 ` Jim Fehlig
2016-03-17 9:55 ` George Dunlap
2016-03-17 18:38 ` Ian Jackson
2016-03-16 16:09 ` [PATCH 8/8] DO NOT APPLY libxl: Change hotplug script interface to use physical-device-path George Dunlap
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=1458144557-29070-3-git-send-email-george.dunlap@citrix.com \
--to=george.dunlap@citrix.com \
--cc=ian.jackson@citrix.com \
--cc=roger.pau@citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.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).