mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 01:43:39 +00:00
Trivial branch pull request 20220222
-----BEGIN PGP SIGNATURE----- iQJGBAABCAAwFiEEzS913cjjpNwuT1Fz8ww4vT8vvjwFAmIVDEESHGxhdXJlbnRA dml2aWVyLmV1AAoJEPMMOL0/L748A1cP/0DneaaWt5SjvHOaKf2EnZj09kCvMQhk 9WEgfTGV2ZspXpzAov1GVjut+vtrNqvYsbKY8NIp7E+ECOp4VDgKFMANayn6d5Pt emFqCsED1n2qQkL2Zgyy2EWSk46yWIaZCFLNhJKmjIfsYras8VsS86NL8vRaEK4I sI/Gk6cTr6YkoHb2GLzE6mBH/G9VIkvQgVRcq+SW/jfWCnm2dV/0G9Ug+nb5h2k0 O781JjbLL6XGJTzMf2DwmXGtxWJ9qCOonnwO+m/UyEmE/ZHlSfjGOF8livWDdk7e aiCuC+LqDDTTSYzW2xi4GVvhzx5npAqbYeVW4/AXs4VpFZmU7hoEoxC6DE5sdXB3 gQ+bH24J2kQXZjB630QMADju8Z/ZJl3OtQ+lHYZ96FwspjP1rLx0OzEndd3w2FmG hviE0mvHjp+SbIeCL1HF59PQalFLvQg/ncx01AyDByXQ5IIDslL6xLiv4CzFOwFi LdLR+BMRGcQvaqiugzV1u5J/EHUSV/stE0GY9FxlVtRNHgE7sLJVBcC+YoRnksv9 6in4FLpMKPrjhot8Jb3G9JmXccqY6MCiAyvwTjxEqauppFQLPbLckZUys7yau1yC sXzOeiWp11olAsEmWhamIawWrdL9prYN4UozuHoK9PNiG4IDzV7sJlyodo6maDsV N4vJHj8QHiAt =aV9N -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/lvivier-gitlab/tags/trivial-branch-for-7.0-pull-request' into staging Trivial branch pull request 20220222 # gpg: Signature made Tue 22 Feb 2022 16:16:01 GMT # gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C # gpg: issuer "laurent@vivier.eu" # gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full] # gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full] # gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full] # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C * remotes/lvivier-gitlab/tags/trivial-branch-for-7.0-pull-request: hid: Implement support for side and extra buttons vdpa: Make ncs autofree qemu-options: fix incorrect description for '-drive index=' hw/nvram: use at24 macro target/rx: Remove unused ENV_OFFSET definition target/avr: Correct AVRCPUClass docstring configure: Disable capstone and slirp in the --without-default-features mode Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
31e3caf21b
9
configure
vendored
9
configure
vendored
|
@ -331,9 +331,14 @@ skip_meson=no
|
|||
# are included in the automatically generated help message)
|
||||
|
||||
# 1. Track which submodules are needed
|
||||
capstone="auto"
|
||||
if test "$default_feature" = no ; then
|
||||
capstone="disabled"
|
||||
slirp="disabled"
|
||||
else
|
||||
capstone="auto"
|
||||
slirp="auto"
|
||||
fi
|
||||
fdt="auto"
|
||||
slirp="auto"
|
||||
|
||||
# 2. Support --with/--without option
|
||||
default_devices="true"
|
||||
|
|
|
@ -114,6 +114,8 @@ static void hid_pointer_event(DeviceState *dev, QemuConsole *src,
|
|||
[INPUT_BUTTON_LEFT] = 0x01,
|
||||
[INPUT_BUTTON_RIGHT] = 0x02,
|
||||
[INPUT_BUTTON_MIDDLE] = 0x04,
|
||||
[INPUT_BUTTON_SIDE] = 0x08,
|
||||
[INPUT_BUTTON_EXTRA] = 0x10,
|
||||
};
|
||||
HIDState *hs = (HIDState *)dev;
|
||||
HIDPointerEvent *e;
|
||||
|
|
|
@ -54,7 +54,7 @@ struct EEPROMState {
|
|||
static
|
||||
int at24c_eeprom_event(I2CSlave *s, enum i2c_event event)
|
||||
{
|
||||
EEPROMState *ee = container_of(s, EEPROMState, parent_obj);
|
||||
EEPROMState *ee = AT24C_EE(s);
|
||||
|
||||
switch (event) {
|
||||
case I2C_START_SEND:
|
||||
|
|
|
@ -461,14 +461,14 @@ static const uint8_t qemu_mouse_hid_report_descriptor[] = {
|
|||
0xa1, 0x00, /* Collection (Physical) */
|
||||
0x05, 0x09, /* Usage Page (Button) */
|
||||
0x19, 0x01, /* Usage Minimum (1) */
|
||||
0x29, 0x03, /* Usage Maximum (3) */
|
||||
0x29, 0x05, /* Usage Maximum (5) */
|
||||
0x15, 0x00, /* Logical Minimum (0) */
|
||||
0x25, 0x01, /* Logical Maximum (1) */
|
||||
0x95, 0x03, /* Report Count (3) */
|
||||
0x95, 0x05, /* Report Count (5) */
|
||||
0x75, 0x01, /* Report Size (1) */
|
||||
0x81, 0x02, /* Input (Data, Variable, Absolute) */
|
||||
0x95, 0x01, /* Report Count (1) */
|
||||
0x75, 0x05, /* Report Size (5) */
|
||||
0x75, 0x03, /* Report Size (3) */
|
||||
0x81, 0x01, /* Input (Constant) */
|
||||
0x05, 0x01, /* Usage Page (Generic Desktop) */
|
||||
0x09, 0x30, /* Usage (X) */
|
||||
|
|
|
@ -263,7 +263,8 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name,
|
|||
{
|
||||
const NetdevVhostVDPAOptions *opts;
|
||||
int vdpa_device_fd;
|
||||
NetClientState **ncs, *nc;
|
||||
g_autofree NetClientState **ncs = NULL;
|
||||
NetClientState *nc;
|
||||
int queue_pairs, i, has_cvq = 0;
|
||||
|
||||
assert(netdev->type == NET_CLIENT_DRIVER_VHOST_VDPA);
|
||||
|
@ -301,7 +302,6 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name,
|
|||
goto err;
|
||||
}
|
||||
|
||||
g_free(ncs);
|
||||
return 0;
|
||||
|
||||
err:
|
||||
|
@ -309,7 +309,6 @@ err:
|
|||
qemu_del_net_client(ncs[0]);
|
||||
}
|
||||
qemu_close(vdpa_device_fd);
|
||||
g_free(ncs);
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
|
|
@ -1377,7 +1377,7 @@ SRST
|
|||
the bus number and the unit id.
|
||||
|
||||
``index=index``
|
||||
This option defines where is connected the drive by using an
|
||||
This option defines where the drive is connected by using an
|
||||
index in the list of available connectors of a given interface
|
||||
type.
|
||||
|
||||
|
|
|
@ -33,7 +33,6 @@ OBJECT_DECLARE_TYPE(AVRCPU, AVRCPUClass,
|
|||
* AVRCPUClass:
|
||||
* @parent_realize: The parent class' realize handler.
|
||||
* @parent_reset: The parent class' reset handler.
|
||||
* @vr: Version Register value.
|
||||
*
|
||||
* A AVR CPU model.
|
||||
*/
|
||||
|
|
|
@ -116,8 +116,6 @@ struct RXCPU {
|
|||
|
||||
typedef RXCPU ArchCPU;
|
||||
|
||||
#define ENV_OFFSET offsetof(RXCPU, env)
|
||||
|
||||
#define RX_CPU_TYPE_SUFFIX "-" TYPE_RX_CPU
|
||||
#define RX_CPU_TYPE_NAME(model) model RX_CPU_TYPE_SUFFIX
|
||||
#define CPU_RESOLVING_TYPE TYPE_RX_CPU
|
||||
|
|
Loading…
Reference in a new issue