* [PULL 1/7] configure: Disable capstone and slirp in the --without-default-features mode
2022-02-22 16:16 [PULL 0/7] Trivial branch for 7.0 patches Laurent Vivier
@ 2022-02-22 16:16 ` Laurent Vivier
2022-02-22 16:16 ` [PULL 2/7] target/avr: Correct AVRCPUClass docstring Laurent Vivier
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Laurent Vivier @ 2022-02-22 16:16 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Samuel Thibault, Thomas Huth, Laurent Vivier,
Paolo Bonzini
From: Thomas Huth <thuth@redhat.com>
For the users, it looks a little bit weird that capstone and slirp are
not disabled automatically if they run the configure script with the
"--without-default-features" option, so let's do that now.
Note: fdt is *not* changed accordingly since this affects the targets
that we can build, so disabling fdt automatically here might have
unexpected side-effects for the users.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220221090647.150184-1-thuth@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
configure | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 3a29eff5cc16..36d10d95bba8 100755
--- a/configure
+++ b/configure
@@ -361,9 +361,14 @@ slirp_smbd="$default_feature"
# 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"
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PULL 2/7] target/avr: Correct AVRCPUClass docstring
2022-02-22 16:16 [PULL 0/7] Trivial branch for 7.0 patches Laurent Vivier
2022-02-22 16:16 ` [PULL 1/7] configure: Disable capstone and slirp in the --without-default-features mode Laurent Vivier
@ 2022-02-22 16:16 ` Laurent Vivier
2022-02-22 16:16 ` [PULL 3/7] target/rx: Remove unused ENV_OFFSET definition Laurent Vivier
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Laurent Vivier @ 2022-02-22 16:16 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Richard Henderson, Philippe Mathieu-Daudé,
Laurent Vivier
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
There is no 'vr' field in AVRCPUClass.
Likely a copy/paste typo from CRISCPUClass ;)
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220122001036.83267-1-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
target/avr/cpu-qom.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/target/avr/cpu-qom.h b/target/avr/cpu-qom.h
index 9fa6989c1882..14e5b3ce72ff 100644
--- a/target/avr/cpu-qom.h
+++ b/target/avr/cpu-qom.h
@@ -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.
*/
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PULL 3/7] target/rx: Remove unused ENV_OFFSET definition
2022-02-22 16:16 [PULL 0/7] Trivial branch for 7.0 patches Laurent Vivier
2022-02-22 16:16 ` [PULL 1/7] configure: Disable capstone and slirp in the --without-default-features mode Laurent Vivier
2022-02-22 16:16 ` [PULL 2/7] target/avr: Correct AVRCPUClass docstring Laurent Vivier
@ 2022-02-22 16:16 ` Laurent Vivier
2022-02-22 16:16 ` [PULL 4/7] hw/nvram: use at24 macro Laurent Vivier
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Laurent Vivier @ 2022-02-22 16:16 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Richard Henderson, Philippe Mathieu-Daudé,
Yoshinori Sato, Laurent Vivier
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
The last use of ENV_OFFSET was removed in 5e1401969b
("cpu: Move icount_decr to CPUNegativeOffsetState");
the commit of target/rx came in just afterward.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220203001252.37982-1-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
target/rx/cpu.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/target/rx/cpu.h b/target/rx/cpu.h
index 657db84ef0a5..58adf9edf692 100644
--- a/target/rx/cpu.h
+++ b/target/rx/cpu.h
@@ -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
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PULL 4/7] hw/nvram: use at24 macro
2022-02-22 16:16 [PULL 0/7] Trivial branch for 7.0 patches Laurent Vivier
` (2 preceding siblings ...)
2022-02-22 16:16 ` [PULL 3/7] target/rx: Remove unused ENV_OFFSET definition Laurent Vivier
@ 2022-02-22 16:16 ` Laurent Vivier
2022-02-22 16:16 ` [PULL 5/7] qemu-options: fix incorrect description for '-drive index=' Laurent Vivier
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Laurent Vivier @ 2022-02-22 16:16 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Patrick Venture, Philippe Mathieu-Daudé,
Laurent Vivier
From: Patrick Venture <venture@google.com>
Use the macro for going from I2CSlave to EEPROMState.
Signed-off-by: Patrick Venture <venture@google.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220119214329.2557049-1-venture@google.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/nvram/eeprom_at24c.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/nvram/eeprom_at24c.c b/hw/nvram/eeprom_at24c.c
index af6f5dbb9984..da435500baca 100644
--- a/hw/nvram/eeprom_at24c.c
+++ b/hw/nvram/eeprom_at24c.c
@@ -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:
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PULL 5/7] qemu-options: fix incorrect description for '-drive index='
2022-02-22 16:16 [PULL 0/7] Trivial branch for 7.0 patches Laurent Vivier
` (3 preceding siblings ...)
2022-02-22 16:16 ` [PULL 4/7] hw/nvram: use at24 macro Laurent Vivier
@ 2022-02-22 16:16 ` Laurent Vivier
2022-02-22 16:16 ` [PULL 6/7] vdpa: Make ncs autofree Laurent Vivier
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Laurent Vivier @ 2022-02-22 16:16 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Laurent Vivier, Thomas Huth, Laurent Vivier
From: Laurent Vivier <lvivier@redhat.com>
qemu-options.hx contains grammar that a native English-speaking
person would never use.
Replace "This option defines where is connected the drive" by
"This option defines where the drive is connected".
Fixes: https://gitlab.com/qemu-project/qemu/-/issues/853
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20220202143422.912070-1-lvivier@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
qemu-options.hx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qemu-options.hx b/qemu-options.hx
index ba3ae6a42aa3..094a6c1d7c28 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -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.
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PULL 6/7] vdpa: Make ncs autofree
2022-02-22 16:16 [PULL 0/7] Trivial branch for 7.0 patches Laurent Vivier
` (4 preceding siblings ...)
2022-02-22 16:16 ` [PULL 5/7] qemu-options: fix incorrect description for '-drive index=' Laurent Vivier
@ 2022-02-22 16:16 ` Laurent Vivier
2022-02-22 16:16 ` [PULL 7/7] hid: Implement support for side and extra buttons Laurent Vivier
2022-02-23 9:24 ` [PULL 0/7] Trivial branch for 7.0 patches Peter Maydell
7 siblings, 0 replies; 9+ messages in thread
From: Laurent Vivier @ 2022-02-22 16:16 UTC (permalink / raw)
To: qemu-devel
Cc: qemu-trivial, Jason Wang, Laurent Vivier,
Philippe Mathieu-Daudé,
Eugenio Pérez, Stefano Garzarella
From: Eugenio Pérez <eperezma@redhat.com>
Simplifying memory management.
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220214193415.1606752-2-eperezma@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
net/vhost-vdpa.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
index 25dd6dd97547..1e9fe47c033d 100644
--- a/net/vhost-vdpa.c
+++ b/net/vhost-vdpa.c
@@ -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;
}
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PULL 7/7] hid: Implement support for side and extra buttons
2022-02-22 16:16 [PULL 0/7] Trivial branch for 7.0 patches Laurent Vivier
` (5 preceding siblings ...)
2022-02-22 16:16 ` [PULL 6/7] vdpa: Make ncs autofree Laurent Vivier
@ 2022-02-22 16:16 ` Laurent Vivier
2022-02-23 9:24 ` [PULL 0/7] Trivial branch for 7.0 patches Peter Maydell
7 siblings, 0 replies; 9+ messages in thread
From: Laurent Vivier @ 2022-02-22 16:16 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Laurent Vivier, Gerd Hoffmann, Noah Bergbauer
From: Noah Bergbauer <noah@statshelix.com>
Simply set the respective bits and update the descriptor accordingly.
Signed-off-by: Noah Bergbauer <noah@statshelix.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Message-Id: <20211126140437.79745-1-noah@statshelix.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/input/hid.c | 2 ++
hw/usb/dev-hid.c | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/hw/input/hid.c b/hw/input/hid.c
index 8aab0521f405..e7ecebdf8f88 100644
--- a/hw/input/hid.c
+++ b/hw/input/hid.c
@@ -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;
diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c
index 1c7ae97c3033..bdd6d1ffafe4 100644
--- a/hw/usb/dev-hid.c
+++ b/hw/usb/dev-hid.c
@@ -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) */
--
2.35.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PULL 0/7] Trivial branch for 7.0 patches
2022-02-22 16:16 [PULL 0/7] Trivial branch for 7.0 patches Laurent Vivier
` (6 preceding siblings ...)
2022-02-22 16:16 ` [PULL 7/7] hid: Implement support for side and extra buttons Laurent Vivier
@ 2022-02-23 9:24 ` Peter Maydell
7 siblings, 0 replies; 9+ messages in thread
From: Peter Maydell @ 2022-02-23 9:24 UTC (permalink / raw)
To: Laurent Vivier; +Cc: qemu-trivial, qemu-devel
On Tue, 22 Feb 2022 at 16:35, Laurent Vivier <laurent@vivier.eu> wrote:
>
> The following changes since commit e670f6d825d4dee248b311197fd4048469d6772b:
>
> Merge remote-tracking branch 'remotes/legoater/tags/pull-ppc-20220218' into staging (2022-02-20 15:05:41 +0000)
>
> are available in the Git repository at:
>
> https://gitlab.com/laurent_vivier/qemu.git tags/trivial-branch-for-7.0-pull-request
>
> for you to fetch changes up to 1e2d555846226a9e5fb1052fe8ba6f30480f33a9:
>
> hid: Implement support for side and extra buttons (2022-02-22 17:15:36 +0100)
>
> ----------------------------------------------------------------
> Trivial branch pull request 20220222
>
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/7.0
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 9+ messages in thread