Commit bca964bc authored by Sergio Lopez's avatar Sergio Lopez Committed by Paolo Bonzini
Browse files

hw/virtio: Factorize virtio-mmio headers 



Put QOM and main struct definition in a separate header file, so it
can be accessed from other components.

Signed-off-by: default avatarSergio Lopez <slp@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 7320c8b4

hw/virtio/virtio-mmio.c

+1 −47
Original line number Diff line number Diff line
@@ -29,57 +29,11 @@ 
#include "qemu/host-utils.h"

#include "qemu/module.h"

#include "sysemu/kvm.h"

#include "hw/virtio/virtio-bus.h"

#include "hw/virtio/virtio-mmio.h"

#include "qemu/error-report.h"

#include "qemu/log.h"

#include "trace.h"



/* QOM macros */

/* virtio-mmio-bus */

#define TYPE_VIRTIO_MMIO_BUS "virtio-mmio-bus"

#define VIRTIO_MMIO_BUS(obj) \

        OBJECT_CHECK(VirtioBusState, (obj), TYPE_VIRTIO_MMIO_BUS)

#define VIRTIO_MMIO_BUS_GET_CLASS(obj) \

        OBJECT_GET_CLASS(VirtioBusClass, (obj), TYPE_VIRTIO_MMIO_BUS)

#define VIRTIO_MMIO_BUS_CLASS(klass) \

        OBJECT_CLASS_CHECK(VirtioBusClass, (klass), TYPE_VIRTIO_MMIO_BUS)



/* virtio-mmio */

#define TYPE_VIRTIO_MMIO "virtio-mmio"

#define VIRTIO_MMIO(obj) \

        OBJECT_CHECK(VirtIOMMIOProxy, (obj), TYPE_VIRTIO_MMIO)



#define VIRT_MAGIC 0x74726976 /* 'virt' */

#define VIRT_VERSION 2

#define VIRT_VERSION_LEGACY 1

#define VIRT_VENDOR 0x554D4551 /* 'QEMU' */



typedef struct VirtIOMMIOQueue {

    uint16_t num;

    bool enabled;

    uint32_t desc[2];

    uint32_t avail[2];

    uint32_t used[2];

} VirtIOMMIOQueue;



typedef struct {

    /* Generic */

    SysBusDevice parent_obj;

    MemoryRegion iomem;

    qemu_irq irq;

    bool legacy;

    /* Guest accessible state needing migration and reset */

    uint32_t host_features_sel;

    uint32_t guest_features_sel;

    uint32_t guest_page_shift;

    /* virtio-bus */

    VirtioBusState bus;

    bool format_transport_address;

    /* Fields only used for non-legacy (v2) devices */

    uint32_t guest_features[2];

    VirtIOMMIOQueue vqs[VIRTIO_QUEUE_MAX];

} VirtIOMMIOProxy;



static bool virtio_mmio_ioeventfd_enabled(DeviceState *d)

{

    return kvm_eventfds_enabled();

include/hw/virtio/virtio-mmio.h

0 → 100644
+73 −0
Original line number Diff line number Diff line 
/*

 * Virtio MMIO bindings

 *

 * Copyright (c) 2011 Linaro Limited

 *

 * Author:

 *  Peter Maydell <peter.maydell@linaro.org>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License; either version 2

 * of the License, or (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License along

 * with this program; if not, see <http://www.gnu.org/licenses/>.

 */



#ifndef HW_VIRTIO_MMIO_H

#define HW_VIRTIO_MMIO_H



#include "hw/virtio/virtio-bus.h"



/* QOM macros */

/* virtio-mmio-bus */

#define TYPE_VIRTIO_MMIO_BUS "virtio-mmio-bus"

#define VIRTIO_MMIO_BUS(obj) \

        OBJECT_CHECK(VirtioBusState, (obj), TYPE_VIRTIO_MMIO_BUS)

#define VIRTIO_MMIO_BUS_GET_CLASS(obj) \

        OBJECT_GET_CLASS(VirtioBusClass, (obj), TYPE_VIRTIO_MMIO_BUS)

#define VIRTIO_MMIO_BUS_CLASS(klass) \

        OBJECT_CLASS_CHECK(VirtioBusClass, (klass), TYPE_VIRTIO_MMIO_BUS)



/* virtio-mmio */

#define TYPE_VIRTIO_MMIO "virtio-mmio"

#define VIRTIO_MMIO(obj) \

        OBJECT_CHECK(VirtIOMMIOProxy, (obj), TYPE_VIRTIO_MMIO)



#define VIRT_MAGIC 0x74726976 /* 'virt' */

#define VIRT_VERSION 2

#define VIRT_VERSION_LEGACY 1

#define VIRT_VENDOR 0x554D4551 /* 'QEMU' */



typedef struct VirtIOMMIOQueue {

    uint16_t num;

    bool enabled;

    uint32_t desc[2];

    uint32_t avail[2];

    uint32_t used[2];

} VirtIOMMIOQueue;



typedef struct {

    /* Generic */

    SysBusDevice parent_obj;

    MemoryRegion iomem;

    qemu_irq irq;

    bool legacy;

    /* Guest accessible state needing migration and reset */

    uint32_t host_features_sel;

    uint32_t guest_features_sel;

    uint32_t guest_page_shift;

    /* virtio-bus */

    VirtioBusState bus;

    bool format_transport_address;

    /* Fields only used for non-legacy (v2) devices */

    uint32_t guest_features[2];

    VirtIOMMIOQueue vqs[VIRTIO_QUEUE_MAX];

} VirtIOMMIOProxy;



#endif