[Xen-changelog] [xen master] libxl: remove qemu default devices for upstream qemu

[patchbot@xxxxxxx]

commit 6ef823fdfa701b3659e4161520f43b5835338fb5
Author:     Fabio Fantoni <fabio.fantoni@xxxxxxx>
AuthorDate: Mon Sep 30 13:53:08 2013 +0200
Commit:     Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
CommitDate: Mon Oct 14 17:46:18 2013 +0100

    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@xxxxxxx>
    Acked-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
    Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 tools/libxl/libxl_dm.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c
index 43c3bec..ef29d0b 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);
         }
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog