mirror of
https://github.com/xemu-project/xemu.git
synced 2024-11-23 03:29:43 +00:00
misc: fix commonly doubled up words
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Message-Id: <20220707163720.1421716-5-berrange@redhat.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
parent
ebf705541c
commit
7a21bee2aa
@ -461,7 +461,7 @@ LinuxAioState *laio_init(Error **errp)
|
|||||||
s = g_malloc0(sizeof(*s));
|
s = g_malloc0(sizeof(*s));
|
||||||
rc = event_notifier_init(&s->e, false);
|
rc = event_notifier_init(&s->e, false);
|
||||||
if (rc < 0) {
|
if (rc < 0) {
|
||||||
error_setg_errno(errp, -rc, "failed to to initialize event notifier");
|
error_setg_errno(errp, -rc, "failed to initialize event notifier");
|
||||||
goto out_free_state;
|
goto out_free_state;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -787,10 +787,10 @@ static int bitmap_list_store(BlockDriverState *bs, Qcow2BitmapList *bm_list,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Actually, even in in-place case ignoring QCOW2_OL_BITMAP_DIRECTORY is not
|
/* Actually, even in the in-place case ignoring QCOW2_OL_BITMAP_DIRECTORY
|
||||||
* necessary, because we drop QCOW2_AUTOCLEAR_BITMAPS when updating bitmap
|
* is not necessary, because we drop QCOW2_AUTOCLEAR_BITMAPS when updating
|
||||||
* directory in-place (actually, turn-off the extension), which is checked
|
* bitmap directory in-place (actually, turn-off the extension), which is
|
||||||
* in qcow2_check_metadata_overlap() */
|
* checked in qcow2_check_metadata_overlap() */
|
||||||
ret = qcow2_pre_write_overlap_check(
|
ret = qcow2_pre_write_overlap_check(
|
||||||
bs, in_place ? QCOW2_OL_BITMAP_DIRECTORY : 0, dir_offset, dir_size,
|
bs, in_place ? QCOW2_OL_BITMAP_DIRECTORY : 0, dir_offset, dir_size,
|
||||||
false);
|
false);
|
||||||
|
@ -38,7 +38,7 @@ enum EvictionPolicy policy;
|
|||||||
* put in any of the blocks inside the set. The number of block per set is
|
* put in any of the blocks inside the set. The number of block per set is
|
||||||
* called the associativity (assoc).
|
* called the associativity (assoc).
|
||||||
*
|
*
|
||||||
* Each block contains the the stored tag and a valid bit. Since this is not
|
* Each block contains the stored tag and a valid bit. Since this is not
|
||||||
* a functional simulator, the data itself is not stored. We only identify
|
* a functional simulator, the data itself is not stored. We only identify
|
||||||
* whether a block is in the cache or not by searching for its tag.
|
* whether a block is in the cache or not by searching for its tag.
|
||||||
*
|
*
|
||||||
|
@ -371,8 +371,8 @@ This accepts an array of interface type names.
|
|||||||
{ TYPE_USER_CREATABLE },
|
{ TYPE_USER_CREATABLE },
|
||||||
{ NULL })
|
{ NULL })
|
||||||
|
|
||||||
If the type is not intended to be instantiated, then then
|
If the type is not intended to be instantiated, then the
|
||||||
the OBJECT_DEFINE_ABSTRACT_TYPE() macro can be used instead:
|
OBJECT_DEFINE_ABSTRACT_TYPE() macro can be used instead:
|
||||||
|
|
||||||
.. code-block:: c
|
.. code-block:: c
|
||||||
:caption: Defining a simple abstract type
|
:caption: Defining a simple abstract type
|
||||||
|
@ -53,7 +53,7 @@ files in a disk image backing chain:
|
|||||||
|
|
||||||
(1) Directional: 'base' and 'top'. Given the simple disk image chain
|
(1) Directional: 'base' and 'top'. Given the simple disk image chain
|
||||||
above, image [A] can be referred to as 'base', and image [B] as
|
above, image [A] can be referred to as 'base', and image [B] as
|
||||||
'top'. (This terminology can be seen in in QAPI schema file,
|
'top'. (This terminology can be seen in the QAPI schema file,
|
||||||
block-core.json.)
|
block-core.json.)
|
||||||
|
|
||||||
(2) Relational: 'backing file' and 'overlay'. Again, taking the same
|
(2) Relational: 'backing file' and 'overlay'. Again, taking the same
|
||||||
@ -825,7 +825,7 @@ entire disk image chain, to a target, using ``blockdev-mirror`` would be:
|
|||||||
job ready to be completed
|
job ready to be completed
|
||||||
|
|
||||||
(5) Gracefully complete the 'mirror' block device job, and notice the
|
(5) Gracefully complete the 'mirror' block device job, and notice the
|
||||||
the event ``BLOCK_JOB_COMPLETED``
|
event ``BLOCK_JOB_COMPLETED``
|
||||||
|
|
||||||
(6) Shutdown the guest by issuing the QMP ``quit`` command so that
|
(6) Shutdown the guest by issuing the QMP ``quit`` command so that
|
||||||
caches are flushed
|
caches are flushed
|
||||||
|
@ -284,7 +284,7 @@ SVE CPU Property Parsing Semantics
|
|||||||
CPU Property Dependencies and Constraints").
|
CPU Property Dependencies and Constraints").
|
||||||
|
|
||||||
4) If one or more vector lengths have been explicitly enabled and at
|
4) If one or more vector lengths have been explicitly enabled and at
|
||||||
at least one of the dependency lengths of the maximum enabled length
|
least one of the dependency lengths of the maximum enabled length
|
||||||
has been explicitly disabled, then an error is generated (see
|
has been explicitly disabled, then an error is generated (see
|
||||||
constraint (2) of "SVE CPU Property Dependencies and Constraints").
|
constraint (2) of "SVE CPU Property Dependencies and Constraints").
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@ with CXL Host Bridges, which have CXL Root Ports which may be directly
|
|||||||
attached to CXL or PCI End Points. Alternatively there may be CXL Switches
|
attached to CXL or PCI End Points. Alternatively there may be CXL Switches
|
||||||
with CXL and PCI Endpoints attached below them. In many cases additional
|
with CXL and PCI Endpoints attached below them. In many cases additional
|
||||||
control and capabilities are exposed via PCI Express interfaces.
|
control and capabilities are exposed via PCI Express interfaces.
|
||||||
This sharing of interfaces and hence emulation code is is reflected
|
This sharing of interfaces and hence emulation code is reflected
|
||||||
in how the devices are emulated in QEMU. In most cases the various
|
in how the devices are emulated in QEMU. In most cases the various
|
||||||
CXL elements are built upon an equivalent PCIe devices.
|
CXL elements are built upon an equivalent PCIe devices.
|
||||||
|
|
||||||
|
@ -65,7 +65,7 @@ you can specify it via the ``-global s390-ipl.netboot_fw=filename``
|
|||||||
command line option.
|
command line option.
|
||||||
|
|
||||||
The ``bootindex`` property is especially important for booting via the network.
|
The ``bootindex`` property is especially important for booting via the network.
|
||||||
If you don't specify the the ``bootindex`` property here, the network bootloader
|
If you don't specify the ``bootindex`` property here, the network bootloader
|
||||||
firmware code won't get loaded into the guest memory so that the network boot
|
firmware code won't get loaded into the guest memory so that the network boot
|
||||||
will fail. For a successful network boot, try something like this::
|
will fail. For a successful network boot, try something like this::
|
||||||
|
|
||||||
|
@ -182,7 +182,7 @@ certificates.
|
|||||||
--template client-hostNNN.info \
|
--template client-hostNNN.info \
|
||||||
--outfile client-hostNNN-cert.pem
|
--outfile client-hostNNN-cert.pem
|
||||||
|
|
||||||
The subject alt name extension data is not required for clients, so the
|
The subject alt name extension data is not required for clients, so
|
||||||
the ``dns_name`` and ``ip_address`` fields are not included. The
|
the ``dns_name`` and ``ip_address`` fields are not included. The
|
||||||
``tls_www_client`` keyword is the key purpose extension to indicate this
|
``tls_www_client`` keyword is the key purpose extension to indicate this
|
||||||
certificate is intended for usage in a web client. Although QEMU network
|
certificate is intended for usage in a web client. Although QEMU network
|
||||||
|
@ -21,8 +21,8 @@ programs because incorrect usage can disrupt regular operation of the
|
|||||||
storage fabric. QEMU's SCSI passthrough devices ``scsi-block``
|
storage fabric. QEMU's SCSI passthrough devices ``scsi-block``
|
||||||
and ``scsi-generic`` support passing guest persistent reservation
|
and ``scsi-generic`` support passing guest persistent reservation
|
||||||
requests to a privileged external helper program. :program:`qemu-pr-helper`
|
requests to a privileged external helper program. :program:`qemu-pr-helper`
|
||||||
is that external helper; it creates a socket which QEMU can
|
is that external helper; it creates a listener socket which will
|
||||||
connect to to communicate with it.
|
accept incoming connections for communication with QEMU.
|
||||||
|
|
||||||
If you want to run VMs in a setup like this, this helper should be
|
If you want to run VMs in a setup like this, this helper should be
|
||||||
started as a system service, and you should read the QEMU manual
|
started as a system service, and you should read the QEMU manual
|
||||||
|
@ -68,7 +68,7 @@ static uint64_t clock_get_child_period(Clock *clk)
|
|||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
* Return the period to be used for child clocks, which is the parent
|
* Return the period to be used for child clocks, which is the parent
|
||||||
* clock period adjusted for for multiplier and divider effects.
|
* clock period adjusted for multiplier and divider effects.
|
||||||
*/
|
*/
|
||||||
return muldiv64(clk->period, clk->multiplier, clk->divider);
|
return muldiv64(clk->period, clk->multiplier, clk->divider);
|
||||||
}
|
}
|
||||||
|
@ -492,7 +492,7 @@ static MemTxResult gicr_writel(GICv3CPUState *cs, hwaddr offset,
|
|||||||
return MEMTX_OK;
|
return MEMTX_OK;
|
||||||
case GICR_WAKER:
|
case GICR_WAKER:
|
||||||
/* Only the ProcessorSleep bit is writable. When the guest sets
|
/* Only the ProcessorSleep bit is writable. When the guest sets
|
||||||
* it it requests that we transition the channel between the
|
* it, it requests that we transition the channel between the
|
||||||
* redistributor and the cpu interface to quiescent, and that
|
* redistributor and the cpu interface to quiescent, and that
|
||||||
* we set the ChildrenAsleep bit once the inteface has reached the
|
* we set the ChildrenAsleep bit once the inteface has reached the
|
||||||
* quiescent state.
|
* quiescent state.
|
||||||
|
@ -114,7 +114,7 @@ static const uint8_t iotkit_secctl_ns_sse300_idregs[] = {
|
|||||||
* AHB expansion, APB expansion) are all set up so that they are
|
* AHB expansion, APB expansion) are all set up so that they are
|
||||||
* in 16-aligned blocks so offsets 0xN0, 0xN4, 0xN8, 0xNC are PPCs
|
* in 16-aligned blocks so offsets 0xN0, 0xN4, 0xN8, 0xNC are PPCs
|
||||||
* 0, 1, 2, 3 of that type, so we can convert a register address offset
|
* 0, 1, 2, 3 of that type, so we can convert a register address offset
|
||||||
* into an an index into a PPC array easily.
|
* into an index into a PPC array easily.
|
||||||
*/
|
*/
|
||||||
static inline int offset_to_ppc_idx(uint32_t offset)
|
static inline int offset_to_ppc_idx(uint32_t offset)
|
||||||
{
|
{
|
||||||
|
@ -237,7 +237,7 @@ static uint64_t iotkit_sysctl_read(void *opaque, hwaddr offset,
|
|||||||
r = s->ewctrl;
|
r = s->ewctrl;
|
||||||
break;
|
break;
|
||||||
case ARMSSE_SSE300:
|
case ARMSSE_SSE300:
|
||||||
/* In SSE300 this offset is is NMI_ENABLE */
|
/* In SSE300 this offset is NMI_ENABLE */
|
||||||
r = s->nmi_enable;
|
r = s->nmi_enable;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
@ -555,7 +555,7 @@ static void iotkit_sysctl_write(void *opaque, hwaddr offset,
|
|||||||
s->ewctrl = value;
|
s->ewctrl = value;
|
||||||
break;
|
break;
|
||||||
case ARMSSE_SSE300:
|
case ARMSSE_SSE300:
|
||||||
/* In SSE300 this offset is is NMI_ENABLE */
|
/* In SSE300 this offset is NMI_ENABLE */
|
||||||
qemu_log_mask(LOG_UNIMP, "IoTKit SysCtl NMI_ENABLE unimplemented\n");
|
qemu_log_mask(LOG_UNIMP, "IoTKit SysCtl NMI_ENABLE unimplemented\n");
|
||||||
s->nmi_enable = value;
|
s->nmi_enable = value;
|
||||||
break;
|
break;
|
||||||
|
@ -57,7 +57,7 @@ IOInstEnding s390_ccw_store(SubchDev *sch)
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* This code is called for both virtual and passthrough devices,
|
* This code is called for both virtual and passthrough devices,
|
||||||
* but only applies to to the latter. This ugly check makes that
|
* but only applies to the latter. This ugly check makes that
|
||||||
* distinction for us.
|
* distinction for us.
|
||||||
*/
|
*/
|
||||||
if (object_dynamic_cast(OBJECT(sch->driver_data), TYPE_S390_CCW)) {
|
if (object_dynamic_cast(OBJECT(sch->driver_data), TYPE_S390_CCW)) {
|
||||||
|
@ -74,7 +74,7 @@ typedef struct U2FKeyState {
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* API to be used by the U2F key device variants (i.e. hw/u2f-*.c)
|
* API to be used by the U2F key device variants (i.e. hw/u2f-*.c)
|
||||||
* to interact with the the U2F key base device (i.e. hw/u2f.c)
|
* to interact with the U2F key base device (i.e. hw/u2f.c)
|
||||||
*/
|
*/
|
||||||
void u2f_send_to_guest(U2FKeyState *key,
|
void u2f_send_to_guest(U2FKeyState *key,
|
||||||
const uint8_t packet[U2FHID_PACKET_SIZE]);
|
const uint8_t packet[U2FHID_PACKET_SIZE]);
|
||||||
|
@ -386,7 +386,7 @@ bool qdev_realize_and_unref(DeviceState *dev, BusState *bus, Error **errp);
|
|||||||
*
|
*
|
||||||
* - unrealize any child buses by calling qbus_unrealize()
|
* - unrealize any child buses by calling qbus_unrealize()
|
||||||
* (this will recursively unrealize any devices on those buses)
|
* (this will recursively unrealize any devices on those buses)
|
||||||
* - call the the unrealize method of @dev
|
* - call the unrealize method of @dev
|
||||||
*
|
*
|
||||||
* The device can then be freed by causing its reference count to go
|
* The device can then be freed by causing its reference count to go
|
||||||
* to zero.
|
* to zero.
|
||||||
|
@ -70,7 +70,7 @@
|
|||||||
* If the host libc is used then the implementation will appear to work
|
* If the host libc is used then the implementation will appear to work
|
||||||
* most of the time, but there will be a race condition where a
|
* most of the time, but there will be a race condition where a
|
||||||
* signal could arrive just before we make the host syscall inside libc,
|
* signal could arrive just before we make the host syscall inside libc,
|
||||||
* and then then guest syscall will not correctly be interrupted.
|
* and then the guest syscall will not correctly be interrupted.
|
||||||
* Instead the implementation of the guest syscall can use the safe_syscall
|
* Instead the implementation of the guest syscall can use the safe_syscall
|
||||||
* function but otherwise just return the result or errno in the usual
|
* function but otherwise just return the result or errno in the usual
|
||||||
* way; the main loop code will take care of restarting the syscall
|
* way; the main loop code will take care of restarting the syscall
|
||||||
|
@ -137,7 +137,7 @@ static void emulate_vsyscall(CPUX86State *env)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Validate the the pointer arguments.
|
* Validate the pointer arguments.
|
||||||
*/
|
*/
|
||||||
switch (syscall) {
|
switch (syscall) {
|
||||||
case TARGET_NR_gettimeofday:
|
case TARGET_NR_gettimeofday:
|
||||||
|
@ -195,7 +195,7 @@ static bool scsi_read_capacity(VDev *vdev,
|
|||||||
/* virtio-scsi routines */
|
/* virtio-scsi routines */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Tries to locate a SCSI device and and adds the information for the found
|
* Tries to locate a SCSI device and adds the information for the found
|
||||||
* device to the vdev->scsi_device structure.
|
* device to the vdev->scsi_device structure.
|
||||||
* Returns 0 if SCSI device could be located, or a error code < 0 otherwise
|
* Returns 0 if SCSI device could be located, or a error code < 0 otherwise
|
||||||
*/
|
*/
|
||||||
|
@ -29,7 +29,7 @@ help:
|
|||||||
@echo " Performs no environment setup of any kind."
|
@echo " Performs no environment setup of any kind."
|
||||||
@echo ""
|
@echo ""
|
||||||
@echo "make develop:"
|
@echo "make develop:"
|
||||||
@echo " Install deps needed for for 'make check',"
|
@echo " Install deps needed for 'make check',"
|
||||||
@echo " and install the qemu package in editable mode."
|
@echo " and install the qemu package in editable mode."
|
||||||
@echo " (Can be used in or outside of a venv.)"
|
@echo " (Can be used in or outside of a venv.)"
|
||||||
@echo ""
|
@echo ""
|
||||||
|
@ -79,7 +79,7 @@ def add_visual_margin(
|
|||||||
:param content: The text to wrap and decorate.
|
:param content: The text to wrap and decorate.
|
||||||
:param width:
|
:param width:
|
||||||
The number of columns to use, including for the decoration
|
The number of columns to use, including for the decoration
|
||||||
itself. The default (None) uses the the available width of the
|
itself. The default (None) uses the available width of the
|
||||||
current terminal, or a fallback of 72 lines. A negative number
|
current terminal, or a fallback of 72 lines. A negative number
|
||||||
subtracts a fixed-width from the default size. The default obeys
|
subtracts a fixed-width from the default size. The default obeys
|
||||||
the COLUMNS environment variable, if set.
|
the COLUMNS environment variable, if set.
|
||||||
|
@ -8056,7 +8056,7 @@ static TCGv_i32 op_addr_block_pre(DisasContext *s, arg_ldst_block *a, int n)
|
|||||||
* If the writeback is incrementing SP rather than
|
* If the writeback is incrementing SP rather than
|
||||||
* decrementing it, and the initial SP is below the
|
* decrementing it, and the initial SP is below the
|
||||||
* stack limit but the final written-back SP would
|
* stack limit but the final written-back SP would
|
||||||
* be above, then then we must not perform any memory
|
* be above, then we must not perform any memory
|
||||||
* accesses, but it is IMPDEF whether we generate
|
* accesses, but it is IMPDEF whether we generate
|
||||||
* an exception. We choose to do so in this case.
|
* an exception. We choose to do so in this case.
|
||||||
* At this point 'addr' is the lowest address, so
|
* At this point 'addr' is the lowest address, so
|
||||||
|
@ -3632,7 +3632,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
|
|||||||
CPUID_7_0_EDX_CORE_CAPABILITY,
|
CPUID_7_0_EDX_CORE_CAPABILITY,
|
||||||
.features[FEAT_CORE_CAPABILITY] =
|
.features[FEAT_CORE_CAPABILITY] =
|
||||||
MSR_CORE_CAP_SPLIT_LOCK_DETECT,
|
MSR_CORE_CAP_SPLIT_LOCK_DETECT,
|
||||||
/* XSAVES is is added in version 3 */
|
/* XSAVES is added in version 3 */
|
||||||
.features[FEAT_XSAVE] =
|
.features[FEAT_XSAVE] =
|
||||||
CPUID_XSAVE_XSAVEOPT | CPUID_XSAVE_XSAVEC |
|
CPUID_XSAVE_XSAVEOPT | CPUID_XSAVE_XSAVEC |
|
||||||
CPUID_XSAVE_XGETBV1,
|
CPUID_XSAVE_XGETBV1,
|
||||||
|
@ -1652,7 +1652,7 @@ static void tcg_out_branch(TCGContext *s, int call, const tcg_insn_unit *dest)
|
|||||||
} else {
|
} else {
|
||||||
/* rip-relative addressing into the constant pool.
|
/* rip-relative addressing into the constant pool.
|
||||||
This is 6 + 8 = 14 bytes, as compared to using an
|
This is 6 + 8 = 14 bytes, as compared to using an
|
||||||
an immediate load 10 + 6 = 16 bytes, plus we may
|
immediate load 10 + 6 = 16 bytes, plus we may
|
||||||
be able to re-use the pool constant for more calls. */
|
be able to re-use the pool constant for more calls. */
|
||||||
tcg_out_opc(s, OPC_GRP5, 0, 0, 0);
|
tcg_out_opc(s, OPC_GRP5, 0, 0, 0);
|
||||||
tcg_out8(s, (call ? EXT5_CALLN_Ev : EXT5_JMPN_Ev) << 3 | 5);
|
tcg_out8(s, (call ? EXT5_CALLN_Ev : EXT5_JMPN_Ev) << 3 | 5);
|
||||||
|
@ -447,11 +447,11 @@ static void test_nrf51_timer(void)
|
|||||||
|
|
||||||
timer_set_bitmode(qts, NRF51_TIMER_WIDTH_16); /* 16 MHz Timer */
|
timer_set_bitmode(qts, NRF51_TIMER_WIDTH_16); /* 16 MHz Timer */
|
||||||
timer_set_prescaler(qts, 0);
|
timer_set_prescaler(qts, 0);
|
||||||
/* Swept over in first step */
|
/* Swept over, during the first step */
|
||||||
timer_set_cc(qts, 0, 2);
|
timer_set_cc(qts, 0, 2);
|
||||||
/* Barely miss on first step */
|
/* Barely miss, after the second step */
|
||||||
timer_set_cc(qts, 1, 162);
|
timer_set_cc(qts, 1, 162);
|
||||||
/* Spot on on third step */
|
/* Spot on, after the third step */
|
||||||
timer_set_cc(qts, 2, 480);
|
timer_set_cc(qts, 2, 480);
|
||||||
|
|
||||||
timer_assert_events(qts, 0, 0, 0, 0);
|
timer_assert_events(qts, 0, 0, 0, 0);
|
||||||
|
@ -379,7 +379,7 @@ int virtio_send_data_iov(struct fuse_session *se, struct fuse_chan *ch,
|
|||||||
copy_iov(iov, count, in_sg, in_num, iov_len);
|
copy_iov(iov, count, in_sg, in_num, iov_len);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Build a copy of the the in_sg iov so we can skip bits in it,
|
* Build a copy of the in_sg iov so we can skip bits in it,
|
||||||
* including changing the offsets
|
* including changing the offsets
|
||||||
*/
|
*/
|
||||||
in_sg_cpy = g_new(struct iovec, in_num);
|
in_sg_cpy = g_new(struct iovec, in_num);
|
||||||
|
Loading…
Reference in New Issue
Block a user