Commit 0d74f3b4 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging 



Trivial fixes 06/06/2019

# gpg: Signature made Thu 06 Jun 2019 12:05:50 BST
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/trivial-branch-pull-request:
  hw/watchdog/wdt_i6300esb: Use DEVICE() macro to access DeviceState.qdev
  hw/scsi: Use the QOM BUS() macro to access BusState.qbus
  hw/sd: Use the QOM BUS() macro to access BusState.qbus
  hw/audio/ac97: Use the QOM DEVICE() macro to access DeviceState.qdev
  hw/vfio/pci: Use the QOM DEVICE() macro to access DeviceState.qdev
  hw/usb-storage: Use the QOM DEVICE() macro to access DeviceState.qdev
  hw/isa: Use the QOM DEVICE() macro to access DeviceState.qdev
  hw/s390x/event-facility: Use the QOM BUS() macro to access BusState.qbus
  hw/pci-bridge: Use the QOM BUS() macro to access BusState.qbus
  hw/scsi/vmw_pvscsi: Use qbus_reset_all() directly
  docs/devel/build-system: Update an example
  test: Fix make target check-report.tap
  util: Adjust qemu_guest_getrandom_nofail for Coverity
  vhost: fix incorrect print type
  migration: fix a typo
  hw/rdma: Delete unused headers inclusion

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 347a6f44 f1114d32

docs/devel/build-system.txt

+7 −12
Original line number Diff line number Diff line
@@ -413,18 +413,13 @@ context. 
- default-configs/*.mak



The files under default-configs/ control what emulated hardware is built

into each QEMU system and userspace emulator targets. They merely

contain a long list of config variable definitions. For example,

default-configs/x86_64-softmmu.mak has:



  include sound.mak

  include usb.mak

  CONFIG_QXL=$(CONFIG_SPICE)

  CONFIG_VGA_ISA=y

  CONFIG_VGA_CIRRUS=y

  CONFIG_VMWARE_VGA=y

  CONFIG_VIRTIO_VGA=y

  ...snip...

into each QEMU system and userspace emulator targets. They merely contain

a list of config variable definitions like the machines that should be

included. For example, default-configs/aarch64-softmmu.mak has:



  include arm-softmmu.mak

  CONFIG_XLNX_ZYNQMP_ARM=y

  CONFIG_XLNX_VERSAL=y



These files rarely need changing unless new devices / hardware need to

be enabled for a particular system/userspace emulation target

hw/audio/ac97.c

+1 −1
Original line number Diff line number Diff line
@@ -1388,7 +1388,7 @@ static void ac97_realize(PCIDevice *dev, Error **errp) 
    pci_register_bar (&s->dev, 0, PCI_BASE_ADDRESS_SPACE_IO, &s->io_nam);

    pci_register_bar (&s->dev, 1, PCI_BASE_ADDRESS_SPACE_IO, &s->io_nabm);

    AUD_register_card ("ac97", &s->card);

    ac97_on_reset (&s->dev.qdev);

    ac97_on_reset(DEVICE(s));

}



static void ac97_exit(PCIDevice *dev)

hw/isa/lpc_ich9.c

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ void ich9_lpc_pm_init(PCIDevice *lpc_pci, bool smm_enabled) 
                                 true);

    }



    ich9_lpc_reset(&lpc->d.qdev);

    ich9_lpc_reset(DEVICE(lpc));

}



/* APM */

hw/isa/vt82c686.c

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ static void vt82c686b_pm_realize(PCIDevice *dev, Error **errp) 
    pci_conf[0x90] = s->smb_io_base | 1;

    pci_conf[0x91] = s->smb_io_base >> 8;

    pci_conf[0xd2] = 0x90;

    pm_smbus_init(&s->dev.qdev, &s->smb, false);

    pm_smbus_init(DEVICE(s), &s->smb, false);

    memory_region_add_subregion(get_system_io(), s->smb_io_base, &s->smb.io);



    apm_init(dev, &s->apm, NULL, s);

hw/pci/pci_bridge.c

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ void pci_bridge_write_config(PCIDevice *d, 
    newctl = pci_get_word(d->config + PCI_BRIDGE_CONTROL);

    if (~oldctl & newctl & PCI_BRIDGE_CTL_BUS_RESET) {

        /* Trigger hot reset on 0->1 transition. */

        qbus_reset_all(&s->sec_bus.qbus);

        qbus_reset_all(BUS(&s->sec_bus));

    }

}