diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-07-24 12:49:54 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-07-24 12:49:54 +0100 |
| commit | a537d373b9f330853006ceb18d5891541b9e4030 (patch) | |
| tree | cf9392a6abfea5b3b0cd198e2477b385d3bc179e | |
| parent | f368c33d5ab09dd5656924185cd975b11838cd25 (diff) | |
| parent | cf679caf911aa49a25477b3aa20468ee50ed6c89 (diff) | |
| download | qemu-a537d373b9f330853006ceb18d5891541b9e4030.tar.gz | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20140723-1' into staging
usb: mtp: tag root property as experimental
# gpg: Signature made Wed 23 Jul 2014 07:56:21 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-usb-20140723-1:
usb: mtp: tag root property as experimental
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/usb/dev-mtp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c index 1b51a90022..384d4a5ac5 100644 --- a/hw/usb/dev-mtp.c +++ b/hw/usb/dev-mtp.c @@ -1090,7 +1090,7 @@ static const VMStateDescription vmstate_usb_mtp = { }; static Property mtp_properties[] = { - DEFINE_PROP_STRING("root", MTPState, root), + DEFINE_PROP_STRING("x-root", MTPState, root), DEFINE_PROP_STRING("desc", MTPState, desc), DEFINE_PROP_END_OF_LIST(), }; |