From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 19 Nov 2012 14:31:24 +0000 (-0600)
Subject: Merge remote-tracking branch 'afaerber/qom-cpu' into staging
X-Git-Tag: pull-nvme-20200902~6997
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f44d771a8cfb3a22f9de76f8aae1832ee671ecd7;p=qemu-nvme.git

Merge remote-tracking branch 'afaerber/qom-cpu' into staging

* afaerber/qom-cpu:
  target-i386: Add Haswell CPU model
  target-i386/cpu: Add new Opteron CPU model
  target-i386/cpu: Name new CPUID bits
  qapi-types.h: Don't include qemu-common.h
  osdep: Move qemu_{open,close}() prototypes
  qemu-config.h: Include headers it needs
  vnc-palette.h: Include <stdbool.h>
  qemu-fsdev-dummy.c: Include module.h
  qdev: Split up header so it can be used in cpu.h
  Move qemu_irq typedef out of qemu-common.h
  qemu-common.h: Comment about usage rules

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

f44d771a8cfb3a22f9de76f8aae1832ee671ecd7