Commit d246ff5d authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Trivial patches for 4.0 (2019-01-09)

# gpg: Signature made Wed 09 Jan 2019 13:06:58 GMT
# gpg:                using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>"
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/trivial-patches-pull-request:
  ioapic: use TYPE_FOO MACRO than constant string
  trivial: Don't include isa.h if it is not really necessary
  hw/audio/marvell: Don't include unnecessary i2c.h header file
  qom: Include qemu/fprintf-fn.h in cpu.h
  hw/core: fix whitespace in a sentence
  typedefs: (Re-)sort entries alphabetically

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b7744b86 34bec7a8

hw/audio/marvell_88w8618.c

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include "qemu/osdep.h"

#include "hw/sysbus.h"

#include "hw/hw.h"

#include "hw/i2c/i2c.h"

#include "hw/audio/wm8750.h"

#include "audio/audio.h"

#include "qapi/error.h"

hw/display/ramfb-standalone.c

+0 −1
Original line number Diff line number Diff line 
#include "qemu/osdep.h"

#include "qapi/error.h"

#include "hw/loader.h"

#include "hw/isa/isa.h"

#include "hw/display/ramfb.h"

#include "ui/console.h"

#include "sysemu/sysemu.h"

hw/i386/kvm/ioapic.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static void kvm_ioapic_class_init(ObjectClass *klass, void *data) 
}



static const TypeInfo kvm_ioapic_info = {

    .name  = "kvm-ioapic",

    .name  = TYPE_KVM_IOAPIC,

    .parent = TYPE_IOAPIC_COMMON,

    .instance_size = sizeof(KVMIOAPICState),

    .class_init = kvm_ioapic_class_init,

hw/i386/pc.c

+2 −2
Original line number Diff line number Diff line
@@ -2339,9 +2339,9 @@ void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name) 
    unsigned int i;



    if (kvm_ioapic_in_kernel()) {

        dev = qdev_create(NULL, "kvm-ioapic");

        dev = qdev_create(NULL, TYPE_KVM_IOAPIC);

    } else {

        dev = qdev_create(NULL, "ioapic");

        dev = qdev_create(NULL, TYPE_IOAPIC);

    }

    if (parent_name) {

        object_property_add_child(object_resolve_path(parent_name, NULL),

hw/ide/pci.c

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include "qemu/osdep.h"

#include "hw/hw.h"

#include "hw/pci/pci.h"

#include "hw/isa/isa.h"

#include "sysemu/dma.h"

#include "qemu/error-report.h"

#include "hw/ide/pci.h"