From: Roger Pau Monne <roger.pau@citrix.com>
To: xen-devel@lists.xenproject.org
Cc: Wei Liu <wei.liu2@citrix.com>,
Alex Braunegg <alex.braunegg@gmail.com>,
Ian Jackson <ian.jackson@eu.citrix.com>,
Ian Campbell <ian.campbell@citrix.com>,
Roger Pau Monne <roger.pau@citrix.com>
Subject: [PATCH v4 4/4] libxl: fix cd-eject
Date: Tue, 16 Feb 2016 18:37:49 +0100 [thread overview]
Message-ID: <1455644269-40358-5-git-send-email-roger.pau@citrix.com> (raw)
In-Reply-To: <1455644269-40358-1-git-send-email-roger.pau@citrix.com>
Current libxl__device_disk_set_backend implementation tried to guess the
backend of devices with format LIBXL_DISK_FORMAT_EMPTY, which is of course
doomed to fail since the disk is empty. Instead just return early from the
function if an empty disk is detected.
This fixes cd ejection.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reported-by: Alex Braunegg <alex.braunegg@gmail.com>
---
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
Cc: Alex Braunegg <alex.braunegg@gmail.com>
---
tools/libxl/libxl_device.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c
index 8bb5e93..b93cbbf 100644
--- a/tools/libxl/libxl_device.c
+++ b/tools/libxl/libxl_device.c
@@ -273,7 +273,8 @@ int libxl__device_disk_set_backend(libxl__gc *gc, libxl_device_disk *disk) {
LOG(ERROR, "Disk vdev=%s is empty but not cdrom", disk->vdev);
return ERROR_INVAL;
}
- memset(&a.stab, 0, sizeof(a.stab));
+ /* Disk is empty, so it's useless to try to guess the backend type. */
+ return 0;
} else if ((disk->backend == LIBXL_DISK_BACKEND_UNKNOWN ||
disk->backend == LIBXL_DISK_BACKEND_PHY) &&
disk->backend_domid == LIBXL_TOOLSTACK_DOMID &&
--
2.5.4 (Apple Git-61)
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-02-16 17:38 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-16 17:37 [PATCH v4 0/4] Assorted fixes and improvements Roger Pau Monne
2016-02-16 17:37 ` [PATCH v4 1/4] x86/HVM: update the start info structure layout Roger Pau Monne
2016-02-16 19:13 ` Andrew Cooper
2016-02-16 20:06 ` Konrad Rzeszutek Wilk
2016-02-17 10:01 ` Roger Pau Monné
2016-02-16 21:26 ` Boris Ostrovsky
2016-02-17 9:58 ` Jan Beulich
2016-02-17 10:05 ` Roger Pau Monné
2016-02-17 14:39 ` Boris Ostrovsky
2016-02-17 14:54 ` Jan Beulich
2016-02-17 10:45 ` Samuel Thibault
2016-02-17 13:00 ` Jan Beulich
2016-02-16 17:37 ` [PATCH v4 2/4] libxl: introduce LIBXL_VGA_INTERFACE_TYPE_UNKNOWN Roger Pau Monne
2016-02-24 12:08 ` Wei Liu
2016-03-01 16:06 ` Ian Jackson
2016-02-16 17:37 ` [PATCH v4 3/4] libelf: rewrite symtab/strtab loading Roger Pau Monne
2016-02-26 13:15 ` Jan Beulich
2016-02-26 17:02 ` Roger Pau Monné
2016-02-29 9:31 ` Jan Beulich
2016-02-29 10:57 ` Roger Pau Monné
2016-02-29 12:14 ` Jan Beulich
2016-02-29 16:20 ` Roger Pau Monné
2016-02-29 16:41 ` Jan Beulich
2016-02-16 17:37 ` Roger Pau Monne [this message]
2016-02-16 17:58 ` [PATCH v4 4/4] libxl: fix cd-eject Ian Jackson
2016-02-17 11:20 ` Roger Pau Monné
2016-02-17 11:42 ` Ian Campbell
2016-02-17 12:15 ` Ian Jackson
2016-02-17 17:20 ` [PATCH v6] libxl: allow 'phy' backend to use empty files Roger Pau Monne
2016-02-18 10:27 ` Alex Braunegg
2016-02-19 17:30 ` Ian Jackson
2016-02-19 17:41 ` Roger Pau Monné
2016-02-19 18:01 ` [PATCH v7] " Roger Pau Monne
2016-03-01 9:51 ` Roger Pau Monné
2016-03-03 15:41 ` Ian Jackson
2016-03-31 16:20 ` Roger Pau Monné
2016-04-01 14:06 ` Ian Jackson
2016-04-05 16:48 ` [PATCH v6] " George Dunlap
2016-04-05 21:45 ` Alex Braunegg
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=1455644269-40358-5-git-send-email-roger.pau@citrix.com \
--to=roger.pau@citrix.com \
--cc=alex.braunegg@gmail.com \
--cc=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=wei.liu2@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).