error_set updates according to 81e5f78a9f

also error_report was moved to another header

diff --git a/debian/patches/add-qmp-get-link-status.patch b/debian/patches/add-qmp-get-link-status.patch
index 84f1a1d5e4484e265fd5cb5902eafd04d625903c..ab336c2e9e81b580a43aa682346ec961b4abb54e 100644 (file)
--- a/debian/patches/add-qmp-get-link-status.patch
+++ b/debian/patches/add-qmp-get-link-status.patch
@@ -38,7 +38,7 @@ Index: new/net/net.c
 ===================================================================
 --- new.orig/net/net.c 2014-12-10 10:24:39.790496356 +0100
 +++ new/net/net.c      2014-12-11 09:37:55.971321170 +0100
-@@ -1141,6 +1141,32 @@
+@@ -1141,6 +1141,33 @@
      }
  }
  
@@ -54,8 +54,9 @@ Index: new/net/net.c
 +                                          MAX_QUEUE_NUM);
 +
 +    if (queues == 0) {
-+        error_set(errp, QERR_DEVICE_NOT_FOUND, name);
-+      return (int64_t) -1;
++        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
++                  "Device '%s' not found", name);
++        return (int64_t) -1;
 +    }
 +
 +    nc = ncs[0];

diff --git a/debian/patches/backup-add-pve-monitor-commands.patch b/debian/patches/backup-add-pve-monitor-commands.patch
index 09aebfd4c4935289c52ad44a6c218c1526abb10d..c4dbf379ed9a5579378d7dea81bcc851d1fd0cb2 100644 (file)
--- a/debian/patches/backup-add-pve-monitor-commands.patch
+++ b/debian/patches/backup-add-pve-monitor-commands.patch
@@ -10,7 +10,7 @@ Index: new/blockdev.c
  
  static const char *const if_name[IF_COUNT] = {
      [IF_NONE] = "none",
-@@ -1954,6 +1955,439 @@
+@@ -1954,6 +1955,440 @@
      bdrv_put_ref_bh_schedule(bs);
  }
  
@@ -190,7 +190,7 @@ Index: new/blockdev.c
 +    pvebackup_cleanup();
 +}
 +
-+char *qmp_backup(const char *backup_file, bool has_format,
++UuidInfo *qmp_backup(const char *backup_file, bool has_format,
 +                    BackupFormat format,
 +                    bool has_config_file, const char *config_file,
 +                    bool has_devlist, const char *devlist,
@@ -228,18 +228,19 @@ Index: new/blockdev.c
 +            if (blk) {
 +                bs = blk_bs(blk);
 +                if (bdrv_is_read_only(bs)) {
-+                    error_set(errp, QERR_DEVICE_IS_READ_ONLY, *d);
++                    error_setg(errp, "Node '%s' is read only", *d);
 +                    goto err;
 +                }
 +                if (!bdrv_is_inserted(bs)) {
-+                    error_set(errp, QERR_DEVICE_HAS_NO_MEDIUM, *d);
++                    error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, *d);
 +                    goto err;
 +                }
 +                PVEBackupDevInfo *di = g_new0(PVEBackupDevInfo, 1);
 +                di->bs = bs;
 +                di_list = g_list_append(di_list, di);
 +            } else {
-+                error_set(errp, QERR_DEVICE_NOT_FOUND, *d);
++                error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
++                          "Device '%s' not found", *d);
 +                goto err;
 +            }
 +            d++;

diff --git a/debian/patches/internal-snapshot-async.patch b/debian/patches/internal-snapshot-async.patch
index 9fdf610e102b65c46dd92aef06808acf6e289736..ecc91fdf576186d006fb10480be3ffedf887bf8c 100644 (file)
--- a/debian/patches/internal-snapshot-async.patch
+++ b/debian/patches/internal-snapshot-async.patch
@@ -376,9 +376,10 @@ Index: new/savevm-async.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
 +++ new/savevm-async.c 2014-11-20 09:17:48.000000000 +0100
-@@ -0,0 +1,503 @@
+@@ -0,0 +1,506 @@
 +#include "qemu-common.h"
 +#include "qapi/qmp/qerror.h"
++#include "qemu/error-report.h"
 +#include "sysemu/sysemu.h"
 +#include "qmp-commands.h"
 +#include "qemu-options.h"
@@ -720,23 +721,24 @@ Index: new/savevm-async.c
 +
 +    blk = blk_by_name(device);
 +    if (!blk) {
-+        error_set(errp, QERR_DEVICE_NOT_FOUND, device);
++        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
++                  "Device '%s' not found", device);
 +        return;
 +    }
 +
 +    bs = blk_bs(blk);
 +    if (!bdrv_is_inserted(bs)) {
-+        error_set(errp, QERR_DEVICE_HAS_NO_MEDIUM, device);
++        error_setg(errp, QERR_DEVICE_HAS_NO_MEDIUM, device);
 +        return;
 +    }
 +
 +    if (bdrv_is_read_only(bs)) {
-+        error_set(errp, QERR_DEVICE_IS_READ_ONLY, device);
++        error_setg(errp, "Node '%s' is read only", device);
 +        return;
 +    }
 +
 +    if (!bdrv_can_snapshot(bs)) {
-+        error_set(errp, QERR_UNSUPPORTED);
++        error_setg(errp, QERR_UNSUPPORTED);
 +        return;
 +    }
 +
@@ -784,18 +786,19 @@ Index: new/savevm-async.c
 +
 +    blk = blk_by_name(device);
 +    if (!blk) {
-+        error_set(errp, QERR_DEVICE_NOT_FOUND, device);
++        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
++                  "Device '%s' not found", device);
 +        return;
 +    }
 +
 +    bs = blk_bs(blk);
 +    if (bdrv_is_read_only(bs)) {
-+        error_set(errp, QERR_DEVICE_IS_READ_ONLY, device);
++        error_setg(errp, "Node '%s' is read only", device);
 +        return;
 +    }
 +
 +    if (!bdrv_can_snapshot(bs)) {
-+        error_set(errp, QERR_UNSUPPORTED);
++        error_setg(errp, QERR_UNSUPPORTED);
 +        return;
 +    }
 +