Failed in applying to current master (
apply log)
Maintainers: "Daniel P. Berrangé" <berrange@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, "Cédric Le Goater" <clg@kaod.org>, Steven Lee <steven_lee@aspeedtech.com>, Troy Lee <leetroy@gmail.com>, Jamin Lin <jamin_lin@aspeedtech.com>, Kane Chen <kane_chen@aspeedtech.com>, Andrew Jeffery <andrew@codeconstruct.com.au>, Joel Stanley <joel@jms.id.au>, "Philippe Mathieu-Daudé" <philmd@oss.qualcomm.com>, Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>, Fabiano Rosas <farosas@suse.de>, Laurent Vivier <lvivier@redhat.com>
qapi/crypto.json | 33 +-
include/hw/arm/aspeed_soc.h | 9 +-
include/hw/i2c/aspeed_i2c.h | 3 +
include/hw/misc/aspeed_acry.h | 39 ++
include/hw/misc/aspeed_sbc.h | 6 +-
include/hw/sensor/tmp105.h | 46 +-
include/hw/usb/aspeed-udc.h | 85 +++
hw/arm/aspeed_ast10x0.c | 14 +-
hw/arm/aspeed_ast2600.c | 71 ++-
hw/arm/aspeed_ast2600_catalina.c | 1 -
hw/arm/aspeed_ast2600_fuji.c | 16 +-
hw/arm/aspeed_ast2600_sanmiguel.c | 403 ++++++++++++++
hw/i2c/aspeed_i2c.c | 38 +-
hw/misc/aspeed_acry.c | 481 +++++++++++++++++
hw/misc/aspeed_sbc.c | 158 +++++-
hw/misc/aspeed_scu.c | 21 +-
hw/sensor/tmp105.c | 300 ++++++++---
hw/usb/aspeed-udc.c | 1058 +++++++++++++++++++++++++++++++++++++
hw/usb/hcd-ehci.c | 90 ++--
tests/qtest/aspeed-acry-test.c | 406 ++++++++++++++
tests/qtest/aspeed-hace-utils.c | 24 +-
tests/qtest/aspeed-sbc-test.c | 194 +++++++
tests/qtest/tmp105-test.c | 359 +++++++++++++
tests/unit/test-crypto-akcipher.c | 236 +++++++++
crypto/akcipher-gcrypt.c.inc | 340 +++++++++++-
crypto/akcipher-nettle.c.inc | 272 ++++++++++
hw/arm/Kconfig | 1 +
hw/arm/meson.build | 1 +
hw/misc/meson.build | 1 +
hw/misc/trace-events | 8 +
hw/usb/Kconfig | 4 +
hw/usb/meson.build | 1 +
hw/usb/trace-events | 16 +
tests/functional/aspeed.py | 5 +-
tests/qtest/meson.build | 7 +-
35 files changed, 4552 insertions(+), 195 deletions(-)
create mode 100644 include/hw/misc/aspeed_acry.h
create mode 100644 include/hw/usb/aspeed-udc.h
create mode 100644 hw/arm/aspeed_ast2600_sanmiguel.c
create mode 100644 hw/misc/aspeed_acry.c
create mode 100644 hw/usb/aspeed-udc.c
create mode 100644 tests/qtest/aspeed-acry-test.c
create mode 100644 tests/qtest/aspeed-sbc-test.c