xen-hvm-device-model.patch

   1 diff -ur ganeti-2.9.3/lib/constants.py ganeti-2.9.3-devmodel/lib/constants.py
   2 --- ganeti-2.9.3/lib/constants.py       2014-01-27 10:20:35.000000000 +0100
   3 +++ ganeti-2.9.3-devmodel/lib/constants.py      2014-02-12 19:55:47.569588274 +0100
   4 @@ -913,6 +913,8 @@
   5  HV_USB_MOUSE = "usb_mouse"
   6  HV_KEYMAP = "keymap"
   7  HV_DEVICE_MODEL = "device_model"
   8 +HV_DEVICE_MODEL_VERSION = "device_model_version"
   9 +HV_DEVICE_MODEL_OVERRIDE = "device_model_override"
  10  HV_INIT_SCRIPT = "init_script"
  11  HV_MIGRATION_PORT = "migration_port"
  12  HV_MIGRATION_BANDWIDTH = "migration_bandwidth"
  13 @@ -988,6 +990,8 @@
  14    HV_USB_MOUSE: VTYPE_STRING,
  15    HV_KEYMAP: VTYPE_STRING,
  16    HV_DEVICE_MODEL: VTYPE_STRING,
  17 +  HV_DEVICE_MODEL_VERSION: VTYPE_STRING,
  18 +  HV_DEVICE_MODEL_OVERRIDE: VTYPE_STRING,
  19    HV_INIT_SCRIPT: VTYPE_STRING,
  20    HV_MIGRATION_PORT: VTYPE_INT,
  21    HV_MIGRATION_BANDWIDTH: VTYPE_INT,
  22 @@ -2086,6 +2090,8 @@
  23      HV_PAE: True,
  24      HV_KERNEL_PATH: "/usr/lib/xen/boot/hvmloader",
  25      HV_DEVICE_MODEL: "/usr/lib/xen/bin/qemu-dm",
  26 +    HV_DEVICE_MODEL_VERSION: "",
  27 +    HV_DEVICE_MODEL_OVERRIDE: "",
  28      HV_MIGRATION_PORT: 8002,
  29      HV_MIGRATION_MODE: HT_MIGRATION_NONLIVE,
  30      HV_USE_LOCALTIME: False,
  31 diff -ur ganeti-2.9.3/lib/hypervisor/hv_xen.py ganeti-2.9.3-devmodel/lib/hypervisor/hv_xen.py
  32 --- ganeti-2.9.3/lib/hypervisor/hv_xen.py       2014-02-12 20:02:01.476840082 +0100
  33 +++ ganeti-2.9.3-devmodel/lib/hypervisor/hv_xen.py      2014-02-12 20:01:05.332918224 +0100
  34 @@ -1130,6 +1130,8 @@
  35         "VNC bind address is not a valid IP address", None, None),
  36      constants.HV_KERNEL_PATH: hv_base.REQ_FILE_CHECK,
  37      constants.HV_DEVICE_MODEL: hv_base.REQ_FILE_CHECK,
  38 +    constants.HV_DEVICE_MODEL_VERSION: hv_base.NO_CHECK,
  39 +    constants.HV_DEVICE_MODEL_OVERRIDE: hv_base.NO_CHECK,
  40      constants.HV_VNC_PASSWORD_FILE: hv_base.REQ_FILE_CHECK,
  41      constants.HV_MIGRATION_PORT: hv_base.REQ_NET_PORT_CHECK,
  42      constants.HV_MIGRATION_MODE: hv_base.MIGRATION_MODE_CHECK,
  43 @@ -1194,6 +1196,10 @@
  44
  45      config.write("apic = 1\n")
  46      config.write("device_model = '%s'\n" % hvp[constants.HV_DEVICE_MODEL])
  47 +    if hvp[constants.HV_DEVICE_MODEL_VERSION]:
  48 +      config.write("device_model_version = '%s'\n" % hvp[constants.HV_DEVICE_MODEL_VERSION])
  49 +    if hvp[constants.HV_DEVICE_MODEL_OVERRIDE]:
  50 +      config.write("device_model_override = '%s'\n" % hvp[constants.HV_DEVICE_MODEL_OVERRIDE])
  51      config.write("boot = '%s'\n" % hvp[constants.HV_BOOT_ORDER])
  52      config.write("sdl = 0\n")
  53      config.write("usb = 1\n")