mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
trivial patches for 2016-10-08
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABCAAGBQJX+LTGAAoJEHAbT2saaT5ZIBwH+wfho+xxruEjro6qPvSAtdKk BBsOWBfBoqWfbAbOxxCO8ina2nA7p5XbyzSXUr94nZhvZMB9BkgL6la03gdS0Yr2 jHf0J9mM8fIbMQFsEKGOPcdpvU7VEXeFwridZYzypiRvbNSdWK3SKVBKgz2ADNhb l4Tos81IZeH/mw8HcU3XgSGSTV4JuKP4XsnmwlFMa8/sWM/X3vVgx5IG26KURZQm pW720jcX0meSfji5YvhspfbBbp1g2EorTZb6iLcZf+OUIB6XkViMisVasnyOo2HJ cehPlhAHixwq1kXGItc1fs11VloZ6hvEZ7kZ615jAdsD2sGJObtGDxgyJW3+gPo= =HPHj -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging trivial patches for 2016-10-08 # gpg: Signature made Sat 08 Oct 2016 09:56:38 BST # gpg: using RSA key 0x701B4F6B1A693E59 # gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>" # gpg: aka "Michael Tokarev <mjt@corpit.ru>" # gpg: aka "Michael Tokarev <mjt@debian.org>" # Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5 # Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931 4B22 701B 4F6B 1A69 3E59 * remotes/mjt/tags/trivial-patches-fetch: (26 commits) net/filter-mirror: Fix mirror initial check typo virtio: rename the bar index field name in VirtIOPCIProxy linux-user: include <poll.h> instead of <sys/poll.h> char: fix missing return in error path for chardev TLS init CODING_STYLE: Fix a typo ("have" vs. "has") bitmap: refine and move BITMAP_{FIRST/LAST}_WORD_MASK build-sys: fix find-in-path m68k: change default system clock for m5208evb exec: remove unused compacted argument usb: ehci: fix memory leak in ehci_process_itd qapi: make the json schema files more regular. maint: Add module_block.h to .gitignore MAINTAINERS: Some updates related to the SH4 machines MAINTAINERS: Add some more MIPS related files MAINTAINERS: Add usermode related config files MAINTAINERS: Add some more pattern to recognize all win32 related files MAINTAINERS: Add some more rocker related files MAINTAINERS: Add header files to CRIS section MAINTAINERS: Add some more files to the virtio section MAINTAINERS: Add some SPARC machine related files ... # Conflicts: # MAINTAINERS
This commit is contained in:
commit
a20fd901af
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -53,6 +53,7 @@
|
|||
/qemu-monitor-info.texi
|
||||
/qemu-version.h
|
||||
/qemu-version.h.tmp
|
||||
/module_block.h
|
||||
/vscclient
|
||||
/fsdev/virtfs-proxy-helper
|
||||
*.[1-9]
|
||||
|
|
|
@ -9,7 +9,7 @@ patches before submitting.
|
|||
Of course, the most important aspect in any coding style is whitespace.
|
||||
Crusty old coders who have trouble spotting the glasses on their noses
|
||||
can tell the difference between a tab and eight spaces from a distance
|
||||
of approximately fifteen parsecs. Many a flamewar have been fought and
|
||||
of approximately fifteen parsecs. Many a flamewar has been fought and
|
||||
lost on this issue.
|
||||
|
||||
QEMU indents are four spaces. Tabs are never used, except in Makefiles
|
||||
|
|
38
MAINTAINERS
38
MAINTAINERS
|
@ -116,6 +116,7 @@ M: Edgar E. Iglesias <edgar.iglesias@gmail.com>
|
|||
S: Maintained
|
||||
F: target-cris/
|
||||
F: hw/cris/
|
||||
F: include/hw/cris/
|
||||
F: tests/tcg/cris/
|
||||
F: disas/cris.c
|
||||
|
||||
|
@ -149,6 +150,13 @@ M: Yongbok Kim <yongbok.kim@imgtec.com>
|
|||
S: Maintained
|
||||
F: target-mips/
|
||||
F: hw/mips/
|
||||
F: hw/misc/mips_*
|
||||
F: hw/intc/mips_gic.c
|
||||
F: hw/timer/mips_gictimer.c
|
||||
F: include/hw/mips/
|
||||
F: include/hw/misc/mips_*
|
||||
F: include/hw/intc/mips_gic.h
|
||||
F: include/hw/timer/mips_gictimer.h
|
||||
F: tests/tcg/mips/
|
||||
F: disas/mips.c
|
||||
|
||||
|
@ -157,6 +165,8 @@ M: Anthony Green <green@moxielogic.com>
|
|||
S: Maintained
|
||||
F: target-moxie/
|
||||
F: disas/moxie.c
|
||||
F: hw/moxie/
|
||||
F: default-configs/moxie-softmmu.mak
|
||||
|
||||
OpenRISC
|
||||
M: Jia Liu <proljc@gmail.com>
|
||||
|
@ -319,6 +329,9 @@ L: qemu-devel@nongnu.org
|
|||
M: Stefan Weil <sw@weilnetz.de>
|
||||
S: Maintained
|
||||
F: *win32*
|
||||
F: */*win32*
|
||||
F: include/*/*win32*
|
||||
X: qga/*win32*
|
||||
F: qemu.nsi
|
||||
|
||||
ARM Machines
|
||||
|
@ -662,31 +675,38 @@ R2D
|
|||
M: Magnus Damm <magnus.damm@gmail.com>
|
||||
S: Maintained
|
||||
F: hw/sh4/r2d.c
|
||||
F: hw/intc/sh_intc.c
|
||||
F: hw/timer/sh_timer.c
|
||||
|
||||
Shix
|
||||
M: Magnus Damm <magnus.damm@gmail.com>
|
||||
S: Orphan
|
||||
S: Odd Fixes
|
||||
F: hw/sh4/shix.c
|
||||
|
||||
SPARC Machines
|
||||
--------------
|
||||
Sun4m
|
||||
M: Blue Swirl <blauwirbel@gmail.com>
|
||||
M: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
|
||||
S: Maintained
|
||||
F: hw/sparc/sun4m.c
|
||||
F: hw/dma/sparc32_dma.c
|
||||
F: hw/dma/sun4m_iommu.c
|
||||
F: include/hw/sparc/sparc32_dma.h
|
||||
F: include/hw/sparc/sun4m.h
|
||||
F: pc-bios/openbios-sparc32
|
||||
|
||||
Sun4u
|
||||
M: Blue Swirl <blauwirbel@gmail.com>
|
||||
M: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
|
||||
S: Maintained
|
||||
F: hw/sparc64/sun4u.c
|
||||
F: pc-bios/openbios-sparc64
|
||||
|
||||
Leon3
|
||||
M: Fabien Chouteau <chouteau@adacore.com>
|
||||
S: Maintained
|
||||
F: hw/sparc/leon3.c
|
||||
F: hw/*/grlib*
|
||||
F: include/hw/sparc/grlib.h
|
||||
|
||||
S390 Machines
|
||||
-------------
|
||||
|
@ -926,6 +946,8 @@ virtio
|
|||
M: Michael S. Tsirkin <mst@redhat.com>
|
||||
S: Supported
|
||||
F: hw/*/virtio*
|
||||
F: hw/virtio/Makefile.objs
|
||||
F: hw/virtio/trace-events
|
||||
F: net/vhost-user.c
|
||||
F: include/hw/virtio/
|
||||
F: tests/virtio-balloon-test.c
|
||||
|
@ -1013,6 +1035,8 @@ Rocker
|
|||
M: Jiri Pirko <jiri@resnulli.us>
|
||||
S: Maintained
|
||||
F: hw/net/rocker/
|
||||
F: tests/rocker/
|
||||
F: docs/specs/rocker.txt
|
||||
|
||||
NVDIMM
|
||||
M: Xiao Guangrong <guangrong.xiao@linux.intel.com>
|
||||
|
@ -1044,6 +1068,7 @@ M: Gerd Hoffmann <kraxel@redhat.com>
|
|||
S: Maintained
|
||||
F: audio/
|
||||
F: hw/audio/
|
||||
F: include/hw/audio/
|
||||
F: tests/ac97-test.c
|
||||
F: tests/es1370-test.c
|
||||
F: tests/intel-hda-test.c
|
||||
|
@ -1181,8 +1206,9 @@ Human Monitor (HMP)
|
|||
M: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||||
S: Maintained
|
||||
F: monitor.c
|
||||
F: hmp.c
|
||||
F: hmp-commands.hx
|
||||
F: hmp.[ch]
|
||||
F: hmp-commands*.hx
|
||||
F: include/monitor/hmp-target.h
|
||||
|
||||
Network device backends
|
||||
M: Jason Wang <jasowang@redhat.com>
|
||||
|
@ -1407,11 +1433,13 @@ F: user-exec.c
|
|||
BSD user
|
||||
S: Orphan
|
||||
F: bsd-user/
|
||||
F: default-configs/*-bsd-user.mak
|
||||
|
||||
Linux user
|
||||
M: Riku Voipio <riku.voipio@iki.fi>
|
||||
S: Maintained
|
||||
F: linux-user/
|
||||
F: default-configs/*-linux-user.mak
|
||||
|
||||
Tiny Code Generator (TCG)
|
||||
-------------------------
|
||||
|
|
8
exec.c
8
exec.c
|
@ -255,7 +255,7 @@ static void phys_page_set(AddressSpaceDispatch *d,
|
|||
/* Compact a non leaf page entry. Simply detect that the entry has a single child,
|
||||
* and update our entry so we can skip it and go directly to the destination.
|
||||
*/
|
||||
static void phys_page_compact(PhysPageEntry *lp, Node *nodes, unsigned long *compacted)
|
||||
static void phys_page_compact(PhysPageEntry *lp, Node *nodes)
|
||||
{
|
||||
unsigned valid_ptr = P_L2_SIZE;
|
||||
int valid = 0;
|
||||
|
@ -275,7 +275,7 @@ static void phys_page_compact(PhysPageEntry *lp, Node *nodes, unsigned long *com
|
|||
valid_ptr = i;
|
||||
valid++;
|
||||
if (p[i].skip) {
|
||||
phys_page_compact(&p[i], nodes, compacted);
|
||||
phys_page_compact(&p[i], nodes);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -307,10 +307,8 @@ static void phys_page_compact(PhysPageEntry *lp, Node *nodes, unsigned long *com
|
|||
|
||||
static void phys_page_compact_all(AddressSpaceDispatch *d, int nodes_nb)
|
||||
{
|
||||
DECLARE_BITMAP(compacted, nodes_nb);
|
||||
|
||||
if (d->phys_map.skip) {
|
||||
phys_page_compact(&d->phys_map, d->map.nodes, compacted);
|
||||
phys_page_compact(&d->phys_map, d->map.nodes);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -786,8 +786,7 @@ static void n8x0_cbus_setup(struct n800_s *s)
|
|||
|
||||
static void n8x0_uart_setup(struct n800_s *s)
|
||||
{
|
||||
CharDriverState *radio = uart_hci_init(
|
||||
qdev_get_gpio_in(s->mpu->gpio, N8X0_BT_HOST_WKUP_GPIO));
|
||||
CharDriverState *radio = uart_hci_init();
|
||||
|
||||
qdev_connect_gpio_out(s->mpu->gpio, N8X0_BT_RESET_GPIO,
|
||||
csrhci_pins_get(radio)[csrhci_pin_reset]);
|
||||
|
|
|
@ -458,7 +458,7 @@ qemu_irq *csrhci_pins_get(CharDriverState *chr)
|
|||
return s->pins;
|
||||
}
|
||||
|
||||
CharDriverState *uart_hci_init(qemu_irq wakeup)
|
||||
CharDriverState *uart_hci_init(void)
|
||||
{
|
||||
struct csrhci_s *s = (struct csrhci_s *)
|
||||
g_malloc0(sizeof(struct csrhci_s));
|
||||
|
|
|
@ -120,8 +120,8 @@ static void virtio_vga_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
|
|||
* virtio regions are moved to the end of bar #2, to make room for
|
||||
* the stdvga mmio registers at the start of bar #2.
|
||||
*/
|
||||
vpci_dev->modern_mem_bar = 2;
|
||||
vpci_dev->msix_bar = 4;
|
||||
vpci_dev->modern_mem_bar_idx = 2;
|
||||
vpci_dev->msix_bar_idx = 4;
|
||||
|
||||
if (!(vpci_dev->flags & VIRTIO_PCI_FLAG_PAGE_PER_VQ)) {
|
||||
/*
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
#include "elf.h"
|
||||
#include "exec/address-spaces.h"
|
||||
|
||||
#define SYS_FREQ 66000000
|
||||
#define SYS_FREQ 166666666
|
||||
|
||||
#define PCSR_EN 0x0001
|
||||
#define PCSR_RLD 0x0002
|
||||
|
|
|
@ -1426,6 +1426,7 @@ static int ehci_process_itd(EHCIState *ehci,
|
|||
if (off + len > 4096) {
|
||||
/* transfer crosses page border */
|
||||
if (pg == 6) {
|
||||
qemu_sglist_destroy(&ehci->isgl);
|
||||
return -1; /* avoid page pg + 1 */
|
||||
}
|
||||
ptr2 = (itd->bufptr[pg + 1] & ITD_BUFPTR_MASK);
|
||||
|
|
|
@ -1551,7 +1551,7 @@ static void virtio_pci_modern_mem_region_map(VirtIOPCIProxy *proxy,
|
|||
struct virtio_pci_cap *cap)
|
||||
{
|
||||
virtio_pci_modern_region_map(proxy, region, cap,
|
||||
&proxy->modern_bar, proxy->modern_mem_bar);
|
||||
&proxy->modern_bar, proxy->modern_mem_bar_idx);
|
||||
}
|
||||
|
||||
static void virtio_pci_modern_io_region_map(VirtIOPCIProxy *proxy,
|
||||
|
@ -1559,7 +1559,7 @@ static void virtio_pci_modern_io_region_map(VirtIOPCIProxy *proxy,
|
|||
struct virtio_pci_cap *cap)
|
||||
{
|
||||
virtio_pci_modern_region_map(proxy, region, cap,
|
||||
&proxy->io_bar, proxy->modern_io_bar);
|
||||
&proxy->io_bar, proxy->modern_io_bar_idx);
|
||||
}
|
||||
|
||||
static void virtio_pci_modern_mem_region_unmap(VirtIOPCIProxy *proxy,
|
||||
|
@ -1670,14 +1670,14 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp)
|
|||
memory_region_init(&proxy->io_bar, OBJECT(proxy),
|
||||
"virtio-pci-io", 0x4);
|
||||
|
||||
pci_register_bar(&proxy->pci_dev, proxy->modern_io_bar,
|
||||
pci_register_bar(&proxy->pci_dev, proxy->modern_io_bar_idx,
|
||||
PCI_BASE_ADDRESS_SPACE_IO, &proxy->io_bar);
|
||||
|
||||
virtio_pci_modern_io_region_map(proxy, &proxy->notify_pio,
|
||||
¬ify_pio.cap);
|
||||
}
|
||||
|
||||
pci_register_bar(&proxy->pci_dev, proxy->modern_mem_bar,
|
||||
pci_register_bar(&proxy->pci_dev, proxy->modern_mem_bar_idx,
|
||||
PCI_BASE_ADDRESS_SPACE_MEMORY |
|
||||
PCI_BASE_ADDRESS_MEM_PREFETCH |
|
||||
PCI_BASE_ADDRESS_MEM_TYPE_64,
|
||||
|
@ -1693,7 +1693,7 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp)
|
|||
|
||||
if (proxy->nvectors) {
|
||||
int err = msix_init_exclusive_bar(&proxy->pci_dev, proxy->nvectors,
|
||||
proxy->msix_bar);
|
||||
proxy->msix_bar_idx);
|
||||
if (err) {
|
||||
/* Notice when a system that supports MSIx can't initialize it. */
|
||||
if (err != -ENOTSUP) {
|
||||
|
@ -1716,7 +1716,7 @@ static void virtio_pci_device_plugged(DeviceState *d, Error **errp)
|
|||
&virtio_pci_config_ops,
|
||||
proxy, "virtio-pci", size);
|
||||
|
||||
pci_register_bar(&proxy->pci_dev, proxy->legacy_io_bar,
|
||||
pci_register_bar(&proxy->pci_dev, proxy->legacy_io_bar_idx,
|
||||
PCI_BASE_ADDRESS_SPACE_IO, &proxy->bar);
|
||||
}
|
||||
|
||||
|
@ -1760,10 +1760,10 @@ static void virtio_pci_realize(PCIDevice *pci_dev, Error **errp)
|
|||
* region 4+5 -- virtio modern memory (64bit) bar
|
||||
*
|
||||
*/
|
||||
proxy->legacy_io_bar = 0;
|
||||
proxy->msix_bar = 1;
|
||||
proxy->modern_io_bar = 2;
|
||||
proxy->modern_mem_bar = 4;
|
||||
proxy->legacy_io_bar_idx = 0;
|
||||
proxy->msix_bar_idx = 1;
|
||||
proxy->modern_io_bar_idx = 2;
|
||||
proxy->modern_mem_bar_idx = 4;
|
||||
|
||||
proxy->common.offset = 0x0;
|
||||
proxy->common.size = 0x1000;
|
||||
|
|
|
@ -143,10 +143,10 @@ struct VirtIOPCIProxy {
|
|||
MemoryRegion io_bar;
|
||||
MemoryRegion modern_cfg;
|
||||
AddressSpace modern_as;
|
||||
uint32_t legacy_io_bar;
|
||||
uint32_t msix_bar;
|
||||
uint32_t modern_io_bar;
|
||||
uint32_t modern_mem_bar;
|
||||
uint32_t legacy_io_bar_idx;
|
||||
uint32_t msix_bar_idx;
|
||||
uint32_t modern_io_bar_idx;
|
||||
uint32_t modern_mem_bar_idx;
|
||||
int config_cap;
|
||||
uint32_t flags;
|
||||
bool disable_modern;
|
||||
|
|
|
@ -128,7 +128,7 @@ enum {
|
|||
__csrhci_pins,
|
||||
};
|
||||
qemu_irq *csrhci_pins_get(CharDriverState *chr);
|
||||
CharDriverState *uart_hci_init(qemu_irq wakeup);
|
||||
CharDriverState *uart_hci_init(void);
|
||||
|
||||
/* bt-l2cap.c */
|
||||
struct bt_l2cap_device_s;
|
||||
|
|
|
@ -57,11 +57,8 @@
|
|||
* find_next_bit(addr, nbits, bit) Position next set bit in *addr >= bit
|
||||
*/
|
||||
|
||||
#define BITMAP_LAST_WORD_MASK(nbits) \
|
||||
( \
|
||||
((nbits) % BITS_PER_LONG) ? \
|
||||
(1UL<<((nbits) % BITS_PER_LONG))-1 : ~0UL \
|
||||
)
|
||||
#define BITMAP_FIRST_WORD_MASK(start) (~0UL << ((start) & (BITS_PER_LONG - 1)))
|
||||
#define BITMAP_LAST_WORD_MASK(nbits) (~0UL >> (-(nbits) & (BITS_PER_LONG - 1)))
|
||||
|
||||
#define DECLARE_BITMAP(name,bits) \
|
||||
unsigned long name[BITS_TO_LONGS(bits)]
|
||||
|
|
|
@ -42,7 +42,7 @@ int __clone2(int (*fn)(void *), void *child_stack_base,
|
|||
#include <sys/socket.h>
|
||||
#include <sys/un.h>
|
||||
#include <sys/uio.h>
|
||||
#include <sys/poll.h>
|
||||
#include <poll.h>
|
||||
#include <sys/times.h>
|
||||
#include <sys/shm.h>
|
||||
#include <sys/sem.h>
|
||||
|
|
|
@ -198,7 +198,7 @@ static void filter_mirror_setup(NetFilterState *nf, Error **errp)
|
|||
MirrorState *s = FILTER_MIRROR(nf);
|
||||
|
||||
if (!s->outdev) {
|
||||
error_setg(errp, "filter filter mirror needs 'outdev' "
|
||||
error_setg(errp, "filter mirror needs 'outdev' "
|
||||
"property set");
|
||||
return;
|
||||
}
|
||||
|
@ -315,7 +315,7 @@ filter_mirror_set_outdev(Object *obj, const char *value, Error **errp)
|
|||
g_free(s->outdev);
|
||||
s->outdev = g_strdup(value);
|
||||
if (!s->outdev) {
|
||||
error_setg(errp, "filter filter mirror needs 'outdev' "
|
||||
error_setg(errp, "filter mirror needs 'outdev' "
|
||||
"property set");
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -752,6 +752,7 @@
|
|||
'cpu-throttle-increment': 'int',
|
||||
'tls-creds': 'str',
|
||||
'tls-hostname': 'str'} }
|
||||
|
||||
##
|
||||
# @query-migrate-parameters
|
||||
#
|
||||
|
@ -4118,7 +4119,6 @@
|
|||
#
|
||||
# Since 1.6
|
||||
##
|
||||
|
||||
{ 'struct': 'RxFilterInfo',
|
||||
'data': {
|
||||
'name': 'str',
|
||||
|
@ -4338,7 +4338,6 @@
|
|||
#
|
||||
# Since: 2.1
|
||||
##
|
||||
|
||||
{ 'struct': 'Memdev',
|
||||
'data': {
|
||||
'size': 'size',
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
# Since: 1.3
|
||||
#
|
||||
##
|
||||
|
||||
{ 'struct': 'SnapshotInfo',
|
||||
'data': { 'id': 'str', 'name': 'str', 'vm-state-size': 'int',
|
||||
'date-sec': 'int', 'date-nsec': 'int',
|
||||
|
@ -81,7 +80,6 @@
|
|||
#
|
||||
# Since: 1.7
|
||||
##
|
||||
|
||||
{ 'union': 'ImageInfoSpecific',
|
||||
'data': {
|
||||
'qcow2': 'ImageInfoSpecificQCow2',
|
||||
|
@ -129,7 +127,6 @@
|
|||
# Since: 1.3
|
||||
#
|
||||
##
|
||||
|
||||
{ 'struct': 'ImageInfo',
|
||||
'data': {'filename': 'str', 'format': 'str', '*dirty-flag': 'bool',
|
||||
'*actual-size': 'int', 'virtual-size': 'int',
|
||||
|
@ -181,7 +178,6 @@
|
|||
# Since: 1.4
|
||||
#
|
||||
##
|
||||
|
||||
{ 'struct': 'ImageCheck',
|
||||
'data': {'filename': 'str', 'format': 'str', 'check-errors': 'int',
|
||||
'*image-end-offset': 'int', '*corruptions': 'int', '*leaks': 'int',
|
||||
|
@ -518,7 +514,6 @@
|
|||
#
|
||||
# Since: 2.5
|
||||
##
|
||||
|
||||
{ 'struct': 'BlockDeviceTimedStats',
|
||||
'data': { 'interval_length': 'int', 'min_rd_latency_ns': 'int',
|
||||
'max_rd_latency_ns': 'int', 'avg_rd_latency_ns': 'int',
|
||||
|
|
|
@ -3140,6 +3140,7 @@ static void tcp_chr_tls_init(CharDriverState *chr)
|
|||
if (tioc == NULL) {
|
||||
error_free(err);
|
||||
tcp_chr_disconnect(chr);
|
||||
return;
|
||||
}
|
||||
object_unref(OBJECT(s->ioc));
|
||||
s->ioc = QIO_CHANNEL(tioc);
|
||||
|
|
|
@ -2374,7 +2374,7 @@ console with the given dimensions.
|
|||
@item -chardev ringbuf ,id=@var{id} [,size=@var{size}]
|
||||
|
||||
Create a ring buffer with fixed size @option{size}.
|
||||
@var{size} must be a power of two, and defaults to @code{64K}).
|
||||
@var{size} must be a power of two and defaults to @code{64K}.
|
||||
|
||||
@item -chardev file ,id=@var{id} ,path=@var{path}
|
||||
|
||||
|
|
|
@ -138,7 +138,7 @@ endef
|
|||
# Looks in the PATH if the argument contains no slash, else only considers one
|
||||
# specific directory. Returns an # empty string if the program doesn't exist
|
||||
# there.
|
||||
find-in-path = $(if $(find-string /, $1), \
|
||||
find-in-path = $(if $(findstring /, $1), \
|
||||
$(wildcard $1), \
|
||||
$(wildcard $(patsubst %, %/$1, $(subst :, ,$(PATH)))))
|
||||
|
||||
|
|
2
tests/.gitignore
vendored
2
tests/.gitignore
vendored
|
@ -12,7 +12,9 @@ rcutorture
|
|||
test-aio
|
||||
test-base64
|
||||
test-bitops
|
||||
test-blockjob
|
||||
test-blockjob-txn
|
||||
test-bufferiszero
|
||||
test-clone-visitor
|
||||
test-coroutine
|
||||
test-crypto-afsplit
|
||||
|
|
|
@ -157,8 +157,6 @@ int slow_bitmap_andnot(unsigned long *dst, const unsigned long *bitmap1,
|
|||
return result != 0;
|
||||
}
|
||||
|
||||
#define BITMAP_FIRST_WORD_MASK(start) (~0UL << ((start) % BITS_PER_LONG))
|
||||
|
||||
void bitmap_set(unsigned long *map, long start, long nr)
|
||||
{
|
||||
unsigned long *p = map + BIT_WORD(start);
|
||||
|
|
Loading…
Reference in a new issue