Patchwork [3/6] Use machine options to emulate -no-kvm-pit

login
register
mail settings
Submitter Marcelo Tosatti
Date Oct. 3, 2012, 10:52 a.m.
Message ID <20121003105509.463811440@amt.cnet>
Download mbox | patch
Permalink /patch/188750/
State New
Headers show

Comments

Marcelo Tosatti - Oct. 3, 2012, 10:52 a.m.
Commit e81dda195556e72f8cd294998296c1051aab30a8 from qemu-kvm.git.

From: Jan Kiszka <jan.kiszka@siemens.com>

Leave the related command line option in place, just
issuing a warning that it has no function anymore.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Anthony Liguori - Oct. 3, 2012, 2:40 p.m.
Marcelo Tosatti <mtosatti@redhat.com> writes:

> Commit e81dda195556e72f8cd294998296c1051aab30a8 from qemu-kvm.git.
>
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> Leave the related command line option in place, just
> issuing a warning that it has no function anymore.
>
> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>

Regards,

Anthony Liguori

>
> Index: qemu-compat-kvm/vl.c
> ===================================================================
> --- qemu-compat-kvm.orig/vl.c
> +++ qemu-compat-kvm/vl.c
> @@ -3066,7 +3066,11 @@ int main(int argc, char **argv, char **e
>                  qemu_opts_parse(olist, "kernel_irqchip=off", 0);
>                  break;
>              }
> -
> +            case QEMU_OPTION_no_kvm_pit: {
> +                fprintf(stderr, "Warning: KVM PIT can no longer be disabled "
> +                        "separately.\n");
> +                break;
> +            }
>              case QEMU_OPTION_usb:
>                  usb_enabled = 1;
>                  break;
> Index: qemu-compat-kvm/qemu-options.hx
> ===================================================================
> --- qemu-compat-kvm.orig/qemu-options.hx
> +++ qemu-compat-kvm/qemu-options.hx
> @@ -2841,6 +2841,10 @@ ETEXI
>  DEF("no-kvm-irqchip", 0, QEMU_OPTION_no_kvm_irqchip,
>      "-no-kvm-irqchip disable KVM kernel mode PIC/IOAPIC/LAPIC\n",
>      QEMU_ARCH_I386)
> +DEF("no-kvm-pit", 0, QEMU_OPTION_no_kvm_pit,
> +    "-no-kvm-pit     disable KVM kernel mode PIT\n",
> +    QEMU_ARCH_I386)
> +
>  
>  HXCOMM This is the last statement. Insert new options before this line!
>  STEXI
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

Index: qemu-compat-kvm/vl.c
===================================================================
--- qemu-compat-kvm.orig/vl.c
+++ qemu-compat-kvm/vl.c
@@ -3066,7 +3066,11 @@  int main(int argc, char **argv, char **e
                 qemu_opts_parse(olist, "kernel_irqchip=off", 0);
                 break;
             }
-
+            case QEMU_OPTION_no_kvm_pit: {
+                fprintf(stderr, "Warning: KVM PIT can no longer be disabled "
+                        "separately.\n");
+                break;
+            }
             case QEMU_OPTION_usb:
                 usb_enabled = 1;
                 break;
Index: qemu-compat-kvm/qemu-options.hx
===================================================================
--- qemu-compat-kvm.orig/qemu-options.hx
+++ qemu-compat-kvm/qemu-options.hx
@@ -2841,6 +2841,10 @@  ETEXI
 DEF("no-kvm-irqchip", 0, QEMU_OPTION_no_kvm_irqchip,
     "-no-kvm-irqchip disable KVM kernel mode PIC/IOAPIC/LAPIC\n",
     QEMU_ARCH_I386)
+DEF("no-kvm-pit", 0, QEMU_OPTION_no_kvm_pit,
+    "-no-kvm-pit     disable KVM kernel mode PIT\n",
+    QEMU_ARCH_I386)
+
 
 HXCOMM This is the last statement. Insert new options before this line!
 STEXI