[Qemu-commits] [qemu/qemu] a52a88: e1000: document ICS read behaviour

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: a52a8841038638afe54ffb00e0aca48de0b1539a
      
https://github.com/qemu/qemu/commit/a52a8841038638afe54ffb00e0aca48de0b1539a
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2013-01-29 (Tue, 29 Jan 2013)

  Changed paths:
    M hw/e1000.c

  Log Message:
  -----------
  e1000: document ICS read behaviour

Add code comment to clarify the reason we set ICS with ICR:
the reason was previously undocumented and git
log confused rather than clarified the comments.

Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 4b25966ab976f3a7fd9008193b2defcc82f8f04d
      
https://github.com/qemu/qemu/commit/4b25966ab976f3a7fd9008193b2defcc82f8f04d
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2013-01-29 (Tue, 29 Jan 2013)

  Changed paths:
    M rules.mak

  Log Message:
  -----------
  rules.mak: cleanup config generation rules

This addresses two issues with config generation
1. rule generating timestamp has side effect.
Thus cleanup on error does not work.
2. rule for handling timestamp is too generic.
It can create any missing .h file.
As a result when .h file is removed, build
might try to create it using this rule which
results in build errors.

Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 6f329a55305c3b14da3c7b35f19379bae745e728
      
https://github.com/qemu/qemu/commit/6f329a55305c3b14da3c7b35f19379bae745e728
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2013-01-29 (Tue, 29 Jan 2013)

  Changed paths:
    M trace/Makefile.objs

  Log Message:
  -----------
  Makefile: clean timestamp generation rule

create timestamp by rule without sideeffects.

Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 7586317bc0db3b993446b21eec914f5b66645ee4
      
https://github.com/qemu/qemu/commit/7586317bc0db3b993446b21eec914f5b66645ee4
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2013-01-29 (Tue, 29 Jan 2013)

  Changed paths:
    M rules.mak

  Log Message:
  -----------
  rules/mak: make clean should blow away timestamp files

Using a global pattern makes it easier to clean out
old generated files.

Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 41dc8a67c7dcecdf7ae1cd25db3c46f2b42a221f
      
https://github.com/qemu/qemu/commit/41dc8a67c7dcecdf7ae1cd25db3c46f2b42a221f
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2013-01-29 (Tue, 29 Jan 2013)

  Changed paths:
    M hw/virtio-net.c

  Log Message:
  -----------
  virtio-net: revert mac on reset

Once guest overrides virtio net primary mac,
it retains the value set until qemu exit.
This is inconsistent with standard nic behaviour.
To fix, revert the mac to the original value on reset.

Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 921ac5d0f3a0df869db5ce4edf752f51d8b1596a
      
https://github.com/qemu/qemu/commit/921ac5d0f3a0df869db5ce4edf752f51d8b1596a
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2013-01-29 (Tue, 29 Jan 2013)

  Changed paths:
    M hw/virtio-net.c

  Log Message:
  -----------
  virtio-net: remove layout assumptions for ctrl vq

Virtio-net code makes assumption about virtqueue descriptor layout
(e.g. sg[0] is the header, sg[1] is the data buffer).

This patch makes code not rely on the layout of descriptors.

Signed-off-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Amos Kong <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: c1943a3f3774ee1aad51e8cc5b8cd24e66e198a5
      
https://github.com/qemu/qemu/commit/c1943a3f3774ee1aad51e8cc5b8cd24e66e198a5
  Author: Amos Kong <address@hidden>
  Date:   2013-01-29 (Tue, 29 Jan 2013)

  Changed paths:
    M hw/pc_piix.c
    M hw/virtio-net.c
    M hw/virtio-net.h

  Log Message:
  -----------
  virtio-net: introduce a new macaddr control

In virtio-net guest driver, currently we write MAC address to
pci config space byte by byte, this means that we have an
intermediate step where mac is wrong. This patch introduced
a new control command to set MAC address, it's atomic.

VIRTIO_NET_F_CTRL_MAC_ADDR is a new feature bit for compatibility.

"mac" field will be set to read-only when VIRTIO_NET_F_CTRL_MAC_ADDR
is acked.

Signed-off-by: Amos Kong <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: dd23454ba2c83168b453155365671e67723b881f
      
https://github.com/qemu/qemu/commit/dd23454ba2c83168b453155365671e67723b881f
  Author: Amos Kong <address@hidden>
  Date:   2013-01-29 (Tue, 29 Jan 2013)

  Changed paths:
    M hw/virtio-net.c
    M hw/virtio-net.h

  Log Message:
  -----------
  virtio-net: rename ctrl rx commands

This patch makes rx commands consistent with specification.

Signed-off-by: Amos Kong <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 91c3f2f00810a9ba5e4404c9611197efd8f694c8
      
https://github.com/qemu/qemu/commit/91c3f2f00810a9ba5e4404c9611197efd8f694c8
  Author: Jason Baron <address@hidden>
  Date:   2013-01-29 (Tue, 29 Jan 2013)

  Changed paths:
    M hw/ich9.h
    M hw/lpc_ich9.c
    M hw/pc_q35.c

  Log Message:
  -----------
  ich9: add support for pci assignment

Fills out support for the pci assignment API.  Added:

PCIINTxRoute ich9_route_intx_pin_to_irq(void *opaque, int pirq_pin)

Add calls to pci_bus_fire_intx_routing_notifier() when routing changes
are made.

Signed-off-by: Jason Baron <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 1ec4ba741630699665a6334f3959271da3effec7
      
https://github.com/qemu/qemu/commit/1ec4ba741630699665a6334f3959271da3effec7
  Author: Laszlo Ersek <address@hidden>
  Date:   2013-01-29 (Tue, 29 Jan 2013)

  Changed paths:
    M hw/piix_pci.c

  Log Message:
  -----------
  PIIX3: reset the VM when the Reset Control Register's RCPU bit gets set

  Traditional PCI config space access is achieved by writing a 32 bit
  value to io port 0xcf8 to identify the bus, device, function and config
  register. Port 0xcfc then contains the register in question. But if you
  write the appropriate pair of magic values to 0xcf9, the machine will
  reboot. Spectacular! And not standardised in any way (certainly not part
  of the PCI spec), so different chipsets may have different requirements.
  Booo.

In the PIIX3 spec, IO port 0xcf9 is specified as the Reset Control
Register. Bit 1 (System Reset, SRST) would normally differentiate between
soft reset and hard reset, but we ignore the difference beyond allowing
the guest to read it back.

RHBZ reference: 890459

This patch introduces the following overlap between the preexistent
"pci-conf-idx" region and the "piix3-reset-control" region just being
added. Partial output from "info mtree":

  I/O
  0000000000000000-000000000000ffff (prio 0, RW): io
    0000000000000cf8-0000000000000cfb (prio 0, RW): pci-conf-idx
    0000000000000cf9-0000000000000cf9 (prio 1, RW): piix3-reset-control

I sanity-checked the patch by booting a RHEL-6.3 guest and found no
problems. I summoned gdb and set a breakpoint on rcr_write() in order to
gather a bit more confidence. Relevant frames of the stack:

  kvm_handle_io (port=3321, data=0x7f3f5f3de000, direction=1, size=1,
           count=1)                                 [kvm-all.c:1422]
    cpu_outb (addr=3321, val=6 '\006')                      [ioport.c:289]
      ioport_write (index=0, address=3321, data=6)           [ioport.c:83]
  ioport_writeb_thunk (opaque=0x7f3f622c4680, addr=3321, data=6)
                                                      [ioport.c:212]
    memory_region_iorange_write (iorange=0x7f3f622c4680, offset=0,
                                 width=1, data=6)     [memory.c:439]
      access_with_adjusted_size (addr=0, value=0x7f3f531fbac0,
                                 size=1, access_size_min=1,
                                 access_size_max=4,
                                 access=0x7f3f5f6e0f90
                                     <memory_region_write_accessor>,
                                 opaque=0x7f3f6227b668)
                                                      [memory.c:364]
        memory_region_write_accessor (opaque=0x7f3f6227b668, addr=0,
                                      value=0x7f3f531fbac0, size=1,
                                      shift=0, mask=255)
                                                      [memory.c:334]
          rcr_write (opaque=0x7f3f6227afb0, addr=0, val=6, len=1)
                                                 [hw/piix_pci.c:498]

The dispatch happens in ioport_write(); "index=0" means byte-wide access:

    static void ioport_write(int index, uint32_t address, uint32_t data)
    {
  static IOPortWriteFunc * const default_func[3] = {
      default_ioport_writeb,
      default_ioport_writew,
      default_ioport_writel
  };
  IOPortWriteFunc *func = ioport_write_table[index][address];
  if (!func)
      func = default_func[index];
  func(ioport_opaque[address], address, data);
    }

The "ioport_write_table" and "ioport_opaque" arrays describe the flattened
IO port space. The first array is less interesting (it selects a thunk
function). The "ioport_opaque" array is interesting because it decides how
writing to the port is implemented ultimately.

4-byte wide access to 0xcf8 (pci-conf-idx):

  (gdb) print ioport_write_table[2][0xcf8]
  $1 = (IOPortWriteFunc *) 0x7f3f5f6d99ba <ioport_writel_thunk>

  (gdb) print \
  ((struct MemoryRegionIORange*)ioport_opaque[0xcf8])->mr->ops.write
  $2 = (void (*)(void *, hwaddr, uint64_t, unsigned int))
       0x7f3f5f5575cb <pci_host_config_write>

1-byte wide access to 0xcf9 (piix3-reset-control):

  (gdb) print ioport_write_table[0][0xcf9]
  $3 = (IOPortWriteFunc *) 0x7f3f5f6d98d0 <ioport_writeb_thunk>

  (gdb) print \
  ((struct MemoryRegionIORange*)ioport_opaque[0xcf9])->mr->ops.write
  $4 = (void (*)(void *, hwaddr, uint64_t, unsigned int))
       0x7f3f5f6b42f1 <rcr_write>

The higher priority of "piix3-reset-control" ensures that the 0xcf9
entries in ioport_write_table / ioport_opaque will always belong to it,
independently of its relative registration order versus "pci-conf-idx".

Signed-off-by: Laszlo Ersek <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 6a659bbff991b0033d1bf1ff71b7d550e0367d99
      
https://github.com/qemu/qemu/commit/6a659bbff991b0033d1bf1ff71b7d550e0367d99
  Author: Alex Williamson <address@hidden>
  Date:   2013-01-29 (Tue, 29 Jan 2013)

  Changed paths:
    M hw/vfio_pci.c

  Log Message:
  -----------
  vfio-pci: Enable PCIe extended config space

We don't know pre-init time whether the device we're exposing is PCIe
or legacy PCI.  We could ask for it to be specified via a device
option, but that seems like too much to ask of the user.  Instead we
can assume everything will be PCIe, which makes PCI-core allocate
enough config space.  Removing the flag during init leaves the space
allocated, but allows legacy PCI devices to report the real device
config space size to rest of Qemu.

Signed-off-by: Alex Williamson <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 477a3877fdc3125f309133ce511236f39f58c16e
      
https://github.com/qemu/qemu/commit/477a3877fdc3125f309133ce511236f39f58c16e
  Author: Henry Harrington <address@hidden>
  Date:   2013-01-31 (Thu, 31 Jan 2013)

  Changed paths:
    M ui/cocoa.m

  Log Message:
  -----------
  cocoa: Fix VBE function Set Display Start

Register a dpy_gfx_setdata callback so that the Cocoa code
is notified whenever the screen start address changes.

Commit 1d3323d has a similar fix for the VNC UI.

Signed-off-by: Henry Harrington <address@hidden>
Cc: address@hidden (1.3.x)
Signed-off-by: Andreas Färber <address@hidden>


  Commit: 7e02dc63b8f16372107434d44269e21cdff5d19d
      
https://github.com/qemu/qemu/commit/7e02dc63b8f16372107434d44269e21cdff5d19d
  Author: Stefan Weil <address@hidden>
  Date:   2013-01-31 (Thu, 31 Jan 2013)

  Changed paths:
    M ui/cocoa.m

  Log Message:
  -----------
  cocoa: Replace non-portable asprintf() by g_strdup_printf()

Signed-off-by: Stefan Weil <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>


  Commit: 88e28512efd8d36476e50a78acb1dca8b41a3cf1
      
https://github.com/qemu/qemu/commit/88e28512efd8d36476e50a78acb1dca8b41a3cf1
  Author: Andreas Färber <address@hidden>
  Date:   2013-01-31 (Thu, 31 Jan 2013)

  Changed paths:
    M target-unicore32/Makefile.objs
    M target-unicore32/cpu.c
    M target-unicore32/cpu.h
    R target-unicore32/machine.c

  Log Message:
  -----------
  target-unicore32: Mark as unmigratable

CPU_SAVE_VERSION 2 was bogus as both save and load would just throw a
hw_error(). Therefore we can without problems suppress registration of
"cpu_common" VMState by dropping CPU_SAVE_VERSION define and provide an
unmigratable "cpu" VMStateDescription for UniCore32CPU at device level
instead, where we can attach this the QOM way.

Signed-off-by: Juan Quintela <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>


  Commit: 3ce8b2bcbff6445f84db53ef38dbc4e5dd102676
      
https://github.com/qemu/qemu/commit/3ce8b2bcbff6445f84db53ef38dbc4e5dd102676
  Author: Andreas Färber <address@hidden>
  Date:   2013-01-31 (Thu, 31 Jan 2013)

  Changed paths:
    M target-microblaze/Makefile.objs
    M target-microblaze/cpu.c
    M target-microblaze/cpu.h
    R target-microblaze/machine.c

  Log Message:
  -----------
  target-microblaze: Mark as unmigratable

cpu_{save,load} were no-ops, so de facto it is unmigratable and no
backwards compatibility to keep. Therefore mark the MicroBlazeCPU as
unmigratable at device level the QOM way and suppress "cpu_common"
VMState registration by dropping CPU_SAVE_VERSION.

Signed-off-by: Juan Quintela <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>


  Commit: 004a569057492784e4922f2f8cb396fb55affe71
      
https://github.com/qemu/qemu/commit/004a569057492784e4922f2f8cb396fb55affe71
  Author: Andreas Färber <address@hidden>
  Date:   2013-01-31 (Thu, 31 Jan 2013)

  Changed paths:
    M target-xtensa/Makefile.objs
    M target-xtensa/cpu.c
    R target-xtensa/machine.c

  Log Message:
  -----------
  target-xtensa: Mark as unmigratable

There was no CPU_SAVE_VERSION defined, so neither "cpu_common" VMState
nor cpu_{save,load}() were registered. Their implementation was no-op.
Therefore there is no backwards compatibility to keep, so mark XtensaCPU
as unmigratable at device level.

Signed-off-by: Andreas Färber <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>


  Commit: 1e45d31b04b1e3ccad2bfb3b4a90a75317ada16a
      
https://github.com/qemu/qemu/commit/1e45d31b04b1e3ccad2bfb3b4a90a75317ada16a
  Author: Andreas Färber <address@hidden>
  Date:   2013-01-31 (Thu, 31 Jan 2013)

  Changed paths:
    M target-sh4/Makefile.objs
    M target-sh4/cpu.c
    R target-sh4/machine.c

  Log Message:
  -----------
  target-sh4: Mark as unmigratable

It neither defined CPU_SAVE_VERSION nor implemented cpu{save,load}().
Mark it as unmigratable at device level.

Signed-off-by: Andreas Färber <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>


  Commit: c7396bbb2597577b1463fc997a73e67b8a067880
      
https://github.com/qemu/qemu/commit/c7396bbb2597577b1463fc997a73e67b8a067880
  Author: Andreas Färber <address@hidden>
  Date:   2013-01-31 (Thu, 31 Jan 2013)

  Changed paths:
    M target-s390x/Makefile.objs
    M target-s390x/cpu.c
    R target-s390x/machine.c

  Log Message:
  -----------
  target-s390x: Mark as unmigratable

CPU_SAVE_VERSION was undefined, so "cpu_common" VMState and
cpu_{save,load}() were not registered. They were no-ops.
Therefore there is no backwards compatibility to keep, so we can mark
S390CPU as unmigratable at device level.

Signed-off-by: Andreas Färber <address@hidden>
Acked-by: Alexander Graf <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>


  Commit: 087fe4f824e88d5924bf6887cb59985510a790b7
      
https://github.com/qemu/qemu/commit/087fe4f824e88d5924bf6887cb59985510a790b7
  Author: Andreas Färber <address@hidden>
  Date:   2013-01-31 (Thu, 31 Jan 2013)

  Changed paths:
    M target-m68k/Makefile.objs
    M target-m68k/cpu.c
    R target-m68k/machine.c

  Log Message:
  -----------
  target-m68k: Mark as unmigratable

It neither defined CPU_SAVE_VERSION nor implemented cpu_{save,load}().
Mark M68kCPU as unmigratable at device level.

Signed-off-by: Andreas Färber <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>


  Commit: 7a9f812b381639b96a020bdb1f4783f11f886754
      
https://github.com/qemu/qemu/commit/7a9f812b381639b96a020bdb1f4783f11f886754
  Author: Andreas Färber <address@hidden>
  Date:   2013-01-31 (Thu, 31 Jan 2013)

  Changed paths:
    M target-m68k/cpu.c
    M target-m68k/helper.c

  Log Message:
  -----------
  target-m68k: Rename CPU subtypes

In the initial conversion of CPU models to QOM types, model names were
mapped 1:1 to type names. As a side effect this gained us a type "any",
which is now a device.

To avoid "-device any" silliness and to pave the way for compiling
multiple targets into one executable, adopt a <name>-<arch>-cpu scheme.

No functional changes for -cpu arguments or -cpu ? output.

Signed-off-by: Andreas Färber <address@hidden>


  Commit: bc755a00b1fd58ac9bfa316237134958489f0145
      
https://github.com/qemu/qemu/commit/bc755a00b1fd58ac9bfa316237134958489f0145
  Author: Andreas Färber <address@hidden>
  Date:   2013-01-31 (Thu, 31 Jan 2013)

  Changed paths:
    M target-openrisc/cpu.c

  Log Message:
  -----------
  target-openrisc: TYPE_OPENRISC_CPU should be abstract

A basic assumption of CPU subtypes is that only specific models get
instantiated. A user is not supposed to instantiate an <arch>-cpu.
Suppress it via abstract = true, which also drops or32-cpu from
-cpu ? output.

Cc: address@hidden
Cc: Jia Liu <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>


  Commit: 478032a93d908e59085c1ac56f10979942e7dc4f
      
https://github.com/qemu/qemu/commit/478032a93d908e59085c1ac56f10979942e7dc4f
  Author: Andreas Färber <address@hidden>
  Date:   2013-01-31 (Thu, 31 Jan 2013)

  Changed paths:
    M target-openrisc/cpu.c

  Log Message:
  -----------
  target-openrisc: Rename CPU subtypes

Model names were mapped 1:1 to type names. As a side effect this
registered a type "any", which is now a device.

To avoid "-device any" silliness and to pave the way for compiling
multiple targets into one executable, adopt a <name>-<arch>-cpu scheme.

No functional changes for -cpu arguments or -cpu ? output.

Signed-off-by: Andreas Färber <address@hidden>


  Commit: eeb266ded886185d1d3b0d8bc089ec72df1a2bfd
      
https://github.com/qemu/qemu/commit/eeb266ded886185d1d3b0d8bc089ec72df1a2bfd
  Author: Andreas Färber <address@hidden>
  Date:   2013-01-31 (Thu, 31 Jan 2013)

  Changed paths:
    M target-unicore32/cpu.c
    M target-unicore32/helper.c

  Log Message:
  -----------
  target-unicore32: Rename CPU subtypes

In the initial conversion of CPU models to QOM types, model names were
mapped 1:1 to type names. As a side effect this gained us a type "any",
which is now a device.

To avoid "-device any" silliness and to pave the way for compiling
multiple targets into one executable, adopt a <name>-<arch>-cpu scheme.

No functional changes for -cpu arguments.

Signed-off-by: Andreas Färber <address@hidden>


  Commit: cc36a7a2c7e281d7d715ac73d31bbccc0d2d2670
      
https://github.com/qemu/qemu/commit/cc36a7a2c7e281d7d715ac73d31bbccc0d2d2670
  Author: Andreas Färber <address@hidden>
  Date:   2013-01-31 (Thu, 31 Jan 2013)

  Changed paths:
    M hw/pc.c
    M target-i386/cpu.h
    M target-i386/helper.c

  Log Message:
  -----------
  target-i386: Pass X86CPU to cpu_x86_set_a20()

Prepares for cpu_interrupt() changing argument to CPUState.

While touching it, rename to x86_cpu_...() now that it takes an X86CPU.

Signed-off-by: Andreas Färber <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>


  Commit: 77868120cfe93ad7816dfac6546684e5a6c6e256
      
https://github.com/qemu/qemu/commit/77868120cfe93ad7816dfac6546684e5a6c6e256
  Author: Andreas Färber <address@hidden>
  Date:   2013-01-31 (Thu, 31 Jan 2013)

  Changed paths:
    M bsd-user/main.c
    M linux-user/main.c

  Log Message:
  -----------
  linux-user: bsd-user: Don't reset X86CPU twice

Since commit 65dee38052597b6285eb208125369f01b29ba6c1 (target-i386:
move cpu_reset and reset callback to cpu.c) the x86 CPU is reset through
cpu_init() but was still reset immediately after in linux-user and
bsd-user. Clean this up.

Similarly in linux-user/syscall.c it is also reset after cpu_copy().
But that's a bug of its own, fixing which poses a semantic change.

Signed-off-by: Andreas Färber <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>


  Commit: c628d74738bfdb872f771407a2790509ec4520f9
      
https://github.com/qemu/qemu/commit/c628d74738bfdb872f771407a2790509ec4520f9
  Author: Anthony Liguori <address@hidden>
  Date:   2013-01-31 (Thu, 31 Jan 2013)

  Changed paths:
    M hw/e1000.c
    M hw/ich9.h
    M hw/lpc_ich9.c
    M hw/pc_piix.c
    M hw/pc_q35.c
    M hw/piix_pci.c
    M hw/vfio_pci.c
    M hw/virtio-net.c
    M hw/virtio-net.h
    M rules.mak
    M trace/Makefile.objs

  Log Message:
  -----------
  Merge remote-tracking branch 'mst/tags/for_anthony' into staging

virtio,make,pci,e1000,vfio,piix

This includes my timestamp generation cleanup,
Amos's and my work on virtio net commands,
pci,e1000,vfio and piix fixes.

Signed-off-by: Michael S. Tsirkin <address@hidden>

# gpg: Signature made Thu 31 Jan 2013 06:20:27 AM CST using RSA key ID D28D5469
# gpg: Can't check signature: public key not found

# By Michael S. Tsirkin (6) and others
# Via Michael S. Tsirkin
* mst/tags/for_anthony:
  vfio-pci: Enable PCIe extended config space
  PIIX3: reset the VM when the Reset Control Register's RCPU bit gets set
  ich9: add support for pci assignment
  virtio-net: rename ctrl rx commands
  virtio-net: introduce a new macaddr control
  virtio-net: remove layout assumptions for ctrl vq
  virtio-net: revert mac on reset
  rules/mak: make clean should blow away timestamp files
  Makefile: clean timestamp generation rule
  rules.mak: cleanup config generation rules
  e1000: document ICS read behaviour


  Commit: 2854c549e84532f0b76b7884f1903da8a1bf4dbb
      
https://github.com/qemu/qemu/commit/2854c549e84532f0b76b7884f1903da8a1bf4dbb
  Author: Anthony Liguori <address@hidden>
  Date:   2013-01-31 (Thu, 31 Jan 2013)

  Changed paths:
    M ui/cocoa.m

  Log Message:
  -----------
  Merge remote-tracking branch 'afaerber-or/cocoa-for-upstream' into staging

# By Henry Harrington (1) and Stefan Weil (1)
# Via Andreas Färber
* afaerber-or/cocoa-for-upstream:
  cocoa: Replace non-portable asprintf() by g_strdup_printf()
  cocoa: Fix VBE function Set Display Start


  Commit: 8a55ebf01507ab73cc458cfcd5b9cb856aba0b9e
      
https://github.com/qemu/qemu/commit/8a55ebf01507ab73cc458cfcd5b9cb856aba0b9e
  Author: Anthony Liguori <address@hidden>
  Date:   2013-01-31 (Thu, 31 Jan 2013)

  Changed paths:
    M bsd-user/main.c
    M hw/ide.h
    M hw/ide/mmio.c
    M hw/pc.c
    M hw/r2d.c
    M linux-user/main.c
    M target-i386/cpu.h
    M target-i386/helper.c
    M target-m68k/Makefile.objs
    M target-m68k/cpu.c
    M target-m68k/helper.c
    R target-m68k/machine.c
    M target-microblaze/Makefile.objs
    M target-microblaze/cpu.c
    M target-microblaze/cpu.h
    R target-microblaze/machine.c
    M target-openrisc/cpu.c
    M target-s390x/Makefile.objs
    M target-s390x/cpu.c
    R target-s390x/machine.c
    M target-sh4/Makefile.objs
    M target-sh4/cpu.c
    R target-sh4/machine.c
    M target-unicore32/Makefile.objs
    M target-unicore32/cpu.c
    M target-unicore32/cpu.h
    M target-unicore32/helper.c
    R target-unicore32/machine.c
    M target-xtensa/Makefile.objs
    M target-xtensa/cpu.c
    R target-xtensa/machine.c

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

# By Andreas Färber
# Via Andreas Färber
* afaerber/qom-cpu:
  linux-user: bsd-user: Don't reset X86CPU twice
  target-i386: Pass X86CPU to cpu_x86_set_a20()
  target-unicore32: Rename CPU subtypes
  target-openrisc: Rename CPU subtypes
  target-openrisc: TYPE_OPENRISC_CPU should be abstract
  target-m68k: Rename CPU subtypes
  target-m68k: Mark as unmigratable
  target-s390x: Mark as unmigratable
  target-sh4: Mark as unmigratable
  target-xtensa: Mark as unmigratable
  target-microblaze: Mark as unmigratable
  target-unicore32: Mark as unmigratable
  ide/mmio: QOM'ify MMIO IDE for R2D


Compare: https://github.com/qemu/qemu/compare/6b2578d67849...8a55ebf01507