Accepting request 483913 from home:bfrogers:branches:Virtualization

Fix an issue in the rc2 code worth worrying about for Beta1. Also get the support doc in better shape.

OBS-URL: https://build.opensuse.org/request/show/483913
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=332

0048-i386-Replace-uint32_t-with-FeatureW.patch

@@ -0,0 +1,99 @@
+From d6b04856c99c5c9f896e324214643566ba35ed9a Mon Sep 17 00:00:00 2001
+From: Eduardo Habkost <ehabkost@redhat.com>
+Date: Mon, 27 Mar 2017 11:48:14 -0300
+Subject: [PATCH] i386: Replace uint32_t* with FeatureWord on feature
+ getter/setter
+
+Instead of passing a pointer to the feature property getter and
+setter functions, pass a FeatureWord enum so they can perform
+other actions related to the feature flag.
+
+This will be used to add a new "user_features" field to keep
+track of features that were explicitly set by the user.
+
+Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
+Message-Id: <20170327144815.8043-2-ehabkost@redhat.com>
+Reviewed-by: Igor Mammedov <imammedo@redhat.com>
+Tested-by: Jiri Denemark <jdenemar@redhat.com>
+Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
+Signed-off-by: Bruce Rogers <brogers@suse.com>
+---
+ target/i386/cpu.c | 19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/target/i386/cpu.c b/target/i386/cpu.c
+index 7aa7622..feefa5b 100644
+--- a/target/i386/cpu.c
++++ b/target/i386/cpu.c
+@@ -3692,15 +3692,17 @@ static void x86_cpu_unrealizefn(DeviceState *dev, Error **errp)
+ }
+ 
+ typedef struct BitProperty {
+-    uint32_t *ptr;
++    FeatureWord w;
+     uint32_t mask;
+ } BitProperty;
+ 
+ static void x86_cpu_get_bit_prop(Object *obj, Visitor *v, const char *name,
+                                  void *opaque, Error **errp)
+ {
++    X86CPU *cpu = X86_CPU(obj);
+     BitProperty *fp = opaque;
+-    bool value = (*fp->ptr & fp->mask) == fp->mask;
++    uint32_t f = cpu->env.features[fp->w];
++    bool value = (f & fp->mask) == fp->mask;
+     visit_type_bool(v, name, &value, errp);
+ }
+ 
+@@ -3708,6 +3710,7 @@ static void x86_cpu_set_bit_prop(Object *obj, Visitor *v, const char *name,
+                                  void *opaque, Error **errp)
+ {
+     DeviceState *dev = DEVICE(obj);
++    X86CPU *cpu = X86_CPU(obj);
+     BitProperty *fp = opaque;
+     Error *local_err = NULL;
+     bool value;
+@@ -3724,9 +3727,9 @@ static void x86_cpu_set_bit_prop(Object *obj, Visitor *v, const char *name,
+     }
+ 
+     if (value) {
+-        *fp->ptr |= fp->mask;
++        cpu->env.features[fp->w] |= fp->mask;
+     } else {
+-        *fp->ptr &= ~fp->mask;
++        cpu->env.features[fp->w] &= ~fp->mask;
+     }
+ }
+ 
+@@ -3745,7 +3748,7 @@ static void x86_cpu_release_bit_prop(Object *obj, const char *name,
+  */
+ static void x86_cpu_register_bit_prop(X86CPU *cpu,
+                                       const char *prop_name,
+-                                      uint32_t *field,
++                                      FeatureWord w,
+                                       int bitnr)
+ {
+     BitProperty *fp;
+@@ -3755,11 +3758,11 @@ static void x86_cpu_register_bit_prop(X86CPU *cpu,
+     op = object_property_find(OBJECT(cpu), prop_name, NULL);
+     if (op) {
+         fp = op->opaque;
+-        assert(fp->ptr == field);
++        assert(fp->w == w);
+         fp->mask |= mask;
+     } else {
+         fp = g_new0(BitProperty, 1);
+-        fp->ptr = field;
++        fp->w = w;
+         fp->mask = mask;
+         object_property_add(OBJECT(cpu), prop_name, "bool",
+                             x86_cpu_get_bit_prop,
+@@ -3787,7 +3790,7 @@ static void x86_cpu_register_feature_bit_props(X86CPU *cpu,
+     /* aliases don't use "|" delimiters anymore, they are registered
+      * manually using object_property_add_alias() */
+     assert(!strchr(name, '|'));
+-    x86_cpu_register_bit_prop(cpu, name, &cpu->env.features[w], bitnr);
++    x86_cpu_register_bit_prop(cpu, name, w, bitnr);
+ }
+ 
+ static GuestPanicInformation *x86_cpu_get_crash_info(CPUState *cs)

0049-i386-Don-t-override-cpu-options-on-.patch

@@ -0,0 +1,91 @@
+From f29ffe6356b02ac5af7089e63b11ce22fd3313ed Mon Sep 17 00:00:00 2001
+From: Eduardo Habkost <ehabkost@redhat.com>
+Date: Mon, 27 Mar 2017 11:48:15 -0300
+Subject: [PATCH] i386: Don't override -cpu options on -cpu host/max
+
+The existing code for "host" and "max" CPU models overrides every
+single feature in the CPU object at realize time, even the ones
+that were explicitly enabled or disabled by the user using
+"feat=on" or "feat=off", while features set using +feat/-feat are
+kept.
+
+This means "-cpu host,+invtsc" works as expected, while
+"-cpu host,invtsc=on" doesn't.
+
+This was a known bug, already documented in a comment inside
+x86_cpu_expand_features(). What makes this bug worse now is that
+libvirt 3.0.0 and newer now use "feat=on|off" instead of
++feat/-feat when it detects a QEMU version that supports it (see
+libvirt commit d47db7b16dd5422c7e487c8c8ee5b181a2f9cd66).
+
+Change the feature property getter/setter to set a
+env->user_features field, to keep track of features that were
+explicitly changed using QOM properties. Then make the
+max_features code not override user features when handling "-cpu
+host" and "-cpu max".
+
+This will also allow us to remove the plus_features/minus_features
+hack in the future, but I plan to do that after 2.9.0 is
+released.
+
+Reported-by: Jiri Denemark <jdenemar@redhat.com>
+Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
+Message-Id: <20170327144815.8043-3-ehabkost@redhat.com>
+Reviewed-by: Igor Mammedov <imammedo@redhat.com>
+Tested-by: Jiri Denemark <jdenemar@redhat.com>
+Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
+Signed-off-by: Bruce Rogers <brogers@suse.com>
+---
+ target/i386/cpu.c | 13 +++++++++----
+ target/i386/cpu.h |  2 ++
+ 2 files changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/target/i386/cpu.c b/target/i386/cpu.c
+index feefa5b..13c0985 100644
+--- a/target/i386/cpu.c
++++ b/target/i386/cpu.c
+@@ -3373,15 +3373,19 @@ static void x86_cpu_expand_features(X86CPU *cpu, Error **errp)
+     GList *l;
+     Error *local_err = NULL;
+ 
+-    /*TODO: cpu->max_features incorrectly overwrites features
+-     * set using "feat=on|off". Once we fix this, we can convert
++    /*TODO: Now cpu->max_features doesn't overwrite features
++     * set using QOM properties, and we can convert
+      * plus_features & minus_features to global properties
+      * inside x86_cpu_parse_featurestr() too.
+      */
+     if (cpu->max_features) {
+         for (w = 0; w < FEATURE_WORDS; w++) {
+-            env->features[w] =
+-                x86_cpu_get_supported_feature_word(w, cpu->migratable);
++            /* Override only features that weren't set explicitly
++             * by the user.
++             */
++            env->features[w] |=
++                x86_cpu_get_supported_feature_word(w, cpu->migratable) &
++                ~env->user_features[w];
+         }
+     }
+ 
+@@ -3731,6 +3735,7 @@ static void x86_cpu_set_bit_prop(Object *obj, Visitor *v, const char *name,
+     } else {
+         cpu->env.features[fp->w] &= ~fp->mask;
+     }
++    cpu->env.user_features[fp->w] |= fp->mask;
+ }
+ 
+ static void x86_cpu_release_bit_prop(Object *obj, const char *name,
+diff --git a/target/i386/cpu.h b/target/i386/cpu.h
+index 64545b2..81c02c5 100644
+--- a/target/i386/cpu.h
++++ b/target/i386/cpu.h
+@@ -1147,6 +1147,8 @@ typedef struct CPUX86State {
+     uint32_t cpuid_vendor3;
+     uint32_t cpuid_version;
+     FeatureWordArray features;
++    /* Features that were explicitly enabled/disabled */
++    FeatureWordArray user_features;
+     uint32_t cpuid_model[12];
+ 
+     /* MTRRs */

qemu-linux-user.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Mar 30 22:46:47 UTC 2017 - brogers@suse.com
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.9
+* Patches added:
+  0048-i386-Replace-uint32_t-with-FeatureW.patch
+  0049-i386-Don-t-override-cpu-options-on-.patch
+
 -------------------------------------------------------------------
 Tue Mar 28 22:12:56 UTC 2017 - brogers@suse.com
 

qemu-linux-user.spec

@@ -73,6 +73,8 @@ Patch0044:      0044-test-string-input-visitor-Add-uint6.patch
 Patch0045:      0045-tests-Add-QOM-property-unit-tests.patch
 Patch0046:      0046-tests-Add-scsi-disk-test.patch
 Patch0047:      0047-hw-intc-arm_gicv3_kvm-Check-KVM_DEV.patch
+Patch0048:      0048-i386-Replace-uint32_t-with-FeatureW.patch
+Patch0049:      0049-i386-Don-t-override-cpu-options-on-.patch
 # Please do not add QEMU patches manually here.
 # Run update_git.sh to regenerate this queue.
 Source400:      update_git.sh
@@ -174,6 +176,8 @@ run cross-architecture builds.
 %patch0045 -p1
 %patch0046 -p1
 %patch0047 -p1
+%patch0048 -p1
+%patch0049 -p1
 
 %build
 ./configure --prefix=%_prefix --sysconfdir=%_sysconfdir \

qemu-testsuite.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Mar 30 22:46:43 UTC 2017 - brogers@suse.com
+
+- The support documents included are now fairly accurate for the
+  arm and s390 world, and the x86 version also received a few
+  tweaks. Also included in those docs is a url reference to upstream
+  qemu deprecation plans and discussions.
+- Add post v2.9.0-rc2 upstream patches which fix -cpu host and -cpu
+  max feature overrides for libvirt compatability.
+  0048-i386-Replace-uint32_t-with-FeatureW.patch
+  0049-i386-Don-t-override-cpu-options-on-.patch
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.9
+
 -------------------------------------------------------------------
 Tue Mar 28 22:12:52 UTC 2017 - brogers@suse.com
 

qemu-testsuite.spec

@@ -159,6 +159,8 @@ Patch0044:      0044-test-string-input-visitor-Add-uint6.patch
 Patch0045:      0045-tests-Add-QOM-property-unit-tests.patch
 Patch0046:      0046-tests-Add-scsi-disk-test.patch
 Patch0047:      0047-hw-intc-arm_gicv3_kvm-Check-KVM_DEV.patch
+Patch0048:      0048-i386-Replace-uint32_t-with-FeatureW.patch
+Patch0049:      0049-i386-Don-t-override-cpu-options-on-.patch
 # Please do not add QEMU patches manually here.
 # Run update_git.sh to regenerate this queue.
 
@@ -801,6 +803,8 @@ This package provides a service file for starting and stopping KSM.
 %patch0045 -p1
 %patch0046 -p1
 %patch0047 -p1
+%patch0048 -p1
+%patch0049 -p1
 
 %if %{build_x86_fw_from_source}
 pushd roms/ipxe

qemu.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Mar 30 22:46:43 UTC 2017 - brogers@suse.com
+
+- The support documents included are now fairly accurate for the
+  arm and s390 world, and the x86 version also received a few
+  tweaks. Also included in those docs is a url reference to upstream
+  qemu deprecation plans and discussions.
+- Add post v2.9.0-rc2 upstream patches which fix -cpu host and -cpu
+  max feature overrides for libvirt compatability.
+  0048-i386-Replace-uint32_t-with-FeatureW.patch
+  0049-i386-Don-t-override-cpu-options-on-.patch
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.9
+
 -------------------------------------------------------------------
 Tue Mar 28 22:12:52 UTC 2017 - brogers@suse.com
 

qemu.spec

@@ -159,6 +159,8 @@ Patch0044:      0044-test-string-input-visitor-Add-uint6.patch
 Patch0045:      0045-tests-Add-QOM-property-unit-tests.patch
 Patch0046:      0046-tests-Add-scsi-disk-test.patch
 Patch0047:      0047-hw-intc-arm_gicv3_kvm-Check-KVM_DEV.patch
+Patch0048:      0048-i386-Replace-uint32_t-with-FeatureW.patch
+Patch0049:      0049-i386-Don-t-override-cpu-options-on-.patch
 # Please do not add QEMU patches manually here.
 # Run update_git.sh to regenerate this queue.
 
@@ -801,6 +803,8 @@ This package provides a service file for starting and stopping KSM.
 %patch0045 -p1
 %patch0046 -p1
 %patch0047 -p1
+%patch0048 -p1
+%patch0049 -p1
 
 %if %{build_x86_fw_from_source}
 pushd roms/ipxe

supported.arm.txt

@@ -35,7 +35,6 @@ Overview
   documented elsewhere. This document focuses on the features and direct usage
   of QEMU/KVM as provided by the QEMU based packages.
 
-
 Major QEMU/KVM Supported Features
 ---------------------------------
 
@@ -141,10 +140,15 @@ Noteworthy QEMU/KVM Unsupported Features
 
 - GlusterFS integration is not enabled.
 
-
 Deprecated, Superseded, Modified and Dropped Features
 -----------------------------------------------------
 
+- http://wiki.qemu-project.org/Features/LegacyRemoval
+  This website tracks feature deprecation and removal at the upstream
+  development level. Our qemu package inherits this community direction, but be
+  aware that we can and will deviate as needed. Those deviations and additional
+  information can be found in this section.
+
 - The use of "?" as a parameter to "-cpu", "-soundhw", "-device", "-M",
   "-machine", "-d", and "-clock" is now considered deprecated. Use "help"
   instead.
@@ -173,7 +177,7 @@ Deprecated, Superseded, Modified and Dropped Features
 - These previously supported command line options are no longer recognized:
   -device pc-sysfw (no longer needed)
 
-- Specifying a CPUID feature with both "+feature/-feature" and "feature=on/off"
+- Specifying a cpu feature with both "+feature/-feature" and "feature=on/off"
   will now cause a warning. The current behavior for this combination where
   "+feature/-feature" wins over "feature=on/off", will be changed going forward
   so that "+feature" and "-feature" will be synonyms for "feature=on" and
@@ -219,36 +223,30 @@ QEMU Command-Line and Monitor Syntax and Support
   -d ...
   -daemonize
   -debugcon ...
-  -device [isa-serial|isa-parallel|isa-fdc|ide-drive|ide-hd|ide-cd|
+  -device [VGA|rtl8139|virtio-net-pci|virtio-blk-pci|virtio-balloon-pci|
-          VGA|cirrus-vga|rtl8139|virtio-net-pci|virtio-blk-pci|
+          virtio-9p-pci|usb-hub|usb-ehci|usb-tablet|usb-storage|usb-mouse|
-          virtio-balloon-pci|virtio-9p-pci|usb-hub|usb-ehci|usb-tablet|
+          usb-kbd|virtserialport|virtconsole|virtio-serial-pci|i82559er|
-          usb-storage|usb-mouse|usb-kbd|virtserialport|virtconsole|
+          virtio-scsi-pci|scsi-cd|scsi-hd|scsi-generic|scsi-disk|scsi-block|
-          virtio-serial-pci|sga|i82559er|virtio-scsi-pci|scsi-cd|scsi-hd|
+          pci-serial|pci-serial-2x|pci-serial-4x|ich9-ahci|usb-host|usb-serial|
-          scsi-generic|scsi-disk|scsi-block|pci-serial|pci-serial-2x|
+          usb-wacom-tablet|usb-braille|usb-net|pci-ohci|virtio-rng-pci|i6300esb|
-          pci-serial-4x|ich9-ahci|piix-usb-uhci|usb-host|usb-serial|
+          qxl|qxl-vga|pvpanic|vfio-pci|ivshmem|ivshmem-doorbell|ivshmem-plain|
-          usb-wacom-tablet|usb_braille|usb-net|pci-ohci|piix4-usb-uhci|
+          pci-bridge|megasas-gen2|e1000e|e1000]
-          virtio-rng-pci|i6300esb|ib700|qxl|qxl-vga|pvpanic|vfio-pci|ivshmem|
-          ivshmem-doorbell|ivshmem-plain|pci-bridge|megasas-gen2|pc-dimm|
-          floppy|e1000e|ccid-card-emulated|ccid-card-passthrough|xen-backend|
-          loader]
           (the following are aliases of these supported devices: ahci|
           virtio-blk|virtio-net|virtio-serial|virtio-balloon| virtio-9p|
-          virtio-scsi|virtio-rng|e1000)
+          virtio-scsi|virtio-rng|e1000-82540em)
   -dfilter range, ...
   -display ...
-  -drive ... (if specified if=[floppy|ide|virtio] and format=[qcow2|qed|raw] and
+  -drive ... (if specified if=[virtio] and format=[qcow2|qed|raw] and
              snapshot=off only)
   -echr ...
   -enable-fips
   -enable-kvm
-  -fda/-fdb ...
   -fsdev ...
   -full-screen
   -fw_cfg ...
   -gdb ...
   -global ...
   -h
-  -hda/-hdb/-hdc/-hdd ...
   -help
   -incoming ...
   -initrd ...
@@ -271,7 +269,6 @@ QEMU Command-Line and Monitor Syntax and Support
   -no-acpi
   -nodefaults
   -nodefconfig
-  -no-fd-bootchk
   -no-frame
   -nographic
   -no-hpet
@@ -297,22 +294,19 @@ QEMU Command-Line and Monitor Syntax and Support
   -smbios ...
   -smp ...
   -spice
-  -tdf
   -tpmdev passthrough ...
   -trace ...
   -usb
   -usbdevice [braile|disk|host|mouse|net|serial|tablet]
   -uuid ..
   -version
-  -vga [cirrus|none|qxl|std|xenfb]
+  -vga [none|qxl|std|virtio]
   -virtfs ...
   -virtioconsole ...
   -vnc ...
   -watchdog ...
   -watchdog-action ...
   -writeconfig ...
-  -xen-attach ...
-  -xen-domid ...
 
 - The following monitor commands are supported:
   ?
@@ -515,9 +509,6 @@ QEMU Command-Line and Monitor Syntax and Support
   trace-event-get-state
   trace-event-set-state
   transaction
-  xen-load-devices-state
-  xen-save-devices-state
-  xen-set-global-dirty-log
 
 -  The following command line options are unsupported:
   -acpitable ...
@@ -525,43 +516,88 @@ QEMU Command-Line and Monitor Syntax and Support
   -chroot ...
   -cpu ... (all except host)
   -curses
-  -device [ipoctal232|i82562|nec-usb-xhci|hda-duplex|hda-output|usb-bot|
+  -device [160s33b|320s33b|640s33b|a15mpcore_priv|a9mpcore_priv|a9-scu|adlib|
-          lsi53c810a|ich9-usb-uhci2|ich9-usb-uhci6|ich9-usb-uhci5|
+          ads7846|allwinner-a10|allwinner-a10-pic|allwinner-A10-timer|
-          ich9-usb-uhci3|isa-debug-exit|ne2k_pci|usb-uas|ich9-usb-uhci4|ioh3420|
+          allwinner-emac|amd-iommu|AMDVI-PCI|arm1026-arm-cpu|arm1136-arm-cpu|
-          isa-ide|usb-ccid|ich9-usb-ehci2|pcnet|ich9-intel-hda|dc390|
+          arm1136-r2-arm-cpu|arm1176-arm-cpu|arm11mpcore-arm-cpu|
-          ich9-usb-ehci1|hda-micro|x3130-upstream|isa-cirrus-vga|ich9-usb-uhci1|
+          arm11mpcore_priv|arm11-scu|arm926-arm-cpu|arm946-arm-cpu|
-          pc-testdev|ne2k_isa|isa-vga|cs4231a|gus|vmware-svga|i82801b11-bridge|
+          ARMbitband-memory|arm.cortex-a9-global-timer|arm_gic|arm-gicv2m|
-          i82557a|i82557c|i82557b|i82801|AC97|am53c974|intel-hda|i82558a|
+          arm_mptimer|armv7m_nvic|aspeed.timer|aspeed.vic|ast2400|
-          i82558b|usb-audio|i82550|isa-debugcon|sb16|megasas|i82551|
+          at25128a-nonjedec|at25256a-nonjedec|at25df041a|at25df321a|at25df641|
-          xio3130-downstream|vt82c686b-usb-uhci|tpci200|i82559a|i82559b|i82559c|
+          at25fs010|at25fs040|at26df081a|at26df161a|at26df321|at26f004|
-          isa-applesmc|usb-bt-dongle|adlib|ES1370|lsi53c810|nvme|pci-testdev|
+          at45db081d|bcm2835-aux|bcm2835-dma|bcm2835-fb|bcm2835-ic|bcm2835-mbox|
-          pvscsi|vhost-scsi|vhost-scsi-pci|virtio-9p-device|
+          bcm2835-peripherals|bcm2835-property|bcm2836|bcm2836-control|
-          virtio-balloon-device|virtio-blk-device|virtio-net-device|
+          cadence_gem|cadence_ttc|cadence_uart|ccid-card-emulated|
-          virtio-rng-device|virtio-scsi-device|virtio-serial-device|vmxnet3|
+          ccid-card-passthrough|cfi.pflash01|cfi.pflash02|cirrus-vga|corgi-ssp|
-          xen-pci-passthrough|xen-platform|xen-pvdevice|piix3-ide|piix3-ide-xen|
+          cortex-a15-arm-cpu|cortex-a53-arm-cpu|cortex-a57-arm-cpu|
-          piix3-ide|i8042|sdhci-pci|generic-sdhci|secondary-vga|edu|fw_cfg_io|
+          cortex-a8-arm-cpu|cortex-a9-arm-cpu|cortex-m3-arm-cpu|
-          fw_cfg_mem|intel_iommu|usb-mtp|e1000-82540em|e1000-82544gc|
+          cortex-m4-arm-cpu|cortex-r5-arm-cpu|cs4231a|digic|digic-timer|
-          e1000-82545em|virtio-input-host-pci|virtio-keyboard-pci|
+          digic-uart|ds1338|dscm1xxxx|e1000|en25f32|en25p32|en25p64|en25q32b|
-          virtio-mouse-pci|virtio-tablet-pci|virtio-gpu-pci|pci-bridge-seat|pxb|
+          en25q64|esp|exynos4210.combiner|exynos4210-ehci-usb|exynos4210.fimd|
-          pxb-pcie|allwinner-ahci|sdhci-pci|rocker|virtio-input-host-device|
+          exynos4210.gic|exynos4210.i2c|exynos4210.irq_gate|exynos4210.mct|
-          virtio-keyboard-device|virtio-mouse-device|virtio-tablet-device|
+          exynos4210.pmu|exynos4210.pwm|exynos4210.rtc|exynos4210.uart|floppy|
-          virtio-vga|hyperv-testdev|vfio-amd-xgbe|vfio-calxeda-xgmac|
+          fslimx25|fslimx31|fusbh200-ehci-usb|fw_cfg|gd25q32|gd25q64|
-          generic-sdhci|igd-passthrough-isa-bridge|ipmi-bmc-extern|
+          generic-sdhci|gpex-pcihost|gpex-root|gpio_i2c|gpio-key|gus|
-          ipmi-bmc-sim|isa-ipmi-bt|isa-ipmi-kcs|mptsas1068|nvdimm|pxb-host|
+          hyperv-testdev|highbank-regs|host-arm-cpu|*-i386-cpu|i8042|
-          sd-card|virtio-gpu-device|kvm-pci-assign|xen-sysdev|or-irq|amd-iommu|
+          ib700|icp-ctrl-regs|igd-passthrough-isa-bridge|imx25.ccm|imx31.ccm|
-          AMDVI-PCI|vhost-vsock-device|vhost-vsock-pci|virtio-crypto-device|
+          imx6.ccm|imx.avic|imx.epit|imx.fec|imx.gpio|imx.gpt|imx.i2c|
-          virtio-crypto-pci|qemu,register|vfio-pci-igd-lpc-bridge|*-i386-cpu|
+          imx.serial|integrator_core|integrator_debug|integrator_pic|
-          *-x86_64-cpu]
+          integrator_pit|intel_iommu|ipmi-bmc-extern|ipmi-bmc-sim|isa-applesmc|
+          isa-cirrus-vga|isa-debugcon|isa-debug-exit|isa-fdc|isa-ide|
+          isa-ipmi-bt|isa-ipmi-kcs|isa-parallel|isa-vga|isabus-bridge|
+          kvm-arm-gic|kvm-arm-gicv3|kvm-pci-assign|l2x0|lan9118|lm8323|loader|
+          lsi53c810a|lsi53c895a|m25p05|m25p10|m25p128|m25p16|m25p20|m25p32|
+          m25p40|m25p64|m25p80|m25pe16|m25pe20|m25pe80|m25px32|m25px32-s0|
+          m25px32-s1|m25px64|m45pe10|m45pe16|m45pe80|mainstone-fpga|max1110|
+          max1111|max7310|musicpal_gpio|musicpal_key|musicpal_lcd|
+          musicpal-misc|mv88w8618_audio|mv88w8618_eth|mv88w8618_flashcfg|
+          mv88w8618_pic|mv88w8618_pit|mv88w8618_wlan|mx25l12805d|mx25l12855e|
+          mx25l1606e|mx25l2005a|mx25l25635e|mx25l25655e|mx25l3205d|mx25l4005a|
+          mx25l6405d|mx25l8005|n25q032|n25q032a11|n25q032a13|n25q064|n25q064a11|
+          n25q064a13|n25q128|n25q128a11|n25q128a13|n25q256a|n25q256a11|
+          n25q256a13|n25q512a|nand|ne2k_isa|nvdimm|omap2-gpio|omap2-intc|
+          omap-gpio|omap_i2c|omap-intc|onenand|or-irq|pc-dimm|pc-testdev|
+          piix3-ide|piix3-ide|piix3-ide-xen|piix3-usb-uhci|pl011|pl011_luminary|
+          pl022|pl031|pl041|pl050_keyboard|pl050_mouse|pl061|pl061_luminary|
+          pl080|pl081|pl110|pl110_versatile|pl111|pl181|pl190|pl330|
+          platform-bus-device|pxa250-arm-cpu|pxa255-arm-cpu|pxa25x-timer|
+          pxa260-arm-cpu|pxa261-arm-cpu|pxa262-arm-cpu|pxa270-a0-arm-cpu|
+          pxa270-a1-arm-cpu|pxa270-arm-cpu|pxa270-b0-arm-cpu|pxa270-b1-arm-cpu|
+          pxa270-c0-arm-cpu|pxa270-c5-arm-cpu|pxa27x-timer|pxa2xx-dma|
+          pxa2xx-fir|pxa2xx-gpio|pxa2xx_i2c|pxa2xx-i2c-slave|pxa2xx-mmci|
+          pxa2xx-pcmcia|pxa2xx_pic|pxa2xx_rtc|pxa2xx-ssp|qemu,register|
+          realview_gic|realview_mpcore|realview_pci|realview_sysctl|s25fl016k|
+          s25fl064k|s25fl129p0|s25fl129p1|s25fl256s0|s25fl256s1|s25fl512s|
+          s25sl004a|s25sl008a|s25sl016a|s25sl032a|s25sl032p|s25sl064a|s25sl064p|
+          s25sl12800|s25sl12801|s70fl01gs|sa1100-arm-cpu|sa1110-arm-cpu|sb16|
+          scoop|sdhci-pci|sga|sl-nand|smbus-eeprom|smc91c111|sp804|
+          spitz-keyboard|spitz-lcdtg|ssd0303|ssd0323|ssi-sd|sst25vf016b|
+          sst25vf032b|sst25vf040b|sst25vf080b|sst25wf010|sst25wf020|sst25wf040|
+          sst25wf080|sst25wf512|stellaris-adc|stellaris_enet|stellaris-gptm|
+          stellaris-i2c|stm32f205-soc|stm32f2xx-syscfg|stm32f2xx-timer|
+          stm32f2xx-usart|strongarm-gpio|strongarm_pic|strongarm-ppc|
+          strongarm-rtc|strongarm-ssp|strongarm-uart|sysbus-ahci|sysbus-ohci|
+          tegra2-ehci-usb|ti925t-arm-cpu|tmp105|tosa_dac|tosa-ssp|tusb6010|
+          twl92230|usb-redir|versatile_i2c|versatilepb_sic|versatile_pci|
+          versatile_pci_host|vfio-pci-igd-lpc-bridge|vhost-vsock-device|
+          vhost-vsock-pci|virtconsole|virtio-crypto-device|virtio-crypto-pci|
+          virtio-mmio|virtio-vga|vmware-svga|w25q256|w25q32|w25q32dw|w25q64|
+          w25q80|w25q80bl|w25x10|w25x16|w25x20|w25x32|w25x40|w25x64|w25x80|
+          wm8750|*-x86_64-cpu|xen-backend|xen-pci-passthrough|xen-platform|
+          xen-pvdevice|xen-sysdev|xgmac|xilinxzynq_slcr|xlnx.ps7-qspi|
+          xlnx.ps7-spi|xlnxps7-usb|xlnxzynqmp|xlnxzynq-xadc]
           (the following are aliases of these unsupported devices: lsi|
           virtio-input-host|virtio-keyboard|virtio-mouse|virtio-tablet|
-          virtio-gpu|pci-assign)
+          virtio-gpu|pci-assign|piix-usb-uhci)
           (note that some of these device names represent supported devices and
           are used internally, but are not specifyable via -device even though
           they appear in the list of devices)
   -drive ,if=[scsi|mtd|pflash], snapshot=on, format=[anything besides qcow2, qed
          or raw]
   -dtb file
+  -fda/-fdb ...
   -g ...
+  -hda/-hdb/-hdc/-hdd ...
   -icount ...
   -L ...
   -M [akita|borzoi|canon-a1100|cheetah|collie|connex|cubieboard|highbank|
@@ -579,6 +615,7 @@ QEMU Command-Line and Monitor Syntax and Support
   -mtdblock file
   -net [dump|socket|vde] ...
   -netdev [dump|hubport|l2tpv3|socket|vde] ...
+  -no-fd-bootchk
   -no-kvm
   -no-kvm-irqchip
   -no-kvm-pit
@@ -597,9 +634,12 @@ QEMU Command-Line and Monitor Syntax and Support
   -snapshot
   -soundhw ...
   -tb-size ...
-  -vga [cg3|tcx|virtio|vmware]
+  -tdf
+  -vga [cg3|tcx|virtio|cirrus|xenfb]
   -win2k-hack
+  -xen-attach ...
   -xen-create
+  -xen-domid ...
 
 - The following monitor commands are unsupported:
   acl_add ...
@@ -653,3 +693,6 @@ QEMU Command-Line and Monitor Syntax and Support
   x-blockdev-insert-medium
   x-blockdev-remove-medium
   x-colo-lost-heartbeat
+  xen-load-devices-state
+  xen-save-devices-state
+  xen-set-global-dirty-log

supported.s390.txt

@@ -37,7 +37,6 @@ Overview
   documented elsewhere. This document focuses on the features and direct usage
   of QEMU/KVM as provided by the QEMU based packages.
 
-
 Major QEMU/KVM Supported Features
 ---------------------------------
 
@@ -142,10 +141,15 @@ Noteworthy QEMU/KVM Unsupported Features
 
 - GlusterFS integration is not enabled.
 
-
 Deprecated, Superseded, Modified and Dropped Features
 -----------------------------------------------------
 
+- http://wiki.qemu-project.org/Features/LegacyRemoval
+  This website tracks feature deprecation and removal at the upstream
+  development level. Our qemu package inherits this community direction, but be
+  aware that we can and will deviate as needed. Those deviations and additional
+  information can be found in this section.
+
 - The use of "?" as a parameter to "-cpu", "-soundhw", "-device", "-M",
   "-machine", "-d", and "-clock" is now considered deprecated. Use "help"
   instead.
@@ -174,7 +178,7 @@ Deprecated, Superseded, Modified and Dropped Features
 - These previously supported command line options are no longer recognized:
   -device pc-sysfw (no longer needed)
 
-- Specifying a CPUID feature with both "+feature/-feature" and "feature=on/off"
+- Specifying a cpu feature with both "+feature/-feature" and "feature=on/off"
   will now cause a warning. The current behavior for this combination where
   "+feature/-feature" wins over "feature=on/off", will be changed going forward
   so that "+feature" and "-feature" will be synonyms for "feature=on" and
@@ -220,36 +224,25 @@ QEMU Command-Line and Monitor Syntax and Support
   -d ...
   -daemonize
   -debugcon ...
-  -device [isa-serial|isa-parallel|isa-fdc|ide-drive|ide-hd|ide-cd|
+  -device [virtio-net-pci|virtio-blk-pci|virtio-balloon-pci|virtserialport|
-          VGA|cirrus-vga|rtl8139|virtio-net-pci|virtio-blk-pci|
+          virtconsole|virtio-serial-pci|virtio-scsi-pci|scsi-cd|scsi-hd|
-          virtio-balloon-pci|virtio-9p-pci|usb-hub|usb-ehci|usb-tablet|
+          scsi-generic|scsi-disk|scsi-block|virtio-rng-pci|pci-bridge|
-          usb-storage|usb-mouse|usb-kbd|virtserialport|virtconsole|
+          megasas-gen2|e1000e|e1000]
-          virtio-serial-pci|sga|i82559er|virtio-scsi-pci|scsi-cd|scsi-hd|
+          (the following are aliases of these supported devices: virtio-blk|
-          scsi-generic|scsi-disk|scsi-block|pci-serial|pci-serial-2x|
+          virtio-net|virtio-serial|virtio-balloon|virtio-scsi|virtio-rng)
-          pci-serial-4x|ich9-ahci|piix-usb-uhci|usb-host|usb-serial|
-          usb-wacom-tablet|usb_braille|usb-net|pci-ohci|piix4-usb-uhci|
-          virtio-rng-pci|i6300esb|ib700|qxl|qxl-vga|pvpanic|vfio-pci|ivshmem|
-          ivshmem-doorbell|ivshmem-plain|pci-bridge|megasas-gen2|pc-dimm|
-          floppy|e1000e|ccid-card-emulated|ccid-card-passthrough|xen-backend|
-          loader]
-          (the following are aliases of these supported devices: ahci|
-          virtio-blk|virtio-net|virtio-serial|virtio-balloon| virtio-9p|
-          virtio-scsi|virtio-rng|e1000)
   -dfilter range, ...
   -display ...
-  -drive ... (if specified if=[floppy|ide|virtio] and format=[qcow2|qed|raw] and
+  -drive ... (if specified if=[virtio] and format=[qcow2|qed|raw] and
              snapshot=off only)
   -echr ...
   -enable-fips
   -enable-kvm
-  -fda/-fdb ...
   -fsdev ...
   -full-screen
   -fw_cfg ...
   -gdb ...
   -global ...
   -h
-  -hda/-hdb/-hdc/-hdd ...
   -help
   -incoming ...
   -initrd ...
@@ -272,7 +265,6 @@ QEMU Command-Line and Monitor Syntax and Support
   -no-acpi
   -nodefaults
   -nodefconfig
-  -no-fd-bootchk
   -no-frame
   -nographic
   -no-hpet
@@ -295,25 +287,18 @@ QEMU Command-Line and Monitor Syntax and Support
   -sdl
   -serial ...
   -show-cursor
-  -smbios ...
   -smp ...
   -spice
-  -tdf
-  -tpmdev passthrough ...
   -trace ...
-  -usb
-  -usbdevice [braile|disk|host|mouse|net|serial|tablet]
   -uuid ..
   -version
-  -vga [cirrus|none|qxl|std|xenfb]
+  -vga [none|qxl|std]
   -virtfs ...
   -virtioconsole ...
   -vnc ...
   -watchdog ...
   -watchdog-action ...
   -writeconfig ...
-  -xen-attach ...
-  -xen-domid ...
 
 - The following monitor commands are supported:
   ?
@@ -384,8 +369,6 @@ QEMU Command-Line and Monitor Syntax and Support
   system_reset
   system_wakeup
   trace-event ...
-  usb_add ...
-  usb_del ...
   watchdog_action ...
   x ...
   xp ...
@@ -493,9 +476,6 @@ QEMU Command-Line and Monitor Syntax and Support
   query-spice
   query-status
   query-target
-  query-tpm
-  query-tpm-models
-  query-tpm-types
   query-uuid
   query-version
   query-vnc
@@ -516,9 +496,6 @@ QEMU Command-Line and Monitor Syntax and Support
   trace-event-get-state
   trace-event-set-state
   transaction
-  xen-load-devices-state
-  xen-save-devices-state
-  xen-set-global-dirty-log
 
 -  The following command line options are unsupported:
   -acpitable ...
@@ -526,43 +503,63 @@ QEMU Command-Line and Monitor Syntax and Support
   -chroot ...
   -cpu ... (all except host)
   -curses
-  -device [ipoctal232|i82562|nec-usb-xhci|hda-duplex|hda-output|usb-bot|
+  -device [AC97|adlib|allwinner-ahci|am53c974|amd-iommu|AMDVI-PCI|
-          lsi53c810a|ich9-usb-uhci2|ich9-usb-uhci6|ich9-usb-uhci5|
+          ccid-card-emulated|ccid-card-passthrough|cirrus-vga|cs4231a|dc390|
-          ich9-usb-uhci3|isa-debug-exit|ne2k_pci|usb-uas|ich9-usb-uhci4|ioh3420|
+          diag288|e1000-82544gc|e1000-82545em|edu|ES1370|floppy|generic-sdhci|
-          isa-ide|usb-ccid|ich9-usb-ehci2|pcnet|ich9-intel-hda|dc390|
+          generic-sdhci|gus|hda-duplex|hda-micro|hda-output|hyperv-testdev|
-          ich9-usb-ehci1|hda-micro|x3130-upstream|isa-cirrus-vga|ich9-usb-uhci1|
+          *-i386-cpu|i8042|i82550|i82551|i82557a|i82557b|i82557c|i82558a|
-          pc-testdev|ne2k_isa|isa-vga|cs4231a|gus|vmware-svga|i82801b11-bridge|
+          i82558b|i82559a|i82559b|i82559c|i82562|i82801|i82801b11-bridge|ib700|
-          i82557a|i82557c|i82557b|i82801|AC97|am53c974|intel-hda|i82558a|
+          ich9-intel-hda|ich9-usb-ehci1|ich9-usb-ehci2|ich9-usb-uhci1|
-          i82558b|usb-audio|i82550|isa-debugcon|sb16|megasas|i82551|
+          ich9-usb-uhci2|ich9-usb-uhci3|ich9-usb-uhci4|ich9-usb-uhci5|
-          xio3130-downstream|vt82c686b-usb-uhci|tpci200|i82559a|i82559b|i82559c|
+          ich9-usb-uhci6|ide-cd|ide-drive|ide-hd|igd-passthrough-isa-bridge|
-          isa-applesmc|usb-bt-dongle|adlib|ES1370|lsi53c810|nvme|pci-testdev|
+          intel-hda|intel_iommu|ioh3420|ipmi-bmc-extern|ipmi-bmc-sim|ipoctal232|
-          pvscsi|vhost-scsi|vhost-scsi-pci|virtio-9p-device|
+          isa-applesmc|isa-cirrus-vga|isa-debugcon|isa-debug-exit|isa-fdc|
-          virtio-balloon-device|virtio-blk-device|virtio-net-device|
+          isa-ide|isa-ipmi-bt|isa-ipmi-kcs|isa-parallel|isa-serial|isa-vga|
-          virtio-rng-device|virtio-scsi-device|virtio-serial-device|vmxnet3|
+          kvm-pci-assign|lsi53c810|lsi53c810a|megasas|mptsas1068|ne2k_isa|
-          xen-pci-passthrough|xen-platform|xen-pvdevice|piix3-ide|piix3-ide-xen|
+          ne2k_pci|nec-usb-xhci|nvdimm|nvme|pc-dimm|pci-testdev|pcnet|
-          piix3-ide|i8042|sdhci-pci|generic-sdhci|secondary-vga|edu|fw_cfg_io|
+          pc-testdev|piix3-ide|piix3-ide|piix3-ide-xen|piix4-usb-uhci|pvscsi|
-          fw_cfg_mem|intel_iommu|usb-mtp|e1000-82540em|e1000-82544gc|
+          pxb|pxb-host|pxb-pcie|qemu,register|qemuregister|qemu-s390-cpu|rocker|
-          e1000-82545em|virtio-input-host-pci|virtio-keyboard-pci|
+          s390-flic|s390-flic-qemu|s390-ipl|s390-pcihost|
-          virtio-mouse-pci|virtio-tablet-pci|virtio-gpu-pci|pci-bridge-seat|pxb|
+          s390-sclp-event-facility|s390-skeys-qemu|sb16|sclp|sclpconsole|
-          pxb-pcie|allwinner-ahci|sdhci-pci|rocker|virtio-input-host-device|
+          sclp-cpu-hotplug|sclplmconsole|sclp-memory-hotplug-dev|sclpquiesce|
-          virtio-keyboard-device|virtio-mouse-device|virtio-tablet-device|
+          sd-card|sdhci-pci|sdhci-pci|secondary-vga|sga|smbus-eeprom|tpci200|
-          virtio-vga|hyperv-testdev|vfio-amd-xgbe|vfio-calxeda-xgmac|
+          unimplemented-device|usb-audio|usb-bot|usb-bt-dongle|usb-ccid|usb-mtp|
-          generic-sdhci|igd-passthrough-isa-bridge|ipmi-bmc-extern|
+          usb-uas|vfio-amd-xgbe|vfio-calxeda-xgmac|vfio-pci|vhost-scsi-ccw|
-          ipmi-bmc-sim|isa-ipmi-bt|isa-ipmi-kcs|mptsas1068|nvdimm|pxb-host|
+          vhost-vsock-ccw|virtio-9p-device|virtio-balloon-ccw|virtio-blk-ccw|
-          sd-card|virtio-gpu-device|kvm-pci-assign|xen-sysdev|or-irq|amd-iommu|
+          virtio-crypto-ccw|virtio-mmio|virtio-net-ccw|virtio-rng-ccw|
-          AMDVI-PCI|vhost-vsock-device|vhost-vsock-pci|virtio-crypto-device|
+          virtio-scsi-ccw|virtio-serial-ccw|virtio-vga|virtual-css-bridge|
-          virtio-crypto-pci|qemu,register|vfio-pci-igd-lpc-bridge|*-i386-cpu|
+          vmware-svga|vmxnet3|vt82c686b-usb-uhci|x3130-upstream|*-x86_64-cpu|
-          *-x86_64-cpu]
+          xen-backend|xen-pci-passthrough|xen-platform|xen-pvdevice|xen-sysdev|
+          xio3130-downstream|z10BC.2-base-s390-cpu|z10BC.2-s390-cpu|
+          z10BC-base-s390-cpu|z10BC-s390-cpu|z10EC.2-base-s390-cpu|
+          z10EC.2-s390-cpu|z10EC.3-base-s390-cpu|z10EC.3-s390-cpu|
+          z10EC-base-s390-cpu|z10EC-s390-cpu|z114-base-s390-cpu|z114-s390-cpu|
+          z13.2-base-s390-cpu|z13.2-s390-cpu|z13-base-s390-cpu|z13-s390-cpu|
+          z13s-base-s390-cpu|z13s-s390-cpu|z196.2-base-s390-cpu|z196.2-s390-cpu|
+          z196-base-s390-cpu|z196-s390-cpu|z800-base-s390-cpu|z800-s390-cpu|
+          z890.2-base-s390-cpu|z890.2-s390-cpu|z890.3-base-s390-cpu|
+          z890.3-s390-cpu|z890-base-s390-cpu|z890-s390-cpu|z900.2-base-s390-cpu|
+          z900.2-s390-cpu|z900.3-base-s390-cpu|z900.3-s390-cpu|
+          z900-base-s390-cpu|z900-s390-cpu|z990.2-base-s390-cpu|z990.2-s390-cpu|
+          z990.3-base-s390-cpu|z990.3-s390-cpu|z990.4-base-s390-cpu|
+          z990.4-s390-cpu|z990.5-base-s390-cpu|z990.5-s390-cpu|
+          z990-base-s390-cpu|z990-s390-cpu|z9BC.2-base-s390-cpu|z9BC.2-s390-cpu|
+          z9BC-base-s390-cpu|z9BC-s390-cpu|z9EC.2-base-s390-cpu|z9EC.2-s390-cpu|
+          z9EC.3-base-s390-cpu|z9EC.3-s390-cpu|z9EC-base-s390-cpu|z9EC-s390-cpu|
+          zBC12-base-s390-cpu|zBC12-s390-cpu|zEC12.2-base-s390-cpu|
+          zEC12.2-s390-cpu|zEC12-base-s390-cpu|zEC12-s390-cpu|zpci]
           (the following are aliases of these unsupported devices: lsi|
           virtio-input-host|virtio-keyboard|virtio-mouse|virtio-tablet|
-          virtio-gpu|pci-assign)
+          virtio-gpu|virtio-9p|pci-assign|ahci|e1000-82540em)
           (note that some of these device names represent supported devices and
           are used internally, but are not specifyable via -device even though
           they appear in the list of devices)
   -drive ,if=[scsi|mtd|pflash], snapshot=on, format=[anything besides qcow2, qed
          or raw]
   -dtb file
+  -fda/-fdb ...
   -g ...
+  -hda/-hdb/-hdc/-hdd ...
   -icount ...
   -L ...
   -M [s390-ccw-virtio-2.4|s390-ccw-virtio-2.5|s390-ccw-virtio-2.7|
@@ -572,6 +569,7 @@ QEMU Command-Line and Monitor Syntax and Support
   -mtdblock file
   -net [dump|socket|vde] ...
   -netdev [dump|hubport|l2tpv3|socket|vde] ...
+  -no-fd-bootchk
   -no-kvm
   -no-kvm-irqchip
   -no-kvm-pit
@@ -587,12 +585,19 @@ QEMU Command-Line and Monitor Syntax and Support
   -sd file
   -set ...
   -singlestep
+  -smbios ...
   -snapshot
   -soundhw ...
   -tb-size ...
-  -vga [cg3|tcx|virtio|vmware]
+  -tdf
+  -tpmdev passthrough ...
+  -usb
+  -usbdevice [braile|disk|host|mouse|net|serial|tablet]
+  -vga [cg3|tcx|virtio|cirrus|xenfb|vmware]
   -win2k-hack
+  -xen-attach ...
   -xen-create
+  -xen-domid ...
 
 - The following monitor commands are unsupported:
   acl_add ...
@@ -624,6 +629,8 @@ QEMU Command-Line and Monitor Syntax and Support
   singlestep ...
   snapshot_blkdev ...
   stopcapture ...
+  usb_add ...
+  usb_del ...
   wavcapture ...
   x_colo_lost_heartbeat
 
@@ -642,7 +649,13 @@ QEMU Command-Line and Monitor Syntax and Support
   nbd-server-add
   nbd-server-start
   nbd-server-stop
+  query-tpm
+  query-tpm-models
+  query-tpm-types
   x-blockdev-change
   x-blockdev-insert-medium
   x-blockdev-remove-medium
   x-colo-lost-heartbeat
+  xen-load-devices-state
+  xen-save-devices-state
+  xen-set-global-dirty-log

supported.x86.txt

@@ -39,7 +39,6 @@ Overview
   documented elsewhere. This document focuses on the features and direct usage
   of QEMU/KVM as provided by the QEMU based packages.
 
-
 Major QEMU/KVM Supported Features
 ---------------------------------
 
@@ -161,10 +160,15 @@ Noteworthy QEMU/KVM Unsupported Features
 
 - GlusterFS integration is not enabled.
 
-
 Deprecated, Superseded, Modified and Dropped Features
 -----------------------------------------------------
 
+- http://wiki.qemu-project.org/Features/LegacyRemoval
+  This website tracks feature deprecation and removal at the upstream
+  development level. Our qemu package inherits this community direction, but be
+  aware that we can and will deviate as needed. Those deviations and additional
+  information can be found in this section.
+
 - When no video adapter is specified, the default used is stdvga. This differs
   from the default of prior releases which was cirrus. The cirrus adapter was
   considered too outdated to continue to use as the default.
@@ -211,7 +215,7 @@ Deprecated, Superseded, Modified and Dropped Features
 - These previously supported command line options are no longer recognized:
   -device pc-sysfw (no longer needed)
 
-- Specifying a CPUID feature with both "+feature/-feature" and "feature=on/off"
+- Specifying a cpu feature with both "+feature/-feature" and "feature=on/off"
   will now cause a warning. The current behavior for this combination where
   "+feature/-feature" wins over "feature=on/off", will be changed going forward
   so that "+feature" and "-feature" will be synonyms for "feature=on" and
@@ -318,14 +322,14 @@ QEMU Command-Line and Monitor Syntax and Support
           virtio-serial-pci|sga|i82559er|virtio-scsi-pci|scsi-cd|scsi-hd|
           scsi-generic|scsi-disk|scsi-block|pci-serial|pci-serial-2x|
           pci-serial-4x|ich9-ahci|piix-usb-uhci|usb-host|usb-serial|
-          usb-wacom-tablet|usb_braille|usb-net|pci-ohci|piix4-usb-uhci|
+          usb-wacom-tablet|usb-braille|usb-net|pci-ohci|piix4-usb-uhci|
           virtio-rng-pci|i6300esb|ib700|qxl|qxl-vga|pvpanic|vfio-pci|ivshmem|
           ivshmem-doorbell|ivshmem-plain|pci-bridge|megasas-gen2|pc-dimm|
           floppy|e1000e|ccid-card-emulated|ccid-card-passthrough|xen-backend|
-          loader]
+          loader|e1000]
           (the following are aliases of these supported devices: ahci|
           virtio-blk|virtio-net|virtio-serial|virtio-balloon| virtio-9p|
-          virtio-scsi|virtio-rng|e1000)
+          virtio-scsi|virtio-rng|e1000-82540em)
   -dfilter range, ...
   -display ...
   -drive ... (if specified if=[floppy|ide|virtio] and format=[qcow2|qed|raw] and
@@ -636,10 +640,10 @@ QEMU Command-Line and Monitor Syntax and Support
           virtio-rng-device|virtio-scsi-device|virtio-serial-device|vmxnet3|
           xen-pci-passthrough|xen-platform|xen-pvdevice|piix3-ide|piix3-ide-xen|
           piix3-ide|i8042|sdhci-pci|generic-sdhci|secondary-vga|edu|fw_cfg_io|
-          fw_cfg_mem|intel_iommu|usb-mtp|e1000-82540em|e1000-82544gc|
+          fw_cfg_mem|intel_iommu|usb-mtp|e1000-82544gc|e1000-82545em|
-          e1000-82545em|virtio-input-host-pci|virtio-keyboard-pci|
+          virtio-input-host-pci|virtio-keyboard-pci|virtio-mouse-pci|
-          virtio-mouse-pci|virtio-tablet-pci|virtio-gpu-pci|pci-bridge-seat|pxb|
+          virtio-tablet-pci|virtio-gpu-pci|pci-bridge-seat|pxb|pxb-pcie|
-          pxb-pcie|allwinner-ahci|sdhci-pci|rocker|virtio-input-host-device|
+          allwinner-ahci|sdhci-pci|rocker|virtio-input-host-device|
           virtio-keyboard-device|virtio-mouse-device|virtio-tablet-device|
           virtio-vga|hyperv-testdev|vfio-amd-xgbe|vfio-calxeda-xgmac|
           generic-sdhci|igd-passthrough-isa-bridge|ipmi-bmc-extern|