OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Introduce range.h

Browse Source 
Extract range functions from pci.h. These will be used by later patches
by non-PCI devices. Adjust current users.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2010-09-18 05:53:14 +00:00
parent f562e716c9
commit bf1b007123
7 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/acpi_piix4.c
View File

@ -22,6 +22,7 @@
#include "pci.h"
#include "acpi.h"
#include "sysemu.h"
#include "range.h"
//#define DEBUG

1
hw/msix.c
View File

@ -14,6 +14,7 @@
#include "hw.h"
#include "msix.h"
#include "pci.h"
#include "range.h"
/* MSI-X capability structure */
#define MSIX_TABLE_OFFSET 4

1
hw/pci.c
View File

@ -28,6 +28,7 @@
#include "sysemu.h"
#include "loader.h"
#include "qemu-objects.h"
#include "range.h"
//#define DEBUG_PCI
#ifdef DEBUG_PCI

29
hw/pci.h
View File

@ -365,33 +365,4 @@ static inline uint32_t pci_config_size(const PCIDevice *d)
return pci_is_express(d) ? PCIE_CONFIG_SPACE_SIZE : PCI_CONFIG_SPACE_SIZE;
}
/* These are not pci specific. Should move into a separate header.
* Only pci.c uses them, so keep them here for now.
*/
/* Get last byte of a range from offset + length.
* Undefined for ranges that wrap around 0. */
static inline uint64_t range_get_last(uint64_t offset, uint64_t len)
{
return offset + len - 1;
}
/* Check whether a given range covers a given byte. */
static inline int range_covers_byte(uint64_t offset, uint64_t len,
uint64_t byte)
{
return offset <= byte && byte <= range_get_last(offset, len);
}
/* Check whether 2 given ranges overlap.
* Undefined if ranges that wrap around 0. */
static inline int ranges_overlap(uint64_t first1, uint64_t len1,
uint64_t first2, uint64_t len2)
{
uint64_t last1 = range_get_last(first1, len1);
uint64_t last2 = range_get_last(first2, len2);
return !(last2 < first1 || last1 < first2);
}
#endif

1
hw/piix_pci.c
View File

@ -28,6 +28,7 @@
#include "pci_host.h"
#include "isa.h"
#include "sysbus.h"
#include "range.h"
/*
* I440FX chipset data sheet.

3
hw/vhost.c
View File

@ -13,8 +13,7 @@
#include <sys/ioctl.h>
#include "vhost.h"
#include "hw/hw.h"
/* For range_get_last */
#include "pci.h"
#include "range.h"
#include <linux/vhost.h>
static void vhost_dev_sync_region(struct vhost_dev *dev,

29
range.h Normal file
View File

@ -0,0 +1,29 @@
#ifndef QEMU_RANGE_H
#define QEMU_RANGE_H
/* Get last byte of a range from offset + length.
* Undefined for ranges that wrap around 0. */
static inline uint64_t range_get_last(uint64_t offset, uint64_t len)
{
return offset + len - 1;
}
/* Check whether a given range covers a given byte. */
static inline int range_covers_byte(uint64_t offset, uint64_t len,
uint64_t byte)
{
return offset <= byte && byte <= range_get_last(offset, len);
}
/* Check whether 2 given ranges overlap.
* Undefined if ranges that wrap around 0. */
static inline int ranges_overlap(uint64_t first1, uint64_t len1,
uint64_t first2, uint64_t len2)
{
uint64_t last1 = range_get_last(first1, len1);
uint64_t last2 = range_get_last(first2, len2);
return !(last2 < first1 || last1 < first2);
}
#endif