The following changes since commit 32694e98b8d7a246345448a8f707d2e11d6c65e2:

  Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging (2019-03-06 18:52:19 +0000)

are available in the Git repository at:

  git://git.kraxel.org/qemu tags/vga-20190308-pull-request

for you to fetch changes up to 61dbd9eaa1450f94886fb41366e4687d405c52c8:

  virtio-gpu: make virtio_gpu_reset static (2019-03-08 09:36:23 +0100)

----------------------------------------------------------------
vga: virtio reset fix, add ati emulation.

----------------------------------------------------------------

BALATON Zoltan (2):
  hw/display: Add basic ATI VGA emulation
  mips_fulong2e: Add on-board graphics chip

Gerd Hoffmann (3):
  virtio: add class_size to VirtioPCIDeviceTypeInfo
  virtio-vga: fix reset.
  virtio-gpu: make virtio_gpu_reset static

 hw/display/ati_int.h           |  96 ++++
 hw/display/ati_regs.h          | 461 ++++++++++++++++++
 hw/virtio/virtio-pci.h         |   1 +
 include/hw/virtio/virtio-gpu.h |   1 -
 hw/display/ati.c               | 865 +++++++++++++++++++++++++++++++++
 hw/display/ati_2d.c            | 167 +++++++
 hw/display/ati_dbg.c           | 259 ++++++++++
 hw/display/virtio-gpu.c        |   2 +-
 hw/display/virtio-vga.c        |  17 +-
 hw/mips/mips_fulong2e.c        |   6 +
 hw/virtio/virtio-pci.c         |   1 +
 vl.c                           |   1 +
 default-configs/pci.mak        |   1 +
 hw/display/Makefile.objs       |   2 +
 hw/display/trace-events        |   4 +
 15 files changed, 1880 insertions(+), 4 deletions(-)
 create mode 100644 hw/display/ati_int.h
 create mode 100644 hw/display/ati_regs.h
 create mode 100644 hw/display/ati.c
 create mode 100644 hw/display/ati_2d.c
 create mode 100644 hw/display/ati_dbg.c

-- 
2.18.1

On Fri, 8 Mar 2019 at 12:42, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> The following changes since commit 32694e98b8d7a246345448a8f707d2e11d6c65e2:
>
>   Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging (2019-03-06 18:52:19 +0000)
>
> are available in the Git repository at:
>
>   git://git.kraxel.org/qemu tags/vga-20190308-pull-request
>
> for you to fetch changes up to 61dbd9eaa1450f94886fb41366e4687d405c52c8:
>
>   virtio-gpu: make virtio_gpu_reset static (2019-03-08 09:36:23 +0100)
>
> ----------------------------------------------------------------
> vga: virtio reset fix, add ati emulation.
>
> ----------------------------------------------------------------

Hi -- I'm afraid this has conflicted with the Kconfig merge:

CONFLICT (modify/delete): default-configs/pci.mak deleted in HEAD and
modified in remotes/kraxel/tags/vga-20190308-pull-request.

Can you figure out what the Kconfig equivalent of the
pci.mak change is and resend, please?

thanks
-- PMM

On 09/03/19 15:42, Peter Maydell wrote:
> On Fri, 8 Mar 2019 at 12:42, Gerd Hoffmann <kraxel@redhat.com> wrote:
>>
>> The following changes since commit 32694e98b8d7a246345448a8f707d2e11d6c65e2:
>>
>>   Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging (2019-03-06 18:52:19 +0000)
>>
>> are available in the Git repository at:
>>
>>   git://git.kraxel.org/qemu tags/vga-20190308-pull-request
>>
>> for you to fetch changes up to 61dbd9eaa1450f94886fb41366e4687d405c52c8:
>>
>>   virtio-gpu: make virtio_gpu_reset static (2019-03-08 09:36:23 +0100)
>>
>> ----------------------------------------------------------------
>> vga: virtio reset fix, add ati emulation.
>>
>> ----------------------------------------------------------------
> 
> Hi -- I'm afraid this has conflicted with the Kconfig merge:
> 
> CONFLICT (modify/delete): default-configs/pci.mak deleted in HEAD and
> modified in remotes/kraxel/tags/vga-20190308-pull-request.
> 
> Can you figure out what the Kconfig equivalent of the
> pci.mak change is and resend, please?

Should be:

config ATI_VGA
    bool
    default y if PCI_DEVICES
    depends on PCI
    select VGA

Paolo