Merge remote-tracking branch 'aneesh/for-upstream-7' into staging

diff --combined Makefile.objs
index a19e7c5f57639222e9eb6e1d7ddf6e1b39abd7e6,3dead4e4a1f9a21687c859f3a1b33f90679ec35b..31c8cc7b033234024204858b1c6704adf55fad84
--- 1/Makefile.objs
--- 2/Makefile.objs
+++ b/Makefile.objs
@@@ -2,7 -2,7 +2,7 @@@
  # QObject
  qobject-obj-y = qint.o qstring.o qdict.o qlist.o qfloat.o qbool.o
  qobject-obj-y += qjson.o json-lexer.o json-streamer.o json-parser.o
 -qobject-obj-y += qerror.o error.o
 +qobject-obj-y += qerror.o error.o qemu-error.o
  
  #######################################################################
  # oslib-obj-y is code depending on the OS (win32 vs posix)
@@@ -25,7 -25,7 +25,7 @@@ coroutine-obj-$(CONFIG_WIN32) += corout
  
  block-obj-y = cutils.o cache-utils.o qemu-option.o module.o async.o
  block-obj-y += nbd.o block.o aio.o aes.o qemu-config.o qemu-progress.o qemu-sockets.o
 -block-obj-y += $(coroutine-obj-y)
 +block-obj-y += $(coroutine-obj-y) $(qobject-obj-y) $(version-obj-y)
  block-obj-$(CONFIG_POSIX) += posix-aio-compat.o
  block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o
  
@@@ -76,7 -76,7 +76,7 @@@ common-obj-y = $(block-obj-y) blockdev.
  common-obj-y += $(net-obj-y)
  common-obj-y += $(qobject-obj-y)
  common-obj-$(CONFIG_LINUX) += $(fsdev-obj-$(CONFIG_LINUX))
 -common-obj-y += readline.o console.o cursor.o qemu-error.o
 +common-obj-y += readline.o console.o cursor.o
  common-obj-y += $(oslib-obj-y)
  common-obj-$(CONFIG_WIN32) += os-win32.o
  common-obj-$(CONFIG_POSIX) += os-posix.o
@@@ -310,6 -310,7 +310,7 @@@ hw-obj-$(CONFIG_SOUND) += $(sound-obj-y
  9pfs-nested-$(CONFIG_VIRTFS) += virtio-9p-xattr-user.o virtio-9p-posix-acl.o
  9pfs-nested-$(CONFIG_VIRTFS) += virtio-9p-coth.o cofs.o codir.o cofile.o
  9pfs-nested-$(CONFIG_VIRTFS) += coxattr.o virtio-9p-handle.o
+ 9pfs-nested-$(CONFIG_VIRTFS) += virtio-9p-synth.o
  
  hw-obj-$(CONFIG_REALLY_VIRTFS) += $(addprefix 9pfs/, $(9pfs-nested-y))
  $(addprefix 9pfs/, $(9pfs-nested-y)): QEMU_CFLAGS+=$(GLIB_CFLAGS)
@@@ -415,7 -416,7 +416,7 @@@ common-obj-y += qmp.o hmp.
  
  qga-nested-y = guest-agent-commands.o guest-agent-command-state.o
  qga-obj-y = $(addprefix qga/, $(qga-nested-y))
 -qga-obj-y += qemu-ga.o qemu-tool.o qemu-error.o qemu-sockets.o module.o qemu-option.o cutils.o osdep.o
 +qga-obj-y += qemu-ga.o qemu-sockets.o module.o qemu-option.o
  qga-obj-$(CONFIG_WIN32) += oslib-win32.o
  qga-obj-$(CONFIG_POSIX) += oslib-posix.o
  

diff --combined vl.c
index fb28ffcdfb254bfc4cbb7e2715b411d254f086bc,37a79e588c932773055434034b13400326173183..b56e0cb378f5785cef28d476eaf59bf7b370c70d
--- 1/vl.c
--- 2/vl.c
+++ b/vl.c
@@@ -143,9 -143,9 +143,9 @@@ int main(int argc, char **argv
  #include "audio/audio.h"
  #include "migration.h"
  #include "kvm.h"
 +#include "qjson.h"
  #include "qemu-option.h"
  #include "qemu-config.h"
 -#include "qemu-objects.h"
  #include "qemu-options.h"
  #include "qmp-commands.h"
  #include "main-loop.h"
@@@ -2707,6 -2707,8 +2707,8 @@@ int main(int argc, char **argv, char **
                  qemu_opt_set(fsdev, "security_model",
                               qemu_opt_get(opts, "security_model"));
  
+                 qemu_opt_set_bool(fsdev, "readonly",
+                                 qemu_opt_get_bool(opts, "readonly", 0));
                  device = qemu_opts_create(qemu_find_opts("device"), NULL, 0);
                  qemu_opt_set(device, "driver", "virtio-9p-pci");
                  qemu_opt_set(device, "fsdev",
@@@ -2715,6 -2717,24 +2717,24 @@@
                               qemu_opt_get(opts, "mount_tag"));
                  break;
              }
+             case QEMU_OPTION_virtfs_synth: {
+                 QemuOpts *fsdev;
+                 QemuOpts *device;
+ 
+                 fsdev = qemu_opts_create(qemu_find_opts("fsdev"), "v_synth", 1);
+                 if (!fsdev) {
+                     fprintf(stderr, "duplicate option: %s\n", "virtfs_synth");
+                     exit(1);
+                 }
+                 qemu_opt_set(fsdev, "fsdriver", "synth");
+                 qemu_opt_set(fsdev, "path", "/"); /* ignored */
+ 
+                 device = qemu_opts_create(qemu_find_opts("device"), NULL, 0);
+                 qemu_opt_set(device, "driver", "virtio-9p-pci");
+                 qemu_opt_set(device, "fsdev", "v_synth");
+                 qemu_opt_set(device, "mount_tag", "v_synth");
+                 break;
+             }
              case QEMU_OPTION_serial:
                  add_device_config(DEV_SERIAL, optarg);
                  default_serial = 0;