Merge commit '74db920c32cea5b52a91b81f2bfd467fc070e942' into upstream-merge

* commit '74db920c32cea5b52a91b81f2bfd467fc070e942': (34 commits)
  virtio-9p: Create a commandline option -fsdev
  virtio-serial: Fix check for 'assert'; prevent NULL derefs
  Fix the RARP protocol ID
  Fix tiny leak in qemu_opts_parse
  lsi: Properly initialize controller state on reset
  lsi: Purge request queue on soft reset
  Fix boot once option
  vnc: split encoding in specific files
  vnc: Fix compile error on x86_64 with -D_VNC_DEBUG=1
  block: Release allocated options after bdrv_open
  qemu-img rebase: Fix output image corruption
  block: Add wr_highest_sector blockstat
  qcow2: Implement bdrv_truncate() for growing images
  qcow2: Remove abort on free_clusters failure
  qemu-img: Add 'resize' command to grow/shrink disk images
  block: Cache total_sectors to reduce bdrv_getlength calls
  raw-posix: Use pread/pwrite instead of lseek+read/write
  qcow2: Avoid shadowing variable in alloc_clusters_noref()
  block: Set backing_hd to NULL after deleting it
  vmdk: Convert to bdrv_open
  ...

Conflicts:
	vl.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/savevm.c b/savevm.c
index 1754d735c..af377be05 100644
--- a/savevm.c
+++ b/savevm.c
@@ -89,7 +89,7 @@ static BlockDriverState *bs_snapshots;
 #define SELF_ANNOUNCE_ROUNDS 5
 
 #ifndef ETH_P_RARP
-#define ETH_P_RARP 0x0835
+#define ETH_P_RARP 0x8035
 #endif
 #define ARP_HTYPE_ETH 0x0001
 #define ARP_PTYPE_IP 0x0800