aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Fantoni <fabio.fantoni@m2r.biz>2013-09-30 13:53:08 +0200
committerIan Jackson <Ian.Jackson@eu.citrix.com>2013-10-14 17:46:18 +0100
commit6ef823fdfa701b3659e4161520f43b5835338fb5 (patch)
tree0eee63ade50ae78d84dcd08e39b2b4fa01cf7fba
parentb2e55da3cd6f5911b833edb9e1fd9a22110c2a74 (diff)
downloadxen-6ef823fdfa701b3659e4161520f43b5835338fb5.tar.gz
xen-6ef823fdfa701b3659e4161520f43b5835338fb5.tar.bz2
xen-6ef823fdfa701b3659e4161520f43b5835338fb5.zip
libxl: remove qemu default devices for upstream qemu
Remove default devices created by qemu. Qemu will create only devices defined by xen, since the devices not defined by xen are not usable. Remove deleting of empty floppy no more needed with nodefault. (Removed a whitespace error. -iwj) Signed-off-by: Fabio Fantoni <fabio.fantoni@m2r.biz> Acked-by: Anthony PERARD <anthony.perard@citrix.com> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
-rw-r--r--tools/libxl/libxl_dm.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index 43c3becc7a..ef29d0b025 100644
--- a/tools/libxl/libxl_dm.c
+++ b/tools/libxl/libxl_dm.c
@@ -392,6 +392,13 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc,
flexarray_append(dm_args, "-mon");
flexarray_append(dm_args, "chardev=libxl-cmd,mode=control");
+ /*
+ * Remove default devices created by qemu. Qemu will create only devices
+ * defined by xen, since the devices not defined by xen are not usable.
+ * Remove deleting of empty floppy no more needed with nodefault.
+ */
+ flexarray_append(dm_args, "-nodefaults");
+
if (b_info->type == LIBXL_DOMAIN_TYPE_PV) {
flexarray_append(dm_args, "-xen-attach");
}
@@ -457,9 +464,6 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc,
if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) {
int ioemu_nics = 0;
- /* Disable useless empty floppy drive */
- flexarray_vappend(dm_args, "-global", "isa-fdc.driveA=", NULL);
-
if (b_info->u.hvm.serial) {
flexarray_vappend(dm_args, "-serial", b_info->u.hvm.serial, NULL);
}