Merge commit 'b5ec5ce0e39d6e7ea707d5604a5f6d567dfd2f48' into upstream-merge

* commit 'b5ec5ce0e39d6e7ea707d5604a5f6d567dfd2f48':
  Add cpu model configuration support..
  add close callback for tty-based char device
  Fix lost serial TX interrupts. Report receive overruns.
  tcg/ppc: Fix typo
  apc_pci: simplify using rwhandler
  apb_pci: minor cleanup
  Update OpenBIOS images to r683
  Fix arm-softmmu compile
  tcg/ppc64: Use C90 style comments
  tcg/ppc: Implement some of the optional ops
  tcg: fix build on 32-bit hppa, ppc and sparc hosts
  PL181 write fix
  Allow const QemuOptDesc
  cris: Add CRISv10 gdbstub support.
  cris: Mask interrupts on dslots for CRISv10.
  microblaze: Improve brk emulation.
  microblaze: Dont segfault when singlestepping first insn.
  target-sparc: fix --enable-debug build
  tcg: fix assertion with --enable-debug

Conflicts:
	target-i386/helper.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 49 insertions, 0 deletions

diff --git a/qemu-config.c b/qemu-config.c
index 2caf76c93..6cecf3341 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -246,6 +246,54 @@ QemuOptsList qemu_mon_opts = {
     },
 };
 
+QemuOptsList qemu_cpudef_opts = {
+    .name = "cpudef",
+    .head = QTAILQ_HEAD_INITIALIZER(qemu_cpudef_opts.head),
+    .desc = {
+        {
+            .name = "name",
+            .type = QEMU_OPT_STRING,
+        },{
+            .name = "level",
+            .type = QEMU_OPT_NUMBER,
+        },{
+            .name = "vendor",
+            .type = QEMU_OPT_STRING,
+        },{
+            .name = "family",
+            .type = QEMU_OPT_NUMBER,
+        },{
+            .name = "model",
+            .type = QEMU_OPT_NUMBER,
+        },{
+            .name = "stepping",
+            .type = QEMU_OPT_NUMBER,
+        },{
+            .name = "feature_edx",      /* cpuid 0000_0001.edx */
+            .type = QEMU_OPT_STRING,
+        },{
+            .name = "feature_ecx",      /* cpuid 0000_0001.ecx */
+            .type = QEMU_OPT_STRING,
+        },{
+            .name = "extfeature_edx",   /* cpuid 8000_0001.edx */
+            .type = QEMU_OPT_STRING,
+        },{
+            .name = "extfeature_ecx",   /* cpuid 8000_0001.ecx */
+            .type = QEMU_OPT_STRING,
+        },{
+            .name = "xlevel",
+            .type = QEMU_OPT_NUMBER,
+        },{
+            .name = "model_id",
+            .type = QEMU_OPT_STRING,
+        },{
+            .name = "vendor_override",
+            .type = QEMU_OPT_NUMBER,
+        },
+        { /* end of list */ }
+    },
+};
+
 static QemuOptsList *lists[] = {
     &qemu_drive_opts,
     &qemu_chardev_opts,
@@ -255,6 +303,7 @@ static QemuOptsList *lists[] = {
     &qemu_rtc_opts,
     &qemu_global_opts,
     &qemu_mon_opts,
+    &qemu_cpudef_opts,
     NULL,
 };